From 016b4a8c0167c58ad04c3eb545f9affad9e9f1cd Mon Sep 17 00:00:00 2001 From: hickert Date: Mon, 26 Jul 2010 15:47:11 +0000 Subject: [PATCH] Updated several service dialogs, fixed typos, string, html, post handling and more. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19134 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../repository/class_servRepositorySetup.inc | 364 +++++++++--------- 1 file changed, 182 insertions(+), 182 deletions(-) diff --git a/gosa-plugins/fai/admin/systems/services/repository/class_servRepositorySetup.inc b/gosa-plugins/fai/admin/systems/services/repository/class_servRepositorySetup.inc index efd239cd2..cb29c2b25 100644 --- a/gosa-plugins/fai/admin/systems/services/repository/class_servRepositorySetup.inc +++ b/gosa-plugins/fai/admin/systems/services/repository/class_servRepositorySetup.inc @@ -2,222 +2,222 @@ class servRepositorySetup extends plugin { - /* attribute list for save action */ - var $ignore_account = TRUE; - var $attributes = array("Release","ParentServer","Url"); - var $objectclasses = array("whatever"); - - /* Attributes */ - var $Release = ""; - var $ParentServer = ""; - var $Url = ""; - var $Sections = array(); - var $ParentServers = ""; - var $initialy_was = false; - var $cn = ""; - var $parent = ""; - - function servRepositorySetup (&$config, $dn= NULL,$data = false) - { - plugin::plugin ($config, $dn); - - if(isset($this->attrs['cn'][0])){ - $this->cn=$this->attrs['cn'][0]; - } + /* attribute list for save action */ + var $ignore_account = TRUE; + var $attributes = array("Release","ParentServer","Url"); + var $objectclasses = array("whatever"); + + /* Attributes */ + var $Release = ""; + var $ParentServer = ""; + var $Url = ""; + var $Sections = array(); + var $ParentServers = ""; + var $initialy_was = false; + var $cn = ""; + var $parent = ""; + + function servRepositorySetup (&$config, $dn= NULL,$data = false) + { + plugin::plugin ($config, $dn); + + if(isset($this->attrs['cn'][0])){ + $this->cn=$this->attrs['cn'][0]; + } - if($data != false){ - foreach(array("Sections","Release","Url","ParentServer","initialy_was") as $atr){ - if(isset($data[$atr])){ - $this->$atr = $data[$atr]; + if($data != false){ + foreach(array("Sections","Release","Url","ParentServer","initialy_was") as $atr){ + if(isset($data[$atr])){ + $this->$atr = $data[$atr]; + } + } } - } + + // Prepare lists + $this->sectionList = new sortableListing(); + $this->sectionList->setDeleteable(true); + $this->sectionList->setInstantDelete(true); + $this->sectionList->setEditable(false); + $this->sectionList->setWidth("100%"); + $this->sectionList->setHeight("100px"); + $this->sectionList->setHeader(array(_("Name"))); + $this->sectionList->setColspecs(array('*','20px')); + $this->sectionList->setDefaultSortColumn(0); + + } + + function GetName() + { + return($this->Release); } - // Prepare lists - $this->sectionList = new sortableListing(); - $this->sectionList->setDeleteable(true); - $this->sectionList->setInstantDelete(true); - $this->sectionList->setEditable(false); - $this->sectionList->setWidth("100%"); - $this->sectionList->setHeight("100px"); - $this->sectionList->setHeader(array(_("Name"))); - $this->sectionList->setColspecs(array('*','20px')); - $this->sectionList->setDefaultSortColumn(0); - - } - - function GetName() - { - return($this->Release); - } - - function is_new_name() - { - if(!$this->initialy_was){ - return(true); - }else{ - if($this->Release != $this->initialy_was){ - return(true); - } + function is_new_name() + { + if(!$this->initialy_was){ + return(true); + }else{ + if($this->Release != $this->initialy_was){ + return(true); + } + } + return(false); } - return(false); - } - function execute() - { - /* Call parent execute */ - plugin::execute(); + function execute() + { + /* Call parent execute */ + plugin::execute(); - /* Fill templating stuff */ - $smarty= get_smarty(); + /* Fill templating stuff */ + $smarty= get_smarty(); - if(preg_match("/w/",$this->parent->getacl("Section"))){ - if((isset($_POST['AddSection']))&&(isset($_POST['SectionName']))&&(!empty($_POST['SectionName']))){ + if(preg_match("/w/",$this->parent->getacl("Section"))){ + if((isset($_POST['AddSection']))&&(isset($_POST['SectionName']))&&(!empty($_POST['SectionName']))){ - /* Replace multiple spaces with a single, and cut of white spaces (trim)*/ - $val = preg_replace("/\ \ * /" , " ", trim($_POST['SectionName'])); + /* Replace multiple spaces with a single, and cut of white spaces (trim)*/ + $val = preg_replace("/\ \ * /" , " ", trim(get_post('SectionName'))); - /* check if there are more than one entry given ( "section1 section2 )*/ - if(preg_match("/ /",$val)){ + /* check if there are more than one entry given ( "section1 section2 )*/ + if(preg_match("/ /",$val)){ - /* Generate list of new section names */ - $vals = explode(" ",$val); + /* Generate list of new section names */ + $vals = explode(" ",$val); - /* Add new entries */ - foreach($vals as $entry){ - $entry = trim($entry); - if(!empty($entry)){ - $this->Sections[$entry]=$entry; + /* Add new entries */ + foreach($vals as $entry){ + $entry = trim($entry); + if(!empty($entry)){ + $this->Sections[$entry]=$entry; + } + } + }else{ + $this->Sections[$val]=$val; + } + } + + $this->sectionList->save_object(); + $action = $this->sectionList->getAction(); + if($action['action'] == 'delete'){ + $this->Sections = $this->sectionList->getMaintainedData(); } - } - }else{ - $this->Sections[$val]=$val; } - } - $this->sectionList->save_object(); - $action = $this->sectionList->getAction(); - if($action['action'] == 'delete'){ - $this->Sections = $this->sectionList->getMaintainedData(); - } - } + $this->sectionList->setAcl($this->parent->getacl('Section')); + $this->sectionList->setListData(set_post($this->Sections) ); + $this->sectionList->update(); - $this->sectionList->setAcl($this->parent->getacl('Section')); - $this->sectionList->setListData($this->Sections) ; - $this->sectionList->update(); - - $smarty->assign("Sections",$this->sectionList->render()); + $smarty->assign("Sections",$this->sectionList->render()); - /* Get && assign acls */ - $tmp = $this->parent->plInfo(); - foreach($tmp['plProvidedAcls'] as $name => $translated){ - $smarty->assign($name."ACL",$this->parent->getacl($name)); - } + /* Get && assign acls */ + $tmp = $this->parent->plInfo(); + foreach($tmp['plProvidedAcls'] as $name => $translated){ + $smarty->assign($name."ACL",$this->parent->getacl($name)); + } - /* Assign values */ - foreach($this->attributes as $attr){ - $smarty->assign($attr ,$this->$attr); + /* Assign values */ + foreach($this->attributes as $attr){ + $smarty->assign($attr, set_post($this->$attr)); + } + + $tmp = $this->getParentServers(); + $smarty->assign("ParentServers" , set_post($tmp)); + $smarty->assign("ParentServerKeys", set_post(array_flip($tmp))); + + return($smarty->fetch(get_template_path('servRepositorySetup.tpl', TRUE,dirname(__FILE__)))); } - - $tmp = $this->getParentServers(); - $smarty->assign("ParentServers" ,$tmp); - $smarty->assign("ParentServerKeys",array_flip($tmp)); - - return($smarty->fetch(get_template_path('servRepositorySetup.tpl', TRUE,dirname(__FILE__)))); - } - - /* Save data to object */ - function save_object() - { - if(isset($_POST['servRepositorySetup_Posted'])) { - - foreach($this->attributes as $attr){ - if(($this->parent->acl_is_writeable($attr)) && (isset($_POST[$attr]))){ - $this->$attr = $_POST[$attr]; + + /* Save data to object */ + function save_object() + { + if(isset($_POST['servRepositorySetup_Posted'])) { + + foreach($this->attributes as $attr){ + if(($this->parent->acl_is_writeable($attr)) && (isset($_POST[$attr]))){ + $this->$attr = get_post($attr); + } + } } - } } - } - /* Check supplied data */ - function check() - { - /* Call common method to give check the hook */ - $message= plugin::check(); + /* Check supplied data */ + function check() + { + /* Call common method to give check the hook */ + $message= plugin::check(); + + if(empty($this->Release)){ + $message[]= msgPool::required(_("Release")); + } - if(empty($this->Release)){ - $message[]= msgPool::required(_("Release")); + if(empty($this->Url)){ + $message[] = msgPool::required(_("URL")); + } + + return ($message); } - if(empty($this->Url)){ - $message[] = msgPool::required(_("URL")); + + /* Save to LDAP */ + function save() + { + $tmp = array(); + $tmp['ParentServer'] = $this->ParentServer; + $tmp['Url'] = $this->Url; + $tmp['Release'] = $this->Release; + $tmp['Sections'] = $this->Sections; + return($tmp); } - return ($message); - } - - - /* Save to LDAP */ - function save() - { - $tmp = array(); - $tmp['ParentServer'] = $this->ParentServer; - $tmp['Url'] = $this->Url; - $tmp['Release'] = $this->Release; - $tmp['Sections'] = $this->Sections; - return($tmp); - } - - function getParentServers() - { - $ret = array(); - $ldap = $this->config->get_ldap_link(); - $ldap->cd($this->config->current['BASE']); - $ldap->search("(objectClass=FAIrepositoryServer)",array("*")); - while($attr = $ldap->fetch()){ - if($attr['cn'][0] == $this->cn) continue; - $ret[$attr['cn'][0]]= $attr['cn'][0]; + function getParentServers() + { + $ret = array(); + $ldap = $this->config->get_ldap_link(); + $ldap->cd($this->config->current['BASE']); + $ldap->search("(objectClass=FAIrepositoryServer)",array("*")); + while($attr = $ldap->fetch()){ + if($attr['cn'][0] == $this->cn) continue; + $ret[$attr['cn'][0]]= $attr['cn'][0]; + } + + $ret = array_merge($ret,$this->GetHookElements()); + + $ret['none']= " "; + asort($ret); + return($ret); } - $ret = array_merge($ret,$this->GetHookElements()); - - $ret['none']= " "; - asort($ret); - return($ret); - } - - /* this funtions calls a defined hook - and parses all additional serverdata - */ - function GetHookElements() - { - $ret = array(); - $cmd = $this->config->get_cfg_value("servrepository", "repositoryBranchHook"); - if(!empty($cmd)){ - $res = shell_exec($cmd); - $res2 = trim($res); - if(!$res || empty($res2)){ - msg_dialog::display(_("Error"), msgPool::cmdexecfailed("repositoryBranchHook", $cmd, _("Repository service")), ERROR_DIALOG); - }else{ - $tmp = preg_split("/\n/",$res); - foreach($tmp as $hook){ - /* skip empty */ - if(empty($hook)) continue; - - if(preg_match("/;/",$hook)){ - $hookinfo = explode(";",$hook); - $ret[$hookinfo[0]] = $hookinfo[0]; - }else{ - $ret[$hook] = $hook; - } + /* this funtions calls a defined hook + and parses all additional serverdata + */ + function GetHookElements() + { + $ret = array(); + $cmd = $this->config->get_cfg_value("servrepository", "repositoryBranchHook"); + if(!empty($cmd)){ + $res = shell_exec($cmd); + $res2 = trim($res); + if(!$res || empty($res2)){ + msg_dialog::display(_("Error"), msgPool::cmdexecfailed("repositoryBranchHook", $cmd, _("Repository service")), ERROR_DIALOG); + }else{ + $tmp = preg_split("/\n/",$res); + foreach($tmp as $hook){ + /* skip empty */ + if(empty($hook)) continue; + + if(preg_match("/;/",$hook)){ + $hookinfo = explode(";",$hook); + $ret[$hookinfo[0]] = $hookinfo[0]; + }else{ + $ret[$hook] = $hook; + } + } + } } - } + return($ret); } - return($ret); - } } -- 2.30.2