Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[3915] branches/0.7/package/webinterface/altweb
|
From: <abe...@us...> - 2010-04-09 21:19:05
|
Revision: 3915
http://astlinux.svn.sourceforge.net/astlinux/?rev=3915&view=rev
Author: abelbeck
Date: 2010-04-09 21:18:59 +0000 (Fri, 09 Apr 2010)
Log Message:
-----------
Web interface, version 1.6.17, several new features documented here:
http://lonnie.abelbeck.com/astlinux/altweb-changelog.txt
Modified Paths:
--------------
branches/0.7/package/webinterface/altweb/admin/edit.php
branches/0.7/package/webinterface/altweb/admin/monitor.php
branches/0.7/package/webinterface/altweb/admin/network.php
branches/0.7/package/webinterface/altweb/admin/openvpn.php
branches/0.7/package/webinterface/altweb/admin/prefs.php
branches/0.7/package/webinterface/altweb/admin/voicemail.php
branches/0.7/package/webinterface/altweb/common/insert-wav-inline.php
branches/0.7/package/webinterface/altweb/common/openssl-openvpn.php
branches/0.7/package/webinterface/altweb/common/openssl.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 2010-04-09 21:16:22 UTC (rev 3914)
+++ branches/0.7/package/webinterface/altweb/admin/edit.php 2010-04-09 21:18:59 UTC (rev 3915)
@@ -20,8 +20,9 @@
'iptables' => 'Restart Firewall',
'dnsmasq' => 'Restart DNS & DHCP',
'dynamicdns' => 'Restart Dynamic DNS',
- 'ntpd' => 'Restart NTPd',
- 'racoon' => 'Restart IPsec',
+ 'ntpd' => 'Restart NTP Time',
+ 'msmtp' => 'Restart SMTP Mail',
+ 'racoon' => 'Restart IPsec VPN',
'openvpn' => 'Restart OpenVPN Server',
'openvpnclient' => 'Restart OpenVPN Client',
'asterisk' => 'Restart Asterisk',
@@ -172,6 +173,8 @@
}
} elseif ($process === 'ntpd') {
$result = restartPROCESS($process, 22, $result, 'init');
+ } elseif ($process === 'msmtp') {
+ $result = restartPROCESS($process, 31, $result, 'init');
} elseif ($process === 'racoon') {
$result = restartPROCESS($process, 23, $result, 'init');
} elseif ($process === 'openvpn') {
@@ -260,9 +263,9 @@
} elseif ($result == 11) {
putHtml('<p style="color: green;">Asterisk Modules Reloaded.</p>');
} elseif ($result == 22) {
- putHtml('<p style="color: green;">NTPd has Restarted.</p>');
+ putHtml('<p style="color: green;">NTP Time has Restarted.</p>');
} elseif ($result == 23) {
- putHtml('<p style="color: green;">IPsec has Restarted.</p>');
+ putHtml('<p style="color: green;">IPsec VPN has Restarted.</p>');
} elseif ($result == 24) {
putHtml('<p style="color: green;">OpenVPN Server has Restarted.</p>');
} elseif ($result == 25) {
@@ -277,6 +280,8 @@
putHtml('<p style="color: green;">OpenVPN Client has Restarted.</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 == 99) {
putHtml('<p style="color: red;">Action Failed.</p>');
} elseif ($result == 999) {
Modified: branches/0.7/package/webinterface/altweb/admin/monitor.php
===================================================================
--- branches/0.7/package/webinterface/altweb/admin/monitor.php 2010-04-09 21:16:22 UTC (rev 3914)
+++ branches/0.7/package/webinterface/altweb/admin/monitor.php 2010-04-09 21:18:59 UTC (rev 3915)
@@ -86,7 +86,7 @@
}
header('Location: '.$myself.'?result='.$result);
exit;
-} elseif (isset($_GET['file']) && (getPREFdef($global_prefs, 'monitor_play_inline') !== 'yes')) {
+} elseif (isset($_GET['file']) && (getPREFdef($global_prefs, 'monitor_play_inline') === '')) {
$file = rawurldecode($_GET['file']);
$result = 5;
if (strstr($file, '../') !== FALSE) {
@@ -156,7 +156,8 @@
<?php
$db = parseMONITORfiles($MONITORDIR, $global_user);
- $action = (getPREFdef($global_prefs, 'monitor_play_inline') === 'yes') ? 'Play' : 'Get';
+ $inlineType = getPREFdef($global_prefs, 'monitor_play_inline');
+ $action = ($inlineType !== '') ? 'Play' : 'Get';
$datef = (getPREFdef($global_prefs, 'voicemail_24_hour_format') === 'yes') ? 'Y-m-d H:i' : 'Y-m-d h:ia';
putHtml('<table width="100%" class="datatable">');
@@ -176,7 +177,7 @@
echo '<td style="text-align: center;">';
if (isset($file) && $file === $db['data'][$i]['name']) {
- insertWAVinline($cacheLink);
+ insertWAVinline($cacheLink, $inlineType);
} else {
echo '<a href="'.$myself.'?file='.rawurlencode($db['data'][$i]['name']).'" class="actionText">'.$action.'</a>';
}
Modified: branches/0.7/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/0.7/package/webinterface/altweb/admin/network.php 2010-04-09 21:16:22 UTC (rev 3914)
+++ branches/0.7/package/webinterface/altweb/admin/network.php 2010-04-09 21:18:59 UTC (rev 3915)
@@ -316,6 +316,15 @@
$value = 'HTTPSCERT="'.trim($_POST['https_cert']).'"';
if (isset($_POST['create_cert']) && is_opensslHERE()) {
+ if (($countryName = getPREFdef($global_prefs, 'dn_country_name_cmdstr')) === '') {
+ $countryName = 'US';
+ }
+ if (($stateName = getPREFdef($global_prefs, 'dn_state_name_cmdstr')) === '') {
+ $stateName = 'Nebraska';
+ }
+ if (($localityName = getPREFdef($global_prefs, 'dn_locality_name_cmdstr')) === '') {
+ $localityName = 'Omaha';
+ }
if (($orgName = getPREFdef($global_prefs, 'dn_org_name_cmdstr')) === '') {
if (($orgName = getPREFdef($global_prefs, 'title_name_cmdstr')) === '') {
$orgName = 'AstLinux Management';
@@ -331,7 +340,7 @@
$email = 'in...@as...';
}
$fname = '/mnt/kd/ssl/webinterface.pem';
- if (opensslCREATEhttpsCert($orgName, $orgUnit, $commonName, $email, $fname)) {
+ if (opensslCREATEhttpsCert($countryName, $stateName, $localityName, $orgName, $orgUnit, $commonName, $email, $fname)) {
$value = 'HTTPSCERT="'.$fname.'"';
}
}
@@ -631,6 +640,8 @@
$result = restartPROCESS($process, 21, $result);
} elseif ($process === 'ntpd') {
$result = restartPROCESS($process, 22, $result, 'init');
+ } elseif ($process === 'msmtp') {
+ $result = restartPROCESS($process, 31, $result, 'init');
} elseif ($process === 'racoon') {
$result = restartPROCESS($process, 23, $result, 'init');
} elseif ($process === 'openvpn') {
@@ -687,9 +698,9 @@
} elseif ($result == 21) {
putHtml('<p style="color: green;">PPPoE has Restarted.</p>');
} elseif ($result == 22) {
- putHtml('<p style="color: green;">NTPd has Restarted.</p>');
+ putHtml('<p style="color: green;">NTP Time has Restarted.</p>');
} elseif ($result == 23) {
- putHtml('<p style="color: green;">IPsec has Restarted.</p>');
+ putHtml('<p style="color: green;">IPsec VPN has Restarted.</p>');
} elseif ($result == 24) {
putHtml('<p style="color: green;">OpenVPN Server has Restarted.</p>');
} elseif ($result == 25) {
@@ -702,6 +713,8 @@
putHtml('<p style="color: green;">DNS & DHCP Server has Restarted.</p>');
} elseif ($result == 29) {
putHtml('<p style="color: green;">OpenVPN Client has Restarted.</p>');
+ } elseif ($result == 31) {
+ putHtml('<p style="color: green;">SMTP Mail has Restarted.</p>');
} elseif ($result == 99) {
putHtml('<p style="color: red;">Action Failed.</p>');
} elseif ($result == 100) {
@@ -746,9 +759,11 @@
$sel = ($reboot_restart === 'dynamicdns') ? ' selected="selected"' : '';
putHtml('<option value="dynamicdns"'.$sel.'>Restart Dynamic DNS</option>');
$sel = ($reboot_restart === 'ntpd') ? ' selected="selected"' : '';
- putHtml('<option value="ntpd"'.$sel.'>Restart NTPd</option>');
+ putHtml('<option value="ntpd"'.$sel.'>Restart NTP Time</option>');
+ $sel = ($reboot_restart === 'msmtp') ? ' selected="selected"' : '';
+ putHtml('<option value="msmtp"'.$sel.'>Restart SMTP Mail</option>');
$sel = ($reboot_restart === 'racoon') ? ' selected="selected"' : '';
- putHtml('<option value="racoon"'.$sel.'>Restart IPsec</option>');
+ putHtml('<option value="racoon"'.$sel.'>Restart IPsec VPN</option>');
$sel = ($reboot_restart === 'openvpn') ? ' selected="selected"' : '';
putHtml('<option value="openvpn"'.$sel.'>Restart OpenVPN Server</option>');
$sel = ($reboot_restart === 'openvpnclient') ? ' selected="selected"' : '';
@@ -991,7 +1006,7 @@
putHtml('<tr class="dtrow0"><td colspan="6"> </td></tr>');
putHtml('<tr class="dtrow0"><td class="dialogText" style="text-align: left;" colspan="6">');
- putHtml('<strong>External SMTP Smart Host:</strong>');
+ putHtml('<strong>Outbound SMTP Mail Relay:</strong>');
putHtml('</td></tr>');
putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="3">');
$value = getVARdef($db, 'SMTP_SERVER', $cur_db);
Modified: branches/0.7/package/webinterface/altweb/admin/openvpn.php
===================================================================
--- branches/0.7/package/webinterface/altweb/admin/openvpn.php 2010-04-09 21:16:22 UTC (rev 3914)
+++ branches/0.7/package/webinterface/altweb/admin/openvpn.php 2010-04-09 21:18:59 UTC (rev 3915)
@@ -31,6 +31,15 @@
// System location of gui.network.conf file
$NETCONFFILE = '/mnt/kd/rc.conf.d/gui.network.conf';
+ if (($countryName = getPREFdef($global_prefs, 'dn_country_name_cmdstr')) === '') {
+ $countryName = 'US';
+ }
+ if (($stateName = getPREFdef($global_prefs, 'dn_state_name_cmdstr')) === '') {
+ $stateName = 'Nebraska';
+ }
+ if (($localityName = getPREFdef($global_prefs, 'dn_locality_name_cmdstr')) === '') {
+ $localityName = 'Omaha';
+ }
if (($orgName = getPREFdef($global_prefs, 'dn_org_name_cmdstr')) === '') {
if (($orgName = getPREFdef($global_prefs, 'title_name_cmdstr')) === '') {
$orgName = 'AstLinux Management';
@@ -52,7 +61,7 @@
if (($email = getPREFdef($global_prefs, 'dn_email_address_cmdstr')) === '') {
$email = 'in...@as...';
}
- $ssl = openvpnSETUP($orgName, $orgUnit, $commonName, $email);
+ $ssl = openvpnSETUP($countryName, $stateName, $localityName, $orgName, $orgUnit, $commonName, $email);
return($ssl);
}
$openssl = openvpn_openssl();
Modified: branches/0.7/package/webinterface/altweb/admin/prefs.php
===================================================================
--- branches/0.7/package/webinterface/altweb/admin/prefs.php 2010-04-09 21:16:22 UTC (rev 3914)
+++ branches/0.7/package/webinterface/altweb/admin/prefs.php 2010-04-09 21:18:59 UTC (rev 3915)
@@ -189,8 +189,8 @@
$value = 'voicemail_24_hour_format = yes';
fwrite($fp, $value."\n");
}
- if (isset($_POST['play_inline'])) {
- $value = 'monitor_play_inline = yes';
+ if (($value = $_POST['play_inline']) !== '') {
+ $value = 'monitor_play_inline = "'.$value.'"';
fwrite($fp, $value."\n");
}
@@ -235,6 +235,21 @@
$value = 'system_asterisk_sounds_url = "'.trim($_POST['sounds_url']).'"';
fwrite($fp, $value."\n");
+ if (($value = trim(preg_replace('/[^a-zA-Z]+/', '', $_POST['dn_country_name']))) !== '') {
+ if (strlen($value) == 2) {
+ $value = strtoupper($value);
+ $value = 'dn_country_name_cmdstr = "'.$value.'"';
+ fwrite($fp, $value."\n");
+ }
+ }
+ if (($value = trim(preg_replace('/[^a-zA-Z0-9._ -]+/', '', $_POST['dn_state_name']))) !== '') {
+ $value = 'dn_state_name_cmdstr = "'.$value.'"';
+ fwrite($fp, $value."\n");
+ }
+ if (($value = trim(preg_replace('/[^a-zA-Z0-9._ -]+/', '', $_POST['dn_locality_name']))) !== '') {
+ $value = 'dn_locality_name_cmdstr = "'.$value.'"';
+ fwrite($fp, $value."\n");
+ }
if (($value = trim(preg_replace('/[^a-zA-Z0-9._ -]+/', '', $_POST['dn_org_name']))) !== '') {
$value = 'dn_org_name_cmdstr = "'.$value.'"';
fwrite($fp, $value."\n");
@@ -457,10 +472,17 @@
putHtml('<tr class="dtrow1"><td style="text-align: right;">');
$sel = (getPREFdef($global_prefs, 'voicemail_24_hour_format') === 'yes') ? ' checked="checked"' : '';
putHtml('<input type="checkbox" value="hour_format" name="hour_format"'.$sel.' /></td><td colspan="5">Display 24 Hour Time Format instead of 12 Hour am/pm</td></tr>');
- putHtml('<tr class="dtrow1"><td style="text-align: right;">');
- $sel = (getPREFdef($global_prefs, 'monitor_play_inline') === 'yes') ? ' checked="checked"' : '';
- putHtml('<input type="checkbox" value="play_inline" name="play_inline"'.$sel.' /></td><td colspan="5">Play WAV recordings in browser rather than download</td></tr>');
+ putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="3">Play WAV audio recordings:</td><td colspan="3">');
+ putHtml('<select name="play_inline">');
+ putHtml('<option value="">as download</option>');
+ $sel = (getPREFdef($global_prefs, 'monitor_play_inline') === 'yes') ? ' selected="selected"' : '';
+ putHtml('<option value="yes"'.$sel.'>in HTML4 browser</option>');
+ $sel = (getPREFdef($global_prefs, 'monitor_play_inline') === 'html5') ? ' selected="selected"' : '';
+ putHtml('<option value="html5"'.$sel.'>in HTML5 browser</option>');
+ putHtml('</select>');
+ putHtml('</td></tr>');
+
putHtml('<tr class="dtrow0"><td colspan="6"> </td></tr>');
putHtml('<tr class="dtrow0"><td class="dialogText" style="text-align: left;" colspan="6">');
@@ -709,6 +731,16 @@
putHtml('<tr class="dtrow0"><td class="dialogText" style="text-align: left;" colspan="6">');
putHtml('<strong>Distinguished Name:</strong>');
putHtml('</td></tr>');
+
+ putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="3">Country Name:</td><td colspan="3">');
+ $value = getPREFdef($global_prefs, 'dn_country_name_cmdstr');
+ putHtml('<input type="text" size="4" maxlength="2" value="'.$value.'" name="dn_country_name" /></td></tr>');
+ putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="3">State/Province Name:</td><td colspan="3">');
+ $value = getPREFdef($global_prefs, 'dn_state_name_cmdstr');
+ putHtml('<input type="text" size="28" maxlength="64" value="'.$value.'" name="dn_state_name" /></td></tr>');
+ putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="3">Locality Name:</td><td colspan="3">');
+ $value = getPREFdef($global_prefs, 'dn_locality_name_cmdstr');
+ putHtml('<input type="text" size="28" maxlength="64" value="'.$value.'" name="dn_locality_name" /></td></tr>');
putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="3">Organization Name:</td><td colspan="3">');
$value = getPREFdef($global_prefs, 'dn_org_name_cmdstr');
putHtml('<input type="text" size="28" maxlength="64" value="'.$value.'" name="dn_org_name" /></td></tr>');
Modified: branches/0.7/package/webinterface/altweb/admin/voicemail.php
===================================================================
--- branches/0.7/package/webinterface/altweb/admin/voicemail.php 2010-04-09 21:16:22 UTC (rev 3914)
+++ branches/0.7/package/webinterface/altweb/admin/voicemail.php 2010-04-09 21:18:59 UTC (rev 3915)
@@ -86,10 +86,11 @@
$db['data'][$id]['duration'] = $vm_data['duration'];
$db['data'][$id]['origtime'] = $vm_data['origtime'];
- if (is_file($dir.$value.'.WAV')) {
+ // Give priority to .wav (PCM) over .WAV (GSM)
+ if (is_file($dir.$value.'.wav')) {
+ $db['data'][$id]['suffix'] = '.wav';
+ } elseif (is_file($dir.$value.'.WAV')) {
$db['data'][$id]['suffix'] = '.WAV';
- } elseif (is_file($dir.$value.'.wav')) {
- $db['data'][$id]['suffix'] = '.wav';
} else {
$db['data'][$id]['suffix'] = '';
}
@@ -335,7 +336,7 @@
}
header('Location: '.$myself.'?result='.$result);
exit;
-} elseif (isset($_GET['file']) && (getPREFdef($global_prefs, 'monitor_play_inline') !== 'yes')) {
+} elseif (isset($_GET['file']) && (getPREFdef($global_prefs, 'monitor_play_inline') === '')) {
$file = $_GET['file'];
$result = 5;
if (strstr($file, '../') !== FALSE) {
@@ -405,7 +406,8 @@
<?php
$db = parseVOICEMAILfiles($VOICEMAILDIR, $global_user);
- $action = (getPREFdef($global_prefs, 'monitor_play_inline') === 'yes') ? 'Play' : 'Get';
+ $inlineType = getPREFdef($global_prefs, 'monitor_play_inline');
+ $action = ($inlineType !== '') ? 'Play' : 'Get';
$datef = (getPREFdef($global_prefs, 'voicemail_24_hour_format') === 'yes') ? 'Y-m-d H:i' : 'Y-m-d h:ia';
$context = (getPREFdef($global_prefs, 'voicemail_show_context') === 'yes');
@@ -442,7 +444,7 @@
echo '<td style="text-align: center;">';
if (isset($file) && $file === $path.$data['suffix']) {
- insertWAVinline($cacheLink);
+ insertWAVinline($cacheLink, $inlineType);
} else {
echo ($data['suffix'] === '') ? ' ' : '<a href="'.$myself.'?file='.$path.$data['suffix'].'" class="actionText">'.$action.'</a>';
}
Modified: branches/0.7/package/webinterface/altweb/common/insert-wav-inline.php
===================================================================
--- branches/0.7/package/webinterface/altweb/common/insert-wav-inline.php 2010-04-09 21:16:22 UTC (rev 3914)
+++ branches/0.7/package/webinterface/altweb/common/insert-wav-inline.php 2010-04-09 21:18:59 UTC (rev 3915)
@@ -14,8 +14,11 @@
// Function: insertWAVinline()
//
-function insertWAVinline($wavfile) {
+function insertWAVinline($wavfile, $type) {
+ if ($type === 'html5') {
+ echo '<audio src="'.$wavfile.'" autoplay="autoplay" controls="controls">';
+ }
echo '<object classid="clsid:6BF52A52-394A-11D3-B153-00C04F79FAA6" id="audio" width="150" height="32" type="application/x-oleobject">';
echo '<param name="url" value="'.$wavfile.'" />';
echo '<param name="autostart" value="true" />';
@@ -30,6 +33,9 @@
echo '</object>';
echo '<!-- <![endif]-->';
echo '</object>';
+ if ($type === 'html5') {
+ echo '</audio>';
+ }
}
// Function: unique_string()
Modified: branches/0.7/package/webinterface/altweb/common/openssl-openvpn.php
===================================================================
--- branches/0.7/package/webinterface/altweb/common/openssl-openvpn.php 2010-04-09 21:16:22 UTC (rev 3914)
+++ branches/0.7/package/webinterface/altweb/common/openssl-openvpn.php 2010-04-09 21:18:59 UTC (rev 3915)
@@ -12,7 +12,7 @@
// Function: openvpnSETUP()
//
-function openvpnSETUP($orgName, $orgUnit, $commonName, $email) {
+function openvpnSETUP($countryName, $stateName, $localityName, $orgName, $orgUnit, $commonName, $email) {
// System location of OpenSSL default configuration file
$OPENSSL_CNF = '/usr/lib/ssl/openssl.cnf';
@@ -68,9 +68,9 @@
);
$ssl['dn'] = array(
- 'countryName' => 'US',
- 'stateOrProvinceName' => 'NE',
- 'localityName' => 'Omaha',
+ 'countryName' => $countryName,
+ 'stateOrProvinceName' => $stateName,
+ 'localityName' => $localityName,
'organizationName' => $orgName,
'organizationalUnitName' => $orgUnit,
'commonName' => $commonName,
Modified: branches/0.7/package/webinterface/altweb/common/openssl.php
===================================================================
--- branches/0.7/package/webinterface/altweb/common/openssl.php 2010-04-09 21:16:22 UTC (rev 3914)
+++ branches/0.7/package/webinterface/altweb/common/openssl.php 2010-04-09 21:18:59 UTC (rev 3915)
@@ -145,12 +145,12 @@
// Function: opensslCREATEhttpsCert()
//
-function opensslCREATEhttpsCert($orgName, $orgUnit, $commonName, $email, $fname) {
+function opensslCREATEhttpsCert($countryName, $stateName, $localityName, $orgName, $orgUnit, $commonName, $email, $fname) {
$dn = array(
- 'countryName' => 'US',
- 'stateOrProvinceName' => 'NE',
- 'localityName' => 'Omaha',
+ 'countryName' => $countryName,
+ 'stateOrProvinceName' => $stateName,
+ 'localityName' => $localityName,
'organizationName' => $orgName,
'organizationalUnitName' => $orgUnit,
'commonName' => $commonName,
Modified: branches/0.7/package/webinterface/altweb/common/version.php
===================================================================
--- branches/0.7/package/webinterface/altweb/common/version.php 2010-04-09 21:16:22 UTC (rev 3914)
+++ branches/0.7/package/webinterface/altweb/common/version.php 2010-04-09 21:18:59 UTC (rev 3915)
@@ -1,6 +1,6 @@
<?php
// version.php for AstLinux Alternate Web Interface
-$GUI_VERSION = '1.6.16';
+$GUI_VERSION = '1.6.17';
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
