diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc
index bbdc5920d1b06f3c9c0f6603c4cd814092cd5a6a..e76ee82ffe76c1f3b03b584ae666d11c30ea83f5 100644 (file)
<?php
+/*
+ * This code is part of GOsa (http://www.gosa-project.org)
+ * Copyright (C) 2003-2008 GONICUS GmbH
+ *
+ * ID: $$Id$$
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
define ("SEPERATOR", 1002);
var $module= "";
var $IgnoreAccount = TRUE;
+ var $footer = "";
function ClearElementsList()
{
}
/* Adds a regex input field to the current dialog */
- function AddRegex($name,$string,$value,$conn,$image="images/search.png")
+ function AddRegex($name,$string,$value,$conn,$image="images/lists/search.png")
{
$arr = array();
/* Check if the given input field name was already used
for this type of dialog */
- if(isset($_SESSION['MultiDialogFilters'][$this->filterName][$name])){
- $arr['value'] = $_SESSION['MultiDialogFilters'][$this->filterName][$name];
+ $MultiDialogFilters = session::get('MultiDialogFilters');
+ if(isset($MultiDialogFilters[$this->filterName][$name])){
+ $arr['value'] = $MultiDialogFilters[$this->filterName][$name];
$this->$name = $arr['value'];
}else{
$arr['value'] = $value;
$mid = new LayersMenu(6, 7, 2, 1);
$mid->setImgwww("./images/");
$mid->setIcondir("./images/");
- $mid->setDirroot("../include/php_layers_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);
$this->CloseButtonString = _("Close");
$this->filterName = $filterName;
$this->ui = get_userinfo();
- $this->selectedBase = $_SESSION['CurrentMainBase'];
+ $this->selectedBase = session::get('CurrentMainBase');
/* Check default values for SaveAdditionalVars */
+ $MultiDialogFilters = session::get('MultiDialogFilters');
foreach($this->SaveAdditionalVars as $name){
- if(isset($_SESSION['MultiDialogFilters'][$this->filterName][$name])){
- $this->$name = $_SESSION['MultiDialogFilters'][$this->filterName][$name];
+ if(isset($MultiDialogFilters[$this->filterName][$name])){
+ $this->$name = $MultiDialogFilters[$this->filterName][$name];
}
}
/* Return default header part. With back, home and root icons and department selection */
- function get_default_header()
+ function get_default_header($seperator= TRUE)
{
$enable_back = TRUE;
$enable_root = TRUE;
/* Draw root button */
if($enable_root){
- $listhead .= " <input class='center' type='image' src='images/list_root.png' align='middle'
+ $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/list_root_gray.png' class='center' alt='"._("Root")."'> ";
+ $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/list_back.png'
+ $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/list_back_gray.png' class='center' alt='"._("Up")."'> ";
+ $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/list_home.png'
+ $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/list_home_gray.png' class='center' alt='"._("Home")."'> ";
+ $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/list_reload.png' align='middle'
- title='"._("Reload list")."' name='submit_department' alt='"._("Submit")."'> ".
- " <img class='center' src='images/list_seperator.png' align='middle' alt='-' height='16' width='1'> ";
-
+ $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);
}
}else{
/* Check if there was already a variable
for this dialog which we should use instead of the default*/
- if(isset($_SESSION['MultiDialogFilters'][$this->filterName][$name])){
- $arr['default'] = $_SESSION['MultiDialogFilters'][$this->filterName][$name];
+ $MultiDialogFilters = session::get('MultiDialogFilters');
+ if(isset($MultiDialogFilters[$this->filterName][$name])){
+ $arr['default'] = $MultiDialogFilters[$this->filterName][$name];
$this->$name = $arr['default'];
}else{
$arr['default'] = $default;
return($this->is_closed);
}
+
+ function SetListFooter($str){
+ $this->footer = $str;
+ }
+
+
/* Enable the close button */
function EnableCloseButton($bool)
{
/* Check if box is checked */
if($box['default'] == true){
- $boxes .="<input type='checkbox' name=\"".$box['name']."\" value='1' title=\"".htmlentities($box['value'])."\" checked ".$boxClick."> ".$box['string']."<br>";
+ $boxes .="<input type='checkbox' name=\"".$box['name']."\" value='1' title=\"".htmlspecialchars($box['value'])."\" checked ".$boxClick."> ".$box['string']."<br>";
}else{
- $boxes .="<input type='checkbox' name=\"".$box['name']."\" value='1' title=\"".htmlentities($box['value'])."\" ".$boxClick."> ".$box['string']."<br>";
+ $boxes .="<input type='checkbox' name=\"".$box['name']."\" value='1' title=\"".htmlspecialchars($box['value'])."\" ".$boxClick."> ".$box['string']."<br>";
}
}
$smarty->assign("CheckBoxes", $boxes);
</td>
<td width=\"99%\">
<input id=\"".$regex['name']."\" type=\"text\" style='width:99%' name=\"".$regex['name']."\" maxlength='20'
- value=\"".htmlentities($regex['value'])."\" title=\"".htmlentities($regex['string'])."\">
+ value=\"".htmlspecialchars($regex['value'])."\" title=\"".htmlspecialchars($regex['string'])."\">
</td>
</tr>
</table>";
/* Check for exeeded sizelimit */
$smarty->assign("hint" , print_sizelimit_warning());
- $smarty->assign("DivList" , $divlist->DrawList());
-
+ $smarty->assign("DivList" , $divlist->DrawList()."\n\n\n\n\n".$this->footer."\n\n\n\n\n");
if($this->is_headpage){
- $smarty->assign("tree_image", get_template_path('images/tree.png'));
+ $smarty->assign("tree_image", get_template_path('images/lists/search-subtree.png'));
$smarty->assign("infoimage", get_template_path('images/info.png'));
$smarty->assign("launchimage", get_template_path('images/launch.png'));
$smarty->assign("apply", apply_filter());
}else{
- $smarty->assign("tree_image", get_template_path('images/tree.png'));
+ $smarty->assign("tree_image", get_template_path('images/lists/search-subtree.png'));
$smarty->assign("infoimage", get_template_path('images/info_small.png'));
$smarty->assign("launchimage", get_template_path('images/rocket.png'));
$smarty->assign("apply", apply_filter());
if(isset($_GET['act'])&& ($_GET['act'] == "dep_open")){
$s_entry = base64_decode($_GET['dep_id']);
if (!isset($this->config->departments[$s_entry])){
- print_red(_("Error: The requested subtree has an inconsistent DN encoding, check your LDAP!"));
+ msg_dialog::display(_("LDAP error"), sprintf(_("Inconsistent DN encoding detected: '%s'"), LDAP::fix($s_entry)), ERROR_DIALOG);
} else {
$this->selectedBase = $this->config->departments[$s_entry];
}
if($s_action=="back"){
/* Get parent deprtment and check if we are allowed to step in it */
- $base_back= preg_replace("/^[^,]+,/", "", $_SESSION['CurrentMainBase']);
+ $base_back= preg_replace("/^[^,]+,/", "", session::get('CurrentMainBase'));
$dep_id = $this->ui->get_module_departments($this->module);
if(in_array_ics($base_back,$dep_id)){
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];
- $_SESSION['MultiDialogFilters'][$this->filterName][$name] = $_POST[$name];
+ $MultiDialogFilters[$this->filterName][$name] = $_POST[$name];
}
}
}
+ session::set('MultiDialogFilters',$MultiDialogFilters);
/* Check posts from checkboxes
*/
$this->array_Checkboxes[$key]['default'] = false;
$this->$box['name'] = false;
}
+
/* Save settings in out session */
- $_SESSION['MultiDialogFilters'][$this->filterName][$box['name']] = $this->$box['name'];
+ $MultiDialogFilters = session::get('MultiDialogFilters');
+ $MultiDialogFilters[$this->filterName][$box['name']] = $this->$box['name'];
+ 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']];
- $_SESSION['MultiDialogFilters'][$this->filterName][$box['name']] = $this->$box['name'];
+ $MultiDialogFilters = session::get('MultiDialogFilters');
+ $MultiDialogFilters[$this->filterName][$box['name']] = $this->$box['name'];
+ 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;
- $_SESSION['MultiDialogFilters'][$this->filterName][$box['name']] = $val;
+ $MultiDialogFilters = session::get('MultiDialogFilters');
+ $MultiDialogFilters[$this->filterName][$box['name']] = $val;
+ session::set('MultiDialogFilters',$MultiDialogFilters);
}
}
}
}
if($ok){
if($layer_menu){
- $str = "..|<img class='center' src='images/restore.png' alt='"._("Restore")."'> "._("Restore")."|RestoreDeletedSnapShot|\n";
+ $str = "..|<img class='center' src='images/lists/restore.png' alt='"._("Restore")."'> "._("Restore")."|RestoreDeletedSnapShot|\n";
}else{
- $str = "<input class='center' type='image' align='middle' src='images/restore.png'
+ $str = "<input class='center' type='image' align='middle' src='images/lists/restore.png'
title='"._("Restore snapshopts of already deleted objects")."'
alt='"._("Restore")."' name='RestoreDeletedSnapShot'> ";
}
}else{
if($layer_menu){
- $str = "..|<img class='center' src='images/restore_grey.png' alt=''> "._("Restore")."||\n";
+ $str = "..|<img class='center' src='images/lists/restore_grey.png' alt=''> "._("Restore")."||\n";
}else{
- $str = "<img class='center' src='images/restore_grey.png' alt=''> ";
+ $str = "<img class='center' src='images/lists/restore_grey.png' alt=''> ";
}
}
-# $str .= "<img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'> ";
}
return($str);
}
if($this->parent->snapshotEnabled()){
if(count($this->parent->Available_SnapsShots($dn))){
- $str.= "<input class='center' type='image' src='images/restore.png'
+ $str.= "<input class='center' type='image' src='images/lists/restore.png'
alt='"._("Restore snapshot")."' name='RestoreSnapShotDialog_".base64_encode($dn)."' title='"._("Restore snapshot")."'> ";
} else {
- $str = "<img class='center' src='images/restore_grey.png' alt=''> ";
+ $str = "<img class='center' src='images/lists/restore_grey.png' alt=''> ";
}
$str.= "<input class='center' type='image' src='images/snapshot.png'
if(!session::is_set('CurrentMainBase')){
session::set('CurrentMainBase',$this->config->current['BASE']);
}
- $base = $_SESSION['CurrentMainBase'];
+ $base = session::get('CurrentMainBase');
}
/* Create ldap obj and switch into base*/
$nkey= normalizePreg($key);
foreach($this->config->departments as $keyd=>$vald ){
if(preg_match('/$nkey\/.*/',$keyd)){
- $non_empty="full";
+ $non_empty="-full";
}
}
}
}
- $row[]=$field1=array("string"=>"<img src='images/".$non_empty."folder.png' alt='department'>","attach"=>"style='text-align:center;width:20px;'");
+ $row[]=$field1=array("string"=>"<img src='images/lists/folder".$non_empty.".png' alt='department'>","attach"=>"style='text-align:center;width:20px;'");
$row[]=$field2=array("string"=>sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''");
if($numtabs > 2){