a bit of legacy BULLET code review

2025-08-12 09:34:54 +02:00 · 2009-08-23 10:57:51 +00:00
parent 6eafcda674
commit 9863e49cdb
19 changed files with 277 additions and 128 deletions
--- a/e107_plugins/alt_news/alt_news.php
+++ b/e107_plugins/alt_news/alt_news.php
@@ -9,8 +9,8 @@
 * Alternate News
 *
 * $Source: /cvs_backup/e107_0.8/e107_plugins/alt_news/alt_news.php,v $
- * $Revision: 1.4 $
- * $Date: 2009-07-06 07:14:47 $
+ * $Revision: 1.5 $
+ * $Date: 2009-08-23 10:57:50 $
 * $Author: marj_nl_fr $
 */

@@ -44,9 +44,19 @@ function alt_news($news_category) {
 					$datestamp = $gen->convert_date($news_datestamp, "short");
 					$news_body = strip_tags(substr($news_body, 0, 100))." ...";
 					$comment_total = $sql2->db_Count("comments", "(*)", "WHERE comment_item_id='".intval($news_id)."' AND comment_type='0' ");
-					$text .= "<div class='mediumtext'>
-						<img src='".THEME."images/".(defined("BULLET") ? BULLET : "bullet2.gif")."' alt='bullet' /> ";
-
+					$bullet = '';
+					if(defined('BULLET'))
+					{
+						$bullet = '<img src="'.THEME.'images/'.BULLET.'" alt="" class="icon" />';
+					}
+					elseif(file_exists(THEME.'images/bullet2.gif'))
+					{
+						$bullet = '<img src="'.THEME.'images/bullet2.gif" alt="" class="icon" />';
+					}
+					$text .= "
+						<div class='mediumtext'>
+						".$bullet;
+						
 					if ($news_allow_comments) {
 						$text .= "<a href='news.php?extend.".$news_id."'>".$news_title."</a>";
 					} else {
--- 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.10 $
-|     $Date: 2009-07-25 07:54:34 $
+|     $Revision: 1.11 $
+|     $Date: 2009-08-23 10:57:51 $
 |     $Author: marj_nl_fr $
 |
 +----------------------------------------------------------------------------+
@@ -140,15 +140,21 @@ SC_END

 // CALENDAR SHOWEVENT ------------------------------------------------------------
 SC_BEGIN EC_SHOWEVENT_IMAGE
+	//TODO review bullet
 	global $ev;
+
+	$img = '';
 	if($ev['event_cat_icon'] && file_exists(e_PLUGIN."calendar_menu/images/".$ev['event_cat_icon']))
 	{
 	  $img = "<img style='border:0' src='".e_PLUGIN_ABS."calendar_menu/images/".$ev['event_cat_icon']."' alt='' height='".$ev['imagesize']."' width='".$ev['imagesize']."' />";
 	}
-	else
+	elseif(defined('BULLET'))
 	{
-		//TODO review bullet
-		$img = "<img src='".THEME."images/".(defined("BULLET") ? BULLET : "bullet2.gif")."' alt='' style='border:0; vertical-align:middle;' />";
+		$img = '<img src="'.THEME.'images/'.BULLET.'" alt="" class="icon" />';
+	}
+	elseif(file_exists(THEME.'images/bullet2.gif'))
+	{
+		$img = '<img src="'.THEME.'images/bullet2.gif" alt="" class="icon" />';
 	}
 	return $img;
 SC_END
@@ -547,14 +553,18 @@ SC_BEGIN EC_NEXT_EVENT_ICON
  $fe_icon_file = "";
  if ($pref['eventpost_showcaticon'] == 1)
  {
-	if($cal_row['event_cat_icon'] && file_exists(e_PLUGIN."calendar_menu/images/".$cal_row['event_cat_icon']))
-	{
-	  $fe_icon_file = e_PLUGIN_ABS."calendar_menu/images/".$cal_row['event_cat_icon'];
-	}
-	else
-	{
-	  $fe_icon_file = THEME_ABS."images/".(defined("BULLET") ? BULLET : "bullet2.gif");
-	}
+		if($cal_row['event_cat_icon'] && file_exists($ecal_dir."images/".$cal_row['event_cat_icon']))
+		{
+		  $fe_icon_file = $ecal_dir."images/".$cal_row['event_cat_icon'];
+		}
+		elseif(defined('BULLET'))
+		{
+			$img = HEME.'images/'.BULLET;
+		}
+		elseif(file_exists(THEME.'images/bullet2.gif'))
+		{
+			$img = THEME.'images/bullet2.gif';
+		}
  }
  return $fe_icon_file;
 SC_END
--- a/e107_plugins/chatbox_menu/chat_template.php
+++ b/e107_plugins/chatbox_menu/chat_template.php
@@ -7,14 +7,18 @@ if(!$CHAT_TABLE_START){
 		$CHAT_TABLE_START = "
 		<br /><table style='width:100%'><tr><td>";
 }
-if(!$CHAT_TABLE){
-		$CHAT_TABLE = "\n
+if(!$CHAT_TABLE)
+{
+//TODO review bullet
+		$CHAT_TABLE = "
 		<div class='spacer'>
 			<div class='{CHAT_TABLE_FLAG}'>
-				<img src='".THEME."images/bullet2.gif' alt='bullet' /> \n<b>{CHAT_TABLE_NICK}</b> ".CHATBOX_L22." {CHAT_TABLE_DATESTAMP}<br />
-				<div class='defaulttext'><i>{CHAT_TABLE_MESSAGE}</i></div>\n
+				<img src='".THEME."images/bullet2.gif' alt='bullet' />
+				<b>{CHAT_TABLE_NICK}</b> ".CHATBOX_L22." {CHAT_TABLE_DATESTAMP}
+				<br />
+				<div class='defaulttext'><i>{CHAT_TABLE_MESSAGE}</i></div>
 			</div>
-		</div>\n";
+		</div>";

 }
 if(!$CHAT_TABLE_END){
--- a/e107_plugins/chatbox_menu/chatbox_menu.php
+++ b/e107_plugins/chatbox_menu/chatbox_menu.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/chatbox_menu/chatbox_menu.php,v $
-|     $Revision: 1.14 $
-|     $Date: 2009-08-15 11:55:30 $
+|     $Revision: 1.15 $
+|     $Date: 2009-08-23 10:57:50 $
 |     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
@@ -209,9 +209,17 @@ if(!$text = $e107cache->retrieve("nq_chatbox"))
 			$cb_message = str_replace($search, $replace, $cb_message);

 			global $CHATBOXSTYLE;
-			if(!$CHATBOXSTYLE)
+			if( ! $CHATBOXSTYLE)
 			{
-				$bullet = (defined("BULLET") ? "<img src='".THEME_ABS."images/".BULLET."' alt='' style='vertical-align: middle;' />" : "<img src='".THEME_ABS."images/".(defined("BULLET") ? BULLET : "bullet2.gif")."' alt='' style='vertical-align: middle;' />");
+				$bullet = '';
+				if(defined('BULLET'))
+				{
+					$bullet = '<img src="'.THEME.'images/'.BULLET.'" alt="" class="icon" />';
+				}
+				elseif(file_exists(THEME.'images/bullet2.gif'))
+				{
+					$bullet = '<img src="'.THEME.'images/bullet2.gif" alt="" class="icon" />';
+				}
 				// default chatbox style
 				$CHATBOXSTYLE = "<!-- chatbox -->\n<div class='spacer'>
 				$bullet <b>{USERNAME}</b><br /><span class='smalltext'>{TIMEDATE}</span><br /><div class='smallblacktext'>{MESSAGE}</div></div><br />\n";
--- a/e107_plugins/comment_menu/comment_menu_shortcodes.php
+++ b/e107_plugins/comment_menu/comment_menu_shortcodes.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/comment_menu/comment_menu_shortcodes.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2009-07-25 07:54:35 $
+|     $Revision: 1.4 $
+|     $Date: 2009-08-23 10:57:51 $
 |     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
@@ -23,7 +23,16 @@ $comment_menu_shortcodes = $tp -> e_sc -> parse_scbatch(__FILE__);
 /*
 SC_BEGIN CM_ICON
 //TODO review bullet
-return (defined("BULLET") ? "<img src='".THEME_ABS."images/".BULLET."' alt='' style='border:0; vertical-align: middle;' />" : "<img src='".THEME_ABS."images/bullet2.gif' alt='bullet' style='border:0; vertical-align: middle;' />");
+$bullet = '';
+if(defined('BULLET'))
+{
+	$bullet = '<img src="'.THEME.'images/'.BULLET.'" alt="" class="icon" />';
+}
+elseif(file_exists(THEME.'images/bullet2.gif'))
+{
+	$bullet = '<img src="'.THEME.'images/bullet2.gif" alt="" class="icon" />';
+}
+return $bullet;
 SC_END

 SC_BEGIN CM_DATESTAMP
--- a/e107_plugins/content/content_shortcodes.php
+++ b/e107_plugins/content/content_shortcodes.php
@@ -880,12 +880,27 @@ SC_END

 SC_BEGIN CM_MENU_LINKS_ICON
 global $content_pref, $bullet;
+//TODO review bullet + use switch
 	//define icon
-	if($content_pref["content_menu_links_icon"] == "0"){ $ret = "";
-	}elseif($content_pref["content_menu_links_icon"] == "1"){ $ret = $bullet;
-	}elseif($content_pref["content_menu_links_icon"] == "2"){ $ret = "&middot";
-	}elseif($content_pref["content_menu_links_icon"] == "3"){ $ret = "&ordm;";
-	}elseif($content_pref["content_menu_links_icon"] == "4"){ $ret = "&raquo;";
+	if($content_pref["content_menu_links_icon"] == "0")
+	{
+		$ret = "";
+	}
+	elseif($content_pref["content_menu_links_icon"] == "1")
+	{
+		$ret = $bullet;
+	}
+	elseif($content_pref["content_menu_links_icon"] == "2")
+	{
+		$ret = "&middot";
+	}
+	elseif($content_pref["content_menu_links_icon"] == "3")
+	{
+		$ret = "&ordm;";
+	}
+	elseif($content_pref["content_menu_links_icon"] == "4")
+	{
+		$ret = "&raquo;";
 	}
 	return $ret;
 SC_END
@@ -961,6 +976,7 @@ return ($content_pref["content_menu_cat_caption"] != "" ? $content_pref["content
 SC_END

 SC_BEGIN CM_MENU_CATEGORY_ICON
+//TODO legacy bullet + use switch
 global $content_pref, $row, $bullet;
 	$ret = "";
 	if($content_pref["content_menu_cat_icon"] == "0"){ $ret = "";
--- a/e107_plugins/content/handlers/content_class.php
+++ b/e107_plugins/content/handlers/content_class.php
@@ -12,9 +12,9 @@
 |        GNU General Public License (http://gnu.org).
 |
 |		$Source: /cvs_backup/e107_0.8/e107_plugins/content/handlers/content_class.php,v $
-|		$Revision: 1.22 $
-|		$Date: 2007-04-18 21:41:58 $
-|		$Author: lisa_ $
+|		$Revision: 1.23 $
+|		$Date: 2009-08-23 10:57:51 $
+|		$Author: marj_nl_fr $
 +---------------------------------------------------------------+
 */

@@ -1413,9 +1413,18 @@ class content{
 		$data .= "global \$tp;\n";
 		$data .= "\n";
 		$data .= "include_lan(e_PLUGIN.'content/languages/'.e_LANGUAGE.'/lan_content.php');\n";
-		$data .= "\n";
-		$data .= "\$bullet = (defined('BULLET') ? \"<img src='\".THEME_ABS.\"images/\".BULLET.\"' alt='' style='border:0;vertical-align: middle;' />\" : \"<img src='\".THEME_ABS.\"images/bullet2.gif' alt='bullet' style='border:0;vertical-align: middle;' />\");\n";
-		$data .= "\n";
+			$data .= '
+					$bullet = \'\';
+					if(defined(\'BULLET\'))
+					{
+						$bullet = \'<img src="\'.THEME.\'images/\'.BULLET.\'" alt="" class="icon" />\';
+					}
+					elseif(file_exists(THEME.\'images/bullet2.gif\'))
+					{
+						$bullet = \'<img src="\'.THEME.\'images/bullet2.gif" alt="" class="icon" />\';
+					}
+			';
+
 		$data .= "\$content_pref = \$aa -> getContentPref(\$menutypeid, true);\n";
 		$data .= "\n";
 		$data .= "// load the template --------------------------------------------------\n";
--- a/e107_plugins/forum/newforumposts_menu.php
+++ b/e107_plugins/forum/newforumposts_menu.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/forum/newforumposts_menu.php,v $
-|     $Revision: 1.7 $
-|     $Date: 2008-12-07 00:21:21 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.8 $
+|     $Date: 2009-08-23 10:57:51 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
@@ -68,7 +68,8 @@ if($results = $e107->sql->db_Select_gen($qry))
 		$post = $e107->tp->text_truncate($post, $menu_pref['newforumposts_characters'], $menu_pref['newforumposts_postfix']);

 		$url = $e107->url->getUrl('forum', 'thread', array('func' => 'last', 'id' => $id));
-		$bullet = "<img src='".THEME_ABS.'images/'.(defined('BULLET') ? BULLET : 'bullet2.gif')."' alt='' />";
+		//TODO legacy bullet is not use here anymore
+		//$bullet = "<img src='".THEME_ABS.'images/'.(defined('BULLET') ? BULLET : 'bullet2.gif')."' alt='' />";
 		
 		
 		if ($menu_pref['newforumposts_title'])
--- a/e107_plugins/links_page/link_menu.php
+++ b/e107_plugins/links_page/link_menu.php
@@ -16,7 +16,16 @@ global $tp;
 include_lan(e_PLUGIN."links_page/languages/".e_LANGUAGE.".php");

 //TODO review bullet
-$bullet = "<img src='".THEME_ABS."images/bullet2.gif' alt='' />";
+$bullet = '';
+if(defined('BULLET'))
+{
+	$bullet = '<img src="'.THEME.'images/'.BULLET.'" alt="" class="icon" />';
+}
+elseif(file_exists(THEME.'images/bullet2.gif'))
+{
+	$bullet = '<img src="'.THEME.'images/bullet2.gif" alt="" class="icon" />';
+}
+
 global $linkspage_pref;
 $linkspage_pref = $lc -> getLinksPagePref();

--- a/e107_plugins/links_page/link_shortcodes.php
+++ b/e107_plugins/links_page/link_shortcodes.php
@@ -155,35 +155,59 @@ SC_END
 SC_BEGIN LINK_MAIN_ICON
 global $LINK_MAIN_ICON, $rowl, $linkspage_pref;
 $LINK_MAIN_ICON = "";
-if(isset($linkspage_pref['link_cat_icon']) && $linkspage_pref['link_cat_icon']){
-	if (isset($rowl['link_category_icon']) && $rowl['link_category_icon']) {
-		if(strstr($rowl['link_category_icon'], "/")){
-			if(file_exists(e_BASE.$rowl['link_category_icon'])){
-			$LINK_MAIN_ICON = "<img src='".e_BASE.$rowl['link_category_icon']."' alt='' style='border:0; vertical-align:middle' />";
-			} else {
-				if(isset($linkspage_pref['link_cat_icon_empty']) && $linkspage_pref['link_cat_icon_empty']){
-				//TODO review bullet
-				$LINK_MAIN_ICON = "<img src='".THEME_ABS."images/".(defined("BULLET") ? BULLET : "bullet2.gif")."' alt='' style='border:0; vertical-align:middle;' />";
-				}
+$bullet = '';
+if(defined('BULLET'))
+{
+	$bullet = '<img src="'.THEME.'images/'.BULLET.'" alt="" class="icon" />';
+}
+elseif(file_exists(THEME.'images/bullet2.gif'))
+{
+	$bullet = '<img src="'.THEME.'images/bullet2.gif" alt="" class="icon" />';
+}
+
+if(isset($linkspage_pref['link_cat_icon']) && $linkspage_pref['link_cat_icon'])
+{
+	if (isset($rowl['link_category_icon']) && $rowl['link_category_icon'])
+	{
+		if(strstr($rowl['link_category_icon'], "/"))
+		{
+			if(file_exists(e_BASE.$rowl['link_category_icon']))
+			{
+				$LINK_MAIN_ICON = "<img src='".e_BASE.$rowl['link_category_icon']."' alt='' style='border:0; vertical-align:middle' />";
 			}
-		}else{
-			if(file_exists(e_PLUGIN."links_page/cat_images/".$rowl['link_category_icon'])){
-			$LINK_MAIN_ICON = "<img src='".e_PLUGIN_ABS."links_page/cat_images/".$rowl['link_category_icon']."' alt='' style='vertical-align:middle' />";
-			} else {
-				if(isset($linkspage_pref['link_cat_icon_empty']) && $linkspage_pref['link_cat_icon_empty']){
-				//TODO review bullet
-				$LINK_MAIN_ICON = "<img src='".THEME_ABS."images/".(defined("BULLET") ? BULLET : "bullet2.gif")."' alt='' style='vertical-align:middle;' />";
+			else
+			{
+				if(isset($linkspage_pref['link_cat_icon_empty']) && $linkspage_pref['link_cat_icon_empty'])
+				{
+					$LINK_MAIN_ICON = $bullet;
 				}
 			}
 		}
-	} else {
-		if(isset($linkspage_pref['link_cat_icon_empty']) && $linkspage_pref['link_cat_icon_empty']){
-		//TODO review bullet
-		$LINK_MAIN_ICON = "<img src='".THEME_ABS."images/".(defined("BULLET") ? BULLET : "bullet2.gif")."' alt='' style='vertical-align:middle;' />";
+		else
+		{
+			if(file_exists(e_PLUGIN."links_page/cat_images/".$rowl['link_category_icon']))
+			{
+			$LINK_MAIN_ICON = "<img src='".e_PLUGIN_ABS."links_page/cat_images/".$rowl['link_category_icon']."' alt='' style='border:0; vertical-align:middle' />";
+			}
+			else
+			{
+				if(isset($linkspage_pref['link_cat_icon_empty']) && $linkspage_pref['link_cat_icon_empty'])
+				{
+					$LINK_MAIN_ICON = $bullet;
+				}
+			}
 		}
 	}
-	if($rowl['total_links'] && $LINK_MAIN_ICON){
-	$LINK_MAIN_ICON = "<a href='links.php?cat.".$rowl['link_category_id']."'>".$LINK_MAIN_ICON."</a>";
+	else
+	{
+		if(isset($linkspage_pref['link_cat_icon_empty']) && $linkspage_pref['link_cat_icon_empty'])
+		{
+			$LINK_MAIN_ICON = $bullet;
+		}
+	}
+	if($rowl['total_links'] && $LINK_MAIN_ICON)
+	{
+		$LINK_MAIN_ICON = "<a href='links.php?cat.".$rowl['link_category_id']."'>".$LINK_MAIN_ICON."</a>";
 	}
 }
 return $LINK_MAIN_ICON;
--- a/e107_plugins/list_new/list_class.php
+++ b/e107_plugins/list_new/list_class.php
@@ -9,8 +9,8 @@
 * List Class
 *
 * $Source: /cvs_backup/e107_0.8/e107_plugins/list_new/list_class.php,v $
- * $Revision: 1.10 $
- * $Date: 2009-08-15 11:55:30 $
+ * $Revision: 1.11 $
+ * $Date: 2009-08-23 10:57:51 $
 * $Author: marj_nl_fr $
 *
 */
@@ -609,9 +609,13 @@ class listclass

 		if($this->list_pref[$this->mode."_icon_default"])
 		{
-			if(is_readable(THEME."images/bullet2.gif"))
+			if(defined('BULLET'))
 			{
-				$default_bullet = "<img src='".THEME_ABS."images/bullet2.gif' alt='' />";
+				$default_bullet = '<img src="'.THEME.'images/'.BULLET.'" alt="" class="icon" />';
+			}
+			elseif(file_exists(THEME.'images/bullet2.gif'))
+			{
+				$default_bullet = '<img src="'.THEME.'images/bullet2.gif" alt="" class="icon" />';
 			}
 		}

--- a/e107_plugins/login_menu/login_menu.php
+++ b/e107_plugins/login_menu/login_menu.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/login_menu/login_menu.php,v $
-|     $Revision: 1.10 $
-|     $Date: 2008-06-13 20:20:22 $
-|     $Author: e107steved $
+|     $Revision: 1.11 $
+|     $Date: 2009-08-23 10:57:51 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */

@@ -34,12 +34,12 @@ $ip = $e107->getip();
 //Bullet
 	if(defined("BULLET"))
 	{
-   		$bullet = "<img src='".THEME_ABS."images/".BULLET."' alt='' style='vertical-align: middle;' />";
+   		$bullet = "<img src='".THEME_ABS."images/".BULLET."' alt='' class='icon' />";
   		$bullet_src = THEME_ABS."images/".BULLET;
 	}
 	elseif(file_exists(THEME."images/bullet2.gif"))
 	{
-		$bullet = "<img src='".THEME_ABS."images/bullet2.gif' alt='bullet' style='vertical-align: middle;' />";
+		$bullet = "<img src='".THEME_ABS."images/bullet2.gif' alt='bullet' class='icon' />";
 		$bullet_src = THEME_ABS."images/bullet2.gif";
 	}
 	else
--- a/e107_plugins/login_menu/login_menu_shortcodes.php
+++ b/e107_plugins/login_menu/login_menu_shortcodes.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/login_menu/login_menu_shortcodes.php,v $
-|     $Revision: 1.7 $
-|     $Date: 2009-03-06 20:09:08 $
-|     $Author: e107coders $
+|     $Revision: 1.8 $
+|     $Date: 2009-08-23 10:57:51 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
@@ -139,8 +139,9 @@ return '';
 SC_END

 SC_BEGIN LM_ADMINLINK_BULLET
-$data = getcachedvars('login_menu_data'); 
-if(ADMIN==TRUE){
+if(ADMIN)
+{
+	$data = getcachedvars('login_menu_data');
 	return $parm == 'src' ? $data['link_bullet_src'] : $data['link_bullet'];
 }
 return '';