Diabook - remove redundant TPL to bring back all admin settings

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index e07dad4d49f5770bcc2ac924c125f43310d9b3b4..7dbcff93d20cece5ad49b44f6f5761690ead632a 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -11,7 +11,7 @@ require_once('include/cache.php');
 require_once('library/Mobile_Detect/Mobile_Detect.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1480' );
+define ( 'FRIENDICA_VERSION',      '3.0.1500' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1156      );
 
@@ -283,7 +283,9 @@ define ( 'GRAVITY_COMMENT',      6);
  */
 
 function startup() {
+       
        error_reporting(E_ERROR | E_WARNING | E_PARSE);
+
        set_time_limit(0);
 
        // This has to be quite large to deal with embedded private photos
@@ -350,6 +352,8 @@ if(! class_exists('App')) {
                public  $plugins;
                public  $apps = array();
                public  $identities;
+               public  $is_mobile;
+               public  $is_tablet;
        
                public $nav_sel;
 
@@ -401,7 +405,6 @@ if(! class_exists('App')) {
                        elseif(x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443))
                        $this->scheme = 'https';
 
-
                        if(x($_SERVER,'SERVER_NAME')) {
                                $this->hostname = $_SERVER['SERVER_NAME'];
 
@@ -491,6 +494,14 @@ if(! class_exists('App')) {
                        if($this->pager['start'] < 0)
                                $this->pager['start'] = 0;
                        $this->pager['total'] = 0;
+
+                       /**
+                        * Detect mobile devices
+                        */
+
+                       $mobile_detect = new Mobile_Detect();
+                       $this->is_mobile = $mobile_detect->isMobile();
+                       $this->is_tablet = $mobile_detect->isTablet();
                }
 
                function get_baseurl($ssl = false) {
@@ -1288,14 +1299,14 @@ if(! function_exists('get_birthdays')) {
                $a = get_app();
                $o = '';
 
-               if(! local_user())
+               if(! local_user() || $a->is_mobile || $a->is_tablet)
                        return $o;
 
-               $mobile_detect = new Mobile_Detect();
-               $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
+//             $mobile_detect = new Mobile_Detect();
+//             $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
 
-               if($is_mobile)
-                       return $o;
+//             if($is_mobile)
+//                     return $o;
 
                $bd_format = t('g A l F d') ; // 8 AM Friday January 18
                $bd_short = t('F d');
@@ -1373,15 +1384,15 @@ if(! function_exists('get_events')) {
 
                $a = get_app();
 
-               if(! local_user())
+               if(! local_user() || $a->is_mobile || $a->is_tablet)
                        return $o;
 
 
-               $mobile_detect = new Mobile_Detect();
-               $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
+//             $mobile_detect = new Mobile_Detect();
+//             $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
 
-               if($is_mobile)
-                       return $o;
+//             if($is_mobile)
+//                     return $o;
 
                $bd_format = t('g A l F d') ; // 8 AM Friday January 18
                $bd_short = t('F d');
@@ -1507,8 +1518,9 @@ if(! function_exists('current_theme')) {
        
                $a = get_app();
        
-               $mobile_detect = new Mobile_Detect();
-               $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
+//             $mobile_detect = new Mobile_Detect();
+//             $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
+               $is_mobile = $a->is_mobile || $a->is_tablet;
        
                if($is_mobile) {
                        if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
@@ -1783,3 +1795,4 @@ function curPageURL() {
        }
        return $pageURL;
 }
+