X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp.php;h=3e34d3c5a9e76c824e91f329d1c4afc69bd755a4;hb=88ef61df95ed1b26e44d0b28bf22a1c682b5899a;hp=5c1c2bb9c1d7ac8ea4ab235c368d93329a47ef76;hpb=669dafcf22e5c4baf5c2248c967226f915cd4403;p=friendica.git diff --git a/src/App.php b/src/App.php index 5c1c2bb9c1..3e34d3c5a9 100644 --- a/src/App.php +++ b/src/App.php @@ -3,12 +3,12 @@ namespace Friendica; use Friendica\Core\System; +use Friendica\Core\Cache; use Friendica\Core\Config; use Friendica\Core\PConfig; +use Friendica\Database\DBM; -use Cache; use dba; -use dbm; 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);