![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-plugins/goto/admin/applications/class_applicationGeneric.inc b/gosa-plugins/goto/admin/applications/class_applicationGeneric.inc
index 97da83a3cb0b1a173b0226430340216ba9165f5c..bf11b1f7aba247fc43dd11fe70a9124912a42532 100644 (file)
var $last_sorting= "invalid";
var $applications= array();
+ var $orig_base = "";
+ var $orig_cn = "";
+ var $orig_dn = "";
+
/* attribute list for save action */
var $attributes= array("cn", "description", "gosaApplicationExecute", "gosaApplicationName","gosaApplicationIcon",
"gosaApplicationFlags","gotoLogonScript");
var $objectclasses= array("top", "gosaApplication");
+ var $FAIstate ="";
+
+ var $baseSelector;
function application (&$config, $dn= NULL, $parent= NULL)
{
/* Load icon */
$ldap= $config->get_ldap_link();
+ $this->orig_dn = $dn;
if ($dn != 'new'){
$this->iconData= $ldap->get_attribute($dn, "gosaApplicationIcon");
$this->saved_attributes['gosaApplicationIcon'] = $this->iconData;
$this->base= dn2base($ui->dn);
}
} else {
- $this->base= preg_replace ("/^[^,]+,".get_ou('applicationou')."/", "", $this->dn);
+ $this->base= preg_replace ("/^[^,]+,".preg_quote(get_ou('applicationRDN'), '/')."/i", "", $this->dn);
}
+
+ $this->orig_cn = $this->cn;
+ $this->orig_base = $this->base;
+ $this->gosaApplicationFlags = preg_replace("/[^GDLMO]/","",$this->gosaApplicationFlags);
+
+ /* Instanciate base selector */
+ $this->baseSelector= new baseSelector($this->get_allowed_bases(), $this->base);
+ $this->baseSelector->setSubmitButton(false);
+ $this->baseSelector->setHeight(300);
+ $this->baseSelector->update(true);
}
$smarty= get_smarty();
+ /* Assign base ACL */
+ $smarty->assign("base", $this->baseSelector->render());
+
$tmp = $this->plInfo();
foreach($tmp['plProvidedAcls'] as $name => $translation){
- $smarty->assign($name."ACL",$this->getacl($name));
+ $smarty->assign($name."ACL",$this->getacl($name, preg_match("/freeze/i",$this->FAIstate)));
}
+ $smarty->assign("IconReadable", $this->acl_is_readable("gosaApplicationIcon"));
/* Do we represent a valid group? */
if (!$this->is_account && $this->parent === NULL){
$head = $this->generateTemplate();
$this->gotoLogonScript= $this->generateTemplate().preg_replace('/.*### END HEADER ###/s', '', $this->gotoLogonScript);
- if((isset($_POST['upLoad']))&&(isset($_FILES['ScriptFile']))){
+ if((isset($_POST['upLoad']))&&(isset($_FILES['ScriptFile'])) && !preg_match("/freeze/i",$this->FAIstate)){
$str = file_get_contents($_FILES['ScriptFile']['tmp_name']);
$this->gotoLogonScript = $str;
}
$smarty->assign("selectmode", "disabled");
}
- /* Base select dialog */
- $once = true;
- foreach($_POST as $name => $value){
- if(preg_match("/^chooseBase/",$name) && $once){
- $once = false;
- $this->dialog = new baseSelectDialog($this->config,$this,$this->get_allowed_bases());
- $this->dialog->setCurrentBase($this->base);
- }
- }
-
- /* Dialog handling */
- if(is_object($this->dialog)){
- /* Must be called before save_object */
- $this->dialog->save_object();
-
- if($this->dialog->isClosed()){
- $this->dialog = false;
- }elseif($this->dialog->isSelected()){
-
- /* Just allow selection valid bases */
- $tmp = $this->get_allowed_bases();
- if(isset($tmp[$this->dialog->isSelected()])){
- $this->base = $this->dialog->isSelected();
- }
- $this->dialog= false;
- }else{
- return($this->dialog->execute());
- }
- }
-
/* Get random number for pictures */
srand((double)microtime()*1000000);
$smarty->assign("rand", rand(0, 10000));
}
/* Checkboxes */
- foreach (array("G" => "exec_for_groupmembers", "O" => "overwrite_config",
- "L" => "place_on_kicker",
- "D" => "place_on_desktop", "M" => "place_in_startmenu") as $key => $val){
- if (preg_match("/$key/", $this->gosaApplicationFlags)){
+ foreach (array("G" => "execForGroupmembers", "O" => "overwriteConfig",
+ "L" => "placeOnKicker",
+ "D" => "placeOnDesktop", "M" => "placeInStartmenu") as $key => $val){
+ if (preg_match("/$key/", $this->gosaApplicationFlags) && $this->acl_is_readable("$val")){
$smarty->assign("$val", "checked");
} else {
$smarty->assign("$val", "");
function remove_from_parent()
{
- restore_error_handler();
-
/* Parse release out of object dn */
- $release = preg_replace("/".get_ou("applicationou").normalizePreg($this->base)."$/","",$this->dn);
+ $release = preg_replace("/".preg_quote(get_ou("applicationRDN").$this->base, '/')."$/i","",$this->dn);
$release = preg_replace("/^cn=[^,]+,/","",$release);
/* Get a list of all groups
$ldap->cd($release.$group);
$ldap->search("(objectClass=gotoMenuEntry)",array("dn"));
while($attrs = $ldap->fetch()){
- $info = preg_replace("/".normalizePreg($release.$group)."$/","",$attrs['dn']);
+ $info = preg_replace("/".preg_quote($release.$group, '/')."$/","",$attrs['dn']);
if(preg_match("/^cn=".$this->cn."/",$info) && !preg_match("/ou=[^,]+,/",$info)){
$found[] = $attrs['dn'];
}
/* Save data to object */
function save_object()
{
+ if(preg_match("/freeze/i",$this->FAIstate)){
+ return;
+ }
+
if (isset($_POST['cn'])){
/* Create a base backup and reset the
plugin::save_object();
$this->base = $base_tmp;
+ /* Refresh base */
+ if(!$this->is_release()){
+ if ($this->acl_is_moveable($this->base)){
+ if (!$this->baseSelector->update()) {
+ msg_dialog::display(_("Error"), msgPool::permMove(), ERROR_DIALOG);
+ }
+ if ($this->base != $this->baseSelector->getBase()) {
+ $this->base= $this->baseSelector->getBase();
+ $this->is_modified= TRUE;
+ }
+ }
+ }
+
+
/* Save attributes */
parent::save_object();
+ $checks = array("execForGroupmembers" => "G",
+ "placeOnDesktop" => "D",
+ "placeOnKicker" => "L",
+ "placeInStartmenu" => "M",
+ "overwriteConfig" => "O");
+
+
/* Save application flags */
- $flag= "";
- if (isset($_POST['exec_for_groupmembers']) && $_POST['exec_for_groupmembers'] == 1){
- $flag.= "G";
- }
- if (isset($_POST['place_on_desktop']) && $_POST['place_on_desktop'] == 1){
- $flag.= "D";
- }
- if (isset($_POST['place_on_kicker']) && $_POST['place_on_kicker'] == 1){
- $flag.= "L";
- }
- if (isset($_POST['place_in_startmenu']) && $_POST['place_in_startmenu'] == 1){
- $flag.= "M";
- }
- if (isset($_POST['overwrite_config']) && $_POST['overwrite_config'] == 1){
- $flag.= "O";
- }
- if ($this->acl_is_writeable("gosaApplicationFlags")){
- $this->gosaApplicationFlags= "[$flag]";
+ foreach($checks as $name => $flag){
+ if($this->acl_is_writeable($name)){
+ $set = isset($_POST[$name]) && $_POST[$name] == 1;
+ if(!$set && strstr($this->gosaApplicationFlags,$flag)){
+ $this->gosaApplicationFlags = str_replace($flag,"",$this->gosaApplicationFlags);
+ }elseif($set && !preg_match("/".$flag."/",$this->gosaApplicationFlags)){
+ $this->gosaApplicationFlags .= $flag;
+ }
+ }
}
/* Remove current picture */
/* Activate new picture */
$this->set_picture($_FILES['picture_file']['tmp_name']);
}
-
- if(!$this->is_release()){
- $tmp = $this->get_allowed_bases();
- if(isset($_POST['base'])){
- if(isset($tmp[$_POST['base']])){
- $this->base= $_POST['base'];
- }
- }
- }
}
}
$message[]=msgPool::invalid(_("Execute path"),"","","/some/path");
}
+ // Check if a wrong base was supplied
+ if(!$this->baseSelector->checkLastBaseUpdate()){
+ $message[]= msgPool::check_base();;
+ }
+
/* Permissions for that base? */
if ($this->base != ""){
- $new_dn= "cn=".$this->cn.",".get_ou('applicationou').$this->base;
+ $new_dn= "cn=".$this->cn.",".get_ou('applicationRDN').$this->base;
} else {
$new_dn= $this->dn;
}
$message[]= msgPool::required(_("Name"));
}
- if(preg_match("/[^a-z0-9]/",$this->cn)) {
- $message[]=msgPool::invalid(_("Name"),$this->cn,"/^[a-z0-9]*$/");
+ if(preg_match("/[^a-z0-9_-]/",$this->cn)) {
+ $message[]=msgPool::invalid(_("Name"),$this->cn,"/^[a-z0-9_-]*$/");
}
if ($this->gosaApplicationExecute == ""){
/* Check for existing application */
$ldap= $this->config->get_ldap_link();
$ldap->cd($this->config->current["BASE"]);
-
- $tmp = $this->config->search("faiManagement", "CLASS",array('menu','tabs'));
-
if($this->is_release()){
$base = $this->parent->parent->app_release;
}else{
- $base = get_ou('applicationou').$this->base;
+ $base = get_ou('applicationRDN').$this->base;
}
$ldap->ls("(&(objectClass=gosaApplication)(cn=".$this->cn."))",$base,array("cn"));
$message[]= msgPool::duplicated("cn");
}
}
+
+ /* Check if we are allowed to create or move this object
+ */
+ if($this->orig_dn == "new" && !$this->acl_is_createable($this->base)){
+ $message[] = msgPool::permCreate();
+ }elseif($this->orig_dn != "new" && $this->base != $this->orig_base && !$this->acl_is_moveable($this->base)){
+ $message[] = msgPool::permMove();
+ }
+
return $message;
}
/* Get application script without header part, to check if we must save the script itself */
$script = preg_replace('/.*### END HEADER ###/s', '', $this->gotoLogonScript);
+ $this->gosaApplicationFlags ="[{$this->gosaApplicationFlags}]";
plugin::save();
$this->attrs["gosaApplicationIcon"]= $this->gosaApplicationIcon;
if(isset($this->parent->parent)){
return($this->parent->parent->IsReleaseManagementActivated());
}else{
+
/* Check if we should enable the release selection */
- $tmp = $this->config->search("faiManagement", "CLASS",array('menu','tabs'));
- if(!empty($tmp)){
- return(true);
- }
+ return($this->config->pluginEnabled("faiManagement"));
}
return(FALSE);
}
function set_picture($filename)
{
if (!is_file($filename)){
- $filename= "./images/default_icon.png";
+ $filename= "./plugins/goto/images/default_icon.png";
$this->gosaApplicationIcon= "*removed*";
}
{
$vars = array("cn");
- $str ="<h2>"._("Application settings")."</h2>
- <table>
+ $str ="<h3>"._("Application settings")."</h3>
+ <table summary=\""._("Application settings")."\">
<tr>
<td>".
_("Application name").
#FIXME FAIscript seams to ununsed within this class... */
static function plInfo()
{
- return (array(
- "plShortName" => _("Generic"),
- "plDescription" => _("Application generic"),
- "plSelfModify" => FALSE,
- "plDepends" => array(),
- "plPriority" => 0,
- "plSection" => array("administration"),
- "plCategory" => array("application" => array("description" => _("Application"),
- "objectClass" => "gosaApplication")),
+ return (array(
+ "plShortName" => _("Generic"),
+ "plDescription" => _("Application generic"),
+ "plSelfModify" => FALSE,
+ "plDepends" => array(),
+ "plPriority" => 0,
+ "plSection" => array("administration"),
+ "plCategory" => array("application" => array("description" => _("Application"),
+ "objectClass" => "gosaApplication")),
+ "plProperties" =>
+ array(
+ array(
+ "name" => "applicationRDN",
+ "type" => "rdn",
+ "default" => "ou=apps,",
+ "description" => "The 'applicationRDN' statement defines the location where new applications will be created. The default is 'ou=apps,'.",
+ "check" => "gosaProperty::isRdn",
+ "migrate" => "",
+ "group" => "plugin",
+ "mandatory" => FALSE)),
+
"plProvidedAcls"=> array(
- "cn" => _("Name"),
- "base" => _("Base"),
- "description" => _("Description"),
- "gosaApplicationExecute" => _("Execute"),
- "gosaApplicationName" => _("Name"),
- "gosaApplicationIcon" => _("Icon"),
- "gosaApplicationFlags" => _("Flag"),
- "gotoLogonScript" => _("Script content"),
-
- "exec_for_groupmembers" => _("Only executable for members"), // G
- "place_on_desktop" => _("Place icon on members desktop"), // D
- "place_on_kicker" => _("Place entry in members launch bar"), // L
- "place_in_startmenu" => _("Place entry in members startmenu"), // M
- "overwrite_config" => _("Replace user configuration on startup")) // O
- ));
+ "cn" => _("Name"),
+ "base" => _("Base"),
+ "description" => _("Description"),
+ "gosaApplicationExecute" => _("Execute"),
+ "gosaApplicationName" => _("Name"),
+ "gosaApplicationIcon" => _("Icon"),
+ "gotoLogonScript" => _("Script content"),
+
+ "execForGroupmembers" => _("Only executable for members"), // G
+ "placeOnDesktop" => _("Place icon on members desktop"), // D
+ "placeOnKicker" => _("Place entry in members launch bar"), // L
+ "placeInStartmenu" => _("Place entry in members startmenu"), // M
+ "overwriteConfig" => _("Replace user configuration on startup")) // O
+ ));
}
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: