OpencachingDeutschland / oc-server3

htdocs/okapi/views/apps/authorize.php

Unused Use Statements +3 added lines, -5 removed lines

@@ -2,15 +2,13 @@
 
 namespace okapi\views\apps\authorize;
 
-use Exception;
-use okapi\Okapi;
 use okapi\Db;
+use okapi\Locales;
+use okapi\OCSession;
+use okapi\Okapi;
 use okapi\OkapiHttpResponse;
-use okapi\OkapiHttpRequest;
 use okapi\OkapiRedirectResponse;
 use okapi\Settings;
-use okapi\Locales;
-use okapi\OCSession;
 
 class View
 {

Spacing +4 added lines, -4 removed lines

@@ -111,10 +111,10 @@ 
                         foreach ($cookies as $cookie) {
                             $parts = explode('=', $cookie);
                             $name = trim($parts[0]);
-                            setcookie($name, '', time()-1000);
-                            setcookie($name, '', time()-1000, '/');
+                            setcookie($name, '', time() - 1000);
+                            setcookie($name, '', time() - 1000, '/');
                             foreach (self::getPossibleCookieDomains() as $domain) {
-                                setcookie($name, '', time()-1000, '/', $domain);
+                                setcookie($name, '', time() - 1000, '/', $domain);
                             }
                         }
                     }
@@ -123,7 +123,7 @@ 
                 }
             }
 
-            $after_login = "okapi/apps/authorize?oauth_token=$token_key".(($langpref != Settings::get('SITELANG'))?"&langpref=".$langpref:"");
+            $after_login = "okapi/apps/authorize?oauth_token=$token_key".(($langpref != Settings::get('SITELANG')) ? "&langpref=".$langpref : "");
             $login_url = Settings::get('SITE_URL').$login_page."target=".urlencode($after_login)
                 ."&langpref=".$langpref;
             return new OkapiRedirectResponse($login_url);

Braces +13 added lines, -25 removed lines

@@ -20,8 +20,9 @@ 
         $langpref = isset($_GET['langpref']) ? $_GET['langpref'] : Settings::get('SITELANG');
         $langprefs = explode("|", $langpref);
         $locales = array();
-        foreach (Locales::$languages as $lang => $attrs)
-            $locales[$attrs['locale']] = $attrs;
+        foreach (Locales::$languages as $lang => $attrs) {
+                    $locales[$attrs['locale']] = $attrs;
+        }
 
         # Current implementation of the "interactivity" parameter is: If developer
         # wants to "confirm_user", then just log out the current user before we
@@ -48,8 +49,7 @@ 
 
         $callback_concat_char = (strpos($token['callback'], '?') === false) ? "?" : "&";
 
-        if (!$token)
-        {
+        if (!$token) {
             # Probably Request Token has expired. This will be usually viewed
             # by the user, who knows nothing on tokens and OAuth. Let's be nice then!
 
@@ -79,26 +79,21 @@ 
 
         # Ensure a user is logged in (or force re-login).
 
-        if ($force_relogin || ($OC_user_id == null))
-        {
+        if ($force_relogin || ($OC_user_id == null)) {
             # TODO: confirm_user should first ask the user if he's "the proper one",
             # and then offer to sign in as a different user.
 
             $login_page = 'login.php?';
 
-            if ($OC_user_id !== null)
-            {
-                if (Settings::get('OC_BRANCH') == 'oc.de')
-                {
+            if ($OC_user_id !== null) {
+                if (Settings::get('OC_BRANCH') == 'oc.de') {
                     # OCDE login.php?action=logout&target=... will NOT logout and
                     # then redirect to the target, but it will log out, prompt for
                     # login and then redirect to the target after logging in -
                     # that's exactly the relogin that we want.
 
                     $login_page .= 'action=logout&';
-                }
-                else
-                {
+                } else {
                     # OCPL uses REAL MAGIC for session handling. I don't get ANY of it.
                     # The logout.php DOES NOT support the "target" parameter, so we
                     # can't just call it. The only thing that comes to mind is...
@@ -141,15 +136,12 @@ 
                 and consumer_key = '".Db::escape_string($token['consumer_key'])."'
         ", 0);
 
-        if (!$authorized)
-        {
-            if (isset($_POST['authorization_result']))
-            {
+        if (!$authorized) {
+            if (isset($_POST['authorization_result'])) {
                 # Not yet authorized, but user have just submitted the authorization form.
                 # WRTODO: CSRF protection
 
-                if ($_POST['authorization_result'] == 'granted')
-                {
+                if ($_POST['authorization_result'] == 'granted') {
                     Db::execute("
                         insert ignore into okapi_authorizations (consumer_key, user_id)
                         values (
@@ -158,9 +150,7 @@ 
                         );
                     ");
                     $authorized = true;
-                }
-                else
-                {
+                } else {
                     # User denied access. Nothing sensible to do now. Will try to report
                     # back to the Consumer application with an error.
 
@@ -175,9 +165,7 @@ 
                         return new OkapiRedirectResponse(Settings::get('SITE_URL')."index.php");
                     }
                 }
-            }
-            else
-            {
+            } else {
                 # Not yet authorized. Display an authorization request.
                 $vars = array(
                     'okapi_base_url' => Settings::get('SITE_URL')."okapi/",

htdocs/okapi/views/devel/dbstruct.php

Unused Use Statements +4 added lines, -11 removed lines

@@ -3,19 +3,12 @@
 namespace okapi\views\devel\dbstruct;
 
 use Exception;
-use okapi\Okapi;
-use okapi\Settings;
-use okapi\Cache;
-use okapi\Db;
-use okapi\OkapiRequest;
-use okapi\OkapiRedirectResponse;
+use okapi\BadRequest;
 use okapi\OkapiHttpResponse;
-use okapi\ParamMissing;
-use okapi\InvalidParam;
-use okapi\OkapiServiceRunner;
-use okapi\OkapiInternalRequest;
 use okapi\OkapiInternalConsumer;
-use okapi\BadRequest;
+use okapi\OkapiInternalRequest;
+use okapi\OkapiServiceRunner;
+use okapi\Settings;
 
 class View
 {

Spacing +2 added lines, -2 removed lines

@@ -39,12 +39,12 @@
 
         ini_set('memory_limit', '16M');
         $shell_arguments = "mysqldump --no-data -h$dbserver -u$user -p$password $dbname";
-        if (!strpos($shell_arguments,"--no-data"))
+        if (!strpos($shell_arguments, "--no-data"))
             throw new Exception("wrong database dump arguments");
         $struct = shell_exec($shell_arguments);
         if (strlen($struct) > 1000000)
             throw new Exception("something went terribly wrong while dumping table structures");
-        if (stripos($struct,"dumping data") !== FALSE)
+        if (stripos($struct, "dumping data") !== FALSE)
             throw new Exception("something went terribly wrong while dumping table structures");
 
         # Remove the "AUTO_INCREMENT=..." values. They break the diffs.

Braces +25 added lines, -31 removed lines

@@ -39,13 +39,16 @@ 
 
         ini_set('memory_limit', '16M');
         $shell_arguments = "mysqldump --no-data -h$dbserver -u$user -p$password $dbname";
-        if (!strpos($shell_arguments,"--no-data"))
-            throw new Exception("wrong database dump arguments");
+        if (!strpos($shell_arguments,"--no-data")) {
+                    throw new Exception("wrong database dump arguments");
+        }
         $struct = shell_exec($shell_arguments);
-        if (strlen($struct) > 1000000)
-            throw new Exception("something went terribly wrong while dumping table structures");
-        if (stripos($struct,"dumping data") !== FALSE)
-            throw new Exception("something went terribly wrong while dumping table structures");
+        if (strlen($struct) > 1000000) {
+                    throw new Exception("something went terribly wrong while dumping table structures");
+        }
+        if (stripos($struct,"dumping data") !== FALSE) {
+                    throw new Exception("something went terribly wrong while dumping table structures");
+        }
 
         # Remove the "AUTO_INCREMENT=..." values. They break the diffs.
 
@@ -65,12 +68,10 @@ 
 
         $response = new OkapiHttpResponse();
         $response->content_type = "text/plain; charset=utf-8";
-        if (isset($_GET['compare_to']))
-        {
+        if (isset($_GET['compare_to'])) {
             self::requireSafe($_GET['compare_to']);
             $scheme = parse_url($_GET['compare_to'], PHP_URL_SCHEME);
-            if (in_array($scheme, array('http', 'https')))
-            {
+            if (in_array($scheme, array('http', 'https'))) {
                 try {
                     $alternate_struct = @file_get_contents($_GET['compare_to']);
                 } catch (Exception $e) {
@@ -84,16 +85,13 @@ 
                     "-- better to use manual diff instead.\n\n";
                 require_once("comparator.inc.php");
                 $updater = new \dbStructUpdater();
-                if (isset($_GET['reverse']) && ($_GET['reverse'] == 'true'))
-                {
+                if (isset($_GET['reverse']) && ($_GET['reverse'] == 'true')) {
                     $response->body .=
                         "-- REVERSE MODE. The following will alter [2], so that it has the structure of [1].\n".
                         "-- 1. ".Settings::get('SITE_URL')."okapi/devel/dbstruct (".md5($struct).")\n".
                         "-- 2. ".$_GET['compare_to']." (".md5($alternate_struct).")\n\n";
                     $alters = $updater->getUpdates($alternate_struct, $struct);
-                }
-                else
-                {
+                } else {
                     $response->body .=
                         "-- The following will alter [1], so that it has the structure of [2].\n".
                         "-- 1. ".Settings::get('SITE_URL')."okapi/devel/dbstruct (".md5($struct).")\n".
@@ -101,31 +99,27 @@ 
                     $alters = $updater->getUpdates($struct, $alternate_struct);
                 }
                 # Add semicolons
-                foreach ($alters as &$alter_ref)
-                    $alter_ref .= ";";
+                foreach ($alters as &$alter_ref) {
+                                    $alter_ref .= ";";
+                }
                 # Comment out all differences containing "okapi_". These should be executed
                 # by OKAPI update scripts.
-                foreach ($alters as &$alter_ref)
-                {
-                    if (strpos($alter_ref, "okapi_") !== false)
-                    {
+                foreach ($alters as &$alter_ref) {
+                    if (strpos($alter_ref, "okapi_") !== false) {
                         $lines = explode("\n", $alter_ref);
                         $alter_ref = "-- Probably you should NOT execute this one. Use okapi/update instead.\n-- {{{\n--   ".
                             implode("\n--   ", $lines)."\n-- }}}";
                     }
                 }
-                if (count($alters) > 0)
-                    $response->body .= implode("\n", $alters)."\n";
-                else
-                    $response->body .= "-- No differences found\n";
-            }
-            else
-            {
+                if (count($alters) > 0) {
+                                    $response->body .= implode("\n", $alters)."\n";
+                } else {
+                                    $response->body .= "-- No differences found\n";
+                }
+            } else {
                 $response->body = "HTTP(S) only!";
             }
-        }
-        else
-        {
+        } else {
             $response->body = $struct;
         }
         return $response;

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
         $struct = shell_exec($shell_arguments);
         if (strlen($struct) > 1000000)
             throw new Exception("something went terribly wrong while dumping table structures");
-        if (stripos($struct,"dumping data") !== FALSE)
+        if (stripos($struct,"dumping data") !== false)
             throw new Exception("something went terribly wrong while dumping table structures");
 
         # Remove the "AUTO_INCREMENT=..." values. They break the diffs.

htdocs/okapi/views/tilestress.php

Unused Use Statements +4 added lines, -14 removed lines

@@ -3,22 +3,12 @@
 namespace okapi\views\tilestress;
 
 use Exception;
-
-use okapi\Okapi;
-use okapi\Cache;
 use okapi\Db;
-use okapi\OkapiRequest;
-use okapi\OkapiRedirectResponse;
-use okapi\OkapiHttpResponse;
-use okapi\ParamMissing;
-use okapi\InvalidParam;
-use okapi\OkapiServiceRunner;
-use okapi\OkapiInternalRequest;
-use okapi\OkapiInternalConsumer;
-use okapi\OkapiInternalAccessToken;
-use okapi\Settings;
-use okapi\OkapiLock;
 use okapi\OkapiExceptionHandler;
+use okapi\OkapiInternalAccessToken;
+use okapi\OkapiInternalConsumer;
+use okapi\OkapiInternalRequest;
+use okapi\OkapiServiceRunner;
 
 require_once($GLOBALS['rootpath']."okapi/service_runner.php");
 

Spacing +2 added lines, -2 removed lines

@@ -66,8 +66,8 @@
             }
 
             $tiles = array();
-            for ($xx=$x; $xx<$x+4; $xx++)
-                for ($yy=$y; $yy<$y+4; $yy++)
+            for ($xx = $x; $xx < $x + 4; $xx++)
+                for ($yy = $y; $yy < $y + 4; $yy++)
                     $tiles[] = array($xx, $yy);
             srand();
             shuffle($tiles);

Braces +8 added lines, -7 removed lines

@@ -42,8 +42,7 @@ 
         $user_id = $_GET['u'];
         self::out("Yo. I'm $user_id.\n\n");
 
-        while (true)
-        {
+        while (true) {
             srand(floor(time() / 10));
             $mode2 = rand(0, 9) <= 7;
             if ($mode2) {
@@ -66,14 +65,16 @@ 
             }
 
             $tiles = array();
-            for ($xx=$x; $xx<$x+4; $xx++)
-                for ($yy=$y; $yy<$y+4; $yy++)
-                    $tiles[] = array($xx, $yy);
+            for ($xx=$x; $xx<$x+4; $xx++) {
+                            for ($yy=$y;
+            }
+            $yy<$y+4; $yy++) {
+                                    $tiles[] = array($xx, $yy);
+                }
             srand();
             shuffle($tiles);
 
-            foreach ($tiles as $tile)
-            {
+            foreach ($tiles as $tile) {
                 list($x, $y) = $tile;
                 self::out("Loading ".str_pad("($z, $x, $y)... ", 30));
                 $time_started = microtime(true);

htdocs/src/Oc/Libse/ChildWp/ControllerChildWp.php

Doc Comments +6 added lines

@@ -35,6 +35,9 @@ 
         $this->init(0, 0);
     }
 
+    /**
+     * @param boolean $request
+     */
     private function initRequest($request)
     {
         if ($request) {
@@ -44,6 +47,9 @@ 
         return new RequestHttp();
     }
 
+    /**
+     * @param boolean $translator
+     */
     private function initTranslator($translator)
     {
         if ($translator) {

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 use Oc\Libse\Http\RequestHttp;
 use Oc\Libse\Language\TranslatorLanguage;
 
-require_once __DIR__ . '/../../../../lib2/error.inc.php';
+require_once __DIR__.'/../../../../lib2/error.inc.php';
 
 class ControllerChildWp
 {

htdocs/adminuser.php

Spacing +4 added lines, -4 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'adminuser';
 $tpl->menuitem = MNU_ADMIN_USER;
@@ -51,7 +51,7 @@ 
     // send a new confirmation
     $user->sendRegistrationCode();
 
-    $tpl->redirect('adminuser.php?action=searchuser&msg=sendcodecommit&username=' . urlencode($user->getUsername()));
+    $tpl->redirect('adminuser.php?action=searchuser&msg=sendcodecommit&username='.urlencode($user->getUsername()));
 }
 
 function formAction()
@@ -97,8 +97,8 @@ 
         $user->addEmailProblem($datalicense);
     }
 
-    $tpl->redirect('adminuser.php?action=searchuser&username=' . urlencode($username) .
-        '&success=' . ($disduelicense + $disable));
+    $tpl->redirect('adminuser.php?action=searchuser&username='.urlencode($username).
+        '&success='.($disduelicense + $disable));
 }
 
 function searchUser()

htdocs/login.php

Spacing +6 added lines, -6 removed lines

@@ -6,7 +6,7 @@ 
  ***************************************************************************/
 
 $disable_verifyemail = true;
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'login';
 $tpl->menuitem = MNU_LOGIN;
@@ -28,7 +28,7 @@ 
     $target = 'myhome.php';
 }
 
-$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';   // Ocprop
+$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : ''; // Ocprop
 
 if ($action == 'cookieverify') {
     // we should be logged in ... check if cookie is set ...
@@ -39,7 +39,7 @@ 
             $tpl->redirect($target);
         }
     } else {
-        if (!isset($_COOKIE[$opt['session']['cookiename'] . 'data'])) {
+        if (!isset($_COOKIE[$opt['session']['cookiename'].'data'])) {
             $tpl->error(ERROR_NO_COOKIES);
         } else {
             $tpl->redirect($target);
@@ -58,13 +58,13 @@ 
         $tpl->error(ERROR_ALREADY_LOGGEDIN);
     }
 
-    $username = isset($_POST['email']) ? $_POST['email'] : '';  // Ocprop
-    $password = isset($_POST['password']) ? $_POST['password'] : '';  // Ocprop
+    $username = isset($_POST['email']) ? $_POST['email'] : ''; // Ocprop
+    $password = isset($_POST['password']) ? $_POST['password'] : ''; // Ocprop
 
     $retval = $login->try_login($username, $password, null);
     $password = '';
     if ($retval == LOGIN_OK) {
-        $tpl->redirect('login.php?action=cookieverify&target=' . urlencode($target));
+        $tpl->redirect('login.php?action=cookieverify&target='.urlencode($target));
     }
 
     $tpl->assign('username', $username);

htdocs/newlogsrest.php

Spacing +1 added lines, -1 removed lines

@@ -6,4 +6,4 @@
  ***************************************************************************/
 
 $newlogs_rest = true;
-require __DIR__ . '/newlogs.php';
+require __DIR__.'/newlogs.php';

htdocs/garmin.php

Spacing +7 added lines, -7 removed lines

@@ -5,9 +5,9 @@ 
  * Unicode Reminder メモ
  ****************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
-require_once __DIR__ . '/lib2/logic/labels.inc.php';
-require_once __DIR__ . '/lib2/logic/cache.class.php';
+require __DIR__.'/lib2/web.inc.php';
+require_once __DIR__.'/lib2/logic/labels.inc.php';
+require_once __DIR__.'/lib2/logic/cache.class.php';
 
 $tpl->name = 'garmin';
 $tpl->popup = 1;
@@ -30,9 +30,9 @@ 
 // be needed.
 
 if (($opt['lib']['garmin']['domain'] != $_SERVER['HTTP_HOST']) && !isset($_REQUEST['redirect'])) {
-    $redirect = $opt['lib']['garmin']['page_url'] . 'garmin.php?redirect=1&cacheid=' . $cacheid;
+    $redirect = $opt['lib']['garmin']['page_url'].'garmin.php?redirect=1&cacheid='.$cacheid;
     if (isset($_REQUEST['templocale'])) {
-        $redirect .= '&templocale=' . $_REQUEST['templocale'];
+        $redirect .= '&templocale='.$_REQUEST['templocale'];
     }
     $tpl->redirect($redirect);
     exit;
@@ -52,9 +52,9 @@ 
 $tpl->assign('crypt', $bCrypt);
 
 if (isset($_REQUEST['desclang'])) {
-    $sPreferedDescLang = $_REQUEST['desclang'] . ',' . $opt['template']['locale'] . ',EN';
+    $sPreferedDescLang = $_REQUEST['desclang'].','.$opt['template']['locale'].',EN';
 } else {
-    $sPreferedDescLang = $opt['template']['locale'] . ',EN';
+    $sPreferedDescLang = $opt['template']['locale'].',EN';
 }
 
 //get cache record

htdocs/newlogpics.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'newlogpics';
 $tpl->menuitem = MNU_START_NEWLOGPICS;