[Astlinux-commits] SF.net SVN: astlinux:[6290] branches/1.0/package/webinterface/altweb

[<abe...@us...>]

Revision: 6290
          http://sourceforge.net/p/astlinux/code/6290
Author:   abelbeck
Date:     2013-11-19 04:39:55 +0000 (Tue, 19 Nov 2013)
Log Message:
-----------
web interface, Restart services now displays 'is Running' or 'is Stopped' results when possible

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/admin/dnshosts.php
    branches/1.0/package/webinterface/altweb/admin/edit.php
    branches/1.0/package/webinterface/altweb/admin/ipsec.php
    branches/1.0/package/webinterface/altweb/admin/ipsecmobile.php
    branches/1.0/package/webinterface/altweb/admin/network.php
    branches/1.0/package/webinterface/altweb/admin/openvpn.php
    branches/1.0/package/webinterface/altweb/admin/openvpnclient.php
    branches/1.0/package/webinterface/altweb/admin/pptp.php
    branches/1.0/package/webinterface/altweb/admin/slapd.php
    branches/1.0/package/webinterface/altweb/admin/staff.php
    branches/1.0/package/webinterface/altweb/admin/xmpp.php
    branches/1.0/package/webinterface/altweb/admin/zabbix.php
    branches/1.0/package/webinterface/altweb/common/functions.php

Modified: branches/1.0/package/webinterface/altweb/admin/dnshosts.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/dnshosts.php	2013-11-19 00:46:37 UTC (rev 6289)
+++ branches/1.0/package/webinterface/altweb/admin/dnshosts.php	2013-11-19 04:39:55 UTC (rev 6290)
@@ -176,7 +176,7 @@
     } elseif ($result == 5) {
       putHtml('<p style="color: red;">Not a valid MAC Address, format ff:ff:ff:ff:ff:ff</p>');
     } elseif ($result == 10) {
-      putHtml('<p style="color: green;">DNS &amp; DHCP Server has Restarted.</p>');
+      putHtml('<p style="color: green;">DNS &amp; DHCP Server'.statusPROCESS('dnsmasq').'.</p>');
     } elseif ($result == 11) {
       putHtml('<p style="color: green;">Settings saved, click "Restart DNS" to apply any changed settings.</p>');
     } elseif ($result == 99) {

Modified: branches/1.0/package/webinterface/altweb/admin/edit.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/edit.php	2013-11-19 00:46:37 UTC (rev 6289)
+++ branches/1.0/package/webinterface/altweb/admin/edit.php	2013-11-19 04:39:55 UTC (rev 6290)
@@ -324,51 +324,51 @@
     } elseif ($result == 11) {
       putHtml('<p style="color: green;">Asterisk Modules Reloaded.</p>');
     } elseif ($result == 22) {
-      putHtml('<p style="color: green;">NTP Time has Restarted.</p>');
+      putHtml('<p style="color: green;">NTP Time'.statusPROCESS('ntpd').'.</p>');
     } elseif ($result == 23) {
-      putHtml('<p style="color: green;">IPsec VPN has Restarted.</p>');
+      putHtml('<p style="color: green;">IPsec VPN'.statusPROCESS('racoon').'.</p>');
     } elseif ($result == 24) {
-      putHtml('<p style="color: green;">OpenVPN Server has Restarted.</p>');
+      putHtml('<p style="color: green;">OpenVPN Server'.statusPROCESS('openvpn').'.</p>');
     } elseif ($result == 25) {
-      putHtml('<p style="color: green;">Asterisk has Restarted.</p>');
+      putHtml('<p style="color: green;">Asterisk'.statusPROCESS('asterisk').'.</p>');
     } elseif ($result == 26) {
       putHtml('<p style="color: green;">Firewall has Restarted.</p>');
     } elseif ($result == 27) {
-      putHtml('<p style="color: green;">Dynamic DNS has Restarted.</p>');
+      putHtml('<p style="color: green;">Dynamic DNS'.statusPROCESS('dynamicdns').'.</p>');
     } elseif ($result == 28) {
-      putHtml('<p style="color: green;">DNS &amp; DHCP Server has Restarted.</p>');
+      putHtml('<p style="color: green;">DNS &amp; DHCP Server'.statusPROCESS('dnsmasq').'.</p>');
     } elseif ($result == 29) {
-      putHtml('<p style="color: green;">OpenVPN Client has Restarted.</p>');
+      putHtml('<p style="color: green;">OpenVPN Client'.statusPROCESS('openvpnclient').'.</p>');
     } elseif ($result == 30) {
       putHtml('<p style="color: green;">Cron Jobs for root will be reloaded within a minute.</p>');
     } elseif ($result == 31) {
       putHtml('<p style="color: green;">SMTP Mail has Restarted.</p>');
     } elseif ($result == 32) {
-      putHtml('<p style="color: green;">IPv6 Autoconfig (radvd) has Restarted.</p>');
+      putHtml('<p style="color: green;">IPv6 Autoconfig (radvd)'.statusPROCESS('radvd').'.</p>');
     } elseif ($result == 33) {
-      putHtml('<p style="color: green;">PPTP VPN Server has Restarted.</p>');
+      putHtml('<p style="color: green;">PPTP VPN Server'.statusPROCESS('pptpd').'.</p>');
     } elseif ($result == 34) {
-      putHtml('<p style="color: green;">Universal Plug\'n\'Play has Restarted.</p>');
+      putHtml('<p style="color: green;">Universal Plug\'n\'Play'.statusPROCESS('miniupnpd').'.</p>');
     } elseif ($result == 35) {
-      putHtml('<p style="color: green;">UPS Daemon has Restarted.</p>');
+      putHtml('<p style="color: green;">UPS Daemon'.statusPROCESS('apcupsd').'.</p>');
     } elseif ($result == 36) {
-      putHtml('<p style="color: green;">Zabbix Monitoring has Restarted.</p>');
+      putHtml('<p style="color: green;">Zabbix Monitoring'.statusPROCESS('zabbix').'.</p>');
     } elseif ($result == 37) {
-      putHtml('<p style="color: green;">Stunnel Proxy has Restarted.</p>');
+      putHtml('<p style="color: green;">Stunnel Proxy'.statusPROCESS('stunnel').'.</p>');
     } elseif ($result == 38) {
-      putHtml('<p style="color: green;">XMPP Server has Restarted.</p>');
+      putHtml('<p style="color: green;">XMPP Server'.statusPROCESS('prosody').'.</p>');
     } elseif ($result == 39) {
-      putHtml('<p style="color: green;">SNMP Server has Restarted.</p>');
+      putHtml('<p style="color: green;">SNMP Server'.statusPROCESS('snmpd').'.</p>');
     } elseif ($result == 40) {
       putHtml('<p style="color: green;">LDAP Client Defaults has been Reloaded.</p>');
     } elseif ($result == 41) {
-      putHtml('<p style="color: green;">Asterisk Flash Operating Panel2 has Restarted.</p>');
+      putHtml('<p style="color: green;">Asterisk Flash Operating Panel2'.statusPROCESS('fop2').'.</p>');
     } elseif ($result == 42) {
       putHtml('<p style="color: green;">Asterisk Flash Operating Panel2 has been Reloaded.</p>');
     } elseif ($result == 43) {
-      putHtml('<p style="color: green;">LDAP Server has Restarted.</p>');
+      putHtml('<p style="color: green;">LDAP Server'.statusPROCESS('slapd').'.</p>');
     } elseif ($result == 44) {
-      putHtml('<p style="color: green;">NetStat Server (darkstat) has Restarted.</p>');
+      putHtml('<p style="color: green;">NetStat Server (darkstat)'.statusPROCESS('darkstat').'.</p>');
     } elseif ($result == 99) {
       putHtml('<p style="color: red;">Action Failed.</p>');
     } elseif ($result == 999) {

Modified: branches/1.0/package/webinterface/altweb/admin/ipsec.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/ipsec.php	2013-11-19 00:46:37 UTC (rev 6289)
+++ branches/1.0/package/webinterface/altweb/admin/ipsec.php	2013-11-19 04:39:55 UTC (rev 6290)
@@ -447,7 +447,7 @@
     } elseif ($result == 3) {
       putHtml('<p style="color: red;">Error creating file.</p>');
     } elseif ($result == 10) {
-      putHtml('<p style="color: green;">IPsec has Restarted.</p>');
+      putHtml('<p style="color: green;">IPsec VPN'.statusPROCESS('racoon').'.</p>');
     } elseif ($result == 11) {
       putHtml('<p style="color: green;">Settings saved, click "Restart IPsec" to apply any changed settings.</p>');
     } elseif ($result == 12) {

Modified: branches/1.0/package/webinterface/altweb/admin/ipsecmobile.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/ipsecmobile.php	2013-11-19 00:46:37 UTC (rev 6289)
+++ branches/1.0/package/webinterface/altweb/admin/ipsecmobile.php	2013-11-19 04:39:55 UTC (rev 6290)
@@ -367,7 +367,7 @@
     } elseif ($result == 5) {
       putHtml('<p style="color: red;">File Not Found.</p>');
     } elseif ($result == 10) {
-      putHtml('<p style="color: green;">IPsec has Restarted.</p>');
+      putHtml('<p style="color: green;">IPsec VPN'.statusPROCESS('racoon').'.</p>');
     } elseif ($result == 11) {
       putHtml('<p style="color: green;">Settings saved, click "Restart IPsec" to apply any changed settings.</p>');
     } elseif ($result == 30) {

Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php	2013-11-19 00:46:37 UTC (rev 6289)
+++ branches/1.0/package/webinterface/altweb/admin/network.php	2013-11-19 04:39:55 UTC (rev 6290)
@@ -1034,49 +1034,49 @@
     } elseif ($result == 21) {
       putHtml('<p style="color: green;">PPPoE has Restarted.</p>');
     } elseif ($result == 22) {
-      putHtml('<p style="color: green;">NTP Time has Restarted.</p>');
+      putHtml('<p style="color: green;">NTP Time'.statusPROCESS('ntpd').'.</p>');
     } elseif ($result == 23) {
-      putHtml('<p style="color: green;">IPsec VPN has Restarted.</p>');
+      putHtml('<p style="color: green;">IPsec VPN'.statusPROCESS('racoon').'.</p>');
     } elseif ($result == 24) {
-      putHtml('<p style="color: green;">OpenVPN Server has Restarted.</p>');
+      putHtml('<p style="color: green;">OpenVPN Server'.statusPROCESS('openvpn').'.</p>');
     } elseif ($result == 25) {
-      putHtml('<p style="color: green;">Asterisk has Restarted.</p>');
+      putHtml('<p style="color: green;">Asterisk'.statusPROCESS('asterisk').'.</p>');
     } elseif ($result == 26) {
       putHtml('<p style="color: green;">Firewall has Restarted.</p>');
     } elseif ($result == 27) {
-      putHtml('<p style="color: green;">Dynamic DNS has Restarted.</p>');
+      putHtml('<p style="color: green;">Dynamic DNS'.statusPROCESS('dynamicdns').'.</p>');
     } elseif ($result == 28) {
-      putHtml('<p style="color: green;">DNS &amp; DHCP Server has Restarted.</p>');
+      putHtml('<p style="color: green;">DNS &amp; DHCP Server'.statusPROCESS('dnsmasq').'.</p>');
     } elseif ($result == 29) {
-      putHtml('<p style="color: green;">OpenVPN Client has Restarted.</p>');
+      putHtml('<p style="color: green;">OpenVPN Client'.statusPROCESS('openvpnclient').'.</p>');
     } elseif ($result == 31) {
       putHtml('<p style="color: green;">SMTP Mail has Restarted.</p>');
     } elseif ($result == 32) {
-      putHtml('<p style="color: green;">IPv6 Autoconfig (radvd) has Restarted.</p>');
+      putHtml('<p style="color: green;">IPv6 Autoconfig (radvd)'.statusPROCESS('radvd').'.</p>');
     } elseif ($result == 33) {
-      putHtml('<p style="color: green;">PPTP VPN Server has Restarted.</p>');
+      putHtml('<p style="color: green;">PPTP VPN Server'.statusPROCESS('pptpd').'.</p>');
     } elseif ($result == 34) {
-      putHtml('<p style="color: green;">Universal Plug\'n\'Play has Restarted.</p>');
+      putHtml('<p style="color: green;">Universal Plug\'n\'Play'.statusPROCESS('miniupnpd').'.</p>');
     } elseif ($result == 35) {
-      putHtml('<p style="color: green;">UPS Daemon has Restarted.</p>');
+      putHtml('<p style="color: green;">UPS Daemon'.statusPROCESS('apcupsd').'.</p>');
     } elseif ($result == 36) {
-      putHtml('<p style="color: green;">Zabbix Monitoring has Restarted.</p>');
+      putHtml('<p style="color: green;">Zabbix Monitoring'.statusPROCESS('zabbix').'.</p>');
     } elseif ($result == 37) {
-      putHtml('<p style="color: green;">Stunnel Proxy has Restarted.</p>');
+      putHtml('<p style="color: green;">Stunnel Proxy'.statusPROCESS('stunnel').'.</p>');
     } elseif ($result == 38) {
-      putHtml('<p style="color: green;">XMPP Server has Restarted.</p>');
+      putHtml('<p style="color: green;">XMPP Server'.statusPROCESS('prosody').'.</p>');
     } elseif ($result == 39) {
-      putHtml('<p style="color: green;">SNMP Server has Restarted.</p>');
+      putHtml('<p style="color: green;">SNMP Server'.statusPROCESS('snmpd').'.</p>');
     } elseif ($result == 40) {
       putHtml('<p style="color: green;">LDAP Client Defaults has been Reloaded.</p>');
     } elseif ($result == 41) {
-      putHtml('<p style="color: green;">Asterisk Flash Operating Panel2 has Restarted.</p>');
+      putHtml('<p style="color: green;">Asterisk Flash Operating Panel2'.statusPROCESS('fop2').'.</p>');
     } elseif ($result == 42) {
       putHtml('<p style="color: green;">Asterisk Flash Operating Panel2 has been Reloaded.</p>');
     } elseif ($result == 43) {
-      putHtml('<p style="color: green;">LDAP Server has Restarted.</p>');
+      putHtml('<p style="color: green;">LDAP Server'.statusPROCESS('slapd').'.</p>');
     } elseif ($result == 44) {
-      putHtml('<p style="color: green;">NetStat Server (darkstat) has Restarted.</p>');
+      putHtml('<p style="color: green;">NetStat Server (darkstat)'.statusPROCESS('darkstat').'.</p>');
     } elseif ($result == 99) {
       putHtml('<p style="color: red;">Action Failed.</p>');
     } elseif ($result == 100) {

Modified: branches/1.0/package/webinterface/altweb/admin/openvpn.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/openvpn.php	2013-11-19 00:46:37 UTC (rev 6289)
+++ branches/1.0/package/webinterface/altweb/admin/openvpn.php	2013-11-19 04:39:55 UTC (rev 6290)
@@ -513,7 +513,7 @@
     } elseif ($result == 5) {
       putHtml('<p style="color: red;">File Not Found.</p>');
     } elseif ($result == 10) {
-      putHtml('<p style="color: green;">OpenVPN Server has Restarted.</p>');
+      putHtml('<p style="color: green;">OpenVPN Server'.statusPROCESS('openvpn').'.</p>');
     } elseif ($result == 11) {
       putHtml('<p style="color: green;">Settings saved, click "Restart Server" to apply any changed settings.</p>');
     } elseif ($result == 30) {

Modified: branches/1.0/package/webinterface/altweb/admin/openvpnclient.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/openvpnclient.php	2013-11-19 00:46:37 UTC (rev 6289)
+++ branches/1.0/package/webinterface/altweb/admin/openvpnclient.php	2013-11-19 04:39:55 UTC (rev 6290)
@@ -266,7 +266,7 @@
     } elseif ($result == 5) {
       putHtml('<p style="color: red;">File Not Found.</p>');
     } elseif ($result == 10) {
-      putHtml('<p style="color: green;">OpenVPN Client has Restarted.</p>');
+      putHtml('<p style="color: green;">OpenVPN Client'.statusPROCESS('openvpnclient').'.</p>');
     } elseif ($result == 11) {
       putHtml('<p style="color: green;">Settings saved, click "Restart Client" to apply any changed settings.</p>');
     } elseif ($result == 20) {

Modified: branches/1.0/package/webinterface/altweb/admin/pptp.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/pptp.php	2013-11-19 00:46:37 UTC (rev 6289)
+++ branches/1.0/package/webinterface/altweb/admin/pptp.php	2013-11-19 04:39:55 UTC (rev 6290)
@@ -247,7 +247,7 @@
     } elseif ($result == 3) {
       putHtml('<p style="color: red;">Error creating file.</p>');
     } elseif ($result == 10) {
-      putHtml('<p style="color: green;">PPTP VPN Server has Restarted.</p>');
+      putHtml('<p style="color: green;">PPTP VPN Server'.statusPROCESS('pptpd').'.</p>');
     } elseif ($result == 11) {
       putHtml('<p style="color: green;">Settings saved, click "Restart Server" to apply any changed settings.</p>');
     } elseif ($result == 12) {

Modified: branches/1.0/package/webinterface/altweb/admin/slapd.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/slapd.php	2013-11-19 00:46:37 UTC (rev 6289)
+++ branches/1.0/package/webinterface/altweb/admin/slapd.php	2013-11-19 04:39:55 UTC (rev 6290)
@@ -145,7 +145,7 @@
     } elseif ($result == 3) {
       putHtml('<p style="color: red;">Error creating file.</p>');
     } elseif ($result == 10) {
-      putHtml('<p style="color: green;">LDAP Server has Restarted.</p>');
+      putHtml('<p style="color: green;">LDAP Server'.statusPROCESS('slapd').'.</p>');
     } elseif ($result == 11) {
       putHtml('<p style="color: green;">Settings saved, click "Restart LDAP" to apply any changed settings.</p>');
     } elseif ($result == 20) {

Modified: branches/1.0/package/webinterface/altweb/admin/staff.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/staff.php	2013-11-19 00:46:37 UTC (rev 6289)
+++ branches/1.0/package/webinterface/altweb/admin/staff.php	2013-11-19 04:39:55 UTC (rev 6290)
@@ -186,7 +186,7 @@
     } elseif ($result == 15) {
       putHtml('<p style="color: red;">Backup Failed, error archiving unionfs partition.</p>');
     } elseif ($result == 25) {
-      putHtml('<p style="color: green;">Asterisk has Restarted.</p>');
+      putHtml('<p style="color: green;">Asterisk'.statusPROCESS('asterisk').'.</p>');
     } elseif ($result == 40) {
       putHtml('<p style="color: green;">Reboot Scheduled within 24 hours.</p>');
     } elseif ($result == 41) {

Modified: branches/1.0/package/webinterface/altweb/admin/xmpp.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/xmpp.php	2013-11-19 00:46:37 UTC (rev 6289)
+++ branches/1.0/package/webinterface/altweb/admin/xmpp.php	2013-11-19 04:39:55 UTC (rev 6290)
@@ -312,7 +312,7 @@
     } elseif ($result == 4) {
       putHtml('<p style="color: red;">Invalid username, specify a JID, including a host. Example: al...@ex...</p>');
     } elseif ($result == 10) {
-      putHtml('<p style="color: green;">XMPP Server has Restarted.</p>');
+      putHtml('<p style="color: green;">XMPP Server'.statusPROCESS('prosody').'.</p>');
     } elseif ($result == 11) {
       putHtml('<p style="color: green;">Settings saved, click "Restart Server" to apply any changed settings.</p>');
     } elseif ($result == 12) {

Modified: branches/1.0/package/webinterface/altweb/admin/zabbix.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/zabbix.php	2013-11-19 00:46:37 UTC (rev 6289)
+++ branches/1.0/package/webinterface/altweb/admin/zabbix.php	2013-11-19 04:39:55 UTC (rev 6290)
@@ -151,7 +151,7 @@
     } elseif ($result == 3) {
       putHtml('<p style="color: red;">Error creating file.</p>');
     } elseif ($result == 10) {
-      putHtml('<p style="color: green;">Zabbix Monitoring has Restarted.</p>');
+      putHtml('<p style="color: green;">Zabbix Monitoring'.statusPROCESS('zabbix').'.</p>');
     } elseif ($result == 11) {
       putHtml('<p style="color: green;">Settings saved, click "Restart Zabbix" to apply any changed settings.</p>');
     } elseif ($result == 99) {

Modified: branches/1.0/package/webinterface/altweb/common/functions.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/functions.php	2013-11-19 00:46:37 UTC (rev 6289)
+++ branches/1.0/package/webinterface/altweb/common/functions.php	2013-11-19 04:39:55 UTC (rev 6290)
@@ -92,6 +92,46 @@
   return($result);
 }
 
+// Function: statusPROCESS
+//
+function statusPROCESS($process) {
+
+  $str = '';
+  $path = '/var/run/';
+  $running = ' has Restarted and is Running';
+  $stopped = ' is Stopped';
+
+  if ($process === 'asterisk' || $process === 'prosody' || $process === 'slapd') {
+    $path .= $process.'/';
+  } elseif ($process === 'dynamicdns') {
+    if (is_file($path.'ddclient.pid') || is_file($path.'inadyn.pid')) {
+      $str = $running;
+    } else {
+      $str = $stopped;
+    }
+  } elseif ($process === 'stunnel') {
+    if (is_file($path.$process.'/server.pid') || is_file($path.$process.'/client.pid')) {
+      $str = $running;
+    } else {
+      $str = $stopped;
+    }
+  } elseif ($process === 'zabbix') {
+    if (is_file($path.'zabbix_agentd.pid')) {
+      $str = $running;
+    } else {
+      $str = $stopped;
+    }
+  }
+  if ($str === '') {
+    if (is_file($path.$process.'.pid')) {
+      $str = $running;
+    } else {
+      $str = $stopped;
+    }
+  }
+  return($str);
+}
+
 // Function: systemSHUTDOWN
 //
 function systemSHUTDOWN($myself, $result) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.