diff --git a/e107_plugins/calendar_menu/calendar_shortcodes.php b/e107_plugins/calendar_menu/calendar_shortcodes.php index b25b596b2..39f52c88c 100644 --- a/e107_plugins/calendar_menu/calendar_shortcodes.php +++ b/e107_plugins/calendar_menu/calendar_shortcodes.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/calendar_shortcodes.php,v $ -| $Revision: 1.8 $ -| $Date: 2008-03-20 20:49:02 $ +| $Revision: 1.9 $ +| $Date: 2008-07-28 20:16:10 $ | $Author: e107steved $ | +----------------------------------------------------------------------------+ @@ -143,7 +143,7 @@ SC_BEGIN EC_SHOWEVENT_IMAGE global $ev; if($ev['event_cat_icon'] && file_exists(e_PLUGIN."calendar_menu/images/".$ev['event_cat_icon'])) { - $img = ""; + $img = ""; } else { @@ -211,7 +211,7 @@ SC_BEGIN EC_CALENDAR_CALENDAR_RECENT_ICON global $ev; if (!isset($ev['is_recent'])) return ""; if (!$ev['startofevent']) return ""; // Only display on first day of multi-day events -// $recent_icon = e_PLUGIN."calendar_menu/images/recent_icon.png"; +// $recent_icon = e_PLUGIN_ABS."calendar_menu/images/recent_icon.png"; $recent_icon = EC_RECENT_ICON; if (file_exists($recent_icon)) { @@ -348,7 +348,7 @@ SC_BEGIN EC_EVENT_CAT_ICON global $thisevent; if ($thisevent['event_cat_icon'] && file_exists(e_PLUGIN."calendar_menu/images/".$thisevent['event_cat_icon'])) { - return " "; + return " "; } else { diff --git a/e107_plugins/calendar_menu/calendar_template.php b/e107_plugins/calendar_menu/calendar_template.php index eeb79c64f..6da4dc9d7 100644 --- a/e107_plugins/calendar_menu/calendar_template.php +++ b/e107_plugins/calendar_menu/calendar_template.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/calendar_template.php,v $ -| $Revision: 1.4 $ -| $Date: 2007-12-15 21:46:20 $ +| $Revision: 1.5 $ +| $Date: 2008-07-28 20:16:10 $ | $Author: e107steved $ | +----------------------------------------------------------------------------+ @@ -24,12 +24,22 @@ global $imode; if (varsettrue($imode)) { // Its 0.8 $ec_images_path = e_IMAGE.'packs/'.$imode.'/'; - if (!defined('EC_RECENT_ICON')) {define('EC_RECENT_ICON',$ec_images_path.'generic/new.png'); } // Filename of icon used to flag recent events + $ec_images_path_abs = e_IMAGE_ABS.'packs/'.$imode.'/'; + if (!defined('EC_RECENT_ICON')) + { + define('EC_RECENT_ICON',$ec_images_path.'generic/new.png'); + define('EC_RECENT_ICON_ABS',$ec_images_path_abs.'generic/new.png'); + } // Filename of icon used to flag recent events } else { $ec_images_path = e_IMAGE; - if (!defined('EC_RECENT_ICON')) {define('EC_RECENT_ICON',e_IMAGE.'generic/'.IMODE.'/new.png'); } // Filename of icon used to flag recent events + $ec_images_path_abs = e_IMAGE_ABS; + if (!defined('EC_RECENT_ICON')) + { + define('EC_RECENT_ICON',e_IMAGE.'generic/'.IMODE.'/new.png'); + define('EC_RECENT_ICON_ABS',e_IMAGE_ABS.'generic/'.IMODE.'/new.png'); + } // Filename of icon used to flag recent events } diff --git a/e107_plugins/links_page/e_latest.php b/e107_plugins/links_page/e_latest.php index 637effb3d..aec4fe111 100644 --- a/e107_plugins/links_page/e_latest.php +++ b/e107_plugins/links_page/e_latest.php @@ -2,5 +2,5 @@ if (!defined('e107_INIT')) { exit; } $submitted_links = $sql->db_Select("tmp", "*", "tmp_ip='submitted_link' "); -$text .= "
".($submitted_links ? " ".ADLAN_LAT_5.": $submitted_links" : " ".ADLAN_LAT_5.": ".$submitted_links)."
"; +$text .= "
".($submitted_links ? " ".ADLAN_LAT_5.": $submitted_links" : " ".ADLAN_LAT_5.": ".$submitted_links)."
"; ?> \ No newline at end of file diff --git a/e107_plugins/links_page/link_class.php b/e107_plugins/links_page/link_class.php index f450cb98e..413e42026 100644 --- a/e107_plugins/links_page/link_class.php +++ b/e107_plugins/links_page/link_class.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/links_page/link_class.php,v $ -| $Revision: 1.7 $ -| $Date: 2008-05-23 21:03:49 $ +| $Revision: 1.8 $ +| $Date: 2008-07-28 20:16:11 $ | $Author: e107steved $ +----------------------------------------------------------------------------+ */ @@ -646,6 +646,7 @@ class linkclass { $rejectlist = array('$.','$..','/','CVS','thumbs.db','Thumbs.db','*._$', 'index', 'null*', 'blank*'); $iconpath = e_PLUGIN."links_page/link_images/"; $iconlist = $fl->get_files($iconpath,"",$rejectlist); + $iconpath = e_PLUGIN_ABS."links_page/link_images/"; // Absolute paths now we've got the files $text .= " @@ -664,7 +665,7 @@ class linkclass { $img = $iconpath.$row['link_button']; }else{ $blank_display = 'display: none'; - $img = e_PLUGIN."links_page/images/blank.gif"; + $img = e_PLUGIN_ABS."links_page/images/blank.gif"; } $text .= "

"; $text .= " @@ -764,7 +765,7 @@ class linkclass { } else { - $img = "".$LINK_CAT_NAME.""; + $img = "".$LINK_CAT_NAME.""; } } } @@ -782,7 +783,7 @@ class linkclass { ".$img." - ".LINK_ICON_LINK." ".$row['link_name']." + ".LINK_ICON_LINK." ".$row['link_name']." ".LINK_ICON_EDIT." @@ -930,7 +931,7 @@ class linkclass { while ($row = $sql->db_Fetch()) { $linkcatid = $row['link_category_id']; if ($row['link_category_icon']) { - $img = (strstr($row['link_category_icon'], "/") ? "" : ""); + $img = (strstr($row['link_category_icon'], "/") ? "" : ""); } else { $img = " "; } @@ -938,7 +939,7 @@ class linkclass { ".$img." - ".LINK_ICON_LINK." + ".LINK_ICON_LINK." ".$row['link_category_name']."
".$row['link_category_description']." "; if($mode == "cat"){ diff --git a/e107_plugins/links_page/link_shortcodes.php b/e107_plugins/links_page/link_shortcodes.php index 148d14f28..7805b946e 100644 --- a/e107_plugins/links_page/link_shortcodes.php +++ b/e107_plugins/links_page/link_shortcodes.php @@ -4,30 +4,6 @@ include_once(e_HANDLER.'shortcode_handler.php'); $link_shortcodes = $tp -> e_sc -> parse_scbatch(__FILE__); /* -//SC_BEGIN LINK_NAVIGATOR -//global $LINK_NAVIGATOR, $linkspage_pref, $qs; -//$main = ""; -//if(isset($linkspage_pref['link_navigator_frontpage']) && $linkspage_pref['link_navigator_frontpage']){ -// $main .= "".LAN_LINKS_14." >>
"; -//} -//if(isset($linkspage_pref['link_navigator_submit']) && $linkspage_pref['link_navigator_submit'] && isset($linkspage_pref['link_submit']) && $linkspage_pref['link_submit'] && check_class($linkspage_pref['link_submit_class'])){ -// $main .= "".LAN_LINKS_27." >>
"; -//} -//if(isset($linkspage_pref['link_navigator_manager']) && $linkspage_pref['link_navigator_manager'] && isset($linkspage_pref['link_manager']) && $linkspage_pref['link_manager'] && check_class($linkspage_pref['link_manager_class'])){ -// $main .= "".LCLAN_ITEM_35." >>
"; -//} -//if(isset($linkspage_pref['link_navigator_refer']) && $linkspage_pref['link_navigator_refer']){ -// $main .= "".LAN_LINKS_12." >>
"; -//} -//if(isset($linkspage_pref['link_navigator_rated']) && $linkspage_pref['link_navigator_rated']){ -// $main .= "".LAN_LINKS_13." >>
"; -//} -//if(isset($linkspage_pref['link_navigator_category']) && $linkspage_pref['link_navigator_category']){ -// $main .= "".LAN_LINKS_43." >>
"; -//} -//return $main; -//SC_END - SC_BEGIN LINK_NAVIGATOR global $LINK_NAVIGATOR, $rs, $linkspage_pref, $qs; $mains = ""; @@ -191,7 +167,7 @@ if(isset($linkspage_pref['link_cat_icon']) && $linkspage_pref['link_cat_icon']){ } }else{ if(file_exists(e_PLUGIN."links_page/cat_images/".$rowl['link_category_icon'])){ - $LINK_MAIN_ICON = ""; + $LINK_MAIN_ICON = ""; } else { if(isset($linkspage_pref['link_cat_icon_empty']) && $linkspage_pref['link_cat_icon_empty']){ $LINK_MAIN_ICON = ""; @@ -222,7 +198,7 @@ SC_END SC_BEGIN LINK_MAIN_SHOWALL global $LINK_MAIN_SHOWALL, $linkspage_pref; -return (isset($linkspage_pref['link_cat_total']) && $linkspage_pref['link_cat_total'] ? "".LAN_LINKS_25."" : ""); +return (isset($linkspage_pref['link_cat_total']) && $linkspage_pref['link_cat_total'] ? "".LAN_LINKS_25."" : ""); SC_END @@ -246,27 +222,27 @@ if(isset($linkspage_pref['link_icon']) && $linkspage_pref['link_icon']){ $LINK_BUTTON = $LINK_APPEND."\n"; } else { if(isset($linkspage_pref['link_icon_empty']) && $linkspage_pref['link_icon_empty']){ - $LINK_BUTTON = $LINK_APPEND."\n"; + $LINK_BUTTON = $LINK_APPEND."\n"; } } }else{ if(file_exists(e_PLUGIN."links_page/link_images/".$rowl['link_button'])){ - $LINK_BUTTON = $LINK_APPEND."\n"; + $LINK_BUTTON = $LINK_APPEND."\n"; }else{ if(isset($linkspage_pref['link_icon_empty']) && $linkspage_pref['link_icon_empty']){ - $LINK_BUTTON = $LINK_APPEND."\n"; + $LINK_BUTTON = $LINK_APPEND."\n"; } } } } } else { if(isset($linkspage_pref['link_icon_empty']) && $linkspage_pref['link_icon_empty']){ - $LINK_BUTTON = $LINK_APPEND."\n"; + $LINK_BUTTON = $LINK_APPEND."\n"; } } }else{ if(isset($linkspage_pref['link_icon_empty']) && $linkspage_pref['link_icon_empty']){ - $LINK_BUTTON = $LINK_APPEND."\n"; + $LINK_BUTTON = $LINK_APPEND."\n"; } } return $LINK_BUTTON; @@ -379,14 +355,14 @@ $one = $tmp[0]; $two = round($tmp[1],1); $rating = $one.".".$two." "; for($c=1; $c<= $one; $c++){ - $rating .= ""; + $rating .= ""; } if($one < 10){ for($c=9; $c>=$one; $c--){ - $rating .= ""; + $rating .= ""; } } -$rating .= ""; +$rating .= ""; return $rating; SC_END @@ -400,19 +376,19 @@ if(isset($linkspage_pref['link_icon']) && $linkspage_pref['link_icon']){ if(strstr($rowl['link_button'], "/")){ $LINK_RATED_BUTTON = $LINK_RATED_APPEND."\n".$LINK_RATED_NAME.""; }else{ - $LINK_RATED_BUTTON = $LINK_RATED_APPEND."\n".$LINK_RATED_NAME.""; + $LINK_RATED_BUTTON = $LINK_RATED_APPEND."\n".$LINK_RATED_NAME.""; } } } else { if(isset($linkspage_pref['link_icon_empty']) && $linkspage_pref['link_icon_empty']){ - $LINK_RATED_BUTTON = $LINK_RATED_APPEND."\n".$LINK_RATED_NAME.""; + $LINK_RATED_BUTTON = $LINK_RATED_APPEND."\n".$LINK_RATED_NAME.""; }else{ $LINK_RATED_BUTTON = ""; } } }else{ if(isset($linkspage_pref['link_icon_empty']) && $linkspage_pref['link_icon_empty']){ - $LINK_RATED_BUTTON = $LINK_RATED_APPEND."\n".$LINK_RATED_NAME.""; + $LINK_RATED_BUTTON = $LINK_RATED_APPEND."\n".$LINK_RATED_NAME.""; }else{ $LINK_RATED_BUTTON = ""; } diff --git a/e107_plugins/newforumposts_main/newforumposts_main.php b/e107_plugins/newforumposts_main/newforumposts_main.php index 010a3a89a..9870bf5ab 100644 --- a/e107_plugins/newforumposts_main/newforumposts_main.php +++ b/e107_plugins/newforumposts_main/newforumposts_main.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/newforumposts_main/newforumposts_main.php,v $ -| $Revision: 1.2 $ -| $Date: 2007-12-22 19:18:39 $ +| $Revision: 1.3 $ +| $Date: 2008-07-28 20:16:13 $ | $Author: e107steved $ +----------------------------------------------------------------------------+ */ @@ -81,7 +81,7 @@ if (file_exists(THEME."forum/new_small.png")) } else { - $ICON = ""; + $ICON = ""; } $TOTAL_TOPICS = $sql->db_Count("forum_t", "(*)", " WHERE thread_parent='0' "); $TOTAL_REPLIES = $sql->db_Count("forum_t", "(*)", " WHERE thread_parent!='0' "); diff --git a/e107_plugins/pm/pm_template.php b/e107_plugins/pm/pm_template.php index 8c86f0f85..4d4bc0e4f 100755 --- a/e107_plugins/pm/pm_template.php +++ b/e107_plugins/pm/pm_template.php @@ -11,17 +11,17 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm_template.php,v $ -| $Revision: 1.1.1.1 $ -| $Date: 2006-12-02 04:35:39 $ -| $Author: mcfly_e107 $ +| $Revision: 1.2 $ +| $Date: 2008-07-28 20:16:14 $ +| $Author: e107steved $ +----------------------------------------------------------------------------+ */ if (!defined('e107_INIT')) { exit; } global $sc_style; -define("PM_READ_ICON", "".LAN_PM_111.""); -define("PM_UNREAD_ICON", "".LAN_PM_27.""); +define("PM_READ_ICON", "".LAN_PM_111.""); +define("PM_UNREAD_ICON", "".LAN_PM_27.""); $sc_style['PM_ATTACHMENT_ICON']['pre'] = " "; diff --git a/e107_plugins/pm/private_msg_menu.php b/e107_plugins/pm/private_msg_menu.php index 077cd23fc..8d8ec9d53 100755 --- a/e107_plugins/pm/private_msg_menu.php +++ b/e107_plugins/pm/private_msg_menu.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/pm/private_msg_menu.php,v $ -| $Revision: 1.2 $ -| $Date: 2007-05-28 11:18:19 $ +| $Revision: 1.3 $ +| $Date: 2008-07-28 20:16:14 $ | $Author: e107steved $ +----------------------------------------------------------------------------+ */ @@ -26,10 +26,10 @@ if(!isset($pm_prefs['perpage'])) require_once(e_PLUGIN."pm/pm_func.php"); pm_getInfo('clear'); -define("PM_INBOX_ICON", "".LAN_PM_25.""); -define("PM_OUTBOX_ICON", "".LAN_PM_26.""); +define("PM_INBOX_ICON", "".LAN_PM_25.""); +define("PM_OUTBOX_ICON", "".LAN_PM_26.""); define("PM_SEND_LINK", LAN_PM_35); -define("NEWPM_ANIMATION", ""); +define("NEWPM_ANIMATION", ""); $sc_style['SEND_PM_LINK']['pre'] = "

[ "; $sc_style['SEND_PM_LINK']['post'] = " ]"; diff --git a/e107_plugins/poll/poll_class.php b/e107_plugins/poll/poll_class.php index ed2b28cef..a6a33a3e2 100644 --- a/e107_plugins/poll/poll_class.php +++ b/e107_plugins/poll/poll_class.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/poll/poll_class.php,v $ -| $Revision: 1.8 $ -| $Date: 2008-06-03 21:31:31 $ +| $Revision: 1.9 $ +| $Date: 2008-07-28 20:16:14 $ | $Author: e107steved $ +----------------------------------------------------------------------------+ */ @@ -248,9 +248,9 @@ class poll break; } - $barl = (file_exists(THEME."images/barl.png") ? THEME_ABS."images/barl.png" : e_PLUGIN."poll/images/barl.png"); - $barr = (file_exists(THEME."images/barr.png") ? THEME_ABS."images/barr.png" : e_PLUGIN."poll/images/barr.png"); - $bar = (file_exists(THEME."images/bar.png") ? THEME_ABS."images/bar.png" : e_PLUGIN."poll/images/bar.png"); + $barl = (file_exists(THEME."images/barl.png") ? THEME_ABS."images/barl.png" : e_PLUGIN_ABS."poll/images/barl.png"); + $barr = (file_exists(THEME."images/barr.png") ? THEME_ABS."images/barr.png" : e_PLUGIN_ABS."poll/images/barr.png"); + $bar = (file_exists(THEME."images/bar.png") ? THEME_ABS."images/bar.png" : e_PLUGIN_ABS."poll/images/bar.png"); if($type == "preview") { diff --git a/e107_plugins/siteinfo_menu/compliance_menu.php b/e107_plugins/siteinfo_menu/compliance_menu.php index 2704959ef..1c9fce6a2 100644 --- a/e107_plugins/siteinfo_menu/compliance_menu.php +++ b/e107_plugins/siteinfo_menu/compliance_menu.php @@ -3,8 +3,8 @@ if (!defined('e107_INIT')) { exit; } $text = "
- Valid XHTML 1.1!
- Valid CSS! + Valid XHTML 1.1!
+ Valid CSS!
"; $caption = (file_exists(THEME."images/compliance_menu.png") ? " ".COMPLIANCE_L1 : COMPLIANCE_L1); $ns->tablerender($caption, $text, 'compliance');