OpencachingDeutschland / oc-server3

htdocs/lib2/util.inc.php

Spacing +5 added lines, -5 removed lines

@@ -229,7 +229,7 @@ 
 
     while ($nCurPos < mb_strlen($str)) {
         $nNextSep = mb_strlen($str);
-        for ($nSepPos = 0; $nSepPos < mb_strlen($sep); $nSepPos ++) {
+        for ($nSepPos = 0; $nSepPos < mb_strlen($sep); $nSepPos++) {
             $nThisPos = mb_strpos($str, mb_substr($sep, $nSepPos, 1), $nCurPos);
             if ($nThisPos !== false) {
                 if ($nNextSep > $nThisPos) {
@@ -308,9 +308,9 @@ 
         $retval = 'E ';
     }
 
-    $retval = $retval . sprintf("%03d", floor($lon)) . '° ';
+    $retval = $retval.sprintf("%03d", floor($lon)).'° ';
     $lon = $lon - floor($lon);
-    $retval = $retval . sprintf("%06.3f", round($lon * 60, 3)) . '\'';
+    $retval = $retval.sprintf("%06.3f", round($lon * 60, 3)).'\'';
 
     return $retval;
 }
@@ -325,9 +325,9 @@ 
         $retval = 'N ';
     }
 
-    $retval = $retval . sprintf("%02d", floor($lat)) . '° ';
+    $retval = $retval.sprintf("%02d", floor($lat)).'° ';
     $lat = $lat - floor($lat);
-    $retval = $retval . sprintf("%06.3f", round($lat * 60, 3)) . '\'';
+    $retval = $retval.sprintf("%06.3f", round($lat * 60, 3)).'\'';
 
     return $retval;
 }

htdocs/lib2/ss_zip.class.php

Spacing +11 added lines, -11 removed lines

@@ -143,9 +143,9 @@ 
 
         }
         $fnl = strlen($filename);
-        $fh = "\x14\x00";    // ver needed to extract
-        $fh .= "\x00\x00";    // gen purpose bit flag
-        $fh .= "\x08\x00";    // compression method
+        $fh = "\x14\x00"; // ver needed to extract
+        $fh .= "\x00\x00"; // gen purpose bit flag
+        $fh .= "\x08\x00"; // compression method
         $fh .= "\x00\x00\x00\x00"; // last mod time and date
         $fh .= pack(
             "V3v2",
@@ -159,7 +159,7 @@ 
 
         //local file header
         $lfh = "PK\x03\x04";
-        $lfh .= $fh . $filename;
+        $lfh .= $fh.$filename;
         $zipdata = $lfh;
         $zipdata .= $gzdata;
         $zipdata .= pack("V3", $crc, $gzsize, $datasize);
@@ -170,16 +170,16 @@ 
                 "va*v3V2",
                 0,
                 $fh,
-                0,        // file comment length
-                0,        // disk number start
-                0,        // internal file attributes
-                $attr,    // external file attributes - 'archive/directory' bit set
+                0, // file comment length
+                0, // disk number start
+                0, // internal file attributes
+                $attr, // external file attributes - 'archive/directory' bit set
                 $this->offset
-            ) . $filename;
+            ).$filename;
 
         $this->offset += 42 + $fnl + $gzsize;
         $this->cdir[] = $cdir;
-        $this->cnt ++;
+        $this->cnt++;
         $this->idx = $this->cnt - 1;
     }
 
@@ -228,7 +228,7 @@ 
                 $cdsl, // size of central dir
                 $zdsl, // offset to start of central dir
                 0
-            );              // .zip file comment length
+            ); // .zip file comment length
         return $this->zipfile;
     }
 

htdocs/lib2/Net/IDNA2.php

Spacing +49 added lines, -53 removed lines

@@ -23,8 +23,8 @@ 
 //
 
 // }}}
-require_once __DIR__ . '/IDNA2/Exception.php';
-require_once __DIR__ . '/IDNA2/Exception/Nameprep.php';
+require_once __DIR__.'/IDNA2/Exception.php';
+require_once __DIR__.'/IDNA2/Exception/Nameprep.php';
 // adjusted paths for OC distribution
 
 /**
@@ -272,16 +272,16 @@ 
      * @access private
      */
     private static $_np_prohibit_ranges = array(
-        array(0x80,     0x9F    ),
-        array(0x2060,   0x206F  ),
-        array(0x1D173,  0x1D17A ),
-        array(0xE000,   0xF8FF  ),
-        array(0xF0000,  0xFFFFD ),
+        array(0x80, 0x9F),
+        array(0x2060, 0x206F),
+        array(0x1D173, 0x1D17A),
+        array(0xE000, 0xF8FF),
+        array(0xF0000, 0xFFFFD),
         array(0x100000, 0x10FFFD),
-        array(0xFDD0,   0xFDEF  ),
-        array(0xD800,   0xDFFF  ),
-        array(0x2FF0,   0x2FFB  ),
-        array(0xE0020,  0xE007F )
+        array(0xFDD0, 0xFDEF),
+        array(0xD800, 0xDFFF),
+        array(0x2FF0, 0x2FFB),
+        array(0xE0020, 0xE007F)
     );
 
     /**
@@ -2328,8 +2328,7 @@ 
         // Forcing conversion of input to UCS4 array
         // If one time encoding is given, use this, else the objects property
         switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
-        case 'utf8':
-            $decoded = $this->_utf8_to_ucs4($decoded);
+        case 'utf8' : $decoded = $this->_utf8_to_ucs4($decoded);
             break;
         case 'ucs4_string':
             $decoded = $this->_ucs4_string_to_ucs4($decoded);
@@ -2349,7 +2348,7 @@ 
 
         foreach ($decoded as $k => $v) {
             // Make sure to use just the plain dot
-            switch($v) {
+            switch ($v) {
             case 0x3002:
             case 0xFF0E:
             case 0xFF61:
@@ -2370,11 +2369,11 @@ 
                 // Skip first char
                 if ($k) {
                     $encoded = '';
-                    $encoded = $this->_encode(array_slice($decoded, $last_begin, (($k)-$last_begin)));
+                    $encoded = $this->_encode(array_slice($decoded, $last_begin, (($k) - $last_begin)));
                     if ($encoded) {
                         $output .= $encoded;
                     } else {
-                        $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k)-$last_begin)));
+                        $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k) - $last_begin)));
                     }
                     $output .= chr($decoded[$k]);
                 }
@@ -2385,11 +2384,11 @@ 
         if ($last_begin) {
             $inp_len = sizeof($decoded);
             $encoded = '';
-            $encoded = $this->_encode(array_slice($decoded, $last_begin, (($inp_len)-$last_begin)));
+            $encoded = $this->_encode(array_slice($decoded, $last_begin, (($inp_len) - $last_begin)));
             if ($encoded) {
                 $output .= $encoded;
             } else {
-                $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($inp_len)-$last_begin)));
+                $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($inp_len) - $last_begin)));
             }
             return $output;
         }
@@ -2440,7 +2439,7 @@ 
                 $conv = $this->_decode($v);
                 if ($conv) $arr[$k] = $conv;
             }
-            $return = $email_pref . '@' . join('.', $arr);
+            $return = $email_pref.'@'.join('.', $arr);
         } elseif (preg_match('![:\./]!', $input)) { // Or a complete domain name (with or without paths / parameters)
             // No no in strict mode
             if ($this->_strict_mode) {
@@ -2473,8 +2472,7 @@ 
         // The output is UTF-8 by default, other output formats need conversion here
         // If one time encoding is given, use this, else the objects property
         switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
-        case 'utf8':
-            return $return;
+        case 'utf8' : return $return;
             break;
         case 'ucs4_string':
             return $this->_ucs4_to_ucs4_string($this->_utf8_to_ucs4($return));
@@ -2507,20 +2505,20 @@ 
         if (!empty($parts_arr['user'])) {
             $ret_url .= $parts_arr['user'];
             if (!empty($parts_arr['pass'])) {
-                $ret_url .= ':' . $parts_arr['pass'];
+                $ret_url .= ':'.$parts_arr['pass'];
             }
             $ret_url .= '@';
         }
         $ret_url .= $parts_arr['host'];
         if (!empty($parts_arr['port'])) {
-            $ret_url .= ':' . $parts_arr['port'];
+            $ret_url .= ':'.$parts_arr['port'];
         }
         $ret_url .= $parts_arr['path'];
         if (!empty($parts_arr['query'])) {
-            $ret_url .= '?' . $parts_arr['query'];
+            $ret_url .= '?'.$parts_arr['query'];
         }
         if (!empty($parts_arr['fragment'])) {
-            $ret_url .= '#' . $parts_arr['fragment'];
+            $ret_url .= '#'.$parts_arr['fragment'];
         }
         return $ret_url;
     }
@@ -2598,7 +2596,7 @@ 
         }
 
         // Start with the prefix; copy it to output
-        $encoded = $this->_punycode_prefix . $encoded;
+        $encoded = $this->_punycode_prefix.$encoded;
 
         // If we have basic code points in output, add an hyphen to the end
         if ($codecount) {
@@ -2629,9 +2627,8 @@ 
                     $delta++;
                 } else if ($decoded[$i] == $cur_code) {
                     for ($q = $delta, $k = $this->_base; 1; $k += $this->_base) {
-                        $t = ($k <= $bias)?
-                            $this->_tmin :
-                            (($k >= $bias + $this->_tmax)? $this->_tmax : $k - $bias);
+                        $t = ($k <= $bias) ?
+                            $this->_tmin : (($k >= $bias + $this->_tmax) ? $this->_tmax : $k - $bias);
 
                         if ($q < $t) {
                             break;
@@ -2668,11 +2665,11 @@ 
     private function _decode($encoded)
     {
         // We do need to find the Punycode prefix
-        if (!preg_match('!^' . preg_quote($this->_punycode_prefix, '!') . '!', $encoded)) {
+        if (!preg_match('!^'.preg_quote($this->_punycode_prefix, '!').'!', $encoded)) {
             return false;
         }
 
-        $encode_test = preg_replace('!^' . preg_quote($this->_punycode_prefix, '!') . '!', '', $encoded);
+        $encode_test = preg_replace('!^'.preg_quote($this->_punycode_prefix, '!').'!', '', $encoded);
 
         // If nothing left after removing the prefix, it is hopeless
         if (!$encode_test) {
@@ -2699,14 +2696,13 @@ 
         $idx      = 0;
         $char     = $this->_initial_n;
 
-        for ($enco_idx = ($delim_pos)? ($delim_pos + 1) : 0; $enco_idx < $enco_len; ++$deco_len) {
-            for ($old_idx = $idx, $w = 1, $k = $this->_base; 1 ; $k += $this->_base) {
+        for ($enco_idx = ($delim_pos) ? ($delim_pos + 1) : 0; $enco_idx < $enco_len; ++$deco_len) {
+            for ($old_idx = $idx, $w = 1, $k = $this->_base; 1; $k += $this->_base) {
                 $digit = $this->_decodeDigit($encoded{$enco_idx++});
                 $idx += $digit * $w;
 
                 $t = ($k <= $bias) ?
-                    $this->_tmin :
-                    (($k >= $bias + $this->_tmax)? $this->_tmax : ($k - $bias));
+                    $this->_tmin : (($k >= $bias + $this->_tmax) ? $this->_tmax : ($k - $bias));
 
                 if ($digit < $t) {
                     break;
@@ -2717,7 +2713,7 @@ 
 
             $bias      = $this->_adapt($idx - $old_idx, $deco_len + 1, $is_first);
             $is_first  = false;
-            $char     += (int) ($idx / ($deco_len + 1));
+            $char     += (int)($idx / ($deco_len + 1));
             $idx      %= ($deco_len + 1);
 
             if ($deco_len > 0) {
@@ -2745,14 +2741,14 @@ 
      */
     private function _adapt($delta, $npoints, $is_first)
     {
-        $delta = (int) ($is_first ? ($delta / $this->_damp) : ($delta / 2));
-        $delta += (int) ($delta / $npoints);
+        $delta = (int)($is_first ? ($delta / $this->_damp) : ($delta / 2));
+        $delta += (int)($delta / $npoints);
 
         for ($k = 0; $delta > (($this->_base - $this->_tmin) * $this->_tmax) / 2; $k += $this->_base) {
-            $delta = (int) ($delta / ($this->_base - $this->_tmin));
+            $delta = (int)($delta / ($this->_base - $this->_tmin));
         }
 
-        return (int) ($k + ($this->_base - $this->_tmin + 1) * $delta / ($delta + $this->_skew));
+        return (int)($k + ($this->_base - $this->_tmin + 1) * $delta / ($delta + $this->_skew));
     }
 
     /**
@@ -2779,7 +2775,7 @@ 
     private function _decodeDigit($cp)
     {
         $cp = ord($cp);
-        return ($cp - 48 < 10)? $cp - 22 : (($cp - 65 < 26)? $cp - 65 : (($cp - 97 < 26)? $cp - 97 : $this->_base));
+        return ($cp - 48 < 10) ? $cp - 22 : (($cp - 65 < 26) ? $cp - 65 : (($cp - 97 < 26) ? $cp - 97 : $this->_base));
     }
 
     /**
@@ -2807,12 +2803,12 @@ 
 
             // Try to find prohibited input
             if (in_array($v, self::$_np_prohibit) || in_array($v, self::$_general_prohibited)) {
-                throw new Net_IDNA2_Exception_Nameprep('Prohibited input U+' . sprintf('%08X', $v));
+                throw new Net_IDNA2_Exception_Nameprep('Prohibited input U+'.sprintf('%08X', $v));
             }
 
             foreach (self::$_np_prohibit_ranges as $range) {
                 if ($range[0] <= $v && $v <= $range[1]) {
-                    throw new Net_IDNA2_Exception_Nameprep('Prohibited input U+' . sprintf('%08X', $v));
+                    throw new Net_IDNA2_Exception_Nameprep('Prohibited input U+'.sprintf('%08X', $v));
                 }
             }
 
@@ -2862,7 +2858,7 @@ 
                     // Rewind the for loop by one, since there can be more possible compositions
                     $i--;
                     $out_len--;
-                    $last_class = ($i == $last_starter)? 0 : $this->_getCombiningClass($output[$i - 1]);
+                    $last_class = ($i == $last_starter) ? 0 : $this->_getCombiningClass($output[$i - 1]);
 
                     continue;
                 }
@@ -2899,7 +2895,7 @@ 
 
         $result   = array();
         $T        = $this->_tbase + $sindex % $this->_tcount;
-        $result[] = (int)($this->_lbase +  $sindex / $this->_ncount);
+        $result[] = (int)($this->_lbase + $sindex / $this->_ncount);
         $result[] = (int)($this->_vbase + ($sindex % $this->_ncount) / $this->_tcount);
 
         if ($T != $this->_tbase) {
@@ -2985,7 +2981,7 @@ 
      */
     private function _getCombiningClass($char)
     {
-        return isset(self::$_np_norm_combcls[$char])? self::$_np_norm_combcls[$char] : 0;
+        return isset(self::$_np_norm_combcls[$char]) ? self::$_np_norm_combcls[$char] : 0;
     }
 
     /**
@@ -3146,7 +3142,7 @@ 
                     throw new UnexpectedValueException('This might be UTF-8, but I don\'t understand it at byte '.$k);
                 }
                 if ('add' == $mode) {
-                    $output[$out_len] = (int) $v;
+                    $output[$out_len] = (int)$v;
                     ++$out_len;
                     continue;
                 }
@@ -3205,14 +3201,14 @@ 
                 // 4 bytes
                 $output .= chr(240 + ($v >> 18))
                     . chr(128 + (($v >> 12) & 63))
-                    . chr(128 + (($v >>  6) & 63))
+                    . chr(128 + (($v >> 6) & 63))
                     . chr(128 + ($v & 63));
             } else if ($v < 1 << 26) {
                 // 5 bytes
                 $output .= chr(248 + ($v >> 24))
                     . chr(128 + (($v >> 18) & 63))
                     . chr(128 + (($v >> 12) & 63))
-                    . chr(128 + (($v >>  6) & 63))
+                    . chr(128 + (($v >> 6) & 63))
                     . chr(128 + ($v & 63));
             } else if ($v < 1 << 31) {
                 // 6 bytes
@@ -3220,7 +3216,7 @@ 
                     . chr(128 + (($v >> 24) & 63))
                     . chr(128 + (($v >> 18) & 63))
                     . chr(128 + (($v >> 12) & 63))
-                    . chr(128 + (($v >>  6) & 63))
+                    . chr(128 + (($v >> 6) & 63))
                     . chr(128 + ($v & 63));
             } else {
                 throw new UnexpectedValueException('Conversion from UCS-4 to UTF-8 failed: malformed input');
@@ -3245,7 +3241,7 @@ 
         // Take array values and split output to 4 bytes per value
         // The bit mask is 255, which reads &11111111
         foreach ($input as $v) {
-            $output .= ($v & (255 << 24) >> 24) . ($v & (255 << 16) >> 16) . ($v & (255 << 8) >> 8) . ($v & 255);
+            $output .= ($v & (255 << 24) >> 24).($v & (255 << 16) >> 16).($v & (255 << 8) >> 8).($v & 255);
         }
         return $output;
     }
@@ -3280,7 +3276,7 @@ 
                 $out_len++;
                 $output[$out_len] = 0;
             }
-            $output[$out_len] += ord($input{$i}) << (8 * (3 - ($i % 4) ) );
+            $output[$out_len] += ord($input{$i}) << (8 * (3 - ($i % 4)));
         }
         return $output;
     }
@@ -3331,7 +3327,7 @@ 
         $return = '';
 
         for ($i = $w; $i > -1; $i--) {
-            $return .= ($octet & (1 << $i))? '1' : '0';
+            $return .= ($octet & (1 << $i)) ? '1' : '0';
         }
 
         return $return;

htdocs/lib2/Net/IDNA2/Exception/Nameprep.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-require_once __DIR__ . '/../Exception.php';
+require_once __DIR__.'/../Exception.php';
 // adjusted path for OC distribution
 
 class Net_IDNA2_Exception_Nameprep extends Net_IDNA2_Exception

htdocs/lib2/ProcessSync.class.php

Spacing +8 added lines, -8 removed lines

@@ -16,7 +16,7 @@ 
     public function __construct($name)
     {
         global $opt;
-        $this->pidfile_path = $opt['rootpath'] . "cache2/$name.pid";
+        $this->pidfile_path = $opt['rootpath']."cache2/$name.pid";
     }
 
 
@@ -29,7 +29,7 @@ 
         }
 
         if (file_exists($this->pidfile_path)) {
-            echo "Error: Pidfile (" . $this->pidfile_path . ") already present\n";
+            echo "Error: Pidfile (".$this->pidfile_path.") already present\n";
 
             return false;
         } else {
@@ -39,7 +39,7 @@ 
 
                 return true;
             } else {
-                echo "can't create Pidfile " . $this->pidfile_path . "\n";
+                echo "can't create Pidfile ".$this->pidfile_path."\n";
 
                 return false;
             }
@@ -59,19 +59,19 @@ 
 
             // bad PID file, e.g. due to system malfunction while creating the file?
             if ($pid_daemon <= 0) {
-                echo "removing bad pid_file (" . $this->pidfile_path . ")\n";
+                echo "removing bad pid_file (".$this->pidfile_path.")\n";
                 unlink($this->pidfile_path);
 
                 return false;
             } // process running?
             elseif (posix_kill($pid_daemon, 0)) {
                 // yes, good bye
-                echo "Error: process for " . $this->pidfile_path . " is already running with pid=$pid_daemon\n";
+                echo "Error: process for ".$this->pidfile_path." is already running with pid=$pid_daemon\n";
 
                 return false;
             } else {
                 // no, remove pid_file
-                echo "process not running, removing old pid_file (" . $this->pidfile_path . ")\n";
+                echo "process not running, removing old pid_file (".$this->pidfile_path.")\n";
                 unlink($this->pidfile_path);
 
                 return true;
@@ -93,11 +93,11 @@ 
                 unlink($this->pidfile_path);
             }
         } else {
-            echo "Error: can't delete own pidfile (" . $this->pidfile_path . ")\n";
+            echo "Error: can't delete own pidfile (".$this->pidfile_path.")\n";
         }
 
         if ($message) {
-            echo $message . "\n";
+            echo $message."\n";
         }
     }
 

htdocs/lib2/web.inc.php

Spacing +7 added lines, -7 removed lines

@@ -19,23 +19,23 @@ 
 }
 
 // chicken-egg problem ...
-require_once $opt['rootpath'] . 'lib2/const.inc.php';
+require_once $opt['rootpath'].'lib2/const.inc.php';
 
 // do all output in HTML format
 $opt['gui'] = GUI_HTML;
 
 // include the main library
-require_once $opt['rootpath'] . 'lib2/common.inc.php';
+require_once $opt['rootpath'].'lib2/common.inc.php';
 
 // enforce http or https?
 if ($opt['page']['https']['mode'] == HTTPS_DISABLED) {
     if ($opt['page']['https']['active']) {
-        $tpl->redirect('http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']);
+        $tpl->redirect('http://'.$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']);
     }
     $opt['page']['force_https_login'] = false;
 } elseif ($opt['page']['https']['mode'] == HTTPS_ENFORCED) {
     if (!$opt['page']['https']['active']) {
-        $tpl->redirect('https://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']);
+        $tpl->redirect('https://'.$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']);
     }
     $opt['page']['force_https_login'] = true;
 }
@@ -83,7 +83,7 @@ 
     if (substr($helppage, 0, 1) == "!") {
         substr($helppage, 1);
     } elseif ($helppage != "" && isset($opt['locale'][$help_locale]['helpwiki'])) {
-        return $opt['locale'][$help_locale]['helpwiki'] . str_replace(' ', '_', $helppage);
+        return $opt['locale'][$help_locale]['helpwiki'].str_replace(' ', '_', $helppage);
     } else {
         return "";
     }
@@ -98,8 +98,8 @@ 
         return "";
     } else {
         $imgtitle = $translate->t($title, '', basename(__FILE__), __LINE__);
-        $imgtitle = "alt='" . $imgtitle . "' title='" . $imgtitle . "'";
+        $imgtitle = "alt='".$imgtitle."' title='".$imgtitle."'";
 
-        return "<a class='nooutline' href='" . $helpurl . "' " . $imgtitle . " target='_blank'>";
+        return "<a class='nooutline' href='".$helpurl."' ".$imgtitle." target='_blank'>";
     }
 }

htdocs/cachelist.php

Spacing +4 added lines, -4 removed lines

@@ -7,7 +7,7 @@ 
  *  Shortcut for cachelist search
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $id = isset($_REQUEST['id']) ? $_REQUEST['id'] + 0 : 0;
 $password = isset($_REQUEST['key']) ? $_REQUEST['key'] : '';
@@ -33,9 +33,9 @@ 
         }
     }
 
-    $tpl->redirect("search.php?searchto=searchbylist&listid=" . $id .
-        ($password != "" ? "&listkey=" . urlencode($password) : "") .
-        "&showresult=1&f_disabled=0&f_inactive=0&f_ignored=1&sort=byname" . $invalid_waypoints);
+    $tpl->redirect("search.php?searchto=searchbylist&listid=".$id.
+        ($password != "" ? "&listkey=".urlencode($password) : "").
+        "&showresult=1&f_disabled=0&f_inactive=0&f_ignored=1&sort=byname".$invalid_waypoints);
 } else {
     $tpl->redirect("cachelists.php");
 }

htdocs/newcache.php

Spacing +60 added lines, -60 removed lines

@@ -9,10 +9,10 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require_once __DIR__ . '/lib/consts.inc.php';
+require_once __DIR__.'/lib/consts.inc.php';
 $opt['gui'] = GUI_HTML;
-require_once __DIR__ . '/lib/common.inc.php';
-require_once __DIR__ . '/lib2/edithelper.inc.php';
+require_once __DIR__.'/lib/common.inc.php';
+require_once __DIR__.'/lib2/edithelper.inc.php';
 
 $no_tpl_build = false;
 
@@ -33,10 +33,10 @@ 
 
         //set here the template to process
         $tplname = 'newcache';
-        require_once $stylepath . '/' . $tplname . '.inc.php';
+        require_once $stylepath.'/'.$tplname.'.inc.php';
 
         //set template replacements
-        tpl_set_var('reset', $reset);  // obsolete
+        tpl_set_var('reset', $reset); // obsolete
         tpl_set_var('submit', $submit);
         tpl_set_var('general_message', '');
         tpl_set_var('hidden_since_message', '');
@@ -53,7 +53,7 @@ 
         tpl_set_var('diff_message', '');
         tpl_set_var('safari_message', '');
 
-        $sel_type = isset($_POST['type']) ? $_POST['type'] : 0;  // Ocprop
+        $sel_type = isset($_POST['type']) ? $_POST['type'] : 0; // Ocprop
         if (!isset($_POST['size'])) {
             if ($sel_type == 4 || $sel_type == 5) {
                 $sel_size = 7;
@@ -61,15 +61,15 @@ 
                 $sel_size = - 1;
             }
         } else {
-            $sel_size = isset($_POST['size']) ? $_POST['size'] : - 1;  // Ocprop
+            $sel_size = isset($_POST['size']) ? $_POST['size'] : - 1; // Ocprop
         }
         $sel_lang = isset($_POST['desc_lang']) ? $_POST['desc_lang'] : $default_lang;
-        $sel_country = isset($_POST['country']) ? $_POST['country'] : getUserCountry();  // Ocprop
+        $sel_country = isset($_POST['country']) ? $_POST['country'] : getUserCountry(); // Ocprop
         $show_all_countries = isset($_POST['show_all_countries']) ? $_POST['show_all_countries'] : 0;
         $show_all_langs = isset($_POST['show_all_langs']) ? $_POST['show_all_langs'] : 0;
 
         //coords
-        $lonEW = isset($_POST['lonEW']) ? $_POST['lonEW'] : $default_EW;  // Ocprop
+        $lonEW = isset($_POST['lonEW']) ? $_POST['lonEW'] : $default_EW; // Ocprop
         if ($lonEW == 'E') {
             tpl_set_var('lonEsel', ' selected="selected"');
             tpl_set_var('lonWsel', '');
@@ -77,13 +77,13 @@ 
             tpl_set_var('lonEsel', '');
             tpl_set_var('lonWsel', ' selected="selected"');
         }
-        $lon_h = isset($_POST['lon_h']) ? $_POST['lon_h'] : '0';  // Ocprop
+        $lon_h = isset($_POST['lon_h']) ? $_POST['lon_h'] : '0'; // Ocprop
         tpl_set_var('lon_h', htmlspecialchars($lon_h, ENT_COMPAT, 'UTF-8'));
 
-        $lon_min = isset($_POST['lon_min']) ? $_POST['lon_min'] : '00.000';  // Ocprop
+        $lon_min = isset($_POST['lon_min']) ? $_POST['lon_min'] : '00.000'; // Ocprop
         tpl_set_var('lon_min', htmlspecialchars($lon_min, ENT_COMPAT, 'UTF-8'));
 
-        $latNS = isset($_POST['latNS']) ? $_POST['latNS'] : $default_NS;  // Ocprop
+        $latNS = isset($_POST['latNS']) ? $_POST['latNS'] : $default_NS; // Ocprop
         if ($latNS == 'N') {
             tpl_set_var('latNsel', ' selected="selected"');
             tpl_set_var('latSsel', '');
@@ -91,14 +91,14 @@ 
             tpl_set_var('latNsel', '');
             tpl_set_var('latSsel', ' selected="selected"');
         }
-        $lat_h = isset($_POST['lat_h']) ? $_POST['lat_h'] : '0';  // Ocprop
+        $lat_h = isset($_POST['lat_h']) ? $_POST['lat_h'] : '0'; // Ocprop
         tpl_set_var('lat_h', htmlspecialchars($lat_h, ENT_COMPAT, 'UTF-8'));
 
-        $lat_min = isset($_POST['lat_min']) ? $_POST['lat_min'] : '00.000';  // Ocprop
+        $lat_min = isset($_POST['lat_min']) ? $_POST['lat_min'] : '00.000'; // Ocprop
         tpl_set_var('lat_min', htmlspecialchars($lat_min, ENT_COMPAT, 'UTF-8'));
 
         //name
-        $name = isset($_POST['name']) ? trim($_POST['name']) : '';  // Ocprop
+        $name = isset($_POST['name']) ? trim($_POST['name']) : ''; // Ocprop
         tpl_set_var('name', htmlspecialchars($name, ENT_COMPAT, 'UTF-8'));
 
         //shortdesc
@@ -120,7 +120,7 @@ 
                 $oldDescMode = $descMode;
             }
         } else {
-            if (sqlValue("SELECT `no_htmledit_flag` FROM `user` WHERE `user_id`='" . sql_escape($usr['userid']) . "'", 1) == 1) {
+            if (sqlValue("SELECT `no_htmledit_flag` FROM `user` WHERE `user_id`='".sql_escape($usr['userid'])."'", 1) == 1) {
                 $descMode = 1;
             } else {
                 $descMode = 3;
@@ -130,7 +130,7 @@ 
 
         // fuer alte Versionen von OCProp
         if (isset($_POST['submit']) && !isset($_POST['version2'])) {
-            $descMode = (isset($_POST['desc_html']) && ($_POST['desc_html'] == 1)) ? 2 : 1;  // Ocprop
+            $descMode = (isset($_POST['desc_html']) && ($_POST['desc_html'] == 1)) ? 2 : 1; // Ocprop
             $_POST['submitform'] = $_POST['submit'];
 
             $short_desc = iconv("ISO-8859-1", "UTF-8", $short_desc);
@@ -152,13 +152,13 @@ 
 
         tpl_set_var('desc', htmlspecialchars($desc, ENT_COMPAT, 'UTF-8'));
 
-        $headers = tpl_get_var('htmlheaders') . "\n";
+        $headers = tpl_get_var('htmlheaders')."\n";
         if ($descMode == 3) {
             // TinyMCE
-            $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/tiny_mce_gzip.js"></script>' . "\n";
-            $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/config/desc.js.php?cacheid=0&lang=' . strtolower($locale) . '"></script>' . "\n";
+            $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/tiny_mce_gzip.js"></script>'."\n";
+            $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/config/desc.js.php?cacheid=0&lang='.strtolower($locale).'"></script>'."\n";
         }
-        $headers .= '<script language="javascript" type="text/javascript" src="' . editorJsPath() . '"></script>' . "\n";
+        $headers .= '<script language="javascript" type="text/javascript" src="'.editorJsPath().'"></script>'."\n";
         tpl_set_var('htmlheaders', $headers);
 
         //effort
@@ -182,7 +182,7 @@ 
         $st_hours = floor($search_time);
         $st_minutes = sprintf('%02.0F', ($search_time - $st_hours) * 60);
 
-        tpl_set_var('search_time', $st_hours . ':' . $st_minutes);
+        tpl_set_var('search_time', $st_hours.':'.$st_minutes);
         tpl_set_var('way_length', $way_length);
 
 
@@ -196,7 +196,7 @@ 
         }
 
         //tos
-        $tos = isset($_POST['TOS']) ? 1 : 0;  // Ocprop
+        $tos = isset($_POST['TOS']) ? 1 : 0; // Ocprop
         if ($tos == 1) {
             tpl_set_var('toschecked', ' checked="checked"');
         } else {
@@ -204,9 +204,9 @@ 
         }
 
         //hidden_since
-        $hidden_day = isset($_POST['hidden_day']) ? $_POST['hidden_day'] : date('d');  // Ocprop
-        $hidden_month = isset($_POST['hidden_month']) ? $_POST['hidden_month'] : date('m');  // Ocprop
-        $hidden_year = isset($_POST['hidden_year']) ? $_POST['hidden_year'] : date('Y');  // Ocprop
+        $hidden_day = isset($_POST['hidden_day']) ? $_POST['hidden_day'] : date('d'); // Ocprop
+        $hidden_month = isset($_POST['hidden_month']) ? $_POST['hidden_month'] : date('m'); // Ocprop
+        $hidden_year = isset($_POST['hidden_year']) ? $_POST['hidden_year'] : date('Y'); // Ocprop
         tpl_set_var('hidden_day', htmlspecialchars($hidden_day, ENT_COMPAT, 'UTF-8'));
         tpl_set_var('hidden_month', htmlspecialchars($hidden_month, ENT_COMPAT, 'UTF-8'));
         tpl_set_var('hidden_year', htmlspecialchars($hidden_year, ENT_COMPAT, 'UTF-8'));
@@ -223,7 +223,7 @@ 
         tpl_set_var('publish_later_checked', '');
         tpl_set_var('publish_notnow_checked', '');
 
-        $publish = isset($_POST['publish']) ? $_POST['publish'] : 'now2';  // Ocprop
+        $publish = isset($_POST['publish']) ? $_POST['publish'] : 'now2'; // Ocprop
         if ($publish == 'now2') {
             tpl_set_var('publish_now_checked', 'checked');
         } elseif ($publish == 'later') {
@@ -237,11 +237,11 @@ 
         // fill activate hours
         $activate_hour = isset($_POST['activate_hour']) ? $_POST['activate_hour'] + 0 : date('H') + 0;
         $activation_hours = '';
-        for ($i = 0; $i <= 23; $i ++) {
+        for ($i = 0; $i <= 23; $i++) {
             if ($activate_hour == $i) {
-                $activation_hours .= '<option value="' . $i . '" selected="selected">' . $i . '</option>';
+                $activation_hours .= '<option value="'.$i.'" selected="selected">'.$i.'</option>';
             } else {
-                $activation_hours .= '<option value="' . $i . '">' . $i . '</option>';
+                $activation_hours .= '<option value="'.$i.'">'.$i.'</option>';
             }
             $activation_hours .= "\n";
         }
@@ -253,30 +253,30 @@ 
 
         // gc- and nc-waypoints
         // fix #4356: gc waypoints are frequently copy&pasted with leading spaces
-        $wp_gc = isset($_POST['wp_gc']) ? strtoupper(trim($_POST['wp_gc'])) : '';  // Ocprop
+        $wp_gc = isset($_POST['wp_gc']) ? strtoupper(trim($_POST['wp_gc'])) : ''; // Ocprop
         tpl_set_var('wp_gc', htmlspecialchars($wp_gc, ENT_COMPAT, 'UTF-8'));
 
         //difficulty
-        $difficulty = isset($_POST['difficulty']) ? $_POST['difficulty'] : 1;  // Ocprop
-        $difficulty_options = '<option value="1">' . $sel_message . '</option>';
-        for ($i = 2; $i <= 10; $i ++) {
+        $difficulty = isset($_POST['difficulty']) ? $_POST['difficulty'] : 1; // Ocprop
+        $difficulty_options = '<option value="1">'.$sel_message.'</option>';
+        for ($i = 2; $i <= 10; $i++) {
             if ($difficulty == $i) {
-                $difficulty_options .= '<option value="' . $i . '" selected="selected">' . $i / 2 . '</option>';
+                $difficulty_options .= '<option value="'.$i.'" selected="selected">'.$i / 2.'</option>';
             } else {
-                $difficulty_options .= '<option value="' . $i . '">' . $i / 2 . '</option>';
+                $difficulty_options .= '<option value="'.$i.'">'.$i / 2.'</option>';
             }
             $difficulty_options .= "\n";
         }
         tpl_set_var('difficulty_options', $difficulty_options);
 
         //terrain
-        $terrain = isset($_POST['terrain']) ? $_POST['terrain'] : 1;  // Ocprop
-        $terrain_options = '<option value="1">' . $sel_message . '</option>';
-        for ($i = 2; $i <= 10; $i ++) {
+        $terrain = isset($_POST['terrain']) ? $_POST['terrain'] : 1; // Ocprop
+        $terrain_options = '<option value="1">'.$sel_message.'</option>';
+        for ($i = 2; $i <= 10; $i++) {
             if ($terrain == $i) {
-                $terrain_options .= '<option value="' . $i . '" selected="selected">' . $i / 2 . '</option>';
+                $terrain_options .= '<option value="'.$i.'" selected="selected">'.$i / 2.'</option>';
             } else {
-                $terrain_options .= '<option value="' . $i . '">' . $i / 2 . '</option>';
+                $terrain_options .= '<option value="'.$i.'">'.$i / 2.'</option>';
             }
             $terrain_options .= "\n";
         }
@@ -284,34 +284,34 @@ 
 
         //sizeoptions
         $sSelected = ($sel_size == - 1) ? ' selected="selected"' : '';
-        $sizes = '<option value="-1"' . $sSelected . '>' . htmlspecialchars(t('Please select!'), ENT_COMPAT, 'UTF-8') . '</option>';
+        $sizes = '<option value="-1"'.$sSelected.'>'.htmlspecialchars(t('Please select!'), ENT_COMPAT, 'UTF-8').'</option>';
         $rsSizes = sql(
             "SELECT `cache_size`.`id`, IFNULL(`sys_trans_text`.`text`, `cache_size`.`name`) AS `name`
                   FROM `cache_size`
              LEFT JOIN `sys_trans` ON `cache_size`.`trans_id`=`sys_trans`.`id`
              LEFT JOIN `sys_trans_text` ON `sys_trans`.`id`=`sys_trans_text`.`trans_id` AND
-                       `sys_trans_text`.`lang`='" . sql_escape($locale) . "'
+                       `sys_trans_text`.`lang`='" . sql_escape($locale)."'
               ORDER BY `cache_size`.`ordinal` ASC"
         );
         while ($rSize = sql_fetch_assoc($rsSizes)) {
             $sSelected = ($rSize['id'] == $sel_size) ? ' selected="selected"' : '';
-            $sizes .= '<option value="' . $rSize['id'] . '"' . $sSelected . '>' . htmlspecialchars($rSize['name'], ENT_COMPAT, 'UTF-8') . '</option>';
+            $sizes .= '<option value="'.$rSize['id'].'"'.$sSelected.'>'.htmlspecialchars($rSize['name'], ENT_COMPAT, 'UTF-8').'</option>';
         }
         sql_free_result($rsSizes);
         tpl_set_var('sizeoptions', $sizes);
 
         //typeoptions
         $sSelected = ($sel_type == - 1) ? ' selected="selected"' : '';
-        $types = '<option value="-1"' . $sSelected . '>' . htmlspecialchars(t('Please select!'), ENT_COMPAT, 'UTF-8') . '</option>';
+        $types = '<option value="-1"'.$sSelected.'>'.htmlspecialchars(t('Please select!'), ENT_COMPAT, 'UTF-8').'</option>';
         $rsTypes = sql("SELECT `cache_type`.`id`, IFNULL(`sys_trans_text`.`text`, `cache_type`.`en`) AS `name`
                               FROM `cache_type`
                          LEFT JOIN `sys_trans` ON `cache_type`.`trans_id`=`sys_trans`.`id`
                          LEFT JOIN `sys_trans_text` ON `sys_trans`.`id`=`sys_trans_text`.`trans_id` AND
-                                   `sys_trans_text`.`lang`='" . sql_escape($locale) . "'
+                                   `sys_trans_text`.`lang`='" . sql_escape($locale)."'
                           ORDER BY `cache_type`.`ordinal` ASC");
         while ($rType = sql_fetch_assoc($rsTypes)) {
             $sSelected = ($rType['id'] == $sel_type) ? ' selected="selected"' : '';
-            $types .= '<option value="' . $rType['id'] . '"' . $sSelected . '>' . htmlspecialchars($rType['name'], ENT_COMPAT, 'UTF-8') . '</option>';
+            $types .= '<option value="'.$rType['id'].'"'.$sSelected.'>'.htmlspecialchars($rType['name'], ENT_COMPAT, 'UTF-8').'</option>';
         }
         sql_free_result($rsTypes);
         tpl_set_var('typeoptions', $types);
@@ -342,7 +342,7 @@ 
             tpl_set_var('show_all_langs', '0');
             tpl_set_var(
                 'show_all_langs_submit',
-                '<input type="submit" name="show_all_langs_submit" value="' . $show_all . '"/>'
+                '<input type="submit" name="show_all_langs_submit" value="'.$show_all.'"/>'
             );
 
             $rs = sql(
@@ -376,7 +376,7 @@ 
 
         while ($record = sql_fetch_assoc($rs)) {
             $sSelected = ($record['short'] == $sel_lang) ? ' selected="selected"' : '';
-            $langsoptions .= '<option value="' . htmlspecialchars($record['short'], ENT_COMPAT, 'UTF-8') . '"' . $sSelected . '>' . htmlspecialchars($record['name'], ENT_COMPAT, 'UTF-8') . '</option>' . "\n";
+            $langsoptions .= '<option value="'.htmlspecialchars($record['short'], ENT_COMPAT, 'UTF-8').'"'.$sSelected.'>'.htmlspecialchars($record['name'], ENT_COMPAT, 'UTF-8').'</option>'."\n";
         }
 
         tpl_set_var('langoptions', $langsoptions);
@@ -399,7 +399,7 @@ 
 
         if ($show_all_countries == 0) {
             tpl_set_var('show_all_countries', '0');
-            tpl_set_var('show_all_countries_submit', '<input type="submit" id="showallcountries" class="formbutton" name="show_all_countries_submit" value="' . $show_all . '" onclick="submitbutton(\'showallcountries\')" />');
+            tpl_set_var('show_all_countries_submit', '<input type="submit" id="showallcountries" class="formbutton" name="show_all_countries_submit" value="'.$show_all.'" onclick="submitbutton(\'showallcountries\')" />');
 
             $rs = sql(
                 "SELECT `countries`.`short`, IFNULL(`sys_trans_text`.`text`, `countries`.`name`) AS `name`
@@ -434,7 +434,7 @@ 
         // build the "country" dropdown list, preselect $sel_country
         while ($record = sql_fetch_array($rs)) {
             $sSelected = ($record['short'] == $sel_country) ? ' selected="selected"' : '';
-            $countriesoptions .= '<option value="' . htmlspecialchars($record['short'], ENT_COMPAT, 'UTF-8') . '"' . $sSelected . '>' . htmlspecialchars($record['name'], ENT_COMPAT, 'UTF-8') . '</option>' . "\n";
+            $countriesoptions .= '<option value="'.htmlspecialchars($record['short'], ENT_COMPAT, 'UTF-8').'"'.$sSelected.'>'.htmlspecialchars($record['name'], ENT_COMPAT, 'UTF-8').'</option>'."\n";
         }
         sql_free_result($rs);
 
@@ -488,7 +488,7 @@ 
                 LEFT JOIN `sys_trans_text` AS `ttdesc`
                     ON `tdesc`.`id`=`ttdesc`.`trans_id`
                     AND `ttdesc`.`lang`='&1'
-                WHERE `cache_attrib`.`group_id`=" . ($rAttrGroup['id'] + 0) . "
+                WHERE `cache_attrib`.`group_id`=" . ($rAttrGroup['id'] + 0)."
                 AND NOT IFNULL(`cache_attrib`.`hidden`, 0)=1
                 AND `cache_attrib`.`selectable`!=0
                 ORDER BY `cache_attrib`.`group_id`, `cache_attrib`.`id`",
@@ -508,7 +508,7 @@ 
                 $line = mb_ereg_replace('{name}', escape_javascript($record['name']), $line);
                 $line = mb_ereg_replace('{color}', $rAttrGroup['color'], $line);
                 $group_line .= $line;
-                $nLineAttrCount ++;
+                $nLineAttrCount++;
 
                 $line = $cache_attrib_js;
                 $line = mb_ereg_replace('{id}', $record['id'], $line);
@@ -674,8 +674,8 @@ 
                         "SELECT MIN(wp_oc)
                          FROM `caches`
                          WHERE `status`=1
-                         AND ROUND(`longitude`,6)=ROUND('" . sql_escape($longitude) . "',6)
-                         AND ROUND(`latitude`,6)=ROUND('" . sql_escape($latitude) . "',6)",
+                         AND ROUND(`longitude`,6)=ROUND('" . sql_escape($longitude)."',6)
+                         AND ROUND(`latitude`,6)=ROUND('" . sql_escape($latitude)."',6)",
                         null
                     );
                 if ($duplicate_wpoc) {
@@ -813,7 +813,7 @@ 
                     $activation_column = ' ';
                 } elseif ($publish == 'later') {
                     $sel_status = 5;
-                    $activation_date = "'" . date(
+                    $activation_date = "'".date(
                             'Y-m-d H:i:s',
                             mktime(
                                 $activate_hour,
@@ -822,7 +822,7 @@ 
                                 $activate_month,
                                 $activate_day,
                                 $activate_year
-                            )). "'";
+                            ))."'";
                 } elseif ($publish == 'notnow') {
                     $sel_status = 5;
                     $activation_date = 'NULL';
@@ -902,7 +902,7 @@ 
                 );
 
                 // insert cache-attributes
-                for ($i = 0; $i < count($cache_attribs); $i ++) {
+                for ($i = 0; $i < count($cache_attribs); $i++) {
                     if (($cache_attribs[$i] + 0) > 0) {
                         sql(
                             "INSERT INTO `caches_attributes` (`cache_id`, `attrib_id`) VALUES ('&1', '&2')",
@@ -915,14 +915,14 @@ 
                 // only if cache is published NOW or activate_date is in the past
                 if ($publish == 'now2' || ($publish == 'later' && mktime($activate_hour, 0, 0, $activate_month, $activate_day, $activate_year) <= $today)) {
                     //do event handling
-                    include_once(__DIR__ . '/lib/eventhandler.inc.php');
+                    include_once(__DIR__.'/lib/eventhandler.inc.php');
 
                     event_notify_new_cache($cache_id + 0);
                     event_new_cache($usr['userid'] + 0);
                 }
 
                 // redirection
-                tpl_redirect('viewcache.php?cacheid=' . urlencode($cache_id));
+                tpl_redirect('viewcache.php?cacheid='.urlencode($cache_id));
             } else {
                 tpl_set_var('general_message', $error_general);
             }

htdocs/mystatpic.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require_once __DIR__ . '/./lib2/web.inc.php';
+require_once __DIR__.'/./lib2/web.inc.php';
 
 $tpl->name = 'mystatpic';
 $tpl->menuitem = MNU_MYPROFILE_DATA_STATPIC;