OpencachingDeutschland / oc-server3

htdocs/editlog.php

Braces +4 added lines, -2 removed lines

@@ -24,7 +24,8 @@ 
 if ($error == false) {
     //logid
     $log_id = 0;
-    if (isset($_REQUEST['logid'])) { // Ocprop
+    if (isset($_REQUEST['logid'])) {
+// Ocprop
         $log_id = $_REQUEST['logid'];
     }
 
@@ -273,7 +274,8 @@ 
                 }
 
                 //store?
-                if ($date_ok && $logtype_ok && $pw_ok && isset($_POST['submitform'])) { // Ocprop
+                if ($date_ok && $logtype_ok && $pw_ok && isset($_POST['submitform'])) {
+// Ocprop
                     // 00:00:01 = "00:00 was logged"
                     // 00:00:00 = "no time was logged"
                     if ("$log_time_hour$log_time_minute" != "" &&

htdocs/log.php

Braces +7 added lines, -3 removed lines

@@ -24,14 +24,16 @@ 
 
 // check login
 $login->verify();
-if ($login->userid == 0)
+if ($login->userid == 0) {
     $tpl->redirect_login();
+}
 
 // get cache_id if not given
 $cacheId = 0;
 if (isset($_REQUEST['wp'])) {
     $cacheId = cache::cacheIdFromWP($_REQUEST['wp']);
-} elseif (isset($_REQUEST['cacheid'])) { // Ocprop
+} elseif (isset($_REQUEST['cacheid'])) {
+// Ocprop
     $cacheId = $_REQUEST['cacheid'];
 }
 
@@ -216,7 +218,8 @@ 
     $validate['duplicateLog'] = true;
 
     // all checks done, no error => log
-    if (isset($_POST['submitform']) && $loggable)  // Ocprop
+    if (isset($_POST['submitform']) && $loggable) {
+        // Ocprop
     {
         /*
          * check if time is logged
@@ -226,6 +229,7 @@ 
         $logTimeSecond = ($logTimeHour . $logTimeMinute != ""
                 && $logTimeHour == 0
                 && $logTimeMinute == 0) + 0;
+    }
 
         // make time values database ready
         $logDate = date(

htdocs/resource2/tinymce/config/list.js.php

Braces +6 added lines, -5 removed lines

@@ -1,9 +1,10 @@
 <?php
-  if (isset($_REQUEST['lang']))
-    $lang = $_REQUEST['lang'];
-  else
-    $lang = 'de';
-?>
+  if (isset($_REQUEST['lang'])) {
+      $lang = $_REQUEST['lang'];
+  } else {
+      $lang = 'de';
+  }
+  ?>
 
 tinyMCE_GZ.init({
     plugins : 'advhr,contextmenu,emotions,insertdatetime,paste,table',

htdocs/lang/de/ocstyle/main.tpl.php

Braces +15 added lines, -18 removed lines

@@ -145,10 +145,11 @@ 
                         <td><strong>{t}Language:{/t}&nbsp;</strong></td>
                         <td>
 <?php
-                            foreach ($opt['template']['locales'] AS $k => $lang)
-                                if ($lang['show'] == true)
+                            foreach ($opt['template']['locales'] AS $k => $lang) {
+                                                            if ($lang['show'] == true)
                                     echo '<a style="text-decoration: none;" href="index.php?locale=' . $k . '"><img src="' . $lang['flag'] . '" alt="' . $lang['name'] . '" title="' . $lang['name'] . '" width="24px" height="18px" /></a> ';
-?>
+                            }
+                            ?>
                         </td>
                         <td>&nbsp;&nbsp;&nbsp;&nbsp;<strong>{t}Country:{/t}&nbsp;</strong></td>
                         <td>
@@ -157,10 +158,8 @@ 
                                     global $tpl_usercountries;
                                     $nLastGroup = 0;
                                     $maxUserCountries = count($tpl_usercountries);
-                                    for ($i = 0; $i < $maxUserCountries; $i++)
-                                    {
-                                        if ($nLastGroup != $tpl_usercountries[$i]['group'])
-                                        {
+                                    for ($i = 0; $i < $maxUserCountries; $i++) {
+                                        if ($nLastGroup != $tpl_usercountries[$i]['group']) {
                                             echo '<option disabled="disabled">';
                                             if ($tpl_usercountries[$i]['group'] == 1) {
                                                 echo '- ' . t('This OC node') . ' -';
@@ -205,11 +204,12 @@ 
                     <ul>
 <?php
                         // $pageidx is -1 e.g. when calling newcache.php as logged-off-user (-> login.tpl.php)
-                        if ($pageidx >= 0)
-                            mnu_EchoMainMenu($menu[$pageidx]['siteid']);
-                        else
-                            mnu_EchoMainMenu(-1);
-?>
+                        if ($pageidx >= 0) {
+                                                    mnu_EchoMainMenu($menu[$pageidx]['siteid']);
+                        } else {
+                                                    mnu_EchoMainMenu(-1);
+                        }
+                        ?>
                     </ul>
                 </div>
 
@@ -228,8 +228,7 @@ 
                 <div class="nav3">
 <?php
                     //SubNavigation
-                    if (isset($menu[$pageidx]['submenu']))
-                    {
+                    if (isset($menu[$pageidx]['submenu'])) {
 ?>
                         <ul>
                             <li class="title">{t}Main menu{/t}</li>
@@ -257,8 +256,7 @@ 
 
                     <!-- Paypalbutton -->
 <?php
-                    if (isset($opt['page']['showdonations']) && $opt['page']['showdonations'])
-                    {
+                    if (isset($opt['page']['showdonations']) && $opt['page']['showdonations']) {
 ?>
                         <p class="sidebar-maintitle">{t}Donations{/t}</p>
                         <div style="margin-top:16px;width:100%;text-align:center;">
@@ -273,8 +271,7 @@ 
 
                     <!-- Social Media -->
 <?php
-                    if (isset($opt['page']['showsocialmedia']) && $opt['page']['showsocialmedia'])
-                    {
+                    if (isset($opt['page']['showsocialmedia']) && $opt['page']['showsocialmedia']) {
 ?>
                     <p class="sidebar-maintitle">{t}Social media{/t}</p>
                     <div style="margin-top: 10px; margin-bottom: 14px; margin-left: auto; margin-right: auto; text-align: center">

htdocs/lang/de/ocstyle/lib/menu.php

Braces +2 added lines, -1 removed lines

@@ -423,7 +423,8 @@
 {
     global $menu;
 
-    if ($mainmenuindex >= 0) { // is -1 e.g. when calling newcache.php as logged-off-user (-> login.tpl.php)
+    if ($mainmenuindex >= 0) {
+// is -1 e.g. when calling newcache.php as logged-off-user (-> login.tpl.php)
         echo htmlspecialchars(t($menu[$mainmenuindex]['menustring']), ENT_COMPAT, 'UTF-8');
 
         if (isset($menu[$mainmenuindex]['submenu']) && ($menu[$mainmenuindex]['siteid'] != $pageid)) {

htdocs/picture.php

Braces +10 added lines, -5 removed lines

@@ -34,10 +34,12 @@ 
 
 $uuid = isset($_REQUEST['uuid']) ? $_REQUEST['uuid'] : 0;
 
-if ($action == 'add') { // Ocprop
+if ($action == 'add') {
+// Ocprop
     $picture = new picture();
 
-    if (isset($_REQUEST['cacheuuid'])) {  // Ocprop
+    if (isset($_REQUEST['cacheuuid'])) {
+// Ocprop
         $cache = cache::fromUUID($_REQUEST['cacheuuid']);
         if ($cache === null) {
             $tpl->error(ERROR_CACHE_NOT_EXISTS);
@@ -51,7 +53,8 @@ 
         $picture->setObjectType(OBJECT_CACHE);
 
         $cache = null;
-    } elseif (isset($_REQUEST['loguuid'])) {// Ocprop
+    } elseif (isset($_REQUEST['loguuid'])) {
+// Ocprop
         $cachelog = cachelog::fromUUID($_REQUEST['loguuid']);
         if ($cachelog === null) {
             $tpl->error(ERROR_CACHELOG_NOT_EXISTS);
@@ -72,7 +75,8 @@ 
     }
 
     // uploaded file ok?
-    if (isset($_REQUEST['ok'])) { // Ocprop
+    if (isset($_REQUEST['ok'])) {
+// Ocprop
         $bError = false;
 
         $picture->setSpoiler(isset($_REQUEST['spoiler']) && $_REQUEST['spoiler'] == '1');  // Ocprop
@@ -92,7 +96,8 @@ 
             $tpl->redirect($picture->getPageLink());
         }
 
-        if (!isset($_FILES['file'])) { // Ocprop
+        if (!isset($_FILES['file'])) {
+// Ocprop
             $tpl->assign('errorfile', ERROR_UPLOAD_ERR_NO_FILE);
             $bError = true;
         } elseif ($_FILES['file']['error'] == UPLOAD_ERR_NO_FILE) {

htdocs/okapi/oauth.php

Braces +228 added lines, -112 removed lines

@@ -47,19 +47,26 @@ 
 */
 
 /** Base exception type for all exceptions thrown by this module. */
-abstract class OAuthException extends Exception {}
+abstract class OAuthException extends Exception
+{
+}
 
 # All OAuthExceptions fall back into these two categories:
 
 /** OAuth client errors. */
-class OAuthClientException extends OAuthException {}
+class OAuthClientException extends OAuthException
+{
+}
 /** OAuth server errors. */
-abstract class OAuthServerException extends OAuthException {
+abstract class OAuthServerException extends OAuthException
+{
   abstract public function getHttpStatusCode();
-  protected function provideExtras(&$extras) {
+  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(),
@@ -73,77 +80,102 @@ 
 # More subclasses of server exceptions.
 
 /** OAuth server errors which should result in HTTP 400 response. */
-abstract class OAuthServer400Exception extends OAuthServerException {
-  protected function provideExtras(&$extras) {
+abstract class OAuthServer400Exception extends OAuthServerException
+{
+  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) {
+abstract class OAuthServer401Exception extends OAuthServerException
+{
+  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) {
+class OAuthVersionNotSupportedException extends OAuthServer400Exception
+{
+  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 {
+class OAuthMissingParameterException extends OAuthServer400Exception
+{
   protected $param_name;
-  protected function provideExtras(&$extras) {
+  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) {
+class OAuthUnsupportedSignatureMethodException extends OAuthServer400Exception
+{
+  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) {
+class OAuthInvalidConsumerException extends OAuthServer401Exception
+{
+  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) {
+class OAuthInvalidTokenException extends OAuthServer401Exception
+{
+  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) {
+class OAuthInvalidSignatureException extends OAuthServer401Exception
+{
+  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 {
+class OAuthExpiredTimestampException extends OAuthServer400Exception
+{
   protected $usersTimestamp;
   protected $ourTimestamp;
   protected $threshold;
-  protected function provideExtras(&$extras) {
+  protected function provideExtras(&$extras)
+  {
     parent::provideExtras($extras);
     $extras['reason_stack'][] = 'invalid_timestamp';
     $extras['yours'] = $this->usersTimestamp;
@@ -151,39 +183,50 @@ 
     $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) {
+class OAuthNonceAlreadyUsedException extends OAuthServer400Exception
+{
+  protected function provideExtras(&$extras)
+  {
     parent::provideExtras($extras);
     $extras['reason_stack'][] = 'nonce_already_used';
   }
 }
 
-class OAuthConsumer {
+class OAuthConsumer
+{
   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 {
+class OAuthToken
+{
   // access tokens and request tokens
   public $key;
   public $secret;
@@ -192,7 +235,8 @@ 
    * key = the token
    * secret = the token secret
    */
-  function __construct($key, $secret) {
+  function __construct($key, $secret)
+  {
     $this->key = $key;
     $this->secret = $secret;
   }
@@ -201,14 +245,16 @@ 
    * generates the basic string serialization of a token that a server
    * would respond to request_token and access_token calls with
    */
-  function to_string() {
+  function to_string()
+  {
     return "oauth_token=" .
            OAuthUtil::urlencode_rfc3986($this->key) .
            "&oauth_token_secret=" .
            OAuthUtil::urlencode_rfc3986($this->secret);
   }
 
-  function __toString() {
+  function __toString()
+  {
     return $this->to_string();
   }
 }
@@ -217,7 +263,8 @@ 
  * A class for implementing a Signature Method
  * See section 9 ("Signing Requests") in the spec
  */
-abstract class OAuthSignatureMethod {
+abstract class OAuthSignatureMethod
+{
   /**
    * Needs to return the name of the Signature Method (ie HMAC-SHA1)
    * @return string
@@ -244,7 +291,8 @@ 
    * @param string $signature
    * @return bool
    */
-  public function check_signature($request, $consumer, $token, $signature) {
+  public function check_signature($request, $consumer, $token, $signature)
+  {
     $built = $this->build_signature($request, $consumer, $token);
 
     // Check for zero length, although unlikely here
@@ -273,12 +321,15 @@ 
  * character (ASCII code 38) even if empty.
  *   - Chapter 9.2 ("HMAC-SHA1")
  */
-class OAuthSignatureMethod_HMAC_SHA1 extends OAuthSignatureMethod {
-  function get_name() {
+class OAuthSignatureMethod_HMAC_SHA1 extends OAuthSignatureMethod
+{
+  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;
 
@@ -299,8 +350,10 @@ 
  * over a secure channel such as HTTPS. It does not use the Signature Base String.
  *   - Chapter 9.4 ("PLAINTEXT")
  */
-class OAuthSignatureMethod_PLAINTEXT extends OAuthSignatureMethod {
-  public function get_name() {
+class OAuthSignatureMethod_PLAINTEXT extends OAuthSignatureMethod
+{
+  public function get_name()
+  {
     return "PLAINTEXT";
   }
 
@@ -313,7 +366,8 @@ 
    * Please note that the second encoding MUST NOT happen in the SignatureMethod, as
    * OAuthRequest handles this!
    */
-  public function build_signature($request, $consumer, $token) {
+  public function build_signature($request, $consumer, $token)
+  {
     $key_parts = array(
       $consumer->secret,
       ($token) ? $token->secret : ""
@@ -335,8 +389,10 @@ 
  * specification.
  *   - Chapter 9.3 ("RSA-SHA1")
  */
-abstract class OAuthSignatureMethod_RSA_SHA1 extends OAuthSignatureMethod {
-  public function get_name() {
+abstract class OAuthSignatureMethod_RSA_SHA1 extends OAuthSignatureMethod
+{
+  public function get_name()
+  {
     return "RSA-SHA1";
   }
 
@@ -354,7 +410,8 @@ 
   // Either way should return a string representation of the certificate
   protected abstract function fetch_private_cert(&$request);
 
-  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;
 
@@ -373,7 +430,8 @@ 
     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();
@@ -394,7 +452,8 @@ 
   }
 }
 
-class OAuthRequest {
+class OAuthRequest
+{
   protected $parameters;
   protected $http_method;
   protected $http_url;
@@ -403,7 +462,8 @@ 
   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);
     $this->parameters = $parameters;
@@ -415,7 +475,8 @@ 
   /**
    * 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,21 +528,24 @@ 
   /**
    * 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) {
+  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);
-    if ($token)
-      $defaults['oauth_token'] = $token->key;
+    if ($token) {
+          $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])) {
@@ -496,15 +560,18 @@ 
     }
   }
 
-  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]);
   }
 
@@ -512,7 +579,8 @@ 
    * The request parameters, sorted and concatenated into a normalized string.
    * @return string
    */
-  public function get_signable_parameters() {
+  public function get_signable_parameters()
+  {
     // Grab all parameters
     $params = $this->parameters;
 
@@ -532,7 +600,8 @@ 
    * and the parameters (normalized), each urlencoded
    * and the concated with &.
    */
-  public function get_signature_base_string() {
+  public function get_signature_base_string()
+  {
     $parts = array(
       $this->get_normalized_http_method(),
       $this->get_normalized_http_url(),
@@ -547,7 +616,8 @@ 
   /**
    * just uppercases the http method
    */
-  public function get_normalized_http_method() {
+  public function get_normalized_http_method()
+  {
     return strtoupper($this->http_method);
   }
 
@@ -555,7 +625,8 @@ 
    * parses the url and rebuilds it to be
    * scheme://host/path
    */
-  public function get_normalized_http_url() {
+  public function get_normalized_http_url()
+  {
     $parts = parse_url($this->http_url);
 
     $scheme = (isset($parts['scheme'])) ? $parts['scheme'] : 'http';
@@ -573,7 +644,8 @@ 
   /**
    * builds a url usable for a GET request
    */
-  public function to_url() {
+  public function to_url()
+  {
     $post_data = $this->to_postdata();
     $out = $this->get_normalized_http_url();
     if ($post_data) {
@@ -585,24 +657,29 @@ 
   /**
    * builds the data one would send in a POST request
    */
-  public function to_postdata() {
+  public function to_postdata()
+  {
     return OAuthUtil::build_http_query($this->parameters);
   }
 
   /**
    * builds the Authorization: header
    */
-  public function to_header($realm=null) {
+  public function to_header($realm=null)
+  {
     $first = true;
     if($realm) {
       $out = 'Authorization: OAuth realm="' . OAuthUtil::urlencode_rfc3986($realm) . '"';
       $first = false;
-    } else
-      $out = 'Authorization: OAuth';
+    } else {
+          $out = 'Authorization: OAuth';
+    }
 
     $total = array();
     foreach ($this->parameters as $k => $v) {
-      if (substr($k, 0, 5) != "oauth") continue;
+      if (substr($k, 0, 5) != "oauth") {
+          continue;
+      }
       if (is_array($v)) {
         throw new OAuthClientException('Arrays not supported in headers.');
       }
@@ -616,12 +693,14 @@ 
     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(),
@@ -631,7 +710,8 @@ 
     $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;
   }
@@ -639,14 +719,16 @@ 
   /**
    * util function: current timestamp
    */
-  private static function generate_timestamp() {
+  private static function generate_timestamp()
+  {
     return time();
   }
 
   /**
    * util function: current nonce
    */
-  private static function generate_nonce() {
+  private static function generate_nonce()
+  {
     $mt = microtime();
     $rand = mt_rand();
 
@@ -654,18 +736,21 @@ 
   }
 }
 
-class OAuthServer {
+class OAuthServer
+{
   protected $timestamp_threshold = 300; // in seconds, five minutes
   protected $version = '1.0';             // hi blaine
   protected $signature_methods = array();
 
   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;
   }
@@ -676,7 +761,8 @@ 
    * process a request_token request
    * returns the request token on success
    */
-  public function fetch_request_token(&$request) {
+  public function fetch_request_token(&$request)
+  {
     $this->get_version($request);
 
     $consumer = $this->get_consumer($request);
@@ -697,7 +783,8 @@ 
    * process an access_token request
    * returns the access token on success
    */
-  public function fetch_access_token(&$request) {
+  public function fetch_access_token(&$request)
+  {
     $this->get_version($request);
 
     $consumer = $this->get_consumer($request);
@@ -717,7 +804,8 @@ 
   /**
    * verify an api call, checks all the parameters
    */
-  public function verify_request(&$request) {
+  public function verify_request(&$request)
+  {
     $this->get_version($request);
     $consumer = $this->get_consumer($request);
     $token = $this->get_token($request, $consumer, "access");
@@ -729,7 +817,8 @@ 
   /**
    * version 1
    */
-  protected function get_version(&$request) {
+  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.
@@ -745,7 +834,8 @@ 
   /**
    * figure out the signature with some defaults
    */
-  private function get_signature_method($request) {
+  private function get_signature_method($request)
+  {
     $signature_method = $request instanceof OAuthRequest
         ? $request->get_parameter("oauth_signature_method")
         : NULL;
@@ -770,7 +860,8 @@ 
   /**
    * try to find the consumer for the provided request's consumer key
    */
-  protected function get_consumer($request) {
+  protected function get_consumer($request)
+  {
     $consumer_key = $request instanceof OAuthRequest
         ? $request->get_parameter("oauth_consumer_key")
         : NULL;
@@ -790,7 +881,8 @@ 
   /**
    * 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;
@@ -810,7 +902,8 @@ 
    * all-in-one function to check the signature on a request
    * should guess the signature method appropriately
    */
-  protected function check_signature($request, $consumer, $token) {
+  protected function check_signature($request, $consumer, $token)
+  {
     // this should probably be in a different method
     $timestamp = $request instanceof OAuthRequest
         ? $request->get_parameter('oauth_timestamp')
@@ -840,9 +933,11 @@ 
   /**
    * check that the timestamp is new enough
    */
-  private function check_timestamp($timestamp) {
-    if( ! $timestamp )
-      throw new OAuthMissingParameterException('oauth_timestamp');
+  private function check_timestamp($timestamp)
+  {
+    if( ! $timestamp ) {
+          throw new OAuthMissingParameterException('oauth_timestamp');
+    }
 
     // Cast to integer. See issue #314.
     $timestamp = $timestamp + 0;
@@ -858,9 +953,11 @@ 
   /**
    * check that the nonce is not repeated
    */
-  private function check_nonce($consumer, $token, $nonce, $timestamp) {
-    if( ! $nonce )
-      throw new OAuthMissingParameterException('oauth_nonce');
+  private function check_nonce($consumer, $token, $nonce, $timestamp)
+  {
+    if( ! $nonce ) {
+          throw new OAuthMissingParameterException('oauth_nonce');
+    }
 
     // verify that the nonce is uniqueish
     $found = $this->data_store->lookup_nonce(
@@ -876,24 +973,30 @@ 
 
 }
 
-class OAuthDataStore {
-  function lookup_consumer($consumer_key) {
+class OAuthDataStore
+{
+  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
@@ -902,8 +1005,10 @@ 
 
 }
 
-class OAuthUtil {
-  public static function urlencode_rfc3986($input) {
+class OAuthUtil
+{
+  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)) {
@@ -921,7 +1026,8 @@ 
   // 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) {
+  public static function urldecode_rfc3986($string)
+  {
     return urldecode($string);
   }
 
@@ -930,7 +1036,8 @@ 
   // 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) {
+  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) {
@@ -944,7 +1051,8 @@ 
   }
 
   // helper to try to sort out headers for people who aren't running apache
-  public static function get_headers() {
+  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
@@ -967,10 +1075,12 @@ 
       // 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']) )
-        $out['Content-Type'] = $_ENV['CONTENT_TYPE'];
+      if( isset($_SERVER['CONTENT_TYPE']) ) {
+              $out['Content-Type'] = $_SERVER['CONTENT_TYPE'];
+      }
+      if( isset($_ENV['CONTENT_TYPE']) ) {
+              $out['Content-Type'] = $_ENV['CONTENT_TYPE'];
+      }
 
       foreach ($_SERVER as $key => $value) {
         if (substr($key, 0, 5) == "HTTP_") {
@@ -992,8 +1102,11 @@ 
   // 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();
+  public static function parse_parameters( $input )
+  {
+    if (!isset($input) || !$input) {
+        return array();
+    }
 
     $pairs = explode('&', $input);
 
@@ -1021,8 +1134,11 @@ 
     return $parsed_parameters;
   }
 
-  public static function build_http_query($params) {
-    if (!$params) return '';
+  public static function build_http_query($params)
+  {
+    if (!$params) {
+        return '';
+    }
 
     // Urlencode both keys and values
     $keys = OAuthUtil::urlencode_rfc3986(array_keys($params));

htdocs/okapi/datastore.php

Braces +22 added lines, -25 removed lines

@@ -13,8 +13,9 @@ 
             from okapi_consumers
             where `key` = '".Db::escape_string($consumer_key)."'
         ");
-        if (!$row)
-            return null;
+        if (!$row) {
+                    return null;
+        }
         return new OkapiConsumer($row['key'], $row['secret'], $row['name'],
             $row['url'], $row['email'], $row['bflags']);
     }
@@ -29,10 +30,10 @@ 
                 and token_type = '".Db::escape_string($token_type)."'
                 and `key` = '".Db::escape_string($token)."'
         ");
-        if (!$row)
-            return null;
-        switch ($row['token_type'])
-        {
+        if (!$row) {
+                    return null;
+        }
+        switch ($row['token_type']) {
             case 'request':
                 return new OkapiRequestToken($row['key'], $row['secret'],
                     $row['consumer_key'], $row['callback'], $row['user_id'],
@@ -57,8 +58,7 @@ 
             $timestamp,
             $nonce
         )));
-        try
-        {
+        try {
             # Time timestamp is saved separately, because we are periodically
             # removing older nonces from the database (see cronjobs).
 
@@ -71,9 +71,7 @@ 
                 );
             ");
             return null;
-        }
-        catch (\Exception $e)
-        {
+        } catch (\Exception $e) {
             # INSERT failed. This nonce was already used.
 
             return $nonce;
@@ -83,9 +81,8 @@ 
     public function new_request_token($consumer, $callback = null)
     {
         if ((preg_match("#^[a-z][a-z0-9_.-]*://#", $callback) > 0) ||
-            $callback == "oob")
-        { /* ok */ }
-        else { throw new BadRequest("oauth_callback should begin with lower case <scheme>://, or should equal 'oob'."); }
+            $callback == "oob") {
+/* ok */ } else { throw new BadRequest("oauth_callback should begin with lower case <scheme>://, or should equal 'oob'."); }
         $token = new OkapiRequestToken(Okapi::generate_key(20), Okapi::generate_key(40),
             $consumer->key, $callback, null, Okapi::generate_key(8, true));
         Db::execute("
@@ -111,12 +108,15 @@ 
 
     public function new_access_token($token, $consumer, $verifier = null)
     {
-        if ($token->consumer_key != $consumer->key)
-            throw new BadRequest("Request Token given is not associated with the Consumer who signed the request.");
-        if (!$token->authorized_by_user_id)
-            throw new BadRequest("Request Token given has not been authorized.");
-        if ($token->verifier != $verifier)
-            throw new BadRequest("Invalid verifier.");
+        if ($token->consumer_key != $consumer->key) {
+                    throw new BadRequest("Request Token given is not associated with the Consumer who signed the request.");
+        }
+        if (!$token->authorized_by_user_id) {
+                    throw new BadRequest("Request Token given has not been authorized.");
+        }
+        if ($token->verifier != $verifier) {
+                    throw new BadRequest("Invalid verifier.");
+        }
 
         # Invalidate the Request Token.
 
@@ -138,15 +138,12 @@ 
                 and user_id = '".Db::escape_string($token->authorized_by_user_id)."'
                 and consumer_key = '".Db::escape_string($consumer->key)."'
         ");
-        if ($row)
-        {
+        if ($row) {
             # Use existing Access Token
 
             $access_token = new OkapiAccessToken($row['key'], $row['secret'],
                 $consumer->key, $token->authorized_by_user_id);
-        }
-        else
-        {
+        } else {
             # Generate a new Access Token.
 
             $access_token = new OkapiAccessToken(Okapi::generate_key(20), Okapi::generate_key(40),

htdocs/okapi/service_runner.php

Braces +23 added lines, -23 removed lines

@@ -71,15 +71,14 @@ 
     /** Get method options (is consumer required etc.). */
     public static function options($service_name)
     {
-        if (!self::exists($service_name))
-            throw new Exception();
+        if (!self::exists($service_name)) {
+                    throw new Exception();
+        }
         require_once($GLOBALS['rootpath']."okapi/$service_name.php");
-        try
-        {
+        try {
             return call_user_func(array('\\okapi\\'.
                 str_replace('/', '\\', $service_name).'\\WebService', 'options'));
-        } catch (Exception $e)
-        {
+        } catch (Exception $e) {
             throw new Exception("Make sure you've declared your WebService class ".
                 "in an valid namespace (".'okapi\\'.str_replace('/', '\\', $service_name)."); ".
                 $e->getMessage());
@@ -92,8 +91,9 @@ 
      */
     public static function docs($service_name)
     {
-        if (!self::exists($service_name))
-            throw new Exception();
+        if (!self::exists($service_name)) {
+                    throw new Exception();
+        }
         try {
             return file_get_contents("$service_name.xml", true);
         } catch (Exception $e) {
@@ -114,31 +114,28 @@ 
     {
         Okapi::init_internals();
 
-        if (!self::exists($service_name))
-            throw new Exception("Method does not exist: '$service_name'");
+        if (!self::exists($service_name)) {
+                    throw new Exception("Method does not exist: '$service_name'");
+        }
 
         $options = self::options($service_name);
-        if ($options['min_auth_level'] >= 2 && $request->consumer == null)
-        {
+        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 ".
                 "a dummy Consumer if you have to.");
         }
-        if ($options['min_auth_level'] >= 3 && $request->token == null)
-        {
+        if ($options['min_auth_level'] >= 3 && $request->token == null) {
             throw new Exception("Method '$service_name' called with mismatched OkapiRequest: ".
                 "\$request->token MAY NOT be empty for Level 3 methods.");
         }
 
         $time_started = microtime(true);
         Okapi::gettext_domain_init();
-        try
-        {
+        try {
             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")
-            {
+            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)."'
@@ -178,18 +175,21 @@ 
         if ($request !== null) {
             $consumer_key = ($request->consumer != null) ? $request->consumer->key : 'anonymous';
             $user_id = (($request->token != null) && ($request->token instanceof OkapiAccessToken)) ? $request->token->user_id : -1;
-            if ($request->is_http_request() && ($service_name[0] == 's'))  # 's' for "services/", we don't want "extra/" included
+            if ($request->is_http_request() && ($service_name[0] == 's')) {
+                # 's' for "services/", we don't want "extra/" included
                 $calltype = 'http';
-            else
-                $calltype = 'internal';
+            } else {
+                            $calltype = 'internal';
+            }
         } else {
             $consumer_key = 'internal';
             $user_id = -1;
             $calltype = 'internal';
         }
 
-        if (Settings::get('OC_BRANCH') == 'oc.de' && $user_id != -1)
-            $user_id = 0;
+        if (Settings::get('OC_BRANCH') == 'oc.de' && $user_id != -1) {
+                    $user_id = 0;
+        }
 
         Db::execute("
             insert into okapi_stats_temp (`datetime`, consumer_key, user_id, service_name, calltype, runtime)