diff --git a/composer.json b/composer.json old mode 100644 new mode 100755 index 35e8e53d..52a883a2 --- a/composer.json +++ b/composer.json @@ -2,9 +2,16 @@ "name": "phpservermon/phpservermon", "description": "PHP Server Monitor", "homepage": "http://www.phpservermonitor.org", + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/phpservermon/php-pushover" + } + ], "require": { "php": ">=5.3.7", "phpmailer/phpmailer": "5.2.6", - "symfony/http-foundation": "2.4.*" + "symfony/http-foundation": "2.4.*", + "php-pushover/php-pushover": "dev-master" } } diff --git a/composer.lock b/composer.lock index e34ceb9a..ea19d7aa 100644 --- a/composer.lock +++ b/composer.lock @@ -3,8 +3,34 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "63c9618391ed04b38b098c0139b50570", + "hash": "6a941e5369d421e16d869151569bc5c7", "packages": [ + { + "name": "php-pushover/php-pushover", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/phpservermon/php-pushover.git", + "reference": "d13d08dbf5f1cfa73f4adca7e8d27f79c804dd7b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpservermon/php-pushover/zipball/d13d08dbf5f1cfa73f4adca7e8d27f79c804dd7b", + "reference": "d13d08dbf5f1cfa73f4adca7e8d27f79c804dd7b", + "shasum": "" + }, + "type": "library", + "autoload": { + "files": [ + "Pushover.php" + ] + }, + "description": "PHP class for the Pushover.net project", + "support": { + "source": "https://github.com/phpservermon/php-pushover/tree/master" + }, + "time": "2014-07-30 13:55:53" + }, { "name": "phpmailer/phpmailer", "version": "v5.2.6", @@ -60,17 +86,17 @@ }, { "name": "symfony/http-foundation", - "version": "v2.4.3", + "version": "v2.4.8", "target-dir": "Symfony/Component/HttpFoundation", "source": { "type": "git", "url": "https://github.com/symfony/HttpFoundation.git", - "reference": "11ad7352c7bfa12145a0df8e1c4c303c585ce169" + "reference": "68abe34601c519359b60363b99c29ecfb6679bc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/11ad7352c7bfa12145a0df8e1c4c303c585ce169", - "reference": "11ad7352c7bfa12145a0df8e1c4c303c585ce169", + "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/68abe34601c519359b60363b99c29ecfb6679bc4", + "reference": "68abe34601c519359b60363b99c29ecfb6679bc4", "shasum": "" }, "require": { @@ -111,7 +137,7 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "http://symfony.com", - "time": "2014-03-26 11:35:33" + "time": "2014-07-15 14:07:10" } ], "packages-dev": [ @@ -121,9 +147,9 @@ ], "minimum-stability": "stable", - "stability-flags": [ - - ], + "stability-flags": { + "php-pushover/php-pushover": 20 + }, "platform": { "php": ">=5.3.7" }, diff --git a/src/includes/functions.inc.php b/src/includes/functions.inc.php index c55150d8..98d11543 100644 --- a/src/includes/functions.inc.php +++ b/src/includes/functions.inc.php @@ -414,13 +414,12 @@ function psm_build_mail($from_name = null, $from_email = null) { } /** - * Prepare a new Pushover util. * - * @return \psm\Util\Pushover + * @return \Pushover */ function psm_build_pushover() { - $pushover = new \psm\Util\Pushover(); + $pushover = new \Pushover(); $pushover->setToken(psm_get_conf('pushover_api_token')); return $pushover; diff --git a/src/lang/bg_BG.lang.php b/src/lang/bg_BG.lang.php index 21c4d2f8..a8d7d768 100644 --- a/src/lang/bg_BG.lang.php +++ b/src/lang/bg_BG.lang.php @@ -81,6 +81,9 @@ $sm_lang = array( 'level_description' => 'Администраторите имат пълен достъп: могат да управляват сървърите, потребителите и да редактират глобалните настройки.
Потребителите могат само да виждат статуса на сървърите и да обнояват информацията за даден сървър, за който им е разрешен достъп.', 'mobile' => 'Мобилен телефон', 'email' => 'Имейл', + 'pushover' => 'Pushover', + 'pushover_key' => 'Pushover Key', + 'pushover_device' => 'Pushover Device', 'delete_title' => 'Изтриване на потребител', 'delete_message' => 'Сигурни ли сте, че искате да изтриете потребител \'%1\'?', 'deleted' => 'Потребителят е изтрит успешно.', @@ -104,6 +107,7 @@ $sm_lang = array( 'status' => 'Статус', 'email' => 'Имейл', 'sms' => 'SMS', + 'pushover' => 'Pushover', 'no_logs' => 'Няма налични логове', ), 'servers' => array( @@ -127,6 +131,7 @@ $sm_lang = array( 'send_email' => 'Имейл', 'sms' => 'SMS', 'send_sms' => 'SMS', + 'pushover' => 'Pushover', 'users' => 'Users', 'delete_title' => 'Изтриване на сървър', 'delete_message' => 'Сигурни ли сте, че искате да изтриете сървър \'%1\'?', @@ -186,6 +191,8 @@ $sm_lang = array( 'sms_gateway_username' => 'Потребител', 'sms_gateway_password' => 'Парола', 'sms_from' => 'Номер на изпращача', + 'pushover_status' => 'Allow sending pushover messages', + 'pushover_api_token' => 'Pushover App API Token', 'alert_type' => 'Изберете кога желаете да получавате известия
', 'alert_type_description' => 'Промяна на сатуса:
'. 'Ще получавате известие когато има промяна със връзката на даден някой от описаните сървър или сайт. От Онлайн -> Офлайн и от Офлайн -> Онлайн.
'. @@ -194,8 +201,7 @@ $sm_lang = array( 'вашия cron скрипт проверява всеки 15 минути и връзката до сървъра е изгубена в 1 часа през нощта и не работи до 6 часа сутринта '. 'Вие ще получите едно известие в 1 часа за това
'. '
Винаги:
'. - 'Ще получавате известие при всяка проверка на Вашия крон скрипт дори когато връзката до даден сървър или сайт е била'. - 'прекъсната в продължение на часове.', + 'Ще получавате известие при всяка проверка на Вашия крон скрипт дори когато връзката до даден сървър или сайт е била прекъсната в продължение на часове.', 'alert_type_status' => 'Промяна на статуса', 'alert_type_offline' => 'Офлайн', 'alert_type_always' => 'Винаги', @@ -203,13 +209,15 @@ $sm_lang = array( 'log_status_description' => 'Ако е отметнато, системата ще записва всяка промяна.', 'log_email' => 'Да се пази ли лог на изпратените имейли от системата', 'log_sms' => 'Да се пази ли лог на изпратените SMS съобщения от системата', + 'log_pushover' => 'Log pushover messages sent by the script', 'updated' => 'Настройките са обновени успешно.', 'nochanges' => 'Не бяха направени промени!', 'tab_email' => 'Имейл', 'tab_sms' => 'SMS', - 'tab_log' => 'Логове', + 'tab_pushover' => 'Pushover', 'settings_email' => 'Имейл настройки', 'settings_sms' => 'SMS настройки', + 'settings_pushover' => 'Pushover settings', 'settings_notification' => 'Настройки на известията', 'settings_log' => 'Настройки на логовете', 'auto_refresh' => 'Автоматично опресняване', @@ -235,9 +243,13 @@ $sm_lang = array( 'off_sms' => 'Сървър \'%LABEL%\' е Офлайн: ip=%IP%, port=%PORT%. Greshka=%ERROR%', 'off_email_subject' => 'Връзката до \'%LABEL%\' е ИЗГУБЕНА', 'off_email_body' => "Неуспешно свързване:

Сървър: %LABEL%
IP адрес: %IP%
Порт: %PORT%
Грешка: %ERROR%
Днес: %DATE%", + 'off_pushover_title' => 'Връзката до \'%LABEL%\' е ИЗГУБЕНА', + 'off_pushover_message' => "Неуспешно свързване:

Сървър: %LABEL%
IP адрес: %IP%
Порт: %PORT%
Грешка: %ERROR%
Днес: %DATE%", 'on_sms' => 'Сървър \'%LABEL%\' е Онлайн: ip=%IP%, port=%PORT%', 'on_email_subject' => 'Връзката до \'%LABEL%\' е ВЪЗСТАНОВЕНА', 'on_email_body' => "Връзката до '%LABEL%' беше ВЪЗСТАНОВЕНА:

Сървър: %LABEL%
IP адрес: %IP%
Порт: %PORT%
Днес: %DATE%", + 'on_pushover_title' => 'Връзката до \'%LABEL%\' е ВЪЗСТАНОВЕНА', + 'on_pushover_message' => "Връзката до '%LABEL%' беше ВЪЗСТАНОВЕНА:

Сървър: %LABEL%
IP адрес: %IP%
Порт: %PORT%
Днес: %DATE%", ), 'login' => array( 'welcome_usermenu' => 'Добре дошъл, %user_name%', diff --git a/src/lang/da_DK.lang.php b/src/lang/da_DK.lang.php index 5e84569c..d7a41588 100644 --- a/src/lang/da_DK.lang.php +++ b/src/lang/da_DK.lang.php @@ -81,6 +81,9 @@ $sm_lang = array( 'level_description' => 'Administratore har fuld adgang: De kan styre servere, brugere og indstillingere.
Brugere kan kun se og køre opdatere for servere som er tildelt til dem.', 'mobile' => 'Mobil', 'email' => 'Email', + 'pushover' => 'Pushover', + 'pushover_key' => 'Pushover Key', + 'pushover_device' => 'Pushover Device', 'delete_title' => 'Slet bruger', 'delete_message' => 'Er du sikker på du vil slette bruger \'%1\'?', 'deleted' => 'Bruger slettet.', @@ -104,6 +107,7 @@ $sm_lang = array( 'status' => 'Status', 'email' => 'Email', 'sms' => 'SMS', + 'pushover' => 'Pushover', 'no_logs' => 'Intet i loggen', ), 'servers' => array( @@ -127,6 +131,7 @@ $sm_lang = array( 'send_email' => 'Send Email', 'sms' => 'SMS', 'send_sms' => 'Send SMS', + 'pushover' => 'Pushover', 'users' => 'Users', 'delete_title' => 'Slet server', 'delete_message' => 'Er du sikker på du vil slette server \'%1\'?', @@ -186,16 +191,17 @@ $sm_lang = array( 'sms_gateway_username' => 'Gateway brugernavn/apikey', 'sms_gateway_password' => 'Gateway adgangskode', 'sms_from' => 'Afsenders navn.', + 'pushover_status' => 'Allow sending pushover messages', + 'pushover_api_token' => 'Pushover App API Token', 'alert_type' => 'Vælg hvornår du vil modtage besked.
', - 'alert_type_description' => 'Status ændring: '. + 'alert_type_description' => 'Status ændring: '. 'Du vil modtage en notifcation når en server har en ændring i status. Fra online -> offline eller offline -> online.
'. '
Offline: '. 'Du vil modtage en meddelelse, når en server går offline for * kun første gang *. for eksempel, '. 'Hvis dit cronjob køre hvert kvatere og din server går ned kl 01 og kommer først op kl 06 '. ' så vil du kun modtage en mail kl 01.
'. '
Altid: '. - 'Du vil modtage en besked, hver gang scriptet kører og et websted er nede, selvom site har været '. - 'offline i flere timer.', + 'Du vil modtage en besked, hver gang scriptet kører og et websted er nede, selvom site har været offline i flere timer.', 'alert_type_status' => 'Status ændret', 'alert_type_offline' => 'Offline', 'alert_type_always' => 'Altid', @@ -203,13 +209,15 @@ $sm_lang = array( 'log_status_description' => 'Hvis log status er sat til TRUE, vil monitoren logge hændelsen hver gang status ændre sig.', 'log_email' => 'Log mails sendt af systemet', 'log_sms' => 'Log SMS sendt af systemet', + 'log_pushover' => 'Log pushover messages sent by the script', 'updated' => 'Indstillingerne er blevet opdateret.', 'nochanges' => 'The configuration didn\'t change.', 'tab_email' => 'Email', 'tab_sms' => 'SMS', - 'tab_log' => 'Log', + 'tab_pushover' => 'Pushover', 'settings_email' => 'Email indstillinger', 'settings_sms' => 'SMS indstillinger', + 'settings_pushover' => 'Pushover settings', 'settings_notification' => 'Meddelelse indstillinger', 'settings_log' => 'Log indstillinger', 'auto_refresh' => 'Genopfriske automatisk', @@ -235,9 +243,13 @@ $sm_lang = array( 'off_sms' => 'Server \'%LABEL%\' is DOWN: ip=%IP%, port=%PORT%. Fejl=%ERROR%', 'off_email_subject' => 'VIGTIG: Server \'%LABEL%\' is DOWN', 'off_email_body' => "Det lykkedes ikke at oprette forbindelse til følgende server:

Server: %LABEL%
IP: %IP%
Port: %PORT%
Fejl: %ERROR%
Date: %DATE%", + 'off_pushover_title' => 'Server \'%LABEL%\' is DOWN', + 'off_pushover_message' => "Det lykkedes ikke at oprette forbindelse til følgende server:

Server: %LABEL%
IP: %IP%
Port: %PORT%
Fejl: %ERROR%
Date: %DATE%", 'on_sms' => 'Server \'%LABEL%\' is RUNNING: ip=%IP%, port=%PORT%', 'on_email_subject' => 'VIGTIG: Server \'%LABEL%\' is RUNNING', 'on_email_body' => "Server '%LABEL%' køre igen:

Server: %LABEL%
IP: %IP%
Port: %PORT%
Dato: %DATE%", + 'on_pushover_title' => 'Server \'%LABEL%\' is RUNNING', + 'on_pushover_message' => "Server '%LABEL%' køre igen:

Server: %LABEL%
IP: %IP%
Port: %PORT%
Dato: %DATE%", ), 'login' => array( 'welcome_usermenu' => 'Velkommen, %user_name%', diff --git a/src/lang/de_DE.lang.php b/src/lang/de_DE.lang.php index cdeabccc..b783b5a7 100644 --- a/src/lang/de_DE.lang.php +++ b/src/lang/de_DE.lang.php @@ -201,8 +201,7 @@ $sm_lang = array( 'Sie bekommen eine Benachrichtigung, wenn ein Server Offline ist.
'. 'Es wird nur eine Mitteilung versendet.
'. '
Immer: '. - 'Sie werden jedesmal wenn der CronJob oder das Script ausgeführt wird benachrichtigt,
'. - 'auch wenn der Dienst mehreres Stunden offline ist', + 'Sie werden jedesmal wenn der CronJob oder das Script ausgeführt wird benachrichtigt auch wenn der Dienst mehreres Stunden offline ist', 'alert_type_status' => 'Status geändert', 'alert_type_offline' => 'Offline', 'alert_type_always' => 'Immer', @@ -216,10 +215,9 @@ $sm_lang = array( 'tab_email' => 'Email', 'tab_sms' => 'SMS', 'tab_pushover' => 'Pushover', - 'tab_log' => 'Log', 'settings_email' => 'Email', 'settings_sms' => 'SMS Nachricht', - 'settings_pushover' => 'Pushover', + 'settings_pushover' => 'Pushover settings', 'settings_notification' => 'Benachrichtigung', 'settings_log' => 'Log', 'auto_refresh' => 'Auto-refresh', @@ -245,17 +243,13 @@ $sm_lang = array( 'off_sms' => 'Server \'%LABEL%\' ist Offline: ip=%IP%, port=%PORT%. Fehler=%ERROR%', 'off_email_subject' => 'Wichtig: Server \'%LABEL%\' ist Offline', 'off_email_body' => "Kann keine Verbindung zum Server aufbauen:

Server: %LABEL%
IP: %IP%
Port: %PORT%
Fehler: %ERROR%
Datum: %DATE%", - 'off_pushover_title' => '\'%LABEL%\' Offline', - 'off_pushover_message' => 'Server \'%LABEL%\'
ist Offline
IP: %IP%
Port: %PORT%
Fehler: %ERROR%', - 'off_pushover_url_title' => 'SERVER MONITOR', - 'off_pushover_url' => '%MONITORURL%', + 'off_pushover_title' => 'Server \'%LABEL%\' ist Offline', + 'off_pushover_message' => "Kann keine Verbindung zum Server aufbauen:

Server: %LABEL%
IP: %IP%
Port: %PORT%
Fehler: %ERROR%
Datum: %DATE%", 'on_sms' => 'Server \'%LABEL%\' ist wieder Online: ip=%IP%, port=%PORT%', 'on_email_subject' => 'Wichtig: Server \'%LABEL%\' ist wieder Online', 'on_email_body' => "Server '%LABEL%' läuft wieder:

Server: %LABEL%
IP: %IP%
Port: %PORT%
Datum: %DATE%", - 'on_pushover_title' => '\'%LABEL%\' Online', - 'on_pushover_message' => 'Server \'%LABEL%\'
ist wieder Online
IP: %IP%
Port: %PORT%', - 'on_pushover_url_title' => 'SERVER MONITOR', - 'on_pushover_url' => '%MONITORURL%', + 'on_pushover_title' => 'Server \'%LABEL%\' ist wieder Online', + 'on_pushover_message' => "Server '%LABEL%' läuft wieder:

Server: %LABEL%
IP: %IP%
Port: %PORT%
Datum: %DATE%", ), 'login' => array( 'welcome_usermenu' => 'Welcome, %user_name%', diff --git a/src/lang/en_US.lang.php b/src/lang/en_US.lang.php index 5868625f..9b2fb7c2 100644 --- a/src/lang/en_US.lang.php +++ b/src/lang/en_US.lang.php @@ -131,7 +131,7 @@ $sm_lang = array( 'send_email' => 'Send Email', 'sms' => 'SMS', 'send_sms' => 'Send SMS', - 'send_pushover' => 'Send Pushover', + 'pushover' => 'Pushover', 'users' => 'Users', 'delete_title' => 'Delete server', 'delete_message' => 'Are you sure you want to delete server \'%1\'?', @@ -201,8 +201,7 @@ $sm_lang = array( 'your cronjob is every 15 mins and your server goes down at 1 am and stays down till 6 am. '. 'You will get 1 notification at 1 am and thats it.
'. '
Always: '. - 'You will receive a notification every time the script runs and a site is down, even if the site has been '. - 'offline for hours.', + 'You will receive a notification every time the script runs and a site is down, even if the site has been offline for hours.', 'alert_type_status' => 'Status change', 'alert_type_offline' => 'Offline', 'alert_type_always' => 'Always', @@ -216,7 +215,6 @@ $sm_lang = array( 'tab_email' => 'Email', 'tab_sms' => 'SMS', 'tab_pushover' => 'Pushover', - 'tab_log' => 'Log', 'settings_email' => 'Email settings', 'settings_sms' => 'Text message settings', 'settings_pushover' => 'Pushover settings', @@ -245,17 +243,13 @@ $sm_lang = array( 'off_sms' => 'Server \'%LABEL%\' is DOWN: ip=%IP%, port=%PORT%. Error=%ERROR%', 'off_email_subject' => 'IMPORTANT: Server \'%LABEL%\' is DOWN', 'off_email_body' => "Failed to connect to the following server:

Server: %LABEL%
IP: %IP%
Port: %PORT%
Error: %ERROR%
Date: %DATE%", - 'off_pushover_title' => '\'%LABEL%\' Offline', - 'off_pushover_message' => 'Server \'%LABEL%\'
ist Offline
IP: %IP%
Port: %PORT%
Fehler: %ERROR%', - 'off_pushover_url_title' => 'SERVER MONITOR', - 'off_pushover_url' => '%MONITORURL%', + 'off_pushover_title' => 'Server \'%LABEL%\' is DOWN', + 'off_pushover_message' => "Failed to connect to the following server:

Server: %LABEL%
IP: %IP%
Port: %PORT%
Error: %ERROR%
Date: %DATE%", 'on_sms' => 'Server \'%LABEL%\' is RUNNING: ip=%IP%, port=%PORT%', 'on_email_subject' => 'IMPORTANT: Server \'%LABEL%\' is RUNNING', 'on_email_body' => "Server '%LABEL%' is running again:

Server: %LABEL%
IP: %IP%
Port: %PORT%
Date: %DATE%", - 'on_pushover_title' => '\'%LABEL%\' Online', - 'on_pushover_message' => 'Server \'%LABEL%\'
ist wieder Online
IP: %IP%
Port: %PORT%', - 'on_pushover_url_title' => 'SERVER MONITOR', - 'on_pushover_url' => '%MONITORURL%', + 'on_pushover_title' => 'Server \'%LABEL%\' is RUNNING', + 'on_pushover_message' => 'Server \'%LABEL%\' is running again:

Server: %LABEL%
IP: %IP%
Port: %PORT%
Date: %DATE%', ), 'login' => array( 'welcome_usermenu' => 'Welcome, %user_name%', diff --git a/src/lang/es_ES.lang.php b/src/lang/es_ES.lang.php index 0d313a7b..8f559538 100644 --- a/src/lang/es_ES.lang.php +++ b/src/lang/es_ES.lang.php @@ -81,6 +81,9 @@ $sm_lang = array( 'level_description' => 'Administrators have full access: they can manage servers, users and edit the global configuration.
Users can only view and run the updater for the servers that have been assigned to them.', 'mobile' => 'Mobil', 'email' => 'Email', + 'pushover' => 'Pushover', + 'pushover_key' => 'Pushover Key', + 'pushover_device' => 'Pushover Device', 'delete_title' => 'Delete User', 'delete_message' => 'Are you sure you want to delete user \'%1\'?', 'deleted' => 'User deleted.', @@ -104,6 +107,7 @@ $sm_lang = array( 'status' => 'Estado', 'email' => 'Email', 'sms' => 'SMS', + 'pushover' => 'Pushover', 'no_logs' => 'No logs', ), 'servers' => array( @@ -127,6 +131,7 @@ $sm_lang = array( 'send_email' => 'Email', 'sms' => 'SMS', 'send_sms' => 'SMS', + 'pushover' => 'Pushover', 'users' => 'Users', 'delete_title' => 'Delete Server', 'delete_message' => 'Are you sure you want to delete server \'%1\'?', @@ -137,6 +142,7 @@ $sm_lang = array( 'latency_max' => 'Tiempo de respuesta (maximum)', 'latency_min' => 'Tiempo de respuesta (minimum)', 'latency_avg' => 'Tiempo de respuesta (average)', + 'uptime' => 'Uptime', 'year' => 'Year', 'month' => 'Month', 'week' => 'Week', @@ -185,6 +191,8 @@ $sm_lang = array( 'sms_gateway_username' => 'Gateway username', 'sms_gateway_password' => 'Gateway password', 'sms_from' => 'Número origen del SMS', + 'pushover_status' => 'Allow sending pushover messages', + 'pushover_api_token' => 'Pushover App API Token', 'alert_type' => 'Cuando desea recibir notificaciones ?
', 'alert_type_description' => '... Al cambiar el estado: '. 'p.ej. online -> offline o offline -> online.
'. @@ -201,13 +209,15 @@ $sm_lang = array( 'log_status_description' => 'Al setear TRUE (marcar) se protocolan todos los estados.', 'log_email' => 'Enviar Log via email?', 'log_sms' => 'Enviar Log via SMS ?', + 'log_pushover' => 'Log pushover messages sent by the script', 'updated' => 'Configuración guardada.', 'nochanges' => 'The configuration didn\'t change.', 'tab_email' => 'Email', 'tab_sms' => 'SMS', - 'tab_log' => 'Log', + 'tab_pushover' => 'Pushover', 'settings_email' => 'Email', 'settings_sms' => 'Mensaje SMS', + 'settings_pushover' => 'Pushover settings', 'settings_notification' => 'Notificación', 'settings_log' => 'Log', 'auto_refresh' => 'Refrescar automáticamente página de servidores', @@ -233,9 +243,13 @@ $sm_lang = array( 'off_sms' => 'Servidor \'%LABEL%\' está fuera de línea: ip=%IP%, port=%PORT%. error=%ERROR%', 'off_email_subject' => 'Importante: Servidor \'%LABEL%\' está fuera de línea', 'off_email_body' => "No posible conectar al servidor:

Servidor: %LABEL%
IP: %IP%
Port: %PORT%
Error: %ERROR%
Fecha: %DATE%", + 'off_pushover_title' => 'Servidor \'%LABEL%\' está fuera de línea', + 'off_pushover_message' => "No posible conectar al servidor:

Servidor: %LABEL%
IP: %IP%
Port: %PORT%
Error: %ERROR%
Fecha: %DATE%", 'on_sms' => 'Servidor \'%LABEL%\' ya está de nuevo funcionando en línea: ip=%IP%, port=%PORT%', 'on_email_subject' => 'Importante: Servidor \'%LABEL%\' ya está de nuevo en línea', 'on_email_body' => "Servidor '%LABEL%' ya está funcionando en línea de nuevo:

Servidor: %LABEL%
IP: %IP%
Port: %PORT%
Fecha: %DATE%", + 'on_pushover_title' => 'Servidor \'%LABEL%\' ya está de nuevo en línea', + 'on_pushover_message' => "Servidor '%LABEL%' ya está funcionando en línea de nuevo:

Servidor: %LABEL%
IP: %IP%
Port: %PORT%
Fecha: %DATE%", ), 'login' => array( 'welcome_usermenu' => 'Welcome, %user_name%', diff --git a/src/lang/fr_FR.lang.php b/src/lang/fr_FR.lang.php index 99c33a3e..999fbd20 100644 --- a/src/lang/fr_FR.lang.php +++ b/src/lang/fr_FR.lang.php @@ -81,6 +81,9 @@ $sm_lang = array( 'level_description' => 'Les Administrateurs ont un accès total. Ils peuvent gérer les serveurs, les utilisateurs et éditer la configuration globale.
Les Utilisateurs ne peuvent que voir et mettre à jour les serveurs qui leur ont été assignés.', 'mobile' => 'Téléphone', 'email' => 'Email', + 'pushover' => 'Pushover', + 'pushover_key' => 'Pushover Key', + 'pushover_device' => 'Pushover Device', 'delete_title' => 'Supprimer un utilisateur', 'delete_message' => 'Êtes-vous sûr de vouloir supprimer l\'utilisateur \'%1\' ?', 'deleted' => 'Utilisateur supprimé.', @@ -104,6 +107,7 @@ $sm_lang = array( 'status' => 'État', 'email' => 'email', 'sms' => 'SMS', + 'pushover' => 'Pushover', 'no_logs' => 'Aucun événement', ), 'servers' => array( @@ -127,6 +131,7 @@ $sm_lang = array( 'send_email' => 'Envoyer un email', 'sms' => 'SMS', 'send_sms' => 'Envoyer un SMS', + 'pushover' => 'Pushover', 'users' => 'Users', 'delete_title' => 'Supprimer un serveur', 'delete_message' => 'Êtes-vous sûr de vouloir supprimer le serveur \'%1\' ?', @@ -186,6 +191,8 @@ $sm_lang = array( 'sms_gateway_username' => 'Nom utilisateur de la passerelle', 'sms_gateway_password' => 'Mot de passe de la passerelle', 'sms_from' => 'SMS de l\'expéditeur', + 'pushover_status' => 'Allow sending pushover messages', + 'pushover_api_token' => 'Pushover App API Token', 'alert_type' => 'Choisissez quand vous souhaitez être notifié.
', 'alert_type_description' => 'Changement d\'état : '. 'Vous recevez une notification chaque fois que le serveur change d\'état. C\'est-à-dire passe de l\'état OK à HORS SERVICE ou de HORS SERVICE à OK.
'. @@ -202,13 +209,15 @@ $sm_lang = array( 'log_status_description' => 'Si l\'option est activée, un événement est enregistré chaque fois qu\'une notification a lieu.', 'log_email' => 'Enregistrer tout les emails envoyés', 'log_sms' => 'Enregistrer tout les SMS envoyés', + 'log_pushover' => 'Log pushover messages sent by the script', 'updated' => 'La configuration a été mise à jour.', 'nochanges' => 'La configuration n\'a pas été modifiée.', 'tab_email' => 'Email', 'tab_sms' => 'SMS', - 'tab_log' => 'Événements', + 'tab_pushover' => 'Pushover', 'settings_email' => 'Configuration email', 'settings_sms' => 'Configuration SMS', + 'settings_pushover' => 'Pushover settings', 'settings_notification' => 'Configuration des notifications', 'settings_log' => 'Configuration des événements', 'auto_refresh' => 'Auto-rachaîchissement', @@ -234,9 +243,13 @@ $sm_lang = array( 'off_sms' => 'Le Serveur \'%LABEL%\' est HORS SERVICE: IP=%IP%, Port=%PORT%. Erreur=%ERROR%', 'off_email_subject' => 'IMPORTANT: Le Serveur \'%LABEL%\' est HORS SERVICE', 'off_email_body' => "Impossible de se connecter au serveur suivant:

Serveur: %LABEL%
IP: %IP%
Port: %PORT%
Erreur: %ERROR%
Date: %DATE%", + 'off_pushover_title' => 'Le Serveur \'%LABEL%\' est HORS SERVICE', + 'off_pushover_message' => "Impossible de se connecter au serveur suivant:

Serveur: %LABEL%
IP: %IP%
Port: %PORT%
Erreur: %ERROR%
Date: %DATE%", 'on_sms' => 'Le Serveur \'%LABEL%\' est OK: IP=%IP%, Port=%PORT%', 'on_email_subject' => 'IMPORTANT: Le Serveur \'%LABEL%\' est OK', 'on_email_body' => "Le Serveur '%LABEL%' est de nouveau OK:

Serveur: %LABEL%
IP: %IP%
Port: %PORT%
Date: %DATE%", + 'on_pushover_title' => 'Le Serveur \'%LABEL%\' est OK', + 'on_pushover_message' => "Le Serveur '%LABEL%' est de nouveau OK:

Serveur: %LABEL%
IP: %IP%
Port: %PORT%
Date: %DATE%", ), 'login' => array( 'welcome_usermenu' => 'Bonjour %user_name%', diff --git a/src/lang/it_IT.lang.php b/src/lang/it_IT.lang.php index cf5a57b1..cbab0bb9 100644 --- a/src/lang/it_IT.lang.php +++ b/src/lang/it_IT.lang.php @@ -81,6 +81,9 @@ $sm_lang = array( 'level_description' => 'Administrators have full access: they can manage servers, users and edit the global configuration.
Users can only view and run the updater for the servers that have been assigned to them.', 'mobile' => 'Cellulare', 'email' => 'Email', + 'pushover' => 'Pushover', + 'pushover_key' => 'Pushover Key', + 'pushover_device' => 'Pushover Device', 'delete_title' => 'Delete User', 'delete_message' => 'Are you sure you want to delete user \'%1\'?', 'deleted' => 'User deleted.', @@ -104,6 +107,7 @@ $sm_lang = array( 'status' => 'Stato', 'email' => 'Email', 'sms' => 'SMS', + 'pushover' => 'Pushover', 'no_logs' => 'No logs', ), 'servers' => array( @@ -127,6 +131,7 @@ $sm_lang = array( 'send_email' => 'Invia Email', 'sms' => 'SMS', 'send_sms' => 'Invia SMS', + 'pushover' => 'Pushover', 'users' => 'Users', 'delete_title' => 'Delete Server', 'delete_message' => 'Are you sure you want to delete server \'%1\'?', @@ -137,6 +142,7 @@ $sm_lang = array( 'latency_max' => 'Tempo di risposta (maximum)', 'latency_min' => 'Tempo di risposta (minimum)', 'latency_avg' => 'Tempo di risposta (average)', + 'uptime' => 'Uptime', 'year' => 'Year', 'month' => 'Month', 'week' => 'Week', @@ -185,6 +191,8 @@ $sm_lang = array( 'sms_gateway_username' => 'Nome Utente Gateway', 'sms_gateway_password' => 'Password Gateway', 'sms_from' => 'Numero di telefono del mittente', + 'pushover_status' => 'Allow sending pushover messages', + 'pushover_api_token' => 'Pushover App API Token', 'alert_type' => 'Seleziona quando vuoi essere notificato.
', 'alert_type_description' => 'Cambio di Stato: '. 'Riceverai una notifica solo quando un server cambierà stato. Quindi da online -> offline oppure da offline -> online.
'. @@ -201,13 +209,15 @@ $sm_lang = array( 'log_status_description' => 'Se lo Stato Log è impostato su VERO, il monitor registrerà nel log gli eventi appena le notifiche verranno inviate.', 'log_email' => 'Registra email inviate dallo script.', 'log_sms' => 'Registra SMS inviati dallo script.', + 'log_pushover' => 'Log pushover messages sent by the script', 'updated' => 'La configurazione è stato aggiornata.', 'nochanges' => 'The configuration didn\'t change.', 'tab_email' => 'Email', 'tab_sms' => 'SMS', - 'tab_log' => 'Log', + 'tab_pushover' => 'Pushover', 'settings_email' => 'Impostazioni Email', 'settings_sms' => 'Impostazioni SMS', + 'settings_pushover' => 'Pushover settings', 'settings_notification' => 'Impostazioni Notifiche', 'settings_log' => 'Impostazioni Log', 'auto_refresh' => 'Auto-Aggiorna pagina servers', @@ -233,9 +243,13 @@ $sm_lang = array( 'off_sms' => 'Server \'%LABEL%\' è DOWN: ip=%IP%, porta=%PORT%. Errore=%ERROR%', 'off_email_subject' => 'IMPORTANTE: Server \'%LABEL%\' è DOWN', 'off_email_body' => "Impossibile connettersi al seguente server:

Server: %LABEL%
IP: %IP%
Porta: %PORT%
Errore: %ERROR%
Data: %DATE%", + 'off_pushover_title' => 'Server \'%LABEL%\' è DOWN', + 'off_pushover_message' => "Impossibile connettersi al seguente server:

Server: %LABEL%
IP: %IP%
Porta: %PORT%
Errore: %ERROR%
Data: %DATE%", 'on_sms' => 'Server \'%LABEL%\' è ATTIVO: ip=%IP%, porta=%PORT%', 'on_email_subject' => 'IMPORTANTE: Server \'%LABEL%\' è ATTIVO', 'on_email_body' => "Server '%LABEL%' è di nuovo attivo:

Server: %LABEL%
IP: %IP%
Porta: %PORT%
Data: %DATE%", + 'on_pushover_title' => 'Server \'%LABEL%\' è ATTIVO', + 'on_pushover_message' => "Server '%LABEL%' è di nuovo attivo:

Server: %LABEL%
IP: %IP%
Porta: %PORT%
Data: %DATE%", ), 'login' => array( 'welcome_usermenu' => 'Welcome, %user_name%', diff --git a/src/lang/ko_KR.lang.php b/src/lang/ko_KR.lang.php index 7f3bada0..e4073f6c 100644 --- a/src/lang/ko_KR.lang.php +++ b/src/lang/ko_KR.lang.php @@ -81,6 +81,9 @@ $sm_lang = array( 'level_description' => 'Administrators have full access: they can manage servers, users and edit the global configuration.
Users can only view and run the updater for the servers that have been assigned to them.', 'mobile' => '휴대폰', 'email' => 'Email', + 'pushover' => 'Pushover', + 'pushover_key' => 'Pushover Key', + 'pushover_device' => 'Pushover Device', 'delete_title' => 'Delete User', 'delete_message' => 'Are you sure you want to delete user \'%1\'?', 'deleted' => 'User deleted.', @@ -104,6 +107,7 @@ $sm_lang = array( 'status' => '상태', 'email' => 'email', 'sms' => 'sms', + 'pushover' => 'Pushover', 'no_logs' => 'No logs', ), 'servers' => array( @@ -127,6 +131,7 @@ $sm_lang = array( 'send_email' => '메일 전송', 'sms' => 'SMS 전송', 'send_sms' => 'SMS 전송', + 'pushover' => 'Pushover', 'users' => 'Users', 'delete_title' => 'Delete Server', 'delete_message' => 'Are you sure you want to delete server \'%1\'?', @@ -186,6 +191,8 @@ $sm_lang = array( 'sms_gateway_username' => 'Gateway username', 'sms_gateway_password' => 'Gateway password', 'sms_from' => 'Sender\'s phone number', + 'pushover_status' => 'Allow sending pushover messages', + 'pushover_api_token' => 'Pushover App API Token', 'alert_type' => '알림을 원하면 다음과 같이 변경하십시오..
', 'alert_type_description' => '상태 변경:
'. '서버 상태가 변경이되면 알림을 받습니다. online -> offline -> online.
'. @@ -194,6 +201,7 @@ $sm_lang = array( 'cron이 매 15분이고 오전1시 부터 오전6시까지 다운되었을때 오전1시에 한번 알림을 받습니다.
' . '
항상:
'. '사이트가 다운되었을 때 매시간 알림을 받습니다.', + 'alert_type_status' => '상태 변경', 'alert_type_offline' => '오프라인', 'alert_type_always' => '항상', @@ -201,13 +209,15 @@ $sm_lang = array( 'log_status_description' => '로그상태가 TRUE이면 알림설정이 통과할때마다 이벤트를 기록합니다.', 'log_email' => '이메일로 로그를 전송하시겠습니까?', 'log_sms' => 'SMS로 로그를 전송하시겠습니까?', + 'log_pushover' => 'Log pushover messages sent by the script', 'updated' => '설정이 수정되었습니다.', 'nochanges' => 'The configuration didn\'t change.', 'tab_email' => 'Email', 'tab_sms' => 'SMS', - 'tab_log' => '로그', + 'tab_pushover' => 'Pushover', 'settings_email' => 'Email 설정', 'settings_sms' => 'SMS 설정', + 'settings_pushover' => 'Pushover settings', 'settings_notification' => '알림 설정', 'settings_log' => '로그 설정', 'auto_refresh' => 'Auto-refresh', @@ -233,9 +243,13 @@ $sm_lang = array( 'off_sms' => '서버(\'%LABEL%\')가 다운되었습니다. : ip=%IP%, port=%PORT%. Error=%ERROR%', 'off_email_subject' => '중요: 서버(\'%LABEL%\')가 다운되었습니다.', 'off_email_body' => "서버 접속을 실패하였습니다.

Server: %LABEL%
IP: %IP%
Port: %PORT%
Error: %ERROR%
Date: %DATE%", + 'off_pushover_title' => '서버(\'%LABEL%\')가 다운되었습니다.', + 'off_pushover_message' => "서버 접속을 실패하였습니다.

Server: %LABEL%
IP: %IP%
Port: %PORT%
Error: %ERROR%
Date: %DATE%", 'on_sms' => '서버(\'%LABEL%\') 가동중: ip=%IP%, port=%PORT%', 'on_email_subject' => '중요: 서버(\'%LABEL%\')가 가동중입니다.', 'on_email_body' => "서버('%LABEL%')가 재가동됩니다.:

Server: %LABEL%
IP: %IP%
Port: %PORT%
Date: %DATE%", + 'on_pushover_title' => '서버(\'%LABEL%\')가 가동중입니다.', + 'on_pushover_message' => "서버('%LABEL%')가 재가동됩니다.:

Server: %LABEL%
IP: %IP%
Port: %PORT%
Date: %DATE%", ), 'login' => array( 'welcome_usermenu' => 'Welcome, %user_name%', diff --git a/src/lang/nl_NL.lang.php b/src/lang/nl_NL.lang.php index c9c8c10e..19d12fc8 100644 --- a/src/lang/nl_NL.lang.php +++ b/src/lang/nl_NL.lang.php @@ -81,6 +81,9 @@ $sm_lang = array( 'level_description' => 'Beheerders hebben volledige toegang: ze kunnen servers en gebruiker beheren en de globale configuratie aanpassen.
Gebruikers kunnen alleen de servers bekijken en op fouten testen die aan hun zijn toegewezen.', 'mobile' => 'Mobiel', 'email' => 'Email', + 'pushover' => 'Pushover', + 'pushover_key' => 'Pushover Key', + 'pushover_device' => 'Pushover Device', 'delete_title' => 'Delete User', 'delete_message' => 'Are you sure you want to delete user \'%1\'?', 'deleted' => 'User deleted.', @@ -104,6 +107,7 @@ $sm_lang = array( 'status' => 'Status', 'email' => 'Email', 'sms' => 'SMS', + 'pushover' => 'Pushover', 'no_logs' => 'No logs', ), 'servers' => array( @@ -127,6 +131,7 @@ $sm_lang = array( 'send_email' => 'Stuur email', 'sms' => 'SMS', 'send_sms' => 'Stuur SMS', + 'pushover' => 'Pushover', 'users' => 'Gebruikers', 'delete_title' => 'Delete Server', 'delete_message' => 'Are you sure you want to delete server \'%1\'?', @@ -186,6 +191,8 @@ $sm_lang = array( 'sms_gateway_username' => 'Gateway gebruikersnaam', 'sms_gateway_password' => 'Gateway wachtwoord', 'sms_from' => 'Telefoonnummer afzender', + 'pushover_status' => 'Sta Pushover berichten toe?', + 'pushover_api_token' => 'Pushover App API Token', 'alert_type' => 'Selecteer wanneer je een notificatie wilt.
', 'alert_type_description' => 'Status change: '. 'Je ontvangt alleen bericht wanneer een server van status verandert. Dus van online -> offline of offline -> online.
'. @@ -202,13 +209,15 @@ $sm_lang = array( 'log_status_description' => 'Als de log status aan staat, zal de monitor een log aanmaken elke keer dat hij door de notificatie instellingen komt.', 'log_email' => 'Log emails verstuurd bij het script?', 'log_sms' => 'Log sms berichten verstuurd bij het script?', + 'log_pushover' => 'Log pushover messages sent by the script', 'updated' => 'De configuratie is gewijzigd.', 'nochanges' => 'De configuratie is ongewijzigd.', 'tab_email' => 'Email', 'tab_sms' => 'SMS', - 'tab_log' => 'Log', + 'tab_pushover' => 'Pushover', 'settings_email' => 'Email instellingen', 'settings_sms' => 'SMS instellingen', + 'settings_pushover' => 'Pushover settings', 'settings_notification' => 'Notificatie instellingen', 'settings_log' => 'Log instellingen', 'auto_refresh' => 'Auto-refresh', @@ -234,9 +243,13 @@ $sm_lang = array( 'off_sms' => 'Server %LABEL% is DOWN: ip=%IP%, poort=%PORT%. Fout=%ERROR%', 'off_email_subject' => 'BELANGRIJK: Server %LABEL% is DOWN', 'off_email_body' => "De server kon niet worden bereikt:

Server: %LABEL%
IP: %IP%
Poort: %PORT%
Fout: %ERROR%
Datum: %DATE%", + 'off_pushover_title' => 'Server %LABEL% is DOWN', + 'off_pushover_message' => "De server kon niet worden bereikt:

Server: %LABEL%
IP: %IP%
Poort: %PORT%
Fout: %ERROR%
Datum: %DATE%", 'on_sms' => 'Server %LABEL% is RUNNING: ip=%IP%, poort=%PORT%', 'on_email_subject' => 'BELANGRIJK: Server %LABEL% is RUNNING', 'on_email_body' => "Server %LABEL% is weer online:

Server: %LABEL%
IP: %IP%
Poort: %PORT%
Datum: %DATE%", + 'on_pushover_title' => 'Server %LABEL% is RUNNING', + 'on_pushover_message' => "Server %LABEL% is weer online:

Server: %LABEL%
IP: %IP%
Poort: %PORT%
Datum: %DATE%", ), 'login' => array( 'welcome_usermenu' => 'Welkom, %user_name%', diff --git a/src/lang/pt_BR.lang.php b/src/lang/pt_BR.lang.php index 8b069dfe..4094401d 100644 --- a/src/lang/pt_BR.lang.php +++ b/src/lang/pt_BR.lang.php @@ -81,6 +81,9 @@ $sm_lang = array( 'level_description' => 'Administradores Tem total acesso: podem gerenciar servidores, usuários e configurações globais.
Usuários só podem executar atualizações para servidores que lhe foram atribuídos.', 'mobile' => 'Celular', 'email' => 'Email', + 'pushover' => 'Pushover', + 'pushover_key' => 'Pushover Key', + 'pushover_device' => 'Pushover Device', 'delete_title' => 'Delete User', 'delete_message' => 'Are you sure you want to delete user \'%1\'?', 'deleted' => 'User deleted.', @@ -104,6 +107,7 @@ $sm_lang = array( 'status' => 'Status', 'email' => 'Email', 'sms' => 'SMS', + 'pushover' => 'Pushover', 'no_logs' => 'No logs', ), 'servers' => array( @@ -127,6 +131,7 @@ $sm_lang = array( 'send_email' => 'Enviar Email', 'sms' => 'SMS', 'send_sms' => 'Enviar SMS', + 'pushover' => 'Pushover', 'users' => 'Users', 'delete_title' => 'Delete Server', 'delete_message' => 'Are you sure you want to delete server \'%1\'?', @@ -186,6 +191,8 @@ $sm_lang = array( 'sms_gateway_username' => 'Usuário do Gateway', 'sms_gateway_password' => 'Senha do Gateway', 'sms_from' => 'Número de telefone de envio', + 'pushover_status' => 'Allow sending pushover messages', + 'pushover_api_token' => 'Pushover App API Token', 'alert_type' => 'Selecione como você gostaria de ser notificado.
', 'alert_type_description' => 'Mudança de Status: '. 'Você receberá uma notificação quando o seridor tive uma mudança de status. De online -> offline ou offline -> online.
'. @@ -194,8 +201,7 @@ $sm_lang = array( 'A cronjob é a cada 15 minutos e seu servidor caiu em 1:00 e permanece offline até 6 am. '. 'Você receberá uma notificação a 1:00 apenas
'. '
Sempre: '. - 'Você receberá uma notificação toda vez que o script é executado e um site esta offline, mesmo se o site tenha ficado '. - 'offline por horas.', + 'Você receberá uma notificação toda vez que o script é executado e um site esta offline, mesmo se o site tenha ficado offline por horas.', 'alert_type_status' => 'Mudança de Status', 'alert_type_offline' => 'Offline', 'alert_type_always' => 'Sempre', @@ -203,13 +209,15 @@ $sm_lang = array( 'log_status_description' => 'Se o status de registro é definido como TRUE, o monitor irá registrar o evento sempre que as configurações de notificação forem passadas.', 'log_email' => 'Registrar no Log os envios de email feitos pelo script?', 'log_sms' => 'Registrar no Log os envios de mensagens de texto feitos pelo script?', + 'log_pushover' => 'Log pushover messages sent by the script', 'updated' => 'A configuração foi atualizada.', 'nochanges' => 'The configuration didn\'t change.', 'tab_email' => 'Email', 'tab_sms' => 'Texto', - 'tab_log' => 'Logs', + 'tab_pushover' => 'Pushover', 'settings_email' => 'Configuração de email', 'settings_sms' => 'Configuração de mensagens de texto', + 'settings_pushover' => 'Pushover settings', 'settings_notification' => 'Configuração de notificações', 'settings_log' => 'Configuração de Logs', 'auto_refresh' => 'Atualizar automaticamente', @@ -235,9 +243,13 @@ $sm_lang = array( 'off_sms' => 'Servidor \'%LABEL%\' está OFFLINE: ip=%IP%, porta=%PORT%. Erro=%ERROR%', 'off_email_subject' => 'IMPORTANTE: Servidor \'%LABEL%\' está OFFLINE', 'off_email_body' => "Falha ao conectar ao servidor:

Servidor: %LABEL%
IP: %IP%
Porta: %PORT%
Erro: %ERROR%
Data: %DATE%", + 'off_pushover_title' => 'Servidor \'%LABEL%\' está OFFLINE', + 'off_pushover_message' => "Falha ao conectar ao servidor:

Servidor: %LABEL%
IP: %IP%
Porta: %PORT%
Erro: %ERROR%
Data: %DATE%", 'on_sms' => 'Servidor \'%LABEL%\' esta ONLINE: ip=%IP%, porta=%PORT%', 'on_email_subject' => 'IMPORTANTE: Servidor \'%LABEL%\' esta ONLINE', 'on_email_body' => "Servidor '%LABEL%' esta ONLINE novamente:

Servidor: %LABEL%
IP: %IP%
Porta: %PORT%
Data: %DATE%", + 'on_pushover_title' => 'Servidor \'%LABEL%\' esta ONLINE', + 'on_pushover_message' => "Servidor '%LABEL%' esta ONLINE novamente:

Servidor: %LABEL%
IP: %IP%
Porta: %PORT%
Data: %DATE%", ), 'login' => array( 'welcome_usermenu' => 'Bem vindo, %user_name%', diff --git a/src/lang/ru_RU.lang.php b/src/lang/ru_RU.lang.php index d402b95d..eb3ee58b 100644 --- a/src/lang/ru_RU.lang.php +++ b/src/lang/ru_RU.lang.php @@ -81,6 +81,9 @@ $sm_lang = array( 'level_description' => 'Администраторы имеют полный доступ: они могут управлять серверами, пользователями и изменять общую конфигурацию.
Пользователи могут только просматривать и запускать проверку для серверов которые были к ним прикрепплены.', 'mobile' => 'Телефон', 'email' => 'Email', + 'pushover' => 'Pushover', + 'pushover_key' => 'Pushover Key', + 'pushover_device' => 'Pushover Device', 'delete_title' => 'Удалить пользователя', 'delete_message' => 'Вы точно хотите удалить пользователя \'%1\'?', 'deleted' => 'Пользователь удален.', @@ -104,6 +107,7 @@ $sm_lang = array( 'status' => 'Статус', 'email' => 'Email', 'sms' => 'SMS', + 'pushover' => 'Pushover', 'no_logs' => 'Записей нет', ), 'servers' => array( @@ -127,6 +131,7 @@ $sm_lang = array( 'send_email' => 'Отправить Email', 'sms' => 'SMS', 'send_sms' => 'Отправить SMS', + 'pushover' => 'Pushover', 'users' => 'Users', 'delete_title' => 'Удалить сервер', 'delete_message' => 'Вы точно хотите удалить сервер \'%1\'?', @@ -186,6 +191,8 @@ $sm_lang = array( 'sms_gateway_username' => 'Пользователь', 'sms_gateway_password' => 'Пароль', 'sms_from' => 'Номер отправителя', + 'pushover_status' => 'Allow sending pushover messages', + 'pushover_api_token' => 'Pushover App API Token', 'alert_type' => 'Выбирите, какие вы хотите получать уведомления
', 'alert_type_description' => 'Изменение статуса : '. 'Вы получите уведомление об изменение статуса. Для онлайн -> оффлайн или офлайн -> онлайн.
'. @@ -194,8 +201,7 @@ $sm_lang = array( 'Задание Cron выставлено на каждые 15 минут. Сервер перейдет в статус оффлайн в 1:00 и не измениться до 6:00. '. 'Вы получите 1 уведомление только в 1:00
'. '
Всегда: '. - 'Вы будете получать уведомление при каждом запуске скрипта проверки, как только сервер перейдет в статус оффлайн, даже если'. - 'сервер находится в этом статусе несколько часов', + 'Вы будете получать уведомление при каждом запуске скрипта проверки, как только сервер перейдет в статус оффлайн, даже если сервер находится в этом статусе несколько часов', 'alert_type_status' => 'Изменение статуса', 'alert_type_offline' => 'Оффлайн', 'alert_type_always' => 'Всегда', @@ -203,13 +209,15 @@ $sm_lang = array( 'log_status_description' => 'Если лог установлен в TRUE, монитор будет логировать все события режим которых выбран в типе уведомлений.', 'log_email' => 'Уведомления отправленые по Email', 'log_sms' => 'Уведомления отправленые по Email', + 'log_pushover' => 'Log pushover messages sent by the script', 'updated' => 'Параметры были успешно применены.', 'nochanges' => 'Параметры не изменились.', 'tab_email' => 'Email', 'tab_sms' => 'SMS', - 'tab_log' => 'Лог', + 'tab_pushover' => 'Pushover', 'settings_email' => 'Настройка Email', 'settings_sms' => 'Настройка SMS', + 'settings_pushover' => 'Pushover settings', 'settings_notification' => 'Настройка уведомлений', 'settings_log' => 'Настройка логирования', 'auto_refresh' => 'Авто-обновление', @@ -235,9 +243,13 @@ $sm_lang = array( 'off_sms' => 'Сервер \'%LABEL%\' сейчас НЕДОСТУПЕН: ip=%IP%, port=%PORT%. Ошибка=%ERROR%', 'off_email_subject' => 'ВАЖНО: сервер \'%LABEL%\' сейчас НЕДОСТУПЕН', 'off_email_body' => "Невозможно подключиться к следующему серверу:

Server: %LABEL%
IP: %IP%
Порт: %PORT%
Ошибка: %ERROR%
Дата: %DATE%", + 'off_pushover_title' => 'Cервер \'%LABEL%\' сейчас НЕДОСТУПЕН', + 'off_pushover_message' => "Невозможно подключиться к следующему серверу:

Server: %LABEL%
IP: %IP%
Порт: %PORT%
Ошибка: %ERROR%
Дата: %DATE%", 'on_sms' => 'Сервер \'%LABEL%\' сейчас ДОСТУПЕН: ip=%IP%, port=%PORT%', 'on_email_subject' => 'ВАЖНО: Сервер \'%LABEL%\' сейчас ДОСТУПЕН', 'on_email_body' => "Сервер '%LABEL%' снова доступен:

Server: %LABEL%
IP: %IP%
Port: %PORT%
Date: %DATE%", + 'on_pushover_title' => 'Сервер \'%LABEL%\' сейчас ДОСТУПЕН', + 'on_pushover_message' => "Сервер '%LABEL%' снова доступен:

Server: %LABEL%
IP: %IP%
Port: %PORT%
Date: %DATE%", ), 'login' => array( 'welcome_usermenu' => 'Здравствуйте, %user_name%', diff --git a/src/lang/zh_CN.lang.php b/src/lang/zh_CN.lang.php index 052ddf7c..d3ffd62a 100644 --- a/src/lang/zh_CN.lang.php +++ b/src/lang/zh_CN.lang.php @@ -81,6 +81,9 @@ $sm_lang = array( 'level_description' => '超级管理员 拥有所有权限: 管理服务器, 用户 以及修改设置.
普通用户 只能查看及更新自己名下所属的服务器.', 'mobile' => '手机', 'email' => '邮件', + 'pushover' => 'Pushover', + 'pushover_key' => 'Pushover Key', + 'pushover_device' => 'Pushover Device', 'delete_title' => 'Delete User', 'delete_message' => 'Are you sure you want to delete user \'%1\'?', 'deleted' => 'User deleted.', @@ -104,6 +107,7 @@ $sm_lang = array( 'status' => '状态', 'email' => '邮件', 'sms' => '短信', + 'pushover' => 'Pushover', 'no_logs' => 'No logs', ), 'servers' => array( @@ -127,6 +131,7 @@ $sm_lang = array( 'send_email' => '发送邮件', 'sms' => '短信', 'send_sms' => '发送短信', + 'pushover' => 'Pushover', 'users' => 'Users', 'delete_title' => 'Delete Server', 'delete_message' => 'Are you sure you want to delete server \'%1\'?', @@ -186,6 +191,8 @@ $sm_lang = array( 'sms_gateway_username' => 'SMS网关用户名', 'sms_gateway_password' => 'SMS网关密码', 'sms_from' => '发信人电话号', + 'pushover_status' => 'Allow sending pushover messages', + 'pushover_api_token' => 'Pushover App API Token', 'alert_type' => '如果想要收到提醒请选中此项.
', 'alert_type_description' => '状态变化: '. '服务器 online -> offline 或 offline -> online 的状态变化将会收到提醒.
'. @@ -202,13 +209,15 @@ $sm_lang = array( 'log_status_description' => '如果状态记录设置为开, 提醒发送时均会保存记录.', 'log_email' => '记录脚本所发邮件?', 'log_sms' => '记录脚本所发短信SMS?', + 'log_pushover' => 'Log pushover messages sent by the script', 'updated' => '设置已更新.', 'nochanges' => 'The configuration didn\'t change.', 'tab_email' => '邮件发送设置', 'tab_sms' => '短信发送设置', - 'tab_log' => '日志设置', + 'tab_pushover' => 'Pushover', 'settings_email' => '邮件发送设置', 'settings_sms' => '短信发送设置', + 'settings_pushover' => 'Pushover settings', 'settings_notification' => '提醒设置', 'settings_log' => '日志设置', 'auto_refresh' => 'Auto-refresh', @@ -234,9 +243,13 @@ $sm_lang = array( 'off_sms' => '服务器 \'%LABEL%\' 宕机: ip=%IP%, port=%PORT%. Error=%ERROR%', 'off_email_subject' => 'IMPORTANT: 服务器 \'%LABEL%\' 宕机', 'off_email_body' => "无法连接到以下服务器:

服务器: %LABEL%
IP: %IP%
Port: %PORT%
错误: %ERROR%
日期: %DATE%", + 'off_pushover_title' => '服务器 \'%LABEL%\' 宕机', + 'off_pushover_message' => "无法连接到以下服务器:

服务器: %LABEL%
IP: %IP%
Port: %PORT%
错误: %ERROR%
日期: %DATE%", 'on_sms' => '服务器 \'%LABEL%\' 运行中: ip=%IP%, port=%PORT%', 'on_email_subject' => 'IMPORTANT: 服务器 \'%LABEL%\' 运行中', 'on_email_body' => "服务器 '%LABEL%' 恢复运行:

服务器: %LABEL%
IP: %IP%
Port: %PORT%
日期: %DATE%", + 'on_pushover_title' => '服务器 \'%LABEL%\' 运行中', + 'on_pushover_message' => "服务器 '%LABEL%' 恢复运行:

服务器: %LABEL%
IP: %IP%
Port: %PORT%
日期: %DATE%", ), 'login' => array( 'welcome_usermenu' => '欢迎, %user_name%', diff --git a/src/psm/Module/Config/Controller/ConfigController.class.php b/src/psm/Module/Config/Controller/ConfigController.class.php index 51bc51c6..337cc5af 100644 --- a/src/psm/Module/Config/Controller/ConfigController.class.php +++ b/src/psm/Module/Config/Controller/ConfigController.class.php @@ -237,8 +237,8 @@ class ConfigController extends AbstractController { $this->default_tab = 'email'; } elseif(isset($_POST['sms_submit']) || !empty($_POST['test_sms'])) { $this->default_tab = 'sms'; - } elseif(isset($_POST['logging_submit'])) { - $this->default_tab = 'logging'; + } elseif(isset($_POST['pushover_submit'])) { + $this->default_tab = 'pushover'; } } $this->initializeAction('index'); @@ -253,7 +253,6 @@ class ConfigController extends AbstractController { 'label_tab_email' => psm_get_lang('config', 'tab_email'), 'label_tab_sms' => psm_get_lang('config', 'tab_sms'), 'label_tab_pushover' => psm_get_lang('config', 'tab_pushover'), - 'label_tab_log' => psm_get_lang('config', 'tab_log'), 'label_settings_email' => psm_get_lang('config', 'settings_email'), 'label_settings_sms' => psm_get_lang('config', 'settings_sms'), 'label_settings_pushover' => psm_get_lang('config', 'settings_pushover'), diff --git a/src/psm/Module/Server/Controller/LogController.class.php b/src/psm/Module/Server/Controller/LogController.class.php index 8c75a883..82eaead6 100644 --- a/src/psm/Module/Server/Controller/LogController.class.php +++ b/src/psm/Module/Server/Controller/LogController.class.php @@ -45,12 +45,7 @@ class LogController extends AbstractServerController { */ protected function executeIndex() { $this->setTemplateId('server_log_list', 'server/log.tpl.html'); - - $entries = array(); - $entries['status'] = $this->getEntries('status'); - $entries['email'] = $this->getEntries('email'); - $entries['sms'] = $this->getEntries('sms'); - $entries['pushover'] = $this->getEntries('pushover'); + $log_types = array('status', 'email', 'sms', 'pushover'); // get users $users = $this->db->select(PSM_DB_PREFIX.'users', null, array('user_id','name')); @@ -60,7 +55,8 @@ class LogController extends AbstractServerController { $users_labels[$user['user_id']] = $user['name']; } - foreach($entries as $key => $records) { + foreach($log_types as $key) { + $records = $this->getEntries($key); $log_count = count($records); for ($x = 0; $x < $log_count; $x++) { diff --git a/src/psm/Module/Server/Controller/ServerController.class.php b/src/psm/Module/Server/Controller/ServerController.class.php index 15a3dd97..df9fe904 100644 --- a/src/psm/Module/Server/Controller/ServerController.class.php +++ b/src/psm/Module/Server/Controller/ServerController.class.php @@ -93,6 +93,11 @@ class ServerController extends AbstractServerController { // we need an array for our template magic (see below): $html_actions = array('html_actions' => $html_actions); + $icons = array( + 'email' => 'icon-envelope', + 'sms' => 'icon-mobile', + 'pushover' => 'icon-pushover', + ); $servers = $this->getServers(); $server_count = count($servers); @@ -120,13 +125,15 @@ class ServerController extends AbstractServerController { if(($servers[$x]['active'] == 'yes')) { $servers[$x]['active_icon'] = 'icon-eye-open'; $servers[$x]['active_title'] = psm_get_lang('servers', 'monitoring'); - $servers[$x]['email_icon'] = ($servers[$x]['email'] == 'yes') ? 'icon-envelope' : ''; - $servers[$x]['sms_icon'] = ($servers[$x]['sms'] == 'yes') ? 'icon-mobile' : ''; + + foreach($icons as $i_id => $i_icon) { + if(psm_get_conf($i_id . '_status') && $servers[$x][$i_id] == 'yes') { + $servers[$x][$i_id . '_icon'] = $i_icon; + } + } } else { $servers[$x]['active_icon'] = 'icon-eye-close'; $servers[$x]['active_title'] = psm_get_lang('servers', 'no_monitoring'); - $servers[$x]['email_icon'] = ''; - $servers[$x]['sms_icon'] = ''; } $servers[$x] = $this->formatServer($servers[$x]); @@ -240,6 +247,7 @@ class ServerController extends AbstractServerController { 'active' => in_array($_POST['active'], array('yes', 'no')) ? $_POST['active'] : 'no', 'email' => in_array($_POST['email'], array('yes', 'no')) ? $_POST['email'] : 'no', 'sms' => in_array($_POST['sms'], array('yes', 'no')) ? $_POST['sms'] : 'no', + 'pushover' => in_array($_POST['pushover'], array('yes', 'no')) ? $_POST['pushover'] : 'no', ); // make sure websites start with http:// if($clean['type'] == 'website' && substr($clean['ip'], 0, 4) != 'http') { @@ -412,7 +420,7 @@ class ServerController extends AbstractServerController { 'label_send_email' => psm_get_lang('servers', 'send_email'), 'label_sms' => psm_get_lang('servers', 'sms'), 'label_send_sms' => psm_get_lang('servers', 'send_sms'), - 'label_send_pushover' => psm_get_lang('servers', 'send_pushover'), + 'label_pushover' => psm_get_lang('servers', 'pushover'), 'label_users' => psm_get_lang('servers', 'users'), 'label_warning_threshold' => psm_get_lang('servers', 'warning_threshold'), 'label_warning_threshold_description' => psm_get_lang('servers', 'warning_threshold_description'), @@ -447,4 +455,4 @@ class ServerController extends AbstractServerController { } return $result; } -} \ No newline at end of file +} diff --git a/src/psm/Util/Install/Installer.class.php b/src/psm/Util/Install/Installer.class.php index c5cef4b3..a582bb9d 100644 --- a/src/psm/Util/Install/Installer.class.php +++ b/src/psm/Util/Install/Installer.class.php @@ -143,7 +143,7 @@ class Installer { ('sms_gateway_username', 'username'), ('sms_gateway_password', 'password'), ('sms_from', '1234567890'), - ('pushover_status', '1'), + ('pushover_status', '0'), ('pushover_api_token', ''), ('alert_type', 'status'), ('log_status', '1'), @@ -200,7 +200,7 @@ class Installer { PSM_DB_PREFIX . 'log' => "CREATE TABLE `" . PSM_DB_PREFIX . "log` ( `log_id` int(11) unsigned NOT NULL AUTO_INCREMENT, `server_id` int(11) unsigned NOT NULL, - `type` enum('status','email','sms') NOT NULL, + `type` enum('status','email','sms','pushover') NOT NULL, `message` varchar(255) NOT NULL, `datetime` timestamp NOT NULL default CURRENT_TIMESTAMP, `user_id` varchar(255) NOT NULL, @@ -221,7 +221,7 @@ class Installer { `active` enum('yes','no') NOT NULL default 'yes', `email` enum('yes','no') NOT NULL default 'yes', `sms` enum('yes','no') NOT NULL default 'no', - `pushover` enum('yes','no') NOT NULL default 'no', + `pushover` enum('yes','no') NOT NULL default 'yes', `warning_threshold` mediumint(1) unsigned NOT NULL DEFAULT '1', `warning_threshold_counter` mediumint(1) unsigned NOT NULL DEFAULT '0', `timeout` smallint(1) unsigned NULL DEFAULT NULL, @@ -398,14 +398,16 @@ class Installer { protected function upgrade310() { $queries = array(); - $queries[] = "INSERT INTO `" . PSM_DB_PREFIX . "config` (`key`, `value`) VALUES ('pushover_status', '1');"; - $queries[] = "INSERT INTO `" . PSM_DB_PREFIX . "config` (`key`, `value`) VALUES ('log_pushover', '1');"; - $queries[] = "INSERT INTO `" . PSM_DB_PREFIX . "config` (`key`, `value`) VALUES ('pushover_api_token', '');"; - + psm_update_conf('pushover_status', 1); + psm_update_conf('log_pushover', 1); + psm_update_conf('pushover_api_token', ''); $queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "users` ADD `pushover_key` VARCHAR( 255 ) NOT NULL AFTER `mobile`;"; - $queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "users` ADD `pushover_device` VARCHAR( 255 ) NOT NULL AFTER `pushover_key`;"; - - $queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "servers` ADD `pushover` ENOM( 'yes','no' ) NOT NULL DEFAULT 'no' AFTER `sms`;"; + $queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "users` ADD `pushover_device` VARCHAR( 255 ) NOT NULL AFTER `pushover_key`;"; + + $queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "servers` ADD `pushover` ENUM( 'yes','no' ) NOT NULL DEFAULT 'yes' AFTER `sms`;"; + $queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "log` CHANGE `type` `type` ENUM( 'status', 'email', 'sms', 'pushover' ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;"; + + $queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "servers` ADD `timeout` smallint(1) unsigned NULL DEFAULT NULL;"; $queries[] = "CREATE TABLE IF NOT EXISTS `" . PSM_DB_PREFIX . "users_preferences` ( `user_id` int(11) unsigned NOT NULL, @@ -413,7 +415,7 @@ class Installer { `value` varchar(255) NOT NULL, PRIMARY KEY (`user_id`, `key`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8;"; - $queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "servers` ADD `timeout` smallint(1) unsigned NULL DEFAULT NULL;"; + $this->execSQL($queries); } } diff --git a/src/psm/Util/Pushover.class.php b/src/psm/Util/Pushover.class.php deleted file mode 100644 index 406fff2d..00000000 --- a/src/psm/Util/Pushover.class.php +++ /dev/null @@ -1,54 +0,0 @@ -. - * - * @package phpservermon - * @author Pepijn Over - * @copyright Copyright (c) 2008-2014 Pepijn Over - * @license http://www.gnu.org/licenses/gpl.txt GNU GPL v3 - * @version Release: @package_version@ - * @link http://www.phpservermonitor.org/ - * @since phpservermon 3.0.0 - **/ - -namespace psm\Util; - -/** - * Pushover is not using namespaces so unable to load files in autoloader. - */ -require_once(PSM_PATH_VENDOR . '/Pushover/Pushover.php'); - -/** - * PSM Pushover utility - * - * The Pushover is an open source lib that can be found in vendor/Pushover. - * - * @see \Pushover - */ -class Pushover extends \Pushover { - - /** - * Open new Pushover - * - * @param boolean $exceptions - */ - function __construct($exceptions = false) { - parent::__construct($exceptions); - - } -} \ No newline at end of file diff --git a/src/psm/Util/Updater/StatusNotifier.class.php b/src/psm/Util/Updater/StatusNotifier.class.php index f0423cde..7968c86d 100644 --- a/src/psm/Util/Updater/StatusNotifier.class.php +++ b/src/psm/Util/Updater/StatusNotifier.class.php @@ -164,22 +164,28 @@ class StatusNotifier { ); } + $users = $this->getUsers($this->server_id); + + if(empty($users)) { + return $notify; + } + // check if email is enabled for this server if($this->send_emails && $this->server['email'] == 'yes') { // send email - $this->notifyByEmail(); + $this->notifyByEmail($users); } // check if sms is enabled for this server if($this->send_sms && $this->server['sms'] == 'yes') { // yay lets wake those nerds up! - $this->notifyByTxtMsg(); + $this->notifyByTxtMsg($users); } // check if pushover is enabled for this server if($this->send_pushover && $this->server['pushover'] == 'yes') { // yay lets wake those nerds up! - $this->notifyByPushover(); + $this->notifyByPushover($users); } return $notify; @@ -188,17 +194,12 @@ class StatusNotifier { /** * This functions performs the email notifications * + * @param array $users * @return boolean */ - protected function notifyByEmail() { + protected function notifyByEmail($users) { $userlist = array(); - $users = $this->getUsers($this->server_id); - - if (empty($users)) { - return false; - } - // build mail object with some default values $mail = psm_build_mail(); $mail->Subject = psm_parse_msg($this->status_new, 'email_subject', $this->server); @@ -226,53 +227,43 @@ class StatusNotifier { /** * This functions performs the pushover notifications * + * @param array $users * @return boolean */ - protected function notifyByPushover() { + protected function notifyByPushover($users) { $userlist = array(); - - $users = $this->getUsers($this->server_id); - - if (empty($users)) { - return false; - } - - // build pushover object with some default values $pushover = psm_build_pushover(); - if($this->status_new === true) - { + if($this->status_new === true) { $pushover->setPriority(0); - }else - { + } else { $pushover->setPriority(2); $pushover->setRetry(300); //Used with Priority = 2; Pushover will resend the notification every 60 seconds until the user accepts. $pushover->setExpire(3600); //Used with Priority = 2; Pushover will resend the notification every 60 seconds for 3600 seconds. After that point, it stops sending notifications. } - //$pushover->setCallback('http://some.url/runscript.php'); // The callback parameter must be a URL (HTTP or HTTPS) that is reachable from the Internet that our servers will call out to as soon as the notification has been acknowledged. $pushover->setTimestamp(time()); - //$pushover->setDebug(true); - //$pushover->setSound('bike'); - - $this->server['MONITORURL']=$url = "http".(!empty($_SERVER['HTTPS'])?"s":"").":\/\/".$_SERVER['SERVER_NAME']; $message = psm_parse_msg($this->status_new, 'pushover_message', $this->server); - + $pushover->setTitle(psm_parse_msg($this->status_new, 'pushover_title', $this->server)); $pushover->setMessage(str_replace('
', "\n", $message)); + // @todo fix url when script is executed via CLI +// $pushover->setUrl($url); +// $pushover->setUrlTitle(psm_get_lang('system', 'title')); - $pushover->setUrl(psm_parse_msg($this->status_new, 'pushover_url', $this->server)); - $pushover->setUrlTitle(psm_parse_msg($this->status_new, 'pushover_url_title', $this->server)); - - // go through empl - foreach ($users as $user) { + foreach($users as $user) { + if(trim($user['pushover_key']) == '') { + continue; + } + $userlist[] = $user['user_id']; $pushover->setUser($user['pushover_key']); - $pushover->setDevice($user['pushover_device']); + if($user['pushover_device'] != '') { + $pushover->setDevice($user['pushover_device']); + } $pushover->send(); } if(psm_get_conf('log_pushover')) { - // save to log psm_add_log($this->server_id, 'pushover', $message, implode(',', $userlist)); } } @@ -280,16 +271,10 @@ class StatusNotifier { /** * This functions performs the text message notifications * - * @return unknown + * @param array $users + * @return boolean */ - protected function notifyByTxtMsg() { - // send sms to all users for this server using defined gateway - $users = $this->getUsers($this->server_id); - - if (empty($users)) { - return false; - } - + protected function notifyByTxtMsg($users) { $sms = psm_build_sms(); if(!$sms) { return false; diff --git a/src/templates/config/config.tpl.html b/src/templates/config/config.tpl.html old mode 100755 new mode 100644 index a70aa156..9aff176f --- a/src/templates/config/config.tpl.html +++ b/src/templates/config/config.tpl.html @@ -5,7 +5,6 @@
  • {label_tab_email}
  • {label_tab_sms}
  • {label_tab_pushover}
    • -
  • {label_tab_log}
    • @@ -34,6 +33,8 @@

    {label_auto_refresh_servers}

    + +
    {label_settings_notification}
    @@ -46,6 +47,15 @@

    {label_alert_type_description}

    +
    +
    + {label_settings_log} +
    +
    + +

    {label_log_status_description}

    +
    +
    @@ -59,6 +69,11 @@ +
    +
    + +
    +
    @@ -114,6 +129,11 @@
    +
    +
    + +
    +
    @@ -166,6 +186,11 @@
    +
    +
    + +
    +
    @@ -173,31 +198,10 @@
    - +
    -
    -
    - {label_settings_log} -
    - -

    {label_log_status_description}

    -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    \ No newline at end of file diff --git a/src/templates/install/install.tpl.html b/src/templates/install/install.tpl.html old mode 100755 new mode 100644 diff --git a/src/templates/main.tpl.html b/src/templates/main.tpl.html old mode 100755 new mode 100644 diff --git a/src/templates/main_sidebar.tpl.html b/src/templates/main_sidebar.tpl.html old mode 100755 new mode 100644 diff --git a/src/templates/server/log.tpl.html b/src/templates/server/log.tpl.html old mode 100755 new mode 100644 diff --git a/src/templates/server/server.tpl.html b/src/templates/server/server.tpl.html index 61e2d5d4..dc898841 100644 --- a/src/templates/server/server.tpl.html +++ b/src/templates/server/server.tpl.html @@ -10,9 +10,6 @@ {label_rtime} {label_last_online} {label_monitoring} - {label_email} - {label_sms} - {label_pushover} {label_action} @@ -27,10 +24,7 @@
    {type}
    {rtime} s
    {last_online}
    -
    -
    {active}
    -
    {email}
    -
    {sms}
    +
    @@ -52,7 +46,7 @@
    {ip_short}
    - +
    @@ -142,7 +136,7 @@
    - +
    +
    + +
    + +
    +
    @@ -130,12 +128,6 @@
    -
    - -
    - -
    -
    diff --git a/static/css/style.css b/static/css/style.css index 47689d54..2c12e455 100755 --- a/static/css/style.css +++ b/static/css/style.css @@ -560,3 +560,7 @@ legend{ .icon-admin { background-position: -48px -168px; } + +.icon-pushover { + background-position: -72px -168px; +} \ No newline at end of file diff --git a/static/plugin/twitter-bootstrap/img/glyphicons-halflings-white.png b/static/plugin/twitter-bootstrap/img/glyphicons-halflings-white.png index d1be41bb..9e7cfb02 100644 Binary files a/static/plugin/twitter-bootstrap/img/glyphicons-halflings-white.png and b/static/plugin/twitter-bootstrap/img/glyphicons-halflings-white.png differ diff --git a/static/plugin/twitter-bootstrap/img/glyphicons-halflings.png b/static/plugin/twitter-bootstrap/img/glyphicons-halflings.png index 590346d1..1b7577d8 100644 Binary files a/static/plugin/twitter-bootstrap/img/glyphicons-halflings.png and b/static/plugin/twitter-bootstrap/img/glyphicons-halflings.png differ diff --git a/vendor/Pushover/Pushover.php b/vendor/Pushover/Pushover.php deleted file mode 100644 index 99049d6a..00000000 --- a/vendor/Pushover/Pushover.php +++ /dev/null @@ -1,452 +0,0 @@ - - * @version 0.2 - * @package php-pushover - * @example test.php - * @link https://pushover.net/api - * @license BSD License - */ - -class Pushover -{ - // api url - const API_URL = 'https://api.pushover.net/1/messages.xml'; - - /** - * Application API token - * - * @var string - */ - private $_token; - - /** - * User API token - * - * @var string - */ - private $_user; - - /** - * Turn on/off debug mode - * - * @var bool - */ - private $_debug = false; - - /** - * Title of the message - * - * @var string - */ - private $_title; - - /** - * The message itself (up to 512 characters) - * - * @var string - */ - private $_message; - - /** - * Timestamp in Unix timestamp format - * - * @var int - */ - private $_timestamp; - - /** - * User's device (user specific) - * - * @var string - */ - private $_device; - - /** - * Priority of the message. Can be 0, 1 or 2. High-priority messages (1) override a user's "quiet hours" setting and will always be delivered any time they are received. High priority messages are highlighted in red in the Android and iOS clients. Emergency Priority (2) messages work similar to High-Priority messages, but they are repeated until the message is acknowledged by the user. - * - * @var string - */ - private $_priority = 0; - - /** - * Include a Supplementary URL (up to 200 characters) - * - * @var string - */ - private $_url; - - /** - * Title of the included URL (up to 50 characters) - * - * @var string - */ - private $_url_title; - - /** - * The Retry parameter is only used when the Priority is set to 2 (or emergency-priority), and specifies how often (in seconds) the Pushover servers will send the same notification to the user. In a situation where your user might be in a noisy environment or sleeping, retrying the notification (with sound and vibration) will help get his or her attention. This parameter must have a value of at least 30 seconds between retries. - * - * @var int - */ - private $_retry; - - /** - * The expire parameter is only used when the Priority is set to 2 (or emergency-priority), and specifies how many seconds your notification will continue to be retried for. If the notification has not been acknowledged in expire seconds, it will be marked as expired and will stop being sent to the user. This parameter must have a maximum value of at most 86400 seconds (24 hours). - * - * @var int - */ - private $_expire; - - /** - * The optional callback parameter may be supplied with a publicly-accessible URL that our servers will send a request to when the user has acknowledged your notification. - * - * @var string - */ - private $_callback; - - /** - * The sound parameter. Get an up-to-date sound list from https://api.pushover.net/1/sounds.json?token= - * - * @var int - */ - private $_sound; - - /** - * Default constructor - */ - public function __construct () { - } - - /** - * Set API token - * - * @param string $token Your app API key. - * - * @return void - */ - public function setToken ($token) { - $this->_token = (string)$token; - } - - /** - * Get API token - * - * @return string - */ - public function getToken () { - return $this->_token; - } - - /** - * Set API user - * - * @param string $user The user's API key. - * - * @return void - */ - public function setUser ($user) { - $this->_user = (string)$user; - } - - /** - * Get API user - * - * @return string - */ - public function getUser () { - return $this->_user; - } - - /** - * Set message title - * - * @param string $title Title of push notification. - * - * @return void - */ - public function setTitle ($title) { - $this->_title = (string)$title; - } - - /** - * Get message title - * - * @return string - */ - public function getTitle () { - return $this->_title; - } - - /** - * Set Retry Time - * - * @param int $retry The retry time (in seconds). Must have a value of at least 30 seconds. - */ - public function setRetry ($retry) { - $this->_retry = (int)$retry; - } - - /** - * Get Retry Time - * - * @return int - */ - public function getRetry() { - return $this->_retry; - } - - /** - * Set Expire Time - * - * @param int $expire The expiry time (in seconds). Must have a maximum value of at most, 86400 seconds. - */ - public function setExpire ($expire) { - $this->_expire = (int)$expire; - } - - /** - * Get Expire Time - * - * @return string - */ - public function getExpire () { - return $this->_expire; - } - - /** - * Set Callback URL - * - * @param string $callback a publically-accessible URL that Pushover sends a request to when the user has acknowledged your notification. - */ - public function setCallback ($callback) { - $this->_callback = $callback; - } - - /** - * Get Callback URL - * - * @return int - */ - public function getCallback() { - return $this->_callback; - } - - /** - * Set message - * - * @param string $msg Message of push notification. - * - * @return void - */ - public function setMessage ($msg) { - $this->_message = (string)$msg; - } - - /** - * Get message - * - * @return string - */ - public function getMessage () { - return $this->_message; - } - - /** - * Set device - * - * @param string $device Leave this empty if you want to send to all user's devices. This can be user specific! - * - * @return void - */ - public function setDevice ($device) { - $this->_device = (string)$device; - } - - /** - * Get device - * - * @return string - */ - public function getDevice () { - return $this->_device; - } - - /** - * Set timestamp - * - * Messages are stored on the Pushover servers with a timestamp of when they were initially received through the API. This timestamp is sent to and shown on client devices, and messages are listed in order of these timestamps. In most cases, this default timestamp is acceptable. This is not for scheduling! - * - * @param int $time dispaly time on device - * - * @return void - */ - public function setTimestamp ($time) { - $this->_timestamp = (int)$time; - } - - /** - * Get timestamp - * - * @return int - */ - public function getTimestamp () { - return $this->_timestamp; - } - - /** - * Set priority (-1, 0 or 1) - * - * -1 Low priority notifications. - * 0 Default. - * 1 triggers a high-priority alert that always generates sound and vibration. - * 2 triggers the same high-priority alert that #1 does; but is repeated until the notification is acknowledged by the user. - * - * @param int $priority priority level. - * - * @return void - */ - public function setPriority ($priority) { - $this->_priority = (int)$priority; - } - - /** - * Get priority - * - * @return int - */ - public function getPriority () { - return $this->_priority; - } - - /** - * Set url - * - * @param string $url Add an url to your notification. - * - * @return void - */ - public function setUrl ($url) { - $this->_url = (string)$url; - } - - /** - * Get url - * - * @return string - */ - public function getUrl () { - return $this->_url; - } - - /** - * Set url title - * - * @param string $url_title A title if you want to show a text instead of the actual url. - * - * @return void - */ - public function setUrlTitle ($url_title) { - $this->_url_title = (string)$url_title; - } - - /** - * Get url title - * - * @return string - */ - public function getUrlTitle () { - return $this->_url_title; - } - - /** - * Set debug mode - * - * @param bool $debug Enable this to receive detailed input and output info. - * - * @return void - */ - public function setDebug ($debug) { - $this->_debug = (boolean)$debug; - } - - /** - * Get debug mode - * - * @return bool - */ - public function getDebug () { - return $this->_debug; - } - - /** - * Set sound - * - * @param string $sound If no sound parameter is specified, the user's default tone will play. If the user has not chosen a custom sound, the standard Pushover sound will play. - * - * @return void - */ - public function setSound ($sound) { - $this->_sound = (string)$sound; - } - - /** - * Get sound - * - * @return string - */ - public function getSound () { - return $this->_sound; - } - - /** - * Send message to Pushover API - * - * @return bool - */ - public function send() { - if(!Empty($this->_token) && !Empty($this->_user) && !Empty($this->_message)) { - if(!isset($this->_timestamp)) $this->setTimestamp(time()); - - $c = curl_init(); - curl_setopt($c, CURLOPT_URL, self::API_URL); - curl_setopt($c, CURLOPT_HEADER, false); - /* - if possible, set CURLOPT_SSL_VERIFYPEER to true.. - - http://www.tehuber.com/phps/cabundlegen.phps - */ - curl_setopt($c, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($c, CURLOPT_RETURNTRANSFER, true); - curl_setopt($c, CURLOPT_POSTFIELDS, array( - 'token' => $this->getToken(), - 'user' => $this->getUser(), - 'title' => $this->getTitle(), - 'message' => $this->getMessage(), - 'device' => $this->getDevice(), - 'priority' => $this->getPriority(), - 'timestamp' => $this->getTimestamp(), - 'expire' => $this->getExpire(), - 'retry' => $this->getRetry(), - 'callback' => $this->getCallback(), - 'url' => $this->getUrl(), - 'sound' => $this->getSound(), - 'url_title' => $this->getUrlTitle() - )); - $response = curl_exec($c); - $xml = simplexml_load_string($response); - - if($this->getDebug()) { - return array('output' => $xml, 'input' => $this); - } - else { - return ($xml->status == 1) ? true : false; - } - } - } -} -?> \ No newline at end of file