OpencachingDeutschland / oc-server3

htdocs/lib/eventhandler.inc.php

Spacing +2 added lines, -2 removed lines

@@ -21,8 +21,8 @@
     $userid = $userid + 0;
 
     // data changed - delete statpic of user, if exists - will be recreated on next request
-    if (file_exists('./images/statpics/statpic' . $userid . '.jpg')) {
-        unlink('./images/statpics/statpic' . $userid . '.jpg');
+    if (file_exists('./images/statpics/statpic'.$userid.'.jpg')) {
+        unlink('./images/statpics/statpic'.$userid.'.jpg');
     }
 }
 

htdocs/lib/settings-dist.inc.php

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
 $style = 'ocstyle';
 
 // include common settings of lib1 and lib2
-require_once $rootpath . 'config2/settings-dist-common.inc.php';
+require_once $rootpath.'config2/settings-dist-common.inc.php';
 
 //id of the node; see list in config2/settings-dist.inc.php
 $oc_nodeid = 0;
@@ -126,7 +126,7 @@ 
 
 // sql debugging
 $sql_allow_debug = 0;
-$sql_debug_cryptkey = 'this is my very, very secret \'secret key\'';  // min. 24 chars
+$sql_debug_cryptkey = 'this is my very, very secret \'secret key\''; // min. 24 chars
 
 // replacements for sql()
 $sql_replacements['db'] = $dbname;
@@ -148,10 +148,10 @@ 
 
 /* default locale
  */
-$opt['template']['default']['locale'] = 'DE';   // can be overwritten by $opt['domain'][<domain>]['locale']
+$opt['template']['default']['locale'] = 'DE'; // can be overwritten by $opt['domain'][<domain>]['locale']
 
 // include all locale settings
-require_once $rootpath . 'config2/locale.inc.php';
+require_once $rootpath.'config2/locale.inc.php';
 
 /* replicated slave databases
  * use same config as in config2/settings.inc.php (!)
@@ -198,7 +198,7 @@ 
         'menustring' => t('Geokrety'),
         'siteid' => 'geokrety',
         'visible' => true,
-        'filename' => 'http://geokrety.org/index.php?lang=' . (isset($locale) ? strtolower($locale) : 'de')
+        'filename' => 'http://geokrety.org/index.php?lang='.(isset($locale) ? strtolower($locale) : 'de')
     ];
 
     $menu[] = [

htdocs/lib/sqldebugger.inc.php

Spacing +22 added lines, -22 removed lines

@@ -9,7 +9,7 @@ 
  * Unicode Reminder メモ
  ****************************************************************************/
 
-require_once $opt['rootpath'] . 'lib/bench.inc.php';
+require_once $opt['rootpath'].'lib/bench.inc.php';
 
 $sqldbg_cmdNo = 0;
 $sqldbg_sumTimes = 0;
@@ -155,9 +155,9 @@ 
     global $sqldbg_cmdNo;
     global $sqldbg_sumTimes;
 
-    $sqldbg_cmdNo ++;
+    $sqldbg_cmdNo++;
 
-    echo '<p class="sqlno"><span class="white">/*</span> SQL command ' . $sqldbg_cmdNo . ' ';
+    echo '<p class="sqlno"><span class="white">/*</span> SQL command '.$sqldbg_cmdNo.' ';
     if ($bSlave) {
         echo '<span class="slave_title">(slave)</span>';
     }
@@ -224,19 +224,19 @@ 
         $bFirstLine = true;
         $nLine = 0;
         $rs = mysql_query($sqlexplain, $dblink);
-        echo '<div class="selrows">Number of selected rows: ' . mysql_num_rows($rs) . '</div>';
+        echo '<div class="selrows">Number of selected rows: '.mysql_num_rows($rs).'</div>';
 
         echo '<table class="firstresultrow" border="1">';
 
         while ($r = sql_fetch_assoc($rs)) {
             $usebr = true;
-            $nLine ++;
+            $nLine++;
             if ($bFirstLine == true) {
-                echo '<tr>' . "\n";
+                echo '<tr>'."\n";
                 foreach ($r as $field => $value) {
-                    echo '<th>' . htmlspecialchars($field, ENT_COMPAT, 'UTF-8') . '</th>' . "\n";
+                    echo '<th>'.htmlspecialchars($field, ENT_COMPAT, 'UTF-8').'</th>'."\n";
                 }
-                echo '</tr>' . "\n";
+                echo '</tr>'."\n";
             }
 
             if ($bFirstLine) {
@@ -246,9 +246,9 @@ 
             }
 
             foreach ($r as $value) {
-                echo '<td>' . htmlspecialchars(($value != null) ? $value : 'NULL', ENT_COMPAT, 'UTF-8') . '</td>';
+                echo '<td>'.htmlspecialchars(($value != null) ? $value : 'NULL', ENT_COMPAT, 'UTF-8').'</td>';
             }
-            echo '</tr>' . "\n";
+            echo '</tr>'."\n";
 
             if ($nLine == 25) {
                 break;
@@ -261,27 +261,27 @@ 
         echo '<table class="explain" border="1">';
 
         $bFirstLine = true;
-        $rs = mysql_query('EXPLAIN EXTENDED ' . $sqlexplain);
+        $rs = mysql_query('EXPLAIN EXTENDED '.$sqlexplain);
         while ($r = sql_fetch_assoc($rs)) {
             if ($bFirstLine == true) {
                 echo '<tr>';
                 foreach ($r as $field => $value) {
-                    echo '<th>' . htmlspecialchars($field, ENT_COMPAT, 'UTF-8') . '</th>';
+                    echo '<th>'.htmlspecialchars($field, ENT_COMPAT, 'UTF-8').'</th>';
                 }
-                echo '</tr>' . "\n";
+                echo '</tr>'."\n";
 
                 $bFirstLine = false;
             }
 
             echo '<tr>';
             foreach ($r as $value) {
-                echo '<td>' . htmlspecialchars(
+                echo '<td>'.htmlspecialchars(
                         ($value != null) ? mb_ereg_replace('\*/', '* /', $value) : 'NULL',
                         ENT_COMPAT,
                         'UTF-8'
-                    ) . '</td>';
+                    ).'</td>';
             }
-            echo '</tr>' . "\n";
+            echo '</tr>'."\n";
         }
         echo '</table>';
         $usebr = true;
@@ -303,14 +303,14 @@ 
         echo '<table>';
         $rs = mysql_query('SHOW WARNINGS', $dblink);
         while ($r = sql_fetch_assoc($rs)) {
-            echo '<tr><td>' . htmlspecialchars($r['Message'], ENT_COMPAT, 'UTF-8') . '</td></tr>';
+            echo '<tr><td>'.htmlspecialchars($r['Message'], ENT_COMPAT, 'UTF-8').'</td></tr>';
         }
         echo '</table>';
         echo '</div>';
     }
 
-    echo '<div class="runtime">Runtime: ' . sprintf('%01.5f', $bSqlExecution->Diff()) . ' sek.</div>';
-    echo '<div class="affectedrows">Number of affected rows: ' . mysql_affected_rows($dblink) . '</div>';
+    echo '<div class="runtime">Runtime: '.sprintf('%01.5f', $bSqlExecution->Diff()).' sek.</div>';
+    echo '<div class="affectedrows">Number of affected rows: '.mysql_affected_rows($dblink).'</div>';
 
     echo '<div class="white">*/</div></div>';
 
@@ -322,7 +322,7 @@ 
     global $sqldbg_sumTimes;
 
     echo '<span class="white">/*</span><div class="allruntime"><hr>';
-    echo 'Runtime sum: ' . sprintf('%01.5f', $sqldbg_sumTimes) . ' sek.<span class="white">*/</span></div>';
+    echo 'Runtime sum: '.sprintf('%01.5f', $sqldbg_sumTimes).' sek.<span class="white">*/</span></div>';
 
     echo '</body></html>';
     exit;
@@ -347,13 +347,13 @@ 
         return '';
     }
 
-    return 'SELECT * ' . mb_substr($sql, $start);
+    return 'SELECT * '.mb_substr($sql, $start);
 }
 
 function sqldbg_insert_nocache($sql)
 {
     if (mb_strtoupper(mb_substr($sql, 0, 7)) == 'SELECT ') {
-        $sql = 'SELECT SQL_NO_CACHE ' . mb_substr($sql, 7);
+        $sql = 'SELECT SQL_NO_CACHE '.mb_substr($sql, 7);
     }
 
     return $sql;

htdocs/lib/auth.inc.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
  * Dont include this file by hand - it will be included from common.inc.php
  ****************************************************************************/
 
-require $opt['rootpath'] . 'lib/login.class.php';
+require $opt['rootpath'].'lib/login.class.php';
 
 $autherr = 0;
 define('AUTHERR_NOERROR', 0);
@@ -36,7 +36,7 @@ 
     if ($login->userid != 0) {
         //set up $usr array
         $usr['userid'] = $login->userid;
-        $usr['email'] = sqlValue("SELECT `email` FROM `user` WHERE `user_id`='" . sql_escape($login->userid) . "'", '');
+        $usr['email'] = sqlValue("SELECT `email` FROM `user` WHERE `user_id`='".sql_escape($login->userid)."'", '');
         $usr['username'] = $login->username;
         $usr['admin'] = $login->admin;
     } else {

htdocs/lib/settings-dev.inc.php

Spacing +9 added lines, -9 removed lines

@@ -19,7 +19,7 @@ 
 
 //relative path to the root directory
 if (!isset($rootpath)) {
-    $rootpath = dirname(__FILE__) . '/../';
+    $rootpath = dirname(__FILE__).'/../';
 }
 
 //default used language
@@ -36,7 +36,7 @@ 
 $style = 'ocstyle';
 
 // include common settings of lib1 and lib2
-require_once $rootpath . 'config2/settings-dist-common.inc.php';
+require_once $rootpath.'config2/settings-dist-common.inc.php';
 
 //id of the node; see config2/settings-dist.inc.php
 $oc_nodeid = 4;
@@ -74,10 +74,10 @@ 
     $maildomain = 'local.opencaching.de';
 }
 if (!isset($emailaddr)) {
-    $emailaddr = 'root@' . $maildomain;
+    $emailaddr = 'root@'.$maildomain;
 }
 if (!isset($opt['mail']['contact'])) {
-    $opt['mail']['contact'] = 'contact@' . $maildomain;
+    $opt['mail']['contact'] = 'contact@'.$maildomain;
 }
 
 // news settings
@@ -106,7 +106,7 @@ 
 
 // safemode_zip-binary
 $safemode_zip = '/var/www/bin/phpzip.php';
-$zip_basedir = $dev_basepath . ($dev_codepath == '*' ? '' : $dev_codepath . 'htdocs/') . 'download/zip/';
+$zip_basedir = $dev_basepath.($dev_codepath == '*' ? '' : $dev_codepath.'htdocs/').'download/zip/';
 $zip_wwwdir = 'download/zip/';
 
 $googlemap_key = "<key>";
@@ -117,17 +117,17 @@ 
 /* maximum number of failed logins per hour before that IP address is blocked
  * (used to prevent brute-force-attacks)
  */
-$opt['page']['max_logins_per_hour'] = 1000;    // for development ...
+$opt['page']['max_logins_per_hour'] = 1000; // for development ...
 $opt['page']['headoverlay'] = 'oc_head_alpha3';
 
 // data license
-$opt['logic']['license']['disclaimer'] = true;   // also in lib2/settings-dist.inc.php
-$opt['logic']['license']['terms'] = $absolute_server_URI . 'articles.php?page=impressum#datalicense';
+$opt['logic']['license']['disclaimer'] = true; // also in lib2/settings-dist.inc.php
+$opt['logic']['license']['terms'] = $absolute_server_URI.'articles.php?page=impressum#datalicense';
 
 $opt['logic']['admin']['listingadmin_notification'] = 'root';
 
 // include all locale settings
-require_once $rootpath . 'config2/locale.inc.php';
+require_once $rootpath.'config2/locale.inc.php';
 
 /* replicated slave databases
  * use same config as in config2/settings.inc.php (!)

htdocs/lib/settings-sample-vagrant.inc.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
 // database names
 $dbname = 'opencaching';
-$tmpdbname = 'octmp';   // empty db with CREATE and DROP privileges
+$tmpdbname = 'octmp'; // empty db with CREATE and DROP privileges
 
 // common developer system settings
 require 'settings-dev.inc.php';

htdocs/lib/logic.inc.php

Spacing +6 added lines, -6 removed lines

@@ -15,8 +15,8 @@ 
     return sqlValue(
         "SELECT IFNULL(`stt`.`text`, `cache_type`.`en`)
          FROM `cache_type`
-         LEFT JOIN `sys_trans_text` `stt` ON `stt`.`trans_id`=`cache_type`.`trans_id` AND `stt`.`lang`='" . sql_escape($language) . "'
-         WHERE `cache_type`.`id`='" . sql_escape($cachetype) . "'",
+         LEFT JOIN `sys_trans_text` `stt` ON `stt`.`trans_id`=`cache_type`.`trans_id` AND `stt`.`lang`='" . sql_escape($language)."'
+         WHERE `cache_type`.`id`='" . sql_escape($cachetype)."'",
         ''
     );
 }
@@ -26,8 +26,8 @@ 
     return sqlValue(
         "SELECT IFNULL(`stt`.`text`, `cache_size`.`en`)
          FROM `cache_size`
-         LEFT JOIN `sys_trans_text` `stt` ON `stt`.`trans_id`=`cache_size`.`trans_id` AND `stt`.`lang`='" . sql_escape($language) . "'
-         WHERE `cache_size`.`id`='" . sql_escape($cachesize) . "'",
+         LEFT JOIN `sys_trans_text` `stt` ON `stt`.`trans_id`=`cache_size`.`trans_id` AND `stt`.`lang`='" . sql_escape($language)."'
+         WHERE `cache_size`.`id`='" . sql_escape($cachesize)."'",
         ''
     );
 }
@@ -37,8 +37,8 @@ 
     return sqlValue(
         "SELECT IFNULL(`stt`.`text`, `log_types`.`en`)
          FROM `log_types`
-         LEFT JOIN `sys_trans_text` `stt` ON `stt`.`trans_id`=`log_types`.`trans_id` AND `stt`.`lang`='" . sql_escape($language) . "'
-         WHERE `log_types`.`id`='" . sql_escape($logtype) . "'",
+         LEFT JOIN `sys_trans_text` `stt` ON `stt`.`trans_id`=`log_types`.`trans_id` AND `stt`.`lang`='" . sql_escape($language)."'
+         WHERE `log_types`.`id`='" . sql_escape($logtype)."'",
         ''
     );
 }

htdocs/newdesc.php

Spacing +21 added lines, -22 removed lines

@@ -9,10 +9,10 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require_once __DIR__ . '/lib/consts.inc.php';
+require_once __DIR__.'/lib/consts.inc.php';
 $opt['gui'] = GUI_HTML;
-require_once __DIR__ . '/lib/common.inc.php';
-require_once __DIR__ . '/lib2/edithelper.inc.php';
+require_once __DIR__.'/lib/common.inc.php';
+require_once __DIR__.'/lib2/edithelper.inc.php';
 
 //Preprocessing
 if ($error == false) {
@@ -26,7 +26,7 @@ 
         $tplname = 'login';
 
         tpl_set_var('username', '');
-        tpl_set_var('target', htmlspecialchars('newdesc.php?cacheid=' . urlencode($cache_id), ENT_COMPAT, 'UTF-8'));
+        tpl_set_var('target', htmlspecialchars('newdesc.php?cacheid='.urlencode($cache_id), ENT_COMPAT, 'UTF-8'));
         tpl_set_var('message', $login_required);
         tpl_set_var('helplink', helppagelink('login'));
     } else {
@@ -40,15 +40,15 @@ 
             if ($cache_record['user_id'] == $usr['userid']) {
                 $tplname = 'newdesc';
 
-                require $stylepath . '/newdesc.inc.php';
+                require $stylepath.'/newdesc.inc.php';
 
                 //get the posted data
                 $show_all_langs = isset($_POST['show_all_langs']) ? $_POST['show_all_langs'] : 0;
-                $short_desc = isset($_POST['short_desc']) ? $_POST['short_desc'] : '';  // Ocprop
+                $short_desc = isset($_POST['short_desc']) ? $_POST['short_desc'] : ''; // Ocprop
 
-                $hints = isset($_POST['hints']) ? $_POST['hints'] : '';  // Ocprop
-                $sel_lang = isset($_POST['desc_lang']) ? $_POST['desc_lang'] : $default_lang;  // Ocprop
-                $desc = isset($_POST['desc']) ? $_POST['desc'] : '';  // Ocprop
+                $hints = isset($_POST['hints']) ? $_POST['hints'] : ''; // Ocprop
+                $sel_lang = isset($_POST['desc_lang']) ? $_POST['desc_lang'] : $default_lang; // Ocprop
+                $desc = isset($_POST['desc']) ? $_POST['desc'] : ''; // Ocprop
 
                 // read descMode; if not set, initialize from user profile
                 if (isset($_POST['descMode'])) {  // Ocprop
@@ -65,7 +65,7 @@ 
                         $oldDescMode = $descMode;
                     }
                 } else {
-                    if (sqlValue("SELECT `no_htmledit_flag` FROM `user` WHERE `user_id`='" . sql_escape($usr['userid']) . "'", 1) == 1) {
+                    if (sqlValue("SELECT `no_htmledit_flag` FROM `user` WHERE `user_id`='".sql_escape($usr['userid'])."'", 1) == 1) {
                         $descMode = 1;
                     } else {
                         $descMode = 3;
@@ -128,7 +128,7 @@ 
                         // do not use slave server for the next time ...
                         db_slave_exclude();
 
-                        tpl_redirect('editcache.php?cacheid=' . urlencode($cache_id));
+                        tpl_redirect('editcache.php?cacheid='.urlencode($cache_id));
                         exit;
                     }
                 } elseif (isset($_POST['show_all_langs_submit'])) {
@@ -142,8 +142,8 @@ 
                             FROM `languages_list_default`
                             LEFT JOIN `cache_desc`
                                 ON `languages_list_default`.`show`=`cache_desc`.`language`
-                                AND `cache_desc`.`cache_id`='" . sql_escape($cache_id) . "'
-                            WHERE `languages_list_default`.`lang`='" . sql_escape($locale) . "'
+                                AND `cache_desc`.`cache_id`='" . sql_escape($cache_id)."'
+                            WHERE `languages_list_default`.`lang`='" . sql_escape($locale)."'
                             AND ISNULL(`cache_desc`.`cache_id`)", 0) == 0
                     ) {
                         $show_all_langs = 1;
@@ -179,13 +179,13 @@ 
                     if ($sSelected != '') {
                         $selected = true;
                     }
-                    $langoptions .= '<option value="' . htmlspecialchars($rLanguage['short'], ENT_COMPAT, 'UTF-8') . '"' . $sSelected . '>' . htmlspecialchars($rLanguage['name'], ENT_COMPAT, 'UTF-8') . '</option>' . "\n";
+                    $langoptions .= '<option value="'.htmlspecialchars($rLanguage['short'], ENT_COMPAT, 'UTF-8').'"'.$sSelected.'>'.htmlspecialchars($rLanguage['name'], ENT_COMPAT, 'UTF-8').'</option>'."\n";
                 }
                 sql_free_result($rsLanguages);
                 if ($langoptions == '') {
                     // We get here if someone has added descriptions for all avaiable languages, which
                     // is very unlikely to happen ever. Just for completeness (see issue #108):
-                    tpl_redirect('editcache.php?cacheid=' . urlencode($cache_id));
+                    tpl_redirect('editcache.php?cacheid='.urlencode($cache_id));
                 }
 
                 tpl_set_var('langoptions', $langoptions);
@@ -195,8 +195,7 @@ 
                 tpl_set_var('name', htmlspecialchars($cache_record['name'], ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('cacheid', htmlspecialchars($cache_id, ENT_COMPAT, 'UTF-8'));
 
-                tpl_set_var('lang_message', $desc_lang_exists ? $lang_message :
-                    (isset($_POST['submitform']) && $sel_lang == '0' ? $error_no_lang_selected : ''));
+                tpl_set_var('lang_message', $desc_lang_exists ? $lang_message : (isset($_POST['submitform']) && $sel_lang == '0' ? $error_no_lang_selected : ''));
 
                 tpl_set_var('show_all_langs', $show_all_langs);
                 tpl_set_var('show_all_langs_submit', ($show_all_langs == 0) ? $show_all_langs_submit : '');
@@ -209,16 +208,16 @@ 
                 tpl_set_var('descMode', $descMode);
                 tpl_set_var('htmlnotice', $descMode == 2 ? $htmlnotice : '');
 
-                $headers = tpl_get_var('htmlheaders') . "\n";
+                $headers = tpl_get_var('htmlheaders')."\n";
                 if ($descMode == 3) {
                     // TinyMCE
-                    $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/tiny_mce_gzip.js"></script>' . "\n";
-                    $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/config/desc.js.php?cacheid=' . ($cache_id + 0) . '&lang=' . strtolower($locale) . '"></script>' . "\n";
+                    $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/tiny_mce_gzip.js"></script>'."\n";
+                    $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/config/desc.js.php?cacheid='.($cache_id + 0).'&lang='.strtolower($locale).'"></script>'."\n";
                 }
-                $headers .= '<script language="javascript" type="text/javascript" src="' . editorJsPath() . '"></script>' . "\n";
+                $headers .= '<script language="javascript" type="text/javascript" src="'.editorJsPath().'"></script>'."\n";
                 tpl_set_var('htmlheaders', $headers);
 
-                tpl_set_var('reset', $reset);  // obsolete
+                tpl_set_var('reset', $reset); // obsolete
                 tpl_set_var('submit', $submit);
             } else {
                 //TODO: not the owner

htdocs/adoptcache.php

Spacing +4 added lines, -4 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'adoptcache';
 $tpl->menuitem = MNU_CACHES_ADOPT;
@@ -173,7 +173,7 @@ 
 
     $adopt_result = $cache->addAdoption($userid);
     if ($adopt_result === true) {
-        $tpl->redirect('adoptcache.php?action=listbycache&cacheid=' . $cacheid);
+        $tpl->redirect('adoptcache.php?action=listbycache&cacheid='.$cacheid);
     } else {
         $tpl->assign('error', $adopt_result);
         listRequestsByCacheId($cacheid);
@@ -194,7 +194,7 @@ 
         $tpl->error(ERROR_UNKNOWN);
     }
 
-    $tpl->redirect('viewcache.php?cacheid=' . $cacheid);
+    $tpl->redirect('viewcache.php?cacheid='.$cacheid);
 }
 
 function cancelRequest($cacheid, $userid)
@@ -218,6 +218,6 @@ 
     if ($userid == $login->userid) {
         $tpl->redirect('adoptcache.php');
     } else {
-        $tpl->redirect('adoptcache.php?action=listbycache&cacheid=' . $cacheid);
+        $tpl->redirect('adoptcache.php?action=listbycache&cacheid='.$cacheid);
     }
 }