Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	boot.php
	include/api.php
	include/enotify.php

boot.php

@@ -45,7 +45,7 @@ require_once('include/Contact.php');
 require_once('include/account.php');
 
 
-define ( 'RED_PLATFORM',            'hubzilla' );
+define ( 'PLATFORM_NAME',           'hubzilla' );
 define ( 'RED_VERSION',             trim(file_get_contents('version.inc')) . 'R');
 define ( 'ZOT_REVISION',            1     );
 
@@ -1013,7 +1013,7 @@ class App {
 			'$user_scalable' => $user_scalable,
 			'$baseurl' => $this->get_baseurl(),
 			'$local_channel' => local_channel(),
-			'$generator' => RED_PLATFORM . ' ' . RED_VERSION,
+			'$generator' => PLATFORM_NAME . ' ' . RED_VERSION,
 			'$update_interval' => $interval,
 			'$icon' => head_get_icon(),
 			'$head_css' => head_get_css(),

include/api.php

@@ -1936,7 +1936,7 @@ require_once('include/items.php');
 			'private' => $private, 'textlimit' => $textlimit, 'sslserver' => $sslserver, 'ssl' => $ssl,
 			'shorturllength' => '30',
         	'hubzilla' => array(
-				'RED_PLATFORM' => RED_PLATFORM,
+				'PLATFORM_NAME' => PLATFORM_NAME,
 				'RED_VERSION' => RED_VERSION,
 				'ZOT_REVISION' => ZOT_REVISION,
 				'DB_UPDATE_VERSION' => DB_UPDATE_VERSION

include/enotify.php

@@ -56,7 +56,7 @@ function notification($params) {
 	push_lang($recip['account_language']); // should probably have a channel language
 
 	$banner     = t('Hubzilla Notification');
-	$product    = t('hubzilla'); // RED_PLATFORM;
+	$product    = t('hubzilla'); // PLATFORM_NAME;
 	$siteurl    = $a->get_baseurl(true);
 	$thanks     = t('Thank You,');
 	$sitename   = get_config('system','sitename');

include/event.php

@@ -62,7 +62,7 @@ function ical_wrapper($ev) {
 	$o .= "BEGIN:VCALENDAR";
 	$o .= "\nVERSION:2.0";
 	$o .= "\nMETHOD:PUBLISH";
-	$o .= "\nPRODID:-//" . get_config('system','sitename') . "//" . RED_PLATFORM . "//" . strtoupper(get_app()->language). "\n";
+	$o .= "\nPRODID:-//" . get_config('system','sitename') . "//" . PLATFORM_NAME . "//" . strtoupper(get_app()->language). "\n";
 	if(array_key_exists('start', $ev))
 		$o .= format_event_ical($ev);
 	else {

include/identity.php

@@ -481,7 +481,7 @@ function identity_basic_export($channel_id, $items = false) {
 
 	$ret = array();
 
-	$ret['compatibility'] = array('project' => RED_PLATFORM, 'version' => RED_VERSION, 'database' => DB_UPDATE_VERSION);
+	$ret['compatibility'] = array('project' => PLATFORM_NAME, 'version' => RED_VERSION, 'database' => DB_UPDATE_VERSION);
 
 	$r = q("select * from channel where channel_id = %d limit 1",
 		intval($channel_id)

include/items.php

@@ -554,7 +554,7 @@ function get_feed_for($channel, $observer_hash, $params) {
 
 	$atom .= replace_macros($feed_template, array(
 		'$version'      => xmlify(RED_VERSION),
-		'$red'          => xmlify(RED_PLATFORM),
+		'$red'          => xmlify(PLATFORM_NAME),
 		'$feed_id'      => xmlify($channel['xchan_url']),
 		'$feed_title'   => xmlify($channel['channel_name']),
 		'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now' , ATOM_TIME)) ,

include/language.php

@@ -159,10 +159,10 @@ function t($s, $ctx = '') {
 	if (x($a->strings, $cs)) {
 		$t = $a->strings[$cs];
 
-		return ((is_array($t)) ? translate_product($t[0]) : translate_product($t));
+		return ((is_array($t)) ? translate_projectname($t[0]) : translate_projectname($t));
 	}
 
-	return translate_product($s);
+	return translate_projectname($s);
 }
 
 /**
@@ -170,9 +170,9 @@ function t($s, $ctx = '') {
  *  Merging strings from different project names is problematic so we'll do that with a string replacement
  */
 
-function translate_product($s) {
+function translate_projectname($s) {
 
-	return str_replace(array('$product','$Product'),array(RED_PLATFORM,ucfirst(RED_PLATFORM)),$s);
+	return str_replace(array('$projectname','$Projectname'),array(PLATFORM_NAME,ucfirst(PLATFORM_NAME)),$s);
 
 }
 

mod/page.php

@@ -35,7 +35,11 @@ function page_init(&$a) {
 	}
 
 	$channel_address = argv(1);
-	$page_id = argv(2);
+
+	// The page link title was stored in a urlencoded format
+	// php or the browser may/will have decoded it, so re-encode it for our search
+
+	$page_id = urlencode(argv(2));
 
 	$u = q("select channel_id from channel where channel_address = '%s' limit 1",
 		dbesc($channel_address)
@@ -62,7 +66,6 @@ function page_init(&$a) {
 		intval(ITEM_WEBPAGE),
 		intval(ITEM_PDL)
 	);
-
 	if(! $r) {
 
 		// Check again with no permissions clause to see if it is a permissions issue

mod/parse_url.php

@@ -325,7 +325,7 @@ function parse_url_content(&$a) {
 
 	// If this is a Red site, use zrl rather than url so they get zids sent to them by default
 
-	if( x($siteinfo,'generator') && (strpos($siteinfo['generator'],RED_PLATFORM . ' ') === 0))
+	if( x($siteinfo,'generator') && (strpos($siteinfo['generator'],PLATFORM_NAME . ' ') === 0))
 		$template = str_replace('url','zrl',$template);
 
 	if($siteinfo["title"] == "") {

mod/siteinfo.php

@@ -90,7 +90,7 @@ function siteinfo_init(&$a) {
 			'default_service_restrictions' => $service_class,
 			'admin' => $admin,
 			'site_name' => (($site_name) ? $site_name : ''),
-			'platform' => RED_PLATFORM,
+			'platform' => PLATFORM_NAME,
 			'dbdriver' => $db->getdriver(),
 			'lastpoll' => get_config('system','lastpoll'),
 			'info' => (($site_info) ? $site_info : ''),

mod/webpages.php

@@ -133,8 +133,9 @@ function webpages_content(&$a) {
 	$sql_extra = item_permissions_sql($owner);
 
 	$r = q("select * from item_id left join item on item_id.iid = item.id 
-		where item_id.uid = %d and service = 'WEBPAGE' $sql_extra order by item.created desc",
-		intval($owner)
+		where item_id.uid = %d and service = 'WEBPAGE' and item_restrict = %d $sql_extra order by item.created desc",
+		intval($owner),
+		intval(ITEM_WEBPAGE)
 	);
 
 	$pages = null;

mod/zfinger.php

@@ -280,7 +280,7 @@ function zfinger_init(&$a) {
 		$ret['site']['channels'] = channel_total();
 
 
-		$ret['site']['version'] = RED_PLATFORM . ' ' . RED_VERSION . '[' . DB_UPDATE_VERSION . ']';
+		$ret['site']['version'] = PLATFORM_NAME . ' ' . RED_VERSION . '[' . DB_UPDATE_VERSION . ']';
 
 		$ret['site']['admin'] = get_config('system','admin_email');
 

version.inc

@@ -1 +1 @@
-2015-05-12.1030
+2015-05-13.1031