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

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

Revision: 4738
          http://astlinux.svn.sourceforge.net/astlinux/?rev=4738&view=rev
Author:   abelbeck
Date:     2011-01-23 04:47:51 +0000 (Sun, 23 Jan 2011)

Log Message:
-----------
Web interface, Network tab, add Safe Asterisk support

Modified Paths:
--------------
    branches/0.7/package/webinterface/altweb/admin/edit.php
    branches/0.7/package/webinterface/altweb/admin/network.php
    branches/0.7/package/webinterface/altweb/common/functions.php
    branches/0.7/package/webinterface/altweb/common/version.php

Modified: branches/0.7/package/webinterface/altweb/admin/edit.php
===================================================================
--- branches/0.7/package/webinterface/altweb/admin/edit.php	2011-01-22 23:59:18 UTC (rev 4737)
+++ branches/0.7/package/webinterface/altweb/admin/edit.php	2011-01-23 04:47:51 UTC (rev 4738)
@@ -372,6 +372,10 @@
     $sel = ($file === $openfile) ? ' selected="selected"' : '';
     putHtml('<option value="'.$file.'"'.$sel.'>crontabs/'.basename($file).' - Cron Jobs for root</option>');
   }
+  if (is_writable($file = '/mnt/kd/ast-crash')) {
+    $sel = ($file === $openfile) ? ' selected="selected"' : '';
+    putHtml('<option value="'.$file.'"'.$sel.'>'.basename($file).' - Safe Asterisk Crash Shell Script</option>');
+  }
   foreach (glob('/mnt/kd/rc.*') as $globfile) {
     if ($globfile === '/mnt/kd/rc.local' ||
         $globfile === '/mnt/kd/rc.elocal' ||

Modified: branches/0.7/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/0.7/package/webinterface/altweb/admin/network.php	2011-01-22 23:59:18 UTC (rev 4737)
+++ branches/0.7/package/webinterface/altweb/admin/network.php	2011-01-23 04:47:51 UTC (rev 4738)
@@ -1,6 +1,6 @@
 <?php
 
-// Copyright (C) 2008-2010 Lonnie Abelbeck
+// Copyright (C) 2008-2011 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
@@ -24,6 +24,7 @@
 // 05-11-2009, Added Internal interface DNS/DHCP Menu
 // 03-21-2010, Added SMTP TLS support
 // 10-12-2010, Added IPv6 support
+// 01-22-2011, Added Safe Asterisk
 //
 // System location of rc.conf file
 $CONFFILE = '/etc/rc.conf';
@@ -455,6 +456,14 @@
   $value = 'DDPASS="'.trim($_POST['dd_pass']).'"';
   fwrite($fp, $value."\n");
   
+  fwrite($fp, "### Safe Asterisk\n");
+  $value = 'SAFE_ASTERISK="'.$_POST['safe_asterisk'].'"';
+  fwrite($fp, $value."\n");
+  $value = 'SAFE_ASTERISK_NOTIFY="'.trim($_POST['safe_asterisk_notify']).'"';
+  fwrite($fp, $value."\n");
+  $value = 'SAFE_ASTERISK_NOTIFY_FROM="'.trim($_POST['safe_asterisk_notify_from']).'"';
+  fwrite($fp, $value."\n");
+  
   $value = 'ADNAME=""';
   fwrite($fp, "### Disable Bonjour Broadcasts\n".$value."\n");
   fwrite($fp, "### gui.network.conf - end ###\n");
@@ -1387,6 +1396,25 @@
   putHtml('<tr class="dtrow0"><td colspan="6">&nbsp;</td></tr>');
   
   putHtml('<tr class="dtrow0"><td class="dialogText" style="text-align: left;" colspan="6">');
+  putHtml('<strong>Safe Asterisk:</strong>');
+  putHtml('</td></tr>');
+  putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
+  putHtml('Asterisk Automatic Restart on Crash:');
+  putHtml('<select name="safe_asterisk">');
+  putHtml('<option value="">disabled</option>');
+  $sel = (getVARdef($db, 'SAFE_ASTERISK', $cur_db) === 'yes') ? ' selected="selected"' : '';
+  putHtml('<option value="yes"'.$sel.'>enabled</option>');
+  putHtml('</select></td></tr>');
+  putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
+  $value = getVARdef($db, 'SAFE_ASTERISK_NOTIFY', $cur_db);
+  putHtml('Notify Email Addresses To:<input type="text" size="72" maxlength="256" value="'.$value.'" name="safe_asterisk_notify" /></td></tr>');
+  putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
+  $value = getVARdef($db, 'SAFE_ASTERISK_NOTIFY_FROM', $cur_db);
+  putHtml('Notify Email Address From:<input type="text" size="36" maxlength="128" value="'.$value.'" name="safe_asterisk_notify_from" /></td></tr>');
+  
+  putHtml('<tr class="dtrow0"><td colspan="6">&nbsp;</td></tr>');
+  
+  putHtml('<tr class="dtrow0"><td class="dialogText" style="text-align: left;" colspan="6">');
   putHtml('<strong>Advanced Configuration:</strong>');
   putHtml('</td></tr>');
   putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');

Modified: branches/0.7/package/webinterface/altweb/common/functions.php
===================================================================
--- branches/0.7/package/webinterface/altweb/common/functions.php	2011-01-22 23:59:18 UTC (rev 4737)
+++ branches/0.7/package/webinterface/altweb/common/functions.php	2011-01-23 04:47:51 UTC (rev 4738)
@@ -35,7 +35,7 @@
 
 // Function: restartPROCESS
 //
-function restartPROCESS($process, $ret_good, $ret_fail, $start = 'start', $ret_no = 0) {
+function restartPROCESS($process, $ret_good, $ret_fail, $start = 'start') {
   $result = $ret_fail;
   $path = getenv('PATH');
   $pathOK = ($path !== FALSE && $path !== '');
@@ -48,6 +48,7 @@
   } elseif ($start === 'start') {
     $cmd .= ';/etc/init.d/'.$process.' stop >/dev/null 2>/dev/null';
     $cmd .= ';sleep 1';
+    $cmd .= ';/usr/sbin/gen-rc-conf';
     $cmd .= ';nice -n -10 /etc/init.d/'.$process.' '.$start.' >/dev/null 2>/dev/null';
   } elseif ($process === 'iptables') {
     $cmd .= ';/usr/sbin/gen-rc-conf';

Modified: branches/0.7/package/webinterface/altweb/common/version.php
===================================================================
--- branches/0.7/package/webinterface/altweb/common/version.php	2011-01-22 23:59:18 UTC (rev 4737)
+++ branches/0.7/package/webinterface/altweb/common/version.php	2011-01-23 04:47:51 UTC (rev 4738)
@@ -1,6 +1,6 @@
 <?php
 // version.php for AstLinux Alternate Web Interface
 
-$GUI_VERSION = '1.7.12';
+$GUI_VERSION = '1.7.13';
 
 ?>


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