OpencachingDeutschland / oc-server3

htdocs/okapi/services/caches/geocaches.php

Indentation +3 added lines, -3 removed lines

@@ -453,7 +453,7 @@ 
             # OCDE caches can also be indirectly watched by watching cache lists:
             if (Settings::get('OC_BRANCH') == 'oc.de')
             {
-              $tmp = Db::select_column("
+                $tmp = Db::select_column("
                   select c.wp_oc
                   from
                       caches c,
@@ -464,8 +464,8 @@ 
                       and clw.cache_list_id = cli.cache_list_id
                       and clw.user_id = '".Db::escape_string($request->token->user_id)."'
               ");
-              foreach ($tmp as $cache_code)
-                  $tmp2[$cache_code] = true;
+                foreach ($tmp as $cache_code)
+                    $tmp2[$cache_code] = true;
             }
 
             foreach ($results as $cache_code => &$result_ref)

htdocs/okapi/services/caches/formatters/gpx.php

Indentation +1 added lines, -1 removed lines

@@ -465,7 +465,7 @@
                 $ggz_entry['ratings'] = array();
                 $ratings_ref = &$ggz_entry['ratings'];
                 if (isset($cache_ref['rating'])){
-                   $ratings_ref['awesomeness'] = $cache_ref['rating'];
+                    $ratings_ref['awesomeness'] = $cache_ref['rating'];
                 }
                 $ratings_ref['difficulty'] = $cache_ref['difficulty'];
                 if (!isset($cache_ref['size'])) {

htdocs/okapi/oauth.php

Indentation +452 added lines, -452 removed lines

@@ -55,162 +55,162 @@ 
 class OAuthClientException extends OAuthException {}
 /** OAuth server errors. */
 abstract class OAuthServerException extends OAuthException {
-  abstract public function getHttpStatusCode();
-  protected function provideExtras(&$extras) {
+    abstract public function getHttpStatusCode();
+    protected function provideExtras(&$extras) {
     $extras['reason_stack'][] = 'invalid_oauth_request';
-  }
-  public function getOkapiJSON() {
+    }
+    public function getOkapiJSON() {
     $extras = array(
-      'developer_message' => $this->getMessage(),
-      'reason_stack' => array(),
+        'developer_message' => $this->getMessage(),
+        'reason_stack' => array(),
     );
     $this->provideExtras($extras);
     $extras['more_info'] = "http://opencaching.pl/okapi/introduction.html#errors";
     return json_encode(array("error" => $extras));
-  }
+    }
 }
 
 # More subclasses of server exceptions.
 
 /** OAuth server errors which should result in HTTP 400 response. */
 abstract class OAuthServer400Exception extends OAuthServerException {
-  protected function provideExtras(&$extras) {
+    protected function provideExtras(&$extras) {
     parent::provideExtras($extras);
     $extras['status'] = 400;
-  }
-  public function getHttpStatusCode() { return 400; }
+    }
+    public function getHttpStatusCode() { return 400; }
 }
 /** OAuth server errors which should result in HTTP 401 response. */
 abstract class OAuthServer401Exception extends OAuthServerException {
-  protected function provideExtras(&$extras) {
+    protected function provideExtras(&$extras) {
     parent::provideExtras($extras);
     $extras['status'] = 401;
-  }
-  public function getHttpStatusCode() { return 401; }
+    }
+    public function getHttpStatusCode() { return 401; }
 }
 
 /** Client asked for an unsupported OAuth version (not 1.0). */
 class OAuthVersionNotSupportedException extends OAuthServer400Exception {
-  protected function provideExtras(&$extras) {
+    protected function provideExtras(&$extras) {
     parent::provideExtras($extras);
     $extras['reason_stack'][] = 'unsupported_oauth_version';
-  }
+    }
 }
 /** Client didn't provide one of the key OAuth parameters. */
 class OAuthMissingParameterException extends OAuthServer400Exception {
-  protected $param_name;
-  protected function provideExtras(&$extras) {
+    protected $param_name;
+    protected function provideExtras(&$extras) {
     parent::provideExtras($extras);
     $extras['reason_stack'][] = 'missing_parameter';
     $extras['parameter'] = $this->param_name;
-  }
-  public function __construct($param_name) {
+    }
+    public function __construct($param_name) {
     parent::__construct("Missing '$param_name' parameter. This parameter is required.");
     $this->param_name = $param_name;
-  }
-  public function getParamName() { return $this->param_name; }
+    }
+    public function getParamName() { return $this->param_name; }
 }
 /** Client used unsupported signature method. */
 class OAuthUnsupportedSignatureMethodException extends OAuthServer400Exception {
-  protected function provideExtras(&$extras) {
+    protected function provideExtras(&$extras) {
     parent::provideExtras($extras);
     $extras['reason_stack'][] = 'unsupported_signature_method';
-  }
+    }
 }
 /** Client provided invalid Consumer Key. */
 class OAuthInvalidConsumerException extends OAuthServer401Exception {
-  protected function provideExtras(&$extras) {
+    protected function provideExtras(&$extras) {
     parent::provideExtras($extras);
     $extras['reason_stack'][] = 'invalid_consumer';
-  }
+    }
 }
 /** Client provider invalid token (either Request Token or Access Token). */
 class OAuthInvalidTokenException extends OAuthServer401Exception {
-  protected function provideExtras(&$extras) {
+    protected function provideExtras(&$extras) {
     parent::provideExtras($extras);
     $extras['reason_stack'][] = 'invalid_token';
-  }
+    }
 }
 /** Client's signature was invalid. */
 class OAuthInvalidSignatureException extends OAuthServer401Exception {
-  protected function provideExtras(&$extras) {
+    protected function provideExtras(&$extras) {
     parent::provideExtras($extras);
     $extras['reason_stack'][] = 'invalid_signature';
-  }
+    }
 }
 /** Client used expired timestamp (or timestamp too far in future). */
 class OAuthExpiredTimestampException extends OAuthServer400Exception {
-  protected $usersTimestamp;
-  protected $ourTimestamp;
-  protected $threshold;
-  protected function provideExtras(&$extras) {
+    protected $usersTimestamp;
+    protected $ourTimestamp;
+    protected $threshold;
+    protected function provideExtras(&$extras) {
     parent::provideExtras($extras);
     $extras['reason_stack'][] = 'invalid_timestamp';
     $extras['yours'] = $this->usersTimestamp;
     $extras['ours'] = $this->ourTimestamp;
     $extras['difference'] = $this->ourTimestamp - $this->usersTimestamp;
     $extras['threshold'] = $this->threshold;
-  }
-  public function __construct($users, $ours, $threshold) {
+    }
+    public function __construct($users, $ours, $threshold) {
     $this->usersTimestamp = $users;
     $this->ourTimestamp = $ours;
     $this->threshold = $threshold;
     parent::__construct("Expired timestamp, yours $this->usersTimestamp, ours $this->ourTimestamp (threshold $this->threshold).");
-  }
-  public function getUsersTimestamp() { return $this->usersTimestamp; }
-  public function getOurTimestamp() { return $this->ourTimestamp; }
+    }
+    public function getUsersTimestamp() { return $this->usersTimestamp; }
+    public function getOurTimestamp() { return $this->ourTimestamp; }
 }
 /** Client used the same nonce for the second time. */
 class OAuthNonceAlreadyUsedException extends OAuthServer400Exception {
-  protected function provideExtras(&$extras) {
+    protected function provideExtras(&$extras) {
     parent::provideExtras($extras);
     $extras['reason_stack'][] = 'nonce_already_used';
-  }
+    }
 }
 
 class OAuthConsumer {
-  public $key;
-  public $secret;
+    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;
-  }
+    }
 
-  function __toString() {
+    function __toString() {
     return "OAuthConsumer[key=$this->key,secret=$this->secret]";
-  }
+    }
 }
 
 class OAuthToken {
-  // access tokens and request tokens
-  public $key;
-  public $secret;
-
-  /**
-   * key = the token
-   * secret = the token secret
-   */
-  function __construct($key, $secret) {
+    // access tokens and request tokens
+    public $key;
+    public $secret;
+
+    /**
+     * key = the token
+     * secret = the token secret
+     */
+    function __construct($key, $secret) {
     $this->key = $key;
     $this->secret = $secret;
-  }
+    }
 
-  /**
-   * generates the basic string serialization of a token that a server
-   * would respond to request_token and access_token calls with
-   */
-  function to_string() {
+    /**
+     * generates the basic string serialization of a token that a server
+     * would respond to request_token and access_token calls with
+     */
+    function to_string() {
     return "oauth_token=" .
-           OAuthUtil::urlencode_rfc3986($this->key) .
-           "&oauth_token_secret=" .
-           OAuthUtil::urlencode_rfc3986($this->secret);
-  }
+            OAuthUtil::urlencode_rfc3986($this->key) .
+            "&oauth_token_secret=" .
+            OAuthUtil::urlencode_rfc3986($this->secret);
+    }
 
-  function __toString() {
+    function __toString() {
     return $this->to_string();
-  }
+    }
 }
 
 /**
@@ -218,52 +218,52 @@ 
  * See section 9 ("Signing Requests") in the spec
  */
 abstract class OAuthSignatureMethod {
-  /**
-   * Needs to return the name of the Signature Method (ie HMAC-SHA1)
-   * @return string
-   */
-  abstract public function get_name();
-
-  /**
-   * Build up the signature
-   * NOTE: The output of this function MUST NOT be urlencoded.
-   * the encoding is handled in OAuthRequest when the final
-   * request is serialized
-   * @param OAuthRequest $request
-   * @param OAuthConsumer $consumer
-   * @param OAuthToken $token
-   * @return string
-   */
-  abstract public function build_signature($request, $consumer, $token);
-
-  /**
-   * Verifies that a given signature is correct
-   * @param OAuthRequest $request
-   * @param OAuthConsumer $consumer
-   * @param OAuthToken $token
-   * @param string $signature
-   * @return bool
-   */
-  public function check_signature($request, $consumer, $token, $signature) {
+    /**
+     * Needs to return the name of the Signature Method (ie HMAC-SHA1)
+     * @return string
+     */
+    abstract public function get_name();
+
+    /**
+     * Build up the signature
+     * NOTE: The output of this function MUST NOT be urlencoded.
+     * the encoding is handled in OAuthRequest when the final
+     * request is serialized
+     * @param OAuthRequest $request
+     * @param OAuthConsumer $consumer
+     * @param OAuthToken $token
+     * @return string
+     */
+    abstract public function build_signature($request, $consumer, $token);
+
+    /**
+     * Verifies that a given signature is correct
+     * @param OAuthRequest $request
+     * @param OAuthConsumer $consumer
+     * @param OAuthToken $token
+     * @param string $signature
+     * @return bool
+     */
+    public function check_signature($request, $consumer, $token, $signature) {
     $built = $this->build_signature($request, $consumer, $token);
 
     // Check for zero length, although unlikely here
     if (strlen($built) == 0 || strlen($signature) == 0) {
-      return false;
+        return false;
     }
 
     if (strlen($built) != strlen($signature)) {
-      return false;
+        return false;
     }
 
     // Avoid a timing leak with a (hopefully) time insensitive compare
     $result = 0;
     for ($i = 0; $i < strlen($signature); $i++) {
-      $result |= ord($built{$i}) ^ ord($signature{$i});
+        $result |= ord($built{$i}) ^ ord($signature{$i});
     }
 
     return $result == 0;
-  }
+    }
 }
 
 /**
@@ -274,24 +274,24 @@ 
  *   - Chapter 9.2 ("HMAC-SHA1")
  */
 class OAuthSignatureMethod_HMAC_SHA1 extends OAuthSignatureMethod {
-  function get_name() {
+    function get_name() {
     return "HMAC-SHA1";
-  }
+    }
 
-  public function build_signature($request, $consumer, $token) {
+    public function build_signature($request, $consumer, $token) {
     $base_string = $request->get_signature_base_string();
     $request->base_string = $base_string;
 
     $key_parts = array(
-      $consumer->secret,
-      ($token) ? $token->secret : ""
+        $consumer->secret,
+        ($token) ? $token->secret : ""
     );
 
     $key_parts = OAuthUtil::urlencode_rfc3986($key_parts);
     $key = implode('&', $key_parts);
 
     return base64_encode(hash_hmac('sha1', $base_string, $key, true));
-  }
+    }
 }
 
 /**
@@ -300,23 +300,23 @@ 
  *   - Chapter 9.4 ("PLAINTEXT")
  */
 class OAuthSignatureMethod_PLAINTEXT extends OAuthSignatureMethod {
-  public function get_name() {
+    public function get_name() {
     return "PLAINTEXT";
-  }
-
-  /**
-   * oauth_signature is set to the concatenated encoded values of the Consumer Secret and
-   * Token Secret, separated by a '&' character (ASCII code 38), even if either secret is
-   * empty. The result MUST be encoded again.
-   *   - Chapter 9.4.1 ("Generating Signatures")
-   *
-   * Please note that the second encoding MUST NOT happen in the SignatureMethod, as
-   * OAuthRequest handles this!
-   */
-  public function build_signature($request, $consumer, $token) {
+    }
+
+    /**
+     * oauth_signature is set to the concatenated encoded values of the Consumer Secret and
+     * Token Secret, separated by a '&' character (ASCII code 38), even if either secret is
+     * empty. The result MUST be encoded again.
+     *   - Chapter 9.4.1 ("Generating Signatures")
+     *
+     * Please note that the second encoding MUST NOT happen in the SignatureMethod, as
+     * OAuthRequest handles this!
+     */
+    public function build_signature($request, $consumer, $token) {
     $key_parts = array(
-      $consumer->secret,
-      ($token) ? $token->secret : ""
+        $consumer->secret,
+        ($token) ? $token->secret : ""
     );
 
     $key_parts = OAuthUtil::urlencode_rfc3986($key_parts);
@@ -324,7 +324,7 @@ 
     $request->base_string = $key;
 
     return $key;
-  }
+    }
 }
 
 /**
@@ -336,25 +336,25 @@ 
  *   - Chapter 9.3 ("RSA-SHA1")
  */
 abstract class OAuthSignatureMethod_RSA_SHA1 extends OAuthSignatureMethod {
-  public function get_name() {
+    public function get_name() {
     return "RSA-SHA1";
-  }
-
-  // Up to the SP to implement this lookup of keys. Possible ideas are:
-  // (1) do a lookup in a table of trusted certs keyed off of consumer
-  // (2) fetch via http using a url provided by the requester
-  // (3) some sort of specific discovery code based on request
-  //
-  // Either way should return a string representation of the certificate
-  protected abstract function fetch_public_cert(&$request);
-
-  // Up to the SP to implement this lookup of keys. Possible ideas are:
-  // (1) do a lookup in a table of trusted certs keyed off of consumer
-  //
-  // Either way should return a string representation of the certificate
-  protected abstract function fetch_private_cert(&$request);
-
-  public function build_signature($request, $consumer, $token) {
+    }
+
+    // Up to the SP to implement this lookup of keys. Possible ideas are:
+    // (1) do a lookup in a table of trusted certs keyed off of consumer
+    // (2) fetch via http using a url provided by the requester
+    // (3) some sort of specific discovery code based on request
+    //
+    // Either way should return a string representation of the certificate
+    protected abstract function fetch_public_cert(&$request);
+
+    // Up to the SP to implement this lookup of keys. Possible ideas are:
+    // (1) do a lookup in a table of trusted certs keyed off of consumer
+    //
+    // Either way should return a string representation of the certificate
+    protected abstract function fetch_private_cert(&$request);
+
+    public function build_signature($request, $consumer, $token) {
     $base_string = $request->get_signature_base_string();
     $request->base_string = $base_string;
 
@@ -371,9 +371,9 @@ 
     openssl_free_key($privatekeyid);
 
     return base64_encode($signature);
-  }
+    }
 
-  public function check_signature($request, $consumer, $token, $signature) {
+    public function check_signature($request, $consumer, $token, $signature) {
     $decoded_sig = base64_decode($signature);
 
     $base_string = $request->get_signature_base_string();
@@ -391,39 +391,39 @@ 
     openssl_free_key($publickeyid);
 
     return $ok == 1;
-  }
+    }
 }
 
 class OAuthRequest {
-  protected $parameters;
-  protected $http_method;
-  protected $http_url;
-  // for debug purposes
-  public $base_string;
-  public static $version = '1.0';
-  public static $POST_INPUT = 'php://input';
-
-  function __construct($http_method, $http_url, $parameters=NULL) {
+    protected $parameters;
+    protected $http_method;
+    protected $http_url;
+    // for debug purposes
+    public $base_string;
+    public static $version = '1.0';
+    public static $POST_INPUT = 'php://input';
+
+    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);
     $this->parameters = $parameters;
     $this->http_method = $http_method;
     $this->http_url = $http_url;
-  }
+    }
 
 
-  /**
-   * 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) {
+    /**
+     * 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) {
     $scheme = (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != "on")
               ? 'http'
               : 'https';
     $http_url = ($http_url) ? $http_url : $scheme .
-                              '://' . $_SERVER['SERVER_NAME'] .
-                              ':' .
-                              $_SERVER['SERVER_PORT'] .
-                              $_SERVER['REQUEST_URI'];
+                                '://' . $_SERVER['SERVER_NAME'] .
+                                ':' .
+                                $_SERVER['SERVER_PORT'] .
+                                $_SERVER['REQUEST_URI'];
     $http_method = ($http_method) ? $http_method : $_SERVER['REQUEST_METHOD'];
 
     // We weren't handed any parameters, so let's find the ones relevant to
@@ -431,131 +431,131 @@ 
     // If you run XML-RPC or similar you should use this to provide your own
     // parsed parameter-list
     if (!$parameters) {
-      // Find request headers
-      $request_headers = OAuthUtil::get_headers();
+        // Find request headers
+        $request_headers = OAuthUtil::get_headers();
 
-      // Parse the query-string to find GET parameters
-      $parameters = OAuthUtil::parse_parameters($_SERVER['QUERY_STRING']);
+        // Parse the query-string to find GET parameters
+        $parameters = OAuthUtil::parse_parameters($_SERVER['QUERY_STRING']);
 
-      // It's a POST request of the proper content-type, so parse POST
-      // parameters and add those overriding any duplicates from GET
-      if ($http_method == "POST"
+        // It's a POST request of the proper content-type, so parse POST
+        // parameters and add those overriding any duplicates from GET
+        if ($http_method == "POST"
           &&  isset($request_headers['Content-Type'])
           && strstr($request_headers['Content-Type'],
-                     'application/x-www-form-urlencoded')
-          ) {
+                        'application/x-www-form-urlencoded')
+            ) {
         $post_data = OAuthUtil::parse_parameters(
-          file_get_contents(self::$POST_INPUT)
+            file_get_contents(self::$POST_INPUT)
         );
         $parameters = array_merge($parameters, $post_data);
-      }
+        }
 
-      // We have a Authorization-header with OAuth data. Parse the header
-      // and add those overriding any duplicates from GET or POST
-      if (isset($request_headers['Authorization']) && substr($request_headers['Authorization'], 0, 6) == 'OAuth ') {
+        // We have a Authorization-header with OAuth data. Parse the header
+        // and add those overriding any duplicates from GET or POST
+        if (isset($request_headers['Authorization']) && substr($request_headers['Authorization'], 0, 6) == 'OAuth ') {
         $header_parameters = OAuthUtil::split_header(
-          $request_headers['Authorization']
+            $request_headers['Authorization']
         );
         $parameters = array_merge($parameters, $header_parameters);
-      }
+        }
 
     }
 
     return new OAuthRequest($http_method, $http_url, $parameters);
-  }
+    }
 
-  /**
-   * 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) {
+    /**
+     * 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();
     $defaults = array("oauth_version" => OAuthRequest::$version,
-                      "oauth_nonce" => OAuthRequest::generate_nonce(),
-                      "oauth_timestamp" => OAuthRequest::generate_timestamp(),
-                      "oauth_consumer_key" => $consumer->key);
+                        "oauth_nonce" => OAuthRequest::generate_nonce(),
+                        "oauth_timestamp" => OAuthRequest::generate_timestamp(),
+                        "oauth_consumer_key" => $consumer->key);
     if ($token)
-      $defaults['oauth_token'] = $token->key;
+        $defaults['oauth_token'] = $token->key;
 
     $parameters = array_merge($defaults, $parameters);
 
     return new OAuthRequest($http_method, $http_url, $parameters);
-  }
+    }
 
-  public function set_parameter($name, $value, $allow_duplicates = true) {
+    public function set_parameter($name, $value, $allow_duplicates = true) {
     if ($allow_duplicates && isset($this->parameters[$name])) {
-      // We have already added parameter(s) with this name, so add to the list
-      if (is_scalar($this->parameters[$name])) {
+        // We have already added parameter(s) with this name, so add to the list
+        if (is_scalar($this->parameters[$name])) {
         // This is the first duplicate, so transform scalar (string)
         // into an array so we can add the duplicates
         $this->parameters[$name] = array($this->parameters[$name]);
-      }
+        }
 
-      $this->parameters[$name][] = $value;
+        $this->parameters[$name][] = $value;
     } else {
-      $this->parameters[$name] = $value;
+        $this->parameters[$name] = $value;
+    }
     }
-  }
 
-  public function get_parameter($name) {
+    public function get_parameter($name) {
     return isset($this->parameters[$name]) ? $this->parameters[$name] : null;
-  }
+    }
 
-  public function get_parameters() {
+    public function get_parameters() {
     return $this->parameters;
-  }
+    }
 
-  public function unset_parameter($name) {
+    public function unset_parameter($name) {
     unset($this->parameters[$name]);
-  }
+    }
 
-  /**
-   * The request parameters, sorted and concatenated into a normalized string.
-   * @return string
-   */
-  public function get_signable_parameters() {
+    /**
+     * The request parameters, sorted and concatenated into a normalized string.
+     * @return string
+     */
+    public function get_signable_parameters() {
     // Grab all parameters
     $params = $this->parameters;
 
     // Remove oauth_signature if present
     // Ref: Spec: 9.1.1 ("The oauth_signature parameter MUST be excluded.")
     if (isset($params['oauth_signature'])) {
-      unset($params['oauth_signature']);
+        unset($params['oauth_signature']);
     }
 
     return OAuthUtil::build_http_query($params);
-  }
-
-  /**
-   * Returns the base string of this request
-   *
-   * The base string defined as the method, the url
-   * and the parameters (normalized), each urlencoded
-   * and the concated with &.
-   */
-  public function get_signature_base_string() {
+    }
+
+    /**
+     * Returns the base string of this request
+     *
+     * The base string defined as the method, the url
+     * and the parameters (normalized), each urlencoded
+     * and the concated with &.
+     */
+    public function get_signature_base_string() {
     $parts = array(
-      $this->get_normalized_http_method(),
-      $this->get_normalized_http_url(),
-      $this->get_signable_parameters()
+        $this->get_normalized_http_method(),
+        $this->get_normalized_http_url(),
+        $this->get_signable_parameters()
     );
 
     $parts = OAuthUtil::urlencode_rfc3986($parts);
 
     return implode('&', $parts);
-  }
+    }
 
-  /**
-   * just uppercases the http method
-   */
-  public function get_normalized_http_method() {
+    /**
+     * just uppercases the http method
+     */
+    public function get_normalized_http_method() {
     return strtoupper($this->http_method);
-  }
+    }
 
-  /**
-   * parses the url and rebuilds it to be
-   * scheme://host/path
-   */
-  public function get_normalized_http_url() {
+    /**
+     * parses the url and rebuilds it to be
+     * scheme://host/path
+     */
+    public function get_normalized_http_url() {
     $parts = parse_url($this->http_url);
 
     $scheme = (isset($parts['scheme'])) ? $parts['scheme'] : 'http';
@@ -565,118 +565,118 @@ 
 
     if (($scheme == 'https' && $port != '443')
         || ($scheme == 'http' && $port != '80')) {
-      $host = "$host:$port";
+        $host = "$host:$port";
     }
     return "$scheme://$host$path";
-  }
+    }
 
-  /**
-   * builds a url usable for a GET request
-   */
-  public function to_url() {
+    /**
+     * builds a url usable for a GET request
+     */
+    public function to_url() {
     $post_data = $this->to_postdata();
     $out = $this->get_normalized_http_url();
     if ($post_data) {
-      $out .= '?'.$post_data;
+        $out .= '?'.$post_data;
     }
     return $out;
-  }
+    }
 
-  /**
-   * builds the data one would send in a POST request
-   */
-  public function to_postdata() {
+    /**
+     * builds the data one would send in a POST request
+     */
+    public function to_postdata() {
     return OAuthUtil::build_http_query($this->parameters);
-  }
+    }
 
-  /**
-   * builds the Authorization: header
-   */
-  public function to_header($realm=null) {
+    /**
+     * builds the Authorization: header
+     */
+    public function to_header($realm=null) {
     $first = true;
     if($realm) {
-      $out = 'Authorization: OAuth realm="' . OAuthUtil::urlencode_rfc3986($realm) . '"';
-      $first = false;
+        $out = 'Authorization: OAuth realm="' . OAuthUtil::urlencode_rfc3986($realm) . '"';
+        $first = false;
     } else
-      $out = 'Authorization: OAuth';
+        $out = 'Authorization: OAuth';
 
     $total = array();
     foreach ($this->parameters as $k => $v) {
-      if (substr($k, 0, 5) != "oauth") continue;
-      if (is_array($v)) {
+        if (substr($k, 0, 5) != "oauth") continue;
+        if (is_array($v)) {
         throw new OAuthClientException('Arrays not supported in headers.');
-      }
-      $out .= ($first) ? ' ' : ',';
-      $out .= OAuthUtil::urlencode_rfc3986($k) .
-              '="' .
-              OAuthUtil::urlencode_rfc3986($v) .
-              '"';
-      $first = false;
+        }
+        $out .= ($first) ? ' ' : ',';
+        $out .= OAuthUtil::urlencode_rfc3986($k) .
+                '="' .
+                OAuthUtil::urlencode_rfc3986($v) .
+                '"';
+        $first = false;
     }
     return $out;
-  }
+    }
 
-  public function __toString() {
+    public function __toString() {
     return $this->to_url();
-  }
+    }
 
 
-  public function sign_request($signature_method, $consumer, $token) {
+    public function sign_request($signature_method, $consumer, $token) {
     $this->set_parameter(
-      "oauth_signature_method",
-      $signature_method->get_name(),
-      false
+        "oauth_signature_method",
+        $signature_method->get_name(),
+        false
     );
     $signature = $this->build_signature($signature_method, $consumer, $token);
     $this->set_parameter("oauth_signature", $signature, false);
-  }
+    }
 
-  public function build_signature($signature_method, $consumer, $token) {
+    public function build_signature($signature_method, $consumer, $token) {
     $signature = $signature_method->build_signature($this, $consumer, $token);
     return $signature;
-  }
+    }
 
-  /**
-   * util function: current timestamp
-   */
-  private static function generate_timestamp() {
+    /**
+     * util function: current timestamp
+     */
+    private static function generate_timestamp() {
     return time();
-  }
+    }
 
-  /**
-   * util function: current nonce
-   */
-  private static function generate_nonce() {
+    /**
+     * util function: current nonce
+     */
+    private static function generate_nonce() {
     $mt = microtime();
     $rand = mt_rand();
 
     return md5($mt . $rand); // md5s look nicer than numbers
-  }
+    }
 }
 
 class OAuthServer {
-  protected $timestamp_threshold = 300; // in seconds, five minutes
-  protected $version = '1.0';             // hi blaine
-  protected $signature_methods = array();
+    protected $timestamp_threshold = 300; // in seconds, five minutes
+    protected $version = '1.0';             // hi blaine
+    protected $signature_methods = array();
 
-  protected $data_store;
+    protected $data_store;
 
-  function __construct($data_store) {
+    function __construct($data_store) {
     $this->data_store = $data_store;
-  }
+    }
 
-  public function add_signature_method($signature_method) {
+    public function add_signature_method($signature_method) {
     $this->signature_methods[$signature_method->get_name()] =
-      $signature_method;
-  }
+        $signature_method;
+    }
 
-  // high level functions
+    // high level functions
 
-  /**
-   * process a request_token request
-   * returns the request token on success
-   */
-  public function fetch_request_token(&$request) {
+    /**
+     * process a request_token request
+     * returns the request token on success
+     */
+    public function fetch_request_token(&$request) {
     $this->get_version($request);
 
     $consumer = $this->get_consumer($request);
@@ -691,13 +691,13 @@ 
     $new_token = $this->data_store->new_request_token($consumer, $callback);
 
     return $new_token;
-  }
+    }
 
-  /**
-   * process an access_token request
-   * returns the access token on success
-   */
-  public function fetch_access_token(&$request) {
+    /**
+     * process an access_token request
+     * returns the access token on success
+     */
+    public function fetch_access_token(&$request) {
     $this->get_version($request);
 
     $consumer = $this->get_consumer($request);
@@ -712,105 +712,105 @@ 
     $new_token = $this->data_store->new_access_token($token, $consumer, $verifier);
 
     return $new_token;
-  }
+    }
 
-  /**
-   * verify an api call, checks all the parameters
-   */
-  public function verify_request(&$request) {
+    /**
+     * verify an api call, checks all the parameters
+     */
+    public function verify_request(&$request) {
     $this->get_version($request);
     $consumer = $this->get_consumer($request);
     $token = $this->get_token($request, $consumer, "access");
     $this->check_signature($request, $consumer, $token);
     return array($consumer, $token);
-  }
+    }
 
-  // Internals from here
-  /**
-   * version 1
-   */
-  protected function get_version(&$request) {
+    // Internals from here
+    /**
+     * version 1
+     */
+    protected function get_version(&$request) {
     $version = $request->get_parameter("oauth_version");
     if (!$version) {
-      // Service Providers MUST assume the protocol version to be 1.0 if this parameter is not present.
-      // Chapter 7.0 ("Accessing Protected Ressources")
-      $version = '1.0';
+        // Service Providers MUST assume the protocol version to be 1.0 if this parameter is not present.
+        // Chapter 7.0 ("Accessing Protected Ressources")
+        $version = '1.0';
     }
     if ($version !== $this->version) {
-      throw new OAuthVersionNotSupportedException("OAuth version '$version' not supported.");
+        throw new OAuthVersionNotSupportedException("OAuth version '$version' not supported.");
     }
     return $version;
-  }
+    }
 
-  /**
-   * figure out the signature with some defaults
-   */
-  private function get_signature_method($request) {
+    /**
+     * figure out the signature with some defaults
+     */
+    private function get_signature_method($request) {
     $signature_method = $request instanceof OAuthRequest
         ? $request->get_parameter("oauth_signature_method")
         : NULL;
 
     if (!$signature_method) {
-      // According to chapter 7 ("Accessing Protected Ressources") the signature-method
-      // parameter is required, and we can't just fallback to PLAINTEXT
-      throw new OAuthMissingParameterException('oauth_signature_method');
+        // According to chapter 7 ("Accessing Protected Ressources") the signature-method
+        // parameter is required, and we can't just fallback to PLAINTEXT
+        throw new OAuthMissingParameterException('oauth_signature_method');
     }
 
     if (!in_array($signature_method,
-                  array_keys($this->signature_methods))) {
-      throw new OAuthUnsupportedSignatureMethodException(
+                    array_keys($this->signature_methods))) {
+        throw new OAuthUnsupportedSignatureMethodException(
         "Signature method '$signature_method' not supported " .
         "try one of the following: " .
         implode(", ", array_keys($this->signature_methods)) . "."
-      );
+        );
     }
     return $this->signature_methods[$signature_method];
-  }
+    }
 
-  /**
-   * try to find the consumer for the provided request's consumer key
-   */
-  protected function get_consumer($request) {
+    /**
+     * try to find the consumer for the provided request's consumer key
+     */
+    protected function get_consumer($request) {
     $consumer_key = $request instanceof OAuthRequest
         ? $request->get_parameter("oauth_consumer_key")
         : NULL;
 
     if (!$consumer_key) {
-      throw new OAuthMissingParameterException('oauth_consumer_key');
+        throw new OAuthMissingParameterException('oauth_consumer_key');
     }
 
     $consumer = $this->data_store->lookup_consumer($consumer_key);
     if (!$consumer) {
-      throw new OAuthInvalidConsumerException("Invalid consumer");
+        throw new OAuthInvalidConsumerException("Invalid consumer");
     }
 
     return $consumer;
-  }
+    }
 
-  /**
-   * try to find the token for the provided request's token key
-   */
-  protected function get_token($request, $consumer, $token_type="access") {
+    /**
+     * try to find the token for the provided request's token key
+     */
+    protected function get_token($request, $consumer, $token_type="access") {
     $token_field = $request instanceof OAuthRequest
          ? $request->get_parameter('oauth_token')
          : NULL;
     if (!$token_field) {
-      throw new OAuthMissingParameterException('oauth_token');
+        throw new OAuthMissingParameterException('oauth_token');
     }
     $token = $this->data_store->lookup_token(
-      $consumer, $token_type, $token_field
+        $consumer, $token_type, $token_field
     );
     if (!$token) {
-      throw new OAuthInvalidTokenException("Invalid $token_type token: $token_field.");
+        throw new OAuthInvalidTokenException("Invalid $token_type token: $token_field.");
     }
     return $token;
-  }
+    }
 
-  /**
-   * all-in-one function to check the signature on a request
-   * should guess the signature method appropriately
-   */
-  protected function check_signature($request, $consumer, $token) {
+    /**
+     * all-in-one function to check the signature on a request
+     * should guess the signature method appropriately
+     */
+    protected function check_signature($request, $consumer, $token) {
     // this should probably be in a different method
     $timestamp = $request instanceof OAuthRequest
         ? $request->get_parameter('oauth_timestamp')
@@ -826,23 +826,23 @@ 
 
     $signature = $request->get_parameter('oauth_signature');
     $valid_sig = $signature_method->check_signature(
-      $request,
-      $consumer,
-      $token,
-      $signature
+        $request,
+        $consumer,
+        $token,
+        $signature
     );
 
     if (!$valid_sig) {
-      throw new OAuthInvalidSignatureException("Invalid signature.");
+        throw new OAuthInvalidSignatureException("Invalid signature.");
+    }
     }
-  }
 
-  /**
-   * check that the timestamp is new enough
-   */
-  private function check_timestamp($timestamp) {
+    /**
+     * check that the timestamp is new enough
+     */
+    private function check_timestamp($timestamp) {
     if( ! $timestamp )
-      throw new OAuthMissingParameterException('oauth_timestamp');
+        throw new OAuthMissingParameterException('oauth_timestamp');
 
     // Cast to integer. See issue #314.
     $timestamp = $timestamp + 0;
@@ -850,178 +850,178 @@ 
     // verify that timestamp is recentish
     $now = time();
     if (abs($now - $timestamp) > $this->timestamp_threshold) {
-      throw new OAuthExpiredTimestampException($timestamp, $now,
+        throw new OAuthExpiredTimestampException($timestamp, $now,
         $this->timestamp_threshold);
     }
-  }
+    }
 
-  /**
-   * check that the nonce is not repeated
-   */
-  private function check_nonce($consumer, $token, $nonce, $timestamp) {
+    /**
+     * check that the nonce is not repeated
+     */
+    private function check_nonce($consumer, $token, $nonce, $timestamp) {
     if( ! $nonce )
-      throw new OAuthMissingParameterException('oauth_nonce');
+        throw new OAuthMissingParameterException('oauth_nonce');
 
     // verify that the nonce is uniqueish
     $found = $this->data_store->lookup_nonce(
-      $consumer,
-      $token,
-      $nonce,
-      $timestamp
+        $consumer,
+        $token,
+        $nonce,
+        $timestamp
     );
     if ($found) {
-      throw new OAuthNonceAlreadyUsedException("Nonce already used: $nonce.");
+        throw new OAuthNonceAlreadyUsedException("Nonce already used: $nonce.");
+    }
     }
-  }
 
 }
 
 class OAuthDataStore {
-  function lookup_consumer($consumer_key) {
+    function lookup_consumer($consumer_key) {
     // implement me
-  }
+    }
 
-  function lookup_token($consumer, $token_type, $token) {
+    function lookup_token($consumer, $token_type, $token) {
     // implement me
-  }
+    }
 
-  function lookup_nonce($consumer, $token, $nonce, $timestamp) {
+    function lookup_nonce($consumer, $token, $nonce, $timestamp) {
     // implement me
-  }
+    }
 
-  function new_request_token($consumer, $callback = null) {
+    function new_request_token($consumer, $callback = null) {
     // return a new token attached to this consumer
-  }
+    }
 
-  function new_access_token($token, $consumer, $verifier = null) {
+    function new_access_token($token, $consumer, $verifier = null) {
     // return a new access token attached to this consumer
     // for the user associated with this token if the request token
     // is authorized
     // should also invalidate the request token
-  }
+    }
 
 }
 
 class OAuthUtil {
-  public static function urlencode_rfc3986($input) {
-  if (is_array($input)) {
+    public static function urlencode_rfc3986($input) {
+    if (is_array($input)) {
     return array_map(array('\okapi\oauth\OAuthUtil', 'urlencode_rfc3986'), $input);
-  } else if (is_scalar($input)) {
+    } else if (is_scalar($input)) {
     return str_replace(
-      '+',
-      ' ',
-      str_replace('%7E', '~', rawurlencode($input))
+        '+',
+        ' ',
+        str_replace('%7E', '~', rawurlencode($input))
     );
-  } else {
+    } else {
     return '';
-  }
+    }
 }
 
 
-  // This decode function isn't taking into consideration the above
-  // modifications to the encoding process. However, this method doesn't
-  // seem to be used anywhere so leaving it as is.
-  public static function urldecode_rfc3986($string) {
+    // This decode function isn't taking into consideration the above
+    // modifications to the encoding process. However, this method doesn't
+    // seem to be used anywhere so leaving it as is.
+    public static function urldecode_rfc3986($string) {
     return urldecode($string);
-  }
-
-  // Utility function for turning the Authorization: header into
-  // parameters, has to do some unescaping
-  // Can filter out any non-oauth parameters if needed (default behaviour)
-  // May 28th, 2010 - method updated to tjerk.meesters for a speed improvement.
-  //                  see http://code.google.com/p/oauth/issues/detail?id=163
-  public static function split_header($header, $only_allow_oauth_parameters = true) {
+    }
+
+    // Utility function for turning the Authorization: header into
+    // parameters, has to do some unescaping
+    // Can filter out any non-oauth parameters if needed (default behaviour)
+    // May 28th, 2010 - method updated to tjerk.meesters for a speed improvement.
+    //                  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)) {
-      foreach ($matches[1] as $i => $h) {
+        foreach ($matches[1] as $i => $h) {
         $params[$h] = OAuthUtil::urldecode_rfc3986(empty($matches[3][$i]) ? $matches[4][$i] : $matches[3][$i]);
-      }
-      if (isset($params['realm'])) {
+        }
+        if (isset($params['realm'])) {
         unset($params['realm']);
-      }
+        }
     }
     return $params;
-  }
+    }
 
-  // helper to try to sort out headers for people who aren't running apache
-  public static function get_headers() {
+    // helper to try to sort out headers for people who aren't running apache
+    public static function get_headers() {
     if (function_exists('apache_request_headers')) {
-      // we need this to get the actual Authorization: header
-      // because apache tends to tell us it doesn't exist
-      $headers = apache_request_headers();
-
-      // sanitize the output of apache_request_headers because
-      // we always want the keys to be Cased-Like-This and arh()
-      // returns the headers in the same case as they are in the
-      // request
-      $out = array();
-      foreach ($headers AS $key => $value) {
+        // we need this to get the actual Authorization: header
+        // because apache tends to tell us it doesn't exist
+        $headers = apache_request_headers();
+
+        // sanitize the output of apache_request_headers because
+        // we always want the keys to be Cased-Like-This and arh()
+        // returns the headers in the same case as they are in the
+        // request
+        $out = array();
+        foreach ($headers AS $key => $value) {
         $key = str_replace(
             " ",
             "-",
             ucwords(strtolower(str_replace("-", " ", $key)))
-          );
+            );
         $out[$key] = $value;
-      }
+        }
     } else {
-      // 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']) )
+        // 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']) )
         $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) {
+        foreach ($_SERVER as $key => $value) {
         if (substr($key, 0, 5) == "HTTP_") {
-          // this is chaos, basically it is just there to capitalize the first
-          // letter of every word that is not an initial HTTP and strip HTTP
-          // code from przemek
-          $key = str_replace(
+            // this is chaos, basically it is just there to capitalize the first
+            // letter of every word that is not an initial HTTP and strip HTTP
+            // code from przemek
+            $key = str_replace(
             " ",
             "-",
             ucwords(strtolower(str_replace("_", " ", substr($key, 5))))
-          );
-          $out[$key] = $value;
+            );
+            $out[$key] = $value;
+        }
         }
-      }
     }
     return $out;
-  }
+    }
 
-  // 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 ) {
+    // 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 ) {
     if (!isset($input) || !$input) return array();
 
     $pairs = explode('&', $input);
 
     $parsed_parameters = array();
     foreach ($pairs as $pair) {
-      $split = explode('=', $pair, 2);
-      $parameter = OAuthUtil::urldecode_rfc3986($split[0]);
-      $value = isset($split[1]) ? OAuthUtil::urldecode_rfc3986($split[1]) : '';
+        $split = explode('=', $pair, 2);
+        $parameter = OAuthUtil::urldecode_rfc3986($split[0]);
+        $value = isset($split[1]) ? OAuthUtil::urldecode_rfc3986($split[1]) : '';
 
-      if (isset($parsed_parameters[$parameter])) {
+        if (isset($parsed_parameters[$parameter])) {
         // We have already recieved parameter(s) with this name, so add to the list
         // of parameters with this name
 
         if (is_scalar($parsed_parameters[$parameter])) {
-          // This is the first duplicate, so transform scalar (string) into an array
-          // so we can add the duplicates
-          $parsed_parameters[$parameter] = array($parsed_parameters[$parameter]);
+            // This is the first duplicate, so transform scalar (string) into an array
+            // so we can add the duplicates
+            $parsed_parameters[$parameter] = array($parsed_parameters[$parameter]);
         }
 
         $parsed_parameters[$parameter][] = $value;
-      } else {
+        } else {
         $parsed_parameters[$parameter] = $value;
-      }
+        }
     }
     return $parsed_parameters;
-  }
+    }
 
-  public static function build_http_query($params) {
+    public static function build_http_query($params) {
     if (!$params) return '';
 
     // Urlencode both keys and values
@@ -1035,22 +1035,22 @@ 
 
     $pairs = array();
     foreach ($params as $parameter => $value) {
-      if (is_array($value)) {
+        if (is_array($value)) {
         // If two or more parameters share the same name, they are sorted by their value
         // Ref: Spec: 9.1.1 (1)
         // June 12th, 2010 - changed to sort because of issue 164 by hidetaka
         sort($value, SORT_STRING);
         foreach ($value as $duplicate_value) {
-          $pairs[] = $parameter . '=' . $duplicate_value;
+            $pairs[] = $parameter . '=' . $duplicate_value;
         }
-      } else {
+        } else {
         $pairs[] = $parameter . '=' . $value;
-      }
+        }
     }
     // For each parameter, the name is separated from the corresponding value by an '=' character (ASCII code 61)
     // Each name-value pair is separated by an '&' character (ASCII code 38)
     return implode('&', $pairs);
-  }
+    }
 }
 
 ?>

htdocs/okapi/views/changelog_helper.inc.php

Indentation +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
                 );
                 $context = stream_context_create($opts);
                 $changes_xml = file_get_contents(
-                     # TODO: load from OKAPI repo
+                        # TODO: load from OKAPI repo
                     'https://raw.githubusercontent.com/opencaching/okapi/master/etc/changes.xml',
                     false, $context
                 );

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

Indentation +86 added lines, -86 removed lines

@@ -57,9 +57,9 @@ 
     var $config = array();//updater configuration
 
     /**
-    * Constructor
-    * @access public
-    */
+     * Constructor
+     * @access public
+     */
     function __construct()
     {
         $this->init();
@@ -82,9 +82,9 @@ 
     }
 
     /**
-    * merges current updater config with the given one
-    * @param assoc_array $config new configuration values
-    */
+     * merges current updater config with the given one
+     * @param assoc_array $config new configuration values
+     */
     function setConfig($config=array())
     {
         if (is_array($config))
@@ -94,13 +94,13 @@ 
     }
 
     /**
-    * Returns array of update SQL with default options, $source, $dest - database structures
-    * @access public
-    * @param string $source structure dump of database to update
-    * @param string $dest structure dump of the reference database
-    * @param bool $asString if true - result will be a string, otherwise - array
-    * @return array|string update sql statements - in array or string (separated with ';')
-    */
+     * Returns array of update SQL with default options, $source, $dest - database structures
+     * @access public
+     * @param string $source structure dump of database to update
+     * @param string $dest structure dump of the reference database
+     * @param bool $asString if true - result will be a string, otherwise - array
+     * @return array|string update sql statements - in array or string (separated with ';')
+     */
     function getUpdates($source, $dest, $asString=false)
     {
         $result = $asString?'':array();
@@ -123,8 +123,8 @@ 
     }
 
     /**
-    * Filters comparison result and lefts only sync actions allowed by 'updateTypes' option
-    */
+     * Filters comparison result and lefts only sync actions allowed by 'updateTypes' option
+     */
     function filterDiffs($compRes)
     {
         $result = array();
@@ -183,9 +183,9 @@ 
     }
 
     /**
-    * Gets structured general info about the databases diff :
-    * array(sourceOrphans=>array(...), destOrphans=>array(...), different=>array(...))
-    */
+     * Gets structured general info about the databases diff :
+     * array(sourceOrphans=>array(...), destOrphans=>array(...), different=>array(...))
+     */
     function getDiffInfo($compRes)
     {
         if (!is_array($compRes))
@@ -212,19 +212,19 @@ 
     }
 
     /**
-    * Makes comparison of the given database structures, support some options
-    * @access private
-    * @param string $source and $dest are strings - database tables structures
-    * @return array
-    * - table (array)
-    *       - destOrphan (boolean)
-    *       - sourceOrphan (boolean)
-    *       - differs (array) OR (boolean) false if no diffs
-    *           - [0](array)
-    *               - source (string) structure definition line in the out-of-date table
-    *               - dest (string) structure definition line in the reference table
-    *           - [1](array) ...
-    */
+     * Makes comparison of the given database structures, support some options
+     * @access private
+     * @param string $source and $dest are strings - database tables structures
+     * @return array
+     * - table (array)
+     *       - destOrphan (boolean)
+     *       - sourceOrphan (boolean)
+     *       - differs (array) OR (boolean) false if no diffs
+     *           - [0](array)
+     *               - source (string) structure definition line in the out-of-date table
+     *               - dest (string) structure definition line in the reference table
+     *           - [1](array) ...
+     */
     function compare($source, $dest)
     {
         $this->sourceStruct = $source;
@@ -272,10 +272,10 @@ 
     }
 
     /**
-    * Retrieves list of table names from the database structure dump
-    * @access private
-    * @param string $struct database structure listing
-    */
+     * Retrieves list of table names from the database structure dump
+     * @access private
+     * @param string $struct database structure listing
+     */
     function getTableList($struct)
     {
         $result = array();
@@ -290,13 +290,13 @@ 
     }
 
     /**
-    * Retrieves table structure definition from the database structure dump
-    * @access private
-    * @param string $struct database structure listing
-    * @param string $tab table name
-    * @param bool $removeDatabase - either to remove database name in "CREATE TABLE database.tab"-like declarations
-    * @return string table structure definition
-    */
+     * Retrieves table structure definition from the database structure dump
+     * @access private
+     * @param string $struct database structure listing
+     * @param string $tab table name
+     * @param bool $removeDatabase - either to remove database name in "CREATE TABLE database.tab"-like declarations
+     * @return string table structure definition
+     */
     function getTabSql($struct, $tab, $removeDatabase=true)
     {
         $result = '';
@@ -327,9 +327,9 @@ 
     }
 
     /**
-    * Splits table sql into indexed array
-    *
-    */
+     * Splits table sql into indexed array
+     *
+     */
     function splitTabSql($sql)
     {
         $result = array();
@@ -374,17 +374,17 @@ 
     }
 
     /**
-    * returns array of fields or keys definitions that differs in the given tables structure
-    * @access private
-    * @param sring $sourceSql table structure
-    * @param sring $destSql right table structure
-    * supports some $options
-    * @return array
-    *   - [0]
-    *       - source (string) out-of-date table field definition
-    *       - dest (string) reference table field definition
-    *   - [1]...
-    */
+     * returns array of fields or keys definitions that differs in the given tables structure
+     * @access private
+     * @param sring $sourceSql table structure
+     * @param sring $destSql right table structure
+     * supports some $options
+     * @return array
+     *   - [0]
+     *       - source (string) out-of-date table field definition
+     *       - dest (string) reference table field definition
+     *   - [1]...
+     */
     function compareSql($sourceSql, $destSql)//$sourceSql, $destSql
     {
         $result = array();
@@ -449,13 +449,13 @@ 
     }
 
     /**
-    * Transforms table structure defnition line into key=>value pair where the key is a string that uniquely
-    * defines field or key desribed
-    * @access private
-    * @param string $line field definition string
-    * @return array array with single key=>value pair as described in the description
-    * implements some options
-    */
+     * Transforms table structure defnition line into key=>value pair where the key is a string that uniquely
+     * defines field or key desribed
+     * @access private
+     * @param string $line field definition string
+     * @return array array with single key=>value pair as described in the description
+     * implements some options
+     */
     function processLine($line)
     {
         $options = $this->config;
@@ -497,13 +497,13 @@ 
     }
 
     /**
-    * Takes an output of compare() method to generate the set of sql needed to update source table to make it
-    * look as a destination one
-    * @access private
-    * @param array $diff compare() method output
-    * @return array list of sql statements
-    * supports query generation options
-    */
+     * Takes an output of compare() method to generate the set of sql needed to update source table to make it
+     * look as a destination one
+     * @access private
+     * @param array $diff compare() method output
+     * @return array list of sql statements
+     * supports query generation options
+     */
     function getDiffSql($diff)//maybe add option to ommit or force 'IF NOT EXISTS', skip autoincrement
     {
         $options = $this->config;
@@ -566,13 +566,13 @@ 
     }
 
     /**
-    * Compiles update sql
-    * @access private
-    * @param string $action - 'drop', 'add' or 'modify'
-    * @param string $tab table name
-    * @param string $sql definition of the element to change
-    * @return string update sql
-    */
+     * Compiles update sql
+     * @access private
+     * @param string $action - 'drop', 'add' or 'modify'
+     * @param string $tab table name
+     * @param string $sql definition of the element to change
+     * @return string update sql
+     */
     function getActionSql($action, $tab, $sql)
     {
         $result = 'ALTER TABLE `'.$tab.'` ';
@@ -645,12 +645,12 @@ 
     }
 
     /**
-    * Searches for the position of the next delimiter which is not inside string literal like 'this ; ' or
-    * like "this ; ".
-    *
-    * Handles escaped \" and \'. Also handles sql comments.
-    * Actualy it is regex-based Finit State Machine (FSN)
-    */
+     * Searches for the position of the next delimiter which is not inside string literal like 'this ; ' or
+     * like "this ; ".
+     *
+     * Handles escaped \" and \'. Also handles sql comments.
+     * Actualy it is regex-based Finit State Machine (FSN)
+     */
     function getDelimPos($string, $offset=0, $delim=';', $skipInBrackets=false)
     {
         $stack = array();
@@ -732,9 +732,9 @@ 
     }
 
     /**
-    * works the same as getDelimPos except returns position of the first occurence of the delimiter starting from
-    * the end of the string
-    */
+     * works the same as getDelimPos except returns position of the first occurence of the delimiter starting from
+     * the end of the string
+     */
     function getDelimRpos($string, $offset=0, $delim=';', $skipInBrackets=false)
     {
         $pos = $this->getDelimPos($string, $offset, $delim, $skipInBrackets);

htdocs/templates2/ocstyle/search.tpl.inc.php

Indentation +2 added lines, -2 removed lines

@@ -8,8 +8,8 @@
  ****************************************************************************/
 
     // search.php -> $tpl->error
-     $outputformat_notexist = _('The selected output format is unknown!');
-     $error_query_not_found = _('The search operation could not be executed, please reenter the search data.');
+        $outputformat_notexist = _('The selected output format is unknown!');
+        $error_query_not_found = _('The search operation could not be executed, please reenter the search data.');
     $unknown_searchoption = _('unknown search option');
     $unknown_searchtype = _('unknown search type');
 

htdocs/lang/de/ocstyle/newcache.inc.php

Indentation +34 added lines, -34 removed lines

@@ -14,40 +14,40 @@
  * set template specific language variables
  ****************************************************************************/
 
- $firstcache_note = t('If this is your first cache on %1, be sure to check out the <a href="articles.php?page=cacheinfo">description</a> of the individual fields.');
-
- $submit = t('Submit cache');
- $default_country = t('EN');
- $default_lang = t('EN');
- $show_all = t('Show all');
- $default_NS = 'N';
- $default_EW = 'E';
- $date_time_format_message = '&nbsp;' . t('Format:&nbsp;DD-MM-YYYY');
-
- $error_general = "<tr><td class='error' colspan='2'><b>" . t('Some errors occured, please check the marked fields.') . "</b></td></tr>";
- $error_long_not_ok = '<span class="errormsg">' . t('Your chosen coordinated are invalid') . '</span>';
- $error_lat_not_ok = $error_long_not_ok . "<br />";
- $error_duplicate_coords = '<span class="errormsg">' . t('Another cache (<a href="viewcache.php?wp=%1">%1</a>) exists at these coords. Maybe you pressed "submit cache" twice. To publish a cache with identical coords, enter other coords first, then edit the listing and change coords.') . '</span>';
- $time_not_ok_message = '<span class="errormsg">' . t('The entered time is invalid.') . '</span>';
- $way_length_not_ok_message = '<span class="errormsg">' . t('The entered distance is invalid, Format: aa.aaa') . '</span>';
- $date_not_ok_message = '<span class="errormsg">' . t('Invalid date, format:DD-MM-JJJJ') . '</span>';
- $name_not_ok_message = '&nbsp;<span class="errormsg">' . t('Cachename is invalid') . '</span>';
- $tos_not_ok_message = '<br/><span class="errormsg">' . t('The cache can only be adopted if you agree our terms of use.') . '</span>';
- $type_not_ok_message = '&nbsp;<span class="errormsg">' . t('No cache-type is chosen.') . '</span>';
- $size_not_ok_message = '&nbsp;<span class="errormsg">' . t('No cache-size is chosen.') . '</span>';
- $diff_not_ok_message = '&nbsp;<span class="errormsg">' . t('Choose both valuations!') . '</span>';
- $sizemismatch_message = '&nbsp;<span class="errormsg">' . t('For virtual and webcam caches, the cache size has to be -no container-!') . '</span>';
- $safari_not_allowed_message = '<span class="errormsg">' . t('Only virtual caches can be safari caches.') . '</span>';
- $bad_wpgc_message = '<span class="errormsg">' . t('GC waypoint is invalid, must be GCxxxxx') . '</span>';
-
- $cache_submitted = t('Your cache is successfully added to the database. You will be redirected to the cache page, now.');
-
- $sel_message = t('Select');
-
- $cache_attrib_js = "new Array({id}, {selected}, '{img_undef}', '{img_large}')";
- $cache_attrib_pic = '<img id="attr{attrib_id}" src="{attrib_pic}" border="0" onmousedown="toggleAttr({attrib_id})" onmouseover="Tip(\'{html_desc}\', TITLE, \'{name}\', TITLEBGCOLOR, \'{color}\', TITLEFONTCOLOR, \'#000000\', BGCOLOR, \'#FFFFFF\', BORDERCOLOR, \'{color}\', CLICKCLOSE, true, DELAY, 0, FADEIN, false, FADEOUT, false, FONTCOLOR, \'#000080\', WIDTH, 500)" onmouseout="UnTip()" />&nbsp;';
-
- $cache_attrib_group =
+    $firstcache_note = t('If this is your first cache on %1, be sure to check out the <a href="articles.php?page=cacheinfo">description</a> of the individual fields.');
+
+    $submit = t('Submit cache');
+    $default_country = t('EN');
+    $default_lang = t('EN');
+    $show_all = t('Show all');
+    $default_NS = 'N';
+    $default_EW = 'E';
+    $date_time_format_message = '&nbsp;' . t('Format:&nbsp;DD-MM-YYYY');
+
+    $error_general = "<tr><td class='error' colspan='2'><b>" . t('Some errors occured, please check the marked fields.') . "</b></td></tr>";
+    $error_long_not_ok = '<span class="errormsg">' . t('Your chosen coordinated are invalid') . '</span>';
+    $error_lat_not_ok = $error_long_not_ok . "<br />";
+    $error_duplicate_coords = '<span class="errormsg">' . t('Another cache (<a href="viewcache.php?wp=%1">%1</a>) exists at these coords. Maybe you pressed "submit cache" twice. To publish a cache with identical coords, enter other coords first, then edit the listing and change coords.') . '</span>';
+    $time_not_ok_message = '<span class="errormsg">' . t('The entered time is invalid.') . '</span>';
+    $way_length_not_ok_message = '<span class="errormsg">' . t('The entered distance is invalid, Format: aa.aaa') . '</span>';
+    $date_not_ok_message = '<span class="errormsg">' . t('Invalid date, format:DD-MM-JJJJ') . '</span>';
+    $name_not_ok_message = '&nbsp;<span class="errormsg">' . t('Cachename is invalid') . '</span>';
+    $tos_not_ok_message = '<br/><span class="errormsg">' . t('The cache can only be adopted if you agree our terms of use.') . '</span>';
+    $type_not_ok_message = '&nbsp;<span class="errormsg">' . t('No cache-type is chosen.') . '</span>';
+    $size_not_ok_message = '&nbsp;<span class="errormsg">' . t('No cache-size is chosen.') . '</span>';
+    $diff_not_ok_message = '&nbsp;<span class="errormsg">' . t('Choose both valuations!') . '</span>';
+    $sizemismatch_message = '&nbsp;<span class="errormsg">' . t('For virtual and webcam caches, the cache size has to be -no container-!') . '</span>';
+    $safari_not_allowed_message = '<span class="errormsg">' . t('Only virtual caches can be safari caches.') . '</span>';
+    $bad_wpgc_message = '<span class="errormsg">' . t('GC waypoint is invalid, must be GCxxxxx') . '</span>';
+
+    $cache_submitted = t('Your cache is successfully added to the database. You will be redirected to the cache page, now.');
+
+    $sel_message = t('Select');
+
+    $cache_attrib_js = "new Array({id}, {selected}, '{img_undef}', '{img_large}')";
+    $cache_attrib_pic = '<img id="attr{attrib_id}" src="{attrib_pic}" border="0" onmousedown="toggleAttr({attrib_id})" onmouseover="Tip(\'{html_desc}\', TITLE, \'{name}\', TITLEBGCOLOR, \'{color}\', TITLEFONTCOLOR, \'#000000\', BGCOLOR, \'#FFFFFF\', BORDERCOLOR, \'{color}\', CLICKCLOSE, true, DELAY, 0, FADEIN, false, FADEOUT, false, FONTCOLOR, \'#000080\', WIDTH, 500)" onmouseout="UnTip()" />&nbsp;';
+
+    $cache_attrib_group =
     '<div class="attribgroup"><table cellspacing="0" style="display:inline;border-spacing:0px;">
          <tr><td bgcolor="{color}" style="line-height:9px;padding-top:2px;margin:0 0 0 0;border-left:1px solid gray;border-right:1px solid gray;border-top:1px solid gray;"><font size="1">{name}</font></td></tr>
          <tr><td bgcolor="#F8F8F8" style="margin:0 0 0 0;border-left:1px solid gray;border-right:1px solid gray;border-bottom:1px solid gray;">{attribs}</td></tr>

htdocs/lang/de/ocstyle/removelog.inc.php

Indentation +2 added lines, -2 removed lines

@@ -15,8 +15,8 @@
         
  ****************************************************************************/
 
- $error_wrong_node = t('This log entry has been created on another Opencaching website. The cache can only be edited there.');
- $removed_message_end = '---';
+    $error_wrong_node = t('This log entry has been created on another Opencaching website. The cache can only be edited there.');
+    $removed_message_end = '---';
  
 
 function removed_log_subject($lang)

htdocs/lang/de/ocstyle/removedesc.inc.php

Indentation +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@
      
  ****************************************************************************/
  
- $error_wrong_node = t('this description was created on another Opencaching-webserver and can only be deleted there.');
+    $error_wrong_node = t('this description was created on another Opencaching-webserver and can only be deleted there.');
 
- $commit = t('the cache description has been deleted');
- $commit_title = t('delete this cache-description');
+    $commit = t('the cache description has been deleted');
+    $commit_title = t('delete this cache-description');