SF.net SVN: ledger-smb:[5204] branches/1.3

[..hidden..]

Revision: 5204
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5204&view=rev
Author:   einhverfr
Date:     2012-11-17 12:13:31 +0000 (Sat, 17 Nov 2012)
Log Message:
-----------
More fcgi fixes
Also hid backup buttons when db not found
Also added 'Add User' button to setup.pl confirmation screen when 1.3 db found

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/UI/setup/confirm_operation.html
    branches/1.3/common.pl
    branches/1.3/old-handler.pl
    branches/1.3/scripts/asset.pl
    branches/1.3/scripts/file.pl
    branches/1.3/scripts/setup.pl

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2012-11-16 23:03:16 UTC (rev 5203)
+++ branches/1.3/Changelog	2012-11-17 12:13:31 UTC (rev 5204)
@@ -22,6 +22,9 @@
 * Fixed alignment issue on Contact screen on Chrome (Chris T)
 * Fixed cannot reconcile account with negative balance(Havard S, Erik H, h/t Nick P,3586757)
 * Documented cache_templates option in ledgersmb.conf (Chris T)
+* Fixed internal server error on plack with backups (Chris T)
+* Added add user button to setup.pl when LedgerSMB 1.3 db detected (Chris T)
+* Backup buttons do not show when no db found (Chris T)
 
 Berend T is Berend Tober
 Chris T is Chris Travers

Modified: branches/1.3/UI/setup/confirm_operation.html
===================================================================
--- branches/1.3/UI/setup/confirm_operation.html	2012-11-16 23:03:16 UTC (rev 5203)
+++ branches/1.3/UI/setup/confirm_operation.html	2012-11-17 12:13:31 UTC (rev 5204)
@@ -25,6 +25,19 @@
     text = text('Yes') 
 } ?>
 </div>
+<div id="sep" class="listheading"><?lsmb text('Other Actions') ?></div>
+<?lsmb IF next_action == 'rebuild_modules' ?>
+<div id="user">
+<?lsmb INCLUDE button element_data = {
+    name = 'action'
+   value = 'skip_coa'
+    type = 'submit'
+   class = 'submit'
+    text = text('Add User') #'
+}; ?>
+</div>
+<?lsmb END ?> 
+<?lsmb IF next_action != 'create_db' ?>
 <div id="others"><?lsmb text('Backup') ?></div>
 <div class="inputrow">
 <?lsmb INCLUDE button element_data = {
@@ -42,6 +55,7 @@
     text = text('Backup Roles') #' 
 } ?>
 </div>
+<?lsmb END ?>
 </form>
 </body>
 </html>

Modified: branches/1.3/common.pl
===================================================================
--- branches/1.3/common.pl	2012-11-16 23:03:16 UTC (rev 5203)
+++ branches/1.3/common.pl	2012-11-17 12:13:31 UTC (rev 5204)
@@ -34,12 +34,12 @@
     if ( !$script ) {    # http redirect to login.pl if called w/no args
         print "Location: login.pl\n";
         print "Content-type: text/html\n\n";
-        exit;
+        return;
     }
     if (first { $_ eq $script } @{LedgerSMB::Sysconfig::newscripts}){
         print "Location: $form->{callback}\n";
         print "Content-type: text/html\n\n";
-        exit;
+        return;
     }
     $form->error(
         $locale->text(

Modified: branches/1.3/old-handler.pl
===================================================================
--- branches/1.3/old-handler.pl	2012-11-16 23:03:16 UTC (rev 5203)
+++ branches/1.3/old-handler.pl	2012-11-17 12:13:31 UTC (rev 5204)
@@ -208,11 +208,11 @@
         #check for valid session
         if ( !LedgerSMB::Auth::session_check( $cookie{${LedgerSMB::Sysconfig::cookie_name}}, $form ) ) {
             &getpassword(1);
-            exit;
+            return;
         }
     }
     else {
-        exit;
+        return;
     }
 }
 

Modified: branches/1.3/scripts/asset.pl
===================================================================
--- branches/1.3/scripts/asset.pl	2012-11-16 23:03:16 UTC (rev 5203)
+++ branches/1.3/scripts/asset.pl	2012-11-17 12:13:31 UTC (rev 5204)
@@ -720,10 +720,10 @@
     $report->get;
     if ($report->{report_class} == 2) {
       disposal_details($report);
-      exit;
+      return;
     } elsif ($report->{report_class} == 4) {
       partial_disposal_details($report);
-      exit;
+      return;
     }
     my @cols = qw(tag start_depreciation purchase_value method_short_name
                  usable_life basis prior_through prior_dep dep_this_time

Modified: branches/1.3/scripts/file.pl
===================================================================
--- branches/1.3/scripts/file.pl	2012-11-16 23:03:16 UTC (rev 5203)
+++ branches/1.3/scripts/file.pl	2012-11-17 12:13:31 UTC (rev 5204)
@@ -58,7 +58,6 @@
     );
     print $file->content;
 
-    exit;
 }
 
 =item show_attachment_screen

Modified: branches/1.3/scripts/setup.pl
===================================================================
--- branches/1.3/scripts/setup.pl	2012-11-16 23:03:16 UTC (rev 5203)
+++ branches/1.3/scripts/setup.pl	2012-11-17 12:13:31 UTC (rev 5204)
@@ -262,7 +262,6 @@
             print $data;
         }
         unlink $backupfile;
-        exit;
     } else {
         $request->error($request->{_locale}->text("Don't know what to do with backup"));
     }
@@ -808,7 +807,7 @@
                 format => 'HTML',
         );
         $template->render($request);
-        exit;        
+        return;
     }
     if ($request->{perms} == 1){
          for my $role (

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