diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2005-12-05 23:52:44 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2005-12-05 23:52:44 +0000 |
| commit | b863d6c88dda6e322315309d64a0e9ac4c5700fa (patch) | |
| tree | 96177990c430680635889a5bfd2800f6f47814a1 | |
| parent | 536393fee38b27dda462e627a9a5e4bffee526c1 (diff) | |
| download | install-b863d6c88dda6e322315309d64a0e9ac4c5700fa.tar.gz install-b863d6c88dda6e322315309d64a0e9ac4c5700fa.tar.bz2 install-b863d6c88dda6e322315309d64a0e9ac4c5700fa.zip | |
merge recent changes into HEAD
| -rw-r--r-- | BitInstaller.php | 5 | ||||
| -rw-r--r-- | install_packages.php | 4 | ||||
| -rw-r--r-- | migrate_database.php | 24 | ||||
| -rw-r--r-- | templates/install.tpl | 10 |
4 files changed, 33 insertions, 10 deletions
diff --git a/BitInstaller.php b/BitInstaller.php index aa1220a..722b126 100644 --- a/BitInstaller.php +++ b/BitInstaller.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_install/BitInstaller.php,v 1.11 2005/10/12 15:13:51 spiderr Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_install/BitInstaller.php,v 1.12 2005/12/05 23:52:44 squareing Exp $ * @package install */ @@ -35,6 +35,9 @@ class BitInstaller extends BitSystem { { header( 'Content-Type: text/html; charset=utf-8' ); // force the session to close *before* displaying. Why? Note this very important comment from http://us4.php.net/exec + if (ini_get('safe_mode') && ini_get('safe_mode_gid')) { + umask(0007); + } session_write_close(); if( !empty( $pBrowserTitle ) ) { diff --git a/install_packages.php b/install_packages.php index 5b028e1..db35c8f 100644 --- a/install_packages.php +++ b/install_packages.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_install/install_packages.php,v 1.11 2005/10/12 15:13:51 spiderr Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_install/install_packages.php,v 1.12 2005/12/05 23:52:44 squareing Exp $ * @package install * @subpackage functions */ @@ -177,7 +177,7 @@ if( isset( $_REQUEST['fSubmitDbCreate'] ) ) { // Create 'Anonymous' user has id= -1 just like phpBB $anonUser = new BitPermUser(); - $storeHash = array( 'real_name' => 'Guest', 'login' => 'guest', 'password' => $_SESSION['password'], 'email' =>'guest@localhost', 'pass_due' => FALSE, 'user_id' => ANONYMOUS_USER_ID ); + $storeHash = array( 'real_name' => 'Guest', 'login' => 'guest', 'password' => $_SESSION['password'], 'email' =>'guest@localhost', 'pass_due' => FALSE, 'user_id' => ANONYMOUS_USER_ID, 'default_group_id' => ANONYMOUS_USER_ID ); if( $anonUser->store( $storeHash ) ) { // Remove anonymous from registered group diff --git a/migrate_database.php b/migrate_database.php index 006aadd..a0fef0a 100644 --- a/migrate_database.php +++ b/migrate_database.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_install/migrate_database.php,v 1.3 2005/11/22 07:26:29 squareing Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_install/migrate_database.php,v 1.4 2005/12/05 23:52:44 squareing Exp $ * @package install * @subpackage upgrade * @@ -9,7 +9,7 @@ * * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details * - * $Id: migrate_database.php,v 1.3 2005/11/22 07:26:29 squareing Exp $ + * $Id: migrate_database.php,v 1.4 2005/12/05 23:52:44 squareing Exp $ */ /** @@ -185,6 +185,7 @@ if (isset($_REQUEST['fSubmitDatabase']) || isset($_REQUEST['fUpdateTables'])) { $x = $schema[$col]; $t .= $x->name . " "; switch($x->type) { + case "tinyint": case "int": $i = abs(( ( (int)$x->max_length ^ 2) - 1 )); $i = ($i == 5) ? 4 : $i; @@ -192,21 +193,38 @@ if (isset($_REQUEST['fSubmitDatabase']) || isset($_REQUEST['fUpdateTables'])) { $t .= "I" . $i; break; + case "double": + $t .= "N"; + break; + case "varchar": case "char": + case "enum": + case "decimal": $t .= "C(" . $x->max_length . ")"; break; + case "time": + case "timestamp": case "datetime": $t .= "T"; break; + case "date": + $t .= "D"; + break; + + case "blob": case "longblob": + case "tinyblob": + $t .= "B"; + break; + case "text": $t .= "X"; break; default: - die($x->type); + die(tra("No support for type '".$x->type."' - please log a bug at http://sf.net/projects/bitweaver")); } $default = (!$x->binary) ? $x->has_default : false; $t .= " " . ( ($x->unsigned) ? "UNSIGNED" : "" ) . " " diff --git a/templates/install.tpl b/templates/install.tpl index 11d94fa..d7861dc 100644 --- a/templates/install.tpl +++ b/templates/install.tpl @@ -1,5 +1,4 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> -{strip} <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> @@ -13,12 +12,15 @@ <script type="text/javascript" src="{$smarty.const.THEMES_PKG_URL}js/pngfix.js"></script> <![endif]--> - <script type="text/javascript"><!-- + <script type="text/javascript">//<![CDATA[ + var bitCookiePath = "{$smarty.const.BIT_ROOT_URL}"; + var bitCookieDomain = ""; + var bitIconDir = "{$smarty.const.LIBERTY_PKG_URL}icons/"; var bitRootUrl = "{$smarty.const.BIT_ROOT_URL}"; - --></script> + //]]></script> <script type="text/javascript" src="{$smarty.const.THEMES_PKG_URL}js/tabs/tabpane.js"></script> </head> - +{strip} <body> <div class="display install"> <div class="nav"> |