Changeset 879

Timestamp:

Sep 27, 2005, 11:57:14 PM (19 years ago)

Author:

plg

Message:

• bug 168 fixed: crash when language file does not exists. Constant PHPWG_DEFAULT_LANGUAGE added. New function get_language_filepath always used to find language files.

Location:

trunk

Files:

• admin/help.php (modified) (1 diff)
• doc/ChangeLog (modified) (1 diff)
• include/common.inc.php (modified) (1 diff)
• include/constants.php (modified) (1 diff)
• include/functions_user.inc.php (modified) (1 diff)
• popuphelp.php (modified) (1 diff)

trunk/admin/help.php

@@ -28 +28 @@
 include_once( PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php' );
 
-// language files
-$user_langdir = PHPWG_ROOT_PATH.'language/'.$user['language'];
-$conf_langdir = PHPWG_ROOT_PATH.'language/'.$conf['default_language'];
-
-if (file_exists($user_langdir.'/help.html'))
-{
-  $html_file = $user_langdir.'/help.html';
-}
-else
-{
-  $html_file = $conf_langdir.'/help.html';
-}
-
-$template->set_filenames(array('help_content' => $html_file));
+$template->set_filenames(
+  array(
+    'help_content' => get_language_filepath('help.html')
+    )
+  );
+  
 $template->assign_var_from_handle('ADMIN_CONTENT', 'help_content');
 ?>

trunk/doc/ChangeLog

@@ +1 @@
+2005-09-27 Pierrick LE GALL
+        
+        * bug 168 fixed: crash when language file does not
+        exists. Constant PHPWG_DEFAULT_LANGUAGE added. New function
+        get_language_filepath always used to find language files.
+
 2005-09-26 Pierrick LE GALL
 

trunk/include/common.inc.php

@@ -167 +167 @@
 
 // language files
-$user_langdir = PHPWG_ROOT_PATH.'language/'.$user['language'];
-$conf_langdir = PHPWG_ROOT_PATH.'language/'.$conf['default_language'];
+include_once(get_language_filepath('common.lang.php'));
 
-if (file_exists($user_langdir.'/common.lang.php'))
-{
-  include_once($user_langdir.'/common.lang.php');
-}
-else
-{
-  include_once($conf_langdir.'/common.lang.php');
-}
-
-// The administration section requires 2 more language files
 if (defined('IN_ADMIN') and IN_ADMIN)
 {
-  foreach (array('admin') as $section)
-  {
-    if (file_exists($user_langdir.'/'.$section.'.lang.php'))
-    {
-      include_once($user_langdir.'/'.$section.'.lang.php');
-    }
-    else
-    {
-      include_once($conf_langdir.'/'.$section.'.lang.php');
-    }
-  }
+  include_once(get_language_filepath('admin.lang.php'));
 }
 

trunk/include/constants.php

@@ -30 +30 @@
 define('PHPWG_URL', 'http://www.phpwebgallery.net');
 define('PHPWG_FORUM_URL', 'http://forum.phpwebgallery.net');
+define('PHPWG_DEFAULT_LANGUAGE', 'en_UK.iso-8859-1');
 
 // Error codes

trunk/include/functions_user.inc.php

@@ -498 +498 @@
   return $groupname;
 }
+
+/**
+ * return the file path of the given language filename, depending on the
+ * availability of the file
+ *
+ * in descending order of preference: user language, default language,
+ * PhpWebGallery default language.
+ *
+ * @param string filename
+ * @return string filepath
+ */
+function get_language_filepath($filename)
+{
+  global $user, $conf;
+  
+  $directories =
+    array(
+      PHPWG_ROOT_PATH.'language/'.$user['language'],
+      PHPWG_ROOT_PATH.'language/'.$conf['default_language'],
+      PHPWG_ROOT_PATH.'language/'.PHPWG_DEFAULT_LANGUAGE
+      );
+
+  foreach ($directories as $directory)
+  {
+    $filepath = $directory.'/'.$filename;
+    
+    if (file_exists($filepath))
+    {
+      return $filepath;
+    }
+  }
+  
+  return false;
+}
 ?>

trunk/popuphelp.php

@@ -33 +33 @@
 include_once( PHPWG_ROOT_PATH.'include/common.inc.php' );
 
-// language files
-$user_langdir = PHPWG_ROOT_PATH.'language/'.$user['language'];
-$conf_langdir = PHPWG_ROOT_PATH.'language/'.$conf['default_language'];
-
-if (file_exists($user_langdir.'/help/'.$_GET['page'].'.html'))
-{
-  $html_file = $user_langdir.'/help/'.$_GET['page'].'.html';
-}
-else
-{
-  $html_file = $conf_langdir.'/help/'.$_GET['page'].'.html';
-}
-
 $page['body_id'] = 'thePopuphelpPage';
 $page['gallery_title'] = $title = l10n('PhpWebGallery Help');
 include(PHPWG_ROOT_PATH.'include/page_header.php');
-$template->set_filenames(array('help_content' => $html_file));
+
+$template->set_filenames(
+  array(
+    'help_content' => get_language_filepath('help/'.$_GET['page'].'.html')
+    )
+  );
 
 $template->set_filenames(array('popuphelp' => 'popuphelp.tpl'));