Changeset 10060 for extensions/edit_gmaps/admin/include

Timestamp:

Apr 5, 2011, 12:45:03 PM (13 years ago)

Author:

cljosse

Message:

[extensions] edit_gmaps compatibility with piwigo 2.2

File:

• extensions/edit_gmaps/admin/include/EXIF.php (modified) (17 diffs)

extensions/edit_gmaps/admin/include/EXIF.php

@@ -118 +118 @@
 function get_EXIF_JPEG( $filename )
 {
+global $error_message ;
         // Change: Added as of version 1.11
         // Check if a wrapper is being used - these are not currently supported (see notes at top of file)
@@ -123 +124 @@
         {
                 // A HTTP or FTP wrapper is being used - show a warning and abort
-                echo "HTTP and FTP wrappers are currently not supported with EXIF - See EXIF functionality documentation - a local file must be specified<br>";
-                echo "To work on an internet file, copy it locally to start with:<br><br>\n";
-                echo "\$newfilename = tempnam ( \$dir, \"tmpexif\" );<br>\n";
-                echo "copy ( \"http://whatever.com\", \$newfilename );<br><br>\n";
+                $error_message .= "HTTP and FTP wrappers are currently not supported with EXIF - See EXIF functionality documentation - a local file must be specified<br>";
+                $error_message .= "To work on an internet file, copy it locally to start with:<br><br>\n";
+                $error_message .= "\$newfilename = tempnam ( \$dir, \"tmpexif\" );<br>\n";
+                $error_message .= "copy ( \"http://whatever.com\", \$newfilename );<br><br>\n";
                 return FALSE;
         }
@@ -167 +168 @@
         {
                 // Could't open the file - exit
-                echo "<p>Could not open file $filename</p>\n";
+                $error_message .= "<p>Could not open file $filename</p>\n";
                 return FALSE;
         }
@@ -296 +297 @@
 function get_Meta_JPEG( $filename )
 {
+global $error_message ;
         // Change: Added as of version 1.11
         // Check if a wrapper is being used - these are not currently supported (see notes at top of file)
@@ -301 +303 @@
         {
                 // A HTTP or FTP wrapper is being used - show a warning and abort
-                echo "HTTP and FTP wrappers are currently not supported with Meta - See EXIF/Meta functionality documentation - a local file must be specified<br>";
-                echo "To work on an internet file, copy it locally to start with:<br><br>\n";
-                echo "\$newfilename = tempnam ( \$dir, \"tmpmeta\" );<br>\n";
-                echo "copy ( \"http://whatever.com\", \$newfilename );<br><br>\n";
+                $error_message .= "HTTP and FTP wrappers are currently not supported with Meta - See EXIF/Meta functionality documentation - a local file must be specified<br>";
+                $error_message .= "To work on an internet file, copy it locally to start with:<br><br>\n";
+                $error_message .= "\$newfilename = tempnam ( \$dir, \"tmpmeta\" );<br>\n";
+                $error_message .= "copy ( \"http://whatever.com\", \$newfilename );<br><br>\n";
                 return FALSE;
         }
@@ -345 +347 @@
         {
                 // Could't open the file - exit
-                echo "<p>Could not open file $filename</p>\n";
+                $error_message .= "<p>Could not open file $filename</p>\n";
                 return FALSE;
         }
@@ -472 +474 @@
 function get_EXIF_TIFF( $filename )
 {
+global $error_message ;
         // Change: Added as of version 1.11
         // Check if a wrapper is being used - these are not currently supported (see notes at top of file)
@@ -477 +480 @@
         {
                 // A HTTP or FTP wrapper is being used - show a warning and abort
-                echo "HTTP and FTP wrappers are currently not supported with TIFF - See EXIF/TIFF functionality documentation - a local file must be specified<br>";
-                echo "To work on an internet file, copy it locally to start with:<br><br>\n";
-                echo "\$newfilename = tempnam ( \$dir, \"tmptiff\" );<br>\n";
-                echo "copy ( \"http://whatever.com\", \$newfilename );<br><br>\n";
+                $error_message .= "HTTP and FTP wrappers are currently not supported with TIFF - See EXIF/TIFF functionality documentation - a local file must be specified<br>";
+                $error_message .= "To work on an internet file, copy it locally to start with:<br><br>\n";
+                $error_message .= "\$newfilename = tempnam ( \$dir, \"tmptiff\" );<br>\n";
+                $error_message .= "copy ( \"http://whatever.com\", \$newfilename );<br><br>\n";
                 return FALSE;
         }
@@ -491 +494 @@
         {
                 // Could't open the file - exit
-                echo "<p>Could not open file $filename</p>\n";
+                $error_message .= "<p>Could not open file $filename</p>\n";
                 return FALSE;
         }
@@ -1128 +1131 @@
 function read_Multiple_IFDs( $filehnd, $Tiff_offset, $Byte_Align, $Tag_Definitions_Name, $local_offsets = FALSE, $read_next_ptr = TRUE )
 {
+global $error_message ;
         // Start at the offset of the first IFD
         $Next_Offset = 0;
@@ -1140 +1144 @@
                 {
                         // Error seeking to position of next IFD
-                        echo "<p>Error: Corrupted EXIF</p>\n";
+                        $error_message .= "<p>Error: Corrupted EXIF</p>\n";
                         return FALSE;
                 }
@@ -1189 +1193 @@
 function read_IFD_universal( $filehnd, $Tiff_offset, $Byte_Align, $Tag_Definitions_Name, $local_offsets = FALSE, $read_next_ptr = TRUE )
 {
+global $error_message ;
+
         if ( ( $filehnd == NULL ) || ( feof( $filehnd ) ) )
         {
@@ -1210 +1216 @@
         {
                 // Huge number of entries - abort
-                echo "<p>Error: huge number of EXIF entries - EXIF is probably Corrupted</p>\n";
+                $error_message .= "<p>".$No_Entries."Error: huge number of EXIF entries - EXIF is probably Corrupted</p>\n";
 
                 return array ( FALSE , 0);
@@ -1235 +1241 @@
         {
                 // Couldn't read the IFD Data properly, Some Casio files have no Next IFD pointer, hence cause this error
-                echo "<p>Error: EXIF Corrupted</p>\n";
+                $error_message .= "<p>Error: EXIF Corrupted</p>\n";
                 return array(FALSE, 0);
         }
@@ -1291 +1297 @@
                 if ( $Data_Count > 100000 )
                 {
-                     //   echo "<p>Error: huge EXIF data count - EXIF is probably Corrupted</p>\n";
+                     //   $error_message .= "<p>Error: huge EXIF data count - EXIF is probably Corrupted</p>\n";
 
                         // Some Casio files have no Next IFD pointer, hence cause errors
@@ -2202 +2208 @@
 ******************************************************************************/
 
-function get_IFD_Data_Type( $input_data, $data_type, $Byte_Align )
-{
+function get_IFD_Data_Type( $input_data, $data_type, $Byte_Align ){
+global $error_message ;
         // Check if this is a Unsigned Byte, Unsigned Short or Unsigned Long
         if (( $data_type == 1 ) || ( $data_type == 3 ) || ( $data_type == 4 ))
@@ -2228 +2234 @@
                 // to return multiple values instead of a single value
 
-                echo "<p>Error - ASCII Strings should not be processed in get_IFD_Data_Type</p>\n";
+                $error_message .= "<p>Error - ASCII Strings should not be processed in get_IFD_Data_Type</p>\n";
                 return "Error Should never get here"; //explode( "\x00", $input_data );
         }