OpencachingDeutschland / oc-server3

htdocs/mydetails.php

Spacing +6 added lines, -6 removed lines

@@ -5,8 +5,8 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
-require_once __DIR__ . '/lib2/edithelper.inc.php';
+require __DIR__.'/lib2/web.inc.php';
+require_once __DIR__.'/lib2/edithelper.inc.php';
 
 $tpl->name = 'mydetails';
 $tpl->menuitem = MNU_MYPROFILE_DETAILS;
@@ -51,8 +51,8 @@ 
 
         while ($record = sql_fetch_array($rs)) {
             $id = $record['id'];
-            $vis = isset($_REQUEST['chk' . $id]) ? $_REQUEST['chk' . $id] + 0 : 0;
-            $value = isset($_REQUEST['inp' . $id]) ? $_REQUEST['inp' . $id] : '';
+            $vis = isset($_REQUEST['chk'.$id]) ? $_REQUEST['chk'.$id] + 0 : 0;
+            $value = isset($_REQUEST['inp'.$id]) ? $_REQUEST['inp'.$id] : '';
             if ($vis != 1) {
                 $vis = 0;
             }
@@ -63,7 +63,7 @@ 
                 $bErrorlen = true;
             } else {
                 if (!$useroptions->setOptValue($id, $value)) {
-                    $error .= $useroptions->getOptName($id) . ', ';
+                    $error .= $useroptions->getOptName($id).', ';
                     $bError = true;
                 }
             }
@@ -172,7 +172,7 @@ 
         }
         if ($descMode == 3) {
             $tpl->add_header_javascript('resource2/tinymce/tiny_mce_gzip.js');
-            $tpl->add_header_javascript('resource2/tinymce/config/user.js.php?lang=' . strtolower($opt['template']['locale']));
+            $tpl->add_header_javascript('resource2/tinymce/config/user.js.php?lang='.strtolower($opt['template']['locale']));
         }
         $tpl->add_header_javascript(editorJsPath());
         $tpl->assign('descMode', $descMode);

htdocs/doc/sql/stored-proc/old/distance.php

Spacing +4 added lines, -4 removed lines

@@ -9,13 +9,13 @@
  ***************************************************************************/
 
 $opt['rootpath'] = '../../../';
-require_once $opt['rootpath'] . 'lib/clicompatbase.inc.php';
+require_once $opt['rootpath'].'lib/clicompatbase.inc.php';
 
-if (!file_exists($opt['rootpath'] . 'util/mysql_root/sql_root.inc.php')) {
-    die("\n" . 'install util/mysql_root/sql_root.inc.php' . "\n\n");
+if (!file_exists($opt['rootpath'].'util/mysql_root/sql_root.inc.php')) {
+    die("\n".'install util/mysql_root/sql_root.inc.php'."\n\n");
 }
 
-require_once $opt['rootpath'] . 'util/mysql_root/sql_root.inc.php';
+require_once $opt['rootpath'].'util/mysql_root/sql_root.inc.php';
 
 /* begin db connect */
 db_root_connect();

htdocs/doc/sql/stored-proc/maintain-113.inc.php

Spacing +3 added lines, -3 removed lines

@@ -448,7 +448,7 @@ 
 
    SELECT GROUP_CONCAT(DISTINCT `language` ORDER BY `language` SEPARATOR ',') INTO dl FROM `cache_desc` WHERE `cache_id`=nCacheId GROUP BY `cache_id` ;
    UPDATE `caches` SET `desc_languages`=dl, default_desclang=PREFERED_LANG(dl, '&1') WHERE `cache_id`=nCacheId LIMIT 1;
- END;", strtoupper($lang . ',EN'));
+ END;", strtoupper($lang.',EN'));
 
 // set caches.desc_languages of all caches, fill cache_desc_prefered and return number of modified rows
 sql_dropProcedure('sp_updateall_caches_descLanguages');
@@ -456,7 +456,7 @@ 
  BEGIN
    UPDATE `caches`, (SELECT `cache_id`, GROUP_CONCAT(DISTINCT `language` ORDER BY `language` SEPARATOR ',') AS `dl` FROM `cache_desc` GROUP BY `cache_id`) AS `tbl` SET `caches`.`desc_languages`=`tbl`.`dl`, `caches`.`default_desclang`=PREFERED_LANG(`tbl`.`dl`, '&1') WHERE `caches`.`cache_id`=`tbl`.`cache_id`;
    SET nModified = ROW_COUNT() ;
- END;", strtoupper($lang . ',EN'));
+ END;", strtoupper($lang.',EN'));
 
 // update found, last_found, notfound and note of stat_cache_logs, stat_caches and stat_user
 sql_dropProcedure('sp_update_logstat');
@@ -808,7 +808,7 @@ 
                     SET @dont_update_listingdate=0;
                 END;",
                 $opt['logic']['waypoint_pool']['prefix'],
-                '^' . $opt['logic']['waypoint_pool']['prefix'] . '[' . $opt['logic']['waypoint_pool']['valid_chars'] . ']{1,}$');
+                '^'.$opt['logic']['waypoint_pool']['prefix'].'['.$opt['logic']['waypoint_pool']['valid_chars'].']{1,}$');
 
 sql_dropTrigger('cachesAfterInsert');
 sql("CREATE TRIGGER `cachesAfterInsert` AFTER INSERT ON `caches`

htdocs/doc/sql/stored-proc/maintain-153.inc.php

Spacing +3 added lines, -3 removed lines

@@ -204,7 +204,7 @@ 
             LIMIT 1;
         END IF;
      END;",
-    strtoupper($lang . ',EN')
+    strtoupper($lang.',EN')
 );
 
 // set caches.desc_languages of all caches, fill cache_desc_prefered and return number of modified rows
@@ -225,7 +225,7 @@ 
         
         SET nModified = ROW_COUNT();
      END;",
-    strtoupper($lang . ',EN')
+    strtoupper($lang.',EN')
 );
 
 // update found, last_found, notfound and note of stat_cache_logs, stat_caches and stat_user,
@@ -909,7 +909,7 @@ 
         SET @dont_update_listingdate=0;
      END;",
     $opt['logic']['waypoint_pool']['prefix'],
-    '^' . $opt['logic']['waypoint_pool']['prefix'] . '[' . $opt['logic']['waypoint_pool']['valid_chars'] . ']{1,}$'
+    '^'.$opt['logic']['waypoint_pool']['prefix'].'['.$opt['logic']['waypoint_pool']['valid_chars'].']{1,}$'
 );
 
 sql_dropTrigger('cachesAfterInsert');

htdocs/doc/sql/stored-proc/maintain.php

Spacing +8 added lines, -8 removed lines

@@ -8,8 +8,8 @@ 
  *  Load current stored procs and triggers into database.
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../../../';
-require $opt['rootpath'] . 'lib2/cli.inc.php';
+$opt['rootpath'] = __DIR__.'/../../../';
+require $opt['rootpath'].'lib2/cli.inc.php';
 
 if ($opt['db']['maintenance_user'] == '') {
     die("ERROR: \$opt['db']['maintenance_user'] is not set in config2/settings.inc.php\n");
@@ -18,10 +18,10 @@ 
 // retrieve DB password
 if ($opt['db']['maintenance_password'] == '') {
     if (in_array('--flush', $argv)) {
-        echo "\nenter DB " . $opt['db']['maintenance_user'] . " password:\n";
+        echo "\nenter DB ".$opt['db']['maintenance_user']." password:\n";
         flush();
     } else {
-        echo 'enter DB ' . $opt['db']['maintenance_user'] . ' password: ';
+        echo 'enter DB '.$opt['db']['maintenance_user'].' password: ';
     }
 
     $fh = fopen('php://stdin', 'r');
@@ -44,13 +44,13 @@ 
 // include the requested maintain version file
 $dbsv = in_array('--dbsv', $argv);
 if ($dbsv) {
-    $versionfile = 'maintain-' . $argv[$dbsv + 1] . '.inc.php';
-    if (!file_exists(__DIR__ . '/' . $versionfile)) {
-        die($versionfile . " not found\n");
+    $versionfile = 'maintain-'.$argv[$dbsv + 1].'.inc.php';
+    if (!file_exists(__DIR__.'/'.$versionfile)) {
+        die($versionfile." not found\n");
     } else {
         require $versionfile;
     }
-    @unlink($opt['rootpath'] . 'cache2/dbsv-running');
+    @unlink($opt['rootpath'].'cache2/dbsv-running');
 } else {
     require 'maintain-current.inc.php';
 }

htdocs/articles.php

Spacing +10 added lines, -10 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 //get the article name to display
 $article = '';
@@ -23,20 +23,20 @@ 
     $tpl->redirect('index.php');
 } elseif (isset($_REQUEST['wiki'])) {
     $tpl->redirect(helppageurl($article));
-} elseif (!file_exists($opt['stylepath'] . '/articles/' . $language . '/' . $article . '.tpl')) {
+} elseif (!file_exists($opt['stylepath'].'/articles/'.$language.'/'.$article.'.tpl')) {
     // does article exist in default-language?
-    $file = $opt['stylepath'] . '/articles/' . $opt['template']['default']['article_locale'] . '/' . $article . '.tpl';
+    $file = $opt['stylepath'].'/articles/'.$opt['template']['default']['article_locale'].'/'.$article.'.tpl';
     if (file_exists($file)) {
         $language = $opt['template']['default']['article_locale'];
-    } elseif (file_exists($opt['stylepath'] . '/articles/EN/' . $article . '.tpl')) {
+    } elseif (file_exists($opt['stylepath'].'/articles/EN/'.$article.'.tpl')) {
         $language = 'EN';
     } else {
         // use any
         $language = false;
-        if ($hDir = opendir($opt['stylepath'] . '/articles/')) {
+        if ($hDir = opendir($opt['stylepath'].'/articles/')) {
             while ((($sFile = readdir($hDir)) !== false) && ($language === false)) {
-                if (($sFile != '.') && ($sFile != '..') && (is_dir($opt['stylepath'] . '/articles/' . $sFile))) {
-                    if (file_exists($opt['stylepath'] . '/articles/' . $sFile . '/' . $article . '.tpl')) {
+                if (($sFile != '.') && ($sFile != '..') && (is_dir($opt['stylepath'].'/articles/'.$sFile))) {
+                    if (file_exists($opt['stylepath'].'/articles/'.$sFile.'/'.$article.'.tpl')) {
                         $language = $sFile;
                     }
                 }
@@ -54,13 +54,13 @@ 
 $tpl->name = 'articles';
 
 $tpl->caching = true;
-$tpl->cache_id = 'articles|' . $language . '|' . $article;
+$tpl->cache_id = 'articles|'.$language.'|'.$article;
 $tpl->cache_lifetime = 43200;
 
 $tpl->menuitem = sql_value(
     "SELECT `id` FROM `sys_menu` WHERE `href`='&1' LIMIT 1",
     0,
-    'articles.php?page=' . urlencode($article)
+    'articles.php?page='.urlencode($article)
 );
 if ($tpl->menuitem == 0) {
     $tpl->redirect('index.php');
@@ -74,7 +74,7 @@ 
     /* prepare smarty vars for special pages ...
      */
     if ($article == 'cacheinfo') {
-        require_once $opt['rootpath'] . 'lib2/logic/attribute.class.php';
+        require_once $opt['rootpath'].'lib2/logic/attribute.class.php';
         $attributes = attribute::getSelectableAttrbutesListArray(true);
         $tpl->assign('attributes', $attributes);
     }

htdocs/activation.php

Spacing +3 added lines, -5 removed lines

@@ -6,7 +6,7 @@ 
  ***************************************************************************/
 
 $disable_verifyemail = true;
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'activation';
 $tpl->menuitem = MNU_START_REGISTER_ACTIVATION;
@@ -14,10 +14,8 @@ 
 // We use short param codes 'u' and 'c' to generate short-enough activation
 // url that will not be wrapped in plain-text emails.
 
-$code = isset($_REQUEST['code']) ? trim($_REQUEST['code']) :
-    (isset($_REQUEST['c']) ? trim($_REQUEST['c']) : '');
-$email = isset($_REQUEST['email']) ? trim($_REQUEST['email']) :
-    (isset($_REQUEST['e']) ? trim($_REQUEST['e']) : '');
+$code = isset($_REQUEST['code']) ? trim($_REQUEST['code']) : (isset($_REQUEST['c']) ? trim($_REQUEST['c']) : '');
+$email = isset($_REQUEST['email']) ? trim($_REQUEST['email']) : (isset($_REQUEST['e']) ? trim($_REQUEST['e']) : '');
 
 $tpl->assign('errorEMail', false);
 $tpl->assign('errorCode', false);

htdocs/addtolist.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 = 'addtolist';
 $tpl->menuitem = MNU_CACHES_ADDTOLIST;
@@ -22,7 +22,7 @@ 
 $tpl->assign('cacheid', $cacheid);
 
 if (isset($_REQUEST['cancel'])) {
-    $tpl->redirect('viewcache.php?cacheid=' . $cacheid);
+    $tpl->redirect('viewcache.php?cacheid='.$cacheid);
 }
 
 $newlist_name = isset($_REQUEST['newlist_name']) ? trim($_REQUEST['newlist_name']) : false;
@@ -44,14 +44,14 @@ 
                     $cachelist->watch(true);
                 }
             }
-            $tpl->redirect('viewcache.php?cacheid=' . $cacheid);
+            $tpl->redirect('viewcache.php?cacheid='.$cacheid);
         }
     } else {
         $cachelist = new cachelist($listid);
         if ($cachelist->exist()) {
             $cachelist->addCacheByID($cacheid);
         }
-        $tpl->redirect('viewcache.php?cacheid=' . $cacheid);
+        $tpl->redirect('viewcache.php?cacheid='.$cacheid);
     }
 }
 

htdocs/newlogs.php

Spacing +17 added lines, -17 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $add_where = '';
 $newLogsPerCountry = $opt['logic']['new_logs_per_country'];
@@ -30,9 +30,9 @@ 
     $country = false;
     $exclude_country = '*';
     $include_country = '%';
-    $add_where = "AND `caches`.`user_id`='" . sql_escape($ownerid) . "' ";
+    $add_where = "AND `caches`.`user_id`='".sql_escape($ownerid)."' ";
     if (!$show_own_logs) {
-        $add_where .= "AND `cache_logs`.`user_id`<>'" . sql_escape($login->userid) . "' ";
+        $add_where .= "AND `cache_logs`.`user_id`<>'".sql_escape($login->userid)."' ";
     }
     $tpl->caching = false;
     $logcount = 100;
@@ -49,7 +49,7 @@ 
     $country = false;
     $exclude_country = '*';
     $include_country = '%';
-    $add_where = "AND `cache_logs`.`user_id`='" . sql_escape($userid) . "' ";
+    $add_where = "AND `cache_logs`.`user_id`='".sql_escape($userid)."' ";
     $tpl->caching = false;
     $logcount = 100;
     $paging = true;
@@ -69,7 +69,7 @@ 
     $tpl->cache_lifetime = 900;
     $tpl->cache_id = $exclude_country;
     $logcount = 250;
-    $paging = false;  // paging would have poor performance for all logs
+    $paging = false; // paging would have poor performance for all logs
     $orderByDate = $logselection == 3 ? "{fromtable}.`order_date` DESC, " : "";
 } else {
     // latest logs for all countries or for one country
@@ -88,7 +88,7 @@ 
     $tpl->cache_lifetime = 300;
     $tpl->cache_id = $country;
     $logcount = 250;
-    $paging = false;  // paging would have poor performance for all logs
+    $paging = false; // paging would have poor performance for all logs
     $orderByDate = $logselection == 3 ? "{fromtable}.`order_date` DESC, " : "";
     $optimize_for_latest_logs = ($country == '' || $country == $opt['page']['main_country']);
 }
@@ -101,7 +101,7 @@ 
 if ($logselection == 1) {
     $add_where .= "AND DATEDIFF(NOW(), {fromtable}.`date`) < 30 ";
 }
-$tpl->cache_id .= "|" . $logselection;
+$tpl->cache_id .= "|".$logselection;
 
 $tpl->change_country_inpage = true;
 
@@ -121,7 +121,7 @@ 
                 `needs_maintenance`, `listing_outdated`, `order_date`
              FROM `cache_logs`
              ORDER BY `date_created` DESC
-             LIMIT " . (4 * $logcount) . ")"
+             LIMIT " . (4 * $logcount).")"
         );
         $fromtable = '`&loglist0`';
     } else {
@@ -132,16 +132,16 @@ 
     sql_temp_table_slave('loglist');
     sql_slave(
         "CREATE TEMPORARY TABLE &loglist (`id` INT(11) PRIMARY KEY)
-        SELECT " . ($paging ? "SQL_CALC_FOUND_ROWS" : "") . " " . $fromtable . ".`id`
-        FROM " . $fromtable . "
-        INNER JOIN `caches` ON " . $fromtable . ".`cache_id`=`caches`.`cache_id`
+        SELECT " . ($paging ? "SQL_CALC_FOUND_ROWS" : "")." ".$fromtable.".`id`
+        FROM " . $fromtable."
+        INNER JOIN `caches` ON " . $fromtable.".`cache_id`=`caches`.`cache_id`
         INNER JOIN `cache_status` ON `caches`.`status`=`cache_status`.`id`
-        INNER JOIN `user` ON " . $fromtable . ".`user_id`=`user`.`user_id`
+        INNER JOIN `user` ON " . $fromtable.".`user_id`=`user`.`user_id`
         WHERE `cache_status`.`allow_user_view`=1
         AND `caches`.`country` LIKE '&1'
         AND `caches`.`country`<>'&2'
-        " . $add_where . "
-        ORDER BY " . str_replace("{fromtable}", $fromtable, $orderByDate) . $fromtable . ".`date_created` DESC
+        " . $add_where."
+        ORDER BY " . str_replace("{fromtable}", $fromtable, $orderByDate).$fromtable.".`date_created` DESC
         LIMIT &3, &4",
         $include_country,
         $exclude_country,
@@ -202,7 +202,7 @@ 
             ON `caches_attributes`.`cache_id`=`caches`.`cache_id`
             AND `caches_attributes`.`attrib_id`=6
         WHERE IFNULL(`cache_logs_restored`.`restored_by`,0)=0
-        ORDER BY " . $orderByCountry . str_replace("{fromtable}", "`cache_logs`", $orderByDate) . "`cache_logs`.`date_created` DESC",
+        ORDER BY " . $orderByCountry.str_replace("{fromtable}", "`cache_logs`", $orderByDate)."`cache_logs`.`date_created` DESC",
         $opt['template']['locale']
     );
 
@@ -247,7 +247,7 @@ 
             }
             sql_free_result($rsPic);
         }
-        $pics --;
+        $pics--;
 
         $rLog['first'] = false;
         if (isset($caches_logged)) {
@@ -301,7 +301,7 @@ 
 
     $tpl->assign('paging', $paging);
     if ($paging) {
-        $pager = new pager($_SERVER["SCRIPT_NAME"] . '?startat={offset}' . $urlparams);
+        $pager = new pager($_SERVER["SCRIPT_NAME"].'?startat={offset}'.$urlparams);
         $pager->make_from_offset($startat, $total_logs, $logcount);
     }
 }