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

Bugtracker #3984 - prevent uninstalled shortcodes from showing

Browse Source
This commit is contained in:
e107steved 2007-07-18 20:46:42 +00:00
parent 276f37b9a6
commit 178eea6cf6
2 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
e107_handlers/plugin_class.php
View File

@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_handlers/plugin_class.php,v $
| $Revision: 1.10 $
| $Date: 2007-06-06 19:25:26 $
| $Revision: 1.11 $
| $Date: 2007-07-18 20:46:32 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@ -602,7 +602,8 @@ class e107plugin
function save_addon_prefs(){ // scan the plugin table and create path-array-prefs for each addon.
global $sql,$pref;
$query = "SELECT * FROM #plugin WHERE plugin_installflag = 1 AND plugin_addons !='' ORDER BY plugin_path ASC";
// $query = "SELECT * FROM #plugin WHERE plugin_installflag = 1 AND plugin_addons !='' ORDER BY plugin_path ASC";
$query = "SELECT * FROM #plugin WHERE plugin_addons !='' ORDER BY plugin_path ASC";
// clear all addon prefs before re-creation.
unset($pref['shortcode_list'],$pref['bbcode_list'],$pref['e_sql_list']);
@ -615,9 +616,12 @@ class e107plugin
{
while($row = $sql-> db_Fetch())
{
$is_installed = ($row['plugin_installflag'] == 1 );
$tmp = explode(",",$row['plugin_addons']);
$path = $row['plugin_path'];
if ($is_installed)
{
foreach($this->plugin_addons as $val)
{
if(in_array($val,$tmp))
@ -625,6 +629,7 @@ class e107plugin
$pref[$val."_list"][$path] = $path;
}
}
}
// search for .bb and .sc files.
$sc_array = array();
$bb_array = array();
@ -635,22 +640,29 @@ class e107plugin
if(substr($adds,-3) == ".sc")
{
$sc_name = substr($adds, 0,-3); // remove the .sc
$sc_array[$sc_name] = "0"; // default userclass.
if ($is_installed)
{
$sc_array[$sc_name] = "0"; // default userclass = e_UC_PUBLIC
}
else
{
$sc_array[$sc_name] = e_UC_NOBODY; // register shortcode, but disable it
}
}
if(substr($adds,-3) == ".bb")
if($is_installed && (substr($adds,-3) == ".bb"))
{
$bb_name = substr($adds, 0,-3); // remove the .bb
$bb_array[$bb_name] = "0"; // default userclass.
}
if(substr($adds,-4) == "_sql")
if($is_installed && (substr($adds,-4) == "_sql"))
{
$pref['e_sql_list'][$path] = $adds;
}
}
// Build Bbcode list
// Build Bbcode list (will be empty if plugin not installed)
if(count($bb_array) > 0)
{
ksort($bb_array);
@ -662,7 +674,7 @@ class e107plugin
if (isset($pref['bbcode_list'][$path])) unset($pref['bbcode_list'][$path]);
}
// Build shortcode list
// Build shortcode list - do if uninstalled as well
if(count($sc_array) > 0)
{
ksort($sc_array);

30
e107_handlers/shortcode_handler.php
View File

@ -12,9 +12,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_handlers/shortcode_handler.php,v $
| $Revision: 1.7 $
| $Date: 2007-06-13 02:53:21 $
| $Author: mcfly_e107 $
| $Revision: 1.8 $
| $Date: 2007-07-18 20:46:32 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@ -30,10 +30,10 @@ function register_shortcode($code, $filename, $function, $force=false)
}
class e_shortcode {
var $scList;
var $parseSCFiles;
var $addedCodes;
var $registered_codes;
var $scList; // The actual code - added by parsing files or when plugin codes encountered. Array key is the shortcode name.
var $parseSCFiles; // True if shortcode file has been parsed
var $addedCodes; // Apparently not used
var $registered_codes; // Shortcodes added by plugins
function e_shortcode()
{
@ -55,6 +55,7 @@ class e_shortcode {
$code = strtoupper($code);
$this->registered_codes[$code]['type'] = 'plugin';
$this->registered_codes[$code]['path'] = $path;
$this->registered_codes[$code]['perms'] = $uclass; // Add this in
}
}
}
@ -145,12 +146,14 @@ class e_shortcode {
}
else
{
$sc_perms = e_UC_PUBLIC; // Default permissions are 'everybody'
if ($this->parseSCFiles == TRUE)
{
if (is_array($this -> registered_codes) && array_key_exists($code, $this->registered_codes))
{
if($this->registered_codes[$code]['type'] == 'plugin')
{
if (isset($this->registered_codes[$code]['perms'])) $sc_perms = $this->registered_codes[$code]['perms'];
$scFile = e_PLUGIN.strtolower($this->registered_codes[$code]['path']).'/'.strtolower($code).'.sc';
}
else
@ -162,7 +165,13 @@ class e_shortcode {
{
$scFile = e_FILE."shortcode/".strtolower($code).".sc";
}
if (file_exists($scFile)) {
if (!check_class($sc_perms))
{ // Mainly to pick up e_UC_NOBODY
$shortcode = 'return;';
$this->scList[$code] = 'return;';
}
elseif (file_exists($scFile))
{
$shortcode = file_get_contents($scFile);
$this->scList[$code] = $shortcode;
}
@ -177,8 +186,9 @@ class e_shortcode {
if(E107_DBG_SC)
{
echo " sc= ".str_replace(e_FILE."shortcode/","",$scFile)."<br />";
}
echo ($scFile) ? "<br />sc_file= ".str_replace(e_FILE."shortcode/","",$scFile)."<br />" : "";
echo "<br />sc= <b>$code</b>";
}
if(E107_DBG_BBSC)
{