OpencachingDeutschland / oc-server3

htdocs/lib2/search/search.txt.inc.php

Doc Comments +3 added lines

@@ -228,6 +228,9 @@
     return $str;
 }
 
+/**
+ * @param string $str
+ */
 function lf2crlf($str)
 {
     return mb_ereg_replace("\r\r\n", "\r\n", mb_ereg_replace("\n", "\r\n", $str));

htdocs/src/Oc/Libse/ChildWp/ControllerChildWp.php

Doc Comments +6 added lines

@@ -28,6 +28,9 @@ 
         $this->translator = $this->initTranslator($translator);
     }
 
+    /**
+     * @param boolean $request
+     */
     private function initRequest($request)
     {
         if ($request) {
@@ -37,6 +40,9 @@ 
         return new RequestHttp();
     }
 
+    /**
+     * @param boolean $translator
+     */
     private function initTranslator($translator)
     {
         if ($translator) {

htdocs/lib2/logic/cachelog.class.php

Spacing +1 added lines, -1 removed lines

@@ -355,7 +355,7 @@
         //     return array();
         // Logic Error - log types are still valid when no NEW logs are allowed for the cache.
         // (Would e.g. block admin logs and log-type restoring for locked caches.)
-        return get_cache_log_types($this->getCacheId(), $this->getType());  // depends on userid
+        return get_cache_log_types($this->getCacheId(), $this->getType()); // depends on userid
     }
 
     public static function isDuplicate($cacheId, $userId, $logType, $logDate, $logText)

htdocs/lib2/logic/gis.class.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
         // number of points in the polygon
         $n = count($polygon);
         $poly1 = $polygon[0];
-        for ($i = 1; $i <= $n; $i ++) {
+        for ($i = 1; $i <= $n; $i++) {
             $poly1XY = explode(' ', $poly1);
             $poly1x = $poly1XY[0];
             $poly1y = $poly1XY[1];
@@ -44,7 +44,7 @@ 
                         if ($poly1y != $poly2y) {
                             $xinters = ($py - $poly1y) * ($poly2x - $poly1x) / ($poly2y - $poly1y) + $poly1x;
                             if ($poly1x == $poly2x || $px <= $xinters) {
-                                $counter ++;
+                                $counter++;
                             }
                         }
                     }

htdocs/lib2/pager.class.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
             $to_page = min($last_page, max($first_page, $current_page - $lrspan) + $this->max_pages_shown - 1);
             $from_page = max($first_page, $to_page - $this->max_pages_shown + 1);
 
-            for ($page = $from_page; $page <= $to_page; $page ++) {
+            for ($page = $from_page; $page <= $to_page; $page++) {
                 if ($page == $current_page) {
                     $pages[$page] = false;
                 } else {

Doc Comments +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
      * Use {page} in link_url als placeholder for the selected page number
      * and/or {offset} for the 0-based data offset of the selected page.
      *
-     * @param $link_url
+     * @param string $link_url
      * @param int $min_pages_shown
      * @param int $max_pages_shown
      */
@@ -38,8 +38,8 @@ 
     }
 
     /**
-     * @param $current_page
-     * @param $total_pages
+     * @param double $current_page
+     * @param double $total_pages
      * @param bool $page_size
      */
     public function make_from_pagenr($current_page, $total_pages, $page_size = false)
@@ -110,7 +110,7 @@ 
 
     /**
      * @param $page
-     * @param $page_size
+     * @param boolean $page_size
      *
      * @return string
      */

htdocs/lib2/error.inc.php

Indentation +27 added lines, -27 removed lines

@@ -7,34 +7,34 @@
  *  Common error messages
  ***************************************************************************/
 
- define('ERROR_UNKNOWN', 1000);
- define('ERROR_TEMPLATE_NOT_FOUND', 1001);
- define('ERROR_COMPILATION_FAILED', 1002);
- define('ERROR_NO_ACCESS', 1003);
- define('ERROR_INVALID_OPERATION', 1004);
- define('ERROR_LOGIN_REQUIRED', 1005);
- define('ERROR_MAIL_TEMPLATE_NOT_FOUND', 1006);
- define('ERROR_NO_COOKIES', 1007);
- define('ERROR_ALREADY_LOGGEDIN', 1008);
- define('ERROR_USER_NOT_ACTIVE', 1009);
- define('ERROR_USER_NO_EMAIL', 1010);
- define('ERROR_CACHE_NOT_PUBLISHED', 1011);
- define('ERROR_CACHE_LOCKED', 1012);
+    define('ERROR_UNKNOWN', 1000);
+    define('ERROR_TEMPLATE_NOT_FOUND', 1001);
+    define('ERROR_COMPILATION_FAILED', 1002);
+    define('ERROR_NO_ACCESS', 1003);
+    define('ERROR_INVALID_OPERATION', 1004);
+    define('ERROR_LOGIN_REQUIRED', 1005);
+    define('ERROR_MAIL_TEMPLATE_NOT_FOUND', 1006);
+    define('ERROR_NO_COOKIES', 1007);
+    define('ERROR_ALREADY_LOGGEDIN', 1008);
+    define('ERROR_USER_NOT_ACTIVE', 1009);
+    define('ERROR_USER_NO_EMAIL', 1010);
+    define('ERROR_CACHE_NOT_PUBLISHED', 1011);
+    define('ERROR_CACHE_LOCKED', 1012);
 
- define('ERROR_SEARCHPLUGIN_WAYPOINT_FORMAT', 1013);
- define('ERROR_SEARCHPLUGIN_WAYPOINT_MANY', 1014);
- define('ERROR_SEARCHPLUGIN_WAYPOINT_NOTFOUND', 1015);
+    define('ERROR_SEARCHPLUGIN_WAYPOINT_FORMAT', 1013);
+    define('ERROR_SEARCHPLUGIN_WAYPOINT_MANY', 1014);
+    define('ERROR_SEARCHPLUGIN_WAYPOINT_NOTFOUND', 1015);
  
- define('ERROR_DB_COULD_NOT_RECONNECT', 1016);
- define('ERROR_DB_NO_ROOT', 1017);
+    define('ERROR_DB_COULD_NOT_RECONNECT', 1016);
+    define('ERROR_DB_NO_ROOT', 1017);
 
- define('ERROR_USER_NOT_EXISTS', 1018);
- define('ERROR_CACHE_NOT_EXISTS', 1019);
- define('ERROR_CACHELOG_NOT_EXISTS', 1020);
- define('ERROR_PICTURE_NOT_EXISTS', 1021);
+    define('ERROR_USER_NOT_EXISTS', 1018);
+    define('ERROR_CACHE_NOT_EXISTS', 1019);
+    define('ERROR_CACHELOG_NOT_EXISTS', 1020);
+    define('ERROR_PICTURE_NOT_EXISTS', 1021);
 
- define('ERROR_UPLOAD_ERR_NO_FILE', 1022);
- define('ERROR_UPLOAD_ERR_SIZE', 1023);
- define('ERROR_UPLOAD_ERR_TYPE', 1024);
- define('ERROR_UPLOAD_UNKNOWN', 1025);
- define('ERROR_UPLOAD_ERR_BAD_FORMAT', 1026);
+    define('ERROR_UPLOAD_ERR_NO_FILE', 1022);
+    define('ERROR_UPLOAD_ERR_SIZE', 1023);
+    define('ERROR_UPLOAD_ERR_TYPE', 1024);
+    define('ERROR_UPLOAD_UNKNOWN', 1025);
+    define('ERROR_UPLOAD_ERR_BAD_FORMAT', 1026);

htdocs/lib2/sqldebugger.class.php

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
                     break;
                 }
                 $command['result'][] = $r;
-                $c ++;
+                $c++;
             }
             sql_free_result($rs);
 

htdocs/ignore.php

Switch Indentation +6 added lines, -6 removed lines

@@ -29,12 +29,12 @@
 }
 
 switch ($action) {
-    case 'addignore':
-        sql("INSERT IGNORE INTO `cache_ignore` (`cache_id`, `user_id`) VALUES ('&1', '&2')", $cache_id, $login->userid);
-        break;
-    case 'removeignore':
-        sql("DELETE FROM `cache_ignore` WHERE `cache_id`='&1' AND `user_id`='&2'", $cache_id, $login->userid);
-        break;
+        case 'addignore':
+            sql("INSERT IGNORE INTO `cache_ignore` (`cache_id`, `user_id`) VALUES ('&1', '&2')", $cache_id, $login->userid);
+            break;
+        case 'removeignore':
+            sql("DELETE FROM `cache_ignore` WHERE `cache_id`='&1' AND `user_id`='&2'", $cache_id, $login->userid);
+            break;
 }
 
 // clear cached map result, so that the change directly appears on the map

htdocs/newcachesrest.php

Spacing +1 added lines, -2 removed lines

@@ -14,8 +14,7 @@
 $tpl->caching = true;
 $tpl->cache_lifetime = 3600;
 
-$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] :
-    (isset($_REQUEST['country']) ? $_REQUEST['country'] : $opt['page']['main_country']);
+$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] : (isset($_REQUEST['country']) ? $_REQUEST['country'] : $opt['page']['main_country']);
 
 if (!$tpl->is_cached()) {
     $newCaches = array();