Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev

5 files changed, 198 insertions, 0 deletions

diff --git a/Zotlabs/Module/Ap_probe.php b/Zotlabs/Module/Ap_probe.php
index 769cd4c4e..29629a8eb 100644
--- a/Zotlabs/Module/Ap_probe.php
+++ b/Zotlabs/Module/Ap_probe.php
@@ -30,6 +30,7 @@ class Ap_probe extends \Zotlabs\Web\Controller {
 			$redirects = 0;
 		    $x = z_fetch_url($addr,true,$redirects, [ 'headers' => [ $headers ]]);
 	    	if($x['success'])
+				$o .= '<pre>' . $x['header'] . '</pre>' . EOL;
 				$o .= '<pre>' . str_replace(['\\n','\\'],["\n",''],jindent($x['body'])) . '</pre>';
 		}
 		return $o;
diff --git a/Zotlabs/Module/Changeaddr.php b/Zotlabs/Module/Changeaddr.php
new file mode 100644
index 000000000..5cd236394
--- /dev/null
+++ b/Zotlabs/Module/Changeaddr.php
@@ -0,0 +1,88 @@
+<?php
+namespace Zotlabs\Module;
+
+
+class Changeaddr extends \Zotlabs\Web\Controller {
+
+	function post() {
+	
+		if(! local_channel())
+			return;
+	
+		if($_SESSION['delegate'])
+			return;
+	
+		if((! x($_POST,'qxz_password')) || (! strlen(trim($_POST['qxz_password']))))
+			return;
+	
+		if((! x($_POST,'verify')) || (! strlen(trim($_POST['verify']))))
+			return;
+	
+		if($_POST['verify'] !== $_SESSION['remove_account_verify'])
+			return;
+	
+	
+		$account = \App::get_account();
+		$channel = \App::get_channel();
+	
+		$x = account_verify_password($account['account_email'],$_POST['qxz_password']);
+		if(! ($x && $x['account']))
+			return;
+	
+		if($account['account_password_changed'] > NULL_DATE) {
+			$d1 = datetime_convert('UTC','UTC','now - 48 hours');
+			if($account['account_password_changed'] > d1) {
+				notice( t('Channel name changes are not allowed within 48 hours of changing the account password.') . EOL);
+				return;
+			}
+		}
+	
+		$new_address = trim($_POST['newname']);
+
+		if($new_address === $channel['channel_address'])
+			return;
+
+		if($new_address === 'sys') {
+			notice( t('Reserved nickname. Please choose another.') . EOL);
+			return;
+		}
+
+		if(check_webbie(array($new_address)) !== $new_address) {
+			notice( t('Nickname has unsupported characters or is already being used on this site.') . EOL);
+			return $ret;
+		}
+
+		channel_change_address($channel,$new_address);
+
+		goaway(z_root() . '/changeaddr');
+	
+	}
+	
+	
+	function get() {
+	
+		if(! local_channel())
+			goaway(z_root());
+	
+		$channel = \App::get_channel();
+
+		$hash = random_string();
+	
+		$_SESSION['remove_account_verify'] = $hash;
+	
+		$tpl = get_markup_template('channel_rename.tpl');
+		$o .= replace_macros($tpl, array(
+			'$basedir' => z_root(),
+			'$hash' => $hash,
+			'$title' => t('Change channel nickname/address'),
+			'$desc' => array(t('WARNING: '), t('Any/all connections on other networks will be lost!')),
+			'$passwd' => t('Please enter your password for verification:'),
+			'$newname' => array('newname', t('New channel address'),$channel['channel_address'], ''),
+			'$submit' => t('Rename Channel')
+		));
+	
+		return $o;		
+	
+	}
+	
+}
diff --git a/include/channel.php b/include/channel.php
index f6252f094..efa39dcac 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -554,6 +554,92 @@ function change_channel_keys($channel) {
 	return $ret;
 }
 
+function channel_change_address($channel,$new_address) {
+
+	$ret = array('success' => false);
+
+	$old_address = $channel['channel_address'];
+
+	if($new_address === 'sys') {
+        $ret['message'] = t('Reserved nickname. Please choose another.');
+        return $ret;
+    }
+
+    if(check_webbie(array($new_address)) !== $new_address) {
+        $ret['message'] = t('Nickname has unsupported characters or is already being used on this site.');
+        return $ret;
+    }
+
+	$r = q("update channel set channel_address = '%s' where channel_id = %d",
+		dbesc($new_address),
+		intval($channel['channel_id'])
+	);
+	if(! $r) {
+		return $ret;
+ 	}
+
+	$r = q("select * from channel where channel_id = %d",
+		intval($channel['channel_id'])
+	);
+
+	if(! $r) {
+		$ret['message'] = t('Unable to retrieve modified identity');
+		return $ret;
+	}
+
+	$r = q("update xchan set xchan_addr = '%s' where xchan_hash = '%s'",
+		dbesc($new_address . '@' . App::get_hostname()),
+		dbesc($channel['channel_hash'])
+	);
+
+	$h = q("select * from hubloc where hubloc_hash = '%s' and hubloc_url = '%s' ",
+		dbesc($channel['channel_hash']),
+		dbesc(z_root())
+	);
+
+	if($h) {
+		foreach($h as $hv) {
+			if($hv['hubloc_primary']) {
+				q("update hubloc set hubloc_primary = 0 where hubloc_id = %d",
+					intval($hv['hubloc_id'])
+				);
+			}
+			q("update hubloc set hubloc_deleted = 1 where hubloc_id = %d",
+				intval($hv['hubloc_id'])
+			);
+
+			unset($hv['hubloc_id']);
+			$hv['hubloc_addr'] = $new_address . '@' . App::get_hostname();
+			hubloc_store_lowlevel($hv);
+		}
+	}
+
+	// fix apps which were stored with the actual name rather than a macro
+
+	$r = q("select * from app where app_channel = %d and app_system = 1",
+		intval($channel['channel_id'])
+	);
+	if($r) {
+		foreach($r as $rv) {
+			$replace = preg_replace('/([\=\/])(' . $old_address . ')($|[\%\/])/ism','$1' . $new_address . '$3',$rv['app_url']);
+			if($replace != $rv['app_url']) {
+				q("update app set app_url = '%s' where id = %d",
+					dbesc($replace),
+					intval($rv['id'])
+				);
+			}
+		}
+	}		
+
+	Zotlabs\Daemon\Master::Summon(array('Notifier', 'refresh_all', $channel['channel_id']));
+
+	$ret['success'] = true;
+	return $ret;
+}
+
+
+
+
 
 
 /**
diff --git a/view/tpl/channel_rename.tpl b/view/tpl/channel_rename.tpl
new file mode 100755
index 000000000..9948dc647
--- /dev/null
+++ b/view/tpl/channel_rename.tpl
@@ -0,0 +1,20 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+	</div>
+	<div class="section-content-danger-wrapper" id="rename-channel-desc">
+		<strong>{{$desc.0}}</strong><strong>{{$desc.1}}</strong>
+	</div>
+	<div class="section-content-tools-wrapper">
+		<form action="{{$basedir}}/changeaddr" autocomplete="off" method="post" >
+			<input type="hidden" name="verify" value="{{$hash}}" />
+			<div class="form-group" id="rename-channel-pass-wrapper">
+				<label id="rename-channel-pass-label" for="rename-channel-pass">{{$passwd}}</label>
+				<input class="form-control" type="password" id="rename-channel-pass" autocomplete="off" name="qxz_password" value=" " />
+			</div>
+			{{include file="field_input.tpl" field=$newname}}
+			<button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button>
+		</form>
+	</div>
+</div>
+
diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl
index 0e8fb0389..48bf5de4b 100755
--- a/view/tpl/msg-header.tpl
+++ b/view/tpl/msg-header.tpl
@@ -20,6 +20,7 @@
 				$('#jot-media').val($('#jot-media').val() + data.result.message);
 			},
 			stop: function(e,data) {
+				preview_mail();
 				$('#prvmail-rotator').spin(false);
 			},
 		});
@@ -36,6 +37,7 @@
 			$('#prvmail-rotator').spin('tiny');
 			$.get('linkinfo?f=&url=' + reply, function(data) {
 				addmailtext(data);
+				preview_mail();
 				$('#prvmail-rotator').spin(false);
 			});
 		}
@@ -62,6 +64,7 @@
 			$('#prvmail-rotator').spin('tiny');
 			$.get('linkinfo?f=&url=' + reply, function(data) {
 				addmailtext(data);
+				preview_mail();
 				$('#prvmail-rotator').spin(false);
 			});
 		}