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

Merge pull request #2 from e107inc/master

Browse Source 
Update mikeygmt from e107
This commit is contained in:
MikeyGMT
2015-07-01 19:43:43 +01:00
parent 4d920fec84 cb212417a8
commit c2bf486604
6 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/db.php
View File

@@ -1186,7 +1186,7 @@ class system_tools
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
<th>".$frm->checkbox_toggle('check-all-verify', 'xml_prefs')." ".DBLAN_96."</th> <th>".$frm->checkbox_toggle('check-all-verify', 'xml_prefs')." ".LAN_PREFS."</th>
<th class='right'>".DBLAN_98."</th> <th class='right'>".DBLAN_98."</th>
</tr> </tr>

2
e107_admin/plugin.php
View File

@@ -2329,7 +2329,7 @@ class pluginBuilder
$text .= "<li><a data-toggle='tab' href='#".$table."'>Table: ".$table."</a></li>"; $text .= "<li><a data-toggle='tab' href='#".$table."'>Table: ".$table."</a></li>";
$this->tableList[] = $table; $this->tableList[] = $table;
} }
$text .= "<li><a data-toggle='tab' href='#preferences'>".EPL_ADLAN_110."</a></li>"; $text .= "<li><a data-toggle='tab' href='#preferences'>".LAN_PREFS."</a></li>";
$text .= "</ul>"; $text .= "</ul>";

5
e107_handlers/e_parse_class.php
View File

@@ -2687,7 +2687,10 @@ class e_parser
'input' => array('type','name','value','class','style'), 'input' => array('type','name','value','class','style'),
'form' => array('action','method','target'), 'form' => array('action','method','target'),
'audio' => array('src','controls', 'autoplay', 'loop', 'muted', 'preload' ), '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'); protected $badAttrValues = array('javascript[\s]*?:','alert\(','vbscript[\s]*?:','data:text\/html', 'mhtml[\s]*?:', 'data:[\s]*?image');

3
e107_handlers/plugin_class.php
View File

@@ -1653,10 +1653,11 @@ class e107plugin
function XmlTables($function, $plug, $options = array()) 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; if(!file_exists($sqlFile)) // No File, so return;
{ {
e107::getMessage()->addDebug("No SQL File Found at: ".$sqlFile);
return; return;
} }

2
e107_languages/English/admin/lan_db.php
View File

@@ -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_94', "Please make sure you have the following line in your e107_config.php file:");
define('DBLAN_95', "Export Options"); define('DBLAN_95', "Export Options");
define('DBLAN_96', "Preferences"); //define('DBLAN_96', "Preferences");
define('DBLAN_97', "Tables"); define('DBLAN_97', "Tables");
define('DBLAN_98', "Rows"); define('DBLAN_98', "Rows");
define('DBLAN_99', "Table Data:"); define('DBLAN_99', "Table Data:");

3
e107_languages/English/admin/lan_plugin.php
View File

@@ -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_107',"Build an admin-area and xml file for:");
define ('EPL_ADLAN_108',"Check language files:"); define ('EPL_ADLAN_108',"Check language files:");
define ('EPL_ADLAN_109',"Basic Info."); define ('EPL_ADLAN_109',"Basic Info.");
define ('EPL_ADLAN_110',"Preferences"); // define ('EPL_ADLAN_110',"Preferences");
define ('EPL_ADLAN_111',"Generate"); define ('EPL_ADLAN_111',"Generate");
define ('EPL_ADLAN_112',"Review all fields and modify if necessary."); define ('EPL_ADLAN_112',"Review all fields and modify if necessary.");
define ('EPL_ADLAN_113',"Review ALL tabs before clicking 'Generate'."); 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_162',"Other 4");
define ('EPL_ADLAN_163',"Exclude this table"); define ('EPL_ADLAN_163',"Exclude this table");
//FIXME TODO Excessive duplicate terms below.
define ('EPL_ADLAN_164',"Field"); define ('EPL_ADLAN_164',"Field");
define ('EPL_ADLAN_165',"Caption"); define ('EPL_ADLAN_165',"Caption");
define ('EPL_ADLAN_166',"Type"); define ('EPL_ADLAN_166',"Type");