Changeset 2067 for branches/branch-1_7

Timestamp:

Jul 19, 2007, 10:03:17 PM (17 years ago)

Author:

rub

Message:

Resolved issue 0000725: Check integrity

Replace actual test (exif) by a new dynamic system of check integrity.
Anomalies are listed with automatic correction if it's possible.

Merge BSF 2064:2066 into branch-1_7

Location:

branches/branch-1_7

Files:

• admin.php (modified) (2 diffs)
• admin/include/functions.php (modified) (1 diff)
• admin/include/functions_check_integrity.inc.php (copied) (copied from trunk/admin/include/functions_check_integrity.inc.php)
• admin/intro.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)
• template/yoga/admin/check_integrity.tpl (copied) (copied from trunk/template/yoga/admin/check_integrity.tpl)

branches/branch-1_7/admin.php

@@ -45 +45 @@
 
 // +-----------------------------------------------------------------------+
-// |  Check configuration and add notes on problem                         |
-// +-----------------------------------------------------------------------+
-
-check_conf();
-
-// +-----------------------------------------------------------------------+
 // |                            variables init                             |
 // +-----------------------------------------------------------------------+
@@ -67 +61 @@
 $page['errors'] = array();
 $page['infos']  = array();
+
+
+if ($page['page'] == 'intro')
+{
+  include_once(PHPWG_ROOT_PATH.'admin/include/functions_check_integrity.inc.php');
+  check_integrity();
+}
 
 $link_start = PHPWG_ROOT_PATH.'admin.php?page=';

branches/branch-1_7/admin/include/functions.php

@@ -1953 +1953 @@
 
 /**
- * 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)
-  {
-    $pwg_links = pwg_URL();
-    $link_fmt = '<a href="%s" onclick="window.open(this.href, \'\'); return false;">%s</a>';
-    $header_notes[] =
-      sprintf
-      (
-        l10n('note_check_more_info'),
-        sprintf($link_fmt, $pwg_links['FORUM'], l10n('note_check_more_info_forum')),
-        sprintf($link_fmt, $pwg_links['WIKI'], l10n('note_check_more_info_wiki'))
-      );
-  }
-}
-/**
  * Refer main PhpWebGallery URLs (currently PHPWG_DOMAIN domain)
  *

branches/branch-1_7/admin/intro.php

@@ -279 +279 @@
 $template->assign_var_from_handle('ADMIN_CONTENT', 'intro');
 
+display_check_integrity();
+
 ?>

branches/branch-1_7/language/en_UK.iso-8859-1/admin.lang.php

@@ -608 +608 @@
 $lang['is_the_default'] = 'default values';
 $lang['High filesize'] = 'High filesize';
-// --------- Starting below: New or revised $lang ---- from Butterfly (1.7.1)
+// --------- Starting below: New or revised $lang ---- from version 1.7.1
 $lang['Guest cannot be deleted'] = 'Guest cannot be deleted';
 $lang['Default user cannot be deleted'] = 'Default user cannot be deleted';
 $lang['purge history detail'] = 'purge history detail';
 $lang['purge history summary'] = 'purge history summary';
+$lang['c13y_title'] = 'Check integrity';
+$lang['c13y_Anomaly'] = 'Anomaly';
+$lang['c13y_Correction'] = 'Correction';
+$lang['c13y_Automatic_correction'] = 'Automatic correction';
+$lang['c13y_Impossible_automatic_correction'] = 'Impossible automatic correction';
+$lang['c13y_Correction_applied_success'] = 'Correction applied with success';
+$lang['c13y_Correction_applied_error'] = 'Correction applied with error';
+$lang['c13y_Apply_selected_corrections'] = 'Apply selected corrections';
+$lang['c13y_anomaly_count'] = '%d anomaly has been detected.';
+$lang['c13y_anomalies_count'] = '%d anomalies has been detected.';
+$lang['c13y_anomaly_corrected_count'] = '%d anomaly has been corrected.';
+$lang['c13y_anomalies_corrected_count'] = '%d anomalies has been detected corrected.';
+$lang['c13y_anomaly_not_corrected_count'] = '%d anomaly hasn\'t been corrected.';
+$lang['c13y_anomalies_not_corrected_count'] = '%d anomalies hasn\'t been corrected.';
+$lang['c13y_more_info'] = 'Go to %s or %s for more informations';
+$lang['c13y_more_info_forum'] = 'the forum';
+$lang['c13y_more_info_wiki'] = 'the wiki';
+$lang['c13y_exif_anomaly'] = '%s value is not correct file because exif are not supported';
+$lang['c13y_exif_correction'] = '%s must be to set to false in your config_local.inc.php file';
+$lang['c13y_guest_non_existent'] = 'Main "guest" user don\'t exist any more';
+$lang['c13y_bad_guest_status'] = 'Main "guest" user status is incorrect';
+$lang['c13y_default_non_existent'] = 'Default user don\'t exist any more';
+$lang['c13y_webmaster_non_existent'] = 'Main "webmaster" user don\'t exist any more';
+$lang['c13y_bad_webmaster_status'] = 'Main "webmaster" user status is incorrect';
+$lang['c13y_user_created'] = 'User "%s" created with "%s" like password';
+$lang['c13y_user_status_updated'] = 'Status of user "%s" updated';
 ?>

branches/branch-1_7/language/fr_FR.iso-8859-1/admin.lang.php

@@ -609 +609 @@
 $lang['is_the_default'] = 'valeurs par défaut';
 $lang['High filesize'] = 'Taille du fichier HR';
-// --------- Starting below: New or revised $lang ---- from Butterfly (1.7.1)
+// --------- Starting below: New or revised $lang ---- from version 1.7.1
 $lang['Guest cannot be deleted'] = 'L\'invité ne peut pas être supprimé';
 $lang['Default user cannot be deleted'] = 'L\'utilisateur par défaut ne peut pas être supprimé';
 $lang['purge history detail'] = 'purger le detail de l\'historique';
 $lang['purge history summary'] = 'purger le sommaire de l\'historique';
+$lang['c13y_title'] = 'Contrôle d\'intégrité';
+$lang['c13y_Anomaly'] = 'Anomalie';
+$lang['c13y_Correction'] = 'Correction';
+$lang['c13y_Automatic_correction'] = 'Correction automatique';
+$lang['c13y_Impossible_automatic_correction'] = 'Correction automatique impossible';
+$lang['c13y_Correction_applied_success'] = 'Correction appliquée avec succés';
+$lang['c13y_Correction_applied_error'] = 'Correction appliquée avec erreur';
+$lang['c13y_Apply_selected_corrections'] = 'Appliquer les corrections sélectionnées';
+$lang['c13y_anomaly_count'] = '%d anomalie a été détecté.';
+$lang['c13y_anomalies_count'] = '%d anomalies ont été détectées.';
+$lang['c13y_anomaly_corrected_count'] = '%d anomalie a été corrigée.';
+$lang['c13y_anomalies_corrected_count'] = '%d anomalies ont été corrigées.';
+$lang['c13y_anomaly_not_corrected_count'] = '%d anomalie n\'a pas pu être corrigée.';
+$lang['c13y_anomalies_not_corrected_count'] = '%d anomalies n\'ont pu être corrigées.';
+$lang['c13y_more_info'] = 'Allez sur %s ou %s pour plus d\'informations';
+$lang['c13y_more_info_forum'] = 'le forum';
+$lang['c13y_more_info_wiki'] = 'le wiki';
+$lang['c13y_exif_anomaly'] = 'La valeur de %s n\'est pas correcte parce que l\'exif n\'est pas supporté';
+$lang['c13y_exif_correction'] = '%s doit être mis à "false" dans votre fichier config_local.inc.php';
+$lang['c13y_guest_non_existent'] = 'L\'utilisateur "invité" principal n\'existe plus';
+$lang['c13y_bad_guest_status'] = 'Le statut de l\'utilisateur "invité" principal est incorrect';
+$lang['c13y_default_non_existent'] = 'L\'utilisateur par défaut n\'existe plus';
+$lang['c13y_webmaster_non_existent'] = 'L\'utilisateur "webmestre" principal n\'existe plus';
+$lang['c13y_bad_webmaster_status'] = 'Le statut de l\'utilisateur "webmestre" principal est incorrect';
+$lang['c13y_user_created'] = 'Utilisateur "%s" créé avec comme mot de passe "%s"';
+$lang['c13y_user_status_updated'] = 'Statut de l\'utilisateur "%s" mis à jour';
 ?>