OpencachingDeutschland / oc-server3

htdocs/verifyemail.php

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
  ***************************************************************************/
 
 $disable_verifyemail = true;
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'verifyemail';
 $tpl->menuitem = MNU_VERIFY_EMAIL;
@@ -28,7 +28,7 @@ 
     } else {
         $tpl->assign('emailadr', $user->getEMail());
         if ($user->missedDataLicenseMail()) {
-            $tpl->assign('datalicensemail', "<br /><br />" . file_get_contents("resource2/misc/datalicensemail.html"));
+            $tpl->assign('datalicensemail', "<br /><br />".file_get_contents("resource2/misc/datalicensemail.html"));
         }
         $tpl->assign('orgpage', $orgpage);
     }

htdocs/picture.php

Spacing +5 added lines, -5 removed lines

@@ -16,7 +16,7 @@ 
  *
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'picture';
 $tpl->menuitem = MNU_CACHES_PICTURE;
@@ -75,11 +75,11 @@ 
     if (isset($_REQUEST['ok'])) { // Ocprop
         $bError = false;
 
-        $picture->setSpoiler(isset($_REQUEST['spoiler']) && $_REQUEST['spoiler'] == '1');  // Ocprop
-        $picture->setDisplay((isset($_REQUEST['notdisplay']) && $_REQUEST['notdisplay'] == '1') == false);  // Ocprop
+        $picture->setSpoiler(isset($_REQUEST['spoiler']) && $_REQUEST['spoiler'] == '1'); // Ocprop
+        $picture->setDisplay((isset($_REQUEST['notdisplay']) && $_REQUEST['notdisplay'] == '1') == false); // Ocprop
         $picture->setMapPreview(isset($_REQUEST['mappreview']) && $_REQUEST['mappreview'] == '1');
 
-        $title = isset($_REQUEST['title']) ? $_REQUEST['title'] : '';  // Ocprop
+        $title = isset($_REQUEST['title']) ? $_REQUEST['title'] : ''; // Ocprop
         if ($title == '' || ($picture->getObjectType() == OBJECT_CACHELOG && trim($title) == '')) {
             $tpl->assign('errortitle', true);
             $bError = true;
@@ -135,7 +135,7 @@ 
                 }
             } // try saving as jpg and shrinking if > PICTURE_MAX_LONG_SIDE file
             else {
-                $picture->setFilenames(mb_strtolower($fname) . '.jpg');
+                $picture->setFilenames(mb_strtolower($fname).'.jpg');
                 if (!$picture->rotate_and_shrink($_FILES['file']['tmp_name'], PICTURE_MAX_LONG_SIDE)) {
                     $bError = true;
                 }

Braces +10 added lines, -5 removed lines

@@ -34,10 +34,12 @@ 
 
 $uuid = isset($_REQUEST['uuid']) ? $_REQUEST['uuid'] : 0;
 
-if ($action == 'add') { // Ocprop
+if ($action == 'add') {
+// Ocprop
     $picture = new picture();
 
-    if (isset($_REQUEST['cacheuuid'])) {  // Ocprop
+    if (isset($_REQUEST['cacheuuid'])) {
+// Ocprop
         $cache = cache::fromUUID($_REQUEST['cacheuuid']);
         if ($cache === null) {
             $tpl->error(ERROR_CACHE_NOT_EXISTS);
@@ -51,7 +53,8 @@ 
         $picture->setObjectType(OBJECT_CACHE);
 
         $cache = null;
-    } elseif (isset($_REQUEST['loguuid'])) {// Ocprop
+    } elseif (isset($_REQUEST['loguuid'])) {
+// Ocprop
         $cachelog = cachelog::fromUUID($_REQUEST['loguuid']);
         if ($cachelog === null) {
             $tpl->error(ERROR_CACHELOG_NOT_EXISTS);
@@ -72,7 +75,8 @@ 
     }
 
     // uploaded file ok?
-    if (isset($_REQUEST['ok'])) { // Ocprop
+    if (isset($_REQUEST['ok'])) {
+// Ocprop
         $bError = false;
 
         $picture->setSpoiler(isset($_REQUEST['spoiler']) && $_REQUEST['spoiler'] == '1');  // Ocprop
@@ -92,7 +96,8 @@ 
             $tpl->redirect($picture->getPageLink());
         }
 
-        if (!isset($_FILES['file'])) { // Ocprop
+        if (!isset($_FILES['file'])) {
+// Ocprop
             $tpl->assign('errorfile', ERROR_UPLOAD_ERR_NO_FILE);
             $bError = true;
         } elseif ($_FILES['file']['error'] == UPLOAD_ERR_NO_FILE) {

htdocs/okapi/datastore.php

Braces +22 added lines, -25 removed lines

@@ -13,8 +13,9 @@ 
             from okapi_consumers
             where `key` = '".Db::escape_string($consumer_key)."'
         ");
-        if (!$row)
-            return null;
+        if (!$row) {
+                    return null;
+        }
         return new OkapiConsumer($row['key'], $row['secret'], $row['name'],
             $row['url'], $row['email'], $row['bflags']);
     }
@@ -29,10 +30,10 @@ 
                 and token_type = '".Db::escape_string($token_type)."'
                 and `key` = '".Db::escape_string($token)."'
         ");
-        if (!$row)
-            return null;
-        switch ($row['token_type'])
-        {
+        if (!$row) {
+                    return null;
+        }
+        switch ($row['token_type']) {
             case 'request':
                 return new OkapiRequestToken($row['key'], $row['secret'],
                     $row['consumer_key'], $row['callback'], $row['user_id'],
@@ -57,8 +58,7 @@ 
             $timestamp,
             $nonce
         )));
-        try
-        {
+        try {
             # Time timestamp is saved separately, because we are periodically
             # removing older nonces from the database (see cronjobs).
 
@@ -71,9 +71,7 @@ 
                 );
             ");
             return null;
-        }
-        catch (\Exception $e)
-        {
+        } catch (\Exception $e) {
             # INSERT failed. This nonce was already used.
 
             return $nonce;
@@ -83,9 +81,8 @@ 
     public function new_request_token($consumer, $callback = null)
     {
         if ((preg_match("#^[a-z][a-z0-9_.-]*://#", $callback) > 0) ||
-            $callback == "oob")
-        { /* ok */ }
-        else { throw new BadRequest("oauth_callback should begin with lower case <scheme>://, or should equal 'oob'."); }
+            $callback == "oob") {
+/* ok */ } else { throw new BadRequest("oauth_callback should begin with lower case <scheme>://, or should equal 'oob'."); }
         $token = new OkapiRequestToken(Okapi::generate_key(20), Okapi::generate_key(40),
             $consumer->key, $callback, null, Okapi::generate_key(8, true));
         Db::execute("
@@ -111,12 +108,15 @@ 
 
     public function new_access_token($token, $consumer, $verifier = null)
     {
-        if ($token->consumer_key != $consumer->key)
-            throw new BadRequest("Request Token given is not associated with the Consumer who signed the request.");
-        if (!$token->authorized_by_user_id)
-            throw new BadRequest("Request Token given has not been authorized.");
-        if ($token->verifier != $verifier)
-            throw new BadRequest("Invalid verifier.");
+        if ($token->consumer_key != $consumer->key) {
+                    throw new BadRequest("Request Token given is not associated with the Consumer who signed the request.");
+        }
+        if (!$token->authorized_by_user_id) {
+                    throw new BadRequest("Request Token given has not been authorized.");
+        }
+        if ($token->verifier != $verifier) {
+                    throw new BadRequest("Invalid verifier.");
+        }
 
         # Invalidate the Request Token.
 
@@ -138,15 +138,12 @@ 
                 and user_id = '".Db::escape_string($token->authorized_by_user_id)."'
                 and consumer_key = '".Db::escape_string($consumer->key)."'
         ");
-        if ($row)
-        {
+        if ($row) {
             # Use existing Access Token
 
             $access_token = new OkapiAccessToken($row['key'], $row['secret'],
                 $consumer->key, $token->authorized_by_user_id);
-        }
-        else
-        {
+        } else {
             # Generate a new Access Token.
 
             $access_token = new OkapiAccessToken(Okapi::generate_key(20), Okapi::generate_key(40),

htdocs/okapi/service_runner.php

Braces +23 added lines, -23 removed lines

@@ -71,15 +71,14 @@ 
     /** Get method options (is consumer required etc.). */
     public static function options($service_name)
     {
-        if (!self::exists($service_name))
-            throw new Exception();
+        if (!self::exists($service_name)) {
+                    throw new Exception();
+        }
         require_once($GLOBALS['rootpath']."okapi/$service_name.php");
-        try
-        {
+        try {
             return call_user_func(array('\\okapi\\'.
                 str_replace('/', '\\', $service_name).'\\WebService', 'options'));
-        } catch (Exception $e)
-        {
+        } catch (Exception $e) {
             throw new Exception("Make sure you've declared your WebService class ".
                 "in an valid namespace (".'okapi\\'.str_replace('/', '\\', $service_name)."); ".
                 $e->getMessage());
@@ -92,8 +91,9 @@ 
      */
     public static function docs($service_name)
     {
-        if (!self::exists($service_name))
-            throw new Exception();
+        if (!self::exists($service_name)) {
+                    throw new Exception();
+        }
         try {
             return file_get_contents("$service_name.xml", true);
         } catch (Exception $e) {
@@ -114,31 +114,28 @@ 
     {
         Okapi::init_internals();
 
-        if (!self::exists($service_name))
-            throw new Exception("Method does not exist: '$service_name'");
+        if (!self::exists($service_name)) {
+                    throw new Exception("Method does not exist: '$service_name'");
+        }
 
         $options = self::options($service_name);
-        if ($options['min_auth_level'] >= 2 && $request->consumer == null)
-        {
+        if ($options['min_auth_level'] >= 2 && $request->consumer == null) {
             throw new Exception("Method '$service_name' called with mismatched OkapiRequest: ".
                 "\$request->consumer MAY NOT be empty for Level 2 and Level 3 methods. Provide ".
                 "a dummy Consumer if you have to.");
         }
-        if ($options['min_auth_level'] >= 3 && $request->token == null)
-        {
+        if ($options['min_auth_level'] >= 3 && $request->token == null) {
             throw new Exception("Method '$service_name' called with mismatched OkapiRequest: ".
                 "\$request->token MAY NOT be empty for Level 3 methods.");
         }
 
         $time_started = microtime(true);
         Okapi::gettext_domain_init();
-        try
-        {
+        try {
             require_once($GLOBALS['rootpath']."okapi/$service_name.php");
             $response = call_user_func(array('\\okapi\\'.
                 str_replace('/', '\\', $service_name).'\\WebService', 'call'), $request);
-            if ($options['min_auth_level'] >= 3 && $request->token->token_type == "access")
-            {
+            if ($options['min_auth_level'] >= 3 && $request->token->token_type == "access") {
                 Db::execute("
                     update user set last_login=now()
                     where user_id='".Db::escape_string($request->token->user_id)."'
@@ -178,18 +175,21 @@ 
         if ($request !== null) {
             $consumer_key = ($request->consumer != null) ? $request->consumer->key : 'anonymous';
             $user_id = (($request->token != null) && ($request->token instanceof OkapiAccessToken)) ? $request->token->user_id : -1;
-            if ($request->is_http_request() && ($service_name[0] == 's'))  # 's' for "services/", we don't want "extra/" included
+            if ($request->is_http_request() && ($service_name[0] == 's')) {
+                # 's' for "services/", we don't want "extra/" included
                 $calltype = 'http';
-            else
-                $calltype = 'internal';
+            } else {
+                            $calltype = 'internal';
+            }
         } else {
             $consumer_key = 'internal';
             $user_id = -1;
             $calltype = 'internal';
         }
 
-        if (Settings::get('OC_BRANCH') == 'oc.de' && $user_id != -1)
-            $user_id = 0;
+        if (Settings::get('OC_BRANCH') == 'oc.de' && $user_id != -1) {
+                    $user_id = 0;
+        }
 
         Db::execute("
             insert into okapi_stats_temp (`datetime`, consumer_key, user_id, service_name, calltype, runtime)

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

Spacing +1 added lines, -1 removed lines

@@ -192,7 +192,7 @@
      * loads attribute values from the cache. If they are not present in the
      * cache, it will read and parse them from attribute-definitions.xml file.
      */
-    private static function init_from_cache($allow_refreshing=true)
+    private static function init_from_cache($allow_refreshing = true)
     {
         if (self::$attr_dict !== null)
         {

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

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
             # Fill some other fields (not kept in the cached attrdict).
 
             $attr['is_locally_used'] = ($attr['internal_id'] !== null);
-            $attr['is_deprecated'] = $attr['is_discontinued'];  // deprecated and undocumetned field, see issue 70
+            $attr['is_deprecated'] = $attr['is_discontinued']; // deprecated and undocumetned field, see issue 70
 
             # Add to results.
 

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/entries.php

Spacing +1 added lines, -1 removed lines

@@ -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),
                     );

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']),