Changeset 1568 for trunk/include/common.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/common.inc.php (modified) (3 diffs)

trunk/include/common.inc.php

@@ -133 +133 @@
 or die ( "Could not connect to database" );
 
+//
+// Setup gallery wide options, if this fails then we output a CRITICAL_ERROR
+// since basic gallery information is not available
+//
+load_conf_from_db();
+
+include(PHPWG_ROOT_PATH.'include/user.inc.php');
+
+
+// language files
+include_once(get_language_filepath('common.lang.php'));
+if (defined('IN_ADMIN') and IN_ADMIN)
+{
+  include_once(get_language_filepath('admin.lang.php'));
+}
+
+// only now we can set the localized username of the guest user (and not in
+// include/user.inc.php)
+if ($user['is_the_guest'])
+{
+  $user['username'] = $lang['guest'];
+}
+
+// template instance
+$template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template'], $user['theme'] );
+
+if ($conf['gallery_locked'])
+{
+  $header_msgs[] = $lang['gallery_locked_message'];
+
+  if ( basename($_SERVER["SCRIPT_FILENAME"]) != 'identification.php'
+      and !is_admin() )
+  {
+    //next line required if PATH_INFO (no ? in url) but won't work for scripts outside PWG
+    $page['root_path'] = cookie_path();
+    echo $lang['gallery_locked_message']
+      .'<a href="'.get_root_url().'identification.php">.</a>';
+    exit();
+  }
+}
+
+if ($user['is_the_guest'] and !$conf['guest_access']
+    and !in_array( basename($_SERVER['SCRIPT_FILENAME']),
+                      array('identification.php',
+                            'password.php',
+                            'register.php'
+                        )
+                  )
+    )
+{
+  //next line required if PATH_INFO (no ? in url) but won't work for scripts outside PWG
+  $page['root_path'] = cookie_path();
+  redirect (get_root_url().'identification.php');
+}
+
 if ($conf['check_upgrade_feed']
     and defined('PHPWG_IN_UPGRADE')
@@ -150 +205 @@
   if (count(array_diff($existing, $applied)) > 0)
   {
+    //next line required if PATH_INFO (no ? in url) but won't work for scripts outside PWG
+    $page['root_path'] = cookie_path();
     $header_msgs[] = 'Some database upgrades are missing, '
-      .'<a href="'.PHPWG_ROOT_PATH.'upgrade_feed.php">upgrade now</a>';
-  }
-}
-
-//
-// Setup gallery wide options, if this fails then we output a CRITICAL_ERROR
-// since basic gallery information is not available
-//
-load_conf_from_db();
-
-include(PHPWG_ROOT_PATH.'include/user.inc.php');
-
-// language files
-include_once(get_language_filepath('common.lang.php'));
-
-if (defined('IN_ADMIN') and IN_ADMIN)
-{
-  include_once(get_language_filepath('admin.lang.php'));
-}
-
-if ($conf['gallery_locked'])
-{
-  $header_msgs[] = $lang['gallery_locked_message']
-    . '<a href="'.PHPWG_ROOT_PATH.'identification.php">.</a>';
-
-  if ( basename($_SERVER["PHP_SELF"]) != 'identification.php'
-      and !is_admin() )
-  {
-    echo( $lang['gallery_locked_message'] );
-    exit();
-  }
-}
-
-// only now we can set the localized username of the guest user (and not in
-// include/user.inc.php)
-if ($user['is_the_guest'])
-{
-  $user['username'] = $lang['guest'];
-}
-
-// include template/theme configuration
-if (defined('IN_ADMIN') and IN_ADMIN)
-{
-  list($user['template'], $user['theme']) =
-    explode
-    (
-      '/',
-      isset($conf['default_admin_layout']) ? $conf['default_admin_layout']
-                                           : $user['template']
-    );
-// TODO : replace $conf['admin_layout'] by $user['admin_layout']
-}
-else
-{
-  list($user['template'], $user['theme']) = explode('/', $user['template']);
-}
-// TODO : replace initial $user['template'] by $user['layout']
-
-include(
-  PHPWG_ROOT_PATH
-  .'template/'.$user['template']
-  .'/theme/'.$user['theme']
-  .'/themeconf.inc.php'
-  );
+      .'<a href="'.get_root_url().'upgrade_feed.php">upgrade now</a>';
+  }
+}
 
 if (is_adviser())
@@ -220 +216 @@
   $header_msgs[] = $lang['adviser_mode_enabled'];
 }
-
-// template instance
-$template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template']);
 
 if (count($header_msgs) > 0)