Merge remote-tracking branch 'friendika-master/master'

7 files changed, 73 insertions, 15 deletions

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index bacfe9b94..686a42d08 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -63,7 +63,7 @@ function dfrn_poll_init(&$a) {
 		
 		if(count($r)) {
 
-			$s = fetch_url($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check');
+			$s = fetch_url($r[0]['poll'] . '?f=&dfrn_id=' . $my_id . '&type=profile-check');
 
 			logger("dfrn_poll: old profile returns " . $s, LOGGER_DATA);
 
@@ -366,7 +366,7 @@ function dfrn_poll_content(&$a) {
 			// URL reply
 
 			$s = fetch_url($r[0]['poll'] 
-				. '?dfrn_id=' . $encrypted_id 
+				. '?f=&dfrn_id=' . $encrypted_id 
 				. '&type=profile-check'
 				. '&dfrn_version=' . DFRN_PROTOCOL_VERSION
 				. '&challenge=' . $challenge
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 3cd8473cf..cc6355078 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -172,7 +172,7 @@ function dfrn_request_post(&$a) {
 					$dfrn_request = $contact_record['request'];
 
 				if(strlen($dfrn_request) && strlen($confirm_key))
-					$s = fetch_url($dfrn_request . '?confirm_key=' . $confirm_key);
+					$s = fetch_url($dfrn_request . '?f=&confirm_key=' . $confirm_key);
 				
 				// (ignore reply, nothing we can do it failed)
 
diff --git a/mod/network.php b/mod/network.php
index 2ff15a29b..39679b48a 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -70,7 +70,8 @@ function network_content(&$a, $update = 0) {
 			'$utubeurl' => t('Please enter a YouTube link:'),
 			'$vidurl' => t("Please enter a video\x28.ogg\x29 link/URL:"),
 			'$audurl' => t("Please enter an audio\x28.ogg\x29 link/URL:"),
-			'$whereareu' => t('Where are you right now?') 
+			'$whereareu' => t('Where are you right now?'),
+			'$title' => t('Enter a title for this item') 
 		));
 
 
@@ -101,6 +102,7 @@ function network_content(&$a, $update = 0) {
 			'$audio' => t('Insert Vorbis [.ogg] audio'),
 			'$setloc' => t('Set your location'),
 			'$noloc' => t('Clear browser location'),
+			'$title' => t('Set title'),
 			'$wait' => t('Please wait'),
 			'$permset' => t('Permission settings'),
 			'$content' => '',
diff --git a/mod/notifications.php b/mod/notifications.php
index 93ca82bb0..ed0831aab 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -65,12 +65,11 @@ function notifications_content(&$a) {
 	else
 		$sql_extra = " AND `ignore` = 0 ";
 
-
-	$tpl = load_view_file('view/intros-top.tpl');
-	$o .= replace_macros($tpl,array(
-		'$hide_url' => ((strlen($sql_extra)) ? 'notifications/all' : 'notifications' ),
-		'$hide_text' => ((strlen($sql_extra)) ? t('Show Ignored Requests') : t('Hide Ignored Requests'))
-	)); 
+	$o .= '<h1>' . t('Pending Friend/Connect Notifications') . '</h1>' . "\r\n";
+	
+	$o .= '<div id="notification-show-hide-wrapper" >';
+	$o .= '<a href="' . ((strlen($sql_extra)) ? 'notifications/all' : 'notifications' ) . '" id="notifications-show-hide-link" >'
+		. ((strlen($sql_extra)) ? t('Show Ignored Requests') : t('Hide Ignored Requests')) . '</a></div>' . "\r\n";
 
 
 	$r = q("SELECT COUNT(*)	AS `total` FROM `intro` 
@@ -141,7 +140,7 @@ function notifications_content(&$a) {
 
 	if ($a->config['register_policy'] == REGISTER_APPROVE &&	
 		$a->config['admin_email'] === $a->user['email']){
-		$o .= load_view_file('view/registrations-top.tpl');
+		$o .= '<h1>' . t('User registrations waiting for confirm') . '</h1>' . "\r\n";
 		
 		$r = q("SELECT `register`.*, `contact`.`name`, `user`.`email`
 				 FROM `register`
diff --git a/mod/oexchange.php b/mod/oexchange.php
new file mode 100644
index 000000000..f97356559
--- /dev/null
+++ b/mod/oexchange.php
@@ -0,0 +1,53 @@
+<?php
+
+
+function oexchange_init(&$a) {
+
+	if(($a->argc > 1) && ($a->argv[1] === 'xrd')) {
+		$tpl = load_view_file('view/oexchange_xrd.tpl');
+
+		$o = replace_macros($tpl, array('$base' => $a->get_baseurl()));
+		echo $o;
+		killme();
+	}
+
+		
+
+
+}
+
+function oexchange_content(&$a) {
+
+	if(! local_user()) {
+		$o = login(false);
+		return $o;
+	}
+
+	if(($a->argc > 1) && $a->argv[1] === 'done') {
+		notice( t('Post successful.') . EOL);
+		return;
+	}
+
+	$url = (((x($_GET,'url')) && strlen($_GET['url'])) ? notags(trim($_GET['url'])) : '');
+
+	$s = fetch_url($a->get_baseurl() . '/parse_url&url=' . $url);
+
+	if(! strlen($s))
+		return;
+
+	require_once('include/html2bbcode.php');
+
+	$post = array();
+
+	$post['profile_uid'] = local_user();
+	$post['return'] = '/oexchange/done' ;
+	$post['body'] = html2bbcode($s);
+	$post['type'] = 'wall';
+
+	$_POST = $post;
+	require_once('mod/item.php');
+	item_post($a);
+
+}
+
+
diff --git a/mod/profile.php b/mod/profile.php
index 1101c6998..17f6a2d45 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -138,7 +138,8 @@ function profile_content(&$a, $update = 0) {
 				'$utubeurl' => t('Please enter a YouTube link:'),
 				'$vidurl' => t("Please enter a video\x28.ogg\x29 link/URL:"),
 				'$audurl' => t("Please enter an audio\x28.ogg\x29 link/URL:"),
-				'$whereareu' => t('Where are you right now?') 
+				'$whereareu' => t('Where are you right now?'),
+				'$title' => t('Enter a title for this item') 
 			));
 
 			require_once('include/acl_selectors.php');
@@ -169,6 +170,7 @@ function profile_content(&$a, $update = 0) {
 				'$audio' => t('Insert Vorbis [.ogg] audio'),
 				'$setloc' => t('Set your location'),
 				'$noloc' => t('Clear browser location'),
+				'$title' => t('Set title'),
 				'$wait' => t('Please wait'),
 				'$permset' => t('Permission settings'),
 				'$content' => '',
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 68c05625b..48805fbdd 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -196,9 +196,11 @@ function profile_photo_content(&$a) {
 		$o .= replace_macros($tpl,array(
 			'$filename' => $filename,
 			'$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'],
-			'$image_url' => $a->get_baseurl() . '/photo/' . $filename
-			));
-
+			'$image_url' => $a->get_baseurl() . '/photo/' . $filename,
+			'$title' => t('Crop Image'),
+			'$desc' => t('Please adjust the image cropping for optimum viewing.'),
+			'$done' => t('Done Editing')
+		));
 		return $o;
 	}