OpencachingDeutschland / oc-server3

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

Doc Comments +3 added lines

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

Spacing +4 added lines, -4 removed lines

@@ -116,10 +116,10 @@ 
 
         if ($r['html'] == 0) {
             $thisline = mb_ereg_replace('{htmlwarn}', '', $thisline);
-            $thisline = mb_ereg_replace('{desc}', decodeEntities(strip_tags($r['desc'])) . $license, $thisline);
+            $thisline = mb_ereg_replace('{desc}', decodeEntities(strip_tags($r['desc'])).$license, $thisline);
         } else {
             $thisline = mb_ereg_replace('{htmlwarn}', " ($converted_from_html)", $thisline);
-            $thisline = mb_ereg_replace('{desc}', html2txt($r['desc']) . $license, $thisline);
+            $thisline = mb_ereg_replace('{desc}', html2txt($r['desc']).$license, $thisline);
         }
 
         $thisline = mb_ereg_replace('{type}', $r['type'], $thisline);
@@ -197,7 +197,7 @@ 
                 $thislog = mb_ereg_replace('{text}', html2txt($rLog['text']), $thislog);
             }
 
-            $logentries .= $thislog . "\n";
+            $logentries .= $thislog."\n";
         }
         $thisline = mb_ereg_replace('{logs}', $logentries, $thisline);
 
@@ -205,7 +205,7 @@ 
         if (!$bUseZip) {
             echo $thisline;
         } else {
-            $phpzip->add_data($r['waypoint'] . '.txt', $thisline);
+            $phpzip->add_data($r['waypoint'].'.txt', $thisline);
         }
     }
     mysql_free_result($rs);

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

Doc Comments +6 added lines

@@ -35,6 +35,9 @@ 
         $this->init(0, 0);
     }
 
+    /**
+     * @param boolean $request
+     */
     private function initRequest($request)
     {
         if ($request) {
@@ -44,6 +47,9 @@ 
         return new RequestHttp();
     }
 
+    /**
+     * @param boolean $translator
+     */
     private function initTranslator($translator)
     {
         if ($translator) {

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 use Oc\Libse\Validator\AlwaysValidValidator;
 use Oc\Libse\Validator\ArrayValidator;
 
-require_once __DIR__ . '/../../../../lib2/error.inc.php';
+require_once __DIR__.'/../../../../lib2/error.inc.php';
 
 abstract class PresenterChildWp
 {

htdocs/adminuser.php

Spacing +4 added lines, -4 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'adminuser';
 $tpl->menuitem = MNU_ADMIN_USER;
@@ -51,7 +51,7 @@ 
     // send a new confirmation
     $user->sendRegistrationCode();
 
-    $tpl->redirect('adminuser.php?action=searchuser&msg=sendcodecommit&username=' . urlencode($user->getUsername()));
+    $tpl->redirect('adminuser.php?action=searchuser&msg=sendcodecommit&username='.urlencode($user->getUsername()));
 }
 
 function formAction()
@@ -97,8 +97,8 @@ 
         $user->addEmailProblem($datalicense);
     }
 
-    $tpl->redirect('adminuser.php?action=searchuser&username=' . urlencode($username) .
-        '&success=' . ($disduelicense + $disable));
+    $tpl->redirect('adminuser.php?action=searchuser&username='.urlencode($username).
+        '&success='.($disduelicense + $disable));
 }
 
 function searchUser()

htdocs/login.php

Spacing +6 added lines, -6 removed lines

@@ -6,7 +6,7 @@ 
  ***************************************************************************/
 
 $disable_verifyemail = true;
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'login';
 $tpl->menuitem = MNU_LOGIN;
@@ -28,7 +28,7 @@ 
     $target = 'myhome.php';
 }
 
-$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';   // Ocprop
+$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : ''; // Ocprop
 
 if ($action == 'cookieverify') {
     // we should be logged in ... check if cookie is set ...
@@ -39,7 +39,7 @@ 
             $tpl->redirect($target);
         }
     } else {
-        if (!isset($_COOKIE[$opt['session']['cookiename'] . 'data'])) {
+        if (!isset($_COOKIE[$opt['session']['cookiename'].'data'])) {
             $tpl->error(ERROR_NO_COOKIES);
         } else {
             $tpl->redirect($target);
@@ -58,13 +58,13 @@ 
         $tpl->error(ERROR_ALREADY_LOGGEDIN);
     }
 
-    $username = isset($_POST['email']) ? $_POST['email'] : '';  // Ocprop
-    $password = isset($_POST['password']) ? $_POST['password'] : '';  // Ocprop
+    $username = isset($_POST['email']) ? $_POST['email'] : ''; // Ocprop
+    $password = isset($_POST['password']) ? $_POST['password'] : ''; // Ocprop
 
     $retval = $login->try_login($username, $password, null);
     $password = '';
     if ($retval == LOGIN_OK) {
-        $tpl->redirect('login.php?action=cookieverify&target=' . urlencode($target));
+        $tpl->redirect('login.php?action=cookieverify&target='.urlencode($target));
     }
 
     $tpl->assign('username', $username);

htdocs/newlogsrest.php

Spacing +1 added lines, -1 removed lines

@@ -6,4 +6,4 @@
  ***************************************************************************/
 
 $newlogs_rest = true;
-require __DIR__ . '/newlogs.php';
+require __DIR__.'/newlogs.php';

htdocs/garmin.php

Spacing +7 added lines, -7 removed lines

@@ -5,9 +5,9 @@ 
  * Unicode Reminder メモ
  ****************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
-require_once __DIR__ . '/lib2/logic/labels.inc.php';
-require_once __DIR__ . '/lib2/logic/cache.class.php';
+require __DIR__.'/lib2/web.inc.php';
+require_once __DIR__.'/lib2/logic/labels.inc.php';
+require_once __DIR__.'/lib2/logic/cache.class.php';
 
 $tpl->name = 'garmin';
 $tpl->popup = 1;
@@ -30,9 +30,9 @@ 
 // be needed.
 
 if (($opt['lib']['garmin']['domain'] != $_SERVER['HTTP_HOST']) && !isset($_REQUEST['redirect'])) {
-    $redirect = $opt['lib']['garmin']['page_url'] . 'garmin.php?redirect=1&cacheid=' . $cacheid;
+    $redirect = $opt['lib']['garmin']['page_url'].'garmin.php?redirect=1&cacheid='.$cacheid;
     if (isset($_REQUEST['templocale'])) {
-        $redirect .= '&templocale=' . $_REQUEST['templocale'];
+        $redirect .= '&templocale='.$_REQUEST['templocale'];
     }
     $tpl->redirect($redirect);
     exit;
@@ -52,9 +52,9 @@ 
 $tpl->assign('crypt', $bCrypt);
 
 if (isset($_REQUEST['desclang'])) {
-    $sPreferedDescLang = $_REQUEST['desclang'] . ',' . $opt['template']['locale'] . ',EN';
+    $sPreferedDescLang = $_REQUEST['desclang'].','.$opt['template']['locale'].',EN';
 } else {
-    $sPreferedDescLang = $opt['template']['locale'] . ',EN';
+    $sPreferedDescLang = $opt['template']['locale'].',EN';
 }
 
 //get cache record

htdocs/mywatches.php

Spacing +4 added lines, -4 removed lines

@@ -5,14 +5,14 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'mywatches';
 $tpl->menuitem = MNU_MYPROFILE_WATCHES;
 
 $login->verify();
 if ($login->userid == 0) {
-    $tpl->redirect('login.php?target=' . urlencode($tpl->target));
+    $tpl->redirect('login.php?target='.urlencode($tpl->target));
 }
 
 $action = isset($_REQUEST['action']) ? mb_strtolower($_REQUEST['action']) : '';
@@ -48,14 +48,14 @@ 
     }
 
     $hours = array();
-    for ($i = 0; $i < 24; $i ++) {
+    for ($i = 0; $i < 24; $i++) {
         $hours[] = [
             'value' => $i,
             'time' => mktime($i, 0, 0)
         ];
     }
     $weekdays = array();
-    for ($i = 1; $i <= 7; $i ++) {
+    for ($i = 1; $i <= 7; $i++) {
         $weekdays[] = array(
             'value' => $i,
             'time' => mktime(0, 0, 0, 0, $i + 5, 2000)

htdocs/doc/sql/stored-proc/old/distance.php

Spacing +4 added lines, -4 removed lines

@@ -9,13 +9,13 @@
  ***************************************************************************/
 
 $opt['rootpath'] = '../../../';
-require_once $opt['rootpath'] . 'lib/clicompatbase.inc.php';
+require_once $opt['rootpath'].'lib/clicompatbase.inc.php';
 
-if (!file_exists($opt['rootpath'] . 'util/mysql_root/sql_root.inc.php')) {
-    die("\n" . 'install util/mysql_root/sql_root.inc.php' . "\n\n");
+if (!file_exists($opt['rootpath'].'util/mysql_root/sql_root.inc.php')) {
+    die("\n".'install util/mysql_root/sql_root.inc.php'."\n\n");
 }
 
-require_once $opt['rootpath'] . 'util/mysql_root/sql_root.inc.php';
+require_once $opt['rootpath'].'util/mysql_root/sql_root.inc.php';
 
 /* begin db connect */
 db_root_connect();

htdocs/doc/sql/stored-proc/maintain-113.inc.php

Spacing +3 added lines, -3 removed lines

@@ -448,7 +448,7 @@ 
 
    SELECT GROUP_CONCAT(DISTINCT `language` ORDER BY `language` SEPARATOR ',') INTO dl FROM `cache_desc` WHERE `cache_id`=nCacheId GROUP BY `cache_id` ;
    UPDATE `caches` SET `desc_languages`=dl, default_desclang=PREFERED_LANG(dl, '&1') WHERE `cache_id`=nCacheId LIMIT 1;
- END;", strtoupper($lang . ',EN'));
+ END;", strtoupper($lang.',EN'));
 
 // set caches.desc_languages of all caches, fill cache_desc_prefered and return number of modified rows
 sql_dropProcedure('sp_updateall_caches_descLanguages');
@@ -456,7 +456,7 @@ 
  BEGIN
    UPDATE `caches`, (SELECT `cache_id`, GROUP_CONCAT(DISTINCT `language` ORDER BY `language` SEPARATOR ',') AS `dl` FROM `cache_desc` GROUP BY `cache_id`) AS `tbl` SET `caches`.`desc_languages`=`tbl`.`dl`, `caches`.`default_desclang`=PREFERED_LANG(`tbl`.`dl`, '&1') WHERE `caches`.`cache_id`=`tbl`.`cache_id`;
    SET nModified = ROW_COUNT() ;
- END;", strtoupper($lang . ',EN'));
+ END;", strtoupper($lang.',EN'));
 
 // update found, last_found, notfound and note of stat_cache_logs, stat_caches and stat_user
 sql_dropProcedure('sp_update_logstat');
@@ -808,7 +808,7 @@ 
                     SET @dont_update_listingdate=0;
                 END;",
                 $opt['logic']['waypoint_pool']['prefix'],
-                '^' . $opt['logic']['waypoint_pool']['prefix'] . '[' . $opt['logic']['waypoint_pool']['valid_chars'] . ']{1,}$');
+                '^'.$opt['logic']['waypoint_pool']['prefix'].'['.$opt['logic']['waypoint_pool']['valid_chars'].']{1,}$');
 
 sql_dropTrigger('cachesAfterInsert');
 sql("CREATE TRIGGER `cachesAfterInsert` AFTER INSERT ON `caches`