We got rid of two workerqueue queries, yeah!

[friendica.git] / index.php

diff --git a/index.php b/index.php
index efaf07c1a0b24a7957ba47acc81753f33245a8ac..9ddb47efc693883d170803c8acdb3ae2f16aaf4e 100644 (file)
--- a/index.php
+++ b/index.php
@@ -13,12 +13,13 @@
  *
  */
 
-use \Friendica\Core\Config;
+use Friendica\App;
+use Friendica\Core\Config;
 
-require_once('boot.php');
-require_once('object/BaseObject.php');
+require_once 'boot.php';
+require_once 'object/BaseObject.php';
 
-$a = new App;
+$a = new App(__DIR__);
 BaseObject::set_app($a);
 
 // We assume that the index.php is called by a frontend process
@@ -58,22 +59,22 @@ if (!$install) {
 
        Config::load();
 
-       if ($a->max_processes_reached() OR $a->maxload_reached()) {
+       if ($a->max_processes_reached() || $a->maxload_reached()) {
                header($_SERVER["SERVER_PROTOCOL"] . ' 503 Service Temporarily Unavailable');
                header('Retry-After: 120');
                header('Refresh: 120; url=' . App::get_baseurl() . "/" . $a->query_string);
                die("System is currently unavailable. Please try again later");
        }
 
-       if (get_config('system', 'force_ssl') AND ($a->get_scheme() == "http") AND
-               (intval(get_config('system', 'ssl_policy')) == SSL_POLICY_FULL) AND
+       if (get_config('system', 'force_ssl') && ($a->get_scheme() == "http") &&
+               (intval(get_config('system', 'ssl_policy')) == SSL_POLICY_FULL) &&
                (substr(App::get_baseurl(), 0, 8) == "https://")) {
                header("HTTP/1.1 302 Moved Temporarily");
                header("Location: " . App::get_baseurl() . "/" . $a->query_string);
                exit();
        }
 
-       require_once("include/session.php");
+       require_once 'include/session.php';
        load_hooks();
        call_hooks('init_1');
 
@@ -112,9 +113,11 @@ if (!$a->is_backend()) {
  */
 if (x($_SESSION,'authenticated') && !x($_SESSION,'language')) {
        // we didn't loaded user data yet, but we need user language
-       $r = q("SELECT language FROM user WHERE uid=%d", intval($_SESSION['uid']));
+       $r = dba::select('user', array('language'), array('uid' => $_SESSION['uid']), array('limit' => 1));
        $_SESSION['language'] = $lang;
-       if (dbm::is_result($r)) $_SESSION['language'] = $r[0]['language'];
+       if (dbm::is_result($r)) {
+               $_SESSION['language'] = $r['language'];
+       }
 }
 
 if ((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
@@ -125,7 +128,7 @@ if ((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
 if ((x($_GET,'zrl')) && (!$install && !$maintenance)) {
        // Only continue when the given profile link seems valid
        // Valid profile links contain a path with "/profile/" and no query parameters
-       if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == "") AND
+       if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == "") &&
                strstr(parse_url($_GET['zrl'], PHP_URL_PATH), "/profile/")) {
                $_SESSION['my_url'] = $_GET['zrl'];
                $a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is','',$a->query_string);
@@ -242,7 +245,7 @@ if (strlen($a->module)) {
        }
 
        // Compatibility with the Firefox App
-       if (($a->module == "users") AND ($a->cmd == "users/sign_in")) {
+       if (($a->module == "users") && ($a->cmd == "users/sign_in")) {
                $a->module = "login";
        }
 
@@ -447,7 +450,7 @@ if (!$a->theme['stylesheet']) {
 $a->page['htmlhead'] = str_replace('{{$stylesheet}}',$stylesheet,$a->page['htmlhead']);
 //$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet));
 
-if (isset($_GET["mode"]) AND (($_GET["mode"] == "raw") OR ($_GET["mode"] == "minimal"))) {
+if (isset($_GET["mode"]) && (($_GET["mode"] == "raw") || ($_GET["mode"] == "minimal"))) {
        $doc = new DOMDocument();
 
        $target = new DOMDocument();
@@ -470,7 +473,7 @@ if (isset($_GET["mode"]) AND (($_GET["mode"] == "raw") OR ($_GET["mode"] == "min
        }
 }
 
-if (isset($_GET["mode"]) AND ($_GET["mode"] == "raw")) {
+if (isset($_GET["mode"]) && ($_GET["mode"] == "raw")) {
 
        header("Content-type: text/html; charset=utf-8");
 
@@ -486,7 +489,7 @@ header("X-Friendica-Version: " . FRIENDICA_VERSION);
 header("Content-type: text/html; charset=utf-8");
 
 /*
- * We use $_GET["mode"] for special page templates. So we will check if we have 
+ * We use $_GET["mode"] for special page templates. So we will check if we have
  * to load another page template than the default one.
  * The page templates are located in /view/php/ or in the theme directory.
  */