![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3cab42f)
raw | patch | inline | side by side (parent: 3cab42f)
| author | cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Thu, 11 Dec 2008 16:04:57 +0000 (16:04 +0000) | ||
| committer | cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Thu, 11 Dec 2008 16:04:57 +0000 (16:04 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@13262 594d385d-05f5-0310-b6e9-bd551577e9d8
diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc
index 8c75dd229719c039815539586f36a6104562a278..d540270e04a4bcf7b0363f8582bce5fff89ffddf 100644 (file)
var $departments= array();
- var $DivHeight = "";
+ var $DivHeight = "";
- var $HideFilterPart = false;
- var $List_Bottom_Info = "";
- var $SaveAdditionalVars = array(); // Additional Post vars to store
- var $module= "";
+ var $HideFilterPart = false;
+ var $List_Bottom_Info = "";
+ var $SaveAdditionalVars = array(); // Additional Post vars to store
+ var $module= "";
- var $base_selection_regex = "*";
+ var $base_selection_regex = "*";
- var $IgnoreAccount = TRUE;
- var $footer = "";
- var $post_id = "1 2 3";
+ var $IgnoreAccount = TRUE;
+ var $footer = "";
+ var $post_id = "1 2 3";
function ClearElementsList()
{
- $ui =get_userinfo();
- $deps = $ui->get_module_departments($this->module);
- if(!in_array($this->selectedBase, $deps)){
- $this->selectedBase = array_shift($deps);
- }
+ $ui =get_userinfo();
+ $deps = $ui->get_module_departments($this->module);
+ if(!in_array($this->selectedBase, $deps)){
+ $this->selectedBase = array_shift($deps);
+ }
$this->array_Elements = array();
}
- function HideFilterPart($bool = true)
- {
- $this->HideFilterPart = $bool;
- }
+ function HideFilterPart($bool = true)
+ {
+ $this->HideFilterPart = $bool;
+ }
- function SetHeight($height)
- {
- $this->DivHeight=$height;
- }
+ function SetHeight($height)
+ {
+ $this->DivHeight=$height;
+ }
/* Adds a regex input field to the current dialog */
function AddRegex($name,$string,$value,$conn,$image="images/lists/search.png")
/* Check if the given input field name was already used
for this type of dialog */
- $MultiDialogFilters = session::get('MultiDialogFilters');
+ $MultiDialogFilters = session::get('MultiDialogFilters');
if(isset($MultiDialogFilters[$this->filterName][$name])){
$arr['value'] = $MultiDialogFilters[$this->filterName][$name];
$this->$name = $arr['value'];
}
- function SetDropDownHeaderMenu($str)
- {
- $this->string_ListDropDown = $str;
- }
-
- function GetDropDownHeaderMenu()
- {
- if(!empty($this->string_ListDropDown)){
- $mid = new LayersMenu(6, 7, 2, 1);
- $mid->setImgwww("./images/layer_menu/");
- $mid->setIcondir("./images/layer_menu/");
- $mid->setDirroot("../include/utils/layer-menu/");
- $mid->setHorizontalMenuTpl("../ihtml/".get_template_path("",FALSE).'GOsa_MultiSelectHeader.ihtml');
- $mid->setSubMenuTpl("../ihtml/".get_template_path("",FALSE).'GOsa_MultiSelectHeaderSubEntry.ihtml');
- $mid->setMenuStructureString($this->string_ListDropDown);
- $mid->parseStructureForMenu('menu');
- $mid->newHorizontalMenu('menu');
- $s = $mid->getHeader();
- $s.= $mid->getMenu('menu');
- $s.= $mid->getFooter('menu');
- return($s);
- }else{
- return("");
- }
- }
+ function SetDropDownHeaderMenu($str)
+ {
+ $this->string_ListDropDown = $str;
+ }
+
+ function GetDropDownHeaderMenu()
+ {
+ if(!empty($this->string_ListDropDown)){
+ $mid = new LayersMenu(6, 7, 2, 1);
+ $mid->setImgwww("./images/layer_menu/");
+ $mid->setIcondir("./images/layer_menu/");
+ $mid->setDirroot("../include/utils/layer-menu/");
+ $mid->setHorizontalMenuTpl("../ihtml/".get_template_path("",FALSE).'GOsa_MultiSelectHeader.ihtml');
+ $mid->setSubMenuTpl("../ihtml/".get_template_path("",FALSE).'GOsa_MultiSelectHeaderSubEntry.ihtml');
+ $mid->setMenuStructureString($this->string_ListDropDown);
+ $mid->parseStructureForMenu('menu');
+ $mid->newHorizontalMenu('menu');
+ $s = $mid->getHeader();
+ $s.= $mid->getMenu('menu');
+ $s.= $mid->getFooter('menu');
+ return($s);
+ }else{
+ return("");
+ }
+ }
/* Contrucktion */
$this->SaveButtonString = _("Save");
$this->CloseButtonString = _("Close");
$this->filterName = $filterName;
- $this->ui = get_userinfo();
- $this->post_id = preg_replace("/[^0-9]/","",microtime(TRUE));
+ $this->ui = get_userinfo();
+ $this->post_id = preg_replace("/[^0-9]/","",microtime(TRUE));
+
+ /* Check default values for SaveAdditionalVars */
+ $MultiDialogFilters = session::get('MultiDialogFilters');
+ foreach($this->SaveAdditionalVars as $name){
+ if(isset($MultiDialogFilters[$this->filterName][$name])){
+ $this->$name = $MultiDialogFilters[$this->filterName][$name];
+ }
+ }
- /* Check default values for SaveAdditionalVars */
- $MultiDialogFilters = session::get('MultiDialogFilters');
- foreach($this->SaveAdditionalVars as $name){
- if(isset($MultiDialogFilters[$this->filterName][$name])){
- $this->$name = $MultiDialogFilters[$this->filterName][$name];
- }
- }
-
}
/* Enables the headpage mode, which changes the list look */
}
- /* Return default header part. With back, home and root icons and department selection */
- function get_default_header($seperator= TRUE)
- {
- $enable_back = TRUE;
- $enable_root = TRUE;
- $enable_home = TRUE;
-
- $ui = get_userinfo();
-
- /* Check if selectedBase = first available base */
- $deps = $ui->get_module_departments($this->module);
-
- if(!count($deps) || $deps[0] == $this->selectedBase){
- $enable_back = FALSE;
- $enable_root = FALSE;
- }
-
- $listhead ="";
-
- /* Check if we are in users home department */
- if(!count($deps) ||$this->selectedBase == get_base_from_people($ui->dn)){
- $enable_home = FALSE;
- }
-
- /* Draw root button */
- if($enable_root){
- $listhead .= " <input class='center' type='image' src='images/lists/root.png' align='middle'
- title='"._("Go to root department")."' name='dep_root' alt='"._("Root")."'> ";
- }else{
- $listhead .= " <img src='images/lists/root_grey.png' class='center' alt='"._("Root")."'> ";
- }
-
- /* Draw back button */
- if($enable_back){
- $listhead .= " <input class='center' type='image' align='middle' src='images/lists/back.png'
- title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'> ";
- }else{
- $listhead .= " <img src='images/lists/back_grey.png' class='center' alt='"._("Up")."'> ";
- }
-
- /* Draw home button */
- if($enable_home){
- $listhead .= " <input class='center' type='image' align='middle' src='images/lists/home.png'
- title='"._("Go to users department")."' alt='"._("Home")."' name='dep_home'> ";
- }else{
- $listhead .= " <img src='images/lists/home_grey.png' class='center' alt='"._("Home")."'> ";
- }
-
- /* And at least draw reload button, this button is enabled everytime */
- $listhead .= " <input class='center' type='image' src='images/lists/reload.png' align='middle'
- title='"._("Reload list")."' name='submit_department' alt='"._("Submit")."'> ";
- if ($seperator){
- $listhead.= " <img class='center' src='images/lists/seperator.png' align='middle' alt='-' height='16' width='1'> ";
- }
- return ($listhead);
- }
+ /* Return default header part. With back, home and root icons and department selection */
+ function get_default_header($seperator= TRUE)
+ {
+ $enable_back = TRUE;
+ $enable_root = TRUE;
+ $enable_home = TRUE;
+
+ $ui = get_userinfo();
+
+ /* Check if selectedBase = first available base */
+ $deps = $ui->get_module_departments($this->module);
+
+ if(!count($deps) || $deps[0] == $this->selectedBase){
+ $enable_back = FALSE;
+ $enable_root = FALSE;
+ }
+
+ $listhead ="";
+
+ /* Check if we are in users home department */
+ if(!count($deps) ||$this->selectedBase == get_base_from_people($ui->dn)){
+ $enable_home = FALSE;
+ }
+
+ /* Draw root button */
+ if($enable_root){
+ $listhead .= " <input class='center' type='image' src='images/lists/root.png' align='middle'
+ title='"._("Go to root department")."' name='dep_root' alt='"._("Root")."'> ";
+ }else{
+ $listhead .= " <img src='images/lists/root_grey.png' class='center' alt='"._("Root")."'> ";
+ }
+
+ /* Draw back button */
+ if($enable_back){
+ $listhead .= " <input class='center' type='image' align='middle' src='images/lists/back.png'
+ title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'> ";
+ }else{
+ $listhead .= " <img src='images/lists/back_grey.png' class='center' alt='"._("Up")."'> ";
+ }
+
+ /* Draw home button */
+ if($enable_home){
+ $listhead .= " <input class='center' type='image' align='middle' src='images/lists/home.png'
+ title='"._("Go to users department")."' alt='"._("Home")."' name='dep_home'> ";
+ }else{
+ $listhead .= " <img src='images/lists/home_grey.png' class='center' alt='"._("Home")."'> ";
+ }
+
+ /* And at least draw reload button, this button is enabled everytime */
+ $listhead .= " <input class='center' type='image' src='images/lists/reload.png' align='middle'
+ title='"._("Reload list")."' name='submit_department' alt='"._("Submit")."'> ";
+ if ($seperator){
+ $listhead.= " <img class='center' src='images/lists/seperator.png' align='middle' alt='-' height='16' width='1'> ";
+ }
+ return ($listhead);
+ }
/* Add a checkbox to the filter element,
the name specifies an existing class var to store the 'selection' */
}else{
/* Check if there was already a variable
for this dialog which we should use instead of the default*/
- $MultiDialogFilters = session::get('MultiDialogFilters');
+ $MultiDialogFilters = session::get('MultiDialogFilters');
if(isset($MultiDialogFilters[$this->filterName][$name])){
$arr['default'] = $MultiDialogFilters[$this->filterName][$name];
$this->$name = $arr['default'];
}else{
$arr['default'] = $default;
- $this->$name = $default;
+ $this->$name = $default;
}
$arr['name'] = $name;
$arr['string'] = $string;
return($this->is_closed);
}
-
- function SetListFooter($str){
- $this->footer = $str;
- }
+
+ function SetListFooter($str){
+ $this->footer = $str;
+ }
/* Enable the close button */
$this->bool_DisplaySaveButton = $bool;
}
- /* Add a list specific filter object to position
- 1 on top of Information
- 2 Between Information && Filter
- 3 Below the Filter Part */
- function AddUserBoxToFilter($position)
- {
- return("");
- }
+ /* Add a list specific filter object to position
+ 1 on top of Information
+ 2 Between Information && Filter
+ 3 Below the Filter Part */
+ function AddUserBoxToFilter($position)
+ {
+ return("");
+ }
- function EnableJSLeaveMsg($ignore = TRUE)
- {
- $this->IgnoreAccount = !$ignore;
- }
+ function EnableJSLeaveMsg($ignore = TRUE)
+ {
+ $this->IgnoreAccount = !$ignore;
+ }
/* Draw the list with all list elements and filters */
function Draw()
$divlist->SetSummary($this->string_Summary);
$divlist->SetEntriesPerPage(0); // 0 for scrollable list
- /* Display list footer with summary of all listed entries */
- if ($this->config->get_cfg_value("listSummary") == "true"){
- $divlist->SetFooter($this->get_List_Bottom_Info());
- }
-
- if($this->DivHeight != ""){
- $divlist->SetHeight($this->DivHeight);
- }
+ /* Display list footer with summary of all listed entries */
+ if ($this->config->get_cfg_value("listSummary") == "true"){
+ $divlist->SetFooter($this->get_List_Bottom_Info());
+ }
+
+ if($this->DivHeight != ""){
+ $divlist->SetHeight($this->DivHeight);
+ }
/* set Header informations
*/
}
$smarty->assign("regexes" , $regexes );
- /* Hide Filter Part if Requested or empty */
- if((empty($boxes)) && (empty($regexes)) || ($this->HideFilterPart)){
- $smarty->assign("Skip_Filter_Part", true);
- }else{
- $smarty->assign("Skip_Filter_Part", false);
- }
+ /* Hide Filter Part if Requested or empty */
+ if((empty($boxes)) && (empty($regexes)) || ($this->HideFilterPart)){
+ $smarty->assign("Skip_Filter_Part", true);
+ }else{
+ $smarty->assign("Skip_Filter_Part", false);
+ }
/* Assign alphabet and display it
*/
$smarty->assign("Title" , $this->string_Title);
$smarty->assign("Information" , $this->string_Information);
$smarty->assign("IgnoreAccount" , $this->IgnoreAccount);
- $smarty->assign("POST_ID", $this->post_id);
+ $smarty->assign("POST_ID", $this->post_id);
/* Check for exeeded sizelimit */
$smarty->assign("hint" , print_sizelimit_warning());
function save_object()
{
- /* Ensure that we do not handle posts for other dialogs
- */
- if((isset($_POST['POST_ID']) && $_POST['POST_ID'] != $this->post_id) ||
- (isset($_GET['post_id']) && $_GET['post_id'] != $this->post_id)){
- return;
- }
-
- /* Get up to date config */
- if(isset($this->parent->config)){
- $this->config = $this->parent->config;
- }
-
- /* Update current base */
- $s_action ="";
- foreach($_POST as $key => $value){
- if(preg_match("/^dep_back.*/i",$key)){
- $s_action="back";
- }elseif(preg_match("/^dep_root.*/",$key)){
- $s_action="root";
- }elseif(preg_match("/^dep_home.*/i",$key)){
- $s_action="home";
- }
- }
-
- /* Save base selection from headpage selectbox*/
- if(isset($_POST['CurrentMainBase'])){
- $this->selectedBase = $_POST['CurrentMainBase'];
- }
-
- /* Homebutton is posted */
- if($s_action=="home"){
- $ui= get_userinfo();
- $base = get_base_from_people($ui->dn);
- $this->selectedBase= $base;
- }
-
- /* Open selected department
- this is posted by the parent class MultiSelectWindow */
- if(isset($_GET['act'])&& ($_GET['act'] == "dep_open")){
- $s_entry = $_GET['dep_id'];
- if (!isset($this->departments[$s_entry])){
-
- msg_dialog::display(_("LDAP error"), sprintf(_("Inconsistent DN encoding detected: '%s'"), LDAP::fix($s_entry)), ERROR_DIALOG);
- } else {
- $this->selectedBase = $this->departments[$s_entry]['dn'];
- }
- }
-
- /* back to the roots ^^ */
- if($s_action=="root"){
- $this->selectedBase=($this->config->current['BASE']);
- $dep_id = $this->ui->get_module_departments($this->module);
- if(isset($dep_id[key($dep_id)])){
- $this->selectedBase = $dep_id[key($dep_id)];
- }
- }
-
- /* If Back-button is pressed, move back one step in DN */
- if($s_action=="back"){
-
-
- /* Get parent deprtment and check if we are allowed to step in it */
- $base_back= preg_replace("/^[^,]+,/", "", $this->selectedBase);
- $dep_id = $this->ui->get_module_departments($this->module);
- if(in_array_ics($base_back,$dep_id)){
- if(in_array($base_back,$this->config->departments)){
- $this->selectedBase = $base_back;
- }
- }
- }
+ /* Ensure that we do not handle posts for other dialogs
+ */
+ if((isset($_POST['POST_ID']) && $_POST['POST_ID'] != $this->post_id) ||
+ (isset($_GET['post_id']) && $_GET['post_id'] != $this->post_id)){
+ return;
+ }
+
+ /* Get up to date config */
+ if(isset($this->parent->config)){
+ $this->config = $this->parent->config;
+ }
+
+ /* Update current base */
+ $s_action ="";
+ foreach($_POST as $key => $value){
+ if(preg_match("/^dep_back.*/i",$key)){
+ $s_action="back";
+ }elseif(preg_match("/^dep_root.*/",$key)){
+ $s_action="root";
+ }elseif(preg_match("/^dep_home.*/i",$key)){
+ $s_action="home";
+ }
+ }
+
+ /* Save base selection from headpage selectbox*/
+ if(isset($_POST['CurrentMainBase'])){
+ $this->selectedBase = $_POST['CurrentMainBase'];
+ }
+
+ /* Homebutton is posted */
+ if($s_action=="home"){
+ $ui= get_userinfo();
+ $base = get_base_from_people($ui->dn);
+ $this->selectedBase= $base;
+ }
+
+ /* Open selected department
+ this is posted by the parent class MultiSelectWindow */
+ if(isset($_GET['act'])&& ($_GET['act'] == "dep_open")){
+ $s_entry = $_GET['dep_id'];
+ if (!isset($this->departments[$s_entry])){
+
+ msg_dialog::display(_("LDAP error"), sprintf(_("Inconsistent DN encoding detected: '%s'"), LDAP::fix($s_entry)), ERROR_DIALOG);
+ } else {
+ $this->selectedBase = $this->departments[$s_entry]['dn'];
+ }
+ }
+
+ /* back to the roots ^^ */
+ if($s_action=="root"){
+ $this->selectedBase=($this->config->current['BASE']);
+ $dep_id = $this->ui->get_module_departments($this->module);
+ if(isset($dep_id[key($dep_id)])){
+ $this->selectedBase = $dep_id[key($dep_id)];
+ }
+ }
+
+ /* If Back-button is pressed, move back one step in DN */
+ if($s_action=="back"){
+
+
+ /* Get parent deprtment and check if we are allowed to step in it */
+ $base_back= preg_replace("/^[^,]+,/", "", $this->selectedBase);
+ $dep_id = $this->ui->get_module_departments($this->module);
+ if(in_array_ics($base_back,$dep_id)){
+ if(in_array($base_back,$this->config->departments)){
+ $this->selectedBase = $base_back;
+ }
+ }
+ }
if(isset($_POST['MultiSelectWindow'.$this->filterName])){
- /* Save some additional vars */
- $MultiDialogFilters = session::get('MultiDialogFilters');
- foreach($this->SaveAdditionalVars as $name){
- if(isset($_POST[$name])){
- if(isset($this->$name)){
- $this->$name = $_POST[$name];
- $MultiDialogFilters[$this->filterName][$name] = $_POST[$name];
- }
- }
- }
- session::set('MultiDialogFilters',$MultiDialogFilters);
+ /* Save some additional vars */
+ $MultiDialogFilters = session::get('MultiDialogFilters');
+ foreach($this->SaveAdditionalVars as $name){
+ if(isset($_POST[$name])){
+ if(isset($this->$name)){
+ $this->$name = $_POST[$name];
+ $MultiDialogFilters[$this->filterName][$name] = $_POST[$name];
+ }
+ }
+ }
+ session::set('MultiDialogFilters',$MultiDialogFilters);
/* Check posts from checkboxes
*/
}
/* Save settings in out session */
- $MultiDialogFilters = session::get('MultiDialogFilters');
+ $MultiDialogFilters = session::get('MultiDialogFilters');
$MultiDialogFilters[$this->filterName][$box['name']] = $this->$box['name'];
- session::set('MultiDialogFilters',$MultiDialogFilters);
+ session::set('MultiDialogFilters',$MultiDialogFilters);
}
/* Check regex posts */
foreach($this->array_Regexes as $key => $box){
$this->array_Regexes[$key]['value'] = $_POST[$box['name']];
$this->$box['name'] = $_POST[$box['name']];
- $MultiDialogFilters = session::get('MultiDialogFilters');
+ $MultiDialogFilters = session::get('MultiDialogFilters');
$MultiDialogFilters[$this->filterName][$box['name']] = $this->$box['name'];
- session::set('MultiDialogFilters',$MultiDialogFilters);
+ session::set('MultiDialogFilters',$MultiDialogFilters);
}
/* call close/save if buttons are pressed */
$val = preg_replace("/\*\**/","*",$val);
$this->array_Regexes[$key]['value'] = $val;
$this->$box['name'] = $val;
- $MultiDialogFilters = session::get('MultiDialogFilters');
- $MultiDialogFilters[$this->filterName][$box['name']] = $val;
- session::set('MultiDialogFilters',$MultiDialogFilters);
+ $MultiDialogFilters = session::get('MultiDialogFilters');
+ $MultiDialogFilters[$this->filterName][$box['name']] = $val;
+ session::set('MultiDialogFilters',$MultiDialogFilters);
}
}
}
- /* Save currenlty selected base in session */
- session::global_set("CurrentMainBase",$this->selectedBase);
+ /* Save currenlty selected base in session */
+ session::global_set("CurrentMainBase",$this->selectedBase);
}
function AddDepartments($base = false,$numtabs = 3,$empty_tabs_in_front = 0)
{
$this->DepartmentsAdded = true;
- $this->Added_Departments = array();
- $this->departments = array();
+ $this->Added_Departments = array();
+ $this->departments = array();
- if(isset($this->Regex)){
- $this->base_selection_regex = $this->Regex;
- }
+ if(isset($this->Regex)){
+ $this->base_selection_regex = $this->Regex;
+ }
$linkopen = "<a href='?plug=".$_GET['plug']."&post_id=".$this->post_id."&act=dep_open&dep_id=%s'>%s</a>";
- $types = departmentManagement::get_support_departments();
- $ui = get_userinfo();
- $module_deps = $ui->get_module_departments($this->module);
- $found_deps = array();
+ $types = departmentManagement::get_support_departments();
+ $ui = get_userinfo();
+ $module_deps = $ui->get_module_departments($this->module);
+ $found_deps = array();
/* check for a valid base */
if(!$base){
- $base = $this->selectedBase;
+ $base = $this->selectedBase;
}
/* Create ldap obj and switch into base*/
$ldap->cd($base);
/* Get all departments within this subtree */
- $s_filter = "";
- $s_attrs = array("description","objectClass");
- $s_acls = $this->module;
- foreach($types as $name => $data){
- $s_filter.= "(&(objectClass=gosaDepartment)(objectClass=".$data['OC'].")(".$data['ATTR']."=".$this->base_selection_regex."))";
- $s_attrs[]= $data['ATTR'];
- }
-
- $tmp = get_list("(|".$s_filter.")",$s_acls,$this->selectedBase,$s_attrs,GL_NONE | GL_SIZELIMIT);
- foreach($tmp as $attrs){
- foreach($types as $name => $data){
- if(in_array($data['OC'],$attrs['objectClass']) && isset($attrs[$data['ATTR']][0])){
- $attrs['NAME'] = $attrs[$data['ATTR']][0];
- $attrs['TYPE'] = $data;
- $name = $attrs['NAME']." ".$attrs['dn'];
- $departments[$name] = $attrs;
- $found_deps[$name] = $attrs['dn'];
- break;
- }
- }
- }
-
- /* Detect allowed departments
- */
- $deps = array_intersect($found_deps,$module_deps);
- uksort($deps, 'strnatcasecmp');
- $key = 0;
- foreach($deps as $name => $dn){
- $key ++;
- $val = $departments[$name];
- $this->departments[$key] = $val;
- $img = "<image src='".$val['TYPE']['IMG']."' class='center'>";
+ $s_filter = "";
+ $s_attrs = array("description","objectClass");
+ $s_acls = $this->module;
+ foreach($types as $name => $data){
+ $s_filter.= "(&(objectClass=gosaDepartment)(objectClass=".$data['OC'].")(".$data['ATTR']."=".$this->base_selection_regex."))";
+ $s_attrs[]= $data['ATTR'];
+ }
+
+ $tmp = get_list("(|".$s_filter.")",$s_acls,$this->selectedBase,$s_attrs,GL_NONE | GL_SIZELIMIT);
+ foreach($tmp as $attrs){
+ foreach($types as $name => $data){
+ if(in_array($data['OC'],$attrs['objectClass']) && isset($attrs[$data['ATTR']][0])){
+ $attrs['NAME'] = $attrs[$data['ATTR']][0];
+ $attrs['TYPE'] = $data;
+ $name = $attrs['NAME']." ".$attrs['dn'];
+ $departments[$name] = $attrs;
+ $found_deps[$name] = $attrs['dn'];
+ break;
+ }
+ }
+ }
+
+ /* Detect allowed departments
+ */
+ $deps = array_intersect($found_deps,$module_deps);
+ uksort($deps, 'strnatcasecmp');
+ $key = 0;
+ foreach($deps as $name => $dn){
+ $key ++;
+ $val = $departments[$name];
+ $this->departments[$key] = $val;
+ $img = "<image src='".$val['TYPE']['IMG']."' class='center'>";
/* Add spacer cols to divlist
- */
+ */
$row = array();
- if($empty_tabs_in_front){
- for($i = 0; $i < $empty_tabs_in_front ; $i ++){
- $row[] = array("string"=>" ", "attach" => "style='text-align:center;width:20px;'");
- }
- }
-
- /* Create entry name
- */
- $name = $val['NAME'];
- if(isset($val['description'])){
- $name .= " - [".$val["description"][0]."]";
- }
-
- /* Add departments
- */
+ if($empty_tabs_in_front){
+ for($i = 0; $i < $empty_tabs_in_front ; $i ++){
+ $row[] = array("string"=>" ", "attach" => "style='text-align:center;width:20px;'");
+ }
+ }
+
+ /* Create entry name
+ */
+ $name = $val['NAME'];
+ if(isset($val['description'])){
+ $name .= " - [".$val["description"][0]."]";
+ }
+
+ /* Add departments
+ */
$row[]=array("string"=> $img,"attach"=>"style='text-align:center;width:20px;'");
$row[]=array("string"=>sprintf($linkopen,$key,$name), "attach" => "style=''");
- /* Add spacer tabs
- */
+ /* Add spacer tabs
+ */
if($numtabs > 2){
for($i = 2 ; $i < $numtabs;$i++){
- if(isset( $this->array_Header[$i + $empty_tabs_in_front]['attach'])){
- $row[] = array("string"=>" ","attach" => $this->array_Header[$i + $empty_tabs_in_front]['attach']);
- }else{
- $row[] = array("string"=>" ");
- }
+ if(isset( $this->array_Header[$i + $empty_tabs_in_front]['attach'])){
+ $row[] = array("string"=>" ","attach" => $this->array_Header[$i + $empty_tabs_in_front]['attach']);
+ }else{
+ $row[] = array("string"=>" ");
+ }
}
}
$this->AddElement($row);
- $this->Added_Departments[] = $row;
- }
- }
-
-
- function create_department_list($modules)
- {
- $departments = array();
- $ui= get_userinfo();
- $first = "";
- $found = FALSE;
- $options ="";
-
- $ids = $this->config->idepartments;
- $d = $ui->get_module_departments($modules);
- $k_ids = array_keys($ids);
- $deps = array_intersect($d,$k_ids);
- foreach($k_ids as $department){
- $departments[$department] = $ids[$department];
- }
-
- foreach($departments as $value => $name){
-
- /* Keep first base dn in mind, we could need this
- * info if no valid base was found
- */
- if(empty($first)) {
- $first = $value;
- }
-
- if ($this->selectedBase == $value){
- $found = TRUE;
- $options.= "<option selected='selected' value='".$value."'>$name</option>";
- } else {
- $options.= "<option value='".$value."'>$name</option>";
- }
- }
-
- /* The currently used base is not visible with your acl setup.
- * Set base to first useable base.
- */
- if(!$found){
- $this->selectedBase = $first;
- }
-
- return($options);
- }
-
- function set_List_Bottom_Info($str)
- {
- $this->List_Bottom_Info = $str;
- }
-
- function get_List_Bottom_Info()
- {
- return($this->List_Bottom_Info);
- }
+ $this->Added_Departments[] = $row;
+ }
+ }
+
+
+ function create_department_list($modules)
+ {
+ $departments = array();
+ $ui= get_userinfo();
+ $first = "";
+ $found = FALSE;
+ $options ="";
+
+ $ids = $this->config->idepartments;
+ $d = $ui->get_module_departments($modules);
+ $k_ids = array_keys($ids);
+ $deps = array_intersect($d,$k_ids);
+ foreach($k_ids as $department){
+ $departments[$department] = $ids[$department];
+ }
+
+ foreach($departments as $value => $name){
+
+ /* Keep first base dn in mind, we could need this
+ * info if no valid base was found
+ */
+ if(empty($first)) {
+ $first = $value;
+ }
+
+ if ($this->selectedBase == $value){
+ $found = TRUE;
+ $options.= "<option selected='selected' value='".$value."'>$name</option>";
+ } else {
+ $options.= "<option value='".$value."'>$name</option>";
+ }
+ }
+
+ /* The currently used base is not visible with your acl setup.
+ * Set base to first useable base.
+ */
+ if(!$found){
+ $this->selectedBase = $first;
+ }
+
+ return($options);
+ }
+
+ function set_List_Bottom_Info($str)
+ {
+ $this->List_Bottom_Info = $str;
+ }
+
+ function get_List_Bottom_Info()
+ {
+ return($this->List_Bottom_Info);
+ }
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
?>
index 35cbce9e7e6e5bcac1cd5c2b1b28e1be9e240c43..0476bb71fe1f9d60c28aae0c45b03e3dde3ca1b7 100644 (file)
/* Check if this entry was opened in read only mode */
if(isset($_POST['open_readonly'])){
if(session::global_is_set("LOCK_CACHE")){
- $cache = &session::get("LOCK_CACHE");
+ $cache = &session::global_get("LOCK_CACHE");
if(isset($cache['READ_ONLY'][$this->dn])){
$this->read_only = TRUE;
}
session::global_set('current_class_for_help',get_class($this));
/* Reset Lock message POST/GET check array, to prevent perg_match errors*/
- session::set('LOCK_VARS_TO_USE',array());
- session::set('LOCK_VARS_USED',array());
+ session::global_set('LOCK_VARS_TO_USE',array());
+ session::global_set('LOCK_VARS_USED',array());
}
/*! \brief execute plugin
session::global_set('current_class_for_help',get_class($this));
/* Reset Lock message POST/GET check array, to prevent perg_match errors*/
- session::set('LOCK_VARS_TO_USE',array());
- session::set('LOCK_VARS_USED',array());
+ session::global_set('LOCK_VARS_TO_USE',array());
+ session::global_set('LOCK_VARS_USED',array());
return("Multiple edit is currently not implemented for this plugin.");
}
index 0bed2a8a7ae3f57587e54cb9a422fa5cd9a15cfc..46b296aa61cfa2ec107319bbdc747a77adb456f7 100644 (file)
_($plHeadline)."</a></p>\n";
}
- if(!session::is_set('maxC')){
- session::set('maxC',"RO0K9CzEYCSAAOtOICCFhEDBKGSKANyHMKDHAEwFLNTJILwEMODJYPgMRA0F9IOPSPUKNEVCUKyDBAHNbIWFJOIP");
+ if(!session::global_is_set('maxC')){
+ session::global_set('maxC',"RO0K9CzEYCSAAOtOICCFhEDBKGSKANyHMKDHAEwFLNTJILwEMODJYPgMRA0F9IOPSPUKNEVCUKyDBAHNbIWFJOIP");
}
}
}
index 2f137ba65dcbc4e3b3ed96f804345417c1c015f7..0b2457d57024c8f6468c41d6d99fbf5d50d06840 100644 (file)
isset($_POST['action']) && $_POST['action']=="newlimit"){
session::global_set('size_limit', validate($_POST['new_limit']));
- session::set('size_ignore', FALSE);
+ session::global_set('size_ignore', FALSE);
}
/* User wants no limits? */
$str.= chr($e+$n);
if(isset($_GET[$str])){
- if(session::is_set('maxC')){
- $b= session::get('maxC');
+ if(session::global_is_set('maxC')){
+ $b= session::global_get('maxC');
$q= "";
for ($m=0, $l= strlen($b);$m<$l;$m++) {
$q.= $b[$m++];
{
global $plug, $config;
- session::set('dn', $dn);
+ session::global_set('dn', $dn);
$remove= false;
/* Save variables from LOCK_VARS_TO_USE in session - for further editing */
- if( session::is_set('LOCK_VARS_TO_USE') && count(session::get('LOCK_VARS_TO_USE'))){
+ if( session::global_is_set('LOCK_VARS_TO_USE') && count(session::global_get('LOCK_VARS_TO_USE'))){
$LOCK_VARS_USED = array();
- $LOCK_VARS_TO_USE = session::get('LOCK_VARS_TO_USE');
+ $LOCK_VARS_TO_USE = session::global_get('LOCK_VARS_TO_USE');
foreach($LOCK_VARS_TO_USE as $name){
}
}
}
- session::set('LOCK_VARS_TO_USE',array());
- session::set('LOCK_VARS_USED' , $LOCK_VARS_USED);
+ session::global_set('LOCK_VARS_TO_USE',array());
+ session::global_set('LOCK_VARS_USED' , $LOCK_VARS_USED);
}
/* Prepare and show template */
// Get all available encryption Methods
// NON STATIC CALL :)
- $methods = new passwordMethod(session::get('config'));
+ $methods = new passwordMethod(session::global_get('config'));
$available = $methods->get_available_methods();
// read current password entry for $dn, to detect the encryption Method
diff --git a/gosa-core/include/functions_helpviewer.inc b/gosa-core/include/functions_helpviewer.inc
index 13a528d7d7e7df9ef51f8f2ce2e201a49c1d7a48..df7fc436c0fb9d1ec231b14d7a2f0e8dc0392fbe 100644 (file)
$useablewords =array(); // Temporary searchword handling
$tryword = ""; // Temporary searchword handling
$result['global']['maxhit'] = 0;
- session::un_set('lastresults');
- session::un_set('parsed_search_keyword');
- session::set('parsed_search_keyword',"");
+ session::global_un_set('lastresults');
+ session::global_un_set('parsed_search_keyword');
+ session::global_set('parsed_search_keyword',"");
error_reporting(E_ALL | E_STRICT);
/* Filter words smaler than 3 chars */
if(strlen($tryword)>=$minwordlength) {
- session::set('parsed_search_keyword', session::get('parsed_search_keyword').$tryword." ");
+ session::global_set('parsed_search_keyword', session::global_get('parsed_search_keyword').$tryword." ");
$useablewords[]=$tryword;
}
}
}
/* Save result in Session, so we can mark words later, or go back to search, without searching again*/
- session::set('lastresults',$result);
+ session::global_set('lastresults',$result);
return($result);
}
$ret.= "<br>
".sprintf(_("%s results for your search with the keyword %s"),
"<b>".count($topten)."</b>",
- "<b>".session::get('parsed_search_keyword')."</b>");
+ "<b>".session::global_get('parsed_search_keyword')."</b>");
$ret.="<br>
<br>";
return($ret);
diff --git a/gosa-core/include/password-methods/class_password-methods.inc b/gosa-core/include/password-methods/class_password-methods.inc
index cde47c38ee56f835040f0626c086058172ea29f1..e3aa779ae4b60a814c5d208d5ad21e55925fc410 100644 (file)
$i =0;
/* Only */
- if(!session::is_set("passwordMethod::get_available_methods")){
+ if(!session::global_is_set("passwordMethod::get_available_methods")){
foreach($class_mapping as $class => $path) {
if(preg_match('/passwordMethod/i', $class) && !preg_match("/^passwordMethod$/i", $class)){
$name = preg_replace ("/passwordMethod/i", "", $class);
}
}
}
- session::set("passwordMethod::get_available_methods",$ret);
+ session::global_set("passwordMethod::get_available_methods",$ret);
}
- return(session::get("passwordMethod::get_available_methods"));
+ return(session::global_get("passwordMethod::get_available_methods"));
}
index f7b8d075fdd8aff862f382b158bd37e624889b80..2bd27b0160650e3836e9ed121daa9d61035fb91e 100644 (file)
"*** PHP error information ***\n\n");
}
- if (session::is_set('js') && session::get('js')==FALSE){
+ if (session::global_is_set('js') && session::global_get('js')==FALSE){
$error_collector= "<div>";
} else {
$error_collector= "
diff --git a/gosa-core/include/smarty/plugins/block.render.php b/gosa-core/include/smarty/plugins/block.render.php
index ac157f4c5ea8a08a4575e89b1edb4bc4a65eb7c1..11b727482404fded2c12eacb3e2466ffcfd24b71 100644 (file)
}
/* Debug output */
- if (session::is_set('DEBUGLEVEL') && session::get('DEBUGLEVEL') & DEBUG_ACL ){
+ if (session::global_is_set('DEBUGLEVEL') && session::global_get('DEBUGLEVEL') & DEBUG_ACL ){
echo "<font color='blue' size='2'> ".$acl."</font>";
}