OpencachingDeutschland / oc-server3

htdocs/lib2/menu.class.php

Spacing +13 added lines, -13 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require_once $opt['rootpath'] . 'lib2/translate.class.php';
+require_once $opt['rootpath'].'lib2/translate.class.php';
 
 define('AUTH_LEVEL_ALL', 0);
 define('AUTH_LEVEL_ADMIN', '2');
@@ -22,7 +22,7 @@ 
     {
         global $opt, $login, $build_map_towns_menu;
 
-        $this->sMenuFilename = $opt['rootpath'] . 'cache2/menu-' . $opt['template']['locale'] . '.inc.php';
+        $this->sMenuFilename = $opt['rootpath'].'cache2/menu-'.$opt['template']['locale'].'.inc.php';
 
         if (!file_exists($this->sMenuFilename)) {
             $this->CreateCacheFile();
@@ -34,7 +34,7 @@ 
         // add country-dependent town list for small map
         $country = $login->getUserCountry();
         if ($opt['map']['towns']['enable'] &&
-            isset($build_map_towns_menu) && $build_map_towns_menu &&   // optimization
+            isset($build_map_towns_menu) && $build_map_towns_menu && // optimization
             isset($opt['map']['towns'][$country]['enable']) && $opt['map']['towns'][$country]['enable']
         ) {
             $rsTowns = sqlf(
@@ -67,13 +67,13 @@ 
                         'title' => $rTown['name'],
                         'menustring' => $rTown['name'],
                         'authlevel' => 0,
-                        'href' => 'map2.php?mode=normalscreen&lat=' . $rTown['coord_lat'] . '&lon=' . $rTown['coord_long'] . '&zoom=' . $zoom,
+                        'href' => 'map2.php?mode=normalscreen&lat='.$rTown['coord_lat'].'&lon='.$rTown['coord_long'].'&zoom='.$zoom,
                         'visible' => 1,
                         'sublevel' => 1,
                         'parent' => MNU_MAP
                     ];
                     $menuitem[MNU_MAP]['subitems'][] = $menu_map;
-                    ++ $menu_map;
+                    ++$menu_map;
                 }
             }
         }
@@ -85,12 +85,12 @@ 
 
         $f = fopen($this->sMenuFilename, 'w');
         fwrite($f, "<?php\n");
-        fwrite($f, 'global $menuitem;' . "\n");
+        fwrite($f, 'global $menuitem;'."\n");
         fwrite($f, "\n");
 
         $rsDefines = sqlf("SELECT `id`, `id_string` FROM `sys_menu`");
         while ($rDefine = sql_fetch_assoc($rsDefines)) {
-            fwrite($f, 'if (!defined(\'' . addslashes($rDefine['id_string']) . '\')) define(\'' . addslashes($rDefine['id_string']) . '\', ' . $rDefine['id'] . ");\n");
+            fwrite($f, 'if (!defined(\''.addslashes($rDefine['id_string']).'\')) define(\''.addslashes($rDefine['id_string']).'\', '.$rDefine['id'].");\n");
         }
         sql_free_result($rsDefines);
         fwrite($f, "\n");
@@ -100,7 +100,7 @@ 
         $rsSubmenu = sqlf("SELECT `id` FROM `sys_menu` WHERE `parent`=0 ORDER BY `parent` ASC, `position` ASC");
         while ($rSubmenu = sql_fetch_assoc($rsSubmenu)) {
             $aMenu[MNU_ROOT]['subitems'][$nPos] = $rSubmenu['id'];
-            $nPos ++;
+            $nPos++;
         }
         sql_free_result($rsSubmenu);
         fwrite($f, "\n");
@@ -137,13 +137,13 @@ 
             );
             while ($rSubmenu = sql_fetch_assoc($rsSubmenu)) {
                 $aMenu[$r['id']]['subitems'][$nPos] = $rSubmenu['id'];
-                $nPos ++;
+                $nPos++;
             }
             sql_free_result($rsSubmenu);
         }
         sql_free_result($rs);
 
-        fwrite($f, '$menuitem = unserialize("' . str_replace('"', '\\"', serialize($aMenu)) . '");' . "\n");
+        fwrite($f, '$menuitem = unserialize("'.str_replace('"', '\\"', serialize($aMenu)).'");'."\n");
 
         fwrite($f, "?>");
         fclose($f);
@@ -153,12 +153,12 @@ 
     {
         global $opt;
 
-        $dir = $opt['rootpath'] . 'cache2/';
+        $dir = $opt['rootpath'].'cache2/';
         if ($dh = opendir($dir)) {
             while (($file = readdir($dh)) !== false) {
-                if (filetype($dir . $file) == 'file') {
+                if (filetype($dir.$file) == 'file') {
                     if (preg_match('/^menu-[a-z]{2,2}.inc.php/', $file)) {
-                        unlink($dir . $file);
+                        unlink($dir.$file);
                     }
                 }
             }

htdocs/lib2/translate_filescan.class.php

Spacing +10 added lines, -10 removed lines

@@ -34,8 +34,8 @@ 
 
     public function scanTranslateFunctionCalls()
     {
-        $nNextPos = strpos($this->msContent, "t" . "('");
-        $nNext_ = strpos($this->msContent, "_" . "('");
+        $nNextPos = strpos($this->msContent, "t"."('");
+        $nNext_ = strpos($this->msContent, "_"."('");
         if ($nNext_ !== false && ($nNextPos === false || $nNext_ < $nNextPos)) {
             $nNextPos = $nNext_;
         }
@@ -68,8 +68,8 @@ 
                 );
             }
 
-            $nNext_ = strpos($this->msContent, "_" . "('", $nNextPos + 1);
-            $nNextPos = strpos($this->msContent, "t" . "('", $nNextPos + 1);
+            $nNext_ = strpos($this->msContent, "_"."('", $nNextPos + 1);
+            $nNextPos = strpos($this->msContent, "t"."('", $nNextPos + 1);
             if ($nNext_ !== false && ($nNextPos === false || $nNext_ < $nNextPos)) {
                 $nNextPos = $nNext_;
             }
@@ -92,11 +92,11 @@ 
 
     public function scanTranslationPlaceholders()
     {
-        $nNextPos = strpos($this->msContent, '{' . 't');
+        $nNextPos = strpos($this->msContent, '{'.'t');
         while ($nNextPos !== false) {
             // check for match
-            if ((substr($this->msContent, $nNextPos, 3) == '{' . 't}') ||
-                (substr($this->msContent, $nNextPos, 3) == '{' . 't ')
+            if ((substr($this->msContent, $nNextPos, 3) == '{'.'t}') ||
+                (substr($this->msContent, $nNextPos, 3) == '{'.'t ')
             ) {
                 $nStart = strpos($this->msContent, '}', $nNextPos);
                 $nEnd = strpos($this->msContent, '{/t}', $nNextPos);
@@ -111,7 +111,7 @@ 
                 );
             }
 
-            $nNextPos = strpos($this->msContent, '{' . 't', $nNextPos + 1);
+            $nNextPos = strpos($this->msContent, '{'.'t', $nNextPos + 1);
         }
     }
 
@@ -120,9 +120,9 @@ 
     {
         $nLine = 1;
 
-        for ($n = 0; $n < $nPos; $n ++) {
+        for ($n = 0; $n < $nPos; $n++) {
             if (substr($this->msContent, $n, 1) == "\n") {
-                $nLine ++;
+                $nLine++;
             }
         }
 

htdocs/lib2/translate.class.php

Spacing +5 added lines, -5 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require_once $opt['rootpath'] . 'lib2/translationHandler.class.php';
+require_once $opt['rootpath'].'lib2/translationHandler.class.php';
 
 function createTranslate($backtrace_level = 0)
 {
@@ -32,7 +32,7 @@ 
      */
     public function t($message, $style, $resource_name, $line, $plural = '', $count = 1, $lang = null)
     {
-        global $opt, $locale;    // $locale is for lib1 compatibility
+        global $opt, $locale; // $locale is for lib1 compatibility
 
         if ($message == '') {
             return '';
@@ -98,10 +98,10 @@ 
 
             $variables = array();
             $language_lower = mb_strtolower($language);
-            $translationHandler->loadNodeTextFile($variables, $opt['logic']['node']['id'] . '.txt', $language_lower);
+            $translationHandler->loadNodeTextFile($variables, $opt['logic']['node']['id'].'.txt', $language_lower);
             $translationHandler->loadNodeTextFile(
                 $variables,
-                $opt['logic']['node']['id'] . '-' . $language_lower . '.txt',
+                $opt['logic']['node']['id'].'-'.$language_lower.'.txt',
                 $language_lower
             );
             $message = $translationHandler->substitueVariables($variables, $language_lower, $message);
@@ -184,6 +184,6 @@ 
 
         $text = $trans ? $trans : gettext($search);
 
-        return $text . ' <a href= translate.php?action=edit&id=' . $r['id'] . '>Edit</a>';
+        return $text.' <a href= translate.php?action=edit&id='.$r['id'].'>Edit</a>';
     }
 }

htdocs/lib2/html2text.class.php

Spacing +10 added lines, -10 removed lines

@@ -451,9 +451,9 @@ 
         if (empty($url)) {
             if (!empty($_SERVER['HTTP_HOST'])) {
                 if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off') {
-                    $this->url = 'https://' . $_SERVER['HTTP_HOST'];
+                    $this->url = 'https://'.$_SERVER['HTTP_HOST'];
                 } else {
-                    $this->url = 'http://' . $_SERVER['HTTP_HOST'];
+                    $this->url = 'http://'.$_SERVER['HTTP_HOST'];
                 }
             } else {
                 $this->url = '';
@@ -499,7 +499,7 @@ 
 
         // Add link list
         if (!empty($this->_link_list)) {
-            $text .= "\n\nLinks:\n------\n" . $this->_link_list;
+            $text .= "\n\nLinks:\n------\n".$this->_link_list;
         }
 
         // Wrap the text to a readable format
@@ -534,24 +534,24 @@ 
         if (substr($link, 0, 7) == 'http://' || substr($link, 0, 8) == 'https://' ||
             substr($link, 0, 7) == 'mailto:'
         ) {
-            $this->_link_count ++;
-            $this->_link_list .= "[" . $this->_link_count . "] $link\n";
-            $additional = ' [' . $this->_link_count . ']';
+            $this->_link_count++;
+            $this->_link_list .= "[".$this->_link_count."] $link\n";
+            $additional = ' ['.$this->_link_count.']';
         } elseif (substr($link, 0, 11) == 'javascript:') {
             // Don't count the link; ignore it
             $additional = '';
             // what about href="#anchor" ?
         } else {
-            $this->_link_count ++;
-            $this->_link_list .= "[" . $this->_link_count . "] " . $this->url;
+            $this->_link_count++;
+            $this->_link_list .= "[".$this->_link_count."] ".$this->url;
             if (substr($link, 0, 1) != '/') {
                 $this->_link_list .= '/';
             }
             $this->_link_list .= "$link\n";
-            $additional = ' [' . $this->_link_count . ']';
+            $additional = ' ['.$this->_link_count.']';
         }
 
-        return $display . $additional;
+        return $display.$additional;
     }
 
 }

htdocs/lib2/logic/cachelist.class.php

Spacing +20 added lines, -20 removed lines

@@ -8,7 +8,7 @@ 
  *   add/remove etc. is executed instantly
  ***************************************************************************/
 
-require_once __DIR__ . '/../translate.class.php';
+require_once __DIR__.'/../translate.class.php';
 
 define('ERROR_BAD_LISTNAME', 1);
 define('ERROR_DUPLICATE_LISTNAME', 2);
@@ -164,7 +164,7 @@ 
         return sql_value(
             "
             SELECT `entries` FROM `stat_cache_lists`
-            WHERE `stat_cache_lists`.`cache_list_id`='" . sql_escape($this->getId()) . "'",
+            WHERE `stat_cache_lists`.`cache_list_id`='" . sql_escape($this->getId())."'",
             0
         );
     }
@@ -174,7 +174,7 @@ 
         return sql_value(
             "
             SELECT `watchers` FROM `stat_cache_lists`
-            WHERE `stat_cache_lists`.`cache_list_id`='" . sql_escape($this->getId()) . "'",
+            WHERE `stat_cache_lists`.`cache_list_id`='" . sql_escape($this->getId())."'",
             0
         );
     }
@@ -402,7 +402,7 @@ 
     {
         global $login;
 
-        return cachelist::getLists("`cache_lists`.`user_id`='" . sql_escape($login->userid) . "'");
+        return cachelist::getLists("`cache_lists`.`user_id`='".sql_escape($login->userid)."'");
     }
 
     public static function getListsWatchedByMe()
@@ -410,9 +410,9 @@ 
         global $login;
 
         return cachelist::getLists(
-            "`id` IN (SELECT `cache_list_id` FROM `cache_list_watches` WHERE `user_id`='" . sql_escape(
+            "`id` IN (SELECT `cache_list_id` FROM `cache_list_watches` WHERE `user_id`='".sql_escape(
                 $login->userid
-            ) . "')"
+            )."')"
         );
     }
 
@@ -421,9 +421,9 @@ 
         global $login;
 
         return cachelist::getLists(
-            "`id` IN (SELECT `cache_list_id` FROM `cache_list_bookmarks` WHERE `user_id`='" . sql_escape(
+            "`id` IN (SELECT `cache_list_id` FROM `cache_list_bookmarks` WHERE `user_id`='".sql_escape(
                 $login->userid
-            ) . "')"
+            )."')"
         );
     }
 
@@ -436,8 +436,8 @@ 
             LEFT JOIN `stat_cache_lists` ON  `stat_cache_lists`.`cache_list_id`=`cache_lists`.`id`
             LEFT JOIN `user` ON `user`.`user_id`=`cache_lists`.`user_id`
             WHERE `is_public`>=2 AND `entries`>0"
-            . ($namelike ? " AND `name` LIKE '%" . sql_escape($namelike) . "%'" : '')
-            . ($userlike ? " AND `username` LIKE '%" . sql_escape($userlike) . "%'" : ''),
+            . ($namelike ? " AND `name` LIKE '%".sql_escape($namelike)."%'" : '')
+            . ($userlike ? " AND `username` LIKE '%".sql_escape($userlike)."%'" : ''),
             0
         );
     }
@@ -446,8 +446,8 @@ 
     {
         return cachelist::getLists(
             "`is_public`>=2 AND `entries`>0"
-            . ($namelike ? " AND `name` LIKE '%" . sql_escape($namelike) . "%'" : '')
-            . ($userlike ? " AND `username` LIKE '%" . sql_escape($userlike) . "%'" : ''),
+            . ($namelike ? " AND `name` LIKE '%".sql_escape($namelike)."%'" : '')
+            . ($userlike ? " AND `username` LIKE '%".sql_escape($userlike)."%'" : ''),
             0,
             $startat,
             $maxitems,
@@ -458,7 +458,7 @@ 
     public static function getPublicListsOf($userid)
     {
         return cachelist::getLists(
-            "`is_public`>=2 AND `entries`>0 AND `cache_lists`.`user_id`='" . sql_escape($userid) . "'"
+            "`is_public`>=2 AND `entries`>0 AND `cache_lists`.`user_id`='".sql_escape($userid)."'"
         );
     }
 
@@ -471,7 +471,7 @@ 
             "
             SELECT `user_id`
             FROM `caches`
-            WHERE `cache_id`='" . sql_escape($cacheid) . "'",
+            WHERE `cache_id`='" . sql_escape($cacheid)."'",
             0
         );
         $my_watches = sql_fetch_column(
@@ -483,15 +483,15 @@ 
             `id` IN
                 (SELECT `cache_list_id`
                  FROM `cache_list_items`
-                 WHERE `cache_id`='" . sql_escape($cacheid) . "')
+                 WHERE `cache_id`='" . sql_escape($cacheid)."')
             AND
             (
-                `cache_lists`.`user_id`='" . sql_escape($login->userid) . "' " .
-            ($all ? "OR `is_public`= 3 " : "") .
+                `cache_lists`.`user_id`='" . sql_escape($login->userid)."' ".
+            ($all ? "OR `is_public`= 3 " : "").
             "OR (`is_public`> 0 AND
-                   `cache_lists`.`id` IN ('" . implode("','", array_map('sql_escape', $my_watches)) . "'))
+                   `cache_lists`.`id` IN ('" . implode("','", array_map('sql_escape', $my_watches))."'))
             )",
-            "`cache_lists`.`user_id`<>'" . sql_escape($cache_owner_id) . "'",
+            "`cache_lists`.`user_id`<>'".sql_escape($cache_owner_id)."'",
             0,
             20,
             true
@@ -500,7 +500,7 @@ 
 
     public static function getListById($listid)
     {
-        $lists = cachelist::getLists("`id`='" . sql_escape($listid) . "'");
+        $lists = cachelist::getLists("`id`='".sql_escape($listid)."'");
         if (count($lists)) {
             $lists[0]['description_for_display'] = use_current_protocol_in_html($lists[0]['description']);
 

htdocs/lib2/logic/const.inc.php

Spacing +21 added lines, -21 removed lines

@@ -16,28 +16,28 @@ 
 define('RE_TYPE_FLOAT', 5);
 define('RE_TYPE_DOUBLE', 6);
 
-define('RE_INSERT_NOTHING', 0);       //
-define('RE_INSERT_OVERWRITE', 1);     // ignore given values and use function
-define('RE_INSERT_IGNORE', 2);        // dont use this column on insert
+define('RE_INSERT_NOTHING', 0); //
+define('RE_INSERT_OVERWRITE', 1); // ignore given values and use function
+define('RE_INSERT_IGNORE', 2); // dont use this column on insert
 define('RE_INSERT_AUTOINCREMENT', 4); // column is an auto increment column
-define('RE_INSERT_AUTOUUID', 8);      // if empty, UUID is generated by before insert trigger (not supported for primary key fields)
-define('RE_INSERT_NOW', 16);          // NOW()
+define('RE_INSERT_AUTOUUID', 8); // if empty, UUID is generated by before insert trigger (not supported for primary key fields)
+define('RE_INSERT_NOW', 16); // NOW()
 
 define('EUROPEAN_LETTERS', 'A-Za-zÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ');
 // ASCII + ISO-8859-1 0xC0..0xFF
-define('REGEX_USERNAME', '^[' . EUROPEAN_LETTERS . '0-9\.\-_@=)(\/\\\&*+~#][' . EUROPEAN_LETTERS . '0-9\.\-_ @=)(\/\\\&*+~#]{1,58}[' . EUROPEAN_LETTERS . '0-9\.\-_@=)(\/\\\&*+~#]$');
-define('REGEX_PASSWORD', '^[' . EUROPEAN_LETTERS . '0-9\.\-_ @=)(\/\\\&*+~#]{3,60}$');
-define('REGEX_LAST_NAME', '^[' . EUROPEAN_LETTERS . '][' . EUROPEAN_LETTERS . '0-9\.\- ]{0,58}[' . EUROPEAN_LETTERS . '0-9\.]$');
+define('REGEX_USERNAME', '^['.EUROPEAN_LETTERS.'0-9\.\-_@=)(\/\\\&*+~#]['.EUROPEAN_LETTERS.'0-9\.\-_ @=)(\/\\\&*+~#]{1,58}['.EUROPEAN_LETTERS.'0-9\.\-_@=)(\/\\\&*+~#]$');
+define('REGEX_PASSWORD', '^['.EUROPEAN_LETTERS.'0-9\.\-_ @=)(\/\\\&*+~#]{3,60}$');
+define('REGEX_LAST_NAME', '^['.EUROPEAN_LETTERS.']['.EUROPEAN_LETTERS.'0-9\.\- ]{0,58}['.EUROPEAN_LETTERS.'0-9\.]$');
 define('REGEX_FIRST_NAME', REGEX_LAST_NAME);
-define('REGEX_STATPIC_TEXT', '^[' . EUROPEAN_LETTERS . '0-9\.\-_ @=)(\/\\\&*\$+~#!§%;,-?:\[\]{}¹²³\'\"`\|µ°\%]{0,30}$');
+define('REGEX_STATPIC_TEXT', '^['.EUROPEAN_LETTERS.'0-9\.\-_ @=)(\/\\\&*\$+~#!§%;,-?:\[\]{}¹²³\'\"`\|µ°\%]{0,30}$');
 
-define('ADMIN_TRANSLATE', 1);     // edit translation
-define('ADMIN_MAINTAINANCE', 2);  // check table etc.
-define('ADMIN_USER', 4);          // drop users, caches etc.
-define('ADMIN_NEWS', 8);          // obsolete / reserved
-define('ADMIN_RESTORE', 16);      // restore vandalized listings
-define('ADMIN_ROOT', 128 | 127);  // root + all previous rights
-define('ADMIN_LISTING', 1024);    // can edit any cache listings
+define('ADMIN_TRANSLATE', 1); // edit translation
+define('ADMIN_MAINTAINANCE', 2); // check table etc.
+define('ADMIN_USER', 4); // drop users, caches etc.
+define('ADMIN_NEWS', 8); // obsolete / reserved
+define('ADMIN_RESTORE', 16); // restore vandalized listings
+define('ADMIN_ROOT', 128 | 127); // root + all previous rights
+define('ADMIN_LISTING', 1024); // can edit any cache listings
 
 define('ATTRIB_SELECTED', 1);
 define('ATTRIB_UNSELECTED', 2);
@@ -79,11 +79,11 @@ 
 // ID 15 was temporarily used and is reserved, see commit dda7ef0. Continue with 16.
 
 // user.data_license values
-define('OLD_DATA_LICSENSE', 0);                       // before deadline
-define('NEW_DATA_LICENSE_ACTIVELY_DECLINED', 1);      // declined license
-define('NEW_DATA_LICENSE_ACTIVELY_ACCEPTED', 2);      // accepted new license on registration
-define('NEW_DATA_LICENSE_PASSIVELY_ACCEPTED', 3);     // did not decline license until deadline
-define('NEW_DATA_LICENSE_PASSIVELY_DECLINED', 4);     // could not accept/decline because disabled
+define('OLD_DATA_LICSENSE', 0); // before deadline
+define('NEW_DATA_LICENSE_ACTIVELY_DECLINED', 1); // declined license
+define('NEW_DATA_LICENSE_ACTIVELY_ACCEPTED', 2); // accepted new license on registration
+define('NEW_DATA_LICENSE_PASSIVELY_ACCEPTED', 3); // did not decline license until deadline
+define('NEW_DATA_LICENSE_PASSIVELY_DECLINED', 4); // could not accept/decline because disabled
 
 //picture upload/resize parameters
 define('PICTURE_QUALITY', 85);

htdocs/lib2/logic/getNew.class.php

Spacing +4 added lines, -4 removed lines

@@ -51,11 +51,11 @@ 
     public function rsForSmarty($type, $args = null)
     {
         // check type
-        if (method_exists($this, strtolower($type) . 'Rs')) {
+        if (method_exists($this, strtolower($type).'Rs')) {
             return call_user_func(
                 [
                     $this,
-                    $type . 'Rs'
+                    $type.'Rs'
                 ],
                 $args
             );
@@ -78,11 +78,11 @@ 
     public function feedForSmarty($type, $items = null, $url = null, $timeout = null, $includetext = null)
     {
         // check type
-        if (method_exists($this, strtolower($type) . 'Feed')) {
+        if (method_exists($this, strtolower($type).'Feed')) {
             return call_user_func(
                 [
                     $this,
-                    $type . 'Feed'
+                    $type.'Feed'
                 ],
                 $items,
                 $url,

htdocs/lib2/logic/cacheIcon.class.php

Spacing +4 added lines, -4 removed lines

@@ -10,8 +10,8 @@ 
 
     public static function get($user_id, $cache_id, $cache_status, $cache_userid, $iconname)
     {
-        $iconname = mb_eregi_replace("cache/", "", $iconname);   // for old cache_type table contents
-        $iconext = "." . mb_eregi_replace("^.*\.", "", $iconname);
+        $iconname = mb_eregi_replace("cache/", "", $iconname); // for old cache_type table contents
+        $iconext = ".".mb_eregi_replace("^.*\.", "", $iconname);
         $iconname = mb_eregi_replace("\..*", "", $iconname);
 
         // add status
@@ -30,7 +30,7 @@ 
                 break;
             case 5:
                 $iconname .= "-s";
-                break;      // fix for RT ticket #3403
+                break; // fix for RT ticket #3403
             case 6:
                 $iconname .= "-a";
                 break;
@@ -65,7 +65,7 @@ 
             }
         }
 
-        return $iconname . $iconext;
+        return $iconname.$iconext;
     }
 
 }

htdocs/lib2/logic/coordinate.class.php

Spacing +61 added lines, -61 removed lines

@@ -31,15 +31,15 @@ 
     public function getDecimal()
     {
         if ($this->nLat < 0) {
-            $sLat = 'S ' . sprintf('%08.5f', - $this->nLat) . '°';
+            $sLat = 'S '.sprintf('%08.5f', - $this->nLat).'°';
         } else {
-            $sLat = 'N ' . sprintf('%08.5f', $this->nLat) . '°';
+            $sLat = 'N '.sprintf('%08.5f', $this->nLat).'°';
         }
 
         if ($this->nLon < 0) {
-            $sLon = 'W ' . sprintf('%09.5f', - $this->nLon) . '°';
+            $sLon = 'W '.sprintf('%09.5f', - $this->nLon).'°';
         } else {
-            $sLon = 'E ' . sprintf('%09.5f', $this->nLon) . '°';
+            $sLon = 'E '.sprintf('%09.5f', $this->nLon).'°';
         }
 
         return [
@@ -62,9 +62,9 @@ 
         $nLatDeg = floor($nLat);
         $nLatMin = ($nLat - $nLatDeg) * 60;
         if ($bLatN) {
-            $sLat = 'N ' . sprintf("%02d", $nLatDeg) . '° ' . sprintf($minute_format, $nLatMin) . '\'';
+            $sLat = 'N '.sprintf("%02d", $nLatDeg).'° '.sprintf($minute_format, $nLatMin).'\'';
         } else {
-            $sLat = 'S ' . sprintf("%02d", $nLatDeg) . '° ' . sprintf($minute_format, $nLatMin) . '\'';
+            $sLat = 'S '.sprintf("%02d", $nLatDeg).'° '.sprintf($minute_format, $nLatMin).'\'';
         }
 
         // Ocprop: ([E|W].*?)&#039;
@@ -76,9 +76,9 @@ 
         $nLonDeg = floor($nLon);
         $nLonMin = ($nLon - $nLonDeg) * 60;
         if ($bLonE) {
-            $sLon = 'E ' . sprintf("%03d", $nLonDeg) . '° ' . sprintf($minute_format, $nLonMin) . '\'';
+            $sLon = 'E '.sprintf("%03d", $nLonDeg).'° '.sprintf($minute_format, $nLonMin).'\'';
         } else {
-            $sLon = 'W ' . sprintf("%03d", $nLonDeg) . '° ' . sprintf($minute_format, $nLonMin) . '\'';
+            $sLon = 'W '.sprintf("%03d", $nLonDeg).'° '.sprintf($minute_format, $nLonMin).'\'';
         }
 
         return [
@@ -101,15 +101,15 @@ 
         $nLatMin = ($nLatMin - $nLatSec);
         $nLatSec = $nLatSec * 60;
         if ($bLatN) {
-            $sLat = 'N ' . sprintf("%02d", $nLatDeg) . '° ' . sprintf("%02d", $nLatMin) . '\' ' . sprintf(
+            $sLat = 'N '.sprintf("%02d", $nLatDeg).'° '.sprintf("%02d", $nLatMin).'\' '.sprintf(
                     "%02d",
                     $nLatSec
-                ) . '\'\'';
+                ).'\'\'';
         } else {
-            $sLat = 'S ' . sprintf("%02d", $nLatDeg) . '° ' . sprintf("%02d", $nLatMin) . '\' ' . sprintf(
+            $sLat = 'S '.sprintf("%02d", $nLatDeg).'° '.sprintf("%02d", $nLatMin).'\' '.sprintf(
                     "%02d",
                     $nLatSec
-                ) . '\'\'';
+                ).'\'\'';
         }
 
         $nLon = $this->nLon;
@@ -123,15 +123,15 @@ 
         $nLonMin = ($nLonMin - $nLonSec);
         $nLonSec = $nLonSec * 60;
         if ($bLonE) {
-            $sLon = 'E ' . sprintf("%03d", $nLonDeg) . '° ' . sprintf("%02d", $nLonMin) . '\' ' . sprintf(
+            $sLon = 'E '.sprintf("%03d", $nLonDeg).'° '.sprintf("%02d", $nLonMin).'\' '.sprintf(
                     "%02d",
                     $nLonSec
-                ) . '\'\'';
+                ).'\'\'';
         } else {
-            $sLon = 'W ' . sprintf("%03d", $nLonDeg) . '° ' . sprintf("%02d", $nLonMin) . '\' ' . sprintf(
+            $sLon = 'W '.sprintf("%03d", $nLonDeg).'° '.sprintf("%02d", $nLonMin).'\' '.sprintf(
                     "%02d",
                     $nLonSec
-                ) . '\'\'';
+                ).'\'\'';
         }
 
         return [
@@ -162,8 +162,8 @@ 
             return [
                 'zone' => "",
                 'letter' => "",
-                'north' => 'N ' . 0,
-                'east' => 'E ' . 0
+                'north' => 'N '.0,
+                'east' => 'E '.0
             ];
         }
         if ($this->nLon <= - 180 || $this->nLon > 180 || $this->nLat <= - 80 || $this->nLat >= 84) {
@@ -175,8 +175,8 @@ 
                 0
             ];
         }
-        $lw = (float) $this->nLon;
-        $bw = (float) $this->nLat;
+        $lw = (float)$this->nLon;
+        $bw = (float)$this->nLat;
 
         //WGS84 Datum
         //Große Halbachse a und Abplattung f
@@ -195,9 +195,9 @@ 
 
         //Koeffizienten zur Berechnung der Meridianbogenlänge
         $e0 = $c * (pi() / 180) * (1 - 3 * $ex2 / 4 + 45 * $ex4 / 64 - 175 * $ex6 / 256 + 11025 * $ex8 / 16384);
-        $e2 = $c * (- 3 * $ex2 / 8 + 15 * $ex4 / 32 - 525 * $ex6 / 1024 + 2205 * $ex8 / 4096);
+        $e2 = $c * (-3 * $ex2 / 8 + 15 * $ex4 / 32 - 525 * $ex6 / 1024 + 2205 * $ex8 / 4096);
         $e4 = $c * (15 * $ex4 / 256 - 105 * $ex6 / 1024 + 2205 * $ex8 / 16384);
-        $e6 = $c * (- 35 * $ex6 / 3072 + 315 * $ex8 / 12288);
+        $e6 = $c * (-35 * $ex6 / 3072 + 315 * $ex8 / 12288);
 
         //Längenzone lz und Breitenzone (Band) bz
         $lzn = intval(($lw + 180) / 6) + 1;
@@ -221,9 +221,9 @@ 
 
         $lz = "$lzn";
         if ($lzn < 10) {
-            $lz = "0" . $lzn;
+            $lz = "0".$lzn;
         }
-        $bd = (int) (1 + ($bw + 80) / 8);
+        $bd = (int)(1 + ($bw + 80) / 8);
         $bz = substr($b_sel, $bd - 1, 1);
 
         //Geographische Breite in Radianten br
@@ -268,29 +268,29 @@ 
         $ew = 0.9996 * ($nd * $cos1 * $dl + $nd * $cos3 * (1 - $tan2 + $etasq) * $dl3 / 6 +
                 $nd * $cos5 * (5 - 18 * $tan2 + $tan4) * $dl5 / 120) + 500000;
 
-        $nk = $nw - (int) $nw;
+        $nk = $nw - (int)$nw;
         if ($nk < 0.5) {
-            $nw = '' . (int) $nw;
+            $nw = ''.(int)$nw;
         } else {
-            $nw = '' . ((int) $nw + 1);
+            $nw = ''.((int)$nw + 1);
         }
 
         while (strlen($nw) < 7) {
-            $nw = '0' . $nw;
+            $nw = '0'.$nw;
         }
 
-        $nk = $ew - (int) $ew;
+        $nk = $ew - (int)$ew;
         if ($nk < 0.5) {
-            $ew = '0' . (int) $ew;
+            $ew = '0'.(int)$ew;
         } else {
-            $ew = '0' . intval($ew + 1);
+            $ew = '0'.intval($ew + 1);
         }
 
         return [
             'zone' => $lz,
             'letter' => $bz,
-            'north' => 'N ' . floor($nw),
-            'east' => 'E ' . floor($ew)
+            'north' => 'N '.floor($nw),
+            'east' => 'E '.floor($ew)
         ];
     }
 
@@ -300,7 +300,7 @@ 
         $pdResult = $this->wgs2pot($this->nLat, $this->nLon);
         $result = $this->geo2gk($pdResult[1], $pdResult[0]);
 
-        return 'R ' . floor($result[0]) . ' H ' . floor($result[1]);
+        return 'R '.floor($result[0]).' H '.floor($result[1]);
     }
 
     public function wgs2pot($bw, $lw)
@@ -331,8 +331,8 @@ 
                 0
             ];
         }
-        $lw = (float) $lw;
-        $bw = (float) $bw;
+        $lw = (float)$lw;
+        $bw = (float)$bw;
 
         // Quellsystem WGS 84 Datum
         // Große Halbachse a und Abplattung fq
@@ -410,8 +410,8 @@ 
                 0
             ];
         }
-        $lp = (float) $lp;
-        $bp = (float) $bp;
+        $lp = (float)$lp;
+        $bp = (float)$bp;
 
         // Potsdam Datum
         // Große Halbachse a und Abplattung f
@@ -429,9 +429,9 @@ 
 
         // Koeffizienten zur Berechnung der Meridianbogenlänge
         $e0 = $c * (pi() / 180) * (1 - 3 * $ex2 / 4 + 45 * $ex4 / 64 - 175 * $ex6 / 256 + 11025 * $ex8 / 16384);
-        $e2 = $c * (- 3 * $ex2 / 8 + 15 * $ex4 / 32 - 525 * $ex6 / 1024 + 2205 * $ex8 / 4096);
+        $e2 = $c * (-3 * $ex2 / 8 + 15 * $ex4 / 32 - 525 * $ex6 / 1024 + 2205 * $ex8 / 4096);
         $e4 = $c * (15 * $ex4 / 256 - 105 * $ex6 / 1024 + 2205 * $ex8 / 16384);
-        $e6 = $c * (- 35 * $ex6 / 3072 + 315 * $ex8 / 12288);
+        $e6 = $c * (-35 * $ex6 / 3072 + 315 * $ex8 / 12288);
 
         // Breite in Radianten
         $br = $bp * pi() / 180;
@@ -469,18 +469,18 @@ 
         $rw = ($nd * $cos1 * $dl + $nd * $cos3 * (1 - $tan2 + $etasq) * $dl3 / 6 +
             $nd * $cos5 * (5 - 18 * $tan2 + $tan4) * $dl5 / 120 + $kz * 1e6 + 500000);
 
-        $nk = $hw - (int) $hw;
+        $nk = $hw - (int)$hw;
         if ($nk < 0.5) {
-            $hw = (int) $hw;
+            $hw = (int)$hw;
         } else {
-            $hw = ((int) $hw) + 1;
+            $hw = ((int)$hw) + 1;
         }
 
-        $nk = $rw - (int) $rw;
+        $nk = $rw - (int)$rw;
         if ($nk < 0.5) {
-            $rw = (int) $rw;
+            $rw = (int)$rw;
         } else {
-            $rw = (int) ($rw + 1);
+            $rw = (int)($rw + 1);
         }
 
         return [
@@ -499,8 +499,8 @@ 
         $lat_base = 52.15517440;
         $lon_base = 5.38720621;
 
-        for ($i = 0; $i <= 6; $i ++) {
-            for ($j = 0; $j <= 5; $j ++) {
+        for ($i = 0; $i <= 6; $i++) {
+            for ($j = 0; $j <= 5; $j++) {
                 $rpq[$i][$j] = 0;
                 $spq[$i][$j] = 0;
             }
@@ -535,8 +535,8 @@ 
         $xOrigin = 0;
         $yOrigin = 0;
 
-        for ($q = 0; $q <= 5; $q ++) {
-            for ($p = 0; $p <= 6; $p ++) {
+        for ($q = 0; $q <= 5; $q++) {
+            for ($p = 0; $p <= 6; $p++) {
                 $xOrigin = $xOrigin + ($rpq[$p][$q] * ((pow($dlat, $p)) * (pow($dlon, $q))));
                 $yOrigin = $yOrigin + ($spq[$p][$q] * ((pow($dlat, $p)) * (pow($dlon, $q))));
             }
@@ -544,7 +544,7 @@ 
         $xOrigin = $xOrigin + $rdx_base;
         $yOrigin = $yOrigin + $rdy_base;
 
-        return 'X ' . floor($xOrigin) . ' Y ' . floor($yOrigin);
+        return 'X '.floor($xOrigin).' Y '.floor($yOrigin);
     }
 
     // returns string
@@ -604,13 +604,13 @@ 
 
     public static function parseRequestLat($name)
     {
-        if (!isset($_REQUEST[$name . 'NS']) || !isset($_REQUEST[$name . 'Lat']) || !isset($_REQUEST[$name . 'LatMin'])) {
+        if (!isset($_REQUEST[$name.'NS']) || !isset($_REQUEST[$name.'Lat']) || !isset($_REQUEST[$name.'LatMin'])) {
             return false;
         }
 
-        $coordNS = $_REQUEST[$name . 'NS'];
-        $coordLat = $_REQUEST[$name . 'Lat'] + 0;
-        $coordLatMin = str_replace(',', '.', $_REQUEST[$name . 'LatMin']) + 0;
+        $coordNS = $_REQUEST[$name.'NS'];
+        $coordLat = $_REQUEST[$name.'Lat'] + 0;
+        $coordLatMin = str_replace(',', '.', $_REQUEST[$name.'LatMin']) + 0;
 
         $lat = $coordLat + $coordLatMin / 60;
         if ($coordNS == 'S') {
@@ -622,13 +622,13 @@ 
 
     public static function parseRequestLon($name)
     {
-        if (!isset($_REQUEST[$name . 'EW']) || !isset($_REQUEST[$name . 'Lon']) || !isset($_REQUEST[$name . 'LonMin'])) {
+        if (!isset($_REQUEST[$name.'EW']) || !isset($_REQUEST[$name.'Lon']) || !isset($_REQUEST[$name.'LonMin'])) {
             return false;
         }
 
-        $coordEW = $_REQUEST[$name . 'EW'];
-        $coordLon = $_REQUEST[$name . 'Lon'] + 0;
-        $coordLonMin = str_replace(',', '.', $_REQUEST[$name . 'LonMin']) + 0;
+        $coordEW = $_REQUEST[$name.'EW'];
+        $coordLon = $_REQUEST[$name.'Lon'] + 0;
+        $coordLonMin = str_replace(',', '.', $_REQUEST[$name.'LonMin']) + 0;
 
         $lon = $coordLon + $coordLonMin / 60;
         if ($coordEW == 'W') {
@@ -656,8 +656,8 @@ 
             [
                 'http' => [
                     'method' => 'POST',
-                    'header' => "Content-Type: application/x-www-form-urlencoded\r\n" .
-                        "Content-Length: " . strlen($params_str) . "\r\n",
+                    'header' => "Content-Type: application/x-www-form-urlencoded\r\n".
+                        "Content-Length: ".strlen($params_str)."\r\n",
                     'content' => $params_str,
                 ],
             ]