summaryrefslogtreecommitdiff
authorGiulio 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)
commit17efce23d9f205f56f5ebbe8e4f4ca581ea47bcb (patch) (unidiff)
tree4117988aa276fd20d624c60a37f3e05e2fa2c19b
parent67455b069c4c9ec493f9cef76017e172a430a7d4 (diff)
parent96d01919d3ff42c3fdd7f6186a0500caccd3c140 (diff)
downloadclipperz-17efce23d9f205f56f5ebbe8e4f4ca581ea47bcb.zip
clipperz-17efce23d9f205f56f5ebbe8e4f4ca581ea47bcb.tar.gz
clipperz-17efce23d9f205f56f5ebbe8e4f4ca581ea47bcb.tar.bz2
Merge branch 'master' of github.com:gcsolaroli/password-manager into php+gamma
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--backend/php/src/setup/index.php2
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
@@ -151,33 +151,33 @@ if(count($_POST) > 0 && $_SESSION['diagnosticsSuccessful']==false)
151 if ($pluginName != '') 151 if ($pluginName != '')
152 { 152 {
153 $plugins[] = $file; 153 $plugins[] = $file;
154 } 154 }
155 155
156 } 156 }
157 } 157 }
158 closedir($dir); 158 closedir($dir);
159 } 159 }
160 160
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 {
174 $errors++; 174 $errors++;
175 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'); 175 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');
176 } 176 }
177 if ($errors == 0) 177 if ($errors == 0)
178 { 178 {
179 if (!@mysql_select_db ($GLOBALS['configuration']['db'])) 179 if (!@mysql_select_db ($GLOBALS['configuration']['db']))
180 { 180 {
181 $errors++; 181 $errors++;
182 AddError('Cannot find the specified database "'.$GLOBALS['configuration']['db'].'". Edit configuration.php'); 182 AddError('Cannot find the specified database "'.$GLOBALS['configuration']['db'].'". Edit configuration.php');
183 } 183 }