Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed issue #5721: Login with admin and default password doesn't work…
… on Postgres with certain server versions
- Loading branch information
Showing
1 changed file
with
110 additions
and
110 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,110 +1,110 @@ | ||
| <?php | ||
| /* | ||
| * LimeSurvey | ||
| * Copyright (C) 2007 The LimeSurvey Project Team / Carsten Schmitz | ||
| * All rights reserved. | ||
| * License: http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php | ||
| * LimeSurvey is free software. This version may have been modified pursuant | ||
| * to the GNU General Public License, and as distributed it includes or | ||
| * is derivative of works licensed under the GNU General Public License or | ||
| * other free or open source software licenses. | ||
| * See COPYRIGHT.php for copyright notices and details. | ||
| * | ||
| * $Id$ | ||
| */ | ||
|
|
||
| //Ensure script is not run directly, avoid path disclosure | ||
| if (isset($_REQUEST['rootdir'])) {die('You cannot start this script directly');} | ||
| require_once(dirname(__FILE__).'/../../config-defaults.php'); | ||
| require_once(dirname(__FILE__).'/../../common.php'); | ||
| require_once($rootdir.'/classes/core/language.php'); | ||
| require_once(dirname(__FILE__).'/../admin_functions.php'); | ||
| $clang = new limesurvey_lang("en"); | ||
|
|
||
|
|
||
| $dbname = $databasename; | ||
|
|
||
| sendcacheheaders(); | ||
| echo getAdminHeader(); | ||
| echo "<div class='messagebox ui-corner-all'><div class='header ui-widget-header' >" | ||
| .$clang->gT("Create Database")."</div><p>\n"; | ||
| echo $clang->gT("Creating tables. This might take a moment...")."<p> \n"; | ||
|
|
||
| // In Step2 fill the database with data | ||
| if (returnglobal('createdbstep2')==$clang->gT("Populate Database")) | ||
| { | ||
| $createdbtype=$databasetype; | ||
| if ($databasetype=='mysql' || $databasetype=='mysqli') { | ||
| @$connect->Execute("ALTER DATABASE `$dbname` DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;"); | ||
| $createdbtype='mysql'; | ||
| } | ||
| if ($createdbtype=='mssql_n' || $createdbtype=='odbc_mssql' || $createdbtype=='odbtp') $createdbtype='mssql'; | ||
| if($createdbtype=='postgres' && $connect->pgVersion=='9') | ||
| { | ||
| $connect->execute("ALTER DATABASE {$dbname} SET bytea_output='escape';"); | ||
| } | ||
| if($createdbtype=='mssqlnative') $createdbtype='mssqlnative'; | ||
| if (modify_database(dirname(__FILE__).'/create-'.$createdbtype.'.sql')) | ||
| { | ||
| echo "<br /><div class='successtitle'>\n"; | ||
| echo sprintf($clang->gT("Database `%s` has been successfully populated."),$dbname)."</div><p> \n"; | ||
| echo "<input type='submit' value='".$clang->gT("Main Admin Screen")."' onclick='location.href=\"../$scriptname\"' /></div>"; | ||
| exit; | ||
| } | ||
| else | ||
| { | ||
| echo $modifyoutput; | ||
| echo"Error"; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| if (!$dbname) | ||
| { | ||
| echo "<br /><strong>$setfont<font color='red'>".$clang->gT("Error")."</font></strong><br />\n"; | ||
| echo $clang->gT("Database Information not provided. This script must be run from admin.php only."); | ||
|
|
||
| echo "<br /><br />\n"; | ||
| echo "<input type='submit' value='".$clang->gT("Main Admin Screen")."' onclick='location.href=\"../$scriptname\"' />"; | ||
| exit; | ||
| } | ||
|
|
||
| if (!$database_exists) //Database named in config-defaults.php does not exist | ||
| { | ||
| // TODO SQL: Portable to other databases?? | ||
| switch ($databasetype) | ||
| { | ||
| case 'mysqli': | ||
| case 'mysql': $createDb=$connect->Execute("CREATE DATABASE `$dbname` DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci"); | ||
| break; | ||
| case 'mssql_n': | ||
| case 'odbc_mssql': | ||
| case 'mssqlnative': | ||
| case 'odbtp': $createDb=$connect->Execute("CREATE DATABASE [$dbname];"); | ||
| break; | ||
| case 'postgres': $createDb=$connect->Execute("CREATE DATABASE \"$dbname\" ENCODING 'UTF8'"); | ||
| break; | ||
| default: $createDb=$connect->Execute("CREATE DATABASE $dbname"); | ||
| } | ||
| if ($createDb) //Database has been successfully created | ||
| { | ||
| $connect->database = $dbname; | ||
| $connect->Execute("USE DATABASE `$dbname`"); | ||
| echo "<br />$setfont<strong><font class='successtitle'>\n"; | ||
| echo $clang->gT("Database has been created.")."</font></strong></font><br /><br />\n"; | ||
| echo $clang->gT("Please click below to populate the database")."<br /><br />\n"; | ||
| echo "<form method='post'>"; | ||
| echo "<input type='submit' name='createdbstep2' value='".$clang->gT("Populate Database")."' onclick='location.href=\"createdb.php\"' /></form>"; | ||
| } | ||
| else | ||
| { | ||
| echo "<strong>$setfont<font color='red'>".$clang->gT("Error")."</font></strong></font><br />\n"; | ||
| echo $clang->gT("Could not create database")." ($dbname)<br /><font size='1'>\n"; | ||
| echo $connect->ErrorMsg(); | ||
| echo "</font><br /><br />\n"; | ||
| echo "<input type='submit' value='".$clang->gT("Main Admin Screen")."' onclick='location.href=\"../$scriptname\"'>"; | ||
| } | ||
| } | ||
| echo "</td></tr></table>\n"; | ||
|
|
||
| ?> | ||
| <?php | ||
| /* | ||
| * LimeSurvey | ||
| * Copyright (C) 2007 The LimeSurvey Project Team / Carsten Schmitz | ||
| * All rights reserved. | ||
| * License: http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php | ||
| * LimeSurvey is free software. This version may have been modified pursuant | ||
| * to the GNU General Public License, and as distributed it includes or | ||
| * is derivative of works licensed under the GNU General Public License or | ||
| * other free or open source software licenses. | ||
| * See COPYRIGHT.php for copyright notices and details. | ||
| * | ||
| * $Id$ | ||
| */ | ||
|
|
||
| //Ensure script is not run directly, avoid path disclosure | ||
| if (isset($_REQUEST['rootdir'])) {die('You cannot start this script directly');} | ||
| require_once(dirname(__FILE__).'/../../config-defaults.php'); | ||
| require_once(dirname(__FILE__).'/../../common.php'); | ||
| require_once($rootdir.'/classes/core/language.php'); | ||
| require_once(dirname(__FILE__).'/../admin_functions.php'); | ||
| $clang = new limesurvey_lang("en"); | ||
|
|
||
|
|
||
| $dbname = $databasename; | ||
|
|
||
| sendcacheheaders(); | ||
| echo getAdminHeader(); | ||
| echo "<div class='messagebox ui-corner-all'><div class='header ui-widget-header' >" | ||
| .$clang->gT("Create Database")."</div><p>\n"; | ||
| echo $clang->gT("Creating tables. This might take a moment...")."<p> \n"; | ||
|
|
||
| // In Step2 fill the database with data | ||
| if (returnglobal('createdbstep2')==$clang->gT("Populate Database")) | ||
| { | ||
| $createdbtype=$databasetype; | ||
| if ($databasetype=='mysql' || $databasetype=='mysqli') { | ||
| @$connect->Execute("ALTER DATABASE `$dbname` DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;"); | ||
| $createdbtype='mysql'; | ||
| } | ||
| if ($createdbtype=='mssql_n' || $createdbtype=='odbc_mssql' || $createdbtype=='odbtp') $createdbtype='mssql'; | ||
| if($createdbtype=='postgres' && version_compare($connect->pgVersion, '9') >= 0) | ||
| { | ||
| $connect->execute("ALTER DATABASE {$dbname} SET bytea_output='escape';"); | ||
| } | ||
| if($createdbtype=='mssqlnative') $createdbtype='mssqlnative'; | ||
| if (modify_database(dirname(__FILE__).'/create-'.$createdbtype.'.sql')) | ||
| { | ||
| echo "<br /><div class='successtitle'>\n"; | ||
| echo sprintf($clang->gT("Database `%s` has been successfully populated."),$dbname)."</div><p> \n"; | ||
| echo "<input type='submit' value='".$clang->gT("Main Admin Screen")."' onclick='location.href=\"../$scriptname\"' /></div>"; | ||
| exit; | ||
| } | ||
| else | ||
| { | ||
| echo $modifyoutput; | ||
| echo"Error"; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| if (!$dbname) | ||
| { | ||
| echo "<br /><strong>$setfont<font color='red'>".$clang->gT("Error")."</font></strong><br />\n"; | ||
| echo $clang->gT("Database Information not provided. This script must be run from admin.php only."); | ||
|
|
||
| echo "<br /><br />\n"; | ||
| echo "<input type='submit' value='".$clang->gT("Main Admin Screen")."' onclick='location.href=\"../$scriptname\"' />"; | ||
| exit; | ||
| } | ||
|
|
||
| if (!$database_exists) //Database named in config-defaults.php does not exist | ||
| { | ||
| // TODO SQL: Portable to other databases?? | ||
| switch ($databasetype) | ||
| { | ||
| case 'mysqli': | ||
| case 'mysql': $createDb=$connect->Execute("CREATE DATABASE `$dbname` DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci"); | ||
| break; | ||
| case 'mssql_n': | ||
| case 'odbc_mssql': | ||
| case 'mssqlnative': | ||
| case 'odbtp': $createDb=$connect->Execute("CREATE DATABASE [$dbname];"); | ||
| break; | ||
| case 'postgres': $createDb=$connect->Execute("CREATE DATABASE \"$dbname\" ENCODING 'UTF8'"); | ||
| break; | ||
| default: $createDb=$connect->Execute("CREATE DATABASE $dbname"); | ||
| } | ||
| if ($createDb) //Database has been successfully created | ||
| { | ||
| $connect->database = $dbname; | ||
| $connect->Execute("USE DATABASE `$dbname`"); | ||
| echo "<br />$setfont<strong><font class='successtitle'>\n"; | ||
| echo $clang->gT("Database has been created.")."</font></strong></font><br /><br />\n"; | ||
| echo $clang->gT("Please click below to populate the database")."<br /><br />\n"; | ||
| echo "<form method='post'>"; | ||
| echo "<input type='submit' name='createdbstep2' value='".$clang->gT("Populate Database")."' onclick='location.href=\"createdb.php\"' /></form>"; | ||
| } | ||
| else | ||
| { | ||
| echo "<strong>$setfont<font color='red'>".$clang->gT("Error")."</font></strong></font><br />\n"; | ||
| echo $clang->gT("Could not create database")." ($dbname)<br /><font size='1'>\n"; | ||
| echo $connect->ErrorMsg(); | ||
| echo "</font><br /><br />\n"; | ||
| echo "<input type='submit' value='".$clang->gT("Main Admin Screen")."' onclick='location.href=\"../$scriptname\"'>"; | ||
| } | ||
| } | ||
| echo "</td></tr></table>\n"; | ||
|
|
||
| ?> |