SF.net SVN: ledger-smb: [923]

[..hidden..]

Revision: 923
          http://svn.sourceforge.net/ledger-smb/?rev=923&view=rev
Author:   linuxpoet
Date:     2007-03-16 19:03:32 -0700 (Fri, 16 Mar 2007)

Log Message:
-----------
Ripped out applicaton lock functionality. If you are upgrading schedule an outage.
Removed now deprecated users directory in 1.2 as well

Modified Paths:
--------------
    branches/1.2/bin/admin.pl
    trunk/bin/admin.pl

Removed Paths:
-------------
    branches/1.2/users/

Modified: branches/1.2/bin/admin.pl
===================================================================
--- branches/1.2/bin/admin.pl	2007-03-17 01:50:10 UTC (rev 922)
+++ branches/1.2/bin/admin.pl	2007-03-17 02:03:32 UTC (rev 923)
@@ -199,12 +199,6 @@
 
 sub list_users {
 
-	#currently, this is disabled, but will set a value in the central db
-	#$nologin = qq|<button type="submit" class="submit" name="action" value="lock_system">|.$locale->text('Lock System').qq|</button>|;
-	#
-	#if (-e "${LedgerSMB::Sysconfig::userspath}/nologin") {
-	#	$nologin = qq|<button type="submit" class="submit" name="action" value="unlock_system">|.$locale->text('Unlock System').qq|</button>|;
-	#}
 
 	# use the central database handle
 	my $dbh = ${LedgerSMB::Sysconfig::GLOBALDBH};

Modified: trunk/bin/admin.pl
===================================================================
--- trunk/bin/admin.pl	2007-03-17 01:50:10 UTC (rev 922)
+++ trunk/bin/admin.pl	2007-03-17 02:03:32 UTC (rev 923)
@@ -199,23 +199,15 @@
 
 sub list_users {
 
-	#currently, this is disabled, but will set a value in the central db
-	#$nologin = qq|<button type="submit" class="submit" name="action" value="lock_system">|.$locale->text('Lock System').qq|</button>|;
-	#
-	#if (-e "${LedgerSMB::Sysconfig::userspath}/nologin") {
-	#	$nologin = qq|<button type="submit" class="submit" name="action" value="unlock_system">|.$locale->text('Unlock System').qq|</button>|;
-	#}
 
 	# use the central database handle
 	my $dbh = ${LedgerSMB::Sysconfig::GLOBALDBH};
 
-	my $fetchMembers = $dbh->selectall_arrayref("SELECT uc.name, uc.company, uc.templates,
-														uc.dbuser, uc.dbdriver, uc.dbname, 
-														uc.dbhost, u.username
-												   FROM users as u, users_conf as uc
-												  WHERE u.id = uc.id	
-													AND u.id > 1
-											   ORDER BY u.username;", { Slice => {} });	
+	my $fetchMembers = $dbh->selectall_arrayref("SELECT uc.name, uc.company, uc.templates, uc.dbuser, uc.dbdriver, uc.dbname, uc.dbhost, u.username 
+							    FROM users as u, users_conf as uc
+							    WHERE u.id = uc.id	
+							    AND u.id > 1
+							    ORDER BY u.username;", { Slice => {} });	
 
 	my @memberArray = ();
 	my @member = ();


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