index 9e339ca318222004415ba31087a6535a91d02281..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 $types =array(); // Array Types NFS/Samba/NCP/netatalk
var $charsets =array(); // Array with charsets
var $path =""; // Path
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 $allow_mounts = false; //do we allow mount entries?
var $option =""; // Options
var $is_edit =false;
var $allow_mounts = false; //do we allow mount entries?
{
plugin::plugin ($config, $dn);
{
plugin::plugin ($config, $dn);
- $this->types = array("NFS"=>"NFS","samba"=>"samba","netatalk"=>"netatalk","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);
}
if($dn){
$this->host = substr($dn, 3, strpos($dn, ',')-3);
}
}
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/netatalk
- $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;
}
$this->create_mount_init = $mount;
}
}
}
$ldap = $this->config->get_ldap_link();
}
}
$ldap = $this->config->get_ldap_link();
- $ldap->cat($mountdn);
+ $ldap->cat($mountdn, array('dn'));
$attrs = $ldap->fetch();
if (count($attrs) > 0) {
$smarty->assign("mount_checked", "checked");
$attrs = $ldap->fetch();
if (count($attrs) > 0) {
$smarty->assign("mount_checked", "checked");
// 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.");
}
$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));
}