Fixed a strict error in listform.inc.php Fixed the uses function in app.inc...

tbrehm

2007-08-19 c6faf26a3cc3aba065018340e1671d25031a50e5

 interface/lib/classes/listform.inc.php

@@ -46,6 +46,7 @@
        var $pagingValues;
        var $searchChanged = 0;
        var $module;
      var $dateformat = 'd.m.Y';

    function loadListDef($file,$module = '') {
                global $app,$conf;
@@ -56,7 +57,7 @@
            
            // Fill datasources
            foreach($this->listDef["item"] as $key => $field) {
               if(is_array($field['datasource'])) {
               if(@is_array($field['datasource'])) {
                       $this->listDef["item"][$key]["value"] = $this->getDatasourceData($field);
                    }
            }
@@ -85,7 +86,7 @@
                        $querystring = str_replace("{USERID}",$_SESSION["s"]["user"]["userid"],$querystring);
                        $querystring = str_replace("{GROUPID}",$_SESSION["s"]["user"]["default_group"],$querystring);
                        $querystring = str_replace("{GROUPS}",$_SESSION["s"]["user"]["groups"],$querystring);
                        $table_idx = $this->formDef['db_table_idx'];
                        //$table_idx = $this->formDef['db_table_idx'];
                        //$querystring = str_replace("{RECORDID}",$record[$table_idx],$querystring);
                  $app->uses("tform");
                        $querystring = str_replace("{AUTHSQL}",$app->tform->getAuthSQL('r'),$querystring);
@@ -141,13 +142,13 @@
                                if(is_array($i['value'])) {
                                        $out = '<option value=""></option>';
                                        foreach($i['value'] as $k => $v) {
                                                $selected = ($k == $_SESSION["search"][$list_name][$search_prefix.$field] && $_SESSION["search"][$list_name][$search_prefix.$field] != '')?' SELECTED':'';
                                                $selected = (isset($_SESSION["search"][$list_name][$search_prefix.$field]) && $k == $_SESSION["search"][$list_name][$search_prefix.$field] && $_SESSION["search"][$list_name][$search_prefix.$field] != '')?' SELECTED':'';
                                                $out .= "<option value='$k'$selected>$v</option>\r\n";
                                        }
                                }
                                $this->searchValues[$search_prefix.$field] = $out;
                        } else {
                                $this->searchValues[$search_prefix.$field] = $_SESSION["search"][$list_name][$search_prefix.$field];
                                if(isset($_SESSION["search"][$list_name][$search_prefix.$field])) $this->searchValues[$search_prefix.$field] = $_SESSION["search"][$list_name][$search_prefix.$field];
                        }
                }

@@ -156,7 +157,8 @@

                foreach($this->listDef["item"] as $i) {
                        $field = $i["field"];
                        if($_REQUEST[$search_prefix.$field] != '') $sql_where .= " $field ".$i["op"]." '".$i["prefix"].$_REQUEST[$search_prefix.$field].$i["suffix"]."' and";
                        //if($_REQUEST[$search_prefix.$field] != '') $sql_where .= " $field ".$i["op"]." '".$i["prefix"].$_REQUEST[$search_prefix.$field].$i["suffix"]."' and";
                  if(isset($_SESSION["search"][$list_name][$search_prefix.$field]) && $_SESSION["search"][$list_name][$search_prefix.$field] != '') $sql_where .= " $field ".$i["op"]." '".$i["prefix"].$_SESSION["search"][$list_name][$search_prefix.$field].$i["suffix"]."' and";
                }

                if($sql_where != '') {
@@ -179,7 +181,7 @@
                $table                                 = $this->listDef["table"];

                // setze page auf null, wenn in session nicht gesetzt
                if($_SESSION["search"][$list_name]["page"] == '') $_SESSION["search"][$list_name]["page"] = 0;
                if(!isset($_SESSION["search"][$list_name]["page"]) || $_SESSION["search"][$list_name]["page"] == '') $_SESSION["search"][$list_name]["page"] = 0;

                // setze page auf wert der request variablen "page"
                if(isset($_REQUEST["page"])) $_SESSION["search"][$list_name]["page"] = $_REQUEST["page"];
@@ -189,21 +191,22 @@

                $sql_von = $_SESSION["search"][$list_name]["page"] * $records_per_page;
                $record_count = $app->db->queryOneRecord("SELECT count(*) AS anzahl FROM $table WHERE $sql_where");
                $pages = intval($record_count["anzahl"] / $records_per_page);
                $pages = intval(($record_count["anzahl"] - 1) / $records_per_page);


                $vars["list_file"] = $this->listDef["file"];
                $vars["list_file"] = $_SESSION["s"]["module"]["name"].'/'.$this->listDef["file"];
                $vars["page"] = $_SESSION["search"][$list_name]["page"];
                $vars["last_page"] = $_SESSION["search"][$list_name]["page"] - 1;
                $vars["next_page"] = $_SESSION["search"][$list_name]["page"] + 1;
                $vars["pages"] = $pages;
                $vars["max_pages"] = $pages + 1;
                $vars["records_gesamt"] = $record_count["anzahl"];
                $vars["page_params"] = $this->listDef["page_params"];
                $vars["page_params"] = (isset($this->listDef["page_params"]))? $this->listDef["page_params"]:'';
            //$vars["module"] = $_SESSION["s"]["module"]["name"];


                if($_SESSION["search"][$list_name]["page"] > 0) $vars["show_page_back"] = 1;
                if($_SESSION["search"][$list_name]["page"] <= $seiten - 1) $vars["show_page_next"] = 1;
                if($_SESSION["search"][$list_name]["page"] <= $vars["pages"] - 1) $vars["show_page_next"] = 1;

                $this->pagingValues = $vars;
                $this->pagingHTML = $this->getPagingHTML($vars);
@@ -214,6 +217,17 @@
        }

        function getPagingHTML($vars) {
                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; ';
                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> ';
                $content .= ' '.$app->lng('Page').' '.$vars["next_page"].' '.$app->lng('of').' '.$vars["max_pages"].' ';
                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; ';
                $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>';

                return $content;
        }
		
      function getPagingHTMLasTXT($vars) {
                global $app;
                $content = '[<a href="'.$vars["list_file"].'?page=0'.$vars["page_params"].'">|&lt;&lt; </a>]';
                if($vars["show_page_back"] == 1) $content .= '[<< <a href="'.$vars["list_file"].'?page='.$vars["last_page"].$vars["page_params"].'">'.$app->lng('Back').'</a>] ';
@@ -254,9 +268,11 @@
                                break;

                                case 'DATE':
                                        if($val > 0) {
                                        if($record[$key] > 0) {
                                                $record[$key] = date($this->dateformat,$record[$key]);
                                        }
                                        } else {
                                 $record[$key] = '';
                              }
                                break;

                                case 'INTEGER':
@@ -274,6 +290,7 @@
                                default:
                                        $record[$key] = stripslashes($record[$key]);
                                }
								
                        }

                }