Changeset 1568 for trunk/include/functions.inc.php

Timestamp:

Oct 20, 2006, 4:17:53 AM (18 years ago)

Author:

rvelices

Message:

• put back configsession_length disappeared in r1493 but has always been

used in the code (generates mysql errors on session garbage collector)

• fix auto_login (die mysql when session timed out, but user has remember)
• when a user reconnects from identification.php, the remember cookie was not

deleted

• fix all redirect warnings/errors (many changes - mainly in common.inc.php

and user.inc.php)

• reduced $confremember_me_length to 60 days, because now at each auto

login the 60 days countdown restarts

File:

• trunk/include/functions.inc.php (modified) (3 diffs)

trunk/include/functions.inc.php

@@ -585 +585 @@
   global $user, $template, $lang_info, $conf, $lang, $t2, $page, $debug;
 
-  if (!isset($lang_info)) {
+  if (!isset($lang_info))
+  {
+    $user = build_user( $conf['guest_id'], true);
     include_once(get_language_filepath('common.lang.php'));
+    list($tmpl, $thm) = explode('/', $conf['default_template']);
+    $template = new Template(PHPWG_ROOT_PATH.'template/'.$tmpl, $thm);
+  }
+  else
+  {
+    $template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template'], $user['theme']);
   }
 
@@ -602 +610 @@
   $url_link = $url;
   $title = 'redirection';
-
-  unset($template);
-  if ( isset($user['template']) )
-  {
-    $template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template']);
-  }
-  else
-  {
-    list($tmpl, $thm) = explode('/', $conf['default_template']);
-    global $themeconf;
-    include(
-      PHPWG_ROOT_PATH
-      .'template/'.$tmpl
-      .'/theme/'.$thm
-      .'/themeconf.inc.php'
-      );
-    $template = new Template(PHPWG_ROOT_PATH.'template/'.$tmpl);
-    $user['is_the_guest']=true;
-    $user['id']=$conf['guest_id'];
-  }
 
   $template->set_filenames( array( 'redirect' => 'redirect.tpl' ) );
@@ -922 +910 @@
 function get_themeconf($key)
 {
-  global $themeconf;
-
-  return isset($themeconf[$key]) ? $themeconf[$key] : '';
+  global $template;
+
+  return $template->get_themeconf($key);
 }