diff --git a/e107_admin/filemanager.php b/e107_admin/filemanager.php index 49c63d3ea..1d17b3313 100644 --- a/e107_admin/filemanager.php +++ b/e107_admin/filemanager.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_admin/filemanager.php,v $ -| $Revision: 1.8 $ -| $Date: 2009-07-07 06:50:55 $ -| $Author: e107coders $ +| $Revision: 1.9 $ +| $Date: 2009-07-25 07:52:16 $ +| $Author: marj_nl_fr $ +----------------------------------------------------------------------------+ */ require_once("../class2.php"); @@ -302,7 +302,7 @@ while ($dirs[$c]) { upload - ".$dirs[$c]." ".FMLAN_31." + ".$dirs[$c]." ".FMLAN_31." ".$dirs[$c]."
".$frm->file('file_userfile[]', array('id'=>false, 'size'=>'20')).$frm->admin_button('upload', FMLAN_22, '', '', array('id'=>false))."
diff --git a/e107_admin/includes/categories.php b/e107_admin/includes/categories.php index 6d06b1baf..bf16ce3a7 100644 --- a/e107_admin/includes/categories.php +++ b/e107_admin/includes/categories.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_admin/includes/categories.php,v $ -| $Revision: 1.5 $ -| $Date: 2008-12-30 15:56:12 $ -| $Author: secretr $ +| $Revision: 1.6 $ +| $Date: 2009-07-25 07:52:16 $ +| $Author: marj_nl_fr $ +----------------------------------------------------------------------------+ */ @@ -86,7 +86,7 @@ foreach ($admin_cat['id'] as $cat_key => $cat_id) if ($eplug_conffile) { $eplug_name = $tp->toHTML($eplug_name,FALSE,"defs, emotes_off"); - $plugin_icon = $eplug_icon_small ? "".$eplug_caption."" : E_16_PLUGIN; + $plugin_icon = $eplug_icon_small ? "".$eplug_caption."" : E_16_PLUGIN; $plugin_array[ucfirst($eplug_name)] = array('link' => e_PLUGIN.$plugin_path."/".$eplug_conffile, 'title' => $eplug_name, 'caption' => $eplug_caption, 'perms' => "P".$plugin_id, 'icon' => $plugin_icon); if ($plugin_array[0]) { diff --git a/e107_admin/mailout.php b/e107_admin/mailout.php index b75f31164..2aa44565d 100644 --- a/e107_admin/mailout.php +++ b/e107_admin/mailout.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_admin/mailout.php,v $ -| $Revision: 1.15 $ -| $Date: 2009-07-15 09:37:59 $ -| $Author: e107coders $ +| $Revision: 1.16 $ +| $Date: 2009-07-25 07:52:16 $ +| $Author: marj_nl_fr $ | | Work in progress - supplementary mailer plugin | @@ -769,13 +769,13 @@ function showMailouts($sub_par,$mail_id) ".$row['pending']."
"; - $text .= "".LAN_MAILOUT_109.""; + $text .= "".LAN_MAILOUT_109.""; if ($row['pending']) { - $text .= "".LAN_MAILOUT_86.""; + $text .= "".LAN_MAILOUT_86.""; } $text .= " - ".LAN_DELETE." + ".LAN_DELETE."
@@ -820,7 +820,7 @@ function showMailouts($sub_par,$mail_id) ".$row['pending']."
- toJS(LAN_CONFIRMDEL." [".$row['gen_datestamp']."]")."') \">".LAN_DELETE." + toJS(LAN_CONFIRMDEL." [".$row['gen_datestamp']."]")."') \">".LAN_DELETE."
\n @@ -1251,11 +1251,11 @@ function showList($type='massmail') ".$datestamp."
"; - $text .= "".LAN_EDIT.""; + $text .= "".LAN_EDIT.""; // // toJS(LAN_CONFIRMDEL." [".$row2['gen_ip']."]")."') \" src='".$images_path."delete_16.png' alt='".LAN_DELETE."' title='".LAN_DELETE."' style='border:0px' /> $text .= " - toJS(LAN_CONFIRMDEL." [".$row2['gen_ip']."]")."') \">".LAN_DELETE." + toJS(LAN_CONFIRMDEL." [".$row2['gen_ip']."]")."') \">".LAN_DELETE."
diff --git a/e107_admin/modcomment.php b/e107_admin/modcomment.php index 506704fca..2fdfb4e71 100644 --- a/e107_admin/modcomment.php +++ b/e107_admin/modcomment.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_admin/modcomment.php,v $ -| $Revision: 1.7 $ -| $Date: 2009-05-08 21:50:19 $ -| $Author: e107steved $ +| $Revision: 1.8 $ +| $Date: 2009-07-25 07:52:16 $ +| $Author: marj_nl_fr $ +----------------------------------------------------------------------------+ */ require_once("../class2.php"); @@ -139,7 +139,7 @@ else ".$comment_nick."
".$comment_str." ".$row['comment_comment']." - ".LAN_EDIT."" + ".LAN_EDIT."" ." ".($row['comment_blocked'] ? " ".MDCLAN_5."" : " ".MDCLAN_6."") ."  ".LAN_DELETE." diff --git a/e107_files/shortcode/batch/comment_shortcodes.php b/e107_files/shortcode/batch/comment_shortcodes.php index e66c5573c..b3edcd2aa 100644 --- a/e107_files/shortcode/batch/comment_shortcodes.php +++ b/e107_files/shortcode/batch/comment_shortcodes.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/comment_shortcodes.php,v $ -| $Revision: 1.8 $ -| $Date: 2009-07-07 07:25:27 $ -| $Author: e107coders $ +| $Revision: 1.9 $ +| $Date: 2009-07-25 07:54:34 $ +| $Author: marj_nl_fr $ +----------------------------------------------------------------------------+ */ if (!defined('e107_INIT')) { exit; } @@ -106,12 +106,12 @@ if ($pref['allowCommentEdit'] && USER && $comrow['user_id'] == USERID && $comrow { if (!strstr(e_QUERY, ".")) { - return "".COMLAN_318.""; + return "".COMLAN_318.""; } else { // return "".COMLAN_318.""; - return "".COMLAN_318.""; + return "".COMLAN_318.""; } } else diff --git a/e107_files/shortcode/batch/news_archives.php b/e107_files/shortcode/batch/news_archives.php index d81b7f6ef..a436e492e 100644 --- a/e107_files/shortcode/batch/news_archives.php +++ b/e107_files/shortcode/batch/news_archives.php @@ -19,7 +19,8 @@ $news_archive_shortcodes = $tp -> e_sc -> parse_scbatch(__FILE__); /* SC_BEGIN ARCHIVE_BULLET global $news2; -return ""; +//TODO review bullt +return ""; SC_END SC_BEGIN ARCHIVE_LINK diff --git a/e107_files/shortcode/batch/news_shortcodes.php b/e107_files/shortcode/batch/news_shortcodes.php index c91f26ed4..9f8641293 100644 --- a/e107_files/shortcode/batch/news_shortcodes.php +++ b/e107_files/shortcode/batch/news_shortcodes.php @@ -1,7 +1,7 @@ news_item['news_id']."'>\n"; + return " \n"; } else { @@ -310,6 +310,7 @@ class news_shortcodes } if($this->param['caticon'] == ''){$this->param['caticon'] = 'border:0px';} + //TODO use CSS class return "news_item['news_category']}")."'>"; } diff --git a/e107_files/shortcode/batch/signup_shortcodes.php b/e107_files/shortcode/batch/signup_shortcodes.php index b5cc9cd34..5fd1c533b 100755 --- a/e107_files/shortcode/batch/signup_shortcodes.php +++ b/e107_files/shortcode/batch/signup_shortcodes.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/signup_shortcodes.php,v $ -| $Revision: 1.13 $ -| $Date: 2008-12-21 22:17:05 $ -| $Author: e107steved $ +| $Revision: 1.14 $ +| $Date: 2009-07-25 07:54:34 $ +| $Author: marj_nl_fr $ | | Mods to show extended field categories +----------------------------------------------------------------------------+ @@ -259,7 +259,7 @@ if($pref['signup_option_image']) for($c = 1; $c <= (count($avatarlist)-1); $c++) { - $text .= " "; + $text .= " "; } $text .= "
diff --git a/e107_files/shortcode/batch/siteinfo_shortcodes.php b/e107_files/shortcode/batch/siteinfo_shortcodes.php index 0702cdcd9..d9bac764d 100644 --- a/e107_files/shortcode/batch/siteinfo_shortcodes.php +++ b/e107_files/shortcode/batch/siteinfo_shortcodes.php @@ -1,7 +1,7 @@ tp->replaceConstants($_POST['sitebutton']) : (strstr(SITEBUTTON, 'http:') ? SITEBUTTON : e_IMAGE.SITEBUTTON); - return "\"".SITENAME."\""; + //TODO use CSS class? + return ''.SITENAME.''; } function sc_sitedisclaimer() diff --git a/e107_files/shortcode/batch/user_shortcodes.php b/e107_files/shortcode/batch/user_shortcodes.php index 8f8059e53..127ac60be 100644 --- a/e107_files/shortcode/batch/user_shortcodes.php +++ b/e107_files/shortcode/batch/user_shortcodes.php @@ -9,8 +9,8 @@ * User information - shortcodes * * $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/user_shortcodes.php,v $ - * $Revision: 1.16 $ - * $Date: 2009-07-21 10:16:24 $ + * $Revision: 1.17 $ + * $Date: 2009-07-25 07:54:34 $ * $Author: marj_nl_fr $ * */ @@ -164,9 +164,9 @@ if(defined("USER_REALNAME_ICON")) } if(file_exists(THEME."images/user_realname.png")) { - return " "; + return " "; } -return " "; +return " "; SC_END SC_BEGIN USER_REALNAME @@ -204,9 +204,9 @@ if(defined("USER_ICON")) } if(file_exists(THEME."images/user.png")) { - return " "; + return " "; } -return " "; +return " "; SC_END SC_BEGIN USER_ICON_LINK @@ -217,11 +217,11 @@ if(defined("USER_ICON")) } else if(file_exists(THEME."images/user.png")) { - $icon = " "; + $icon = " "; } else { - $icon = " "; + $icon = " "; } return "{$icon}"; SC_END @@ -308,7 +308,7 @@ if($pref['profile_rate'] && USER) $num = $rating[1]; for($i=1; $i<= $num; $i++) { - $ret .= ""; + $ret .= ""; } } if(!$rater->checkrated('user', $user['user_id'])) diff --git a/e107_files/shortcode/batch/usersettings_shortcodes.php b/e107_files/shortcode/batch/usersettings_shortcodes.php index 6e5250c1b..5d902b122 100755 --- a/e107_files/shortcode/batch/usersettings_shortcodes.php +++ b/e107_files/shortcode/batch/usersettings_shortcodes.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/usersettings_shortcodes.php,v $ -| $Revision: 1.10 $ -| $Date: 2008-12-28 22:37:42 $ -| $Author: e107steved $ +| $Revision: 1.11 $ +| $Date: 2009-07-25 07:54:34 $ +| $Author: marj_nl_fr $ +----------------------------------------------------------------------------+ */ if (!defined('e107_INIT')) { exit; } @@ -177,7 +177,7 @@ closedir($handle); for($c = 1; $c <= (count($avatarlist)-1); $c++) { - $ret .= " "; + $ret .= " "; } $ret .= " diff --git a/e107_handlers/calendar/calendar_class.php b/e107_handlers/calendar/calendar_class.php index 1d485c9ab..6e15888e6 100755 --- a/e107_handlers/calendar/calendar_class.php +++ b/e107_handlers/calendar/calendar_class.php @@ -49,7 +49,7 @@ class DHTML_Calendar } else { - $this->calendar_img = ""; + $this->calendar_img = ""; } if(file_exists(THEME."calendar.css")) diff --git a/e107_handlers/emailprint_class.php b/e107_handlers/emailprint_class.php index 075e7278e..faf190f60 100644 --- a/e107_handlers/emailprint_class.php +++ b/e107_handlers/emailprint_class.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_handlers/emailprint_class.php,v $ -| $Revision: 1.5 $ -| $Date: 2009-07-08 01:29:54 $ -| $Author: e107coders $ +| $Revision: 1.6 $ +| $Date: 2009-07-25 07:54:34 $ +| $Author: marj_nl_fr $ +----------------------------------------------------------------------------+ */ @@ -64,12 +64,14 @@ class emailprint if ($look == 0 || $look == 1) { $ico_mail = (defined("ICONMAIL") && file_exists(THEME."images/".ICONMAIL) ? THEME_ABS."images/".ICONMAIL : e_IMAGE_ABS."generic/email.png"); - $text_emailprint .= "".LAN_EMAIL_7." "; + //TDOD CSS class + $text_emailprint .= "".LAN_EMAIL_7." "; } if ($look == 0 || $look == 2) { $ico_print = (defined("ICONPRINT") && file_exists(THEME."images/".ICONPRINT) ? THEME_ABS."images/".ICONPRINT : e_IMAGE_ABS."generic/printer.png"); - $text_emailprint .= "".LAN_PRINT_1.""; + //TODO CSS class + $text_emailprint .= "".LAN_PRINT_1.""; } return $text_emailprint; } diff --git a/e107_handlers/emote.php b/e107_handlers/emote.php index 373995b32..754b53ce5 100644 --- a/e107_handlers/emote.php +++ b/e107_handlers/emote.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_handlers/emote.php,v $ -| $Revision: 1.4 $ -| $Date: 2007-05-24 21:06:50 $ -| $Author: e107steved $ +| $Revision: 1.5 $ +| $Date: 2009-07-25 07:54:34 $ +| $Author: marj_nl_fr $ +----------------------------------------------------------------------------+ */ if (!defined('e107_INIT')) { exit; } @@ -38,7 +38,8 @@ function r_emote() $value2 = substr($value, 0, strpos($value, " ")); $value = ($value2 ? $value2 : $value); $value = ($value == '&|') ? ':((' : $value; - $str .= "\n "; + //TODO CSS class + $str .= "\n "; } return "
".$str."
"; diff --git a/e107_handlers/emote_filter.php b/e107_handlers/emote_filter.php index 816eb96ac..1b0465a1b 100644 --- a/e107_handlers/emote_filter.php +++ b/e107_handlers/emote_filter.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_handlers/emote_filter.php,v $ -| $Revision: 1.2 $ -| $Date: 2007-05-25 21:47:13 $ -| $Author: e107steved $ +| $Revision: 1.3 $ +| $Date: 2009-07-25 07:54:34 $ +| $Author: marj_nl_fr $ +----------------------------------------------------------------------------+ */ @@ -57,6 +57,7 @@ class e_emotefilter { { $this->search[] = " ".$code; $this->search[] = "\n".$code; + //TODO CSS class? $this->replace[] = " "; $this->replace[] = "\n "; } @@ -68,6 +69,7 @@ class e_emotefilter { { $this->search[] = " ".$value; $this->search[] = "\n".$value; + //TODO CSS class? $this->replace[] = " "; $this->replace[] = "\n "; } diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php index d9dab4acf..47103348a 100644 --- a/e107_handlers/theme_handler.php +++ b/e107_handlers/theme_handler.php @@ -10,9 +10,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_handlers/theme_handler.php,v $ -| $Revision: 1.40 $ -| $Date: 2009-07-24 12:54:38 $ -| $Author: e107coders $ +| $Revision: 1.41 $ +| $Date: 2009-07-25 07:54:34 $ +| $Author: marj_nl_fr $ +----------------------------------------------------------------------------+ */ @@ -436,7 +436,7 @@ class themeHandler{ global $pref; $author = ($theme['email'] ? "".$theme['author']."" : $theme['author']); $website = ($theme['website'] ? "".$theme['website']."" : ""); - $preview = "".($theme['preview'] ? "" : "").""; + $preview = "".($theme['preview'] ? "" : "").""; $text = "
".TPVLAN_7."
@@ -579,16 +579,16 @@ class themeHandler{ $author = ($theme['email'] ? "".$theme['author']."" : $theme['author']); $website = ($theme['website'] ? "".$theme['website']."" : ""); - $preview = "".($theme['preview'] ? "" : "").""; + $preview = "".($theme['preview'] ? "" : "").""; $previewbutton = (!$mode ? " " : ""); $main_icon = ($pref['sitetheme'] != $theme['path']) ? "\n" : ADMIN_TRUE_ICON; - $info_icon = "\n"; + $info_icon = "\n"; $preview_icon = "\n"; - $admin_icon = ($pref['admintheme'] != $theme['path']) ? "\n" : ADMIN_TRUE_ICON; + $admin_icon = ($pref['admintheme'] != $theme['path']) ? "\n" : ADMIN_TRUE_ICON; - $newpreview = "".($theme['preview'] ? "" : "").""; + $newpreview = "".($theme['preview'] ? "" : "").""; if(!$mode) // Choose a Theme to Install. diff --git a/e107_plugins/calendar_menu/admin_config.php b/e107_plugins/calendar_menu/admin_config.php index 4890e47f8..d2ac84a3e 100644 --- a/e107_plugins/calendar_menu/admin_config.php +++ b/e107_plugins/calendar_menu/admin_config.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/admin_config.php,v $ -| $Revision: 1.11 $ -| $Date: 2008-12-07 21:41:04 $ -| $Author: e107steved $ +| $Revision: 1.12 $ +| $Date: 2009-07-25 07:54:34 $ +| $Author: marj_nl_fr $ | +----------------------------------------------------------------------------+ */ @@ -480,7 +480,7 @@ if(isset($ec_qs[0]) && $ec_qs[0] == "cat") $imagelist = $fi->get_files(e_PLUGIN."calendar_menu/images", "\.\w{3}$"); foreach($imagelist as $img){ if ($img['fname']){ - $calendarmenu_text .= " "; + $calendarmenu_text .= " "; } } $calendarmenu_text .= " diff --git a/e107_plugins/calendar_menu/calendar_menu.php b/e107_plugins/calendar_menu/calendar_menu.php index 4068686b6..fbb8c735a 100644 --- a/e107_plugins/calendar_menu/calendar_menu.php +++ b/e107_plugins/calendar_menu/calendar_menu.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/calendar_menu.php,v $ -| $Revision: 1.4 $ -| $Date: 2009-02-01 20:54:08 $ -| $Author: e107steved $ +| $Revision: 1.5 $ +| $Date: 2009-07-25 07:54:34 $ +| $Author: marj_nl_fr $ | +----------------------------------------------------------------------------+ */ @@ -168,7 +168,7 @@ for($cal_c = 1; $cal_c <= $numberdays; $cal_c++) $title = " title='{$cal_event_count} " . EC_LAN_106 . "' "; } } - if (is_file(e_PLUGIN.$cal_event_icon)) $cal_img = ""; + if (is_file(e_PLUGIN.$cal_event_icon)) $cal_img = ""; //height='10' width='10' if (isset($cal_recent[$cal_c]) && $cal_recent[$cal_c]) { diff --git a/e107_plugins/calendar_menu/calendar_shortcodes.php b/e107_plugins/calendar_menu/calendar_shortcodes.php index 39f52c88c..9005b2c96 100644 --- a/e107_plugins/calendar_menu/calendar_shortcodes.php +++ b/e107_plugins/calendar_menu/calendar_shortcodes.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/calendar_shortcodes.php,v $ -| $Revision: 1.9 $ -| $Date: 2008-07-28 20:16:10 $ -| $Author: e107steved $ +| $Revision: 1.10 $ +| $Date: 2009-07-25 07:54:34 $ +| $Author: marj_nl_fr $ | +----------------------------------------------------------------------------+ */ @@ -147,6 +147,7 @@ SC_BEGIN EC_SHOWEVENT_IMAGE } else { + //TODO review bullet $img = ""; } return $img; @@ -215,7 +216,7 @@ SC_BEGIN EC_CALENDAR_CALENDAR_RECENT_ICON $recent_icon = EC_RECENT_ICON; if (file_exists($recent_icon)) { - return " "; + return " "; } return "R"; SC_END @@ -299,7 +300,7 @@ SC_BEGIN EC_EVENT_RECENT_ICON $recent_icon = EC_RECENT_ICON; if (file_exists($recent_icon)) { - return " "; + return " "; } return ""; SC_END @@ -348,7 +349,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 { @@ -441,7 +442,7 @@ SC_BEGIN EC_EVENT_OPTIONS global $EC_EVENT_OPTIONS, $thisevent, $event_author_name, $cal_super, $pref, $ec_images_path; if (USERNAME == $event_author_name || $cal_super || check_class($pref['eventpost_admin'])) { - $EC_EVENT_OPTIONS = "".EC_LAN_35 . "  ".EC_LAN_36.""; + $EC_EVENT_OPTIONS = "".EC_LAN_35 . "  ".EC_LAN_36.""; } return $EC_EVENT_OPTIONS; SC_END @@ -512,7 +513,7 @@ SC_BEGIN EC_NEXT_EVENT_RECENT_ICON $recent_icon = EC_RECENT_ICON; if (file_exists($recent_icon)) { - return " "; + return " "; } return ""; SC_END diff --git a/e107_plugins/comment_menu/comment_menu_shortcodes.php b/e107_plugins/comment_menu/comment_menu_shortcodes.php index 004cdb81f..bec1eaa75 100644 --- a/e107_plugins/comment_menu/comment_menu_shortcodes.php +++ b/e107_plugins/comment_menu/comment_menu_shortcodes.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/comment_menu/comment_menu_shortcodes.php,v $ -| $Revision: 1.2 $ -| $Date: 2007-02-08 22:35:26 $ -| $Author: e107steved $ +| $Revision: 1.3 $ +| $Date: 2009-07-25 07:54:35 $ +| $Author: marj_nl_fr $ +----------------------------------------------------------------------------+ */ if (!defined('e107_INIT')) { exit; } @@ -22,6 +22,7 @@ $comment_menu_shortcodes = $tp -> e_sc -> parse_scbatch(__FILE__); /* SC_BEGIN CM_ICON +//TODO review bullet return (defined("BULLET") ? "" : "bullet"); SC_END diff --git a/e107_plugins/download/download_shortcodes.php b/e107_plugins/download/download_shortcodes.php index 1c673aefb..5934ac84f 100644 --- a/e107_plugins/download/download_shortcodes.php +++ b/e107_plugins/download/download_shortcodes.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/download/download_shortcodes.php,v $ -| $Revision: 1.6 $ -| $Date: 2009-07-21 07:10:24 $ -| $Author: e107coders $ +| $Revision: 1.7 $ +| $Date: 2009-07-25 07:54:35 $ +| $Author: marj_nl_fr $ +----------------------------------------------------------------------------+ */ if (!defined('e107_INIT')) { exit; } @@ -363,12 +363,12 @@ class download_shortcodes } else { - return $dnld_link."*"; + return $dnld_link."*"; } } else { - return $dnld_link." xxx*"; + return $dnld_link." xxx*"; } } function sc_download_view_filesize() diff --git a/e107_plugins/forum/forum_admin.php b/e107_plugins/forum/forum_admin.php index e472abb5c..3f4e02426 100644 --- a/e107_plugins/forum/forum_admin.php +++ b/e107_plugins/forum/forum_admin.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/forum/forum_admin.php,v $ -| $Revision: 1.8 $ -| $Date: 2008-12-18 18:32:54 $ -| $Author: mcfly_e107 $ +| $Revision: 1.9 $ +| $Date: 2009-07-25 07:54:35 $ +| $Author: marj_nl_fr $ +----------------------------------------------------------------------------+ */ $eplug_admin = true; @@ -37,9 +37,9 @@ require_once(e_PLUGIN.'forum/forum_admin_class.php'); $rs = new form; $for = new e107forum; $forum = new forumAdmin; -define('IMAGE_new', ""); -define('IMAGE_sub', "".FORLAN_145.""); -define('IMAGE_nosub', "".FORLAN_145.""); +define('IMAGE_new', ""); +define('IMAGE_sub', "".FORLAN_145.""); +define('IMAGE_nosub', "".FORLAN_145.""); $deltest = array_flip($_POST); if (e_QUERY) diff --git a/e107_plugins/links_page/link_class.php b/e107_plugins/links_page/link_class.php index 6b087a7f1..6fb453dc3 100644 --- a/e107_plugins/links_page/link_class.php +++ b/e107_plugins/links_page/link_class.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/links_page/link_class.php,v $ -| $Revision: 1.12 $ -| $Date: 2009-01-30 22:03:13 $ -| $Author: lisa_ $ +| $Revision: 1.13 $ +| $Date: 2009-07-25 07:54:35 $ +| $Author: marj_nl_fr $ +----------------------------------------------------------------------------+ */ @@ -778,7 +778,7 @@ class linkclass $blank_display = 'display: none'; $img = e_PLUGIN_ABS."links_page/images/blank.gif"; } - $text .= "

"; + $text .= "

"; $text .= "
"; @@ -887,17 +887,17 @@ class linkclass { if (strpos($row['link_button'], "http://") !== FALSE) { - $img = "".$LINK_CAT_NAME.""; + $img = "".$LINK_CAT_NAME.""; } else { if(strstr($row['link_button'], "/")) { - $img = "".$LINK_CAT_NAME.""; + $img = "".$LINK_CAT_NAME.""; } else { - $img = "".$LINK_CAT_NAME.""; + $img = "".$LINK_CAT_NAME.""; } } } @@ -1011,7 +1011,7 @@ class linkclass ".$rs -> form_button("button", '', LCLAN_CAT_23, "onclick=\"expandit('catico')\"")." diff --git a/e107_plugins/links_page/link_defines.php b/e107_plugins/links_page/link_defines.php index 458042532..85be3284c 100644 --- a/e107_plugins/links_page/link_defines.php +++ b/e107_plugins/links_page/link_defines.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/links_page/link_defines.php,v $ -| $Revision: 1.4 $ -| $Date: 2009-07-07 07:39:35 $ -| $Author: e107coders $ +| $Revision: 1.5 $ +| $Date: 2009-07-25 07:54:35 $ +| $Author: marj_nl_fr $ +----------------------------------------------------------------------------+ */ @@ -21,13 +21,13 @@ if (!defined('e107_INIT')) { exit; } $imagedir = e_IMAGE."admin_images/"; if (!defined("IMAGE_NEW")){ define("IMAGE_NEW", (file_exists(THEME."images/new.png") ? THEME."images/new.png" : e_IMAGE."generic/new.png")); } -if (!defined('LINK_ICON_EDIT')) { define("LINK_ICON_EDIT", ""); } -if (!defined('LINK_ICON_DELETE')) { define("LINK_ICON_DELETE", ""); } +if (!defined('LINK_ICON_EDIT')) { define("LINK_ICON_EDIT", ""); } +if (!defined('LINK_ICON_DELETE')) { define("LINK_ICON_DELETE", ""); } if (!defined('LINK_ICON_DELETE_BASE')) { define("LINK_ICON_DELETE_BASE", $imagedir."delete_16.png"); } -if (!defined('LINK_ICON_LINK')) { define("LINK_ICON_LINK", ""); } +if (!defined('LINK_ICON_LINK')) { define("LINK_ICON_LINK", ""); } if (!defined('LINK_ICON_ORDER_UP_BASE')) { define("LINK_ICON_ORDER_UP_BASE", $imagedir."up.png"); } if (!defined('LINK_ICON_ORDER_DOWN_BASE')) { define("LINK_ICON_ORDER_DOWN_BASE", $imagedir."down.png"); } -if (!defined('LINK_ICON_ORDER_UP')) { define("LINK_ICON_ORDER_UP", ""); } -if (!defined('LINK_ICON_ORDER_DOWN')) { define("LINK_ICON_ORDER_DOWN", ""); } +if (!defined('LINK_ICON_ORDER_UP')) { define("LINK_ICON_ORDER_UP", ""); } +if (!defined('LINK_ICON_ORDER_DOWN')) { define("LINK_ICON_ORDER_DOWN", ""); } ?> \ No newline at end of file diff --git a/e107_plugins/links_page/link_menu.php b/e107_plugins/links_page/link_menu.php index e26d67a90..b7cd8f6b3 100644 --- a/e107_plugins/links_page/link_menu.php +++ b/e107_plugins/links_page/link_menu.php @@ -15,7 +15,8 @@ global $tp; @include_lan(e_PLUGIN."links_page/languages/".e_LANGUAGE.".php"); -$bullet = ""; +//TODO review bullet +$bullet = ""; global $linkspage_pref; $linkspage_pref = $lc -> getLinksPagePref(); diff --git a/e107_plugins/links_page/link_shortcodes.php b/e107_plugins/links_page/link_shortcodes.php index ba025e842..c8c05d62c 100644 --- a/e107_plugins/links_page/link_shortcodes.php +++ b/e107_plugins/links_page/link_shortcodes.php @@ -162,21 +162,24 @@ if(isset($linkspage_pref['link_cat_icon']) && $linkspage_pref['link_cat_icon']){ $LINK_MAIN_ICON = ""; } else { if(isset($linkspage_pref['link_cat_icon_empty']) && $linkspage_pref['link_cat_icon_empty']){ + //TODO review bullet $LINK_MAIN_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 = ""; + //TODO review bullet + $LINK_MAIN_ICON = ""; } } } } else { if(isset($linkspage_pref['link_cat_icon_empty']) && $linkspage_pref['link_cat_icon_empty']){ - $LINK_MAIN_ICON = ""; + //TODO review bullet + $LINK_MAIN_ICON = ""; } } if($rowl['total_links'] && $LINK_MAIN_ICON){ @@ -371,24 +374,24 @@ global $LINK_RATED_BUTTON, $linkspage_pref, $rowl, $LINK_RATED_NAME, $LINK_RATED if(isset($linkspage_pref['link_icon']) && $linkspage_pref['link_icon']){ if ($rowl['link_button']) { if (strpos($rowl['link_button'], "http://") !== FALSE) { - $LINK_RATED_BUTTON = $LINK_RATED_APPEND."\n".$LINK_RATED_NAME.""; + $LINK_RATED_BUTTON = $LINK_RATED_APPEND."\n".$LINK_RATED_NAME.""; } else { if(strstr($rowl['link_button'], "/")){ - $LINK_RATED_BUTTON = $LINK_RATED_APPEND."\n".$LINK_RATED_NAME.""; + $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/list_new/list_admin_class.php b/e107_plugins/list_new/list_admin_class.php index 79b486249..eaebfad00 100644 --- a/e107_plugins/list_new/list_admin_class.php +++ b/e107_plugins/list_new/list_admin_class.php @@ -9,9 +9,9 @@ * List Admin Class * * $Source: /cvs_backup/e107_0.8/e107_plugins/list_new/list_admin_class.php,v $ - * $Revision: 1.4 $ - * $Date: 2009-01-28 08:49:33 $ - * $Author: lisa_ $ + * $Revision: 1.5 $ + * $Date: 2009-07-25 07:54:35 $ + * $Author: marj_nl_fr $ * */ if (!defined('e107_INIT')) { exit; } @@ -180,7 +180,7 @@ class list_admin "; $this->row['FIELD'] .= $this->parseTemplate('FIELD_TABLE'); diff --git a/e107_plugins/log/stats.php b/e107_plugins/log/stats.php index fb783b04a..9cd2eb70a 100644 --- a/e107_plugins/log/stats.php +++ b/e107_plugins/log/stats.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/log/stats.php,v $ -| $Revision: 1.10 $ -| $Date: 2008-12-11 21:13:48 $ -| $Author: e107steved $ +| $Revision: 1.11 $ +| $Date: 2009-07-25 07:54:35 $ +| $Author: marj_nl_fr $ +----------------------------------------------------------------------------+ */ require_once("../../class2.php"); @@ -803,7 +803,7 @@ class siteStats $percentage = round(($info['ttlv']/$total) * 100, 2); $text .= " - ".($can_delete ? "".ADSTAT_L39." " : "")." + ".($can_delete ? "".ADSTAT_L39." " : "")." ".$key." "; $text .= " diff --git a/e107_plugins/newsfeed/newsfeed_functions.php b/e107_plugins/newsfeed/newsfeed_functions.php index 4f9b7d632..62a808aaa 100644 --- a/e107_plugins/newsfeed/newsfeed_functions.php +++ b/e107_plugins/newsfeed/newsfeed_functions.php @@ -9,9 +9,9 @@ * Plugin - newsfeeds * * $Source: /cvs_backup/e107_0.8/e107_plugins/newsfeed/newsfeed_functions.php,v $ - * $Revision: 1.5 $ - * $Date: 2008-12-20 10:39:29 $ - * $Author: e107steved $ + * $Revision: 1.6 $ + * $Date: 2009-07-25 07:54:35 $ + * $Author: marj_nl_fr $ * */ @@ -169,7 +169,7 @@ class newsfeedClass } if ($newsfeed_image == 'default') { - $temp['newsfeed_image_link'] = "".$rss->image["; + $temp['newsfeed_image_link'] = "".$rss->image["; } else { diff --git a/e107_plugins/pm/pm_shortcodes.php b/e107_plugins/pm/pm_shortcodes.php index f061fa875..97aed0d0f 100755 --- a/e107_plugins/pm/pm_shortcodes.php +++ b/e107_plugins/pm/pm_shortcodes.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm_shortcodes.php,v $ -| $Revision: 1.10 $ -| $Date: 2009-07-21 14:44:13 $ -| $Author: e107coders $ +| $Revision: 1.11 $ +| $Date: 2009-07-25 07:54:36 $ +| $Author: marj_nl_fr $ +----------------------------------------------------------------------------+ */ if (!defined('e107_INIT')) { exit; } @@ -307,11 +307,11 @@ SC_BEGIN PM_BLOCK_USER global $pm_info, $pm_blocks; if(in_array($pm_info['pm_from'], $pm_blocks)) { - return "".LAN_PM_51.""; + return "".LAN_PM_51.""; } else { - return "".LAN_PM_50.""; + return "".LAN_PM_50.""; } SC_END @@ -325,7 +325,7 @@ else { $extra = '.'.($pm_info['pm_from'] == USERID ? 'outbox' : 'inbox'); } -return "".LAN_PM_52.""; +return "".LAN_PM_52.""; SC_END SC_BEGIN DELETE_SELECTED diff --git a/e107_plugins/pm/pm_template.php b/e107_plugins/pm/pm_template.php index 4d4bc0e4f..c59293448 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.2 $ -| $Date: 2008-07-28 20:16:14 $ -| $Author: e107steved $ +| $Revision: 1.3 $ +| $Date: 2009-07-25 07:54:36 $ +| $Author: marj_nl_fr $ +----------------------------------------------------------------------------+ */ 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 009791a4a..f79b20243 100755 --- a/e107_plugins/pm/private_msg_menu.php +++ b/e107_plugins/pm/private_msg_menu.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/pm/private_msg_menu.php,v $ -| $Revision: 1.6 $ -| $Date: 2008-11-25 17:38:56 $ -| $Author: mcfly_e107 $ +| $Revision: 1.7 $ +| $Date: 2009-07-25 07:54:36 $ +| $Author: marj_nl_fr $ +----------------------------------------------------------------------------+ */ if (!defined('e107_INIT')) { exit; } @@ -25,10 +25,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'] = "

[ "; diff --git a/e107_plugins/rss_menu/rss_menu.php b/e107_plugins/rss_menu/rss_menu.php index dc9a304a1..be6437fa0 100644 --- a/e107_plugins/rss_menu/rss_menu.php +++ b/e107_plugins/rss_menu/rss_menu.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/rss_menu/rss_menu.php,v $ -| $Revision: 1.2 $ -| $Date: 2008-12-13 12:34:53 $ -| $Author: e107steved $ +| $Revision: 1.3 $ +| $Date: 2009-07-25 07:54:36 $ +| $Author: marj_nl_fr $ +----------------------------------------------------------------------------+ */ if (!defined('e107_INIT')) { exit; } @@ -74,13 +74,11 @@ if(e_PAGE == "news.php" && $pref['rss_newscats']) $text = "
".$des.RSS_MENU_L1."
-
rss1.0
-
rss2.0
-
rdf
+
rss1.0
+
rss2.0
+
rdf
"; $caption = (file_exists(THEME."images/RSS_menu.png") ? " ".RSS_MENU_L2 : RSS_MENU_L2); $ns->tablerender($caption, $text, 'backend'); - -?> diff --git a/e107_plugins/siteinfo_menu/compliance_menu.php b/e107_plugins/siteinfo_menu/compliance_menu.php index 1c9fce6a2..160b4cec1 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'); diff --git a/e107_plugins/tinymce/plugins/emoticons/emoticons.php b/e107_plugins/tinymce/plugins/emoticons/emoticons.php index 2a3f91beb..849a5d607 100644 --- a/e107_plugins/tinymce/plugins/emoticons/emoticons.php +++ b/e107_plugins/tinymce/plugins/emoticons/emoticons.php @@ -32,7 +32,7 @@ function headerjs(){ } function insertEmotion(file_name, title) { - var html = '\'''; + var html = '\'''; tinyMCE.execCommand('mceInsertContent', false, html); tinyMCEPopup.close(); }