Fixed typos

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

diff --git a/ihtml/themes/altlinux/sizelimit.tpl b/ihtml/themes/altlinux/sizelimit.tpl
index 6ec66dc4fa0c4dae3358e10cf47a8450a117253f..276404de807d6a126ca80dd5d47bd884f78644ad 100644 (file)
--- a/ihtml/themes/altlinux/sizelimit.tpl
+++ b/ihtml/themes/altlinux/sizelimit.tpl
@@ -7,7 +7,7 @@
 </p>
 
 <input type="radio" name="action" value="ignore">{t}ignore this error and show all entries the LDAP server returns{/t}<br>
-<input type="radio" name="action" value="limited" checked>{t}ignore this error and show all entries that fit int the defined sizelimit and let me use filters instead{/t}<br>
+<input type="radio" name="action" value="limited" checked>{t}ignore this error and show all entries that fit into the defined sizelimit and let me use filters instead{/t}<br>
 <input type="radio" name="action" value="newlimit">{$limit_message}
 
 <p class="plugbottom">

diff --git a/ihtml/themes/default/sizelimit.tpl b/ihtml/themes/default/sizelimit.tpl
index 6ec66dc4fa0c4dae3358e10cf47a8450a117253f..276404de807d6a126ca80dd5d47bd884f78644ad 100644 (file)
--- a/ihtml/themes/default/sizelimit.tpl
+++ b/ihtml/themes/default/sizelimit.tpl
@@ -7,7 +7,7 @@
 </p>
 
 <input type="radio" name="action" value="ignore">{t}ignore this error and show all entries the LDAP server returns{/t}<br>
-<input type="radio" name="action" value="limited" checked>{t}ignore this error and show all entries that fit int the defined sizelimit and let me use filters instead{/t}<br>
+<input type="radio" name="action" value="limited" checked>{t}ignore this error and show all entries that fit into the defined sizelimit and let me use filters instead{/t}<br>
 <input type="radio" name="action" value="newlimit">{$limit_message}
 
 <p class="plugbottom">

diff --git a/include/functions.inc b/include/functions.inc
index 5acf7ff7ffe13745c0b4cf983f81b3b2acb8ee59..89dfcf29ac328016fba75b95f0a1ce88d239a742 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:#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'>";
+      $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:0; visibility: hidden'>";
     }
   }
  
@@ -1569,6 +1569,9 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
       $args.= htmlentities("\"$arg\", ");
     }
     $args= preg_replace("/, $/", "", $args);
+    if ($args == ""){
+      $args= "-";
+    }
     $file= $ct['file'];
     $line= $ct['line'];
     $color= ($index&1)?'#404040':'606060';

diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc
index ded000d4e6d0d8772cf3f631c5228c704d08ac69..555280f8dc2b2b7c3c6329bc08b817e6a8471db3 100644 (file)
--- a/plugins/admin/ogroups/class_ogroupManagement.inc
+++ b/plugins/admin/ogroups/class_ogroupManagement.inc
@@ -295,6 +295,7 @@ class ogroupManagement extends plugin
 
     $smarty->assign("hint", print_sizelimit_warning());
     $smarty->assign("apply", apply_filter());
+    $smarty->assign("alphabet", generate_alphabet());
     return ($smarty->fetch (get_template_path('headpage.tpl', TRUE)));
   }