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

2013-08-07 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/setup/setup_auth.php, godmode/admin_access_logs.php,
	godmode/agentes/module_manager.php: removed the code as
	"call time passing variables by reference" deprecated in PHP 5.4.
	
	* index.php: improved the source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8635 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-08-07 08:26:26 +00:00
parent f6a24dbd3b
commit 1afefbf265
5 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2013-08-07 Miguel de Dios <miguel.dedios@artica.es>
* godmode/setup/setup_auth.php, godmode/admin_access_logs.php,
godmode/agentes/module_manager.php: removed the code as
"call time passing variables by reference" deprecated in PHP 5.4.
* index.php: improved the source code style.
2013-08-06 Miguel de Dios <miguel.dedios@artica.es>
* godmode/menu.php, godmode/massive/massive_edit_modules.php:

4
pandora_console/godmode/admin_access_logs.php
View File

@ -284,10 +284,10 @@ foreach ($result as $row) {
switch ($config['dbtype']) {
case "mysql":
case "postgresql":
enterprise_hook('rowEnterpriseAudit', array($table, &$iterator, $row['id_sesion']));
rowEnterpriseAudit$table, $iterator, $row['id_sesion']);
break;
case "oracle":
enterprise_hook('rowEnterpriseAudit', array($table, &$iterator, $row['id_sesion']));
rowEnterpriseAudit($table, $iterator, $row['id_sesion']);
break;
}
}

4
pandora_console/godmode/agentes/module_manager.php
View File

@ -77,7 +77,9 @@ if ($wmi_available)
if ($prediction_available)
$modules['predictionserver'] = __('Create a new prediction server module');
enterprise_hook ('set_enterprise_module_types', array (&$modules));
if (enterprise_installed()) {
set_enterprise_module_types($modules);
}
$sec2 = get_parameter('sec2', '');
if (strstr($sec2, "enterprise/godmode/policies/policies") !== false) {

8
pandora_console/godmode/setup/setup_auth.php
View File

@ -36,7 +36,9 @@ $table->size[0] = '30%';
$table->data[0][0] = __('Authentication method');
$auth_methods = array ('mysql' => __('Local Pandora FMS'), 'ldap' => __('ldap'));
enterprise_hook ('add_enterprise_auth_methods', array (&$auth_methods));
if (enterprise_installed()) {
add_enterprise_auth_methods($auth_methods);
}
$table->data[0][1] = html_print_select ($auth_methods, 'auth', $config['auth'], 'show_selected_rows ();', '', 0, true);
$table->data[1][0] = __('Autocreate remote users');
@ -80,7 +82,9 @@ for ($i = 5; $i <= 10; $i++) {
}
// Add enterprise authentication options
enterprise_hook ('add_enterprise_auth_options', array (&$table, 11));
if (enterprise_installed()) {
add_enterprise_auth_options($table, 11);
}
echo '<form id="form_setup" method="post">';
html_print_input_hidden ('update_config', 1);

28
pandora_console/index.php
View File

@ -565,21 +565,23 @@ echo "\n<!-- Page generated in $run_time seconds -->\n";
// Values from PHP to be recovered from JAVASCRIPT
require('include/php_to_js_values.php');
?>
<script type="text/javascript" language="javascript">
//Initial load of page
$(document).ready(sizeContent);
//Every resize of window
$(window).resize(sizeContent);
//Dynamically assign height
function sizeContent() {
var footposition_bottom = $('#foot').position().top + $("#foot").height();
if(footposition_bottom < $(window).height()) {
$('#container').css('height', $(window).height() - $("#foot").height() - 15 + 'px');
//Initial load of page
$(document).ready(sizeContent);
//Every resize of window
$(window).resize(sizeContent);
//Dynamically assign height
function sizeContent() {
var footposition_bottom = $('#foot').position().top + $("#foot").height();
if (footposition_bottom < $(window).height()) {
$('#container').css('height', $(window).height() - $("#foot").height() - 15 + 'px');
}
}
}
</script>