X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=1f6937b6488a1b475e98fdbb9450cf5829223805;hb=efded4046141f770eb5222dabb6bbb2f376f2f78;hp=773e2d9660f7be3b6e21162b94dcf3d713b57246;hpb=5cb979f5e432e68c1514262f86dd32cc2ace878c;p=friendica.git

diff --git a/boot.php b/boot.php
index 773e2d9660..1f6937b648 100644
--- 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.1412' );
+define ( 'FRIENDICA_VERSION',      '3.0.1419' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1154      );
 
@@ -573,6 +573,13 @@ if(! class_exists('App')) {
 			));
 		}
 
+		function init_page_end() {
+			$tpl = get_markup_template('end.tpl');
+			$this->page['end'] = replace_macros($tpl,array(
+				'$baseurl' => $this->get_baseurl() // FIXME for z_path!!!!
+			));
+		}
+
 		function set_curl_code($code) {
 			$this->curl_code = $code;
 		}
@@ -748,9 +755,10 @@ if(! function_exists('check_config')) {
 							// If the update fails or times-out completely you may need to
 							// delete the config entry to try again.
 
-							if(get_config('database','update_' . $x))
+							$t = get_config('database','update_' . $x);
+							if($t !== false)
 								break;
-							set_config('database','update_' . $x, '1');
+							set_config('database','update_' . $x, time());
 
 							// call the specific update
 
@@ -773,13 +781,14 @@ if(! function_exists('check_config')) {
 									. 'Content-transfer-encoding: 8bit' );
 								//try the logger
 								logger('CRITICAL: Update Failed: '. $x);
+								break;
 							}
-							else
+							else {
 								set_config('database','update_' . $x, 'success');
-								
+								set_config('system','build', $x + 1);
+							}								
 						}
 					}
-					set_config('system','build', DB_UPDATE_VERSION);
 				}
 			}
 		}
@@ -1242,6 +1251,12 @@ if(! function_exists('get_birthdays')) {
 		if(! local_user())
 			return $o;
 
+		$mobile_detect = new Mobile_Detect();
+		$is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
+
+		if($is_mobile)
+			return $o;
+
 		$bd_format = t('g A l F d') ; // 8 AM Friday January 18
 		$bd_short = t('F d');
 
@@ -1321,6 +1336,13 @@ if(! function_exists('get_events')) {
 		if(! local_user())
 			return $o;
 
+
+		$mobile_detect = new Mobile_Detect();
+		$is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
+
+		if($is_mobile)
+			return $o;
+
 		$bd_format = t('g A l F d') ; // 8 AM Friday January 18
 		$bd_short = t('F d');
 
@@ -1449,11 +1471,11 @@ if(! function_exists('current_theme')) {
 			$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);
 		}
-		else {
+		if(!$is_mobile || ($system_theme === '' && $theme_name === '')) {
 			$system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
 			$theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme);
 		}
-	
+
 		if($theme_name &&
 				(file_exists('view/theme/' . $theme_name . '/style.css') ||
 						file_exists('view/theme/' . $theme_name . '/style.php')))