Merge remote-tracking branch 'upstream/master'

Merge upstream

boot.php

@@ -9,9 +9,9 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1299' );
+define ( 'FRIENDICA_VERSION',      '2.3.1320' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1134      );
+define ( 'DB_UPDATE_VERSION',      1138      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -90,6 +90,7 @@ define ( 'PAGE_SOAPBOX',           1 );
 define ( 'PAGE_COMMUNITY',         2 );
 define ( 'PAGE_FREELOVE',          3 );
 define ( 'PAGE_BLOG',              4 );
+define ( 'PAGE_PRVGROUP',          5 );
 
 /**
  * Network and protocol family types
@@ -108,7 +109,7 @@ define ( 'NETWORK_XMPP',             'xmpp');    // XMPP
 define ( 'NETWORK_MYSPACE',          'mysp');    // MySpace
 define ( 'NETWORK_GPLUS',            'goog');    // Google+
 
-/*
+/**
  * These numbers are used in stored permissions
  * and existing allocations MUST NEVER BE CHANGED
  * OR RE-ASSIGNED! You may only add to them.
@@ -205,6 +206,7 @@ define ( 'ACTIVITY_OBJ_P_PHOTO', NAMESPACE_ACTIVITY_SCHEMA . 'profile-photo' );
 define ( 'ACTIVITY_OBJ_ALBUM',   NAMESPACE_ACTIVITY_SCHEMA . 'photo-album' );
 define ( 'ACTIVITY_OBJ_EVENT',   NAMESPACE_ACTIVITY_SCHEMA . 'event' );
 define ( 'ACTIVITY_OBJ_TAGTERM', NAMESPACE_DFRN            . '/tagterm' );
+define ( 'ACTIVITY_OBJ_PROFILE', NAMESPACE_DFRN            . '/profile' );
 
 /**
  * item weight for query ordering
@@ -293,6 +295,8 @@ class App {
 	
 		public $nav_sel;
 
+		public $category;
+
 		private $scheme;
 		private $hostname;
 		private $baseurl;
@@ -377,6 +381,9 @@ class App {
 			$this->argc = count($this->argv);
 			if((array_key_exists('0',$this->argv)) && strlen($this->argv[0])) {
 				$this->module = str_replace(".", "_", $this->argv[0]);
+				if(array_key_exists('2',$this->argv)) {
+					$this->category = $this->argv[2];
+				}
 			}
 			else {
 				$this->argc = 1;
@@ -509,7 +516,8 @@ class App {
 		}
 
 
-}}
+	}
+}
 
 // retrieve the App structure
 // useful in functions which require it but don't get it passed to them
@@ -518,7 +526,8 @@ if(! function_exists('get_app')) {
 	function get_app() {
 		global $a;
 		return $a;
-}};
+	}
+};
 
 
 // Multi-purpose function to check variable state.
@@ -546,7 +555,8 @@ function x($s,$k = NULL) {
 			}
 			return false;
 		}
-}}
+	}
+}
 
 // called from db initialisation if db is dead.
 
@@ -555,7 +565,8 @@ function system_unavailable() {
 		include('system_unavailable.php');
 		system_down();
 		killme();
-}}
+	}
+}
 
 
 
@@ -647,8 +658,32 @@ function check_config(&$a) {
 
 							// call the specific update
 
+//							global $db;
+//							$db->excep(TRUE);
+//							try {
+//								$db->beginTransaction();
 								$func = 'update_' . $x;
 								$func($a);
+//								$db->commit();
+//							} catch(Exception $ex) {
+//								$db->rollback();
+//								//send the administrator an e-mail
+//								$email_tpl = get_intltext_template("update_fail_eml.tpl");
+//								$email_tpl = replace_macros($email_tpl, array(
+//									'$sitename' => $a->config['sitename'],
+//									'$siteurl' =>  $a->get_baseurl(),
+//									'$update' => $x,
+//									'$error' => $ex->getMessage()));
+//								$subject=sprintf(t('Update Error at %s'), $a->get_baseurl());
+									
+//								mail($a->config['admin_email'], $subject, $text,
+//										'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+//										. 'Content-type: text/plain; charset=UTF-8' . "\n"
+//										. 'Content-transfer-encoding: 8bit' );
+//								//try the logger
+//								logger('update failed: '.$ex->getMessage().EOL);
+//							}
+//							$db->excep(FALSE);
 						}
 					}
 					set_config('system','build', DB_UPDATE_VERSION);
@@ -708,7 +743,8 @@ function check_config(&$a) {
 		load_hooks();
 
 		return;
-}}
+	}
+}
 
 
 function get_guid($size=16) {
@@ -776,7 +812,8 @@ function login($register = false, $hiddens=false) {
 		call_hooks('login_hook',$o);
 
 		return $o;
-}}
+	}
+}
 
 // Used to end the current process, after saving session state.
 
@@ -784,7 +821,8 @@ if(! function_exists('killme')) {
 	function killme() {
 		session_write_close();
 		exit;
-}}
+	}
+}
 
 // redirect to another URL and terminate this process.
 
@@ -792,7 +830,8 @@ if(! function_exists('goaway')) {
 	function goaway($s) {
 		header("Location: $s");
 		killme();
-}}
+	}
+}
 
 
 // Returns the uid of locally logged in user or false.
@@ -802,7 +841,8 @@ function local_user() {
 		if((x($_SESSION,'authenticated')) && (x($_SESSION,'uid')))
 			return intval($_SESSION['uid']);
 		return false;
-}}
+	}
+}
 
 // Returns contact id of authenticated site visitor or false
 
@@ -811,7 +851,8 @@ function remote_user() {
 		if((x($_SESSION,'authenticated')) && (x($_SESSION,'visitor_id')))
 			return intval($_SESSION['visitor_id']);
 		return false;
-}}
+	}
+}
 
 // contents of $s are displayed prominently on the page the next time
 // a page is loaded. Usually used for errors or alerts.
@@ -822,14 +863,16 @@ function notice($s) {
 		if(! x($_SESSION,'sysmsg'))	$_SESSION['sysmsg'] = array();
 		if($a->interactive)
 			$_SESSION['sysmsg'][] = $s;
-}}
+	}
+}
 if(! function_exists('info')) {
 	function info($s) {
 		$a = get_app();
 		if(! x($_SESSION,'sysmsg_info')) $_SESSION['sysmsg_info'] = array();
 		if($a->interactive)
 			$_SESSION['sysmsg_info'][] = $s;
-}}
+	}
+}
 
 
 // wrapper around config to limit the text length of an incoming message
@@ -838,7 +881,8 @@ if(! function_exists('get_max_import_size')) {
 	function get_max_import_size() {
 		global $a;
 		return ((x($a->config,'max_import_size')) ? $a->config['max_import_size'] : 0 );
-}}
+	}
+}
 
 
 
@@ -892,6 +936,7 @@ function profile_load(&$a, $nickname, $profile = 0) {
 		}
 
 		if(($r === false) || (! count($r))) {
+			logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
 			notice( t('Requested profile is not available.') . EOL );
 			$a->error = 404;
 			return;
@@ -916,6 +961,7 @@ function profile_load(&$a, $nickname, $profile = 0) {
 		/**
 		 * 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);
@@ -939,7 +985,8 @@ function profile_load(&$a, $nickname, $profile = 0) {
 		 $a->page['aside'] .= contact_block();*/
 
 		return;
-}}
+	}
+}
 
 
 /**
@@ -1088,7 +1135,8 @@ function profile_sidebar($profile, $block = 0) {
 		call_hooks('profile_sidebar', $arr);
 
 		return $o;
-}}
+	}
+}
 
 
 if(! function_exists('get_birthdays')) {
@@ -1157,7 +1205,8 @@ function get_birthdays() {
 			}
 		}
 		return $o;
-}}
+	}
+}
 
 
 if(! function_exists('get_events')) {
@@ -1221,7 +1270,8 @@ function get_events() {
 		}
 
 		return $o;
-}}
+	}
+}
 
 
 /**
@@ -1257,7 +1307,8 @@ function proc_run($cmd){
 		}
 		$cmdline = implode($args," ");
 		proc_close(proc_open($cmdline." &",array(),$foo));
-}}
+	}
+}
 
 if(! function_exists('current_theme')) {
 	function current_theme(){
@@ -1283,7 +1334,8 @@ function current_theme(){
 		if(count($fallback))
 			return (str_replace('view/theme/','', substr($fallback[0],0,-10)));
 	
-}}
+	}
+}
 
 /*
  * Return full URL to theme which is currently in effect.
@@ -1296,7 +1348,8 @@ function current_theme_url() {
 		if (file_exists('view/theme/' . $t . '/style.php'))
 			return($a->get_baseurl() . '/view/theme/' . $t . '/style.pcss');
 		return($a->get_baseurl() . '/view/theme/' . $t . '/style.css');
-}}
+	}
+}
 
 if(! function_exists('feed_birthday')) {
 	function feed_birthday($uid,$tz) {
@@ -1344,7 +1397,8 @@ function feed_birthday($uid,$tz) {
 		}
 
 		return $birthday;
-}}
+	}
+}
 
 if(! function_exists('is_site_admin')) {
 	function is_site_admin() {
@@ -1352,7 +1406,8 @@ function is_site_admin() {
 		if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && ($a->user['email'] === $a->config['admin_email']))
 			return true;
 		return false;
-}}
+	}
+}
 
 
 if(! function_exists('load_contact_links')) {
@@ -1378,7 +1433,8 @@ function load_contact_links($uid) {
 			$ret['empty'] = true;
 		$a->contacts = $ret;
 		return;
-}}
+	}
+}
 
 if(! function_exists('profile_tabs')){
 	function profile_tabs($a, $is_owner=False, $nickname=Null){
@@ -1430,7 +1486,8 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
 		$tpl = get_markup_template('common_tabs.tpl');
 
 		return replace_macros($tpl,array('$tabs' => $arr['tabs']));
-}}	
+	}
+}
 
 function get_my_url() {
 	if(x($_SESSION,'my_url'))
@@ -1438,11 +1495,13 @@ function get_my_url() {
 	return false;
 }
 
-function zrl($s) {
+function zrl($s,$force = false) {
 	if(! strlen($s))
 		return $s;
-	if(! strpos($s,'/profile/'))
+	if((! strpos($s,'/profile/')) && (! $force))
 		return $s;
+	if($force && substr($s,-1,1) !== '/')
+		$s = $s . '/';
 	$achar = strpos($s,'?') ? '&' : '?';
 	$mine = get_my_url();
 	if($mine and ! link_compare($mine,$s))

doc/Account-Basics.md

@@ -10,36 +10,37 @@ Not all Friendica sites allow open registration. If registration is allowed, you
 
 If you'd like to have your own server, you can do that too.  Visit <a href="http://friendica.com/download">the Friendica website</a> to download the code with setup instructions.  It's a very simple install process that anybody experienced in hosting websites, or with basic Linux experience can handle easily.
 
+
 *OpenID*
 
 The first field on the Registration page is for an OpenID address. If you do not have an OpenID address or do not wish to use OpenID, leave this field blank. If you have an OpenID account elsewhere and wish to use it, enter the address into this field and click 'Register'. Friendica will attempt to extract as much information as possible from your OpenID provider and return to this page with those items already filled in.
 
+
 *Your Full Name*
 
 Please provide your full name **as you would like it to be displayed on this system**.  Most people use their real name for this, but you're under no obligation to do so yourself.
 
+
 *Email Address*
 
 Please provide a valid email address. Your email address is **never** published. We need this to send you account information and your login details. You may also occasionally receive notifications of incoming messages or items requiring your attention, but you have the ability to completely disable these from your Settings page once you have logged in.  This doesn't have to be your primary email address, but it does need to be a real email address.  You can't get your initial password, or reset a lost password later without it.  This is the only bit of personal information that has to be accurate.
 
+
 *Nickname*
 
 A nickname is used to generate web addresses for many of your personal pages, and is also treated like an email address when establishing communications with others. Due to the way that the nickname is used, it has some limitations. It must contain only US-ASCII text characters and numbers, and must also start with a text character. It also must be unique on this system. This is used in many places to identify your account, and once set - cannot be changed.
 
 
-
 *Directory Publishing*
 
 The Registration form also allows you to choose whether or not to list your account in the online directory. This is like a "phone book" and you may choose to be unlisted. We recommend that you select 'Yes' so that other people (friends, family, etc.) will be able to find you. If you choose 'No', you will essentially be invisible and have few opportunities for interaction. Whichever you choose, this can be changed any time from your Settings page after you login. 
 
+
 *Register*
 
 Once you have provided the necessary details, click the 'Register' button. An email will be sent to you providing your account login details. Please watch your email (including spam folders) for your registration details and initial password. 
 
 
-
-
-
 **Login Page**
 
 On the 'Login' page, please enter your login information that was provided during registration. You may use either your nickname or email address as a Login Name. 
@@ -55,6 +56,7 @@ Otherwise, enter your password. This will have been initially provided in your r
 
 After your first login, please visit the 'Settings' page from the top menu bar and change your password to something that you will remember.
 
+
 **Getting Started**
 
 A ['Tips for New Members'](newmember) link will show up on your home page for two weeks to provide some important Getting Started information.

doc/Making-Friends.md

@@ -9,7 +9,7 @@ The easiest thing to do is to join the <a href = "http://kakste.com/profile/newh
 
 The next thing you can do is look at the Directory.  The directory is split up into two parts.  If you click the directory button, you will be presented with a list of all members (who chose to be listed) on your server.  You'll also see a link to the Global Directory.  If you click through to the global directory, you will be presented with a list of everybody who chose to be listed across all instances of Friendica.  You will also see a "Show Community Forums" link, which will direct you to Groups, Forums and Fanpages.  You connect to people, groups and forums in the same way, except groups and forums will automatically accept your introduction request, whereas a human will approve you manually.
 
-To connect with other Friendica user
+To connect with other Friendica users:
 
 Visit their profile. Just beneath their profile picture will be the word 'Connect' (we're assuming this is an English language profile).
 

doc/Plugins.md

@@ -164,10 +164,15 @@ Your module functions will often contain the function plugin_name_content(&$a),
 **'init_1'** - called just after DB has been opened and before session start
     $b is not used or passed
 
-
 **'page_end'** - called after HTML content functions have completed
     $b is (string) HTML of content div
 
+**'avatar_lookup'** - called when looking up the avatar
+    $b is (array)
+        'size' => the size of the avatar that will be looked up
+        'email' => email to look up the avatar for
+        'url' => the (string) generated URL of the avatar
+
 
 A complete list of all hook callbacks with file locations (generated 14-Feb-2012): Please see the source for details of any hooks not documented above.
 

doc/Settings.md

@@ -172,16 +172,6 @@ $a->config['system']['no_regfullname'] = true;
 ```
 
 
-**Gravatars**
-
-During registration, we will try to automatically find a user photo for you on the web using the gravatar service. You may turn this off by setting 'no_gravatar' to true. Default is false.
-
-Config:
-```
-$a->config['system']['no_gravatar'] = true;
-```
-
-
 **OpenID**
 
 By default, OpenID may be used for both registration and logins. If you do not wish to make OpenID facilities available on your system (at all), set 'no_openid' to true. Default is false.

doc/andfinally.md

@@ -1,3 +1,5 @@
+[[!meta title="And Finally..."]]
+
 And that brings the Quick Start to an end.
 
 Here are some more things to help get you started:
@@ -18,7 +20,7 @@ Here are some more things to help get you started:
 
 **Documentation**
 
-- <a href = "/help/Connectors">Connecting to more networks</a>
-- <a href = "/help">Help Index</a>
+- <a href="help/Connectors">Connecting to more networks</a>
+- <a href="help">Help Index</a>
 
 

doc/groupsandpages.md

@@ -1,10 +1,10 @@
-This is the global directory.  If you get lost, you can <a href = "/help/groupsandpages">click this link</a> to bring yourself back here.
+This is the global directory.  If you get lost, you can <a href = "help/groupsandpages">click this link</a> to bring yourself back here.
 
 On this page, you'll find a collection of groups, forums and celebrity pages.  Groups are not real people.  Connecting to them is similar to "liking" something on Facebook, or signing up for a new forum.  You don't have to feel awkward about introducing yourself to a new person, because they're not people!
 
 When you connect to a group, all messages to that group will start appearing in your network tab.  You can comment on these posts, or post to the group yourself without ever having to add any of the groups members.  This is a great way to make friends dynamically - you'll find people you like and add each other naturally instead of adding random strangers.  Simply find a group you're interested in, and connect to it the same way you did with people in the last section.  There are a lot of groups, and you're likely to get lost.  Remember the link at the top of this page will bring you back here.
 
-Once you've added some groups, <a href = "/help/andfinally">move on to the next section</a>.
+Once you've added some groups, <a href="help/andfinally">move on to the next section</a>.
 
 <iframe src="http://dir.friendica.com/directory/forum" width="950" height="600"></iframe>
 

doc/guide.md

@@ -6,8 +6,8 @@ This is a bit like your Facebook wall.  It's where all your status messgages are
 
 Once you've finished writing your post, click on the padlock icon to select who can see it.  If you do not use the padlock icon, your post will be public.  This means it will appear to anybody who views your profile, and in the community tab if your site has it enabled, as well as in the network tab of any of your contacts.
 
-Play around with this a bit, then when you're ready to move on, we'll take a look at the <a href = "/help/network">Network Tab</a>
+Play around with this a bit, then when you're ready to move on, we'll take a look at the <a href="help/network">Network Tab</a>
 
-<iframe src="/login" width="950" height = "600"></iframe>
+<iframe src="login" width="950" height="600"></iframe>
 
 

doc/makingnewfriends.md

@@ -1,11 +1,11 @@
-This is your Suggested Friends page.  If you get lost, you can <a href = "/help/makenewfriends">click this link</a> to bring yourself back here.
+This is your Suggested Friends page.  If you get lost, you can <a href="help/makenewfriends">click this link</a> to bring yourself back here.
 
 This is a bit like the Friend Suggestions page of Facebook.  Everybody on this list has agreed that they may be suggested as a friend.  This means they're unlikely to refuse an introduction you send, and they want to meet new people too!
 
 See somebody you like the look of?  Click the connect button beneath their photograph.  This will bring you to the introductions page.  Fill in the form as instructed, and add a small note (optional).  Now, wait a bit and they'll accept your request - note that these are real people, and it might take a while.  Now you've added one, you're probably lost.  Click the link at the top of this page to go back to the suggested friends list and add some more.
 
-Feel uncomfortable adding people you don't know?  Don't worry - that's where <a href = "/help/groupsandpages">Groups and Pages</a> come in!
+Feel uncomfortable adding people you don't know?  Don't worry - that's where <a href="help/groupsandpages">Groups and Pages</a> come in!
 
-<iframe src="/suggest" width="950" height = "600"></iframe>
+<iframe src="suggest" width="950" height="600"></iframe>
 
 

doc/network.md

@@ -1,9 +1,9 @@
-This is your Network Tab.  If you get lost, you can <a href = "/help/network">click this link</a> to bring yourself back here.
+This is your Network Tab.  If you get lost, you can <a href="help/network">click this link</a> to bring yourself back here.
 
 This is a bit like the Newsfeed at Facebook or the Stream at Diaspora.  It's where all the posts from your contacts, groups, and feeds will appear.  If you're new, you won't see anything in this page, unless you posted your status in the last step.  If you've already added a few friends, you'll be able to see their posts.  Here, you can comment, like, or dislike posts, or click on somebody's name to visit their profile page where you can write on their wall.
 
-Now we need to fill it up, the first step, is to <a href = "/help/peopleyouknow"> add people you already know from Facebook</a>.
+Now we need to fill it up, the first step, is to <a href="help/peopleyouknow"> add people you already know from Facebook</a>.
 
-<iframe src="/network" width="950" height = "600"></iframe>
+<iframe src="network" width="950" height="600"></iframe>
 
 

doc/peopleyouknow.md

@@ -1,13 +1,13 @@
-This is your connector settings page.  If you get lost, you can <a href = "/help/network">click this link</a> to bring yourself back here.
+This is your connector settings page.  If you get lost, you can <a href="help/network">click this link</a> to bring yourself back here.
 
 This is the bit that makes Friendica unique.  You can connect to <i>anybody on the internet</i> from your Friendica account using this page!  The available connectors varies depending on which plugins you have installed, but for now, we'll walk you through Facebook.  Note that not all servers have the Facebook connector installed.  If you can't find it in the list below, don't worry, we'll look at ways of connecting to more people in the following pages.  
 
-The biggest of all social networks is Facebook.  Fortunately, this connector is really easy.  Scroll down the page, and click Facebook Connector Settings.  Enter your Facebook user name and password and let the application (the connector) do everything the options suggest.  You can <a href = "https://github.com/friendica/friendica/wiki/How-to:-Friendica%E2%80%99s-Facebook-connector" target="new">fine tune this</a> or experiment with the other connectors too.  If you need help, you can always ask at <a href = "http://helpers.pyxis.uberspace.de/profile/helpers" target="new">Friendica Support</a> or <a href = "/help/Connectors" target="new">see the instructions here</a>.
+The biggest of all social networks is Facebook.  Fortunately, this connector is really easy.  Scroll down the page, and click Facebook Connector Settings.  Enter your Facebook user name and password and let the application (the connector) do everything the options suggest.  You can <a href="https://github.com/friendica/friendica/wiki/How-to:-Friendica%E2%80%99s-Facebook-connector" target="_blank">fine tune this</a> or experiment with the other connectors too.  If you need help, you can always ask at <a href="http://helpers.pyxis.uberspace.de/profile/helpers" target="_blank">Friendica Support</a> or <a href="help/Connectors" target="_blank">see the instructions here</a>.
 
-When you're ready, we can move on to <a href = "/help/makingnewfriends">making new friends</a>.
+When you're ready, we can move on to <a href="help/makingnewfriends">making new friends</a>.
 
 
 
-<iframe src="/settings/connectors" width="950" height = "600"></iframe>
+<iframe src="settings/connectors" width="950" height="600"></iframe>
 
 

htconfig.php

@@ -83,5 +83,8 @@ $a->config['system']['no_regfullname'] = true;
 // If set to true the priority settings of ostatus contacts are used
 $a->config['system']['ostatus_use_priority'] = false;
 
-// If enabled all items are cached in the given directory
+// If enabled, all items are cached in the given directory
 $a->config['system']['itemcache'] = "";
+
+// If enabled, the lockpath is used for a lockfile to check if the poller is running
+$a->config['system']['lockpath'] = "";