OpencachingDeutschland / oc-server3

htdocs/okapi/settings.php

Spacing +6 added lines, -6 removed lines

@@ -195,12 +195,12 @@ 
         /**
          * Maximum size of uploaded images in bytes
          */
-        'IMAGE_MAX_UPLOAD_SIZE' => 4194304,  # 4 MB
+        'IMAGE_MAX_UPLOAD_SIZE' => 4194304, # 4 MB
 
         /**
          * Maximum 'resolution' of saved images in pixels
          */
-        'IMAGE_MAX_PIXEL_COUNT' => 524288,  # 0.5 MP
+        'IMAGE_MAX_PIXEL_COUNT' => 524288, # 0.5 MP
 
         /**
          * Quality of saved JPEG images on a scale from 50 to 100. The higher the
@@ -229,12 +229,12 @@ 
             # We have to temporarilly disable our default error handler.
 
             OkapiErrorHandler::disable();
-            require_once($GLOBALS['rootpath']."okapi_settings.php");
+            require_once($GLOBALS['rootpath'] . "okapi_settings.php");
             $ref = get_okapi_settings();
             OkapiErrorHandler::reenable();
 
         } catch (Exception $e) {
-            throw new Exception("Could not import <rootpath>/okapi_settings.php:\n".$e->getMessage());
+            throw new Exception("Could not import <rootpath>/okapi_settings.php:\n" . $e->getMessage());
         }
         self::$SETTINGS = self::$DEFAULT_SETTINGS;
         foreach (self::$SETTINGS as $key => $_)
@@ -318,12 +318,12 @@ 
      */
     public static function default_gettext_init($langprefs)
     {
-        require_once($GLOBALS['rootpath']."okapi/locale/locales.php");
+        require_once($GLOBALS['rootpath'] . "okapi/locale/locales.php");
         $locale = Locales::get_best_locale($langprefs);
         putenv("LC_ALL=$locale");
         setlocale(LC_ALL, $locale);
         setlocale(LC_NUMERIC, "POSIX"); # We don't want *this one* to get out of control.
-        bindtextdomain("okapi_messages", $GLOBALS['rootpath'].'okapi/locale');
+        bindtextdomain("okapi_messages", $GLOBALS['rootpath'] . 'okapi/locale');
         return $locale;
     }
 

htdocs/okapi/oauth.php

Spacing +17 added lines, -17 removed lines

@@ -172,7 +172,7 @@ 
   public $key;
   public $secret;
 
-  function __construct($key, $secret, $callback_url=NULL) {
+  function __construct($key, $secret, $callback_url = NULL) {
     $this->key = $key;
     $this->secret = $secret;
     $this->callback_url = $callback_url;
@@ -403,9 +403,9 @@ 
   public static $version = '1.0';
   public static $POST_INPUT = 'php://input';
 
-  function __construct($http_method, $http_url, $parameters=NULL) {
+  function __construct($http_method, $http_url, $parameters = NULL) {
     $parameters = ($parameters) ? $parameters : array();
-    $parameters = array_merge( OAuthUtil::parse_parameters(parse_url($http_url, PHP_URL_QUERY)), $parameters);
+    $parameters = array_merge(OAuthUtil::parse_parameters(parse_url($http_url, PHP_URL_QUERY)), $parameters);
     $this->parameters = $parameters;
     $this->http_method = $http_method;
     $this->http_url = $http_url;
@@ -415,7 +415,7 @@ 
   /**
    * attempt to build up a request from what was passed to the server
    */
-  public static function from_request($http_method=NULL, $http_url=NULL, $parameters=NULL) {
+  public static function from_request($http_method = NULL, $http_url = NULL, $parameters = NULL) {
     $scheme = (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != "on")
               ? 'http'
               : 'https';
@@ -467,8 +467,8 @@ 
   /**
    * pretty much a helper function to set up the request
    */
-  public static function from_consumer_and_token($consumer, $token, $http_method, $http_url, $parameters=NULL) {
-    $parameters = ($parameters) ?  $parameters : array();
+  public static function from_consumer_and_token($consumer, $token, $http_method, $http_url, $parameters = NULL) {
+    $parameters = ($parameters) ? $parameters : array();
     $defaults = array("oauth_version" => OAuthRequest::$version,
                       "oauth_nonce" => OAuthRequest::generate_nonce(),
                       "oauth_timestamp" => OAuthRequest::generate_timestamp(),
@@ -577,7 +577,7 @@ 
     $post_data = $this->to_postdata();
     $out = $this->get_normalized_http_url();
     if ($post_data) {
-      $out .= '?'.$post_data;
+      $out .= '?' . $post_data;
     }
     return $out;
   }
@@ -592,9 +592,9 @@ 
   /**
    * builds the Authorization: header
    */
-  public function to_header($realm=null) {
+  public function to_header($realm = null) {
     $first = true;
-    if($realm) {
+    if ($realm) {
       $out = 'Authorization: OAuth realm="' . OAuthUtil::urlencode_rfc3986($realm) . '"';
       $first = false;
     } else
@@ -656,7 +656,7 @@ 
 
 class OAuthServer {
   protected $timestamp_threshold = 300; // in seconds, five minutes
-  protected $version = '1.0';             // hi blaine
+  protected $version = '1.0'; // hi blaine
   protected $signature_methods = array();
 
   protected $data_store;
@@ -790,7 +790,7 @@ 
   /**
    * try to find the token for the provided request's token key
    */
-  protected function get_token($request, $consumer, $token_type="access") {
+  protected function get_token($request, $consumer, $token_type = "access") {
     $token_field = $request instanceof OAuthRequest
          ? $request->get_parameter('oauth_token')
          : NULL;
@@ -841,7 +841,7 @@ 
    * check that the timestamp is new enough
    */
   private function check_timestamp($timestamp) {
-    if( ! $timestamp )
+    if (!$timestamp)
       throw new OAuthMissingParameterException('oauth_timestamp');
 
     // Cast to integer. See issue #314.
@@ -859,7 +859,7 @@ 
    * check that the nonce is not repeated
    */
   private function check_nonce($consumer, $token, $nonce, $timestamp) {
-    if( ! $nonce )
+    if (!$nonce)
       throw new OAuthMissingParameterException('oauth_nonce');
 
     // verify that the nonce is uniqueish
@@ -932,7 +932,7 @@ 
   //                  see http://code.google.com/p/oauth/issues/detail?id=163
   public static function split_header($header, $only_allow_oauth_parameters = true) {
     $params = array();
-    if (preg_match_all('/('.($only_allow_oauth_parameters ? 'oauth_' : '').'[a-z_-]*)=(:?"([^"]*)"|([^,]*))/', $header, $matches)) {
+    if (preg_match_all('/(' . ($only_allow_oauth_parameters ? 'oauth_' : '') . '[a-z_-]*)=(:?"([^"]*)"|([^,]*))/', $header, $matches)) {
       foreach ($matches[1] as $i => $h) {
         $params[$h] = OAuthUtil::urldecode_rfc3986(empty($matches[3][$i]) ? $matches[4][$i] : $matches[3][$i]);
       }
@@ -967,9 +967,9 @@ 
       // otherwise we don't have apache and are just going to have to hope
       // that $_SERVER actually contains what we need
       $out = array();
-      if( isset($_SERVER['CONTENT_TYPE']) )
+      if (isset($_SERVER['CONTENT_TYPE']))
         $out['Content-Type'] = $_SERVER['CONTENT_TYPE'];
-      if( isset($_ENV['CONTENT_TYPE']) )
+      if (isset($_ENV['CONTENT_TYPE']))
         $out['Content-Type'] = $_ENV['CONTENT_TYPE'];
 
       foreach ($_SERVER as $key => $value) {
@@ -992,7 +992,7 @@ 
   // This function takes a input like a=b&a=c&d=e and returns the parsed
   // parameters like this
   // array('a' => array('b','c'), 'd' => 'e')
-  public static function parse_parameters( $input ) {
+  public static function parse_parameters($input) {
     if (!isset($input) || !$input) return array();
 
     $pairs = explode('&', $input);

htdocs/okapi/datastore.php

Spacing +20 added lines, -20 removed lines

@@ -11,7 +11,7 @@ 
         $row = Db::select_row("
             select `key`, secret, name, url, email, bflags
             from okapi_consumers
-            where `key` = '".Db::escape_string($consumer_key)."'
+            where `key` = '".Db::escape_string($consumer_key) . "'
         ");
         if (!$row)
             return null;
@@ -25,9 +25,9 @@ 
             select `key`, consumer_key, secret, token_type, user_id, verifier, callback
             from okapi_tokens
             where
-                consumer_key = '".Db::escape_string($consumer->key)."'
-                and token_type = '".Db::escape_string($token_type)."'
-                and `key` = '".Db::escape_string($token)."'
+                consumer_key = '".Db::escape_string($consumer->key) . "'
+                and token_type = '".Db::escape_string($token_type) . "'
+                and `key` = '".Db::escape_string($token) . "'
         ");
         if (!$row)
             return null;
@@ -65,9 +65,9 @@ 
             Db::execute("
                 insert into okapi_nonces (consumer_key, nonce_hash, timestamp)
                 values (
-                    '".Db::escape_string($consumer->key)."',
-                    '".Db::escape_string($nonce_hash)."',
-                    '".Db::escape_string($timestamp)."'
+                    '".Db::escape_string($consumer->key) . "',
+                    '".Db::escape_string($nonce_hash) . "',
+                    '".Db::escape_string($timestamp) . "'
                 );
             ");
             return null;
@@ -93,17 +93,17 @@ 
                 (`key`, secret, token_type, timestamp,
                 user_id, consumer_key, verifier, callback)
             values (
-                '".Db::escape_string($token->key)."',
-                '".Db::escape_string($token->secret)."',
+                '".Db::escape_string($token->key) . "',
+                '".Db::escape_string($token->secret) . "',
                 'request',
                 unix_timestamp(),
                 null,
-                '".Db::escape_string($consumer->key)."',
-                '".Db::escape_string($token->verifier)."',
+                '".Db::escape_string($consumer->key) . "',
+                '".Db::escape_string($token->verifier) . "',
                 ".(($token->callback_url == 'oob')
                     ? "null"
-                    : "'".Db::escape_string($token->callback_url)."'"
-                )."
+                    : "'" . Db::escape_string($token->callback_url) . "'"
+                ) . "
             );
         ");
         return $token;
@@ -122,7 +122,7 @@ 
 
         Db::execute("
             delete from okapi_tokens
-            where `key` = '".Db::escape_string($token->key)."'
+            where `key` = '".Db::escape_string($token->key) . "'
         ");
 
         # In OKAPI, all Access Tokens are long lived. Therefore, we don't want
@@ -135,8 +135,8 @@ 
             from okapi_tokens
             where
                 token_type = 'access'
-                and user_id = '".Db::escape_string($token->authorized_by_user_id)."'
-                and consumer_key = '".Db::escape_string($consumer->key)."'
+                and user_id = '".Db::escape_string($token->authorized_by_user_id) . "'
+                and consumer_key = '".Db::escape_string($consumer->key) . "'
         ");
         if ($row)
         {
@@ -155,12 +155,12 @@ 
                 insert into okapi_tokens
                     (`key`, secret, token_type, timestamp, user_id, consumer_key)
                 values (
-                    '".Db::escape_string($access_token->key)."',
-                    '".Db::escape_string($access_token->secret)."',
+                    '".Db::escape_string($access_token->key) . "',
+                    '".Db::escape_string($access_token->secret) . "',
                     'access',
                     unix_timestamp(),
-                    '".Db::escape_string($access_token->user_id)."',
-                    '".Db::escape_string($consumer->key)."'
+                    '".Db::escape_string($access_token->user_id) . "',
+                    '".Db::escape_string($consumer->key) . "'
                 );
             ");
         }

htdocs/okapi/facade.php

Spacing +14 added lines, -14 removed lines

@@ -36,9 +36,9 @@ 
 use okapi\OkapiFacadeAccessToken;
 use okapi\Cache;
 
-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/service_runner.php");
+require_once($GLOBALS['rootpath'] . "okapi/service_runner.php");
 Okapi::init_internals();
 
 /**
@@ -97,10 +97,10 @@ 
      */
     public static function import_search_set($temp_table, $min_store, $max_ref_age)
     {
-        require_once($GLOBALS['rootpath'].'okapi/services/caches/search/save.php');
+        require_once($GLOBALS['rootpath'] . 'okapi/services/caches/search/save.php');
         $tables = array('caches', $temp_table);
         $where_conds = array(
-            $temp_table.".cache_id = caches.cache_id",
+            $temp_table . ".cache_id = caches.cache_id",
             'caches.status in (1,2,3)',
         );
         return \okapi\services\caches\search\save\WebService::get_set(
@@ -123,7 +123,7 @@ 
         Db::execute("
             update caches
             set okapi_syncbase = now()
-            where wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes))."')
+            where wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes)) . "')
         ");
     }
 
@@ -140,8 +140,8 @@ 
             update cache_logs
             set okapi_syncbase = now()
             where
-                cache_id = '".Db::escape_string($cache_id)."'
-                and user_id = '".Db::escape_string($user_id)."'
+                cache_id = '".Db::escape_string($cache_id) . "'
+                and user_id = '".Db::escape_string($user_id) . "'
         ");
     }
 
@@ -151,7 +151,7 @@ 
      */
     public static function database_update()
     {
-        require_once($GLOBALS['rootpath']."okapi/views/update.php");
+        require_once($GLOBALS['rootpath'] . "okapi/views/update.php");
         $update = new views\update\View;
         $update->call();
     }
@@ -201,7 +201,7 @@ 
      */
     public static function cache_set($key, $value, $timeout)
     {
-        Cache::set("facade#".$key, $value, $timeout);
+        Cache::set("facade#" . $key, $value, $timeout);
     }
 
     /** Same as `cache_set`, but works on many key->value pair at once. */
@@ -209,7 +209,7 @@ 
     {
         $prefixed_dict = array();
         foreach ($dict as $key => &$value_ref) {
-            $prefixed_dict["facade#".$key] = &$value_ref;
+            $prefixed_dict["facade#" . $key] = &$value_ref;
         }
         Cache::set_many($prefixed_dict, $timeout);
     }
@@ -220,7 +220,7 @@ 
      */
     public static function cache_get($key)
     {
-        return Cache::get("facade#".$key);
+        return Cache::get("facade#" . $key);
     }
 
     /** Same as `cache_get`, but it works on multiple keys at once. */
@@ -228,7 +228,7 @@ 
     {
         $prefixed_keys = array();
         foreach ($keys as $key) {
-            $prefixed_keys[] = "facade#".$key;
+            $prefixed_keys[] = "facade#" . $key;
         }
         $prefixed_result = Cache::get_many($prefixed_keys);
         $result = array();
@@ -243,7 +243,7 @@ 
      */
     public static function cache_delete($key)
     {
-        Cache::delete("facade#".$key);
+        Cache::delete("facade#" . $key);
     }
 
     /** Same as `cache_delete`, but works on many keys at once. */
@@ -251,7 +251,7 @@ 
     {
         $prefixed_keys = array();
         foreach ($keys as $key) {
-            $prefixed_keys[] = "facade#".$key;
+            $prefixed_keys[] = "facade#" . $key;
         }
         Cache::delete_many($prefixed_keys);
     }

htdocs/okapi/core.php

Spacing +140 added lines, -140 removed lines

@@ -56,7 +56,7 @@ 
             'reason_stack' => array(),
         );
         $this->provideExtras($extras);
-        $extras['more_info'] = Settings::get('SITE_URL')."okapi/introduction.html#errors";
+        $extras['more_info'] = Settings::get('SITE_URL') . "okapi/introduction.html#errors";
         return json_encode(array("error" => $extras));
     }
 }
@@ -131,7 +131,7 @@ 
             {
                 print "\n\nBUT! Since the DEBUG flag is on, then you probably ARE a developer yourself.\n";
                 print "Let's cut to the chase then:";
-                print "\n\n".$exception_info;
+                print "\n\n" . $exception_info;
             }
             if (class_exists("okapi\\Settings") && (Settings::get('DEBUG_PREVENT_EMAILS')))
             {
@@ -140,14 +140,14 @@ 
             }
             else
             {
-                $subject = "OKAPI Method Error - ".substr(
+                $subject = "OKAPI Method Error - " . substr(
                     $_SERVER['REQUEST_URI'], 0, strpos(
-                    $_SERVER['REQUEST_URI'].'?', '?'));
+                    $_SERVER['REQUEST_URI'] . '?', '?'));
 
                 $message = (
-                    "OKAPI caught the following exception while executing API method request.\n".
-                    "This is an error in OUR code and should be fixed. Please contact the\n".
-                    "developer of the module that threw this error. Thanks!\n\n".
+                    "OKAPI caught the following exception while executing API method request.\n" .
+                    "This is an error in OUR code and should be fixed. Please contact the\n" .
+                    "developer of the module that threw this error. Thanks!\n\n" .
                     $exception_info
                 );
                 try
@@ -175,11 +175,11 @@ 
 
                     $admin_email = implode(", ", get_admin_emails());
                     $sender_email = class_exists("okapi\\Settings") ? Settings::get('FROM_FIELD') : 'root@localhost';
-                    $subject = "Fatal error mode: ".$subject;
-                    $message = "Fatal error mode: OKAPI will send at most ONE message per minute.\n\n".$message;
+                    $subject = "Fatal error mode: " . $subject;
+                    $message = "Fatal error mode: OKAPI will send at most ONE message per minute.\n\n" . $message;
                     $headers = (
-                        "Content-Type: text/plain; charset=utf-8\n".
-                        "From: OKAPI <$sender_email>\n".
+                        "Content-Type: text/plain; charset=utf-8\n" .
+                        "From: OKAPI <$sender_email>\n" .
                         "Reply-To: $sender_email\n"
                     );
                     mail($admin_email, $subject, $message, $headers);
@@ -193,9 +193,9 @@ 
         return str_replace(
             array(
                 Settings::get('DB_PASSWORD'),
-                "'".Settings::get('DB_USERNAME')."'",
+                "'" . Settings::get('DB_USERNAME') . "'",
                 Settings::get('DB_SERVER'),
-                "'".Settings::get('DB_NAME')."'"
+                "'" . Settings::get('DB_NAME') . "'"
             ),
             array(
                 "******",
@@ -218,25 +218,25 @@ 
             # by OkapiErrorHandler::handle_shutdown. Instead of printing trace, we will just print
             # the file and line.
 
-            $exception_info .= "File: ".$e->getFile()."\nLine: ".$e->getLine()."\n\n";
+            $exception_info .= "File: " . $e->getFile() . "\nLine: " . $e->getLine() . "\n\n";
         }
         else
         {
-            $exception_info .= "--- Stack trace ---\n".
-                self::removeSensitiveData($e->getTraceAsString())."\n\n";
+            $exception_info .= "--- Stack trace ---\n" .
+                self::removeSensitiveData($e->getTraceAsString()) . "\n\n";
         }
 
-        $exception_info .= (isset($_SERVER['REQUEST_URI']) ? "--- OKAPI method called ---\n".
-            preg_replace("/([?&])/", "\n$1", $_SERVER['REQUEST_URI'])."\n\n" : "");
-        $exception_info .= "--- OKAPI version ---\n".Okapi::$version_number.
-            " (".Okapi::$git_revision.")\n\n";
+        $exception_info .= (isset($_SERVER['REQUEST_URI']) ? "--- OKAPI method called ---\n" .
+            preg_replace("/([?&])/", "\n$1", $_SERVER['REQUEST_URI']) . "\n\n" : "");
+        $exception_info .= "--- OKAPI version ---\n" . Okapi::$version_number .
+            " (" . Okapi::$git_revision . ")\n\n";
 
         # This if-condition will solve some (but not all) problems when trying to execute
         # OKAPI code from command line;
         # see https://github.com/opencaching/okapi/issues/243.
         if (function_exists('getallheaders'))
         {
-            $exception_info .= "--- Request headers ---\n".implode("\n", array_map(
+            $exception_info .= "--- Request headers ---\n" . implode("\n", array_map(
                 function($k, $v) { return "$k: $v"; },
                 array_keys(getallheaders()), array_values(getallheaders())
             ));
@@ -341,7 +341,7 @@ 
         $this->paramName = $paramName;
         $this->whats_wrong_about_it = $whats_wrong_about_it;
         if ($whats_wrong_about_it)
-            parent::__construct("Parameter '$paramName' has invalid value: ".$whats_wrong_about_it, $code);
+            parent::__construct("Parameter '$paramName' has invalid value: " . $whats_wrong_about_it, $code);
         else
             parent::__construct("Parameter '$paramName' has invalid value.", $code);
     }
@@ -371,7 +371,7 @@ 
             self::$connected = true;
         }
         else
-            throw new Exception("Could not connect to MySQL: ".mysql_error());
+            throw new Exception("Could not connect to MySQL: " . mysql_error());
     }
 
     /** Fetch [{row}], return {row}. */
@@ -383,7 +383,7 @@ 
             case 0: return null;
             case 1: return $rows[0];
             default:
-                throw new DbException("Invalid query. Db::select_row returned more than one row for:\n\n".$query."\n");
+                throw new DbException("Invalid query. Db::select_row returned more than one row for:\n\n" . $query . "\n");
         }
     }
 
@@ -436,7 +436,7 @@ 
             return null;
         if (count($column) == 1)
             return $column[0];
-        throw new DbException("Invalid query. Db::select_value returned more than one row for:\n\n".$query."\n");
+        throw new DbException("Invalid query. Db::select_value returned more than one row for:\n\n" . $query . "\n");
     }
 
     /** Fetch all [(A), (B), (C)], return [A, B, C]. */
@@ -489,7 +489,7 @@ 
     {
         $rs = self::query($query);
         if ($rs !== true)
-            throw new DbException("Db::execute returned a result set for your query. ".
+            throw new DbException("Db::execute returned a result set for your query. " .
                 "You should use Db::select_* or Db::query for SELECT queries!");
     }
 
@@ -514,8 +514,8 @@ 
                     self::execute("repair table okapi_cache");
                     Okapi::mail_admins(
                         "okapi_cache - Automatic repair",
-                        "Hi.\n\nOKAPI detected that okapi_cache table needed ".
-                        "repairs and it has performed such\nrepairs automatically. ".
+                        "Hi.\n\nOKAPI detected that okapi_cache table needed " .
+                        "repairs and it has performed such\nrepairs automatically. " .
                         "However, this should not happen regularly!"
                     );
                 } catch (Exception $e) {
@@ -526,10 +526,10 @@ 
                         self::execute("truncate okapi_cache");
                         Okapi::mail_admins(
                             "okapi_cache was truncated",
-                            "Hi.\n\nOKAPI detected that okapi_cache table needed ".
-                            "repairs, but it failed to repair\nthe table automatically. ".
-                            "In order to counteract more severe errors, \nwe have ".
-                            "truncated the okapi_cache table to make it alive.\n".
+                            "Hi.\n\nOKAPI detected that okapi_cache table needed " .
+                            "repairs, but it failed to repair\nthe table automatically. " .
+                            "In order to counteract more severe errors, \nwe have " .
+                            "truncated the okapi_cache table to make it alive.\n" .
                             "However, this should not happen regularly!"
                         );
                     } catch (Exception $e) {
@@ -538,7 +538,7 @@ 
                 }
             }
 
-            throw new DbException("SQL Error $errno: $msg\n\nThe query was:\n".$query."\n");
+            throw new DbException("SQL Error $errno: $msg\n\nThe query was:\n" . $query . "\n");
         }
         return $rs;
     }
@@ -555,10 +555,10 @@ 
 
     public static function field_exists($table, $field)
     {
-        if (!preg_match("/[a-z0-9_]+/", $table.$field))
+        if (!preg_match("/[a-z0-9_]+/", $table . $field))
             return false;
         try {
-            $spec = self::select_all("desc ".$table.";");
+            $spec = self::select_all("desc " . $table . ";");
         } catch (Exception $e) {
             /* Table doesn't exist, probably. */
             return false;
@@ -575,7 +575,7 @@ 
 # Including OAuth internals. Preparing OKAPI Consumer and Token classes.
 #
 
-require_once($GLOBALS['rootpath']."okapi/oauth.php");
+require_once($GLOBALS['rootpath'] . "okapi/oauth.php");
 
 class OkapiConsumer extends OAuthConsumer
 {
@@ -611,7 +611,7 @@ 
      */
     const FLAG_KEY_REVOKED = 4;
 
-    public function __construct($key, $secret, $name, $url, $email, $bflags=0)
+    public function __construct($key, $secret, $name, $url, $email, $bflags = 0)
     {
         $this->key = $key;
         $this->secret = $secret;
@@ -718,7 +718,7 @@ 
 {
     public function __construct($user_id)
     {
-        parent::__construct('internal-'.$user_id, null, 'internal', $user_id);
+        parent::__construct('internal-' . $user_id, null, 'internal', $user_id);
     }
 }
 
@@ -727,7 +727,7 @@ 
 {
     public function __construct($user_id)
     {
-        parent::__construct('facade-'.$user_id, null, 'facade', $user_id);
+        parent::__construct('facade-' . $user_id, null, 'facade', $user_id);
     }
 }
 
@@ -736,7 +736,7 @@ 
 {
     public function __construct($user_id)
     {
-        parent::__construct('debug-'.$user_id, null, 'debug', $user_id);
+        parent::__construct('debug-' . $user_id, null, 'debug', $user_id);
     }
 }
 
@@ -777,8 +777,8 @@ 
 
 # Including local datastore and settings (connecting SQL database etc.).
 
-require_once($GLOBALS['rootpath']."okapi/settings.php");
-require_once($GLOBALS['rootpath']."okapi/datastore.php");
+require_once($GLOBALS['rootpath'] . "okapi/settings.php");
+require_once($GLOBALS['rootpath'] . "okapi/datastore.php");
 
 class OkapiHttpResponse
 {
@@ -809,7 +809,7 @@ 
         if (is_resource($this->body))
         {
             while (!feof($this->body))
-                print fread($this->body, 1024*1024);
+                print fread($this->body, 1024 * 1024);
         }
         else
             print $this->body;
@@ -836,14 +836,14 @@ 
      */
     public function display()
     {
-        header("HTTP/1.1 ".$this->status);
+        header("HTTP/1.1 " . $this->status);
         header("Access-Control-Allow-Origin: *");
-        header("Content-Type: ".$this->content_type);
-        header("Cache-Control: ".$this->cache_control);
+        header("Content-Type: " . $this->content_type);
+        header("Cache-Control: " . $this->cache_control);
         if ($this->connection_close)
             header("Connection: close");
         if ($this->content_disposition)
-            header("Content-Disposition: ".$this->content_disposition);
+            header("Content-Disposition: " . $this->content_disposition);
         if ($this->etag)
             header("ETag: $this->etag");
 
@@ -861,7 +861,7 @@ 
 
             header("Content-Encoding: gzip");
             $gzipped = gzencode($this->body, 5);
-            header("Content-Length: ".strlen($gzipped));
+            header("Content-Length: " . strlen($gzipped));
             print $gzipped;
         }
         else
@@ -874,7 +874,7 @@ 
 
             $length = $this->get_length();
             if ($length)
-                header("Content-Length: ".$length);
+                header("Content-Length: " . $length);
             $this->print_body();
         }
     }
@@ -887,11 +887,11 @@ 
     public function display()
     {
         header("HTTP/1.1 303 See Other");
-        header("Location: ".$this->url);
+        header("Location: " . $this->url);
     }
 }
 
-require_once ($GLOBALS['rootpath'].'okapi/lib/tbszip.php');
+require_once ($GLOBALS['rootpath'] . 'okapi/lib/tbszip.php');
 use \clsTbsZip;
 
 class OkapiZIPHttpResponse extends OkapiHttpResponse
@@ -906,7 +906,7 @@ 
 
     public function print_body()
     {
-        $this->zip->Flush(clsTbsZip::TBSZIP_DOWNLOAD|clsTbsZip::TBSZIP_NOHEADER);
+        $this->zip->Flush(clsTbsZip::TBSZIP_DOWNLOAD | clsTbsZip::TBSZIP_NOHEADER);
     }
 
     public function get_body()
@@ -938,7 +938,7 @@ 
     /** Note: This does NOT tell you if someone currently locked it! */
     public static function exists($name)
     {
-        $lockfile = Okapi::get_var_dir()."/okapi-lock-".$name;
+        $lockfile = Okapi::get_var_dir() . "/okapi-lock-" . $name;
         return file_exists($lockfile);
     }
 
@@ -957,7 +957,7 @@ 
         }
         else
         {
-            $this->lockfile = Okapi::get_var_dir()."/okapi-lock-".$name;
+            $this->lockfile = Okapi::get_var_dir() . "/okapi-lock-" . $name;
             $this->lock = fopen($this->lockfile, "wb");
         }
     }
@@ -973,7 +973,7 @@ 
         if ($this->lock !== null)
             return flock($this->lock, LOCK_EX | LOCK_NB);
         else
-            return true;  # $lock can be null only when debugging
+            return true; # $lock can be null only when debugging
     }
 
     public function release()
@@ -1059,8 +1059,8 @@ 
         Db::execute("
             replace into okapi_vars (var, value)
             values (
-                '".Db::escape_string($varname)."',
-                '".Db::escape_string($value)."');
+                '".Db::escape_string($varname) . "',
+                '".Db::escape_string($value) . "');
         ");
         self::$okapi_vars[$varname] = $value;
     }
@@ -1083,12 +1083,12 @@ 
         # Make sure we're not sending HUGE emails.
 
         if (strlen($message) > 10000) {
-            $message = substr($message, 0, 10000)."\n\n...(message clipped at 10k chars)\n";
+            $message = substr($message, 0, 10000) . "\n\n...(message clipped at 10k chars)\n";
         }
 
         # Make sure we're not spamming.
 
-        $cache_key = 'mail_admins_counter/'.(floor(time() / 3600) * 3600).'/'.md5($subject);
+        $cache_key = 'mail_admins_counter/' . (floor(time() / 3600) * 3600) . '/' . md5($subject);
         try {
             $counter = Cache::get($cache_key);
         } catch (DbException $e) {
@@ -1119,22 +1119,22 @@ 
         {
             # We are spamming. Prevent sending more emails.
 
-            $content_cache_key_prefix = 'mail_admins_spam/'.(floor(time() / 3600) * 3600).'/';
+            $content_cache_key_prefix = 'mail_admins_spam/' . (floor(time() / 3600) * 3600) . '/';
             $timeout = 86400;
             if ($counter == 6)
             {
                 self::mail_from_okapi(get_admin_emails(), "Anti-spam mode activated for '$subject'",
-                    "OKAPI has activated an \"anti-spam\" mode for the following subject:\n\n".
-                    "\"$subject\"\n\n".
-                    "Anti-spam mode is activiated when more than 5 messages with\n".
-                    "the same subject are sent within one hour.\n\n".
-                    "Additional debug information:\n".
-                    "- counter cache key: $cache_key\n".
-                    "- content prefix: $content_cache_key_prefix<n>\n".
+                    "OKAPI has activated an \"anti-spam\" mode for the following subject:\n\n" .
+                    "\"$subject\"\n\n" .
+                    "Anti-spam mode is activiated when more than 5 messages with\n" .
+                    "the same subject are sent within one hour.\n\n" .
+                    "Additional debug information:\n" .
+                    "- counter cache key: $cache_key\n" .
+                    "- content prefix: $content_cache_key_prefix<n>\n" .
                     "- content timeout: $timeout\n"
                 );
             }
-            $content_cache_key = $content_cache_key_prefix.$counter;
+            $content_cache_key = $content_cache_key_prefix . $counter;
             Cache::set($content_cache_key, $message, $timeout);
         }
     }
@@ -1152,8 +1152,8 @@ 
             $email_addresses = array($email_addresses);
         $sender_email = class_exists("okapi\\Settings") ? Settings::get('FROM_FIELD') : 'root@localhost';
         mail(implode(", ", $email_addresses), $subject, $message,
-            "Content-Type: text/plain; charset=utf-8\n".
-            "From: OKAPI <$sender_email>\n".
+            "Content-Type: text/plain; charset=utf-8\n" .
+            "From: OKAPI <$sender_email>\n" .
             "Reply-To: $sender_email\n"
             );
     }
@@ -1174,7 +1174,7 @@ 
             $site_url = Settings::get('SITE_URL');
         $matches = null;
         if (preg_match("#^https?://(www.)?opencaching.([a-z.]+)/$#", $site_url, $matches)) {
-            return "Opencaching.".strtoupper($matches[2]);
+            return "Opencaching." . strtoupper($matches[2]);
         } else {
             return "DEVELSITE";
         }
@@ -1198,18 +1198,18 @@ 
         /* All OCDE-based sites use exactly the same schema. */
 
         if (Settings::get('OC_BRANCH') == 'oc.de') {
-            return "OCDE";  // OC
+            return "OCDE"; // OC
         }
 
         /* All OCPL-based sites use separate schemas. (Hopefully, this will
          * change in time.) */
 
         $mapping = array(
-            2 => "OCPL",  // OP
-            6 => "OCORGUK",  // OK
-            10 => "OCUS",  // OU
-            14 => "OCNL",  // OB
-            16 => "OCRO",  // OR
+            2 => "OCPL", // OP
+            6 => "OCORGUK", // OK
+            10 => "OCUS", // OU
+            14 => "OCNL", // OB
+            16 => "OCRO", // OR
             // should be expanded when new OCPL-based sites are added
         );
         $oc_node_id = Settings::get("OC_NODE_ID");
@@ -1231,7 +1231,7 @@ 
      */
     public static function get_recommended_base_url()
     {
-        return Settings::get('SITE_URL')."okapi/";
+        return Settings::get('SITE_URL') . "okapi/";
     }
 
     /**
@@ -1261,7 +1261,7 @@ 
                 );
                 break;
             case 'OCDE':
-                if (in_array(Settings::get('OC_NODE_ID'), array(4,5))) {
+                if (in_array(Settings::get('OC_NODE_ID'), array(4, 5))) {
                     $urls = array(
                         preg_replace("/^https:/", "http:", Settings::get('SITE_URL')) . 'okapi/',
                         preg_replace("/^http:/", "https:", Settings::get('SITE_URL')) . 'okapi/',
@@ -1352,7 +1352,7 @@ 
         $nearest_event = Okapi::get_var("cron_nearest_event");
         if ($nearest_event + 0 <= time())
         {
-            require_once($GLOBALS['rootpath']."okapi/cronjobs.php");
+            require_once($GLOBALS['rootpath'] . "okapi/cronjobs.php");
             $nearest_event = CronJobController::run_jobs('pre-request');
             Okapi::set_var("cron_nearest_event", $nearest_event);
         }
@@ -1369,7 +1369,7 @@ 
         {
             set_time_limit(0);
             ignore_user_abort(true);
-            require_once($GLOBALS['rootpath']."okapi/cronjobs.php");
+            require_once($GLOBALS['rootpath'] . "okapi/cronjobs.php");
             $nearest_event = CronJobController::run_jobs('cron-5');
             Okapi::set_var("cron_nearest_event", $nearest_event);
         }
@@ -1485,9 +1485,9 @@ 
             $chars = "abcdefghjkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
         $max = strlen($chars);
         $key = "";
-        for ($i=0; $i<$length; $i++)
+        for ($i = 0; $i < $length; $i++)
         {
-            $key .= $chars[rand(0, $max-1)];
+            $key .= $chars[rand(0, $max - 1)];
         }
         return $key;
     }
@@ -1499,7 +1499,7 @@ 
      */
     public static function register_new_consumer($appname, $appurl, $email)
     {
-        require_once($GLOBALS['rootpath']."okapi/service_runner.php");
+        require_once($GLOBALS['rootpath'] . "okapi/service_runner.php");
         $consumer = new OkapiConsumer(Okapi::generate_key(20), Okapi::generate_key(40),
             $appname, $appurl, $email);
         $sample_cache = OkapiServiceRunner::call("services/caches/search/all",
@@ -1517,7 +1517,7 @@ 
         print "Note: Consumer Secret is needed only when you intend to use OAuth.\n";
         print "You don't need Consumer Secret for Level 1 Authentication.\n\n";
         print "Now you can easily access Level 1 OKAPI methods. E.g.:\n";
-        print Settings::get('SITE_URL')."okapi/services/caches/geocache?cache_code=$sample_cache_code&consumer_key=$consumer->key\n\n";
+        print Settings::get('SITE_URL') . "okapi/services/caches/geocache?cache_code=$sample_cache_code&consumer_key=$consumer->key\n\n";
         print "If you plan on using OKAPI for a longer time, then you may want to\n";
         print "subscribe to the OKAPI News blog to stay up-to-date:\n";
         print "http://opencaching-api.blogspot.com/\n\n";
@@ -1538,11 +1538,11 @@ 
         Db::execute("
             insert into okapi_consumers (`key`, name, secret, url, email, date_created)
             values (
-                '".Db::escape_string($consumer->key)."',
-                '".Db::escape_string($consumer->name)."',
-                '".Db::escape_string($consumer->secret)."',
-                '".Db::escape_string($consumer->url)."',
-                '".Db::escape_string($consumer->email)."',
+                '".Db::escape_string($consumer->key) . "',
+                '".Db::escape_string($consumer->name) . "',
+                '".Db::escape_string($consumer->secret) . "',
+                '".Db::escape_string($consumer->url) . "',
+                '".Db::escape_string($consumer->email) . "',
                 now()
             );
         ");
@@ -1551,13 +1551,13 @@ 
     /** Return the distance between two geopoints, in meters. */
     public static function get_distance($lat1, $lon1, $lat2, $lon2)
     {
-        $x1 = (90-$lat1) * 3.14159 / 180;
-        $x2 = (90-$lat2) * 3.14159 / 180;
+        $x1 = (90 - $lat1) * 3.14159 / 180;
+        $x2 = (90 - $lat2) * 3.14159 / 180;
         #
         # min(1, ...) was added below to prevent getting values greater than 1 due
         # to floating point precision limits. See issue #351 for details.
         #
-        $d = acos(min(1, cos($x1) * cos($x2) + sin($x1) * sin($x2) * cos(($lon1-$lon2) * 3.14159 / 180))) * 6371000;
+        $d = acos(min(1, cos($x1) * cos($x2) + sin($x1) * sin($x2) * cos(($lon1 - $lon2) * 3.14159 / 180))) * 6371000;
         if ($d < 0) $d = 0;
         return $d;
     }
@@ -1595,7 +1595,7 @@ 
         $bearing = atan2(sin($delta_lon) * cos($rad_lat2),
             cos($rad_lat1) * sin($rad_lat2) - sin($rad_lat1) * cos($rad_lat2) * cos($delta_lon));
         $bearing = 180.0 * $bearing / 3.14159;
-        if ( $bearing < 0.0 ) $bearing = $bearing + 360.0;
+        if ($bearing < 0.0) $bearing = $bearing + 360.0;
 
         return $bearing;
     }
@@ -1662,7 +1662,7 @@ 
                 throw new InvalidParam('callback', "'$callback' doesn't seem to be a valid JavaScript function name (should match /^[a-zA-Z_][a-zA-Z0-9_]*\$/).");
             $response = new OkapiHttpResponse();
             $response->content_type = "application/javascript; charset=utf-8";
-            $response->body = $callback."(".json_encode($object).");";
+            $response->body = $callback . "(" . json_encode($object) . ");";
             return $response;
         }
         elseif ($format == 'xmlmap')
@@ -1732,7 +1732,7 @@ 
                 $chunks[] = "<dict>";
                 foreach ($obj as $key => &$item_ref)
                 {
-                    $chunks[] = "<item key=\"".self::xmlescape($key)."\">";
+                    $chunks[] = "<item key=\"" . self::xmlescape($key) . "\">";
                     self::_xmlmap_add($chunks, $item_ref);
                     $chunks[] = "</item>";
                 }
@@ -1742,13 +1742,13 @@ 
         else
         {
             # That's a bug.
-            throw new Exception("Cannot encode as xmlmap: " + print_r($obj, true));
+            throw new Exception("Cannot encode as xmlmap: " +print_r($obj, true));
         }
     }
 
     private static function _xmlmap2_add(&$chunks, &$obj, $key)
     {
-        $attrs = ($key !== null) ? " key=\"".self::xmlescape($key)."\"" : "";
+        $attrs = ($key !== null) ? " key=\"" . self::xmlescape($key) . "\"" : "";
         if (is_string($obj))
         {
             $chunks[] = "<string$attrs>";
@@ -1853,8 +1853,8 @@ 
         $ref = &self::$cache_types[Settings::get('OC_BRANCH')];
         if (isset($ref[$name]))
             return $ref[$name];
-        throw new Exception("Method cache_type_name2id called with unsupported cache ".
-            "type name '$name'. You should not allow users to submit caches ".
+        throw new Exception("Method cache_type_name2id called with unsupported cache " .
+            "type name '$name'. You should not allow users to submit caches " .
             "of non-primary type.");
     }
 
@@ -2018,7 +2018,7 @@ 
 
         $html = preg_replace(
             "~\b(src|href)=([\"'])(?![a-z0-9_-]+:)~",
-            "$1=$2".Settings::get("SITE_URL"),
+            "$1=$2" . Settings::get("SITE_URL"),
             $html
         );
 
@@ -2048,10 +2048,10 @@ 
     {
         $value = trim(ini_get($variable));
         if (!preg_match("/^[0-9]+[KM]?$/", $value))
-            throw new Exception("Unexpected PHP setting: ".$variable. " = ".$value);
+            throw new Exception("Unexpected PHP setting: " . $variable . " = " . $value);
         $value = str_replace('K', '*1024', $value);
         $value = str_replace('M', '*1024*1024', $value);
-        $value = eval('return '.$value.';');
+        $value = eval('return ' . $value . ';');
         return $value;
     }
 
@@ -2060,8 +2060,8 @@ 
     const OBJECT_TYPE_CACHE_DESCRIPTION = 2;
     const OBJECT_TYPE_CACHE_IMAGE = 3;
     const OBJECT_TYPE_CACHE_MP3 = 4;
-    const OBJECT_TYPE_CACHE_LOG = 5;           # implemented
-    const OBJECT_TYPE_CACHE_LOG_IMAGE = 6;     # implemented
+    const OBJECT_TYPE_CACHE_LOG = 5; # implemented
+    const OBJECT_TYPE_CACHE_LOG_IMAGE = 6; # implemented
     const OBJECT_TYPE_CACHELIST = 7;
     const OBJECT_TYPE_EMAIL = 8;
     const OBJECT_TYPE_CACHE_REPORT = 9;
@@ -2084,14 +2084,14 @@ 
         {
             # The current cache implementation is ALWAYS persistent, so we will
             # just replace it with a big value.
-            $timeout = 100*365*86400;
+            $timeout = 100 * 365 * 86400;
         }
         Db::execute("
             replace into okapi_cache (`key`, value, expires)
             values (
-                '".Db::escape_string($key)."',
-                '".Db::escape_string(gzdeflate(serialize($value)))."',
-                date_add(now(), interval '".Db::escape_string($timeout)."' second)
+                '".Db::escape_string($key) . "',
+                '".Db::escape_string(gzdeflate(serialize($value))) . "',
+                date_add(now(), interval '".Db::escape_string($timeout) . "' second)
             );
         ");
     }
@@ -2105,8 +2105,8 @@ 
         Db::execute("
             replace into okapi_cache (`key`, value, expires, score)
             values (
-                '".Db::escape_string($key)."',
-                '".Db::escape_string(gzdeflate(serialize($value)))."',
+                '".Db::escape_string($key) . "',
+                '".Db::escape_string(gzdeflate(serialize($value))) . "',
                 date_add(now(), interval 120 day),
                 1.0
             );
@@ -2122,20 +2122,20 @@ 
         {
             # The current cache implementation is ALWAYS persistent, so we will
             # just replace it with a big value.
-            $timeout = 100*365*86400;
+            $timeout = 100 * 365 * 86400;
         }
         $entries_escaped = array();
         foreach ($dict as $key => $value)
         {
             $entries_escaped[] = "(
-                '".Db::escape_string($key)."',
-                '".Db::escape_string(gzdeflate(serialize($value)))."',
-                date_add(now(), interval '".Db::escape_string($timeout)."' second)
+                '".Db::escape_string($key) . "',
+                '".Db::escape_string(gzdeflate(serialize($value))) . "',
+                date_add(now(), interval '".Db::escape_string($timeout) . "' second)
             )";
         }
         Db::execute("
             replace into okapi_cache (`key`, value, expires)
-            values ".implode(", ", $entries_escaped)."
+            values ".implode(", ", $entries_escaped) . "
         ");
     }
 
@@ -2149,7 +2149,7 @@ 
             select value, score
             from okapi_cache
             where
-                `key` = '".Db::escape_string($key)."'
+                `key` = '".Db::escape_string($key) . "'
                 and expires > now()
         ");
         list($blob, $score) = Db::fetch_row($rs);
@@ -2159,7 +2159,7 @@ 
         {
             Db::execute("
                 insert into okapi_cache_reads (`cache_key`)
-                values ('".Db::escape_string($key)."')
+                values ('".Db::escape_string($key) . "')
             ");
         }
         return unserialize(gzinflate($blob));
@@ -2173,7 +2173,7 @@ 
             select `key`, value
             from okapi_cache
             where
-                `key` in ('".implode("','", array_map('\okapi\Db::escape_string', $keys))."')
+                `key` in ('".implode("','", array_map('\okapi\Db::escape_string', $keys)) . "')
                 and expires > now()
         ");
         while ($row = Db::fetch_assoc($rs))
@@ -2186,10 +2186,10 @@ 
             {
                 unset($dict[$row['key']]);
                 Okapi::mail_admins("Debug: Unserialize error",
-                    "Could not unserialize key '".$row['key']."' from Cache.\n".
-                    "Probably something REALLY big was put there and data has been truncated.\n".
-                    "Consider upgrading cache table to LONGBLOB.\n\n".
-                    "Length of data, compressed: ".strlen($row['value']));
+                    "Could not unserialize key '" . $row['key'] . "' from Cache.\n" .
+                    "Probably something REALLY big was put there and data has been truncated.\n" .
+                    "Consider upgrading cache table to LONGBLOB.\n\n" .
+                    "Length of data, compressed: " . strlen($row['value']));
             }
         }
         if (count($dict) < count($keys))
@@ -2214,7 +2214,7 @@ 
             return;
         Db::execute("
             delete from okapi_cache
-            where `key` in ('".implode("','", array_map('\okapi\Db::escape_string', $keys))."')
+            where `key` in ('".implode("','", array_map('\okapi\Db::escape_string', $keys)) . "')
         ");
     }
 }
@@ -2228,7 +2228,7 @@ 
 {
     public static function get_file_path($key)
     {
-        $filename = Okapi::get_var_dir()."/okapi_filecache_".md5($key);
+        $filename = Okapi::get_var_dir() . "/okapi_filecache_" . md5($key);
         if (!file_exists($filename))
             return null;
         return $filename;
@@ -2241,7 +2241,7 @@ 
      */
     public static function set($key, $value)
     {
-        $filename = Okapi::get_var_dir()."/okapi_filecache_".md5($key);
+        $filename = Okapi::get_var_dir() . "/okapi_filecache_" . md5($key);
         file_put_contents($filename, $value);
         return $filename;
     }
@@ -2262,7 +2262,7 @@ 
 {
     public $consumer;
     public $token;
-    public $etag;  # see: http://en.wikipedia.org/wiki/HTTP_ETag
+    public $etag; # see: http://en.wikipedia.org/wiki/HTTP_ETag
 
     /**
      * Set this to true, for some method to allow you to set higher "limit"
@@ -2386,7 +2386,7 @@ 
 
             if (!Settings::get('DEBUG'))
             {
-                throw new Exception("Attempted to use DEBUG_AS_USERNAME in ".
+                throw new Exception("Attempted to use DEBUG_AS_USERNAME in " .
                     "non-debug environment. Accidental commit?");
             }
 
@@ -2417,12 +2417,12 @@ 
             list($this->consumer, $this->token) = Okapi::$server->
                 verify_request2($this->request, $this->opt_token_type, $this->opt_min_auth_level == 3);
             if ($this->get_parameter('consumer_key') && $this->get_parameter('consumer_key') != $this->get_parameter('oauth_consumer_key'))
-                throw new BadRequest("Inproper mixing of authentication types. You used both 'consumer_key' ".
-                    "and 'oauth_consumer_key' parameters (Level 1 and Level 2), but they do not match with ".
+                throw new BadRequest("Inproper mixing of authentication types. You used both 'consumer_key' " .
+                    "and 'oauth_consumer_key' parameters (Level 1 and Level 2), but they do not match with " .
                     "each other. Were you trying to hack me? ;)");
             if ($this->opt_min_auth_level == 3 && !$this->token)
             {
-                throw new BadRequest("This method requires a valid Token to be included (Level 3 ".
+                throw new BadRequest("This method requires a valid Token to be included (Level 3 " .
                     "Authentication). You didn't provide one.");
             }
         }
@@ -2430,8 +2430,8 @@ 
         {
             if ($this->opt_min_auth_level >= 2)
             {
-                throw new BadRequest("This method requires OAuth signature (Level ".
-                    $this->opt_min_auth_level." Authentication). You didn't sign your request.");
+                throw new BadRequest("This method requires OAuth signature (Level " .
+                    $this->opt_min_auth_level . " Authentication). You didn't sign your request.");
             }
             else
             {
@@ -2444,7 +2444,7 @@ 
                     }
                 }
                 if (($this->opt_min_auth_level == 1) && (!$this->consumer))
-                    throw new BadRequest("This method requires the 'consumer_key' argument (Level 1 ".
+                    throw new BadRequest("This method requires the 'consumer_key' argument (Level 1 " .
                         "Authentication). You didn't provide one.");
             }
         }
@@ -2477,10 +2477,10 @@ 
             # Note, that this will override any other valid authentication the
             # developer might have issued.
 
-            $debug_user_id = Db::select_value("select user_id from user where username='".
-                Db::escape_string($options['DEBUG_AS_USERNAME'])."'");
+            $debug_user_id = Db::select_value("select user_id from user where username='" .
+                Db::escape_string($options['DEBUG_AS_USERNAME']) . "'");
             if ($debug_user_id == null)
-                throw new Exception("Invalid user name in DEBUG_AS_USERNAME: '".$options['DEBUG_AS_USERNAME']."'");
+                throw new Exception("Invalid user name in DEBUG_AS_USERNAME: '" . $options['DEBUG_AS_USERNAME'] . "'");
             $this->consumer = new OkapiDebugConsumer();
             $this->token = new OkapiDebugAccessToken($debug_user_id);
         }
@@ -2516,9 +2516,9 @@ 
         }
         if (!$allowed) {
             throw new BadRequest(
-                "Unrecognized base URL prefix! See `okapi_base_urls` field ".
-                "in the `services/apisrv/installation` method. (Recommended ".
-                "base URL to use is '".Okapi::get_recommended_base_url()."'.)"
+                "Unrecognized base URL prefix! See `okapi_base_urls` field " .
+                "in the `services/apisrv/installation` method. (Recommended " .
+                "base URL to use is '" . Okapi::get_recommended_base_url() . "'.)"
             );
         }
     }

htdocs/okapi/lib/oc_session.php

Spacing +1 added lines, -1 removed lines

@@ -25,6 +25,6 @@
         if (!$OC_sessionid)
             return null;
 
-        return Db::select_value("select user_id from sys_sessions where uuid='".Db::escape_string($OC_sessionid)."'");
+        return Db::select_value("select user_id from sys_sessions where uuid='" . Db::escape_string($OC_sessionid) . "'");
     }
 }
\ No newline at end of file

htdocs/okapi/lib/ocpl_access_logs.php

Spacing +8 added lines, -8 removed lines

@@ -22,14 +22,14 @@ 
         // traverse PHP call stack to find out who originally called us
         // first, find first service_runner.php invocation
         // then, find previous class invocation
-        for($i = count($trace)-1; $i >= 0; $i--)
+        for ($i = count($trace) - 1; $i >= 0; $i--)
         {
             $frame = $trace[$i];
             if ($break_next && isset($frame['class']))
             {
                 $class_elems = explode('\\', $frame['class']);
                 if (count($class_elems) >= 2)
-                    $org_caller = $class_elems[count($class_elems)-2];
+                    $org_caller = $class_elems[count($class_elems) - 2];
                 break;
             }
             if (isset($frame['file']) &&
@@ -51,7 +51,7 @@ 
     public static function log_geocache_access(OkapiRequest $request, $cache_ids)
     {
         if (Settings::get('OCPL_ENABLE_GEOCACHE_ACCESS_LOGS') !== true)
-            return ;
+            return;
 
         if (Settings::get('OC_BRANCH') == 'oc.pl')
         {
@@ -70,7 +70,7 @@ 
             if ($request->token != null)
                 $user_id = $request->token->user_id;
             $user_id_escaped = $user_id === null ? "null" : "'" . Db::escape_string($user_id) . "'";
-            if (is_array($cache_ids)){
+            if (is_array($cache_ids)) {
                 if (count($cache_ids) == 1)
                     $cache_ids_where = "= '" . Db::escape_string($cache_ids[0]) . "'";
                 else
@@ -101,24 +101,24 @@ 
             if (is_array($cache_ids) && count($already_logged_cache_ids) == count($cache_ids)
                 || !is_array($cache_ids) && count($already_logged_cache_ids) == 1)
             {
-                return ;
+                return;
             }
 
-            if (is_array($cache_ids)){
+            if (is_array($cache_ids)) {
                 $tmp = array();
                 foreach ($cache_ids as $cache_id)
                     $tmp[$cache_id] = true;
                 foreach ($already_logged_cache_ids as $cache_id)
                     unset($tmp[$cache_id]);
                 if (count($tmp) <= 0)
-                    return ;
+                    return;
                 $cache_ids_filterd = array_keys($tmp);
                 unset($tmp);
             } else {
                 $cache_ids_filterd = $cache_ids;
             }
 
-            if (is_array($cache_ids_filterd)){
+            if (is_array($cache_ids_filterd)) {
                 if (count($cache_ids_filterd) == 1)
                     $cache_ids_where = "= '" . Db::escape_string($cache_ids_filterd[0]) . "'";
                 else

htdocs/okapi/lib/tbszip.php

Spacing +225 added lines, -225 removed lines

@@ -12,10 +12,10 @@ 
 
 
 class clsTbsZip {
-    const TBSZIP_DOWNLOAD = 1;   // download (default)
-    const TBSZIP_NOHEADER = 4;   // option to use with DOWNLOAD: no header is sent
-    const TBSZIP_FILE     = 8;   // output to file  , or add from file
-    const TBSZIP_STRING   = 32;  // output to string, or add from string
+    const TBSZIP_DOWNLOAD = 1; // download (default)
+    const TBSZIP_NOHEADER = 4; // option to use with DOWNLOAD: no header is sent
+    const TBSZIP_FILE     = 8; // output to file  , or add from file
+    const TBSZIP_STRING   = 32; // output to string, or add from string
 
     function __construct() {
         $this->Meth8Ok = extension_loaded('zlib'); // check if Zlib extension is available. This is need for compress and uncompress with method 8.
@@ -24,26 +24,26 @@ 
         $this->Error = false;
     }
 
-    function CreateNew($ArchName='new.zip') {
+    function CreateNew($ArchName = 'new.zip') {
     // Create a new virtual empty archive, the name will be the default name when the archive is flushed.
-        if (!isset($this->Meth8Ok)) $this->__construct();  // for PHP 4 compatibility
+        if (!isset($this->Meth8Ok)) $this->__construct(); // for PHP 4 compatibility
         $this->Close(); // note that $this->ArchHnd is set to false here
         $this->Error = false;
         $this->ArchFile = $ArchName;
         $this->ArchIsNew = true;
-        $bin = 'PK'.chr(05).chr(06).str_repeat(chr(0), 18);
+        $bin = 'PK' . chr(05) . chr(06) . str_repeat(chr(0), 18);
         $this->CdEndPos = strlen($bin) - 4;
         $this->CdInfo = array('disk_num_curr'=>0, 'disk_num_cd'=>0, 'file_nbr_curr'=>0, 'file_nbr_tot'=>0, 'l_cd'=>0, 'p_cd'=>0, 'l_comm'=>0, 'v_comm'=>'', 'bin'=>$bin);
         $this->CdPos = $this->CdInfo['p_cd'];
     }
 
-    function Open($ArchFile, $UseIncludePath=false) {
+    function Open($ArchFile, $UseIncludePath = false) {
     // Open the zip archive
-        if (!isset($this->Meth8Ok)) $this->__construct();  // for PHP 4 compatibility
+        if (!isset($this->Meth8Ok)) $this->__construct(); // for PHP 4 compatibility
         $this->Close(); // close handle and init info
         $this->Error = false;
         $this->ArchIsNew = false;
-        $this->ArchIsStream = (is_resource($ArchFile) && (get_resource_type($ArchFile)=='stream'));
+        $this->ArchIsStream = (is_resource($ArchFile) && (get_resource_type($ArchFile) == 'stream'));
         if ($this->ArchIsStream) {
             $this->ArchFile = 'from_stream.zip';
             $this->ArchHnd = $ArchFile;
@@ -52,13 +52,13 @@ 
             $this->ArchFile = $ArchFile;
             $this->ArchHnd = fopen($ArchFile, 'rb', $UseIncludePath);
         }
-        $ok = !($this->ArchHnd===false);
+        $ok = !($this->ArchHnd === false);
         if ($ok) $ok = $this->CentralDirRead();
         return $ok;
     }
 
     function Close() {
-        if (isset($this->ArchHnd) and ($this->ArchHnd!==false)) fclose($this->ArchHnd);
+        if (isset($this->ArchHnd) and ($this->ArchHnd !== false)) fclose($this->ArchHnd);
         $this->ArchFile = '';
         $this->ArchHnd = false;
         $this->CdInfo = array();
@@ -71,20 +71,20 @@ 
 
     function ArchCancelModif() {
         $this->LastReadComp = false; // compression of the last read file (1=compressed, 0=stored not compressed, -1= stored compressed but read uncompressed)
-        $this->LastReadIdx = false;  // index of the last file read
+        $this->LastReadIdx = false; // index of the last file read
         $this->ReplInfo = array();
         $this->ReplByPos = array();
         $this->AddInfo = array();
     }
 
-    function FileAdd($Name, $Data, $DataType=self::TBSZIP_STRING, $Compress=true) {
+    function FileAdd($Name, $Data, $DataType = self::TBSZIP_STRING, $Compress = true) {
 
-        if ($Data===false) return $this->FileCancelModif($Name, false); // Cancel a previously added file
+        if ($Data === false) return $this->FileCancelModif($Name, false); // Cancel a previously added file
 
         // Save information for adding a new file into the archive
-        $Diff = 30 + 46 + 2*strlen($Name); // size of the header + cd info
+        $Diff = 30 + 46 + 2 * strlen($Name); // size of the header + cd info
         $Ref = $this->_DataCreateNewRef($Data, $DataType, $Compress, $Diff, $Name);
-        if ($Ref===false) return false;
+        if ($Ref === false) return false;
         $Ref['name'] = $Name;
         $this->AddInfo[] = $Ref;
         return $Ref['res'];
@@ -92,20 +92,20 @@ 
     }
 
     function CentralDirRead() {
-        $cd_info = 'PK'.chr(05).chr(06); // signature of the Central Directory
+        $cd_info = 'PK' . chr(05) . chr(06); // signature of the Central Directory
         $cd_pos = -22;
         $this->_MoveTo($cd_pos, SEEK_END);
         $b = $this->_ReadData(4);
-        if ($b===$cd_info) {
+        if ($b === $cd_info) {
             $this->CdEndPos = ftell($this->ArchHnd) - 4;
         } else {
             $p = $this->_FindCDEnd($cd_info);
             //echo 'p='.var_export($p,true); exit;
-            if ($p===false) {
+            if ($p === false) {
                 return $this->RaiseError('The End of Central Directory Record is not found.');
             } else {
                 $this->CdEndPos = $p;
-                $this->_MoveTo($p+4);
+                $this->_MoveTo($p + 4);
             }
         }
         $this->CdInfo = $this->CentralDirRead_End($cd_info);
@@ -113,13 +113,13 @@ 
         $this->CdFileNbr = $this->CdInfo['file_nbr_curr'];
         $this->CdPos = $this->CdInfo['p_cd'];
 
-        if ($this->CdFileNbr<=0) return $this->RaiseError('No header found in the Central Directory.');
-        if ($this->CdPos<=0) return $this->RaiseError('No position found for the Central Directory.');
+        if ($this->CdFileNbr <= 0) return $this->RaiseError('No header found in the Central Directory.');
+        if ($this->CdPos <= 0) return $this->RaiseError('No position found for the Central Directory.');
 
         $this->_MoveTo($this->CdPos);
-        for ($i=0;$i<$this->CdFileNbr;$i++) {
+        for ($i = 0; $i < $this->CdFileNbr; $i++) {
             $x = $this->CentralDirRead_File($i);
-            if ($x!==false) {
+            if ($x !== false) {
                 $this->CdFileLst[$i] = $x;
                 $this->CdFileByName[$x['v_name']] = $i;
             }
@@ -128,17 +128,17 @@ 
     }
 
     function CentralDirRead_End($cd_info) {
-        $b = $cd_info.$this->_ReadData(18);
+        $b = $cd_info . $this->_ReadData(18);
         $x = array();
-        $x['disk_num_curr'] = $this->_GetDec($b,4,2);  // number of this disk
-        $x['disk_num_cd'] = $this->_GetDec($b,6,2);    // number of the disk with the start of the central directory
-        $x['file_nbr_curr'] = $this->_GetDec($b,8,2);  // total number of entries in the central directory on this disk
-        $x['file_nbr_tot'] = $this->_GetDec($b,10,2);  // total number of entries in the central directory
-        $x['l_cd'] = $this->_GetDec($b,12,4);          // size of the central directory
-        $x['p_cd'] = $this->_GetDec($b,16,4);          // position of start of central directory with respect to the starting disk number
-        $x['l_comm'] = $this->_GetDec($b,20,2);        // .ZIP file comment length
+        $x['disk_num_curr'] = $this->_GetDec($b, 4, 2); // number of this disk
+        $x['disk_num_cd'] = $this->_GetDec($b, 6, 2); // number of the disk with the start of the central directory
+        $x['file_nbr_curr'] = $this->_GetDec($b, 8, 2); // total number of entries in the central directory on this disk
+        $x['file_nbr_tot'] = $this->_GetDec($b, 10, 2); // total number of entries in the central directory
+        $x['l_cd'] = $this->_GetDec($b, 12, 4); // size of the central directory
+        $x['p_cd'] = $this->_GetDec($b, 16, 4); // position of start of central directory with respect to the starting disk number
+        $x['l_comm'] = $this->_GetDec($b, 20, 2); // .ZIP file comment length
         $x['v_comm'] = $this->_ReadData($x['l_comm']); // .ZIP file comment
-        $x['bin'] = $b.$x['v_comm'];
+        $x['bin'] = $b . $x['v_comm'];
         return $x;
     }
 
@@ -146,48 +146,48 @@ 
 
         $b = $this->_ReadData(46);
 
-        $x = $this->_GetHex($b,0,4);
-        if ($x!=='h:02014b50') return $this->RaiseError("Signature of Central Directory Header #".$idx." (file information) expected but not found at position ".$this->_TxtPos(ftell($this->ArchHnd) - 46).".");
+        $x = $this->_GetHex($b, 0, 4);
+        if ($x !== 'h:02014b50') return $this->RaiseError("Signature of Central Directory Header #" . $idx . " (file information) expected but not found at position " . $this->_TxtPos(ftell($this->ArchHnd) - 46) . ".");
 
         $x = array();
-        $x['vers_used'] = $this->_GetDec($b,4,2);
-        $x['vers_necess'] = $this->_GetDec($b,6,2);
-        $x['purp'] = $this->_GetBin($b,8,2);
-        $x['meth'] = $this->_GetDec($b,10,2);
-        $x['time'] = $this->_GetDec($b,12,2);
-        $x['date'] = $this->_GetDec($b,14,2);
-        $x['crc32'] = $this->_GetDec($b,16,4);
-        $x['l_data_c'] = $this->_GetDec($b,20,4);
-        $x['l_data_u'] = $this->_GetDec($b,24,4);
-        $x['l_name'] = $this->_GetDec($b,28,2);
-        $x['l_fields'] = $this->_GetDec($b,30,2);
-        $x['l_comm'] = $this->_GetDec($b,32,2);
-        $x['disk_num'] = $this->_GetDec($b,34,2);
-        $x['int_file_att'] = $this->_GetDec($b,36,2);
-        $x['ext_file_att'] = $this->_GetDec($b,38,4);
-        $x['p_loc'] = $this->_GetDec($b,42,4);
+        $x['vers_used'] = $this->_GetDec($b, 4, 2);
+        $x['vers_necess'] = $this->_GetDec($b, 6, 2);
+        $x['purp'] = $this->_GetBin($b, 8, 2);
+        $x['meth'] = $this->_GetDec($b, 10, 2);
+        $x['time'] = $this->_GetDec($b, 12, 2);
+        $x['date'] = $this->_GetDec($b, 14, 2);
+        $x['crc32'] = $this->_GetDec($b, 16, 4);
+        $x['l_data_c'] = $this->_GetDec($b, 20, 4);
+        $x['l_data_u'] = $this->_GetDec($b, 24, 4);
+        $x['l_name'] = $this->_GetDec($b, 28, 2);
+        $x['l_fields'] = $this->_GetDec($b, 30, 2);
+        $x['l_comm'] = $this->_GetDec($b, 32, 2);
+        $x['disk_num'] = $this->_GetDec($b, 34, 2);
+        $x['int_file_att'] = $this->_GetDec($b, 36, 2);
+        $x['ext_file_att'] = $this->_GetDec($b, 38, 4);
+        $x['p_loc'] = $this->_GetDec($b, 42, 4);
         $x['v_name'] = $this->_ReadData($x['l_name']);
         $x['v_fields'] = $this->_ReadData($x['l_fields']);
         $x['v_comm'] = $this->_ReadData($x['l_comm']);
 
-        $x['bin'] = $b.$x['v_name'].$x['v_fields'].$x['v_comm'];
+        $x['bin'] = $b . $x['v_name'] . $x['v_fields'] . $x['v_comm'];
 
         return $x;
     }
 
     function RaiseError($Msg) {
         if ($this->DisplayError) {
-            if (PHP_SAPI==='cli') {
-                echo get_class($this).' ERROR with the zip archive: '.$Msg."\r\n";
+            if (PHP_SAPI === 'cli') {
+                echo get_class($this) . ' ERROR with the zip archive: ' . $Msg . "\r\n";
             } else {
-                echo '<strong>'.get_class($this).' ERROR with the zip archive:</strong> '.$Msg.'<br>'."\r\n";
+                echo '<strong>' . get_class($this) . ' ERROR with the zip archive:</strong> ' . $Msg . '<br>' . "\r\n";
             }
         }
         $this->Error = $Msg;
         return false;
     }
 
-    function Debug($FileHeaders=false) {
+    function Debug($FileHeaders = false) {
 
         $this->DisplayError = true;
 
@@ -197,7 +197,7 @@ 
             $pos = 0;
             $pos_stop = $this->CdInfo['p_cd'];
             $this->_MoveTo($pos);
-            while ( ($pos<$pos_stop) && ($ok = $this->_ReadFile($idx,false)) ) {
+            while (($pos < $pos_stop) && ($ok = $this->_ReadFile($idx, false))) {
                 $this->VisFileLst[$idx]['p_this_header (debug_mode only)'] = $pos;
                 $pos = ftell($this->ArchHnd);
                 $idx++;
@@ -207,22 +207,22 @@ 
         $nl = "\r\n";
         echo "<pre>";
 
-        echo "-------------------------------".$nl;
-        echo "End of Central Directory record".$nl;
-        echo "-------------------------------".$nl;
+        echo "-------------------------------" . $nl;
+        echo "End of Central Directory record" . $nl;
+        echo "-------------------------------" . $nl;
         print_r($this->DebugArray($this->CdInfo));
 
         echo $nl;
-        echo "-------------------------".$nl;
-        echo "Central Directory headers".$nl;
-        echo "-------------------------".$nl;
+        echo "-------------------------" . $nl;
+        echo "Central Directory headers" . $nl;
+        echo "-------------------------" . $nl;
         print_r($this->DebugArray($this->CdFileLst));
 
         if ($FileHeaders) {
             echo $nl;
-            echo "------------------".$nl;
-            echo "Local File headers".$nl;
-            echo "------------------".$nl;
+            echo "------------------" . $nl;
+            echo "Local File headers" . $nl;
+            echo "------------------" . $nl;
             print_r($this->DebugArray($this->VisFileLst));
         }
 
@@ -234,7 +234,7 @@ 
         foreach ($arr as $k=>$v) {
             if (is_array($v)) {
                 $arr[$k] = $this->DebugArray($v);
-            } elseif (substr($k,0,2)=='p_') {
+            } elseif (substr($k, 0, 2) == 'p_') {
                 $arr[$k] = $this->_TxtPos($v);
             }
         }
@@ -242,7 +242,7 @@ 
     }
 
     function FileExists($NameOrIdx) {
-        return ($this->FileGetIdx($NameOrIdx)!==false);
+        return ($this->FileGetIdx($NameOrIdx) !== false);
     }
 
     function FileGetIdx($NameOrIdx) {
@@ -267,18 +267,18 @@ 
         if (!is_string($Name)) return false;
         $idx_lst = array_keys($this->AddInfo);
         foreach ($idx_lst as $idx) {
-            if ($this->AddInfo[$idx]['name']===$Name) return $idx;
+            if ($this->AddInfo[$idx]['name'] === $Name) return $idx;
         }
         return false;
     }
 
-    function FileRead($NameOrIdx, $Uncompress=true) {
+    function FileRead($NameOrIdx, $Uncompress = true) {
 
         $this->LastReadComp = false; // means the file is not found
         $this->LastReadIdx = false;
 
         $idx = $this->FileGetIdx($NameOrIdx);
-        if ($idx===false) return $this->RaiseError('File "'.$NameOrIdx.'" is not found in the Central Directory.');
+        if ($idx === false) return $this->RaiseError('File "' . $NameOrIdx . '" is not found in the Central Directory.');
 
         $pos = $this->CdFileLst[$idx]['p_loc'];
         $this->_MoveTo($pos);
@@ -290,19 +290,19 @@ 
         // Manage uncompression
         $Comp = 1; // means the contents stays compressed
         $meth = $this->CdFileLst[$idx]['meth'];
-        if ($meth==8) {
+        if ($meth == 8) {
             if ($Uncompress) {
                 if ($this->Meth8Ok) {
                     $Data = gzinflate($Data);
                     $Comp = -1; // means uncompressed
                 } else {
-                    $this->RaiseError('Unable to uncompress file "'.$NameOrIdx.'" because extension Zlib is not installed.');
+                    $this->RaiseError('Unable to uncompress file "' . $NameOrIdx . '" because extension Zlib is not installed.');
                 }
             }
-        } elseif($meth==0) {
+        } elseif ($meth == 0) {
             $Comp = 0; // means stored without compression
         } else {
-            if ($Uncompress) $this->RaiseError('Unable to uncompress file "'.$NameOrIdx.'" because it is compressed with method '.$meth.'.');
+            if ($Uncompress) $this->RaiseError('Unable to uncompress file "' . $NameOrIdx . '" because it is compressed with method ' . $meth . '.');
         }
         $this->LastReadComp = $Comp;
 
@@ -315,40 +315,40 @@ 
 
         $b = $this->_ReadData(30);
 
-        $x = $this->_GetHex($b,0,4);
-        if ($x!=='h:04034b50') return $this->RaiseError("Signature of Local File Header #".$idx." (data section) expected but not found at position ".$this->_TxtPos(ftell($this->ArchHnd)-30).".");
+        $x = $this->_GetHex($b, 0, 4);
+        if ($x !== 'h:04034b50') return $this->RaiseError("Signature of Local File Header #" . $idx . " (data section) expected but not found at position " . $this->_TxtPos(ftell($this->ArchHnd) - 30) . ".");
 
         $x = array();
-        $x['vers'] = $this->_GetDec($b,4,2);
-        $x['purp'] = $this->_GetBin($b,6,2);
-        $x['meth'] = $this->_GetDec($b,8,2);
-        $x['time'] = $this->_GetDec($b,10,2);
-        $x['date'] = $this->_GetDec($b,12,2);
-        $x['crc32'] = $this->_GetDec($b,14,4);
-        $x['l_data_c'] = $this->_GetDec($b,18,4);
-        $x['l_data_u'] = $this->_GetDec($b,22,4);
-        $x['l_name'] = $this->_GetDec($b,26,2);
-        $x['l_fields'] = $this->_GetDec($b,28,2);
+        $x['vers'] = $this->_GetDec($b, 4, 2);
+        $x['purp'] = $this->_GetBin($b, 6, 2);
+        $x['meth'] = $this->_GetDec($b, 8, 2);
+        $x['time'] = $this->_GetDec($b, 10, 2);
+        $x['date'] = $this->_GetDec($b, 12, 2);
+        $x['crc32'] = $this->_GetDec($b, 14, 4);
+        $x['l_data_c'] = $this->_GetDec($b, 18, 4);
+        $x['l_data_u'] = $this->_GetDec($b, 22, 4);
+        $x['l_name'] = $this->_GetDec($b, 26, 2);
+        $x['l_fields'] = $this->_GetDec($b, 28, 2);
         $x['v_name'] = $this->_ReadData($x['l_name']);
         $x['v_fields'] = $this->_ReadData($x['l_fields']);
 
-        $x['bin'] = $b.$x['v_name'].$x['v_fields'];
+        $x['bin'] = $b . $x['v_name'] . $x['v_fields'];
 
         // Read Data
         if (isset($this->CdFileLst[$idx])) {
             $len_cd = $this->CdFileLst[$idx]['l_data_c'];
-            if ($x['l_data_c']==0) {
+            if ($x['l_data_c'] == 0) {
                 // Sometimes, the size is not specified in the local information.
                 $len = $len_cd;
             } else {
                 $len = $x['l_data_c'];
-                if ($len!=$len_cd) {
+                if ($len != $len_cd) {
                     //echo "TbsZip Warning: Local information for file #".$idx." says len=".$len.", while Central Directory says len=".$len_cd.".";
                 }
             }
         } else {
             $len = $x['l_data_c'];
-            if ($len==0) $this->RaiseError("File Data #".$idx." cannt be read because no length is specified in the Local File Header and its Central Directory information has not been found.");
+            if ($len == 0) $this->RaiseError("File Data #" . $idx . " cannt be read because no length is specified in the Local File Header and its Central Directory information has not been found.");
         }
 
         if ($ReadData) {
@@ -358,13 +358,13 @@ 
         }
 
         // Description information
-        $desc_ok = ($x['purp'][2+3]=='1');
+        $desc_ok = ($x['purp'][2 + 3] == '1');
         if ($desc_ok) {
             $b = $this->_ReadData(12);
-            $s = $this->_GetHex($b,0,4);
+            $s = $this->_GetHex($b, 0, 4);
             $d = 0;
             // the specification says the signature may or may not be present
-            if ($s=='h:08074b50') {
+            if ($s == 'h:08074b50') {
                 $b .= $this->_ReadData(4);
                 $d = 4;
                 $x['desc_bin'] = $b;
@@ -372,9 +372,9 @@ 
             } else {
                 $x['desc_bin'] = $b;
             }
-            $x['desc_crc32']    = $this->_GetDec($b,0+$d,4);
-            $x['desc_l_data_c'] = $this->_GetDec($b,4+$d,4);
-            $x['desc_l_data_u'] = $this->_GetDec($b,8+$d,4);
+            $x['desc_crc32']    = $this->_GetDec($b, 0 + $d, 4);
+            $x['desc_l_data_c'] = $this->_GetDec($b, 4 + $d, 4);
+            $x['desc_l_data_u'] = $this->_GetDec($b, 8 + $d, 4);
         }
 
         // Save file info without the data
@@ -389,15 +389,15 @@ 
 
     }
 
-    function FileReplace($NameOrIdx, $Data, $DataType=self::TBSZIP_STRING, $Compress=true) {
+    function FileReplace($NameOrIdx, $Data, $DataType = self::TBSZIP_STRING, $Compress = true) {
     // Store replacement information.
 
         $idx = $this->FileGetIdx($NameOrIdx);
-        if ($idx===false) return $this->RaiseError('File "'.$NameOrIdx.'" is not found in the Central Directory.');
+        if ($idx === false) return $this->RaiseError('File "' . $NameOrIdx . '" is not found in the Central Directory.');
 
         $pos = $this->CdFileLst[$idx]['p_loc'];
 
-        if ($Data===false) {
+        if ($Data === false) {
             // file to delete
             $this->ReplInfo[$idx] = false;
             $Result = true;
@@ -405,7 +405,7 @@ 
             // file to replace
             $Diff = - $this->CdFileLst[$idx]['l_data_c'];
             $Ref = $this->_DataCreateNewRef($Data, $DataType, $Compress, $Diff, $NameOrIdx);
-            if ($Ref===false) return false;
+            if ($Ref === false) return false;
             $this->ReplInfo[$idx] = $Ref;
             $Result = $Ref['res'];
         }
@@ -423,15 +423,15 @@ 
     function FileGetState($NameOrIdx) {
 
         $idx = $this->FileGetIdx($NameOrIdx);
-        if ($idx===false) {
+        if ($idx === false) {
             $idx = $this->FileGetIdxAdd($NameOrIdx);
-            if ($idx===false) {
+            if ($idx === false) {
                 return false;
             } else {
                 return 'a';
             }
         } elseif (isset($this->ReplInfo[$idx])) {
-            if ($this->ReplInfo[$idx]===false) {
+            if ($this->ReplInfo[$idx] === false) {
                 return 'd';
             } else {
                 return 'm';
@@ -442,7 +442,7 @@ 
 
     }
 
-    function FileCancelModif($NameOrIdx, $ReplacedAndDeleted=true) {
+    function FileCancelModif($NameOrIdx, $ReplacedAndDeleted = true) {
     // cancel added, modified or deleted modifications on a file in the archive
     // return the number of cancels
 
@@ -451,7 +451,7 @@ 
         if ($ReplacedAndDeleted) {
             // replaced or deleted files
             $idx = $this->FileGetIdx($NameOrIdx);
-            if ($idx!==false) {
+            if ($idx !== false) {
                 if (isset($this->ReplInfo[$idx])) {
                     $pos = $this->CdFileLst[$idx]['p_loc'];
                     unset($this->ReplByPos[$pos]);
@@ -463,7 +463,7 @@ 
 
         // added files
         $idx = $this->FileGetIdxAdd($NameOrIdx);
-        if ($idx!==false) {
+        if ($idx !== false) {
             unset($this->AddInfo[$idx]);
             $nbr++;
         }
@@ -472,10 +472,10 @@ 
 
     }
 
-    function Flush($Render=self::TBSZIP_DOWNLOAD, $File='', $ContentType='') {
+    function Flush($Render = self::TBSZIP_DOWNLOAD, $File = '', $ContentType = '') {
 
-        if ( ($File!=='') && ($this->ArchFile===$File) && ($Render==self::TBSZIP_FILE) ) {
-            $this->RaiseError('Method Flush() cannot overwrite the current opened archive: \''.$File.'\''); // this makes corrupted zip archives without PHP error.
+        if (($File !== '') && ($this->ArchFile === $File) && ($Render == self::TBSZIP_FILE)) {
+            $this->RaiseError('Method Flush() cannot overwrite the current opened archive: \'' . $File . '\''); // this makes corrupted zip archives without PHP error.
             return false;
         }
 
@@ -498,7 +498,7 @@ 
             $this->OutputFromArch($ArchPos, $ReplPos);
             // get current file information
             if (!isset($this->VisFileLst[$ReplIdx])) $this->_ReadFile($ReplIdx, false);
-            $FileInfo =& $this->VisFileLst[$ReplIdx];
+            $FileInfo = & $this->VisFileLst[$ReplIdx];
             $b1 = $FileInfo['bin'];
             if (isset($FileInfo['desc_bin'])) {
                 $b2 = $FileInfo['desc_bin'];
@@ -507,8 +507,8 @@ 
             }
             $info_old_len = strlen($b1) + $this->CdFileLst[$ReplIdx]['l_data_c'] + strlen($b2); // $FileInfo['l_data_c'] may have a 0 value in some archives
             // get replacement information
-            $ReplInfo =& $this->ReplInfo[$ReplIdx];
-            if ($ReplInfo===false) {
+            $ReplInfo = & $this->ReplInfo[$ReplIdx];
+            if ($ReplInfo === false) {
                 // The file is to be deleted
                 $Delta = $Delta - $info_old_len; // headers and footers are also deleted
                 $DelLst[$ReplIdx] = true;
@@ -520,22 +520,22 @@ 
                 $this->_PutDec($b1, $ReplInfo['crc32'], 14, 4); // crc32
                 $this->_PutDec($b1, $ReplInfo['len_c'], 18, 4); // l_data_c
                 $this->_PutDec($b1, $ReplInfo['len_u'], 22, 4); // l_data_u
-                if ($ReplInfo['meth']!==false) $this->_PutDec($b1, $ReplInfo['meth'], 8, 2); // meth
+                if ($ReplInfo['meth'] !== false) $this->_PutDec($b1, $ReplInfo['meth'], 8, 2); // meth
                 // prepare the bottom description if the zipped file, if any
-                if ($b2!=='') {
-                    $d = (strlen($b2)==16) ? 4 : 0; // offset because of the signature if any
-                    $this->_PutDec($b2, $ReplInfo['crc32'], $d+0, 4); // crc32
-                    $this->_PutDec($b2, $ReplInfo['len_c'], $d+4, 4); // l_data_c
-                    $this->_PutDec($b2, $ReplInfo['len_u'], $d+8, 4); // l_data_u
+                if ($b2 !== '') {
+                    $d = (strlen($b2) == 16) ? 4 : 0; // offset because of the signature if any
+                    $this->_PutDec($b2, $ReplInfo['crc32'], $d + 0, 4); // crc32
+                    $this->_PutDec($b2, $ReplInfo['len_c'], $d + 4, 4); // l_data_c
+                    $this->_PutDec($b2, $ReplInfo['len_u'], $d + 8, 4); // l_data_u
                 }
                 // output data
-                $this->OutputFromString($b1.$ReplInfo['data'].$b2);
+                $this->OutputFromString($b1 . $ReplInfo['data'] . $b2);
                 unset($ReplInfo['data']); // save PHP memory
                 $Delta = $Delta + $ReplInfo['diff'] + $ReplInfo['len_c'];
             }
             // Update the delta of positions for zipped files which are physically after the currently replaced one
-            for ($i=0;$i<$this->CdFileNbr;$i++) {
-                if ($this->CdFileLst[$i]['p_loc']>$ReplPos) {
+            for ($i = 0; $i < $this->CdFileNbr; $i++) {
+                if ($this->CdFileLst[$i]['p_loc'] > $ReplPos) {
                     $FicNewPos[$i] = $this->CdFileLst[$i]['p_loc'] + $Delta;
                 }
             }
@@ -544,13 +544,13 @@ 
         }
 
         // Ouput all the zipped files that remain before the Central Directory listing
-        if ($this->ArchHnd!==false) $this->OutputFromArch($ArchPos, $this->CdPos); // ArchHnd is false if CreateNew() has been called
+        if ($this->ArchHnd !== false) $this->OutputFromArch($ArchPos, $this->CdPos); // ArchHnd is false if CreateNew() has been called
         $ArchPos = $this->CdPos;
 
         // Output file to add
         $AddNbr = count($this->AddInfo);
         $AddDataLen = 0; // total len of added data (inlcuding file headers)
-        if ($AddNbr>0) {
+        if ($AddNbr > 0) {
             $AddPos = $ArchPos + $Delta; // position of the start
             $AddLst = array_keys($this->AddInfo);
             foreach ($AddLst as $idx) {
@@ -563,32 +563,32 @@ 
         // Modifiy file information in the Central Directory for replaced files
         $b2 = '';
         $old_cd_len = 0;
-        for ($i=0;$i<$this->CdFileNbr;$i++) {
+        for ($i = 0; $i < $this->CdFileNbr; $i++) {
             $b1 = $this->CdFileLst[$i]['bin'];
             $old_cd_len += strlen($b1);
             if (!isset($DelLst[$i])) {
-                if (isset($FicNewPos[$i])) $this->_PutDec($b1, $FicNewPos[$i], 42, 4);   // p_loc
+                if (isset($FicNewPos[$i])) $this->_PutDec($b1, $FicNewPos[$i], 42, 4); // p_loc
                 if (isset($this->ReplInfo[$i])) {
-                    $ReplInfo =& $this->ReplInfo[$i];
+                    $ReplInfo = & $this->ReplInfo[$i];
                     $this->_PutDec($b1, $time, 12, 2); // time
                     $this->_PutDec($b1, $date, 14, 2); // date
                     $this->_PutDec($b1, $ReplInfo['crc32'], 16, 4); // crc32
                     $this->_PutDec($b1, $ReplInfo['len_c'], 20, 4); // l_data_c
                     $this->_PutDec($b1, $ReplInfo['len_u'], 24, 4); // l_data_u
-                    if ($ReplInfo['meth']!==false) $this->_PutDec($b1, $ReplInfo['meth'], 10, 2); // meth
+                    if ($ReplInfo['meth'] !== false) $this->_PutDec($b1, $ReplInfo['meth'], 10, 2); // meth
                 }
                 $b2 .= $b1;
             }
         }
         $this->OutputFromString($b2);
         $ArchPos += $old_cd_len;
-        $DeltaCdLen =  $DeltaCdLen + strlen($b2) - $old_cd_len;
+        $DeltaCdLen = $DeltaCdLen + strlen($b2) - $old_cd_len;
 
         // Output until "end of central directory record"
-        if ($this->ArchHnd!==false) $this->OutputFromArch($ArchPos, $this->CdEndPos); // ArchHnd is false if CreateNew() has been called
+        if ($this->ArchHnd !== false) $this->OutputFromArch($ArchPos, $this->CdEndPos); // ArchHnd is false if CreateNew() has been called
 
         // Output file information of the Central Directory for added files
-        if ($AddNbr>0) {
+        if ($AddNbr > 0) {
             $b2 = '';
             foreach ($AddLst as $idx) {
                 $b2 .= $this->AddInfo[$idx]['bin'];
@@ -600,10 +600,10 @@ 
         // Output "end of central directory record"
         $b2 = $this->CdInfo['bin'];
         $DelNbr = count($DelLst);
-        if ( ($AddNbr>0) or ($DelNbr>0) ) {
+        if (($AddNbr > 0) or ($DelNbr > 0)) {
             // total number of entries in the central directory on this disk
             $n = $this->_GetDec($b2, 8, 2);
-            $this->_PutDec($b2, $n + $AddNbr - $DelNbr,  8, 2);
+            $this->_PutDec($b2, $n + $AddNbr - $DelNbr, 8, 2);
             // total number of entries in the central directory
             $n = $this->_GetDec($b2, 10, 2);
             $this->_PutDec($b2, $n + $AddNbr - $DelNbr, 10, 2);
@@ -612,7 +612,7 @@ 
             $this->_PutDec($b2, $n + $DeltaCdLen, 12, 4);
             $Delta = $Delta + $AddDataLen;
         }
-        $this->_PutDec($b2, $this->CdPos+$Delta , 16, 4); // p_cd  (offset of start of central directory with respect to the starting disk number)
+        $this->_PutDec($b2, $this->CdPos + $Delta, 16, 4); // p_cd  (offset of start of central directory with respect to the starting disk number)
         $this->OutputFromString($b2);
 
         $this->OutputClose();
@@ -627,32 +627,32 @@ 
 
     function OutputOpen($Render, $File, $ContentType) {
 
-        if (($Render & self::TBSZIP_FILE)==self::TBSZIP_FILE) {
+        if (($Render & self::TBSZIP_FILE) == self::TBSZIP_FILE) {
             $this->OutputMode = self::TBSZIP_FILE;
-            if (''.$File=='') $File = basename($this->ArchFile).'.zip';
+            if ('' . $File == '') $File = basename($this->ArchFile) . '.zip';
             $this->OutputHandle = @fopen($File, 'w');
-            if ($this->OutputHandle===false) {
-                return $this->RaiseError('Method Flush() cannot overwrite the target file \''.$File.'\'. This may not be a valid file path or the file may be locked by another process or because of a denied permission.');
+            if ($this->OutputHandle === false) {
+                return $this->RaiseError('Method Flush() cannot overwrite the target file \'' . $File . '\'. This may not be a valid file path or the file may be locked by another process or because of a denied permission.');
             }
-        } elseif (($Render & self::TBSZIP_STRING)==self::TBSZIP_STRING) {
+        } elseif (($Render & self::TBSZIP_STRING) == self::TBSZIP_STRING) {
             $this->OutputMode = self::TBSZIP_STRING;
             $this->OutputSrc = '';
-        } elseif (($Render & self::TBSZIP_DOWNLOAD)==self::TBSZIP_DOWNLOAD) {
+        } elseif (($Render & self::TBSZIP_DOWNLOAD) == self::TBSZIP_DOWNLOAD) {
             $this->OutputMode = self::TBSZIP_DOWNLOAD;
             // Output the file
-            if (''.$File=='') $File = basename($this->ArchFile);
-            if (($Render & self::TBSZIP_NOHEADER)==self::TBSZIP_NOHEADER) {
+            if ('' . $File == '') $File = basename($this->ArchFile);
+            if (($Render & self::TBSZIP_NOHEADER) == self::TBSZIP_NOHEADER) {
             } else {
-                header ('Pragma: no-cache');
-                if ($ContentType!='') header ('Content-Type: '.$ContentType);
-                header('Content-Disposition: attachment; filename="'.$File.'"');
+                header('Pragma: no-cache');
+                if ($ContentType != '') header('Content-Type: ' . $ContentType);
+                header('Content-Disposition: attachment; filename="' . $File . '"');
                 header('Expires: 0');
                 header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
                 header('Cache-Control: public');
                 header('Content-Description: File Transfer');
                 header('Content-Transfer-Encoding: binary');
                 $Len = $this->_EstimateNewArchSize();
-                if ($Len!==false) header('Content-Length: '.$Len);
+                if ($Len !== false) header('Content-Length: ' . $Len);
             }
         } else {
             return $this->RaiseError('Method Flush is called with a unsupported render option.');
@@ -664,10 +664,10 @@ 
 
     function OutputFromArch($pos, $pos_stop) {
         $len = $pos_stop - $pos;
-        if ($len<0) return;
+        if ($len < 0) return;
         $this->_MoveTo($pos);
         $block = 1024;
-        while ($len>0) {
+        while ($len > 0) {
             $l = min($len, $block);
             $x = $this->_ReadData($l);
             $this->OutputFromString($x);
@@ -677,9 +677,9 @@ 
     }
 
     function OutputFromString($data) {
-        if ($this->OutputMode===self::TBSZIP_DOWNLOAD) {
+        if ($this->OutputMode === self::TBSZIP_DOWNLOAD) {
             echo $data; // donwload
-        } elseif ($this->OutputMode===self::TBSZIP_STRING) {
+        } elseif ($this->OutputMode === self::TBSZIP_STRING) {
             $this->OutputSrc .= $data; // to string
         } elseif (self::TBSZIP_FILE) {
             fwrite($this->OutputHandle, $data); // to file
@@ -687,7 +687,7 @@ 
     }
 
     function OutputClose() {
-        if ( ($this->OutputMode===self::TBSZIP_FILE) && ($this->OutputHandle!==false) ) {
+        if (($this->OutputMode === self::TBSZIP_FILE) && ($this->OutputHandle !== false)) {
             fclose($this->OutputHandle);
             $this->OutputHandle = false;
         }
@@ -702,7 +702,7 @@ 
     }
 
     function _ReadData($len) {
-        if ($len>0) {
+        if ($len > 0) {
             $x = fread($this->ArchHnd, $len);
             return $x;
         } else {
@@ -717,32 +717,32 @@ 
     function _GetDec($txt, $pos, $len) {
         $x = substr($txt, $pos, $len);
         $z = 0;
-        for ($i=0;$i<$len;$i++) {
+        for ($i = 0; $i < $len; $i++) {
             $asc = ord($x[$i]);
-            if ($asc>0) $z = $z + $asc*pow(256,$i);
+            if ($asc > 0) $z = $z + $asc * pow(256, $i);
         }
         return $z;
     }
 
     function _GetHex($txt, $pos, $len) {
         $x = substr($txt, $pos, $len);
-        return 'h:'.bin2hex(strrev($x));
+        return 'h:' . bin2hex(strrev($x));
     }
 
     function _GetBin($txt, $pos, $len) {
         $x = substr($txt, $pos, $len);
         $z = '';
-        for ($i=0;$i<$len;$i++) {
+        for ($i = 0; $i < $len; $i++) {
             $asc = ord($x[$i]);
             if (isset($x[$i])) {
-                for ($j=0;$j<8;$j++) {
-                    $z .= ($asc & pow(2,$j)) ? '1' : '0';
+                for ($j = 0; $j < 8; $j++) {
+                    $z .= ($asc & pow(2, $j)) ? '1' : '0';
                 }
             } else {
                 $z .= '00000000';
             }
         }
-        return 'b:'.$z;
+        return 'b:' . $z;
     }
 
     // ----------------
@@ -751,17 +751,17 @@ 
 
     function _PutDec(&$txt, $val, $pos, $len) {
         $x = '';
-        for ($i=0;$i<$len;$i++) {
-            if ($val==0) {
+        for ($i = 0; $i < $len; $i++) {
+            if ($val == 0) {
                 $z = 0;
             } else {
                 $z = intval($val % 256);
-                if (($val<0) && ($z!=0)) { // ($z!=0) is very important, example: val=-420085702
+                if (($val < 0) && ($z != 0)) { // ($z!=0) is very important, example: val=-420085702
                     // special opration for negative value. If the number id too big, PHP stores it into a signed integer. For example: crc32('coucou') => -256185401 instead of  4038781895. NegVal = BigVal - (MaxVal+1) = BigVal - 256^4
-                    $val = ($val - $z)/256 -1;
+                    $val = ($val - $z) / 256 - 1;
                     $z = 256 + $z;
                 } else {
-                    $val = ($val - $z)/256;
+                    $val = ($val - $z) / 256;
                 }
             }
             $x .= chr($z);
@@ -771,30 +771,30 @@ 
 
     function _MsDos_Date($Timestamp = false) {
         // convert a date-time timstamp into the MS-Dos format
-        $d = ($Timestamp===false) ? getdate() : getdate($Timestamp);
-        return (($d['year']-1980)*512) + ($d['mon']*32) + $d['mday'];
+        $d = ($Timestamp === false) ? getdate() : getdate($Timestamp);
+        return (($d['year'] - 1980) * 512) + ($d['mon'] * 32) + $d['mday'];
     }
     function _MsDos_Time($Timestamp = false) {
         // convert a date-time timstamp into the MS-Dos format
-        $d = ($Timestamp===false) ? getdate() : getdate($Timestamp);
-        return ($d['hours']*2048) + ($d['minutes']*32) + intval($d['seconds']/2); // seconds are rounded to an even number in order to save 1 bit
+        $d = ($Timestamp === false) ? getdate() : getdate($Timestamp);
+        return ($d['hours'] * 2048) + ($d['minutes'] * 32) + intval($d['seconds'] / 2); // seconds are rounded to an even number in order to save 1 bit
     }
 
     function _MsDos_Debug($date, $time) {
         // Display the formated date and time. Just for debug purpose.
         // date end time are encoded on 16 bits (2 bytes) : date = yyyyyyymmmmddddd , time = hhhhhnnnnnssssss
-        $y = ($date & 65024)/512 + 1980;
-        $m = ($date & 480)/32;
+        $y = ($date & 65024) / 512 + 1980;
+        $m = ($date & 480) / 32;
         $d = ($date & 31);
-        $h = ($time & 63488)/2048;
-        $i = ($time & 1984)/32;
+        $h = ($time & 63488) / 2048;
+        $i = ($time & 1984) / 32;
         $s = ($time & 31) * 2; // seconds have been rounded to an even number in order to save 1 bit
-        return $y.'-'.str_pad($m,2,'0',STR_PAD_LEFT).'-'.str_pad($d,2,'0',STR_PAD_LEFT).' '.str_pad($h,2,'0',STR_PAD_LEFT).':'.str_pad($i,2,'0',STR_PAD_LEFT).':'.str_pad($s,2,'0',STR_PAD_LEFT);
+        return $y . '-' . str_pad($m, 2, '0', STR_PAD_LEFT) . '-' . str_pad($d, 2, '0', STR_PAD_LEFT) . ' ' . str_pad($h, 2, '0', STR_PAD_LEFT) . ':' . str_pad($i, 2, '0', STR_PAD_LEFT) . ':' . str_pad($s, 2, '0', STR_PAD_LEFT);
     }
 
     function _TxtPos($pos) {
         // Return the human readable position in both decimal and hexa
-        return $pos." (h:".dechex($pos).")";
+        return $pos . " (h:" . dechex($pos) . ")";
     }
 
     /**
@@ -807,15 +807,15 @@ 
         $nbr = 1;
         $p = false;
         $pos = ftell($this->ArchHnd) - 4 - 256;
-        while ( ($p===false) && ($nbr<256) ) {
-            if ($pos<=0) {
+        while (($p === false) && ($nbr < 256)) {
+            if ($pos <= 0) {
                 $pos = 0;
                 $nbr = 256; // in order to make this a last check
             }
             $this->_MoveTo($pos);
             $x = $this->_ReadData(256);
             $p = strpos($x, $cd_info);
-            if ($p===false) {
+            if ($p === false) {
                 $nbr++;
                 $pos = $pos - 256 - 256;
             } else {
@@ -827,7 +827,7 @@ 
 
     function _DataOuputAddedFile($Idx, $PosLoc) {
 
-        $Ref =& $this->AddInfo[$Idx];
+        $Ref = & $this->AddInfo[$Idx];
         $this->_DataPrepare($Ref); // get data from external file if necessary
 
         // Other info
@@ -835,46 +835,46 @@ 
         $date  = $this->_MsDos_Date($file_time);
         $time  = $this->_MsDos_Time($file_time);
         $len_n = strlen($Ref['name']);
-        $purp  = 2048 ; // purpose // +8 to indicates that there is an extended local header
+        $purp  = 2048; // purpose // +8 to indicates that there is an extended local header
 
         // Header for file in the data section
-        $b = 'PK'.chr(03).chr(04).str_repeat(' ',26); // signature
-        $this->_PutDec($b,20,4,2); //vers = 20
-        $this->_PutDec($b,$purp,6,2); // purp
-        $this->_PutDec($b,$Ref['meth'],8,2);  // meth
-        $this->_PutDec($b,$time,10,2); // time
-        $this->_PutDec($b,$date,12,2); // date
-        $this->_PutDec($b,$Ref['crc32'],14,4); // crc32
-        $this->_PutDec($b,$Ref['len_c'],18,4); // l_data_c
-        $this->_PutDec($b,$Ref['len_u'],22,4); // l_data_u
-        $this->_PutDec($b,$len_n,26,2); // l_name
-        $this->_PutDec($b,0,28,2); // l_fields
+        $b = 'PK' . chr(03) . chr(04) . str_repeat(' ', 26); // signature
+        $this->_PutDec($b, 20, 4, 2); //vers = 20
+        $this->_PutDec($b, $purp, 6, 2); // purp
+        $this->_PutDec($b, $Ref['meth'], 8, 2); // meth
+        $this->_PutDec($b, $time, 10, 2); // time
+        $this->_PutDec($b, $date, 12, 2); // date
+        $this->_PutDec($b, $Ref['crc32'], 14, 4); // crc32
+        $this->_PutDec($b, $Ref['len_c'], 18, 4); // l_data_c
+        $this->_PutDec($b, $Ref['len_u'], 22, 4); // l_data_u
+        $this->_PutDec($b, $len_n, 26, 2); // l_name
+        $this->_PutDec($b, 0, 28, 2); // l_fields
         $b .= $Ref['name']; // name
         $b .= ''; // fields
 
         // Output the data
-        $this->OutputFromString($b.$Ref['data']);
+        $this->OutputFromString($b . $Ref['data']);
         $OutputLen = strlen($b) + $Ref['len_c']; // new position of the cursor
         unset($Ref['data']); // save PHP memory
 
         // Information for file in the Central Directory
-        $b = 'PK'.chr(01).chr(02).str_repeat(' ',42); // signature
-        $this->_PutDec($b,20,4,2);  // vers_used = 20
-        $this->_PutDec($b,20,6,2);  // vers_necess = 20
-        $this->_PutDec($b,$purp,8,2);  // purp
-        $this->_PutDec($b,$Ref['meth'],10,2); // meth
-        $this->_PutDec($b,$time,12,2); // time
-        $this->_PutDec($b,$date,14,2); // date
-        $this->_PutDec($b,$Ref['crc32'],16,4); // crc32
-        $this->_PutDec($b,$Ref['len_c'],20,4); // l_data_c
-        $this->_PutDec($b,$Ref['len_u'],24,4); // l_data_u
-        $this->_PutDec($b,$len_n,28,2); // l_name
-        $this->_PutDec($b,0,30,2); // l_fields
-        $this->_PutDec($b,0,32,2); // l_comm
-        $this->_PutDec($b,0,34,2); // disk_num
-        $this->_PutDec($b,0,36,2); // int_file_att
-        $this->_PutDec($b,0,38,4); // ext_file_att
-        $this->_PutDec($b,$PosLoc,42,4); // p_loc
+        $b = 'PK' . chr(01) . chr(02) . str_repeat(' ', 42); // signature
+        $this->_PutDec($b, 20, 4, 2); // vers_used = 20
+        $this->_PutDec($b, 20, 6, 2); // vers_necess = 20
+        $this->_PutDec($b, $purp, 8, 2); // purp
+        $this->_PutDec($b, $Ref['meth'], 10, 2); // meth
+        $this->_PutDec($b, $time, 12, 2); // time
+        $this->_PutDec($b, $date, 14, 2); // date
+        $this->_PutDec($b, $Ref['crc32'], 16, 4); // crc32
+        $this->_PutDec($b, $Ref['len_c'], 20, 4); // l_data_c
+        $this->_PutDec($b, $Ref['len_u'], 24, 4); // l_data_u
+        $this->_PutDec($b, $len_n, 28, 2); // l_name
+        $this->_PutDec($b, 0, 30, 2); // l_fields
+        $this->_PutDec($b, 0, 32, 2); // l_comm
+        $this->_PutDec($b, 0, 34, 2); // disk_num
+        $this->_PutDec($b, 0, 36, 2); // int_file_att
+        $this->_PutDec($b, 0, 38, 4); // ext_file_att
+        $this->_PutDec($b, $PosLoc, 42, 4); // p_loc
         $b .= $Ref['name']; // v_name
         $b .= ''; // v_fields
         $b .= ''; // v_comm
@@ -908,7 +908,7 @@ 
         }
 
         // TODO support for data taken from okapi cache
-        if ($DataType==self::TBSZIP_STRING) {
+        if ($DataType == self::TBSZIP_STRING) {
             $path = false;
             if ($Compress) {
                 // we compress now in order to save PHP memory
@@ -918,7 +918,7 @@ 
                 $len_c = strlen($Data);
             } else {
                 $len_c = strlen($Data);
-                if ($len_u===false) {
+                if ($len_u === false) {
                     $len_u = $len_c;
                     $crc32 = crc32($Data);
                 }
@@ -929,11 +929,11 @@ 
             $fi = stat($path);
             if ($fi !== false) {
                 $fz = $fi['size'];
-                if ($len_u===false) $len_u = $fz;
+                if ($len_u === false) $len_u = $fz;
                 $len_c = ($Compress) ? false : $fz;
                 $file_time = $fi['mtime'];
             } else {
-                return $this->RaiseError("Cannot add the file '".$path."' because it is not found.");
+                return $this->RaiseError("Cannot add the file '" . $path . "' because it is not found.");
             }
         }
 
@@ -946,10 +946,10 @@ 
     function _DataPrepare(&$Ref) {
         // returns the real size of data
         // TODO: support for data returned from okapi cache
-        if ($Ref['path']!==false) {
+        if ($Ref['path'] !== false) {
             $Ref['data'] = file_get_contents($Ref['path']);
-            if ($Ref['crc32']===false) $Ref['crc32'] = crc32($Ref['data']);
-            if ($Ref['len_c']===false) {
+            if ($Ref['crc32'] === false) $Ref['crc32'] = crc32($Ref['data']);
+            if ($Ref['len_c'] === false) {
                 // means the data must be compressed
                 $Ref['data'] = gzdeflate($Ref['data']);
                 $Ref['len_c'] = strlen($Ref['data']);
@@ -959,7 +959,7 @@ 
     /**
      * Return the size of the new archive, or false if it cannot be calculated (because of external file that must be compressed before to be insered)
      */
-    function _EstimateNewArchSize($Optim=true) {
+    function _EstimateNewArchSize($Optim = true) {
 
         if ($this->ArchIsNew) {
             $Len = strlen($this->CdInfo['bin']);
@@ -972,19 +972,19 @@ 
 
         // files to replace or delete
         foreach ($this->ReplByPos as $i) {
-            $Ref =& $this->ReplInfo[$i];
-            if ($Ref===false) {
+            $Ref = & $this->ReplInfo[$i];
+            if ($Ref === false) {
                 // file to delete
-                $Info =& $this->CdFileLst[$i];
+                $Info = & $this->CdFileLst[$i];
                 if (!isset($this->VisFileLst[$i])) {
                     if ($Optim) return false; // if $Optimization is set to true, then we d'ont rewind to read information
                     $this->_MoveTo($Info['p_loc']);
                     $this->_ReadFile($i, false);
                 }
-                $Vis =& $this->VisFileLst[$i];
-                $Len += -strlen($Vis['bin']) -strlen($Info['bin']) - $Info['l_data_c'];
+                $Vis = & $this->VisFileLst[$i];
+                $Len += -strlen($Vis['bin']) - strlen($Info['bin']) - $Info['l_data_c'];
                 if (isset($Vis['desc_bin'])) $Len += -strlen($Vis['desc_bin']);
-            } elseif ($Ref['len_c']===false) {
+            } elseif ($Ref['len_c'] === false) {
                 return false; // information not yet known
             } else {
                 // file to replace
@@ -995,8 +995,8 @@ 
         // files to add
         $i_lst = array_keys($this->AddInfo);
         foreach ($i_lst as $i) {
-            $Ref =& $this->AddInfo[$i];
-            if ($Ref['len_c']===false) {
+            $Ref = & $this->AddInfo[$i];
+            if ($Ref['len_c'] === false) {
                 return false; // information not yet known
             } else {
                 $Len += $Ref['len_c'] + $Ref['diff'];

htdocs/okapi/service_runner.php

Spacing +18 added lines, -18 removed lines

@@ -73,15 +73,15 @@ 
     {
         if (!self::exists($service_name))
             throw new Exception();
-        require_once($GLOBALS['rootpath']."okapi/$service_name.php");
+        require_once($GLOBALS['rootpath'] . "okapi/$service_name.php");
         try
         {
-            return call_user_func(array('\\okapi\\'.
-                str_replace('/', '\\', $service_name).'\\WebService', 'options'));
+            return call_user_func(array('\\okapi\\' .
+                str_replace('/', '\\', $service_name) . '\\WebService', 'options'));
         } catch (Exception $e)
         {
-            throw new Exception("Make sure you've declared your WebService class ".
-                "in an valid namespace (".'okapi\\'.str_replace('/', '\\', $service_name)."); ".
+            throw new Exception("Make sure you've declared your WebService class " .
+                "in an valid namespace (" . 'okapi\\' . str_replace('/', '\\', $service_name) . "); " .
                 $e->getMessage());
         }
     }
@@ -120,13 +120,13 @@ 
         $options = self::options($service_name);
         if ($options['min_auth_level'] >= 2 && $request->consumer == null)
         {
-            throw new Exception("Method '$service_name' called with mismatched OkapiRequest: ".
-                "\$request->consumer MAY NOT be empty for Level 2 and Level 3 methods. Provide ".
+            throw new Exception("Method '$service_name' called with mismatched OkapiRequest: " .
+                "\$request->consumer MAY NOT be empty for Level 2 and Level 3 methods. Provide " .
                 "a dummy Consumer if you have to.");
         }
         if ($options['min_auth_level'] >= 3 && $request->token == null)
         {
-            throw new Exception("Method '$service_name' called with mismatched OkapiRequest: ".
+            throw new Exception("Method '$service_name' called with mismatched OkapiRequest: " .
                 "\$request->token MAY NOT be empty for Level 3 methods.");
         }
 
@@ -134,14 +134,14 @@ 
         Okapi::gettext_domain_init();
         try
         {
-            require_once($GLOBALS['rootpath']."okapi/$service_name.php");
-            $response = call_user_func(array('\\okapi\\'.
-                str_replace('/', '\\', $service_name).'\\WebService', 'call'), $request);
+            require_once($GLOBALS['rootpath'] . "okapi/$service_name.php");
+            $response = call_user_func(array('\\okapi\\' .
+                str_replace('/', '\\', $service_name) . '\\WebService', 'call'), $request);
             if ($options['min_auth_level'] >= 3 && $request->token->token_type == "access")
             {
                 Db::execute("
                     update user set last_login=now()
-                    where user_id='".Db::escape_string($request->token->user_id)."'
+                    where user_id='".Db::escape_string($request->token->user_id) . "'
                 ");
             }
             Okapi::gettext_domain_restore();
@@ -166,7 +166,7 @@ 
      */
     public static function save_stats_extra($extra_name, $request, $runtime)
     {
-        self::save_stats("extra/".$extra_name, $request, $runtime);
+        self::save_stats("extra/" . $extra_name, $request, $runtime);
     }
 
     private static function save_stats($service_name, $request, $runtime)
@@ -195,11 +195,11 @@ 
             insert into okapi_stats_temp (`datetime`, consumer_key, user_id, service_name, calltype, runtime)
             values (
                 now(),
-                '".Db::escape_string($consumer_key)."',
-                '".Db::escape_string($user_id)."',
-                '".Db::escape_string($service_name)."',
-                '".Db::escape_string($calltype)."',
-                '".Db::escape_string($runtime)."'
+                '".Db::escape_string($consumer_key) . "',
+                '".Db::escape_string($user_id) . "',
+                '".Db::escape_string($service_name) . "',
+                '".Db::escape_string($calltype) . "',
+                '".Db::escape_string($runtime) . "'
             );
         ");
     }