tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

2012-02-22 Miguel de Dios <miguel.dedios@artica.es>

Browse Source 
* install.php, index.php, include/functions_ui.php: cleaned source code
	style.
	
	* include/styles/dialog.css: fix the bad selector that it finished with
	colon.
	
	* godmode/reporting/visual_console_builder.editor.php: fixed the bad syntax
	in the styles from the grid.

	* godmode/reporting/visual_console_builder.editor.js: fixed a tiny
	javascript warning.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5632 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2012-02-22 11:23:27 +00:00
parent 6b4e58f41e
commit 0ea8c7e582
7 changed files with 58 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_console/ChangeLog
View File

@ -1,3 +1,17 @@
2012-02-22 Miguel de Dios <miguel.dedios@artica.es>
* install.php, index.php, include/functions_ui.php: cleaned source code
style.
* include/styles/dialog.css: fix the bad selector that it finished with
colon.
* godmode/reporting/visual_console_builder.editor.php: fixed the bad syntax
in the styles from the grid.
* godmode/reporting/visual_console_builder.editor.js: fixed a tiny
javascript warning.
2012-02-21 Vanessa Gil <vanessa.gil@artica.es> 2012-02-21 Vanessa Gil <vanessa.gil@artica.es>
* godmode/reporting/graph_template_item_editor.php: Added option to edit * godmode/reporting/graph_template_item_editor.php: Added option to edit

2
pandora_console/godmode/reporting/visual_console_builder.editor.js
View File

@ -1476,7 +1476,7 @@ function click_button_toolbox(id) {
} }
break; break;
case 'save': case 'save':
status = true; var status = true;
activeToolboxButton('save', false); activeToolboxButton('save', false);
jQuery.each(list_actions_pending_save, function(key, action_pending_save) { jQuery.each(list_actions_pending_save, function(key, action_pending_save) {
jQuery.ajax ({ jQuery.ajax ({

2
pandora_console/godmode/reporting/visual_console_builder.editor.php
View File

@ -254,7 +254,7 @@ echo '<div id="frame_view" style="width: 100%; height: 500px; overflow: scroll;"
echo '<div id="background" class="ui-widget-content" style=" echo '<div id="background" class="ui-widget-content" style="
border: 2px black solid; width: ' . $widthBackground . 'px; height: ' . $heightBackground . 'px;">'; border: 2px black solid; width: ' . $widthBackground . 'px; height: ' . $heightBackground . 'px;">';
//echo "<img style='opacity:.5' id='background_img' src='images/console/background/white_boxed.jpg' width='100%' height='100%' />"; //echo "<img style='opacity:.5' id='background_img' src='images/console/background/white_boxed.jpg' width='100%' height='100%' />";
echo "<div id='background_grid' style='position:absolute; display:none; overflow:none; background:url(images/console/background/white_boxed.jpg) x-repeat y-repeat; width: " . $widthBackground . "px; height: " . $heightBackground . "px;'></div>"; //<img id='background_grid' style='display:none' src='images/console/background/white_boxed.jpg' width='100%' height='100%' /></div>"; echo "<div id='background_grid' style='position: absolute; display: none; overflow: hidden; background: url(images/console/background/white_boxed.jpg); background-repeat: repeat; width: " . $widthBackground . "px; height: " . $heightBackground . "px;'></div>"; //<img id='background_grid' style='display:none' src='images/console/background/white_boxed.jpg' width='100%' height='100%' /></div>";
echo "<img id='background_img' src='images/console/background/" . $background . "' width='100%' height='100%' />"; echo "<img id='background_img' src='images/console/background/" . $background . "' width='100%' height='100%' />";
foreach ($layoutDatas as $layoutData) { foreach ($layoutDatas as $layoutData) {

1
pandora_console/include/functions_ui.php
View File

@ -879,6 +879,7 @@ function ui_require_jquery_file ($name, $path = 'include/javascript/') {
return false; return false;
$config['jquery'][$name] = $filename; $config['jquery'][$name] = $filename;
return true; return true;
} }

2
pandora_console/include/styles/dialog.css
View File

@ -93,7 +93,7 @@
} }
/* Dialog handle styles */ /* Dialog handle styles */
.ui-dialog .ui-resizable-n, { .ui-dialog .ui-resizable-n {
cursor: n-resize; cursor: n-resize;
height: 6px; height: 6px;
width: 100%; width: 100%;

4
pandora_console/index.php
View File

@ -251,11 +251,11 @@ else {
if ($page != "") { if ($page != "") {
$page .= '.php'; $page .= '.php';
// Enterprise ACL check // Enterprise ACL check
if (enterprise_hook ('enterprise_acl', array ($config['id_user'], $sec, $sec2)) == false){ if (enterprise_hook ('enterprise_acl', array ($config['id_user'], $sec, $sec2)) == false) {
require ("general/noaccess.php"); require ("general/noaccess.php");
} }
elseif (file_exists ($page)) { elseif (file_exists ($page)) {
if (! extensions_is_extension ($page)){ if (! extensions_is_extension ($page)) {
require_once($page); require_once($page);
} }
else { else {

76
pandora_console/install.php
View File

@ -51,7 +51,7 @@ function ChangeDBAction(causer) {
else { else {
window.document.step2_form.db_action.length=2; window.document.step2_form.db_action.length=2;
} }
while (i < window.document.step2_form.db_action.length){ while (i < window.document.step2_form.db_action.length) {
window.document.step2_form.db_action.options[i].value =options_values[i]; window.document.step2_form.db_action.options[i].value =options_values[i];
window.document.step2_form.db_action.options[i].text =options_text[i]; window.document.step2_form.db_action.options[i].text =options_text[i];
i++; i++;
@ -72,11 +72,11 @@ $banner = "v$version Build $build";
error_reporting(0); error_reporting(0);
function check_extension ( $ext, $label ){ function check_extension ( $ext, $label ) {
echo "<tr><td>"; echo "<tr><td>";
echo "<span class='arr'> $label </span>"; echo "<span class='arr'> $label </span>";
echo "</td><td>"; echo "</td><td>";
if (!extension_loaded($ext)){ if (!extension_loaded($ext)) {
echo "<img src='images/dot_red.png'>"; echo "<img src='images/dot_red.png'>";
return 1; return 1;
} }
@ -87,11 +87,11 @@ function check_extension ( $ext, $label ){
echo "</td></tr>"; echo "</td></tr>";
} }
function check_include ( $ext, $label ){ function check_include ( $ext, $label ) {
echo "<tr><td>"; echo "<tr><td>";
echo "<span class='arr'> $label </span>"; echo "<span class='arr'> $label </span>";
echo "</td><td>"; echo "</td><td>";
if (!include($ext)){ if (!include($ext)) {
echo "<img src='images/dot_red.png'>"; echo "<img src='images/dot_red.png'>";
return 1; return 1;
} }
@ -102,11 +102,11 @@ function check_include ( $ext, $label ){
echo "</td></tr>"; echo "</td></tr>";
} }
function check_exists ( $file, $label ){ function check_exists ( $file, $label ) {
echo "<tr><td>"; echo "<tr><td>";
echo "<span class='arr'> $label </span>"; echo "<span class='arr'> $label </span>";
echo "</td><td>"; echo "</td><td>";
if (!file_exists ($file)){ if (!file_exists ($file)) {
echo " <img src='images/dot_red.png'>"; echo " <img src='images/dot_red.png'>";
return 1; return 1;
} }
@ -117,11 +117,11 @@ function check_exists ( $file, $label ){
echo "</td></tr>"; echo "</td></tr>";
} }
function check_generic ( $ok, $label ){ function check_generic ( $ok, $label ) {
echo "<tr><td>"; echo "<tr><td>";
echo "<span class='arr'> $label </span>"; echo "<span class='arr'> $label </span>";
echo "</td><td>"; echo "</td><td>";
if ($ok == 0 ){ if ($ok == 0 ) {
echo " <img src='images/dot_red.png'>"; echo " <img src='images/dot_red.png'>";
return 1; return 1;
} }
@ -132,12 +132,12 @@ function check_generic ( $ok, $label ){
echo "</td></tr>"; echo "</td></tr>";
} }
function check_writable ( $fullpath, $label ){ function check_writable ( $fullpath, $label ) {
echo "<tr><td>"; echo "<tr><td>";
echo "<span class='arr'> $label </span>"; echo "<span class='arr'> $label </span>";
echo "</td><td>"; echo "</td><td>";
if (file_exists($fullpath)) if (file_exists($fullpath))
if (is_writable($fullpath)){ if (is_writable($fullpath)) {
echo " <img src='images/dot_green.png'>"; echo " <img src='images/dot_green.png'>";
echo "</td></tr>"; echo "</td></tr>";
return 0; return 0;
@ -155,12 +155,12 @@ function check_writable ( $fullpath, $label ){
} }
function check_variable ( $var, $value, $label, $mode ){ function check_variable ( $var, $value, $label, $mode ) {
echo "<tr><td>"; echo "<tr><td>";
echo "<span class='arr'> $label </span>"; echo "<span class='arr'> $label </span>";
echo "</td><td>"; echo "</td><td>";
if ($mode == 1){ if ($mode == 1) {
if ($var >= $value){ if ($var >= $value) {
echo " <img src='images/dot_green.png'>"; echo " <img src='images/dot_green.png'>";
return 0; return 0;
} }
@ -169,7 +169,7 @@ function check_variable ( $var, $value, $label, $mode ){
return 1; return 1;
} }
} }
elseif ($var == $value){ elseif ($var == $value) {
echo " <img src='images/dot_green.png'>"; echo " <img src='images/dot_green.png'>";
return 0; return 0;
} }
@ -180,14 +180,14 @@ function check_variable ( $var, $value, $label, $mode ){
echo "</td></tr>"; echo "</td></tr>";
} }
function parse_mysql_dump($url){ function parse_mysql_dump($url) {
if (file_exists($url)){ if (file_exists($url)) {
$file_content = file($url); $file_content = file($url);
$query = ""; $query = "";
foreach($file_content as $sql_line){ foreach($file_content as $sql_line) {
if(trim($sql_line) != "" && strpos($sql_line, "--") === false){ if(trim($sql_line) != "" && strpos($sql_line, "--") === false) {
$query .= $sql_line; $query .= $sql_line;
if(preg_match("/;[\040]*\$/", $sql_line)){ if(preg_match("/;[\040]*\$/", $sql_line)) {
if (!$result = mysql_query($query)) { if (!$result = mysql_query($query)) {
echo mysql_error(); //Uncomment for debug echo mysql_error(); //Uncomment for debug
echo "<i><br>$query<br></i>"; echo "<i><br>$query<br></i>";
@ -209,7 +209,7 @@ function parse_postgresql_dump($connection, $url, $debug = false) {
$query = ""; $query = "";
foreach($file_content as $sql_line){ foreach($file_content as $sql_line) {
$clean_line = trim($sql_line); $clean_line = trim($sql_line);
$comment = preg_match("/^(\s|\t)*--.*$/", $clean_line); $comment = preg_match("/^(\s|\t)*--.*$/", $clean_line);
if ($comment) { if ($comment) {
@ -259,7 +259,7 @@ function parse_oracle_dump($connection, $url, $debug = false) {
$query = ""; $query = "";
$plsql_block = false; $plsql_block = false;
foreach($file_content as $sql_line){ foreach($file_content as $sql_line) {
$clean_line = trim($sql_line); $clean_line = trim($sql_line);
$comment = preg_match("/^(\s|\t)*--.*$/", $clean_line); $comment = preg_match("/^(\s|\t)*--.*$/", $clean_line);
if ($comment) { if ($comment) {
@ -271,7 +271,7 @@ function parse_oracle_dump($connection, $url, $debug = false) {
} }
//Support for PL/SQL blocks //Support for PL/SQL blocks
if (preg_match("/^BEGIN$/", $clean_line)){ if (preg_match("/^BEGIN$/", $clean_line)) {
$query .= $clean_line . ' '; $query .= $clean_line . ' ';
$plsql_block = true; $plsql_block = true;
} }
@ -281,7 +281,7 @@ function parse_oracle_dump($connection, $url, $debug = false) {
//Check query's end with a back slash and any returns in the end of line or if it's a PL/SQL block 'END;;' string //Check query's end with a back slash and any returns in the end of line or if it's a PL/SQL block 'END;;' string
if ((preg_match("/;[\040]*\$/", $clean_line) && !$plsql_block) || if ((preg_match("/;[\040]*\$/", $clean_line) && !$plsql_block) ||
(preg_match("/^END;;[\040]*\$/", $clean_line) && $plsql_block)) { (preg_match("/^END;;[\040]*\$/", $clean_line) && $plsql_block)) {
$plsql_block = false; $plsql_block = false;
//Execute and clean buffer //Execute and clean buffer
@ -343,7 +343,7 @@ function oracle_drop_all_objects ($connection) {
return 0; return 0;
} }
function random_name ($size){ function random_name ($size) {
$temp = ""; $temp = "";
for ($a=0;$a< $size;$a++) for ($a=0;$a< $size;$a++)
$temp = $temp. chr(rand(122,97)); $temp = $temp. chr(rand(122,97));
@ -351,7 +351,7 @@ function random_name ($size){
return $temp; return $temp;
} }
function print_logo_status ($step, $step_total){ function print_logo_status ($step, $step_total) {
global $banner; global $banner;
echo " echo "
@ -366,7 +366,7 @@ function print_logo_status ($step, $step_total){
function install_step1() { function install_step1() {
global $banner; global $banner;
echo " echo "
<div id='install_container'> <div id='install_container'>
<div id='wizard' style='height: 480px;'> <div id='wizard' style='height: 480px;'>
@ -377,11 +377,11 @@ function install_step1() {
<p>For more information, please refer to documentation.<br> <p>For more information, please refer to documentation.<br>
<i>Pandora FMS Development Team</i></p> <i>Pandora FMS Development Team</i></p>
"; ";
if (file_exists("include/config.php")){ if (file_exists("include/config.php")) {
echo "<div class='warn'><b>Warning:</b> You already have a config.php file. echo "<div class='warn'><b>Warning:</b> You already have a config.php file.
Configuration and database would be overwritten if you continued.</div>"; Configuration and database would be overwritten if you continued.</div>";
} }
echo "<br>"; echo "<br>";
echo "<table width=85%>"; echo "<table width=85%>";
$writable = check_writable ( "include", "Checking if ./include is writable"); $writable = check_writable ( "include", "Checking if ./include is writable");
if (file_exists("include/config.php")) if (file_exists("include/config.php"))
@ -399,9 +399,9 @@ function install_step1() {
<a href='http://www.pandorafms.com'>PandoraFMS.com web site</a>.</div>"; <a href='http://www.pandorafms.com'>PandoraFMS.com web site</a>.</div>";
echo "</div>"; echo "</div>";
print_logo_status (1, 5); print_logo_status (1, 5);
echo "<div id='install_img'>"; echo "<div id='install_img'>";
if ($writable == 0) { if ($writable == 0) {
echo " echo "
@ -431,7 +431,7 @@ function install_step1_licence() {
<p>If you dont accept the licence terms, please, close your browser and delete Pandora FMS files.</p> <p>If you dont accept the licence terms, please, close your browser and delete Pandora FMS files.</p>
"; ";
if (!file_exists("COPYING")){ if (!file_exists("COPYING")) {
echo "<div class='warn'><b>Licence file 'COPYING' is not present in your distribution. This means you have some 'partial' Pandora FMS distribution. We cannot continue without accepting the licence file.</b>"; echo "<div class='warn'><b>Licence file 'COPYING' is not present in your distribution. This means you have some 'partial' Pandora FMS distribution. We cannot continue without accepting the licence file.</b>";
echo "</div>"; echo "</div>";
} }
@ -444,9 +444,9 @@ function install_step1_licence() {
echo "<input type=submit value='Yes, I accept licence terms'>"; echo "<input type=submit value='Yes, I accept licence terms'>";
} }
echo "</div>"; echo "</div>";
print_logo_status (2, 5); print_logo_status (2, 5);
echo "</div> echo "</div>
<div style='clear: both;height: 1px;'><!-- --></div> <div style='clear: both;height: 1px;'><!-- --></div>
<div id='foot_install'> <div id='foot_install'>
@ -702,7 +702,7 @@ function install_step4() {
} }
// Create schema // Create schema
if ($dbaction == 'db_new' || $dbdrop == 1){ if ($dbaction == 'db_new' || $dbdrop == 1) {
$step1 = mysql_query ("CREATE DATABASE $dbname"); $step1 = mysql_query ("CREATE DATABASE $dbname");
check_generic ($step1, "Creating database '$dbname'"); check_generic ($step1, "Creating database '$dbname'");
} }
@ -763,7 +763,7 @@ function install_step4() {
break; break;
case 'oracle': case 'oracle':
$connection = oci_connect($dbuser, $dbpassword, '//' . $dbhost . '/' . $dbname); $connection = oci_connect($dbuser, $dbpassword, '//' . $dbhost . '/' . $dbname);
if (!$connection){ if (!$connection) {
check_generic(0, "Connection with Database"); check_generic(0, "Connection with Database");
} }
else { else {
@ -840,7 +840,7 @@ function install_step4() {
$result = pg_query($connection, "DROP DATABASE \"" . $dbname . "\";"); $result = pg_query($connection, "DROP DATABASE \"" . $dbname . "\";");
} }
if ($dbaction != 'db_exist' || $dbdrop == 1){ if ($dbaction != 'db_exist' || $dbdrop == 1) {
pg_send_query($connection, "CREATE DATABASE \"" . $dbname . "\" WITH ENCODING 'utf8';"); pg_send_query($connection, "CREATE DATABASE \"" . $dbname . "\" WITH ENCODING 'utf8';");
$result = pg_get_result($connection); $result = pg_get_result($connection);
if (pg_result_status($result) != PGSQL_FATAL_ERROR) { if (pg_result_status($result) != PGSQL_FATAL_ERROR) {
@ -1086,7 +1086,7 @@ function install_step5() {
// Main page code // Main page code
// --------------- // ---------------
if (! isset($_GET["step"])){ if (! isset($_GET["step"])) {
install_step1(); install_step1();
} }
else { else {