Merge pull request #4243 from MrPetovan/task/switch-to-array-new-style

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index 3e34d3c5a9e76c824e91f329d1c4afc69bd755a4..fdd928ba1a1c7b64a226301fd8ca1a5fdfa78d79 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -14,6 +14,9 @@ use Detection\MobileDetect;
 
 use Exception;
 
+require_once 'boot.php';
+require_once 'include/dba.php';
+
 /**
  *
  * class: App
@@ -30,9 +33,11 @@ use Exception;
 class App {
 
        public $module_loaded = false;
+       public $module_class = null;
        public $query_string;
        public $config;
        public $page;
+       public $page_offset;
        public $profile;
        public $profile_uid;
        public $user;
@@ -41,7 +46,7 @@ class App {
        public $contacts;
        public $page_contact;
        public $content;
-       public $data = array();
+       public $data = [];
        public $error = false;
        public $cmd;
        public $argv;
@@ -55,14 +60,15 @@ class App {
        public $timezone;
        public $interactive = true;
        public $plugins;
-       public $apps = array();
+       public $plugins_admin = [];
+       public $apps = [];
        public $identities;
        public $is_mobile = false;
        public $is_tablet = false;
        public $is_friendica_app;
-       public $performance = array();
-       public $callstack = array();
-       public $theme_info = array();
+       public $performance = [];
+       public $callstack = [];
+       public $theme_info = [];
        public $backend = true;
        public $nav_sel;
        public $category;
@@ -81,34 +87,34 @@ class App {
         * Mostly unimplemented yet. Only options 'template_engine' and
         * beyond are used.
         */
-       public $theme = array(
+       public $theme = [
                'sourcename' => '',
                'videowidth' => 425,
                'videoheight' => 350,
                'force_max_items' => 0,
                'stylesheet' => '',
                'template_engine' => 'smarty3',
-       );
+       ];
 
        /**
         * @brief An array of registered template engines ('name'=>'class name')
         */
-       public $template_engines = array();
+       public $template_engines = [];
 
        /**
         * @brief An array of instanced template engines ('name'=>'instance')
         */
-       public $template_engine_instance = array();
+       public $template_engine_instance = [];
        public $process_id;
        public $queue;
-       private $ldelim = array(
+       private $ldelim = [
                'internal' => '',
                'smarty3' => '{{'
-       );
-       private $rdelim = array(
+       ];
+       private $rdelim = [
                'internal' => '',
                'smarty3' => '}}'
-       );
+       ];
        private $scheme;
        private $hostname;
        private $db;
@@ -154,16 +160,16 @@ class App {
                $this->performance['marktime'] = 0;
                $this->performance['markstart'] = microtime(true);
 
-               $this->callstack['database'] = array();
-               $this->callstack['database_write'] = array();
-               $this->callstack['network'] = array();
-               $this->callstack['file'] = array();
-               $this->callstack['rendering'] = array();
-               $this->callstack['parser'] = array();
+               $this->callstack['database'] = [];
+               $this->callstack['database_write'] = [];
+               $this->callstack['network'] = [];
+               $this->callstack['file'] = [];
+               $this->callstack['rendering'] = [];
+               $this->callstack['parser'] = [];
 
-               $this->config = array();
-               $this->page = array();
-               $this->pager = array();
+               $this->config = [];
+               $this->page = [];
+               $this->pager = [];
 
                $this->query_string = '';
 
@@ -268,7 +274,7 @@ class App {
                        $this->module = str_replace('-', '_', $this->module);
                } else {
                        $this->argc = 1;
-                       $this->argv = array('home');
+                       $this->argv = ['home'];
                        $this->module = 'home';
                }
 
@@ -309,10 +315,8 @@ class App {
         *
         * @return string
         */
-       public static function get_basepath() {
-               if (isset($this)) {
-                       $basepath = $this->basepath;
-               }
+       public function get_basepath() {
+               $basepath = $this->basepath;
 
                if (! $basepath) {
                        $basepath = Config::get('system', 'basepath');
@@ -513,7 +517,7 @@ class App {
                $invinite_scroll = infinite_scroll_data($this->module);
 
                $tpl = get_markup_template('head.tpl');
-               $this->page['htmlhead'] = replace_macros($tpl, array(
+               $this->page['htmlhead'] = replace_macros($tpl, [
                                '$baseurl' => $this->get_baseurl(),
                                '$local_user' => local_user(),
                                '$generator' => 'Friendica' . ' ' . FRIENDICA_VERSION,
@@ -525,7 +529,7 @@ class App {
                                '$touch_icon' => $touch_icon,
                                '$stylesheet' => $stylesheet,
                                '$infinite_scroll' => $invinite_scroll,
-                       )) . $this->page['htmlhead'];
+                       ]) . $this->page['htmlhead'];
        }
 
        function init_page_end() {
@@ -533,9 +537,9 @@ class App {
                        $this->page['end'] = '';
                }
                $tpl = get_markup_template('end.tpl');
-               $this->page['end'] = replace_macros($tpl, array(
+               $this->page['end'] = replace_macros($tpl, [
                                '$baseurl' => $this->get_baseurl()
-                       )) . $this->page['end'];
+                       ]) . $this->page['end'];
        }
 
        function set_curl_code($code) {
@@ -616,7 +620,7 @@ class App {
         * If $name is not defined, return engine defined by theme,
         * or default
         *
-        * @param strin $name Template engine name
+        * @param string $name Template engine name
         * @return object Template Engine instance
         */
        function template_engine($name = '') {
@@ -705,7 +709,7 @@ class App {
 
                $r = q('SELECT `pid` FROM `process` WHERE `pid` = %d', intval(getmypid()));
                if (!DBM::is_result($r)) {
-                       dba::insert('process', array('pid' => getmypid(), 'command' => $command, 'created' => datetime_convert()));
+                       dba::insert('process', ['pid' => getmypid(), 'command' => $command, 'created' => datetime_convert()]);
                }
                dba::commit();
        }
@@ -720,7 +724,7 @@ class App {
                if (DBM::is_result($r)) {
                        foreach ($r AS $process) {
                                if (!posix_kill($process['pid'], 0)) {
-                                       dba::delete('process', array('pid' => $process['pid']));
+                                       dba::delete('process', ['pid' => $process['pid']]);
                                }
                        }
                }
@@ -731,7 +735,7 @@ class App {
         * @brief Remove the active process from the "process" table
         */
        function end_process() {
-               dba::delete('process', array('pid' => getmypid()));
+               dba::delete('process', ['pid' => getmypid()]);
        }
 
        function get_useragent() {
@@ -756,7 +760,7 @@ class App {
         * @return bool Is it a known backend?
         */
        function is_backend() {
-               static $backends = array();
+               static $backends = [];
                $backends[] = '_well_known';
                $backends[] = 'api';
                $backends[] = 'dfrn_notify';
@@ -833,7 +837,7 @@ class App {
 
                $memdata = explode("\n", file_get_contents('/proc/meminfo'));
 
-               $meminfo = array();
+               $meminfo = [];
                foreach ($memdata as $line) {
                        list($key, $val) = explode(':', $line);
                        $meminfo[$key] = (int) trim(str_replace('kB', '', $val));
@@ -920,9 +924,9 @@ class App {
                }
 
                if (Config::get('system', 'proc_windows')) {
-                       $resource = proc_open('cmd /c start /b ' . $cmdline, array(), $foo, $this->get_basepath());
+                       $resource = proc_open('cmd /c start /b ' . $cmdline, [], $foo, $this->get_basepath());
                } else {
-                       $resource = proc_open($cmdline . ' &', array(), $foo, $this->get_basepath());
+                       $resource = proc_open($cmdline . ' &', [], $foo, $this->get_basepath());
                }
                if (!is_resource($resource)) {
                        logger('We got no resource for command ' . $cmdline, LOGGER_DEBUG);