diff --git a/e107_admin/banlist.php b/e107_admin/banlist.php index 0f1d3eb3b..270b8ec23 100644 --- a/e107_admin/banlist.php +++ b/e107_admin/banlist.php @@ -109,7 +109,7 @@ class banlist_ui extends e_admin_ui protected $fields = array ( 'checkboxes' => array ( 'title' => '', 'type' => null, 'data' => null, 'width' => '5%', 'thclass' => 'center', 'forced' => '1', 'class' => 'center', 'toggle' => 'e-multiselect', ), 'banlist_id' => array ( 'title' => LAN_ID, 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), - 'banlist_ip' => array ( 'title' => BANLAN_126, 'type' => 'method', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), + 'banlist_ip' => array ( 'title' => BANLAN_126, 'type' => 'method', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => array(), 'class' => 'left', 'thclass' => 'left', ), 'banlist_bantype' => array ( 'title' => LAN_TYPE, 'type' => 'method', 'data' => 'str', 'width' => 'auto', 'filter'=>true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'banlist_datestamp' => array ( 'title' => LAN_DATESTAMP, 'type' => 'datestamp', 'data' => 'int', 'width' => 'auto', 'filter' => true, 'help' => '', 'readParms' => '', 'writeParms' => 'auto=1&hidden=1&readonly=1', 'class' => 'left', 'thclass' => 'left', ), 'banlist_banexpires' => array ( 'title' => BANLAN_124, 'type' => 'method', 'data' => 'int', 'inline'=>true, 'width' => 'auto', 'batch' => true, 'filter' => true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), diff --git a/e107_admin/cron.php b/e107_admin/cron.php index e0e51a5dc..a67c70bd2 100644 --- a/e107_admin/cron.php +++ b/e107_admin/cron.php @@ -149,7 +149,7 @@ class cron_admin_ui extends e_admin_ui 'name' => LAN_CRON_06_1, 'category' => 'user', 'function' => 'procBanRetrigger', - 'description' => LAN_CRON_06_2 ."
". LAN_CRON_06_3, + 'description' => defset('LAN_CRON_06_2') ."
". defset('LAN_CRON_06_3'), // 'available' => e107::getPref('ban_retrigger') ), 6 => array( diff --git a/e107_admin/header.php b/e107_admin/header.php index a3f61e79b..dadbbe324 100644 --- a/e107_admin/header.php +++ b/e107_admin/header.php @@ -19,11 +19,11 @@ if (!defined('e107_INIT')) if (!defined('ADMIN_AREA')) { //avoid PHP warning - define("ADMIN_AREA", TRUE); + define("ADMIN_AREA", true); } if(!defined('USER_AREA')) { - define("USER_AREA", FALSE); + define("USER_AREA", false); } e107::getDebug()->logTime('(Header Top)'); diff --git a/e107_admin/image.php b/e107_admin/image.php index 96163b197..1251b3564 100644 --- a/e107_admin/image.php +++ b/e107_admin/image.php @@ -610,8 +610,8 @@ class media_form_ui extends e_admin_form_ui foreach($options as $key=>$title) { $title = ucwords(str_replace("-"," ",$key)); - $valW = vartrue($curval[$key]['w']); - $valH = vartrue($curval[$key]['h']); + $valW = !empty($curval[$key]['w']) ? $curval[$key]['w'] : 400; + $valH = !empty($curval[$key]['h']) ? $curval[$key]['h'] : 400; $text .= "".$title.""; $text .= ""; @@ -3147,7 +3147,7 @@ class media_admin_ui extends e_admin_ui $text = "
- ".DBLAN_20." + @@ -3202,8 +3202,8 @@ class media_admin_ui extends e_admin_ui - - + + @@ -3468,7 +3468,7 @@ class media_admin_ui extends e_admin_ui $url = e107::getParser()->thumbUrl($f['path'].$f['fname'], 'w=100', true); $large = e107::getParser()->thumbUrl($f['path'].$f['fname'], 'w=800', true); //echo $url; - return "\"".$f['name']."\""; + return "\"".varset($f['name'])."\""; } else { diff --git a/e107_admin/mailout.php b/e107_admin/mailout.php index 39b9b08d0..db68e5725 100644 --- a/e107_admin/mailout.php +++ b/e107_admin/mailout.php @@ -58,9 +58,17 @@ Valid subparameters (where required): $_GET['m'] - id of mail info in db $_GET['t'] - id of target info in db */ -// header('Content-Encoding: none'); // turn off gzip. +// header('Content-Encoding: none'); // turn off gzip. + +use PHPMailer\PHPMailer\PHPMailer; +use PHPMailer\PHPMailer\SMTP; +use PHPMailer\PHPMailer\POP3; +use PHPMailer\PHPMailer\Exception; + require_once('../class2.php'); + + if (!getperms('W')) { e107::redirect('admin'); @@ -978,7 +986,8 @@ class mailout_main_ui extends e_admin_ui function testPage() { - require_once(e_HANDLER. 'phpmailer/PHPMailerAutoload.php'); + require_once(e_HANDLER.'vendor/autoload.php'); + // require_once(e_HANDLER. 'phpmailer/PHPMailerAutoload.php'); /** @var SMTP $smtp */ $smtp = new SMTP; diff --git a/e107_admin/menus.php b/e107_admin/menus.php index b14a8e02d..bf32627c0 100644 --- a/e107_admin/menus.php +++ b/e107_admin/menus.php @@ -14,6 +14,8 @@ if(isset($_GET['configure'])) $_GET['configure'] = preg_replace('[^a-z0-9_-]','',$_GET['configure']); define("USER_AREA", true); + define('ADMIN_AREA', false); +// define('ADMIN_AREA', false); //Switch to desired layout define('THEME_LAYOUT', $_GET['configure']); @@ -30,10 +32,15 @@ if(isset($_GET['configure'])) } define('e_MENUMANAGER_ACTIVE', true); + } else { define('e_ADMIN_AREA', true); + define("USER_AREA", false); +// define('ADMIN_AREA', true); +// define('ADMIN_AREA', true); +// define('USER_AREA', false); define('e_MENUMANAGER_ACTIVE', false); } diff --git a/e107_admin/meta.php b/e107_admin/meta.php index 38c210b44..a9655dba8 100644 --- a/e107_admin/meta.php +++ b/e107_admin/meta.php @@ -66,11 +66,11 @@ if (isset($_POST['metasubmit'])) save_prefs(); } -$meta = vartrue($pref['meta_tag']); -$meta_diz = vartrue($pref['meta_description']); -$meta_keywords = vartrue($pref['meta_keywords']); -$meta_copyright = vartrue($pref['meta_copyright']); -$meta_author = vartrue($pref['meta_author']); +$meta = vartrue($pref['meta_tag'], array()); +$meta_diz = vartrue($pref['meta_description'], array()); +$meta_keywords = vartrue($pref['meta_keywords'], array()); +$meta_copyright = vartrue($pref['meta_copyright'], array()); +$meta_author = vartrue($pref['meta_author'], array()); $text = " diff --git a/e107_admin/users_extended.php b/e107_admin/users_extended.php index b5670fbaf..52987c331 100755 --- a/e107_admin/users_extended.php +++ b/e107_admin/users_extended.php @@ -604,6 +604,11 @@ e107::js('footer-inline', js()); private function addPageActivate() { + if(empty($_POST['activate'])) + { + return null; + } + $ue = e107::getUserExt(); $tp = e107::getParser(); $ret = ""; @@ -643,6 +648,11 @@ e107::js('footer-inline', js()); private function addPageDeactivate() { + if(empty($_POST['deactivate'])) + { + return null; + } + $tp = e107::getParser(); $sql = e107::getDb(); $ue = e107::getUserExt(); diff --git a/e107_handlers/db_debug_class.php b/e107_handlers/db_debug_class.php index 5a57175c7..ea410914b 100644 --- a/e107_handlers/db_debug_class.php +++ b/e107_handlers/db_debug_class.php @@ -1135,12 +1135,12 @@ if(!isset($In_e107_Footer)) { - if(defset('ADMIN_AREA')) + if(deftrue('ADMIN_AREA')) { $filewanted = realpath(__DIR__) . '/../' . $ADMIN_DIRECTORY . 'footer.php'; require_once($filewanted); } - elseif(defset('USER_AREA')) + elseif(deftrue('USER_AREA')) { $filewanted = realpath(__DIR__) . '/../' . FOOTERF; require_once($filewanted); diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php index d9c41969e..d4d9c4ea7 100644 --- a/e107_handlers/e107_class.php +++ b/e107_handlers/e107_class.php @@ -3616,7 +3616,7 @@ class e107 * @example e107::lan('theme'); // Loads THEME."languages/English.php (if English is the current language) * @example e107::lan('gallery'); // Loads e_PLUGIN."gallery/languages/English_front.php (if English is the current language) * @example e107::lan('gallery', 'admin'); // Loads e_PLUGIN."gallery/languages/English/admin.php (if English is the current language) - * @example e107::lan('gallery', 'admin', true); // Loads e_PLUGIN."gallery/languages/English_admin.php (if English is the current language) + * @example e107::lan('gallery', 'admin', true); // Loads e_PLUGIN."gallery/languages/English/English_admin.php (if English is the current language) * @example e107::lan('gallery', 'admin/example'); // Loads e_PLUGIN."gallery/languages/English/admin/example.php (if English is the current language) * @example e107::lan('gallery', true); // Loads e_PLUGIN."gallery/languages/English_admin.php (if English is the current language) * @example e107::lan('gallery', "something", true); // Loads e_PLUGIN."gallery/languages/English_something.php (if English is the current language) @@ -3629,17 +3629,19 @@ class e107 switch ($type) { case 'core' : - self::coreLan($fname, $options); + $result = self::coreLan($fname, $options); break; case 'theme' : - self::themeLan($fname, null, $options); + $result = self::themeLan($fname, null, $options); break; default : - self::plugLan($type, $fname, $options); + $result = self::plugLan($type, $fname, $options); break; } + return $result; + } diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php index 57bf1074c..0e1fb6672 100644 --- a/e107_handlers/e_parse_class.php +++ b/e107_handlers/e_parse_class.php @@ -1530,7 +1530,7 @@ class e_parse extends e_parser */ public function toHTML($text, $parseBB = FALSE, $modifiers = '', $postID = '', $wrap = FALSE) { - if($text == '') + if(empty($text) || !is_string($text)) { return $text; } @@ -4805,6 +4805,11 @@ class e_parser */ public function isBBcode($text) { + if(!is_string($text)) + { + return false; + } + if(strpos($text,'[')=== false || preg_match('#(?<=<)\w+(?=[^<]*?>)#', $text)) { return false; @@ -4834,6 +4839,10 @@ class e_parser */ public function isHtml($text) { + if(!is_string($text)) + { + return false; + } if(strpos($text,'[html]') !==false) { @@ -4935,6 +4944,11 @@ class e_parser */ public function isVideo($file) { + if(!is_string($file)) + { + return false; + } + $ext = pathinfo($file,PATHINFO_EXTENSION); return $ext === 'youtube' || $ext === 'youtubepl'; @@ -4948,6 +4962,11 @@ class e_parser */ public function isImage($file) { + if(!is_string($text)) + { + return false; + } + if(strpos($file, "{e_") === 0) { $file = e107::getParser()->replaceConstants($file); diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index 6593b76df..922825a53 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -4569,7 +4569,14 @@ var_dump($select_options);*/ foreach ($fieldarray as $field => $data) { - + if(!isset($data['readParms']) || $data['readParms'] === '' ) + { + $data['readParms'] = array(); + } + elseif(is_string($data['readParms'])) // fix for readParms = ''; + { + parse_str($data['readParms'],$data['readParms']); + } // shouldn't happen... test with Admin->Users with user_xup visible and NULL values in user_xup table column before re-enabling this code. /* if(!isset($fieldvalues[$field]) && vartrue($data['alias'])) diff --git a/e107_handlers/mail_manager_class.php b/e107_handlers/mail_manager_class.php index c9ffcc10e..9b5e3d3ee 100644 --- a/e107_handlers/mail_manager_class.php +++ b/e107_handlers/mail_manager_class.php @@ -595,7 +595,7 @@ class e107MailManager case MAIL_STATUS_HELD : return LAN_MAILOUT_217; default : - if (($status > MAIL_STATUS_PENDING) && ($status <= MAIL_STATUS_ACTIVE)) + if (($status > defset('MAIL_STATUS_PENDING')) && ($status <= defset('MAIL_STATUS_ACTIVE'))) { return LAN_MAILOUT_214; } diff --git a/e107_handlers/session_handler.php b/e107_handlers/session_handler.php index a166ca9de..6e5b108ef 100644 --- a/e107_handlers/session_handler.php +++ b/e107_handlers/session_handler.php @@ -490,8 +490,10 @@ class e_session switch ($this->_sessionSaveMethod) { case 'db': - ini_set('session.save_handler', 'user'); + // ini_set('session.save_handler', 'user'); + $session = new e_session_db; + session_set_save_handler($session, true); $session->setSaveHandler(); break; @@ -1065,7 +1067,7 @@ class e_core_session extends e_session } -class e_session_db +class e_session_db implements SessionHandlerInterface { /** * @var e_db diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php index 10fa2f280..f2a13bc24 100644 --- a/e107_handlers/theme_handler.php +++ b/e107_handlers/theme_handler.php @@ -1070,8 +1070,9 @@ class e_theme } - private static function initThemeLayout() + private static function initThemeLayout($pref) { + e107::getDebug()->logTime('Find/Load Theme-Layout'); // needs to run after checkvalidtheme() (for theme previewing). if(deftrue('e_ADMIN_AREA')) @@ -1090,7 +1091,6 @@ class e_theme if(!defined('THEME_LAYOUT')) { $user_pref = e107::getUser()->getPref(); - $pref = e107::getPref(); $cusPagePref = (!empty($user_pref['sitetheme_custompages'])) ? $user_pref['sitetheme_custompages'] : varset($pref['sitetheme_custompages'],array()); $cusPageDef = (empty($user_pref['sitetheme_deflayout'])) ? varset($pref['sitetheme_deflayout']) : $user_pref['sitetheme_deflayout']; $deflayout = e107::getTheme()->getThemeLayout($cusPagePref, $cusPageDef, e_REQUEST_URL, varset($_SERVER['SCRIPT_FILENAME'])); @@ -1111,6 +1111,7 @@ class e_theme $sql = e107::getDb(); $e107 = e107::getInstance(); $tp = e107::getParser(); + $pref = e107::getPref(); e107::getDebug()->logTime('Theme Check'); @@ -1119,7 +1120,7 @@ class e_theme { list($action, $id) = explode('.', $_SERVER['QUERY_STRING']); self::initThemePreview($id); - self::initThemeLayout(); + self::initThemeLayout($pref); return; } @@ -1136,7 +1137,7 @@ class e_theme $e107->site_theme = $themeDir; e107::getDebug()->logTime('Theme Check End'); - self::initThemeLayout(); + self::initThemeLayout($pref); return; } @@ -1155,7 +1156,7 @@ class e_theme } e107::getDebug()->logTime('Theme Check End'); - self::initThemeLayout(); + self::initThemeLayout($pref); } diff --git a/e107_languages/English/admin/lan_cron.php b/e107_languages/English/admin/lan_cron.php index 722c03448..47f85e3a8 100644 --- a/e107_languages/English/admin/lan_cron.php +++ b/e107_languages/English/admin/lan_cron.php @@ -37,6 +37,7 @@ define("LAN_CRON_04_3", "Only needed if retriggering of bans enabled."); define("LAN_CRON_05_1", "Database Backup"); define("LAN_CRON_05_2", "Backup the system database to"); +define('LAN_CRON_06_1', "Process Ban Trigger"); // Error and info messages define("LAN_CRON_6", "Couldn't Import Prefs"); diff --git a/e107_plugins/_blank/e_header.php b/e107_plugins/_blank/e_header.php index bf9e7a4df..f58c795f7 100644 --- a/e107_plugins/_blank/e_header.php +++ b/e107_plugins/_blank/e_header.php @@ -14,7 +14,7 @@ if (!defined('e107_INIT')) { exit; } -if(USER_AREA) // prevents inclusion of JS/CSS/meta in the admin area. +if(deftrue('USER_AREA')) // prevents inclusion of JS/CSS/meta in the admin area. { //e107::js('_blank', 'js/blank.js'); // loads e107_plugins/_blank/js/blank.js on every page. e107::css('_blank', 'css/blank.css'); // loads e107_plugins/_blank/css/blank.css on every page diff --git a/e107_plugins/chatbox_menu/e_search.php b/e107_plugins/chatbox_menu/e_search.php index a8f564343..242535fb3 100644 --- a/e107_plugins/chatbox_menu/e_search.php +++ b/e107_plugins/chatbox_menu/e_search.php @@ -32,7 +32,7 @@ class chatbox_menu_search extends e_search // include plugin-folder in the name. 'return_fields' => array('cb_id', 'cb_nick', 'cb_message', 'cb_datestamp'), 'search_fields' => array('cb_nick' => '1', 'cb_message' => '1'), // fields and weights. - 'order' => array('cb_datestamp' => DESC), + 'order' => array('cb_datestamp' => 'DESC'), 'refpage' => 'chat.php' ); diff --git a/e107_plugins/download/includes/admin.php b/e107_plugins/download/includes/admin.php index 61eee22c5..8e54acc61 100644 --- a/e107_plugins/download/includes/admin.php +++ b/e107_plugins/download/includes/admin.php @@ -196,7 +196,13 @@ class download_cat_ui extends e_admin_ui while($row = $sql->fetch()) { - $num = $row['_depth'] - 1; + $num = (int) $row['_depth'] - 1; + + if($num < 0) + { + $num = 0; + } + $id = $row['download_category_id']; $this->downloadCats[$id] = str_repeat("  ",$num).$row['download_category_name']; } @@ -2314,7 +2320,7 @@ $columnInfo = array( - +
".$frm->checkbox("batch_selected[".$c."]",$f['fname'],$checked)." ".$this->preview($f)." ".$f['fname']."".$frm->text('batch_import_name['.$c.']', ($_POST['batch_import_name'][$c] ? $tp->filter($_POST['batch_import_name'][$c]) : $default['title']))."".$frm->text('batch_import_name['.$c.']', (!empty($_POST['batch_import_name'][$c]) ? $tp->filter($_POST['batch_import_name'][$c]) : $default['title']))." ".$default['authorName']."
".$default['authorEmail']."		 ".$f['mime']."
".DOWLAN_XXX."".defset('DOWLAN_XXX')." //TODO
diff --git a/e107_plugins/faqs/e_search.php b/e107_plugins/faqs/e_search.php index 31e2a2a99..b0288b27e 100644 --- a/e107_plugins/faqs/e_search.php +++ b/e107_plugins/faqs/e_search.php @@ -21,7 +21,7 @@ class faqs_search extends e_search // include plugin-folder in the name. 'return_fields' => array('t.faq_question','t.faq_answer','t.faq_datestamp','x.faq_info_title','t.faq_id','x.faq_info_id','x.faq_info_title', 'x.faq_info_class','x.faq_info_sef'), 'search_fields' => array('t.faq_question'=>1.0, 't.faq_answer'=>1.2, "x.faq_info_title"=>0.6, 't.faq_tags'=> 1.4), // fields and weights. - 'order' => array('t.faq_question' => DESC), + 'order' => array('t.faq_question' => 'DESC'), 'refpage' => 'faqs.php' ); diff --git a/e107_plugins/forum/e_event.php b/e107_plugins/forum/e_event.php index b8d38de81..a858f1266 100644 --- a/e107_plugins/forum/e_event.php +++ b/e107_plugins/forum/e_event.php @@ -42,7 +42,7 @@ class forum_event fclose($myfile); echo('hola'); print_a($data);*/ - e107::getDb()->update('user_extended', "user_plugin_forum_viewed = NULL WHERE user_extended_id = ".$data[user_id]); + e107::getDb()->update('user_extended', "user_plugin_forum_viewed = NULL WHERE user_extended_id = ".$data['user_id']); } diff --git a/e107_plugins/forum/e_search.php b/e107_plugins/forum/e_search.php index 92298e3cc..bc4670ffa 100644 --- a/e107_plugins/forum/e_search.php +++ b/e107_plugins/forum/e_search.php @@ -46,7 +46,7 @@ class forum_search extends e_search // include plugin-folder in the name. 'return_fields' => array('t.thread_id', 't.thread_name', 'p.post_id', 'p.post_entry', 't.thread_forum_id', 't.thread_datestamp', 't.thread_user', 'u.user_id', 'u.user_name', 'f.forum_class', 'f.forum_id', 'f.forum_name', 'f.forum_sef'), 'search_fields' => array('t.thread_name'=>'1.2', 'p.post_entry'=>'0.6'), // fields and weights. - 'order' => array('thread_datestamp' => DESC), + 'order' => array('thread_datestamp' => 'DESC'), 'refpage' => 'forum' ); diff --git a/e107_plugins/hero/admin_config.php b/e107_plugins/hero/admin_config.php index c7378dd50..ca1d02135 100644 --- a/e107_plugins/hero/admin_config.php +++ b/e107_plugins/hero/admin_config.php @@ -437,7 +437,7 @@ class hero_form_ui extends e_admin_form_ui foreach($amt as $v) { $name = 'hero_bullets['.$v.']'; - $val = varset($value[$v]); + $val = varset($value[$v], array()); $text .= " ".$this->glyphPicker($name.'[icon]', $val['icon'])." diff --git a/e107_plugins/list_new/list_admin_class.php b/e107_plugins/list_new/list_admin_class.php index 012c7513b..d4502228b 100644 --- a/e107_plugins/list_new/list_admin_class.php +++ b/e107_plugins/list_new/list_admin_class.php @@ -286,7 +286,7 @@ class list_admin //menu preference : caption $this->row['TOPIC'] = LIST_ADMIN_LAN_2; $this->row['HEADING'] = LIST_ADMIN_LAN_3; - $this->row['HELP'] = LIST_ADMIN_LAN_4; + $this->row['HELP'] = defset('LIST_ADMIN_LAN_4'); $this->row['CONTID'] = "list-new-menu-{$type}-expandable-caption"; $this->row['FIELD'] = $rs->form_text($type."_caption", "30", $tp->toHTML($this->parent->list_pref[$type."_caption"],"","defs"), "50", "tbox"); $text .= $this->parseTemplate('TOPIC_ROW'); @@ -294,7 +294,7 @@ class list_admin //menu preference : icon : use $this->row['TOPIC'] = LIST_ADMIN_LAN_5; $this->row['HEADING'] = LIST_ADMIN_LAN_6; - $this->row['HELP'] = LIST_ADMIN_LAN_7; + $this->row['HELP'] = defset('LIST_ADMIN_LAN_7'); $this->row['CONTID'] = "list-new-menu-{$type}-expandable-icon-use"; $this->row['FIELD'] = " ".$rs->form_radio($type."_icon_use", "1", ($this->parent->list_pref[$type."_icon_use"] ? "1" : "0"), "", "").LIST_ADMIN_7." @@ -305,7 +305,7 @@ class list_admin //menu preference : icon : show default theme bullet $this->row['TOPIC'] = LIST_ADMIN_MENU_2; $this->row['HEADING'] = LIST_ADMIN_MENU_3; - $this->row['HELP'] = LIST_ADMIN_MENU_4; + $this->row['HELP'] = defset('LIST_ADMIN_MENU_4'); $this->row['CONTID'] = "list-new-menu-{$type}-expandable-icon-show"; $this->row['FIELD'] = " ".$rs->form_radio($type."_icon_default", "1", ($this->parent->list_pref[$type."_icon_default"] ? "1" : "0"), "", "").LIST_ADMIN_7." @@ -316,7 +316,7 @@ class list_admin //menu preference : amount chars $this->row['TOPIC'] = LIST_ADMIN_LAN_8; $this->row['HEADING'] = LIST_ADMIN_LAN_9; - $this->row['HELP'] = LIST_ADMIN_LAN_10; + $this->row['HELP'] = defset('LIST_ADMIN_LAN_10'); $this->row['CONTID'] = "list-new-menu-{$type}-expandable-amount-chars"; $this->row['FIELD'] = $rs->form_text($type."_char_heading", "3", $this->parent->list_pref[$type."_char_heading"], "3", "tbox"); $text .= $this->parseTemplate('TOPIC_ROW'); @@ -324,7 +324,7 @@ class list_admin //menu preference : postfix $this->row['TOPIC'] = LIST_ADMIN_LAN_11; $this->row['HEADING'] = LIST_ADMIN_LAN_12; - $this->row['HELP'] = LIST_ADMIN_LAN_13; + $this->row['HELP'] = defset('LIST_ADMIN_LAN_13'); $this->row['CONTID'] = "list-new-menu-{$type}-expandable-postfix"; $this->row['FIELD'] = $rs->form_text($type."_char_postfix", "3", $this->parent->list_pref[$type."_char_postfix"], "3", "tbox"); $text .= $this->parseTemplate('TOPIC_ROW'); @@ -332,7 +332,7 @@ class list_admin //menu preference : date $this->row['TOPIC'] = LIST_ADMIN_LAN_14; $this->row['HEADING'] = LIST_ADMIN_LAN_15; - $this->row['HELP'] = LIST_ADMIN_LAN_16; + $this->row['HELP'] = defset('LIST_ADMIN_LAN_16'); $this->row['CONTID'] = "list-new-menu-{$type}-expandable-date"; $this->row['FIELD'] = $rs->form_text($type."_datestyle", "30", $this->parent->list_pref[$type."_datestyle"], "50", "tbox"); $text .= $this->parseTemplate('TOPIC_ROW'); @@ -340,7 +340,7 @@ class list_admin //menu preference : date today $this->row['TOPIC'] = LIST_ADMIN_LAN_17; $this->row['HEADING'] = LIST_ADMIN_LAN_18; - $this->row['HELP'] = LIST_ADMIN_LAN_19; + $this->row['HELP'] = defset('LIST_ADMIN_LAN_19'); $this->row['CONTID'] = "list-new-menu-{$type}-expandable-datet"; $this->row['FIELD'] = $rs->form_text($type."_datestyletoday", "30", $this->parent->list_pref[$type."_datestyletoday"], "50", "tbox"); $text .= $this->parseTemplate('TOPIC_ROW'); @@ -348,7 +348,7 @@ class list_admin //menu preference : show empty $this->row['TOPIC'] = LIST_ADMIN_LAN_26; $this->row['HEADING'] = LIST_ADMIN_LAN_27; - $this->row['HELP'] = LIST_ADMIN_LAN_28; + $this->row['HELP'] = defset('LIST_ADMIN_LAN_28'); $this->row['CONTID'] = "list-new-menu-{$type}-expandable-sempty"; $this->row['FIELD'] = " ".$rs->form_radio($type."_showempty", "1", ($this->parent->list_pref[$type."_showempty"] ? "1" : "0"), "", "").LIST_ADMIN_7." @@ -359,7 +359,7 @@ class list_admin //menu preference : open section if content exists? this will override the individual setting of the section $this->row['TOPIC'] = LIST_ADMIN_LAN_39; $this->row['HEADING'] = LIST_ADMIN_LAN_40; - $this->row['HELP'] = LIST_ADMIN_LAN_41; + $this->row['HELP'] = defset('LIST_ADMIN_LAN_41'); $this->row['CONTID'] = "list-new-menu-{$type}-expandable-osie"; $this->row['FIELD'] = " ".$rs->form_radio($type."_openifrecords", "1", ($this->parent->list_pref[$type."_openifrecords"] ? "1" : "0"), "", "").LIST_ADMIN_7." @@ -396,7 +396,7 @@ class list_admin //page preference : caption $this->row['TOPIC'] = LIST_ADMIN_LAN_2; $this->row['HEADING'] = LIST_ADMIN_LAN_3; - $this->row['HELP'] = LIST_ADMIN_LAN_4; + $this->row['HELP'] = defset('LIST_ADMIN_LAN_4'); $this->row['CONTID'] = "list-new-page-{$type}-expandable-caption"; $this->row['FIELD'] = $rs->form_text($type."_caption", "30", $tp->toHTML($this->parent->list_pref[$type."_caption"],"","defs"), "50", "tbox"); $text .= $this->parseTemplate('TOPIC_ROW'); @@ -404,7 +404,7 @@ class list_admin //page preference : icon : use $this->row['TOPIC'] = LIST_ADMIN_LAN_5; $this->row['HEADING'] = LIST_ADMIN_LAN_6; - $this->row['HELP'] = LIST_ADMIN_LAN_7; + $this->row['HELP'] = defset('LIST_ADMIN_LAN_7'); $this->row['CONTID'] = "list-new-page-{$type}-expandable-icon-use"; $this->row['FIELD'] = " ".$rs->form_radio($type."_icon_use", "1", ($this->parent->list_pref[$type."_icon_use"] ? "1" : "0"), "", "").LIST_ADMIN_7." @@ -415,7 +415,7 @@ class list_admin //page preference : icon : show default theme bullet $this->row['TOPIC'] = LIST_ADMIN_LAN_29; $this->row['HEADING'] = LIST_ADMIN_LAN_30; - $this->row['HELP'] = LIST_ADMIN_LAN_31; + $this->row['HELP'] = defset('LIST_ADMIN_LAN_31'); $this->row['CONTID'] = "list-new-page-{$type}-expandable-icon-show"; $this->row['FIELD'] = " ".$rs->form_radio($type."_icon_default", "1", ($this->parent->list_pref[$type."_icon_default"] ? "1" : "0"), "", "").LIST_ADMIN_7." @@ -426,7 +426,7 @@ class list_admin //page preference : amount chars $this->row['TOPIC'] = LIST_ADMIN_LAN_8; $this->row['HEADING'] = LIST_ADMIN_LAN_9; - $this->row['HELP'] = LIST_ADMIN_LAN_10; + $this->row['HELP'] = defset('LIST_ADMIN_LAN_10'); $this->row['CONTID'] = "list-new-page-{$type}-expandable-amount-chars"; $this->row['FIELD'] = $rs->form_text($type."_char_heading", "3", $this->parent->list_pref[$type."_char_heading"], "3", "tbox"); $text .= $this->parseTemplate('TOPIC_ROW'); @@ -434,7 +434,7 @@ class list_admin //page preference : postfix $this->row['TOPIC'] = LIST_ADMIN_LAN_11; $this->row['HEADING'] = LIST_ADMIN_LAN_12; - $this->row['HELP'] = LIST_ADMIN_LAN_13; + $this->row['HELP'] = defset('LIST_ADMIN_LAN_13'); $this->row['CONTID'] = "list-new-page-{$type}-expandable-postfix"; $this->row['FIELD'] = $rs->form_text($type."_char_postfix", "3", $this->parent->list_pref[$type."_char_postfix"], "3", "tbox"); $text .= $this->parseTemplate('TOPIC_ROW'); @@ -442,7 +442,7 @@ class list_admin //page preference : date $this->row['TOPIC'] = LIST_ADMIN_LAN_14; $this->row['HEADING'] = LIST_ADMIN_LAN_15; - $this->row['HELP'] = LIST_ADMIN_LAN_16; + $this->row['HELP'] = defset('LIST_ADMIN_LAN_16'); $this->row['CONTID'] = "list-new-page-{$type}-expandable-date"; $this->row['FIELD'] = $rs->form_text($type."_datestyle", "30", $this->parent->list_pref[$type."_datestyle"], "50", "tbox"); $text .= $this->parseTemplate('TOPIC_ROW'); @@ -450,7 +450,7 @@ class list_admin //page preference : date today $this->row['TOPIC'] = LIST_ADMIN_LAN_17; $this->row['HEADING'] = LIST_ADMIN_LAN_18; - $this->row['HELP'] = LIST_ADMIN_LAN_19; + $this->row['HELP'] = defset('LIST_ADMIN_LAN_19'); $this->row['CONTID'] = "list-new-page-{$type}-expandable-datet"; $this->row['FIELD'] = $rs->form_text($type."_datestyletoday", "30", $this->parent->list_pref[$type."_datestyletoday"], "50", "tbox"); $text .= $this->parseTemplate('TOPIC_ROW'); @@ -458,7 +458,7 @@ class list_admin //page preference : show empty $this->row['TOPIC'] = LIST_ADMIN_LAN_26; $this->row['HEADING'] = LIST_ADMIN_LAN_27; - $this->row['HELP'] = LIST_ADMIN_LAN_28; + $this->row['HELP'] = defset('LIST_ADMIN_LAN_28'); $this->row['CONTID'] = "list-new-page-{$type}-expandable-showe"; $this->row['FIELD'] = " ".$rs->form_radio($type."_showempty", "1", ($this->parent->list_pref[$type."_showempty"] ? "1" : "0"), "", "").LIST_ADMIN_7." @@ -469,7 +469,7 @@ class list_admin //page preference : colomn $this->row['TOPIC'] = LIST_ADMIN_LAN_20; $this->row['HEADING'] = LIST_ADMIN_LAN_21; - $this->row['HELP'] = LIST_ADMIN_LAN_22; + $this->row['HELP'] = defset('LIST_ADMIN_LAN_22'); $this->row['CONTID'] = "list-new-page-{$type}-expandable-colomn"; $this->row['FIELD'] = $rs->form_select_open($type."_colomn"); for($a=1, $aMax = count($this->parent->sections); $a<= $aMax; $a++) @@ -482,7 +482,7 @@ class list_admin //page preference : welcome text $this->row['TOPIC'] = LIST_ADMIN_LAN_23; $this->row['HEADING'] = LIST_ADMIN_LAN_24; - $this->row['HELP'] = LIST_ADMIN_LAN_25; + $this->row['HELP'] = defset('LIST_ADMIN_LAN_25'); $this->row['CONTID'] = "list-new-page-{$type}-expandable-wtext"; $this->row['FIELD'] = $rs->form_textarea($type."_welcometext", "50", "5", $tp->toHTML($this->parent->list_pref[$type."_welcometext"],"","defs"), "", "tbox"); $text .= $this->parseTemplate('TOPIC_ROW'); @@ -492,7 +492,7 @@ class list_admin //timelapse:show $this->row['TOPIC'] = LIST_ADMIN_LAN_36; $this->row['HEADING'] = LIST_ADMIN_LAN_37; - $this->row['HELP'] = LIST_ADMIN_LAN_38; + $this->row['HELP'] = defset('LIST_ADMIN_LAN_38'); $this->row['CONTID'] = "list-new-page-{$type}-expandable-timelapse-show"; $this->row['FIELD'] = " ".$rs->form_radio($type."_timelapse", "1", ($this->parent->list_pref[$type."_timelapse"] ? "1" : "0"), "", "").LIST_ADMIN_7." @@ -503,7 +503,7 @@ class list_admin //timelapse day number maximum $this->row['TOPIC'] = LIST_ADMIN_LAN_32; $this->row['HEADING'] = LIST_ADMIN_LAN_33; - $this->row['HELP'] = LIST_ADMIN_LAN_34; + $this->row['HELP'] = defset('LIST_ADMIN_LAN_34'); $this->row['CONTID'] = "list-new-page-{$type}-expandable-timelapse-dnm"; $this->row['FIELD'] = $rs->form_text($type."_timelapse_days", "3", $this->parent->list_pref[$type."_timelapse_days"], "3", "tbox")." ".LIST_ADMIN_LAN_35; $text .= $this->parseTemplate('TOPIC_ROW'); @@ -512,7 +512,7 @@ class list_admin //page preference : open section if content exists? this will override the individual setting of the section $this->row['TOPIC'] = LIST_ADMIN_LAN_39; $this->row['HEADING'] = LIST_ADMIN_LAN_40; - $this->row['HELP'] = LIST_ADMIN_LAN_41; + $this->row['HELP'] = defset('LIST_ADMIN_LAN_41'); $this->row['CONTID'] = "list-new-page-{$type}-expandable-osie"; $this->row['FIELD'] = " ".$rs->form_radio($type."_openifrecords", "1", ($this->parent->list_pref[$type."_openifrecords"] ? "1" : "0"), "", "").LIST_ADMIN_7." diff --git a/e107_plugins/page/e_search.php b/e107_plugins/page/e_search.php index 4ded69435..6caff88ba 100644 --- a/e107_plugins/page/e_search.php +++ b/e107_plugins/page/e_search.php @@ -78,7 +78,7 @@ class page_search extends e_search // include plugin-folder in the name. 'return_fields' => array('p.page_id', 'p.page_title', 'p.page_sef', 'p.page_text', 'p.page_chapter', 'p.page_datestamp', 'p.menu_image'), 'search_fields' => array('p.page_title' => '1.2', 'p.page_text' => '0.6', 'p.page_metakeys'=> '1.0', 'p.page_fields' => '0.5'), // fields and their weights. - 'order' => array('page_datestamp' => DESC), + 'order' => array('page_datestamp' => 'DESC'), 'refpage' => 'page.php' ); diff --git a/e107_plugins/pm/admin_config.php b/e107_plugins/pm/admin_config.php index 47367bd2a..0ae3aeccc 100644 --- a/e107_plugins/pm/admin_config.php +++ b/e107_plugins/pm/admin_config.php @@ -102,19 +102,19 @@ class private_msg_ui extends e_admin_ui protected $listOrder = "p.pm_id DESC"; protected $fields = array ( 'checkboxes' => array ( 'title' => '', 'type' => null, 'data' => null, 'width' => '5%', 'thclass' => 'center', 'forced' => '1', 'class' => 'center', 'toggle' => 'e-multiselect', ), - 'pm_id' => array ( 'title' => LAN_ID, 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), - 'pm_from' => array ( 'title' => LAN_PLUGIN_PM_FROM, 'type' => 'method', 'noedit'=>true, 'data' => 'int', 'filter'=>true, 'width' => '5%%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), - 'pm_to' => array ( 'title' => LAN_PLUGIN_PM_TO, 'type' => 'user', 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), - 'pm_sent' => array ( 'title' => LAN_DATE, 'type' => 'datestamp', 'data' => 'int', 'width' => '15%', 'help' => '', 'readParms' => '', 'writeParms' => 'auto=1&readonly=1', 'class' => 'center', 'thclass' => 'center', ), - 'pm_subject' => array ( 'title' => LAN_PLUGIN_PM_SUB, 'type' => 'text', 'data' => 'str', 'width' => '15%', 'help' => '', 'readParms' => '', 'writeParms' => array('size'=>'xlarge'), 'class' => 'left', 'thclass' => 'left', ), + 'pm_id' => array ( 'title' => LAN_ID, 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => array(), 'writeParms' => array(), 'class' => 'left', 'thclass' => 'left', ), + 'pm_from' => array ( 'title' => LAN_PLUGIN_PM_FROM, 'type' => 'method', 'noedit'=>true, 'data' => 'int', 'filter'=>true, 'width' => '5%%', 'help' => '', 'readParms' => array(), 'writeParms' => array(), 'class' => 'left', 'thclass' => 'left', ), + 'pm_to' => array ( 'title' => LAN_PLUGIN_PM_TO, 'type' => 'user', 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => array(), 'writeParms' => array(), 'class' => 'left', 'thclass' => 'left', ), + 'pm_sent' => array ( 'title' => LAN_DATE, 'type' => 'datestamp', 'data' => 'int', 'width' => '15%', 'help' => '', 'readParms' => array(), 'writeParms' => 'auto=1&readonly=1', 'class' => 'center', 'thclass' => 'center', ), + 'pm_subject' => array ( 'title' => LAN_PLUGIN_PM_SUB, 'type' => 'text', 'data' => 'str', 'width' => '15%', 'help' => '', 'readParms' => array(), 'writeParms' => array('size'=>'xlarge'), 'class' => 'left', 'thclass' => 'left', ), 'pm_text' => array ( 'title' => LAN_PLUGIN_PM_MESS, 'type' => 'bbarea', 'data' => 'str', 'width' => '40%', 'help' => '', 'readParms' => 'expand=1&truncate=50', 'writeParms' => 'rows=5&size=block&cols=80', 'class' => 'left', 'thclass' => 'left', ), - 'pm_read' => array ( 'title' => LAN_PLUGIN_PM_READ, 'type' => 'boolean', 'noedit'=>1, 'data' => 'int', 'batch'=>true, 'filter'=>true, 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), + 'pm_read' => array ( 'title' => LAN_PLUGIN_PM_READ, 'type' => 'boolean', 'noedit'=>1, 'data' => 'int', 'batch'=>true, 'filter'=>true, 'width' => '5%', 'help' => '', 'readParms' => array(), 'writeParms' => array(), 'class' => 'center', 'thclass' => 'center', ), - 'pm_sent_del' => array ( 'title' => LAN_PLUGIN_PM_DEL, 'type' => 'boolean', 'noedit'=>true, 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), - 'pm_read_del' => array ( 'title' => LAN_PLUGIN_PM_DEL, 'type' => 'boolean', 'noedit'=>true, 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), - 'pm_attachments' => array ( 'title' => LAN_PLUGIN_PM_ATTACHMENT, 'type' => 'text', 'noedit'=>true, 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), - 'pm_option' => array ( 'title' => 'Option', 'type' => 'text', 'noedit'=>true, 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), - 'pm_size' => array ( 'title' => LAN_PLUGIN_PM_SIZE, 'type' => 'boolean', 'noedit'=>true, 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), + 'pm_sent_del' => array ( 'title' => LAN_PLUGIN_PM_DEL, 'type' => 'boolean', 'noedit'=>true, 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => array(), 'writeParms' => array(), 'class' => 'center', 'thclass' => 'center', ), + 'pm_read_del' => array ( 'title' => LAN_PLUGIN_PM_DEL, 'type' => 'boolean', 'noedit'=>true, 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => array(), 'writeParms' => array(), 'class' => 'center', 'thclass' => 'center', ), + 'pm_attachments' => array ( 'title' => LAN_PLUGIN_PM_ATTACHMENT, 'type' => 'text', 'noedit'=>true, 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => array(), 'writeParms' => array(), 'class' => 'center', 'thclass' => 'center', ), + 'pm_option' => array ( 'title' => 'Option', 'type' => 'text', 'noedit'=>true, 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => array(), 'writeParms' => array(), 'class' => 'center', 'thclass' => 'center', ), + 'pm_size' => array ( 'title' => LAN_PLUGIN_PM_SIZE, 'type' => 'boolean', 'noedit'=>true, 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => array(), 'writeParms' => array(), 'class' => 'center', 'thclass' => 'center', ), 'options' => array ( 'title' => LAN_OPTIONS, 'type' => 'method', 'data' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced' => '1', ), ); @@ -991,11 +991,11 @@ class private_msg_block_ui extends e_admin_ui protected $perPage = 10; protected $fields = array ( 'checkboxes' => array ( 'title' => '', 'type' => null, 'data' => null, 'width' => '5%', 'thclass' => 'center', 'forced' => '1', 'class' => 'center', 'toggle' => 'e-multiselect', ), - 'pm_block_id' => array ( 'title' => 'LAN_ID', 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), - 'pm_block_from' => array ( 'title' => 'From', 'type' => 'boolean', 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), - 'pm_block_to' => array ( 'title' => 'To', 'type' => 'boolean', 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), - 'pm_block_datestamp' => array ( 'title' => 'LAN_DATESTAMP', 'type' => 'datestamp', 'data' => 'int', 'width' => 'auto', 'filter' => true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), - 'pm_block_count' => array ( 'title' => 'Count', 'type' => 'boolean', 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), + 'pm_block_id' => array ( 'title' => 'LAN_ID', 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => array(), 'writeParms' => array(), 'class' => 'left', 'thclass' => 'left', ), + 'pm_block_from' => array ( 'title' => 'From', 'type' => 'boolean', 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => array(), 'writeParms' => array(), 'class' => 'center', 'thclass' => 'center', ), + 'pm_block_to' => array ( 'title' => 'To', 'type' => 'boolean', 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => array(), 'writeParms' => array(), 'class' => 'center', 'thclass' => 'center', ), + 'pm_block_datestamp' => array ( 'title' => 'LAN_DATESTAMP', 'type' => 'datestamp', 'data' => 'int', 'width' => 'auto', 'filter' => true, 'help' => '', 'readParms' => array(), 'writeParms' => array(), 'class' => 'left', 'thclass' => 'left', ), + 'pm_block_count' => array ( 'title' => 'Count', 'type' => 'boolean', 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => array(), 'writeParms' => array(), 'class' => 'center', 'thclass' => 'center', ), 'options' => array ( 'title' => 'Options', 'type' => null, 'data' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced' => '1', ), ); diff --git a/e107_plugins/tinymce4/admin_config.php b/e107_plugins/tinymce4/admin_config.php index e5206d3d3..85b570357 100644 --- a/e107_plugins/tinymce4/admin_config.php +++ b/e107_plugins/tinymce4/admin_config.php @@ -15,7 +15,7 @@ if( !e107::isInstalled('tinymce4')) exit(); } -e107::lan('tinymce4','admin', true); +$result = e107::lan('tinymce4', true); class tinymce4_admin extends e_admin_dispatcher