X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=50cfbf66168755f96742ee5a2e2e29aea4a665fe;hb=37730ecc2aa9a55faa232658fc348da241416700;hp=9932f0430ad6b5068e4f5ecc66924f9bb18a3669;hpb=a9ec56ace1756726517650d96192df5320f445fe;p=friendica.git

diff --git a/boot.php b/boot.php
index 9932f0430a..50cfbf6616 100644
--- a/boot.php
+++ b/boot.php
@@ -8,10 +8,10 @@ require_once("include/pgettext.php");
 require_once('include/nav.php');
 require_once('include/cache.php');
 
-define ( 'FRIENDIKA_PLATFORM',     'Friendica');
-define ( 'FRIENDIKA_VERSION',      '2.3.1153' );
+define ( 'FRIENDICA_PLATFORM',     'Friendica');
+define ( 'FRIENDICA_VERSION',      '2.3.1181' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
-define ( 'DB_UPDATE_VERSION',      1101      );
+define ( 'DB_UPDATE_VERSION',      1107      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -100,6 +100,8 @@ 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     
 
 
 /**
@@ -254,6 +256,8 @@ class App {
 	public  $plugins;
 	public  $apps = array();
 	public  $identities;
+	
+	public $nav_sel;
 
 	private $scheme;
 	private $hostname;
@@ -413,9 +417,11 @@ class App {
 		$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')
+			'$comment' => t('Comment'),
+			'$showmore' => t('show more'),
+			'$showfewer' => t('show fewer')
 		));
 	}
 
@@ -652,7 +658,7 @@ function get_guid($size=16) {
 // returns the complete html for inserting into the page
 
 if(! function_exists('login')) {
-function login($register = false) {
+function login($register = false, $hiddens=false) {
 	$o = "";
 	$reg = false;
 	if ($register) {
@@ -683,6 +689,7 @@ function login($register = false) {
 		'$openid'		=> !$noid,
 		'$lopenid'	=> array('openid_url', t('OpenID: '),'',''),
 		
+		'$hiddens'	=> $hiddens,
 		
 		'$register'		=> $reg,
 		
@@ -793,17 +800,17 @@ function profile_load(&$a, $nickname, $profile = 0) {
 
 	if($profile) {
 		$profile_int = intval($profile);
-		$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.* FROM `profile` 
-			LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
-			WHERE `user`.`nickname` = '%s' AND `profile`.`id` = %d LIMIT 1",
+		$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile` 
+			left join `contact` on `contact`.`uid` = `profile`.`uid` LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
+			WHERE `user`.`nickname` = '%s' AND `profile`.`id` = %d and `contact`.`self` = 1 LIMIT 1",
 			dbesc($nickname),
 			intval($profile_int)
 		);
 	}
 	if(! count($r)) {	
-		$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.* FROM `profile` 
-			LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
-			WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 LIMIT 1",
+		$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile` 
+			left join `contact` on `contact`.`uid` = `profile`.`uid` LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
+			WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 and `contact`.`self` = 1 LIMIT 1",
 			dbesc($nickname)
 		);
 	}
@@ -820,6 +827,14 @@ function profile_load(&$a, $nickname, $profile = 0) {
 	$a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename'];
 	$_SESSION['theme'] = $a->profile['theme'];
 
+	/**
+	 * load/reload current theme info
+	 */
+	$theme_info_file = "view/theme/".current_theme()."/theme.php";
+	if (file_exists($theme_info_file)){
+		require_once($theme_info_file);
+	}
+
 	if(! (x($a->page,'aside')))
 		$a->page['aside'] = '';
 
@@ -870,6 +885,8 @@ function profile_sidebar($profile, $block = 0) {
 	if((! is_array($profile)) && (! count($profile)))
 		return $o;
 
+	$profile['picdate'] = urlencode($profile['picdate']);
+
 	call_hooks('profile_sidebar_enter', $profile);
 
 	
@@ -944,7 +961,7 @@ function profile_sidebar($profile, $block = 0) {
 	$diaspora = array(
 		'podloc' => $a->get_baseurl(),
 		'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ),
-		'nickname ' => $profile['nickname'],
+		'nickname' => $profile['nickname'],
 		'fullname' => $profile['name'],
 		'firstname' => $firstname,
 		'lastname' => $lastname,