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

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

Revision: 5919
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5919&view=rev
Author:   abelbeck
Date:     2013-01-21 18:57:32 +0000 (Mon, 21 Jan 2013)
Log Message:
-----------
web interface, Staff tab - add 'Restart Asterisk', more prosody tweaks

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/admin/staff.php
    branches/1.0/package/webinterface/altweb/admin/xmpp.php
    branches/1.0/package/webinterface/altweb/common/status.inc

Modified: branches/1.0/package/webinterface/altweb/admin/staff.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/staff.php	2013-01-21 08:25:09 UTC (rev 5918)
+++ branches/1.0/package/webinterface/altweb/admin/staff.php	2013-01-21 18:57:32 UTC (rev 5919)
@@ -1,6 +1,6 @@
 <?php
 
-// Copyright (C) 2008-2010 Lonnie Abelbeck
+// Copyright (C) 2008-2013 Lonnie Abelbeck
 // This is free software, licensed under the GNU General Public License
 // version 3 as published by the Free Software Foundation; you can
 // redistribute it and/or modify it under the terms of the GNU
@@ -8,6 +8,7 @@
 
 // staff.php for AstLinux
 // 12-12-2009
+// 01-21-2013, Add Restart Asterisk
 //
 // System location of webgui-staff-backup.conf
 $CONFFILE = '/mnt/kd/webgui-staff-backup.conf';
@@ -134,6 +135,16 @@
       header('Location: '.$myself.'?reboot_delay='.$delay.'&result='.$result);
       exit;
     }
+  } elseif (isset($_POST['submit_restart_asterisk'])) {
+    $result = 99;
+    if (isset($_POST['confirm_restart_asterisk'])) {
+      $mesg = date('Y-m-d H:i:s').'  RESTART_ASTERISK  Remote Address: '.$_SERVER['REMOTE_ADDR'];
+      @file_put_contents($LOGFILE, $mesg."\n", FILE_APPEND);
+      chmod($LOGFILE, 0600);
+      $result = restartPROCESS('asterisk', 25, $result);
+    } else {
+      $result = 7;
+    }
   } elseif (isset($_POST['submit_shutdown'])) {
     $result = 99;
     if (isset($_POST['confirm_shutdown'])) {
@@ -166,6 +177,8 @@
       putHtml('<p style="color: green;">System is Rebooting... back in <span id="count_down"><script language="JavaScript" type="text/javascript">document.write(count_down_secs);</script></span> seconds.</p>');
     } 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>');
     } elseif ($result == 40) {
       putHtml('<p style="color: green;">Reboot Scheduled within 24 hours.</p>');
     } elseif ($result == 41) {
@@ -203,6 +216,14 @@
 }
   
   putHtml('<tr><td style="text-align: center;">');
+  putHtml('<h2>Restart Asterisk:</h2>');
+  putHtml('</td></tr><tr><td class="dialogText" style="text-align: center;">');
+  putHtml('<input type="submit" value="Restart Asterisk" name="submit_restart_asterisk" />');
+  putHtml('&ndash;');
+  putHtml('<input type="checkbox" value="restart_asterisk" name="confirm_restart_asterisk" />&nbsp;Confirm');
+  putHtml('</td></tr>');
+
+  putHtml('<tr><td style="text-align: center;">');
   putHtml('<h2>Reboot/Restart System:</h2>');
   putHtml('</td></tr><tr><td class="dialogText" style="text-align: center;">');
   putHtml('<select name="reboot_delay">');

Modified: branches/1.0/package/webinterface/altweb/admin/xmpp.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/xmpp.php	2013-01-21 08:25:09 UTC (rev 5918)
+++ branches/1.0/package/webinterface/altweb/admin/xmpp.php	2013-01-21 18:57:32 UTC (rev 5919)
@@ -445,8 +445,10 @@
   if (is_file('/mnt/kd/prosody/sharedgroups.conf')) {
     putHtml('&ndash;');
     putHtml('<input type="submit" value="Edit Groups" name="submit_edit_groups" class="button" />');
-    putHtml('&ndash;');
-    putHtml('<input type="submit" value="Reload" name="submit_reload_groups" class="button" />');
+    if ($xmpp_groups === 'yes') {
+      putHtml('&ndash;');
+      putHtml('<input type="submit" value="Reload" name="submit_reload_groups" class="button" />');
+    }
   }
   putHtml('</td></tr>');
 

Modified: branches/1.0/package/webinterface/altweb/common/status.inc
===================================================================
--- branches/1.0/package/webinterface/altweb/common/status.inc	2013-01-21 08:25:09 UTC (rev 5918)
+++ branches/1.0/package/webinterface/altweb/common/status.inc	2013-01-21 18:57:32 UTC (rev 5919)
@@ -1048,6 +1048,11 @@
     shell($cmd.' >'.$tmpfile, $status);
   
     $ph = @fopen($tmpfile, "r");
+    if (! feof($ph)) {
+      if ($line = rtrim(fgets($ph, 1024))) {
+        putText('Prosody Version: '.$line);
+      }
+    }
     while (! feof($ph)) {
       if ($line = rtrim(fgets($ph, 1024))) {
         putText($line);

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