X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_servNfs.inc;h=c7b05c3621f7a1fe0e7aa8781fee7acf93982569;hb=6a1a66d8a6cd5da5cd6b48c3e9719db322f96435;hp=30a1a4c2d1641bcf4a2a4ba4b51aaefa3deb7616;hpb=3082209baacc737659b444a6de4ed6ef5588faaf;p=gosa.git diff --git a/plugins/admin/systems/class_servNfs.inc b/plugins/admin/systems/class_servNfs.inc index 30a1a4c2d..c7b05c362 100644 --- a/plugins/admin/systems/class_servNfs.inc +++ b/plugins/admin/systems/class_servNfs.inc @@ -9,7 +9,7 @@ class servnfs extends plugin /* attribute list for save action */ var $ignore_account = TRUE; - var $attributes = array("description","type","charset","path","option"); + var $attributes = array("description","type","charset","path","option", "volume"); var $objectclasses = array("whatever"); var $is_account = true; @@ -17,42 +17,72 @@ class servnfs extends plugin var $description =""; // description var $type =""; // Type FS/Samba/NCP var $charset =""; // charset - var $types =array(); // Array Types NFS/Samba/NCP + var $host =""; // hostname + var $types =array(); // Array Types NFS/Samba/NCP/netatalk var $charsets =array(); // Array with charsets var $path =""; // Path + var $volume =""; // Volume var $option =""; // Options var $is_edit =false; + var $create_mount_init = false; //mount entry set for this entry (while editing)? + var $create_mount = false; //save mount entry + var $parent = NULL; - function servnfs ($config, $dn= NULL,$entry = false) + function servnfs ($config, $parent,$entry= false,$mount =false) { + $this->parent = $parent; + $dn = $parent->dn; plugin::plugin ($config, $dn); - $this->types = array("NFS"=>"NFS","samba"=>"samba","NCP"=>"NCP"); - $this->charsets = array("UTF-8" => "UTF-8", - "ISO8859-1"=>"ISO8859-1 (Latin 1)", - "ISO8859-2"=>"ISO8859-2 (Latin 2)", - "ISO8859-3"=>"ISO8859-3 (Latin 3)", - "ISO8859-4"=>"ISO8859-4 (Latin 4)", - "ISO8859-5"=>"ISO8859-5 (Latin 5)"); + + $this->types = array("CIFS" => "CIFS", "NFS"=>"NFS","samba"=>"samba","netatalk"=>"netatalk","NCP"=>"NCP"); + if($dn){ + $this->host = substr($dn, 3, strpos($dn, ',')-3); + } + + $this->charsets = array(); + + if(!file_exists(CONFIG_DIR."/encodings")){ + print_red(sprintf(_("The file '%s/encodings' does not exist, can't get supported charsets."),CONFIG_DIR)); + }else{ + if(!is_readable(CONFIG_DIR."/encodings")){ + print_red(sprintf(_("Can't read '%s/encodings', please check permissions."),CONFIG_DIR)); + }else{ + $fp = fopen(CONFIG_DIR."/encodings","r"); + $i = 100; + while(!feof($fp)&&$i){ + $i -- ; + $str = trim(fgets($fp,256)); + + /* Skip comments */ + if(!preg_match("/^#/",$str)){ + $arr = split("\=",$str); + if(count($arr)==2){ + $this->charsets[$arr[0]]=$arr[1]; + } + } + } + } + } if($entry){ - $tmp = split("\|",$entry); - $this->name = $tmp[0]; // Name of NFS - $this->description = $tmp[1]; // description - $this->type = $tmp[2]; // Type NFS/Samba/NCP - $this->charset = $tmp[3]; // charset - $this->path = $tmp[4]; // Path - $this->option = $tmp[5]; // Options + list($this->name, $this->description, $this->type, $this->charset, + $this->path, $this->option, $this->volume)= split("\|",$entry."|"); $this->is_edit = true; + }else{ $this->attributes[] = "name"; } + + + $this->create_mount_init = $mount; } function execute() { - /* Call parent execute */ - plugin::execute(); + /* Call parent execute */ + plugin::execute(); + /* Fill templating stuff */ $smarty= get_smarty(); @@ -64,11 +94,47 @@ class servnfs extends plugin $smarty->assign($attr,$this->$attr); } - $smarty->assign("nameACL",""); - $smarty->assign("name",$this->name); + $tmp = $this->parent->plInfo(); + foreach($tmp['plProvidedAcls'] as $name => $translation){ + $smarty->assign($name."ACL",$this->parent->getacl($name)); + } + $smarty->assign("name",$this->name); if($this->is_edit){ - $smarty->assign("nameACL"," disabled "); + $smarty->assign("nameACL", preg_replace("/w/","",$this->parent->getacl("name"))); + } + $smarty->assign("allow_mounts", $this->parent->allow_mounts); + $smarty->assign("mount_checked", ""); + + $smarty->assign("appleMountsACL", $this->getacl("appleMounts")); + + if (($this->type == "netatalk") || ($this->type == "NFS")) { + if ($this->create_mount_init) { + $smarty->assign("mount_checked", "checked"); + } else { + $tmp = split(",", $this->dn); + $clip = $tmp[0] . ",ou=servers,ou=systems,"; + $mountsdn = "cn=mounts," . substr($this->dn, strlen($clip)); + switch ($this->type) { + case "netatalk" : { + $mountdn = "cn=".$this->host.":/".$this->name.",".$mountsdn; + break; + } + case "NFS" : { + $mountdn = "cn=".$this->host.":".$this->path.",".$mountsdn; + break; + } + default : { + continue; + } + } + $ldap = $this->config->get_ldap_link(); + $ldap->cat($mountdn, array('dn')); + $attrs = $ldap->fetch(); + if (count($attrs) > 0) { + $smarty->assign("mount_checked", "checked"); + } + } } $display= $smarty->fetch(get_template_path('servnfs.tpl', TRUE)); @@ -84,10 +150,18 @@ class servnfs extends plugin /* Save data to object */ function save_object() { - plugin::save_object(TRUE); - if(isset($_POST['path'])){ - foreach($this->attributes as $attr){ - $this->$attr = $_POST[$attr]; + if(isset($_POST['servnfs_posted'])){ + + foreach($this->attributes as $name){ + if($this->parent->acl_is_writeable($name) && isset($_POST[$name])){ + $this->$name = $_POST[$name]; + } + } + + if ((isset($_POST['netatalk_mount'])) && (($this->type == "netatalk") || ($this->type == "NFS"))) { + $this->create_mount = true; + } else { + $this->create_mount = false; } } } @@ -96,7 +170,8 @@ class servnfs extends plugin /* Check supplied data */ function check() { - $message= array(); + /* Call common method to give check the hook */ + $message= plugin::check(); // fixme : a check for the path ? ? if(empty($this->path)){ @@ -105,36 +180,49 @@ class servnfs extends plugin // only 0-9a-z if(!$this->is_edit){ - if(preg_match("/[^a-z0-9]/i",$this->name)){ - $message[]=_("Please specify a valid name for your setup."); + if(!preg_match("/^[a-z0-9\._]+$/i",$this->name)){ + $message[]=_("Please specify a valid name for your share."); } if(empty($this->name)){ - $message[]=_("Please specify a name for your setup."); + $message[]=_("Please specify a name for your share."); } } - if(preg_match("/\|/",$this->description)){ + if(preg_match("/[^a-z0-9äöü._+ -]+/i",$this->description)){ $message[]=_("Description contains invalid characters."); } - + + if(preg_match("/[^a-z0-9._+ -]/i",$this->volume)){ + $message[]=_("Volume contains invalid characters."); + } + if(preg_match("/\|/",$this->path)){ $message[]=_("Path contains invalid characters."); } - if(preg_match("/\|/",$this->option)){ + if(preg_match("/[^a-z0-9\.,=_+ -]/i",$this->option)){ $message[]=_("Option contains invalid characters."); } + /* remove a / at the end of the path, we neither need it there nor + * do we want to check for it later. + */ + if(substr($this->path, -1, 1) == '/') { + $this->path=substr($this->path, 0, -1); + } + $ldap= $this->config->get_ldap_link(); $ldap->cd($this->config->current['BASE']); $ldap->search("(objectClass=goShareServer)", array("goExportEntry")); while($test = $ldap->fetch()){ if($test['dn']==$this->dn) continue; - foreach($test['goExportEntry'] as $entry){ - $tmp = split("\|",$entry); - if($tmp[0] == $this->name){ - $message[]="Name already in use"; + if(isset($test['goExportEntry'])){ + foreach($test['goExportEntry'] as $entry){ + $tmp = split("\|",$entry); + if($tmp[0] == $this->name){ + $message[]="Name already in use"; + } } } } @@ -156,11 +244,17 @@ class servnfs extends plugin $s_return.= $this->type."|"; $s_return.= $this->charset."|"; $s_return.= $this->path."|"; - $s_return.= $this->option; + $s_return.= $this->option."|"; + $s_return.= $this->volume; return(array($this->name=>$s_return)); } + function should_create_mount() { + return $this->create_mount; + } + + } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: