[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[4385] trunk

Subject: SF.net SVN: ledger-smb:[4385] trunk
From: ..hidden..
Date: Tue, 06 Mar 2012 02:04:16 +0000
Revision: 4385
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4385&view=rev
Author:   einhverfr
Date:     2012-03-06 02:04:15 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/Changelog
    trunk/LedgerSMB/Database.pm
    trunk/UI/lib/elements.html
    trunk/dists/rpm/ledgersmb.spec

Property Changed:
----------------
    trunk/
    trunk/LedgerSMB/Scripts/account.pm
    trunk/LedgerSMB/Scripts/admin.pm
    trunk/LedgerSMB/Scripts/customer.pm
    trunk/LedgerSMB/Scripts/employee.pm
    trunk/LedgerSMB/Scripts/file.pm
    trunk/LedgerSMB/Scripts/journal.pm
    trunk/LedgerSMB/Scripts/login.pm
    trunk/LedgerSMB/Scripts/menu.pm
    trunk/LedgerSMB/Scripts/payment.pm
    trunk/LedgerSMB/Scripts/recon.pm
    trunk/LedgerSMB/Scripts/setup.pm
    trunk/LedgerSMB/Scripts/taxform.pm
    trunk/LedgerSMB/Scripts/vendor.pm
    trunk/sql/upgrade/1.2-1.3-manual.sql


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-4372
   + /branches/1.3:3711-4384

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2012-03-06 01:56:21 UTC (rev 4384)
+++ trunk/Changelog	2012-03-06 02:04:15 UTC (rev 4385)
@@ -31,6 +31,11 @@
 Initial Release:  Monday, Oct 12 2011
 Supported Presently
 
+Changelog for 1.3.13
+* Reduced log messages when upgrading/creating db, for some log levels (Chris T)
+* Changed db setup not to use createdb for simple admin of pg_hba.conf (Chris T)
+* Corrected type = 'password' not handled properly in elements.html (Chris T)
+
 Changelog for 1.3.12
 * Corrected processing of <?lsmb tags in order/invoice numbers (Chris T)
 * Corrected handling of accounts in dropdowns where () are present (Chris T)

Modified: trunk/LedgerSMB/Database.pm
===================================================================
--- trunk/LedgerSMB/Database.pm	2012-03-06 01:56:21 UTC (rev 4384)
+++ trunk/LedgerSMB/Database.pm	2012-03-06 02:04:15 UTC (rev 4385)
@@ -394,9 +394,23 @@
     # We have to use template0 because of issues that Debian has with database 
     # encoding.  Apparently that causes problems for us, so template0 must be
     # used.
-    my $rc = system("createdb -T template0 -E UTF8 > $temp/dblog");
+    #
+    # Also moved away from createdb here because at least for some versions of
+    # PostgreSQL, it connects to the postgres db in order to issue the CREATE DATABASE
+    # command.  This makes it harder to adequately secure the platform via pg_hba.conf.
+    # 
+    # Hat tip:  irc user nwnw -- CT
+
+    use DBI;
+    my $dbh = DBI->connect('dbi:Pg:dbname=template1');
+
+    $dbh->{RaiseError} = 1;
+    $dbh->{AutoCommit} = 1;
+    my $dbn = $dbh->quote_identifier($ENV{PGDATABASE});
+    my $rc = $dbh->do("CREATE DATABASE $dbn WITH TEMPLATE template0 ENCODING 'UTF8'");
+
     $logger->trace("after create db \$rc=$rc");
-    if ($rc) {
+    if (!$rc) {
         return $rc;
     }
     my $rc2=0;


Property changes on: trunk/LedgerSMB/Scripts/account.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4372
/branches/1.3/scripts/account.pl:3711-4368
   + /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4384
/branches/1.3/scripts/account.pl:3711-4368


Property changes on: trunk/LedgerSMB/Scripts/admin.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4372
/branches/1.3/scripts/admin.pl:3711-3903,4273-4287
   + /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4384
/branches/1.3/scripts/admin.pl:3711-3903,4273-4287


Property changes on: trunk/LedgerSMB/Scripts/customer.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4372
/branches/1.3/scripts/customer.pl:4273-4287
   + /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4384
/branches/1.3/scripts/customer.pl:4273-4287


Property changes on: trunk/LedgerSMB/Scripts/employee.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4372
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
   + /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4384
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310


Property changes on: trunk/LedgerSMB/Scripts/file.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4372
/branches/1.3/scripts/file.pl:3711-4138
   + /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4384
/branches/1.3/scripts/file.pl:3711-4138


Property changes on: trunk/LedgerSMB/Scripts/journal.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/journal.pm:4288-4372
/branches/1.3/scripts/journal.pl:3711-4328
   + /branches/1.3/LedgerSMB/Scripts/journal.pm:4288-4384
/branches/1.3/scripts/journal.pl:3711-4328


Property changes on: trunk/LedgerSMB/Scripts/login.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/login.pm:4193-4372
/branches/1.3/scripts/login.pl:3711-4192
   + /branches/1.3/LedgerSMB/Scripts/login.pm:4193-4384
/branches/1.3/scripts/login.pl:3711-4192


Property changes on: trunk/LedgerSMB/Scripts/menu.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/menu.pm:4155-4372
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287
   + /branches/1.3/LedgerSMB/Scripts/menu.pm:4155-4384
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287


Property changes on: trunk/LedgerSMB/Scripts/payment.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4372
/branches/1.3/scripts/payment.pl:3711-4310
   + /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4384
/branches/1.3/scripts/payment.pl:3711-4310


Property changes on: trunk/LedgerSMB/Scripts/recon.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4372
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287
   + /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4384
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287


Property changes on: trunk/LedgerSMB/Scripts/setup.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4372
/branches/1.3/scripts/setup.pl:3711-4216,4273-4287
   + /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4384
/branches/1.3/scripts/setup.pl:3711-4216,4273-4287


Property changes on: trunk/LedgerSMB/Scripts/taxform.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4372
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
   + /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4384
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287


Property changes on: trunk/LedgerSMB/Scripts/vendor.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4372
/branches/1.3/scripts/vendor.pl:4273-4287
   + /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4384
/branches/1.3/scripts/vendor.pl:4273-4287

Modified: trunk/UI/lib/elements.html
===================================================================
--- trunk/UI/lib/elements.html	2012-03-06 01:56:21 UTC (rev 4384)
+++ trunk/UI/lib/elements.html	2012-03-06 02:04:15 UTC (rev 4385)
@@ -59,7 +59,7 @@
 	      CASE ['radio'];
 	        input_type_keys = input_keys.merge(['checked']);
 	      CASE ['password'];
-                element_data.type = 'password';
+	        input_type_keys = input_keys;
 	        input_defaults = password_defaults;
 	      CASE 'text';
 	        input_type_keys = input_keys.merge(['maxlength', 'readonly']);

Modified: trunk/dists/rpm/ledgersmb.spec
===================================================================
--- trunk/dists/rpm/ledgersmb.spec	2012-03-06 01:56:21 UTC (rev 4384)
+++ trunk/dists/rpm/ledgersmb.spec	2012-03-06 02:04:15 UTC (rev 4385)
@@ -1,7 +1,7 @@
 # RPM spec written for and tested on CentOS 4 and CentOS 5 
 Summary: LedgerSMB - Open Source accounting software
 Name: ledgersmb
-Version: 1.3.11
+Version: 1.3.12
 Release: 1
 License: GPL
 URL: http://www.ledgersmb.org/


Property changes on: trunk/sql/upgrade/1.2-1.3-manual.sql
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/sql/upgrade/1.2-1.3-manual.sql:3712-4372
/branches/1.3/sql/upgrade/1.2-1.3.sql:3711-3851
/trunk/sql/upgrade/1.2-1.3.sql:858-3710
   + /branches/1.3/sql/upgrade/1.2-1.3-manual.sql:3712-4384
/branches/1.3/sql/upgrade/1.2-1.3.sql:3711-3851
/trunk/sql/upgrade/1.2-1.3.sql:858-3710

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Prev by Date: SF.net SVN: ledger-smb:[4384] branches/1.3
Next by Date: SF.net SVN: ledger-smb:[4386] branches/1.3/doc/release_notes
Previous by thread: SF.net SVN: ledger-smb:[4384] branches/1.3
Next by thread: SF.net SVN: ledger-smb:[4386] branches/1.3/doc/release_notes
Index(es):
- Date
- Thread