Menu
▾
▴
astlinux-commits
|
From: <abe...@us...> - 2011-11-04 18:17:04
|
Revision: 5250
http://astlinux.svn.sourceforge.net/astlinux/?rev=5250&view=rev
Author: abelbeck
Date: 2011-11-04 18:16:58 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
web interface, add '/mnt/kd/rc.local.stop' support
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/edit.php
branches/1.0/package/webinterface/altweb/admin/system.php
Modified: branches/1.0/package/webinterface/altweb/admin/edit.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/edit.php 2011-11-04 17:52:57 UTC (rev 5249)
+++ branches/1.0/package/webinterface/altweb/admin/edit.php 2011-11-04 18:16:58 UTC (rev 5250)
@@ -396,11 +396,12 @@
}
foreach (glob('/mnt/kd/rc.*') as $globfile) {
if ($globfile === '/mnt/kd/rc.local' ||
+ $globfile === '/mnt/kd/rc.local.stop' ||
$globfile === '/mnt/kd/rc.elocal' ||
$globfile === '/mnt/kd/rc.ledcontrol') {
if (is_writable($globfile)) {
$sel = ($globfile === $openfile) ? ' selected="selected"' : '';
- putHtml('<option value="'.$globfile.'"'.$sel.'>'.basename($globfile).' - Startup Shell Script</option>');
+ putHtml('<option value="'.$globfile.'"'.$sel.'>'.basename($globfile).' - Startup/Stop Shell Script</option>');
}
}
}
Modified: branches/1.0/package/webinterface/altweb/admin/system.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/system.php 2011-11-04 17:52:57 UTC (rev 5249)
+++ branches/1.0/package/webinterface/altweb/admin/system.php 2011-11-04 18:16:58 UTC (rev 5250)
@@ -173,7 +173,8 @@
$srcfile = '$(ls -1 /mnt/kd/ | sed -n -e "s/^rc.conf.d$/&/p" -e "s/^ssh_keys$/&/p"';
$srcfile .= ' -e "s/^.*[.]conf$/&/p" -e "s/^webgui-prefs.txt$/&/p" -e "s/^ast.*/&/p"';
$srcfile .= ' -e "s/^blocked-hosts$/&/p" -e "s/^dnsmasq.static$/&/p" -e "s/^hosts$/&/p" -e "s/^ethers$/&/p"';
- $srcfile .= ' -e "s/^rc.local$/&/p" -e "s/^rc.elocal$/&/p" -e "s/^rc.ledcontrol$/&/p" -e "s/^crontabs$/&/p"';
+ $srcfile .= ' -e "s/^rc.local$/&/p" -e "s/^rc.local.stop$/&/p" -e "s/^rc.elocal$/&/p" -e "s/^rc.ledcontrol$/&/p"';
+ $srcfile .= ' -e "s/^crontabs$/&/p"';
$srcfile .= ' -e "s/^openvpn$/&/p" -e "s/^ipsec$/&/p" -e "s/^dahdi$/&/p" -e "s/^ssl$/&/p" -e "s/^apcupsd$/&/p")';
$srcfile .= $firewall;
} elseif ($backup_type === 'cdr') {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2012-01-30 19:15:08
|
Revision: 5428
http://astlinux.svn.sourceforge.net/astlinux/?rev=5428&view=rev
Author: abelbeck
Date: 2012-01-30 19:14:56 +0000 (Mon, 30 Jan 2012)
Log Message:
-----------
web interface, add support for testmail via testmail.php Network sub-tab
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/network.php
Added Paths:
-----------
branches/1.0/package/webinterface/altweb/admin/testmail.php
Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php 2012-01-30 18:08:07 UTC (rev 5427)
+++ branches/1.0/package/webinterface/altweb/admin/network.php 2012-01-30 19:14:56 UTC (rev 5428)
@@ -735,6 +735,10 @@
header('Location: /admin/edit.php?file='.$file);
exit;
}
+ } elseif (isset($_POST['submit_test_smtp'])) {
+ $result = saveNETWORKsettings($NETCONFDIR, $NETCONFFILE);
+ header('Location: /admin/testmail.php');
+ exit;
} elseif (isset($_POST['submit_dns_hosts'])) {
$result = saveNETWORKsettings($NETCONFDIR, $NETCONFFILE);
header('Location: /admin/dnshosts.php');
@@ -1260,6 +1264,9 @@
putHtml('<tr class="dtrow0"><td class="dialogText" style="text-align: left;" colspan="6">');
putHtml('<strong>Outbound SMTP Mail Relay:</strong>');
+ if (is_file('/usr/sbin/testmail')) {
+ putHtml(' <input type="submit" value="Test SMTP Mail Relay" name="submit_test_smtp" class="button" />');
+ }
putHtml('</td></tr>');
putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="3">');
$value = getVARdef($db, 'SMTP_SERVER', $cur_db);
Added: branches/1.0/package/webinterface/altweb/admin/testmail.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/testmail.php (rev 0)
+++ branches/1.0/package/webinterface/altweb/admin/testmail.php 2012-01-30 19:14:56 UTC (rev 5428)
@@ -0,0 +1,151 @@
+<?php
+
+// Copyright (C) 2008-2012 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
+// General Public License; and comes with ABSOLUTELY NO WARRANTY.
+
+// testmail.php for AstLinux
+// 01-30-2012
+//
+// System location of gui.network.conf file
+$NETCONFFILE = '/mnt/kd/rc.conf.d/gui.network.conf';
+
+$myself = $_SERVER['PHP_SELF'];
+
+require_once '../common/functions.php';
+
+// Function: putACTIONresult
+//
+function putACTIONresult($result_str, $status) {
+ global $myself;
+
+ if ($status == 0) {
+ $result = 100;
+ } else {
+ $result = 101;
+ }
+ if ($result == 100) {
+ $result_str = 'Test Email has been successfully sent.';
+ } elseif ($result_str === '') {
+ $result_str = 'Error';
+ }
+ header('Location: '.$myself.'?result_str='.rawurlencode($result_str).'&result='.$result);
+}
+
+// Function: getACTIONresult
+//
+function getACTIONresult($result) {
+ $str = 'No Action.';
+
+ if (isset($_GET['result_str'])) {
+ $str = stripslashes(rawurldecode($_GET['result_str']));
+ }
+ if ($result == 100) {
+ $color = 'green';
+ } else {
+ $color = 'red';
+ }
+ return('<p style="color: '.$color.';">'.$str.'</p>');
+}
+
+if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+ $result = 1;
+ if (! $global_admin) {
+ $result = 999;
+ } elseif (isset($_POST['submit_send_email'])) {
+ $to = trim($_POST['to_email']);
+ $from = trim($_POST['from_email']);
+ if ($to !== '') {
+ // Sanitize to and from
+ if (preg_match('/^[a-zA-Z0-9._@-]*$/', $to) && preg_match('/^[a-zA-Z0-9._@-]*$/', $from)) {
+ $result = restartPROCESS('msmtp', 10, 99, 'init');
+ if ($result == 10) {
+ @exec('cd /root;/usr/sbin/testmail "'.$to.'" "'.$from.'" 2>&1', $result_array, $status);
+ $result_str = '';
+ foreach ($result_array as $value) {
+ $result_str .= $value.' ';
+ }
+ putACTIONresult(trim($result_str), $status);
+ exit;
+ }
+ } else {
+ $result = 106;
+ }
+ } else {
+ $result = 105;
+ }
+ }
+ header('Location: '.$myself.'?result='.$result);
+ exit;
+} else { // Start of HTTP GET
+$ACCESS_RIGHTS = 'admin';
+require_once '../common/header.php';
+
+ if (is_file($NETCONFFILE)) {
+ $db = parseRCconf($NETCONFFILE);
+ if (($to_email = getVARdef($db, 'SAFE_ASTERISK_NOTIFY')) === '') {
+ $to_email = getVARdef($db, 'UPS_NOTIFY');
+ }
+ if (($from_email = getVARdef($db, 'SAFE_ASTERISK_NOTIFY_FROM')) === '') {
+ $from_email = getVARdef($db, 'UPS_NOTIFY_FROM');
+ }
+ } else {
+ $to_email = '';
+ $from_email = '';
+ }
+
+ putHtml('<center>');
+ if (isset($_GET['result'])) {
+ $result = $_GET['result'];
+ if ($result == 0) {
+ putHtml('<p style="color: green;">Action Successful.</p>');
+ } elseif ($result == 99) {
+ putHtml('<p style="color: red;">Action Failed.</p>');
+ } elseif ($result == 100 || $result == 101) {
+ putHtml(getACTIONresult($result));
+ } elseif ($result == 105) {
+ putHtml('<p style="color: red;">To Email Address is missing.</p>');
+ } elseif ($result == 106) {
+ putHtml('<p style="color: red;">Invalid Email Address.</p>');
+ } elseif ($result == 999) {
+ putHtml('<p style="color: red;">Permission denied for user "'.$global_user.'".</p>');
+ } else {
+ putHtml('<p> </p>');
+ }
+ } else {
+ putHtml('<p> </p>');
+ }
+ putHtml('</center>');
+?>
+ <center>
+ <table class="layout"><tr><td><center>
+ <form method="post" action="<?php echo $myself;?>">
+ <table width="100%" class="stdtable">
+ <tr><td style="text-align: center;" colspan="3">
+ <h2>Test SMTP Mail Relay:</h2>
+ </td></tr>
+ </table>
+<?php
+ putHtml('<table class="stdtable">');
+ putHtml('<tr><td class="dialogText" style="text-align: right;">');
+ putHtml('To Email <i>(Required)</i>:<input type="text" size="42" maxlength="128" name="to_email" value="'.$to_email.'" />');
+ putHtml('</td></tr>');
+ putHtml('<tr><td class="dialogText" style="text-align: right;">');
+ putHtml('From Email <i>(Optional)</i>:<input type="text" size="42" maxlength="128" name="from_email" value="'.$from_email.'" />');
+ putHtml('</td></tr>');
+
+ putHtml('<tr><td class="dialogText" style="text-align: center;">');
+ putHtml('<br />');
+ putHtml('<input type="submit" value="Send Test Email" name="submit_send_email" />');
+ putHtml('</td></tr>');
+ putHtml('</table>');
+
+ putHtml("</form>");
+ putHtml("</center></td></tr></table>");
+ putHtml("</center>");
+} // End of HTTP GET
+require_once '../common/footer.php';
+
+?>
Property changes on: branches/1.0/package/webinterface/altweb/admin/testmail.php
___________________________________________________________________
Added: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2012-02-22 20:57:51
|
Revision: 5465
http://astlinux.svn.sourceforge.net/astlinux/?rev=5465&view=rev
Author: abelbeck
Date: 2012-02-22 20:57:45 +0000 (Wed, 22 Feb 2012)
Log Message:
-----------
web interface, Prefs tab and Speed Dial tab, add support for '00 to 999' digits
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/prefs.php
branches/1.0/package/webinterface/altweb/admin/sysdial.php
Modified: branches/1.0/package/webinterface/altweb/admin/prefs.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/prefs.php 2012-02-21 22:47:00 UTC (rev 5464)
+++ branches/1.0/package/webinterface/altweb/admin/prefs.php 2012-02-22 20:57:45 UTC (rev 5465)
@@ -685,6 +685,10 @@
$sel = ($i == $value) ? ' selected="selected"' : '';
putHtml('<option value="'.$i.'"'.$sel.'>00 to '.$j.'</option>');
}
+ $i = 1000;
+ $j = 999;
+ $sel = ($i == $value) ? ' selected="selected"' : '';
+ putHtml('<option value="'.$i.'"'.$sel.'>00 to '.$j.'</option>');
putHtml('</select>');
putHtml('</td></tr>');
Modified: branches/1.0/package/webinterface/altweb/admin/sysdial.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/sysdial.php 2012-02-21 22:47:00 UTC (rev 5464)
+++ branches/1.0/package/webinterface/altweb/admin/sysdial.php 2012-02-22 20:57:45 UTC (rev 5465)
@@ -1,6 +1,6 @@
<?php
-// Copyright (C) 2008 Lonnie Abelbeck
+// Copyright (C) 2008-2012 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
@@ -9,6 +9,7 @@
// sysdial.php for AstLinux
// 03-24-2008
// 04-12-2008, Added Extension Prefix
+// 02-22-2012, Added 00-999 format
//
// -- extensions.conf snippet --
// exten => _11[01234]X,1,Macro(dial-sysdial,${EXTEN:2:2}) ; DB: sysdial/00-49
@@ -45,9 +46,10 @@
} elseif (isset($_POST['submit_add'])) {
$speeddial = trim($_POST['speeddial']);
$speeddialname = trim($_POST['speeddialname']);
+ $ext_1x00 = (isset($_POST['ext_1x00'])) ? $_POST['ext_1x00'] : '';
$ext_11x0 = $_POST['ext_11x0'];
$ext_110x = $_POST['ext_110x'];
- $value = $ext_11x0.$ext_110x;
+ $value = $ext_1x00.$ext_11x0.$ext_110x;
if (strlen($speeddial) > 0) {
if (putAstDB($family, $value, $speeddial) == 0) {
$result = 0;
@@ -80,13 +82,21 @@
$db = parseAstDB($family);
$dbname = parseAstDB($familyname);
+ // Sort by Number
if (($n = count($db['data'])) > 0) {
+ foreach ($db['data'] as $key => $row) {
+ $number[$key] = '1'.$row['key']; // Use leading '1' to not ignore leading 0's
+ }
+ array_multisort($number, SORT_ASC, SORT_NUMERIC, $db['data']);
+ }
+
+ if (($n = count($db['data'])) > 0) {
for ($i = 0; $i < $n; $i++) {
$key = $db['data'][$i]['key'];
$name = '';
if (($m = count($dbname['data'])) > 0) {
for ($j = 0; $j < $m; $j++) {
- if ($dbname['data'][$j]['key'] == $key) {
+ if ($dbname['data'][$j]['key'] === $key) {
$name = $dbname['data'][$j]['value'];
break;
}
@@ -126,16 +136,29 @@
putHtml('<input type="submit" class="formbtn" value="Save Changes" name="submit_add" />');
putHtml('</td><td class="dialogText" style="text-align: center;">');
echo('Ext: '.$ext_prefix.' ');
+ if ($ext_digits > 100) {
+ putHtml('<select name="ext_1x00">');
+ putHtml('<option value=""> </option>');
+ $digits = ($ext_digits > 1000) ? 10 : ($ext_digits / 100);
+ $key = (strlen($ldb['key']) >= 3) ? ($ldb['key'] / 100) % 10 : -1;
+ for ($i = 0; $i < $digits; $i++) {
+ $sel = ($i == $key) ? ' selected="selected"' : '';
+ putHtml('<option value="'.$i.'"'.$sel.'>'.$i.'</option>');
+ }
+ putHtml('</select>');
+ }
putHtml('<select name="ext_11x0">');
+ $digits = ($ext_digits > 100) ? 10 : ($ext_digits / 10);
$key = ($ldb['key'] / 10) % 10;
- for ($i = 0; $i < ($ext_digits / 10); $i++) {
+ for ($i = 0; $i < $digits; $i++) {
$sel = ($i == $key) ? ' selected="selected"' : '';
putHtml('<option value="'.$i.'"'.$sel.'>'.$i.'</option>');
}
putHtml('</select>');
putHtml('<select name="ext_110x">');
+ $digits = 10;
$key = $ldb['key'] % 10;
- for ($i = 0; $i < 10; $i++) {
+ for ($i = 0; $i < $digits; $i++) {
$sel = ($i == $key) ? ' selected="selected"' : '';
putHtml('<option value="'.$i.'"'.$sel.'>'.$i.'</option>');
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2012-09-02 00:30:38
|
Revision: 5656
http://astlinux.svn.sourceforge.net/astlinux/?rev=5656&view=rev
Author: abelbeck
Date: 2012-09-02 00:30:32 +0000 (Sun, 02 Sep 2012)
Log Message:
-----------
web interface, allow Zabbix logs to be viewed from the System tab
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/system.php
branches/1.0/package/webinterface/altweb/admin/zabbix.php
Modified: branches/1.0/package/webinterface/altweb/admin/system.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/system.php 2012-09-01 19:17:59 UTC (rev 5655)
+++ branches/1.0/package/webinterface/altweb/admin/system.php 2012-09-02 00:30:32 UTC (rev 5656)
@@ -538,6 +538,12 @@
if (is_file($file = '/var/log/openvpnclient.log')) {
putHtml('<option value="'.$file.'">OpenVPN Client log</option>');
}
+ if (is_file($file = '/var/log/zabbix_agentd.log')) {
+ putHtml('<option value="'.$file.'">Zabbix Agent log</option>');
+ }
+ if (is_file($file = '/var/log/zabbix_proxy.log')) {
+ putHtml('<option value="'.$file.'">Zabbix Proxy log</option>');
+ }
if (is_file($file = '/stat/etc/rc.conf')) {
putHtml('<option value="'.$file.'">Default System Variables</option>');
}
Modified: branches/1.0/package/webinterface/altweb/admin/zabbix.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/zabbix.php 2012-09-01 19:17:59 UTC (rev 5655)
+++ branches/1.0/package/webinterface/altweb/admin/zabbix.php 2012-09-02 00:30:32 UTC (rev 5656)
@@ -145,7 +145,7 @@
} elseif ($result == 10) {
putHtml('<p style="color: green;">Zabbix Monitoring has Restarted.</p>');
} elseif ($result == 11) {
- putHtml('<p style="color: green;">Settings saved, click "Restart Client" to apply any changed settings.</p>');
+ putHtml('<p style="color: green;">Settings saved, click "Restart Zabbix" to apply any changed settings.</p>');
} elseif ($result == 99) {
putHtml('<p style="color: red;">Action Failed.</p>');
} elseif ($result == 999) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2012-09-04 21:28:15
|
Revision: 5663
http://astlinux.svn.sourceforge.net/astlinux/?rev=5663&view=rev
Author: abelbeck
Date: 2012-09-04 21:28:09 +0000 (Tue, 04 Sep 2012)
Log Message:
-----------
web interface, Network and Edit tabs allow Stunnel Proxy to be Restarted
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/edit.php
branches/1.0/package/webinterface/altweb/admin/network.php
Modified: branches/1.0/package/webinterface/altweb/admin/edit.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/edit.php 2012-09-04 03:18:06 UTC (rev 5662)
+++ branches/1.0/package/webinterface/altweb/admin/edit.php 2012-09-04 21:28:09 UTC (rev 5663)
@@ -27,6 +27,7 @@
'openvpnclient' => 'Restart OpenVPN Client',
'racoon' => 'Restart IPsec VPN',
'pptpd' => 'Restart PPTP VPN Server',
+ 'stunnel' => 'Restart Stunnel Proxy',
'miniupnpd' => 'Restart Univ. Plug\'n\'Play',
'apcupsd' => 'Restart UPS Daemon',
'zabbix' => 'Restart Zabbix Monitor',
@@ -206,6 +207,8 @@
$result = restartPROCESS($process, 35, $result, 'init');
} elseif ($process === 'zabbix') {
$result = restartPROCESS($process, 36, $result, 'init', 4);
+ } elseif ($process === 'stunnel') {
+ $result = restartPROCESS($process, 37, $result, 'init');
} elseif ($process === 'cron') {
$result = updateCRON('root', 30, $result);
}
@@ -313,6 +316,8 @@
putHtml('<p style="color: green;">UPS Daemon has Restarted.</p>');
} elseif ($result == 36) {
putHtml('<p style="color: green;">Zabbix Monitoring has Restarted.</p>');
+ } elseif ($result == 37) {
+ putHtml('<p style="color: green;">Stunnel Proxy has Restarted.</p>');
} elseif ($result == 99) {
putHtml('<p style="color: red;">Action Failed.</p>');
} elseif ($result == 999) {
Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php 2012-09-04 03:18:06 UTC (rev 5662)
+++ branches/1.0/package/webinterface/altweb/admin/network.php 2012-09-04 21:28:09 UTC (rev 5663)
@@ -876,6 +876,8 @@
$result = restartPROCESS($process, 35, $result, 'init');
} elseif ($process === 'zabbix') {
$result = restartPROCESS($process, 36, $result, 'init', 4);
+ } elseif ($process === 'stunnel') {
+ $result = restartPROCESS($process, 37, $result, 'init');
}
} else {
$result = 2;
@@ -946,6 +948,8 @@
putHtml('<p style="color: green;">UPS Daemon has Restarted.</p>');
} elseif ($result == 36) {
putHtml('<p style="color: green;">Zabbix Monitoring has Restarted.</p>');
+ } elseif ($result == 37) {
+ putHtml('<p style="color: green;">Stunnel Proxy has Restarted.</p>');
} elseif ($result == 99) {
putHtml('<p style="color: red;">Action Failed.</p>');
} elseif ($result == 100) {
@@ -1021,6 +1025,8 @@
putHtml('<option value="racoon"'.$sel.'>Restart IPsec VPN</option>');
$sel = ($reboot_restart === 'pptpd') ? ' selected="selected"' : '';
putHtml('<option value="pptpd"'.$sel.'>Restart PPTP VPN Server</option>');
+ $sel = ($reboot_restart === 'stunnel') ? ' selected="selected"' : '';
+ putHtml('<option value="stunnel"'.$sel.'>Restart Stunnel Proxy</option>');
$sel = ($reboot_restart === 'miniupnpd') ? ' selected="selected"' : '';
putHtml('<option value="miniupnpd"'.$sel.'>Restart Univ. Plug\'n\'Play</option>');
$sel = ($reboot_restart === 'apcupsd') ? ' selected="selected"' : '';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-02-13 20:46:19
|
Revision: 5953
http://astlinux.svn.sourceforge.net/astlinux/?rev=5953&view=rev
Author: abelbeck
Date: 2013-02-13 20:46:08 +0000 (Wed, 13 Feb 2013)
Log Message:
-----------
web interface, OpenVPN Server and OpenVPN Client sub-tabs, add OpenVPN 2.3 IPv6 support
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/openvpn.php
branches/1.0/package/webinterface/altweb/admin/openvpnclient.php
Modified: branches/1.0/package/webinterface/altweb/admin/openvpn.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/openvpn.php 2013-02-12 20:16:52 UTC (rev 5952)
+++ branches/1.0/package/webinterface/altweb/admin/openvpn.php 2013-02-13 20:46:08 UTC (rev 5953)
@@ -12,6 +12,7 @@
// 02-06-2009, Added tls-verify, temporarily disable clients
// 08-13-2010, Added QoS Passthrough, setting passtos
// 01-03-2013, Added private keysize support
+// 02-13-2013, Added OpenVPN 2.3 IPv6 support
//
// System location of /mnt/kd/rc.conf.d directory
$OVPNCONFDIR = '/mnt/kd/rc.conf.d';
@@ -100,11 +101,25 @@
'yes' => 'Cert. + User/Pass'
);
+$protocol_menu = array (
+ 'udp' => 'UDP v4',
+ 'tcp-server' => 'TCP v4',
+ 'udp6' => 'UDP v4/v6',
+ 'tcp6-server' => 'TCP v4/v6'
+);
+
$key_size_menu = array (
'1024' => '1024 Bits',
'2048' => '2048 Bits'
);
+$topology_menu = array (
+ '' => 'Default Topology',
+ 'net30' => '[net30] older, OpenVPN 2.0 default',
+ 'p2p' => '[p2p] point-to-point, no Windows clients',
+ 'subnet' => '[subnet] latest, requires OpenVPN 2.1+ clients'
+);
+
// Function: saveOVPNsettings
//
function saveOVPNsettings($conf_dir, $conf_file, $disabled = NULL) {
@@ -148,8 +163,14 @@
fwrite($fp, "### Allowed External Hosts\n".$value."\n");
$value = 'OVPN_SERVER="'.trim($_POST['server']).'"';
- fwrite($fp, "### Server Network\n".$value."\n");
+ fwrite($fp, "### Server IPv4 Network\n".$value."\n");
+ $value = 'OVPN_SERVERV6="'.trim($_POST['serverv6']).'"';
+ fwrite($fp, "### Server IPv6 Network\n".$value."\n");
+
+ $value = 'OVPN_TOPOLOGY="'.$_POST['topology'].'"';
+ fwrite($fp, "### Topology\n".$value."\n");
+
$value = 'OVPN_PUSH="';
fwrite($fp, "### Server Push\n".$value."\n");
$value = stripslashes($_POST['push']);
@@ -447,11 +468,12 @@
putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
putHtml('Protocol:');
putHtml('</td><td style="text-align: left;" colspan="1">');
+ $protocol = getVARdef($db, 'OVPN_PROTOCOL');
putHtml('<select name="protocol">');
- $sel = (getVARdef($db, 'OVPN_PROTOCOL') === 'udp') ? ' selected="selected"' : '';
- putHtml('<option value="udp"'.$sel.'>UDP</option>');
- $sel = (getVARdef($db, 'OVPN_PROTOCOL') === 'tcp-server') ? ' selected="selected"' : '';
- putHtml('<option value="tcp-server"'.$sel.'>TCP</option>');
+ foreach ($protocol_menu as $key => $value) {
+ $sel = ($protocol === $key) ? ' selected="selected"' : '';
+ putHtml('<option value="'.$key.'"'.$sel.'>'.$value.'</option>');
+ }
putHtml('</select>');
putHtml('</td><td style="text-align: right;" colspan="1">');
putHtml('Port:');
@@ -546,14 +568,35 @@
putHtml('<tr class="dtrow0"><td class="dialogText" style="text-align: left;" colspan="6">');
putHtml('<strong>Server Mode:</strong>');
putHtml('</td></tr>');
- putHtml('<tr class="dtrow1"><td style="text-align: right;">');
- putHtml('Network:');
- putHtml('</td><td style="text-align: left;" colspan="5">');
+
+ putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
+ putHtml('Network IPv4 NM:');
+ putHtml('</td><td style="text-align: left;" colspan="4">');
if (($value = getVARdef($db, 'OVPN_SERVER')) === '') {
$value = '10.8.0.0 255.255.255.0';
}
putHtml('<input type="text" size="48" maxlength="128" value="'.$value.'" name="server" />');
putHtml('</td></tr>');
+
+ putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
+ putHtml('Network IPv6/nn:');
+ putHtml('</td><td style="text-align: left;" colspan="4">');
+ $value = getVARdef($db, 'OVPN_SERVERV6');
+ putHtml('<input type="text" size="48" maxlength="128" value="'.$value.'" name="serverv6" />');
+ putHtml('</td></tr>');
+
+ putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
+ putHtml('Topology:');
+ putHtml('</td><td style="text-align: left;" colspan="4">');
+ $topology = getVARdef($db, 'OVPN_TOPOLOGY');
+ putHtml('<select name="topology">');
+ foreach ($topology_menu as $key => $value) {
+ $sel = ($topology === $key) ? ' selected="selected"' : '';
+ putHtml('<option value="'.$key.'"'.$sel.'>'.$value.'</option>');
+ }
+ putHtml('</select>');
+ putHtml('</td></tr>');
+
putHtml('<tr class="dtrow1"><td style="text-align: right;">');
putHtml('"push":');
putHtml('</td><td style="text-align: left;" colspan="5">');
Modified: branches/1.0/package/webinterface/altweb/admin/openvpnclient.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/openvpnclient.php 2013-02-12 20:16:52 UTC (rev 5952)
+++ branches/1.0/package/webinterface/altweb/admin/openvpnclient.php 2013-02-13 20:46:08 UTC (rev 5953)
@@ -1,6 +1,6 @@
<?php
-// Copyright (C) 2008-2009 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
@@ -9,6 +9,7 @@
// openvpnclient.php for AstLinux
// 04-15-2009
// 08-13-2010, Added QoS Passthrough, setting passtos
+// 02-13-2013, Added OpenVPN 2.3 IPv6 support
//
// System location of /mnt/kd/rc.conf.d directory
$OVPNCONFDIR = '/mnt/kd/rc.conf.d';
@@ -23,6 +24,13 @@
$openssl = openvpnclientSETUP();
+$protocol_menu = array (
+ 'udp' => 'UDP v4',
+ 'tcp-client' => 'TCP v4',
+ 'udp6' => 'UDP v6',
+ 'tcp6-client' => 'TCP v6'
+);
+
$cipher_menu = array (
'' => 'Default Cipher',
'BF-CBC' => 'BF-CBC',
@@ -254,11 +262,12 @@
putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
putHtml('Protocol:');
putHtml('</td><td style="text-align: left;" colspan="1">');
+ $protocol = getVARdef($db, 'OVPNC_PROTOCOL');
putHtml('<select name="protocol">');
- $sel = (getVARdef($db, 'OVPNC_PROTOCOL') === 'udp') ? ' selected="selected"' : '';
- putHtml('<option value="udp"'.$sel.'>UDP</option>');
- $sel = (getVARdef($db, 'OVPNC_PROTOCOL') === 'tcp-client') ? ' selected="selected"' : '';
- putHtml('<option value="tcp-client"'.$sel.'>TCP</option>');
+ foreach ($protocol_menu as $key => $value) {
+ $sel = ($protocol === $key) ? ' selected="selected"' : '';
+ putHtml('<option value="'.$key.'"'.$sel.'>'.$value.'</option>');
+ }
putHtml('</select>');
putHtml('</td><td style="text-align: right;" colspan="1">');
putHtml('Port:');
@@ -349,13 +358,13 @@
putHtml('<strong>Client Mode:</strong>');
putHtml('</td></tr>');
putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
- putHtml('Remote Server:');
+ putHtml('Remote Server Hostname:');
putHtml('</td><td style="text-align: left;" colspan="4">');
$value = getVARdef($db, 'OVPNC_REMOTE');
putHtml('<input type="text" size="32" maxlength="128" value="'.$value.'" name="remote" />');
putHtml('</td></tr>');
putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
- putHtml('Remote Network:');
+ putHtml('Remote Network IPv4 NM:');
putHtml('</td><td style="text-align: left;" colspan="4">');
if (($value = getVARdef($db, 'OVPNC_SERVER')) === '') {
$value = '10.8.0.0 255.255.255.0';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-02-18 21:58:47
|
Revision: 5961
http://astlinux.svn.sourceforge.net/astlinux/?rev=5961&view=rev
Author: abelbeck
Date: 2013-02-18 21:58:39 +0000 (Mon, 18 Feb 2013)
Log Message:
-----------
web interface, add OpenVPN Server and Client sub-tab support for Auth HMAC, and Edit tab support for '/mnt/kd/openvpn/ccd/' files
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/edit.php
branches/1.0/package/webinterface/altweb/admin/openvpn.php
branches/1.0/package/webinterface/altweb/admin/openvpnclient.php
Modified: branches/1.0/package/webinterface/altweb/admin/edit.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/edit.php 2013-02-18 19:57:20 UTC (rev 5960)
+++ branches/1.0/package/webinterface/altweb/admin/edit.php 2013-02-18 21:58:39 UTC (rev 5961)
@@ -9,6 +9,7 @@
// edit.php for AstLinux
// 04-28-2008
// 12-04-2008, Added Reload/Restart Menu
+// 02-18-2013, Added OpenVPN Client Config editing
//
$myself = $_SERVER['PHP_SELF'];
@@ -248,6 +249,7 @@
if ($dir === '/mnt/kd' ||
$dir === '/mnt/kd/dahdi' ||
$dir === '/mnt/kd/openvpn' ||
+ $dir === '/mnt/kd/openvpn/ccd' ||
$dir === '/mnt/kd/rc.conf.d' ||
$dir === '/mnt/kd/crontabs' ||
$dir === '/mnt/kd/apcupsd' ||
@@ -470,10 +472,20 @@
putHtml('<option value="'.$file.'"'.$sel.'>prosody/'.basename($file).' - XMPP Shared Groups</option>');
}
putHtml('</optgroup>');
- if (is_dir('/mnt/kd/docs')) {
+ if (is_dir('/mnt/kd/openvpn/ccd') && count($globfiles = glob('/mnt/kd/openvpn/ccd/*')) > 0) {
+ putHtml('<optgroup label="———— OpenVPN Client Configs ————">');
+ foreach ($globfiles as $globfile) {
+ if (is_file($globfile) && is_writable($globfile)) {
+ $sel = ($globfile === $openfile) ? ' selected="selected"' : '';
+ putHtml('<option value="'.$globfile.'"'.$sel.'>'.basename($globfile).' - X509 CN of OpenVPN Client</option>');
+ }
+ }
+ putHtml('</optgroup>');
+ }
+ if (is_dir('/mnt/kd/docs') && count($globfiles = glob('/mnt/kd/docs/*')) > 0) {
putHtml('<optgroup label="———— Documentation ————">');
- foreach (glob('/mnt/kd/docs/*') as $globfile) {
- if (is_writable($globfile)) {
+ foreach ($globfiles as $globfile) {
+ if (is_file($globfile) && is_writable($globfile)) {
$sel = ($globfile === $openfile) ? ' selected="selected"' : '';
putHtml('<option value="'.$globfile.'"'.$sel.'>'.basename($globfile).' - /mnt/kd/docs/ File</option>');
}
Modified: branches/1.0/package/webinterface/altweb/admin/openvpn.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/openvpn.php 2013-02-18 19:57:20 UTC (rev 5960)
+++ branches/1.0/package/webinterface/altweb/admin/openvpn.php 2013-02-18 21:58:39 UTC (rev 5961)
@@ -82,13 +82,19 @@
$openssl = openvpn_openssl($key_size);
$cipher_menu = array (
- '' => 'Default Cipher',
+ '' => 'Use Default',
'BF-CBC' => 'BF-CBC',
'AES-128-CBC' => 'AES-128-CBC',
'AES-192-CBC' => 'AES-192-CBC',
'AES-256-CBC' => 'AES-256-CBC'
);
+$auth_hmac_menu = array (
+ '' => 'Use Default',
+ 'SHA1' => 'SHA1',
+ 'SHA256' => 'SHA256'
+);
+
$verbosity_menu = array (
'1' => 'Low',
'3' => 'Medium',
@@ -114,7 +120,7 @@
);
$topology_menu = array (
- '' => 'Default Topology',
+ '' => 'Use Default',
'net30' => '[net30] older, OpenVPN 2.0 default',
'p2p' => '[p2p] point-to-point, no Windows clients',
'subnet' => '[subnet] latest, requires OpenVPN 2.1+ clients'
@@ -178,6 +184,9 @@
$value = 'OVPN_CIPHER="'.$_POST['cipher_menu'].'"';
fwrite($fp, "### Cipher\n".$value."\n");
+ $value = 'OVPN_AUTH="'.$_POST['auth_hmac'].'"';
+ fwrite($fp, "### Auth HMAC\n".$value."\n");
+
$value = 'OVPN_TUNNEL_HOSTS="'.trim($_POST['tunnel_external_hosts']).'"';
fwrite($fp, "### Allowed External Hosts\n".$value."\n");
@@ -339,6 +348,9 @@
if (($cipher = getVARdef($db, 'OVPN_CIPHER')) !== '') {
$str .= "cipher $cipher\n";
}
+ if (($auth_hmac = getVARdef($db, 'OVPN_AUTH')) !== '') {
+ $str .= "auth $auth_hmac\n";
+ }
if ($ta_file !== '') {
$str .= "key-direction 1\n";
}
@@ -622,13 +634,23 @@
putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
putHtml('Device:');
- putHtml('</td><td style="text-align: left;" colspan="4">');
+ putHtml('</td><td style="text-align: left;" colspan="1">');
putHtml('<select name="device">');
$sel = (getVARdef($db, 'OVPN_DEV') === 'tun0') ? ' selected="selected"' : '';
putHtml('<option value="tun0"'.$sel.'>tun0</option>');
$sel = (getVARdef($db, 'OVPN_DEV') === 'tun1') ? ' selected="selected"' : '';
putHtml('<option value="tun1"'.$sel.'>tun1</option>');
putHtml('</select>');
+ putHtml('</td><td style="text-align: right;" colspan="1">');
+ putHtml('Auth HMAC:');
+ putHtml('</td><td style="text-align: left;" colspan="2">');
+ $auth_hmac = getVARdef($db, 'OVPN_AUTH');
+ putHtml('<select name="auth_hmac">');
+ foreach ($auth_hmac_menu as $key => $value) {
+ $sel = ($auth_hmac === $key) ? ' selected="selected"' : '';
+ putHtml('<option value="'.$key.'"'.$sel.'>'.$value.'</option>');
+ }
+ putHtml('</select>');
putHtml('</td></tr>');
putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
Modified: branches/1.0/package/webinterface/altweb/admin/openvpnclient.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/openvpnclient.php 2013-02-18 19:57:20 UTC (rev 5960)
+++ branches/1.0/package/webinterface/altweb/admin/openvpnclient.php 2013-02-18 21:58:39 UTC (rev 5961)
@@ -32,13 +32,19 @@
);
$cipher_menu = array (
- '' => 'Default Cipher',
+ '' => 'Use Default',
'BF-CBC' => 'BF-CBC',
'AES-128-CBC' => 'AES-128-CBC',
'AES-192-CBC' => 'AES-192-CBC',
'AES-256-CBC' => 'AES-256-CBC'
);
+$auth_hmac_menu = array (
+ '' => 'Use Default',
+ 'SHA1' => 'SHA1',
+ 'SHA256' => 'SHA256'
+);
+
$nscerttype_menu = array (
'' => 'No',
'server' => 'Server'
@@ -86,6 +92,9 @@
$value = 'OVPNC_CIPHER="'.$_POST['cipher_menu'].'"';
fwrite($fp, "### Cipher\n".$value."\n");
+
+ $value = 'OVPNC_AUTH="'.$_POST['auth_hmac'].'"';
+ fwrite($fp, "### Auth HMAC\n".$value."\n");
$value = 'OVPNC_NSCERTTYPE="'.$_POST['nscerttype'].'"';
fwrite($fp, "### nsCertType\n".$value."\n");
@@ -333,13 +342,23 @@
putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
putHtml('Device:');
- putHtml('</td><td style="text-align: left;" colspan="4">');
+ putHtml('</td><td style="text-align: left;" colspan="1">');
putHtml('<select name="device">');
$sel = (getVARdef($db, 'OVPNC_DEV') === 'tun2') ? ' selected="selected"' : '';
putHtml('<option value="tun2"'.$sel.'>tun2</option>');
$sel = (getVARdef($db, 'OVPNC_DEV') === 'tun3') ? ' selected="selected"' : '';
putHtml('<option value="tun3"'.$sel.'>tun3</option>');
putHtml('</select>');
+ putHtml('</td><td style="text-align: right;" colspan="1">');
+ putHtml('Auth HMAC:');
+ putHtml('</td><td style="text-align: left;" colspan="2">');
+ $auth_hmac = getVARdef($db, 'OVPNC_AUTH');
+ putHtml('<select name="auth_hmac">');
+ foreach ($auth_hmac_menu as $key => $value) {
+ $sel = ($auth_hmac === $key) ? ' selected="selected"' : '';
+ putHtml('<option value="'.$key.'"'.$sel.'>'.$value.'</option>');
+ }
+ putHtml('</select>');
putHtml('</td></tr>');
putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-02-24 02:39:44
|
Revision: 5966
http://astlinux.svn.sourceforge.net/astlinux/?rev=5966&view=rev
Author: abelbeck
Date: 2013-02-24 02:39:36 +0000 (Sun, 24 Feb 2013)
Log Message:
-----------
web interface, OpenVPN Client, add support for User/Pass
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/firewall.php
branches/1.0/package/webinterface/altweb/admin/openvpnclient.php
branches/1.0/package/webinterface/altweb/admin/system.php
Modified: branches/1.0/package/webinterface/altweb/admin/firewall.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/firewall.php 2013-02-23 21:26:30 UTC (rev 5965)
+++ branches/1.0/package/webinterface/altweb/admin/firewall.php 2013-02-24 02:39:36 UTC (rev 5966)
@@ -823,9 +823,11 @@
putHtml('Port:<input type="text" size="18" maxlength="64" name="d_lport" value="'.$ldb['d_lport'].'" />');
putHtml('– <input type="text" size="6" maxlength="5" name="d_uport" value="'.$ldb['d_uport'].'" />');
putHtml('</td></tr>');
- putHtml('<tr><td id="nat_ext" class="dialogText" style="visibility: hidden;">');
+ putHtml('<tr><td class="dialogText">');
+ putHtml('<div id="nat_ext" style="visibility: hidden;">');
putHtml('NAT EXT:');
putHtml('<input type="text" size="16" maxlength="18" name="e_addr" value="'.$ldb['e_addr'].'" />');
+ putHtml('</div>');
putHtml('</td><td colspan="2" class="dialogText" style="text-align: right;">');
putHtml('Comment <i>(optional)</i>:<input type="text" size="64" maxlength="64" name="comment" value="'.htmlspecialchars($ldb['comment']).'" />');
putHtml('</td></tr>');
Modified: branches/1.0/package/webinterface/altweb/admin/openvpnclient.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/openvpnclient.php 2013-02-23 21:26:30 UTC (rev 5965)
+++ branches/1.0/package/webinterface/altweb/admin/openvpnclient.php 2013-02-24 02:39:36 UTC (rev 5966)
@@ -10,6 +10,7 @@
// 04-15-2009
// 08-13-2010, Added QoS Passthrough, setting passtos
// 02-13-2013, Added OpenVPN 2.3 IPv6 support
+// 02-23-2013, Added User/Pass support
//
// System location of /mnt/kd/rc.conf.d directory
$OVPNCONFDIR = '/mnt/kd/rc.conf.d';
@@ -24,6 +25,11 @@
$openssl = openvpnclientSETUP();
+$auth_method_menu = array (
+ '' => 'Certificate',
+ 'yes' => 'Cert. + User/Pass'
+);
+
$protocol_menu = array (
'udp' => 'UDP v4',
'tcp-client' => 'TCP v4',
@@ -57,6 +63,26 @@
'0' => 'None'
);
+// Function: parseUserPass
+//
+function parseUserPass($user_pass, $type) {
+ $str = '';
+ if ($user_pass !== '') {
+ $index = 0;
+ $match = ($type === 'user') ? 1 : 2;
+ $strtokens = explode(' ', $user_pass);
+ foreach ($strtokens as $value) {
+ if ($value !== '') {
+ if (++$index == $match) {
+ $str = $value;
+ break;
+ }
+ }
+ }
+ }
+ return($str);
+}
+
// Function: saveOVPNCsettings
//
function saveOVPNCsettings($conf_dir, $conf_file) {
@@ -95,6 +121,13 @@
$value = 'OVPNC_AUTH="'.$_POST['auth_hmac'].'"';
fwrite($fp, "### Auth HMAC\n".$value."\n");
+
+ if ($_POST['auth_method'] === 'yes' && trim($_POST['auth_user']) !== '' && trim($_POST['auth_pass']) !== '') {
+ $value = 'OVPNC_USER_PASS="'.trim($_POST['auth_user']).' '.string2RCconfig(trim($_POST['auth_pass'])).'"';
+ } else {
+ $value = 'OVPNC_USER_PASS=""';
+ }
+ fwrite($fp, "### Auth User/Pass\n".$value."\n");
$value = 'OVPNC_NSCERTTYPE="'.$_POST['nscerttype'].'"';
fwrite($fp, "### nsCertType\n".$value."\n");
@@ -260,9 +293,25 @@
}
putHtml("</center>");
?>
+ <script language="JavaScript" type="text/javascript">
+ //<![CDATA[
+ function auth_method_change() {
+ var form = document.getElementById("iform");
+ var user_pass = document.getElementById("user_pass");
+ switch (form.auth_method.selectedIndex) {
+ case 0: // Certificate
+ user_pass.style.visibility = "hidden";
+ break;
+ case 1: // Cert. + User/Pass
+ user_pass.style.visibility = "visible";
+ break;
+ }
+ }
+ //]]>
+ </script>
<center>
<table class="layout"><tr><td><center>
- <form method="post" action="<?php echo $myself;?>">
+ <form id="iform" method="post" action="<?php echo $myself;?>">
<table width="100%" class="stdtable">
<tr><td style="text-align: center;" colspan="2">
<h2>OpenVPN Client Configuration:</h2>
@@ -379,6 +428,33 @@
putHtml('</td></tr>');
putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
+ putHtml('Auth Method:');
+ putHtml('</td><td style="text-align: left;" colspan="4">');
+ if (($auth_method = getVARdef($db, 'OVPNC_USER_PASS')) !== '') {
+ $auth_method = 'yes';
+ }
+ putHtml('<select name="auth_method" onchange="auth_method_change()">');
+ foreach ($auth_method_menu as $key => $value) {
+ $sel = ($auth_method === $key) ? ' selected="selected"' : '';
+ putHtml('<option value="'.$key.'"'.$sel.'>'.$value.'</option>');
+ }
+ putHtml('</select>');
+ putHtml('</td></tr>');
+
+ putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
+ putHtml(' ');
+ putHtml('</td><td style="text-align: left;" colspan="4">');
+ putHtml('<div id="user_pass" style="visibility: hidden;">');
+ $user_pass = getVARdef($db, 'OVPNC_USER_PASS');
+ $value = parseUserPass($user_pass, 'user');
+ putHtml('User: <input type="text" size="16" maxlength="128" value="'.$value.'" name="auth_user" />');
+ $value = parseUserPass($user_pass, 'pass');
+ $value = htmlspecialchars(RCconfig2string($value));
+ putHtml('Pass: <input type="password" size="16" maxlength="128" value="'.$value.'" name="auth_pass" />');
+ putHtml('</div>');
+ putHtml('</td></tr>');
+
+ putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
putHtml('Require nsCertType:');
putHtml('</td><td style="text-align: left;" colspan="4">');
$nscerttype = getVARdef($db, 'OVPNC_NSCERTTYPE');
@@ -479,6 +555,11 @@
putHtml('</center></td></tr></table>');
putHtml('</center>');
+ putHtml('<script language="JavaScript" type="text/javascript">');
+ putHtml('//<![CDATA[');
+ putHtml('auth_method_change();');
+ putHtml('//]]>');
+ putHtml('</script>');
} // End of HTTP GET
require_once '../common/footer.php';
Modified: branches/1.0/package/webinterface/altweb/admin/system.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/system.php 2013-02-23 21:26:30 UTC (rev 5965)
+++ branches/1.0/package/webinterface/altweb/admin/system.php 2013-02-24 02:39:36 UTC (rev 5966)
@@ -774,6 +774,7 @@
$var === 'STATICHOSTS' ||
$var === 'PPTP_USER_PASS' ||
$var === 'OVPN_USER_PASS' ||
+ $var === 'OVPNC_USER_PASS' ||
$var === 'IPSECM_XAUTH_USER_PASS' ||
$var === 'IPSEC_PSK_ASSOCIATIONS') {
$value = '********';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-05-15 18:32:20
|
Revision: 6086
http://sourceforge.net/p/astlinux/code/6086
Author: abelbeck
Date: 2013-05-15 18:32:17 +0000 (Wed, 15 May 2013)
Log Message:
-----------
web interface, add SNMP Agent Server support by editing files in /mnt/kd/snmp/
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/edit.php
branches/1.0/package/webinterface/altweb/admin/network.php
branches/1.0/package/webinterface/altweb/admin/system.php
Modified: branches/1.0/package/webinterface/altweb/admin/edit.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/edit.php 2013-05-15 16:30:47 UTC (rev 6085)
+++ branches/1.0/package/webinterface/altweb/admin/edit.php 2013-05-15 18:32:17 UTC (rev 6086)
@@ -28,6 +28,7 @@
'openvpnclient' => 'Restart OpenVPN Client',
'racoon' => 'Restart IPsec VPN',
'pptpd' => 'Restart PPTP VPN Server',
+ 'snmpd' => 'Restart SNMP Server',
'stunnel' => 'Restart Stunnel Proxy',
'miniupnpd' => 'Restart Univ. Plug\'n\'Play',
'apcupsd' => 'Restart UPS Daemon',
@@ -217,6 +218,8 @@
$result = restartPROCESS($process, 37, $result, 'init');
} elseif ($process === 'prosody') {
$result = restartPROCESS($process, 38, $result, 'init');
+ } elseif ($process === 'snmpd') {
+ $result = restartPROCESS($process, 39, $result, 'init');
} elseif ($process === 'cron') {
$result = updateCRON('root', 30, $result);
}
@@ -256,6 +259,7 @@
$dir === '/mnt/kd/openvpn/ccd' ||
$dir === '/mnt/kd/rc.conf.d' ||
$dir === '/mnt/kd/crontabs' ||
+ $dir === '/mnt/kd/snmp' ||
$dir === '/mnt/kd/apcupsd' ||
$dir === '/mnt/kd/prosody' ||
$dir === '/mnt/kd/docs' ||
@@ -330,6 +334,8 @@
putHtml('<p style="color: green;">Stunnel Proxy has Restarted.</p>');
} elseif ($result == 38) {
putHtml('<p style="color: green;">XMPP Server has Restarted.</p>');
+ } elseif ($result == 39) {
+ putHtml('<p style="color: green;">SNMP Server has Restarted.</p>');
} elseif ($result == 99) {
putHtml('<p style="color: red;">Action Failed.</p>');
} elseif ($result == 999) {
@@ -475,6 +481,14 @@
$sel = ($file === $openfile) ? ' selected="selected"' : '';
putHtml('<option value="'.$file.'"'.$sel.'>prosody/'.basename($file).' - XMPP Shared Groups</option>');
}
+ if (is_writable($file = '/mnt/kd/snmp/snmpd.conf')) {
+ $sel = ($file === $openfile) ? ' selected="selected"' : '';
+ putHtml('<option value="'.$file.'"'.$sel.'>snmp/'.basename($file).' - SNMP Agent Server Config</option>');
+ }
+ if (is_writable($file = '/mnt/kd/snmp/snmp.conf')) {
+ $sel = ($file === $openfile) ? ' selected="selected"' : '';
+ putHtml('<option value="'.$file.'"'.$sel.'>snmp/'.basename($file).' - SNMP Applications Config</option>');
+ }
putHtml('</optgroup>');
if (is_dir('/mnt/kd/openvpn/ccd') && count($globfiles = glob('/mnt/kd/openvpn/ccd/*')) > 0) {
putHtml('<optgroup label="———— OpenVPN Client Configs ————">');
Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php 2013-05-15 16:30:47 UTC (rev 6085)
+++ branches/1.0/package/webinterface/altweb/admin/network.php 2013-05-15 18:32:17 UTC (rev 6086)
@@ -785,6 +785,12 @@
$result = saveNETWORKsettings($NETCONFDIR, $NETCONFFILE);
header('Location: /admin/xmpp.php');
exit;
+ } elseif (isset($_POST['submit_snmp_agent'])) {
+ $result = saveNETWORKsettings($NETCONFDIR, $NETCONFFILE);
+ if (is_writable($file = '/mnt/kd/snmp/snmpd.conf')) {
+ header('Location: /admin/edit.php?file='.$file);
+ exit;
+ }
} elseif (isset($_POST['submit_zabbix'])) {
$result = saveNETWORKsettings($NETCONFDIR, $NETCONFFILE);
header('Location: /admin/zabbix.php');
@@ -890,6 +896,8 @@
$result = restartPROCESS($process, 37, $result, 'init');
} elseif ($process === 'prosody') {
$result = restartPROCESS($process, 38, $result, 'init');
+ } elseif ($process === 'snmpd') {
+ $result = restartPROCESS($process, 39, $result, 'init');
}
} else {
$result = 2;
@@ -964,6 +972,8 @@
putHtml('<p style="color: green;">Stunnel Proxy has Restarted.</p>');
} elseif ($result == 38) {
putHtml('<p style="color: green;">XMPP Server has Restarted.</p>');
+ } elseif ($result == 39) {
+ putHtml('<p style="color: green;">SNMP Server has Restarted.</p>');
} elseif ($result == 99) {
putHtml('<p style="color: red;">Action Failed.</p>');
} elseif ($result == 100) {
@@ -1041,6 +1051,8 @@
putHtml('<option value="racoon"'.$sel.'>Restart IPsec VPN</option>');
$sel = ($reboot_restart === 'pptpd') ? ' selected="selected"' : '';
putHtml('<option value="pptpd"'.$sel.'>Restart PPTP VPN Server</option>');
+ $sel = ($reboot_restart === 'snmpd') ? ' selected="selected"' : '';
+ putHtml('<option value="snmpd"'.$sel.'>Restart SNMP Server</option>');
$sel = ($reboot_restart === 'stunnel') ? ' selected="selected"' : '';
putHtml('<option value="stunnel"'.$sel.'>Restart Stunnel Proxy</option>');
$sel = ($reboot_restart === 'miniupnpd') ? ' selected="selected"' : '';
@@ -1426,6 +1438,11 @@
putHtml('XMPP Server, Messaging and Presence:');
putHtml('<input type="submit" value="Configure XMPP" name="submit_xmpp" class="button" /></td></tr>');
+ if (is_file('/etc/init.d/snmpd') && is_file('/mnt/kd/snmp/snmpd.conf')) {
+ putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
+ putHtml('SNMP Agent Server:');
+ putHtml('<input type="submit" value="Configure SNMP Agent" name="submit_snmp_agent" class="button" /></td></tr>');
+ }
if (is_file('/etc/init.d/zabbix')) {
putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
putHtml('Zabbix Monitoring:');
Modified: branches/1.0/package/webinterface/altweb/admin/system.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/system.php 2013-05-15 16:30:47 UTC (rev 6085)
+++ branches/1.0/package/webinterface/altweb/admin/system.php 2013-05-15 18:32:17 UTC (rev 6086)
@@ -174,7 +174,7 @@
$srcfile .= ' -e "s/^.*[.]conf$/&/p" -e "s/^webgui-prefs.txt$/&/p" -e "s/^ast.*/&/p"';
$srcfile .= ' -e "s/^blocked-hosts$/&/p" -e "s/^dnsmasq.static$/&/p" -e "s/^hosts$/&/p" -e "s/^ethers$/&/p"';
$srcfile .= ' -e "s/^rc.local$/&/p" -e "s/^rc.local.stop$/&/p" -e "s/^rc.elocal$/&/p" -e "s/^rc.ledcontrol$/&/p"';
- $srcfile .= ' -e "s/^crontabs$/&/p"';
+ $srcfile .= ' -e "s/^crontabs$/&/p" -e "s/^snmp$/&/p"';
$srcfile .= ' -e "s/^openvpn$/&/p" -e "s/^ipsec$/&/p" -e "s/^dahdi$/&/p" -e "s/^ssl$/&/p" -e "s/^apcupsd$/&/p")';
$srcfile .= $firewall;
} elseif ($backup_type === 'cdr') {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-05-28 02:48:41
|
Revision: 6108
http://sourceforge.net/p/astlinux/code/6108
Author: abelbeck
Date: 2013-05-28 02:48:38 +0000 (Tue, 28 May 2013)
Log Message:
-----------
web interface, Network and Edit tabs, add 'LDAP Client System Defaults' support
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/edit.php
branches/1.0/package/webinterface/altweb/admin/network.php
Modified: branches/1.0/package/webinterface/altweb/admin/edit.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/edit.php 2013-05-27 15:52:55 UTC (rev 6107)
+++ branches/1.0/package/webinterface/altweb/admin/edit.php 2013-05-28 02:48:38 UTC (rev 6108)
@@ -28,6 +28,7 @@
'openvpnclient' => 'Restart OpenVPN Client',
'racoon' => 'Restart IPsec VPN',
'pptpd' => 'Restart PPTP VPN Server',
+ 'ldap' => 'Reload LDAP Client',
'snmpd' => 'Restart SNMP Server',
'stunnel' => 'Restart Stunnel Proxy',
'miniupnpd' => 'Restart Univ. Plug\'n\'Play',
@@ -43,6 +44,7 @@
'misdn-init.conf' => 'mISDN Configuration',
'ntpd.conf' => 'NTP Time Client/Server',
'sshd.conf' => 'SSH Server sshd_config',
+ 'ldap.conf' => 'LDAP Client System Defaults',
'lighttpd.conf' => 'Web Server Configuration',
'sensors.conf' => 'Lm_sensors Hardware Monitoring',
'zaptel.conf' => 'Zaptel System Config',
@@ -220,6 +222,8 @@
$result = restartPROCESS($process, 38, $result, 'init');
} elseif ($process === 'snmpd') {
$result = restartPROCESS($process, 39, $result, 'init');
+ } elseif ($process === 'ldap') {
+ $result = restartPROCESS($process, 40, $result, 'init');
} elseif ($process === 'cron') {
$result = updateCRON('root', 30, $result);
}
@@ -336,6 +340,8 @@
putHtml('<p style="color: green;">XMPP Server has Restarted.</p>');
} elseif ($result == 39) {
putHtml('<p style="color: green;">SNMP Server has Restarted.</p>');
+ } elseif ($result == 40) {
+ putHtml('<p style="color: green;">LDAP Client Defaults has been Reloaded.</p>');
} elseif ($result == 99) {
putHtml('<p style="color: red;">Action Failed.</p>');
} elseif ($result == 999) {
Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php 2013-05-27 15:52:55 UTC (rev 6107)
+++ branches/1.0/package/webinterface/altweb/admin/network.php 2013-05-28 02:48:38 UTC (rev 6108)
@@ -81,6 +81,20 @@
'External Interface' => 'interface'
);
+$select_ldap_deref = array (
+ 'never' => 'never',
+ 'searching' => 'searching',
+ 'finding' => 'finding',
+ 'always' => 'always'
+);
+
+$select_ldap_tls_reqcert = array (
+ 'never' => 'never',
+ 'allow' => 'allow',
+ 'try' => 'try',
+ 'demand' => 'demand'
+);
+
$select_ups_type = array (
'disabled' => '',
'usb' => 'usb',
@@ -541,7 +555,32 @@
fwrite($fp, $value."\n");
$value = 'MONITOR_ASTERISK_SIP_STATUS_UPDATES="'.$_POST['monitor_status_updates'].'"';
fwrite($fp, $value."\n");
-
+
+ fwrite($fp, "### LDAP Client System Defaults\n");
+ if (isset($_POST['ldap_uri'], $_POST['ldap_base'])) {
+ $value = 'LDAP_URI="'.tuq($_POST['ldap_uri']).'"';
+ fwrite($fp, $value."\n");
+ $value = 'LDAP_BASE="'.tuq($_POST['ldap_base']).'"';
+ fwrite($fp, $value."\n");
+ $value = 'LDAP_DEREF="'.$_POST['ldap_deref'].'"';
+ fwrite($fp, $value."\n");
+ $value = 'LDAP_TLS_CACERT="'.tuq($_POST['ldap_tls_cacert']).'"';
+ fwrite($fp, $value."\n");
+ $value = 'LDAP_TLS_REQCERT="'.$_POST['ldap_tls_reqcert'].'"';
+ fwrite($fp, $value."\n");
+ } else {
+ $value = 'LDAP_URI=""';
+ fwrite($fp, $value."\n");
+ $value = 'LDAP_BASE=""';
+ fwrite($fp, $value."\n");
+ $value = 'LDAP_DEREF=""';
+ fwrite($fp, $value."\n");
+ $value = 'LDAP_TLS_CACERT=""';
+ fwrite($fp, $value."\n");
+ $value = 'LDAP_TLS_REQCERT=""';
+ fwrite($fp, $value."\n");
+ }
+
fwrite($fp, "### APC UPS Monitoring - Shutdown\n");
if (isset($_POST['ups_type'], $_POST['ups_cable'], $_POST['ups_device'])) {
$value = 'UPSTYPE="'.$_POST['ups_type'].'"';
@@ -819,6 +858,12 @@
$result = saveNETWORKsettings($NETCONFDIR, $NETCONFFILE);
header('Location: /admin/pptp.php');
exit;
+ } elseif (isset($_POST['submit_edit_ldap'])) {
+ $result = saveNETWORKsettings($NETCONFDIR, $NETCONFFILE);
+ if (is_writable($file = '/mnt/kd/ldap.conf')) {
+ header('Location: /admin/edit.php?file='.$file);
+ exit;
+ }
} elseif (isset($_POST['submit_edit_ups'])) {
$result = saveNETWORKsettings($NETCONFDIR, $NETCONFFILE);
if (is_writable($file = '/mnt/kd/apcupsd/apcupsd.conf')) {
@@ -898,6 +943,8 @@
$result = restartPROCESS($process, 38, $result, 'init');
} elseif ($process === 'snmpd') {
$result = restartPROCESS($process, 39, $result, 'init');
+ } elseif ($process === 'ldap') {
+ $result = restartPROCESS($process, 40, $result, 'init');
}
} else {
$result = 2;
@@ -974,6 +1021,8 @@
putHtml('<p style="color: green;">XMPP Server has Restarted.</p>');
} elseif ($result == 39) {
putHtml('<p style="color: green;">SNMP Server has Restarted.</p>');
+ } elseif ($result == 40) {
+ putHtml('<p style="color: green;">LDAP Client Defaults has been Reloaded.</p>');
} elseif ($result == 99) {
putHtml('<p style="color: red;">Action Failed.</p>');
} elseif ($result == 100) {
@@ -1051,6 +1100,8 @@
putHtml('<option value="racoon"'.$sel.'>Restart IPsec VPN</option>');
$sel = ($reboot_restart === 'pptpd') ? ' selected="selected"' : '';
putHtml('<option value="pptpd"'.$sel.'>Restart PPTP VPN Server</option>');
+ $sel = ($reboot_restart === 'ldap') ? ' selected="selected"' : '';
+ putHtml('<option value="ldap"'.$sel.'>Reload LDAP Client</option>');
$sel = ($reboot_restart === 'snmpd') ? ' selected="selected"' : '';
putHtml('<option value="snmpd"'.$sel.'>Restart SNMP Server</option>');
$sel = ($reboot_restart === 'stunnel') ? ' selected="selected"' : '';
@@ -1705,7 +1756,49 @@
putHtml('<tr class="dtrow0"><td colspan="6"> </td></tr>');
putHtml('<tr class="dtrow0"><td class="dialogText" style="text-align: left;" colspan="6">');
+
+ putHtml('<strong>LDAP Client System Defaults:</strong>');
+ putHtml('</td></tr>');
+ putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
+ if (! is_file('/mnt/kd/ldap.conf')) {
+ $value = getVARdef($db, 'LDAP_URI', $cur_db);
+ putHtml('LDAP Server URI(s):<input type="text" size="82" maxlength="256" value="'.$value.'" name="ldap_uri" /></td></tr>');
+ putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
+ $value = getVARdef($db, 'LDAP_BASE', $cur_db);
+ putHtml('LDAP Base DN:<input type="text" size="82" maxlength="256" value="'.$value.'" name="ldap_base" /></td></tr>');
+
+ putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
+ putHtml('LDAP Dereferencing:');
+ $ldap_deref = getVARdef($db, 'LDAP_DEREF', $cur_db);
+ putHtml('<select name="ldap_deref">');
+ foreach ($select_ldap_deref as $key => $value) {
+ $sel = ($ldap_deref === $value) ? ' selected="selected"' : '';
+ putHtml('<option value="'.$value.'"'.$sel.'>'.$key.'</option>');
+ }
+ putHtml('</select>');
+ putHtml('</td></tr>');
+
+ putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
+ putHtml('LDAP TLS Cert Check:');
+ $ldap_tls_reqcert = getVARdef($db, 'LDAP_TLS_REQCERT', $cur_db);
+ putHtml('<select name="ldap_tls_reqcert">');
+ foreach ($select_ldap_tls_reqcert as $key => $value) {
+ $sel = ($ldap_tls_reqcert === $value) ? ' selected="selected"' : '';
+ putHtml('<option value="'.$value.'"'.$sel.'>'.$key.'</option>');
+ }
+ putHtml('</select>');
+ putHtml('– Server CA Cert File:');
+ $value = getVARdef($db, 'LDAP_TLS_CACERT', $cur_db);
+ putHtml('<input type="text" size="24" maxlength="64" value="'.$value.'" name="ldap_tls_cacert" /></td></tr>');
+ } else {
+ putHtml('LDAP Defaults:');
+ putHtml('<input type="submit" value="LDAP Configuration" name="submit_edit_ldap" class="button" /></td></tr>');
+ }
+
+ putHtml('<tr class="dtrow0"><td colspan="6"> </td></tr>');
+ putHtml('<tr class="dtrow0"><td class="dialogText" style="text-align: left;" colspan="6">');
+
putHtml('<strong>APC UPS Monitoring & Shutdown:</strong>');
putHtml('</td></tr>');
putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-07-25 18:35:29
|
Revision: 6154
http://sourceforge.net/p/astlinux/code/6154
Author: abelbeck
Date: 2013-07-25 18:35:25 +0000 (Thu, 25 Jul 2013)
Log Message:
-----------
web interface, Voicemail tab, support FOP2 UserEvent: FOP2RELOADVOICEMAIL to sync mailbox status
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/dnshosts.php
branches/1.0/package/webinterface/altweb/admin/voicemail.php
Modified: branches/1.0/package/webinterface/altweb/admin/dnshosts.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/dnshosts.php 2013-07-24 16:53:09 UTC (rev 6153)
+++ branches/1.0/package/webinterface/altweb/admin/dnshosts.php 2013-07-25 18:35:25 UTC (rev 6154)
@@ -228,7 +228,7 @@
putHtml('<tr><td class="dialogText" style="text-align: right;">');
putHtml('IP Address:<input type="text" size="42" maxlength="39" name="ip" value="'.$ldb['ip'].'" />');
putHtml('</td><td class="dialogText" style="text-align: right;">');
- putHtml('Host Name:<input type="text" size="24" maxlength="128" name="name" value="'.$ldb['name'].'" />');
+ putHtml('Host Name(s):<input type="text" size="28" maxlength="128" name="name" value="'.$ldb['name'].'" />');
putHtml('</td></tr>');
putHtml('<tr><td class="dialogText" style="text-align: right;" colspan="2">');
putHtml('MAC Address matched via DHCP for IPv4 address <i>(optional)</i>:<input type="text" size="20" maxlength="17" name="mac" value="'.$ldb['mac'].'" />');
@@ -243,7 +243,7 @@
if (($n = count($db['data'])) > 0) {
echo '<td class="dialogText" style="text-align: left; font-weight: bold;">', "IP Address", "</td>";
- echo '<td class="dialogText" style="text-align: left; font-weight: bold;">', "Host Name", "</td>";
+ echo '<td class="dialogText" style="text-align: left; font-weight: bold;">', "Host Name(s)", "</td>";
echo '<td class="dialogText" style="text-align: left; font-weight: bold;">', "MAC Address", "</td>";
echo '<td class="dialogText" style="text-align: center; font-weight: bold;">', "Delete", "</td>";
for ($i = 0; $i < $n; $i++) {
Modified: branches/1.0/package/webinterface/altweb/admin/voicemail.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/voicemail.php 2013-07-24 16:53:09 UTC (rev 6153)
+++ branches/1.0/package/webinterface/altweb/admin/voicemail.php 2013-07-25 18:35:25 UTC (rev 6154)
@@ -1,6 +1,6 @@
<?php
-// Copyright (C) 2008-2012 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
@@ -12,6 +12,7 @@
// 07-20-2008, Added special user "staff" permissions
// 07-21-2008, Added externnotify support
// 09-05-2012, Automatically create "Old" folder if it doesn't exist
+// 07-25-2013, Add support for FOP2 UserEvent: FOP2RELOADVOICEMAIL
//
// System location of the asterisk voicemail directory
$VOICEMAILDIR = '/var/spool/asterisk/voicemail/';
@@ -20,6 +21,54 @@
require_once '../common/functions.php';
+// Function: asteriskAMI_UserEvent
+//
+function asteriskAMI_UserEvent($user, $pass, $event) {
+
+ $event_list = explode(',', $event);
+
+ if (($socket = @fsockopen('127.0.0.1', '5038', $errno, $errstr, 5)) === FALSE) {
+ return(FALSE);
+ }
+ fputs($socket, "Action: login\r\n");
+ fputs($socket, "Username: $user\r\n");
+ fputs($socket, "Secret: $pass\r\n");
+ fputs($socket, "Events: off\r\n\r\n");
+
+ fputs($socket, "Action: UserEvent\r\n");
+ foreach ($event_list as $value) {
+ fputs($socket, "$value\r\n");
+ }
+ fputs($socket, "\r\n");
+
+ fputs($socket, "Action: logoff\r\n\r\n");
+
+ stream_set_timeout($socket, 5);
+ $info = stream_get_meta_data($socket);
+ while (! feof($socket) && ! $info['timed_out']) {
+ $line = fgets($socket, 256);
+ $info = stream_get_meta_data($socket);
+ if (strncasecmp($line, 'Response: Error', 15) == 0) {
+ while (! feof($socket) && ! $info['timed_out']) {
+ fgets($socket, 256);
+ $info = stream_get_meta_data($socket);
+ }
+ fclose($socket);
+ return(FALSE);
+ }
+ if (strncasecmp($line, 'Message: Event Sent', 19) == 0) {
+ break;
+ }
+ }
+ while (! feof($socket) && ! $info['timed_out']) {
+ fgets($socket, 256);
+ $info = stream_get_meta_data($socket);
+ }
+ fclose($socket);
+
+ return(0);
+}
+
// Function: getVMdataTXT
//
function getVMdataTXT($path) {
@@ -123,17 +172,24 @@
// Function: notifyVMdir
//
-function notifyVMdir($dir, $path, $count) {
+function notifyVMdir($dir, $path, $count, $fop2) {
global $global_prefs;
$value = substr($path, strlen($dir));
$tokens = explode('/', $value);
- if ($tokens[2] !== 'INBOX') {
+ $context = $tokens[0];
+ $mbox = $tokens[1];
+ $folder = $tokens[2];
+
+ if ($fop2 && is_addon_package('fop2')) {
+ $user_event= 'UserEvent: FOP2RELOADVOICEMAIL,Mailbox: '.$mbox.'@'.$context.',Server: 0';
+ asteriskAMI_UserEvent('fop2', 'astlinux', $user_event);
+ }
+
+ if ($folder !== 'INBOX') {
return(FALSE);
}
- $context = $tokens[0];
- $mbox = $tokens[1];
-
+
if (getPREFdef($global_prefs, 'voicemail_extern_notify') === 'yes') {
if (($ph = popen("grep -m 1 '^externnotify' /etc/asterisk/voicemail.conf", "r")) !== FALSE) {
if (! feof($ph)) {
@@ -235,11 +291,11 @@
}
}
$cnt = sequenceVMdir($fpath);
- notifyVMdir($msg['dir'], $fpath, $cnt);
+ notifyVMdir($msg['dir'], $fpath, $cnt, FALSE);
$cnt = sequenceVMdir($tpath);
- notifyVMdir($msg['dir'], $tpath, $cnt);
-
+ notifyVMdir($msg['dir'], $tpath, $cnt, TRUE);
+
return($cnt == 0 ? FALSE : $cnt);
}
@@ -308,7 +364,7 @@
if ($resequence > 0) {
for ($i = 0; $i < count($delete); $i++) {
$cnt = sequenceVMdir($VOICEMAILDIR.$delete[$i]);
- notifyVMdir('', $delete[$i], $cnt);
+ notifyVMdir('', $delete[$i], $cnt, TRUE);
}
$result = 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-09-06 19:58:31
|
Revision: 6187
http://sourceforge.net/p/astlinux/code/6187
Author: abelbeck
Date: 2013-09-06 19:58:27 +0000 (Fri, 06 Sep 2013)
Log Message:
-----------
web interface, Edit tab, add shortcut support defined via Prefs tab. Shortcuts: are defined as a space separated list of filenames, optionally with a trailing ~Label
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/edit.php
branches/1.0/package/webinterface/altweb/admin/prefs.php
Modified: branches/1.0/package/webinterface/altweb/admin/edit.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/edit.php 2013-09-05 23:56:17 UTC (rev 6186)
+++ branches/1.0/package/webinterface/altweb/admin/edit.php 2013-09-06 19:58:27 UTC (rev 6187)
@@ -588,11 +588,29 @@
}
putHtml('</optgroup>');
}
+
+ putHtml('</select>');
+ putHtml('</td><td width="20"> </td><td style="text-align: left;">');
+ putHtml('<input type="submit" class="formbtn" value=">> Open File" name="submit_open" />');
+ putHtml('</td></tr></table>');
+
+ if (($shortcut_str = getPREFdef($global_prefs, 'edit_text_shortcut_cmdstr')) !== '') {
+ putHtml('<table width="100%" class="stdtable">');
+ putHtml('<tr><td width="400" style="text-align: center;">');
+ foreach (explode(' ', $shortcut_str) as $shortcut) {
+ if (trim($shortcut) !== '') {
+ if (($pos = strpos($shortcut, '~')) !== FALSE) {
+ $shortcut_label = substr($shortcut, $pos + 1);
+ $shortcut = substr($shortcut, 0, $pos);
+ } else {
+ $shortcut_label = basename($shortcut);
+ }
+ putHtml('<a href="'.$myself.'?file='.$shortcut.'" class="headerText">'.$shortcut_label.'</a>');
+ }
+ }
+ putHtml('</td></tr></table>');
+ }
?>
- </select>
- </td><td width="20"> </td><td style="text-align: left;">
- <input type="submit" class="formbtn" value=">> Open File" name="submit_open" />
- </td></tr></table>
<table width="100%" class="stdtable">
<tr><td width="240" style="text-align: center;">
<input type="submit" class="formbtn" value="Save Changes" name="submit_save" onclick="setOKhandler();" />
Modified: branches/1.0/package/webinterface/altweb/admin/prefs.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/prefs.php 2013-09-05 23:56:17 UTC (rev 6186)
+++ branches/1.0/package/webinterface/altweb/admin/prefs.php 2013-09-06 19:58:27 UTC (rev 6187)
@@ -301,6 +301,8 @@
$value = 'edit_text_rows_cmdstr = "'.$value.'"';
fwrite($fp, $value."\n");
}
+ $value = 'edit_text_shortcut_cmdstr = "'.tuqp($_POST['edittext_shortcut']).'"';
+ fwrite($fp, $value."\n");
if (isset($_POST['backup_hostname_domain'])) {
$value = 'system_backup_hostname_domain = yes';
@@ -913,6 +915,10 @@
$value = '30';
}
putHtml('<input type="text" size="6" maxlength="2" value="'.$value.'" name="text_rows" /></td></tr>');
+
+ putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">Shortcuts:</td><td colspan="4">');
+ $value = getPREFdef($global_prefs, 'edit_text_shortcut_cmdstr');
+ putHtml('<input type="text" size="48" maxlength="900" value="'.$value.'" name="edittext_shortcut" /></td></tr>');
putHtml('<tr class="dtrow0"><td colspan="6"> </td></tr>');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-09-07 04:14:23
|
Revision: 6189
http://sourceforge.net/p/astlinux/code/6189
Author: abelbeck
Date: 2013-09-07 04:14:20 +0000 (Sat, 07 Sep 2013)
Log Message:
-----------
web interface, make Edit tab shortcuts easier to define in the Prefs tab, multi-line return separated
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/edit.php
branches/1.0/package/webinterface/altweb/admin/prefs.php
Modified: branches/1.0/package/webinterface/altweb/admin/edit.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/edit.php 2013-09-06 23:45:01 UTC (rev 6188)
+++ branches/1.0/package/webinterface/altweb/admin/edit.php 2013-09-07 04:14:20 UTC (rev 6189)
@@ -10,6 +10,7 @@
// 04-28-2008
// 12-04-2008, Added Reload/Restart Menu
// 02-18-2013, Added OpenVPN Client Config editing
+// 09-06-2013, Added Shortcut support
//
$myself = $_SERVER['PHP_SELF'];
@@ -598,14 +599,14 @@
putHtml('<table width="100%" class="stdtable">');
putHtml('<tr><td width="400" style="text-align: center;">');
foreach (explode(' ', $shortcut_str) as $shortcut) {
- if (trim($shortcut) !== '') {
+ if ($shortcut !== '') {
if (($pos = strpos($shortcut, '~')) !== FALSE) {
$shortcut_label = substr($shortcut, $pos + 1);
$shortcut = substr($shortcut, 0, $pos);
} else {
$shortcut_label = basename($shortcut);
}
- putHtml('<a href="'.$myself.'?file='.$shortcut.'" class="headerText">'.$shortcut_label.'</a>');
+ putHtml('<a href="'.$myself.'?file='.$shortcut.'" class="headerText">'.htmlspecialchars($shortcut_label).'</a>');
}
}
putHtml('</td></tr></table>');
Modified: branches/1.0/package/webinterface/altweb/admin/prefs.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/prefs.php 2013-09-06 23:45:01 UTC (rev 6188)
+++ branches/1.0/package/webinterface/altweb/admin/prefs.php 2013-09-07 04:14:20 UTC (rev 6189)
@@ -16,6 +16,7 @@
// 09-28-2012, Added Show Latest System Logs/Hide Log Words
// 09-28-2012, Added Show Custom Asterisk Command
// 01-20-2013, Added Show XMPP Server Status
+// 09-06-2013, Added Edit Tab Shortcut support
//
$myself = $_SERVER['PHP_SELF'];
@@ -301,7 +302,12 @@
$value = 'edit_text_rows_cmdstr = "'.$value.'"';
fwrite($fp, $value."\n");
}
- $value = 'edit_text_shortcut_cmdstr = "'.tuqp($_POST['edittext_shortcut']).'"';
+ $value = tuqp(str_replace(chr(13), ' ', $_POST['edittext_shortcut']));
+ $value = str_replace(chr(10), '', $value);
+ if (strlen($value) > 900) { // 1024 total line limit for prefs
+ $value = substr($value, 0, 900);
+ }
+ $value = 'edit_text_shortcut_cmdstr = "'.$value.'"';
fwrite($fp, $value."\n");
if (isset($_POST['backup_hostname_domain'])) {
@@ -916,9 +922,17 @@
}
putHtml('<input type="text" size="6" maxlength="2" value="'.$value.'" name="text_rows" /></td></tr>');
- putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">Shortcuts:</td><td colspan="4">');
- $value = getPREFdef($global_prefs, 'edit_text_shortcut_cmdstr');
- putHtml('<input type="text" size="48" maxlength="900" value="'.$value.'" name="edittext_shortcut" /></td></tr>');
+ putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">Shortcuts:<br /><i>(Path~Label)</i></td><td colspan="4">');
+ echo '<textarea name="edittext_shortcut" rows="4" cols="40" wrap="off" class="edititemText">';
+ if (($value = getPREFdef($global_prefs, 'edit_text_shortcut_cmdstr')) !== '') {
+ foreach (explode(' ', $value) as $shortcut) {
+ if ($shortcut !== '') {
+ echo htmlspecialchars($shortcut), chr(13);
+ }
+ }
+ }
+ putHtml('</textarea>');
+ putHtml('</td></tr>');
putHtml('<tr class="dtrow0"><td colspan="6"> </td></tr>');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-03-18 21:19:04
|
Revision: 6469
http://sourceforge.net/p/astlinux/code/6469
Author: abelbeck
Date: 2014-03-18 21:19:00 +0000 (Tue, 18 Mar 2014)
Log Message:
-----------
web interface, add phoneprov templates directory to Basic Backup
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/phoneprov.php
branches/1.0/package/webinterface/altweb/admin/system.php
Modified: branches/1.0/package/webinterface/altweb/admin/phoneprov.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/phoneprov.php 2014-03-18 12:58:39 UTC (rev 6468)
+++ branches/1.0/package/webinterface/altweb/admin/phoneprov.php 2014-03-18 21:19:00 UTC (rev 6469)
@@ -458,9 +458,7 @@
<table class="layout"><tr><td><center>
<form method="post" action="<?php echo $myself;?>">
<?php
- if (($phoneprov_base_dir = trim(shell_exec('. /etc/rc.conf; echo "$PHONEPROV_BASE_DIR"'))) === '') {
- $phoneprov_base_dir = '/mnt/kd/phoneprov';
- }
+ $phoneprov_base_dir = trim(shell_exec('. /etc/rc.conf; echo "${PHONEPROV_BASE_DIR:-/mnt/kd/phoneprov}"'));
if (is_file($PHONEPROVCONFFILE)) {
$vars = parseRCconf($PHONEPROVCONFFILE);
Modified: branches/1.0/package/webinterface/altweb/admin/system.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/system.php 2014-03-18 12:58:39 UTC (rev 6468)
+++ branches/1.0/package/webinterface/altweb/admin/system.php 2014-03-18 21:19:00 UTC (rev 6469)
@@ -182,8 +182,14 @@
$asturw = (getPREFdef($global_prefs, 'system_backup_asturw') === 'yes') ? '/mnt/kd/asturw'.$suffix : '';
$prefix = (getPREFdef($global_prefs, 'system_backup_temp_disk') === 'yes') ? '/mnt/kd/.' : '/tmp/';
$tmpfile = $backup_name.'-'.$backup_type.'-'.date('Y-m-d').$suffix;
- $firewall = is_dir('/mnt/kd/arno-iptables-firewall/plugins') ? ' "arno-iptables-firewall/plugins"' : '';
if ($backup_type === 'basic') {
+ $firewall = is_dir('/mnt/kd/arno-iptables-firewall/plugins') ? ' "arno-iptables-firewall/plugins"' : '';
+ $phoneprov_base_dir = rtrim(trim(shell_exec('. /etc/rc.conf; echo "${PHONEPROV_BASE_DIR:-/mnt/kd/phoneprov}"')), '/');
+ if (is_dir("$phoneprov_base_dir/templates") && (strncmp($phoneprov_base_dir, '/mnt/kd', strlen('/mnt/kd')) == 0)) {
+ $templates = ' "'.substr("$phoneprov_base_dir/templates", strlen('/mnt/kd/')).'"';
+ } else {
+ $templates = '';
+ }
$srcfile = '$(ls -1 /mnt/kd/ | sed -n -e "s/^rc.conf.d$/&/p" -e "s/^ssh_keys$/&/p"';
$srcfile .= ' -e "s/^.*[.]conf$/&/p" -e "s/^webgui-prefs.txt$/&/p" -e "s/^ast.*/&/p"';
$srcfile .= ' -e "s/^blocked-hosts$/&/p" -e "s/^dnsmasq.static$/&/p" -e "s/^hosts$/&/p" -e "s/^ethers$/&/p"';
@@ -191,6 +197,7 @@
$srcfile .= ' -e "s/^crontabs$/&/p" -e "s/^snmp$/&/p" -e "s/^fop2$/&/p"';
$srcfile .= ' -e "s/^openvpn$/&/p" -e "s/^ipsec$/&/p" -e "s/^dahdi$/&/p" -e "s/^ssl$/&/p" -e "s/^ups$/&/p")';
$srcfile .= $firewall;
+ $srcfile .= $templates;
} elseif ($backup_type === 'cdr') {
$srcfile = '$(ls -1 /mnt/kd/ | sed -n -e "s/^cdr-.*/&/p")';
$asturw = '';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-11-07 16:13:21
|
Revision: 6804
http://sourceforge.net/p/astlinux/code/6804
Author: abelbeck
Date: 2014-11-07 16:13:12 +0000 (Fri, 07 Nov 2014)
Log Message:
-----------
web interface, add Edit tab and basic backup for /mnt/kd/wan-failover.script
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/edit.php
branches/1.0/package/webinterface/altweb/admin/system.php
Modified: branches/1.0/package/webinterface/altweb/admin/edit.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/edit.php 2014-11-07 14:48:36 UTC (rev 6803)
+++ branches/1.0/package/webinterface/altweb/admin/edit.php 2014-11-07 16:13:12 UTC (rev 6804)
@@ -531,6 +531,10 @@
$sel = ($file === $openfile) ? ' selected="selected"' : '';
putHtml('<option value="'.$file.'"'.$sel.'>snmp/'.basename($file).' - SNMP Applications Config</option>');
}
+ if (is_writable($file = '/mnt/kd/wan-failover.script')) {
+ $sel = ($file === $openfile) ? ' selected="selected"' : '';
+ putHtml('<option value="'.$file.'"'.$sel.'>'.basename($file).' - WAN Failover Shell Script</option>');
+ }
putHtml('</optgroup>');
if (is_dir('/mnt/kd/openvpn/ccd') && count($globfiles = glob('/mnt/kd/openvpn/ccd/*')) > 0) {
putHtml('<optgroup label="———— OpenVPN Client Configs ————">');
Modified: branches/1.0/package/webinterface/altweb/admin/system.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/system.php 2014-11-07 14:48:36 UTC (rev 6803)
+++ branches/1.0/package/webinterface/altweb/admin/system.php 2014-11-07 16:13:12 UTC (rev 6804)
@@ -195,6 +195,7 @@
$srcfile .= ' -e "s/^.*[.]conf$/&/p" -e "s/^webgui-prefs.txt$/&/p" -e "s/^ast.*/&/p"';
$srcfile .= ' -e "s/^blocked-hosts$/&/p" -e "s/^dnsmasq.static$/&/p" -e "s/^hosts$/&/p" -e "s/^ethers$/&/p"';
$srcfile .= ' -e "s/^rc.local$/&/p" -e "s/^rc.local.stop$/&/p" -e "s/^rc.elocal$/&/p" -e "s/^rc.ledcontrol$/&/p"';
+ $srcfile .= ' -e "s/^wan-failover.script$/&/p"';
$srcfile .= ' -e "s/^crontabs$/&/p" -e "s/^snmp$/&/p" -e "s/^fop2$/&/p" -e "s/^kamailio$/&/p"';
$srcfile .= ' -e "s/^openvpn$/&/p" -e "s/^ipsec$/&/p" -e "s/^dahdi$/&/p" -e "s/^ssl$/&/p" -e "s/^ups$/&/p")';
$srcfile .= $firewall;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-08-03 17:02:31
|
Revision: 7174
http://sourceforge.net/p/astlinux/code/7174
Author: abelbeck
Date: 2015-08-03 17:02:29 +0000 (Mon, 03 Aug 2015)
Log Message:
-----------
web interface, layout tweaks to PhoneProv tab and add hover-text to CDR Log column title links
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/cdrlog.php
branches/1.0/package/webinterface/altweb/admin/phoneprov.php
Modified: branches/1.0/package/webinterface/altweb/admin/cdrlog.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/cdrlog.php 2015-08-03 00:07:58 UTC (rev 7173)
+++ branches/1.0/package/webinterface/altweb/admin/cdrlog.php 2015-08-03 17:02:29 UTC (rev 7174)
@@ -420,7 +420,7 @@
function putCDRheader($sortby, $title) {
global $myself;
- return('<a href="'.$myself.'?sortcolumnby='.$sortby.'" class="headerText">'.$title.'</a>');
+ return('<a href="'.$myself.'?sortcolumnby='.$sortby.'" class="headerText" title="Column Sort by: '.$sortby.'">'.$title.'</a>');
}
Modified: branches/1.0/package/webinterface/altweb/admin/phoneprov.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/phoneprov.php 2015-08-03 00:07:58 UTC (rev 7173)
+++ branches/1.0/package/webinterface/altweb/admin/phoneprov.php 2015-08-03 17:02:29 UTC (rev 7174)
@@ -8,7 +8,7 @@
// phoneprov.php for AstLinux
// 03-14-2014
-// 08-02-2015, Add Status Info, Reload Config and Reboot buttons
+// 08-02-2015, Add Status, Reload and Reboot links
//
// System location of /mnt/kd/rc.conf.d directory
$PHONEPROVCONFDIR = '/mnt/kd/rc.conf.d';
@@ -616,7 +616,7 @@
$info_data_mac = $mac;
putHtml('<p> </p>');
} else {
- putHtml('<p style="color: red;">Status Info Failed.</p>');
+ putHtml('<p style="color: red;">Status Action Failed.</p>');
}
} else {
putHtml('<p style="color: red;">SQL Action Failed.</p>');
@@ -628,10 +628,10 @@
if (($sip_notify_text = asteriskCMDtext('sip notify '.$sip_notify.' '.$sql['account'])) !== FALSE) {
putHtml('<p>'.$sip_notify_text[0].'</p>');
} else {
- putHtml('<p style="color: red;">Reload Config Failed.</p>');
+ putHtml('<p style="color: red;">Reload Action Failed.</p>');
}
} else {
- putHtml('<p style="color: red;">Reload Config Failed.</p>');
+ putHtml('<p style="color: red;">Reload Action Failed.</p>');
}
} else {
putHtml('<p style="color: red;">SQL Action Failed.</p>');
@@ -643,10 +643,10 @@
if (($sip_notify_text = asteriskCMDtext('sip notify '.$sip_notify.' '.$sql['account'])) !== FALSE) {
putHtml('<p>'.$sip_notify_text[0].'</p>');
} else {
- putHtml('<p style="color: red;">Reboot Failed.</p>');
+ putHtml('<p style="color: red;">Reboot Action Failed.</p>');
}
} else {
- putHtml('<p style="color: red;">Reboot Failed.</p>');
+ putHtml('<p style="color: red;">Reboot Action Failed.</p>');
}
} else {
putHtml('<p style="color: red;">SQL Action Failed.</p>');
@@ -794,11 +794,10 @@
if (($sql = isMACinSQL($mac)) !== FALSE) {
putHtml("</tr>");
echo '<tr ', ($i % 2 == 0) ? 'class="dtrow0"' : 'class="dtrow1"', '>';
- echo '<td> </td>';
- echo '<td colspan="6">';
- echo ' <a href="'.$myself.'?info='.rawurlencode($mac).'" class="actionText">Status Info</a>';
- echo ' <a href="'.$myself.'?reload='.rawurlencode($mac).'" class="actionText">Reload Config</a>';
- echo ' <a href="'.$myself.'?reboot='.rawurlencode($mac).'" class="actionText">Reboot</a>';
+ echo '<td style="text-align: right;" colspan="7">';
+ echo ' <a href="'.$myself.'?info='.rawurlencode($mac).'" class="headerText" title="Show SIP Peer Info">Status</a>';
+ echo ' <a href="'.$myself.'?reload='.rawurlencode($mac).'" class="headerText" title="Send SIP Notify to Reload Config">Reload</a>';
+ echo ' <a href="'.$myself.'?reboot='.rawurlencode($mac).'" class="headerText" title="Send SIP Notify to Reboot Phone">Reboot</a>';
echo '</td>';
if ($info_data_mac === $mac) {
foreach ($info_data as $info_label => $info_field) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-08-23 14:50:16
|
Revision: 7218
http://sourceforge.net/p/astlinux/code/7218
Author: abelbeck
Date: 2015-08-23 14:50:14 +0000 (Sun, 23 Aug 2015)
Log Message:
-----------
web interface, add 'Fossil Commands' sub-tab referenced via the Edit tab
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/edit.php
Added Paths:
-----------
branches/1.0/package/webinterface/altweb/admin/fossilcmd.php
Modified: branches/1.0/package/webinterface/altweb/admin/edit.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/edit.php 2015-08-21 23:43:37 UTC (rev 7217)
+++ branches/1.0/package/webinterface/altweb/admin/edit.php 2015-08-23 14:50:14 UTC (rev 7218)
@@ -187,6 +187,9 @@
$result = 3;
}
}
+ } elseif (isset($_POST['submit_fossil'])) {
+ header('Location: /admin/fossilcmd.php');
+ exit;
} elseif (isset($_POST['submit_reload'])) {
$result = 99;
$process = $_POST['reload_restart'];
@@ -673,6 +676,10 @@
putHtml('</select>');
putHtml('</td><td width="20"> </td><td style="text-align: left;">');
putHtml('<input type="submit" class="formbtn" value=">> Open File" name="submit_open" />');
+ if (getPREFdef($global_prefs, 'tab_fossil_show') === 'yes') {
+ putHtml('<br /><br />');
+ putHtml('<input type="submit" class="formbtn" value="Fossil Commands" name="submit_fossil" />');
+ }
putHtml('</td></tr></table>');
if (($shortcut_str = getPREFdef($global_prefs, 'edit_text_shortcut_cmdstr')) !== '') {
Added: branches/1.0/package/webinterface/altweb/admin/fossilcmd.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/fossilcmd.php (rev 0)
+++ branches/1.0/package/webinterface/altweb/admin/fossilcmd.php 2015-08-23 14:50:14 UTC (rev 7218)
@@ -0,0 +1,149 @@
+<?php
+
+// Copyright (C) 2008-2015 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
+// General Public License; and comes with ABSOLUTELY NO WARRANTY.
+
+// fossilcmd.php for AstLinux
+// 08-23-2015
+//
+
+require_once '../common/functions.php';
+
+$action_menu = array (
+ 'status' => 'fossil-status',
+ 'diff' => 'fossil-diff',
+ 'commit' => 'fossil-commit',
+ 'revert' => 'fossil-revert'
+);
+
+// Function: multi_args
+//
+function multi_args($args) {
+ $str = '';
+
+ if ($args == '') {
+ return($str);
+ }
+
+ $strtokens = explode(' ', $args);
+ foreach ($strtokens as $value) {
+ if ($value !== '') {
+ $str .= ' "'.$value.'"';
+ }
+ }
+ return($str);
+}
+
+if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+ $result = 1;
+ if (! $global_admin) {
+ $result = 999;
+ } elseif (isset($_POST['submit_action'])) {
+ $result = 10;
+ $action = $_POST['fossil_action'];
+ $arg = isset($_POST['fossil_arg']) ? tuq($_POST['fossil_arg']) : '';
+ header('Location: '.$myself.'?action='.$action.'&arg='.rawurlencode($arg).'&result='.$result);
+ exit;
+ }
+ header('Location: '.$myself.'?result='.$result);
+ exit;
+} else { // Start of HTTP GET
+$ACCESS_RIGHTS = 'admin';
+require_once '../common/header.php';
+
+ $action = isset($_GET['action']) ? $_GET['action'] : '';
+ $arg = isset($_GET['arg']) ? rawurldecode($_GET['arg']) : '';
+
+ if ($action === 'status') {
+ $arg_str = '';
+ } elseif ($action === 'diff') {
+ $arg_str = multi_args($arg);
+ } elseif ($action === 'commit') {
+ $arg_str = ($arg !== '') ? '"'.$arg.'"' : '';
+ } elseif ($action === 'revert') {
+ $arg_str = multi_args($arg);
+ } else {
+ $action = '';
+ $arg_str = '';
+ }
+
+ putHtml("<center>");
+ if (isset($_GET['result'])) {
+ $result = $_GET['result'];
+ if ($result == 10 && $action !== '') {
+ putHtml('<p style="color: green;">Fossil Command: fossil-'.$action.' '.htmlspecialchars($arg_str).'</p>');
+ } elseif ($result == 99) {
+ putHtml('<p style="color: red;">Action Failed.</p>');
+ } elseif ($result == 999) {
+ putHtml('<p style="color: red;">Permission denied for user "'.$global_user.'".</p>');
+ } else {
+ putHtml('<p style="color: orange;">No Action.</p>');
+ }
+ } else {
+ putHtml('<p> </p>');
+ }
+ putHtml("</center>");
+?>
+ <center>
+ <table width="100%" class="layout"><tr><td><center>
+ <form method="post" action="<?php echo $myself;?>" enctype="multipart/form-data">
+ <table width="100%" class="stdtable">
+ <tr><td style="text-align: center;" colspan="2">
+ <h2>Fossil Commands:</h2>
+ </td></tr>
+<?php
+
+if (is_file('/var/run/fossil.pid')) {
+ putHtml('<tr><td style="text-align: center;" colspan="2">');
+ putHtml('<select name="fossil_action">');
+ foreach ($action_menu as $key => $value) {
+ putHtml('<option value="'.$key.'"'.$sel.'>'.$value.'</option>');
+ }
+ putHtml('</select>');
+ putHtml('<input type="text" size="48" maxlength="256" name="fossil_arg" value="" />');
+ putHtml('–');
+ putHtml('<input type="submit" value="Fossil Command" name="submit_action" />');
+ putHtml('</td></tr>');
+} else {
+ putHtml('<tr><td style="text-align: center;" colspan="2">');
+ putHtml('<p style="color: red;">The Fossil Server is not running, enable via the Network Tab.</p>');
+ putHtml('</td></tr>');
+}
+ putHtml('</table>');
+ putHtml('</form>');
+
+ putHtml("</center></td></tr></table>");
+ putHtml("</center>");
+
+if (is_file('/var/run/fossil.pid')) {
+ if ($action !== '') {
+ putHtml("<pre>");
+ $tmpfile = tempnam("/tmp", "PHP_");
+ @exec('cd /root;FOSSIL_HOME="/mnt/kd/fossil" fossil-'.$action.' '.$arg_str.' >'.$tmpfile.' 2>&1');
+ if (($fp = @fopen($tmpfile, "rb")) !== FALSE) {
+ $max = 250000;
+ $stat = fstat($fp);
+ if ($stat['size'] > $max) {
+ @fseek($fp, -$max, SEEK_END);
+ fgets($fp, 1024);
+ echo "<strong>----- File too large to display, showing the end of the file -----</strong>\n";
+ }
+ while (! feof($fp)) {
+ if ($line = fgets($fp, 1024)) {
+ echo htmlspecialchars($line);
+ }
+ }
+ fclose($fp);
+ }
+ @unlink($tmpfile);
+ putHtml("</pre>");
+ }
+}
+
+} // End of HTTP GET
+require_once '../common/footer.php';
+
+?>
Property changes on: branches/1.0/package/webinterface/altweb/admin/fossilcmd.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-02 16:51:23
|
Revision: 7303
http://sourceforge.net/p/astlinux/code/7303
Author: abelbeck
Date: 2015-11-02 16:51:20 +0000 (Mon, 02 Nov 2015)
Log Message:
-----------
web interface, add support for Connection Type: [Static IPv4/DHCPv6]
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/failover.php
branches/1.0/package/webinterface/altweb/admin/network.php
Modified: branches/1.0/package/webinterface/altweb/admin/failover.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/failover.php 2015-11-02 15:51:26 UTC (rev 7302)
+++ branches/1.0/package/webinterface/altweb/admin/failover.php 2015-11-02 16:51:20 UTC (rev 7303)
@@ -148,7 +148,7 @@
}
fwrite($fp, "### Static IPv4 Gateway\n".$value."\n");
- if ($_POST['ip_type'] === 'dhcp-dhcpv6') {
+ if ($_POST['ip_type'] === 'dhcp-dhcpv6' || $_POST['ip_type'] === 'static-dhcpv6') {
$value = 'EXT2DHCPV6_CLIENT_ENABLE="yes"';
} else {
$value = 'EXT2DHCPV6_CLIENT_ENABLE="no"';
@@ -404,8 +404,10 @@
putHtml('<option value="dhcp">DHCP</option>');
$sel = (getVARdef($db, 'EXT2IP', $cur_db) === '' && getVARdef($db, 'EXT2DHCPV6_CLIENT_ENABLE', $cur_db) === 'yes') ? ' selected="selected"' : '';
putHtml('<option value="dhcp-dhcpv6"'.$sel.'>DHCP/DHCPv6</option>');
- $sel = (getVARdef($db, 'EXT2IP', $cur_db) !== '') ? ' selected="selected"' : '';
+ $sel = (getVARdef($db, 'EXT2IP', $cur_db) !== '' && getVARdef($db, 'EXT2DHCPV6_CLIENT_ENABLE', $cur_db) !== 'yes') ? ' selected="selected"' : '';
putHtml('<option value="static"'.$sel.'>Static IP</option>');
+ $sel = (getVARdef($db, 'EXT2IP', $cur_db) !== '' && getVARdef($db, 'EXT2DHCPV6_CLIENT_ENABLE', $cur_db) === 'yes') ? ' selected="selected"' : '';
+ putHtml('<option value="static-dhcpv6"'.$sel.'>Static IPv4/DHCPv6</option>');
putHtml('</select>');
putHtml('</td></tr>');
Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php 2015-11-02 15:51:26 UTC (rev 7302)
+++ branches/1.0/package/webinterface/altweb/admin/network.php 2015-11-02 16:51:20 UTC (rev 7303)
@@ -230,7 +230,7 @@
}
fwrite($fp, "### External Static IPv4 Gateway\n".$value."\n");
- if ($_POST['ip_type'] === 'dhcp-dhcpv6') {
+ if ($_POST['ip_type'] === 'dhcp-dhcpv6' || $_POST['ip_type'] === 'static-dhcpv6') {
$value = 'DHCPV6_CLIENT_ENABLE="yes"';
} else {
$value = 'DHCPV6_CLIENT_ENABLE="no"';
@@ -1110,7 +1110,7 @@
} elseif ($result == 10) {
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 == 11) {
- putHtml('<p style="color: green;">Settings saved, click "Reboot/Restart" to apply any changed settings.</p>');
+ putHtml('<p style="color: green;">Settings saved, click "Reboot/Restart" to apply any changed settings, a "Reboot System" is required for Interface changes.</p>');
} elseif ($result == 21) {
putHtml('<p style="color: green;">PPPoE has Restarted.</p>');
} elseif ($result == 22) {
@@ -1307,8 +1307,10 @@
putHtml('<option value="dhcp">DHCP</option>');
$sel = (getVARdef($db, 'EXTIP', $cur_db) === '' && getVARdef($db, 'DHCPV6_CLIENT_ENABLE', $cur_db) === 'yes') ? ' selected="selected"' : '';
putHtml('<option value="dhcp-dhcpv6"'.$sel.'>DHCP/DHCPv6</option>');
- $sel = (getVARdef($db, 'EXTIP', $cur_db) !== '' && getVARdef($db, 'EXTIF', $cur_db) !== 'ppp0') ? ' selected="selected"' : '';
+ $sel = (getVARdef($db, 'EXTIP', $cur_db) !== '' && getVARdef($db, 'EXTIF', $cur_db) !== 'ppp0' && getVARdef($db, 'DHCPV6_CLIENT_ENABLE', $cur_db) !== 'yes') ? ' selected="selected"' : '';
putHtml('<option value="static"'.$sel.'>Static IP</option>');
+ $sel = (getVARdef($db, 'EXTIP', $cur_db) !== '' && getVARdef($db, 'EXTIF', $cur_db) !== 'ppp0' && getVARdef($db, 'DHCPV6_CLIENT_ENABLE', $cur_db) === 'yes') ? ' selected="selected"' : '';
+ putHtml('<option value="static-dhcpv6"'.$sel.'>Static IPv4/DHCPv6</option>');
$sel = (getVARdef($db, 'EXTIF', $cur_db) === 'ppp0') ? ' selected="selected"' : '';
putHtml('<option value="pppoe"'.$sel.'>PPPoE</option>');
putHtml('</select>');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-12-27 22:20:39
|
Revision: 7430
http://sourceforge.net/p/astlinux/code/7430
Author: abelbeck
Date: 2015-12-27 22:20:36 +0000 (Sun, 27 Dec 2015)
Log Message:
-----------
web interface, Network tab, IPSec, add all supported Diffie-Hellman group selections
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/ipsec.php
branches/1.0/package/webinterface/altweb/admin/ipsecmobile.php
Modified: branches/1.0/package/webinterface/altweb/admin/ipsec.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/ipsec.php 2015-12-26 14:13:28 UTC (rev 7429)
+++ branches/1.0/package/webinterface/altweb/admin/ipsec.php 2015-12-27 22:20:36 UTC (rev 7430)
@@ -56,7 +56,12 @@
$p1_dhgroup_menu = array (
'modp768' => '768 (1)',
'modp1024' => '1024 (2)',
- 'modp1536' => '1536 (5)'
+ 'modp1536' => '1536 (5)',
+ 'modp2048' => '2048 (14)',
+ 'modp3072' => '3072 (15)',
+ 'modp4096' => '4096 (16)',
+ 'modp6144' => '6144 (17)',
+ 'modp8192' => '8192 (18)'
);
$p2_auth_menu = array (
@@ -69,7 +74,12 @@
'none' => 'None',
'modp768' => '768 (1)',
'modp1024' => '1024 (2)',
- 'modp1536' => '1536 (5)'
+ 'modp1536' => '1536 (5)',
+ 'modp2048' => '2048 (14)',
+ 'modp3072' => '3072 (15)',
+ 'modp4096' => '4096 (16)',
+ 'modp6144' => '6144 (17)',
+ 'modp8192' => '8192 (18)'
);
$method_menu = array (
Modified: branches/1.0/package/webinterface/altweb/admin/ipsecmobile.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/ipsecmobile.php 2015-12-26 14:13:28 UTC (rev 7429)
+++ branches/1.0/package/webinterface/altweb/admin/ipsecmobile.php 2015-12-27 22:20:36 UTC (rev 7430)
@@ -122,7 +122,12 @@
$p1_dhgroup_menu = array (
'modp768' => '768 (1)',
'modp1024' => '1024 (2)',
- 'modp1536' => '1536 (5)'
+ 'modp1536' => '1536 (5)',
+ 'modp2048' => '2048 (14)',
+ 'modp3072' => '3072 (15)',
+ 'modp4096' => '4096 (16)',
+ 'modp6144' => '6144 (17)',
+ 'modp8192' => '8192 (18)'
);
$p2_hashes_menu = array (
@@ -135,7 +140,12 @@
'none' => 'None',
'modp768' => '768 (1)',
'modp1024' => '1024 (2)',
- 'modp1536' => '1536 (5)'
+ 'modp1536' => '1536 (5)',
+ 'modp2048' => '2048 (14)',
+ 'modp3072' => '3072 (15)',
+ 'modp4096' => '4096 (16)',
+ 'modp6144' => '6144 (17)',
+ 'modp8192' => '8192 (18)'
);
$key_size_menu = array (
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-10-03 21:42:06
|
Revision: 7876
http://sourceforge.net/p/astlinux/code/7876
Author: abelbeck
Date: 2016-10-03 21:42:03 +0000 (Mon, 03 Oct 2016)
Log Message:
-----------
web interface, added miscellaneous sanity checks
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/cdrlog.php
branches/1.0/package/webinterface/altweb/admin/followme.php
branches/1.0/package/webinterface/altweb/admin/fossilcmd.php
branches/1.0/package/webinterface/altweb/admin/setup.php
branches/1.0/package/webinterface/altweb/admin/system.php
branches/1.0/package/webinterface/altweb/admin/users.php
branches/1.0/package/webinterface/altweb/admin/xmpp.php
Modified: branches/1.0/package/webinterface/altweb/admin/cdrlog.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/cdrlog.php 2016-10-03 14:03:28 UTC (rev 7875)
+++ branches/1.0/package/webinterface/altweb/admin/cdrlog.php 2016-10-03 21:42:03 UTC (rev 7876)
@@ -1,6 +1,6 @@
<?php session_start();
-// Copyright (C) 2008-2015 Lonnie Abelbeck
+// Copyright (C) 2008-2016 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
@@ -528,7 +528,7 @@
$db['displayStart'] = 0;
}
if (isset($_POST['list_type_val'])) {
- $search = tuqd($_POST['list_type_val']);
+ $search = tuq($_POST['list_type_val']);
$search = trim($search, ' |&"');
if ($search === '') {
$result = 0;
@@ -612,7 +612,7 @@
$map = mapCDRvalues($default, $extra, $last);
if (isset($_GET['search'])) {
- $search = rawurldecode($_GET['search']);
+ $search = tuq(rawurldecode($_GET['search']));
if (isset($_GET['key'])) {
$fkey = $_GET['key'];
} else {
Modified: branches/1.0/package/webinterface/altweb/admin/followme.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/followme.php 2016-10-03 14:03:28 UTC (rev 7875)
+++ branches/1.0/package/webinterface/altweb/admin/followme.php 2016-10-03 21:42:03 UTC (rev 7876)
@@ -1,6 +1,6 @@
<?php
-// Copyright (C) 2008-2009 Lonnie Abelbeck
+// Copyright (C) 2008-2016 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
@@ -215,10 +215,10 @@
}
}
}
- if (($value = getPREFdef($global_prefs, 'followme_number_context_cmdstr')) !== '') {
+ if (($value = tuq(getPREFdef($global_prefs, 'followme_number_context_cmdstr'))) !== '') {
$cmd .= 'context=>'.$value.chr(10);
}
- if (($value = getPREFdef($global_prefs, 'followme_music_class_cmdstr')) !== '') {
+ if (($value = tuq(getPREFdef($global_prefs, 'followme_music_class_cmdstr'))) !== '') {
$cmd .= 'musicclass=>'.$value.chr(10);
}
shell('echo -n "'.chr(10).$cmd.'" >>'.$fname, $status);
@@ -269,8 +269,8 @@
}
$enabled = isset($_POST['enabled']) ? $_POST['enabled'] : array();
for ($i = 0; $i < $MAXNUM; $i++) {
- $number[$i] = tuqd($_POST["number$i"]);
- $timeout[$i] = tuqd($_POST["timeout$i"]);
+ $number[$i] = tuq($_POST["number$i"]);
+ $timeout[$i] = tuq($_POST["timeout$i"]);
if ($USE_RULES && $number[$i] !== '') {
if (! preg_match("/$NUMBER_FORMAT/", $number[$i])) {
$result = 12;
Modified: branches/1.0/package/webinterface/altweb/admin/fossilcmd.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/fossilcmd.php 2016-10-03 14:03:28 UTC (rev 7875)
+++ branches/1.0/package/webinterface/altweb/admin/fossilcmd.php 2016-10-03 21:42:03 UTC (rev 7876)
@@ -1,6 +1,6 @@
<?php
-// Copyright (C) 2008-2015 Lonnie Abelbeck
+// Copyright (C) 2008-2016 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
@@ -55,7 +55,7 @@
require_once '../common/header.php';
$action = isset($_GET['action']) ? $_GET['action'] : '';
- $arg = isset($_GET['arg']) ? rawurldecode($_GET['arg']) : '';
+ $arg = isset($_GET['arg']) ? tuq(rawurldecode($_GET['arg'])) : '';
if ($action === 'status') {
$arg_str = '';
Modified: branches/1.0/package/webinterface/altweb/admin/setup.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/setup.php 2016-10-03 14:03:28 UTC (rev 7875)
+++ branches/1.0/package/webinterface/altweb/admin/setup.php 2016-10-03 21:42:03 UTC (rev 7876)
@@ -1,6 +1,6 @@
<?php
-// Copyright (C) 2008-2009 Lonnie Abelbeck
+// Copyright (C) 2008-2016 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
@@ -72,7 +72,7 @@
} elseif (isset($_POST['submit_format'])) {
if (isset($_POST['format_type']) && isset($_POST['unionfs_size']) && isset($_POST['target_drive'])) {
$format_type = $_POST['format_type'];
- $target_drive = $_POST['target_drive'];
+ $target_drive = tuq($_POST['target_drive']);
if ($format_type === 'combined') {
$result_str = shell($INITIAL_SETUP.' format combined '.$target_drive.' 2>/dev/null', $status);
if ($status != 0) {
@@ -82,7 +82,7 @@
systemREBOOT($myself, 10, TRUE);
}
} else {
- $unionfs_size = $_POST['unionfs_size'];
+ $unionfs_size = tuq($_POST['unionfs_size']);
if ($unionfs_size > 9) {
$result_str = shell($INITIAL_SETUP.' format separate '.$target_drive.' '.$unionfs_size.' 2>/dev/null', $status);
if ($status != 0) {
@@ -98,7 +98,7 @@
}
} elseif (isset($_POST['submit_configure'])) {
if (isset($_POST['target_drive'])) {
- $target_drive = $_POST['target_drive'];
+ $target_drive = tuq($_POST['target_drive']);
$result_str = shell($INITIAL_SETUP.' configure '.$target_drive.' 2>/dev/null', $status);
if ($status != 0) {
putACTIONresult($result_str, $status);
Modified: branches/1.0/package/webinterface/altweb/admin/system.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/system.php 2016-10-03 14:03:28 UTC (rev 7875)
+++ branches/1.0/package/webinterface/altweb/admin/system.php 2016-10-03 21:42:03 UTC (rev 7876)
@@ -1,6 +1,6 @@
<?php
-// Copyright (C) 2008-2014 Lonnie Abelbeck
+// Copyright (C) 2008-2016 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
@@ -28,11 +28,11 @@
require_once '../common/users-password.php';
-if (($REPOSITORY_URL = getPREFdef($global_prefs, 'system_firmware_repository_url')) === '') {
+if (($REPOSITORY_URL = tuq(getPREFdef($global_prefs, 'system_firmware_repository_url'))) === '') {
$REPOSITORY_URL = asteriskURLrepo();
}
-if (($SOUNDS_URL = getPREFdef($global_prefs, 'system_asterisk_sounds_url')) === '') {
+if (($SOUNDS_URL = tuq(getPREFdef($global_prefs, 'system_asterisk_sounds_url'))) === '') {
$SOUNDS_URL = 'http://downloads.asterisk.org/pub/telephony/sounds';
}
@@ -333,9 +333,9 @@
$action = $_POST['sounds_action'];
if (isset($_POST['sounds_type'], $_POST['sounds_lang'], $_POST['sounds_codec']) &&
($_POST['sounds_type'] !== '' || $action === 'show')) {
- $type = $_POST['sounds_type'];
- $lang = $_POST['sounds_lang'];
- $codec = $_POST['sounds_codec'];
+ $type = tuq($_POST['sounds_type']);
+ $lang = tuq($_POST['sounds_lang']);
+ $codec = tuq($_POST['sounds_codec']);
$file = '/usr/sbin/upgrade-asterisk-sounds';
$std_err = ' 2>/dev/null';
if ($action === 'upgrade') {
@@ -360,7 +360,7 @@
$result = 99;
$action = $_POST['addon_package_action'];
if (isset($_POST['addon_package_type']) && ($_POST['addon_package_type'] !== '' || $action === 'show')) {
- $type = $_POST['addon_package_type'];
+ $type = tuq($_POST['addon_package_type']);
$file = '/usr/sbin/upgrade-package';
$std_err = ' 2>/dev/null';
if ($action === 'upgrade') {
Modified: branches/1.0/package/webinterface/altweb/admin/users.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/users.php 2016-10-03 14:03:28 UTC (rev 7875)
+++ branches/1.0/package/webinterface/altweb/admin/users.php 2016-10-03 21:42:03 UTC (rev 7876)
@@ -1,6 +1,6 @@
<?php
-// Copyright (C) 2008-2014 Lonnie Abelbeck
+// Copyright (C) 2008-2016 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
@@ -20,7 +20,7 @@
require_once '../common/users-password.php';
-if (($context = getPREFdef($global_prefs, 'users_voicemail_context_cmdstr')) === '') {
+if (($context = tuq(getPREFdef($global_prefs, 'users_voicemail_context_cmdstr'))) === '') {
$context = 'default';
}
Modified: branches/1.0/package/webinterface/altweb/admin/xmpp.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/xmpp.php 2016-10-03 14:03:28 UTC (rev 7875)
+++ branches/1.0/package/webinterface/altweb/admin/xmpp.php 2016-10-03 21:42:03 UTC (rev 7876)
@@ -202,6 +202,8 @@
//
function deleteUser($user) {
+ $user = str_replace(' ', '', stripshellsafe($user));
+
if ($user === '') {
return(FALSE);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X