Changeset 2127 for trunk/install.php

Timestamp:

Oct 9, 2007, 3:43:29 AM (17 years ago)

Author:

rvelices

Message:

• PWG_CHARSET, DB_CHARSET and DB_COLLATE... utf-8 ready

File:

• trunk/install.php (modified) (14 diffs)

trunk/install.php

@@ -28 +28 @@
 define('PHPWG_ROOT_PATH','./');
 
-// Guess an initial language ... 
-function guess_lang()
-{
-  return 'en_UK.iso-8859-1';
-}
-
 //
 // Pick a language, any language ...
@@ -39 +33 @@
 function language_select($default, $select_name = "language")
 {
-  $available_lang = get_languages();
+  $available_lang = get_languages('utf-8');
 
   $lang_select = '<select name="' . $select_name . '" onchange="document.location = \''.PHPWG_ROOT_PATH.'install.php?language=\'+this.options[this.selectedIndex].value;">';
@@ -85 +79 @@
       if (!preg_match('/^DROP TABLE/i', $query))
       {
+        global $install_charset_collate;
+        if ( !empty($install_charset_collate) )
+        {
+          if ( preg_match('/^(CREATE TABLE .*)[\s]*;[\s]*/im', $query, $matches) )
+          {
+            $query = $matches[1].' '.$install_charset_collate.';';
+          }
+        }
         mysql_query($query);
       }
@@ -211 +213 @@
 create_empty_local_files();
 
-if ( isset( $_POST['language'] ))
-{
-  $language = strip_tags($_POST['language']);
-}
-elseif ( isset( $_GET['language'] ))
-{
-  $language = strip_tags($_GET['language']);
-}
-else 
-{
-  $language = guess_lang();
-}
-
-if (!file_exists(PHPWG_ROOT_PATH.'language/'.$language.'/install.lang.php'))
-{
-  $language = 'en_UK.iso-8859-1';
-}
-
-include( './language/'.$language.'/common.lang.php' );
-// Never: @include( './language/'.$language.'/local.lang.php' );
-include( './language/'.$language.'/admin.lang.php' );
-include( './language/'.$language.'/install.lang.php' );
+if ( isset( $_REQUEST['language'] ))
+{
+  $language = strip_tags($_REQUEST['language']);
+}
+else
+{
+  $language = 'en_UK';
+}
+
+load_language( 'common.lang', '', $language, false, 'utf-8' );
+load_language( 'admin.lang', '', $language, false, 'utf-8' );
+load_language( 'install.lang', '', $language, false, 'utf-8' );
+
 //----------------------------------------------------- template initialization
-$template=setup_style('yoga');
+$template=new Template(PHPWG_ROOT_PATH.'template/yoga');
 $template->set_filenames( array('install'=>'install.tpl') );
 $step = 1;
@@ -252 +245 @@
       array_push( $errors, $lang['step1_err_db'] );
     }
+    if ( version_compare(mysql_get_server_info(), '4.1.0', '>=') )
+    {
+      $pwg_charset='utf-8';
+      $pwg_db_charset='utf8';
+      $install_charset_collate = "DEFAULT CHARACTER SET $pwg_db_charset";
+    }
+    else
+    {
+      $pwg_charset='iso-8859-1';
+      $pwg_db_charset='latin1';
+      $install_charset_collate = '';
+      if ( !array_key_exists($language, get_languages($pwg_charset) ) )
+      {
+        $language='en_UK';
+      }
+    }
   }
   else
@@ -257 +266 @@
     array_push( $errors, $lang['step1_err_server'] );
   }
-  
+
   $webmaster = trim(preg_replace( '/\s{2,}/', ' ', $admin_name ));
   if ( empty($webmaster))
@@ -267 +276 @@
   if ( empty($admin_mail))
     array_push( $errors, $lang['reg_err_mail_address'] );
-  else 
+  else
   {
     $error_mail_address = validate_mail_address(null, $admin_mail);
@@ -273 +282 @@
       array_push( $errors, $error_mail_address );
   }
-  
+
   if ( count( $errors ) == 0 )
   {
@@ -286 +295 @@
 
 define(\'PHPWG_INSTALLED\', true);
+define(\'PWG_CHARSET\', \''.$pwg_charset.'\');
+define(\'DB_CHARSET\', \''.$pwg_db_charset.'\');
+define(\'DB_COLLATE\', \'\');
+
 ?'.'>';
-    
+
     @umask(0111);
     // writing the configuration file
@@ -303 +316 @@
     @fputs($fp, $file_content, strlen($file_content));
     @fclose($fp);
-    
+
     // tables creation, based on phpwebgallery_structure.sql
     execute_sqlfile(
@@ -325 +338 @@
       );
     mass_inserts(SITES_TABLE, array_keys($insert), array($insert));
-    
+
     // webmaster admin user
     $inserts = array(
@@ -371 +384 @@
   array(
     'RELEASE'=>PHPWG_VERSION,
-  
+
     'L_BASE_TITLE'=>$lang['Initial_config'],
     'L_LANG_TITLE'=>$lang['Default_lang'],
@@ -399 +412 @@
     'L_END_TITLE'=>$lang['install_end_title'],
     'L_END_MESSAGE'=>$lang['install_end_message'],
-    
+
     'F_ACTION'=>'install.php',
     'F_DB_HOST'=>$dbhost,
@@ -412 +425 @@
     'F_ADMIN_EMAIL'=>$admin_mail,
     'F_LANG_SELECT'=>language_select($language),
-    
-    'T_CONTENT_ENCODING' => $lang_info['charset']
+
+    'T_CONTENT_ENCODING' => 'utf-8'
     ));