From 7ec569933a6fe3e3ad1f473f1f68c43e54baa11d Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 22 Jan 2011 13:17:54 +0100 Subject: use • as breadcrumb separator --- inc/template.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/template.php') diff --git a/inc/template.php b/inc/template.php index 6d25a7171..ad9a454b4 100644 --- a/inc/template.php +++ b/inc/template.php @@ -685,7 +685,7 @@ function tpl_searchform($ajax=true,$autocomplete=true){ * * @author Andreas Gohr */ -function tpl_breadcrumbs($sep='♦'){ +function tpl_breadcrumbs($sep='•'){ global $lang; global $conf; -- cgit v1.2.3 From f22c196478c011c905357a7ae4b50af27ad9c868 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 31 Jan 2011 13:58:24 +0100 Subject: make use of quickselect in the action dropdown --- inc/template.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'inc/template.php') diff --git a/inc/template.php b/inc/template.php index ad9a454b4..828f64c85 100644 --- a/inc/template.php +++ b/inc/template.php @@ -1164,7 +1164,7 @@ function tpl_actiondropdown($empty='',$button='>'){ if($REV) echo ''; echo ''; - echo ''; echo ''; echo ''; @@ -1204,7 +1204,7 @@ function tpl_actiondropdown($empty='',$button='>'){ echo ''; echo ''; - echo ''; + echo ''; echo ''; } -- cgit v1.2.3 From a8a3aa33b73d21c50ce7aa202a6eff90a5ffc588 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 6 Feb 2011 19:16:47 +0100 Subject: make hierarchical breadcrumb consistent on search FS#2078 A search equivalent to a new ID so it should show up in the bread crumbs. --- inc/template.php | 6 ------ 1 file changed, 6 deletions(-) (limited to 'inc/template.php') diff --git a/inc/template.php b/inc/template.php index 828f64c85..7ac3437fb 100644 --- a/inc/template.php +++ b/inc/template.php @@ -739,12 +739,6 @@ function tpl_youarehere($sep=' » '){ $parts = explode(':', $ID); $count = count($parts); - if($GLOBALS['ACT'] == 'search') - { - $parts = array($conf['start']); - $count = 1; - } - echo ''.$lang['youarehere'].': '; // always print the startpage -- cgit v1.2.3 From bf413a4e50ea09a0345533c5fb1d07e963bd6368 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 20 Feb 2011 18:33:02 +0000 Subject: added 'register' and 'resendpwd' to action links and buttons Attention: $lang['register'] has been renamed to $lang['btn_register'], anyone using that in any plugin or template should adjust it. --- inc/template.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'inc/template.php') diff --git a/inc/template.php b/inc/template.php index 7ac3437fb..b873d818f 100644 --- a/inc/template.php +++ b/inc/template.php @@ -93,7 +93,7 @@ function tpl_content_core(){ break; case 'index': html_index($IDX); #FIXME can this be pulled from globals? is it sanitized correctly? - break; + break; case 'backlink': html_backlinks(); break; @@ -593,6 +593,16 @@ function tpl_get_action($type) { $type = 'logout'; } break; + case 'register': + if($_SERVER['REMOTE_USER']){ + return false; + } + break; + case 'resendpwd': + if($_SERVER['REMOTE_USER']){ + return false; + } + break; case 'admin': if(!$INFO['ismanager']){ return false; -- cgit v1.2.3 From 3a48618a538412994ec244d5a9fde5c4a6161d10 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Tue, 22 Feb 2011 23:04:53 +0000 Subject: improved actionOK and its use --- inc/template.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'inc/template.php') diff --git a/inc/template.php b/inc/template.php index b873d818f..d29e3e779 100644 --- a/inc/template.php +++ b/inc/template.php @@ -581,12 +581,9 @@ function tpl_get_action($type) { $accesskey = 'b'; break; case 'login': - if(!$conf['useacl'] || !$auth){ - return false; - } $params['sectok'] = getSecurityToken(); if(isset($_SERVER['REMOTE_USER'])){ - if (!$auth->canDo('logout')) { + if (!actionOK('logout')) { return false; } $params['do'] = 'logout'; @@ -619,20 +616,19 @@ function tpl_get_action($type) { $type = 'subscribe'; $params['do'] = 'subscribe'; case 'subscribe': - if(!$conf['useacl'] || !$auth || !$conf['subscribers'] || !$_SERVER['REMOTE_USER']){ + if(!$_SERVER['REMOTE_USER']){ return false; } break; case 'backlink': break; case 'profile': - if(!$conf['useacl'] || !$auth || !isset($_SERVER['REMOTE_USER']) || - !$auth->canDo('Profile')){ + if(!isset($_SERVER['REMOTE_USER'])){ return false; } break; case 'subscribens': - // Superseeded by subscribe/subscription + // Superseded by subscribe/subscription return ''; break; default: -- cgit v1.2.3