Review and Use statements

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index 7ff56cee3a03e5df05b8fe033c85e2a060c281fe..3e34d3c5a9e76c824e91f329d1c4afc69bd755a4 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -3,11 +3,11 @@
 namespace Friendica;
 
 use Friendica\Core\System;
+use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
-use Friendica\Database\Dbm;
+use Friendica\Database\DBM;
 
-use Cache;
 use dba;
 
 use Detection\MobileDetect;
@@ -73,7 +73,6 @@ class App {
        public $videowidth = 425;
        public $videoheight = 350;
        public $force_max_items = 0;
-       public $theme_thread_allow = true;
        public $theme_events_in_profile = true;
 
        /**
@@ -87,7 +86,6 @@ class App {
                'videowidth' => 425,
                'videoheight' => 350,
                'force_max_items' => 0,
-               'thread_allow' => true,
                'stylesheet' => '',
                'template_engine' => 'smarty3',
        );
@@ -295,7 +293,7 @@ class App {
                // Register template engines
                $dc = get_declared_classes();
                foreach ($dc as $k) {
-                       if (in_array('ITemplateEngine', class_implements($k))) {
+                       if (in_array('Friendica\Render\ITemplateEngine', class_implements($k))) {
                                $this->register_template_engine($k);
                        }
                }
@@ -706,7 +704,7 @@ class App {
                dba::transaction();
 
                $r = q('SELECT `pid` FROM `process` WHERE `pid` = %d', intval(getmypid()));
-               if (!Dbm::is_result($r)) {
+               if (!DBM::is_result($r)) {
                        dba::insert('process', array('pid' => getmypid(), 'command' => $command, 'created' => datetime_convert()));
                }
                dba::commit();
@@ -719,10 +717,10 @@ class App {
                dba::transaction();
 
                $r = q('SELECT `pid` FROM `process`');
-               if (Dbm::is_result($r)) {
+               if (DBM::is_result($r)) {
                        foreach ($r AS $process) {
                                if (!posix_kill($process['pid'], 0)) {
-                                       q('DELETE FROM `process` WHERE `pid` = %d', intval($process['pid']));
+                                       dba::delete('process', array('pid' => $process['pid']));
                                }
                        }
                }
@@ -733,7 +731,7 @@ class App {
         * @brief Remove the active process from the "process" table
         */
        function end_process() {
-               q('DELETE FROM `process` WHERE `pid` = %d', intval(getmypid()));
+               dba::delete('process', array('pid' => getmypid()));
        }
 
        function get_useragent() {
@@ -806,7 +804,7 @@ class App {
                        }
                }
 
-               $processlist = Dbm::processlist();
+               $processlist = DBM::processlist();
                if ($processlist['list'] != '') {
                        logger('Processcheck: Processes: ' . $processlist['amount'] . ' - Processlist: ' . $processlist['list'], LOGGER_DEBUG);