X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FApp.php;h=ff118ac72550792328c7305f2d393d659c868bff;hb=f32ea03911e81ccb1ce9f6553f8fc3bdaa815ffb;hp=9fb63ce6792e1d1f21b13cad6663adc239b24fc8;hpb=920ffab43948d4a3081d248eb2e9f6dd5b1398e6;p=friendica.git diff --git a/src/App.php b/src/App.php index 9fb63ce679..ff118ac725 100644 --- a/src/App.php +++ b/src/App.php @@ -34,8 +34,6 @@ class App public $query_string = ''; public $config = []; public $page = []; - public $pager = []; - public $page_offset; public $profile; public $profile_uid; public $user; @@ -303,16 +301,6 @@ class App $this->module = 'home'; } - // See if there is any page number information, and initialise pagination - $this->pager['page'] = !empty($_GET['page']) && intval($_GET['page']) > 0 ? intval($_GET['page']) : 1; - $this->pager['itemspage'] = 50; - $this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage']; - - if ($this->pager['start'] < 0) { - $this->pager['start'] = 0; - } - $this->pager['total'] = 0; - // Detect mobile devices $mobile_detect = new MobileDetect(); $this->is_mobile = $mobile_detect->isMobile(); @@ -732,23 +720,6 @@ class App return $this->urlPath; } - public function setPagerTotal($n) - { - $this->pager['total'] = intval($n); - } - - public function setPagerItemsPage($n) - { - $this->pager['itemspage'] = ((intval($n) > 0) ? intval($n) : 0); - $this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage']; - } - - public function setPagerPage($n) - { - $this->pager['page'] = $n; - $this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage']; - } - /** * Initializes App->page['htmlhead']. * @@ -798,9 +769,6 @@ class App $touch_icon = 'images/friendica-128.png'; } - // get data wich is needed for infinite scroll on the network page - $infinite_scroll = infinite_scroll_data($this->module); - Core\Addon::callHooks('head', $this->page['htmlhead']); $tpl = get_markup_template('head.tpl'); @@ -818,7 +786,6 @@ class App '$update_interval' => $interval, '$shortcut_icon' => $shortcut_icon, '$touch_icon' => $touch_icon, - '$infinite_scroll' => $infinite_scroll, '$block_public' => intval(Core\Config::get('system', 'block_public')), '$stylesheets' => $this->stylesheets, ]) . $this->page['htmlhead']; @@ -1984,6 +1951,9 @@ class App // Theme templates expect $a as an App instance $a = $this; + // Used as is in view/php/default.php + $lang = Core\L10n::getCurrentLang(); + /// @TODO Looks unsafe (remote-inclusion), is maybe not but Core\Theme::getPathForFile() uses file_exists() but does not escape anything require_once $template; }