From de12eb9e30c4870901d092553810f0881f1d4ec2 Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 25 May 2007 06:48:20 +0000 Subject: [PATCH] Updated setup git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6476 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/addons/logview/class_logview.inc | 1 + plugins/addons/logview/main.inc | 16 +++++++--------- setup/class_setupStep_Migrate.inc | 6 +++--- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/plugins/addons/logview/class_logview.inc b/plugins/addons/logview/class_logview.inc index abf4af9f9..22bd6ad1d 100644 --- a/plugins/addons/logview/class_logview.inc +++ b/plugins/addons/logview/class_logview.inc @@ -1,5 +1,6 @@ set_acl_category("logview"); + if (!isset($_SESSION['log_tabs']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){ + $_SESSION['log_tabs']= new log_tabs($config, $config->data['TABS']['LOGTABS'],""); } - $logview= $_SESSION['logview']; + $log_tabs= $_SESSION['log_tabs']; /* Execute formular */ - $display= $logview->save_object(); - $display= $logview->execute (); + $display= $log_tabs->save_object(); + $display= $log_tabs->execute (); $display.= "\n"; /* Page header*/ - $display= print_header(get_template_path('images/logview.png'), _("System log view")).$display; + $display= print_header(get_template_path('images/log_tabs.png'), _("System log view")).$display; /* Store changes in session */ - $_SESSION['logview']= $logview; + $_SESSION['log_tabs']= $log_tabs; } ?> diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc index aadcba569..1773a678b 100644 --- a/setup/class_setupStep_Migrate.inc +++ b/setup/class_setupStep_Migrate.inc @@ -1151,7 +1151,7 @@ class Step_Migrate extends setup_step print_red(_("Couldn't move users to specified department.")); return(false); } - + foreach($this->outside_users as $b_dn => $data){ $this->outside_users[$b_dn]['ldif'] =""; if($data['selected']){ @@ -1700,7 +1700,7 @@ class Step_Migrate extends setup_step $ldap->cd($cv['base']); $tmp = array(); $ldap->search("(&(objectClass=gosaDepartment)(ou=*))",array("dn")); - $tmp['/'] = $cv['base']; + $tmp[base64_encode($cv['base'])] = $ldap->fix($cv['base']); while($attrs = $ldap->fetch()){ $tmp[base64_encode($attrs['dn'])] = $ldap->fix($attrs['dn']);; } @@ -1808,7 +1808,7 @@ class Step_Migrate extends setup_step $ldap->cd($cv['base']); $tmp = array(); $ldap->search("(&(objectClass=gosaDepartment)(ou=*))",array("dn")); - $tmp['/'] = $cv['base']; + $tmp[base64_encode($cv['base'])] = $ldap->fix($cv['base']); while($attrs = $ldap->fetch()){ $tmp[base64_encode($attrs['dn'])] = $ldap->fix($attrs['dn']);; } -- 2.30.2