diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php index 3a3aec447..c1a721346 100644 --- a/e107_handlers/e_parse_class.php +++ b/e107_handlers/e_parse_class.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_handlers/e_parse_class.php,v $ -| $Revision: 1.9 $ -| $Date: 2007-04-30 20:16:55 $ +| $Revision: 1.10 $ +| $Date: 2007-05-16 20:24:30 $ | $Author: e107steved $ +----------------------------------------------------------------------------+ */ @@ -276,6 +276,7 @@ class e_parse $pos = 0; $curlen = 0; $tmp_pos = 0; + $intag = FALSE; while($curlen < $len && $curlen < strlen($text)) { switch($text{$pos}) @@ -699,9 +700,17 @@ class e_parse $search[] = "{e_ADMIN}"; } if ($all) { + if (USER) + { // Can only replace with valid number for logged in users $replace_relative[] = USERID; $replace_absolute[] = USERID; - $search[] = "{USERID}"; + } + else + { + $replace_relative[] = ''; + $replace_absolute[] = ''; + } + $search[] = "{USERID}"; } $replace = ((string)$nonrelative == "full" ) ? $replace_absolute : $replace_relative; return str_replace($search,$replace,$text); diff --git a/e107_handlers/sitelinks_class.php b/e107_handlers/sitelinks_class.php index 2bc28e085..f8cf7c15e 100644 --- a/e107_handlers/sitelinks_class.php +++ b/e107_handlers/sitelinks_class.php @@ -12,9 +12,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_handlers/sitelinks_class.php,v $ -| $Revision: 1.6 $ -| $Date: 2007-03-16 13:47:59 $ -| $Author: mcfly_e107 $ +| $Revision: 1.7 $ +| $Date: 2007-05-16 20:24:30 $ +| $Author: e107steved $ +---------------------------------------------------------------+ */ @@ -183,7 +183,8 @@ class sitelinks $indent = ($style['linkdisplay'] != 3) ? $style['subindent'] : ""; } - $linkInfo['link_url'] = $tp -> replaceConstants($linkInfo['link_url'], '', TRUE); // replace {e_xxxx} + // Convert any {e_XXX} to absolute URLs (relative ones sometimes get broken by adding e_HTTP at the front) + $linkInfo['link_url'] = $tp -> replaceConstants($linkInfo['link_url'], TRUE, TRUE); // replace {e_xxxx} if(strpos($linkInfo['link_url'],"{") !== FALSE){ $linkInfo['link_url'] = $tp->parseTemplate($linkInfo['link_url'], TRUE); // shortcode in URL support - dynamic urls for multilanguage. @@ -290,9 +291,13 @@ function hilite($link,$enabled=''){ // --------------- highlighting for 'HOME'. ---------------- global $pref; - list($fp,$fp_q) = explode("?",$pref['frontpage']['all']."?"); - if(strpos(e_SELF,"/".$pref['frontpage']['all'])!== FALSE && $fp_q == $tmp[1] && $link == e_HTTP."index.php"){ + if (isset($pref['frontpage']['all'])) + { + list($fp,$fp_q) = explode("?",$pref['frontpage']['all']."?"); + if (strpos(e_SELF,"/".$pref['frontpage']['all'])!== FALSE && $fp_q == $tmp[1] && $link == e_HTTP."index.php") + { return TRUE; + } } // --------------- highlighting for plugins. ---------------- diff --git a/e107_plugins/forum/forum_class.php b/e107_plugins/forum/forum_class.php index 7faa1c92d..4e069c981 100644 --- a/e107_plugins/forum/forum_class.php +++ b/e107_plugins/forum/forum_class.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/forum/forum_class.php,v $ -| $Revision: 1.1.1.1 $ -| $Date: 2006-12-02 04:35:13 $ -| $Author: mcfly_e107 $ +| $Revision: 1.2 $ +| $Date: 2007-05-16 20:24:37 $ +| $Author: e107steved $ +----------------------------------------------------------------------------+ */ if (!defined('e107_INIT')) { exit; } @@ -230,6 +230,7 @@ class e107forum function forum_newflag_list() { + if (!USER) return FALSE; // Can't determine new threads for non-logged in users global $sql; $viewed = ""; if(USERVIEWED) @@ -810,7 +811,7 @@ class e107forum return FORLAN_9; } } - else + if($type == 'make_inactive') { $pruned = $sql->db_Update("forum_t", "thread_active=0 WHERE thread_lastpost < $prunedate AND thread_parent=0 AND thread_forum_id IN ({$forumList})"); return FORLAN_8." ".$pruned." ".FORLAN_91; diff --git a/e107_themes/lamb/forum_template.php b/e107_themes/lamb/forum_template.php index 886de9b88..8c151cc65 100644 --- a/e107_themes/lamb/forum_template.php +++ b/e107_themes/lamb/forum_template.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_themes/lamb/forum_template.php,v $ -| $Revision: 1.1.1.1 $ -| $Date: 2006-12-02 04:35:57 $ -| $Author: mcfly_e107 $ +| $Revision: 1.2 $ +| $Date: 2007-05-16 20:24:44 $ +| $Author: e107steved $ +----------------------------------------------------------------------------+ */ if (!defined('e107_INIT')) { exit; } @@ -29,22 +29,27 @@ $FORUM_MAIN_FORUM = "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
{INFOTITLE}
{LOGO}{USERINFO}
{INFO}
{FORUMINFO}
{USERLIST}
{STATLINK}
\n\n
\n\n\n\n\n\n\n
{ICONKEY}{SEARCH}{PERMS}\n
\n
\n"; - if(!$FORUM_NEWPOSTS_START){ + if(!isset($FORUM_NEWPOSTS_START)) + { $FORUM_NEWPOSTS_START = "
\n
\n\n\n\n\n\n"; } - if(!$FORUM_NEWPOSTS_MAIN){ - $FORUM_NEWPOSTS_MAIN .= "\n\n\n\n"; + if(!isset($FORUM_NEWPOSTS_MAIN)) + { + $FORUM_NEWPOSTS_MAIN = "\n\n\n\n"; } - if(!$FORUM_NEWPOSTS_END){ - $FORUM_NEWPOSTS_END .= "
 {NEWTHREADTITLE}{POSTEDTITLE}
{NEWIMAGE}{NEWSPOSTNAME}{STARTERTITLE}
{NEWIMAGE}{NEWSPOSTNAME}{STARTERTITLE}
"; + if(!isset($FORUM_NEWPOSTS_END)) + { + $FORUM_NEWPOSTS_END = ""; } - if(!$FORUM_TRACK_START){ + if(!isset($FORUM_TRACK_START)) + { $FORUM_TRACK_START = "
\n
\n\n\n\n\n"; - if(!$FORUM_TRACK_MAIN){ + if(!isset($FORUM_TRACK_MAIN)) + { $FORUM_TRACK_MAIN = " @@ -53,7 +58,8 @@ $FORUM_MAIN_END = "
{TRACKTITLE}
{NEWIMAGE} {TRACKPOSTNAME}
\n
\n