From be54ccfae4d04a752aac25db28a1ee79da603113 Mon Sep 17 00:00:00 2001 From: Cameron Date: Tue, 30 Jun 2015 10:04:06 -0700 Subject: [PATCH 1/3] LANS: LAN_PREFS usage. --- e107_admin/db.php | 2 +- e107_admin/plugin.php | 2 +- e107_languages/English/admin/lan_db.php | 2 +- e107_languages/English/admin/lan_plugin.php | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/e107_admin/db.php b/e107_admin/db.php index 9710e8d61..aac933acd 100644 --- a/e107_admin/db.php +++ b/e107_admin/db.php @@ -1186,7 +1186,7 @@ class system_tools - ".$frm->checkbox_toggle('check-all-verify', 'xml_prefs')." ".DBLAN_96." + ".$frm->checkbox_toggle('check-all-verify', 'xml_prefs')." ".LAN_PREFS." ".DBLAN_98." diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php index 7e0ed54d7..38e92bf60 100644 --- a/e107_admin/plugin.php +++ b/e107_admin/plugin.php @@ -2329,7 +2329,7 @@ class pluginBuilder $text .= "
  • Table: ".$table."
    • "; $this->tableList[] = $table; } - $text .= "
  • ".EPL_ADLAN_110."
    • "; + $text .= "
  • ".LAN_PREFS."
    • "; $text .= ""; diff --git a/e107_languages/English/admin/lan_db.php b/e107_languages/English/admin/lan_db.php index 1306ffc79..24083658f 100644 --- a/e107_languages/English/admin/lan_db.php +++ b/e107_languages/English/admin/lan_db.php @@ -112,7 +112,7 @@ define('DBLAN_93', "Database Converted successfully to UTF-8."); define('DBLAN_94', "Please make sure you have the following line in your e107_config.php file:"); define('DBLAN_95', "Export Options"); -define('DBLAN_96', "Preferences"); +//define('DBLAN_96', "Preferences"); define('DBLAN_97', "Tables"); define('DBLAN_98', "Rows"); define('DBLAN_99', "Table Data:"); diff --git a/e107_languages/English/admin/lan_plugin.php b/e107_languages/English/admin/lan_plugin.php index 7bbb936fc..b96534ba3 100644 --- a/e107_languages/English/admin/lan_plugin.php +++ b/e107_languages/English/admin/lan_plugin.php @@ -125,7 +125,7 @@ define ('EPL_ADLAN_106',"Select your plugin's folder to begin."); define ('EPL_ADLAN_107',"Build an admin-area and xml file for:"); define ('EPL_ADLAN_108',"Check language files:"); define ('EPL_ADLAN_109',"Basic Info."); -define ('EPL_ADLAN_110',"Preferences"); +// define ('EPL_ADLAN_110',"Preferences"); define ('EPL_ADLAN_111',"Generate"); define ('EPL_ADLAN_112',"Review all fields and modify if necessary."); define ('EPL_ADLAN_113',"Review ALL tabs before clicking 'Generate'."); @@ -186,6 +186,7 @@ define ('EPL_ADLAN_161',"Other 3"); define ('EPL_ADLAN_162',"Other 4"); define ('EPL_ADLAN_163',"Exclude this table"); +//FIXME TODO Excessive duplicate terms below. define ('EPL_ADLAN_164',"Field"); define ('EPL_ADLAN_165',"Caption"); define ('EPL_ADLAN_166',"Type"); From 3dba34c62f5e10fd7a7026eed0242766b048d9bd Mon Sep 17 00:00:00 2001 From: Cameron Date: Tue, 30 Jun 2015 10:34:38 -0700 Subject: [PATCH 2/3] Plugin: DB Table installation was failing on plugins with _menu in the folder name. --- e107_handlers/plugin_class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/e107_handlers/plugin_class.php b/e107_handlers/plugin_class.php index ce187c118..ddc7e462f 100644 --- a/e107_handlers/plugin_class.php +++ b/e107_handlers/plugin_class.php @@ -1653,10 +1653,11 @@ class e107plugin function XmlTables($function, $plug, $options = array()) { - $sqlFile = e_PLUGIN.$plug['plugin_path'].'/'.$plug['plugin_path']."_sql.php"; + $sqlFile = e_PLUGIN.$plug['plugin_path'].'/'.str_replace("_menu","", $plug['plugin_path'])."_sql.php"; if(!file_exists($sqlFile)) // No File, so return; { + e107::getMessage()->addDebug("No SQL File Found at: ".$sqlFile); return; } From cb212417a885d2af7565bab70a6049a9b6e16d72 Mon Sep 17 00:00:00 2001 From: Cameron Date: Tue, 30 Jun 2015 19:44:33 -0700 Subject: [PATCH 3/3] Fixes #1103 - html parser issue with table colspan. --- e107_handlers/e_parse_class.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php index 7b38ac697..ef8ae017a 100644 --- a/e107_handlers/e_parse_class.php +++ b/e107_handlers/e_parse_class.php @@ -2687,7 +2687,10 @@ class e_parser 'input' => array('type','name','value','class','style'), 'form' => array('action','method','target'), 'audio' => array('src','controls', 'autoplay', 'loop', 'muted', 'preload' ), - 'video' => array('autoplay', 'controls', 'height', 'loop', 'muted', 'poster', 'preload', 'src', 'width') + 'video' => array('autoplay', 'controls', 'height', 'loop', 'muted', 'poster', 'preload', 'src', 'width'), + 'td' => array('id', 'style', 'class', 'colspan', 'rowspan'), + 'th' => array('id', 'style', 'class', 'colspan', 'rowspan'), + 'col' => array('id', 'span', 'class','style') ); protected $badAttrValues = array('javascript[\s]*?:','alert\(','vbscript[\s]*?:','data:text\/html', 'mhtml[\s]*?:', 'data:[\s]*?image');