OpencachingDeutschland / oc-server3

htdocs/okapi/services/apiref/issue.php

Braces +7 added lines, -6 removed lines

@@ -26,10 +26,12 @@ 
     public static function call(OkapiRequest $request)
     {
         $issue_id = $request->get_parameter('issue_id');
-        if (!$issue_id)
-            throw new ParamMissing('issue_id');
-        if ((!preg_match("/^[0-9]+$/", $issue_id)) || (strlen($issue_id) > 6))
-            throw new InvalidParam('issue_id');
+        if (!$issue_id) {
+                    throw new ParamMissing('issue_id');
+        }
+        if ((!preg_match("/^[0-9]+$/", $issue_id)) || (strlen($issue_id) > 6)) {
+                    throw new InvalidParam('issue_id');
+        }
 
         $cache_key = "apiref/issue#".$issue_id;
         $result = Cache::get($cache_key);
@@ -55,8 +57,7 @@ 
                 $context = stream_context_create($opts);
                 $json = file_get_contents("https://api.github.com/repos/opencaching/okapi/issues/$issue_id",
                     false, $context);
-            }
-            catch (ErrorException $e)
+            } catch (ErrorException $e)
             {
                 throw new BadRequest("Sorry, we could not retrieve issue stats from the GitHub site. ".
                     "This is probably due to a temporary connection problem. Try again later or contact ".

htdocs/okapi/services/apiref/method.php

Braces +45 added lines, -32 removed lines

@@ -128,15 +128,19 @@ 
     public static function call(OkapiRequest $request)
     {
         $methodname = $request->get_parameter('name');
-        if (!$methodname)
-            throw new ParamMissing('name');
-        if (!preg_match("#^services/[0-9a-z_/]*$#", $methodname))
-            throw new InvalidParam('name');
-        if (!OkapiServiceRunner::exists($methodname))
-            throw new InvalidParam('name', "Method does not exist: '$methodname'.");
+        if (!$methodname) {
+                    throw new ParamMissing('name');
+        }
+        if (!preg_match("#^services/[0-9a-z_/]*$#", $methodname)) {
+                    throw new InvalidParam('name');
+        }
+        if (!OkapiServiceRunner::exists($methodname)) {
+                    throw new InvalidParam('name', "Method does not exist: '$methodname'.");
+        }
         $options = OkapiServiceRunner::options($methodname);
-        if (!isset($options['min_auth_level']))
-            throw new Exception("Method $methodname is missing a required 'min_auth_level' option!");
+        if (!isset($options['min_auth_level'])) {
+                    throw new Exception("Method $methodname is missing a required 'min_auth_level' option!");
+        }
         $docs = simplexml_load_string(OkapiServiceRunner::docs($methodname));
         $exploded = explode("/", $methodname);
         $result = array(
@@ -149,23 +153,30 @@ 
                 'oauth_token' => $options['min_auth_level'] >= 3,
             )
         );
-        if (!$docs->brief)
-            throw new Exception("Missing <brief> element in the $methodname.xml file.");
-        if ($docs->brief != self::get_inner_xml($docs->brief))
-            throw new Exception("The <brief> element may not contain HTML markup ($methodname.xml).");
-        if (strlen($docs->brief) > 80)
-            throw new Exception("The <brief> description may not be longer than 80 characters ($methodname.xml).");
-        if (strpos($docs->brief, "\n") !== false)
-            throw new Exception("The <brief> element may not contain new-lines ($methodname.xml).");
-        if (substr(trim($docs->brief), -1) == '.')
-            throw new Exception("The <brief> element should not end with a dot ($methodname.xml).");
+        if (!$docs->brief) {
+                    throw new Exception("Missing <brief> element in the $methodname.xml file.");
+        }
+        if ($docs->brief != self::get_inner_xml($docs->brief)) {
+                    throw new Exception("The <brief> element may not contain HTML markup ($methodname.xml).");
+        }
+        if (strlen($docs->brief) > 80) {
+                    throw new Exception("The <brief> description may not be longer than 80 characters ($methodname.xml).");
+        }
+        if (strpos($docs->brief, "\n") !== false) {
+                    throw new Exception("The <brief> element may not contain new-lines ($methodname.xml).");
+        }
+        if (substr(trim($docs->brief), -1) == '.') {
+                    throw new Exception("The <brief> element should not end with a dot ($methodname.xml).");
+        }
         $result['brief_description'] = self::get_inner_xml($docs->brief);
-        if ($docs->{'issue-id'})
-            $result['issue_id'] = (string)$docs->{'issue-id'};
-        else
-            $result['issue_id'] = null;
-        if (!$docs->desc)
-            throw new Exception("Missing <desc> element in the $methodname.xml file.");
+        if ($docs->{'issue-id'}) {
+                    $result['issue_id'] = (string)$docs->{'issue-id'};
+        } else {
+                    $result['issue_id'] = null;
+        }
+        if (!$docs->desc) {
+                    throw new Exception("Missing <desc> element in the $methodname.xml file.");
+        }
         $result['description'] = self::get_inner_xml($docs->desc);
         $result['arguments'] = array();
         foreach ($docs->req as $arg) { $result['arguments'][] = self::arg_desc($arg); }
@@ -180,14 +191,14 @@ 
             $exclude_list = isset($attrs['except']) ? explode("|", $attrs['except']) : array();
             foreach ($referenced_method_info['arguments'] as $arg)
             {
-                if ($arg['class'] == 'common-formatting')
-                    continue;
+                if ($arg['class'] == 'common-formatting') {
+                                    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>";
-                }
-                elseif (
+                } elseif (
                     (($include_list === null) || in_array($arg['name'], $include_list))
                     && (!in_array($arg['name'], $exclude_list))
                 ) {
@@ -217,12 +228,14 @@ 
                 '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'])
+        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. ".
+        }
+        if (!$docs->returns) {
+                    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

Braces +46 added lines, -55 removed lines

@@ -43,10 +43,14 @@ 
         # "call").
 
         $cache_code = $request->get_parameter('cache_code');
-        if (!$cache_code) throw new ParamMissing('cache_code');
+        if (!$cache_code) {
+            throw new ParamMissing('cache_code');
+        }
 
         $logtype = $request->get_parameter('logtype');
-        if (!$logtype) throw new ParamMissing('logtype');
+        if (!$logtype) {
+            throw new ParamMissing('logtype');
+        }
         if (!in_array($logtype, array(
             'Found it', "Didn't find it", 'Comment', 'Will attend', 'Attended'
         ))) {
@@ -54,12 +58,17 @@ 
         }
 
         $comment = $request->get_parameter('comment');
-        if (!$comment) $comment = "";
+        if (!$comment) {
+            $comment = "";
+        }
 
         $comment_format = $request->get_parameter('comment_format');
-        if (!$comment_format) $comment_format = "auto";
-        if (!in_array($comment_format, array('auto', 'html', 'plaintext')))
-            throw new InvalidParam('comment_format', $comment_format);
+        if (!$comment_format) {
+            $comment_format = "auto";
+        }
+        if (!in_array($comment_format, array('auto', 'html', 'plaintext'))) {
+                    throw new InvalidParam('comment_format', $comment_format);
+        }
 
         $tmp = $request->get_parameter('when');
         if ($tmp)
@@ -77,8 +86,7 @@ 
                     "the past, but NOT in the future."
                 ));
             }
-        }
-        else {
+        } else {
             $when = time();
         }
 
@@ -115,9 +123,12 @@ 
         }
 
         $recommend = $request->get_parameter('recommend');
-        if (!$recommend) $recommend = 'false';
-        if (!in_array($recommend, array('true', 'false')))
-            throw new InvalidParam('recommend', "Unknown option: '$recommend'.");
+        if (!$recommend) {
+            $recommend = 'false';
+        }
+        if (!in_array($recommend, array('true', 'false'))) {
+                    throw new InvalidParam('recommend', "Unknown option: '$recommend'.");
+        }
         $recommend = ($recommend == 'true');
         if ($recommend && $logtype != 'Found it')
         {
@@ -125,8 +136,7 @@ 
                 throw new BadRequest(
                     "Recommending is allowed only for 'Found it' and 'Attended' logs."
                 );
-            }
-            else if (Settings::get('OC_BRANCH') == 'oc.pl') {
+            } else if (Settings::get('OC_BRANCH') == 'oc.pl') {
 
                 # We will remove the recommendation request and change the success message
                 # (which will be returned IF the rest of the query will meet all the
@@ -156,9 +166,7 @@ 
         # Parse $needs_maintenance and get rid of it.
 
         if ($needs_maintenance) {
-            if ($needs_maintenance == 'true') { $needs_maintenance2 = 'true'; }
-            else if ($needs_maintenance == 'false') { $needs_maintenance2 = 'null'; }
-            else {
+            if ($needs_maintenance == 'true') { $needs_maintenance2 = 'true'; } else if ($needs_maintenance == 'false') { $needs_maintenance2 = 'null'; } else {
                 throw new InvalidParam(
                     'needs_maintenance', "Unknown option: '$needs_maintenance'."
                 );
@@ -216,16 +224,14 @@ 
                     'you can attend it, or comment on it)!'
                 ));
             }
-        }
-        else  # type != event
+        } else  # type != event
         {
             if (in_array($logtype, array('Will attend', 'Attended'))) {
                 throw new CannotPublishException(_(
                     'This cache is NOT an Event cache. You cannot "Attend" it '.
                     '(but you can find it, or comment on it)!'
                 ));
-            }
-            else if (!in_array($logtype, array('Found it', "Didn't find it", 'Comment'))) {
+            } else if (!in_array($logtype, array('Found it', "Didn't find it", 'Comment'))) {
                 throw new Exception("Unknown log entry - should be documented here.");
             }
         }
@@ -276,8 +282,7 @@ 
             if (Settings::get('OC_BRANCH') == 'oc.de')
             {
                 $value_for_text_html_field = 0;
-            }
-            else
+            } else
             {
                 # 'text_html' = 0 (false) is broken in OCPL code and has been
                 # deprecated; OCPL code was changed to always set it to 1 (true).
@@ -289,8 +294,7 @@ 
 
                 $value_for_text_html_field = 1;
             }
-        }
-        elseif ($comment_format == 'auto')
+        } elseif ($comment_format == 'auto')
         {
             # 'Auto' is for backward compatibility. Before the "comment_format"
             # was introduced, OKAPI used a weird format in between (it allowed
@@ -298,8 +302,7 @@ 
 
             $formatted_comment = nl2br($comment);
             $value_for_text_html_field = 1;
-        }
-        else
+        } else
         {
             $formatted_comment = $comment;
 
@@ -318,8 +321,7 @@ 
 
                 $purifier = new \OcHTMLPurifier($opt);
                 $formatted_comment = $purifier->purify($formatted_comment);
-            }
-            else
+            } else
             {
                 # TODO: Add OCPL HTML filtering.
                 # See https://github.com/opencaching/okapi/issues/412.
@@ -392,8 +394,7 @@ 
                 {
                     # Act as if the log has been submitted successfully.
                     return $duplicate_uuid;
-                }
-                elseif ($on_duplicate == 'user_error')
+                } elseif ($on_duplicate == 'user_error')
                 {
                     throw new CannotPublishException(_(
                         "You have already submitted a log entry with exactly ".
@@ -511,8 +512,7 @@ 
                 $logtype = 'Needs maintenance';
                 $second_logtype = null;
                 $second_formatted_comment = null;
-            }
-            elseif ($logtype == 'Found it')
+            } elseif ($logtype == 'Found it')
             {
                 # If "Found it", then we'll issue two log entries: one "Found
                 # it" with the original comment, and second one "Needs
@@ -520,8 +520,7 @@ 
 
                 $second_logtype = 'Needs maintenance';
                 $second_formatted_comment = "";
-            }
-            elseif ($logtype == "Didn't find it")
+            } elseif ($logtype == "Didn't find it")
             {
                 # If "Didn't find it", then we'll issue two log entries, but this time
                 # we'll do this the other way around. The first "Didn't find it" entry
@@ -532,8 +531,7 @@ 
                 $second_logtype = 'Needs maintenance';
                 $second_formatted_comment = $formatted_comment;
                 $formatted_comment = "";
-            }
-            else if ($logtype == 'Will attend' || $logtype == 'Attended')
+            } else if ($logtype == 'Will attend' || $logtype == 'Attended')
             {
                 # OC branches which allow maintenance logs, still don't allow them on
                 # event caches.
@@ -541,12 +539,10 @@ 
                 throw new CannotPublishException(_(
                     "Event caches cannot \"need maintenance\"."
                 ));
-            }
-            else {
+            } else {
                 throw new Exception();
             }
-        }
-        else
+        } else
         {
             # User didn't check the "Needs maintenance" flag OR "Needs maintenance"
             # log type isn't supported by this server.
@@ -644,8 +640,7 @@ 
                         from_unixtime('".Db::escape_string($when)."')
                     );
                 ");
-            }
-            else
+            } else
             {
                 Db::execute("
                     insert into cache_rating (user_id, cache_id)
@@ -680,7 +675,9 @@ 
         # This is the "real" entry point. A wrapper for the _call method.
 
         $langpref = $request->get_parameter('langpref');
-        if (!$langpref) $langpref = "en";
+        if (!$langpref) {
+            $langpref = "en";
+        }
 
         # Error messages thrown via CannotPublishException exceptions should be localized.
         # They will be delivered for end user to display in his language.
@@ -698,8 +695,7 @@ 
                 'log_uuids' => $log_uuids
             );
             Okapi::gettext_domain_restore();
-        }
-        catch (CannotPublishException $e)
+        } catch (CannotPublishException $e)
         {
             Okapi::gettext_domain_restore();
             $result = array(
@@ -719,8 +715,7 @@ 
         {
             # OCDE handles cache stats updates using triggers. So, they are already
             # incremented properly.
-        }
-        else
+        } else
         {
             # OCPL doesn't use triggers for this. We need to update manually.
 
@@ -736,24 +731,21 @@ 
                         )
                     where cache_id = '".Db::escape_string($cache_internal_id)."'
                 ");
-            }
-            elseif ($logtype == "Didn't find it")
+            } elseif ($logtype == "Didn't find it")
             {
                 Db::execute("
                     update caches
                     set notfounds = notfounds + 1
                     where cache_id = '".Db::escape_string($cache_internal_id)."'
                 ");
-            }
-            elseif ($logtype == 'Comment')
+            } elseif ($logtype == 'Comment')
             {
                 Db::execute("
                     update caches
                     set notes = notes + 1
                     where cache_id = '".Db::escape_string($cache_internal_id)."'
                 ");
-            }
-            else
+            } else
             {
                 # This log type is not represented in cache stats.
             }
@@ -766,8 +758,7 @@ 
         {
             # OCDE handles cache stats updates using triggers. So, they are already
             # incremented properly.
-        }
-        else
+        } else
         {
             # OCPL doesn't have triggers for this. We need to update manually.
 

htdocs/okapi/services/logs/userlogs.php

Braces +21 added lines, -11 removed lines

@@ -24,21 +24,31 @@
     public static function call(OkapiRequest $request)
     {
         $user_uuid = $request->get_parameter('user_uuid');
-        if (!$user_uuid) throw new ParamMissing('user_uuid');
+        if (!$user_uuid) {
+            throw new ParamMissing('user_uuid');
+        }
         $limit = $request->get_parameter('limit');
-        if (!$limit) $limit = "20";
-        if (!is_numeric($limit))
-            throw new InvalidParam('limit', "'$limit'");
+        if (!$limit) {
+            $limit = "20";
+        }
+        if (!is_numeric($limit)) {
+                    throw new InvalidParam('limit', "'$limit'");
+        }
         $limit = intval($limit);
-        if (($limit < 1) || ($limit > 1000))
-            throw new InvalidParam('limit', "Has to be in range 1..1000.");
+        if (($limit < 1) || ($limit > 1000)) {
+                    throw new InvalidParam('limit', "Has to be in range 1..1000.");
+        }
         $offset = $request->get_parameter('offset');
-        if (!$offset) $offset = "0";
-        if (!is_numeric($offset))
-            throw new InvalidParam('offset', "'$offset'");
+        if (!$offset) {
+            $offset = "0";
+        }
+        if (!is_numeric($offset)) {
+                    throw new InvalidParam('offset', "'$offset'");
+        }
         $offset = intval($offset);
-        if ($offset < 0)
-            throw new InvalidParam('offset', "'$offset'");
+        if ($offset < 0) {
+                    throw new InvalidParam('offset', "'$offset'");
+        }
 
         # Check if user exists and retrieve user's ID (this will throw
         # a proper exception on invalid UUID).

htdocs/okapi/services/logs/entry.php

Braces +9 added lines, -4 removed lines

@@ -21,16 +21,21 @@
     public static function call(OkapiRequest $request)
     {
         $log_uuid = $request->get_parameter('log_uuid');
-        if (!$log_uuid) throw new ParamMissing('log_uuid');
+        if (!$log_uuid) {
+            throw new ParamMissing('log_uuid');
+        }
         $fields = $request->get_parameter('fields');
-        if (!$fields) $fields = "date|user|type|comment";
+        if (!$fields) {
+            $fields = "date|user|type|comment";
+        }
 
         $results = OkapiServiceRunner::call('services/logs/entries', new OkapiInternalRequest(
             $request->consumer, $request->token, array('log_uuids' => $log_uuid,
             'fields' => $fields)));
         $result = $results[$log_uuid];
-        if ($result == null)
-            throw new InvalidParam('log_uuid', "This log entry does not exist.");
+        if ($result == null) {
+                    throw new InvalidParam('log_uuid', "This log entry does not exist.");
+        }
         return Okapi::formatted_response($request, $result);
     }
 }

htdocs/okapi/services/logs/logs.php

Braces +24 added lines, -11 removed lines

@@ -24,19 +24,31 @@ 
     public static function call(OkapiRequest $request)
     {
         $cache_code = $request->get_parameter('cache_code');
-        if (!$cache_code) throw new ParamMissing('cache_code');
+        if (!$cache_code) {
+            throw new ParamMissing('cache_code');
+        }
         $fields = $request->get_parameter('fields');
-        if (!$fields) $fields = "uuid|date|user|type|comment";
+        if (!$fields) {
+            $fields = "uuid|date|user|type|comment";
+        }
 
         $offset = $request->get_parameter('offset');
-        if (!$offset) $offset = "0";
-        if ((((int)$offset) != $offset) || ((int)$offset) < 0)
-            throw new InvalidParam('offset', "Expecting non-negative integer.");
+        if (!$offset) {
+            $offset = "0";
+        }
+        if ((((int)$offset) != $offset) || ((int)$offset) < 0) {
+                    throw new InvalidParam('offset', "Expecting non-negative integer.");
+        }
         $limit = $request->get_parameter('limit');
-        if (!$limit) $limit = "none";
-        if ($limit == "none") $limit = "999999999";
-        if ((((int)$limit) != $limit) || ((int)$limit) < 0)
-            throw new InvalidParam('limit', "Expecting non-negative integer or 'none'.");
+        if (!$limit) {
+            $limit = "none";
+        }
+        if ($limit == "none") {
+            $limit = "999999999";
+        }
+        if ((((int)$limit) != $limit) || ((int)$limit) < 0) {
+                    throw new InvalidParam('limit', "Expecting non-negative integer or 'none'.");
+        }
 
         # Check if code exists and retrieve cache ID (this will throw
         # a proper exception on invalid code).
@@ -64,8 +76,9 @@ 
         $internal_request->skip_limits = true;
         $logs = OkapiServiceRunner::call('services/logs/entries', $internal_request);
         $results = array();
-        foreach ($log_uuids as $log_uuid)
-            $results[] = $logs[$log_uuid];
+        foreach ($log_uuids as $log_uuid) {
+                    $results[] = $logs[$log_uuid];
+        }
 
         /* Handle OCPL's "access logs" feature. */
 

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

Braces +41 added lines, -31 removed lines

@@ -48,8 +48,9 @@ 
         # validate the 'log_uuid' parameter
 
         $log_uuid = $request->get_parameter('log_uuid');
-        if (!$log_uuid)
-            throw new ParamMissing('log_uuid');
+        if (!$log_uuid) {
+                    throw new ParamMissing('log_uuid');
+        }
         $rs = Db::query("
             select id, node, user_id
             from cache_logs
@@ -57,8 +58,9 @@ 
         );
         $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."'.");
+        if (!$row) {
+                    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"
@@ -85,17 +87,21 @@ 
         }
 
         $is_spoiler = $request->get_parameter('is_spoiler');
-        if ($is_spoiler === null) $is_spoiler = 'false';
-        if (!in_array($is_spoiler, array('true', 'false')))
-            throw new InvalidParam('is_spoiler');
+        if ($is_spoiler === null) {
+            $is_spoiler = 'false';
+        }
+        if (!in_array($is_spoiler, array('true', 'false'))) {
+                    throw new InvalidParam('is_spoiler');
+        }
 
         $position = LogImagesCommon::validate_position($request);
 
         # validate the 'image' parameter
 
         $base64_image = $request->get_parameter('image');
-        if (!$base64_image)
-            throw new ParamMissing('image');
+        if (!$base64_image) {
+                    throw new ParamMissing('image');
+        }
 
         $estimated_decoded_size = strlen($base64_image) / 4 * 3 - 2;
         if ($estimated_decoded_size > Settings::get('IMAGE_MAX_UPLOAD_SIZE'))
@@ -112,20 +118,21 @@ 
         }
 
         $image = base64_decode($base64_image);
-        if (!$image)
-            throw new InvalidParam('image', "bad base64 encoding");
+        if (!$image) {
+                    throw new InvalidParam('image', "bad base64 encoding");
+        }
 
         try {
             $image_properties = getimagesizefromstring($image);  # can throw
-            if (!$image_properties)
-                throw new Exception();
+            if (!$image_properties) {
+                            throw new Exception();
+            }
             list($width, $height, $image_type) = $image_properties;
             if (!in_array($image_type, array(IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_GIF))) {
                 # This will happen e.g. for BMP and XBM images, which are supported by GD.
                 throw new Exception();
             }
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             # Note: There may be *subtypes* which are not accepted by the GD library.
             # About 1 of 2000 JPEGs at OC.de is not readable by the PHP functions,
             # though they can be displayed by web browsers.
@@ -149,9 +156,10 @@ 
         }
         try {
             $image = imagecreatefromstring($image);  # can throw
-            if (!$image) throw new Exception();
-        }
-        catch (Exception $e) {
+            if (!$image) {
+                throw new Exception();
+            }
+        } catch (Exception $e) {
             throw new CannotPublishException(_("The uploaded image file is broken."));
         }
 
@@ -190,8 +198,9 @@ 
                 $file_ext = '.???';
                 $result = false;
         }
-        if (!$result)
-            throw new Exception("could not save image file '".$imagepath.$file_ext."'");
+        if (!$result) {
+                    throw new Exception("could not save image file '".$imagepath.$file_ext."'");
+        }
 
         # insert image into database
 
@@ -201,15 +210,13 @@ 
                 $request->consumer->key, $request->token->user_id,
                 $log_internal_id, $image_uuid, $position, $caption, $is_spoiler, $file_ext
             );
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             # TODO: Proper handling of nested exception if the unlink() fails
             # (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); }
-            catch (Exception $e2) {}
+            try { unlink($imagepath.$file_ext); } catch (Exception $e2) {}
             throw $e;
         }
 
@@ -239,8 +246,9 @@ 
         # and more powerful alternative (e.g. allowing more file types),
         # but that needs additional and sometimes non-trivial installation.
 
-        if (!extension_loaded('gd'))
-            throw new Exception('PHP GD image processing module is disabled');
+        if (!extension_loaded('gd')) {
+                    throw new Exception('PHP GD image processing module is disabled');
+        }
 
         # rescale image if necessary
 
@@ -261,8 +269,9 @@ 
         #   - GD cannot save EXIF data anyway, and
         #   - the orientation flag may not be recognized by all image processors.
 
-        if (!extension_loaded('exif'))
-            throw new Exception('PHP Exif module is disabled');
+        if (!extension_loaded('exif')) {
+                    throw new Exception('PHP Exif module is disabled');
+        }
 
         if ($image_type == IMAGETYPE_JPEG)
         {
@@ -393,7 +402,9 @@ 
         # This is the "real" entry point. A wrapper for the _call method.
 
         $langpref = $request->get_parameter('langpref');
-        if (!$langpref) $langpref = "en";
+        if (!$langpref) {
+            $langpref = "en";
+        }
         Okapi::gettext_domain_init(explode("|", $langpref));
 
         try
@@ -406,8 +417,7 @@ 
                 'position' => $position
             );
             Okapi::gettext_domain_restore();
-        }
-        catch (CannotPublishException $e)
+        } catch (CannotPublishException $e)
         {
             Okapi::gettext_domain_restore();
             $result = array(

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

Braces +1 added lines, -2 removed lines

@@ -44,8 +44,7 @@
         if (Settings::get('OC_BRANCH') == 'oc.de')
         {
             # OCDE does all the housekeeping by triggers
-        }
-        else
+        } else
         {
             Db::execute("
                 INSERT INTO removed_objects (

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

Braces +8 added lines, -7 removed lines

@@ -60,8 +60,9 @@ 
 
         $is_spoiler = $request->get_parameter('is_spoiler');
         if ($is_spoiler !== null) {
-            if (!in_array($is_spoiler, array('true', 'false')))
-                throw new InvalidParam('is_spoiler');
+            if (!in_array($is_spoiler, array('true', 'false'))) {
+                            throw new InvalidParam('is_spoiler');
+            }
         }
 
         $position = LogImagesCommon::validate_position($request);
@@ -111,8 +112,7 @@ 
                     order by date_created
                 ");
                 $position = array_search($image_uuid, $image_uuids);
-            }
-            else
+            } else
             {
                 list($position, $seq) = LogImagesCommon::prepare_position(
                     $log_internal_id,
@@ -204,7 +204,9 @@ 
         # This is the "real" entry point. A wrapper for the _call method.
 
         $langpref = $request->get_parameter('langpref');
-        if (!$langpref) $langpref = "en";
+        if (!$langpref) {
+            $langpref = "en";
+        }
         Okapi::gettext_domain_init(explode("|", $langpref));
 
         try
@@ -216,8 +218,7 @@ 
                 'position' => $position
             );
             Okapi::gettext_domain_restore();
-        }
-        catch (CannotPublishException $e)
+        } catch (CannotPublishException $e)
         {
             Okapi::gettext_domain_restore();
             $result = array(