X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_servService.inc;h=1233484180d1b477faa62b5abf16a864dea77bcf;hb=ccaa264984e691fb1371b7e93e22e4fd9a2a6ba9;hp=4bf89bf30ba32c2fe86ed097cea784045484dd91;hpb=387ef9fc128dd4599a2199bb31f334ea9743e255;p=gosa.git
diff --git a/plugins/admin/systems/class_servService.inc b/plugins/admin/systems/class_servService.inc
index 4bf89bf30..123348418 100644
--- a/plugins/admin/systems/class_servService.inc
+++ b/plugins/admin/systems/class_servService.inc
@@ -7,33 +7,50 @@ class servservice extends plugin
var $cli_description= "Some longer text\nfor help";
var $cli_parameters= array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
- var $goExportEntry = array();
- var $goTimeSource = array();
- var $goLdapBase= "";
- var $goXdmcpIsEnabled ="";
- var $goFontPath= "";
- var $goNTPServer="";
- var $goLdapServer="";
- var $goTerminalServer="";
- var $goSyslogServer="";
- var $goCupsServer="";
+ var $goExportEntry = array();
+ var $goExportEntryList= array();
+ var $goTimeSource = array();
+ var $goLdapBase = "";
+ var $goXdmcpIsEnabled = "";
+ var $goFontPath = "";
+ var $goNTPServer = "";
+ var $goShareServer = false;
+ var $goLdapServer = "";
+ var $goTerminalServer = "";
+ var $goSyslogServer = "";
+ var $goCupsServer = "";
+ var $goMailServer = "";
+ var $o_subWindow = NULL;
/* attribute list for save action */
var $ignore_account= TRUE;
- var $attributes = array("goLdapBase","goXdmcpIsEnabled","goFontPath");
- var $possible_objectclasses= array( "goNfsServer", "goNtpServer", "goServer", "goLdapServer",
- "goTerminalServer", "goSyslogServer", "goCupsServer");
- var $objectclasses = array("top","goServer");
- var $additionaloc = array( "goNfsServer" => array("goExportEntry"),
+ var $attributes = array("goLdapBase","goXdmcpIsEnabled","goFontPath","goExportEntry","goTimeSource");
+ var $possible_objectclasses= array( "goShareServer", "goNtpServer", "goServer", "GOhard", "goLdapServer",
+ "goTerminalServer", "goSyslogServer", "goCupsServer","goMailServer");
+ var $objectclasses = array( "top","goServer", "GOhard");
+ var $additionaloc = array( "goShareServer" => array("goExportEntry"),
"goNtpServer" => array("goTimeSource"),
"goLdapServer" => array("goLdapBase"),
"goTerminalServer"=> array("goXdmcpIsEnabled", "goFontPath"),
"goSyslogServer" => array(),
+ "goMailServer" => array(),
"goCupsServer" => array());
- function servservice ($config, $dn= NULL)
+ var $allow_mounts = false; //do we allow mount entries?
+ var $mounts_to_add = array();
+ var $mounts_to_remove = array();
+ var $oldone = NULL; //temp dave for old mount entry
+
+ function servservice ($config, $dn= NULL, $parent= NULL)
{
- plugin::plugin ($config, $dn);
+
+ plugin::plugin ($config, $dn, $parent);
+
+ $ldap = $this->config->get_ldap_link();
+ $avl_objectclasses = $ldap->get_objectclasses();
+ if (isset($avl_objectclasses["mount"])) {
+ $this->allow_mounts = true;
+ }
/* Assemble final object class list */
foreach ($this->additionaloc as $oc => $dummy){
@@ -43,7 +60,7 @@ class servservice extends plugin
}
/* Load arrays */
- foreach (array("goTimeSource", "goExportEntry") as $name){
+ foreach (array("goTimeSource") as $name){
$tmp= array();
if (isset($this->attrs[$name])){
for ($i= 0; $i<$this->attrs[$name]['count']; $i++){
@@ -53,32 +70,144 @@ class servservice extends plugin
$this->$name= $tmp;
}
+ $tmp =array();
+ $tmp2=array();
+ if(isset($this->attrs['goExportEntry'])){
+ if(isset($this->attrs['goExportEntry']['count'])){
+ for($i= 0; $i<$this->attrs['goExportEntry']['count']; $i++){
+ $entry= $this->attrs['goExportEntry'][$i];
+ $tmp[preg_replace('/\|.*$/', '', $entry)]= $entry;
+ }
+ }
+ }
+ $this->goExportEntryList = $tmp;
+
/* Always is account... */
$this->is_account= TRUE;
+
+ /* Check if goShareServer is defined */
+ if((isset($this->attrs['objectClass']))&&(is_array($this->attrs['objectClass']))){
+ if(in_array("goShareServer",$this->attrs['objectClass'])){
+ $this->goShareServer = true;
+ }
+ }
}
+ function addToList($entry){
+ $key = key($entry);
+ $this->goExportEntryList[$key]=$entry[$key];
+ }
+
+ function deleteFromList($id){
+ /* Check if the share is used by someone */
+ $ldap = $this->config->get_ldap_link();
+ $ldap->cd($this->config->current['BASE']);
+ $ldap->search("(|(gotoProfileServer=*|$id)(gotoShare=*|$id|*))", array("cn"));
+ $cnt= $ldap->count();
+ if ($cnt){
+ $msg= sprintf(_("The share can't be removed since it is still used by %d users:"), $cnt);
+ $msg.= "
";
+ while ($attrs= $ldap->fetch()){
+ $msg.= "- ".$attrs["cn"][0]."
";
+ }
+ $msg.= "
"._("Please correct the share-/profile settings of these users");
+ print_red($msg);
+
+ } else {
+ /* Finally remove it */
+ unset($this->goExportEntryList[$id]);
+ }
+ }
+
+ function addToMountList($entry) {
+ $key = key($entry);
+ $type = $this->get_share_type($entry[$key]);
+ if (($type == "netatalk") || ($type == "NFS")) {
+ $this->mounts_to_add[$entry[$key]] = $entry[$key];
+ unset($this->mounts_to_remove[$entry[$key]]);
+ }
+ }
+
+ function deleteFromMountList($entry) {
+ $type = $this->get_share_type($entry);
+ if (($type == "netatalk") || ($type == "NFS")) {
+ $this->mounts_to_remove[$entry] = $entry;
+ unset($this->mounts_to_add[$entry]);
+ }
+ }
function execute()
{
+ /* Call parent execute */
+ plugin::execute();
+
/* Fill templating stuff */
$smarty= get_smarty();
-
$smarty->assign("staticAddress", "");
- /* Here we add a new entry */
- if(isset($_POST['NewNfsAdd']) && $_POST['NewNfsExport'] != "") {
- $this->goExportEntry[$_POST['NewNfsExport']]= $_POST['NewNfsExport'];
- asort($this->goExportEntry);
+ if((isset($_POST['DelNfsEnt']))&&(isset($_POST['goExportEntryList']))){
+ if($this->allow_mounts){
+ foreach($_POST['goExportEntryList'] as $entry){
+ $this->deleteFromMountList($this->goExportEntryList[$entry]);
+ }
+ }
+ foreach($_POST['goExportEntryList'] as $entry){
+ $this->deleteFromList($entry);
+ }
}
- /* Deleting an Entry, is a bit more complicated than adding one*/
- if(isset($_POST['DelNfsEnt']) && isset($_POST['goExportEntry'])) {
- foreach ($_POST['goExportEntry'] as $entry){
- if (isset($this->goExportEntry[$entry])){
- unset($this->goExportEntry[$entry]);
+ if(isset($_POST['NewNfsAdd'])){
+ $this->oldone = NULL;
+ $this->o_subWindow = new servnfs($this->config,$this->acl, $this->allow_mounts, $this->dn);
+ $this->dialog = true;
+ }
+
+ if((isset($_POST['NewNfsEdit']))&&(isset($_POST['goExportEntryList']))){
+ $entry = $this->goExportEntryList[$_POST['goExportEntryList'][0]];
+ $add_mount=isset($this->mounts_to_add[$entry]);
+ $this->oldone=$entry;
+ $this->o_subWindow = new servnfs($this->config,$this->acl,$this->allow_mounts,$this->dn,$entry,$add_mount);
+ $this->dialog = true;
+ }
+
+ if(isset($this->o_subWindow)){
+ $this->o_subWindow->save_object(TRUE);
+ }
+
+ /* Save NFS setup */
+ if(isset($_POST['NFSsave'])){
+ if(count($this->o_subWindow->check())>0){
+ foreach($this->o_subWindow->check() as $msg) {
+ print_red($msg);
+ }
+ }else{
+ $this->o_subWindow->save_object();
+ $newone = $this->o_subWindow->save();
+ $this->addToList($newone);
+ if($this->allow_mounts){
+ if($this->oldone) {
+ $this->deleteFromMountList($this->oldone);
+ }
+ if ($this->o_subWindow->should_create_mount()) {
+ $this->addToMountList($newone);
+ }
}
+ unset($this->o_subWindow);
+ $this->dialog = false;
}
}
+
+ /* Cancel NFS setup */
+ if(isset($_POST['NFScancel'])){
+ $this->oldone = NULL;
+ unset($this->o_subWindow);
+ $this->dialog = false;
+ }
+
+ /* Execute NFS setup dialog*/
+ if(isset($this->o_subWindow)){
+ return $this->o_subWindow->execute();
+ }
/* Here we add a new entry */
if(isset($_POST['NewNTPAdd']) && $_POST['NewNTPExport'] != "") {
@@ -101,13 +230,21 @@ class servservice extends plugin
$smarty->assign("$attr"."ACL", chkacl($this->acl, $attr));
$smarty->assign($attr."State","");
}
-
- /* Arrays */
- foreach (array("goTimeSource", "goExportEntry") as $name){
- $smarty->assign("$name", $this->$name);
- $smarty->assign("$name"."ACL", chkacl($this->acl, $name));
- $smarty->assign($name."State","");
+
+ $tellSmarty=array();
+ ksort($this->goExportEntryList);
+ foreach($this->goExportEntryList as $name=>$values){
+ $tmp = split("\|",$values);
+ $tellSmarty[$name] = $tmp[0]." ".$tmp[4]." (".$tmp[2].")";
}
+ $smarty->assign("goExportEntry",array_keys($tellSmarty));
+ $smarty->assign("goExportEntryKeys",($tellSmarty));
+ $smarty->assign("goExportEntryACL", chkacl($this->acl, "goExportEntry"));
+
+ $smarty->assign("goTimeSource", $this->goTimeSource);
+ $smarty->assign("goTimeSourceACL", chkacl($this->acl, "goTimeSource"));
+ $smarty->assign("goTimeSourceState","");
+
/* Classes... */
foreach ($this->additionaloc as $oc => $dummy){
@@ -123,6 +260,14 @@ class servservice extends plugin
}
}
+ if(!$this->goShareServer){
+ $smarty->assign("goShareServerState", " disabled ");
+ $smarty->assign("goExportEntryACL", " disabled ");
+ }else{
+ $smarty->assign("goShareServerState", " ");
+ $smarty->assign("goExportEntryACL", " ");
+ }
+
/* Different handling for checkbox */
if($this->goXdmcpIsEnabled == "true"){
$smarty->assign("goXdmcpIsEnabled","checked");
@@ -143,11 +288,17 @@ class servservice extends plugin
/* Save data to object */
function save_object()
{
+ plugin::save_object();
if (isset($_POST['servicetab'])){
- plugin::save_object();
-
+ $tmp = $this->goTimeSource;
+
+ if(isset($_POST['goLdapBase'])){
+ $this->goLdapBase = $_POST['goLdapBase'];
+ }
+
/* Save checkbox state */
foreach ($this->additionaloc as $oc => $dummy){
+// if($oc == "goNtpServer") continue;
if (chkacl($this->acl, $oc) == ""){
if (isset($_POST[$oc]) && $_POST[$oc] == '1'){
$this->objectclasses[$oc]= $oc;
@@ -164,6 +315,14 @@ class servservice extends plugin
$this->goXdmcpIsEnabled= "false";
}
+ /* Save xdmcp is enabled flag */
+ if (isset($_POST['goShareServer'])){
+ $this->goShareServer = true;
+ } else {
+ $this->goShareServer = false;
+ }
+ $this->goTimeSource = array();
+ $this->goTimeSource = $tmp;
}
}
@@ -171,9 +330,8 @@ class servservice extends plugin
/* Check supplied data */
function check()
{
- $message= array();
-
-
+ /* Call common method to give check the hook */
+ $message= plugin::check();
if((isset($_POST['goTerminalServer']))&&(empty($this->goFontPath))){
$message[]=_("Terminal server, must have fontpath specified.");
@@ -186,13 +344,6 @@ class servservice extends plugin
/* Save to LDAP */
function save()
{
- /* Normalize lazy objectclass arrays */
- $objectclasses= array();
- foreach($this->objectclasses as $oc){
- $objectclasses[]= $oc;
- }
- $this->objectclasses= $objectclasses;
-
plugin::save();
$tmp= array();
@@ -203,7 +354,7 @@ class servservice extends plugin
$tmp[]= $oc;
}
}
-
+
/* Merge our current objectclasses */
foreach($this->objectclasses as $oc){
if (!in_array_ics($oc, $tmp)){
@@ -214,6 +365,19 @@ class servservice extends plugin
/* Reassign cleaned value */
$this->attrs['objectClass']= $tmp;
+ /* Arrays */
+ foreach (array("goTimeSource"=>"goTimeSource", "goExportEntryList"=>"goExportEntry") as $source => $destination){
+ $this->attrs[$destination]= array();
+ foreach ($this->$source as $element){
+ $this->attrs[$destination][]= $element;
+ }
+ }
+
+ /* Process netatalk mounts */
+ if($this->allow_mounts) {
+ $this->process_mounts();
+ }
+
/* Remove illegal attributes */
foreach ($this->additionaloc as $oc => $attrs){
if (!in_array($oc, $this->objectclasses)){
@@ -223,31 +387,120 @@ class servservice extends plugin
}
}
- /* Arrays */
- foreach (array("goTimeSource", "goExportEntry") as $name){
- $this->attrs[$name]= array();
- foreach ($this->$name as $element){
- $this->attrs[$name][]= $element;
- }
- }
-
/* Write to LDAP */
$ldap= $this->config->get_ldap_link();
$ldap->cd($this->dn);
- $ldap->modify($this->attrs);
- show_ldap_error($ldap->get_error());
+ $this->cleanup();
+ $ldap->modify ($this->attrs);
+
+ show_ldap_error($ldap->get_error(), _("Saving server service object failed"));
/* Optionally execute a command after we're done */
if ($this->initially_was_account == $this->is_account){
if ($this->is_modified){
- $this->handle_post_events("mofify");
+ $this->handle_post_events("modify");
}
} else {
$this->handle_post_events("add");
}
}
+
+ function process_mounts() {
+
+ $clip = "cn=" . $this->cn . ",ou=servers,ou=systems,";
+ $mountsdn = "cn=mounts," . substr($this->dn, strlen($clip));
+
+ $mounts = array(
+ "objectClass" => "container",
+ "cn" => "mounts"
+ );
+
+ # load data from mounts container
+ $ldap = $this->config->get_ldap_link();
+ $ldap->cat($mountsdn, array('dn'));
+ $attrs = $ldap->fetch();
+
+ # mounts container not present yet, so we create it
+ if (count($attrs) == 0) {
+ $ldap->cd($mountsdn);
+ $ldap->add($mounts);
+ show_ldap_error($ldap->get_error(), _("Creating mount container failed"));
+ gosa_log("Mount container '$mountsdn' has been created");
+ }
-}
+ # remove deleted mounts from the container
+ foreach ($this->mounts_to_remove as $entry) {
+ $mount=$this->returnMountEntry($entry);
+ $mountdn = "cn=".$mount["cn"].","."$mountsdn";
+
+ $ldap->cat($mountdn, array('dn'));
+ $attrs = $ldap->fetch();
+
+ if (count($attrs) != 0) {
+ $ldap->rmdir($mountdn);
+ show_ldap_error($ldap->get_error(), _("Removing mount container failed"));
+ gosa_log("Mount object '".$mountdn."' has been removed");
+ }
+ }
+
+ # add new mounts to the container
+ foreach ($this->mounts_to_add as $entry) {
+
+ $mount=$this->returnMountEntry($entry);
+ $mountdn = "cn=".$mount["cn"].","."$mountsdn";
+ $ldap->cd($mountdn);
+ $ldap->add($mount);
+ show_ldap_error($ldap->get_error(), _("Saving mount container failed"));
+ gosa_log("Mount object '".$mountdn."' has been added");
+ }
+ }
+
+ function get_share_type($share) {
+ $tmp = split("\|", $share);
+ return $tmp[2];
+ }
+
+
+ function returnMountEntry($entry) {
+ $item = split("\|", $entry);
+ $name = $item[0];
+ $description = $item[1];
+ $type = $item[2];
+ $charset = $item[3];
+ $path = $item[4];
+ $options = $item[5];
+
+ switch ($type) {
+ case "netatalk" : {
+ $mount = array(
+ "mountDirectory" => "/Network/Servers/",
+ "mountOption" => array(
+ "net",
+ "url==afp://;AUTH=NO%20USER%20AUTHENT@".$this->cn."/$name/"
+ ),
+ "mountType" => "url",
+ "objectClass" => "mount",
+ "cn" => $this->cn .":/".$name
+ );
+ break;
+ }
+ case "NFS" : {
+ $mount = array(
+ "mountDirectory" => "/Network/Servers/",
+ "mountOption" => "net",
+ "mountType" => "nfs",
+ "objectClass" => "mount",
+ "cn" => $this->cn .":".$path
+ );
+ break;
+ }
+ default : {
+ continue;
+ }
+ }
+ return $mount;
+ }
+}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
?>