X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=html%2Fmain.php;h=8c096eb3b49a7bc8396b84dcd5bdc7b09b2c1690;hb=109dd9bc67ec575086a53e574d552ae140fc50bb;hp=81d9f4bf623e4d23e777f0960b6fce7935d88df3;hpb=86ec2958f80d7b8f411cb8a89802e63ed2cf7142;p=gosa.git

diff --git a/html/main.php b/html/main.php
index 81d9f4bf6..8c096eb3b 100644
--- a/html/main.php
+++ b/html/main.php
@@ -19,6 +19,7 @@
  */
 
 /* Basic setup, remove eventually registered sessions */
+$start = microtime();
 $timing= array();
 require_once ("../include/php_setup.inc");
 require_once ("functions.inc");
@@ -32,8 +33,13 @@ $domain = 'messages';
 bindtextdomain($domain, "$BASE_DIR/locale");
 textdomain($domain);
 
+/* Set cookie lifetime to one day */
+session_set_cookie_params(24*60*60);
+
 /* Remember everything we did after the last click */
 session_start ();
+
+
 if ($_SERVER["REQUEST_METHOD"] == "POST"){
   @DEBUG (DEBUG_POST, __LINE__, __FUNCTION__, __FILE__, $_POST, "_POST");
 }
@@ -41,13 +47,15 @@ if ($_SERVER["REQUEST_METHOD"] == "POST"){
 
 /* Logged in? Simple security check */
 if (!isset($_SESSION['config'])){
-  gosa_log ("main.php called without session");
-  header ("Location: index.php");
+  gosa_log ("main.php called without session - logging out");
+  header ("Location: logout.php");
   exit;
 } 
 
 /* Reset errors */
-$_SESSION['errors']= "";
+$_SESSION['errors']             = "";
+$_SESSION['errorsAlreadyPosted']= array();
+$_SESSION['LastError']          = "";
 
 /* Check for uniqe ip address */
 $ui= $_SESSION["ui"];
@@ -57,6 +65,37 @@ if ($_SERVER['REMOTE_ADDR'] != $ui->ip){
   exit;
 }
 $config= $_SESSION['config'];
+
+
+/* Check for invalid sessions */
+if(empty($_SESSION['_LAST_PAGE_REQUEST'])){
+  $_SESSION['_LAST_PAGE_REQUEST']= time();
+}else{
+
+  /* check GOsa.conf for defined session lifetime */
+  if(isset($config->data['MAIN']['SESSION_LIFETIME'])){
+    $max_life = $config->data['MAIN']['SESSION_LIFETIME'];
+  }else{
+    $max_life = 60*60*2;
+  }
+
+  /* get time difference between last page reload */
+  $request_time = (time()-$_SESSION['_LAST_PAGE_REQUEST']);
+
+  /* If page wasn't reloaded for more than max_life seconds 
+   * kill session
+   */
+  if($request_time > $max_life){
+    session_unset();
+    gosa_log ("main.php called without session - logging out");
+    header ("Location: logout.php");
+    exit;
+  }
+//  echo "Session was ".$request_time." s inactive";
+  $_SESSION['_LAST_PAGE_REQUEST'] = time();
+}
+
+
 @DEBUG (DEBUG_CONFIG, __LINE__, __FUNCTION__, __FILE__, $config->data, "config");
 
 /* Set template compile directory */
@@ -66,12 +105,28 @@ if (isset ($config->data['MAIN']['COMPILE'])){
   $smarty->compile_dir= '/var/spool/gosa/';
 }
 
+/* Set default */
+$reload_navigation = false;
+
+/* Set last initialised language to current, browser settings */
+if((!isset($_SESSION['Last_init_lang']))){
+  $reload_navigation = true;
+  $_SESSION['Last_init_lang'] = get_browser_language();
+}
+
 /* Language setup */
 if ($config->data['MAIN']['LANG'] == ""){
+  
+  /* If last language != current force navi reload */
+  if($_SESSION['Last_init_lang'] != get_browser_language()){
+    $reload_navigation = true;
+  }
   $lang= get_browser_language();
+  $_SESSION['Last_init_lang'] = $lang;
 } else {
   $lang= $config->data['MAIN']['LANG'];
 }
+
 $lang.=".UTF-8";
 putenv("LANGUAGE=");
 putenv("LANG=$lang");
@@ -176,7 +231,10 @@ if ($_SERVER["REQUEST_METHOD"] == "POST"){
 /* Load department list when plugin has changed. That is some kind of
    compromise between speed and beeing up to date */
 if (isset($_GET['reset'])){
-  $config->departments= get_departments();
+  if (!isset($_SESSION['cached_departments'])){
+    $_SESSION['cached_departments']= get_departments();
+  }
+  $config->departments= $_SESSION['cached_departments'];
   $config->make_idepartments ();
   if (isset($_SESSION['objectinfo'])){
     unset ($_SESSION['objectinfo']);
@@ -205,10 +263,10 @@ if (isset($plug)){
 }
 if ($_SESSION['js']==FALSE){
   $smarty->assign("javascript", "false");
-  $smarty->assign("help_method", "href='helpviewer.php$plug' target='_new'");
+  $smarty->assign("help_method", "href='helpviewer.php$plug' target='_blank'");
 } else {
   $smarty->assign("javascript", "true");
-  $smarty->assign("help_method","href='' onclick=\"return popup('helpviewer.php$plug','GOsa help');\"");
+  $smarty->assign("help_method"," onclick=\"return popup('helpviewer.php$plug','GOsa help');\"");
 }
 
 $smarty->assign ("username", $ui->username);
@@ -220,13 +278,18 @@ $smarty->assign ("go_top", get_template_path('images/go_top.png'));
 $smarty->assign ("go_corner", get_template_path('images/go_corner.png'));
 $smarty->assign ("go_left", get_template_path('images/go_left.png'));
 $smarty->assign ("go_help", get_template_path('images/help.png'));
+
+/* reload navigation if language changed*/  
+if($reload_navigation){
+  $plist->menu="";;
+}
+$plist->gen_headlines();
 $plist->gen_menu();
 $smarty->assign ("menu", $plist->menu);
 $smarty->assign ("plug", "$plug");
 
 $header= "<!-- headers.tpl-->".$smarty->fetch(get_template_path('headers.tpl'));
 
-
 /* React on clicks */
 if ($_SERVER["REQUEST_METHOD"] == "POST"){
 
@@ -234,6 +297,14 @@ if ($_SERVER["REQUEST_METHOD"] == "POST"){
      lock at this point globally. Plugins do not need to remove it. */
   if (isset($_POST['delete_lock']) && isset($_SESSION['dn'])){
     del_lock ($_SESSION['dn']);
+
+    /* Set old Post data */
+    if(isset($_SESSION['LOCK_VARS_USED'])){
+      foreach($_SESSION['LOCK_VARS_USED'] as $name => $value){
+        $_GET[$name]  = $value;
+        $_POST[$name] = $value;
+      } 
+    }
     sess_del ('dn');
   }
 
@@ -266,7 +337,13 @@ if (is_file("$plugin_dir/main.inc")){
 }
 
 /* Close div/tables */
+
+/* Print_out last ErrorMessage repeated string.
+ */
+print_red(NULL);
+
 $smarty->assign("contents", $display);
+
 if (isset($_SESSION['errors'])){
   $smarty->assign("errors", $_SESSION['errors']);
 }
@@ -277,22 +354,15 @@ if ($error_collector != ""){
 }
 $display= $header.$smarty->fetch(get_template_path('framework.tpl'));
 
-/* For development, perform a W3C conformance check if specified in gosa.conf */
-if (isset($config->data['MAIN']['W3CTEST']) && preg_match('/true/i', $config->data['MAIN']['W3CTEST'])) {
-
-  /* Use PHP tidy for debugging */
-  // Specify configuration
-
-  $tidy = new tidy();
-  $config = array('indent' => TRUE,
-               'output-xhtml' => TRUE,
-               'wrap' => 200);
-  $display = tidy_parse_string($display, $config, 'UTF8');
-  tidy_clean_repair($display);
-  $cnt =  (tidy_error_count($display))+(tidy_warning_count($display));
-  if($cnt != 0){
-    echo nl2br(htmlentities($display->errorBuffer));
+if ((isset($config->data['MAIN']['W3CTEST']) && preg_match('/true/i', $config->data['MAIN']['W3CTEST']))&&(!empty($display))&&(is_callable("tidy_parse_string"))) {
+  tidy_parse_string(utf8_decode($display));
+  $err = nl2br(htmlentities(tidy_get_error_buffer()));
+  
+  if($err){
+    echo "<table summary=\"\" width=\"100%\" style='background-color:#E0E0E0;border-bottom:1px solid black'><tr><td><img alt=\"W3C\"            align=\"middle\" src='images/warning.png'>&nbsp;<font style='font-size:14px;font-weight:bold'>"._("Generating this page caused the W3C          conformance checker to raise some errors!")."</font></td><td align=right><button onClick='toggle(\"w3cbox\")'>"._("Toggle information")."</     button></td></tr></table><div id='w3cbox' style='width:100%; position:absolute; z-index:0; visibility: hidden; background-color:white; border-  bottom:1px solid black;'>";
+    echo $err."</div>";
   }
+
   tidy_clean_repair($display);
 }
 
@@ -302,5 +372,22 @@ echo $display;
 /* Save plist */
 $_SESSION['plist']= $plist;
 
+/* Echo compilation time * /
+$r = split(" ",$start);
+$ms = $r[0];
+$s= $r[1];
+
+$re = split(" ",microtime());
+$mse = $re[0];
+$se= $re[1];
+
+$add = 0;
+if(($mse -$ms)<0){
+  $se --;
+  $add = 1;
+}
+echo ($se -$s).",";
+echo (int)(($add+($mse -$ms))*1000)." s";
+*/
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>