1
0
mirror of https://github.com/e107inc/e107.git synced 2025-04-21 05:02:02 +02:00

Bugtracker #4497 - more links from relative to absolute

This commit is contained in:
e107steved 2010-01-09 12:06:15 +00:00
parent 04b97e3e3b
commit 608dc984f1
4 changed files with 87 additions and 50 deletions

View File

@ -11,12 +11,22 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/comment.php,v $
| $Revision: 1.13 $
| $Date: 2009-11-18 01:04:24 $
| $Author: e107coders $
| $Revision: 1.14 $
| $Date: 2010-01-09 12:06:09 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
require_once("class2.php");
/**
* @package e107
* @subpackage user
* @version $Id: comment.php,v 1.14 2010-01-09 12:06:09 e107steved Exp $;
*
* Display comments
*/
require_once('class2.php');
include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
require_once(e_HANDLER."news_class.php");
@ -148,15 +158,15 @@ if ($redirectFlag)
exit;
case "poll" :
echo "<script type='text/javascript'>document.location.href='".e_BASE."comment.php?comment.{$table}.{$redirectFlag}'</script>\n";
echo "<script type='text/javascript'>document.location.href='".e_HTTP."comment.php?comment.{$table}.{$redirectFlag}'</script>\n";
exit;
break;
case "download" :
echo "<script type='text/javascript'>document.location.href='".e_BASE."download.php?view.{$redirectFlag}'</script>\n";
echo "<script type='text/javascript'>document.location.href='".e_HTTP."download.php?view.{$redirectFlag}'</script>\n";
exit;
break;
case "page" :
echo "<script type='text/javascript'>document.location.href='".e_BASE."page.php?{$redirectFlag}'</script>\n";
echo "<script type='text/javascript'>document.location.href='".e_HTTP."page.php?{$redirectFlag}'</script>\n";
exit;
break;
}
@ -358,7 +368,7 @@ else
if(isset($pref['trackbackEnabled']) && $pref['trackbackEnabled'] && $table == "news")
{
echo "<span class='smalltext'><b>".$pref['trackbackString']."</b> ".$e107->http_path.e_PLUGIN."trackback/trackback.php?pid={$id}</span>";
echo "<span class='smalltext'><b>".$pref['trackbackString']."</b> ".SITEURLBASE.e_PLUGIN_ABS."trackback/trackback.php?pid={$id}</span>";
}
$field = ($field ? $field : ($id ? $id : "")); // ID of associated source item
@ -404,7 +414,7 @@ if(isset($pref['trackbackEnabled']) && $pref['trackbackEnabled'] && $table == "n
echo "<a name='track'></a>".COMLAN_316;
}
if (ADMIN && getperms("B")) {
echo "<div style='text-align:right'><a href='".e_PLUGIN."trackback/modtrackback.php?".$id."'>".COMLAN_317."</a></div><br />";
echo "<div style='text-align:right'><a href='".e_PLUGIN_ABS."trackback/modtrackback.php?".$id."'>".COMLAN_317."</a></div><br />";
}
}

View File

@ -9,8 +9,8 @@
* Shortcodes for event calendar
*
* $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/calendar_shortcodes.php,v $
* $Revision: 1.18 $
* $Date: 2009-12-28 21:49:23 $
* $Revision: 1.19 $
* $Date: 2010-01-09 12:06:09 $
* $Author: e107steved $
*
*/
@ -20,7 +20,7 @@
*
* @package e107_plugins
* @subpackage event_calendar
* @version $Id: calendar_shortcodes.php,v 1.18 2009-12-28 21:49:23 e107steved Exp $;
* @version $Id: calendar_shortcodes.php,v 1.19 2010-01-09 12:06:09 e107steved Exp $;
*/
/*
@ -543,7 +543,7 @@ class event_calendar_shortcodes
{
$cal_dayarray = getdate($this->event['event_start']);
$cal_linkut = mktime(0 , 0 , 0 , $cal_dayarray['mon'], $cal_dayarray['mday'], $cal_dayarray['year']).".one"; // ALways need "one"
return ' '.str_replace(e_HTTP,SITEURL, e_PLUGIN_ABS).'calendar_menu/event.php?'.$cal_linkut.' ';
return ' '.SITEURLBASE.e_PLUGIN_ABS.'calendar_menu/event.php?'.$cal_linkut.' ';
}
@ -579,19 +579,19 @@ class event_calendar_shortcodes
public function sc_ec_calendar_calendar_day_today_heading()
{
return "<b><a href='".e_PLUGIN."calendar_menu/event.php?".$this->todayStart."'>".$this->days[($this->curDay-1)]."</a></b> <span class='smalltext'>[".EC_LAN_TODAY."]</span>";
return "<b><a href='".e_PLUGIN_ABS."calendar_menu/event.php?".$this->todayStart."'>".$this->days[($this->curDay-1)]."</a></b> <span class='smalltext'>[".EC_LAN_TODAY."]</span>";
}
public function sc_ec_calendar_calendar_day_event_heading()
{
return "<a href='".e_PLUGIN."calendar_menu/event.php?".$this->todayStart.".one'>".$this->days[($this->curDay-1)]."</a>";
return "<a href='".e_PLUGIN_ABS."calendar_menu/event.php?".$this->todayStart.".one'>".$this->days[($this->curDay-1)]."</a>";
}
public function sc_ec_calendar_calendar_day_empty_heading()
{
return "<a href='".e_PLUGIN."calendar_menu/event.php?".$this->todayStart."'>".$this->days[($this->curDay-1)]."</a>";
return "<a href='".e_PLUGIN_ABS."calendar_menu/event.php?".$this->todayStart."'>".$this->days[($this->curDay-1)]."</a>";
}
@ -599,10 +599,9 @@ class event_calendar_shortcodes
{
if (!isset($this->event['is_recent'])) return '';
if (!$this->event['startofevent']) return ''; // Only display on first day of multi-day events
$recent_icon = EC_RECENT_ICON;
if (is_readable($recent_icon))
if (is_readable(EC_RECENT_ICON))
{
return "<img src='".$recent_icon."' alt='' /> ";
return "<img src='".EC_RECENT_ICON_ABS."' alt='' /> ";
}
return "R";
}
@ -630,11 +629,11 @@ class event_calendar_shortcodes
}
elseif(defined('BULLET'))
{
$img = '<img src="'.THEME.'images/'.BULLET.'" alt="" class="icon" />';
$img = '<img src="'.THEME_ABS.'images/'.BULLET.'" alt="" class="icon" />';
}
elseif(file_exists(THEME.'images/bullet2.gif'))
{
$img = '<img src="'.THEME.'images/bullet2.gif" alt="" class="icon" />';
$img = '<img src="'.THEME_ABS.'images/bullet2.gif" alt="" class="icon" />';
}
return $img;
}
@ -657,11 +656,11 @@ class event_calendar_shortcodes
}
if($this->event['startofevent'])
{
return "<b><a title='{$this->event['event_title']}' href='".e_PLUGIN.'calendar_menu/event.php?'.$linkut.'.event.'.$this->event['event_id']."'><span class='mediumtext'>".$show_title."</span></a></b>";
return "<b><a title='{$this->event['event_title']}' href='".e_PLUGIN_ABS.'calendar_menu/event.php?'.$linkut.'.event.'.$this->event['event_id']."'><span class='mediumtext'>".$show_title."</span></a></b>";
}
else
{
return "<a title='{$this->event['event_title']}' href='".e_PLUGIN.'calendar_menu/event.php?'.$linkut.'.event.'.$this->event['event_id']."'><span class='smalltext'>".$show_title."</span></a>";
return "<a title='{$this->event['event_title']}' href='".e_PLUGIN_ABS.'calendar_menu/event.php?'.$linkut.'.event.'.$this->event['event_id']."'><span class='smalltext'>".$show_title."</span></a>";
}
}
@ -792,7 +791,7 @@ class event_calendar_shortcodes
}
if(USER)
{
return "<a href='".e_BASE."user.php?id.".$event_author_id."'>".$event_author_name."</a>";
return "<a href='".e_HTTP."user.php?id.".$event_author_id."'>".$event_author_name."</a>";
}
return $event_author_name;
}
@ -826,7 +825,7 @@ class event_calendar_shortcodes
$event_author_name = strstr(varset($this->event['event_author'],'0.??'),'.');
if (USERNAME == $event_author_name || $this->ecalClass->cal_super || check_class($pref['eventpost_admin']))
{
return "<a href='event.php?ed.".$this->event['event_id']."'><img class='icon S16' src='".e_IMAGE_ABS."admin_images/edit_16.png' title='".EC_LAN_35."' alt='".EC_LAN_35 . "'/></a>&nbsp;&nbsp;<a href='".e_PLUGIN_ABS.'calendar_menu/event.php?de.'.$this->event['event_id']."'><img style='border:0;' src='".e_IMAGE_ABS."admin_images/delete_16.png' title='".EC_LAN_36."' alt='".EC_LAN_36."'/></a>";
return "<a href='".e_PLUGIN_ABS."calendar_menu/event.php?ed.".$this->event['event_id']."'><img class='icon S16' src='".e_IMAGE_ABS."admin_images/edit_16.png' title='".EC_LAN_35."' alt='".EC_LAN_35 . "'/></a>&nbsp;&nbsp;<a href='".e_PLUGIN_ABS.'calendar_menu/event.php?de.'.$this->event['event_id']."'><img style='border:0;' src='".e_IMAGE_ABS."admin_images/delete_16.png' title='".EC_LAN_36."' alt='".EC_LAN_36."'/></a>";
}
}
@ -875,7 +874,7 @@ class event_calendar_shortcodes
public function sc_ec_eventarchive_date()
{
$startds = $this->ecalClass->event_date_string($this->event['event_start']);
return "<a href='event.php?".$this->event['event_start'].'.event.'.$this->event['event_id']."'>".$startds."</a>";
return "<a href='".e_PLUGIN_ABS."calendar_menu/event.php?".$this->event['event_start'].'.event.'.$this->event['event_id']."'>".$startds."</a>";
}
@ -915,10 +914,9 @@ class event_calendar_shortcodes
global $pref;
if (!$pref['eventpost_fe_showrecent']) return;
if (!isset($this->event['is_recent'])) return;
$recent_icon = EC_RECENT_ICON;
if (is_readable($recent_icon))
if (is_readable(EC_RECENT_ICON))
{
return "<img src='".$recent_icon."' alt='' /> ";
return "<img src='".EC_RECENT_ICON_ABS."' alt='' /> ";
}
return '';
}
@ -968,11 +966,11 @@ class event_calendar_shortcodes
}
elseif(defined('BULLET'))
{
$fe_icon_file = THEME.'images/'.BULLET;
$fe_icon_file = THEME_ABS.'images/'.BULLET;
}
elseif(file_exists(THEME.'images/bullet2.gif'))
{
$fe_icon_file = THEME.'images/bullet2.gif';
$fe_icon_file = THEME_ABS.'images/bullet2.gif';
}
}
return $fe_icon_file;

View File

@ -9,12 +9,20 @@
*
*
* $Source: /cvs_backup/e107_0.8/e107_plugins/chatbox_menu/chatbox_menu.php,v $
* $Revision: 1.18 $
* $Date: 2010-01-08 23:29:23 $
* $Author: e107coders $
* $Revision: 1.19 $
* $Date: 2010-01-09 12:06:14 $
* $Author: e107steved $
*/
global $tp, $e107cache, $e_event, $e107, $pref, $footer_js, $PLUGINS_DIRECTORY;
/**
* e107 Chatbox plugin
*
* @package e107_plugins
* @subpackage chatbox
* @version $Id: chatbox_menu.php,v 1.19 2010-01-09 12:06:14 e107steved Exp $;
*/
global $tp, $e107cache, $e_event, $e107, $pref;
if (!plugInstalled('chatbox_menu'))
{
return '';
@ -24,22 +32,19 @@ if(($pref['cb_layer']==2) || isset($_POST['chatbox_ajax']))
{
if(isset($_POST['chat_submit']))
{
include_once("../../class2.php");
include_once('../../class2.php');
//Normally the menu.sc file will auto-load the language file, this is needed in case
//ajax is turned on and the menu is not loaded from the menu.sc
include_lan(e_PLUGIN."chatbox_menu/languages/".e_LANGUAGE."/".e_LANGUAGE.".php");
include_lan(e_PLUGIN.'chatbox_menu/languages/'.e_LANGUAGE.'/'.e_LANGUAGE.'.php');
}
// $footer_js[] = e_FILE_ABS.'e_ajax.php';
}
if(!defined("e_HANDLER")){ exit; }
require_once(e_HANDLER."emote.php");
if(!defined('e_HANDLER')){ exit; }
require_once(e_HANDLER.'emote.php');
$emessage='';
if(isset($_POST['chat_submit']) && $_POST['cmessage'] != "")
if(isset($_POST['chat_submit']) && $_POST['cmessage'] != '')
{
if(!USER && !$pref['anon_post'])
{
@ -136,7 +141,7 @@ else
if($pref['cb_layer'] == 2)
{
$oc = "onclick=\"javascript:sendInfo('".SITEURL.$PLUGINS_DIRECTORY."chatbox_menu/chatbox_menu.php', 'chatbox_posts', this.form);\"";
$oc = "onclick=\"javascript:sendInfo('".SITEURLBASE.e_PLUGIN_ABS."chatbox_menu/chatbox_menu.php', 'chatbox_posts', this.form);\"";
}
else
{
@ -189,7 +194,7 @@ if(!$text = $e107cache->retrieve("nq_chatbox"))
list($cb_uid, $cb_nick) = explode(".", $cb['cb_nick'], 2);
if($cb['user_name'])
{
$cb_nick = "<a href='".e_BASE."user.php?id.{$cb_uid}'>{$cb['user_name']}</a>";
$cb_nick = "<a href='".e_HTTP."user.php?id.{$cb_uid}'>{$cb['user_name']}</a>";
}
else
{
@ -212,11 +217,11 @@ if(!$text = $e107cache->retrieve("nq_chatbox"))
$bullet = '';
if(defined('BULLET'))
{
$bullet = '<img src="'.THEME.'images/'.BULLET.'" alt="" class="icon" />';
$bullet = '<img src="'.THEME_ABS.'images/'.BULLET.'" alt="" class="icon" />';
}
elseif(file_exists(THEME.'images/bullet2.gif'))
{
$bullet = '<img src="'.THEME.'images/bullet2.gif" alt="" class="icon" />';
$bullet = '<img src="'.THEME_ABS.'images/bullet2.gif" alt="" class="icon" />';
}
// default chatbox style
$CHATBOXSTYLE = "<!-- chatbox -->\n<div class='spacer'>
@ -235,7 +240,7 @@ if(!$text = $e107cache->retrieve("nq_chatbox"))
$total_chats = $sql -> db_Count("chatbox");
if($total_chats > $chatbox_posts || CB_MOD)
{
$text .= "<br /><div style='text-align:center'><a href='".e_PLUGIN."chatbox_menu/chat.php'>".(CB_MOD ? CHATBOX_L13 : CHATBOX_L12)."</a> (".$total_chats.")</div>";
$text .= "<br /><div style='text-align:center'><a href='".e_PLUGIN_ABS."chatbox_menu/chat.php'>".(CB_MOD ? CHATBOX_L13 : CHATBOX_L12)."</a> (".$total_chats.")</div>";
}
$e107cache->set("nq_chatbox", $text);
}

View File

@ -1,6 +1,30 @@
<?php
/*
* e107 website system
*
* Copyright (C) 2008-2010 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
* Chatbox plugin - Status
*
* $Source: /cvs_backup/e107_0.8/e107_plugins/chatbox_menu/e_status.php,v $
* $Revision: 1.2 $
* $Date: 2010-01-09 12:06:15 $
* $Author: e107steved $
*
*/
/**
* e107 Chatbox plugin
*
* @package e107_plugins
* @subpackage chatbox
* @version $Id: e_status.php,v 1.2 2010-01-09 12:06:15 e107steved Exp $;
*/
if (!defined('e107_INIT')) { exit; }
$chatbox_posts = $sql -> db_Count("chatbox");
$text .= "<div style='padding-bottom: 2px;'><img src='".e_PLUGIN."chatbox_menu/images/chatbox_16.png' style='width: 16px; height: 16px; vertical-align: bottom' alt='' /> ".ADLAN_115.": ".$chatbox_posts."</div>";
$chatbox_posts = $sql -> db_Count('chatbox');
$text .= "<div style='padding-bottom: 2px;'><img src='".e_PLUGIN_ABS."chatbox_menu/images/chatbox_16.png' style='width: 16px; height: 16px; vertical-align: bottom' alt='' /> ".ADLAN_115.": ".$chatbox_posts."</div>";
?>