Index: trunk/wb/install/save.php =================================================================== --- trunk/wb/install/save.php (revision 581) +++ trunk/wb/install/save.php (revision 582) @@ -23,19 +23,16 @@ */ -// Start a session +// Start a session if(!defined('SESSION_STARTED')) { - // get random-part for session_name() - list($usec,$sec) = explode(' ',microtime()); - srand((float)$sec+((float)$usec*100000)); - $session_rand = rand(1000,9999); - session_name("wb_{$session_rand}_session_id"); + session_name('wb_session_id'); session_start(); - $_SESSION['SESSION_RAND'] = $session_rand; - define('SESSION_STARTED', true); -} else { - $session_rand = $_SESSION['SESSION_RAND']; -} + define('SESSION_STARTED', true); +} +// get random-part for session_name() +list($usec,$sec) = explode(' ',microtime()); +srand((float)$sec+((float)$usec*100000)); +$session_rand = rand(1000,9999); // Function to set error function set_error($message) { Index: trunk/wb/install/index.php =================================================================== --- trunk/wb/install/index.php (revision 581) +++ trunk/wb/install/index.php (revision 582) @@ -1,380 +1,375 @@ - - Copyright (C) 2004-2008, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ + + Copyright (C) 2004-2008, Ryan Djurovich + + Website Baker is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + Website Baker is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Website Baker; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +*/ + +// Start a session if(!defined('SESSION_STARTED')) { - // get random-part for session_name() - list($usec,$sec) = explode(' ',microtime()); - srand((float)$sec+((float)$usec*100000)); - $session_rand = rand(1000,9999); - session_name("wb_session_id"); + session_name('wb_session_id'); session_start(); - $_SESSION['SESSION_RAND'] = $session_rand; - define('SESSION_STARTED', true); + define('SESSION_STARTED', true); } - -// Check if the page has been reloaded -if(!isset($_GET['sessions_checked']) OR $_GET['sessions_checked'] != 'true') { - // Set session variable - $_SESSION['session_support'] = 'Enabled'; - // Reload page - header('Location: index.php?sessions_checked=true'); - exit(0); -} else { - // Check if session variable has been saved after reload - if(isset($_SESSION['session_support'])) { - $session_support = $_SESSION['session_support']; - } else { - $session_support = 'Disabled'; - } -} - -?> - - - -Website Baker Installation Wizard - - - - - - - - - - - -
- Logo -   - Website Baker - Installation Wizard -
- -
- - - - - - - - - -
- -
- Welcome to the Website Baker Installation Wizard. -
- -
Error:
- - - - - Enabled') { ?> - - - - - - - - - - - - -

Step 1

Please check the following requirements are met before continuing...
Please note: PHP Session Support may appear disabled if your browser does not support cookies.
PHP Version > 4.1.0 - 4.1) { - ?>YesNo - PHP Session SupportPHP Safe Mode - EnabledDisabled -
- - - - - - - - - - - - - - - - - - - - - - - - -

Step 2

Please check the following files/folders are writeable before continuing...
wb/config.phpWriteable'; } elseif(!file_exists('../config.php')) { echo 'File Not Found'; } else { echo 'Unwriteable'; } ?>wb/pages/Writeable'; } elseif(!file_exists('../pages/')) { echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>wb/media/Writeable'; } elseif(!file_exists('../media/')) { echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>wb/templates/Writeable'; } elseif(!file_exists('../templates/')) { echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>
wb/modules/Writeable'; } elseif(!file_exists('../modules/')) { echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>wb/languages/Writeable'; } elseif(!file_exists('../languages/')) { echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>wb/temp/Writeable'; } elseif(!file_exists('../temp/')) { echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>  
- - - - - - - - - - - - -

Step 3

Please check your path settings, and select your default timezone...
- Absolute URL: - - - -
- Default Timezone: - - -
- - - - - - - - - -

Step 4

Please specify your operating system information below...
- Server Operating System: - - /> - Linux/Unix based -
- /> - Windows - 		-
- /> - -
- (Please note: this is only recommended for testing environments) -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Please enter your MySQL database server details below...
Host Name: - -  Username: - -
Database Name: - -  Password: - /> -
Table Prefix: - /> -   - /> - -
      - (Please note: May remove existing tables and data)

Step 5

Please enter your website title below...
Website Title: - -

Step 6

Please enter your Administrator account details below...
Username: - -  Password: - /> -
Email: - /> -  Re-Password: - /> -

 

- - - - - -
Please note:   - Website Baker is released under the - GNU General Public License -
- By clicking install, you are accepting the license. -
- 		- -
-
- -
- - - - - -
- - Website Baker - is released under the - GNU General Public License - -
- - - \ No newline at end of file + +// Check if the page has been reloaded +if(!isset($_GET['sessions_checked']) OR $_GET['sessions_checked'] != 'true') { + // Set session variable + $_SESSION['session_support'] = 'Enabled'; + // Reload page + header('Location: index.php?sessions_checked=true'); + exit(0); +} else { + // Check if session variable has been saved after reload + if(isset($_SESSION['session_support'])) { + $session_support = $_SESSION['session_support']; + } else { + $session_support = 'Disabled'; + } +} + +?> + + + +Website Baker Installation Wizard + + + + + + + + + + + +
+ Logo +   + Website Baker + Installation Wizard +
+ +
+ + + + + + + + + +
+ +
+ Welcome to the Website Baker Installation Wizard. +
+ +
Error:
+ + + + + Enabled') { ?> + + + + + + + + + + + + +

Step 1

Please check the following requirements are met before continuing...
Please note: PHP Session Support may appear disabled if your browser does not support cookies.
PHP Version > 4.1.0 + 4.1) { + ?>YesNo + PHP Session SupportPHP Safe Mode + EnabledDisabled +
+ + + + + + + + + + + + + + + + + + + + + + + + +

Step 2

Please check the following files/folders are writeable before continuing...
wb/config.phpWriteable'; } elseif(!file_exists('../config.php')) { echo 'File Not Found'; } else { echo 'Unwriteable'; } ?>wb/pages/Writeable'; } elseif(!file_exists('../pages/')) { echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>wb/media/Writeable'; } elseif(!file_exists('../media/')) { echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>wb/templates/Writeable'; } elseif(!file_exists('../templates/')) { echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>
wb/modules/Writeable'; } elseif(!file_exists('../modules/')) { echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>wb/languages/Writeable'; } elseif(!file_exists('../languages/')) { echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>wb/temp/Writeable'; } elseif(!file_exists('../temp/')) { echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>  
+ + + + + + + + + + + + +

Step 3

Please check your path settings, and select your default timezone...
+ Absolute URL: + + + +
+ Default Timezone: + + +
+ + + + + + + + + +

Step 4

Please specify your operating system information below...
+ Server Operating System: + + /> + Linux/Unix based +
+ /> + Windows + 		+
+ /> + +
+ (Please note: this is only recommended for testing environments) +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Please enter your MySQL database server details below...
Host Name: + +  Username: + +
Database Name: + +  Password: + /> +
Table Prefix: + /> +   + /> + +
      + (Please note: May remove existing tables and data)

Step 5

Please enter your website title below...
Website Title: + +

Step 6

Please enter your Administrator account details below...
Username: + +  Password: + /> +
Email: + /> +  Re-Password: + /> +

 

+ + + + + +
Please note:   + Website Baker is released under the + GNU General Public License +
+ By clicking install, you are accepting the license. +
+ 		+ +
+
+ +
+ + + + + +
+ + Website Baker + is released under the + GNU General Public License + +
+ + +