Backports from trunk

-Updated groupware plugin

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

diff --git a/gosa-plugins/groupware/admin/groups/GroupwareSharedFolder/class_GroupwareSharedFolder.inc b/gosa-plugins/groupware/admin/groups/GroupwareSharedFolder/class_GroupwareSharedFolder.inc
index aa8c527a5fb5deb1469f6ed337429440717f7793..f293da6cae08b5ec988da0c6c28381cba7b0f2d6 100644 (file)
--- a/gosa-plugins/groupware/admin/groups/GroupwareSharedFolder/class_GroupwareSharedFolder.inc
+++ b/gosa-plugins/groupware/admin/groups/GroupwareSharedFolder/class_GroupwareSharedFolder.inc
@@ -284,6 +284,12 @@ class GroupwareSharedFolder extends plugin
      */  
     function save()
     {
+
+        if(!$this->initialized){
+            echo "Nothing to save, plugin init failed!";
+            return;
+        }
+
         $this->folderList = $this->FolderWidget->save();
         $rpc = $this->config->getRpcHandle();
 

diff --git a/gosa-plugins/groupware/personal/groupware/class_Groupware.inc b/gosa-plugins/groupware/personal/groupware/class_Groupware.inc
index df39903517e1713f69084be2c8b313afbb7f48c0..1fd3bb080312596534dfd684d46ff5b43b2d9280 100644 (file)
--- a/gosa-plugins/groupware/personal/groupware/class_Groupware.inc
+++ b/gosa-plugins/groupware/personal/groupware/class_Groupware.inc
@@ -418,7 +418,7 @@ class Groupware extends plugin
                 $list = $this->mailAddressSelectDialog->save();
                 foreach ($list as $entry){
                     $val = $entry['mail'][0];
-                    if (!in_array ($val, $this->alternateAddresses) && $val != $this->mailAddress){
+                    if (!in_array_strict($val, $this->alternateAddresses) && $val != $this->mailAddress){
                         $this->addForwarder($val);
                         $this->is_modified= TRUE;
                     }