mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-28 18:30:53 +02:00
Code Issues Releases Wiki Activity

Fixes #4056 - plugin menu detection path limits.

Browse Source
This commit is contained in:
camer0n
2023-11-18 08:19:48 -08:00
parent d9fc6d4956
commit 6b7aa7c6d9
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_handlers/menumanager_class.php
View File

@@ -475,7 +475,7 @@ class e_menuManager
/** /**
* @return void * @return void
*/ */
function menuScanMenus() public function menuScanMenus()
{ {
global $sql2; global $sql2;
$sql = e107::getDb(); $sql = e107::getDb();
@@ -484,7 +484,7 @@ class e_menuManager
$efile->dirFilter = array('/', 'CVS', '.svn', 'languages'); $efile->dirFilter = array('/', 'CVS', '.svn', 'languages');
$efile->fileFilter[] = '^e_menu\.php$'; $efile->fileFilter[] = '^e_menu\.php$';
$fileList = $efile->get_files(e_PLUGIN, "_menu\.php$", 'standard', 2); $fileList = $efile->get_files(e_PLUGIN, "_menu\.php$", 'standard', 1);
// $this->menuAddMessage('Scanning for new menus', E_MESSAGE_DEBUG); // $this->menuAddMessage('Scanning for new menus', E_MESSAGE_DEBUG);
@@ -2901,7 +2901,7 @@ class e_mm_layout
{ {
$fl = e107::getFile(); $fl = e107::getFile();
$fl->dirFilter = array('/', 'CVS', '.svn', 'languages'); $fl->dirFilter = array('/', 'CVS', '.svn', 'languages');
$files = $fl->get_files(e_PLUGIN,"_menu\.php$",'standard',2); $files = $fl->get_files(e_PLUGIN,"_menu\.php$",'standard',1);
$data = array(); $data = array();

4
e107_handlers/plugin_class.php
View File

@@ -3258,12 +3258,12 @@ class e107plugin
unset($attrib['read'], $attrib['write'], $attrib['applicable'], $attrib['required'], $attrib['fieldType']); unset($attrib['read'], $attrib['write'], $attrib['applicable'], $attrib['required'], $attrib['fieldType']);
$name = $this->ue_field_name($plug, EUF_ADDON, $field); $name = $this->ue_field_name($plug, defset('EUF_ADDON'), $field);
$insert = array( $insert = array(
'name' => $name, 'name' => $name,
'text' => varset($attrib['title'], "None Specified"), 'text' => varset($attrib['title'], "None Specified"),
'type' => EUF_ADDON, 'type' => defset('EUF_ADDON'),
'parms' => $plug, 'parms' => $plug,
'values' => e107::serialize($attrib, 'json'), 'values' => e107::serialize($attrib, 'json'),
'default' => null, 'default' => null,

5
e107_tests/tests/unit/pluginsTest.php
View File

@@ -126,8 +126,9 @@
{ {
// $this->_debugPlugin = '_blank'; // $this->_debugPlugin = '_blank';
$this->pluginInstall('_blank'); $result = $this->pluginInstall('_blank');
// print_r($result);
// $this->pluginUninstall('_blank'); // $this->pluginUninstall('_blank');
@@ -578,6 +579,8 @@
{ {
$this->assertTrue($val, $key." list pref is missing for ".$pluginDir); $this->assertTrue($val, $key." list pref is missing for ".$pluginDir);
} }
return $install;
} }
private function pluginUninstall($pluginDir, $opts=array()) private function pluginUninstall($pluginDir, $opts=array())