X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=600a02afad34023f205fff2f96050eba72756934;hb=9daafe7489e12da476df8067b3411315e362ca4b;hp=74707fbc942ab771425c53299f44ad55c7c35c88;hpb=41439804f4ae7a0ae07894d96b1ad87b6ee775d4;p=friendica.git

diff --git a/boot.php b/boot.php
index 74707fbc94..600a02afad 100644
--- a/boot.php
+++ b/boot.php
@@ -11,9 +11,9 @@ require_once('include/cache.php');
 require_once('library/Mobile_Detect/Mobile_Detect.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1457' );
+define ( 'FRIENDICA_VERSION',      '3.0.1481' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1154      );
+define ( 'DB_UPDATE_VERSION',      1156      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -350,6 +350,8 @@ if(! class_exists('App')) {
 		public  $plugins;
 		public  $apps = array();
 		public  $identities;
+		public	$is_mobile;
+		public	$is_tablet;
 	
 		public $nav_sel;
 
@@ -491,6 +493,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) {
@@ -1088,9 +1098,12 @@ if(! function_exists('profile_load')) {
 
 		$a->profile = $r[0];
 
+		$a->profile['mobile-theme'] = get_pconfig($profile_uid, 'system', 'mobile_theme');
+
 
 		$a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename'];
 		$_SESSION['theme'] = $a->profile['theme'];
+		$_SESSION['mobile-theme'] = $a->profile['mobile-theme'];
 
 		/**
 		 * load/reload current theme info
@@ -1285,14 +1298,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');
@@ -1370,15 +1383,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');
@@ -1504,12 +1517,25 @@ 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) {
-			$system_theme = ((isset($a->config['system']['mobile-theme'])) ? $a->config['system']['mobile-theme'] : '');
-			$theme_name = ((isset($_SESSION) && x($_SESSION,'mobile-theme')) ? $_SESSION['mobile-theme'] : $system_theme);
+			if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
+				$system_theme = '';
+				$theme_name = '';
+			}
+			else {
+				$system_theme = ((isset($a->config['system']['mobile-theme'])) ? $a->config['system']['mobile-theme'] : '');
+				$theme_name = ((isset($_SESSION) && x($_SESSION,'mobile-theme')) ? $_SESSION['mobile-theme'] : $system_theme);
+
+				if($theme_name === '---') {
+					// user has selected to have the mobile theme be the same as the normal one
+					$system_theme = '';
+					$theme_name = '';
+				}
+			}
 		}
 		if(!$is_mobile || ($system_theme === '' && $theme_name === '')) {
 			$system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
@@ -1751,3 +1777,20 @@ function build_querystring($params, $name=null) {
     } 
     return $ret;    
 }
+
+/**
+* Returns the complete URL of the current page, e.g.: http(s)://something.com/network
+*
+* Taken from http://webcheatsheet.com/php/get_current_page_url.php
+*/
+function curPageURL() {
+	$pageURL = 'http';
+	if ($_SERVER["HTTPS"] == "on") {$pageURL .= "s";}
+	$pageURL .= "://";
+	if ($_SERVER["SERVER_PORT"] != "80" && $_SERVER["SERVER_PORT"] != "443") {
+		$pageURL .= $_SERVER["SERVER_NAME"].":".$_SERVER["SERVER_PORT"].$_SERVER["REQUEST_URI"];
+	} else {
+		$pageURL .= $_SERVER["SERVER_NAME"].$_SERVER["REQUEST_URI"];
+	}
+	return $pageURL;
+}