[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[3524] trunk
- Subject: SF.net SVN: ledger-smb:[3524] trunk
- From: ..hidden..
- Date: Fri, 15 Jul 2011 18:07:05 +0000
Revision: 3524
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3524&view=rev
Author: einhverfr
Date: 2011-07-15 18:07:05 +0000 (Fri, 15 Jul 2011)
Log Message:
-----------
Codebase is now gettext safe
Modified Paths:
--------------
trunk/LedgerSMB/ScriptLib/Company.pm
trunk/bin/aa.pl
trunk/bin/am.pl
trunk/bin/bp.pl
trunk/bin/gl.pl
trunk/bin/ic.pl
trunk/bin/rp.pl
Removed Paths:
-------------
trunk/bin/admin.pl
Modified: trunk/LedgerSMB/ScriptLib/Company.pm
===================================================================
--- trunk/LedgerSMB/ScriptLib/Company.pm 2011-07-15 16:32:43 UTC (rev 3523)
+++ trunk/LedgerSMB/ScriptLib/Company.pm 2011-07-15 18:07:05 UTC (rev 3524)
@@ -361,7 +361,7 @@
# },
{name => 'action',
value => 'add',
- text => $company->{_locale}->text("Add $label"),
+ text => $company->{_locale}->text("Add [_1]", $label),
type => 'submit',
class => 'submit',
}
Modified: trunk/bin/aa.pl
===================================================================
--- trunk/bin/aa.pl 2011-07-15 16:32:43 UTC (rev 3523)
+++ trunk/bin/aa.pl 2011-07-15 18:07:05 UTC (rev 3524)
@@ -427,15 +427,18 @@
$form->{batch_control_code}=$form->get_batch_control_code($form->{dbh},$form->{batch_id});
$form->{batch_description}=$form->get_batch_description($form->{dbh},$form->{batch_id});
}
-
+ # $locale->text('Add AR Transaction');
+ # $locale->text('Add AP Transaction');
+ # $locale->text('Edit AR Transaction');
+ # $locale->text('Edit AP Transaction');
if ($form->{reverse} == 0){
- $form->{title} = $locale->text("$title $form->{ARAP} Transaction");
+ $form->{title} = $locale->text("[_1] [_2] Transaction", $title, $form->{ARAP});
}
elsif($form->{reverse} == 1) {
if ($form->{subtype} eq 'credit_note'){
- $form->{title} = $locale->text("$title Credit Note");
+ $form->{title} = $locale->text("[_1] Credit Note", $title);
} elsif ($form->{subtype} eq 'debit_note'){
- $form->{title} = $locale->text("$title Debit Note");
+ $form->{title} = $locale->text("[_1] Debit Note", $title);
} else {
$form->error("Unknown subtype $form->{subtype} in $form->{ARAP} "
. "transaction.");
@@ -1653,7 +1656,7 @@
<th align=right>$name</th>
<td colspan=3>$selectname</td>
</tr>
- <tr><th align="right">|.$locale->text("$name Number").qq|</th>
+ <tr><th align="right">|.$locale->text("[_1] Number", $name).qq|</th>
<td colspan="3"><input name="meta_number" size="36">
</tr>
$employee
Deleted: trunk/bin/admin.pl
===================================================================
--- trunk/bin/admin.pl 2011-07-15 16:32:43 UTC (rev 3523)
+++ trunk/bin/admin.pl 2011-07-15 18:07:05 UTC (rev 3524)
@@ -1,1306 +0,0 @@
-#=====================================================================
-# LedgerSMB
-# Small Medium Business Accounting software
-# http://www.ledgersmb.org/
-#
-#
-# Copyright (C) 2006
-# This work contains copyrighted information from a number of sources all used
-# with permission.
-#
-# This file contains source code included with or based on SQL-Ledger which
-# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed
-# under the GNU General Public License version 2 or, at your option, any later
-# version. For a full list including contact information of contributors,
-# maintainers, and copyright holders, see the CONTRIBUTORS file.
-#
-# Original Copyright Notice from SQL-Ledger 2.6.17 (before the fork):
-# Copyright (c) 2000
-#
-# Author: DWS Systems Inc.
-# Web: http://www.sql-ledger.org
-#
-# Contributors:
-#
-#
-#======================================================================
-#
-# This file has undergone whitespace cleanup.
-#
-#======================================================================
-#
-# setup module
-# add/edit/delete users
-#
-#======================================================================
-
-
-use LedgerSMB::Form;
-use LedgerSMB::Locale;
-use LedgerSMB::User;
-use LedgerSMB::Session;
-
-$form = new Form;
-
-$locale = LedgerSMB::Locale->get_handle( ${LedgerSMB::Sysconfig::language} )
- or
- $form->error( __FILE__ . ':' . __LINE__ . ': ' . "Locale not loaded: $!\n" );
-$locale->encoding('UTF-8');
-$form->{charset} = 'UTF-8';
-
-eval { require DBI; };
-$form->error(
- __FILE__ . ':' . __LINE__ . ': ' . $locale->text('DBI not installed!') )
- if ($@);
-
-$form->{stylesheet} = "ledgersmb.css";
-$form->{favicon} = "favicon.ico";
-$form->{timeout} = 600;
-
-require "bin/pw.pl";
-
-# customization
-if ( -f "bin/custom/$form->{script}" ) {
- eval { require "bin/custom/$form->{script}"; };
- $form->error( __FILE__ . ':' . __LINE__ . ': ' . $@ ) if ($@);
-}
-
-if ( $form->{action} ) {
- &check_password unless $form->{action} eq 'logout';
- &{ $form->{action} };
-
-}
-else {
-
- # if there are no drivers bail out
- $form->error( __FILE__ . ':' . __LINE__ . ': '
- . $locale->text('No Database Drivers available!') )
- unless ( LedgerSMB::User->dbdrivers );
-
- &adminlogin;
-}
-
-1;
-
-# end
-
-sub adminlogin {
-
- my ($errorMessage) = @_;
-
- $form->{title} =
- qq|LedgerSMB $form->{version} | . $locale->text('Administration');
-
- $myheaderadd = qq|
- <script language="JavaScript" type="text/javascript">
- <!--
- function sf(){
- document.admin.password.focus();
- }
- // End -->
- </script>
- |;
- $form->header( undef, $myheaderadd );
-
- print qq|
- <body class="admin" onload="sf()">
- <div align="center">
- <a href="http://www.ledgersmb.org/";><img src="images/ledgersmb.png" width="200" height="100" border="0" alt="LedgerSMB Logo" /></a>
- <h1 class="login">|
- . $locale->text('Version')
- . qq| $form->{version} <br />|
- . $locale->text('Administration')
- . qq|</h1>
- <form method="post" action="admin.pl" name="admin">
- <table>
- <tr>
- <th>| . $locale->text('Password') . qq|</th>
- <td><input type="password" name="password" /></td>
- <td><button type="submit" class="submit" name="action" value="login">|
- . $locale->text('Login')
- . qq|</button></td>
- </tr>
- </table>
- <input type="hidden" name="action" value="login" />
- <input type="hidden" name="path" value="$form->{path}" />
- </form>
- |;
-
- if ($errorMessage) {
- print
-qq|<p><span style="font-weight:bold; color:red;">$errorMessage</span></p><br />|;
- }
-
- print qq|
- <br /><br />
- <p><a href="login.pl"
- >| . $locale->text("Application Login") . qq|</a></p>
-
- <br /><br />
- <a style="font-size: 0.8em;" href="http://www.ledgersmb.org/";>|
- . $locale->text('LedgerSMB website') . qq|</a>
- </div>
- </body>
- </html>
- |;
-
-}
-
-sub login {
-
- &list_users;
-}
-
-sub logout {
- $form->{login} = 'admin';
- $form->{callback} = "admin.pl?action=adminlogin";
- Session::session_destroy($form);
- $form->redirect( $locale->text('You are logged out') );
-
-}
-
-sub add_user {
-
- $form->{title} =
- "LedgerSMB "
- . $locale->text('Accounting') . " "
- . $locale->text('Administration') . " / "
- . $locale->text('Add User');
-
- if ( -f "css/ledgersmb.css" ) {
- $myconfig->{stylesheet} = "ledgersmb.css";
- }
-
- $myconfig->{vclimit} = 1000;
- $myconfig->{menuwidth} = 155;
- $myconfig->{timeout} = 3600;
-
- &form_header;
- &form_footer;
-}
-
-sub edit {
-
- $form->{title} =
- "LedgerSMB "
- . $locale->text('Accounting') . " "
- . $locale->text('Administration') . " / "
- . $locale->text('Edit User');
- $form->{edit} = 1;
-
- &form_header;
- &form_footer;
-}
-
-sub form_footer {
-
- if ( $form->{edit} ) {
- $delete =
- qq|<button type="submit" class="submit" name="action" value="delete">|
- . $locale->text('Delete')
- . qq|</button>
- <input type="hidden" name="edit" value="1" />|;
- }
-
- print qq|
- <input name="callback" type="hidden" value="$form->{script}?action=list_users&path=$form->{path}" />
- <input type="hidden" name="path" value="$form->{path}" />
- <button type="submit" class="submit" name="action" value="save">|
- . $locale->text('Save')
- . qq|</button>
- $delete
- </form>
- </body>
- </html>
- |;
-}
-
-sub list_users {
-
- # 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 @memberArray = ();
- my @member = ();
-
- foreach my $memberArray (@$fetchMembers) {
- $member{ $memberArray->{username} } = $memberArray;
- }
-
- # type=submit $locale->text('Pg Database Administration')
- # type=submit $locale->text('PgPP Database Administration')
-
- foreach $item ( LedgerSMB::User->dbdrivers ) {
- $dbdrivers .=
- qq|<button name="action" type="submit" class="submit" value="|
- . ( lc $item )
- . '_database_administration">'
- . $locale->text("$item Database Administration")
- . qq|</button>|;
- }
-
- $column_header{login} = qq|<th>| . $locale->text('Login') . qq|</th>|;
- $column_header{name} = qq|<th>| . $locale->text('Name') . qq|</th>|;
- $column_header{company} = qq|<th>| . $locale->text('Company') . qq|</th>|;
- $column_header{dbdriver} = qq|<th>| . $locale->text('Driver') . qq|</th>|;
- $column_header{dbhost} = qq|<th>| . $locale->text('Host') . qq|</th>|;
- $column_header{dataset} = qq|<th>| . $locale->text('Dataset') . qq|</th>|;
- $column_header{templates} =
- qq|<th>| . $locale->text('Templates') . qq|</th>|;
-
- @column_index = qw(login name company dbdriver dbhost dataset templates);
-
- $form->{title} =
- "LedgerSMB "
- . $locale->text('Accounting') . " "
- . $locale->text('Administration');
-
- $form->{login} = "admin";
- $form->header;
-
- print qq|
- <body class="admin">
- <form method="post" action="$form->{script}">
- <table width="100%">
- <tr class="listheading">
- <th>$form->{title}</th>
- </tr>
- <tr size="5"></tr>
- <tr>
- <td>
- <table width="100%">
- <tr class="listheading">|;
-
- for (@column_index) { print "$column_header{$_}\n" }
-
- print qq| </tr>|;
-
- foreach $key ( sort keys %member ) {
-
- $href = "$script?action=edit&login=$key&path=$form->{path}";
- $href =~ s/ /%20/g;
-
- $member{$key}{templates} =~ s/^${LedgerSMB::Sysconfig::templates}\///;
-
- $column_data{login} = qq|<td><a href="$href">$key</a></td>|;
- $column_data{name} = qq|<td>$member{$key}{name}</td>|;
- $column_data{company} = qq|<td>$member{$key}{company}</td>|;
- $column_data{dbdriver} = qq|<td>$member{$key}{dbdriver}</td>|;
- $column_data{dbhost} = qq|<td>$member{$key}{dbhost}</td>|;
- $column_data{dataset} = qq|<td>$member{$key}{dbname}</td>|;
- $column_data{templates} = qq|<td>$member{$key}{templates}</td>|;
-
- $i++;
- $i %= 2;
- print qq| <tr class="listrow$i">|;
-
- for (@column_index) { print "$column_data{$_}\n"; }
-
- print qq| </tr>|;
- }
-
- print qq| </table>
- </td>
- </tr>
- <tr>
- <td><hr size="3" noshade /></td>
- </tr>
- </table>
- <input type="hidden" name="path" value="$form->{path}" />
- <br />
- <button type="submit" class="submit" name="action" value="add_user">|
- . $locale->text('Add User')
- . qq|</button>
- <button type="submit" class="submit" name="action" value="change_admin_password">|
- . $locale->text('Change Admin Password')
- . qq|</button>
-
- $dbdrivers
-
- <button type="submit" class="submit" name="action" value="logout">|
- . $locale->text('Logout')
- . qq|</button>
- </form>
-
- | . $locale->text('Click on login name to edit!') . qq|
- <br />
- |
- . $locale->text(
-'To add a user to a group edit a name, change the login name and save. A new user with the same variables will then be saved under the new login name.'
- )
- . qq|
-
- </body>
- </html>|;
-}
-
-sub form_header {
-
- # if there is a login, get user
- if ( $form->{login} ) {
-
- # get user
- %{$myconfig} = %{ LedgerSMB::User->fetch_config( $form->{login} ) };
-
- for (qw(company address signature)) {
- $myconfig->{$_} = $form->quote( $myconfig->{$_} );
- }
- for (qw(address signature)) { $myconfig->{$_} =~ s/\\n/\n/g }
-
- # strip basedir from templates directory
- $myconfig->{templates} =~ s/^${LedgerSMB::Sysconfig::templates}\///;
- }
-
- foreach $item (qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd))
- {
- $dateformat .=
- ( $item eq $myconfig->{dateformat} )
- ? "<option selected>$item</option>\n"
- : "<option>$item</option>\n";
- }
-
- my @formats = qw(1,000.00 1000.00 1.000,00 1000,00 1'000.00);
- push @formats, '1 000.00';
- foreach $item (@formats) {
- $numberformat .=
- ( $item eq $myconfig->{numberformat} )
- ? "<option selected>$item</option>\n"
- : "<option>$item</option>\n";
- }
-
- %countrycodes = LedgerSMB::User->country_codes;
- $countrycodes = "";
- my $selectedcode =
- ( $myconfig->{countrycode} ) ? $myconfig->{countrycode} : 'en';
-
- foreach $key ( sort { $countrycodes{$a} cmp $countrycodes{$b} }
- keys %countrycodes )
- {
- $countrycodes .=
- ( $selectedcode eq $key )
- ? qq|<option selected value="$key">$countrycodes{$key}</option>|
- : qq|<option value="$key">$countrycodes{$key}</option>|;
- }
-
- # is there a templates basedir
- if ( !-d "${LedgerSMB::Sysconfig::templates}" ) {
- $form->error(
- __FILE__ . ':' . __LINE__ . ': '
- . $locale->text(
- 'Directory [_1] does not exist',
- ${LedgerSMB::Sysconfig::templates}
- )
- );
- }
-
- opendir TEMPLATEDIR, "${LedgerSMB::Sysconfig::templates}/."
- or $form->error( __FILE__ . ':' . __LINE__ . ': ' . "$templates : $!" );
- @all = grep !/(^\.\.?$|^\.svn)/, readdir TEMPLATEDIR;
- closedir TEMPLATEDIR;
-
- @allhtml = sort grep /\.html/, @all;
-
- @alldir = ();
- for (@all) {
-
- if ( -d "${LedgerSMB::Sysconfig::templates}/$_" ) {
- push @alldir, $_;
- }
- }
-
- @allhtml = reverse grep !/Default/, @allhtml;
- push @allhtml, 'Default';
- @allhtml = reverse @allhtml;
-
- foreach $item ( sort @alldir ) {
-
- if ( $item eq $myconfig->{templates} ) {
- $usetemplates .=
- qq|<option selected value="$item">$item</option>\n|;
- }
- else {
- $usetemplates .= qq|<option value="$item">$item</option>\n|;
- }
- }
-
- $lastitem = $allhtml[0];
- $lastitem =~ s/-.*//g;
- $mastertemplates = qq|<option value="$lastitem">$lastitem</option>\n|;
-
- foreach $item (@allhtml) {
-
- $item =~ s/-.*//g;
-
- if ( $item ne $lastitem ) {
- $mastertemplates .= qq|<option value="$item">$item</option>\n|;
- $lastitem = $item;
- }
- }
-
- opendir CSS, "css/.";
- @all = grep /.*\.css$/, readdir CSS;
- closedir CSS;
-
- foreach $item (@all) {
-
- if ( $item eq $myconfig->{stylesheet} ) {
- $selectstylesheet .=
- qq|<option selected value="$item">$item</option>\n|;
- }
- else {
- $selectstylesheet .= qq|<option value="$item">$item</option>\n|;
- }
- }
-
- $selectstylesheet .= "<option></option>\n";
-
- if ( %{LedgerSMB::Sysconfig::printer} && ${LedgerSMB::Sysconfig::latex} ) {
-
- $selectprinter = "<option></option>\n";
-
- foreach $item ( sort keys %{LedgerSMB::Sysconfig::printer} ) {
-
- if ( $myconfig->{printer} eq $item ) {
- $selectprinter .=
- qq|<option value="$item" selected>$item</option>\n|;
- }
- else {
- $selectprinter .= qq|<option value="$item">$item</option>\n|;
- }
- }
-
- $printer = qq|
- <tr>
- <th align="right">| . $locale->text('Printer') . qq|</th>
- <td><select name="printer">$selectprinter</select></td>
- </tr>
- |;
-
- }
-
- $user = $form->{login};
- $form->{login} = "admin";
- $form->header;
- $form->{login} = $user;
-
- print qq|
- <body class="admin">
- <form method="post" action="admin.pl">
- <table width="100%">
- <tr class="listheading"><th colspan="2">$form->{title}</th></tr>
- <tr size="5"></tr>
- <tr valign="top">
- <td>
- <table>
- <tr>
- <th align="right">| . $locale->text('Login') . qq|</th>
- <td><input name="login" value="$myconfig->{login}" /></td>
- </tr>
- <tr>
- <th align="right">| . $locale->text('Password') . qq|</th>
- <td><input type="password" name="new_password" size="8" value="$myconfig->{password}" /></td>
- </tr>
- <tr>
- <th align="right">| . $locale->text('Name') . qq|</th>
- <td><input name="name" size="15" value="$myconfig->{name}" /></td>
- </tr>
- <tr>
- <th align="right">| . $locale->text('E-mail') . qq|</th>
- <td><input name="email" size="30" value="$myconfig->{email}" /></td>
- </tr>
- <tr valign="top">
- <th align="right">| . $locale->text('Signature') . qq|</th>
- <td><textarea name="signature" rows="3" cols="35">$myconfig->{signature}</textarea></td>
- </tr>
- <tr>
- <th align="right">| . $locale->text('Phone') . qq|</th>
- <td><input name="tel" size="14" value="$myconfig->{tel}" /></td>
- </tr>
- <tr>
- <th align="right">| . $locale->text('Fax') . qq|</th>
- <td><input name="fax" size="14" value="$myconfig->{fax}" /></td>
- </tr>
- <tr>
- <th align="right">| . $locale->text('Company') . qq|</th>
- <td><input name="company" size="35" value="$myconfig->{company}" /></td>
- </tr>
- <tr valign="top">
- <th align="right">| . $locale->text('Address') . qq|</th>
- <td><textarea name="address" rows="4" cols="35">$myconfig->{address}</textarea></td>
- </tr>
- </table>
- </td>
- <td>
- <table>
- <tr>
- <th align="right">| . $locale->text('Date Format') . qq|</th>
- <td><select name="dateformat">$dateformat</select></td>
- </tr>
- <tr>
- <th align="right">| . $locale->text('Number Format') . qq|</th>
- <td><select name="numberformat">$numberformat</select></td>
- </tr>
- <tr>
- <th align="right">| . $locale->text('Dropdown Limit') . qq|</th>
- <td><input name="vclimit" value="$myconfig->{vclimit}" /></td>
- </tr>
- <tr>
- <th align="right">| . $locale->text('Menu Width') . qq|</th>
- <td><input name="menuwidth" value="$myconfig->{menuwidth}" /></td>
- </tr>
- <tr>
- <th align="right">| . $locale->text('Language') . qq|</th>
- <td><select name="countrycode">$countrycodes</select></td>
- </tr>
- <tr>
- <th align="right">| . $locale->text('Session Timeout') . qq|</th>
- <td><input name="newtimeout" value="$myconfig->{timeout}" /></td>
- </tr>
- <tr>
- <th align="right">| . $locale->text('Stylesheet') . qq|</th>
- <td><select name="userstylesheet">$selectstylesheet</select></td>
- </tr>
- $printer
- <tr>
- <th align="right">| . $locale->text('Use Templates') . qq|</th>
- <td><select name="usetemplates">$usetemplates</select></td>
- </tr>
- <tr>
- <th align="right">| . $locale->text('New Templates') . qq|</th>
- <td><input name="newtemplates" /></td>
- </tr>
- <tr>
- <th align="right">| . $locale->text('Setup Templates') . qq|</th>
- <td><select name="mastertemplates">$mastertemplates</select></td>
- </tr>
- </table>
- <input type="hidden" name="templates" value="$myconfig->{templates}" />
- </td>
- </tr>
- <tr class="listheading">
- <th colspan="2">| . $locale->text('Database') . qq|</th>
- </tr>|;
-
- # list section for database drivers
- foreach $item ( LedgerSMB::User->dbdrivers ) {
-
- print qq|
- <tr>
- <td colspan="2">
- <table>
- <tr>|;
-
- $checked = "checked";
-
- if ( $myconfig->{dbdriver} eq $item ) {
-
- for (qw(dbhost dbport dbuser dbpasswd dbname sid)) {
- $form->{"${item}_$_"} = $myconfig->{$_};
- }
- $checked = "checked";
- }
-
- print qq|
- <th align="right">| . $locale->text('Driver') . qq|</th>
- <td><input name="dbdriver" type="radio" class="radio" value="$item" $checked /> $item</td>
- <th align="right">| . $locale->text('Host') . qq|</th>
- <td><input name="${item}_dbhost" size="30" value="$form->{"${item}_dbhost"}" /></td>
- </tr>
- <tr>|;
-
- print qq|
- <th align="right">| . $locale->text('Dataset') . qq|</th>
- <td><input name="${item}_dbname" size="15" value="$form->{"${item}_dbname"}" /></td>
- <th align="right">| . $locale->text('Port') . qq|</th>
- <td><input name="${item}_dbport" size="4" value="$form->{"${item}_dbport"}" /></td>
- </tr>
- <tr>
- <th align="right">| . $locale->text('User') . qq|</th>
- <td><input name="${item}_dbuser" size="15" value="$form->{"${item}_dbuser"}" /></td>
- <th align="right">| . $locale->text('Password') . qq|</th>
- <td><input name="${item}_dbpasswd" type="password" size="10" value="$form->{"${item}_dbpasswd"}" /></td>
- </tr>|;
-
- print qq|
- </table>
- <input type="hidden" name="old_dbpasswd" value="$myconfig->{dbpasswd}" />
- </td>
- </tr>
- <tr>
- <td colspan="2"><hr size="2" noshade /></td>
- </tr>
- |;
-
- }
-
- # access control
-
- %role = (
- 'admin' => $locale->text('Administrator'),
- 'user' => $locale->text('User'),
- 'supervisor' => $locale->text('Supervisor'),
- 'manager' => $locale->text('Manager')
- );
-
- $selectrole = "";
-
- foreach $item (qw(user admin supervisor manager)) {
- $selectrole .=
- ( $myconfig->{role} eq $item )
- ? "<option selected value=\"$item\">$role{$item}</option>\n"
- : "<option value=\"$item\">$role{$item}</option>\n";
- }
-
- print qq|
- <tr class="listheading">
- <th colspan="2">| . $locale->text('Access Control') . qq|</th>
- </tr>
- <tr>
- <td><select name="role">$selectrole</select></td>
- </tr>
- |;
-
- foreach $item ( split /;/, $myconfig->{acs} ) {
- ( $key, $value ) = split /--/, $item, 2;
- $excl{$key}{$value} = 1;
- }
-
- foreach $key (@acsorder) {
-
- $checked = "checked";
-
- if ( $form->{login} ) {
- $checked = ( $excl{$key}{$key} ) ? "" : "checked";
- }
-
- # can't have variable names with & and spaces
- $item = $form->escape( "${key}--$key", 1 );
-
- $acsheading = $key;
- $acsheading =~ s/ / /g;
-
- $acsheading = qq|
- <td align="left" nowrap="nowrap" style="background-color: #C7E9F7" colspan="2">
- <input name="$item" class="checkbox" type="checkbox" value="1" $checked /> $acsheading</td><tr><td>\n|;
- $menuitems .= "$item;";
- $acsdata = "<td style=\"background-color: #F0F0F0\">";
-
- foreach $item ( @{ $acs{$key} } ) {
-
- next if ( $key eq $item );
-
- $checked = "checked";
-
- if ( $form->{login} ) {
- $checked = ( $excl{$key}{$item} ) ? "" : "checked";
- }
-
- $acsitem = $form->escape( "${key}--$item", 1 );
-
- $acsdata .=
-qq|<br /><input name="$acsitem" class="checkbox" type="checkbox" value="1" $checked /> $item|;
- $menuitems .= "$acsitem;";
- }
-
- $acsdata .= "
- </td>";
-
- print qq|
- <tr valign="top">$acsheading $acsdata
- </tr>
- |;
- }
-
- print qq|<input type="hidden" name="acs" value="$menuitems" />
- <tr>
- <td colspan="2"><hr size="3" noshade /></td>
- </tr>
- </table>
- </div>
- |;
-
-}
-
-sub save {
-
- $form->{callback} = "admin.pl?action=list_users";
-
- # no driver checked
- $form->error( __FILE__ . ':' . __LINE__ . ': '
- . $locale->text('Database Driver not checked!') )
- unless $form->{dbdriver};
-
- # no spaces allowed in login name
- $form->{login} =~ s/ //g;
-
- $form->isblank( "login", $locale->text('Login name missing!') );
-
- # check for duplicates
- if ( !$form->{edit} ) {
- $temp = LedgerSMB::User->new( $form->{login} );
-
- if ( $temp->{login} ) {
- $form->error( __FILE__ . ':' . __LINE__ . ': '
- . $locale->text( '[_1] is already a member!', $form->{login} )
- );
- }
- }
-
- # no spaces allowed in directories
- $form->{newtemplates} =~ s/( |\.\.|\*)//g;
-
- if ( $form->{newtemplates} ne "" ) {
- $form->{templates} = $form->{newtemplates};
- }
- else {
- $form->{templates} =
- ( $form->{usetemplates} ) ? $form->{usetemplates} : $form->{login};
- }
-
- # is there a basedir
- if ( !-d "${LedgerSMB::Sysconfig::templates}" ) {
- $form->error(
- __FILE__ . ':' . __LINE__ . ': '
- . $locale->text(
- 'Directory [_1] does not exist',
- ${LedgerSMB::Sysconfig::templates}
- )
- );
- }
-
- # add base directory to $form->{templates}
- $form->{templates} =
- "${LedgerSMB::Sysconfig::templates}/$form->{templates}";
-
- $myconfig = LedgerSMB::User->new("$form->{login}");
-
- # redo acs variable and delete all the acs codes
- @acs = split /;/, $form->{acs};
- $form->{acs} = "";
-
- foreach $item (@acs) {
-
- $item = $form->escape( $item, 1 );
-
- if ( !$form->{$item} ) {
- $form->{acs} .= $form->unescape( $form->unescape("$item") ) . ";";
- }
-
- delete $form->{$item};
- }
-
- # check which database was filled in
-
- $form->{dbhost} = $form->{"$form->{dbdriver}_dbhost"};
- $form->{dbport} = $form->{"$form->{dbdriver}_dbport"};
- $form->{dbpasswd} = $form->{"$form->{dbdriver}_dbpasswd"};
- $form->{dbuser} = $form->{"$form->{dbdriver}_dbuser"};
- $form->{dbname} = $form->{"$form->{dbdriver}_dbname"};
- $form->isblank( "dbname", $locale->text('Dataset missing!') );
- $form->isblank( "dbuser", $locale->text('Database User missing!') );
-
- foreach $item ( keys %{$form} ) {
- $myconfig->{$item} = $form->{$item};
- }
-
- $myconfig->{password} = $form->{new_password};
- $myconfig->{timeout} = $form->{newtimeout};
-
- delete $myconfig->{stylesheet};
-
- if ( $form->{userstylesheet} ) {
- $myconfig->{stylesheet} = $form->{userstylesheet};
- }
-
- $myconfig->{packpw} = 1;
-
- $myconfig->save_member($form);
-
- # create user template directory and copy master files
- if ( !-d "$form->{templates}" ) {
-
- umask(002);
-
- if ( mkdir "$form->{templates}", oct("771") ) {
-
- umask(007);
-
- # copy templates to the directory
- opendir TEMPLATEDIR, "${LedgerSMB::Sysconfig::templates}/."
- or $form->error(
- __FILE__ . ':' . __LINE__ . ': ' . "$templates : $!" );
- @templates = grep /$form->{mastertemplates}-/, readdir TEMPLATEDIR;
- closedir TEMPLATEDIR;
-
- foreach $file (@templates) {
-
- open( TEMP, '<', "${LedgerSMB::Sysconfig::templates}/$file" )
- or $form->error( __FILE__ . ':' . __LINE__ . ': '
- . "$templates/$file : $!" );
-
- $file =~ s/$form->{mastertemplates}-//;
- open( NEW, '>', "$form->{templates}/$file" )
- or $form->error( __FILE__ . ':' . __LINE__ . ': '
- . "$form->{templates}/$file : $!" );
-
- while ( $line = <TEMP> ) {
- print NEW $line;
- }
-
- close(TEMP);
- close(NEW);
- }
-
- }
- else {
- $form->error(
- __FILE__ . ':' . __LINE__ . ': ' . "$form->{templates} : $!" );
- }
- }
-
- $form->redirect( $locale->text('User saved!') );
-}
-
-sub delete {
-
- $form->{callback} = "admin.pl?action=list_users";
-
- $form->{templates} =
- ( $form->{templates} )
- ? "${LedgerSMB::Sysconfig::templates}/$form->{templates}"
- : "$templates/$form->{login}";
-
- # scan %user for $templatedir
- foreach $login ( keys %user ) {
- last if ( $found = ( $form->{templates} eq $user{$login} ) );
- }
-
- # if found keep directory otherwise delete
- if ( !$found ) {
-
- # delete it if there is a template directory
- $dir = "$form->{templates}";
- if ( -d "$dir" ) {
- unlink <$dir/*>;
- rmdir "$dir";
- }
- }
-
- my $dbh = ${LedgerSMB::Sysconfig::GLOBALDBH};
-
- #users_conf
- my $deleteUser =
- $dbh->prepare(
-"DELETE FROM users_conf USING users WHERE users.username = ? and users.id = users_conf.id;"
- );
- $deleteUser->execute( $form->{login} );
-
- #and now users
- $deleteUser = $dbh->prepare("DELETE FROM users WHERE username = ?;");
- $deleteUser->execute( $form->{login} );
-
- $form->redirect( $locale->text('User deleted!') );
-}
-
-sub login_name {
-
- my $login = shift;
- $login =~ s/\[\]//g;
- return ($login) ? $login : undef;
-}
-
-sub change_admin_password {
-
- $form->{title} =
- qq|LedgerSMB |
- . $locale->text('Accounting') . " "
- . $locale->text('Administration') . " / "
- . $locale->text('Change Admin Password');
-
- $form->{login} = "admin";
- $form->header;
-
- print qq|
- <body class="admin">
- <form method="post" action="$form->{script}">
- <table>
- <tr class="listheading">
- <th>| . $locale->text('Change Password') . qq|</th>
- </tr>
- <tr size="5"></tr>
- <tr>
- <td>
- <table width="100%">
- <tr>
- <th align="right">| . $locale->text('Password') . qq|</th>
- <td><input type="password" name="new_password" /></td>
- </tr>
- <tr>
- <th align="right">| . $locale->text('Confirm') . qq|</th>
- <td><input type="password" name="confirm_password" /></td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- <br />
- <hr size="3" noshade />
- <input type="hidden" name="path" value="$form->{path}" />
- <p><button type="submit" class="submit" name="action" value="change_password">|
- . $locale->text('Change Password')
- . qq|</button></p>
- </form>
- </body>
- </html>
- |;
-
-}
-
-sub change_password {
-
- # Do we want to force a login after changing the password?
- $form->{callback} = "admin.pl?";
-
- $form->error( __FILE__ . ':' . __LINE__ . ': '
- . $locale->text('Passwords do not match!') )
- if $form->{new_password} ne $form->{confirm_password};
-
- # use the central database handle
- my $dbh = ${LedgerSMB::Sysconfig::GLOBALDBH};
-
- my $updateAdminPassword = $dbh->prepare(
- "UPDATE users_conf
- SET password = md5(?)
- WHERE id = 1"
- );
-
- $updateAdminPassword->execute( $form->{new_password} );
-
- $form->{callback} =
- "$form->{script}?action=list_users&path=$form->{path}";
- $form->redirect( $locale->text('Password changed!') );
-}
-
-sub check_password {
-
- $root = LedgerSMB::User->new('admin');
-
- if ( $form->{password} ) {
-
- $form->{callback} .= "&password=$form->{password}"
- if $form->{callback};
-
- if ( $root->{password} ne ( Digest::MD5::md5_hex $form->{password} ) ) {
- &adminlogin( $locale->text('Access Denied!') );
- $form->finalize_request();
- }
- else {
- $form->{login} = 'admin';
- Session::session_create($form);
- }
- }
- else {
-
- $ENV{HTTP_COOKIE} =~ s/;\s*/;/g;
- @cookies = split /;/, $ENV{HTTP_COOKIE};
- foreach (@cookies) {
- ( $name, $value ) = split /=/, $_, 2;
- $cookie{$name} = $value;
- }
-
- if ( !Session::session_check( $cookie{${LedgerSMB::Sysconfig::cookie_name}}, $root ) ) {
- &adminlogin( $locale->text('Session expired!') );
- $form->finalize_request();
- }
- }
-}
-
-sub pg_database_administration {
-
- $form->{dbdriver} = 'Pg';
- &dbselect_source;
-}
-
-sub pgpp_database_administration {
-
- $form->{dbdriver} = 'PgPP';
- &dbselect_source;
-
-}
-
-sub dbdriver_defaults {
-
- # load some defaults for the selected driver
- %driverdefaults = (
- 'Pg' => {
- dbport => '5432',
- dbuser => '',
- dbdefault => 'template1',
- dbhost => 'localhost',
- connectstring => $locale->text('Connect to')
- }
- );
-
- $driverdefaults{PgPP} = $driverdefaults{Pg};
-
- for ( keys %{ $driverdefaults{Pg} } ) {
- $form->{$_} = $driverdefaults{ $form->{dbdriver} }{$_};
- }
-
-}
-
-sub dbselect_source {
-
- &dbdriver_defaults;
-
- $form->{title} =
- "LedgerSMB "
- . $locale->text('Accounting') . " / "
- . $locale->text('Database Administration');
-
- $form->{login} = "admin";
- $form->header;
-
- #an insane amount of table nesting here, this should be cleaned up.
- print qq|
- <body class="admin">
- <center>
- <h2>$form->{title}</h2>
- <form method="post" action="$form->{script}" />
- <table>
- <tr>
- <td>
- <table>
- <tr class="listheading">
- <th colspan="4">| . $locale->text('Database') . qq|</th>
- </tr>
- <tr>
- <td>
- <table>
- <tr>
- <th align="right">| . $locale->text('Host') . qq|</th>
- <td><input name="dbhost" size="25" value="$form->{dbhost}" /></td>
- <th align="right">| . $locale->text('Port') . qq|</th>
- <td><input name="dbport" size="5" value="$form->{dbport}" /></td>
- </tr>
- <tr>
- <th align="right">| . $locale->text('User') . qq|</th>
- <td><input name="dbuser" size="10" value="$form->{dbuser}" /></td>
- <th align="right">| . $locale->text('Password') . qq|</th>
- <td><input type="password" name="dbpasswd" size="10" /></td>
- </tr>
- <tr>
- <th align="right">$form->{connectstring}</th>
- <td colspan="3"><input name="dbdefault" size="10" value="$form->{dbdefault}" /></td>
- </tr>
- <tr>
- <th align="right">| . $locale->text("Superuser") . qq|</th>
- <td><input name="dbsuperuser" size="10" value="$form->{dbsuperuser}" /></td>
- <th align="right">| . $locale->text('Password') . qq|</th>
- <td><input type="password" name="dbsuperpasswd" size="10" /></td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- <input type="hidden" name="dbdriver" value="$form->{dbdriver}" />
- <input name="callback" type="hidden" value="$form->{script}?action=list_users&path=$form->{path}" />
- <input type="hidden" name="path" value="$form->{path}" />
- <br />
- <button type="submit" class="submit" name="action" value="create_dataset">|
- . $locale->text('Create Company')
- . qq|</button>
- <button type="submit" class="submit" name="action" value="delete_dataset">|
- . $locale->text('Delete Company')
- . qq|</button>
- </form>
- <p>|
- . $locale->text(
-'This is a preliminary check for existing sources. Nothing will be created or deleted at this stage!'
- )
- . qq|</p>
- </center>
- </body>
- </html>
- |;
-}
-
-sub continue {
-
- &{ $form->{nextsub} };
-}
-
-sub dbupdate {
- $form->{callback} = "admin.pl?action=list_users";
-
- LedgerSMB::User->dbupdate( \%$form );
- $form->redirect( $locale->text('Dataset updated!') );
-}
-
-sub create_dataset {
-
- @dbsources = sort LedgerSMB::User->dbsources( \%$form );
-
- opendir SQLDIR, "sql/."
- or $form->error( __FILE__ . ':' . __LINE__ . ': ' . $! );
-
- foreach $item ( sort grep /-chart\.sql/, readdir SQLDIR ) {
- next if ( $item eq 'Default-chart.sql' );
- $item =~ s/-chart\.sql//;
- push @charts,
-qq|<input name="chart" class="radio" type="radio" value="$item" />$item|;
- }
-
- closedir SQLDIR;
-
- # add Default at beginning
- unshift @charts,
-qq|<input name="chart" class="radio" type="radio" value="Default" checked />Default|;
-
- $form->{title} =
- "LedgerSMB "
- . $locale->text('Accounting') . " "
- . $locale->text('Database Administration') . " / "
- . $locale->text('Create Dataset');
- $form->{login} = "admin";
- $form->header;
-
- print qq|
- <body class="admin">
- <center>
- <h2>$form->{title}</h2>
- <form method="post" action="$form->{script}" />
- <table width="100%">
- <tr class="listheading">
- <th colspan="2"> </th>
- </tr>
- <tr>
- <th align="right" nowrap="nowrap">|
- . $locale->text('Existing Datasets')
- . qq|</th>
- <td>
- |;
-
- for (@dbsources) { print "[ $_ ] " }
-
- print qq|
- </td>
- </tr>
- <tr>
- <th align="right" nowrap="nowrap">|
- . $locale->text('Create Dataset')
- . qq|</th>
- <td><input name="db" /></td>
- </tr>
- <tr>
- <th align="right" nowrap="nowrap">|
- . $locale->text('Create Chart of Accounts')
- . qq|</th>
- <td>
- <table>
- |;
-
- while (@charts) {
- print qq| <tr>|;
-
- for ( 0 .. 2 ) { print "<td>$charts[$_]</td>\n" }
-
- print qq| </tr>|;
-
- splice @charts, 0, 3;
- }
-
- print qq| </table>
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <hr size="3" noshade />
- </td>
- </tr>
- </table>
- |;
-
- $form->hide_form(
- qw(dbdriver dbsuperuser dbsuperpasswd dbuser dbhost dbport dbpasswd dbdefault path)
- );
-
- print qq|
- <input name="callback" type="hidden" value="$form->{script}?action=list_users&path=$form->{path}" />
- <input type="hidden" name="nextsub" value="dbcreate" />
- <br />
- <button type="submit" class="submit" name="action" value="continue">|
- . $locale->text('Continue')
- . qq|</button>
- </form>
- </body>
- </html>
- |;
-
-}
-
-sub dbcreate {
-
- $form->isblank( "db", $locale->text('Dataset missing!') );
-
- LedgerSMB::User->dbcreate( \%$form );
-
- $form->{title} =
- "LedgerSMB "
- . $locale->text('Accounting') . " "
- . $locale->text('Database Administration') . " / "
- . $locale->text('Create Dataset');
-
- $form->{login} = "admin";
- $form->header;
-
- print qq|
- <body class="admin">
- <center>
- <h2>$form->{title}</h2>
- <form method="post" action="$form->{script}">|
- . $locale->text( 'Dataset [_1] successfully created!', $form->{db} ) . qq|
- <input type="hidden" name="path" value="$form->{path}" />
- <input type="hidden" name="nextsub" value="list_users" />
- <p><button type="submit" class="submit" name="action" value="continue">|
- . $locale->text('Continue')
- . qq|</button></p>
- </form>
- </center>
- </body>
- </html>
- |;
-}
-
-sub unlock_system {
-
- # This needs to be done with a db tool
- # unlink "${LedgerSMB::Sysconfig::userspath}/nologin";
- $form->{callback} =
- "$form->{script}?action=list_users&path=$form->{path}";
- $form->redirect( $locale->text('Lockfile removed!') );
-}
-
-sub lock_system {
-
-# This needs to be done with a db tool
-#open(FH, '>', "${LedgerSMB::Sysconfig::userspath}/nologin") or $form->error($locale->text('Cannot create Lock!'));
-#close(FH);
- $form->{callback} =
- "$form->{script}?action=list_users&path=$form->{path}";
- $form->redirect( $locale->text('Lockfile created!') );
-}
Modified: trunk/bin/am.pl
===================================================================
--- trunk/bin/am.pl 2011-07-15 16:32:43 UTC (rev 3523)
+++ trunk/bin/am.pl 2011-07-15 18:07:05 UTC (rev 3524)
@@ -251,7 +251,7 @@
push @buttons, {
name => 'action',
value => lc "${type}_list_account",
- text => $locale->text("$type Report"),
+ text => $locale->text("[_1] Report", $type),
type => 'submit',
class => 'submit',
};
@@ -441,7 +441,7 @@
sub gifi_header {
my $hiddens = shift;
- $form->{title} = $locale->text("$form->{title} GIFI");
+ $form->{title} = $locale->text("[_1] GIFI", $form->{title});
# $locale->text('Add GIFI')
# $locale->text('Edit GIFI')
@@ -669,7 +669,7 @@
sub department_header {
my $hiddens = shift;
- $form->{title} = $locale->text("$form->{title} Department");
+ $form->{title} = $locale->text("[_1] Department", $form->{title});
# $locale->text('Add Department')
# $locale->text('Edit Department')
@@ -824,7 +824,7 @@
sub business_header {
my $hiddens = shift;
- $form->{title} = $locale->text("$form->{title} Business");
+ $form->{title} = $locale->text("[_1] Business", $form->{title});
# $locale->text('Add Business')
# $locale->text('Edit Business')
@@ -991,7 +991,7 @@
sub sic_header {
my $hiddens = shift;
- $form->{title} = $locale->text("$form->{title} SIC");
+ $form->{title} = $locale->text("[_1] SIC", $form->{title});
# $locale->text('Add SIC')
# $locale->text('Edit SIC')
@@ -1154,7 +1154,7 @@
sub language_header {
my $hiddens = shift;
- $form->{title} = $locale->text("$form->{title} Language");
+ $form->{title} = $locale->text("[_1] Language", $form->{title});
# $locale->text('Add Language')
# $locale->text('Edit Language')
@@ -1995,7 +1995,7 @@
sub warehouse_header {
my $hiddens = shift;
- $form->{title} = $locale->text("$form->{title} Warehouse");
+ $form->{title} = $locale->text("[_1] Warehouse", $form->{title});
# $locale->text('Add Warehouse')
# $locale->text('Edit Warehouse')
Modified: trunk/bin/bp.pl
===================================================================
--- trunk/bin/bp.pl 2011-07-15 16:32:43 UTC (rev 3523)
+++ trunk/bin/bp.pl 2011-07-15 18:07:05 UTC (rev 3524)
@@ -119,7 +119,7 @@
$label{request_quotation}{quonumber} = $label{sales_quotation}{quonumber};
# do one call to text
- $form->{title} = $locale->text("Print $label{$form->{type}}{title}");
+ $form->{title} = $locale->text("Print [_1]", $label{$form->{type}}{title});
# accounting years
if ( @{ $form->{all_years} } ) {
Modified: trunk/bin/gl.pl
===================================================================
--- trunk/bin/gl.pl 2011-07-15 16:32:43 UTC (rev 3523)
+++ trunk/bin/gl.pl 2011-07-15 18:07:05 UTC (rev 3524)
@@ -177,10 +177,10 @@
}
$title = $form->{title};
if ( $form->{transfer} ) {
- $form->{title} = $locale->text("$title Cash Transfer Transaction");
+ $form->{title} = $locale->text("[_1] Cash Transfer Transaction", $title);
}
else {
- $form->{title} = $locale->text("$title General Ledger Transaction");
+ $form->{title} = $locale->text("[_1] General Ledger Transaction", $title);
}
for (qw(reference description notes)) {
Modified: trunk/bin/ic.pl
===================================================================
--- trunk/bin/ic.pl 2011-07-15 16:32:43 UTC (rev 3523)
+++ trunk/bin/ic.pl 2011-07-15 18:07:05 UTC (rev 3524)
@@ -3519,7 +3519,7 @@
if ( $form->{obsolete} ) {
$form->error(
$locale->text(
-"Inventory quantity must be zero before you can set this $form->{item} obsolete!"
+"Inventory quantity must be zero before you can set this [_1] obsolete!", $form->{item}
)
) if ( $form->{onhand} );
}
Modified: trunk/bin/rp.pl
===================================================================
--- trunk/bin/rp.pl 2011-07-15 16:32:43 UTC (rev 3523)
+++ trunk/bin/rp.pl 2011-07-15 18:07:05 UTC (rev 3524)
@@ -857,7 +857,7 @@
push @buttons, {
name => 'action',
value => lc "${type}_$form->{nextsub}",
- text => $locale->text("$type Report"),
+ text => $locale->text("[_1] Report", $type),
type => 'submit',
class => 'submit',
};
@@ -1268,7 +1268,7 @@
push @buttons, {
name => 'action',
value => lc "${type}_$form->{nextsub}",
- text => $locale->text("$type Report"),
+ text => $locale->text("[_1] Report", $type),
type => 'submit',
class => 'submit',
};
@@ -1983,7 +1983,7 @@
};
$column_header{meta_number} = {
href => "$href&sort=meta_number",
- text => $locale->text("$vc Number"),
+ text => $locale->text("[_1] Number", $vc),
};
$column_header{employee} = {
href => "$href&sort=employee",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.