tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed feature to add cron extension in meta. Tiquet: #3669

This commit is contained in:
m-lopez-f 2016-05-23 15:20:46 +02:00
parent da10acd6c3
commit cefbc70ede
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pandora_console/include/functions_extensions.php
View File

@ -93,11 +93,24 @@ function extensions_is_extension ($page) {
* @param bool $enterprise * @param bool $enterprise
*/ */
function extensions_get_extensions ($enterprise = false) { function extensions_get_extensions ($enterprise = false) {
$dir = EXTENSIONS_DIR; $dir = EXTENSIONS_DIR;
$master_dir = ENTERPRISE_DIR . '/' . EXTENSIONS_DIR;
$handle = false; $handle = false;
if ($enterprise) if ($enterprise) {
$dir = ENTERPRISE_DIR.'/'.EXTENSIONS_DIR; $dir = ENTERPRISE_DIR . '/' . EXTENSIONS_DIR;
if (defined("METACONSOLE")) {
$dir = '../' . EXTENSIONS_DIR;
$master_dir = '../' . EXTENSIONS_DIR;
}
}
else {
if (defined("METACONSOLE")) {
$dir = '../../' . $dir;
$master_dir = '../' . EXTENSIONS_DIR;
}
}
if (file_exists ($dir)) if (file_exists ($dir))
$handle = @opendir ($dir); $handle = @opendir ($dir);
@ -134,7 +147,7 @@ function extensions_get_extensions ($enterprise = false) {
} }
/* Load extensions in enterprise directory */ /* Load extensions in enterprise directory */
if (! $enterprise && file_exists (ENTERPRISE_DIR.'/'.EXTENSIONS_DIR)) if (! $enterprise && file_exists ($master_dir))
return array_merge ($extensions, extensions_get_extensions (true)); return array_merge ($extensions, extensions_get_extensions (true));
return $extensions; return $extensions;