Changeset 1682 for trunk

Timestamp:

Dec 28, 2006, 1:06:06 AM (17 years ago)

Author:

rub

Message:

Fix Feature Issue ID 0000585.

Convergence of exif configuration between local site and remote site.

Notes added on administration page where configuration is not OK.

Location:

trunk

Files:

• admin.php (modified) (1 diff)
• admin/include/functions.php (modified) (1 diff)
• include/config_default.inc.php (modified) (1 diff)
• include/picture_metadata.inc.php (modified) (1 diff)
• language/en_UK.iso-8859-1/admin.lang.php (modified) (1 diff)
• language/fr_FR.iso-8859-1/admin.lang.php (modified) (1 diff)
• picture.php (modified) (1 diff)

trunk/admin.php

@@ -44 +44 @@
 
 sync_users();
+
+// +-----------------------------------------------------------------------+
+// |  Check configuration and add notes on problem                         |
+// +-----------------------------------------------------------------------+
+
+check_conf();
 
 // +-----------------------------------------------------------------------+

trunk/admin/include/functions.php

@@ -1889 +1889 @@
   associate_images_to_categories($images, $destinations);
 }
+
+/**
+ * Check configuration and add notes on problem
+ *
+ * @param void
+ * @return void
+ */
+function check_conf()
+{
+  global $conf, $header_notes;
+  $count = 0;
+  
+  if (($conf['show_exif']) and (!function_exists('read_exif_data')))
+  {
+    $header_notes[] = sprintf(l10n('note_check_exif'), '$conf[\'show_exif\']');
+    $count++;
+  }
+
+  if (($conf['use_exif']) and (!function_exists('read_exif_data')))
+  {
+    $header_notes[] = sprintf(l10n('note_check_exif'), '$conf[\'use_exif\']');
+    $count++;
+  }
+
+  if ($count != 0)
+  {
+    $header_notes[] =
+      sprintf
+      (
+        l10n('note_check_more_info'),
+        sprintf('<a href="http://forum.phpwebgallery.net/" target="_blank"> %s</a>', l10n('note_check_more_info_forum')),
+        sprintf('<a href="http://phpwebgallery.net/doc/" target="_blank"> %s</a>', l10n('note_check_more_info_wiki'))
+      );
+  }
+}
+
 ?>

trunk/include/config_default.inc.php

@@ -311 +311 @@
 // use_exif: Use EXIF data during database synchronization with files
 // metadata
-$conf['use_exif'] = false;
+$conf['use_exif'] = true;
 
 // use_exif_mapping: same behaviour as use_iptc_mapping

trunk/include/picture_metadata.inc.php

@@ -33 +33 @@
 include_once(PHPWG_ROOT_PATH.'/include/functions_metadata.inc.php');
 $template->assign_block_vars('metadata', array());
-if ($conf['show_exif'])
+if (($conf['show_exif']) and (function_exists('read_exif_data')))
 {
-  if (!function_exists('read_exif_data'))
-  {
-    die('Exif extension not available, admin should disable exif display');
-  }
-
   if ($exif = @read_exif_data($picture['current']['image_path']))
   {

trunk/language/en_UK.iso-8859-1/admin.lang.php

@@ -568 +568 @@
 $lang['special_admin_menu'] = 'Specials';
 $lang['pictures_menu'] = 'Pictures';
+$lang['note_check_exif'] = '%s must be to set to false in your config_local.inc.php file because exif are not supported.';
+$lang['note_check_more_info'] = 'Go to %s or %s for more informations.';
+$lang['note_check_more_info_forum'] = 'the forum';
+$lang['note_check_more_info_wiki'] = 'the wiki';
 
 

trunk/language/fr_FR.iso-8859-1/admin.lang.php

@@ -566 +566 @@
 $lang['special_admin_menu'] = 'Spécials';
 $lang['pictures_menu'] = 'Images';
+$lang['note_check_exif'] = '%s doit être mis à "false" dans votre fichier config_local.inc.php parce que l\'exif n\'est pas supporté.';
+$lang['note_check_more_info'] = 'Allez sur %s ou %s pour plus d\'informations.';
+$lang['note_check_more_info_forum'] = 'le forum';
+$lang['note_check_more_info_wiki'] = 'le wiki';
 
 ?>

trunk/picture.php

@@ -780 +780 @@
 include(PHPWG_ROOT_PATH.'include/picture_rate.inc.php');
 include(PHPWG_ROOT_PATH.'include/picture_comment.inc.php');
-if ($metadata_showable and isset($_GET['metadata']))
+//if ($metadata_showable and isset($_GET['metadata']))
 {
   include(PHPWG_ROOT_PATH.'include/picture_metadata.inc.php');