OpencachingDeutschland / oc-server3

htdocs/okapi/services/apiref/method.php

Spacing +12 added lines, -12 removed lines

@@ -30,7 +30,7 @@ 
             'is_deprecated' => (isset($attrs['class']) && (strpos($attrs['class'], 'deprecated') !== false)),
             'class' => 'public',
             'description' =>
-                (isset($attrs['default']) ? ("<p>Default value: <b>".$attrs['default']."</b></p>") : "").
+                (isset($attrs['default']) ? ("<p>Default value: <b>" . $attrs['default'] . "</b></p>") : "") .
                 self::get_inner_xml($arg_node),
 
         );
@@ -96,7 +96,7 @@ 
         switch ($plugin_name) {
             case 'docurl':
                 $fragment = $arr[1];
-                return Settings::get('SITE_URL')."okapi/introduction.html#".$fragment;
+                return Settings::get('SITE_URL') . "okapi/introduction.html#" . $fragment;
             case 'methodref':
             case 'methodargref':
             case 'methodretref':
@@ -104,7 +104,7 @@ 
                 $result = '';
                 if ($elements[0] != '')
                 {
-                    $result .= Settings::get('SITE_URL')."okapi/".$elements[0].'.html';
+                    $result .= Settings::get('SITE_URL') . "okapi/" . $elements[0] . '.html';
                 }
                 if (count($elements) > 1)
                 {
@@ -121,7 +121,7 @@ 
                 }
                 return $result;
             default:
-                throw new Exception("Unknown plugin: ".$input);
+                throw new Exception("Unknown plugin: " . $input);
         }
     }
 
@@ -142,7 +142,7 @@ 
         $result = array(
             'name' => $methodname,
             'short_name' => end($exploded),
-            'ref_url' => Settings::get('SITE_URL')."okapi/$methodname.html",
+            'ref_url' => Settings::get('SITE_URL') . "okapi/$methodname.html",
             'auth_options' => array(
                 'min_auth_level' => $options['min_auth_level'],
                 'oauth_consumer' => $options['min_auth_level'] >= 2,
@@ -184,15 +184,15 @@ 
                     continue;
                 if (($include_list === null) && (count($exclude_list) == 0))
                 {
-                    $arg['description'] = "<i>Inherited from <a href='".$referenced_method_info['ref_url'].
-                        "#arg_". $arg['name'] . "'>".$referenced_method_info['name']."</a> method.</i>";
+                    $arg['description'] = "<i>Inherited from <a href='" . $referenced_method_info['ref_url'] .
+                        "#arg_" . $arg['name'] . "'>" . $referenced_method_info['name'] . "</a> method.</i>";
                 }
                 elseif (
                     (($include_list === null) || in_array($arg['name'], $include_list))
                     && (!in_array($arg['name'], $exclude_list))
                 ) {
-                    $arg['description'] = "<i>Same as in the <a href='".$referenced_method_info['ref_url'].
-                        "#arg_". $arg['name'] . "'>".$referenced_method_info['name']."</a> method.</i>";
+                    $arg['description'] = "<i>Same as in the <a href='" . $referenced_method_info['ref_url'] .
+                        "#arg_" . $arg['name'] . "'>" . $referenced_method_info['name'] . "</a> method.</i>";
                 } else {
                     continue;
                 }
@@ -207,21 +207,21 @@ 
                 'is_required' => false,
                 'is_deprecated' => false,
                 'class' => 'common-formatting',
-                'description' => "<i>Standard <a href='".Settings::get('SITE_URL')."okapi/introduction.html#common-formatting'>common formatting</a> argument.</i>"
+                'description' => "<i>Standard <a href='" . Settings::get('SITE_URL') . "okapi/introduction.html#common-formatting'>common formatting</a> argument.</i>"
             );
             $result['arguments'][] = array(
                 'name' => 'callback',
                 'is_required' => false,
                 'is_deprecated' => false,
                 'class' => 'common-formatting',
-                'description' => "<i>Standard <a href='".Settings::get('SITE_URL')."okapi/introduction.html#common-formatting'>common formatting</a> argument.</i>"
+                'description' => "<i>Standard <a href='" . Settings::get('SITE_URL') . "okapi/introduction.html#common-formatting'>common formatting</a> argument.</i>"
             );
         }
         foreach ($result['arguments'] as &$arg_ref)
             if ($arg_ref['is_deprecated'])
                 $arg_ref['class'] .= " deprecated";
         if (!$docs->returns)
-            throw new Exception("Missing <returns> element in the $methodname.xml file. ".
+            throw new Exception("Missing <returns> element in the $methodname.xml file. " .
                 "If your method does not return anything, you should document in nonetheless.");
         $result['returns'] = self::get_inner_xml($docs->returns);
         return Okapi::formatted_response($request, $result);

htdocs/okapi/services/logs/submit.php

Spacing +65 added lines, -65 removed lines

@@ -70,10 +70,10 @@ 
                     'when', "'$tmp' is not in a valid format or is not a valid date."
                 );
             }
-            if ($when > time() + 5*60) {
+            if ($when > time() + 5 * 60) {
                 throw new CannotPublishException(_(
-                    "You are trying to publish a log entry with a date in ".
-                    "future. Cache log entries are allowed to be published in ".
+                    "You are trying to publish a log entry with a date in " .
+                    "future. Cache log entries are allowed to be published in " .
                     "the past, but NOT in the future."
                 ));
             }
@@ -91,7 +91,7 @@ 
         }
 
         $rating = $request->get_parameter('rating');
-        if ($rating !== null && (!in_array($rating, array(1,2,3,4,5)))) {
+        if ($rating !== null && (!in_array($rating, array(1, 2, 3, 4, 5)))) {
             throw new InvalidParam(
                 'rating', "If present, it must be an integer in the 1..5 scale."
             );
@@ -107,8 +107,8 @@ 
             # (which will be returned IF the rest of the query will meet all the
             # requirements).
 
-            self::$success_message .= " ".sprintf(_(
-                "However, your cache rating was ignored, because %s does not ".
+            self::$success_message .= " " . sprintf(_(
+                "However, your cache rating was ignored, because %s does not " .
                 "have a rating system."
             ), Okapi::get_normalized_site_name());
             $rating = null;
@@ -132,8 +132,8 @@ 
                 # (which will be returned IF the rest of the query will meet all the
                 # requirements).
 
-                self::$success_message .= " ".sprintf(_(
-                    "However, your cache recommendation was ignored, because ".
+                self::$success_message .= " " . sprintf(_(
+                    "However, your cache recommendation was ignored, because " .
                     "%s does not allow recommending event caches."
                 ), Okapi::get_normalized_site_name());
                 $recommend = null;
@@ -147,7 +147,7 @@ 
         $needs_maintenance2 = $request->get_parameter('needs_maintenance2');
         if ($needs_maintenance && $needs_maintenance2) {
             throw new BadRequest(
-                "You cannot use both of these parameters at the same time: ".
+                "You cannot use both of these parameters at the same time: " .
                 "needs_maintenance and needs_maintenance2."
             );
         }
@@ -181,8 +181,8 @@ 
         ) {
             # If not supported, just ignore it.
 
-            self::$success_message .= " ".sprintf(_(
-                "However, your \"does not need maintenance\" flag was ignored, because ".
+            self::$success_message .= " " . sprintf(_(
+                "However, your \"does not need maintenance\" flag was ignored, because " .
                 "%s does not yet support this feature."
             ), Okapi::get_normalized_site_name());
             $needs_maintenance2 = 'null';
@@ -212,7 +212,7 @@ 
         {
             if (!in_array($logtype, array('Will attend', 'Attended', 'Comment'))) {
                 throw new CannotPublishException(_(
-                    'This cache is an Event cache. You cannot "Find" it (but '.
+                    'This cache is an Event cache. You cannot "Find" it (but ' .
                     'you can attend it, or comment on it)!'
                 ));
             }
@@ -221,7 +221,7 @@ 
         {
             if (in_array($logtype, array('Will attend', 'Attended'))) {
                 throw new CannotPublishException(_(
-                    'This cache is NOT an Event cache. You cannot "Attend" it '.
+                    'This cache is NOT an Event cache. You cannot "Attend" it ' .
                     '(but you can find it, or comment on it)!'
                 ));
             }
@@ -242,7 +242,7 @@ 
             $valid_password = Db::select_value("
                 select logpw
                 from caches
-                where cache_id = '".Db::escape_string($cache['internal_id'])."'
+                where cache_id = '".Db::escape_string($cache['internal_id']) . "'
             ");
             $supplied_password = $request->get_parameter('password');
             if (!$supplied_password) {
@@ -358,8 +358,8 @@ 
             select 1
             from cache_logs
             where
-                user_id = '".Db::escape_string($request->token->user_id)."'
-                and cache_id = '".Db::escape_string($cache['internal_id'])."'
+                user_id = '".Db::escape_string($request->token->user_id) . "'
+                and cache_id = '".Db::escape_string($cache['internal_id']) . "'
             for update
         ");
 
@@ -378,12 +378,12 @@ 
                 select uuid
                 from cache_logs
                 where
-                    user_id = '".Db::escape_string($request->token->user_id)."'
-                    and cache_id = '".Db::escape_string($cache['internal_id'])."'
-                    and type = '".Db::escape_string(Okapi::logtypename2id($logtype))."'
-                    and date = from_unixtime('".Db::escape_string($when)."')
-                    and text = '".Db::escape_string($formatted_comment)."'
-                    ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "and deleted = 0" : "")."
+                    user_id = '".Db::escape_string($request->token->user_id) . "'
+                    and cache_id = '".Db::escape_string($cache['internal_id']) . "'
+                    and type = '".Db::escape_string(Okapi::logtypename2id($logtype)) . "'
+                    and date = from_unixtime('".Db::escape_string($when) . "')
+                    and text = '".Db::escape_string($formatted_comment) . "'
+                    ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "and deleted = 0" : "") . "
                 limit 1
             ");
             if ($duplicate_uuid != null)
@@ -396,7 +396,7 @@ 
                 elseif ($on_duplicate == 'user_error')
                 {
                     throw new CannotPublishException(_(
-                        "You have already submitted a log entry with exactly ".
+                        "You have already submitted a log entry with exactly " .
                         "the same contents."
                     ));
                 }
@@ -416,20 +416,20 @@ 
                 select 1
                 from cache_logs
                 where
-                    user_id = '".Db::escape_string($user['internal_id'])."'
-                    and cache_id = '".Db::escape_string($cache['internal_id'])."'
-                    and type = '".Db::escape_string(Okapi::logtypename2id("Found it"))."'
-                    and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "deleted = 0" : "true")."
+                    user_id = '".Db::escape_string($user['internal_id']) . "'
+                    and cache_id = '".Db::escape_string($cache['internal_id']) . "'
+                    and type = '".Db::escape_string(Okapi::logtypename2id("Found it")) . "'
+                    and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "deleted = 0" : "true") . "
             ");
             if ($has_already_found_it) {
                 throw new CannotPublishException(_(
-                    "You have already submitted a \"Found it\" log entry once. ".
+                    "You have already submitted a \"Found it\" log entry once. " .
                     "Now you may submit \"Comments\" only!"
                 ));
             }
             if ($user['uuid'] == $cache['owner']['uuid']) {
                 throw new CannotPublishException(_(
-                    "You are the owner of this cache. You may submit ".
+                    "You are the owner of this cache. You may submit " .
                     "\"Comments\" only!"
                 ));
             }
@@ -446,12 +446,12 @@ 
                 select 1
                 from scores
                 where
-                    user_id = '".Db::escape_string($user['internal_id'])."'
-                    and cache_id = '".Db::escape_string($cache['internal_id'])."'
+                    user_id = '".Db::escape_string($user['internal_id']) . "'
+                    and cache_id = '".Db::escape_string($cache['internal_id']) . "'
             ");
             if ($has_already_rated) {
                 throw new CannotPublishException(_(
-                    "You have already rated this cache once. Your rating ".
+                    "You have already rated this cache once. Your rating " .
                     "cannot be changed."
                 ));
             }
@@ -467,8 +467,8 @@ 
                 select 1
                 from cache_rating
                 where
-                    user_id = '".Db::escape_string($user['internal_id'])."'
-                    and cache_id = '".Db::escape_string($cache['internal_id'])."'
+                    user_id = '".Db::escape_string($user['internal_id']) . "'
+                    and cache_id = '".Db::escape_string($cache['internal_id']) . "'
             ");
             if ($already_recommended) {
                 throw new CannotPublishException(_(
@@ -478,7 +478,7 @@ 
 
             # Check the number of recommendations.
 
-            $founds = $user['caches_found'] + 1;  // +1, because he'll find THIS ONE in a moment
+            $founds = $user['caches_found'] + 1; // +1, because he'll find THIS ONE in a moment
 
             # Note: caches_found includes the number of attended events (both on
             # OCDE and OCPL). OCPL does not allow recommending events, but the
@@ -488,7 +488,7 @@ 
             $rcmds_left = floor($founds / 10.0) - $user['rcmds_given'];
             if ($rcmds_left <= 0) {
                 throw new CannotPublishException(_(
-                    "You don't have any recommendations to give. Find more ".
+                    "You don't have any recommendations to give. Find more " .
                     "caches first!"
                 ));
             }
@@ -615,17 +615,17 @@ 
                 update caches
                 set
                     score = (
-                        score*votes + '".Db::escape_string($db_score)."'
+                        score*votes + '".Db::escape_string($db_score) . "'
                     ) / (votes + 1),
                     votes = votes + 1
-                where cache_id = '".Db::escape_string($cache['internal_id'])."'
+                where cache_id = '".Db::escape_string($cache['internal_id']) . "'
             ");
             Db::execute("
                 insert into scores (user_id, cache_id, score)
                 values (
-                    '".Db::escape_string($user['internal_id'])."',
-                    '".Db::escape_string($cache['internal_id'])."',
-                    '".Db::escape_string($db_score)."'
+                    '".Db::escape_string($user['internal_id']) . "',
+                    '".Db::escape_string($cache['internal_id']) . "',
+                    '".Db::escape_string($db_score) . "'
                 );
             ");
         }
@@ -639,9 +639,9 @@ 
                 Db::execute("
                     insert into cache_rating (user_id, cache_id, rating_date)
                     values (
-                        '".Db::escape_string($user['internal_id'])."',
-                        '".Db::escape_string($cache['internal_id'])."',
-                        from_unixtime('".Db::escape_string($when)."')
+                        '".Db::escape_string($user['internal_id']) . "',
+                        '".Db::escape_string($cache['internal_id']) . "',
+                        from_unixtime('".Db::escape_string($when) . "')
                     );
                 ");
             }
@@ -650,8 +650,8 @@ 
                 Db::execute("
                     insert into cache_rating (user_id, cache_id)
                     values (
-                        '".Db::escape_string($user['internal_id'])."',
-                        '".Db::escape_string($cache['internal_id'])."'
+                        '".Db::escape_string($user['internal_id']) . "',
+                        '".Db::escape_string($cache['internal_id']) . "'
                     );
                 ");
             }
@@ -664,7 +664,7 @@ 
         # We need to delete the copy of stats-picture for this user. Otherwise,
         # the legacy OC code won't detect that the picture needs to be refreshed.
 
-        $filepath = Okapi::get_var_dir().'/images/statpics/statpic'.$user['internal_id'].'.jpg';
+        $filepath = Okapi::get_var_dir() . '/images/statpics/statpic' . $user['internal_id'] . '.jpg';
         if (file_exists($filepath)) {
             unlink($filepath);
         }
@@ -732,9 +732,9 @@ 
                         founds = founds + 1,
                         last_found = greatest(
                             ifnull(last_found, 0),
-                            from_unixtime('".Db::escape_string($when)."')
+                            from_unixtime('".Db::escape_string($when) . "')
                         )
-                    where cache_id = '".Db::escape_string($cache_internal_id)."'
+                    where cache_id = '".Db::escape_string($cache_internal_id) . "'
                 ");
             }
             elseif ($logtype == "Didn't find it")
@@ -742,7 +742,7 @@ 
                 Db::execute("
                     update caches
                     set notfounds = notfounds + 1
-                    where cache_id = '".Db::escape_string($cache_internal_id)."'
+                    where cache_id = '".Db::escape_string($cache_internal_id) . "'
                 ");
             }
             elseif ($logtype == 'Comment')
@@ -750,7 +750,7 @@ 
                 Db::execute("
                     update caches
                     set notes = notes + 1
-                    where cache_id = '".Db::escape_string($cache_internal_id)."'
+                    where cache_id = '".Db::escape_string($cache_internal_id) . "'
                 ");
             }
             else
@@ -783,7 +783,7 @@ 
             Db::execute("
                 update user
                 set $field_to_increment = $field_to_increment + 1
-                where user_id = '".Db::escape_string($user_internal_id)."'
+                where user_id = '" . Db::escape_string($user_internal_id) . "'
             ");
         }
     }
@@ -812,19 +812,19 @@ 
         Db::execute("
             insert into cache_logs (
                 uuid, cache_id, user_id, type, date, text, text_html,
-                last_modified, date_created, node".$needs_maintenance_field_SQL."
+                last_modified, date_created, node".$needs_maintenance_field_SQL . "
             ) values (
-                '".Db::escape_string($log_uuid)."',
-                '".Db::escape_string($cache_internal_id)."',
-                '".Db::escape_string($user_internal_id)."',
-                '".Db::escape_string(Okapi::logtypename2id($logtype))."',
-                from_unixtime('".Db::escape_string($when)."'),
-                '".Db::escape_string($formatted_comment)."',
-                '".Db::escape_string($text_html)."',
+                '".Db::escape_string($log_uuid) . "',
+                '".Db::escape_string($cache_internal_id) . "',
+                '".Db::escape_string($user_internal_id) . "',
+                '".Db::escape_string(Okapi::logtypename2id($logtype)) . "',
+                from_unixtime('".Db::escape_string($when) . "'),
+                '".Db::escape_string($formatted_comment) . "',
+                '".Db::escape_string($text_html) . "',
                 now(),
                 now(),
-                '".Db::escape_string(Settings::get('OC_NODE_ID'))."'
-                ".$needs_maintenance_SQL."
+                '".Db::escape_string(Settings::get('OC_NODE_ID')) . "'
+                ".$needs_maintenance_SQL . "
             );
         ");
         $log_internal_id = Db::last_insert_id();
@@ -835,9 +835,9 @@ 
         Db::execute("
             insert into okapi_submitted_objects (object_type, object_id, consumer_key)
             values (
-                ".Okapi::OBJECT_TYPE_CACHE_LOG.",
-                '".Db::escape_string($log_internal_id)."',
-                '".Db::escape_string($consumer_key)."'
+                ".Okapi::OBJECT_TYPE_CACHE_LOG . ",
+                '".Db::escape_string($log_internal_id) . "',
+                '".Db::escape_string($consumer_key) . "'
             );
         ");
 

htdocs/okapi/services/logs/userlogs.php

Spacing +2 added lines, -2 removed lines

@@ -52,8 +52,8 @@
                 c.wp_oc as cache_code
             from cache_logs cl, caches c
             where
-                cl.user_id = '".Db::escape_string($user['internal_id'])."'
-                and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "cl.deleted = 0" : "true")."
+                cl.user_id = '".Db::escape_string($user['internal_id']) . "'
+                and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "cl.deleted = 0" : "true") . "
                 and c.status in (1,2,3)
                 and cl.cache_id = c.cache_id
             order by cl.date desc

htdocs/okapi/services/logs/logs.php

Spacing +3 added lines, -3 removed lines

@@ -50,8 +50,8 @@ 
             select uuid
             from cache_logs
             where
-                cache_id = '".Db::escape_string($cache['internal_id'])."'
-                and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "deleted = 0" : "true")."
+                cache_id = '".Db::escape_string($cache['internal_id']) . "'
+                and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "deleted = 0" : "true") . "
             order by date desc
             limit $offset, $limit
         ");
@@ -74,7 +74,7 @@ 
             && Settings::get('OCPL_ENABLE_GEOCACHE_ACCESS_LOGS')
             && (count($log_uuids) > 0)
         ) {
-            require_once($GLOBALS['rootpath'].'okapi/lib/ocpl_access_logs.php');
+            require_once($GLOBALS['rootpath'] . 'okapi/lib/ocpl_access_logs.php');
             \okapi\OCPLAccessLogs::log_geocache_access($request, $cache['internal_id']);
         }
 

htdocs/okapi/services/logs/images/add.php

Spacing +30 added lines, -30 removed lines

@@ -53,12 +53,12 @@ 
         $rs = Db::query("
             select id, node, user_id
             from cache_logs
-            where uuid = '".Db::escape_string($log_uuid)."'"
+            where uuid = '".Db::escape_string($log_uuid) . "'"
         );
         $row = Db::fetch_assoc($rs);
         Db::free_result($rs);
         if (!$row)
-            throw new InvalidParam('log_uuid', "There is no log entry with uuid '".$log_uuid."'.");
+            throw new InvalidParam('log_uuid', "There is no log entry with uuid '" . $log_uuid . "'.");
         if ($row['node'] != Settings::get('OC_NODE_ID')) {
             throw new Exception(
                 "This site's database contains the log entry '$log_uuid' which has been"
@@ -116,7 +116,7 @@ 
             throw new InvalidParam('image', "bad base64 encoding");
 
         try {
-            $image_properties = getimagesizefromstring($image);  # can throw
+            $image_properties = getimagesizefromstring($image); # can throw
             if (!$image_properties)
                 throw new Exception();
             list($width, $height, $image_type) = $image_properties;
@@ -148,7 +148,7 @@ 
             ));
         }
         try {
-            $image = imagecreatefromstring($image);  # can throw
+            $image = imagecreatefromstring($image); # can throw
             if (!$image) throw new Exception();
         }
         catch (Exception $e) {
@@ -167,23 +167,23 @@ 
         #   - eliminate any data flaws which have may been in the source files.
 
         $image_uuid = Okapi::create_uuid();
-        $imagepath = Settings::get('IMAGES_DIR').'/'.$image_uuid;
+        $imagepath = Settings::get('IMAGES_DIR') . '/' . $image_uuid;
         switch ($image_type)
         {
             case IMAGETYPE_JPEG:
                 $file_ext = '.jpg';
                 $quality = Settings::get('JPEG_QUALITY');
-                $result = imagejpeg($image, $imagepath.$file_ext, $quality);
+                $result = imagejpeg($image, $imagepath . $file_ext, $quality);
                 break;
 
             case IMAGETYPE_PNG:
                 $file_ext = '.png';
-                $result = imagepng($image, $imagepath.$file_ext);
+                $result = imagepng($image, $imagepath . $file_ext);
                 break;
 
             case IMAGETYPE_GIF:
                 $file_ext = '.gif';
-                $result = imagegif($image, $imagepath.$file_ext);
+                $result = imagegif($image, $imagepath . $file_ext);
                 break;
 
             default:
@@ -191,7 +191,7 @@ 
                 $result = false;
         }
         if (!$result)
-            throw new Exception("could not save image file '".$imagepath.$file_ext."'");
+            throw new Exception("could not save image file '" . $imagepath . $file_ext . "'");
 
         # insert image into database
 
@@ -208,7 +208,7 @@ 
             # (which is very unlikely, and will just add a bit more of garbage
             # to that which is already present in the images directory).
 
-            try { unlink($imagepath.$file_ext); }
+            try { unlink($imagepath . $file_ext); }
             catch (Exception $e2) {}
             throw $e;
         }
@@ -224,11 +224,11 @@ 
 
     private static function max_pixels($base64_image)
     {
-        $bytes_per_pixel = 5;   # GD needs 5 bytes per pixel for "true color"
+        $bytes_per_pixel = 5; # GD needs 5 bytes per pixel for "true color"
         $available_memory = Okapi::php_ini_get_bytes('memory_limit') - memory_get_usage();
-        $available_memory -= 16 * 1024 * 1024;  # reserve
-        $available_memory -= strlen($base64_image);  # will be copied for EXIF processing
-        $available_memory -= 3 * $bytes_per_pixel * Settings::get('IMAGE_MAX_PIXEL_COUNT');  # processing buffers
+        $available_memory -= 16 * 1024 * 1024; # reserve
+        $available_memory -= strlen($base64_image); # will be copied for EXIF processing
+        $available_memory -= 3 * $bytes_per_pixel * Settings::get('IMAGE_MAX_PIXEL_COUNT'); # processing buffers
         return floor($available_memory / $bytes_per_pixel);
     }
 
@@ -312,15 +312,15 @@ 
                 set seq = seq + 1
                 where
                     object_type = 1
-                    and object_id = '".Db::escape_string($log_internal_id)."'
-                    and seq >= '".Db::escape_string($seq)."'
+                    and object_id = '".Db::escape_string($log_internal_id) . "'
+                    and seq >= '".Db::escape_string($seq) . "'
                 order by seq desc
             ");
         }
 
         if (Settings::get('OC_BRANCH') == 'oc.de') {
             $local_fields_SQL = "seq";
-            $local_values_escaped_SQL = "'".Db::escape_string($seq)."'";
+            $local_values_escaped_SQL = "'" . Db::escape_string($seq) . "'";
             # All other fields are set by trigger or defaults for OCDE.
         } else {
             # These are the additional fields that OCPL newpic.php supplies
@@ -328,27 +328,27 @@ 
             $local_fields_SQL =
                 "date_created, last_modified, description, desc_html, last_url_check, user_id";
             $local_values_escaped_SQL =
-                "NOW(), NOW(), '', 0, NOW(), '".Db::escape_string($user_id)."'";
+                "NOW(), NOW(), '', 0, NOW(), '" . Db::escape_string($user_id) . "'";
         }
 
         Db::execute("
             insert into pictures (
                 uuid, node, local, title, spoiler, url, object_type, object_id,
                 unknown_format, display,
-                ".$local_fields_SQL."
+                ".$local_fields_SQL . "
             )
             values (
-                '".Db::escape_string($image_uuid)."',
-                '".Db::escape_string(Settings::get('OC_NODE_ID'))."',
+                '".Db::escape_string($image_uuid) . "',
+                '".Db::escape_string(Settings::get('OC_NODE_ID')) . "',
                 1,
-                '".Db::escape_string($caption)."',
-                '".($is_spoiler == 'true' ? 1 : 0)."',
-                '".Db::escape_string(Settings::get('IMAGES_URL').$image_uuid.$file_ext)."',
+                '".Db::escape_string($caption) . "',
+                '".($is_spoiler == 'true' ? 1 : 0) . "',
+                '".Db::escape_string(Settings::get('IMAGES_URL') . $image_uuid . $file_ext) . "',
                 1,
-                '".Db::escape_string($log_internal_id)."',
+                '".Db::escape_string($log_internal_id) . "',
                 0,
                 1,
-                ".$local_values_escaped_SQL."
+                ".$local_values_escaped_SQL . "
             )
         ");
         $image_internal_id = Db::last_insert_id();
@@ -365,7 +365,7 @@ 
                 set
                     picturescount = picturescount + 1,
                     last_modified = NOW()
-                where id = '".Db::escape_string($log_internal_id)."'
+                where id = '".Db::escape_string($log_internal_id) . "'
             ");
         }
 
@@ -375,9 +375,9 @@ 
         Db::execute("
             insert into okapi_submitted_objects (object_type, object_id, consumer_key)
             values (
-                '".Okapi::OBJECT_TYPE_CACHE_LOG_IMAGE."',
-                '".Db::escape_string($image_internal_id)."',
-                '".Db::escape_string($consumer_key)."'
+                '".Okapi::OBJECT_TYPE_CACHE_LOG_IMAGE . "',
+                '".Db::escape_string($image_internal_id) . "',
+                '".Db::escape_string($consumer_key) . "'
             );
         ");
 

htdocs/okapi/services/logs/images/delete.php

Spacing +6 added lines, -6 removed lines

@@ -31,10 +31,10 @@ 
         $image_row = Db::select_row("
             select id, node, url, local
             from pictures
-            where uuid = '".$image_uuid_escaped."'
+            where uuid = '".$image_uuid_escaped . "'
         ");
         Db::execute("
-            delete from pictures where uuid = '".$image_uuid_escaped."'
+            delete from pictures where uuid = '".$image_uuid_escaped . "'
         ");
 
         # Remember that OCPL picture sequence numbers are always 1, and
@@ -52,8 +52,8 @@ 
                     localID, uuid, type, removed_date, node
                 )
                 VALUES (
-                    ".$image_row['id']."
-                    '".$image_uuid_escaped."',
+                    ".$image_row['id'] . "
+                    '".$image_uuid_escaped . "',
                     6,
                     NOW(),
                     ".$image_row['node']
@@ -72,7 +72,7 @@ 
                 set
                     picturescount = greatest(0, picturescount - 1),
                     last_modified = NOW()
-                where id = '".Db::escape_string($log_internal_id)."'
+                where id = '".Db::escape_string($log_internal_id) . "'
             ");
         }
 
@@ -80,7 +80,7 @@ 
 
         if ($image_row['local']) {
             $filename = basename($image_row['url']);
-            unlink(Settings::get('IMAGES_DIR').'/'.$filename);
+            unlink(Settings::get('IMAGES_DIR') . '/' . $filename);
         }
 
         $result = array(

htdocs/okapi/services/logs/images/edit.php

Spacing +18 added lines, -18 removed lines

@@ -81,8 +81,8 @@ 
         if ($caption !== null) {
             Db::execute("
                 update pictures
-                set title = '".Db::escape_string($caption)."'
-                where uuid = '".$image_uuid_escaped."'
+                set title = '".Db::escape_string($caption) . "'
+                where uuid = '".$image_uuid_escaped . "'
             ");
             $log_entry_modified = true;
         }
@@ -91,8 +91,8 @@ 
         if ($is_spoiler !== null) {
             Db::execute("
                 update pictures
-                set spoiler = ".($is_spoiler == 'true' ? 1 : 0)."
-                where uuid = '".$image_uuid_escaped."'
+                set spoiler = ".($is_spoiler == 'true' ? 1 : 0) . "
+                where uuid = '".$image_uuid_escaped . "'
             ");
             $log_entry_modified = true;
         }
@@ -107,7 +107,7 @@ 
 
                 $image_uuids = Db::select_column("
                     select uuid from pictures
-                    where object_type = 1 and object_id = '".Db::escape_string($log_internal_id)."'
+                    where object_type = 1 and object_id = '".Db::escape_string($log_internal_id) . "'
                     order by date_created
                 ");
                 $position = array_search($image_uuid, $image_uuids);
@@ -122,7 +122,7 @@ 
                 # For OCDE the pictures table is write locked now.
 
                 $old_seq = DB::select_value("
-                    select seq from pictures where uuid = '".$image_uuid_escaped."'
+                    select seq from pictures where uuid = '".$image_uuid_escaped . "'
                 ");
 
                 if ($seq != $old_seq)
@@ -134,13 +134,13 @@ 
                     $max_seq = Db::select_value("
                         select max(seq)
                         from pictures
-                        where object_type = 1 and object_id = '".Db::escape_string($log_internal_id)."'
+                        where object_type = 1 and object_id = '".Db::escape_string($log_internal_id) . "'
                     ");
 
                     Db::query("
                         update pictures
-                        set seq = '".Db::escape_string($max_seq + 1)."'
-                        where uuid = '".$image_uuid_escaped."'
+                        set seq = '".Db::escape_string($max_seq + 1) . "'
+                        where uuid = '".$image_uuid_escaped . "'
                     ");
 
                     # now move the pictures inbetween
@@ -150,9 +150,9 @@ 
                             set seq = seq + 1
                             where
                                 object_type = 1
-                                and object_id = '".Db::escape_string($log_internal_id)."'
-                                and seq >= '".Db::escape_string($seq)."'
-                                and seq < '".Db::escape_string($old_seq)."'
+                                and object_id = '".Db::escape_string($log_internal_id) . "'
+                                and seq >= '".Db::escape_string($seq) . "'
+                                and seq < '".Db::escape_string($old_seq) . "'
                             order by seq desc
                         ");
                     } else {
@@ -161,9 +161,9 @@ 
                             set seq = seq - 1
                             where
                                 object_type = 1
-                                and object_id = '".Db::escape_string($log_internal_id)."'
-                                and seq <= '".Db::escape_string($seq)."'
-                                and seq > '".Db::escape_string($old_seq)."'
+                                and object_id = '".Db::escape_string($log_internal_id) . "'
+                                and seq <= '".Db::escape_string($seq) . "'
+                                and seq > '".Db::escape_string($old_seq) . "'
                             order by seq asc
                         ");
                     }
@@ -171,8 +171,8 @@ 
                     # and finally move the edited picture into place
                     Db::query("
                         update pictures
-                        set seq = '".Db::escape_string($seq)."'
-                        where uuid = '".$image_uuid_escaped."'
+                        set seq = '".Db::escape_string($seq) . "'
+                        where uuid = '".$image_uuid_escaped . "'
                     ");
                 }
 
@@ -188,7 +188,7 @@ 
             Db::query("
                 update cache_logs
                 set last_modified = NOW()
-                where id = '".Db::escape_string($log_internal_id)."'
+                where id = '".Db::escape_string($log_internal_id) . "'
             ");
 
             # OCPL code currently does not update pictures.last_modified when

htdocs/okapi/services/logs/images/log_images_common.inc.php

Spacing +8 added lines, -8 removed lines

@@ -36,14 +36,14 @@ 
                 pictures.node
             from cache_logs
             join pictures on pictures.object_id = cache_logs.id
-            where pictures.object_type = 1 and pictures.uuid = '".Db::escape_string($image_uuid)."'
+            where pictures.object_type = 1 and pictures.uuid = '".Db::escape_string($image_uuid) . "'
         ");
         $row = Db::fetch_assoc($rs);
         Db::free_result($rs);
         if (!$row) {
             throw new InvalidParam(
                 'image_uuid',
-                "There is no log entry image with uuid '".$image_uuid."'."
+                "There is no log entry image with uuid '" . $image_uuid . "'."
             );
         }
         if ($row['node'] != Settings::get('OC_NODE_ID')) {
@@ -67,7 +67,7 @@ 
     {
         $position = $request->get_parameter('position');
         if ($position !== null && !preg_match("/^-?[0-9]+$/", $position)) {
-            throw new InvalidParam('position', "'".$position."' is not an integer number.");
+            throw new InvalidParam('position', "'" . $position . "' is not an integer number.");
         }
         return $position;
     }
@@ -101,10 +101,10 @@ 
             Db::execute('lock tables pictures write');
         }
 
-        $log_images_count =  Db::select_value("
+        $log_images_count = Db::select_value("
             select count(*)
             from pictures
-            where object_type = 1 and object_id = '".Db::escape_string($log_internal_id)."'
+            where object_type = 1 and object_id = '".Db::escape_string($log_internal_id) . "'
         ");
 
         if (Settings::get('OC_BRANCH') == 'oc.pl')
@@ -122,7 +122,7 @@ 
                 $seq = Db::select_value("
                     select max(seq)
                     from pictures
-                    where object_type = 1 and object_id = '".Db::escape_string($log_internal_id)."'
+                    where object_type = 1 and object_id = '".Db::escape_string($log_internal_id) . "'
                 ") + $end_offset;
             } else if ($position <= 0) {
                 $position = 0;
@@ -131,9 +131,9 @@ 
                 $seq = Db::select_value("
                     select seq
                     from pictures
-                    where object_type = 1 and object_id = '".Db::escape_string($log_internal_id)."'
+                    where object_type = 1 and object_id = '".Db::escape_string($log_internal_id) . "'
                     order by seq
-                    limit ".($position+0).", 1
+                    limit ".($position + 0) . ", 1
                 ");
             }
         }

htdocs/okapi/services/logs/entries.php

Spacing +13 added lines, -13 removed lines

@@ -40,8 +40,8 @@ 
             $log_uuids = explode("|", $log_uuids);
 
         if ((count($log_uuids) > 500) && (!$request->skip_limits))
-            throw new InvalidParam('log_uuids', "Maximum allowed number of referenced ".
-                "log entries is 500. You provided ".count($log_uuids)." UUIDs.");
+            throw new InvalidParam('log_uuids', "Maximum allowed number of referenced " .
+                "log entries is 500. You provided " . count($log_uuids) . " UUIDs.");
         if (count($log_uuids) != count(array_unique($log_uuids)))
             throw new InvalidParam('log_uuids', "Duplicate UUIDs detected (make sure each UUID is referenced only once).");
         $fields = $request->get_parameter('fields');
@@ -68,9 +68,9 @@ 
         $rs = Db::query("
             select
                 cl.id, c.wp_oc as cache_code, cl.uuid, cl.type,
-                ".$teamentry_field." as oc_team_entry,
-                ".$needs_maintenance_SQL." as needs_maintenance2,
-                ".$listing_is_outdated_SQL." as listing_is_outdated,
+                ".$teamentry_field . " as oc_team_entry,
+                ".$needs_maintenance_SQL . " as needs_maintenance2,
+                ".$listing_is_outdated_SQL . " as listing_is_outdated,
                 unix_timestamp(cl.date) as date, cl.text,
                 u.uuid as user_uuid, u.username, u.user_id,
                 if(cr.user_id is null, 0, 1) as was_recommended
@@ -81,14 +81,14 @@ 
                 left join cache_rating cr
                     on cr.user_id = u.user_id
                     and cr.cache_id = c.cache_id
-                    ".$ratingdate_condition."
+                    ".$ratingdate_condition . "
                     and cl.type in (
-                        ".Okapi::logtypename2id("Found it").",
-                        ".Okapi::logtypename2id("Attended")."
+                        ".Okapi::logtypename2id("Found it") . ",
+                        ".Okapi::logtypename2id("Attended") . "
                     )
             where
-                cl.uuid in ('".implode("','", array_map('\okapi\Db::escape_string', $log_uuids))."')
-                and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "cl.deleted = 0" : "true")."
+                cl.uuid in ('".implode("','", array_map('\okapi\Db::escape_string', $log_uuids)) . "')
+                and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "cl.deleted = 0" : "true") . "
                 and cl.user_id = u.user_id
                 and c.cache_id = cl.cache_id
                 and c.status in (1,2,3)
@@ -105,7 +105,7 @@ 
                 'user' => array(
                     'uuid' => $row['user_uuid'],
                     'username' => $row['username'],
-                    'profile_url' => Settings::get('SITE_URL')."viewprofile.php?userid=".$row['user_id'],
+                    'profile_url' => Settings::get('SITE_URL') . "viewprofile.php?userid=" . $row['user_id'],
                 ),
                 'type' => Okapi::logtypeid2name($row['type']),
                 'was_recommended' => $row['was_recommended'] ? true : false,
@@ -132,7 +132,7 @@ 
                 from pictures
                 where
                     object_type = 1
-                    and object_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($log_id2uuid)))."')
+                    and object_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($log_id2uuid))) . "')
                     and display = 1   /* currently is always 1 for logpix */
                     and unknown_format = 0
                 order by seq, date_created
@@ -148,7 +148,7 @@ 
                     array(
                         'uuid' => $row['uuid'],
                         'url' => $row['url'],
-                        'thumb_url' => Settings::get('SITE_URL') . 'thumbs.php?'.$object_type_param.'uuid=' . $row['uuid'],
+                        'thumb_url' => Settings::get('SITE_URL') . 'thumbs.php?' . $object_type_param . 'uuid=' . $row['uuid'],
                         'caption' => $row['title'],
                         'is_spoiler' => ($row['spoiler'] ? true : false),
                     );