OpencachingDeutschland / oc-server3

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

Unused Use Statements -3 removed lines

@@ -7,12 +7,9 @@
 namespace okapi\services\logs\images;
 
 use Exception;
-use okapi\Okapi;
 use okapi\Db;
-use okapi\OkapiRequest;
 use okapi\InvalidParam;
 use okapi\Settings;
-use okapi\BadRequest;
 
 
 class LogImagesCommon

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("

htdocs/editdesc.php

Braces +14 added lines, -7 removed lines

@@ -19,9 +19,12 @@ 
     require $stylepath . '/editdesc.inc.php';
 
     // check for old-style parameters
-    if (isset($_REQUEST['cacheid']) && isset($_REQUEST['desclang']) && !isset($_REQUEST['descid']))  // Ocprop
+    if (isset($_REQUEST['cacheid']) && isset($_REQUEST['desclang']) && !isset($_REQUEST['descid'])) {
+        // Ocprop
     {
-        $cache_id = $_REQUEST['cacheid'];  // Ocprop
+        $cache_id = $_REQUEST['cacheid'];
+    }
+    // Ocprop
         $desc_lang = $_REQUEST['desclang'];  // Ocprop
 
         $rs = sql("SELECT `id` FROM `cache_desc` WHERE `cache_id`='&1' AND `language`='&2'", $cache_id, $desc_lang);
@@ -87,10 +90,13 @@ 
                 $show_all_langs = false;
 
                 //save to DB?
-                if (isset($_POST['post']))  // Ocprop
+                if (isset($_POST['post'])) {
+                    // Ocprop
                 {
                     //here we read all used information from the form if submitted
-                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1;  // Ocprop
+                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1;
+                }
+                // Ocprop
 
                     // fuer alte Versionen von OCProp
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -147,7 +153,8 @@ 
 
                     $desc = processEditorInput($oldDescMode, $descMode, $desc);
 
-                    if (isset($_POST['submitform']))  // Ocprop
+                    if (isset($_POST['submitform'])) {
+                        // Ocprop
                     {
                         // prüfen, ob sprache nicht schon vorhanden
                         $rs = sql(
@@ -160,6 +167,7 @@ 
                             $descid,
                             $desclang
                         );
+                    }
                         $r = sql_fetch_array($rs);
                         if ($r['count'] > 0) {
                             tpl_errorMsg('editdesc', $error_desc_exists);
@@ -224,8 +232,7 @@ 
 
                     if ($oldDescMode == 0) {
                         $desc = processEditorInput($oldDescMode, $descMode, $desc_record['desc']);
-                    }
-                    else {
+                    } else {
                         $desc = $desc_record['desc'];
                     }
                 }

htdocs/resource2/tinymce/config/log.js.php

Braces +1 added lines, -2 removed lines

@@ -1,8 +1,7 @@
 <?php
   if (isset($_REQUEST['lang'])) {
     $lang = $_REQUEST['lang'];
-  }
-  else {
+  } else {
     $lang = 'de';
   }
 ?>

htdocs/resource2/tinymce/config/desc.js.php

Braces +2 added lines, -4 removed lines

@@ -1,14 +1,12 @@
 <?php
   if (isset($_REQUEST['cacheid'])) {
     $cacheID = $_REQUEST['cacheid'];
-  }
-  else {
+  } else {
     $cacheID = 0;
   }
   if (isset($_REQUEST['lang'])) {
     $lang = $_REQUEST['lang'];
-  }
-  else {
+  } else {
     $lang = 'de';
   }
 ?>

htdocs/resource2/tinymce/config/user.js.php

Braces +6 added lines, -5 removed lines

@@ -1,9 +1,10 @@
 <?php
-  if (isset($_REQUEST['lang']))
-    $lang = $_REQUEST['lang'];
-  else
-    $lang = 'de';
-?>
+  if (isset($_REQUEST['lang'])) {
+      $lang = $_REQUEST['lang'];
+  } else {
+      $lang = 'de';
+  }
+  ?>
 
 tinyMCE_GZ.init({
     plugins : 'advhr,contextmenu,emotions,insertdatetime,paste,table',

htdocs/mailto.php

Braces +1 added lines, -2 removed lines

@@ -55,8 +55,7 @@
 $text = isset($_REQUEST['text']) ? $_REQUEST['text'] : '';
 if (isset($_REQUEST['emailaddress'])) {
     $bEmailaddress = ($_REQUEST['emailaddress'] == 1);
-}
-else {
+} else {
     $own_user = new user($login->userid);
     $bEmailaddress = $own_user->getUsermailSendAddress();
 }

htdocs/lib2/db.inc.php

Braces +3 added lines, -2 removed lines

@@ -894,8 +894,9 @@
     }
 
     if ($db['dblink_slave'] !== false) {
-        if (mysql_select_db($opt['db']['placeholder']['db'], $db['dblink_slave']) == false)
-            sql_error();
+        if (mysql_select_db($opt['db']['placeholder']['db'], $db['dblink_slave']) == false) {
+                    sql_error();
+        }
 
         mysql_query("SET NAMES '" . mysql_real_escape_string($opt['charset']['mysql'], $db['dblink_slave']) . "'", $db['dblink_slave']);
 

htdocs/okapi/services/replicate/changelog.php

Braces +9 added lines, -4 removed lines

@@ -29,13 +29,18 @@
         require_once('replicate_common.inc.php');
 
         $since = $request->get_parameter('since');
-        if ($since === null) throw new ParamMissing('since');
-        if ((int)$since != $since) throw new InvalidParam('since');
+        if ($since === null) {
+            throw new ParamMissing('since');
+        }
+        if ((int)$since != $since) {
+            throw new InvalidParam('since');
+        }
 
         # Let's check the $since parameter.
 
-        if (!ReplicateCommon::check_since_param($since))
-            throw new BadRequest("The 'since' parameter is too old. You must update your database more frequently.");
+        if (!ReplicateCommon::check_since_param($since)) {
+                    throw new BadRequest("The 'since' parameter is too old. You must update your database more frequently.");
+        }
 
         # Select a best chunk for the given $since, get the chunk from the database (or cache).
 

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);
     }
 }