Changeset 592

Timestamp:

Nov 5, 2004, 10:36:35 PM (19 years ago)

Author:

z0rglub

Message:

• DEFAULT_LANGUAGE constant moved to $confdefault_language

• DEBUG constant divided into $confshow_queries and $confshow_gt (display generation time at the bottom of each page)

Location:

trunk/include

Files:

• config.inc.php (modified) (1 diff)
• constants.php (modified) (1 diff)
• functions.inc.php (modified) (1 diff)
• functions_user.inc.php (modified) (2 diffs)
• page_tail.php (modified) (1 diff)

trunk/include/config.inc.php

@@ -147 +147 @@
 // admin/infos_images
 $conf['info_nb_elements_page'] = 5;
+
+// default_language : language used if language set in user database is not
+// available
+$conf['default_language'] = 'en_UK.iso-8859-1';
+
+// show_queries : for debug purpose, show queries and execution times
+$conf['show_queries'] = false;
+
+// show_gt : display generation time at the bottom of each page
+$conf['show_gt'] = true;
 ?>

trunk/include/constants.php

@@ -27 +27 @@
 
 // Default settings
-define('DEFAULT_LANGUAGE', 'en_UK.iso-8859-1');
 define('PHPWG_VERSION', 'BSF');
 define('PHPWG_URL', 'http://www.phpwebgallery.net');
 define('PHPWG_FORUM_URL', 'http://forum.phpwebgallery.net');
 
-// Debug Level : 1 = on, 0 = off
-define('DEBUG', 0);
- 
 // User level
 define('ANONYMOUS', 2);

trunk/include/functions.inc.php

@@ -447 +447 @@
 function pwg_query($query)
 {
+  global $conf;
+  
   $start = get_moment();
   $result = mysql_query($query);
 
-  if (DEBUG)
+  if ($conf['show_queries'])
   {
     global $count_queries,$queries_time;

trunk/include/functions_user.inc.php

@@ -227 +227 @@
   if ( !file_exists(@realpath(PHPWG_ROOT_PATH . 'language/' . $language . '/common.lang.php')) )
   {
-    $language = DEFAULT_LANGUAGE;
+    $language = $conf['default_language'];
   }
   include_once(PHPWG_ROOT_PATH . 'language/' . $language . '/common.lang.php');
@@ -236 +236 @@
     if ( !file_exists(@realpath(PHPWG_ROOT_PATH . 'language/' . $language. '/admin.lang.php')) )
     {
-      $language = DEFAULT_LANGUAGE;
+      $language = $conf['default_language'];
     }
   include_once(PHPWG_ROOT_PATH . 'language/' . $language . '/admin.lang.php');

trunk/include/page_tail.php

@@ -44 +44 @@
     ));
     
-//if (DEBUG)
-if (true)
+if ($conf['show_gt'])
 {
   $template->assign_block_vars('debug', array());