diff --git a/class2.php b/class2.php index e4e9523ff..e62112e9b 100644 --- a/class2.php +++ b/class2.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/class2.php,v $ -| $Revision: 1.18 $ -| $Date: 2007-04-08 23:45:52 $ -| $Author: e107coders $ +| $Revision: 1.19 $ +| $Date: 2007-04-15 16:07:39 $ +| $Author: lisa_ $ +----------------------------------------------------------------------------+ */ // @@ -1281,7 +1281,7 @@ function init_session() { if ($result['user_ban'] == 1) { exit; } - $user_pref = unserialize($result['user_prefs']); + $user_pref = ($result['user_prefs']) ? unserialize($result['user_prefs']) : ''; if (isset($_POST['settheme'])) { $user_pref['sitetheme'] = ($pref['sitetheme'] == $_POST['sitetheme'] ? "" : $_POST['sitetheme']); diff --git a/e107_files/bbcode/code.bb b/e107_files/bbcode/code.bb index d7fceea85..afe2292ae 100644 --- a/e107_files/bbcode/code.bb +++ b/e107_files/bbcode/code.bb @@ -14,7 +14,7 @@ $search = array(E_NL,'\','$', '<'); $replace = array("\r\n","\\",'$', '<'); $code_text = str_replace($search, $replace, $code_text); -if($pref['useGeshi'] && file_exists(e_PLUGIN."geshi/geshi.php")) { +if(isset($pref['useGeshi']) && $pref['useGeshi'] && file_exists(e_PLUGIN."geshi/geshi.php")) { $code_md5 = md5($code_text); if(!$CodeCache = $e107cache->retrieve('GeshiParsed_'.$code_md5)) { diff --git a/e107_files/shortcode/batch/bbcode_shortcodes.php b/e107_files/shortcode/batch/bbcode_shortcodes.php index bf38f6993..5835e1c1c 100644 --- a/e107_files/shortcode/batch/bbcode_shortcodes.php +++ b/e107_files/shortcode/batch/bbcode_shortcodes.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/bbcode_shortcodes.php,v $ -| $Revision: 1.3 $ -| $Date: 2007-02-11 10:40:28 $ -| $Author: e107steved $ +| $Revision: 1.4 $ +| $Date: 2007-04-15 16:07:39 $ +| $Author: lisa_ $ +----------------------------------------------------------------------------+ */ if (!defined('e107_INIT')) { exit; } @@ -90,11 +90,11 @@ foreach($eplug_bb as $key=>$val) // allow plugins to plug into it. } -$_onclick_func = ($bbcode[$parm][0]) ? $bbcode[$parm][0] : $bbcode_func; -$_onclick_var = $bbcode[$parm][1]; -$_helptxt = $bbcode[$parm][2]; -$_function = $bbcode[$parm][4]; -$_function_var = $bbcode[$parm][5]; +$_onclick_func = (isset($bbcode[$parm][0])) ? $bbcode[$parm][0] : $bbcode_func; +$_onclick_var = (isset($bbcode[$parm][1])) ? $bbcode[$parm][1] : ''; +$_helptxt = (isset($bbcode[$parm][2])) ? $bbcode[$parm][2] : ''; +$_function = (isset($bbcode[$parm][4])) ? $bbcode[$parm][4] : ''; +$_function_var = (isset($bbcode[$parm][5])) ? $bbcode[$parm][5] : ''; if($bbcode[$parm]) // default - insert text. diff --git a/e107_handlers/bbcode_handler.php b/e107_handlers/bbcode_handler.php index 85b4d9ff1..0f3e9a13b 100644 --- a/e107_handlers/bbcode_handler.php +++ b/e107_handlers/bbcode_handler.php @@ -12,9 +12,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_handlers/bbcode_handler.php,v $ -| $Revision: 1.7 $ -| $Date: 2007-03-03 19:40:53 $ -| $Author: e107steved $ +| $Revision: 1.8 $ +| $Date: 2007-04-15 16:07:39 $ +| $Author: lisa_ $ +----------------------------------------------------------------------------+ */ @@ -101,8 +101,8 @@ class e_bbcode if ($cont[0] == '[') { // We've got a bbcode - split it up and process it $match_count = preg_match($pattern,$cont,$matches); - $bbparam = $matches[5]; - $bbword = $matches[2]; + $bbparam = (isset($matches[5])) ? $matches[5] : ''; + $bbword = (isset($matches[2])) ? $matches[2] : ''; if ($force_lower) $bbword = strtolower($bbword); if ($nopro && ($bbword == 'code') && ($matches[1] == '/')) $nopro = FALSE; // End of code block if (($bbword) && ($bbword == trim($bbword)) && !$nopro) diff --git a/e107_handlers/comment_class.php b/e107_handlers/comment_class.php index a486f44d7..5f4078677 100644 --- a/e107_handlers/comment_class.php +++ b/e107_handlers/comment_class.php @@ -12,9 +12,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_handlers/comment_class.php,v $ -| $Revision: 1.3 $ -| $Date: 2007-01-29 22:10:53 $ -| $Author: e107steved $ +| $Revision: 1.4 $ +| $Date: 2007-04-15 16:07:39 $ +| $Author: lisa_ $ +----------------------------------------------------------------------------+ */ @@ -487,6 +487,10 @@ class comment { WHERE c.comment_item_id='".intval($id)."' AND c.comment_type='".$tp -> toDB($type, true)."' ORDER BY c.comment_datestamp"; $text = ""; + $comment = ''; + $modcomment = ''; + $lock = ''; + $ret['comment'] = ''; if ($comment_total = $sql->db_Select_gen($query)) { diff --git a/e107_handlers/emote.php b/e107_handlers/emote.php index 618bc5c04..356fc2006 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.2 $ -| $Date: 2006-12-19 20:34:12 $ -| $Author: e107steved $ +| $Revision: 1.3 $ +| $Date: 2007-04-15 16:07:39 $ +| $Author: lisa_ $ +----------------------------------------------------------------------------+ */ if (!defined('e107_INIT')) { exit; } @@ -28,6 +28,7 @@ function r_emote() $tp->e_emote = new e_emoteFilter; } + $str = ''; foreach($tp->e_emote->emotes as $key => $value) { $key = str_replace("!", "_", $key); diff --git a/e107_plugins/content/content_shortcodes.php b/e107_plugins/content/content_shortcodes.php index e97ab6b2b..700993b7c 100644 --- a/e107_plugins/content/content_shortcodes.php +++ b/e107_plugins/content/content_shortcodes.php @@ -86,20 +86,20 @@ global $row, $tp, $content_pref; if($sc_mode){ if($sc_mode=='cat'){ global $comment_total, $plugintable; - if($row['content_comment'] && isset($content_pref["content_catall_comment"]) && $content_pref["content_catall_comment"]){ + if(varsettrue($row['content_comment']) && varsettrue($content_pref["content_catall_comment"])){ $sqlc = new db; $comment_total = $sqlc -> db_Select("comments", "*", "comment_item_id='".$row['content_id']."' AND comment_type='".$plugintable."' AND comment_pid='0' "); return "".CONTENT_LAN_57." ".$comment_total.""; } }elseif($sc_mode=='catlist'){ global $qs, $comment_total, $sql, $plugintable; - if($row['content_comment'] && isset($content_pref["content_cat_comment"]) && $content_pref["content_cat_comment"]){ + if(varsettrue($row['content_comment']) && varsettrue($content_pref["content_cat_comment"])){ $comment_total = $sql -> db_Count("comments", "(*)", "WHERE comment_item_id='".intval($qs[1])."' AND comment_type='".$plugintable."' AND comment_pid='0' "); return "".CONTENT_LAN_57." ".$comment_total.""; } }elseif($sc_mode=='content'){ global $cobj, $qs, $plugintable; - if((isset($content_pref["content_content_comment"]) && $content_pref["content_content_comment"] && $row['content_comment']) || $content_pref["content_content_comment_all"] ){ + if((varsettrue($content_pref["content_content_comment"]) && varsettrue($row['content_comment'])) || varsettrue($content_pref["content_content_comment_all"]) ){ return $cobj -> count_comments($plugintable, $qs[1]); } } @@ -164,7 +164,7 @@ global $content_pref, $row, $tp; if($sc_mode){ $epicons = ""; if($sc_mode=='content'){ - if(($content_pref["content_content_peicon"] && $row['content_pe']) || $content_pref["content_content_peicon_all"]){ + if((varsettrue($content_pref["content_list_peicon"]) && varsettrue($row['content_pe'])) || varsettrue($content_pref["content_list_peicon_all"]) ){ $epicons = $tp -> parseTemplate("{EMAIL_ITEM=".CONTENT_LAN_69." ".CONTENT_LAN_71."^plugin:content.".$row['content_id']."}"); $epicons .= " ".$tp -> parseTemplate("{PRINT_ITEM=".CONTENT_LAN_70." ".CONTENT_LAN_71."^plugin:content.".$row['content_id']."}"); $epicons .= " ".$tp -> parseTemplate("{PDF=".CONTENT_LAN_76." ".CONTENT_LAN_71."^plugin:content.".$row['content_id']."}"); @@ -172,7 +172,7 @@ if($sc_mode){ } }elseif($sc_mode=='recent'){ if(varsettrue($content_pref["content_list_peicon"])){ - if($row['content_pe'] || isset($content_pref["content_list_peicon_all"]) && $content_pref["content_list_peicon_all"]){ + if( varsettrue($row['content_pe']) || varsettrue($content_pref["content_list_peicon_all"]) ){ $epicons = $tp -> parseTemplate("{EMAIL_ITEM=".CONTENT_LAN_69." ".CONTENT_LAN_71."^plugin:content.".$row['content_id']."}"); $epicons .= " ".$tp -> parseTemplate("{PRINT_ITEM=".CONTENT_LAN_70." ".CONTENT_LAN_71."^plugin:content.".$row['content_id']."}"); $epicons .= " ".$tp -> parseTemplate("{PDF=".CONTENT_LAN_76." ".CONTENT_LAN_71."^plugin:content.".$row['content_id']."}"); @@ -180,14 +180,14 @@ if($sc_mode){ } } }elseif($sc_mode=='cat'){ - if($row['content_pe'] && varsettrue($content_pref["content_catall_peicon"])){ + if( varsettrue($row['content_pe']) && varsettrue($content_pref["content_catall_peicon"])){ $epicons = $tp -> parseTemplate("{EMAIL_ITEM=".CONTENT_LAN_69." ".CONTENT_LAN_72."^plugin:content.".$row['content_id']."}"); $epicons .= " ".$tp -> parseTemplate("{PRINT_ITEM=".CONTENT_LAN_70." ".CONTENT_LAN_72."^plugin:content.".$row['content_id']."}"); $epicons .= " ".$tp -> parseTemplate("{PDF=".CONTENT_LAN_76." ".CONTENT_LAN_71."^plugin:content.".$row['content_id']."}"); return $epicons; } }elseif($sc_mode=='catlist'){ - if( (varsettrue($content_pref["content_cat_peicon"]) && $row['content_pe']) || varsettrue($content_pref["content_cat_peicon_all"]) ){ + if( (varsettrue($content_pref["content_cat_peicon"]) && varsettrue($row['content_pe'])) || varsettrue($content_pref["content_cat_peicon_all"]) ){ $epicons = $tp -> parseTemplate("{EMAIL_ITEM=".CONTENT_LAN_69." ".CONTENT_LAN_72."^plugin:content.$qs[1]}"); $epicons .= " ".$tp -> parseTemplate("{PRINT_ITEM=".CONTENT_LAN_70." ".CONTENT_LAN_72."^plugin:content.$qs[1]}"); $epicons .= " ".$tp -> parseTemplate("{PDF=".CONTENT_LAN_76." ".CONTENT_LAN_71."^plugin:content.$qs[1]}"); @@ -238,7 +238,7 @@ SC_BEGIN CM_ICON global $aa, $row, $content_pref, $content_icon_path, $content_cat_icon_path_small, $content_cat_icon_path_large; if($sc_mode){ if($sc_mode=='top'){ - if($content_pref["content_top_icon"]){ + if(varsettrue($content_pref["content_top_icon"])){ $width = varsettrue($content_pref["content_upload_icon_size"], '100'); $width = varsettrue($content_pref["content_top_icon_width"], $width); return $aa -> getIcon("item", $row['content_icon'], $content_icon_path, "content.".$row['content_id'], $width, $content_pref["content_blank_icon"]); @@ -486,7 +486,7 @@ if($sc_mode){ if($sc_mode=='content'){ return $CONTENT_CONTENT_TABLE_TEXT; }elseif($sc_mode=='recent'){ - if(isset($content_pref["content_list_text"]) && $content_pref["content_list_text"] && $content_pref["content_list_text_char"] > 0){ + if(varsettrue($content_pref["content_list_text"]) && $content_pref["content_list_text_char"] > 0){ $rowtext = preg_replace("/\[newpage.*?]/si", " ", $row['content_text']); $rowtext = $tp->toHTML($rowtext, TRUE, "nobreak"); $rowtext = strip_tags($rowtext); @@ -502,7 +502,7 @@ if($sc_mode){ return $ret; } }elseif($sc_mode=='cat'){ - if($row['content_text'] && isset($content_pref["content_catall_text"]) && $content_pref["content_catall_text"] && ($content_pref["content_catall_text_char"] > 0 || $content_pref["content_catall_text_char"] == 'all')){ + if($row['content_text'] && varsettrue($content_pref["content_catall_text"]) && ($content_pref["content_catall_text_char"] > 0 || $content_pref["content_catall_text_char"] == 'all')){ if($content_pref["content_catall_text_char"] == 'all'){ $ret = $row['content_text']; }else{ @@ -520,7 +520,7 @@ if($sc_mode){ return $ret; } }elseif($sc_mode=='catlist'){ - if($row['content_text'] && isset($content_pref["content_cat_text"]) && $content_pref["content_cat_text"] && ($content_pref["content_cat_text_char"] > 0 || $content_pref["content_cat_text_char"] == 'all')){ + if($row['content_text'] && varsettrue($content_pref["content_cat_text"]) && ($content_pref["content_cat_text_char"] > 0 || $content_pref["content_cat_text_char"] == 'all')){ if($content_pref["content_cat_text_char"] == 'all'){ $CONTENT_CAT_LIST_TABLE_TEXT = $tp->toHTML($row['content_text'], TRUE, "constants"); }else{ @@ -599,11 +599,8 @@ if($sc_mode){ for($i=0;$i toHTML($row['content_subheading'], TRUE); $popupname = $tp -> toHTML($content_image_popup_name, TRUE); $author = $tp -> toHTML($authordetails[1], TRUE); @@ -628,8 +625,7 @@ if($sc_mode){ for($i=0;$i