Changeset 2126 for trunk/include

Timestamp:

Oct 9, 2007, 1:46:09 AM (17 years ago)

Author:

rvelices

Message:

• some code refactoring before upgrade to utf (only cosmetic at this point...)

Location:

trunk/include

Files:

• common.inc.php (modified) (1 diff)
• functions.inc.php (modified) (2 diffs)
• functions_mail.inc.php (modified) (8 diffs)
• page_header.php (modified) (2 diffs)
• ws_functions.inc.php (modified) (1 diff)
• ws_protocols/rest_encoder.php (modified) (1 diff)

trunk/include/common.inc.php

@@ -156 +156 @@
 
 // language files
-include_once(get_language_filepath('common.lang.php'));
+load_language('common.lang');
 if (defined('IN_ADMIN') and IN_ADMIN)
 {
-  include_once(get_language_filepath('admin.lang.php'));
+  load_language('admin.lang');
 }
 trigger_action('loading_lang');
-@include_once(get_language_filepath('local.lang.php'));
+load_language('local.lang');
 
 // only now we can set the localized username of the guest user (and not in

trunk/include/functions.inc.php

@@ -730 +730 @@
   {
     $user = build_user( $conf['guest_id'], true);
-    include_once(get_language_filepath('common.lang.php'));
+    load_language('common.lang');
     trigger_action('loading_lang');
-    @include_once(get_language_filepath('local.lang.php'));
+    load_language('local.lang');
     list($tmpl, $thm) = explode('/', get_default_template());
     $template = new Template(PHPWG_ROOT_PATH.'template/'.$tmpl, $thm);
@@ -1425 +1425 @@
 }
 
+/**
+ * returns the character set of data sent to browsers / received from forms
+ */
+function get_pwg_charset()
+{
+  //TEMP CODE
+  global $lang_info;return $lang_info['charset'];
+}
+
+/**
+ * includes a language file or returns the content of a language file
+ * availability of the file
+ *
+ * in descending order of preference:
+ *   param language, user language, default language
+ * PhpWebGallery default language.
+ *
+ * @param string filename
+ * @param string dirname
+ * @param string language
+ * @param bool return_content - if true the file content is returned otherwise
+ *  the file is evaluated as php
+ * @return boolean success status or a string if return_content is true
+ */
+function load_language($filename, $dirname = '', $language = '',
+    $return_content=false)
+{
+  //TEMP CODE
+  if (!$return_content) $filename.='.php';
+  $f = get_language_filepath($filename, $dirname, $language);
+  if ($f === false)
+    return false;
+  if ($return_content)
+    return @file_get_contents($f);
+  global $lang, $lang_info;
+  @include($f);
+  return true;
+}
+
 ?>

trunk/include/functions_mail.inc.php

@@ -49 +49 @@
 
   global $lang_info;
-  return '=?'.$lang_info['charset'].'?Q?'.$str.'?=';
+  return '=?'.get_pwg_charset().'?Q?'.$str.'?=';
 }
 
@@ -227 +227 @@
 
       // language files
-      include(get_language_filepath('common.lang.php', '', $language));
+      load_language('common.lang', '', $language);
       // No test admin because script is checked admin (user selected no)
       // Translations are in admin file too
-      include(get_language_filepath('admin.lang.php', '', $language));
+      load_language('admin.lang', '', $language);
       trigger_action('loading_lang');
-      @include(get_language_filepath('local.lang.php', '', $language));
+      load_language('local.lang', '', $language);
 
       $switch_lang[$language]['lang_info'] = $lang_info;
@@ -589 +589 @@
   $content = '';
 
-  if (!isset($conf_mail[$args['email_format']][$lang_info['charset']][$args['template']][$args['theme']]))
+  if (!isset($conf_mail[$args['email_format']][get_pwg_charset()][$args['template']][$args['theme']]))
   {
     if (!isset($mail_template))
@@ -604 +604 @@
         'BOUNDARY_KEY' => $conf_mail['boundary_key'],
         'CONTENT_TYPE' => $args['email_format'],
-        'CONTENT_ENCODING' => $lang_info['charset'],
+        'CONTENT_ENCODING' => get_pwg_charset(),
         'LANG' => $lang_info['code'],
         'DIR' => $lang_info['direction'],
@@ -651 +651 @@
     // what are displayed on the header of each mail ?
     $conf_mail[$args['email_format']]
-      [$lang_info['charset']]
+      [get_pwg_charset()]
       [$args['template']][$args['theme']]['header'] =
         $mail_template->parse('mail_header', true);
@@ -657 +657 @@
     // what are displayed on the footer of each mail ?
     $conf_mail[$args['email_format']]
-      [$lang_info['charset']]
+      [get_pwg_charset()]
       [$args['template']][$args['theme']]['footer'] =
         $mail_template->parse('mail_footer', true);
@@ -664 +664 @@
   // Header
   $content.= $conf_mail[$args['email_format']]
-              [$lang_info['charset']]
+              [get_pwg_charset()]
               [$args['template']][$args['theme']]['header'];
 
@@ -684 +684 @@
   // Footer
   $content.= $conf_mail[$args['email_format']]
-              [$lang_info['charset']]
+              [get_pwg_charset()]
               [$args['template']][$args['theme']]['footer'];
 

trunk/include/page_header.php

@@ -47 +47 @@
         $page['body_id'] : '',
 
-    'CONTENT_ENCODING' => $lang_info['charset'],
+    'CONTENT_ENCODING' => get_pwg_charset(),
     'PAGE_TITLE' => strip_tags($title),
     'LANG'=>$lang_info['code'],
@@ -100 +100 @@
 trigger_action('loc_end_page_header');
 
-header('Content-Type: text/html; charset='.$lang_info['charset']);
+header('Content-Type: text/html; charset='.get_pwg_charset());
 $template->parse('header');
 

trunk/include/ws_functions.inc.php

@@ -911 +911 @@
     $res[$k] = $user[$k];
   }
-  foreach ( array('charset') as $k )
-  {
-    $res[$k] = $lang_info[$k];
-  }
+  $res['charset'] = get_pwg_charset();
   return $res;
 }

trunk/include/ws_protocols/rest_encoder.php

@@ -169 +169 @@
     $this->encode($response);
     $ret = $this->_writer->getOutput();
-    $ret = '<?xml version="1.0" encoding="'.$lang_info['charset'].'" ?>
+    $ret = '<?xml version="1.0" encoding="'.get_pwg_charset().'" ?>
 <rsp stat="ok">
 '.$ret.'