Javascript check works now as expected.

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

diff --git a/html/include/focus.js b/html/include/focus.js
index 9eac9f83a848dff5fe611c11000a42a3f629baf1..ba60e13d058d55c7fd428a50fe784d1f9a48d57c 100644 (file)
--- a/html/include/focus.js
+++ b/html/include/focus.js
@@ -118,3 +118,7 @@ function popup(target, name) {
        mypopup.focus();
        return false;
 }
+
+function js_check(form) {
+       form.javascript.value = 'true';
+}

diff --git a/html/index.php b/html/index.php
index 1adcf42ff6d6ed1f65fde5541d1da1bcce127f30..432b704a6f05db4e53cfdfad017e58fa6b6e8062 100644 (file)
--- a/html/index.php
+++ b/html/index.php
@@ -38,14 +38,10 @@ if (!file_exists(CONFIG_DIR."/gosa.conf")){
 $_SESSION['errors']= "";
 
 /* Check for java script */
-if (!isset($_GET['js']) && !isset($_SESSION['js'])){
-  echo '<script language="JavaScript" type="text/javascript">';
-  echo '  location = "index.php?js=true";';
-  echo '</script>';
-
-  $_SESSION['js']= FALSE;
-} else {
+if(isset($_POST['javascript']) && $_POST['javascript'] == "true") {
   $_SESSION['js']= TRUE;
+} else {
+  $_SESSION['js']= FALSE;
 }
 
 /* Check if gosa.conf is accessable */

diff --git a/ihtml/themes/default/login.tpl b/ihtml/themes/default/login.tpl
index 59807e55b85b56e0acc9939b59382f60f2166962..94721fa07e966da8218f14c587c26bdc58826b4e 100644 (file)
--- a/ihtml/themes/default/login.tpl
+++ b/ihtml/themes/default/login.tpl
@@ -19,7 +19,7 @@
     <p class='gosaLoginWarning'> {$ssl} </p>
 
     <!-- Formular data, containing a table to center fields -->
-    <form action='index.php' method='post' name='mainform'>
+    <form action='index.php' method='post' name='mainform' onSubmit='js_check(this);return true;'>
      <table summary="" style='align:center; text-align:left;' cellspacing='7' align='center'>
       <tr>
         <td>
@@ -57,6 +57,7 @@
        </td>
       </tr>
      </table>
+               <input type='hidden' name='javascript' value='false'/>          
     </form>
 
     <!-- Display error message on demand -->