mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 14:46:56 +02:00
Code Issues Releases Wiki Activity

content: code improvements and optimization

Browse Source
This commit is contained in:
lia
2007-04-12 23:11:46 +00:00
parent 526f219363
commit 4fd1da3e4a
2 changed files with 46 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
e107_plugins/content/content_shortcodes.php
View File

@@ -5,27 +5,27 @@ $content_shortcodes = $tp -> e_sc -> parse_scbatch(__FILE__);
/* /*
SC_BEGIN CM_AMOUNT SC_BEGIN CM_AMOUNT
global $row, $tp; global $row, $tp, $content_pref;
if($sc_mode){ if($sc_mode){
if($sc_mode=='author'){ if($sc_mode=='author'){
global $totalcontent, $content_pref; global $totalcontent;
if($content_pref["content_author_amount"]){ if(varsettrue($content_pref["content_author_amount"])){
return $totalcontent." ".($totalcontent==1 ? CONTENT_LAN_53 : CONTENT_LAN_54); return $totalcontent." ".($totalcontent==1 ? CONTENT_LAN_53 : CONTENT_LAN_54);
} }
}elseif($sc_mode=='cat'){ }elseif($sc_mode=='cat'){
global $row, $totalitems, $content_pref; global $totalitems;
if(isset($content_pref["content_catall_amount"]) && $content_pref["content_catall_amount"]){ if(varsettrue($content_pref["content_catall_amount"])){
return $totalitems." ".($totalitems == "1" ? CONTENT_LAN_53 : CONTENT_LAN_54); return $totalitems." ".($totalitems == "1" ? CONTENT_LAN_53 : CONTENT_LAN_54);
} }
}elseif($sc_mode=='catlist'){ }elseif($sc_mode=='catlist'){
global $row, $content_pref, $totalparent; global $totalparent;
if(isset($content_pref["content_cat_amount"]) && $content_pref["content_cat_amount"]){ if(varsettrue($content_pref["content_cat_amount"])){
return $totalparent." ".($totalparent == "1" ? CONTENT_LAN_53 : CONTENT_LAN_54); return $totalparent." ".($totalparent == "1" ? CONTENT_LAN_53 : CONTENT_LAN_54);
} }
}elseif($sc_mode=='catlistsub'){ }elseif($sc_mode=='catlistsub'){
global $row, $content_pref, $totalsubcat; global $totalsubcat;
if(isset($content_pref["content_catsub_amount"]) && $content_pref["content_catsub_amount"]){ if(varsettrue($content_pref["content_catsub_amount"])){
return $totalsubcat." ".($totalsubcat == "1" ? CONTENT_LAN_53 : CONTENT_LAN_54); return $totalsubcat." ".($totalsubcat == "1" ? CONTENT_LAN_53 : CONTENT_LAN_54);
} }
}elseif($sc_mode=='type'){ }elseif($sc_mode=='type'){
@@ -82,23 +82,23 @@ if($sc_mode){
SC_END SC_END
SC_BEGIN CM_COMMENT SC_BEGIN CM_COMMENT
global $row, $tp; global $row, $tp, $content_pref;
if($sc_mode){ if($sc_mode){
if($sc_mode=='cat'){ if($sc_mode=='cat'){
global $row, $comment_total, $content_pref, $plugintable; global $comment_total, $plugintable;
if($row['content_comment'] && isset($content_pref["content_catall_comment"]) && $content_pref["content_catall_comment"]){ if($row['content_comment'] && isset($content_pref["content_catall_comment"]) && $content_pref["content_catall_comment"]){
$sqlc = new db; $sqlc = new db;
$comment_total = $sqlc -> db_Select("comments", "*", "comment_item_id='".$row['content_id']."' AND comment_type='".$plugintable."' AND comment_pid='0' "); $comment_total = $sqlc -> db_Select("comments", "*", "comment_item_id='".$row['content_id']."' AND comment_type='".$plugintable."' AND comment_pid='0' ");
return "<a href='".e_SELF."?cat.".$row['content_id'].".comment'>".CONTENT_LAN_57." ".$comment_total."</a>"; return "<a href='".e_SELF."?cat.".$row['content_id'].".comment'>".CONTENT_LAN_57." ".$comment_total."</a>";
} }
}elseif($sc_mode=='catlist'){ }elseif($sc_mode=='catlist'){
global $qs, $row, $comment_total, $content_pref, $sql, $plugintable; global $qs, $comment_total, $sql, $plugintable;
if($row['content_comment'] && isset($content_pref["content_cat_comment"]) && $content_pref["content_cat_comment"]){ if($row['content_comment'] && isset($content_pref["content_cat_comment"]) && $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' "); $comment_total = $sql -> db_Count("comments", "(*)", "WHERE comment_item_id='".intval($qs[1])."' AND comment_type='".$plugintable."' AND comment_pid='0' ");
return "<a href='".e_SELF."?cat.".$qs[1].".comment'>".CONTENT_LAN_57." ".$comment_total."</a>"; return "<a href='".e_SELF."?cat.".$qs[1].".comment'>".CONTENT_LAN_57." ".$comment_total."</a>";
} }
}elseif($sc_mode=='content'){ }elseif($sc_mode=='content'){
global $cobj, $qs, $content_pref, $row, $plugintable; 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((isset($content_pref["content_content_comment"]) && $content_pref["content_content_comment"] && $row['content_comment']) || $content_pref["content_content_comment_all"] ){
return $cobj -> count_comments($plugintable, $qs[1]); return $cobj -> count_comments($plugintable, $qs[1]);
} }
@@ -110,30 +110,29 @@ SC_BEGIN CM_DATE
global $row, $tp, $content_pref, $gen; global $row, $tp, $content_pref, $gen;
if($sc_mode){ if($sc_mode){
if($sc_mode=='archive'){ if($sc_mode=='archive'){
if(isset($content_pref["content_archive_date"]) && $content_pref["content_archive_date"]){ if(varsettrue($content_pref["content_archive_date"])){
$datestyle = ($content_pref["content_archive_datestyle"] ? $content_pref["content_archive_datestyle"] : "%d %b %Y"); $datestyle = varset($content_pref["content_archive_datestyle"],"%d %b %Y");
return strftime($datestyle, $row['content_datestamp']); return strftime($datestyle, $row['content_datestamp']);
} }
}elseif($sc_mode=='recent'){ }elseif($sc_mode=='recent'){
if(isset($content_pref["content_list_date"]) && $content_pref["content_list_date"]){ if(varsettrue($content_pref["content_list_date"])){
$datestyle = ($content_pref["content_list_datestyle"] ? $content_pref["content_list_datestyle"] : "%d %b %Y"); $datestyle = varset($content_pref["content_list_datestyle"],"%d %b %Y");
return strftime($datestyle, $row['content_datestamp']); return strftime($datestyle, $row['content_datestamp']);
} }
}elseif($sc_mode=='content'){ }elseif($sc_mode=='content'){
global $gen, $row, $content_pref; if(varsettrue($content_pref["content_content_date"])){
if(isset($content_pref["content_content_date"]) && $content_pref["content_content_date"]){ if(!is_object($gen)){ $gen = new convert; }
$gen = new convert;
$datestamp = preg_replace("# -.*#", "", $gen -> convert_date($row['content_datestamp'], "long")); $datestamp = preg_replace("# -.*#", "", $gen -> convert_date($row['content_datestamp'], "long"));
return ($datestamp != "" ? $datestamp : ""); return ($datestamp != "" ? $datestamp : "");
} }
}elseif($sc_mode=='cat'){ }elseif($sc_mode=='cat'){
if(isset($content_pref["content_catall_date"]) && $content_pref["content_catall_date"]){ if(varsettrue($content_pref["content_catall_date"])){
if(!is_object($gen)){ $gen = new convert; } if(!is_object($gen)){ $gen = new convert; }
$datestamp = preg_replace("# -.*#", "", $gen -> convert_date($row['content_datestamp'], "long")); $datestamp = preg_replace("# -.*#", "", $gen -> convert_date($row['content_datestamp'], "long"));
return ($datestamp != "" ? $datestamp : ""); return ($datestamp != "" ? $datestamp : "");
} }
}elseif($sc_mode=='catlist'){ }elseif($sc_mode=='catlist'){
if(isset($content_pref["content_cat_date"]) && $content_pref["content_cat_date"]){ if(varsettrue($content_pref["content_cat_date"])){
if(!is_object($gen)){ $gen = new convert; } if(!is_object($gen)){ $gen = new convert; }
$datestamp = preg_replace("# -.*#", "", $gen -> convert_date($row['content_datestamp'], "long")); $datestamp = preg_replace("# -.*#", "", $gen -> convert_date($row['content_datestamp'], "long"));
return ($datestamp != "" ? $datestamp : ""); return ($datestamp != "" ? $datestamp : "");
@@ -149,11 +148,11 @@ SC_BEGIN CM_EDITICON
global $content_pref, $row, $plugindir, $tp; global $content_pref, $row, $plugindir, $tp;
if($sc_mode){ if($sc_mode){
if($sc_mode=='content'){ if($sc_mode=='content'){
if(ADMIN && getperms("P") && isset($content_pref["content_content_editicon"])){ if(ADMIN && getperms("P") && varsettrue($content_pref["content_content_editicon"])){
return "<a href='".$plugindir."admin_content_config.php?content.edit.".$row['content_id']."'>".CONTENT_ICON_EDIT."</a>"; return "<a href='".$plugindir."admin_content_config.php?content.edit.".$row['content_id']."'>".CONTENT_ICON_EDIT."</a>";
} }
}elseif($sc_mode=='recent'){ }elseif($sc_mode=='recent'){
if(ADMIN && getperms("P") && isset($content_pref["content_list_editicon"]) && $content_pref["content_list_editicon"]){ if(ADMIN && getperms("P") && varsettrue($content_pref["content_list_editicon"])){
return $CONTENT_RECENT_TABLE_EDITICON = "<a href='".$plugindir."admin_content_config.php?content.edit.".$row['content_id']."'>".CONTENT_ICON_EDIT."</a>"; return $CONTENT_RECENT_TABLE_EDITICON = "<a href='".$plugindir."admin_content_config.php?content.edit.".$row['content_id']."'>".CONTENT_ICON_EDIT."</a>";
} }
} }
@@ -163,8 +162,8 @@ SC_END
SC_BEGIN CM_EPICONS SC_BEGIN CM_EPICONS
global $content_pref, $row, $tp; global $content_pref, $row, $tp;
if($sc_mode){ if($sc_mode){
$epicons = "";
if($sc_mode=='content'){ if($sc_mode=='content'){
$epicons = "";
if(($content_pref["content_content_peicon"] && $row['content_pe']) || $content_pref["content_content_peicon_all"]){ if(($content_pref["content_content_peicon"] && $row['content_pe']) || $content_pref["content_content_peicon_all"]){
$epicons = $tp -> parseTemplate("{EMAIL_ITEM=".CONTENT_LAN_69." ".CONTENT_LAN_71."^plugin:content.".$row['content_id']."}"); $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("{PRINT_ITEM=".CONTENT_LAN_70." ".CONTENT_LAN_71."^plugin:content.".$row['content_id']."}");
@@ -172,8 +171,7 @@ if($sc_mode){
return $epicons; return $epicons;
} }
}elseif($sc_mode=='recent'){ }elseif($sc_mode=='recent'){
$epicons = ""; if(varsettrue($content_pref["content_list_peicon"])){
if(isset($content_pref["content_list_peicon"]) && $content_pref["content_list_peicon"]){
if($row['content_pe'] || isset($content_pref["content_list_peicon_all"]) && $content_pref["content_list_peicon_all"]){ if($row['content_pe'] || isset($content_pref["content_list_peicon_all"]) && $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("{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("{PRINT_ITEM=".CONTENT_LAN_70." ".CONTENT_LAN_71."^plugin:content.".$row['content_id']."}");
@@ -182,22 +180,19 @@ if($sc_mode){
} }
} }
}elseif($sc_mode=='cat'){ }elseif($sc_mode=='cat'){
$epicons = ""; if($row['content_pe'] && varsettrue($content_pref["content_catall_peicon"])){
if($row['content_pe'] && isset($content_pref["content_catall_peicon"]) && $content_pref["content_catall_peicon"]){
$epicons = $tp -> parseTemplate("{EMAIL_ITEM=".CONTENT_LAN_69." ".CONTENT_LAN_72."^plugin:content.".$row['content_id']."}"); $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("{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']."}"); $epicons .= " ".$tp -> parseTemplate("{PDF=".CONTENT_LAN_76." ".CONTENT_LAN_71."^plugin:content.".$row['content_id']."}");
return $epicons; return $epicons;
} }
}elseif($sc_mode=='catlist'){ }elseif($sc_mode=='catlist'){
$epicons = ""; if( (varsettrue($content_pref["content_cat_peicon"]) && $row['content_pe']) || varsettrue($content_pref["content_cat_peicon_all"]) ){
if( (isset($content_pref["content_cat_peicon"]) && $content_pref["content_cat_peicon"] && $row['content_pe']) || (isset($content_pref["content_cat_peicon_all"]) && $content_pref["content_cat_peicon_all"])){
$epicons = $tp -> parseTemplate("{EMAIL_ITEM=".CONTENT_LAN_69." ".CONTENT_LAN_72."^plugin:content.$qs[1]}"); $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("{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]}"); $epicons .= " ".$tp -> parseTemplate("{PDF=".CONTENT_LAN_76." ".CONTENT_LAN_71."^plugin:content.$qs[1]}");
return $epicons; return $epicons;
} }
} }
} }
SC_END SC_END
@@ -249,33 +244,33 @@ if($sc_mode){
return $aa -> getIcon("item", $row['content_icon'], $content_icon_path, "content.".$row['content_id'], $width, $content_pref["content_blank_icon"]); return $aa -> getIcon("item", $row['content_icon'], $content_icon_path, "content.".$row['content_id'], $width, $content_pref["content_blank_icon"]);
} }
}elseif($sc_mode=='score'){ }elseif($sc_mode=='score'){
if(isset($content_pref["content_score_icon"]) && $content_pref["content_score_icon"]){ if(varsettrue($content_pref["content_score_icon"])){
$width = varsettrue($content_pref["content_upload_icon_size"], '100'); $width = varsettrue($content_pref["content_upload_icon_size"], '100');
$width = varsettrue($content_pref["content_score_icon_width"], $width); $width = varsettrue($content_pref["content_score_icon_width"], $width);
return $aa -> getIcon("item", $row['content_icon'], $content_icon_path, "content.".$row['content_id'], $width, $content_pref["content_blank_icon"]); return $aa -> getIcon("item", $row['content_icon'], $content_icon_path, "content.".$row['content_id'], $width, $content_pref["content_blank_icon"]);
} }
}elseif($sc_mode=='cat'){ }elseif($sc_mode=='cat'){
if(isset($content_pref["content_catall_icon"]) && $content_pref["content_catall_icon"]){ if(varsettrue($content_pref["content_catall_icon"])){
$qry = "cat.".$row['content_id']; $qry = "cat.".$row['content_id'];
return $aa -> getIcon("catlarge", $row['content_icon'], $content_cat_icon_path_large, $qry, "", $content_pref["content_blank_caticon"]); return $aa -> getIcon("catlarge", $row['content_icon'], $content_cat_icon_path_large, $qry, "", $content_pref["content_blank_caticon"]);
} }
}elseif($sc_mode=='catlist'){ }elseif($sc_mode=='catlist'){
if(isset($content_pref["content_cat_icon"]) && $content_pref["content_cat_icon"]){ if(varsettrue($content_pref["content_cat_icon"])){
return $aa -> getIcon("catlarge", $row['content_icon'], $content_cat_icon_path_large, "", "", $content_pref["content_blank_caticon"]); return $aa -> getIcon("catlarge", $row['content_icon'], $content_cat_icon_path_large, "", "", $content_pref["content_blank_caticon"]);
} }
}elseif($sc_mode=='catlistsub'){ }elseif($sc_mode=='catlistsub'){
if(isset($content_pref["content_catsub_icon"]) && $content_pref["content_catsub_icon"]){ if(varsettrue($content_pref["content_catsub_icon"])){
return $aa -> getIcon("catsmall", $row['content_icon'], $content_cat_icon_path_small, "cat.".$row['content_id'], "", $content_pref["content_blank_caticon"]); return $aa -> getIcon("catsmall", $row['content_icon'], $content_cat_icon_path_small, "cat.".$row['content_id'], "", $content_pref["content_blank_caticon"]);
} }
}elseif($sc_mode=='recent'){ }elseif($sc_mode=='recent'){
if(isset($content_pref["content_list_icon"]) && $content_pref["content_list_icon"]){ if(varsettrue($content_pref["content_list_icon"])){
$width = varsettrue($content_pref["content_upload_icon_size"], '100'); $width = varsettrue($content_pref["content_upload_icon_size"], '100');
return $aa -> getIcon("item", $row['content_icon'], $content_icon_path, "content.".$row['content_id'], $width, $content_pref["content_blank_icon"]); return $aa -> getIcon("item", $row['content_icon'], $content_icon_path, "content.".$row['content_id'], $width, $content_pref["content_blank_icon"]);
} }
}elseif($sc_mode=='author'){ }elseif($sc_mode=='author'){
return "<a href='".e_SELF."?author.".$row['content_id']."'>".CONTENT_ICON_AUTHORLIST."</a>"; return "<a href='".e_SELF."?author.".$row['content_id']."'>".CONTENT_ICON_AUTHORLIST."</a>";
}elseif($sc_mode=='content'){ }elseif($sc_mode=='content'){
if(isset($content_pref["content_content_icon"]) && $content_pref["content_content_icon"]){ if(varsettrue($content_pref["content_content_icon"])){
$width = varsettrue($content_pref["content_upload_icon_size"], '100'); $width = varsettrue($content_pref["content_upload_icon_size"], '100');
return $aa -> getIcon("item", $row['content_icon'], $content_icon_path, "", $width, $content_pref["content_blank_icon"]); return $aa -> getIcon("item", $row['content_icon'], $content_icon_path, "", $width, $content_pref["content_blank_icon"]);
} }
@@ -290,10 +285,6 @@ if($sc_mode){
}elseif($sc_mode=='manager_new'){ }elseif($sc_mode=='manager_new'){
if( (isset($content_pref["content_manager_personal"]) && check_class($content_pref["content_manager_personal"])) || (isset($content_pref["content_manager_category"]) && check_class($content_pref["content_manager_category"])) || (isset($content_pref["content_manager_submit"]) && check_class($content_pref["content_manager_submit"])) ){ if( (isset($content_pref["content_manager_personal"]) && check_class($content_pref["content_manager_personal"])) || (isset($content_pref["content_manager_category"]) && check_class($content_pref["content_manager_category"])) || (isset($content_pref["content_manager_submit"]) && check_class($content_pref["content_manager_submit"])) ){
//if(getperms('0')){
// return "<a href='".e_SELF."?content.create.".$row['content_id']."'>".CONTENT_MANAGER_LAN_1."</a> | <a href='".e_SELF."?content.submit.".$row['content_id']."'>".CONTENT_MANAGER_LAN_4."</a>";
//}
if( (isset($content_pref["content_manager_personal"]) && check_class($content_pref["content_manager_personal"])) || (isset($content_pref["content_manager_category"]) && check_class($content_pref["content_manager_category"])) ){ if( (isset($content_pref["content_manager_personal"]) && check_class($content_pref["content_manager_personal"])) || (isset($content_pref["content_manager_category"]) && check_class($content_pref["content_manager_category"])) ){
return "<a href='".e_SELF."?content.create.".$row['content_id']."'>".CONTENT_MANAGER_LAN_1."</a>"; return "<a href='".e_SELF."?content.create.".$row['content_id']."'>".CONTENT_MANAGER_LAN_1."</a>";
}elseif( isset($content_pref["content_manager_submit"]) && check_class($content_pref["content_manager_submit"]) ){ }elseif( isset($content_pref["content_manager_submit"]) && check_class($content_pref["content_manager_submit"]) ){
@@ -319,11 +310,11 @@ SC_BEGIN CM_PARENT
global $aa, $array, $row, $content_pref, $tp; global $aa, $array, $row, $content_pref, $tp;
if($sc_mode){ if($sc_mode){
if($sc_mode=='content'){ if($sc_mode=='content'){
if(isset($content_pref["content_content_parent"]) && $content_pref["content_content_parent"]){ if(varsettrue($content_pref["content_content_parent"])){
return $aa -> getCrumbItem($row['content_parent'], $array); return $aa -> getCrumbItem($row['content_parent'], $array);
} }
}elseif($sc_mode=='recent'){ }elseif($sc_mode=='recent'){
if(isset($content_pref["content_list_parent"]) && $content_pref["content_list_parent"]){ if(varsettrue($content_pref["content_list_parent"])){
return $aa -> getCrumbItem($row['content_parent'], $array); return $aa -> getCrumbItem($row['content_parent'], $array);
} }
} }
@@ -361,15 +352,13 @@ if($sc_mode){
return $rating; return $rating;
}elseif($sc_mode=='cat'){ }elseif($sc_mode=='cat'){
if($row['content_rate'] && isset($content_pref["content_catall_rating"]) && $content_pref["content_catall_rating"]){ if($row['content_rate'] && varsettrue($content_pref["content_catall_rating"])){
return $rater->composerating($plugintable, $row['content_id'], $enter=TRUE, $userid=FALSE); return $rater->composerating($plugintable, $row['content_id'], $enter=TRUE, $userid=FALSE);
} }
}elseif($sc_mode=='catlist'){ }elseif($sc_mode=='catlist'){
if( (isset($content_pref["content_cat_rating_all"]) && $content_pref["content_cat_rating_all"]) || (isset($content_pref["content_cat_rating"]) && $content_pref["content_cat_rating"] && $row['content_rate'])){ if( varsettrue($content_pref["content_cat_rating_all"]) || (varsettrue($content_pref["content_cat_rating"]) && $row['content_rate'])){
return $rater->composerating($plugintable, $row['content_id'], $enter=TRUE, $userid=FALSE); return $rater->composerating($plugintable, $row['content_id'], $enter=TRUE, $userid=FALSE);
} }
} }
} }
SC_END SC_END
@@ -378,7 +367,7 @@ SC_BEGIN CM_REFER
global $sql, $row, $tp, $qs, $content_pref, $plugintable; global $sql, $row, $tp, $qs, $content_pref, $plugintable;
if($sc_mode){ if($sc_mode){
if($sc_mode=='content'){ if($sc_mode=='content'){
if(isset($content_pref["content_content_refer"]) && $content_pref["content_content_refer"]){ if(varsettrue($content_pref["content_content_refer"])){
$sql -> db_Select($plugintable, "content_refer", "content_id='".intval($qs[1])."' "); $sql -> db_Select($plugintable, "content_refer", "content_id='".intval($qs[1])."' ");
list($content_refer) = $sql -> db_Fetch(); list($content_refer) = $sql -> db_Fetch();
$refercounttmp = explode("^", $content_refer); $refercounttmp = explode("^", $content_refer);
@@ -437,7 +426,7 @@ if($sc_mode){
if($sc_mode=='content'){ if($sc_mode=='content'){
return ($content_pref["content_content_subheading"] && $row['content_subheading'] ? $tp -> toHTML($row['content_subheading'], TRUE, "") : ""); return ($content_pref["content_content_subheading"] && $row['content_subheading'] ? $tp -> toHTML($row['content_subheading'], TRUE, "") : "");
}elseif($sc_mode=='recent'){ }elseif($sc_mode=='recent'){
if (isset($content_pref["content_list_subheading"]) && $content_pref["content_list_subheading"] && $row['content_subheading'] && $content_pref["content_list_subheading_char"] && $content_pref["content_list_subheading_char"] != "" && $content_pref["content_list_subheading_char"] != "0"){ if (varsettrue($content_pref["content_list_subheading"]) && $row['content_subheading'] && $content_pref["content_list_subheading_char"] && $content_pref["content_list_subheading_char"] != "" && $content_pref["content_list_subheading_char"] != "0"){
if(strlen($row['content_subheading']) > $content_pref["content_list_subheading_char"]) { if(strlen($row['content_subheading']) > $content_pref["content_list_subheading_char"]) {
$row['content_subheading'] = substr($row['content_subheading'], 0, $content_pref["content_list_subheading_char"]).$content_pref["content_list_subheading_post"]; $row['content_subheading'] = substr($row['content_subheading'], 0, $content_pref["content_list_subheading_char"]).$content_pref["content_list_subheading_post"];
} }
@@ -449,16 +438,15 @@ if($sc_mode){
}elseif($sc_mode=='type'){ }elseif($sc_mode=='type'){
return $tp -> toHTML($row['content_subheading'], TRUE, "emotes_off, no_make_clickable"); return $tp -> toHTML($row['content_subheading'], TRUE, "emotes_off, no_make_clickable");
}elseif($sc_mode=='cat'){ }elseif($sc_mode=='cat'){
if(isset($content_pref["content_catall_subheading"]) && $content_pref["content_catall_subheading"]){ if(varsettrue($content_pref["content_catall_subheading"])){
return $tp -> toHTML($row['content_subheading'], TRUE, ""); return $tp -> toHTML($row['content_subheading'], TRUE, "");
} }
}elseif($sc_mode=='catlist'){ }elseif($sc_mode=='catlist'){
if(isset($content_pref["content_cat_subheading"]) && $content_pref["content_cat_subheading"]){ if(varsettrue($content_pref["content_cat_subheading"])){
return $tp -> toHTML($row['content_subheading'], TRUE, ""); return $tp -> toHTML($row['content_subheading'], TRUE, "");
} }
}elseif($sc_mode=='catlistsub'){ }elseif($sc_mode=='catlistsub'){
if(isset($content_pref["content_catsub_subheading"]) && $content_pref["content_catsub_subheading"]){ if(varsettrue($content_pref["content_catsub_subheading"])){
return $tp -> toHTML($row['content_subheading'], TRUE, ""); return $tp -> toHTML($row['content_subheading'], TRUE, "");
} }
}elseif($sc_mode=='searchresult'){ }elseif($sc_mode=='searchresult'){
@@ -475,7 +463,7 @@ if($sc_mode){
if($sc_mode=='content'){ if($sc_mode=='content'){
return $CONTENT_CONTENT_TABLE_SUMMARY; return $CONTENT_CONTENT_TABLE_SUMMARY;
}elseif($sc_mode=='recent'){ }elseif($sc_mode=='recent'){
if (isset($content_pref["content_list_summary"]) && $content_pref["content_list_summary"]){ if (varsettrue($content_pref["content_list_summary"])){
if($row['content_summary'] && $content_pref["content_list_summary_char"] && $content_pref["content_list_summary_char"] != "" && $content_pref["content_list_summary_char"] != "0"){ if($row['content_summary'] && $content_pref["content_list_summary_char"] && $content_pref["content_list_summary_char"] != "" && $content_pref["content_list_summary_char"] != "0"){
if(strlen($row['content_summary']) > $content_pref["content_list_summary_char"]) { if(strlen($row['content_summary']) > $content_pref["content_list_summary_char"]) {
$row['content_summary'] = substr($row['content_summary'], 0, $content_pref["content_list_summary_char"]).$content_pref["content_list_summary_post"]; $row['content_summary'] = substr($row['content_summary'], 0, $content_pref["content_list_summary_char"]).$content_pref["content_list_summary_post"];
@@ -511,8 +499,8 @@ if($sc_mode){
$ret .= " ".$content_pref["content_list_text_post"]; $ret .= " ".$content_pref["content_list_text_post"];
} }
} }
return $ret;
} }
return $ret;
}elseif($sc_mode=='cat'){ }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'] && 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($content_pref["content_catall_text_char"] == 'all'){ if($content_pref["content_catall_text_char"] == 'all'){
@@ -553,8 +541,6 @@ if($sc_mode){
return $tp -> toHTML($row['content_text'], TRUE, ""); return $tp -> toHTML($row['content_text'], TRUE, "");
} }
} }
SC_END SC_END
@@ -584,8 +570,6 @@ if($sc_mode){
} }
return ($filesexisting == "0" ? "" : CONTENT_LAN_41." ".($filesexisting == 1 ? CONTENT_LAN_42 : CONTENT_LAN_43)." ".$file." "); return ($filesexisting == "0" ? "" : CONTENT_LAN_41." ".($filesexisting == 1 ? CONTENT_LAN_42 : CONTENT_LAN_43)." ".$file." ");
} }
}elseif($sc_mode=='print'){ }elseif($sc_mode=='print'){
}elseif($sc_mode=='pdf'){ }elseif($sc_mode=='pdf'){
} }
@@ -700,28 +684,6 @@ if($sc_mode){
} }
SC_END SC_END
//SC_BEGIN CM_AUTHOR
//global $row, $tp;
//if($sc_mode){
// if($sc_mode=='archive'){
// }elseif($sc_mode=='author'){
// }elseif($sc_mode=='cat'){
// }elseif($sc_mode=='catlist'){
// }elseif($sc_mode=='content'){
// }elseif($sc_mode=='recent'){
// }elseif($sc_mode=='score'){
// }elseif($sc_mode=='top'){
// }elseif($sc_mode=='type'){
// }else{
// }
//}else{
//}
//SC_END
// ############################################################################ // ############################################################################
// ##### SHORTCODES THAT STILL NEED TO BE CONVERTED TO THE NEW STANDARD! ------ // ##### SHORTCODES THAT STILL NEED TO BE CONVERTED TO THE NEW STANDARD! ------
// ############################################################################ // ############################################################################
@@ -765,7 +727,6 @@ if($content_pref["content_archive_letterindex"]){
} }
SC_END SC_END
// CONTENT_RECENT_TABLE ------------------------------------------------ // CONTENT_RECENT_TABLE ------------------------------------------------
SC_BEGIN CONTENT_RECENT_TABLE_INFOPRE SC_BEGIN CONTENT_RECENT_TABLE_INFOPRE
global $CONTENT_RECENT_TABLE_INFOPRE; global $CONTENT_RECENT_TABLE_INFOPRE;
@@ -881,7 +842,6 @@ global $CONTENT_SEARCH_TABLE_KEYWORD;
return $CONTENT_SEARCH_TABLE_KEYWORD; return $CONTENT_SEARCH_TABLE_KEYWORD;
SC_END SC_END
// ############################################################################ // ############################################################################
// ##### SHORTCODES USED IN THE MENU ------------------------------------------ // ##### SHORTCODES USED IN THE MENU ------------------------------------------
// ############################################################################ // ############################################################################
@@ -1105,8 +1065,6 @@ global $CMT_RECENT;
return $CMT_RECENT; return $CMT_RECENT;
SC_END SC_END
// ############################################################################ // ############################################################################
// ##### SHORTCODES USED IN THE ADMIN PAGES ----------------------------------- // ##### SHORTCODES USED IN THE ADMIN PAGES -----------------------------------
// ############################################################################ // ############################################################################
@@ -1780,8 +1738,6 @@ global $CONTENTFORM_PRESET_VALUE;
return $CONTENTFORM_PRESET_VALUE; return $CONTENTFORM_PRESET_VALUE;
SC_END SC_END
// ############################################################################ // ############################################################################
// ##### DEPRECATED SHORTCODES ! WILL BE REMOVED AFTER THE NEXT RELEASE ------- // ##### DEPRECATED SHORTCODES ! WILL BE REMOVED AFTER THE NEXT RELEASE -------
// ############################################################################ // ############################################################################

20
e107_plugins/content/handlers/content_class.php
View File

@@ -12,8 +12,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_plugins/content/handlers/content_class.php,v $ | $Source: /cvs_backup/e107_0.8/e107_plugins/content/handlers/content_class.php,v $
| $Revision: 1.14 $ | $Revision: 1.15 $
| $Date: 2007-04-12 21:35:00 $ | $Date: 2007-04-12 23:11:46 $
| $Author: lisa_ $ | $Author: lisa_ $
+---------------------------------------------------------------+ +---------------------------------------------------------------+
*/ */
@@ -375,12 +375,9 @@ class content{
$content_pref[$k] = $tp->toDB($v); $content_pref[$k] = $tp->toDB($v);
} }
} }
return $content_pref; return $content_pref;
} }
function getContentPref($id="") { function getContentPref($id="") {
global $sql, $plugintable, $qs, $tp, $eArrayStorage; global $sql, $plugintable, $qs, $tp, $eArrayStorage;
@@ -557,7 +554,6 @@ class content{
return $content_pref; return $content_pref;
} }
function CONTENTREGEXP($var){ function CONTENTREGEXP($var){
return "(^|,)(".str_replace(",", "|", $var).")(,|$)"; return "(^|,)(".str_replace(",", "|", $var).")(,|$)";
} }
@@ -721,8 +717,6 @@ class content{
} }
} }
function countCatItems($id){ function countCatItems($id){
global $sqlcountitemsincat, $plugintable, $datequery; global $sqlcountitemsincat, $plugintable, $datequery;
//$id : category content_id //$id : category content_id
@@ -741,7 +735,6 @@ class content{
return $n; return $n;
} }
function getCategoryHeading($id){ function getCategoryHeading($id){
global $plugintable, $sql; global $plugintable, $sql;
$qry = " $qry = "
@@ -850,8 +843,6 @@ class content{
define("e_PAGETITLE", $page); define("e_PAGETITLE", $page);
} }
function getAuthor($content_author) { function getAuthor($content_author) {
global $sql, $plugintable, $datequery; global $sql, $plugintable, $datequery;
@@ -887,8 +878,6 @@ class content{
return $getauthor; return $getauthor;
} }
function getMainParent($id){ function getMainParent($id){
global $sql, $plugintable; global $sql, $plugintable;
@@ -908,7 +897,6 @@ class content{
return $val; return $val;
} }
//$mode : managecontent, createcontent, category //$mode : managecontent, createcontent, category
function ShowOption($currentparent="", $mode=''){ function ShowOption($currentparent="", $mode=''){
global $qs, $sql, $rs, $plugintable, $tp, $content_pref, $stylespacer; global $qs, $sql, $rs, $plugintable, $tp, $content_pref, $stylespacer;
@@ -998,7 +986,6 @@ class content{
return $text; return $text;
} }
function getOrder(){ function getOrder(){
global $qs, $content_pref; global $qs, $content_pref;
@@ -1044,8 +1031,6 @@ class content{
return $order; return $order;
} }
function getIcon($mode, $icon, $path="", $linkid="", $width="", $blank=""){ function getIcon($mode, $icon, $path="", $linkid="", $width="", $blank=""){
global $content_cat_icon_path_small, $content_cat_icon_path_large, $content_icon_path, $content_pref; global $content_cat_icon_path_small, $content_cat_icon_path_large, $content_icon_path, $content_pref;
@@ -1137,7 +1122,6 @@ class content{
if(!isset($searchtypeid)){ if(!isset($searchtypeid)){
$searchtypeid = (is_numeric($qs[1]) ? $qs[1] : $qs[2]); $searchtypeid = (is_numeric($qs[1]) ? $qs[1] : $qs[2]);
} }
if($mode == "menu"){ if($mode == "menu"){
$CONTENT_SEARCH_TABLE_KEYWORD = $rs -> form_open("post", $plugindir."content.php?recent.$searchtypeid", "contentsearchmenu_{$mode}", "", "enctype='multipart/form-data'")."<div><input class='tbox' size='20' type='text' id='searchfieldmenu_{$mode}' name='searchfieldmenu_{$mode}' value='".(isset($_POST['searchfieldmenu_{$mode}']) ? $_POST['searchfieldmenu_{$mode}'] : CONTENT_LAN_18)."' maxlength='100' onfocus=\"document.forms['contentsearchmenu_{$mode}'].searchfieldmenu_$mode.value='';\" /> <input class='button' type='submit' name='searchsubmit' value='".CONTENT_LAN_19."' /></div>".$rs -> form_close(); $CONTENT_SEARCH_TABLE_KEYWORD = $rs -> form_open("post", $plugindir."content.php?recent.$searchtypeid", "contentsearchmenu_{$mode}", "", "enctype='multipart/form-data'")."<div><input class='tbox' size='20' type='text' id='searchfieldmenu_{$mode}' name='searchfieldmenu_{$mode}' value='".(isset($_POST['searchfieldmenu_{$mode}']) ? $_POST['searchfieldmenu_{$mode}'] : CONTENT_LAN_18)."' maxlength='100' onfocus=\"document.forms['contentsearchmenu_{$mode}'].searchfieldmenu_$mode.value='';\" /> <input class='button' type='submit' name='searchsubmit' value='".CONTENT_LAN_19."' /></div>".$rs -> form_close();
}else{ }else{