mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00
Code Issues Releases Wiki Activity

Resolve conflict with merging upstream repository changes into this fork.

Browse Source
This commit is contained in:
Lóna Lore
2016-11-15 20:19:10 +01:00
parent 407b6fe939 d2a0685a67
commit e4aefdb6b1
9 changed files with 67 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/header.php
View File

@@ -179,7 +179,7 @@ else // XHTML
*
*/
echo "<meta name=\"viewport\" content=\"width=device-width; initial-scale=0.8; maximum-scale=1\" />\n"; // Works better for iOS but still has some issues.
echo "<meta name=\"viewport\" content=\"width=device-width, initial-scale=0.8, maximum-scale=1\" />\n"; // Works better for iOS but still has some issues.
// echo (defined("VIEWPORT")) ? "<meta name=\"viewport\" content=\"".VIEWPORT."\" />\n" : "";
echo "<title>".(defined("e_PAGETITLE") ? e_PAGETITLE." - " : (defined("PAGE_NAME") ? PAGE_NAME." - " : "")).LAN_HEADER_04." :: ".SITENAME."</title>\n";

2
e107_core/bbcodes/bb_img.php
View File

@@ -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)
{

12
e107_handlers/admin_ui.php
View File

@@ -6079,7 +6079,7 @@ class e_admin_form_ui extends e_form
".$this->text('searchquery', $current_query[0], 50, $input_options)."
<i class='fa fa-search searchquery form-control-feedback form-control-feedback-left'></i>
<span>
".$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)

1
e107_handlers/e_parse_class.php
View File

@@ -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("&nbsp;", " ", $text);
}
return $text;

19
e107_languages/English/admin/lan_admin.php
View File

@@ -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");

8
e107_languages/English/admin/lan_admin_log.php
View File

@@ -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");

47
e107_plugins/forum/forum.php
View File

@@ -303,18 +303,24 @@ str_replace("[x]", ($total_topics+$total_replies), LAN_FORUM_0031)." ($total_top
".(!defined("e_TRACKING_DISABLED") ? "" : "<br />".$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).")<br />".LAN_FORUM_0066." ".$total_members."<br />".LAN_FORUM_0065." <a href='".e_HTTP."user.php ?id.".$nuser_id."'>".$nuser_name."</a>.\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'] = "<a id='".$buttonId."' href='#' title=\"".$trackDiz."\" data-token='".e_TOKEN."' data-forum-insert='".$buttonId."' data-forum-post='".$row['thread_forum_id']."' data-forum-thread='".$row['thread_id']."' data-forum-action='track' name='track' class='btn btn-primary' >".IMAGE_track."</a>";
$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'))
{

6
e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
View File

@@ -225,7 +225,11 @@ if(!empty($viewable))
//else
//{
//-- Possible candidate for wrapper????
return empty($viewable)?'':"<div class='panel panel-default' style='margin-top:10px'><div class='panel-heading'>".LAN_FORUM_8012."</div><div class='panel-body'>".$viewable."</div></div></div>";
/* WORKING WRAPPER
$SC_WRAPPER['VIEWABLE_BY'] = "<div class='panel panel-default' style='margin-top:10px'><div class='panel-heading'>".LAN_FORUM_8012."</div><div class='panel-body'>{---}</div></div></div>";
*/
return empty($viewable)?'':$viewable;
}
function sc_search()

2
e107_plugins/forum/templates/forum_viewforum_template.php
View File

@@ -343,6 +343,8 @@ $FORUM_VIEWFORUM_TEMPLATE['sub-footer'] = "";
$FORUM_VIEWFORUM_TEMPLATE['divider-important'] = "<tr><th colspan='2'>".LAN_FORUM_1006."</th><th class='text-center'>".LAN_FORUM_0003."</th><th class='hidden-xs text-center'>".LAN_FORUM_1005."</th><th class='hidden-xs'>".LAN_FORUM_0004."</th></tr>";
$FORUM_VIEWFORUM_TEMPLATE['divider-normal'] = "<tr><th colspan='2'>".LAN_FORUM_1007."</th><th class='text-center' >".LAN_FORUM_0003."</th><th class='hidden-xs text-center'>".LAN_FORUM_1005."</th><th class='hidden-xs'>".LAN_FORUM_0004."</th></tr>";
$SC_WRAPPER['VIEWABLE_BY'] = "<div class='panel panel-default' style='margin-top:10px'><div class='panel-heading'>".LAN_FORUM_8012."</div><div class='panel-body'>{---}</div></div></div>";
$FORUM_VIEWFORUM_TEMPLATE['footer'] = "</table>
<div class='row row-fluid'>