OpencachingDeutschland / oc-server3

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);

local/mailing/mailing.php

Spacing +6 added lines, -6 removed lines

@@ -32,7 +32,7 @@ 
 
 $total = count($sendto);
 $n = 0;
-echo 'sending email to ' . $total . ' of ' . count($addresses) . " recipients\n\n";
+echo 'sending email to '.$total.' of '.count($addresses)." recipients\n\n";
 
 $subject = '....';
 $from_adr = 'user@do.main';
@@ -41,18 +41,18 @@ 
 
 foreach ($sendto as $receiver) {
     $receiver = trim($receiver);
-    echo ++ $n . "/$total: $receiver";
+    echo ++$n."/$total: $receiver";
     mail(
         $receiver,
         $subject,
         $message,
-        "From: $from_adr\r\n" .
-        "MIME-Version: 1.0\r\n" .
-        "Content-Type: text/plain; charset=iso-8859-1\r\n" .
+        "From: $from_adr\r\n".
+        "MIME-Version: 1.0\r\n".
+        "Content-Type: text/plain; charset=iso-8859-1\r\n".
         'Content-Transfer-Encoding: 8bit'
     );
     echo "\n";
     file_put_contents('sent.txt', "$receiver\n", FILE_APPEND);
 }
 
-echo 'Time needed: ' . (microtime(true) - $starttime) . "s\n";
+echo 'Time needed: '.(microtime(true) - $starttime)."s\n";

local/devel/okapi-update.php

Spacing +13 added lines, -13 removed lines

@@ -9,12 +9,12 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../../htdocs/';
-require_once $opt['rootpath'] . 'okapi-update-settings.inc.php';
+$opt['rootpath'] = __DIR__.'/../../htdocs/';
+require_once $opt['rootpath'].'okapi-update-settings.inc.php';
 
 function git($args)
 {
-    return exec('git ' . $args);
+    return exec('git '.$args);
 }
 
 
@@ -39,7 +39,7 @@ 
 }
 $changes = git('log upstream/master..master');
 if ($changes) {
-    die("[okapi-update] there are unpushed local commits:\n" . $changes);
+    die("[okapi-update] there are unpushed local commits:\n".$changes);
 }
 
 echo "[okapi-update] ok.\n";
@@ -48,7 +48,7 @@ 
 // fetch current OKAPI revision
 
 echo "[okapi-update] pulling and replicating OKAPI master\n";
-echo git('pull ' . OKAPI_REMOTE . ' master') . "\n";
+echo git('pull '.OKAPI_REMOTE.' master')."\n";
 $okapi_version_number = git('rev-list HEAD --count') + 318;
 $okapi_git_revision = git('rev-parse HEAD');
 echo "OKAPI ver. $okapi_version_number\n";
@@ -59,26 +59,26 @@ 
 passthru(
     str_replace(
         '%source',
-        OKAPI_SOURCE_PATH . '/okapi',
-        str_replace('%dest', $opt['rootpath'] . 'okapi', DIRECTORY_TREE_REPLICATOR)
+        OKAPI_SOURCE_PATH.'/okapi',
+        str_replace('%dest', $opt['rootpath'].'okapi', DIRECTORY_TREE_REPLICATOR)
     )
 );
-$core = file_get_contents($opt['rootpath'] . 'okapi/core.php');
+$core = file_get_contents($opt['rootpath'].'okapi/core.php');
 $core = str_replace(
     "\$version_number = null",
-    "\$version_number = " . $okapi_version_number,
+    "\$version_number = ".$okapi_version_number,
     str_replace(
         "\$git_revision = null",
-        "\$git_revision = '" . $okapi_git_revision . "'",
+        "\$git_revision = '".$okapi_git_revision."'",
         $core
     )
 );
-file_put_contents($opt['rootpath'] . 'okapi/core.php', $core);
+file_put_contents($opt['rootpath'].'okapi/core.php', $core);
 chdir($opt['rootpath']);
 passthru('git status');
 
 // commit changes to OC code
 
 echo "[okapi-update] committing to local OC Git repo\n";
-echo git('add .') . "\n";
-echo git('commit -m "OKAPI r' . $okapi_version_number . '"') . "\n";
+echo git('add .')."\n";
+echo git('commit -m "OKAPI r'.$okapi_version_number.'"')."\n";

local/devel/find_unicode_boms.php

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
  *  Searches for Unicode byte order marks in code and template files
  ***************************************************************************/
 
-chdir(__DIR__ . '/../../htdocs');
+chdir(__DIR__.'/../../htdocs');
 require_once 'lib2/cli.inc.php';
 
 
@@ -25,7 +25,7 @@ 
     $hDir = opendir($dir);
     if ($hDir !== false) {
         while (($file = readdir($hDir)) !== false) {
-            $path = $dir . '/' . $file;
+            $path = $dir.'/'.$file;
             if (is_dir($path) && substr($file, 0, 1) !== '.' && $subdirs) {
                 scan($path, $subdirs);
             } else {

local/devel/style-cleanup.php

Spacing +15 added lines, -15 removed lines

@@ -34,13 +34,13 @@ 
     'htdocs/vendor',
 );
 
-chdir(__DIR__ . '/../..');
+chdir(__DIR__.'/../..');
 
 $cleanup = new StyleCleanup();
 $cleanup->run('.', $exclude);
 
 echo
-    $cleanup->getLinesModified() . ' lines in ' . $cleanup->getFilesModified() . ' files'
+    $cleanup->getLinesModified().' lines in '.$cleanup->getFilesModified().' files'
     . " have been cleaned up\n";
 
 
@@ -80,8 +80,8 @@ 
             # process files in $path
 
             $files = array_merge(
-                glob($path . '/*.php'),
-                glob($path . '/*.tpl')
+                glob($path.'/*.php'),
+                glob($path.'/*.tpl')
             );
 
             foreach ($files as $filepath) {
@@ -93,7 +93,7 @@ 
 
                 if (count($lines) && preg_match('/^(.+?)\<\?/', $lines[0], $matches)) {
                     self::warn(
-                        'invalid character(s) "' . $matches[1] . '" at start of ' . $display_filepath
+                        'invalid character(s) "'.$matches[1].'" at start of '.$display_filepath
                     );
                 }
 
@@ -108,19 +108,19 @@ 
                         && !preg_match("/^ *(\\*|\/\/|#) *\n$/", $line)) {
 
                         $old_line = $line;
-                        $line = rtrim($line);   # trims " \t\n\r\0\x0B"
+                        $line = rtrim($line); # trims " \t\n\r\0\x0B"
                         $line = $this->expandTabs($line);
                         $line .= "\n";
 
                         if ($line != $old_line) {
                             $file_modified = true;
-                            ++ $this->lines_modified;
+                            ++$this->lines_modified;
                         }
                     }
                     if (preg_match('/\<\?\s/', $line)) {   # relies on \n at EOL
-                        self::warn('short open tag in line ' . $n . ' of ' . $display_filepath);
+                        self::warn('short open tag in line '.$n.' of '.$display_filepath);
                     }
-                    ++ $n;
+                    ++$n;
                 }
 
                 # remove PHP close tags and empty lines from end of file
@@ -131,23 +131,23 @@ 
                     if ($trimmed_line == '?>' || $trimmed_line == '') {
                         unset($lines[$l]);
                         $file_modified = true;
-                        ++ $this->lines_modified;
+                        ++$this->lines_modified;
                     } else {
                         break;
                     }
-                    -- $l;
+                    --$l;
                 }
 
                 if ($file_modified) {
-                    echo 'cleaned ' . substr($filepath, 2) . "\n";
+                    echo 'cleaned '.substr($filepath, 2)."\n";
                     file_put_contents($filepath, implode('', $lines));
-                    ++ $this->files_modified;
+                    ++$this->files_modified;
                 }
             }
 
             # process subdirectories in $path
 
-            $dirs = glob($path . '/*', GLOB_ONLYDIR);
+            $dirs = glob($path.'/*', GLOB_ONLYDIR);
             foreach ($dirs as $dir) {
                 if ($dir != '.' && $dir != '..') {
                     $this->cleanup($dir);
@@ -170,6 +170,6 @@ 
 
     private static function warn($msg)
     {
-        echo '! ' . $msg . "\n";
+        echo '! '.$msg."\n";
     }
 }

local/devel/find_bad_encodings.php

Spacing +4 added lines, -4 removed lines

@@ -7,7 +7,7 @@ 
  *  Searches for files which are no longer Unicode-encoded
  ***************************************************************************/
 
-chdir(__DIR__ . '/../../htdocs');
+chdir(__DIR__.'/../../htdocs');
 require_once 'lib2/cli.inc.php';
 
 
@@ -25,7 +25,7 @@ 
     $hDir = opendir($dir);
     if ($hDir !== false) {
         while (($file = readdir($hDir)) !== false) {
-            $path = $dir . '/' . $file;
+            $path = $dir.'/'.$file;
             if (is_dir($path) && substr($file, 0, 1) !== '.' && $subdirs) {
                 scan($path, $subdirs);
             } else {
@@ -41,7 +41,7 @@ 
 
 function test_encoding($path)
 {
-    static $ur_exclude = [  // no unicode reminder needed
+    static $ur_exclude = [// no unicode reminder needed
         'lang/de/ocstyle/search1/search.result.caches',
         'lib2/b2evo-captcha',
         'lib2/HTMLPurifier',
@@ -57,7 +57,7 @@ 
         if (mb_trim(mb_substr($contents, $ur + 17, 2)) != "メモ") {
             $ur = mb_stripos($contents, "Unicode Reminder");
             if (mb_trim(mb_substr($contents, $ur + 17, 2)) != "メモ") {
-                echo "Bad Unicode Reminder found in $path: " . mb_trim(mb_substr($contents, $ur + 17, 2)) . "\n";
+                echo "Bad Unicode Reminder found in $path: ".mb_trim(mb_substr($contents, $ur + 17, 2))."\n";
             } else {
                 echo "Unexpected non-ASCII chars (BOMs?) in header of $path\n";
             }