OpencachingDeutschland / oc-server3

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

Spacing +3 added lines, -3 removed lines

@@ -400,7 +400,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
@@ -421,7 +421,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,
@@ -1105,7 +1105,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/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/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/newemail.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
  ***************************************************************************/
 
 $disable_verifyemail = true;
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'newemail';
 $tpl->menuitem = MNU_MYPROFILE_DATA;

htdocs/myhome.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'myhome';
 $tpl->menuitem = MNU_MYPROFILE_OVERVIEW;

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);
     }
 }