Updated group dialog to move errors away...

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

diff --git a/include/functions.inc b/include/functions.inc
index 3c524da7d9bb4ca581cf415a92987c7ff3153230..5acf7ff7ffe13745c0b4cf983f81b3b2acb8ee59 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -1528,7 +1528,7 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
     if ($_SESSION['js']==FALSE){
       $error_collector= "<div>";
     } else {
-      $error_collector= "<table style='width:100%;background-color:#F0E0E0;border-bottom:1px solid black'><tr><td><img align=center src='".get_template_path('images/warning.png')."'>&nbsp;<font style='font-size:14px;font-weight:bold'>"._("Generating this page caused the PHP interpreter to rise some errors!")."</font></td><td align=right><button onClick='toggle(\"errorbox\")'>"._("Toggle information")."</button></td></tr></table><div id='errorbox' style='position:absolute; z-index:1; visibility: hidden'>";
+      $error_collector= "<table style='width:100%;background-color:#E0E0E0;border-bottom:1px solid black'><tr><td><img align=center src='".get_template_path('images/warning.png')."'>&nbsp;<font style='font-size:14px;font-weight:bold'>"._("Generating this page caused the PHP interpreter to rise some errors!")."</font></td><td align=right><button onClick='toggle(\"errorbox\")'>"._("Toggle information")."</button></td></tr></table><div id='errorbox' style='position:absolute; z-index:1; visibility: hidden'>";
     }
   }
  
@@ -1571,7 +1571,7 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
     $args= preg_replace("/, $/", "", $args);
     $file= $ct['file'];
     $line= $ct['line'];
-    $color= ($index&1)?'#856520':'452500';
+    $color= ($index&1)?'#404040':'606060';
     $error_collector.= "<tr style='background-color:$color'><td style='padding-left:20px' width=30%>"._("Trace")."[$index]: $loc</td>";
     $error_collector.= "<td>"._("File").": $file ("._('Line')." $line)</td><td width=10%>"._("Type").": $type</td></tr>";
     $error_collector.= "<tr style='background-color:$color'><td colspan=3 style='padding-left:20px;'>"._("Arguments").": $args</td></tr>";

diff --git a/plugins/admin/groups/class_groupGeneric.inc b/plugins/admin/groups/class_groupGeneric.inc
index 7ae9d8b5db093d862b099f334f880b73ced44ea6..7339dc335004bc90c757a2cca09213bd25330a9f 100644 (file)
--- a/plugins/admin/groups/class_groupGeneric.inc
+++ b/plugins/admin/groups/class_groupGeneric.inc
@@ -222,6 +222,7 @@ class group extends plugin
         }
       }
       $smarty->assign("users", $users);
+      $smarty->assign("apply", apply_filter());
       $display= $smarty->fetch (get_template_path('group_objects.tpl', TRUE, dirname(__FILE__)));
       return ($display);
     }
@@ -280,6 +281,8 @@ class group extends plugin
     $smarty->assign("sambaDomainNameACL", chkacl($this->acl, "sambaDomainName"));
     if ($this->fon_group){
       $smarty->assign("fon_group", "checked");
+    } else {
+      $smarty->assign("fon_group", "");
     }
     $smarty->assign("fon_groupACL", chkacl($this->acl, "fon_group"));
 
@@ -289,6 +292,11 @@ class group extends plugin
       $smarty->assign("$val"."ACL", chkacl($this->acl, "$val"));
     }
 
+    /* Missing ACL's */
+    foreach (array("base", "smbgroup", "members") as $val){
+      $smarty->assign("$val"."ACL", chkacl($this->acl, "$val"));
+    }
+
     /* Show main page */
     $smarty->assign("alphabet", generate_alphabet(10));
     $smarty->assign("search_image", get_template_path('images/search.png'));

diff --git a/plugins/admin/groups/class_groupMail.inc b/plugins/admin/groups/class_groupMail.inc
index 67be95079171db7bac04869bce4d1b01c1efa612..23ff9c64e8768c718166dca6ccbf3d434b36104a 100644 (file)
--- a/plugins/admin/groups/class_groupMail.inc
+++ b/plugins/admin/groups/class_groupMail.inc
@@ -352,7 +352,7 @@ class mailgroup extends plugin
       }
       error_reporting (E_ALL);
       natcasesort ($mailusers);
-      reset ($maiusers);
+      reset ($mailusers);
 
       /* Show dialog */
       $smarty->assign("search_image", get_template_path('images/search.png'));

diff --git a/plugins/admin/groups/generic.tpl b/plugins/admin/groups/generic.tpl
index 0a7ec94f668270a3b987554ea4c60a4d48eee861..812b6d285a748d165c0319aec8b43818da3c5a43 100644 (file)
--- a/plugins/admin/groups/generic.tpl
+++ b/plugins/admin/groups/generic.tpl
@@ -20,7 +20,7 @@
     <tr>
      <td>{t}Base{/t}{$must}</td>
      <td>
-      <select size="1" name="base" {$selectmode} title="{t}Choose subtree to place group in{/t}">
+      <select size="1" name="base" {$baseACL} title="{t}Choose subtree to place group in{/t}">
        {html_options options=$bases selected=$base_select}
       </select>
      </td>