SF.net SVN: ledger-smb: [1029] trunk

[..hidden..]

Revision: 1029
          http://svn.sourceforge.net/ledger-smb/?rev=1029&view=rev
Author:   einhverfr
Date:     2007-04-04 13:15:17 -0700 (Wed, 04 Apr 2007)

Log Message:
-----------
Removed LedgerSMB::format_fields since this should be done by the template engine

Modified Paths:
--------------
    trunk/LedgerSMB.pm
    trunk/bin/pos.pl

Modified: trunk/LedgerSMB.pm
===================================================================
--- trunk/LedgerSMB.pm	2007-04-04 20:14:21 UTC (rev 1028)
+++ trunk/LedgerSMB.pm	2007-04-04 20:15:17 UTC (rev 1029)
@@ -39,10 +39,6 @@
 If $amount is a Bigfloat, it is returned as is.  If it is a string, it is 
 parsed according to the user preferences stored in the LedgerSMB::User object.
 
-=item format_fields (fields => ..hidden..);
-This function converts fields to their appropriate representation in 
-HTML/SGML/XML or LaTeX.
-
 =item is_blank (name => $string)
 This function returns true if $self->{$string} only consists of whitespace
 characters or is an empty string.
@@ -136,7 +132,7 @@
 
 	}
 
-	if (($self->{script} =~ m#(\.\.|\\|/)#)){
+	if (($self->{script} =~ m#(..|\\|/)#)){
 		$self->error("Access Denied");
 	}
 		
@@ -250,48 +246,6 @@
 	}
 }
 
-sub format_fields {
-	# Based on SQL-Ledger's Form::format_string
-	# We should look at moving this into LedgerSMB::Template.
-	# And cleaning it up......  Chris
-
-	my $self = shift @_;
-	my %args = @_;
-	my @fields = @{$args{fields}};
-
-	my $format = $self->{format};
-
-	if ($self->{format} =~ /(postscript|pdf)/) {
-		$format = 'tex';
-	}
-
-	my %replace = ( 
-		'order' => { 
-			html => [ '<', '>', '\n', '\r' ],
-			txt  => [ '\n', '\r' ],
-			tex  => [ quotemeta('\\'), '&', '\n','\r', 
-				'\$', '%', '_', '#',
-				quotemeta('^'), '{', '}', '<', '>', 'Â' 
-				] },
-		html => { '<'  => '&lt;', '>' => '&gt;','\n' => '<br />', 
-			'\r' => '<br />' },
-		txt  => { '\n' => "\n", '\r' => "\r" },
-		tex  => {'&' => '\&', '$' => '\$', '%' => '\%', '_' => '\_',
-			'#' => '\#', quotemeta('^') => '\^\\', '{' => '\{', 
-			'}' => '\}', '<' => '$<$', '>' => '$>$',
-			'\n' => '\newline ', '\r' => '\newline ', 
-			'Â' => '\pounds ', quotemeta('\\') => '/'} 
-	);
-
-	my $key;
-
-	foreach $key (@{ $replace{order}{$format} }) {
-		for (@fields) { $self->{$_} =~ s/$key/$replace{$format}{$key}/g }
-	}
-
-}
-
-
 # TODO:  Either we should have an amount class with formats and such attached
 # Or maybe we should move this into the user class...
 sub format_amount {

Modified: trunk/bin/pos.pl
===================================================================
--- trunk/bin/pos.pl	2007-04-04 20:14:21 UTC (rev 1028)
+++ trunk/bin/pos.pl	2007-04-04 20:15:17 UTC (rev 1029)
@@ -124,8 +124,8 @@
 
 
 sub openinvoices {
-  undef %column_data;
-  undef %column_heading;
+  undef $column_data;
+  undef $column_heading;
 
   $ENV{REMOTE_ADDR} =~ /(\d+)\.(\d+)\.(\d+)\.(\d+)/;
   $form->{till} = $4;
@@ -139,7 +139,7 @@
   }
 
   $form->{title} = $locale->text('Open');
-  transactions;
+  &transactions;
   
 }
 
@@ -582,7 +582,7 @@
       
     for (sort { $button{$a}->{ndx} <=> $button{$b}->{ndx} } keys %button) { $form->print_button(\%button, $_) }
 
-  
+ 
     if ($form->{partsgroup}) {
       $form->{partsgroup} =~ s/\r//g;
       $form->{partsgroup} = $form->quote($form->{partsgroup});


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