| author | Giulio Cesare Solaroli <giulio.cesare@clipperz.com> | 2012-02-06 10:09:26 (UTC) |
|---|---|---|
| committer | Giulio Cesare Solaroli <giulio.cesare@clipperz.com> | 2012-02-06 10:09:26 (UTC) |
| commit | 96d01919d3ff42c3fdd7f6186a0500caccd3c140 (patch) (side-by-side diff) | |
| tree | fd7b52d56d818dcca5605766e728ac004847aede /backend/php | |
| parent | b312e037ebba7c94abea9661bcf62c52b7d73fbf (diff) | |
| parent | aa25544e0ab8a1b9dcc3c47d5953a9a2afc5f77c (diff) | |
| download | clipperz-96d01919d3ff42c3fdd7f6186a0500caccd3c140.zip clipperz-96d01919d3ff42c3fdd7f6186a0500caccd3c140.tar.gz clipperz-96d01919d3ff42c3fdd7f6186a0500caccd3c140.tar.bz2 | |
Merge pull request #24 from acozzette/master
Trivial change to setup/index.php in the PHP backend
| -rw-r--r-- | backend/php/src/setup/index.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/backend/php/src/setup/index.php b/backend/php/src/setup/index.php index 4087961..93dea6f 100644 --- a/backend/php/src/setup/index.php +++ b/backend/php/src/setup/index.php @@ -143,49 +143,49 @@ if(count($_POST) > 0 && $_SESSION['diagnosticsSuccessful']==false) if(file_exists($GLOBALS['configuration']['plugins_path']."/IPlugin.php")) { include_once($GLOBALS['configuration']['plugins_path']."/IPlugin.php"); } if(strlen($file) > 4 && substr(strtolower($file), strlen($file) - 4) === '.php' && !is_dir($file) && strtolower(substr($file, 0, 6)) == 'plugin') { include_once($GLOBALS['configuration']['plugins_path']."/{$file}"); $pluginName = GetPluginName($file); if ($pluginName != '') { $plugins[] = $file; } } } closedir($dir); } /** * verify configuration info */ if ($errors == 0) { AddTrace('File Structure....OK!'); - if (!@mysql_connect ($GLOBALS['configuration']['host'].":".$GLOBALS['configuration']['port'], $GLOBALS['configuration']['user'], $GLOBALS['configuration']['pass'])) + if (!mysql_connect ($GLOBALS['configuration']['host'].":".$GLOBALS['configuration']['port'], $GLOBALS['configuration']['user'], $GLOBALS['configuration']['pass'])) { $errors++; AddError('Cannot connect to the specified database server. Edit configuration.php'); } if (isset($GLOBALS['configuration']['db_encoding']) && $GLOBALS['configuration']['db_encoding'] == 1 && !Base64::IsBase64FunctionInstalled()) { $errors++; AddError('$configuration[db_encoding] needs to be set to 0 until you install the base64 plugin. Set db_encoding to 0 by editing configuration.php, run setup again and go to the "Manage Plugins" tab. Install the base64 plugin. Then you can set db_encoding = 1'); } if ($errors == 0) { if (!@mysql_select_db ($GLOBALS['configuration']['db'])) { $errors++; AddError('Cannot find the specified database "'.$GLOBALS['configuration']['db'].'". Edit configuration.php'); } } } /** * verify storage status */ if ($errors == 0) |