begin channel management (was "manage") page, use term "channel" instead of the vague and hard to explain "identity"

6 files changed, 43 insertions, 25 deletions

diff --git a/boot.php b/boot.php
index 2863c1b97..9e0d8e061 100644
--- a/boot.php
+++ b/boot.php
@@ -1493,7 +1493,7 @@ if(! function_exists('proc_run')) {
 
 		$cmdline = implode($args," ");
 		if(get_config('system','proc_windows'))
-			proc_close(proc_open('start /b ' . $cmdline,array(),$foo));
+			proc_close(proc_open('cmd /c start /b ' . $cmdline,array(),$foo));
 		else
 			proc_close(proc_open($cmdline." &",array(),$foo));
 	}
diff --git a/mod/install.php b/mod/install.php
index 4e4631b85..eff408964 100755
--- a/mod/install.php
+++ b/mod/install.php
@@ -114,7 +114,7 @@ function install_content(&$a) {
 	global $install_wizard_pass, $db;
 	$o = '';
 	$wizard_status = "";
-	$install_title = t('Friendica Social Communications Server - Setup');
+	$install_title = t('Friendica Red Communications Server - Setup');
 	
 
 	
@@ -233,6 +233,7 @@ function install_content(&$a) {
 				'$dbuser' => array('dbuser', t('Database Login Name'), $dbuser, ''),
 				'$dbpass' => array('dbpass', t('Database Login Password'), $dbpass, ''),
 				'$dbdata' => array('dbdata', t('Database Name'), $dbdata, ''),
+
 				'$adminmail' => array('adminmail', t('Site administrator email address'), $adminmail, t('Your account email address must match this in order to use the web admin panel.')),
 
 				
@@ -387,7 +388,7 @@ function check_funcs(&$checks) {
 		$ck_funcs[0]['status']= false;
 		$ck_funcs[0]['help']= t('Error: libCURL PHP module required but not installed.');
 	}
-	if(! function_exists('imagecreatefromjpeg')){
+x	if(! function_exists('imagecreatefromjpeg')){
 		$ck_funcs[1]['status']= false;
 		$ck_funcs[1]['help']= t('Error: GD graphics PHP module with JPEG support required but not installed.');
 	}
@@ -406,8 +407,7 @@ function check_funcs(&$checks) {
 	
 	$checks = array_merge($checks, $ck_funcs);
 	
-	/*if((x($_SESSION,'sysmsg')) && is_array($_SESSION['sysmsg']) && count($_SESSION['sysmsg']))
-		notice( t('Please see the file "INSTALL.txt".') . EOL);*/
+
 }
 
 
@@ -488,7 +488,7 @@ function what_next() {
 		."<p>".t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.')
 		.t('Please see the file "INSTALL.txt".')			
 		."</p><p>"
-		.t("Go to your new Firendica node <a href='$baseurl/register'>registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.")
+		.t("Go to your new Friendica node <a href='$baseurl/register'>registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.")
 		."</p>";
 }
 
diff --git a/mod/manage.php b/mod/manage.php
index 96d420c78..e0e99b123 100644
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -82,32 +82,29 @@ function manage_post(&$a) {
 
 function manage_content(&$a) {
 
-	if(! local_user()) {
+	if(! get_account_id()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
 
-	$o = '<h3>' . t('Manage Identities and/or Pages') . '</h3>';
+	$active = null;
 
-	
-	$o .= '<div id="identity-manage-desc">' . t('Toggle between different identities or community/group pages which share your account details or which you have been granted "manage" permissions') . '</div>';
-
-	$o .= '<div id="identity-manage-choose">' . t('Select an identity to manage: ') . '</div>';
-
-	$o .= '<div id="identity-selector-wrapper">' . "\r\n";
-	$o .= '<form action="manage" method="post" >' . "\r\n";
-	$o .= '<select name="identity" size="4" onchange="this.form.submit();" >' . "\r\n";
+	if(local_user()) {
+		$r = q("select * from entity where entity_id = %d limit 1",
+			intval(local_user())
+		);
 
-	foreach($a->identities as $rr) {
-		$selected = (($rr['nickname'] === $a->user['nickname']) ? ' selected="selected" ' : '');
-		$o .= '<option ' . $selected . 'value="' . $rr['uid'] . '">' . $rr['username'] . ' (' . $rr['nickname'] . ')</option>' . "\r\n";
+		if($r && count($r))
+			$active = $r[0];
 	}
 
-	$o .= '</select>' . "\r\n";
-	$o .= '<div id="identity-select-break"></div>' . "\r\n";
 
-//	$o .= '<input id="identity-submit" type="submit" name="submit" value="' . t('Submit') . '" />';
-	$o .= '</div></form>' . "\r\n";
+	$o = replace_macros(get_markup_template('channels.tpl'), array(
+		'$header' => t('Manage Profile Channels'),
+		'$desc' => t('These are your Profile Channels. Select any Profile Channel to attach and make that the current channel.'),
+		'$active' => $active,
+	));
+
 
 	return $o;
 
diff --git a/mod/zentity.php b/mod/zentity.php
index 9e90dd263..41ee7165b 100644
--- a/mod/zentity.php
+++ b/mod/zentity.php
@@ -99,8 +99,8 @@ function zentity_content(&$a) {
 
 	$o = replace_macros(get_markup_template('zentity.tpl'), array(
 
-		'$title'        => t('Create Identity'),
-		'$desc'         => t('An identity is a profile container for a personal profile, blog, public or private group/forum, celebrity page, and more. You may create as many of these as your provider allows.'),
+		'$title'        => t('Create a Profile Channel'),
+		'$desc'         => t('A channel is a collection of web resources attached to a profile page. This is typically used to create a personal profile, but may also be used to create a blog, public and private forums, celebrity pages, and more. You may create as many of these as your provider allows.'),
 
 		'$label_name'   => t('Full name'),
 		'$label_nick'   => t('Choose a short nickname'),
diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl
new file mode 100644
index 000000000..a18c4c1bb
--- /dev/null
+++ b/view/tpl/channel.tpl
@@ -0,0 +1,2 @@
+<img class="channel-photo" src="$channel.photo" alt="$channel.name" />
+<div class="channel-name">$channel.name</div>
diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl
new file mode 100644
index 000000000..bfff3964f
--- /dev/null
+++ b/view/tpl/channels.tpl
@@ -0,0 +1,19 @@
+<h3>$header</h3>
+
+<div id="channels-desc" class="descriptive-text">$desc</div>
+
+{{ if $links }}
+{{ for $links as $l }}
+<a class="channels-links" href="$l.0" title="$l.1">$l.2</a>
+{{ endfor }}
+{{ endif }} 
+
+<div align="center">{{ inc channel.tpl with $chn = $active }}</div>
+<div align="center">$act_desc</div>
+
+
+{{ for $all_channels as $chn }}
+{{ inc channel.tpl with $channel = $chn }}
+{{ endfor }} 
+
+<div class="channels-end"></div>