fix immediate issue with multiple login forms until I can figure out an elegant way to "popup" the modal login form already on the page. We still may need this fix for the actual login module which should always be callable and present a login form even if the nav is completely borked.

3 files changed, 4 insertions, 10 deletions

diff --git a/Zotlabs/Lib/Permcat.php b/Zotlabs/Lib/Permcat.php
index 032257be6..c697984f1 100644
--- a/Zotlabs/Lib/Permcat.php
+++ b/Zotlabs/Lib/Permcat.php
@@ -67,17 +67,11 @@ class Permcat {
 				[ 'view_stream','view_profile','view_contacts','view_storage','view_pages','view_wiki',
 				  'post_like' ]
 			],
-
 			[ 'contributor', t('contributor','permcat'),
 				[ 'view_stream','view_profile','view_contacts','view_storage','view_pages','view_wiki',
 				  'post_wall','post_comments','write_wiki','post_like','tag_deliver','chat' ]
 			],
-			[ 'trusted', t('trusted','permcat'),
-				[ 'view_stream','view_profile','view_contacts','view_storage','view_pages',
-				  'write_storage','post_wall','write_pages','write_wiki','post_comments','post_like','tag_deliver',
-				  'chat', 'republish' ]
-			],
-			[ 'moderator', t('moderator','permcat'),
+			[ 'publisher', t('publisher','permcat'),
 				[ 'view_stream','view_profile','view_contacts','view_storage','view_pages',
 				  'write_storage','post_wall','write_pages','write_wiki','post_comments','post_like','tag_deliver',
 				  'chat', 'republish' ]
diff --git a/boot.php b/boot.php
index e42c41546..127a45065 100755
--- a/boot.php
+++ b/boot.php
@@ -1709,7 +1709,7 @@ function login($register = false, $form_id = 'main-login', $hiddens=false, $logi
 		$reglink = 'register';
 
 	$reg = array(
-		'title' => t('Create an account to access services and applications within the Hubzilla'),
+		'title' => t('Create an account to access services and applications'),
 		'desc' => t('Register'),
 		'link' => (($register) ? $reglink : 'pubsites')
 	);
@@ -1733,7 +1733,7 @@ function login($register = false, $form_id = 'main-login', $hiddens=false, $logi
 		'$form_id'      => $form_id,
 		'$lname'        => array('username', t('Login/Email') , '', ''),
 		'$lpassword'    => array('password', t('Password'), '', ''),
-		'$remember_me'  => array('remember_me', t('Remember me'), '', '',array(t('No'),t('Yes'))),
+		'$remember_me'  => array((($login_page) ? 'remember' : 'remember_me'), t('Remember me'), '', '',array(t('No'),t('Yes'))),
 		'$hiddens'      => $hiddens,
 		'$register'     => $reg,
 		'$lostpass'     => t('Forgot your password?'),
diff --git a/include/auth.php b/include/auth.php
index fdcecec36..c7be69583 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -300,7 +300,7 @@ else {
 		// (i.e. expire when the browser is closed), even when there's a time expiration
 		// on the cookie
 
-		if($_POST['remember_me']) {
+		if(($_POST['remember_me']) || ($_POST['remember'])) {
 			$_SESSION['remember_me'] = 1;
 			App::$session->new_cookie(31449600); // one year
 		}