harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
zotlabs 2017-02-08 11:24:21 -08:00
parent 6ceaea8478
commit 28f0833237
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Zotlabs/Lib/Permcat.php
View File

@ -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' ]

4
boot.php
View File

@ -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?'),

2
include/auth.php
View File

@ -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
}