Changeset 2830 for branches/2.0/plugins

Timestamp:

Nov 5, 2008, 11:59:42 PM (16 years ago)

Author:

rub

Message:

merge -c2829 from trunk to branch 2.0
The exact copy of commit log in 2829.

Location:

branches/2.0/plugins/c13y_upgrade

Files:

• initialize.inc.php (modified) (4 diffs)
• language/de_DE/plugin.lang.php (modified) (1 diff)
• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/es_ES/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (1 diff)
• language/it_IT/plugin.lang.php (modified) (1 diff)

branches/2.0/plugins/c13y_upgrade/initialize.inc.php

@@ -35 +35 @@
   load_language('plugin.lang', dirname(__FILE__).'/');
 
-  $can_be_deactivate = true;
+  $to_deactivate = true;
 
   /* Check user with same e-mail */
@@ -53 +53 @@
   if (mysql_fetch_array(pwg_query($query)))
   {
-    $can_be_deactivate = false;
+    $to_deactivate = false;
     $c13y->add_anomaly(
       l10n('c13y_dbl_email_user'),
@@ -83 +83 @@
   while ($row = mysql_fetch_assoc($result))
   {
-    $can_be_deactivate = false;
+    $to_deactivate = false;
 
     $uninstall_msg_link =
@@ -99 +99 @@
   }
 
-  /* Check if this plugin must deactivate */
-  if ($can_be_deactivate)
+  /* Check if this plugin must be deactivate */
+  if ($to_deactivate)
   {
-    $deactivate_msg_link =
-      '<a href="'.
-      PHPWG_ROOT_PATH.
-      'admin.php?page=plugins_list&amp;plugin=c13y_upgrade&amp;action=deactivate'.
-      '" onclick="window.open(this.href, \'\'); return false;">'.
-      l10n('c13y_upgrade_deactivate').'</a>';
-
-    $c13y->add_anomaly(
-      l10n('c13y_upgrade_no_anomaly'),
-      'c13y_upgrade_correction',
-      'deactivate_plugin',
-      $deactivate_msg_link
-      );
-  }
-}
-
-function c13y_upgrade_correction($action)
-{
-  $result = false;
-
-  switch ($action)
-  {
-    case 'deactivate_plugin':
-      {
-        $query = '
+    $query = '
 REPLACE INTO '.PLUGINS_TABLE.'
 (id, state)
 VALUES (\'c13y_upgrade\', \'inactive\')
 ;';
-        pwg_query($query);
-        $result = true;
-      }
-      break;
+    pwg_query($query);
+
+  global $page;
+  $page['infos'][] = l10n('c13y_upgrade_no_anomaly');
   }
-
-  return $result;
 }
 

branches/2.0/plugins/c13y_upgrade/language/de_DE/plugin.lang.php

@@ -23 +23 @@
 
 // --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
-$lang['c13y_upgrade_no_anomaly'] = 'Keine Unregelmäßigkeiten festgestellt nach der Aktualisierung der Anwendung';
-$lang['c13y_upgrade_deactivate'] = 'Sie können desactivate "Check-Upgrades"-Plugin';
+$lang['c13y_upgrade_no_anomaly'] = 'Keine Unregelmäßigkeiten festgestellt nach der Aktualisierung der Anwendung'; /* TODO , "Check upgrades" plugin was deactivated.'*/
 $lang['c13y_dbl_email_user'] = 'Benutzer mit gleichen E-Mail-Adresse';
 $lang['c13y_correction_dbl_email_user'] = 'Löschen doppeltes Benutzer';

branches/2.0/plugins/c13y_upgrade/language/en_UK/plugin.lang.php

@@ -23 +23 @@
 
 // --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
-$lang['c13y_upgrade_no_anomaly'] = 'No anomaly detected after application upgrade';
-$lang['c13y_upgrade_deactivate'] = 'You can deactivate "Check upgrades" plugin';
+$lang['c13y_upgrade_no_anomaly'] = 'No anomaly detected after application upgrade, "Check upgrades" plugin was deactivated.';
 $lang['c13y_dbl_email_user'] = 'Users with same email address';
 $lang['c13y_correction_dbl_email_user'] = 'Delete duplicate users';

branches/2.0/plugins/c13y_upgrade/language/es_ES/plugin.lang.php

@@ -23 +23 @@
 
 // --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
-$lang['c13y_upgrade_no_anomaly'] = 'Ninguna anomalía detectada después de la puesta al día de la aplicación';
-$lang['c13y_upgrade_deactivate'] = 'Usted puede desactivar el plugin Check upgrades';
+$lang['c13y_upgrade_no_anomaly'] = 'Ninguna anomalía detectada después de la puesta al día de la aplicación'; /* TODO , "Check upgrades" plugin was deactivated.'*/
 $lang['c13y_dbl_email_user'] = 'Utilizadores con la misma dirección e-mail';
 $lang['c13y_correction_dbl_email_user'] = 'Suprima a los utilizadores en duplicado';

branches/2.0/plugins/c13y_upgrade/language/fr_FR/plugin.lang.php

@@ -23 +23 @@
 
 // --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
-$lang['c13y_upgrade_no_anomaly'] = 'Pas d\'anomalie détectée après la mise à jour de l\'application';
-$lang['c13y_upgrade_deactivate'] = 'Vous pouvez désactiver le plugin "Check upgrades"';
+$lang['c13y_upgrade_no_anomaly'] = 'Pas d\'anomalie détectée après la mise à jour de l\'application, le plugin "Check upgrades" a été désactivé.';
 $lang['c13y_dbl_email_user'] = 'Utilisateurs avec la même adresse email';
 $lang['c13y_correction_dbl_email_user'] = 'Supprimez les utilisateurs en double';

branches/2.0/plugins/c13y_upgrade/language/it_IT/plugin.lang.php

@@ -23 +23 @@
 
 // --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
-$lang['c13y_upgrade_no_anomaly'] = 'Nessun\' anomalia individuata dopo l\'aggiornamento dell\'applicatione';
-$lang['c13y_upgrade_deactivate'] = 'Potete disattivare il plugin "Check upgrades"';
+$lang['c13y_upgrade_no_anomaly'] = 'Nessun\' anomalia individuata dopo l\'aggiornamento dell\'applicatione'; /* TODO , "Check upgrades" plugin was deactivated.'*/
 $lang['c13y_dbl_email_user'] = 'Utenti con lo stesso indirizzo email';
 $lang['c13y_correction_dbl_email_user'] = 'Cancellare i doppioni';