@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | // 2.5 versions only |
| 161 | 161 | if (version_compare($version, '2.6.0-alpha', '<') && !is_writeable('../template')) { |
| 162 | 162 | echo '<p class="alert alert-danger text-center"><strong>Please change the directory ../template '. |
| 163 | - 'and its contents writable (777 on Linux/UNIX).</strong></p>'; |
|
| 163 | + 'and its contents writable (777 on Linux/UNIX).</strong></p>'; |
|
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | // We only support updates from 2.6+ |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | if (file_exists(PMF_ROOT_DIR.'/config/database.php')) { |
| 207 | 207 | if (!copy(PMF_ROOT_DIR.'/config/database.php', PMF_ROOT_DIR.'/config/database.bak.php')) { |
| 208 | 208 | echo '<p class="alert alert-danger"><strong>Error:</strong> The backup file ../config/database.bak.php '. |
| 209 | - 'could not be written. Please correct this!</p>'; |
|
| 209 | + 'could not be written. Please correct this!</p>'; |
|
| 210 | 210 | } else { |
| 211 | 211 | $checkDatabaseSetupFile = true; |
| 212 | 212 | } |
@@ -574,8 +574,8 @@ discard block |
||
| 574 | 574 | if (!$result) { |
| 575 | 575 | echo '</div>'; |
| 576 | 576 | echo '<p class="alert alert-danger"><strong>Error:</strong> Please update your version of phpMyFAQ '. |
| 577 | - 'once again or send us a <a href="http://bugs.phpmyfaq.de" target="_blank">bug report</a>.'. |
|
| 578 | - '</p>'; |
|
| 577 | + 'once again or send us a <a href="http://bugs.phpmyfaq.de" target="_blank">bug report</a>.'. |
|
| 578 | + '</p>'; |
|
| 579 | 579 | printf( |
| 580 | 580 | '<p class="alert alert-danger"><strong>DB error:</strong> %s</p>', |
| 581 | 581 | $faqConfig->getDb()->error() |
@@ -851,7 +851,7 @@ discard block |
||
| 851 | 851 | printf('<span title="%s"><i class="fa fa-circle"></i></span>', $executeQuery); |
| 852 | 852 | if (!$result) { |
| 853 | 853 | echo '<p class="alert alert-danger"><strong>Error:</strong> Please install your version of phpMyFAQ once again '. |
| 854 | - 'or send us a <a href="http://bugs.phpmyfaq.de" target="_blank">bug report</a>.</p>'; |
|
| 854 | + 'or send us a <a href="http://bugs.phpmyfaq.de" target="_blank">bug report</a>.</p>'; |
|
| 855 | 855 | printf('<p class="error"><strong>DB error:</strong> %s</p>', $faqConfig->getDb()->error()); |
| 856 | 856 | printf('<code>%s</code>', htmlentities($executeQuery)); |
| 857 | 857 | PMF_System::renderFooter(); |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | // Backup of config/elasticsearch.php if exists |
| 230 | 230 | if (file_exists(PMF_ROOT_DIR.'/config/elasticsearch.php')) { |
| 231 | 231 | if (!copy(PMF_ROOT_DIR.'/config/elasticsearch.php', PMF_ROOT_DIR.'/config/elasticsearch.bak.php')) { |
| 232 | - echo '<p class="alert alert-danger"><strong>Error:</strong> The backup file ' . |
|
| 232 | + echo '<p class="alert alert-danger"><strong>Error:</strong> The backup file '. |
|
| 233 | 233 | '../config/elasticsearch.bak.php could not be written. Please correct this!</p>'; |
| 234 | 234 | } else { |
| 235 | 235 | $checkElasticsearchSetupFile = true; |
@@ -597,7 +597,7 @@ discard block |
||
| 597 | 597 | foreach ($query as $key => $executeQuery) { |
| 598 | 598 | $result = $faqConfig->getDb()->query($executeQuery); |
| 599 | 599 | echo '.'; |
| 600 | - if (!($key % 100)) { |
|
| 600 | + if (!($key%100)) { |
|
| 601 | 601 | echo '<br />'; |
| 602 | 602 | } |
| 603 | 603 | if (!$result) { |
@@ -617,7 +617,7 @@ discard block |
||
| 617 | 617 | } |
| 618 | 618 | usleep(10000); |
| 619 | 619 | ++$count; |
| 620 | - if (!($count % 10)) { |
|
| 620 | + if (!($count%10)) { |
|
| 621 | 621 | ob_flush(); |
| 622 | 622 | } |
| 623 | 623 | } |
@@ -395,12 +395,12 @@ |
||
| 395 | 395 | public function update(Array $newConfigs) |
| 396 | 396 | { |
| 397 | 397 | $runtimeConfigs = [ |
| 398 | - 'core.database', // PMF_DB_Driver |
|
| 399 | - 'core.instance', // PMF_Instance |
|
| 400 | - 'core.language', // Language |
|
| 401 | - 'core.ldap', // PMF_Ldap |
|
| 402 | - 'core.ldapConfig', // $PMF_LDAP |
|
| 403 | - 'core.elasticsearch', // Elasticsearch\Client |
|
| 398 | + 'core.database', // PMF_DB_Driver |
|
| 399 | + 'core.instance', // PMF_Instance |
|
| 400 | + 'core.language', // Language |
|
| 401 | + 'core.ldap', // PMF_Ldap |
|
| 402 | + 'core.ldapConfig', // $PMF_LDAP |
|
| 403 | + 'core.elasticsearch', // Elasticsearch\Client |
|
| 404 | 404 | 'core.elasticsearchConfig' // $PMF_ES |
| 405 | 405 | ]; |
| 406 | 406 | |