OpencachingDeutschland / oc-server3

htdocs/okapi/views/method_doc.php

Spacing +4 added lines, -4 removed lines

@@ -19,8 +19,8 @@ 
 {
     public static function call($methodname)
     {
-        require_once($GLOBALS['rootpath'].'okapi/service_runner.php');
-        require_once($GLOBALS['rootpath'].'okapi/views/menu.inc.php');
+        require_once($GLOBALS['rootpath'] . 'okapi/service_runner.php');
+        require_once($GLOBALS['rootpath'] . 'okapi/views/menu.inc.php');
 
         try
         {
@@ -33,8 +33,8 @@ 
         }
         $vars = array(
             'method' => $method,
-            'menu' => OkapiMenu::get_menu_html($methodname.".html"),
-            'okapi_base_url' => Settings::get('SITE_URL')."okapi/",
+            'menu' => OkapiMenu::get_menu_html($methodname . ".html"),
+            'okapi_base_url' => Settings::get('SITE_URL') . "okapi/",
             'installations' => OkapiMenu::get_installations(),
             'okapi_rev' => Okapi::$version_number,
         );

Braces +1 added lines, -2 removed lines

@@ -26,8 +26,7 @@
         {
             $method = OkapiServiceRunner::call('services/apiref/method', new OkapiInternalRequest(
                 null, null, array('name' => $methodname)));
-        }
-        catch (BadRequest $e)
+        } catch (BadRequest $e)
         {
             throw new Http404();
         }

htdocs/okapi/views/apps/revoke_access.php

Spacing +7 added lines, -7 removed lines

@@ -17,7 +17,7 @@ 
     {
         # Determine which user is logged in to OC.
 
-        require_once($GLOBALS['rootpath']."okapi/lib/oc_session.php");
+        require_once($GLOBALS['rootpath'] . "okapi/lib/oc_session.php");
         $OC_user_id = OCSession::get_user_id();
 
         # Ensure a user is logged in.
@@ -25,7 +25,7 @@ 
         if ($OC_user_id == null)
         {
             $after_login = "okapi/apps/"; # it is correct, if you're wondering
-            $login_url = Settings::get('SITE_URL')."login.php?target=".urlencode($after_login);
+            $login_url = Settings::get('SITE_URL') . "login.php?target=" . urlencode($after_login);
             return new OkapiRedirectResponse($login_url);
         }
 
@@ -36,18 +36,18 @@ 
         Db::execute("
             delete from okapi_tokens
             where
-                user_id = '".Db::escape_string($OC_user_id)."'
-                and consumer_key = '".Db::escape_string($consumer_key)."'
+                user_id = '".Db::escape_string($OC_user_id) . "'
+                and consumer_key = '".Db::escape_string($consumer_key) . "'
         ");
         Db::execute("
             delete from okapi_authorizations
             where
-                user_id = '".Db::escape_string($OC_user_id)."'
-                and consumer_key = '".Db::escape_string($consumer_key)."'
+                user_id = '".Db::escape_string($OC_user_id) . "'
+                and consumer_key = '".Db::escape_string($consumer_key) . "'
         ");
 
         # Redirect back to the apps page.
 
-        return new OkapiRedirectResponse(Settings::get('SITE_URL')."okapi/apps/");
+        return new OkapiRedirectResponse(Settings::get('SITE_URL') . "okapi/apps/");
     }
 }

htdocs/okapi/views/apps/authorized.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
                 okapi_consumers c,
                 okapi_tokens t
             where
-                t.`key` = '".Db::escape_string($token_key)."'
+                t.`key` = '".Db::escape_string($token_key) . "'
                 and t.consumer_key = c.`key`
         ");
 
@@ -41,7 +41,7 @@ 
         }
 
         $vars = array(
-            'okapi_base_url' => Settings::get('SITE_URL')."okapi/",
+            'okapi_base_url' => Settings::get('SITE_URL') . "okapi/",
             'token' => $token,
             'verifier' => $verifier,
             'site_name' => Okapi::get_normalized_site_name(),

htdocs/okapi/views/apps/index.php

Spacing +5 added lines, -5 removed lines

@@ -20,13 +20,13 @@ 
 
         # Determine which user is logged in to OC.
 
-        require_once($GLOBALS['rootpath']."okapi/lib/oc_session.php");
+        require_once($GLOBALS['rootpath'] . "okapi/lib/oc_session.php");
         $OC_user_id = OCSession::get_user_id();
 
         if ($OC_user_id == null)
         {
-            $after_login = "okapi/apps/".(($langpref != Settings::get('SITELANG'))?"?langpref=".$langpref:"");
-            $login_url = Settings::get('SITE_URL')."login.php?target=".urlencode($after_login);
+            $after_login = "okapi/apps/" . (($langpref != Settings::get('SITELANG')) ? "?langpref=" . $langpref : "");
+            $login_url = Settings::get('SITE_URL') . "login.php?target=" . urlencode($after_login);
             return new OkapiRedirectResponse($login_url);
         }
 
@@ -38,12 +38,12 @@ 
                 okapi_consumers c,
                 okapi_authorizations a
             where
-                a.user_id = '".Db::escape_string($OC_user_id)."'
+                a.user_id = '".Db::escape_string($OC_user_id) . "'
                 and c.`key` = a.consumer_key
             order by c.name
         ");
         $vars = array();
-        $vars['okapi_base_url'] = Settings::get('SITE_URL')."okapi/";
+        $vars['okapi_base_url'] = Settings::get('SITE_URL') . "okapi/";
         $vars['site_url'] = Settings::get('SITE_URL');
         $vars['site_name'] = Okapi::get_normalized_site_name();
         $vars['site_logo'] = Settings::get('SITE_LOGO');

Braces +3 added lines, -2 removed lines

@@ -48,8 +48,9 @@
         $vars['site_name'] = Okapi::get_normalized_site_name();
         $vars['site_logo'] = Settings::get('SITE_LOGO');
         $vars['apps'] = array();
-        while ($row = Db::fetch_assoc($rs))
-            $vars['apps'][] = $row;
+        while ($row = Db::fetch_assoc($rs)) {
+                    $vars['apps'][] = $row;
+        }
         Db::free_result($rs);
 
         $response = new OkapiHttpResponse();

htdocs/okapi/views/introduction.php

Spacing +3 added lines, -3 removed lines

@@ -18,12 +18,12 @@
 {
     public static function call()
     {
-        require_once($GLOBALS['rootpath'].'okapi/service_runner.php');
-        require_once($GLOBALS['rootpath'].'okapi/views/menu.inc.php');
+        require_once($GLOBALS['rootpath'] . 'okapi/service_runner.php');
+        require_once($GLOBALS['rootpath'] . 'okapi/views/menu.inc.php');
 
         $vars = array(
             'menu' => OkapiMenu::get_menu_html("introduction.html"),
-            'okapi_base_url' => Settings::get('SITE_URL')."okapi/",
+            'okapi_base_url' => Settings::get('SITE_URL') . "okapi/",
             'site_url' => Settings::get('SITE_URL'),
             'method_index' => OkapiServiceRunner::call('services/apiref/method_index',
                 new OkapiInternalRequest(new OkapiInternalConsumer(), null, array())),

htdocs/okapi/views/index.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
         # This is called when someone displays "http://../okapi/" (with no
         # html path at the end). We will redirect to the introduction page.
 
-        return new OkapiRedirectResponse(Settings::get('SITE_URL').
+        return new OkapiRedirectResponse(Settings::get('SITE_URL') .
             "okapi/introduction.html");
     }
 }

htdocs/okapi/views/signup.php

Spacing +4 added lines, -4 removed lines

@@ -55,18 +55,18 @@
             return $response;
         }
 
-        require_once($GLOBALS['rootpath'].'okapi/service_runner.php');
-        require_once($GLOBALS['rootpath'].'okapi/views/menu.inc.php');
+        require_once($GLOBALS['rootpath'] . 'okapi/service_runner.php');
+        require_once($GLOBALS['rootpath'] . 'okapi/views/menu.inc.php');
 
         $vars = array(
             'menu' => OkapiMenu::get_menu_html("signup.html"),
-            'okapi_base_url' => Settings::get('SITE_URL')."okapi/",
+            'okapi_base_url' => Settings::get('SITE_URL') . "okapi/",
             'site_url' => Settings::get('SITE_URL'),
             'site_name' => Okapi::get_normalized_site_name(),
             'installations' => OkapiMenu::get_installations(),
             'okapi_rev' => Okapi::$version_number,
             'data_license_html' => Settings::get('DATA_LICENSE_URL')
-                ? "<a href='".Settings::get('DATA_LICENSE_URL')."'>Data License</a>"
+                ? "<a href='" . Settings::get('DATA_LICENSE_URL') . "'>Data License</a>"
                 : "Data License",
         );
 

Braces +15 added lines, -15 removed lines

@@ -26,21 +26,21 @@
             $email = isset($_REQUEST['email']) ? $_REQUEST['email'] : "";
             $accepted_terms = isset($_REQUEST['terms']) ? $_REQUEST['terms'] : "";
             $ok = false;
-            if (!$appname)
-                $notice = "Please provide a valid application name.";
-            elseif (mb_strlen($appname) > 100)
-                $notice = "Application name should be less than 100 characters long.";
-            elseif (mb_strlen($appurl) > 250)
-                $notice = "Application URL should be less than 250 characters long.";
-            elseif ($appurl && (substr($appurl, 0, 7) != "http://") && (substr($appurl, 0, 8) != "https://"))
-                $notice = "Application homepage URL should start with http(s)://. (Note: this URL is OPTIONAL and it is NOT for OAuth callback.)";
-            elseif (!$email)
-                $notice = "Please provide a valid email address.";
-            elseif (mb_strlen($email) > 70)
-                $notice = "Email address should be less than 70 characters long.";
-            elseif (!$accepted_terms)
-                $notice = "You have to read and accept OKAPI Terms of Use.";
-            else
+            if (!$appname) {
+                            $notice = "Please provide a valid application name.";
+            } elseif (mb_strlen($appname) > 100) {
+                            $notice = "Application name should be less than 100 characters long.";
+            } elseif (mb_strlen($appurl) > 250) {
+                            $notice = "Application URL should be less than 250 characters long.";
+            } elseif ($appurl && (substr($appurl, 0, 7) != "http://") && (substr($appurl, 0, 8) != "https://")) {
+                            $notice = "Application homepage URL should start with http(s)://. (Note: this URL is OPTIONAL and it is NOT for OAuth callback.)";
+            } elseif (!$email) {
+                            $notice = "Please provide a valid email address.";
+            } elseif (mb_strlen($email) > 70) {
+                            $notice = "Email address should be less than 70 characters long.";
+            } elseif (!$accepted_terms) {
+                            $notice = "You have to read and accept OKAPI Terms of Use.";
+            } else
             {
                 $ok = true;
                 Okapi::register_new_consumer($appname, $appurl, $email);

htdocs/map2.php

Spacing +3 added lines, -3 removed lines

@@ -67,7 +67,7 @@ 
                        WHERE option_id=6 AND user_id='&1'", true, $login->userid))
 ) {
     $fullscreen = true;
-    $tpl->popup = true;        // disables page header and -frame
+    $tpl->popup = true; // disables page header and -frame
     $tpl->popupmargin = false;
 } else {
     $fullscreen = false;
@@ -456,7 +456,7 @@ 
     $caches_found = 0;
     while ($r = sql_fetch_assoc($rs)) {
         echo '<cache name="' . xmlentities($r['name']) . '" wpoc="' . xmlentities($r['wp_oc']) . '" />' . "\n";
-        ++ $caches_found;
+        ++$caches_found;
     }
     sql_free_result($rs);
 
@@ -496,7 +496,7 @@ 
         "SELECT `slave_id`
         FROM `map2_result`
         WHERE `result_id`='&1' AND DATE_ADD(`date_created`, INTERVAL '&2' SECOND)>NOW()",
-        - 2,
+        -2,
         $nResultId,
         $opt['map']['maxcacheage']
     );

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');