![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/admin/systems/class_servService.inc b/plugins/admin/systems/class_servService.inc
index a2ab17c4e4fe50cddb8b8b60973a2f1111b975d5..2ee9fc90b1c99d0822027d216ca59339839ef690 100644 (file)
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 $goTimeSource = array();
+ var $goLdapBase = "";
+ var $goXdmcpIsEnabled = "";
+ var $goFontPath = "";
+ var $goNTPServer = "";
+ var $goShareServer = false;
+ var $goLdapServer = "";
+ var $goTerminalServer = "";
+ var $goSyslogServer = "";
+ var $goCupsServer = "";
+ 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",
+ var $possible_objectclasses= array( "goShareServer", "goNtpServer", "goServer", "goLdapServer",
"goTerminalServer", "goSyslogServer", "goCupsServer");
- var $objectclasses = array("top","goServer");
- var $additionaloc = array( "goNfsServer" => array("goExportEntry"),
+ var $objectclasses = array( "top","goServer");
+ var $additionaloc = array( "goShareServer" => array("goExportEntry"),
"goNtpServer" => array("goTimeSource"),
"goLdapServer" => array("goLdapBase"),
"goTerminalServer"=> array("goXdmcpIsEnabled", "goFontPath"),
}
/* 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++){
$this->$name= $tmp;
}
+ $tmp =array();
+ $tmp2=array();
+ if(isset($this->attrs['goExportEntry'])){
+ unset($this->attrs['goExportEntry']['count']);
+ if((isset($this->attrs['goExportEntry']))&&(isset($this->attrs['goExportEntry']))){
+ foreach($this->attrs['goExportEntry'] as $entry){
+ $tmp2= split("\|",$entry);
+ $tmp[$tmp2[0]]= $entry;
+ }
+ }
+ }
+ $this->goExportEntry = $tmp;
+
/* Always is account... */
$this->is_account= TRUE;
+
+ if(is_array($this->attrs['objectClass'])){
+ if(in_array("goShareServer",$this->attrs['objectClass'])){
+ $this->goShareServer = true;
+ }
+ }
+ }
+
+ function addToList($entry){
+ $key = key($entry);
+ $this->goExportEntry[$key]=$entry[$key];
+ }
+
+ function deleteFromList($id){
+ unset($this->goExportEntry[$id]);
}
$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['goExportEntry']))){
+ $this->deleteFromList($_POST['goExportEntry']);
}
- /* 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->o_subWindow = new servnfs($this->config, $this->dn);
+ $this->dialog = true;
+ }
+
+ if((isset($_POST['NewNfsEdit']))&&(isset($_POST['goExportEntry']))){
+ $entry = $this->goExportEntry[$_POST['goExportEntry']];
+ $this->o_subWindow = new servnfs($this->config, $this->dn,$entry);
+ $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) ;
+ unset($this->o_subWindow);
+ $this->dialog = false;
}
}
+
+ /* Cancel NFS setup */
+ if(isset($_POST['NFScancel'])){
+ 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'] != "") {
$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();
+ foreach($this->goExportEntry as $name=>$values){
+ $tmp = split("\|",$values);
+ $tellSmarty[$name] = $tmp[0]." ".$tmp[4];
}
+ $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){
}
}
+ 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");
$this->goXdmcpIsEnabled= "false";
}
+ /* Save xdmcp is enabled flag */
+ if (isset($_POST['goShareServer'])){
+ $this->goShareServer = true;
+ } else {
+ $this->goShareServer = false;
+ }
}
}
{
$message= array();
-
-
if((isset($_POST['goTerminalServer']))&&(empty($this->goFontPath))){
- $message[]=_("Termial server, must have fontpath specified.");
+ $message[]=_("Terminal server, must have fontpath specified.");
}
return ($message);
/* 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();
$tmp[]= $oc;
}
}
-
+
/* Merge our current objectclasses */
foreach($this->objectclasses as $oc){
if (!in_array_ics($oc, $tmp)){
/* Reassign cleaned value */
$this->attrs['objectClass']= $tmp;
+ /* Arrays */
+ foreach (array("goTimeSource", "goExportEntry") as $name){
+ $this->attrs[$name]= array();
+ foreach ($this->$name as $element){
+ $this->attrs[$name][]= $element;
+ }
+ }
+
/* Remove illegal attributes */
foreach ($this->additionaloc as $oc => $attrs){
if (!in_array($oc, $this->objectclasses)){
}
}
- /* 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);