mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-19 04:41:53 +02:00
Code Issues Releases Wiki Activity

content: ideas 1228 : added option to use all icons or just the 'tmp' icons (for both icons and attachments). Useful if you want to reuse the same icons and attachments in multiple content items

Browse Source
This commit is contained in:
lia
2007-04-18 21:41:58 +00:00
parent 91d45d6eb3
commit 04d8264594
4 changed files with 56 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,8 +12,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/content/handlers/content_class.php,v $
| $Revision: 1.21 $
| $Date: 2007-04-18 20:46:04 $
| $Revision: 1.22 $
| $Date: 2007-04-18 21:41:58 $
| $Author: lisa_ $
+---------------------------------------------------------------+
*/
@@ -54,6 +54,8 @@ class content{
$cp['content_admin_layout'] = ''; //should the option for choosing a layout template be shown
$cp['content_admin_customtags'] = ''; //should options for adding additional data be shown
$cp['content_admin_presettags'] = ''; //should preset data tags be shown
$cp['content_admin_loadicons'] = 0; //load all icons, or only the 'tmp' icons, when assigning an icon
$cp['content_admin_loadattach'] = 0; //load all attachments, or only the 'tmp' attachments, when assigning an attachment
//ADMIN CREATE CATEGORY FORM
$cp['content_admincat_subheading'] = '1'; //should subheading be available

32
e107_plugins/content/handlers/content_form_class.php
View File

@@ -12,8 +12,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/content/handlers/content_form_class.php,v $
| $Revision: 1.16 $
| $Date: 2007-04-18 21:13:23 $
| $Revision: 1.17 $
| $Date: 2007-04-18 21:41:58 $
| $Author: lisa_ $
+---------------------------------------------------------------+
*/
@@ -213,7 +213,7 @@ class contentform{
}
function show_create_content($mode, $userid="", $username=""){
global $qs, $sql, $ns, $rs, $aa, $fl, $tp, $content_shortcodes, $content_pref, $plugintable, $plugindir, $pref, $eArrayStorage, $message, $row, $show, $content_author_name_value, $content_author_name_js, $content_author_email_value, $content_author_email_js, $content_author_id, $months, $ne_day, $ne_month, $ne_year, $current_year, $end_day, $end_month, $end_year, $checkicon, $checkattach, $checkimages, $content_tmppath_icon, $content_tmppath_file, $content_tmppath_image, $iconlist, $checkattachnumber, $filelist, $checkimagesnumber, $imagelist, $CONTENTFORM_CATEGORY, $CONTENTFORM_CUSTOM, $CONTENTFORM_CUSTOM_KEY, $CONTENTFORM_CUSTOM_VALUE, $CONTENT_ADMIN_CONTENT_CREATE_CUSTOMSTART, $CONTENT_ADMIN_CONTENT_CREATE_CUSTOMTABLE, $CONTENT_ADMIN_CONTENT_CREATE_CUSTOMEND, $CONTENTFORM_PRESET, $CONTENT_ADMIN_CONTENT_CREATE, $CONTENT_ADMIN_BUTTON;
global $qs, $sql, $ns, $rs, $aa, $fl, $tp, $content_shortcodes, $content_pref, $plugintable, $plugindir, $pref, $eArrayStorage, $message, $row, $show, $content_author_name_value, $content_author_name_js, $content_author_email_value, $content_author_email_js, $content_author_id, $months, $ne_day, $ne_month, $ne_year, $current_year, $end_day, $end_month, $end_year, $content_tmppath_icon, $content_tmppath_file, $content_tmppath_image, $iconlist, $checkattachnumber, $filelist, $checkimagesnumber, $imagelist, $CONTENTFORM_CATEGORY, $CONTENTFORM_CUSTOM, $CONTENTFORM_CUSTOM_KEY, $CONTENTFORM_CUSTOM_VALUE, $CONTENT_ADMIN_CONTENT_CREATE_CUSTOMSTART, $CONTENT_ADMIN_CONTENT_CREATE_CUSTOMTABLE, $CONTENT_ADMIN_CONTENT_CREATE_CUSTOMEND, $CONTENTFORM_PRESET, $CONTENT_ADMIN_CONTENT_CREATE, $CONTENT_ADMIN_BUTTON;
$months = array(CONTENT_ADMIN_DATE_LAN_0, CONTENT_ADMIN_DATE_LAN_1, CONTENT_ADMIN_DATE_LAN_2, CONTENT_ADMIN_DATE_LAN_3, CONTENT_ADMIN_DATE_LAN_4, CONTENT_ADMIN_DATE_LAN_5, CONTENT_ADMIN_DATE_LAN_6, CONTENT_ADMIN_DATE_LAN_7, CONTENT_ADMIN_DATE_LAN_8, CONTENT_ADMIN_DATE_LAN_9, CONTENT_ADMIN_DATE_LAN_10, CONTENT_ADMIN_DATE_LAN_11);
@@ -610,14 +610,22 @@ class contentform{
$show['upload'] = false;
}
if($checkicon){
$iconlist = $fl->get_files($content_pref['content_icon_path_tmp'],"",$rejectlist);
$list1 = $fl->get_files($content_pref['content_icon_path_tmp'],"",$rejectlist);
if(varsettrue($content_pref['content_admin_loadicons'])){
$list2 = $fl->get_files($content_pref['content_icon_path'],"",$rejectlist);
}
$iconlist = ($list2) ? array_merge($list1, $list2) : $list1;
$show['icon'] = true;
}else{
$show['icon'] = false;
$hidden .= $rs -> form_hidden("content_icon", $row['content_icon']);
}
if($checkattach){
$filelist = $fl->get_files($content_pref['content_file_path_tmp'],"",$rejectlist);
$list1 = $fl->get_files($content_pref['content_file_path_tmp'],"",$rejectlist);
if(varsettrue($content_pref['content_admin_loadattach'])){
$list2 = $fl->get_files($content_pref['content_file_path'],"",$rejectlist);
}
$filelist = ($list2) ? array_merge($list1, $list2) : $list1;
$show['attach'] = true;
}else{
$show['attach'] = false;
@@ -1860,6 +1868,20 @@ class contentform{
$TOPIC_FIELD .= $rs -> form_select_close();
$text .= preg_replace("/\{(.*?)\}/e", '$\1', $TOPIC_ROW_NOEXPAND);
//content_admin_loadicons
$TOPIC_TOPIC = CONTENT_ADMIN_OPT_LAN_176;
$TOPIC_FIELD = "
".$rs -> form_radio("content_admin_loadicons", "1", ($content_pref['content_admin_loadicons'] ? "1" : "0"), "", "").CONTENT_ADMIN_OPT_LAN_SECTION_30."
".$rs -> form_radio("content_admin_loadicons", "0", ($content_pref['content_admin_loadicons'] ? "0" : "1"), "", "").CONTENT_ADMIN_OPT_LAN_SECTION_31;
$text .= preg_replace("/\{(.*?)\}/e", '$\1', $TOPIC_ROW_NOEXPAND);
//content_admin_loadattach
$TOPIC_TOPIC = CONTENT_ADMIN_OPT_LAN_177;
$TOPIC_FIELD = "
".$rs -> form_radio("content_admin_loadattach", "1", ($content_pref['content_admin_loadattach'] ? "1" : "0"), "", "").CONTENT_ADMIN_OPT_LAN_SECTION_30."
".$rs -> form_radio("content_admin_loadattach", "0", ($content_pref['content_admin_loadattach'] ? "0" : "1"), "", "").CONTENT_ADMIN_OPT_LAN_SECTION_31;
$text .= preg_replace("/\{(.*?)\}/e", '$\1', $TOPIC_ROW_NOEXPAND);
//content_admin_custom_preset_
$TOPIC_TOPIC = CONTENT_ADMIN_OPT_LAN_6;
$TOPIC_HEADING = CONTENT_ADMIN_OPT_LAN_7;