Changeset 5593


Ignore:
Timestamp:
Apr 3, 2010, 3:33:04 PM (14 years ago)
Author:
Eric
Message:

[NBC_UserAdvManager]

  • Code refactoring for Piwigo 2.1 compliance
  • Bug 1508 fixed : Plugin displayed name doesn't show "nbc_" prefix any more
  • Bug 1551 fixed : There was a problem on very first time installation
  • Several translation fixes
  • Template files storage : All admin's templates are now in a "template" directory with css file
Location:
extensions/NBC_UserAdvManager/trunk
Files:
11 added
5 deleted
17 edited

Legend:

Unmodified
Added
Removed

  • extensions/NBC_UserAdvManager/trunk/ConfirmMail.php

    r5181 r5593  
    3535                );
    3636  }
    37 
    38   //$refresh_txt = l10n('ConfirmMail_redirection');
    39   //$refresh_time = '10';
    40   //redirect(make_index_url(),'',$refresh_time);
    4137}
    4238

  • extensions/NBC_UserAdvManager/trunk/ConfirmMail.tpl

    r5181 r5593  
    1 {* $Id: ConfirmMail.tpl $ *}
    21<div id="content" class="content">
    32  <div class="titrePage">

  • extensions/NBC_UserAdvManager/trunk/admin/UAM_admin.php

    r5181 r5593  
    1414//ini_set('display_errors', true);
    1515
    16 include_once (PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php');
     16include_once(PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php');
    1717include_once (PHPWG_ROOT_PATH.'/include/constants.php');
    1818$my_base_url = get_admin_plugin_menu_link(__FILE__);
    … …  
    452452// |                           templates display                           |
    453453// +-----------------------------------------------------------------------+
    454   $template->set_filename('plugin_admin_content', dirname(__FILE__) . '/global.tpl');
     454  $template->set_filename('plugin_admin_content', dirname(__FILE__) . '/template/global.tpl');
    455455  $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');
    456456
    … …  
    573573      }
    574574      else $display = '';
    575      
    576       /* Plugin version inserted */
    577       $template->assign(
    578         array(
    579           'UAM_VERSION' => $version,
    580           'UAM_PATH'    => UAM_PATH,
    581           )
    582         );
    583575
    584576                $template->append(
    … …  
    594586                        );
    595587                }
     588    /* Plugin version inserted */
     589    $template->assign(
     590      array(
     591        'UAM_VERSION'  => $version,
     592        'UAM_PATH'     => UAM_PATH,
     593      )
     594    );   
    596595// +-----------------------------------------------------------------------+
    597596// |                             errors display                            |
    … …  
    609608// |                           templates display                           |
    610609// +-----------------------------------------------------------------------+
    611                 $template->set_filename('plugin_admin_content', dirname(__FILE__) . '/userlist.tpl');
     610                $template->set_filename('plugin_admin_content', dirname(__FILE__) . '/template/userlist.tpl');
    612611    $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');         
    613612  }
    614613  else
    615614  {
    616                 array_push($page['infos'], l10n('Err_Userlist_Settings'));
     615                array_push($page['errors'], l10n('Err_Userlist_Settings'));
    617616  }
    618617  break;
    … …  
    11631162// |                           templates display                           |
    11641163// +-----------------------------------------------------------------------+
    1165                 $template->set_filename('plugin_admin_content', dirname(__FILE__) . '/usermanager.tpl');
     1164                $template->set_filename('plugin_admin_content', dirname(__FILE__) . '/template/usermanager.tpl');
    11661165    $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');         
    11671166        }
    11681167  else
    11691168  {
    1170                 array_push($page['infos'], l10n('Err_UserManager_Settings'));
     1169                array_push($page['errors'], l10n('Err_UserManager_Settings'));
    11711170  }
    11721171  break;
    … …  
    15541553// |                           templates display                           |
    15551554// +-----------------------------------------------------------------------+
    1556                 $template->set_filename('plugin_admin_content', dirname(__FILE__) . '/ghosttracker.tpl');
     1555                $template->set_filename('plugin_admin_content', dirname(__FILE__) . '/template/ghosttracker.tpl');
    15571556    $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');         
    15581557        }
    15591558  else
    15601559  {
    1561                 array_push($page['infos'], l10n('Err_GhostTracker_Settings'));
     1560                array_push($page['errors'], l10n('Err_GhostTracker_Settings'));
    15621561  }
    15631562

  • extensions/NBC_UserAdvManager/trunk/changelog.txt.php

    r5181 r5593  
    153153-- 2.14.1 : Bug 1497 fixed - Using users tracker without Ghost Tracker is now OK
    154154
    155 -- 2.14.2 : Bug 1474 fixed - Messages on registration's confirmation return page (ConfirmMail.tpl) are customizable
     155
     156***************************************
     157***** Plugin history (branch 2.15)*****
     158***************************************
     159
     160-- 2.15.0 : Plugin compatibility for Piwigo 2.1
    156161            Bug 1467 fixed - FCK Editor's functionnalities are available on registration's confirmation return page customization fields
     162            Bug 1474 fixed - Messages on registration's confirmation return page (ConfirmMail.tpl) are customizable
    157163            Bug 1508 fixed - Plugin's name is now UserAdvManager (deletion of "nbc_" in code and PEM)
     164            Bug 1551 fixed - Database upgrade improvement
    158165*/
    159166?>

  • extensions/NBC_UserAdvManager/trunk/language/de_DE/help/plugin.lang.php

    r5105 r5593  
    148148<b>HINWEIS</b> : Die Liste wird nicht angezeigt, die nicht validiert ihrer Registrierung (falls die M&ouml;glichkeit der Validierung der Registrierung aktiviert ist). Diese Benutzer werden dann in besonderer Weise in der &quot;Tracking Validierungen verwaltet&quot; aus.';
    149149// --------- End: New or revised $lang ---- from version 2.14.1
     150
     151
     152// --------- Starting below: New or revised $lang ---- from version 2.15.0
     153/*TODO*/$lang['UAM_confirmmail_custom1'] = 'Text of the confirmation page - Confirmation accepted';
     154/*TODO*/$lang['UAM_confirmmail_custom1_d'] = 'When the option &quot;Confirmation of registration&quot; is active, this field allows you to customize the <b><u>acceptance text</u></b> on the registration confirmation page displayed when user clicks the confirmation link that was received by email.<br>
     155After installing the plugin, a standard text is set as an example.<br>
     156This field is compatible with the FCK Editor and, for multi-languages, you can use the tags [lang] of the plugin Extended description if it\'s active.<br>
     157<b style=&quot;color:red;&quot;>Changing the text is possible ONLY if &quot;Confirmation of registration&quot; is activated.</b>';
     158/*TODO*/$lang['UAM_confirmmail_custom2'] = 'Text of the confirmation page - Confirmation rejected';
     159/*TODO*/$lang['UAM_confirmmail_custom2_d'] = 'When the option &quot;Confirmation of registration&quot; is active, this field allows you to customize the <b><u>rejectance text</u></b> on the registration confirmation page displayed when user clicks the confirmation link that was received by email.<br>
     160After installing the plugin, a standard text is set as an example.<br>
     161This field is compatible with the FCK Editor and, for multi-languages, you can use the tags [lang] of the plugin Extended description if it\'s active.<br>
     162<b style=&quot;color:red;&quot;>Changing the text is possible ONLY if &quot;Confirmation of registration&quot; is activated.</b>';
     163// --------- End: New or revised $lang ---- from version 2.15.0
    150164?>

  • extensions/NBC_UserAdvManager/trunk/language/de_DE/plugin.lang.php

    r5181 r5593  
    197197$lang['Reminder_without_key_of_%s'] = '%s, Ihre Validierung Schlüssel abläuft';
    198198/* Errors and Warnings */
    199 $lang['Err_UserManager_Settings'] = 'Diese Seite ist nur verfügbar, wenn &quot;Deadline für die Registrierung begrenzte Validierung&quot; aktiv ist und ein Unvalidierte User-Gruppe ist im Abschnitt &quot;Einstellung Bestätigungen und Validierungen der Registrierung&quot; gesetzt.';
    200199$lang['Err_GhostTracker_Settings'] = 'Diese Seite ist nur verfügbar, wenn &quot;Geist Tracker&quot; aktiv &quot;Einstellen der Registrierung durchgeführt und andere Optionen&quot;.';
    201200$lang['Err_Userlist_Settings'] = 'Diese Seite ist nur verfügbar, wenn &quot;Monitoring registrierte Benutzer&quot; ist aktiv in der &quot;Einstellung der Registrierung durchgeführt und andere Optionen&quot;';
    … …  
    225224- Optional können Sie das Plugin Extended Description Multi-Sprachen<br>
    226225            </li><br><br>
    227               <li>
     226            <li>
    228227Etappen:<br><br>
    229228A. In plugin UAM:
    … …  
    235234                <li>Speichern Sie das Plugin-Konfiguration</li>
    236235              </ol>
    237               </li><br>
     236<br>
    238237B. In plugin PWG Stuffs :
    239238              <ol>
    … …  
    244243                <li>Überprüfen Sie die Konfiguration des Moduls</li>
    245244              </ol>
     245            </li>
    246246          </ul>';
    247247// --------- End: New or revised $lang ---- from version 2.14.0
     248
     249
     250// --------- Starting below: New or revised $lang ---- from version 2.15.0
     251$lang['UAM_confirmmail_custom_Txt1'] = 'Text der Bestätigungs-Seite - Bestätigung akzeptiert';
     252$lang['UAM_confirmmail_custom_Txt2'] = 'Text der Bestätigungs-Seite - Bestätigung abgelehnt';
     253$lang['LastVisit_Date'] = 'Letzter Besuch';
     254$lang['Nb_Days'] = 'Differenz in Tagen';
     255$lang['Err_UserManager_Settings'] = 'Diese Seite ist nur verfügbar, wenn "Bestätigung der Anmeldung" aktiv ist und wenn eine Gruppe von nicht validierte Besuchern wird in "Einstellen Bestätigungen und Validierungen der Registrierung" konfiguriert.';
     256// --------- End: New or revised $lang ---- from version 2.15.0
    248257?>

  • extensions/NBC_UserAdvManager/trunk/language/en_UK/help/plugin.lang.php

    r5105 r5593  
    148148<b>NOTE</b> : The list does not display who have not validated their registration (if the option of validating the registration is activated). These users are then managed in a special way in the &quot;Tracking validations&quot; tab.';
    149149// --------- End: New or revised $lang ---- from version 2.14.1
     150
     151
     152// --------- Starting below: New or revised $lang ---- from version 2.15.0
     153$lang['UAM_confirmmail_custom1'] = 'Text of the confirmation page - Confirmation accepted';
     154$lang['UAM_confirmmail_custom1_d'] = 'When the option &quot;Confirmation of registration&quot; is active, this field allows you to customize the <b><u>acceptance text</u></b> on the registration confirmation page displayed when user clicks the confirmation link that was received by email.<br>
     155After installing the plugin, a standard text is set as an example.<br>
     156This field is compatible with the FCK Editor and, for multi-languages, you can use the tags [lang] of the plugin Extended description if it\'s active.<br>
     157<b style=&quot;color:red;&quot;>Changing the text is possible ONLY if &quot;Confirmation of registration&quot; is activated.</b>';
     158$lang['UAM_confirmmail_custom2'] = 'Text of the confirmation page - Confirmation rejected';
     159$lang['UAM_confirmmail_custom2_d'] = 'When the option &quot;Confirmation of registration&quot; is active, this field allows you to customize the <b><u>rejectance text</u></b> on the registration confirmation page displayed when user clicks the confirmation link that was received by email.<br>
     160After installing the plugin, a standard text is set as an example.<br>
     161This field is compatible with the FCK Editor and, for multi-languages, you can use the tags [lang] of the plugin Extended description if it\'s active.<br>
     162<b style=&quot;color:red;&quot;>Changing the text is possible ONLY if &quot;Confirmation of registration&quot; is activated.</b>';
     163// --------- End: New or revised $lang ---- from version 2.15.0
    150164?>

  • extensions/NBC_UserAdvManager/trunk/language/en_UK/plugin.lang.php

    r5181 r5593  
    6666/* Ghost Tracker Tab */
    6767$lang['Tab_GhostTracker'] = 'Ghost Tracker';
    68 $lang['LastVisit_Date'] = 'Last visit';
    6968$lang['Reminder'] = 'Email reminder';
    7069$lang['Reminder_Sent_OK'] = 'YES';
    … …  
    105104/* UserList Tab */
    106105$lang['UserList_Title'] = 'Monitoring registered users';
    107 $lang['Nb_Days'] = 'Number of days<br>since last visit';
    108106// --------- End: New or revised $lang ---- from version 2.13.0
    109107
    … …  
    197195$lang['Reminder_without_key_of_%s'] = '%s, your validation key will expire';
    198196/* Errors and Warnings */
    199 $lang['Err_UserManager_Settings'] = 'This page is available only if "Deadline for registration validation limited" is active and an unvalidated users group is set in "Setting confirmations and validations of registration".';
    200197$lang['Err_GhostTracker_Settings'] = 'This page is available only if "Ghost Tracker" is active in "Setting the registrations followed and other options".';
    201198$lang['Err_Userlist_Settings'] = 'This page is available only if "Monitoring registered users" is active in the "Setting the registrations followed and other options".';
    … …  
    224221- Optionally, the plugin Extended Description to support multi-languages<br>
    225222            </li><br><br>
    226               <li>
     223            <li>
    227224Stages:<br><br>
    228225A. In plugin UAM:
    … …  
    234231                <li>Save the plugin configuration</li>
    235232              </ol>
    236               </li><br>
     233<br>
    237234B. In plugin PWG Stuffs :
    238235              <ol>
    … …  
    243240                <li>Validate the configuration of the module</li>
    244241              </ol>
     242            </li>
    245243          </ul>';
    246244// --------- End: New or revised $lang ---- from version 2.14.0
    247245
    248246
    249 // --------- Starting below: New or revised $lang ---- from version 2.14.2
    250 $lang['UAM_confirmmail_custom_Txt'] = 'Validation page customization';
    251 /* Email confirmation page */
    252 // --------- End: New or revised $lang ---- from version 2.14.2
     247// --------- Starting below: New or revised $lang ---- from version 2.15.0
     248$lang['UAM_confirmmail_custom_Txt1'] = 'Text of the confirmation page - Confirmation accepted';
     249$lang['UAM_confirmmail_custom_Txt2'] = 'Text of the confirmation page - Confirmation rejected';
     250$lang['LastVisit_Date'] = 'Last visit';
     251$lang['Nb_Days'] = 'Difference in days';
     252$lang['Err_UserManager_Settings'] = 'This page is available only if "Confirmation of registration" is active and if a group of visitors not validated is configured in "Setting confirmations and validations of registration".';
     253// --------- End: New or revised $lang ---- from version 2.15.0
    253254?>

  • extensions/NBC_UserAdvManager/trunk/language/es_ES/help/plugin.lang.php

    r5105 r5593  
    148148<b>NOTA</b> : La lista no muestra que no han validado su registro (si la opci&oacute;n de validar el registro est&aacute; activado). Estos usuarios son administrados despu&eacute;s de una manera especial en &quot;Seguimiento de las Validaciones&quot; ficha.';
    149149// --------- End: New or revised $lang ---- from version 2.14.1
     150
     151
     152// --------- Starting below: New or revised $lang ---- from version 2.15.0
     153/*TODO*/$lang['UAM_confirmmail_custom1'] = 'Text of the confirmation page - Confirmation accepted';
     154/*TODO*/$lang['UAM_confirmmail_custom1_d'] = 'When the option &quot;Confirmation of registration&quot; is active, this field allows you to customize the <b><u>acceptance text</u></b> on the registration confirmation page displayed when user clicks the confirmation link that was received by email.<br>
     155After installing the plugin, a standard text is set as an example.<br>
     156This field is compatible with the FCK Editor and, for multi-languages, you can use the tags [lang] of the plugin Extended description if it\'s active.<br>
     157<b style=&quot;color:red;&quot;>Changing the text is possible ONLY if &quot;Confirmation of registration&quot; is activated.</b>';
     158/*TODO*/$lang['UAM_confirmmail_custom2'] = 'Text of the confirmation page - Confirmation rejected';
     159/*TODO*/$lang['UAM_confirmmail_custom2_d'] = 'When the option &quot;Confirmation of registration&quot; is active, this field allows you to customize the <b><u>rejectance text</u></b> on the registration confirmation page displayed when user clicks the confirmation link that was received by email.<br>
     160After installing the plugin, a standard text is set as an example.<br>
     161This field is compatible with the FCK Editor and, for multi-languages, you can use the tags [lang] of the plugin Extended description if it\'s active.<br>
     162<b style=&quot;color:red;&quot;>Changing the text is possible ONLY if &quot;Confirmation of registration&quot; is activated.</b>';
     163// --------- End: New or revised $lang ---- from version 2.15.0
    150164?>

  • extensions/NBC_UserAdvManager/trunk/language/es_ES/plugin.lang.php

    r5181 r5593  
    6767/* Ghost Tracker Tab */
    6868$lang['Tab_GhostTracker'] = 'Ghost Tracker';
    69 $lang['LastVisit_Date'] = 'Última visita';
    7069$lang['Reminder'] = 'Recordatorio por email';
    7170$lang['Reminder_Sent_OK'] = 'SI';
    … …  
    106105/* UserList Tab */
    107106$lang['UserList_Title'] = 'Seguimiento los usuarios registrados';
    108 $lang['Nb_Days'] = 'Número de días<br>desde la última visita';
    109107// --------- End: New or revised $lang ---- from version 2.13.0
    110108
    … …  
    199197$lang['Reminder_without_key_of_%s'] = '%s, su clave de validación expirará';
    200198/* Errors and Warnings */
    201 $lang['Err_UserManager_Settings'] = 'Esta página está disponible sólo si "Plazo para la validación de registro limitado" está activa y un grupo de usuarios no validados se encuentra en "Configuración de la confirmación y validación de registro".';
    202199$lang['Err_GhostTracker_Settings'] = 'Esta página está disponible sólo si "Ghost Tracker" está activo en "Configuración de los registros seguido y otras opciones".';
    203200$lang['Err_Userlist_Settings'] = 'Esta página está disponible sólo si "Seguimiento de los usuarios registrados" está activo en la "Configuración de los registros seguido y otras opciones".';
    … …  
    226223- Opcionalmente, la Extended Description plugin para soportar múltiples idiomas<br>
    227224            </li><br><br>
    228               <li>
     225            <li>
    229226Etapas:<br><br>
    230227A. En plugin UAM:
    … …  
    236233                <li>Guardar la configuración de plug-in</li>
    237234              </ol>
    238               </li><br>
     235<br>
    239236B. En plugin PWG Stuffs :
    240237              <ol>
    … …  
    245242                <li>Validar la configuración del módulo</li>
    246243              </ol>
     244            </li>
    247245          </ul>';
    248246// --------- End: New or revised $lang ---- from version 2.14.0
     247
     248
     249// --------- Starting below: New or revised $lang ---- from version 2.15.0
     250$lang['UAM_confirmmail_custom_Txt1'] = 'Texto de la página de confirmación - Confirmación aceptada';
     251$lang['UAM_confirmmail_custom_Txt2'] = 'Texto de la página de confirmación - Confirmación rechazada';
     252$lang['LastVisit_Date'] = 'Su última visita';
     253$lang['Nb_Days'] = 'Diferencia en días';
     254$lang['Err_UserManager_Settings'] = 'Esta página está disponible sólo si "Confirmación de registro" está activo y si un grupo de visitantes no ha sido validada está configurado en "Configuración de las confirmaciones y validaciones de registro".';
     255// --------- End: New or revised $lang ---- from version 2.15.0
    249256?>

  • extensions/NBC_UserAdvManager/trunk/language/fr_FR/help/plugin.lang.php

    r5181 r5593  
    147147
    148148
    149 // --------- Starting below: New or revised $lang ---- from version 2.14.2
    150 $lang['UAM_confirmmail_custom1'] = 'Personnalisation du retour de confirmation - Confirmation acceptée';
    151 $lang['UAM_confirmmail_custom1_d'] = 'Lorque l\'option &quot;Confirmation d\'inscription&quot; est active, ce champ permet de personnaliser <b><u>le texte d\'acceptation</u></b> de la confirmation d\'inscription sur la page affichée lorsqu\'un utilisateur clique sur le lien de confirmation qu\'il a reçu par email.<br><br>
     149// --------- Starting below: New or revised $lang ---- from version 2.15.0
     150$lang['UAM_confirmmail_custom1'] = 'Texte de la page de confirmation - Confirmation acceptée';
     151$lang['UAM_confirmmail_custom1_d'] = 'Lorsque l\'option &quot;Confirmation d\'inscription&quot; est active, ce champ permet de personnaliser <b><u>le texte d\'acceptation</u></b> de la confirmation d\'inscription sur la page affichée lorsqu\'un utilisateur clique sur le lien de confirmation qu\'il a reçu par email.<br><br>
    152152A l\'installation du plugin, un texte standard est donnée en exemple.<br><br>
    153153Ce champ est compatible avec l\'extension FCK Editor et, pour une utilisation multi-langues, vous pouvez utiliser les balises [lang] du plugin Extended Description si celui-ci est actif.<br><br>
    154154<b style=&quot;color: red;&quot;>La modification du texte n\'est possible QUE si l\'option &quot;Confirmation d\'inscription&quot; est activée.</b>';
    155 $lang['UAM_confirmmail_custom2'] = 'Personnalisation du retour de confirmation - Confirmation rejetée';
    156 $lang['UAM_confirmmail_custom2_d'] = 'Lorque l\'option &quot;Confirmation d\'inscription&quot; est active, ce champ permet de personnaliser <b><u>le texte de rejet</u></b> de la confirmation d\'inscription sur la page affichée lorsqu\'un utilisateur clique sur le lien de confirmation qu\'il a reçu par email.<br><br>
     155$lang['UAM_confirmmail_custom2'] = 'Texte de la page de confirmation - Confirmation rejetée';
     156$lang['UAM_confirmmail_custom2_d'] = 'Lorsque l\'option &quot;Confirmation d\'inscription&quot; est active, ce champ permet de personnaliser <b><u>le texte de rejet</u></b> de la confirmation d\'inscription sur la page affichée lorsqu\'un utilisateur clique sur le lien de confirmation qu\'il a reçu par email.<br><br>
    157157A l\'installation du plugin, un texte standard est donnée en exemple.<br><br>
    158158Ce champ est compatible avec l\'extension FCK Editor et, pour une utilisation multi-langues, vous pouvez utiliser les balises [lang] du plugin Extended Description si celui-ci est actif.<br><br>
    159159<b style=&quot;color: red;&quot;>La modification du texte n\'est possible QUE si l\'option &quot;Confirmation d\'inscription&quot; est activée.</b>';
    160 // --------- End: New or revised $lang ---- from version 2.14.2
     160// --------- End: New or revised $lang ---- from version 2.15.0
    161161?>

  • extensions/NBC_UserAdvManager/trunk/language/fr_FR/plugin.lang.php

    r5181 r5593  
    6666/* Ghost Tracker Tab */
    6767$lang['Tab_GhostTracker'] = 'Ghost Tracker';
    68 $lang['LastVisit_Date'] = 'Date de dernière visite';
    6968$lang['Reminder'] = 'Email de rappel';
    7069$lang['Reminder_Sent_OK'] = 'OUI';
    … …  
    106105$lang['UserList_Title'] = 'Suivi des utilisateurs inscrits';
    107106$lang['Tab_UserList'] = 'Suivi des utilisateurs';
    108 $lang['Nb_Days'] = 'Nb de jours<br>depuis dernière visite';
    109107// --------- End: New or revised $lang ---- from version 2.13.0
    110108
    … …  
    196194$lang['Reminder_without_key_of_%s'] = '%s, votre clef de validation va expirer';
    197195/* Errors and Warnings */
    198 $lang['Err_UserManager_Settings'] = 'Cette page n\'est accessible que si "Délai de validation d\'inscription" est actif et si un groupe de visiteurs non validés est configuré dans le "Paramétrage des confirmations et validations d\'inscriptions".';
    199196$lang['Err_GhostTracker_Settings'] = 'Cette page n\'est accessible que si "Gestion des visiteurs fantômes" est actif dans "Paramétrage des suivis des inscrits et autres options".';
    200197$lang['Err_Userlist_Settings'] = 'Cette page n\'est accessible que si le "Suivi des utilisateurs inscrits" est actif dans "Paramétrage des suivis des inscrits et autres options".';
    … …  
    211208            Objectifs:<br>
    212209            - A son arrivée sur la galerie : Informer le visiteur qu\'il peut s\'inscrire pour accéder aux photos privées<br>
    213             - A l\'inscription : Générer un email avec lien direct de validation, informer le nouvel utilisateur de sa non-validation et le rattacher au groupe &quot;Attente&quot;<br>
    214             - A la validation : Le passer automatiquement du groupe &quot;Attente&quot; au groupe &quot;Validés&quot;, qui lui permet d\'accéder normalement aux catégories privées<br><br>
    215             <span style="font-style:italic">Rappel: En fonctionnement standard, le &quot;Guest&quot; ne voit que les catégories publiques, sans message d\'information.</span>
     210            - A l\'inscription : Générer un email avec lien direct de validation, informer le nouvel utilisateur de sa non-validation et le rattacher au groupe "Attente"<br>
     211            - A la validation : Le passer automatiquement du groupe "Attente" au groupe "Validés", qui lui permet d\'accéder normalement aux catégories privées<br><br>
     212            <span style="font-style:italic">Rappel: En fonctionnement standard, le "Guest" ne voit que les catégories publiques, sans message d\'information.</span>
    216213            </li><br><br>
    217214            <li>
    218215Pré-requis:<br>
    219216- Une galerie avec tout ou partie des catégories privées, visibles par les seuls utilisateurs inscrits<br>
    220 - Au moins les 2 groupes d\'utilisateurs Piwigo suivants : &quot;Attente&quot;, sans aucune permission sur les catégories privées, et &quot;Validés&quot;, avec toutes les permissions sur les catégories privées<br>
     217- Au moins les 2 groupes d\'utilisateurs Piwigo suivants : "Attente", sans aucune permission sur les catégories privées, et "Validés", avec toutes les permissions sur les catégories privées<br>
    221218- Le plugin UAM<br>
    222 - Le plugin PWG Stuffs, pour l\'ajout d\'un module de type &quot;Bloc personnel&quot;<br>
     219- Le plugin PWG Stuffs, pour l\'ajout d\'un module de type "Bloc personnel"<br>
    223220- En option, le plugin Extended Description, pour le support multi-langues<br>
    224221            </li><br><br>
    225               <li>
     222            <li>
    226223Réalisation:<br><br>
    227 A. Dans le plugin UAM:
     224A. Dans le plugin UAM:<br>
    228225              <ol>
    229226                <li>Activer la confirmation d\'inscription</li>
    230                 <li>Saisir un &quot;texte d\'accueil personnalisé&quot; qui sera joint au mail de confirmation d\'inscription. Si le plugin Extended Description est activé, les balises de langues peuvent être utilisées</li>
    231                 <li>Sélectionner le groupe &quot;Attente&quot; à la rubrique &quot;Pour les utilisateurs n\'ayant pas validé leur inscription&quot;</li>
    232                 <li>Sélectionner le groupe &quot;Validés&quot; à la rubrique &quot;Pour les utilisateurs ayant validé leur inscription&quot;</li>
     227                <li>Saisir un "texte d\'accueil personnalisé" qui sera joint au mail de confirmation d\'inscription. Si le plugin Extended Description est activé, les balises de langues peuvent être utilisées</li>
     228                <li>Sélectionner le groupe "Attente" à la rubrique "Pour les utilisateurs n\'ayant pas validé leur inscription"</li>
     229                <li>Sélectionner le groupe "Validés" à la rubrique "Pour les utilisateurs ayant validé leur inscription"</li>
    233230                <li>Enregistrer la configuration du plugin</li>
    234231              </ol>
    235               </li><br>
    236 B. Dans le plugin PWG Stuffs:
     232<br>
     233B. Dans le plugin PWG Stuffs:<br>
    237234              <ol>
    238                 <li>Ajouter un nouveau module de type &quot;Bloc personnel : Affiche un bloc personnel (un édito par exemple)&quot;</li>
    239                 <li>Configurer le module, en indiquant son titre (ex : &quot;Inscription en attente de validation&quot;) et sa description, et cocher uniquement&quot;Attente&quot; dans la liste des groupes autorisés</li>
     235                <li>Ajouter un nouveau module de type "Bloc personnel : Affiche un bloc personnel (un édito par exemple)"</li>
     236                <li>Configurer le module, en indiquant son titre (ex : "Inscription en attente de validation") et sa description, et cocher uniquement "Attente" dans la liste des groupes autorisés</li>
    240237                <li>Compléter le contenu du module avec le texte du message d\'information qui sera affiché aux utilisateurs non validés. Comme dans UAM, les balises de langues peuvent être utilisées si le plugin Extended Description est activé</li>
    241                 <li>Cocher &quot;Afficher le module sur la page d\'accueil du site&quot;</li>
     238                <li>Cocher "Afficher le module sur la page d\'accueil du site"</li>
    242239                <li>Valider la configuration du module</li>
    243240              </ol>
     241            </li>
    244242          </ul>';
    245243// --------- End: New or revised $lang ---- from version 2.14.0
    246244
    247245
    248 // --------- Starting below: New or revised $lang ---- from version 2.14.0
    249 $lang['UAM_confirmmail_custom_Txt1'] = 'Personnalisation du retour de confirmation - Confirmation acceptée';
    250 $lang['UAM_confirmmail_custom_Txt2'] = 'Personnalisation du retour de confirmation - Confirmation rejetée';
    251 /* Email confirmation page */
    252 //$lang['ConfirmMail_redirection'] = 'Redirection automatique vers l\'accueil.';
    253 // --------- End: New or revised $lang ---- from version 2.14.2
     246// --------- Starting below: New or revised $lang ---- from version 2.15.0
     247$lang['UAM_confirmmail_custom_Txt1'] = 'Texte de la page de confirmation - Confirmation acceptée';
     248$lang['UAM_confirmmail_custom_Txt2'] = 'Texte de la page de confirmation - Confirmation rejetée';
     249$lang['LastVisit_Date'] = 'Dernière visite le';
     250$lang['Nb_Days'] = 'Ecart en jours';
     251$lang['Err_UserManager_Settings'] = 'Cette page n\'est accessible que si "Confirmation d\'inscription" est actif et si un groupe de visiteurs non validés est configuré dans le "Paramétrage des confirmations et validations d\'inscriptions".';
     252// --------- End: New or revised $lang ---- from version 2.15.0
    254253?>

  • extensions/NBC_UserAdvManager/trunk/language/it_IT/help/plugin.lang.php

    r5319 r5593  
    2727';
    2828$lang['UAM_casenTitle'] = 'Pseudo: Sensibilità maiuscole/minuscole';
    29 $lang['UAM_casenTitle_d'] = 'Di default, Piwigo è sensibile alle minuscole/maiuscole e vengono considerate come diverse lettere nei pseudo scelti dagli utenti al momento dell\'iscrizzione. E dunque "Pippo", "pippo" e "PIPPO" possono essere 3 diversi utenti.<br><br>
    30 L\'attivazione di questa opzione permette di considerare "Pippo", "pippo", "PIPPO", ... come un\'solo utente. Se "pippo" esiste già, creare un nuovo pseudo "Pippo" risulterà impossibile.<br><br>
    31 <b style="color: red;">Attenzione: questa opzione non ha alcun effetto sui pseudo creati prima della sua attivazione.</b>';
     29$lang['UAM_casenTitle_d'] = 'Di default, Piwigo è sensibile alle minuscole e maiuscole e vengono considerate come diverse lettere nei pseudo scelti dagli utenti al momento dell\'iscrizzione. E dunque &quot;Pippo&quot;, &quot;pippo&quot; e &quot;PIPPO&quot; possono essere 3 diversi utenti.<br><br>
     30L\'attivazione di questa opzione permette di considerare &quot;Pippo&quot;, &quot;pippo&quot;, &quot;PIPPO&quot;, ... come un\'solo utente. Se &quot;pippo&quot; esiste già, creare un nuovo pseudo &quot;Pippo&quot; risulterà impossibile.<br><br>
     31<b style=&quot;color: red&quot;>Attenzione: questa opzione non ha alcun effetto sui pseudo creati prima della sua attivazione.</b>';
    3232$lang['UAM_carexcTitle'] = 'Pseudo: Esclusione di caratteri';
    33 $lang['UAM_carexcTitle_d'] = 'Può essere interessante vietare certi caratteri per i pseudo (ad esempio: negare login contenente "@"). Questa opzione permette di escludere dei caratteri o sequenza di caratterile.<br>NB: L\'opzione può anche escludere parole intere.
     33$lang['UAM_carexcTitle_d'] = 'Può essere interessante vietare certi caratteri per i pseudo (ad esempio: negare login contenente &quot;@&quot;). Questa opzione permette di escludere i caratteri o sequenza di caratteri, eventi.<br>
     34NB: L\'opzione può anche escludere parole intere.
    3435<br><br>
    35 <b style="color: red">Attenzione: questa opzione non ha alcun effetto sui pseudo creati prima della sua attivazione.</b>';
     36<b style=&quot;color: red;&quot;>Attenzione: questa opzione non ha alcun effetto sui pseudo creati prima della sua attivazione.</b>';
    3637$lang['UAM_passwTitle'] = 'Rafforzare il livello di sicurezza delle password';
    3738$lang['UAM_passwTitle_d'] = 'L\'attivazione di questa opzione rende obbligatorio l\'inserimento di una password al momento della registrazione, e richiede la password scelta dal visitatore di incontrare un livello minimo di complessità. Se la soglia non viene raggiunta, il punteggio conseguito e il punteggio minimo da raggiungere sono visualizzate, insieme con raccomandazioni per aumentare il valore di questa partitura.<br><br>
    … …  
    148149<b>NOTE</b> : The list does not display who have not validated their registration (if the option of validating the registration is activated). These users are then managed in a special way in the &quot;Tracking validations&quot; tab.';
    149150// --------- End: New or revised $lang ---- from version 2.14.1
     151
     152
     153// --------- Starting below: New or revised $lang ---- from version 2.15.0
     154/*TODO*/$lang['UAM_confirmmail_custom1'] = 'Text of the confirmation page - Confirmation accepted';
     155/*TODO*/$lang['UAM_confirmmail_custom1_d'] = 'When the option &quot;Confirmation of registration&quot; is active, this field allows you to customize the <b><u>acceptance text</u></b> on the registration confirmation page displayed when user clicks the confirmation link that was received by email.<br>
     156After installing the plugin, a standard text is set as an example.<br>
     157This field is compatible with the FCK Editor and, for multi-languages, you can use the tags [lang] of the plugin Extended description if it\'s active.<br>
     158<b style=&quot;color:red;&quot;>Changing the text is possible ONLY if &quot;Confirmation of registration&quot; is activated.</b>';
     159/*TODO*/$lang['UAM_confirmmail_custom2'] = 'Text of the confirmation page - Confirmation rejected';
     160/*TODO*/$lang['UAM_confirmmail_custom2_d'] = 'When the option &quot;Confirmation of registration&quot; is active, this field allows you to customize the <b><u>rejectance text</u></b> on the registration confirmation page displayed when user clicks the confirmation link that was received by email.<br>
     161After installing the plugin, a standard text is set as an example.<br>
     162This field is compatible with the FCK Editor and, for multi-languages, you can use the tags [lang] of the plugin Extended description if it\'s active.<br>
     163<b style=&quot;color:red;&quot;>Changing the text is possible ONLY if &quot;Confirmation of registration&quot; is activated.</b>';
     164// --------- End: New or revised $lang ---- from version 2.15.0
    150165?>

  • extensions/NBC_UserAdvManager/trunk/language/it_IT/plugin.lang.php

    r5181 r5593  
    6767/* Ghost Tracker Tab */
    6868$lang['Tab_GhostTracker'] = 'GhostTracker';
    69 $lang['LastVisit_Date'] = 'Data ultima visita';
    7069$lang['Reminder'] = 'Email di rilancio';
    7170$lang['Reminder_Sent_OK'] = 'SI';
    … …  
    106105/* UserList Tab */
    107106$lang['UserList_Title'] = 'Monitoraggio degli utenti registrati';
    108 $lang['Nb_Days'] = 'Numero di giorni<br>dall\'ultima visita';
    109107// --------- End: New or revised $lang ---- from version 2.13.0
    110108
    … …  
    199197$lang['Reminder_without_key_of_%s'] = '%s, la chiave di convalida sta per scadere';
    200198/* Errors and Warnings */
    201 $lang['Err_UserManager_Settings'] = 'Questa pagina è disponibile solo se "Termine per la validazione dell\'iscrizione limitato" è attivo e se un gruppo di utenti non convalidati è attivo in "Impostare le conferme e validazioni all\'iscrizione".';
    202199$lang['Err_GhostTracker_Settings'] = 'Questa pagina è disponibile solo se "GhostTracker" è attivo in "Impostare le registrazioni seguite e altre opzioni".';
    203200$lang['Err_Userlist_Settings'] = 'Questa pagina è disponibile solo se "Monitoraggio degli utenti registrati" è attivo nella sezione "Impostare le registrazioni seguite e altre opzioni".';
    … …  
    226223- In opzione, il plugin Extended Description per il supporto multi-lingue<br>
    227224            </li><br><br>
    228               <li>
     225            <li>
    229226Tappe:<br><br>
    230227A. Nel plugin NBC_UAM:
    … …  
    236233                <li>Salvare le impostazzioni</li>
    237234              </ol>
    238               </li><br>
     235<br>
    239236B. Nel plugin PWG Stuffs :
    240237              <ol>
    … …  
    245242                <li>Salvare le impostazzioni</li>
    246243              </ol>
     244            </li>
    247245          </ul>';
    248246// --------- End: New or revised $lang ---- from version 2.14.0
     247
     248
     249// --------- Starting below: New or revised $lang ---- from version 2.15.0
     250$lang['UAM_confirmmail_custom_Txt1'] = 'Testo della pagina di conferma - Conferma accettati';
     251$lang['UAM_confirmmail_custom_Txt2'] = 'Testo della pagina di conferma - Conferma respinto';
     252$lang['LastVisit_Date'] = 'ultima visita';
     253$lang['Nb_Days'] = 'Differenza in giorni';
     254$lang['Err_UserManager_Settings'] = 'Questa pagina è disponibile solo se "Conferma dell\'iscrizione" è attiva e se un gruppo di visitatori non convalidato è configurato in "Impostare le conferme e validazioni all\'iscrizione".';
     255// --------- End: New or revised $lang ---- from version 2.15.0
    249256?>

  • extensions/NBC_UserAdvManager/trunk/main.inc.php

    r5181 r5593  
    22/*
    33Plugin Name: UserAdvManager
    4 Version: 2.14.2
     4Version: 2.15.0
    55Description: Renforcer la gestion des utilisateurs - Enforce users management
    66Plugin URI: http://fr.piwigo.org/ext/extension_view.php?eid=216

  • extensions/NBC_UserAdvManager/trunk/maintain.inc.php

    r5181 r5593  
    22
    33if(!defined("UAM_PATH")) define('UAM_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');
    4 if (!defined('UAM_ROOT')) {
    5   define('UAM_ROOT',     dirname(__FILE__).'/');
     4if (!defined('UAM_ROOT'))
     5{
     6  define('UAM_ROOT', dirname(__FILE__).'/');
    67}
    78
    … …  
    8182  clean_obsolete_files();
    8283
    83 
     84/* Check if it's a blank installation */
     85/* ********************************** */
     86        $query = '
     87SELECT param
     88  FROM '.CONFIG_TABLE.'
     89WHERE param = "nbc_UserAdvManager_ConfirmMail"
     90;';
     91  $count1 = mysql_num_rows(pwg_query($query));
     92 
     93        $query1 = '
     94SELECT param
     95  FROM '.CONFIG_TABLE.'
     96WHERE param = "nbc_UserAdvManager_ConfirmMail"
     97;';
     98  $count2 = mysql_num_rows(pwg_query($query1));
     99
     100/* If old params exist an upgrade is needed */
     101/* **************************************** */
     102  if ($count1 == 1 or $count2 == 1)
     103  {
    84104/* Check for upgrade from 2.10 to 2.11 */
    85105/* *********************************** */
    86         $query = '
     106    $query = '
    87107SELECT *
    88108  FROM '.CONFIG_TABLE.'
    89109WHERE param = "nbc_UserAdvManager_ConfirmMail"
    90110;';
    91   $count = mysql_num_rows(pwg_query($query));
    92  
    93         if ($count == 0)
    94         {
    95   /* upgrade from branch 2.10 to 2.11 */
    96   /* ******************************** */
    97                 upgrade_210();
    98         }
     111    $count = mysql_num_rows(pwg_query($query));
     112 
     113    if ($count == 0)
     114    {
     115    /* upgrade from branch 2.10 to 2.11 */
     116    /* ******************************** */
     117      upgrade_210();
     118    }
    99119
    100120
    101121/* Check for upgrade from 2.11 to 2.12 */
    102122/* *********************************** */
    103   if (!table_exist(USER_LASTVISIT_TABLE))
    104   {
    105   /* upgrade from branch 2.11 to 2.12 */
    106   /* ******************************** */
    107                 upgrade_211();
    108   }
     123    if (!table_exist(USER_LASTVISIT_TABLE))
     124    {
     125    /* upgrade from branch 2.11 to 2.12 */
     126    /* ******************************** */
     127                upgrade_211();
     128    }
    109129
    110130
    111131/* Check for upgrade from 2.12 to 2.13 */
    112132/* *********************************** */
    113   $query = '
    114 SELECT *
    115 FROM '.USER_CONFIRM_MAIL_TABLE.'
    116 ;';
    117 
    118   $result = pwg_query($query);
     133    $fields = mysql_list_fields($conf['db_base'],USER_CONFIRM_MAIL_TABLE);
     134    $nb_fields = mysql_num_fields($fields);
     135
     136//  $query = '
     137//SELECT *
     138//FROM '.USER_CONFIRM_MAIL_TABLE.'
     139//;';
     140
     141//  $result = pwg_query($query);
    119142       
    120         $numfields = mysql_num_fields($result);
    121 
    122   if ($numfields < 6)
    123   {
    124   /* upgrade from branch 2.12 to 2.13 */
    125   /* ******************************** */
    126     upgrade_212();
    127   }
     143//      $numfields = mysql_num_fields($result);
     144
     145    if ($nb_fields < 6)
     146    {
     147    /* upgrade from branch 2.12 to 2.13 */
     148    /* ******************************** */
     149      upgrade_212();
     150    }
    128151
    129152
    130153/* Serializing conf parameters - Available since 2.14.0 */
    131154/* **************************************************** */
    132   if (unserialize($conf['nbc_UserAdvManager']) === false)
    133   {
    134   /* upgrade from branch 2.13 to 2.14 */
    135   /* ******************************** */
    136     upgrade_213();
    137   }
    138 
     155    if (unserialize($conf['nbc_UserAdvManager']) === false)
     156    {
     157    /* upgrade from branch 2.13 to 2.14 */
     158    /* ******************************** */
     159      upgrade_213();
     160    }
     161 
    139162
    140163/* Check for upgrade from 2.14.1 to 2.14.2 */
    141164/* *************************************** */
    142         $query1 = '
     165        $query1 = '
    143166SELECT param
    144167  FROM '.CONFIG_TABLE.'
     168WHERE param = "nbc_UserAdvManager"
     169;';
     170    $count1 = mysql_num_rows(pwg_query($query1));
     171 
     172    $query1 = '
     173SELECT param
     174  FROM '.CONFIG_TABLE.'
    145175WHERE param = "nbc_UserAdvManager_ConfirmMail"
    146176;';
    147   $count1 = mysql_num_rows(pwg_query($query1));
    148  
    149         $query1 = '
    150 SELECT param
    151   FROM '.CONFIG_TABLE.'
    152 WHERE param = "nbc_UserAdvManager_ConfirmMail"
    153 ;';
    154   $count2 = mysql_num_rows(pwg_query($query1));
    155  
    156         if ($count1 == 1 or $count2 == 1)
    157         {
    158   /* upgrade from branch 2.14.1 to 2.14.2 */
    159   /* ************************************ */
    160                 upgrade_214_1();
    161         }
     177    $count2 = mysql_num_rows(pwg_query($query1));
     178 
     179    if ($count1 == 1 or $count2 == 1)
     180    {
     181    /* upgrade from branch 2.14.1 to 2.14.2 */
     182    /* ************************************ */
     183      upgrade_214_1();
     184    }
     185  }
    162186}
    163187
    … …  
    352376
    353377/* Upgrading ConfirmMail options */
    354   $conf_UAM2 = explode(';', $conf['UserAdvManager_ConfirmMail']);
    355 
    356   $upgrade_UAM2 = array($conf_UAM2[0],$conf_UAM2[1],$conf_UAM2[2],$conf_UAM2[3],$conf_UAM2[4],'Thank you to have confirmed your email address and your registration on the gallery. Have fun !','Your activation key is incorrect or expired or you have already validated your account, please contact the webmaster to fix this problem.');
    357 
    358378  $query = '
    359 UPDATE '.CONFIG_TABLE.'
    360   SET value = "'.addslashes(serialize($upgrade_UAM2)).'"
    361   WHERE param = "UserAdvManager_ConfirmMail"
    362 ;';
    363   pwg_query($query);
     379SELECT value
     380  FROM '.CONFIG_TABLE.'
     381WHERE param = "UserAdvManager_ConfirmMail"
     382;';
     383
     384  $result = pwg_query($query);
     385  $conf_UAM_ConfirmMail = pwg_db_fetch_assoc($result);
     386   
     387  $conf_ConfirmMail = unserialize($conf_UAM_ConfirmMail['value']);
     388 
     389  $conf_ConfirmMail[5] ='Thank you to have confirmed your email address and your registration on the gallery. Have fun !';
     390  $conf_ConfirmMail[6] ='Your activation key is incorrect or expired or you have already validated your account, please contact the webmaster to fix this problem.';
     391 
     392  $update_conf = serialize($conf_ConfirmMail);
     393   
     394  $query = '
     395      UPDATE '.CONFIG_TABLE.'
     396                        SET value="'.addslashes($update_conf).'"
     397                        WHERE param="UserAdvManager_ConfirmMail"
     398                        LIMIT 1
     399                ;';
     400
     401                pwg_query($query);
    364402}
    365403?>

  • extensions/NBC_UserAdvManager/trunk/obsolete.list

    r5056 r5593  
    1 admin/UserAdvManager_admin.php
    2 admin/confirmmail.tpl
    3 admin/UserAdvManager_admin.tpl
    4 include/functions_UserAdvManager.inc.php
     1admin/ghosttracker.tpl
     2admin/global.tpl
     3admin/uam.css
     4admin/userlist.tpl
     5admin/usermanager.tpl
Note: See TracChangeset for help on using the changeset viewer.