Merge remote-tracking branch 'upstream/master'

[nominatim.git] / utils / blocks.php

diff --git a/utils/blocks.php b/utils/blocks.php
index 7d9a3f8a2264f61744a5ed5a3613731abedcae8f..602df0bc09822e763c0e59bc845ce3793391a7c4 100755 (executable)
--- a/utils/blocks.php
+++ b/utils/blocks.php
@@ -7,7 +7,7 @@ ini_set('memory_limit', '800M');
 
 $aCMDOptions
  = array(
 
 $aCMDOptions
  = array(

-    "Manage service blocks / restrictions",
+    'Manage service blocks / restrictions',

     array('help', 'h', 0, 1, 0, 0, false, 'Show Help'),
     array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'),
     array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),
     array('help', 'h', 0, 1, 0, 0, false, 'Show Help'),
     array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'),
     array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),


@@ -29,16 +29,16 @@ if ($aResult['list']) {
 
     $aBlocks = getBucketBlocks();
     echo "\n";
 
     $aBlocks = getBucketBlocks();
     echo "\n";

-    printf(" %-40s | %12s | %7s | %13s | %31s | %8s\n", "Key", "Total Blocks", "Current", "Still Blocked", "Last Block Time", "Sleeping");
-    printf(" %'--40s-|-%'-12s-|-%'-7s-|-%'-13s-|-%'-31s-|-%'-8s\n", "", "", "", "", "", "");
+    printf(" %-40s | %12s | %7s | %13s | %31s | %8s\n", 'Key', 'Total Blocks', 'Current', 'Still Blocked', 'Last Block Time', 'Sleeping');
+    printf(" %'--40s-|-%'-12s-|-%'-7s-|-%'-13s-|-%'-31s-|-%'-8s\n", '', '', '', '', '', '');

     foreach ($aBlocks as $sKey => $aDetails) {
         printf(
             " %-40s | %12s | %7s | %13s | %31s | %8s\n",
             $sKey,
     foreach ($aBlocks as $sKey => $aDetails) {
         printf(
             " %-40s | %12s | %7s | %13s | %31s | %8s\n",
             $sKey,

-            $aDetails['totalBlocks'], 
+            $aDetails['totalBlocks'],

             (int)$aDetails['currentBucketSize'],
             (int)$aDetails['currentBucketSize'],

-            $aDetails['currentlyBlocked']?'Y':'N', 
-            date("r", $aDetails['lastBlockTimestamp']),
+            $aDetails['currentlyBlocked']?'Y':'N',
+            date('r', $aDetails['lastBlockTimestamp']),

             $aDetails['isSleeping']?'Y':'N'
         );
     }
             $aDetails['isSleeping']?'Y':'N'
         );
     }