Merge remote-tracking branch 'upstream/master'

[nominatim.git] / utils / blocks.php

diff --git a/utils/blocks.php b/utils/blocks.php
index b213e4545d9774a5872f4c764a4e0ff652a90934..761ab9e4f004c11097093da1b16891dba8f1b6d5 100755 (executable)
--- a/utils/blocks.php
+++ b/utils/blocks.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php -Cq
+#!@PHP_BIN@ -Cq

 <?php
 
 require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 <?php
 
 require_once(dirname(dirname(__FILE__)).'/settings/settings.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,8 +29,8 @@ 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",
     foreach ($aBlocks as $sKey => $aDetails) {
         printf(
             " %-40s | %12s | %7s | %13s | %31s | %8s\n",


@@ -38,7 +38,7 @@ if ($aResult['list']) {
             $aDetails['totalBlocks'],
             (int)$aDetails['currentBucketSize'],
             $aDetails['currentlyBlocked']?'Y':'N',
             $aDetails['totalBlocks'],
             (int)$aDetails['currentBucketSize'],
             $aDetails['currentlyBlocked']?'Y':'N',

-            date("r", $aDetails['lastBlockTimestamp']),
+            date('r', $aDetails['lastBlockTimestamp']),

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