OpencachingDeutschland / oc-server3

htdocs/okapi/views/changelog.tpl.php

Spacing +4 added lines, -4 removed lines

@@ -46,10 +46,10 @@ 
                         foreach ($vars['changes'] as $type => $changes) {
                             if (count($changes)) {
                                 if ($type == 'unavailable') {
-                                    echo "<p>The following changes are not available yet at " . $vars['site_name'] . ":</p>";
+                                    echo "<p>The following changes are not available yet at ".$vars['site_name'].":</p>";
                                     $br = '<br />';
                                 } else {
-                                    echo "<p>".$br."The following changes are available at " . $vars['site_name'] . ":</p>";
+                                    echo "<p>".$br."The following changes are available at ".$vars['site_name'].":</p>";
                                 } ?>
 
                                 <table cellspacing='1px' class='changelog'>
@@ -58,11 +58,11 @@ 
                                         <th>Date</th>
                                         <th>Change</th>
                                     </th>
-                                <?php foreach($changes as $change) { ?>
+                                <?php foreach ($changes as $change) { ?>
                                     <tr id="v<?= $change['version'] ?>">
                                         <td><a href="https://github.com/opencaching/okapi/tree/<?= $change['commit'] ?>"><?= $change['version'] ?></a></td>
                                         <td><?= substr($change['time'], 0, 10) ?></td>
-                                        <td><?= ($change['type'] == 'bugfix' ? 'Fixed: ' : '') . $change['comment'] ?></td>
+                                        <td><?= ($change['type'] == 'bugfix' ? 'Fixed: ' : '').$change['comment'] ?></td>
                                     </tr>
                                 <?php } ?>
                                 </table>

htdocs/okapi/lib/ocpl_access_logs.php

Spacing +22 added lines, -22 removed lines

@@ -22,14 +22,14 @@ 
         // traverse PHP call stack to find out who originally called us
         // first, find first service_runner.php invocation
         // then, find previous class invocation
-        for($i = count($trace)-1; $i >= 0; $i--)
+        for ($i = count($trace) - 1; $i >= 0; $i--)
         {
             $frame = $trace[$i];
             if ($break_next && isset($frame['class']))
             {
                 $class_elems = explode('\\', $frame['class']);
                 if (count($class_elems) >= 2)
-                    $org_caller = $class_elems[count($class_elems)-2];
+                    $org_caller = $class_elems[count($class_elems) - 2];
                 break;
             }
             if (isset($frame['file']) &&
@@ -51,40 +51,40 @@ 
     public static function log_geocache_access(OkapiRequest $request, $cache_ids)
     {
         if (Settings::get('OCPL_ENABLE_GEOCACHE_ACCESS_LOGS') !== true)
-            return ;
+            return;
 
         if (Settings::get('OC_BRANCH') == 'oc.pl')
         {
             // TODO: can we use the _SERVER global here? or should we make them abstract, and
             // pass along with request object?
-            $remote_addr_escaped = "'" . Db::escape_string($_SERVER['REMOTE_ADDR']) . "'";
+            $remote_addr_escaped = "'".Db::escape_string($_SERVER['REMOTE_ADDR'])."'";
             $user_agent_escaped = isset($_SERVER['HTTP_USER_AGENT']) ?
-                "'" . Db::escape_string($_SERVER['HTTP_USER_AGENT']) . "'" : "null";
+                "'".Db::escape_string($_SERVER['HTTP_USER_AGENT'])."'" : "null";
             $forwarded_for_escaped = isset($_SERVER['HTTP_X_FORWARDED_FOR']) ?
-                "'" . Db::escape_string($_SERVER['HTTP_X_FORWARDED_FOR']) . "'" : "null";
+                "'".Db::escape_string($_SERVER['HTTP_X_FORWARDED_FOR'])."'" : "null";
 
-            $consumer_key_escaped = "'" . Db::escape_string($request->consumer->key) . "'";
-            $original_caller_escaped = "'" . Db::escape_string(self::get_original_caller()) . "'";
+            $consumer_key_escaped = "'".Db::escape_string($request->consumer->key)."'";
+            $original_caller_escaped = "'".Db::escape_string(self::get_original_caller())."'";
 
             $user_id = null;
             if ($request->token != null)
                 $user_id = $request->token->user_id;
-            $user_id_escaped = $user_id === null ? "null" : "'" . Db::escape_string($user_id) . "'";
-            if (is_array($cache_ids)){
+            $user_id_escaped = $user_id === null ? "null" : "'".Db::escape_string($user_id)."'";
+            if (is_array($cache_ids)) {
                 if (count($cache_ids) == 1)
-                    $cache_ids_where = "= '" . Db::escape_string($cache_ids[0]) . "'";
+                    $cache_ids_where = "= '".Db::escape_string($cache_ids[0])."'";
                 else
-                    $cache_ids_where = "in ('" . implode("','", array_map('\okapi\Db::escape_string', $cache_ids)) . "')";
+                    $cache_ids_where = "in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_ids))."')";
             } else {
-                $cache_ids_where = "= '" . Db::escape_string($cache_ids) . "'";
+                $cache_ids_where = "= '".Db::escape_string($cache_ids)."'";
             }
 
             $sql = "
                 select cache_id
                 from CACHE_ACCESS_LOGS cal
                 where
-                    cache_id $cache_ids_where" .
-                    ($user_id === null ? " and cal.user_id is null" : " and cal.user_id = $user_id_escaped") . "
+                    cache_id $cache_ids_where".
+                    ($user_id === null ? " and cal.user_id is null" : " and cal.user_id = $user_id_escaped")."
                     and cal.source = 'O'
                     and cal.event = $original_caller_escaped
                     and cal.okapi_consumer_key = $consumer_key_escaped
@@ -101,30 +101,30 @@ 
             if (is_array($cache_ids) && count($already_logged_cache_ids) == count($cache_ids)
                 || !is_array($cache_ids) && count($already_logged_cache_ids) == 1)
             {
-                return ;
+                return;
             }
 
-            if (is_array($cache_ids)){
+            if (is_array($cache_ids)) {
                 $tmp = array();
                 foreach ($cache_ids as $cache_id)
                     $tmp[$cache_id] = true;
                 foreach ($already_logged_cache_ids as $cache_id)
                     unset($tmp[$cache_id]);
                 if (count($tmp) <= 0)
-                    return ;
+                    return;
                 $cache_ids_filterd = array_keys($tmp);
                 unset($tmp);
             } else {
                 $cache_ids_filterd = $cache_ids;
             }
 
-            if (is_array($cache_ids_filterd)){
+            if (is_array($cache_ids_filterd)) {
                 if (count($cache_ids_filterd) == 1)
-                    $cache_ids_where = "= '" . Db::escape_string($cache_ids_filterd[0]) . "'";
+                    $cache_ids_where = "= '".Db::escape_string($cache_ids_filterd[0])."'";
                 else
-                    $cache_ids_where = "in ('" . implode("','", array_map('\okapi\Db::escape_string', $cache_ids_filterd)) . "')";
+                    $cache_ids_where = "in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_ids_filterd))."')";
             } else {
-                $cache_ids_where = "= '" . Db::escape_string($cache_ids_filterd) . "'";
+                $cache_ids_where = "= '".Db::escape_string($cache_ids_filterd)."'";
             }
 
             Db::execute("

Braces +36 added lines, -33 removed lines

@@ -22,20 +22,18 @@ 
         // traverse PHP call stack to find out who originally called us
         // first, find first service_runner.php invocation
         // then, find previous class invocation
-        for($i = count($trace)-1; $i >= 0; $i--)
-        {
+        for($i = count($trace)-1; $i >= 0; $i--) {
             $frame = $trace[$i];
-            if ($break_next && isset($frame['class']))
-            {
+            if ($break_next && isset($frame['class'])) {
                 $class_elems = explode('\\', $frame['class']);
-                if (count($class_elems) >= 2)
-                    $org_caller = $class_elems[count($class_elems)-2];
+                if (count($class_elems) >= 2) {
+                                    $org_caller = $class_elems[count($class_elems)-2];
+                }
                 break;
             }
             if (isset($frame['file']) &&
                     // test if file ends with service_runner.php
-                    substr($frame['file'], -strlen('service_runner.php')) === 'service_runner.php')
-            {
+                    substr($frame['file'], -strlen('service_runner.php')) === 'service_runner.php') {
                 $break_next = true;
             }
         }
@@ -50,11 +48,11 @@ 
      */
     public static function log_geocache_access(OkapiRequest $request, $cache_ids)
     {
-        if (Settings::get('OCPL_ENABLE_GEOCACHE_ACCESS_LOGS') !== true)
-            return ;
+        if (Settings::get('OCPL_ENABLE_GEOCACHE_ACCESS_LOGS') !== true) {
+                    return ;
+        }
 
-        if (Settings::get('OC_BRANCH') == 'oc.pl')
-        {
+        if (Settings::get('OC_BRANCH') == 'oc.pl') {
             // TODO: can we use the _SERVER global here? or should we make them abstract, and
             // pass along with request object?
             $remote_addr_escaped = "'" . Db::escape_string($_SERVER['REMOTE_ADDR']) . "'";
@@ -67,14 +65,16 @@ 
             $original_caller_escaped = "'" . Db::escape_string(self::get_original_caller()) . "'";
 
             $user_id = null;
-            if ($request->token != null)
-                $user_id = $request->token->user_id;
+            if ($request->token != null) {
+                            $user_id = $request->token->user_id;
+            }
             $user_id_escaped = $user_id === null ? "null" : "'" . Db::escape_string($user_id) . "'";
-            if (is_array($cache_ids)){
-                if (count($cache_ids) == 1)
-                    $cache_ids_where = "= '" . Db::escape_string($cache_ids[0]) . "'";
-                else
-                    $cache_ids_where = "in ('" . implode("','", array_map('\okapi\Db::escape_string', $cache_ids)) . "')";
+            if (is_array($cache_ids)) {
+                if (count($cache_ids) == 1) {
+                                    $cache_ids_where = "= '" . Db::escape_string($cache_ids[0]) . "'";
+                } else {
+                                    $cache_ids_where = "in ('" . implode("','", array_map('\okapi\Db::escape_string', $cache_ids)) . "')";
+                }
             } else {
                 $cache_ids_where = "= '" . Db::escape_string($cache_ids) . "'";
             }
@@ -99,30 +99,33 @@ 
 
             // check, if all the geocaches has already been logged
             if (is_array($cache_ids) && count($already_logged_cache_ids) == count($cache_ids)
-                || !is_array($cache_ids) && count($already_logged_cache_ids) == 1)
-            {
+                || !is_array($cache_ids) && count($already_logged_cache_ids) == 1) {
                 return ;
             }
 
-            if (is_array($cache_ids)){
+            if (is_array($cache_ids)) {
                 $tmp = array();
-                foreach ($cache_ids as $cache_id)
-                    $tmp[$cache_id] = true;
-                foreach ($already_logged_cache_ids as $cache_id)
-                    unset($tmp[$cache_id]);
-                if (count($tmp) <= 0)
-                    return ;
+                foreach ($cache_ids as $cache_id) {
+                                    $tmp[$cache_id] = true;
+                }
+                foreach ($already_logged_cache_ids as $cache_id) {
+                                    unset($tmp[$cache_id]);
+                }
+                if (count($tmp) <= 0) {
+                                    return ;
+                }
                 $cache_ids_filterd = array_keys($tmp);
                 unset($tmp);
             } else {
                 $cache_ids_filterd = $cache_ids;
             }
 
-            if (is_array($cache_ids_filterd)){
-                if (count($cache_ids_filterd) == 1)
-                    $cache_ids_where = "= '" . Db::escape_string($cache_ids_filterd[0]) . "'";
-                else
-                    $cache_ids_where = "in ('" . implode("','", array_map('\okapi\Db::escape_string', $cache_ids_filterd)) . "')";
+            if (is_array($cache_ids_filterd)) {
+                if (count($cache_ids_filterd) == 1) {
+                                    $cache_ids_where = "= '" . Db::escape_string($cache_ids_filterd[0]) . "'";
+                } else {
+                                    $cache_ids_where = "in ('" . implode("','", array_map('\okapi\Db::escape_string', $cache_ids_filterd)) . "')";
+                }
             } else {
                 $cache_ids_where = "= '" . Db::escape_string($cache_ids_filterd) . "'";
             }

htdocs/ownlogs.php

Spacing +2 added lines, -2 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'ownlogs';
 $tpl->menuitem = MNU_MYPROFILE_OWNLOGS;
@@ -18,4 +18,4 @@ 
 
 $tpl->assign('ownlogs', true);
 
-require __DIR__ . '/newlogs.php';
+require __DIR__.'/newlogs.php';

htdocs/404.php

Spacing +3 added lines, -3 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $sUserCountry = $login->getUserCountry();
 
@@ -27,10 +27,10 @@ 
 if ($isRedirect404) {
     // check length
     $uril = 70;
-    $uri = 'http://' . strtolower($_SERVER['SERVER_NAME']) . $_SERVER['REQUEST_URI'];
+    $uri = 'http://'.strtolower($_SERVER['SERVER_NAME']).$_SERVER['REQUEST_URI'];
     // limit to $uril
     if (strlen($uri) > $uril) {
-        $uri = substr($uri, 0, $uril - 3) . '...';
+        $uri = substr($uri, 0, $uril - 3).'...';
     }
 
     // assign uri

htdocs/api/user_inactivity.php

Spacing +2 added lines, -2 removed lines

@@ -5,8 +5,8 @@
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../';
-require $opt['rootpath'] . 'lib2/web.inc.php';
+$opt['rootpath'] = __DIR__.'/../';
+require $opt['rootpath'].'lib2/web.inc.php';
 
 header('Content-type: text/plain; charset=utf-8');
 

htdocs/api/email_problems.php

Spacing +3 added lines, -3 removed lines

@@ -5,8 +5,8 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../';
-require $opt['rootpath'] . 'lib2/web.inc.php';
+$opt['rootpath'] = __DIR__.'/../';
+require $opt['rootpath'].'lib2/web.inc.php';
 
 header('Content-type: text/plain; charset=utf-8');
 
@@ -16,7 +16,7 @@ 
 ) {
     $rs = sql('SELECT `user_id`, `email_problems` FROM `user` WHERE `email_problems`');
     while ($r = sql_fetch_assoc($rs)) {
-        echo $r['user_id'] . ' ' . $r['email_problems'] . "\n";
+        echo $r['user_id'].' '.$r['email_problems']."\n";
     }
     sql_free_result($rs);
 }

htdocs/api/hidden_caches.php

Spacing +3 added lines, -3 removed lines

@@ -9,8 +9,8 @@ 
  *  replicated system than the XML interface.
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../';
-require $opt['rootpath'] . 'lib2/web.inc.php';
+$opt['rootpath'] = __DIR__.'/../';
+require $opt['rootpath'].'lib2/web.inc.php';
 
 header('Content-type: text/plain; charset=utf-8');
 
@@ -24,5 +24,5 @@ 
 );
 $wp_ocs = sql_fetch_column($rs);
 foreach ($wp_ocs as $wp_oc) {
-    echo $wp_oc . "\n";
+    echo $wp_oc."\n";
 }

htdocs/api/ping.php

Spacing +2 added lines, -2 removed lines

@@ -5,8 +5,8 @@
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../';
-require $opt['rootpath'] . 'lib2/web.inc.php';
+$opt['rootpath'] = __DIR__.'/../';
+require $opt['rootpath'].'lib2/web.inc.php';
 
 header('Content-type: text/plain; charset=utf-8');
 echo sql_value('SELECT NOW()', '');

htdocs/api/gc2oc.php

Spacing +2 added lines, -2 removed lines

@@ -13,8 +13,8 @@
  *
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../';
-require $opt['rootpath'] . 'lib2/web.inc.php';
+$opt['rootpath'] = __DIR__.'/../';
+require $opt['rootpath'].'lib2/web.inc.php';
 
 if (isset($_REQUEST['report']) && $_REQUEST['report']) {
     header('Content-type: text/plain');