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 /backend | |
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 | |||
@@ -135,65 +135,65 @@ if(count($_POST) > 0 && $_SESSION['diagnosticsSuccessful']==false) | |||
135 | 135 | ||
136 | if ($errors == 0) | 136 | if ($errors == 0) |
137 | { | 137 | { |
138 | $dir = opendir($GLOBALS['configuration']['plugins_path']); | 138 | $dir = opendir($GLOBALS['configuration']['plugins_path']); |
139 | $plugins = array(); | 139 | $plugins = array(); |
140 | 140 | ||
141 | while(($file = readdir($dir)) !== false) | 141 | while(($file = readdir($dir)) !== false) |
142 | { | 142 | { |
143 | if(file_exists($GLOBALS['configuration']['plugins_path']."/IPlugin.php")) | 143 | if(file_exists($GLOBALS['configuration']['plugins_path']."/IPlugin.php")) |
144 | { | 144 | { |
145 | include_once($GLOBALS['configuration']['plugins_path']."/IPlugin.php"); | 145 | include_once($GLOBALS['configuration']['plugins_path']."/IPlugin.php"); |
146 | } | 146 | } |
147 | if(strlen($file) > 4 && substr(strtolower($file), strlen($file) - 4) === '.php' && !is_dir($file) && strtolower(substr($file, 0, 6)) == 'plugin') | 147 | if(strlen($file) > 4 && substr(strtolower($file), strlen($file) - 4) === '.php' && !is_dir($file) && strtolower(substr($file, 0, 6)) == 'plugin') |
148 | { | 148 | { |
149 | include_once($GLOBALS['configuration']['plugins_path']."/{$file}"); | 149 | include_once($GLOBALS['configuration']['plugins_path']."/{$file}"); |
150 | $pluginName = GetPluginName($file); | 150 | $pluginName = GetPluginName($file); |
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 | } |
184 | } | 184 | } |
185 | } | 185 | } |
186 | 186 | ||
187 | /** | 187 | /** |
188 | * verify storage status | 188 | * verify storage status |
189 | */ | 189 | */ |
190 | 190 | ||
191 | if ($errors == 0) | 191 | if ($errors == 0) |
192 | { | 192 | { |
193 | AddTrace("Configuration Info....OK!\n"); | 193 | AddTrace("Configuration Info....OK!\n"); |
194 | AddTrace("Storage Status"); | 194 | AddTrace("Storage Status"); |
195 | foreach($objects as $object) | 195 | foreach($objects as $object) |
196 | { | 196 | { |
197 | $objectName = GetObjectName("../objects/".$object); | 197 | $objectName = GetObjectName("../objects/".$object); |
198 | eval ('$instance = new '.$objectName.'();'); | 198 | eval ('$instance = new '.$objectName.'();'); |
199 | if (TestStorageExists($objectName, "mysql")) | 199 | if (TestStorageExists($objectName, "mysql")) |