[Gdtc-commits] r1672 - /trunk/gdtc/include/search.php

[bdrieu]

Author: benj
Date: Tue May 10 11:44:15 2016
New Revision: 1672

URL: http://svn.gna.org/viewcvs/gdtc?rev=1672&view=rev
Log:
Remove some PHP error messages (not displayed except in dev) + some cleanup 

Modified:
    trunk/gdtc/include/search.php

Modified: trunk/gdtc/include/search.php
URL: 
http://svn.gna.org/viewcvs/gdtc/trunk/gdtc/include/search.php?rev=1672&r1=1671&r2=1672&view=diff
==============================================================================
--- trunk/gdtc/include/search.php       (original)
+++ trunk/gdtc/include/search.php       Tue May 10 11:44:15 2016
@@ -78,11 +78,7 @@
     {
        $nb = $args['count'];
        $additional [ 'count' ] = $nb;
-       if ( ( $start + $limit ) < $nb )
-           $additional [ 'next' ] = $start + $limit;
-    }
-
-    $smarty -> assign ( 'o_sort', $args [ 'o_sort' ] );
+    }
 
     // Compute order used
     if ( array_key_exists ( 'o_order', $args ) && $args [ 'o_order' ] != 
'DESC' )
@@ -151,13 +147,16 @@
     $added_fields = Array ();
     for ( $i = 1 ; array_key_exists ( "field${i}_field", $args ) ; $i++ )
     {    
-       foreach ( explode( ',', $fields [ $args [ "field${i}_field" ] ] [ 
'fields' ] ) as $field )
-       {
-         $name = $field;
-         if ( ! array_key_exists ( $name, $f ) )
-           array_push ( $added_fields, Array ( 'name' => $name,
-                                               'field' => $field ) );
-         $f [ $name ] = 1;
+       if ( array_key_exists ( 'fields', $fields [ $args [ "field${i}_field" ] 
] ) )
+       {
+           foreach ( explode( ',', $fields [ $args [ "field${i}_field" ] ] [ 
'fields' ] ) as $field )
+           {
+               $name = $field;
+               if ( ! array_key_exists ( $name, $f ) )
+                   array_push ( $added_fields, Array ( 'name' => $name,
+                                                       'field' => $field ) );
+               $f [ $name ] = 1;
+           }
        }
     }
 
@@ -309,7 +308,7 @@
     $result = gdtc_do_search ( $table, $args );
 
     /* do_search returns two args : ( $data, $count ) */
-    if ( $result [ 0 ] == 1 && $args [ 'quick' ] == 1 )
+    if ( $result [ 0 ] == 1 && array_key_exists ( 'quick', $args ) && $args [ 
'quick' ] == 1 )
     {
         edit_actor ( $result [ 1 ] [ 0 ] [ 'actor_id' ], $args );
     }
@@ -376,7 +375,7 @@
                if ( ! $value ) $value = "''";
            }
 
-           if ( $search_struct [ 'person_format' ] || 
+           if ( array_key_exists ( 'person_format', $search_struct ) && 
$search_struct [ 'person_format' ] || 
                 $search_struct [ 'format' ] )
            {
                $format = $operands [ $args [ "field${field_no}_operand" ] ] [ 
'format' ];
@@ -399,7 +398,8 @@
                $string = preg_replace ( '/{([^}]*)}/',
                                         //# FIXME: why two times?
                                         $format,
-                                        ( $search_struct [ 'person_format' ] ? 
+                                        ( array_key_exists ( 'person_format', 
$search_struct ) && 
+                                          $search_struct [ 'person_format' ] ? 
                                           $search_struct [ 'person_format' ] :
                                           $search_struct [ 'format' ] ) );
 
@@ -426,7 +426,7 @@
                $person_search_string .= ' ' . $args [ 
"field${field_no}_boolean" ] . ' ';
            }
 
-           if ( $search_struct [ 'entity_format' ] || 
+           if ( ( array_key_exists ( 'entity_format', $search_struct ) && 
$search_struct [ 'entity_format' ] ) || 
                 $search_struct [ 'format' ] )
            {
                $format = $operands [ $args [ "field${field_no}_operand" ] ] [ 
'format' ];
@@ -446,7 +446,8 @@
                $string = preg_replace ( '/{([^}]*)}/',
                                         //# FIXME: why two times?
                                         $format,
-                                        ( $search_struct [ 'entity_format' ] ? 
+                                        ( array_key_exists ( 'entity_format', 
$search_struct ) && 
+                                          $search_struct [ 'entity_format' ] ? 
                                           $search_struct [ 'entity_format' ] :
                                           $search_struct [ 'format' ] ) );
 


_______________________________________________
Gdtc-commits mailing list
Gdtc-commits@gna.org
https://mail.gna.org/listinfo/gdtc-commits