| author | Giulio Cesare Solaroli <giulio.cesare@clipperz.com> | 2012-02-08 23:08:46 (UTC) |
|---|---|---|
| committer | Giulio Cesare Solaroli <giulio.cesare@clipperz.com> | 2012-02-08 23:08:46 (UTC) |
| commit | 17efce23d9f205f56f5ebbe8e4f4ca581ea47bcb (patch) (unidiff) | |
| tree | 4117988aa276fd20d624c60a37f3e05e2fa2c19b | |
| parent | 67455b069c4c9ec493f9cef76017e172a430a7d4 (diff) | |
| parent | 96d01919d3ff42c3fdd7f6186a0500caccd3c140 (diff) | |
| download | clipperz-17efce23d9f205f56f5ebbe8e4f4ca581ea47bcb.zip clipperz-17efce23d9f205f56f5ebbe8e4f4ca581ea47bcb.tar.gz clipperz-17efce23d9f205f56f5ebbe8e4f4ca581ea47bcb.tar.bz2 | |
Merge branch 'master' of github.com:gcsolaroli/password-manager into php+gamma
| -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 | |||
| @@ -161,13 +161,13 @@ if(count($_POST) > 0 && $_SESSION['diagnosticsSuccessful']==false) | |||
| 161 | /** | 161 | /** |
| 162 | * verify configuration info | 162 | * verify configuration info |
| 163 | */ | 163 | */ |
| 164 | if ($errors == 0) | 164 | if ($errors == 0) |
| 165 | { | 165 | { |
| 166 | AddTrace('File Structure....OK!'); | 166 | AddTrace('File Structure....OK!'); |
| 167 | if (!@mysql_connect ($GLOBALS['configuration']['host'].":".$GLOBALS['configuration']['port'], $GLOBALS['configuration']['user'], $GLOBALS['configuration']['pass'])) | 167 | if (!mysql_connect ($GLOBALS['configuration']['host'].":".$GLOBALS['configuration']['port'], $GLOBALS['configuration']['user'], $GLOBALS['configuration']['pass'])) |
| 168 | { | 168 | { |
| 169 | $errors++; | 169 | $errors++; |
| 170 | AddError('Cannot connect to the specified database server. Edit configuration.php'); | 170 | AddError('Cannot connect to the specified database server. Edit configuration.php'); |
| 171 | } | 171 | } |
| 172 | if (isset($GLOBALS['configuration']['db_encoding']) && $GLOBALS['configuration']['db_encoding'] == 1 && !Base64::IsBase64FunctionInstalled()) | 172 | if (isset($GLOBALS['configuration']['db_encoding']) && $GLOBALS['configuration']['db_encoding'] == 1 && !Base64::IsBase64FunctionInstalled()) |
| 173 | { | 173 | { |