OpencachingDeutschland / oc-server3

htdocs/okapi/services/attrs/attr_helper.inc.php

Braces +38 added lines, -50 removed lines

@@ -49,21 +49,17 @@ 
      */
     public static function refresh_now()
     {
-        try
-        {
+        try {
             $path = $GLOBALS['rootpath']."okapi/services/attrs/attribute-definitions.xml";
             $xml = file_get_contents($path);
             self::refresh_from_string($xml);
-        }
-        catch (Exception $e)
-        {
+        } catch (Exception $e) {
             # Failed to read or parse the file (i.e. after a syntax error was
             # commited). Let's check when the last successful parse occured.
 
             self::init_from_cache(false);
 
-            if (self::$attr_dict === null)
-            {
+            if (self::$attr_dict === null) {
                 # That's bad! We don't have ANY copy of the data AND we failed
                 # to parse it. We will use a fake, empty data.
 
@@ -99,8 +95,7 @@ 
         # Build cache attributes dictionary
 
         $all_internal_ids = array();
-        foreach ($doc->attr as $attrnode)
-        {
+        foreach ($doc->attr as $attrnode) {
             $attr = array(
                 'acode' => (string)$attrnode['acode'],
                 'gc_equivs' => array(),
@@ -109,47 +104,45 @@ 
                 'descriptions' => array(),
                 'is_discontinued' => true
             );
-            foreach ($attrnode->groundspeak as $gsnode)
-            {
+            foreach ($attrnode->groundspeak as $gsnode) {
                 $attr['gc_equivs'][] = array(
                     'id' => (int)$gsnode['id'],
                     'inc' => in_array((string)$gsnode['inc'], array("true", "1")) ? 1 : 0,
                     'name' => (string)$gsnode['name']
                 );
             }
-            foreach ($attrnode->opencaching as $ocnode)
-            {
+            foreach ($attrnode->opencaching as $ocnode) {
                 /* If it is used by at least one OC site, then it's NOT discontinued. */
                 $attr['is_discontinued'] = false;
 
-                if ((string)$ocnode['schema'] == $my_schema)
-                {
+                if ((string)$ocnode['schema'] == $my_schema) {
                     /* It is used by THIS OC site. */
 
                     $internal_id = (int)$ocnode['id'];
-                    if (isset($all_internal_ids[$internal_id]))
-                        throw new Exception("The internal attribute ".$internal_id.
+                    if (isset($all_internal_ids[$internal_id])) {
+                                            throw new Exception("The internal attribute ".$internal_id.
                             " has multiple assigments to OKAPI attributes.");
+                    }
                     $all_internal_ids[$internal_id] = true;
-                    if (!is_null($attr['internal_id']))
-                        throw new Exception("There are multiple internal IDs for the ".
+                    if (!is_null($attr['internal_id'])) {
+                                            throw new Exception("There are multiple internal IDs for the ".
                             $attr['acode']." attribute.");
+                    }
                     $attr['internal_id'] = $internal_id;
                 }
             }
-            foreach ($attrnode->lang as $langnode)
-            {
+            foreach ($attrnode->lang as $langnode) {
                 $lang = (string)$langnode['id'];
-                foreach ($langnode->name as $namenode)
-                {
-                    if (isset($attr['names'][$lang]))
-                        throw new Exception("Duplicate ".$lang." name of attribute ".$attr['acode']);
+                foreach ($langnode->name as $namenode) {
+                    if (isset($attr['names'][$lang])) {
+                                            throw new Exception("Duplicate ".$lang." name of attribute ".$attr['acode']);
+                    }
                     $attr['names'][$lang] = (string)$namenode;
                 }
-                foreach ($langnode->desc as $descnode)
-                {
-                    if (isset($attr['descriptions'][$lang]))
-                        throw new Exception("Duplicate ".$lang." description of attribute ".$attr['acode']);
+                foreach ($langnode->desc as $descnode) {
+                    if (isset($attr['descriptions'][$lang])) {
+                                            throw new Exception("Duplicate ".$lang." description of attribute ".$attr['acode']);
+                    }
                     $xml = $descnode->asxml(); /* contains "<desc>" and "</desc>" */
                     $innerxml = preg_replace("/(^[^>]+>)|(<[^<]+$)/us", "", $xml);
                     $attr['descriptions'][$lang] = self::cleanup_string($innerxml);
@@ -194,25 +187,20 @@ 
      */
     private static function init_from_cache($allow_refreshing=true)
     {
-        if (self::$attr_dict !== null)
-        {
+        if (self::$attr_dict !== null) {
             /* Already initialized. */
             return;
         }
         $cache_key = "attrhelper/dict#".Okapi::$git_revision.self::cache_key_suffix();
         $cachedvalue = Cache::get($cache_key);
-        if ($cachedvalue === null)
-        {
+        if ($cachedvalue === null) {
             # I.e. after Okapi::$git_revision is changed, or cache got invalidated.
 
-            if ($allow_refreshing)
-            {
+            if ($allow_refreshing) {
                 self::refresh_now();
                 self::init_from_cache(false);
                 return;
-            }
-            else
-            {
+            } else {
                 $cachedvalue = array(
                     'attr_dict' => array(),
                 );
@@ -244,17 +232,18 @@ 
     public static function get_internal_id_to_acode_mapping()
     {
         static $mapping = null;
-        if ($mapping !== null)
-            return $mapping;
+        if ($mapping !== null) {
+                    return $mapping;
+        }
 
         $cache_key = "attrhelper/id2acode/".Okapi::$git_revision.self::cache_key_suffix();
         $mapping = Cache::get($cache_key);
-        if (!$mapping)
-        {
+        if (!$mapping) {
             self::init_from_cache();
             $mapping = array();
-            foreach (self::$attr_dict as $acode => &$attr_ref)
-                $mapping[$attr_ref['internal_id']] = $acode;
+            foreach (self::$attr_dict as $acode => &$attr_ref) {
+                            $mapping[$attr_ref['internal_id']] = $acode;
+            }
             Cache::set($cache_key, $mapping, self::ttl());
         }
         return $mapping;
@@ -267,18 +256,17 @@ 
     public static function get_acode_to_name_mapping($langpref)
     {
         static $mapping = null;
-        if ($mapping !== null)
-            return $mapping;
+        if ($mapping !== null) {
+                    return $mapping;
+        }
 
         $cache_key = md5(serialize(array("attrhelper/acode2name", $langpref,
             Okapi::$git_revision, self::cache_key_suffix())));
         $mapping = Cache::get($cache_key);
-        if (!$mapping)
-        {
+        if (!$mapping) {
             self::init_from_cache();
             $mapping = array();
-            foreach (self::$attr_dict as $acode => &$attr_ref)
-            {
+            foreach (self::$attr_dict as $acode => &$attr_ref) {
                 $mapping[$acode] = Okapi::pick_best_language(
                     $attr_ref['names'], $langpref);
             }

htdocs/okapi/services/attrs/attributes.php

Braces +24 added lines, -16 removed lines

@@ -35,26 +35,35 @@ 
         # Read the parameters.
 
         $acodes = $request->get_parameter('acodes');
-        if (!$acodes) throw new ParamMissing('acodes');
+        if (!$acodes) {
+            throw new ParamMissing('acodes');
+        }
         $acodes = explode("|", $acodes);
 
         $langpref = $request->get_parameter('langpref');
-        if (!$langpref) $langpref = "en";
+        if (!$langpref) {
+            $langpref = "en";
+        }
         $langpref = explode("|", $langpref);
 
         $fields = $request->get_parameter('fields');
-        if (!$fields) $fields = "name";
+        if (!$fields) {
+            $fields = "name";
+        }
         $fields = explode("|", $fields);
-        foreach ($fields as $field)
-        {
-            if (!in_array($field, self::$valid_field_names))
-                throw new InvalidParam('fields', "'$field' is not a valid field code.");
+        foreach ($fields as $field) {
+            if (!in_array($field, self::$valid_field_names)) {
+                            throw new InvalidParam('fields', "'$field' is not a valid field code.");
+            }
         }
 
         $forward_compatible = $request->get_parameter('forward_compatible');
-        if (!$forward_compatible) $forward_compatible = "true";
-        if (!in_array($forward_compatible, array("true", "false")))
-            throw new InvalidParam('forward_compatible');
+        if (!$forward_compatible) {
+            $forward_compatible = "true";
+        }
+        if (!in_array($forward_compatible, array("true", "false"))) {
+                    throw new InvalidParam('forward_compatible');
+        }
         $forward_compatible = ($forward_compatible == "true");
 
         # Load the attributes (all of them).
@@ -66,8 +75,7 @@ 
         # to the results.
 
         $results = array();
-        foreach ($acodes as $acode)
-        {
+        foreach ($acodes as $acode) {
             /* Please note, that the $attr variable from the $attrdict dictionary
              * below is NOT fully compatible with the interface of the "attribute"
              * method. Some of $attr's fields are private and should not be exposed,
@@ -101,8 +109,7 @@ 
         # in the $attrdict because currently we have no way of knowing then they
         # change.)
 
-        if (in_array('local_icon_url', $fields))
-        {
+        if (in_array('local_icon_url', $fields)) {
             $tmp = Db::select_all("
                 select id, icon_large
                 from cache_attrib
@@ -133,8 +140,9 @@ 
                 continue;
             }
             $clean_row = array();
-            foreach ($fields as $field)
-                $clean_row[$field] = $attr_ref[$field];
+            foreach ($fields as $field) {
+                            $clean_row[$field] = $attr_ref[$field];
+            }
             $attr_ref = $clean_row;
         }
 

htdocs/okapi/services/attrs/attribute_index.php

Braces +10 added lines, -5 removed lines

@@ -30,13 +30,19 @@ 
         # Read the parameters.
 
         $langpref = $request->get_parameter('langpref');
-        if (!$langpref) $langpref = "en";
+        if (!$langpref) {
+            $langpref = "en";
+        }
 
         $fields = $request->get_parameter('fields');
-        if (!$fields) $fields = "name";
+        if (!$fields) {
+            $fields = "name";
+        }
 
         $only_locally_used = $request->get_parameter('only_locally_used');
-        if (!$only_locally_used) $only_locally_used = "false";
+        if (!$only_locally_used) {
+            $only_locally_used = "false";
+        }
         $only_locally_used = ($only_locally_used == "true");
 
         # Get the list of attributes and filter the A-codes based on the
@@ -45,8 +51,7 @@ 
         require_once 'attr_helper.inc.php';
         $attrdict = AttrHelper::get_attrdict();
         $acodes = array();
-        foreach ($attrdict as $acode => &$attr_ref)
-        {
+        foreach ($attrdict as $acode => &$attr_ref) {
             if ($only_locally_used && ($attr_ref['internal_id'] === null)) {
                 /* Skip. */
                 continue;

htdocs/okapi/services/logs/submit.php

Braces +78 added lines, -127 removed lines

@@ -20,7 +20,9 @@ 
  * the Consumer did anything wrong (it's the user who did). This exception shouldn't
  * be used outside of this file.
  */
-class CannotPublishException extends Exception {}
+class CannotPublishException extends Exception
+{
+}
 
 class WebService
 {
@@ -43,10 +45,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,16 +60,20 @@ 
         }
 
         $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)
-        {
+        if ($tmp) {
             $when = strtotime($tmp);
             if ($when < 1) {
                 throw new InvalidParam(
@@ -77,8 +87,7 @@ 
                     "the past, but NOT in the future."
                 ));
             }
-        }
-        else {
+        } else {
             $when = time();
         }
 
@@ -101,8 +110,7 @@ 
                 "Rating is allowed only for 'Found it' and 'Attended' logtypes."
             );
         }
-        if ($rating !== null && (Settings::get('OC_BRANCH') == 'oc.de'))
-        {
+        if ($rating !== null && (Settings::get('OC_BRANCH') == 'oc.de')) {
             # We will remove the rating request and change the success message
             # (which will be returned IF the rest of the query will meet all the
             # requirements).
@@ -115,18 +123,19 @@ 
         }
 
         $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')
-        {
+        if ($recommend && $logtype != 'Found it') {
             if ($logtype != 'Attended') {
                 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 +165,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'."
                 );
@@ -208,24 +215,21 @@ 
 
         # Various integrity checks.
 
-        if ($cache['type'] == 'Event')
-        {
+        if ($cache['type'] == 'Event') {
             if (!in_array($logtype, array('Will attend', 'Attended', 'Comment'))) {
                 throw new CannotPublishException(_(
                     'This cache is an Event cache. You cannot "Find" it (but '.
                     '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.");
             }
         }
@@ -237,8 +241,7 @@ 
 
         # Password check.
 
-        if (($logtype == 'Found it' || $logtype == 'Attended') && $cache['req_passwd'])
-        {
+        if (($logtype == 'Found it' || $logtype == 'Attended') && $cache['req_passwd']) {
             $valid_password = Db::select_value("
                 select logpw
                 from caches
@@ -264,8 +267,7 @@ 
         # original format, while still being able to re-create the comment in
         # its original form.
 
-        if ($comment_format == 'plaintext')
-        {
+        if ($comment_format == 'plaintext') {
             # This code is identical to the plaintext processing in OC code,
             # including a space handling bug: Multiple consecutive spaces will
             # get semantically lost in the generated HTML.
@@ -273,12 +275,9 @@ 
             $formatted_comment = htmlspecialchars($comment, ENT_COMPAT);
             $formatted_comment = nl2br($formatted_comment);
 
-            if (Settings::get('OC_BRANCH') == 'oc.de')
-            {
+            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).
                 # For OKAPI, the value has been changed from 0 to 1 with commit
@@ -289,26 +288,21 @@ 
 
                 $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
             # HTML, but applied nl2br too).
 
             $formatted_comment = nl2br($comment);
             $value_for_text_html_field = 1;
-        }
-        else
-        {
+        } else {
             $formatted_comment = $comment;
 
             # For user-supplied HTML comments, OC sites require us to do
             # additional HTML purification prior to the insertion into the
             # database.
 
-            if (Settings::get('OC_BRANCH') == 'oc.de')
-            {
+            if (Settings::get('OC_BRANCH') == 'oc.de') {
                 # NOTICE: We are including EXTERNAL OCDE library here! This
                 # code does not belong to OKAPI!
 
@@ -318,9 +312,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.
             }
@@ -328,8 +320,7 @@ 
             $value_for_text_html_field = 1;
         }
 
-        if (Settings::get('OC_BRANCH') == 'oc.pl')
-        {
+        if (Settings::get('OC_BRANCH') == 'oc.pl') {
             # The HTML processing in OCPL code is broken. Effectively, it
             # will decode &lt; &gt; and &amp; (and maybe other things?)
             # before display so that text contents may be interpreted as HTML.
@@ -365,8 +356,7 @@ 
 
         # Duplicate detection.
 
-        if ($on_duplicate != 'continue')
-        {
+        if ($on_duplicate != 'continue') {
             # Attempt to find a log entry made by the same user, for the same cache, with
             # the same date, type, comment, etc. Note, that these are not ALL the fields
             # we could check, but should work ok in most cases. Also note, that we
@@ -386,15 +376,11 @@ 
                     ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "and deleted = 0" : "")."
                 limit 1
             ");
-            if ($duplicate_uuid != null)
-            {
-                if ($on_duplicate == 'silent_success')
-                {
+            if ($duplicate_uuid != null) {
+                if ($on_duplicate == 'silent_success') {
                     # 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 ".
                         "the same contents."
@@ -440,8 +426,7 @@ 
         # user submit a rating for it? Anyway, I will stick to the procedure
         # found in log.php. On the bright side, it's fail-safe.
 
-        if ($rating)
-        {
+        if ($rating) {
             $has_already_rated = Db::select_value("
                 select 1
                 from scores
@@ -459,8 +444,7 @@ 
 
         # If user wants to recommend...
 
-        if ($recommend)
-        {
+        if ($recommend) {
             # Do the same "fail-safety" check as we did for the rating.
 
             $already_recommended = Db::select_value("
@@ -497,32 +481,26 @@ 
         # If user checked the "needs_maintenance(2)" flag for OCPL, we will shuffle things
         # a little...
 
-        if (Settings::get('OC_BRANCH') == 'oc.pl' && $needs_maintenance2 == 'true')
-        {
+        if (Settings::get('OC_BRANCH') == 'oc.pl' && $needs_maintenance2 == 'true') {
             # If we're here, then we also know that the "Needs maintenance" log
             # type is supported by this OC site. However, it's a separate log
             # type, so we might have to submit two log types together:
 
-            if ($logtype == 'Comment')
-            {
+            if ($logtype == 'Comment') {
                 # If user submits a "Comment", we'll just change its type to
                 # "Needs maintenance". Only one log entry will be issued.
 
                 $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
                 # maintenance" with empty comment.
 
                 $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
                 # will have an empty comment. We will move the comment to the second
@@ -532,22 +510,17 @@ 
                 $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.
 
                 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.
 
@@ -567,8 +540,7 @@ 
         );
         self::increment_cache_stats($cache['internal_id'], $when, $logtype);
         self::increment_user_stats($user['internal_id'], $logtype);
-        if ($second_logtype != null)
-        {
+        if ($second_logtype != null) {
             # Reminder: This will only be called for OCPL branch.
 
             $log_uuids[] = self::insert_log_row(
@@ -587,8 +559,7 @@ 
 
         # Save the rating.
 
-        if ($rating)
-        {
+        if ($rating) {
             # This code will be called for OCPL branch only. Earlier, we made sure,
             # to set $rating to null, if we're running on OCDE.
 
@@ -602,8 +573,7 @@ 
             # but presumably has some deep logic into it. See also here (Polish):
             # http://wiki.opencaching.pl/index.php/Oceny_skrzynek
 
-            switch ($rating)
-            {
+            switch ($rating) {
                 case 1: $db_score = -2.0; break;
                 case 2: $db_score = -0.5; break;
                 case 3: $db_score = 0.7; break;
@@ -632,10 +602,8 @@ 
 
         # Save recommendation.
 
-        if ($recommend)
-        {
-            if (Db::field_exists('cache_rating', 'rating_date'))
-            {
+        if ($recommend) {
+            if (Db::field_exists('cache_rating', 'rating_date')) {
                 Db::execute("
                     insert into cache_rating (user_id, cache_id, rating_date)
                     values (
@@ -644,9 +612,7 @@ 
                         from_unixtime('".Db::escape_string($when)."')
                     );
                 ");
-            }
-            else
-            {
+            } else {
                 Db::execute("
                     insert into cache_rating (user_id, cache_id)
                     values (
@@ -680,14 +646,15 @@ 
         # 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.
 
         Okapi::gettext_domain_init(explode("|", $langpref));
-        try
-        {
+        try {
             # If appropriate, $success_message might be changed inside the _call.
             self::$success_message = _("Your cache log entry was posted successfully.");
             $log_uuids = self::_call($request);
@@ -698,9 +665,7 @@ 
                 'log_uuids' => $log_uuids
             );
             Okapi::gettext_domain_restore();
-        }
-        catch (CannotPublishException $e)
-        {
+        } catch (CannotPublishException $e) {
             Okapi::gettext_domain_restore();
             $result = array(
                 'success' => false,
@@ -715,17 +680,13 @@ 
 
     private static function increment_cache_stats($cache_internal_id, $when, $logtype)
     {
-        if (Settings::get('OC_BRANCH') == 'oc.de')
-        {
+        if (Settings::get('OC_BRANCH') == 'oc.de') {
             # 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.
 
-            if ($logtype == 'Found it')
-            {
+            if ($logtype == 'Found it') {
                 Db::execute("
                     update caches
                     set
@@ -736,25 +697,19 @@ 
                         )
                     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.
             }
         }
@@ -762,17 +717,13 @@ 
 
     private static function increment_user_stats($user_internal_id, $logtype)
     {
-        if (Settings::get('OC_BRANCH') == 'oc.de')
-        {
+        if (Settings::get('OC_BRANCH') == 'oc.de') {
             # 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.
 
-            switch ($logtype)
-            {
+            switch ($logtype) {
                 case 'Found it': $field_to_increment = 'founds_count'; break;
                 case "Didn't find it": $field_to_increment = 'notfounds_count'; break;
                 case 'Comment': $field_to_increment = 'log_notes_count'; break;
@@ -791,15 +742,15 @@ 
     private static function insert_log_row(
         $consumer_key, $cache_internal_id, $user_internal_id, $logtype, $when,
         $formatted_comment, $text_html, $needs_maintenance2
-    )
-    {
+    ) {
         if (Settings::get('OC_BRANCH') == 'oc.de') {
             $needs_maintenance_field_SQL = ', needs_maintenance';
             if ($needs_maintenance2 == 'true') {
                 $needs_maintenance_SQL = ',2';
             } else if ($needs_maintenance2 == 'false') {
                 $needs_maintenance_SQL = ',1';
-            } else {  // 'null'
+            } else {
+// 'null'
                 $needs_maintenance_SQL = ',0';
             }
         } else {

htdocs/okapi/services/logs/entries.php

Braces +32 added lines, -29 removed lines

@@ -31,35 +31,38 @@ 
     public static function call(OkapiRequest $request)
     {
         $log_uuids = $request->get_parameter('log_uuids');
-        if ($log_uuids === null) throw new ParamMissing('log_uuids');
-        if ($log_uuids === "")
-        {
+        if ($log_uuids === null) {
+            throw new ParamMissing('log_uuids');
+        }
+        if ($log_uuids === "") {
             $log_uuids = array();
+        } else {
+                    $log_uuids = explode("|", $log_uuids);
         }
-        else
-            $log_uuids = explode("|", $log_uuids);
 
-        if ((count($log_uuids) > 500) && (!$request->skip_limits))
-            throw new InvalidParam('log_uuids', "Maximum allowed number of referenced ".
+        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.");
-        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).");
+        }
+        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');
-        if (!$fields) $fields = "date|user|type|comment";
+        if (!$fields) {
+            $fields = "date|user|type|comment";
+        }
         $fields = explode("|", $fields);
-        foreach ($fields as $field)
-            if (!in_array($field, self::$valid_field_names))
+        foreach ($fields as $field) {
+                    if (!in_array($field, self::$valid_field_names))
                 throw new InvalidParam('fields', "'$field' is not a valid field code.");
+        }
 
-        if (Settings::get('OC_BRANCH') == 'oc.de')
-        {
+        if (Settings::get('OC_BRANCH') == 'oc.de') {
             $teamentry_field = 'cl.oc_team_comment';
             $ratingdate_condition = 'and cr.rating_date=cl.date';
             $needs_maintenance_SQL = 'cl.needs_maintenance';
             $listing_is_outdated_SQL = 'cl.listing_outdated';
-        }
-        else
-        {
+        } else {
             $teamentry_field = '(cl.type=12)';
             $ratingdate_condition = '';
             $needs_maintenance_SQL = 'IF(cl.type=5, 2, IF(cl.type=6, 1, 0))';
@@ -96,8 +99,7 @@ 
         $results = array();
         $log_id2uuid = array(); /* Maps logs' internal_ids to uuids */
         $flag_options = array('null', 'false', 'true');
-        while ($row = Db::fetch_assoc($rs))
-        {
+        while ($row = Db::fetch_assoc($rs)) {
             $results[$row['uuid']] = array(
                 'uuid' => $row['uuid'],
                 'cache_code' => $row['cache_code'],
@@ -122,8 +124,7 @@ 
 
         # fetch images
 
-        if (in_array('images', $fields))
-        {
+        if (in_array('images', $fields)) {
             # For OCPL log entry images, pictures.seq currently is always = 1,
             # while OCDE uses it for ordering the images.
 
@@ -142,8 +143,7 @@ 
             } else {
                 $object_type_param = '';
             }
-            while ($row = Db::fetch_assoc($rs))
-            {
+            while ($row = Db::fetch_assoc($rs)) {
                 $results[$log_id2uuid[$row['object_id']]]['images'][] =
                     array(
                         'uuid' => $row['uuid'],
@@ -158,22 +158,25 @@ 
 
         # Check which UUIDs were not found and mark them with null.
 
-        foreach ($log_uuids as $log_uuid)
-            if (!isset($results[$log_uuid]))
+        foreach ($log_uuids as $log_uuid) {
+                    if (!isset($results[$log_uuid]))
                 $results[$log_uuid] = null;
+        }
 
         # Remove unwanted fields.
 
-        foreach (self::$valid_field_names as $field)
-            if (!in_array($field, $fields))
+        foreach (self::$valid_field_names as $field) {
+                    if (!in_array($field, $fields))
                 foreach ($results as &$result_ref)
                     unset($result_ref[$field]);
+        }
 
         # Order the results in the same order as the input codes were given.
 
         $ordered_results = array();
-        foreach ($log_uuids as $log_uuid)
-            $ordered_results[$log_uuid] = $results[$log_uuid];
+        foreach ($log_uuids as $log_uuid) {
+                    $ordered_results[$log_uuid] = $results[$log_uuid];
+        }
 
         return Okapi::formatted_response($request, $ordered_results);
     }

htdocs/okapi/services/logs/userlogs.php

Braces +22 added lines, -13 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).
@@ -60,8 +70,7 @@ 
             limit $offset, $limit
         ");
         $results = array();
-        while ($row = Db::fetch_assoc($rs))
-        {
+        while ($row = Db::fetch_assoc($rs)) {
             $results[] = array(
                 'uuid' => $row['uuid'],
                 'date' => date('c', $row['date']),

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

Braces +15 added lines, -18 removed lines

@@ -19,7 +19,9 @@ 
  * the Consumer did anything wrong (it's the user who did). This exception shouldn't
  * be used outside of this file.
  */
-class CannotPublishException extends Exception {}
+class CannotPublishException extends Exception
+{
+}
 
 class WebService
 {
@@ -60,8 +62,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);
@@ -98,10 +101,8 @@ 
         }
 
         # update position
-        if ($position !== null)
-        {
-            if (Settings::get('OC_BRANCH') == 'oc.pl')
-            {
+        if ($position !== null) {
+            if (Settings::get('OC_BRANCH') == 'oc.pl') {
                 # OCPL as no arbitrary log picture ordering => ignore position parameter
                 # and return the picture's current position.
 
@@ -111,9 +112,7 @@ 
                     order by date_created
                 ");
                 $position = array_search($image_uuid, $image_uuids);
-            }
-            else
-            {
+            } else {
                 list($position, $seq) = LogImagesCommon::prepare_position(
                     $log_internal_id,
                     $position,
@@ -125,8 +124,7 @@ 
                     select seq from pictures where uuid = '".$image_uuid_escaped."'
                 ");
 
-                if ($seq != $old_seq)
-                {
+                if ($seq != $old_seq) {
                     # First move the edited picture to the end, to make space for rotating.
                     # Remember that we have no transactions at OC.de. If something goes wrong,
                     # the image will stay at the end of the list.
@@ -204,11 +202,12 @@ 
         # 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
-        {
+        try {
             $position = self::_call($request);
             $result = array(
                 'success' => true,
@@ -216,9 +215,7 @@ 
                 'position' => $position
             );
             Okapi::gettext_domain_restore();
-        }
-        catch (CannotPublishException $e)
-        {
+        } catch (CannotPublishException $e) {
             Okapi::gettext_domain_restore();
             $result = array(
                 'success' => false,

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

Braces +2 added lines, -5 removed lines

@@ -41,12 +41,9 @@
         # OCDE sequence numbers may have gaps. So we do not need to adjust
         # any numbers after deleting from table 'pictures'.
 
-        if (Settings::get('OC_BRANCH') == 'oc.de')
-        {
+        if (Settings::get('OC_BRANCH') == 'oc.de') {
             # OCDE does all the housekeeping by triggers
-        }
-        else
-        {
+        } else {
             Db::execute("
                 INSERT INTO removed_objects (
                     localID, uuid, type, removed_date, node

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

Braces +6 added lines, -9 removed lines

@@ -20,8 +20,9 @@ 
     function validate_image_uuid($request)
     {
         $image_uuid = $request->get_parameter('image_uuid');
-        if (!$image_uuid)
-            throw new ParamMissing('image_uuid');
+        if (!$image_uuid) {
+                    throw new ParamMissing('image_uuid');
+        }
 
         # When uploading images, OCPL stores the user_id of the uploader
         # in the 'pictures' table. This is redundant to cache_logs.user_id,
@@ -91,8 +92,7 @@ 
 
     static function prepare_position($log_internal_id, $position, $end_offset)
     {
-        if (Settings::get('OC_BRANCH') == 'oc.de' && $position !== null)
-        {
+        if (Settings::get('OC_BRANCH') == 'oc.de' && $position !== null) {
             # Prevent race conditions when creating sequence numbers if a
             # user tries to upload multiple images simultaneously. With a
             # few picture uploads per hour - most of them probably witout
@@ -107,16 +107,13 @@ 
             where object_type = 1 and object_id = '".Db::escape_string($log_internal_id)."'
         ");
 
-        if (Settings::get('OC_BRANCH') == 'oc.pl')
-        {
+        if (Settings::get('OC_BRANCH') == 'oc.pl') {
             # Ignore the position parameter, always insert at end.
             # Remember that this function is NOT called when editing OCPL images.
 
             $position = $log_images_count;
             $seq = 1;
-        }
-        else
-        {
+        } else {
             if ($position === null || $position >= $log_images_count) {
                 $position = $log_images_count - 1 + $end_offset;
                 $seq = Db::select_value("