Updated setup

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6476 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/addons/logview/class_logview.inc b/plugins/addons/logview/class_logview.inc
index abf4af9f9c98c3efa87bd10a08798d0d07e3d20b..22bd6ad1d2f326fd81e32d82ea5638b22d1952ab 100644 (file)
--- a/plugins/addons/logview/class_logview.inc
+++ b/plugins/addons/logview/class_logview.inc
@@ -1,5 +1,6 @@
 <?php
 
+require_once("tabs_log.inc");
 class logview extends plugin
 {
   /* Definitions */

diff --git a/plugins/addons/logview/main.inc b/plugins/addons/logview/main.inc
index 1e4bf527843b76ac2fbbd0602a4acf3f36b51707..e06e034c0216e7c13b48d38aaa57946b9f024895 100644 (file)
--- a/plugins/addons/logview/main.inc
+++ b/plugins/addons/logview/main.inc
@@ -17,25 +17,23 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
-
 if (!$remove_lock){
 
        /* Create logview object on demand */
-       if (!isset($_SESSION['logview']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){
-               $_SESSION['logview']= new logview ($config);
-               $_SESSION['logview']->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.= "<input type=\"hidden\" name=\"ignore\">\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 aadcba569ae61f5569248d7d7af430daf0ef88f7..1773a678bf6002e6d36884364cc6a41f73abef3a 100644 (file)
--- 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']);;
       }