Changeset 2830

Show
Ignore:
Timestamp:
11/05/08 23:59:42 (5 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:
6 modified

Legend:

Unmodified
Added
Removed

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

    r2329 r2830  
    3535  load_language('plugin.lang', dirname(__FILE__).'/'); 
    3636 
    37   $can_be_deactivate = true; 
     37  $to_deactivate = true; 
    3838 
    3939  /* Check user with same e-mail */ 
    … …  
    5353  if (mysql_fetch_array(pwg_query($query))) 
    5454  { 
    55     $can_be_deactivate = false; 
     55    $to_deactivate = false; 
    5656    $c13y->add_anomaly( 
    5757      l10n('c13y_dbl_email_user'), 
    … …  
    8383  while ($row = mysql_fetch_assoc($result)) 
    8484  { 
    85     $can_be_deactivate = false; 
     85    $to_deactivate = false; 
    8686 
    8787    $uninstall_msg_link = 
    … …  
    9999  } 
    100100 
    101   /* Check if this plugin must deactivate */ 
    102   if ($can_be_deactivate) 
     101  /* Check if this plugin must be deactivate */ 
     102  if ($to_deactivate) 
    103103  { 
    104     $deactivate_msg_link = 
    105       '<a href="'. 
    106       PHPWG_ROOT_PATH. 
    107       'admin.php?page=plugins_list&amp;plugin=c13y_upgrade&amp;action=deactivate'. 
    108       '" onclick="window.open(this.href, \'\'); return false;">'. 
    109       l10n('c13y_upgrade_deactivate').'</a>'; 
    110  
    111     $c13y->add_anomaly( 
    112       l10n('c13y_upgrade_no_anomaly'), 
    113       'c13y_upgrade_correction', 
    114       'deactivate_plugin', 
    115       $deactivate_msg_link 
    116       ); 
    117   } 
    118 } 
    119  
    120 function c13y_upgrade_correction($action) 
    121 { 
    122   $result = false; 
    123  
    124   switch ($action) 
    125   { 
    126     case 'deactivate_plugin': 
    127       { 
    128         $query = ' 
     104    $query = ' 
    129105REPLACE INTO '.PLUGINS_TABLE.' 
    130106(id, state) 
    131107VALUES (\'c13y_upgrade\', \'inactive\') 
    132108;'; 
    133         pwg_query($query); 
    134         $result = true; 
    135       } 
    136       break; 
     109    pwg_query($query); 
     110 
     111  global $page; 
     112  $page['infos'][] = l10n('c13y_upgrade_no_anomaly'); 
    137113  } 
    138  
    139   return $result; 
    140114} 
    141115 

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

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

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

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

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

    r2686 r2830  
    2323 
    2424// --------- Starting below: New or revised $lang ---- from Butterfly (1.8) 
    25 $lang['c13y_upgrade_no_anomaly'] = 'Ninguna anomalía detectada después de la puesta al día de la aplicación'; 
    26 $lang['c13y_upgrade_deactivate'] = 'Usted puede desactivar el plugin Check upgrades'; 
     25$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.'*/ 
    2726$lang['c13y_dbl_email_user'] = 'Utilizadores con la misma dirección e-mail'; 
    2827$lang['c13y_correction_dbl_email_user'] = 'Suprima a los utilizadores en duplicado'; 

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

    r2299 r2830  
    2323 
    2424// --------- Starting below: New or revised $lang ---- from Butterfly (1.8) 
    25 $lang['c13y_upgrade_no_anomaly'] = 'Pas d\'anomalie détectée après la mise à jour de l\'application'; 
    26 $lang['c13y_upgrade_deactivate'] = 'Vous pouvez désactiver le plugin "Check upgrades"'; 
     25$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é.'; 
    2726$lang['c13y_dbl_email_user'] = 'Utilisateurs avec la même adresse email'; 
    2827$lang['c13y_correction_dbl_email_user'] = 'Supprimez les utilisateurs en double'; 

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

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