Fixed copy & paste (attribute_mail)

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

diff --git a/html/main.php b/html/main.php
index 8471e3eea3751e21ed743551bfa80a99d85ef8f4..14983974542684173cf6eb9a6ca1c82def32fe5e 100644 (file)
--- a/html/main.php
+++ b/html/main.php
@@ -39,6 +39,12 @@ session_set_cookie_params(24*60*60);
 /* Remember everything we did after the last click */
 session_start ();
 
+if(file_exists("../../Lab/GosaStuff/TimeTest/TimeTest.php")){
+  require_once("../../Lab/GosaStuff/TimeTest/TimeTest.php");
+  $_SESSION['TT'] = new TimeTest();
+  $_SESSION['TT'] -> AddPoint("Main");
+}
+
 
 if ($_SERVER["REQUEST_METHOD"] == "POST"){
   @DEBUG (DEBUG_POST, __LINE__, __FUNCTION__, __FILE__, $_POST, "_POST");
@@ -366,6 +372,11 @@ if ((isset($config->data['MAIN']['W3CTEST']) && preg_match('/true/i', $config->d
   tidy_clean_repair($display);
 }
 
+if(isset($_SESSION['TT'])){
+  $_SESSION['TT']->AddPoint("Ende");
+  echo $_SESSION['TT']->Draw();
+}
+
 /* Show page... */
 echo $display;
 

diff --git a/include/class_tabs.inc b/include/class_tabs.inc
index cda88a02cff2fcb2f5cfbd0826ec8ebd27cc6876..689d89268149b06d7e47ceb8c7d23c8f5a040e0d 100644 (file)
--- a/include/class_tabs.inc
+++ b/include/class_tabs.inc
@@ -272,7 +272,7 @@ class tabs
                                  $this->SubDialog = true;
                      return($tmp['string']);
                  }else{
-                 $ret .= "<br>".$tmp['string'];
+                 $ret .= $tmp['string'];
                          }
                  }
          }

diff --git a/plugins/gofon/phoneaccount/class_phoneAccount.inc b/plugins/gofon/phoneaccount/class_phoneAccount.inc
index 693ee6d05dab57248c84a566ab8115482b219f03..6d2c229e21794c2bef77b65afa1e300816864137 100644 (file)
--- a/plugins/gofon/phoneaccount/class_phoneAccount.inc
+++ b/plugins/gofon/phoneaccount/class_phoneAccount.inc
@@ -35,7 +35,7 @@ class phoneAccount extends plugin
 
   /* attribute list for save action */
   var $CopyPasteVars          = array("phoneNumbers");
-  var $attributes             = array("goFonDeliveryMode", "goFonFormat","uid","cn","mail",
+  var $attributes             = array("goFonDeliveryMode", "goFonFormat","uid","cn",
       "goFonHardware","goFonPIN","goFonVoicemailPIN","telephoneNumber", "goFonMacro","macro");
   var $objectclasses= array("goFonAccount");
 
@@ -1015,7 +1015,7 @@ $ldap->modify ($this->attrs);
   function remove_from_parent()
   {
     foreach($this->attributes as $key=>$val){
-      if(in_array($val,array("uid","cn","mail"))){
+      if(in_array($val,array("uid","cn"))){
         unset($this->attributes[$key]);
         unset($this->$val);
       }

diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc
index 045d4fe84f719e808fff324c2670e985cd027ef0..2da4db13cb2b44fc7b60ccb3e3a2d1d827eb4f16 100644 (file)
--- a/plugins/personal/mail/class_mailAccount.inc
+++ b/plugins/personal/mail/class_mailAccount.inc
@@ -669,8 +669,8 @@ $ldap->modify ($this->attrs);
     /* Save data to LDAP */
     $ldap->cd($this->dn);
     $this->cleanup();
-$ldap->modify ($this->attrs); 
-
+    $ldap->modify ($this->attrs); 
+  
     show_ldap_error($ldap->get_error());
 
     /* Only do IMAP actions if we are not a template */