[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop:[4269] ipcop/trunk
From:       eoberlander () users ! sourceforge ! net
Date:       2010-02-20 17:19:29
Message-ID: E1NiszJ-0001Sl-8t () sfp-svn-5 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 4269
          http://ipcop.svn.sourceforge.net/ipcop/?rev=4269&view=rev
Author:   eoberlander
Date:     2010-02-20 17:19:28 +0000 (Sat, 20 Feb 2010)

Log Message:
-----------
Rearrange test for sort method, in case variable is empty.

Modified Paths:
--------------
    ipcop/trunk/src/libs/general-functions.pl
    ipcop/trunk/updates/1.9.13/ROOTFILES.i486-1.9.13

Modified: ipcop/trunk/src/libs/general-functions.pl
===================================================================
--- ipcop/trunk/src/libs/general-functions.pl	2010-02-20 16:29:40 UTC (rev 4268)
+++ ipcop/trunk/src/libs/general-functions.pl	2010-02-20 17:19:28 UTC (rev 4269)
@@ -1241,9 +1241,11 @@
     }
     close(LEASES);
 
-    #Get sort method
-    $dhcpsettings{'SORT_LEASELIST'} = 'IPADDR';     #default
-    &General::readhash('/var/ipcop/dhcp/settings', \%dhcpsettings);    #or maybe \
saved ! +    # Get sort method
+    &General::readhash('/var/ipcop/dhcp/settings', \%dhcpsettings);  # maybe saved?
+    if ($dhcpsettings{'SORT_LEASELIST'} eq '') {
+        $dhcpsettings{'SORT_LEASELIST'} = 'IPADDR';                  # default, if \
not +    }
 
     # Add visual indicators to column headings to show sort order - EO
     my ($a1, $a2, $a3, $a4) = '';

Modified: ipcop/trunk/updates/1.9.13/ROOTFILES.i486-1.9.13
===================================================================
--- ipcop/trunk/updates/1.9.13/ROOTFILES.i486-1.9.13	2010-02-20 16:29:40 UTC (rev \
                4268)
+++ ipcop/trunk/updates/1.9.13/ROOTFILES.i486-1.9.13	2010-02-20 17:19:28 UTC (rev \
4269) @@ -1,6 +1,7 @@
 ## please place IPCop files first, then packages sorted by alphabetical order
 /home/httpd/cgi-bin/connections.cgi
 /home/httpd/cgi-bin/dhcp.cgi
+/usr/lib/ipcop/general-functions.pl
 # dnsmasq-2.52
 /usr/sbin/dnsmasq
 # logrotate relinked to popt-1.15


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

------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn


[prev in list] [next in list] [prev in thread] [next in thread]