X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=2521ab25a6173e092ae5fc9a1d2fe7afaf0bac76;hb=358b2a46f5b48e5b95b75ed87752a87dccde8d8e;hp=e2e8f9448545649db9dea03ac4ded4a98271e521;hpb=fe0c039d487962359ac995eb5ec555c3a111ad1c;p=friendica.git

diff --git a/boot.php b/boot.php
index e2e8f94485..2521ab25a6 100644
--- a/boot.php
+++ b/boot.php
@@ -4,14 +4,14 @@ require_once('include/config.php');
 require_once('include/network.php');
 require_once('include/plugin.php');
 require_once('include/text.php');
-require_once("include/pgettext.php");
+require_once('include/pgettext.php');
 require_once('include/nav.php');
 require_once('include/cache.php');
 
-define ( 'FRIENDIKA_PLATFORM',     'Friendica');
-define ( 'FRIENDIKA_VERSION',      '2.3.1174' );
+define ( 'FRIENDICA_PLATFORM',     'Friendica');
+define ( 'FRIENDICA_VERSION',      '2.3.1219' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
-define ( 'DB_UPDATE_VERSION',      1105      );
+define ( 'DB_UPDATE_VERSION',      1115      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -21,8 +21,9 @@ define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
  *
  * Image storage quality. Lower numbers save space at cost of image detail.
  * For ease of upgrade, please do not change here. Change jpeg quality with 
- * set_config('system','jpeg_quality',n) in .htconfig.php
- * where n is netween 1 and 100, and with very poor results below about 50 
+ * $a->config['system']['jpeg_quality'] = n; 
+ * in .htconfig.php, where n is netween 1 and 100, and with very poor results 
+ * below about 50 
  *
  */
 
@@ -100,7 +101,9 @@ define ( 'NETWORK_FEED',             'feed');    // RSS/Atom feeds with no known
 define ( 'NETWORK_DIASPORA',         'dspr');    // Diaspora
 define ( 'NETWORK_MAIL',             'mail');    // IMAP/POP
 define ( 'NETWORK_FACEBOOK',         'face');    // Facebook API     
-
+define ( 'NETWORK_LINKEDIN',         'lnkd');    // LinkedIn
+define ( 'NETWORK_XMPP',             'xmpp');    // XMPP     
+define ( 'NETWORK_MYSPACE',          'mysp');    // MySpace
 
 /**
  * Maximum number of "people who like (or don't like) this"  that we will list by name
@@ -124,6 +127,9 @@ define ( 'NOTIFY_CONFIRM', 0x0002 );
 define ( 'NOTIFY_WALL',    0x0004 );
 define ( 'NOTIFY_COMMENT', 0x0008 );
 define ( 'NOTIFY_MAIL',    0x0010 );
+define ( 'NOTIFY_SUGGEST', 0x0020 );
+define ( 'NOTIFY_PROFILE', 0x0040 );
+
 
 /**
  * various namespaces we may need to parse
@@ -303,7 +309,15 @@ class App {
 		if(x($_GET,'q'))
 			$this->cmd = trim($_GET['q'],'/\\');
 
+		// unix style "homedir"
+
+		if(substr($this->cmd,0,1) === '~')
+			$this->cmd = 'profile/' . substr($this->cmd,1);
 
+		// Diaspora style profile url
+
+		if(substr($this->cmd,0,2) === 'u/')
+			$this->cmd = 'profile/' . substr($this->cmd,2);
 
 		/**
 		 *
@@ -411,15 +425,20 @@ class App {
 	} 
 
 	function init_pagehead() {
+		$interval = ((local_user()) ? get_pconfig(local_user(),'system','update_interval') : 40000);
+		if($interval < 10000)
+			$interval = 40000;
+
 		$this->page['title'] = $this->config['sitename'];
 		$tpl = file_get_contents('view/head.tpl');
 		$this->page['htmlhead'] = replace_macros($tpl,array(
 			'$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!!
-			'$generator' => 'Friendika' . ' ' . FRIENDIKA_VERSION,
+			'$generator' => 'Friendica' . ' ' . FRIENDICA_VERSION,
 			'$delitem' => t('Delete this item?'),
 			'$comment' => t('Comment'),
 			'$showmore' => t('show more'),
-			'$showfewer' => t('show fewer')
+			'$showfewer' => t('show fewer'),
+			'$update_interval' => $interval
 		));
 	}
 
@@ -685,7 +704,7 @@ function login($register = false, $hiddens=false) {
 		'$lpassword' 	=> array('password', t('Password: '), '', ''),
 		
 		'$openid'		=> !$noid,
-		'$lopenid'	=> array('openid_url', t('OpenID: '),'',''),
+		'$lopenid'	=> array('openid_url', t('Or login using OpenID: '),'',''),
 		
 		'$hiddens'	=> $hiddens,
 		
@@ -814,7 +833,7 @@ function profile_load(&$a, $nickname, $profile = 0) {
 	}
 
 	if(($r === false) || (! count($r))) {
-		notice( t('No profile') . EOL );
+		notice( t('Requested profile is not available.') . EOL );
 		$a->error = 404;
 		return;
 	}
@@ -1020,6 +1039,8 @@ function get_birthdays() {
 	if($r && count($r)) {
 		$total = 0;
 		$now = strtotime('now');
+		$cids = array();
+
 		$istoday = false;
 		foreach($r as $rr) {
 			if(strlen($rr['name']))
@@ -1036,6 +1057,13 @@ function get_birthdays() {
 			foreach($r as $rr) {
 				if(! strlen($rr['name']))
 					continue;
+
+				// avoid duplicates
+
+				if(in_array($rr['cid'],$cids))
+					continue;
+				$cids[] = $rr['cid'];
+
 				$today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false); 
 				$sparkle = '';
 				$url = $rr['url'];