Renamed javascript function 'toggle' it is now called GOsa_toggle.

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

diff --git a/gosa-core/html/include/focus.js b/gosa-core/html/include/focus.js
index 843a0a123b419fbb006becf2c5b919a505368ab6..69f0a1ee83c908e13585e368ef4c38d2da007859 100644 (file)
--- a/gosa-core/html/include/focus.js
+++ b/gosa-core/html/include/focus.js
@@ -256,7 +256,7 @@ function show(element) {
   document.poppedLayer.style.visibility = "visible";
 }
 
-function toggle(element) {
+function GOsa_toggle(element) {
   if (browserType == "gecko" )
      document.poppedLayer = document.getElementById(element);
   else if (browserType == "ie")
@@ -286,7 +286,7 @@ function js_check(form) {
        form.javascript.value = 'true';
 }
 
-function divtoggle(element) {
+function divGOsa_toggle(element) {
        var cell;
        var cellname="tr_"+(element);
 

diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index 3c799e8c0227aa881d30eb23bde74cd87bcf78ee..36bc1eb22caddd589e0acecad226b89c3e3026a3 100644 (file)
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
@@ -363,6 +363,9 @@ if (session::is_set('errors')){
   $smarty->assign("errors", session::get('errors'));
 }
 if ($error_collector != ""){
+
+  echo htmlentities($error_collector);
+
   $smarty->assign("php_errors", preg_replace("/%BUGBODY%/",$error_collector_mailto,$error_collector)."</div>");
 } else {
   $smarty->assign("php_errors", "");

diff --git a/gosa-core/ihtml/themes/default/msg_dialog.tpl b/gosa-core/ihtml/themes/default/msg_dialog.tpl
index ae4e919240595d4bde738fae2902ed2bb54c9714..0a77c43386bb53a6d05e8d3b01d03a115f3e009f 100644 (file)
--- a/gosa-core/ihtml/themes/default/msg_dialog.tpl
+++ b/gosa-core/ihtml/themes/default/msg_dialog.tpl
@@ -119,7 +119,7 @@
                                        </td>
                                        {if $s_Trace != "" && $i_TraceCnt != 0}
                                        <td style='width:20px; vertical-align:top; cursor:pointer;'>
-                                               <div onClick="toggle('trace_{$i_ID}')"><u>Trace</u></div>
+                                               <div onClick="GOsa_toggle('trace_{$i_ID}')"><u>Trace</u></div>
                                        </td>
                                        {/if}
                                </tr>

diff --git a/gosa-core/include/class_acl.inc b/gosa-core/include/class_acl.inc
index f1708574f358fb7f25ebdb04ebfa4aa0e22ea60b..63a4a24025bae253bd01c1ceeca8341d56021165 100644 (file)
--- a/gosa-core/include/class_acl.inc
+++ b/gosa-core/include/class_acl.inc
@@ -759,14 +759,14 @@ class acl extends plugin
                      "\n  <tr>".
                      "\n    <td style='background-color:{$back_color};height:1.8em;' colspan=".($cols-1)."><b>"._("Object").": $name</b></td>".
                      "\n    <td align='right' style='background-color:{$back_color};height:1.8em;'>".
-                     "\n    <input type='button' onclick='divtoggle(\"$tname\");' value='"._("Show/hide advanced settings")."' /></td>".
+                     "\n    <input type='button' onclick='divGOsa_toggle(\"$tname\");' value='"._("Show/hide advanced settings")."' /></td>".
                      "\n  </tr>";
         } else if (isset($_SERVER['HTTP_USER_AGENT']) && preg_match("/ie/i",$_SERVER['HTTP_USER_AGENT'])) {
           $display.= "\n<table style='width:100%;border:1px solid #A0A0A0' cellspacing=0 cellpadding=2>".
                      "\n  <tr>".
                      "\n    <td style='background-color:#C8C8C8;height:1.8em;' colspan=".($cols-1)."><b>"._("Object").": $name</b></td>".
                      "\n    <td align='right' style='background-color:#C8C8C8;height:1.8em;'>".
-                     "\n    <input type='button' onclick='divtoggle(\"$tname\");' value='"._("Show/hide advanced settings")."' /></td>".
+                     "\n    <input type='button' onclick='divGOsa_toggle(\"$tname\");' value='"._("Show/hide advanced settings")."' /></td>".
                      "\n  </tr>";
         } else {
           $display.= "\n<table style='width:100%;border:1px solid #A0A0A0' cellspacing=0 cellpadding=2>".

diff --git a/gosa-core/include/php_setup.inc b/gosa-core/include/php_setup.inc
index f7b8d075fdd8aff862f382b158bd37e624889b80..6566da07f23bf6ca10880b25945d1c2a9a827fdd 100644 (file)
--- a/gosa-core/include/php_setup.inc
+++ b/gosa-core/include/php_setup.inc
@@ -99,7 +99,7 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
               </a>
             </td>
             <td align=right>
-              <button onClick='toggle(\"errorbox\")'>".
+              <button onClick='GOsa_toggle(\"errorbox\")'>".
                 _("Toggle information")."
               </button>
             </td>

diff --git a/gosa-core/include/utils/class_msgPool.inc b/gosa-core/include/utils/class_msgPool.inc
index fa48370fa846abbf052255cf334308ce6bd2a625..5309dfa54687a5d4011496613074ca8443b05300 100644 (file)
--- a/gosa-core/include/utils/class_msgPool.inc
+++ b/gosa-core/include/utils/class_msgPool.inc
@@ -234,7 +234,7 @@ class msgPool
     if ($min == ""){
       return (sprintf(_("Value for '%s' is too large!"), $name));
     } else {
-      return (sprintf(_("'%s' must be smaller than %d!"), $name, $min));
+      return (sprintf(_("'%s' must be smaller than %s!"), $name, $min));
     }
   }
 

diff --git a/gosa-core/plugins/admin/groups/generic.tpl b/gosa-core/plugins/admin/groups/generic.tpl
index 45e95d51699e1c62017c2714e1b4747b494340b1..5172c8b269a79e106c6574977abfaf5b84c5b86d 100644 (file)
--- a/gosa-core/plugins/admin/groups/generic.tpl
+++ b/gosa-core/plugins/admin/groups/generic.tpl
@@ -199,7 +199,7 @@
        <tr>
         <td colspan="2">
     <input type="checkbox" name="use_trustmode" {if $use_trustmode} checked {/if}
-        class="center" onClick="toggle('div_trustmode');">
+        class="center" onClick="GOsa_toggle('div_trustmode');">
                    {t}Trust mode{/t}&nbsp;
        <div {if !$use_trustmode} style="visibility:hidden;" {/if} id="div_trustmode">
     {render acl=$trustmodeACL}

diff --git a/gosa-core/plugins/personal/posix/generic.tpl b/gosa-core/plugins/personal/posix/generic.tpl
index 11c4d91403e3e74f002c742793ce78237cca8ae7..061b87840bf5d3b6f4c6a9878dea171f5f88c52b 100644 (file)
--- a/gosa-core/plugins/personal/posix/generic.tpl
+++ b/gosa-core/plugins/personal/posix/generic.tpl
@@ -152,7 +152,7 @@
 
 {else}
     <input type="checkbox" name="use_trustmode" {if $use_trustmode} checked {/if}
-       class="center" onClick="toggle('div_trustmode');">
+       class="center" onClick="GOsa_toggle('div_trustmode');">
        {t}Trust mode{/t}&nbsp;
     <div {if !$use_trustmode} style="visibility:hidden;" {/if} id="div_trustmode">
        {render acl=$trustmodeACL}

diff --git a/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc b/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc
index d439e86366ec1e1553fe6f2184572edab82e6ed6..f7a8b41045253637d554715d9b7f0cfcc02eead3 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc
@@ -30,6 +30,8 @@ class faiPartitionTable extends plugin
     /* Load Attributes */
     plugin::plugin ($config, $dn);
 
+    $a.=$b;
+
     /* If "dn==new" we try to create a new entry
      * Else we must read all objects from ldap which belong to this entry.
      */

diff --git a/gosa-plugins/goto/personal/environment/environment.tpl b/gosa-plugins/goto/personal/environment/environment.tpl
index 1e27d4846aecee6a32e8e75440a6a9cd7e72bbc6..b8f3a93bc7ab425b3254bba3918b34e536330240 100644 (file)
--- a/gosa-plugins/goto/personal/environment/environment.tpl
+++ b/gosa-plugins/goto/personal/environment/environment.tpl
@@ -333,7 +333,7 @@
 
    <h2>
        <input type="checkbox" name="use_gotoPrinter" value="1" {if $use_gotoPrinter} checked {/if}
-               class="center" onClick="toggle('div_gotoPrinter');">
+               class="center" onClick="GOsa_toggle('div_gotoPrinter');">
     <img alt="" src="plugins/systems/images/select_printer.png" align="middle" class="center" />&nbsp;
     <label for="gotoPrinter">{t}Printer{/t}</label>
    </h2>

diff --git a/gosa-plugins/systems/admin/systems/network.tpl b/gosa-plugins/systems/admin/systems/network.tpl
index de1ca3a3a30b5b5d68b38ec4d0794c327dd5bf66..daf78637b79144404a72984252b9128c410ab9d6 100644 (file)
--- a/gosa-plugins/systems/admin/systems/network.tpl
+++ b/gosa-plugins/systems/admin/systems/network.tpl
@@ -117,18 +117,18 @@
 
 
         checked="checked"
-        onclick="toggle('test2');
+        onclick="GOsa_toggle('test2');
           changeState('zoneName');
           changeState('dNSTTL');
-          toggle('propose_ip');
+          GOsa_toggle('propose_ip');
           changeState('AddNewRecord');
           {$changeStateForRecords}"/>
         {else}
       <input type="checkbox" name="DNS_is_account" value="1"  
-        onclick="toggle('test2');
+        onclick="GOsa_toggle('test2');
           changeState('zoneName');
           changeState('dNSTTL');
-          toggle('propose_ip');
+          GOsa_toggle('propose_ip');
           changeState('AddNewRecord');"/>
         {/if}
 {/render}