OpencachingDeutschland / oc-server3

htdocs/okapi/controller.php

Spacing +6 added lines, -6 removed lines

@@ -17,9 +17,9 @@ 
 
 $GLOBALS['rootpath'] = '../'; # this is for OC-code compatibility
 
-require_once($GLOBALS['rootpath'].'okapi/core.php');
+require_once($GLOBALS['rootpath'] . 'okapi/core.php');
 OkapiErrorHandler::$treat_notices_as_errors = true;
-require_once($GLOBALS['rootpath'].'okapi/urls.php');
+require_once($GLOBALS['rootpath'] . 'okapi/urls.php');
 
 if (ob_list_handlers() == array('default output handler'))
 {
@@ -72,9 +72,9 @@ 
                     # Pattern matched! Moving on to the proper View...
 
                     array_shift($matches);
-                    require_once($GLOBALS['rootpath']."okapi/views/$namespace.php");
-                    $response = call_user_func_array(array('\\okapi\\views\\'.
-                        str_replace('/', '\\', $namespace).'\\View', 'call'), $matches);
+                    require_once($GLOBALS['rootpath'] . "okapi/views/$namespace.php");
+                    $response = call_user_func_array(array('\\okapi\\views\\' .
+                        str_replace('/', '\\', $namespace) . '\\View', 'call'), $matches);
                     if ($response)
                         $response->display();
                     return;
@@ -88,7 +88,7 @@ 
 
         # None of the patterns matched OR method threw the Http404 exception.
 
-        require_once($GLOBALS['rootpath']."okapi/views/http404.php");
+        require_once($GLOBALS['rootpath'] . "okapi/views/http404.php");
         $response = \okapi\views\http404\View::call();
         $response->display();
     }

htdocs/okapi/views/update.php

Spacing +22 added lines, -22 removed lines

@@ -19,7 +19,7 @@ 
 use okapi\cronjobs\CronJobController;
 use okapi\services\replicate\ReplicateCommon;
 
-require_once($GLOBALS['rootpath']."okapi/cronjobs.php");
+require_once($GLOBALS['rootpath'] . "okapi/cronjobs.php");
 
 class View
 {
@@ -93,7 +93,7 @@ 
         self::out("Current OKAPI database version: $current_ver\n");
         if ($current_ver == 0 && ((!isset($_GET['install'])) || ($_GET['install'] != 'true')))
         {
-            self::out("Current OKAPI settings are:\n\n".Settings::describe_settings()."\n\n".
+            self::out("Current OKAPI settings are:\n\n" . Settings::describe_settings() . "\n\n" .
                 "Make sure they are correct, then append '?install=true' to your query.");
             try
             {
@@ -102,10 +102,10 @@ 
             catch (Exception $e)
             {
                 self::out(
-                    "\n\n".
-                    "IMPORTANT: If you're trying to install OKAPI on an empty database then\n".
-                    "you will fail. OKAPI is not a standalone application, it is a plugin\n".
-                    "for Opencaching sites. Please read this:\n\n".
+                    "\n\n" .
+                    "IMPORTANT: If you're trying to install OKAPI on an empty database then\n" .
+                    "you will fail. OKAPI is not a standalone application, it is a plugin\n" .
+                    "for Opencaching sites. Please read this:\n\n" .
                     "https://github.com/opencaching/okapi/issues/299"
                 );
             }
@@ -126,7 +126,7 @@ 
                 $version_to_apply = $current_ver + 1;
                 self::out("Applying mutation #$version_to_apply...");
                 try {
-                    call_user_func(array(__CLASS__, "ver".$version_to_apply));
+                    call_user_func(array(__CLASS__, "ver" . $version_to_apply));
                     self::out(" OK!\n");
                     Okapi::set_var('db_version', $version_to_apply);
                     $current_ver += 1;
@@ -160,8 +160,8 @@ 
                 okapi_stats_hourly sh
             where
                 sh.consumer_key = c.`key`
-                and sh.service_name in ('".implode("','", array_map('\okapi\Db::escape_string', $service_names))."')
-                ".(($days != null) ? "and sh.period_start > date_add(now(), interval '".Db::escape_string(-$days)."' day)" : "")."
+                and sh.service_name in ('".implode("','", array_map('\okapi\Db::escape_string', $service_names)) . "')
+                ".(($days != null) ? "and sh.period_start > date_add(now(), interval '" . Db::escape_string(-$days) . "' day)" : "") . "
         ");
     }
 
@@ -363,12 +363,12 @@ 
         # Inform the admin about the new cronjobs.
         Okapi::mail_admins(
             "Additional setup needed: cronjobs support",
-            "Hello there, you've just updated OKAPI on your server. Thanks!\n\n".
-            "We need you to do one more thing. This version of OKAPI requires\n".
-            "additional crontab entry. Please add the following line to your crontab:\n\n".
-            "*/5 * * * * wget -O - -q -t 1 ".Settings::get('SITE_URL')."okapi/cron5\n\n".
-            "This is required for OKAPI to function properly from now on.\n\n".
-            "-- \n".
+            "Hello there, you've just updated OKAPI on your server. Thanks!\n\n" .
+            "We need you to do one more thing. This version of OKAPI requires\n" .
+            "additional crontab entry. Please add the following line to your crontab:\n\n" .
+            "*/5 * * * * wget -O - -q -t 1 " . Settings::get('SITE_URL') . "okapi/cron5\n\n" .
+            "This is required for OKAPI to function properly from now on.\n\n" .
+            "-- \n" .
             "Thanks, OKAPI developers."
         );
     }
@@ -609,9 +609,9 @@ 
     {
         # Remove unused locks (these might have been created in previous versions of OKAPI).
 
-        for ($z=0; $z<=2; $z++)
-            for ($x=0; $x<(1<<$z); $x++)
-                for ($y=0; $y<(1<<$z); $y++)
+        for ($z = 0; $z <= 2; $z++)
+            for ($x = 0; $x < (1 << $z); $x++)
+                for ($y = 0; $y < (1 << $z); $y++)
                 {
                     $lockname = "tile-computation-$z-$x-$y";
                     if (OkapiLock::exists($lockname))
@@ -623,7 +623,7 @@ 
     {
         # Once again, remove unused locks.
 
-        for ($z=0; $z<=21; $z++)
+        for ($z = 0; $z <= 21; $z++)
         {
             foreach (array("", "-0", "-1") as $suffix)
             {
@@ -698,10 +698,10 @@ 
         # Ignore newly added replicate fields. This way we will avoid generating
         # changelog entries for these fields.
 
-        require_once($GLOBALS['rootpath']."okapi/services/replicate/replicate_common.inc.php");
+        require_once($GLOBALS['rootpath'] . "okapi/services/replicate/replicate_common.inc.php");
         $new_geocache_fields = array(
             'attr_acodes', 'willattends', 'country', 'state', 'preview_image',
-            'trip_time', 'trip_distance', 'gc_code',  'hints2', 'protection_areas'
+            'trip_time', 'trip_distance', 'gc_code', 'hints2', 'protection_areas'
         );
         ReplicateCommon::verify_clog_consistency(true, $new_geocache_fields);
     }
@@ -742,7 +742,7 @@ 
             ) ENGINE=MyISAM DEFAULT CHARSET=utf8
             (
                 SELECT
-                    ".Okapi::OBJECT_TYPE_CACHE_LOG." object_type,
+                    ".Okapi::OBJECT_TYPE_CACHE_LOG . " object_type,
                     log_id object_id,
                     consumer_key
                 FROM okapi_cache_logs

htdocs/okapi/views/changelog_helper.inc.php

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
                     throw new ErrorException();
                 }
                 Cache::set($cache_key, $changes_xml, 3600);
-                Cache::set($cache_backup_key, $changes_xml, 3600*24*30);
+                Cache::set($cache_backup_key, $changes_xml, 3600 * 24 * 30);
             }
             catch (Exception $e)
             {
@@ -51,7 +51,7 @@ 
 
                 $changes_xml = Cache::get($cache_backup_key);
                 if ($changes_xml) {
-                    Cache::set($cache_key, $changes_xml, 3600*12);
+                    Cache::set($cache_key, $changes_xml, 3600 * 12);
                 }
             }
         }

htdocs/okapi/views/devel/cronreport.php

Spacing +9 added lines, -9 removed lines

@@ -26,13 +26,13 @@ 
         $response->content_type = "text/plain; charset=utf-8";
         ob_start();
 
-        require_once($GLOBALS['rootpath']."okapi/cronjobs.php");
+        require_once($GLOBALS['rootpath'] . "okapi/cronjobs.php");
         $schedule = Cache::get("cron_schedule");
         if ($schedule == null)
             $schedule = array();
         print "Nearest event: ";
         if (Okapi::get_var('cron_nearest_event'))
-            print "in ".(Okapi::get_var('cron_nearest_event') - time())." seconds.\n\n";
+            print "in " . (Okapi::get_var('cron_nearest_event') - time()) . " seconds.\n\n";
         else
             print "NOT SET\n\n";
         $cronjobs = CronJobController::get_enabled_cronjobs();
@@ -43,27 +43,27 @@ 
                 return $by_type;
             return $cmp($a->get_name(), $b->get_name());
         });
-        print str_pad("TYPE", 11)."  ".str_pad("NAME", 40)."  SCHEDULE\n";
-        print str_pad("----", 11)."  ".str_pad("----", 40)."  --------\n";
+        print str_pad("TYPE", 11) . "  " . str_pad("NAME", 40) . "  SCHEDULE\n";
+        print str_pad("----", 11) . "  " . str_pad("----", 40) . "  --------\n";
         foreach ($cronjobs as $cronjob)
         {
             $type = $cronjob->get_type();
             $name = $cronjob->get_name();
-            print str_pad($type, 11)."  ".str_pad($name, 40)."  ";
+            print str_pad($type, 11) . "  " . str_pad($name, 40) . "  ";
             if (!isset($schedule[$name]))
                 print "NOT YET SCHEDULED\n";
             elseif ($schedule[$name] <= time())
-                print "DELAYED: should be run ".(time() - $schedule[$name])." seconds ago\n";
+                print "DELAYED: should be run " . (time() - $schedule[$name]) . " seconds ago\n";
             else
-                print "scheduled to run in ".str_pad($schedule[$name] - time(), 6, " ", STR_PAD_LEFT)." seconds\n";
+                print "scheduled to run in " . str_pad($schedule[$name] - time(), 6, " ", STR_PAD_LEFT) . " seconds\n";
         }
         print "\n";
         print "Crontab last ping: ";
         if (Cache::get('crontab_last_ping'))
-            print (time() - Cache::get('crontab_last_ping'))." seconds ago";
+            print (time() - Cache::get('crontab_last_ping')) . " seconds ago";
         else
             print "NEVER";
-        print " (crontab_check_counter: ".Cache::get('crontab_check_counter').").\n";
+        print " (crontab_check_counter: " . Cache::get('crontab_check_counter') . ").\n";
         print "clog_revisions_daily: ";
         if (Cache::get('clog_revisions_daily'))
         {

htdocs/okapi/views/devel/tilereport.php

Spacing +21 added lines, -21 removed lines

@@ -21,7 +21,7 @@ 
     {
         # Flush the stats, so the page is fresh upon every request.
 
-        require_once($GLOBALS['rootpath']."okapi/cronjobs.php");
+        require_once($GLOBALS['rootpath'] . "okapi/cronjobs.php");
         CronJobController::force_run("StatsWriterCronJob");
 
         # When services/caches/map/tile method is called, it writes some extra
@@ -33,7 +33,7 @@ 
         ob_start();
 
         $start = isset($_GET['start']) ? $_GET['start'] : date(
-            "Y-m-d 00:00:00", time() - 7*86400);
+            "Y-m-d 00:00:00", time() - 7 * 86400);
         $end = isset($_GET['end']) ? $_GET['end'] : date("Y-m-d 23:59:59");
 
         print "From: $start\n";
@@ -46,8 +46,8 @@ 
                 sum(total_runtime)
             from okapi_stats_hourly
             where
-                period_start >= '".Db::escape_string($start)."'
-                and period_start < '".Db::escape_string($end)."'
+                period_start >= '".Db::escape_string($start) . "'
+                and period_start < '".Db::escape_string($end) . "'
                 and service_name like '%caches/map/tile%'
             group by service_name
         ");
@@ -72,7 +72,7 @@ 
         }
         if ($total_calls != $calls['A'])
         {
-            print "Partial results. Only ".$calls['A']." out of $total_calls are covered.\n";
+            print "Partial results. Only " . $calls['A'] . " out of $total_calls are covered.\n";
             print "All other will count as \"unaccounted for\".\n\n";
             $total_calls = $calls['A'];
         }
@@ -80,37 +80,37 @@ 
         $calls_left = $total_calls;
         $runtime_left = $total_runtime;
 
-        $perc = function($a, $b) { return ($b > 0) ? sprintf("%.1f", 100 * $a / $b)."%" : "(?)"; };
-        $avg = function($a, $b) { return ($b > 0) ? sprintf("%.4f", $a / $b)."s" : "(?)"; };
+        $perc = function($a, $b) { return ($b > 0) ? sprintf("%.1f", 100 * $a / $b) . "%" : "(?)"; };
+        $avg = function($a, $b) { return ($b > 0) ? sprintf("%.4f", $a / $b) . "s" : "(?)"; };
         $get_stats = function() use (&$calls_left, &$runtime_left, &$total_calls, &$total_runtime, &$perc)
         {
             return (
-                str_pad($perc($calls_left, $total_calls), 6, " ", STR_PAD_LEFT).
+                str_pad($perc($calls_left, $total_calls), 6, " ", STR_PAD_LEFT) .
                 str_pad($perc($runtime_left, $total_runtime), 7, " ", STR_PAD_LEFT)
             );
         };
 
         print "%CALLS  %TIME  Description\n";
         print "====== ======  ======================================================================\n";
-        print $get_stats()."  $total_calls responses served. Total runtime: ".sprintf("%.2f", $total_runtime)."s\n";
+        print $get_stats() . "  $total_calls responses served. Total runtime: " . sprintf("%.2f", $total_runtime) . "s\n";
         print "\n";
         print "               All of these requests needed a TileTree build/lookup. The average runtime of\n";
-        print "               these lookups was ".$avg($runtime['A'], $total_calls).". ".$perc($runtime['A'], $total_runtime)." of total runtime was spent here.\n";
+        print "               these lookups was " . $avg($runtime['A'], $total_calls) . ". " . $perc($runtime['A'], $total_runtime) . " of total runtime was spent here.\n";
         print "\n";
 
         $runtime_left -= $runtime['A'];
 
-        print $get_stats()."  All calls passed here after ~".$avg($runtime['A'], $total_calls)."\n";
+        print $get_stats() . "  All calls passed here after ~" . $avg($runtime['A'], $total_calls) . "\n";
 
         print "\n";
         print "               Lookup result was then processed and \"image description\" was created. It was\n";
         print "               passed on to the TileRenderer to compute the ETag hash string. The average runtime\n";
-        print "               of this part was ".$avg($runtime['B'], $total_calls).". ".$perc($runtime['B'], $total_runtime)." of total runtime was spent here.\n";
+        print "               of this part was " . $avg($runtime['B'], $total_calls) . ". " . $perc($runtime['B'], $total_runtime) . " of total runtime was spent here.\n";
         print "\n";
 
         $runtime_left -= $runtime['B'];
 
-        print $get_stats()."  All calls passed here after ~".$avg($runtime['A'] + $runtime['B'], $total_calls)."\n";
+        print $get_stats() . "  All calls passed here after ~" . $avg($runtime['A'] + $runtime['B'], $total_calls) . "\n";
 
         $etag_hits = $calls['B'] - $calls['C'];
 
@@ -120,29 +120,29 @@ 
 
         $calls_left = $calls['C'];
 
-        print $get_stats()."  $calls_left calls passed here after ~".$avg($runtime['A'] + $runtime['B'], $total_calls)."\n";
+        print $get_stats() . "  $calls_left calls passed here after ~" . $avg($runtime['A'] + $runtime['B'], $total_calls) . "\n";
 
         $imagecache_hits = $calls['C'] - $calls['D'];
 
         print "\n";
         print "               $imagecache_hits of these calls hit the server image cache.\n";
-        print "               ".$perc($runtime['C'], $total_runtime)." of total runtime was spent to find these.\n";
+        print "               " . $perc($runtime['C'], $total_runtime) . " of total runtime was spent to find these.\n";
         print "\n";
 
         $calls_left = $calls['D'];
         $runtime_left -= $runtime['C'];
 
-        print $get_stats()."  $calls_left calls passed here after ~".$avg($runtime['A'] + $runtime['B'] + $runtime['C'], $total_calls)."\n";
+        print $get_stats() . "  $calls_left calls passed here after ~" . $avg($runtime['A'] + $runtime['B'] + $runtime['C'], $total_calls) . "\n";
         print "\n";
         print "               These calls required the tile to be rendered. On average, it took\n";
-        print "               ".$avg($runtime['D'], $calls['D'])." to *render* a tile.\n";
-        print "               ".$perc($runtime['D'], $total_runtime)." of total runtime was spent here.\n";
+        print "               " . $avg($runtime['D'], $calls['D']) . " to *render* a tile.\n";
+        print "               " . $perc($runtime['D'], $total_runtime) . " of total runtime was spent here.\n";
         print "\n";
 
         $runtime_left -= $runtime['D'];
 
-        print $perc($runtime_left, $total_runtime)." of runtime was unaccounted for (other processing).\n";
-        print "Average response time was ".$avg($total_runtime, $total_calls).".\n\n";
+        print $perc($runtime_left, $total_runtime) . " of runtime was unaccounted for (other processing).\n";
+        print "Average response time was " . $avg($total_runtime, $total_calls) . ".\n\n";
 
         print "Current okapi_cache score distribution:\n";
         $rs = Db::query("
@@ -153,7 +153,7 @@ 
         ");
         while (list($log2, $count, $size) = Db::fetch_row($rs))
         {
-            print $count." elements ($size bytes) with score between ".pow(2, $log2)." and ".pow(2, $log2 + 1).".\n";
+            print $count . " elements ($size bytes) with score between " . pow(2, $log2) . " and " . pow(2, $log2 + 1) . ".\n";
         }
 
         $response->body = ob_get_clean();

htdocs/okapi/views/devel/attrlist.php

Spacing +6 added lines, -6 removed lines

@@ -34,12 +34,12 @@ 
             print "$id: $name\n";
 
         print "\nAttributes:\n\n";
-        require_once($GLOBALS['rootpath'].'okapi/services/attrs/attr_helper.inc.php');
+        require_once($GLOBALS['rootpath'] . 'okapi/services/attrs/attr_helper.inc.php');
         $internal2acode = AttrHelper::get_internal_id_to_acode_mapping();
         $dict = self::get_all_attribute_names();
         foreach ($dict as $internal_id => $langs)
         {
-            print $internal_id.": ";
+            print $internal_id . ": ";
             $langkeys = array_keys($langs);
             sort($langkeys);
             if (in_array('en', $langkeys))
@@ -47,12 +47,12 @@ 
             else
                 print ">>>> ENGLISH NAME UNSET! <<<<";
             if (isset($internal2acode[$internal_id]))
-                print " - ".$internal2acode[$internal_id];
+                print " - " . $internal2acode[$internal_id];
             else
                 print " - >>>> MISSING A-CODE MAPPING <<<<";
             print "\n";
             foreach ($langkeys as $langkey)
-                print "        $langkey: ".$langs[$langkey]."\n";
+                print "        $langkey: " . $langs[$langkey] . "\n";
         }
 
         print "\nAttribute notices:\n\n";
@@ -64,7 +64,7 @@ 
         {
             if (!isset($internal2acode[$internal_id]))
             {
-                print "(!) Attribute ".$internal_id." is not mapped to any A-code.\n";
+                print "(!) Attribute " . $internal_id . " is not mapped to any A-code.\n";
                 continue;
             }
             $acode = $internal2acode[$internal_id];
@@ -86,7 +86,7 @@ 
                 {
                     print "( ) Attribute $acode has a different name in the '$lang' language\n";
                     print "    Local name: $value\n";
-                    print "    OKAPI name: ".$attr['names'][$lang]."\n";
+                    print "    OKAPI name: " . $attr['names'][$lang] . "\n";
                 }
             }
         }

htdocs/okapi/views/devel/dbstruct.php

Spacing +21 added lines, -21 removed lines

@@ -39,12 +39,12 @@ 
 
         ini_set('memory_limit', '16M');
         $shell_arguments = "mysqldump --no-data -h$dbserver -u$user -p$password $dbname";
-        if (!strpos($shell_arguments,"--no-data"))
+        if (!strpos($shell_arguments, "--no-data"))
             throw new Exception("wrong database dump arguments");
         $struct = shell_exec($shell_arguments);
         if (strlen($struct) > 1000000)
             throw new Exception("something went terribly wrong while dumping table structures");
-        if (stripos($struct,"dumping data") !== FALSE)
+        if (stripos($struct, "dumping data") !== FALSE)
             throw new Exception("something went terribly wrong while dumping table structures");
 
         # Remove the "AUTO_INCREMENT=..." values. They break the diffs.
@@ -74,30 +74,30 @@ 
                 try {
                     $alternate_struct = @file_get_contents($_GET['compare_to']);
                 } catch (Exception $e) {
-                    throw new BadRequest("Failed to load ".$_GET['compare_to']);
+                    throw new BadRequest("Failed to load " . $_GET['compare_to']);
                 }
                 $response->body =
-                    "-- Automatically generated database diff. Use with caution!\n".
-                    "-- Differences obtained with help of cool library by Kirill Gerasimenko.\n\n".
-                    "-- Note: The following script has some limitations. It will render database\n".
-                    "-- structure compatible, but not necessarilly EXACTLY the same. It might be\n".
+                    "-- Automatically generated database diff. Use with caution!\n" .
+                    "-- Differences obtained with help of cool library by Kirill Gerasimenko.\n\n" .
+                    "-- Note: The following script has some limitations. It will render database\n" .
+                    "-- structure compatible, but not necessarilly EXACTLY the same. It might be\n" .
                     "-- better to use manual diff instead.\n\n";
                 require_once("comparator.inc.php");
                 $updater = new \dbStructUpdater();
                 if (isset($_GET['reverse']) && ($_GET['reverse'] == 'true'))
                 {
                     $response->body .=
-                        "-- REVERSE MODE. The following will alter [2], so that it has the structure of [1].\n".
-                        "-- 1. ".Settings::get('SITE_URL')."okapi/devel/dbstruct (".md5($struct).")\n".
-                        "-- 2. ".$_GET['compare_to']." (".md5($alternate_struct).")\n\n";
+                        "-- REVERSE MODE. The following will alter [2], so that it has the structure of [1].\n" .
+                        "-- 1. " . Settings::get('SITE_URL') . "okapi/devel/dbstruct (" . md5($struct) . ")\n" .
+                        "-- 2. " . $_GET['compare_to'] . " (" . md5($alternate_struct) . ")\n\n";
                     $alters = $updater->getUpdates($alternate_struct, $struct);
                 }
                 else
                 {
                     $response->body .=
-                        "-- The following will alter [1], so that it has the structure of [2].\n".
-                        "-- 1. ".Settings::get('SITE_URL')."okapi/devel/dbstruct (".md5($struct).")\n".
-                        "-- 2. ".$_GET['compare_to']." (".md5($alternate_struct).")\n\n";
+                        "-- The following will alter [1], so that it has the structure of [2].\n" .
+                        "-- 1. " . Settings::get('SITE_URL') . "okapi/devel/dbstruct (" . md5($struct) . ")\n" .
+                        "-- 2. " . $_GET['compare_to'] . " (" . md5($alternate_struct) . ")\n\n";
                     $alters = $updater->getUpdates($struct, $alternate_struct);
                 }
                 # Add semicolons
@@ -110,12 +110,12 @@ 
                     if (strpos($alter_ref, "okapi_") !== false)
                     {
                         $lines = explode("\n", $alter_ref);
-                        $alter_ref = "-- Probably you should NOT execute this one. Use okapi/update instead.\n-- {{{\n--   ".
-                            implode("\n--   ", $lines)."\n-- }}}";
+                        $alter_ref = "-- Probably you should NOT execute this one. Use okapi/update instead.\n-- {{{\n--   " .
+                            implode("\n--   ", $lines) . "\n-- }}}";
                     }
                 }
                 if (count($alters) > 0)
-                    $response->body .= implode("\n", $alters)."\n";
+                    $response->body .= implode("\n", $alters) . "\n";
                 else
                     $response->body .= "-- No differences found\n";
             }
@@ -136,7 +136,7 @@ 
      */
     private static function requireSafe($url)
     {
-        require_once($GLOBALS['rootpath'].'okapi/service_runner.php');
+        require_once($GLOBALS['rootpath'] . 'okapi/service_runner.php');
         $installations = OkapiServiceRunner::call(
             "services/apisrv/installations",
             new OkapiInternalRequest(
@@ -145,16 +145,16 @@ 
         );
         $allowed = array();
         foreach ($installations as $i) {
-            $allowed_url = $i['okapi_base_url']."devel/dbstruct";
+            $allowed_url = $i['okapi_base_url'] . "devel/dbstruct";
             $allowed[] = $allowed_url;
             if ($url == $allowed_url) {
                 return;
             }
         }
         throw new BadRequest(
-            "The following URL is not on our whitelist: \"".$url."\".\n\n".
-            "Please use one of the following:\n".
-            "\"".implode("\",\n\"", $allowed)."\"."
+            "The following URL is not on our whitelist: \"" . $url . "\".\n\n" .
+            "Please use one of the following:\n" .
+            "\"" . implode("\",\n\"", $allowed) . "\"."
         );
     }
 }

htdocs/okapi/views/devel/clogentry.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
         $tmp = Db::select_value("
             select data
             from okapi_clog
-            where id='".Db::escape_string($_GET['id'])."'
+            where id='".Db::escape_string($_GET['id']) . "'
         ");
         $data = unserialize(gzinflate($tmp));
 

htdocs/okapi/views/devel/comparator.inc.php

Spacing +84 added lines, -84 removed lines

@@ -52,9 +52,9 @@ 
 */
 class dbStructUpdater
 {
-    var $sourceStruct = '';//structure dump of the reference database
-    var $destStruct = '';//structure dump of database to update
-    var $config = array();//updater configuration
+    var $sourceStruct = ''; //structure dump of the reference database
+    var $destStruct = ''; //structure dump of database to update
+    var $config = array(); //updater configuration
 
     /**
     * Constructor
@@ -85,7 +85,7 @@ 
     * merges current updater config with the given one
     * @param assoc_array $config new configuration values
     */
-    function setConfig($config=array())
+    function setConfig($config = array())
     {
         if (is_array($config))
         {
@@ -101,9 +101,9 @@ 
     * @param bool $asString if true - result will be a string, otherwise - array
     * @return array|string update sql statements - in array or string (separated with ';')
     */
-    function getUpdates($source, $dest, $asString=false)
+    function getUpdates($source, $dest, $asString = false)
     {
-        $result = $asString?'':array();
+        $result = $asString ? '' : array();
         $compRes = $this->compare($source, $dest);
         if (empty($compRes))
         {
@@ -117,7 +117,7 @@ 
         $result = $this->getDiffSql($compRes);
         if ($asString)
         {
-            $result = implode(";\r\n", $result).';';
+            $result = implode(";\r\n", $result) . ';';
         }
         return $result;
     }
@@ -138,7 +138,7 @@ 
         }
         $allowedActions = array('create', 'drop', 'add', 'remove', 'modify');
         $updateActions = array_intersect($updateActions, $allowedActions);
-        foreach($compRes as $table=>$info)
+        foreach ($compRes as $table=>$info)
         {
             if ($info['sourceOrphan'])
             {
@@ -154,7 +154,7 @@ 
                     $result[$table] = $info;
                 }
             }
-            elseif($info['differs'])
+            elseif ($info['differs'])
             {
                 $resultInfo = $info;
                 unset($resultInfo['differs']);
@@ -168,7 +168,7 @@ 
                     {
                         $resultInfo['differs'][] = $diff;
                     }
-                    elseif(in_array('modify', $updateActions))
+                    elseif (in_array('modify', $updateActions))
                     {
                         $resultInfo['differs'][] = $diff;
                     }
@@ -193,7 +193,7 @@ 
             return false;
         }
         $result = array('sourceOrphans'=>array(), 'destOrphans'=>array(), 'different'=>array());
-        foreach($compRes as $table=>$info)
+        foreach ($compRes as $table=>$info)
         {
             if ($info['sourceOrphan'])
             {
@@ -242,7 +242,7 @@ 
         foreach ($all as $tab)
         {
             $info = array('destOrphan'=>false, 'sourceOrphan'=>false, 'differs'=>false);
-            if(in_array($tab, $destOrphans))
+            if (in_array($tab, $destOrphans))
             {
                 $info['destOrphan'] = true;
             }
@@ -255,16 +255,16 @@ 
                 $destSql = $this->getTabSql($this->destStruct, $tab, true);
                 $sourceSql = $this->getTabSql($this->sourceStruct, $tab, true);
                 $diffs = $this->compareSql($sourceSql, $destSql);
-                if ($diffs===false)
+                if ($diffs === false)
                 {
-                    trigger_error('[WARNING] error parsing definition of table "'.$tab.'" - skipped');
+                    trigger_error('[WARNING] error parsing definition of table "' . $tab . '" - skipped');
                     continue;
                 }
                 elseif (!empty($diffs))//not empty array
                 {
                     $info['differs'] = $diffs;
                 }
-                else continue;//empty array
+                else continue; //empty array
             }
             $result[$tab] = $info;
         }
@@ -281,7 +281,7 @@ 
         $result = array();
         if (preg_match_all('/CREATE(?:\s*TEMPORARY)?\s*TABLE\s*(?:IF NOT EXISTS\s*)?(?:`?(\w+)`?\.)?`?(\w+)`?/i', $struct, $m))
         {
-            foreach($m[2] as $match)//m[1] is a database name if any
+            foreach ($m[2] as $match)//m[1] is a database name if any
             {
                 $result[] = $match;
             }
@@ -297,17 +297,17 @@ 
     * @param bool $removeDatabase - either to remove database name in "CREATE TABLE database.tab"-like declarations
     * @return string table structure definition
     */
-    function getTabSql($struct, $tab, $removeDatabase=true)
+    function getTabSql($struct, $tab, $removeDatabase = true)
     {
         $result = '';
         /* create table should be single line in this case*/
         //1 - part before database, 2-database name, 3 - part after database
-        if (preg_match('/(CREATE(?:\s*TEMPORARY)?\s*TABLE\s*(?:IF NOT EXISTS\s*)?)(?:`?(\w+)`?\.)?(`?('.$tab.')`?(\W|$))/i', $struct, $m, PREG_OFFSET_CAPTURE))
+        if (preg_match('/(CREATE(?:\s*TEMPORARY)?\s*TABLE\s*(?:IF NOT EXISTS\s*)?)(?:`?(\w+)`?\.)?(`?(' . $tab . ')`?(\W|$))/i', $struct, $m, PREG_OFFSET_CAPTURE))
         {
             $tableDef = $m[0][0];
             $start = $m[0][1];
             $database = $m[2][0];
-            $offset = $start+strlen($m[0][0]);
+            $offset = $start + strlen($m[0][0]);
             $end = $this->getDelimPos($struct, $offset);
             if ($end === false)
             {
@@ -315,13 +315,13 @@ 
             }
             else
             {
-                $result = substr($struct, $start, $end-$start);//already without ';'
+                $result = substr($struct, $start, $end - $start); //already without ';'
             }
         }
         $result = trim($result);
         if ($database && $removeDatabase)
         {
-            $result = str_replace($tableDef, $m[1][0].$m[3][0], $result);
+            $result = str_replace($tableDef, $m[1][0] . $m[3][0], $result);
         }
         return $result;
     }
@@ -335,27 +335,27 @@ 
         $result = array();
         //find opening bracket, get the prefix along with it
         $openBracketPos = $this->getDelimPos($sql, 0, '(');
-        if ($openBracketPos===false)
+        if ($openBracketPos === false)
         {
             trigger_error('[WARNING] can not find opening bracket in table definition');
             return false;
         }
-        $prefix = substr($sql, 0, $openBracketPos+1);//prefix can not be empty, so do not check it, just trim
+        $prefix = substr($sql, 0, $openBracketPos + 1); //prefix can not be empty, so do not check it, just trim
         $result[] = trim($prefix);
-        $body = substr($sql, strlen($prefix));//fields, indexes and part after closing bracket
+        $body = substr($sql, strlen($prefix)); //fields, indexes and part after closing bracket
         //split by commas, get part by part
-        while(($commaPos = $this->getDelimPos($body, 0, ',', true))!==false)
+        while (($commaPos = $this->getDelimPos($body, 0, ',', true)) !== false)
         {
-            $part = trim(substr($body, 0, $commaPos+1));//read another part and shorten $body
+            $part = trim(substr($body, 0, $commaPos + 1)); //read another part and shorten $body
             if ($part)
             {
                 $result[] = $part;
             }
-            $body = substr($body, $commaPos+1);
+            $body = substr($body, $commaPos + 1);
         }
         //here we have last field (or index) definition + part after closing bracket (ENGINE, ect)
         $closeBracketPos = $this->getDelimRpos($body, 0, ')');
-        if ($closeBracketPos===false)
+        if ($closeBracketPos === false)
         {
             trigger_error('[WARNING] can not find closing bracket in table definition');
             return false;
@@ -389,27 +389,27 @@ 
     {
         $result = array();
         //split with comma delimiter, not line breaks
-        $sourceParts =  $this->splitTabSql($sourceSql);
-        if ($sourceParts===false)//error parsing sql
+        $sourceParts = $this->splitTabSql($sourceSql);
+        if ($sourceParts === false)//error parsing sql
         {
             trigger_error('[WARNING] error parsing source sql');
             return false;
         }
         $destParts = $this->splitTabSql($destSql);
-        if ($destParts===false)
+        if ($destParts === false)
         {
             trigger_error('[WARNING] error parsing destination sql');
             return false;
         }
         $sourcePartsIndexed = array();
         $destPartsIndexed = array();
-        foreach($sourceParts as $line)
+        foreach ($sourceParts as $line)
         {
             $lineInfo = $this->processLine($line);
             if (!$lineInfo) continue;
             $sourcePartsIndexed[$lineInfo['key']] = $lineInfo['line'];
         }
-        foreach($destParts as $line)
+        foreach ($destParts as $line)
         {
             $lineInfo = $this->processLine($line);
             if (!$lineInfo) continue;
@@ -418,16 +418,16 @@ 
         $sourceKeys = array_keys($sourcePartsIndexed);
         $destKeys = array_keys($destPartsIndexed);
         $all = array_unique(array_merge($sourceKeys, $destKeys));
-        sort($all);//fields first, then indexes - because fields are prefixed with '!'
+        sort($all); //fields first, then indexes - because fields are prefixed with '!'
 
         foreach ($all as $key)
         {
             $info = array('source'=>'', 'dest'=>'');
-            $inSource= in_array($key, $sourceKeys);
-            $inDest= in_array($key, $destKeys);
+            $inSource = in_array($key, $sourceKeys);
+            $inDest = in_array($key, $destKeys);
             $sourceOrphan = $inSource && !$inDest;
             $destOrphan = $inDest && !$inSource;
-            $different =  $inSource && $inDest &&
+            $different = $inSource && $inDest &&
             strcasecmp($this->normalizeString($destPartsIndexed[$key]), $this->normalizeString($sourcePartsIndexed[$key]));
             if ($sourceOrphan)
             {
@@ -472,11 +472,11 @@ 
         }
         elseif (preg_match('/^`?\w+`?/i', $line, $m))//field definition
         {
-            $key = '!'.$m[0];//to make sure fields will be synchronised before the keys
+            $key = '!' . $m[0]; //to make sure fields will be synchronised before the keys
         }
         else
         {
-            return false;//line has no valuable info (empty or comment)
+            return false; //line has no valuable info (empty or comment)
         }
         //$key = str_replace('`', '', $key);
         if (!empty($options['varcharDefaultIgnore']))
@@ -492,7 +492,7 @@ 
             $line = preg_replace("/ AUTO_INCREMENT=[0-9]+/i", '', $line);
         }
         $result['key'] = $this->normalizeString($key);
-        $result['line']= $line;
+        $result['line'] = $line;
         return $result;
     }
 
@@ -512,11 +512,11 @@ 
         {
             return $sqls;
         }
-        foreach($diff as $tab=>$info)
+        foreach ($diff as $tab=>$info)
         {
             if ($info['sourceOrphan'])//delete it
             {
-                $sqls[] = 'DROP TABLE `'.$tab.'`';
+                $sqls[] = 'DROP TABLE `' . $tab . '`';
             }
             elseif ($info['destOrphan'])//create destination table in source
             {
@@ -538,7 +538,7 @@ 
             }
             else
             {
-                foreach($info['differs'] as $finfo)
+                foreach ($info['differs'] as $finfo)
                 {
                     $inDest = !empty($finfo['dest']);
                     $inSource = !empty($finfo['source']);
@@ -575,53 +575,53 @@ 
     */
     function getActionSql($action, $tab, $sql)
     {
-        $result = 'ALTER TABLE `'.$tab.'` ';
+        $result = 'ALTER TABLE `' . $tab . '` ';
         $action = strtolower($action);
-        $keyField = '`?\w`?(?:\(\d+\))?';//matches `name`(10)
-        $keyFieldList = '(?:'.$keyField.'(?:,\s?)?)+';//matches `name`(10),`desc`(255)
-        if (preg_match('/((?:PRIMARY )|(?:UNIQUE )|(?:FULLTEXT ))?KEY `?(\w+)?`?\s(\('.$keyFieldList.'\))/i', $sql, $m))
+        $keyField = '`?\w`?(?:\(\d+\))?'; //matches `name`(10)
+        $keyFieldList = '(?:' . $keyField . '(?:,\s?)?)+'; //matches `name`(10),`desc`(255)
+        if (preg_match('/((?:PRIMARY )|(?:UNIQUE )|(?:FULLTEXT ))?KEY `?(\w+)?`?\s(\(' . $keyFieldList . '\))/i', $sql, $m))
         {   //key and index operations
             $type = strtolower(trim($m[1]));
             $name = trim($m[2]);
             $fields = trim($m[3]);
-            switch($action)
+            switch ($action)
             {
                 case 'drop':
-                    if ($type=='primary')
+                    if ($type == 'primary')
                     {
-                        $result.= 'DROP PRIMARY KEY';
+                        $result .= 'DROP PRIMARY KEY';
                     }
                     else
                     {
-                        $result.= 'DROP INDEX `'.$name.'`';
+                        $result .= 'DROP INDEX `' . $name . '`';
                     }
                 break;
                 case 'add':
-                    if ($type=='primary')
+                    if ($type == 'primary')
                     {
-                        $result.= 'ADD PRIMARY KEY '.$fields;
+                        $result .= 'ADD PRIMARY KEY ' . $fields;
                     }
-                    elseif ($type=='')
+                    elseif ($type == '')
                     {
-                        $result.= 'ADD INDEX `'.$name.'` '.$fields;
+                        $result .= 'ADD INDEX `' . $name . '` ' . $fields;
                     }
                     else
                     {
-                        $result .='ADD '.strtoupper($type).' `'.$name.'` '.$fields;//fulltext or unique
+                        $result .= 'ADD ' . strtoupper($type) . ' `' . $name . '` ' . $fields; //fulltext or unique
                     }
                 break;
                 case 'modify':
-                    if ($type=='primary')
+                    if ($type == 'primary')
                     {
-                        $result.='DROP PRIMARY KEY, ADD PRIMARY KEY '.$fields;
+                        $result .= 'DROP PRIMARY KEY, ADD PRIMARY KEY ' . $fields;
                     }
-                    elseif ($type=='')
+                    elseif ($type == '')
                     {
-                        $result.='DROP INDEX `'.$name.'`, ADD INDEX `'.$name.'` '.$fields;
+                        $result .= 'DROP INDEX `' . $name . '`, ADD INDEX `' . $name . '` ' . $fields;
                     }
                     else
                     {
-                        $result.='DROP INDEX `'.$name.'`, ADD '.strtoupper($type).' `'.$name.'` '.$fields;//fulltext or unique
+                        $result .= 'DROP INDEX `' . $name . '`, ADD ' . strtoupper($type) . ' `' . $name . '` ' . $fields; //fulltext or unique
                     }
                 break;
 
@@ -630,15 +630,15 @@ 
         else //fields operations
         {
             $sql = rtrim(trim($sql), ',');
-            $result.= strtoupper($action);
-            if ($action=='drop')
+            $result .= strtoupper($action);
+            if ($action == 'drop')
             {
                 $spacePos = strpos($sql, ' ');
-                $result.= ' '.substr($sql, 0, $spacePos);
+                $result .= ' ' . substr($sql, 0, $spacePos);
             }
             else
             {
-                $result.= ' '.$sql;
+                $result .= ' ' . $sql;
             }
         }
         return $result;
@@ -651,39 +651,39 @@ 
     * Handles escaped \" and \'. Also handles sql comments.
     * Actualy it is regex-based Finit State Machine (FSN)
     */
-    function getDelimPos($string, $offset=0, $delim=';', $skipInBrackets=false)
+    function getDelimPos($string, $offset = 0, $delim = ';', $skipInBrackets = false)
     {
         $stack = array();
-        $rbs = '\\\\';  //reg - escaped backslash
+        $rbs = '\\\\'; //reg - escaped backslash
         $regPrefix = "(?<!$rbs)(?:$rbs{2})*";
-        $reg = $regPrefix.'("|\')|(/\\*)|(\\*/)|(-- )|(\r\n|\r|\n)|';
+        $reg = $regPrefix . '("|\')|(/\\*)|(\\*/)|(-- )|(\r\n|\r|\n)|';
         if ($skipInBrackets)
         {
-            $reg.='(\(|\))|';
+            $reg .= '(\(|\))|';
         }
         else
         {
-            $reg.='()';
+            $reg .= '()';
         }
-        $reg .= '('.preg_quote($delim).')';
-        while (preg_match('%'.$reg.'%', $string, $m, PREG_OFFSET_CAPTURE, $offset))
+        $reg .= '(' . preg_quote($delim) . ')';
+        while (preg_match('%' . $reg . '%', $string, $m, PREG_OFFSET_CAPTURE, $offset))
         {
-            $offset = $m[0][1]+strlen($m[0][0]);
-            if (end($stack)=='/*')
+            $offset = $m[0][1] + strlen($m[0][0]);
+            if (end($stack) == '/*')
             {
                 if (!empty($m[3][0]))
                 {
                     array_pop($stack);
                 }
-                continue;//here we could also simplify regexp
+                continue; //here we could also simplify regexp
             }
-            if (end($stack)=='-- ')
+            if (end($stack) == '-- ')
             {
                 if (!empty($m[5][0]))
                 {
                     array_pop($stack);
                 }
-                continue;//here we could also simplify regexp
+                continue; //here we could also simplify regexp
             }
 
             if (!empty($m[7][0]))// ';' found
@@ -699,18 +699,18 @@ 
             }
             if (!empty($m[6][0]))// '(' or ')' found
             {
-                if (empty($stack) && $m[6][0]=='(')
+                if (empty($stack) && $m[6][0] == '(')
                 {
                     array_push($stack, $m[6][0]);
                 }
-                elseif($m[6][0]==')' && end($stack)=='(')
+                elseif ($m[6][0] == ')' && end($stack) == '(')
                 {
                     array_pop($stack);
                 }
             }
             elseif (!empty($m[1][0]))// ' or " found
             {
-                if (end($stack)==$m[1][0])
+                if (end($stack) == $m[1][0])
                 {
                     array_pop($stack);
                 }
@@ -735,22 +735,22 @@ 
     * works the same as getDelimPos except returns position of the first occurence of the delimiter starting from
     * the end of the string
     */
-    function getDelimRpos($string, $offset=0, $delim=';', $skipInBrackets=false)
+    function getDelimRpos($string, $offset = 0, $delim = ';', $skipInBrackets = false)
     {
         $pos = $this->getDelimPos($string, $offset, $delim, $skipInBrackets);
-        if ($pos===false)
+        if ($pos === false)
         {
             return false;
         }
         do
         {
-            $newPos=$this->getDelimPos($string, $pos+1, $delim, $skipInBrackets);
+            $newPos = $this->getDelimPos($string, $pos + 1, $delim, $skipInBrackets);
             if ($newPos !== false)
             {
                 $pos = $newPos;
             }
         }
-        while($newPos!==false);
+        while ($newPos !== false);
         return $pos;
     }