OpencachingDeutschland / oc-server3

htdocs/editdesc.php

Spacing +18 added lines, -18 removed lines

@@ -9,20 +9,20 @@ 
  *  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';
 
 // Preprocessing
 if ($error == false) {
-    require $stylepath . '/editdesc.inc.php';
+    require $stylepath.'/editdesc.inc.php';
 
     // check for old-style parameters
     if (isset($_REQUEST['cacheid']) && isset($_REQUEST['desclang']) && !isset($_REQUEST['descid']))  // Ocprop
     {
-        $cache_id = $_REQUEST['cacheid'];  // Ocprop
-        $desc_lang = $_REQUEST['desclang'];  // Ocprop
+        $cache_id = $_REQUEST['cacheid']; // Ocprop
+        $desc_lang = $_REQUEST['desclang']; // Ocprop
 
         $rs = sql("SELECT `id` FROM `cache_desc` WHERE `cache_id`='&1' AND `language`='&2'", $cache_id, $desc_lang);
         if (mysql_num_rows($rs) == 1) {
@@ -43,7 +43,7 @@ 
         $tplname = 'login';
 
         tpl_set_var('username', '');
-        tpl_set_var('target', htmlspecialchars('editdesc.php?descid=' . urlencode($descid), ENT_COMPAT, 'UTF-8'));
+        tpl_set_var('target', htmlspecialchars('editdesc.php?descid='.urlencode($descid), ENT_COMPAT, 'UTF-8'));
         tpl_set_var('message_start', "");
         tpl_set_var('message_end', "");
         tpl_set_var('message', $login_required);
@@ -90,7 +90,7 @@ 
                 if (isset($_POST['post']))  // Ocprop
                 {
                     //here we read all used information from the form if submitted
-                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1;  // Ocprop
+                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1; // Ocprop
 
                     // fuer alte Versionen von OCProp
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -123,7 +123,7 @@ 
                         $oldDescMode = $descMode;
                     }
 
-                    $short_desc = $_POST['short_desc'];  // Ocprop
+                    $short_desc = $_POST['short_desc']; // Ocprop
                     $hint = htmlspecialchars($_POST['hints'], ENT_COMPAT, 'UTF-8');
                     $desclang = $_POST['desclang'];
                     $show_all_langs = isset($_POST['show_all_langs_value']) ? $_POST['show_all_langs_value'] : 0;
@@ -138,7 +138,7 @@ 
                     }
 
                     // Text from textarea
-                    $desc = $_POST['desc'];  // Ocprop
+                    $desc = $_POST['desc']; // Ocprop
 
                     // fuer alte Versionen von OCProp
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -207,7 +207,7 @@ 
                         db_slave_exclude();
 
                         // redirect to cachepage
-                        tpl_redirect('editcache.php?cacheid=' . urlencode($desc_record['cache_id']));
+                        tpl_redirect('editcache.php?cacheid='.urlencode($desc_record['cache_id']));
                         exit;
                     } elseif (isset($_POST['show_all_langs'])) {
                         $show_all_langs = true;
@@ -277,7 +277,7 @@ 
                     ($show_all_langs == true) ? 1 : 0);
                 while ($rLanguage = sql_fetch_assoc($rsLanguages)) {
                     $sSelected = ($rLanguage['short'] == $desc_lang) ? ' selected="selected"' : '';
-                    $languages .= '<option value="' . $rLanguage['short'] . '"' . $sSelected . '>' . htmlspecialchars($rLanguage['name'], ENT_COMPAT, 'UTF-8') . '</option>' . "\n";
+                    $languages .= '<option value="'.$rLanguage['short'].'"'.$sSelected.'>'.htmlspecialchars($rLanguage['name'], ENT_COMPAT, 'UTF-8').'</option>'."\n";
                 }
                 sql_free_result($rsLanguages);
 
@@ -297,20 +297,20 @@ 
                 tpl_set_var('desclang', htmlspecialchars($desc_lang, ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('desclang_name', htmlspecialchars(db_LanguageFromShort($desc_lang), ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('cachename', htmlspecialchars($desc_record['name'], ENT_COMPAT, 'UTF-8'));
-                tpl_set_var('reset', $reset);  // obsolete
+                tpl_set_var('reset', $reset); // obsolete
                 tpl_set_var('submit', $submit);
 
                 // Text / normal HTML / HTML editor
                 tpl_set_var('use_tinymce', ($desc_htmledit == 1) ? 1 : 0);
 
-                $headers = tpl_get_var('htmlheaders') . "\n";
+                $headers = tpl_get_var('htmlheaders')."\n";
                 if (($desc_html == 1) && ($desc_htmledit == 1)) {
                     // TinyMCE
-                    $headers = tpl_get_var('htmlheaders') . "\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=' . ($desc_record['cache_id'] + 0) . '&lang=' . strtolower($locale) . '"></script>' . "\n";
+                    $headers = tpl_get_var('htmlheaders')."\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='.($desc_record['cache_id'] + 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);
             } else {
                 // @todo: not the owner

htdocs/adminreports.php

Spacing +5 added lines, -5 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'adminreports';
 $tpl->menuitem = MNU_ADMIN_REPORTS;
@@ -43,15 +43,15 @@ 
     ($adminid == 0 || ($adminid != $login->userid && $age >= 14))
 ) {
     sql("UPDATE `cache_reports` SET `status`=2, `adminid`=&2 WHERE `id`=&1", $rid, $login->userid);
-    $tpl->redirect('adminreports.php?id=' . $rid);
+    $tpl->redirect('adminreports.php?id='.$rid);
 } elseif (isset($_REQUEST['contact']) && $ownerid > 0) {
     $wp_oc = sql_value("SELECT `wp_oc` FROM `caches` WHERE `cache_id`='&1'", '', $cacheid);
-    $tpl->redirect('mailto.php?userid=' . urlencode($ownerid) . '&wp=' . $wp_oc);
+    $tpl->redirect('mailto.php?userid='.urlencode($ownerid).'&wp='.$wp_oc);
 } elseif (isset($_REQUEST['contact_reporter']) && $reporterid > 0) {
-    $tpl->redirect('mailto.php?userid=' . urlencode($reporterid) . '&reportid=' . $rid);
+    $tpl->redirect('mailto.php?userid='.urlencode($reporterid).'&reportid='.$rid);
 } elseif (isset($_REQUEST['done']) && $adminid == $login->userid) {
     sql("UPDATE `cache_reports` SET `status`=3 WHERE `id`=&1", $rid);
-    $tpl->redirect('adminreports.php?id=' . $rid);
+    $tpl->redirect('adminreports.php?id='.$rid);
 } elseif (isset($_REQUEST['assign']) && ($adminid == 0 || $adminid != $login->userid)) {
     $error = 1;
     $id = 0;

htdocs/event_attendance.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'event_attendance';
 $tpl->popup = true;

local/maintenance/update_passwords.php

Spacing +3 added lines, -3 removed lines

@@ -8,9 +8,9 @@
  ***************************************************************************/
 
 global $opt;
-$opt['rootpath'] = __DIR__ . '/../../htdocs/';
-require $opt['rootpath'] . 'lib2/cli.inc.php';
-require $opt['rootpath'] . 'lib2/logic/crypt.class.php';
+$opt['rootpath'] = __DIR__.'/../../htdocs/';
+require $opt['rootpath'].'lib2/cli.inc.php';
+require $opt['rootpath'].'lib2/logic/crypt.class.php';
 
 if (!isset($opt['logic']['password_salt']) || strlen($opt['logic']['password_salt']) < 32) {
     echo "Warning!\nPassword Salt not set or too short!\n\n";

local/maintenance/update_queries.php

Spacing +4 added lines, -4 removed lines

@@ -9,7 +9,7 @@ 
  ***************************************************************************/
 
 $opt['rootpath'] = '../../htdocs/';
-require $opt['rootpath'] . 'lib2/web.inc.php';
+require $opt['rootpath'].'lib2/web.inc.php';
 
 if ($argc != 2 || $argv[1] != 'go') {
     die("run with parameter 'go' to update queries\n");
@@ -22,15 +22,15 @@ 
         $cachesize = $query['cachesize'];
 
         // add nano size to all queries that include micro or other
-        if (preg_match('/[;][12][;]/', ';' . $cachesize . ';') &&
-            !preg_match('/[;][8][;]/', ';' . $cachesize . ';')
+        if (preg_match('/[;][12][;]/', ';'.$cachesize.';') &&
+            !preg_match('/[;][8][;]/', ';'.$cachesize.';')
         ) {
             // echo $r['name'] . ": " . $cachesize . " -> " . $query['cachesize'] .= ";8\n";
             $query['cachesize'] .= ';8';
             $saveopt = serialize($query);
             // sql("UPDATE queries SET `options`='&1' WHERE `id`='&2'", $saveopt, $r['id']);
             // ^^ run this line only if you are absolutely sure what you are doing
-            echo 'added nano to query ' . $r['id'] . "(" . $cachesize . ') of user ' . $r['user_id'] . "\n";
+            echo 'added nano to query '.$r['id']."(".$cachesize.') of user '.$r['user_id']."\n";
         }
     }
 }

local/maintenance/email_recovery.php

Spacing +37 added lines, -37 removed lines

@@ -16,25 +16,25 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../../htdocs/';
-require $opt['rootpath'] . 'lib2/cli.inc.php';
+$opt['rootpath'] = __DIR__.'/../../htdocs/';
+require $opt['rootpath'].'lib2/cli.inc.php';
 
 if ($argc < 3 || $argc > 4) {
     die(
-        "usage:    php email_recovery.php \"from-datetime\" \"to-datetime\" [option]\n" .
-        "\n" .
-        "          Datetimes must be in YYYY-MM-DD HH:MM:SS format and are inclusive.\n" .
-        "\n" .
-        "options:  <none>          show information about all lost information\n" .
-        "          watchlist       resend log notifications\n" .
-        "          newcaches       resend new caches notifications\n" .
+        "usage:    php email_recovery.php \"from-datetime\" \"to-datetime\" [option]\n".
+        "\n".
+        "          Datetimes must be in YYYY-MM-DD HH:MM:SS format and are inclusive.\n".
+        "\n".
+        "options:  <none>          show information about all lost information\n".
+        "          watchlist       resend log notifications\n".
+        "          newcaches       resend new caches notifications\n".
         "          registrations   resend activation codes\n"
     );
 }
 
 $er = new EmailRecovery($argv[1], $argv[2], $errormsg);
 if ($errormsg != '') {
-    die($errormsg . "\n");
+    die($errormsg."\n");
 }
 
 if ($argc < 4) {
@@ -52,7 +52,7 @@ 
             $er->resendActivationCodes();
             break;
         default:
-            die('invalid option: '. $option . "\n");
+            die('invalid option: '.$option."\n");
     }
 }
 
@@ -65,9 +65,9 @@ 
     public function __construct($fromDT, $toDT, &$errormsg)
     {
         if (!self::verifyDateTime($fromDT)) {
-            $errormsg = 'invalid from-datetime (must be SQL format): "' . $fromDT . '"';
+            $errormsg = 'invalid from-datetime (must be SQL format): "'.$fromDT.'"';
         } elseif (!self::verifyDateTime($toDT)) {
-            $errormsg = 'invalid from-datetime (must be SQL format): "' . $toDT . '"';
+            $errormsg = 'invalid from-datetime (must be SQL format): "'.$toDT.'"';
         } else {
             $this->fromDateTime = $fromDT;
             $this->toDateTime = $toDT;
@@ -85,26 +85,26 @@ 
 
     private static function message($level, $text)
     {
-        echo str_repeat(' ', 2 * $level) . $text . "\n";
+        echo str_repeat(' ', 2 * $level).$text."\n";
     }
 
     private function getDateCondition($table, $field)
     {
         return
-            "`" . $table . "`.`" . $field . "` >= '" . sql_escape($this->fromDateTime) . "'" .
-            " AND `" . $table . "`.`" . $field . "` <= '" . sql_escape($this->toDateTime) . "'";
+            "`".$table."`.`".$field."` >= '".sql_escape($this->fromDateTime)."'".
+            " AND `".$table."`.`".$field."` <= '".sql_escape($this->toDateTime)."'";
     }
 
     private function showObjectCount($table, $dateField, $description, $andWhere = '')
     {
         $objectCount = sql_value(
             "SELECT COUNT(*)
-             FROM `" . $table . "`
-             WHERE " . $this->getDateCondition($table, $dateField) .
-                       ($andWhere ? ' AND (' . $andWhere . ')' : ''),
+             FROM `" . $table."`
+             WHERE " . $this->getDateCondition($table, $dateField).
+                       ($andWhere ? ' AND ('.$andWhere.')' : ''),
             0
         );
-        self::message(1, $objectCount . ' ' . $description);
+        self::message(1, $objectCount.' '.$description);
     }
 
 
@@ -153,16 +153,16 @@ 
              JOIN `user` `user1` ON `user1`.`user_id` = `cache_logs_archived`.`user_id`
              JOIN `user` `user2` ON `user2`.`user_id` = `cache_logs_archived`.`deleted_by`
              JOIN `caches` ON `caches`.`cache_id` = `cache_logs_archived`.`cache_id`
-             WHERE " . $this->getDateCondition('cache_logs_archived', 'deletion_date') . "
+             WHERE " . $this->getDateCondition('cache_logs_archived', 'deletion_date')."
              ORDER BY `cache_logs_archived`.`deletion_date` DESC"
         );
         while ($r = sql_fetch_assoc($rs)) {
             self::message(
                 2,
                 $r['wp_oc']
-                . ' logged:' . $r['logdate']
-                . ' logger:' . $r['logger_name']
-                . ' deleter:' . $r['deleter_name']
+                . ' logged:'.$r['logdate']
+                . ' logger:'.$r['logger_name']
+                . ' deleter:'.$r['deleter_name']
             );
         }
         sql_free_result($rs);
@@ -175,12 +175,12 @@ 
                 `username`
              FROM `user`
              WHERE " .
-                $this->getDateCondition('user', 'date_created') . "
+                $this->getDateCondition('user', 'date_created')."
                 AND last_login IS NULL AND `activation_code` <> ''
              ORDER BY `date_created` DESC"
         );
         while ($r = sql_fetch_assoc($rs)) {
-            self::message(2, $r['registration_date'] . ' ' . $r['username']);
+            self::message(2, $r['registration_date'].' '.$r['username']);
         }
         sql_free_result($rs);
 
@@ -192,11 +192,11 @@ 
                 `user`.`username` `sender_name`
              FROM `email_user`
              JOIN `user` ON `user`.`user_id` = `email_user`.`from_user_id`
-             WHERE " . $this->getDateCondition('email_user', 'date_created') . "
+             WHERE " . $this->getDateCondition('email_user', 'date_created')."
              ORDER BY `email_user`.`date_created` DESC"
         );
         while ($r = sql_fetch_assoc($rs)) {
-            self::message(2, $r['emaildate'] . ' from:' . $r['sender_name']);
+            self::message(2, $r['emaildate'].' from:'.$r['sender_name']);
         }
         sql_free_result($rs);
     }
@@ -232,7 +232,7 @@ 
                 JOIN `cache_status` ON `cache_status`.`id` = `caches`.`status`
                 JOIN `cache_watches` ON `cache_watches`.`cache_id` = `caches`.`cache_id`
                 WHERE
-                    " . $this->getDateCondition('cache_logs', 'date_created') . "
+                    " . $this->getDateCondition('cache_logs', 'date_created')."
                     AND `cache_status`.`allow_user_view` = 1"
         );
         $watcher_notifications = sql_affected_rows();
@@ -247,13 +247,13 @@ 
                 JOIN `cache_list_items` ON `cache_list_items`.`cache_id` = `cache_logs`.`cache_id`
                 JOIN `cache_list_watches` ON `cache_list_watches`.`cache_list_id` = `cache_list_items`.`cache_list_id`
                 WHERE
-                    " . $this->getDateCondition('cache_logs', 'date_created') . "
+                    " . $this->getDateCondition('cache_logs', 'date_created')."
                     AND `cache_status`.`allow_user_view` = 1"
         );
         $watcher_notifications += sql_affected_rows();
 
-        self::message(0, $owner_notifications . ' owners will be notified');
-        self::message(0, $watcher_notifications . ' watchers will be notified');
+        self::message(0, $owner_notifications.' owners will be notified');
+        self::message(0, $watcher_notifications.' watchers will be notified');
     }
 
     public function resendCacheNotifications()
@@ -265,7 +265,7 @@ 
              FROM `caches`
              JOIN `cache_status` ON `cache_status`.`id` = `caches`.`status`
              WHERE
-                " . $this->getDateCondition('caches', 'date_created') . "
+                " . $this->getDateCondition('caches', 'date_created')."
                 AND `cache_status`.`allow_user_view` = 1"
         );
         while ($r = sql_fetch_assoc($rs)) {
@@ -280,7 +280,7 @@ 
 
         $new_notifications =
             sql_value("SELECT COUNT(*) FROM `notify_waiting`", 0) - $notifies_wating;
-        self::message(0, $new_notifications . ' new cache notifications will be sent');
+        self::message(0, $new_notifications.' new cache notifications will be sent');
     }
     
     public function resendActivationCodes()
@@ -289,7 +289,7 @@ 
             "SELECT `user_id`
              FROM `user`
              WHERE
-                " . $this->getDateCondition('user', 'date_created') . "
+                " . $this->getDateCondition('user', 'date_created')."
                 AND last_login IS NULL
                 AND `activation_code` <> ''"
         );
@@ -297,10 +297,10 @@ 
         while ($r = sql_fetch_assoc($rs)) {
             $user = new user($r['user_id']);
             $user->sendRegistrationCode();
-            ++ $n;
+            ++$n;
         }
         sql_free_result($rs);
-        self::message(0, $n . ' users have been re-sent the activation code');
+        self::message(0, $n.' users have been re-sent the activation code');
     }
     
 }

local/maintenance/init_user_languages.php

Spacing +7 added lines, -7 removed lines

@@ -8,9 +8,9 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../../htdocs/';
-require_once $opt['rootpath'] . 'lib2/cli.inc.php';
-require_once $opt['rootpath'] . 'lib2/logic/user.class.php';
+$opt['rootpath'] = __DIR__.'/../../htdocs/';
+require_once $opt['rootpath'].'lib2/cli.inc.php';
+require_once $opt['rootpath'].'lib2/logic/user.class.php';
 
 $write = ($argc == 2 && $argv[1] = 'write');
 if (!$write) {
@@ -31,11 +31,11 @@ 
                 $lang
             );
         }
-        ++ $set;
+        ++$set;
     }
-    if (++ $processed % 1000 == 0) {
-        echo "$set of $processed " . ($write ? '' : 'would be ') . "set\n";
+    if (++$processed % 1000 == 0) {
+        echo "$set of $processed ".($write ? '' : 'would be ')."set\n";
     }
 }
-echo "$set of $processed " . ($write ? '' : 'would be ') . "set\n";
+echo "$set of $processed ".($write ? '' : 'would be ')."set\n";
 sql_free_result($rs);

local/maintenance/cleanup_coordinates.php

Spacing +5 added lines, -5 removed lines

@@ -12,8 +12,8 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../../htdocs/';
-require $opt['rootpath'] . 'lib2/cli.inc.php';
+$opt['rootpath'] = __DIR__.'/../../htdocs/';
+require $opt['rootpath'].'lib2/cli.inc.php';
 
 $rs = sql(
     "SELECT `id`, `cache_id`, `latitude`, `longitude`
@@ -41,14 +41,14 @@ 
 
 if ($duplicates) {
     if ($argc == 2 && $argv[1] == 'go') {
-        echo 'deleting ' . count($duplicates) . " duplicate coordinate records\n";
+        echo 'deleting '.count($duplicates)." duplicate coordinate records\n";
         sql(
             "DELETE FROM `cache_coordinates`
-             WHERE `id` IN (" . implode(',', $duplicates) . ")"
+             WHERE `id` IN (" . implode(',', $duplicates).")"
         );
     } else {
         echo
-            count($duplicates) . ' duplicate coordinates found. ' .
+            count($duplicates).' duplicate coordinates found. '.
             "Add parameter 'go' to delete them.\n";
     }
 } else {

local/mailing/email-addresslist.php

Spacing +3 added lines, -3 removed lines

@@ -7,8 +7,8 @@ 
 
 header('Content-type: text/html; charset=utf-8');
 
-$opt['rootpath'] = __DIR__ . '/../../htdocs/';
-require $opt['rootpath'] . 'lib2/web.inc.php';
+$opt['rootpath'] = __DIR__.'/../../htdocs/';
+require $opt['rootpath'].'lib2/web.inc.php';
 
 $rs = sql(
     'SELECT email FROM `user`
@@ -18,6 +18,6 @@ 
      ORDER BY user_id DESC'
 );
 while ($r = sql_fetch_assoc($rs)) {
-    echo $r['email'] . "\n";
+    echo $r['email']."\n";
 }
 sql_free_result($rs);