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

2010-06-02 Ramon Novoa <rnovoa@artica.es> 

* operation/messages/message.php: Small fixes. Fixed bug #3008779.

        * godmode/servers/modificar_server.php: Ask for confirmation before
          deleting a server.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2845 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2010-06-02 15:06:48 +00:00
parent 57b21a7a6f
commit 0075d5da2b
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2010-06-02 Ramon Novoa <rnovoa@artica.es>
* operation/messages/message.php: Small fixes. Fixed bug #3008779.
* godmode/servers/modificar_server.php: Ask for confirmation before
deleting a server.
2010-06-02 Sergio Martin <sergio.martin@artica.es>
* godmode/alerts/alert_list.list.php: Fixed the error

6
pandora_console/godmode/servers/modificar_server.php
View File

@ -52,7 +52,6 @@ if (isset($_GET["server"])) {
echo "</div>";
} else {
$servers = get_server_info ();
print_page_header (__('Manage servers'), "", false, "", true);
if (isset ($_GET["delete"])) {
@ -77,7 +76,8 @@ if (isset($_GET["server"])) {
echo '<h3 class="error">'.__('There was a problem updating the server').'</h3>';
}
}
$servers = get_server_info ();
if ($servers !== false) {
$table->width = "90%";
$table->class = "databox";
@ -118,7 +118,7 @@ if (isset($_GET["server"])) {
$data[4] = human_time_comparation ($server["laststart"]);
$data[5] = human_time_comparation ($server["keepalive"]);
$data[6] = '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_del='.$server["id_server"].'&amp;delete=1">';
$data[6] .= print_image ('images/cross.png', true, array ('title' => __('Delete')));
$data[6] .= print_image ('images/cross.png', true, array ('title' => __('Delete'), 'onclick' => "if (! confirm ('" . __('Modules run by this server will stop working. Do you want to continue?') ."')) return false"));
$data[6] .= '</a>';
array_push ($table->data, $data);

4
pandora_console/operation/messages/message.php
View File

@ -29,7 +29,7 @@ if (isset ($_GET["new_msg"]))
print_page_header (__('Messages'). " &raquo; ".__('New message'), "images/email.png", false, "", false, "" );
elseif (isset ($_GET["read_message"]))
print_page_header (__('Messages'). " &raquo; ".__('Read message'), "images/email.png", false, "", false, "" );
if (isset ($_GET["read_message"]) || !isset ($_GET["new_msg"]))
else
if (empty ($config["pure"]) && !is_ajax ())
print_page_header (__('Messages'). " &raquo; ".__('Message overview'), "images/email.png", false, "", false, "" );
@ -232,7 +232,7 @@ if (isset ($_GET["read_message"]) || !isset ($_GET["new_msg"])) {
array_push ($table->data, $data);
}
echo '<form method="post" action="index.php?sec=messages&amp;sec2=operation/messages/message&amp;new_msg=1">';
echo '<form method="post" action="index.php?sec=messages&amp;sec2=operation/messages/message">';
print_table ($table);
echo '</form>';
}