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

2014-06-24 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_extensions.php, index.php: force to load the
	new integrated update manager and don't load the old update manager
	extension.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10273 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2014-06-24 11:14:49 +00:00
parent 6b7fb2db11
commit 3a56ef0101
3 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2014-06-24 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_extensions.php, index.php: force to load the
new integrated update manager and don't load the old update manager
extension.
2014-06-24 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.data.sql

12
pandora_console/include/functions_extensions.php
View File

@ -74,8 +74,16 @@ function extensions_call_login_function () {
function extensions_is_extension ($page) {
global $config;
$filename = basename ($page);
return isset ($config['extensions'][$filename]);
$return = false;
//Avoid the old update manager
if ($page != "godmode/update_manager/update_manager.php") {
$filename = basename ($page);
$return = isset ($config['extensions'][$filename]);
}
return $return;
}
/**

17
pandora_console/index.php
View File

@ -468,11 +468,15 @@ else {
if ($page != "") {
$page .= '.php';
// Enterprise ACL check
if (enterprise_hook ('enterprise_acl', array ($config['id_user'], $sec, $sec2, true)) == false) {
if (enterprise_hook ('enterprise_acl',
array ($config['id_user'], $sec, $sec2, true)) == false) {
require ("general/noaccess.php");
}
elseif (file_exists ($page)) {
if (! extensions_is_extension ($page)) {
require_once($page);
}
else {
@ -496,7 +500,7 @@ else {
}
if ($home_page != '') {
switch($home_page) {
switch ($home_page) {
case 'Event list':
require ('operation/events/events.php');
break;
@ -525,13 +529,14 @@ else {
$id_visualc = db_get_value('id', 'tlayout', 'name', $home_url);
if (($home_url == '') || ($id_visualc == false)) {
$str = 'sec=visualc&sec2=operation/visual_console/index&refr=60';
} else
$str = 'sec=visualc&sec2=operation/visual_console/render_view&id='.$id_visualc .'&refr=60';
}
else
$str = 'sec=visualc&sec2=operation/visual_console/render_view&id='.$id_visualc .'&refr=60';
parse_str($str, $res);
foreach ($res as $key => $param) {
$_GET[$key] = $param;
}
require($_GET["sec2"].'.php');
require($_GET["sec2"] . '.php');
break;
case 'Other':
$home_url = io_safe_output($home_url);
@ -540,7 +545,7 @@ else {
$_GET[$key] = $param;
}
if (isset($_GET['sec2'])) {
$file = $_GET['sec2'].'.php';
$file = $_GET['sec2'] . '.php';
if (!file_exists ($file)) {
unset($_GET['sec2']);