Added a function to merge language files.

tbrehm

2008-09-21 8dd29e227f44e2379a0a72a4f60130b24e54a14b

 interface/lib/classes/listform.inc.php

@@ -1,7 +1,7 @@
<?php

/*
Copyright (c) 2005, Till Brehm, projektfarm Gmbh
Copyright (c) 2007, Till Brehm, projektfarm Gmbh
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
@@ -133,7 +133,7 @@
            $field = $i['field'];

            //*TODO: comment =  hat sich die suche ge�ndert
            if(isset($_REQUEST[$search_prefix.$field]) and $_REQUEST[$search_prefix.$field] != $_SESSION['search'][$list_name][$search_prefix.$field]){
            if(isset($_REQUEST[$search_prefix.$field]) && isset($_SESSION['search'][$list_name][$search_prefix.$field]) && $_REQUEST[$search_prefix.$field] != $_SESSION['search'][$list_name][$search_prefix.$field]){
                    $this->searchChanged = 1;
            }

@@ -224,20 +224,20 @@
    {
        global $app;
        $content = '<a href="'."javascript:loadContent('".$vars['list_file'].'?page=0'.$vars['page_params']."');".'">'
                    .'<img src="themes/grey/images/btn_left.png" border="0"></a> &nbsp; ';
                    .'<img src="themes/'.$_SESSION['s']['theme'].'/images/btn_left.png" border="0"></a> &nbsp; ';
        //* Show Back 
        if(isset($vars['show_page_back']) && $vars['show_page_back'] == 1){
            $content .= '<a href="'."javascript:loadContent('".$vars['list_file'].'?page='.$vars['last_page'].$vars['page_params']."');".'">'
                        .'<img src="themes/grey/images/btn_back.png" border="0"></a> ';
                        .'<img src="themes/'.$_SESSION['s']['theme'].'/images/btn_back.png" border="0"></a> ';
        }
        $content .= ' '.$app->lng('Page').' '.$vars['next_page'].' '.$app->lng('of').' '.$vars['max_pages'].' ';
        //* Show Next
        if(isset($vars['show_page_next']) && $vars['show_page_next'] == 1){
            $content .= '<a href="'."javascript:loadContent('".$vars['list_file'].'?page='.$vars['next_page'].$vars['page_params']."');".'">'
                        .'<img src="themes/grey/images/btn_next.png" border="0"></a> &nbsp; ';
                        .'<img src="themes/'.$_SESSION['s']['theme'].'/images/btn_next.png" border="0"></a> &nbsp; ';
        }
        $content .= '<a href="'."javascript:loadContent('".$vars['list_file'].'?page='.$vars['pages'].$vars['page_params']."');".'">'
                    .'<img src="themes/grey/images/btn_right.png" border="0"></a>';
                    .'<img src="themes/'.$_SESSION['s']['theme'].'/images/btn_right.png" border="0"></a>';
        return $content;
    }
      
@@ -312,7 +312,7 @@
                    case 'VARCHAR':
                    case 'TEXT':
                        if(!is_array($record[$key])) {
                            $record[$key] = addslashes($record[$key]);
                            $record[$key] = mysql_real_escape_string($record[$key]);
                        } else {
                            $record[$key] = implode($this->tableDef[$key]['separator'],$record[$key]);
                        }
@@ -330,7 +330,7 @@
                        break;

                    case 'DOUBLE':
                        $record[$key] = addslashes($record[$key]);
                        $record[$key] = mysql_real_escape_string($record[$key]);
                        break;

                    case 'CURRENCY':