X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=239c09ee242f1aecc88be2b4d09836396838df50;hb=168ae40dd25ee827e9bcb01e27e52c0e203c21d6;hp=06f18b7845e347a6662b99a1beb5e7f26a9935c7;hpb=6eaca19f4195a5f8f2c1b6b1e51c6e52bad67d96;p=friendica.git

diff --git a/boot.php b/boot.php
index 06f18b7845..239c09ee24 100644
--- a/boot.php
+++ b/boot.php
@@ -10,9 +10,9 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1377' );
+define ( 'FRIENDICA_VERSION',      '3.0.1394' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1149      );
+define ( 'DB_UPDATE_VERSION',      1151      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -34,6 +34,24 @@ define ( 'JPEG_QUALITY',            100  );
  */
 define ( 'PNG_QUALITY',             8  );
 
+/**
+ *
+ * An alternate way of limiting picture upload sizes. Specify the maximum pixel
+ * length that pictures are allowed to be (for non-square pictures, it will apply
+ * to the longest side). Pictures longer than this length will be resized to be
+ * this length (on the longest side, the other side will be scaled appropriately).
+ * Modify this value using
+ *
+ *    $a->config['system']['max_image_length'] = n;
+ *
+ * in .htconfig.php
+ *
+ * If you don't want to set a maximum length, set to -1. The default value is
+ * defined by 'MAX_IMAGE_LENGTH' below.
+ *
+ */
+define ( 'MAX_IMAGE_LENGTH',        -1  );
+
 
 /**
  * Not yet used
@@ -77,14 +95,6 @@ define ( 'CONTACT_IS_SHARING',  2);
 define ( 'CONTACT_IS_FRIEND',   3);
 
 
-/**
- * Hook array order
- */
-
-define ( 'HOOK_HOOK',      0);
-define ( 'HOOK_FILE',      1);
-define ( 'HOOK_FUNCTION',  2);
-
 /**
  * DB update return values
  */
@@ -332,6 +342,9 @@ if(! class_exists('App')) {
 		private $curl_code;
 		private $curl_headers;
 
+		private $cached_profile_image;
+		private $cached_profile_picdate;
+							
 		function __construct() {
 
 			global $default_timezone;
@@ -357,6 +370,14 @@ if(! class_exists('App')) {
 
 			if(x($_SERVER,'SERVER_NAME')) {
 				$this->hostname = $_SERVER['SERVER_NAME'];
+				if(stristr($this->hostname,'xn--')) {
+					// PHP or webserver may have converted idn to punycode, so
+					// convert punycode back to utf-8
+					require_once('library/simplepie/idn/idna_convert.class.php');
+					$x = new idna_convert();
+					$this->hostname = $x->decode($_SERVER['SERVER_NAME']);
+				}
+
 				if(x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443)
 					$this->hostname .= ':' . $_SERVER['SERVER_PORT'];
 				/**
@@ -439,6 +460,8 @@ if(! class_exists('App')) {
 			$this->pager['page'] = ((x($_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;
 		}
 
@@ -543,6 +566,28 @@ if(! class_exists('App')) {
 			return $this->curl_headers;
 		}
 
+		function get_cached_avatar_image($avatar_image){
+			if($this->cached_profile_image[$avatar_image])
+				return $this->cached_profile_image[$avatar_image];
+
+			$path_parts = explode("/",$avatar_image);
+			$common_filename = $path_parts[count($path_parts)-1];
+
+			if($this->cached_profile_picdate[$common_filename]){
+				$this->cached_profile_image[$avatar_image] = $avatar_image . $this->cached_profile_picdate[$common_filename];
+			} else {
+				$r = q("SELECT `contact`.`avatar-date` AS picdate FROM `contact` WHERE `contact`.`thumb` like \"%%/%s\"",
+					$common_filename);
+				if(! count($r)){
+					$this->cached_profile_image[$avatar_image] = $avatar_image;
+				} else {
+					$this->cached_profile_picdate[$common_filename] = "?rev=" . urlencode($r[0]['picdate']);
+  					$this->cached_profile_image[$avatar_image] = $avatar_image . $this->cached_profile_picdate[$common_filename];
+				}
+			}
+			return $this->cached_profile_image[$avatar_image];
+		}
+
 
 	}
 }
@@ -1130,9 +1175,9 @@ if(! function_exists('profile_sidebar')) {
 			'fullname' => $profile['name'],
 			'firstname' => $firstname,
 			'lastname' => $lastname,
-			'photo300' => $a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg',
-			'photo100' => $a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg',
-			'photo50' => $a->get_baseurl() . '/photo/custom/50/'  . $profile['uid'] . '.jpg',
+			'photo300' => $a->get_cached_avatar_image($a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg'),
+			'photo100' => $a->get_cached_avatar_image($a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg'),
+			'photo50' => $a->get_cached_avatar_image($a->get_baseurl() . '/photo/custom/50/'  . $profile['uid'] . '.jpg'),
 		);
 
 		if (!$block){
@@ -1235,6 +1280,9 @@ if(! function_exists('get_birthdays')) {
 			'$event_reminders' => t('Birthday Reminders'),
 			'$event_title' => t('Birthdays this week:'),
 			'$events' => $r,
+			'$lbr' => '{',  // raw brackets mess up if/endif macro processing
+			'$rbr' => '}'
+
 		));
 	}
 }
@@ -1357,9 +1405,9 @@ if(! function_exists('proc_run')) {
 
 		if(count($args) && $args[0] === 'php')
 			$args[0] = ((x($a->config,'php_path')) && (strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-		foreach ($args as $arg){
-			$arg = escapeshellarg($arg);
-		}
+		for($x = 0; $x < count($args); $x ++)
+			$args[$x] = escapeshellarg($args[$x]);
+
 		$cmdline = implode($args," ");
 		proc_close(proc_open($cmdline." &",array(),$foo));
 	}
@@ -1367,7 +1415,7 @@ if(! function_exists('proc_run')) {
 
 if(! function_exists('current_theme')) {
 	function current_theme(){
-		$app_base_themes = array('duepuntozero', 'loozah');
+		$app_base_themes = array('duepuntozero', 'dispy', 'quattro');
 	
 		$a = get_app();
 	
@@ -1385,7 +1433,7 @@ if(! function_exists('current_theme')) {
 				return($t);
 		}
 	
-		$fallback = glob('view/theme/*/style.[css|php]');
+		$fallback = array_merge(glob('view/theme/*/style.css'),glob('view/theme/*/style.php'));
 		if(count($fallback))
 			return (str_replace('view/theme/','', substr($fallback[0],0,-10)));