diff --git a/e107_admin/header.php b/e107_admin/header.php index 181580ddb..601603e27 100644 --- a/e107_admin/header.php +++ b/e107_admin/header.php @@ -179,7 +179,7 @@ else // XHTML * */ -echo "\n"; // Works better for iOS but still has some issues. +echo "\n"; // Works better for iOS but still has some issues. // echo (defined("VIEWPORT")) ? "\n" : ""; echo "".(defined("e_PAGETITLE") ? e_PAGETITLE." - " : (defined("PAGE_NAME") ? PAGE_NAME." - " : "")).LAN_HEADER_04." :: ".SITENAME."\n"; diff --git a/e107_core/bbcodes/bb_img.php b/e107_core/bbcodes/bb_img.php index d06169905..60ec525ba 100644 --- a/e107_core/bbcodes/bb_img.php +++ b/e107_core/bbcodes/bb_img.php @@ -23,7 +23,7 @@ class bb_img extends e_bb_base if(vartrue($parms['class'])) $safe['class'] = eHelper::secureClassAttr($parms['class']); if(vartrue($parms['id'])) $safe['id'] = eHelper::secureIdAttr($parms['id']); if(vartrue($parms['style'])) $safe['style'] = eHelper::secureStyleAttr($parms['style']); - if(vartrue($parms['alt'])) $safe['alt'] = e107::getParser()->filter($parms['style'],'str'); + if(vartrue($parms['alt'])) $safe['alt'] = e107::getParser()->filter($parms['alt'],'str'); if($safe) { diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php index b8a778d5e..0846bf3e8 100644 --- a/e107_handlers/admin_ui.php +++ b/e107_handlers/admin_ui.php @@ -6079,7 +6079,7 @@ class e_admin_form_ui extends e_form ".$this->text('searchquery', $current_query[0], 50, $input_options)." - ".$this->select_open('filter_options', array('class' => 'form-control e-tip tbox select filter', 'id' => false, 'title'=>RL_LAN_088))." + ".$this->select_open('filter_options', array('class' => 'form-control e-tip tbox select filter', 'id' => false, 'title'=>LAN_FILTER))." ".$this->option(LAN_FILTER_LABEL_DISPLAYALL, '')." ".$this->option(LAN_FILTER_LABEL_CLEAR, '___reset___')." ".$this->renderBatchFilter('filter', $current_query[1])." @@ -6513,11 +6513,11 @@ class e_admin_form_ui extends e_form //TODO today, yesterday, this-month, last-month . $dateFilters = array ( - 'hour' => RL_LAN_127, - "day" => RL_LAN_128, - "week" => RL_LAN_129, - "month" => RL_LAN_130, - "year" => RL_LAN_131 + 'hour' => LAN_UI_FILTER_PAST_HOUR, + "day" => LAN_UI_FILTER_PAST_24_HOURS, + "week" => LAN_UI_FILTER_PAST_WEEK, + "month" => LAN_UI_FILTER_PAST_MONTH, + "year" => LAN_UI_FILTER_PAST_YEAR ); foreach($dateFilters as $k => $name) diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php index ffedef130..e10819b93 100644 --- a/e107_handlers/e_parse_class.php +++ b/e107_handlers/e_parse_class.php @@ -792,6 +792,7 @@ class e_parse extends e_parser if (e107::wysiwyg() !== true) { // fix for utf-8 issue with html_entity_decode(); ??? + $text = urldecode($text); // $text = str_replace(" ", " ", $text); } return $text; diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php index a1e621cb6..d13898d95 100644 --- a/e107_languages/English/admin/lan_admin.php +++ b/e107_languages/English/admin/lan_admin.php @@ -5,7 +5,6 @@ * Admin Language File * */ - define("ADLAN_0", "News"); define("ADLAN_1", "Manage news items"); define("ADLAN_2", "Create news item"); @@ -401,7 +400,6 @@ define("LAN_FILTER_LABEL_DISPLAYALL", "Display All"); define("LAN_FILTER_LABEL_CLEAR", "Clear Filter"); define("LAN_FILTER_LABEL_TYPED", "(typed)"); -//FIXME Remove html define("LAN_UI_NOPID_ERROR", "There is no [b]Primary ID[/b] set"); define("LAN_UI_BATCHDEL_ERROR", "Batch delete not allowed!"); define("LAN_UI_404_BODY_ERROR", "Requested page was not found!"); @@ -425,6 +423,11 @@ define("LAN_UI_BATCH_CREATELINK", "Create Link"); define("LAN_UI_USING_DATABASE_TABLE", "Using [x] database table"); define("LAN_UI_TOTAL_RECORDS", "Total Records: [x]"); +define("LAN_UI_FILTER_PAST_HOUR", "Past Hour"); +define("LAN_UI_FILTER_PAST_24_HOURS", "Past 24 hours"); +define("LAN_UI_FILTER_PAST_WEEK", "Past Week"); +define("LAN_UI_FILTER_PAST_MONTH", "Past Month"); +define("LAN_UI_FILTER_PAST_YEAR", "Past Year"); define("LAN_USER_MANAGEALL", "Manage all User, Userclass and Extended User-Field settings"); define("LAN_USER_LIST", "User List"); @@ -456,3 +459,15 @@ define("LAN_SELECT_COLUMNS_TO_DISPLAY", "Select columns to display"); define("LAN_DISPLAY_COLUMNS", "Display Columns"); define("LAN_SETTINGS_NOT_SAVED_NO_CHANGES_MADE", "Settings not saved as no changes were made."); define("LAN_DASHBOARD_LAYOUT", "Dashboard Layout"); +define("LAN_AFTER_SUBMIT", "After submit:"); +define("LAN_UNAVAILABLE", "Unavailable"); +define("LAN_READY_UP_FOLDER_FIELDS", "Ready to use upload form fields, optional - file list view"); +define("LAN_NO_LABEL_PROVIDED", "No Label Provided"); +define("LAN_NOT_FOUND", "Not Found!"); +define("LAN_QUICK_VIEW", "Quick View"); +define("LAN_GO_TO_USER_PROFILE", "Go to user profile"); +define("LAN_MULTI_LANGUAGE_FIELD", "Multi-language field"); +define("LAN_GO_TO_LIST", "go to list"); +define("LAN_CREATE_ANOTHER", "create another"); +define("LAN_EDIT_CURRENT", "edit current"); +define("LAN_MAINTENANCE", "Maintenance"); diff --git a/e107_languages/English/admin/lan_admin_log.php b/e107_languages/English/admin/lan_admin_log.php index 105c5dff8..39219a69c 100644 --- a/e107_languages/English/admin/lan_admin_log.php +++ b/e107_languages/English/admin/lan_admin_log.php @@ -85,7 +85,7 @@ define("RL_LAN_084", "Temporary accounts"); define("RL_LAN_085", "[x] record(s) successfully deleted!"); define("RL_LAN_086", "[x] records not found and not deleted!"); define("RL_LAN_087", "Details"); -define("RL_LAN_088", "Filter the results below"); + // Intentional gap define("RL_LAN_090", "Download ID"); define("RL_LAN_091", "Detailed timings"); @@ -126,11 +126,7 @@ define("RL_LAN_123", "User audit trail class"); define("RL_LAN_124", "User audit trail actions"); define("RL_LAN_125", "System Logs Maintenance"); define("RL_LAN_126", "Total [x] entries matching search condition"); -define("RL_LAN_127", "Past Hour"); -define("RL_LAN_128", "Past 24 hours"); -define("RL_LAN_129", "Past Week"); -define("RL_LAN_130", "Past Month"); -define("RL_LAN_131", "Past Year"); + define("RL_LAN_132", "Informative"); define("RL_LAN_133", "Notice"); define("RL_LAN_134", "Warning"); diff --git a/e107_plugins/forum/forum.php b/e107_plugins/forum/forum.php index 7fdd39077..923e4b2f6 100644 --- a/e107_plugins/forum/forum.php +++ b/e107_plugins/forum/forum.php @@ -303,18 +303,24 @@ str_replace("[x]", ($total_topics+$total_replies), LAN_FORUM_0031)." ($total_top ".(!defined("e_TRACKING_DISABLED") ? "" : "
".$users." ".($users == 1 ? LAN_FORUM_0059 : LAN_FORUM_0060)." (".$member_users." ".($member_users == 1 ? LAN_FORUM_0061 : LAN_FORUM_0062).", ".$guest_users." ".($guest_users == 1 ? LAN_FORUM_0063 : LAN_FORUM_0064).")
".LAN_FORUM_0066." ".$total_members."
".LAN_FORUM_0065." ".$nuser_name.".\n"); // FIXME cannot find other references to e_TRACKING_DISABLED, use pref? --*/ -// FIX - core template always override theme template -// Include core template -include(e_PLUGIN.'forum/templates/forum_template.php'); -// Override with theme template -if (file_exists(THEME.'forum_template.php')) + + +$FORUM_TEMPLATE = e107::getTemplate('forum','forum'); // required to use v2.x wrapper shortcode wrappers. + +if(empty($FORUM_TEMPLATE)) //v1.x fallback. { - include_once(THEME.'forum_template.php'); -} -elseif(file_exists(THEME.'templates/forum/forum_template.php')) -{ - require_once(THEME.'templates/forum/forum_template.php'); + include(e_PLUGIN.'forum/templates/forum_template.php'); + + // Override with theme template + if (file_exists(THEME.'forum_template.php')) + { + include_once(THEME.'forum_template.php'); + } + elseif(file_exists(THEME.'templates/forum/forum_template.php')) + { + require_once(THEME.'templates/forum/forum_template.php'); + } } if(is_array($FORUM_TEMPLATE) && deftrue('BOOTSTRAP',false)) // new v2.x format. @@ -366,7 +372,9 @@ foreach ($forumList['parents'] as $parent) //---- $sc->parentname = $parent['forum_name']; //-- $forum_string .= $tp->simpleParse($FORUM_MAIN_PARENT, $pVars); // $sc->fparent = $parent; - $sc->setVars($parent); + + $sc->setVars($parent); + $sc->wrapper('forum/main/parent'); $forum_string .= $tp->parseTemplate($FORUM_MAIN_PARENT, false, $sc); if (!count($forumList['forums'][$parent['forum_id']])) { @@ -527,7 +535,9 @@ function parse_forum($f, $restricted_string = '') --*/ //-- return $tp->simpleParse($FORUM_MAIN_FORUM, $fVars); - return $tp->parseTemplate($FORUM_MAIN_FORUM, false, $sc); + $sc->wrapper('forum/main/forum'); + + return $tp->parseTemplate($FORUM_MAIN_FORUM, true, $sc); } @@ -638,8 +648,11 @@ $breadarray = array( //-- $fVars->FORUM_BREADCRUMB = $frm->breadcrumb($breadarray); //-- $forum_main_start = $tp->simpleParse($FORUM_MAIN_START, $fVars); +$sc->wrapper('forum/main/start'); $forum_main_start = $tp->parseTemplate($FORUM_MAIN_START, false, $sc); //-- $forum_main_end = $tp->simpleParse($FORUM_MAIN_END, $fVars); + +$sc->wrapper('forum/main/end'); $forum_main_end = $tp->parseTemplate($FORUM_MAIN_END, false, $sc); if ($forum->prefs->get('enclose')) @@ -795,7 +808,8 @@ function forum_track() $data['UNTRACK'] = "".IMAGE_track.""; - $forum_trackstring .= $tp->simpleParse($FORUM_TRACK_MAIN, $data); + $data['_WRAPPER_'] = 'forum/track/item'; + $forum_trackstring .= $tp->parseTemplate($FORUM_TRACK_MAIN, true, $data); } } // print_a($FORUM_TRACK_START); @@ -811,9 +825,12 @@ function forum_track() $data['FORUM_BREADCRUMB'] = e107::getForm()->breadcrumb($breadarray); } + $data['_WRAPPER_'] = 'forum/track/start'; + $forum_track_start = $tp->parseTemplate($FORUM_TRACK_START, true, $data); + + $data['_WRAPPER_'] = 'forum/track/end'; + $forum_track_end = $tp->parseTemplate($FORUM_TRACK_END, true, $data); - $forum_track_start = $tp->simpleParse($FORUM_TRACK_START, $data); - $forum_track_end = $tp->simpleParse($FORUM_TRACK_END, $data); // if ($forum->prefs->get('enclose')) { diff --git a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php index 1aae23cef..74b60dd9f 100644 --- a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php +++ b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php @@ -225,7 +225,11 @@ if(!empty($viewable)) //else //{ //-- Possible candidate for wrapper???? - return empty($viewable)?'':"
".LAN_FORUM_8012."
".$viewable."
"; +/* WORKING WRAPPER + $SC_WRAPPER['VIEWABLE_BY'] = "
".LAN_FORUM_8012."
{---}
"; + +*/ + return empty($viewable)?'':$viewable; } function sc_search() diff --git a/e107_plugins/forum/templates/forum_viewforum_template.php b/e107_plugins/forum/templates/forum_viewforum_template.php index ea7f1c5a9..42ba5ced9 100644 --- a/e107_plugins/forum/templates/forum_viewforum_template.php +++ b/e107_plugins/forum/templates/forum_viewforum_template.php @@ -343,6 +343,8 @@ $FORUM_VIEWFORUM_TEMPLATE['sub-footer'] = ""; $FORUM_VIEWFORUM_TEMPLATE['divider-important'] = "".LAN_FORUM_1006."".LAN_FORUM_0003."".LAN_FORUM_1005."".LAN_FORUM_0004.""; $FORUM_VIEWFORUM_TEMPLATE['divider-normal'] = "".LAN_FORUM_1007."".LAN_FORUM_0003."".LAN_FORUM_1005."".LAN_FORUM_0004.""; +$SC_WRAPPER['VIEWABLE_BY'] = "
".LAN_FORUM_8012."
{---}
"; + $FORUM_VIEWFORUM_TEMPLATE['footer'] = "