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

Reorganizate code for use OS/module groups in metaconsole. Tiquet #3490

This commit is contained in:
m-lopez-f 2016-06-06 13:05:25 +02:00
parent 86c2a56ab4
commit 7ca577ce51
6 changed files with 66 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pandora_console/godmode/groups/configure_modu_group.php
View File

@ -19,14 +19,18 @@ global $config;
check_login ();
enterprise_hook('open_meta_frame');
if (! check_acl ($config['id_user'], 0, "PM")) {
db_pandora_audit("ACL Violation", "Trying to access Group Management2");
require ("general/noaccess.php");
return;
}
// Header
ui_print_page_header (__("Module group management"), "images/module_group.png", false, "", true, "");
if (!is_metaconsole()) {
// Header
ui_print_page_header (__("Module group management"), "images/module_group.png", false, "", true, "");
}
// Init vars
$icon = "";
@ -67,7 +71,10 @@ $table->data[0][1] = html_print_input_text ('name', $name, '', 35, 100, true);
echo'</span>';
echo '<form name="grupo" method="post" action="index.php?sec=gmodules&sec2=godmode/groups/modu_group_list">';
if (is_metaconsole())
echo '<form name="grupo" method="post" action="index.php?sec=advanced&sec2=advanced/component_management&tab=module_group">';
else
echo '<form name="grupo" method="post" action="index.php?sec=gmodules&sec2=godmode/groups/modu_group_list">';
html_print_table ($table);
echo '<div class="action-buttons" style="width: '.$table->width.'">';
if ($id_group) {
@ -81,4 +88,7 @@ else {
}
echo '</div>';
echo '</form>';
enterprise_hook('close_meta_frame');
?>

13
pandora_console/godmode/groups/modu_group_list.php
View File

@ -50,9 +50,10 @@ if (is_ajax ()) {
return;
}
// Header
ui_print_page_header (__("Module groups defined in Pandora"), "images/module_group.png", false, "", true, "");
if (!is_metaconsole()) {
// Header
ui_print_page_header (__("Module groups defined in Pandora"), "images/module_group.png", false, "", true, "");
}
$create_group = (bool) get_parameter ('create_group');
$update_group = (bool) get_parameter ('update_group');
$delete_group = (bool) get_parameter ('delete_group');
@ -190,9 +191,13 @@ if (!empty($groups)) {
foreach ($groups as $id_group ) {
$data = array ();
$data[0] = $id_group["id_mg"];
$data[1] = '<strong><a href="index.php?sec=gmodules&sec2=godmode/groups/configure_modu_group&id_group=' . $id_group["id_mg"].'">' .
ui_print_truncate_text($id_group["name"], GENERIC_SIZE_TEXT).'</a></strong>';
$data[2] = '<a href="index.php?sec=gmodules&sec2=godmode/groups/modu_group_list&id_group='.$id_group["id_mg"].'&delete_group=1" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">' . html_print_image("images/cross.png", true, array("border" => '0')) . '</a>';
if (is_metaconsole())
$data[2] = '<a href="index.php?sec=advanced&sec2=advanced/component_management&tab=module_group&id_group='.$id_group["id_mg"].'&delete_group=1" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">' . html_print_image("images/cross.png", true, array("border" => '0')) . '</a>';
else
$data[2] = '<a href="index.php?sec=gmodules&sec2=godmode/groups/modu_group_list&id_group='.$id_group["id_mg"].'&delete_group=1" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">' . html_print_image("images/cross.png", true, array("border" => '0')) . '</a>';
array_push ($table->data, $data);
}

19
pandora_console/godmode/setup/os.list.php
View File

@ -49,10 +49,16 @@ foreach ($osList as $os) {
$data = array();
$data[] = ui_print_os_icon($os['id_os'], false, true);
$data[] = $os['id_os'];
$data[] = '<a href="index.php?sec=gsetup&sec2=godmode/setup/os&action=edit&tab=builder&id_os=' . $os['id_os'] . '">' . io_safe_output($os['name']) . '</a>';
if(is_metaconsole())
$data[] = '<a href="index.php?sec=advanced&sec2=advanced/component_management&tab=os_manage&action=edit&tab2=builder&id_os=' . $os['id_os'] . '">' . io_safe_output($os['name']) . '</a>';
else
$data[] = '<a href="index.php?sec=gsetup&sec2=godmode/setup/os&action=edit&tab=builder&id_os=' . $os['id_os'] . '">' . io_safe_output($os['name']) . '</a>';
$data[] = ui_print_truncate_text(io_safe_output($os['description']), 'description', true, true);
if ($os['id_os'] > 16) {
$data[] = '<a href="index.php?sec=gsetup&sec2=godmode/setup/os&action=delete&tab=list&id_os=' . $os['id_os'] . '">' . html_print_image("images/cross.png", true) . '</a>';
if(is_metaconsole())
$data[] = '<a href="index.php?sec=advanced&sec2=advanced/component_management&tab=os_manage&action=delete&tab2=list&id_os=' . $os['id_os'] . '">' . html_print_image("images/cross.png", true) . '</a>';
else
$data[] = '<a href="index.php?sec=gsetup&sec2=godmode/setup/os&action=delete&tab=list&id_os=' . $os['id_os'] . '">' . html_print_image("images/cross.png", true) . '</a>';
}
else {
//The original icons of pandora don't delete.
@ -68,4 +74,13 @@ if (isset($data)) {
else {
ui_print_info_message ( array('no_close'=>true, 'message'=> __('There are no defined operating systems') ) );
}
if (is_metaconsole()) {
echo '<form method="post" action="index.php?sec=advanced&sec2=advanced/component_management&tab=os_manage&tab2=builder">';
echo "<div style='text-align:right;width:" . $table->width . "'>";
html_print_submit_button (__('Create OS'), '', false, 'class="sub next"');
echo "</div>";
echo '</form>';
}
?>

16
pandora_console/godmode/setup/os.php
View File

@ -26,7 +26,10 @@ if (! check_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_us
$action = get_parameter('action', 'new');
$idOS = get_parameter('id_os', 0);
$tab = get_parameter('tab', 'list');
if (is_metaconsole())
$tab = get_parameter('tab2', 'list');
else
$tab = get_parameter('tab', 'list');
if ($idOS) {
$os = db_get_row_filter('tconfig_os', array('id_os' => $idOS));
@ -135,18 +138,19 @@ $buttons = array(
$buttons[$tab]['active'] = true;
// Header
ui_print_page_header(__('Edit OS'), "", false, "", true, $buttons);
if (!is_metaconsole()) {
// Header
ui_print_page_header(__('Edit OS'), "", false, "", true, $buttons);
}
echo $message;
switch ($tab) {
case 'list':
require_once('godmode/setup/os.list.php');
require_once($config['homedir'] . '/godmode/setup/os.list.php');
return;
break;
case 'builder':
require_once('godmode/setup/os.builder.php');
require_once($config['homedir'] . '/godmode/setup/os.builder.php');
return;
break;
}

23
pandora_console/godmode/tag/edit_tag.php
View File

@ -45,20 +45,25 @@ if (defined('METACONSOLE'))
else
$sec = 'gmodules';
$buttons = array(
if (defined('METACONSOLE')) {
$buttons = array(
'list' => array(
'active' => false,
'text' => '<a href="index.php?sec='.$sec.'&sec2=advanced/component_management&tab=tags">' .
html_print_image ("images/list.png", true, array ("title" => __('List tags'))) .'</a>'));
$buttons[$tab]['active'] = true;
// Print header
ui_meta_print_header(__('Tags'), "", $buttons);
}
else {
$buttons = array(
'list' => array(
'active' => false,
'text' => '<a href="index.php?sec='.$sec.'&sec2=godmode/tag/tag&tab=list">' .
html_print_image ("images/list.png", true, array ("title" => __('List tags'))) .'</a>'));
$buttons[$tab]['active'] = true;
if (defined('METACONSOLE')) {
// Print header
ui_meta_print_header(__('Tags'), "", $buttons);
}
else {
$buttons[$tab]['active'] = true;
// Header
ui_print_page_header (__('Tags configuration'), "images/tag.png", false, "", true, $buttons);

6
pandora_console/godmode/tag/tag.php
View File

@ -86,7 +86,7 @@ if (is_ajax ()) {
return;
}
enterprise_hook('open_meta_frame');
//~ enterprise_hook('open_meta_frame');
if (is_metaconsole())
$sec = 'advanced';
@ -103,7 +103,7 @@ $buttons[$tab]['active'] = true;
if (is_metaconsole()) {
// Print header
ui_meta_print_header(__('Tags'), "", $buttons);
//ui_meta_print_header(__('Tags'), "", $buttons);
}
else {
// Header
@ -302,7 +302,7 @@ echo "<table border=0 cellpadding=0 cellspacing=0 width=100%>";
echo "</table>";
enterprise_hook('close_meta_frame');
//~ enterprise_hook('close_meta_frame');
?>