index c4e1ce6463f563d2acd673722cfcbc9efc134783..291a8570699aa8bee0e8a80f095e29d9ab0ecc7d 100644 (file)
/* attribute list for save action */
var $ignore_account = TRUE;
/* 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;
var $objectclasses = array("whatever");
var $is_account = true;
var $description =""; // description
var $type =""; // Type FS/Samba/NCP
var $charset =""; // charset
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 $charsets =array(); // Array with charsets
var $path =""; // Path
+ var $volume =""; // Volume
var $option =""; // Options
var $is_edit =false;
var $option =""; // Options
var $is_edit =false;
+ var $allow_mounts = false; //do we allow mount entries?
+ var $create_mount_init = false; //mount entry set for this entry (while editing)?
+ var $create_mount = false; //save mount entry
-
- function servnfs ($config, $dn= NULL,$entry = false)
+ function servnfs ($config, $acl, $allow_mounts, $dn= NULL,$entry = false,$mount = false)
{
plugin::plugin ($config, $dn);
{
plugin::plugin ($config, $dn);
- $this->types = array("NFS"=>"NFS","samba"=>"samba","NCP"=>"NCP");
-
+
+ $this->types = array("CIFS" => "CIFS", "NFS"=>"NFS","samba"=>"samba","netatalk"=>"netatalk","NCP"=>"NCP");
+ if($dn){
+ $this->host = substr($dn, 3, strpos($dn, ',')-3);
+ }
+
+ $this->acl = $acl;
+ $this->allow_mounts=$allow_mounts;
+
$this->charsets = array();
if(!file_exists("/etc/gosa/encodings")){
$this->charsets = array();
if(!file_exists("/etc/gosa/encodings")){
}
if($entry){
}
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;
$this->is_edit = true;
+
}else{
$this->attributes[] = "name";
}
}else{
$this->attributes[] = "name";
}
+
+
+ $this->create_mount_init = $mount;
}
function execute()
{
}
function execute()
{
- /* Call parent execute */
- plugin::execute();
+ /* Call parent execute */
+ plugin::execute();
/* Fill templating stuff */
$smarty= get_smarty();
/* Fill templating stuff */
$smarty= get_smarty();
if($this->is_edit){
$smarty->assign("nameACL"," disabled ");
}
if($this->is_edit){
$smarty->assign("nameACL"," disabled ");
}
+
+ $smarty->assign("allow_mounts", $this->allow_mounts);
+ $smarty->assign("mount_checked", "");
+
+
+ $appleMountsACL=chkacl($this->acl,"gotoShareAppleMounts");
+ $appleMountsACLset=strpos($appleMountsACL, "disabled");
+ $smarty->assign("appleMountsACL", $appleMountsACL);
+ $smarty->assign("appleMountsACLset", $appleMountsACLset);
+
+ 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));
return($display);
$display= $smarty->fetch(get_template_path('servnfs.tpl', TRUE));
return($display);
$this->$attr = $_POST[$attr];
}
}
$this->$attr = $_POST[$attr];
}
}
+
+ if ((isset($_POST['netatalk_mount'])) && (($this->type == "netatalk") || ($this->type == "NFS"))) {
+ $this->create_mount = true;
+ } else {
+ $this->create_mount = false;
+ }
}
/* Check supplied data */
function check()
{
}
/* 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)){
// fixme : a check for the path ? ?
if(empty($this->path)){
// only 0-9a-z
if(!$this->is_edit){
// 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)){
}
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.");
}
$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->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.");
}
$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;
$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";
+ }
}
}
}
}
}
}
$s_return.= $this->type."|";
$s_return.= $this->charset."|";
$s_return.= $this->path."|";
$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));
}
return(array($this->name=>$s_return));
}
+
+ function should_create_mount() {
+ return $this->create_mount;
+ }
}
}