Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[6612] branches/1.0/package/webinterface/altweb
|
From: <abe...@us...> - 2014-07-31 16:33:22
|
Revision: 6612
http://sourceforge.net/p/astlinux/code/6612
Author: abelbeck
Date: 2014-07-31 16:33:19 +0000 (Thu, 31 Jul 2014)
Log Message:
-----------
web interface, Network tab, add support for SMTP Local Aliases: and editing the file /mnt/kd/msmtp-aliases.conf
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/common/license-packages.txt
branches/1.0/package/webinterface/altweb/common/version.php
Modified: branches/1.0/package/webinterface/altweb/admin/edit.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/edit.php 2014-07-31 04:09:35 UTC (rev 6611)
+++ branches/1.0/package/webinterface/altweb/admin/edit.php 2014-07-31 16:33:19 UTC (rev 6612)
@@ -50,6 +50,7 @@
'ddclient.conf' => 'DDclient Dynamic DNS Config',
'dnsmasq.conf' => 'DNSmasq Configuration',
'misdn-init.conf' => 'mISDN Configuration',
+ 'msmtp-aliases.conf' => 'SMTP Local Aliases',
'ntpd.conf' => 'NTP Time Client/Server',
'sshd.conf' => 'SSH Server sshd_config',
'ldap.conf' => 'LDAP Client System Defaults',
Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php 2014-07-31 04:09:35 UTC (rev 6611)
+++ branches/1.0/package/webinterface/altweb/admin/network.php 2014-07-31 16:33:19 UTC (rev 6612)
@@ -846,6 +846,12 @@
$result = saveNETWORKsettings($NETCONFDIR, $NETCONFFILE);
header('Location: /admin/testmail.php');
exit;
+ } elseif (isset($_POST['submit_smtp_aliases'])) {
+ $result = saveNETWORKsettings($NETCONFDIR, $NETCONFFILE);
+ if (is_writable($file = '/mnt/kd/msmtp-aliases.conf')) {
+ header('Location: /admin/edit.php?file='.$file);
+ exit;
+ }
} elseif (isset($_POST['submit_dns_hosts'])) {
$result = saveNETWORKsettings($NETCONFDIR, $NETCONFFILE);
header('Location: /admin/dnshosts.php');
@@ -1547,6 +1553,11 @@
$value = getVARdef($db, 'SMTP_PASS', $cur_db);
$value = htmlspecialchars(RCconfig2string($value));
putHtml('SMTP Password:<input type="password" size="24" maxlength="64" value="'.$value.'" name="smtp_pass" /></td></tr>');
+ if (is_file('/mnt/kd/msmtp-aliases.conf')) {
+ putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="6">');
+ putHtml('SMTP Local Aliases:');
+ putHtml('<input type="submit" value="Edit Local Aliases" name="submit_smtp_aliases" class="button" /></td></tr>');
+ }
putHtml('<tr class="dtrow0"><td colspan="6"> </td></tr>');
Modified: branches/1.0/package/webinterface/altweb/common/license-packages.txt
===================================================================
--- branches/1.0/package/webinterface/altweb/common/license-packages.txt 2014-07-31 04:09:35 UTC (rev 6611)
+++ branches/1.0/package/webinterface/altweb/common/license-packages.txt 2014-07-31 16:33:19 UTC (rev 6612)
@@ -13,30 +13,30 @@
shellinabox~Copyright (c) 2008-2010 Markus Gutschke.
Asterisk~Copyright (c) 1999-2014 Digium, Inc.
DAHDI~Copyright (c) 2001-2014 Digium, Inc.
-libPRI~Copyright (c) 2001-2012 Digium, Inc.
+libPRI~Copyright (c) 2001-2014 Digium, Inc.
Arno's Firewall~Copyright (c) 2001-2014 by Arno van Amersfoort.
dnsmasq~Copyright (c) 2000-2014 Simon Kelley.
-OpenSSL~Copyright (c) 1998-2012 The OpenSSL Project. All rights reserved.
-OpenSSH~Copyright (c) 1995 Tatu Ylonen <yl...@cs...>, Espoo, Finland. All rights reserved.
-OpenVPN~Copyright (c) 2002-2012 OpenVPN Technologies, Inc. <sa...@op...>
-PHP~Copyright (c) 1999-2013 The PHP Group. All rights reserved.
+OpenSSL~Copyright (c) 1998-2014 The OpenSSL Project. All rights reserved.
+OpenSSH~Copyright (c) 1995-2014 Tatu Ylonen <yl...@cs...>, Espoo, Finland. All rights reserved.
+OpenVPN~Copyright (c) 2002-2014 OpenVPN Technologies, Inc. <sa...@op...>
+PHP~Copyright (c) 1999-2014 The PHP Group. All rights reserved.
ntpd~Copyright (c) 1992-2009 David L. Mills.
-vsftpd~Copyright (c) 2001 Daniel Jacobowitz. <da...@de...>
-lighttpd~Copyright (c) 2004-2013, Jan Kneschke.
-radvd~Copyright (c) 1996-2012 by Lars Fenneberg <lf...@el...>
-msmtp~Copyright (c) 2000-2012 Martin Lambers <ma...@ma...>
+vsftpd~Copyright (c) 2001-2013 Daniel Jacobowitz. <da...@de...>
+lighttpd~Copyright (c) 2004-2014, Jan Kneschke.
+radvd~Copyright (c) 1996-2014 by Reuben Hawkins, et al.
+msmtp~Copyright (c) 2000-2014 Martin Lambers <ma...@ma...>
libxml2~Copyright (c) 1998-2012 Daniel Veillard. All Rights Reserved.
libtiff~Copyright (c) 1988-1997 Sam Leffler, Copyright (c) 1991-1997 Silicon Graphics, Inc.
-libjpeg~Copyright (c) 1991-2010, Thomas G. Lane, Guido Vollbeding.
-iptables~Copyright (c) 2000-2012 by the netfilter coreteam <cor...@ne...>
-curl~Copyright (c) 1996-2011 Daniel Stenberg, <da...@ha...>.
+libjpeg~Copyright (c) 1991-2014, Thomas G. Lane, Guido Vollbeding.
+iptables~Copyright (c) 2000-2013 by the netfilter coreteam <cor...@ne...>
+curl~Copyright (c) 1996-2014 Daniel Stenberg, <da...@ha...>.
mDNS~Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
rp-pppoe~Copyright (c) 2001-2012 Roaring Penguin Software Inc.
-zabbix~Copyright (c) 2000-2013 SIA Zabbix.
-zlib~Copyright (c) 1995-2005 Jean-loup Gailly.
+zabbix~Copyright (c) 2000-2014 SIA Zabbix.
+zlib~Copyright (c) 1995-2013 Jean-loup Gailly.
SILK CODEC~Copyright (c) 2010-2012 Skype and/or Microsoft. All rights reserved. Licensed via Digium, Inc.
-SpanDSP~Copyright (c) 2003-2012 Steve Underwood <st...@co...>. All rights reserved.
-Prosody~Copyright (c) 2008-2013 Matthew Wild and Waqas Hussain.
+SpanDSP~Copyright (c) 2003-2014 Steve Underwood <st...@co...>. All rights reserved.
+Prosody~Copyright (c) 2008-2014 Matthew Wild and Waqas Hussain.
clix~Copyright (c) 2008-2013 Matthew Wild.
Lua~Copyright (c) 1994-2012 Lua.org, PUC-Rio. All rights reserved.
perl~Copyright (c) 1987-2013 by Larry Wall, et al.
@@ -44,7 +44,7 @@
FOP2~Copyright (c) 2009-2014 House Internet S.R.L. (http://www.fop2.com)
ddclient~Copyright (c) 1999-2013 Paul Burry, wimpunk, et al.
vCard converter~Copyright (c) 2006-2013 Thomas Bruederli <th...@br...>
-OpenLDAP~Copyright (c) 1998-2013 The OpenLDAP Foundation. All rights reserved.
+OpenLDAP~Copyright (c) 1998-2014 The OpenLDAP Foundation. All rights reserved.
darkstat~Copyright (c) 2001-2014 Emil Mikulic, et al.
NUT~Copyright (c) 1999-2013 Russell Kroll, Arnaud Quette, et al.
iftop~Copyright (c) 2002-2014 Paul Warren, Chris Lightfoot, et al.
Modified: branches/1.0/package/webinterface/altweb/common/version.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/version.php 2014-07-31 04:09:35 UTC (rev 6611)
+++ branches/1.0/package/webinterface/altweb/common/version.php 2014-07-31 16:33:19 UTC (rev 6612)
@@ -1,6 +1,6 @@
<?php
// version.php for AstLinux Alternate Web Interface
-$GUI_VERSION = '1.8.28';
+$GUI_VERSION = '1.8.29';
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
