Ignore:
Timestamp:
Jun 11, 2011, 2:00:51 PM (13 years ago)
Author:
Eric
Message:

r11255 and r11313 merged from trunk to branch 2.20

Location:
extensions/UserAdvManager/branches/2.20
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • extensions/UserAdvManager/branches/2.20/changelog.txt.php

    r11096 r11314  
    256256
    257257-- 2.20.9 : Bug fixed on installation from scratch (unable to save config)
     258
     259-- 2.20.10 : Bug 2324 fixed - New feature : Add [days] flag to insert maximum numbers of days between two visits set in plugin's GhostTracker in GhostTracker reminder email.
    258260*/
    259261?>

  • extensions/UserAdvManager/branches/2.20/include/functions.inc.php

    r11019 r11314  
    10551055  if (isset($conf_UAM[17]) and $conf_UAM[17] <> '' and isset($conf_UAM[15]) and $conf_UAM[15] == 'true')
    10561056  {
    1057     // Management of Extension flags ([username], [mygallery], [myurl])
     1057    // Management of Extension flags ([username], [mygallery], [myurl], [days])
    10581058    $patterns[] = '#\[username\]#i';
    10591059    $replacements[] = $username;
    … …  
    10621062    $patterns[] = '#\[myurl\]#i';
    10631063    $replacements[] = $conf['gallery_url'];
     1064    $patterns[] = '#\[days\]#i';
     1065    $replacements[] = $conf_UAM[16];
    10641066
    10651067    if (function_exists('get_user_language_desc'))

  • extensions/UserAdvManager/branches/2.20/language/de_DE/help/plugin.lang.php

    r11019 r11314  
    163163
    164164// --------- Starting below: New or revised $lang ---- from version 2.20.0
    165 /*TODO*/$lang['UAM_gttextTitle_d'] = 'Geben Sie den gewünschten Text in die E-Mail-Erinnerung angezeigt, die Benutzer rechtzeitig, um wieder zur Galerie zu besuchen (Anm.: Der Text Fertigpen mit der Installation des Plugins ist als Beispiel vorgesehen).
    166 <br><br>
    167 Further customize the content with special inserted tags : Use <b style=&quot;color: red;&quot;>[username]</b> to automatically insert the name of the destination user of the email. Use <b style=&quot;color: red;&quot;>[mygallery]</b> to insert the title of your gallery. Use <b style=&quot;color: red;&quot;>[myurl]</b> to insert your gallery URL if set in Piwigo\'s configuration options.
    168 <br><br>
    169 Um mehrere Sprachen zu benutzen, können Sie die Extended description Plugin-Tags verwenden, wenn er aktiv ist.';
    170165/*TODO*/$lang['UAM_infotxtTitle_d'] = 'Geben Sie den einleitenden Text, den Sie in der Informations-E-Mail angezeigt.
    171166<br><br>
    … …  
    283278/*TODO*/$lang['UAM_HidePasswTitle_d'] = 'Choose here if you want to display the password chosen by the visitor in the information email. If you enable the option, the password will then appear in clear text. If you disable the password will not appear at all.';
    284279// --------- End: New or revised $lang ---- from version 2.20.4
     280
     281
     282// --------- Starting below: New or revised $lang ---- from version 2.20.10
     283/*TODO*/$lang['UAM_gttextTitle_d'] = 'Geben Sie den gewünschten Text in die E-Mail-Erinnerung angezeigt, die Benutzer rechtzeitig, um wieder zur Galerie zu besuchen (Anm.: Der Text Fertigpen mit der Installation des Plugins ist als Beispiel vorgesehen).
     284<br><br>
     285Further customize the content with special inserted tags : Use <b style=&quot;color: red;&quot;>[username]</b> to automatically insert the name of the destination user of the email. Use <b style=&quot;color: red;&quot;>[mygallery]</b> to insert the title of your gallery. Use <b style=&quot;color: red;&quot;>[myurl]</b> to insert your gallery URL if set in Piwigo\'s configuration options. Use <b style=&quot;color: red;&quot;>[days]</b> to insert the maximum numbers of days between two visits.
     286<br><br>
     287Um mehrere Sprachen zu benutzen, können Sie die Extended description Plugin-Tags verwenden, wenn er aktiv ist.';
     288// --------- End: New or revised $lang ---- from version 2.20.10
    285289?>

  • extensions/UserAdvManager/branches/2.20/language/en_UK/help/plugin.lang.php

    r11019 r11314  
    163163
    164164// --------- Starting below: New or revised $lang ---- from version 2.20.0
    165 $lang['UAM_gttextTitle_d'] = 'Enter the text you want to appear in the email reminder to prompt the user to return to visit your gallery (NB: The text pre-filled with the installation of the plugin is provided as an example).
    166 <br><br>
    167 Further customize the content with special inserted tags : Use <b style=&quot;color: red;&quot;>[username]</b> to automatically insert the name of the destination user of the email. Use <b style=&quot;color: red;&quot;>[mygallery]</b> to insert the title of your gallery. Use <b style=&quot;color: red;&quot;>[myurl]</b> to insert your gallery URL if set in Piwigo\'s configuration options.
    168 <br><br>
    169 To use multiple languages, you can use the Extended description plugin\'s tags if it is active.';
    170165$lang['UAM_infotxtTitle_d'] = 'Enter the introductory text that you want to appear in the information email.
    171166<br><br>
    … …  
    283278$lang['UAM_HidePasswTitle_d'] = 'Choose here if you want to display the password chosen by the visitor in the information email. If you enable the option, the password will then appear in clear text. If you disable the password will not appear at all.';
    284279// --------- End: New or revised $lang ---- from version 2.20.4
     280
     281
     282// --------- Starting below: New or revised $lang ---- from version 2.20.10
     283$lang['UAM_gttextTitle_d'] = 'Enter the text you want to appear in the email reminder to prompt the user to return to visit your gallery (NB: The text pre-filled with the installation of the plugin is provided as an example).
     284<br><br>
     285Further customize the content with special inserted tags : Use <b style=&quot;color: red;&quot;>[username]</b> to automatically insert the name of the destination user of the email. Use <b style=&quot;color: red;&quot;>[mygallery]</b> to insert the title of your gallery. Use <b style=&quot;color: red;&quot;>[myurl]</b> to insert your gallery URL if set in Piwigo\'s configuration options. Use <b style=&quot;color: red;&quot;>[days]</b> to insert the maximum numbers of days between two visits.
     286<br><br>
     287To use multiple languages, you can use the Extended description plugin\'s tags if it is active.';
     288// --------- End: New or revised $lang ---- from version 2.20.10
    285289?>

  • extensions/UserAdvManager/branches/2.20/language/es_ES/help/plugin.lang.php

    r11019 r11314  
    159159
    160160// --------- Starting below: New or revised $lang ---- from version 2.20.0
    161 /*TODO*/$lang['UAM_gttextTitle_d'] = 'Introduzca el texto que desea que aparezca en el recordatorio por correo electrónico para pedir al usuario volver a visitar su galería (Nota: El texto pre-llenado con la instalación del plugin se presenta como un ejemplo).
    162 <br><br>
    163 Further customize the content with special inserted tags : Use <b style=&quot;color: red;&quot;>[username]</b> to automatically insert the name of the destination user of the email. Use <b style=&quot;color: red;&quot;>[mygallery]</b> to insert the title of your gallery. Use <b style=&quot;color: red;&quot;>[myurl]</b> to insert your gallery URL if set in Piwigo\'s configuration options.
    164 <br><br>
    165 Para utilizar varios idiomas, puede utilizar las etiquetas para el plugin Extended description si está activo.';
    166161/*TODO*/$lang['UAM_infotxtTitle_d'] = 'Introduzca el texto de introducción que desea ver en el correo electrónico de la información.
    167162<br><br>
    … …  
    279274/*TODO*/$lang['UAM_HidePasswTitle_d'] = 'Choose here if you want to display the password chosen by the visitor in the information email. If you enable the option, the password will then appear in clear text. If you disable the password will not appear at all.';
    280275// --------- End: New or revised $lang ---- from version 2.20.4
     276
     277
     278// --------- Starting below: New or revised $lang ---- from version 2.20.10
     279/*TODO*/$lang['UAM_gttextTitle_d'] = 'Introduzca el texto que desea que aparezca en el recordatorio por correo electrónico para pedir al usuario volver a visitar su galería (Nota: El texto pre-llenado con la instalación del plugin se presenta como un ejemplo).
     280<br><br>
     281Further customize the content with special inserted tags : Use <b style=&quot;color: red;&quot;>[username]</b> to automatically insert the name of the destination user of the email. Use <b style=&quot;color: red;&quot;>[mygallery]</b> to insert the title of your gallery. Use <b style=&quot;color: red;&quot;>[myurl]</b> to insert your gallery URL if set in Piwigo\'s configuration options. Use <b style=&quot;color: red;&quot;>[days]</b> to insert the maximum numbers of days between two visits.
     282<br><br>
     283Para utilizar varios idiomas, puede utilizar las etiquetas para el plugin Extended description si está activo.';
     284// --------- End: New or revised $lang ---- from version 2.20.10
    281285?>

  • extensions/UserAdvManager/branches/2.20/language/fr_FR/help/plugin.lang.php

    r11019 r11314  
    159159
    160160// --------- Starting below: New or revised $lang ---- from version 2.20.0
    161 $lang['UAM_gttextTitle_d'] = 'Saisissez ici le texte qui apparaîtra dans l\'email de rappel pour inciter l\'utilisateur à revenir visiter votre galerie (NB: Le texte pré-renseigné à l\'installation du plugin est donné à titre d\'exemple).
    162 <br><br>
    163 Personnalisez encore plus le contenu avec les balises d\'insertion spéciales : Utilisez la balise <b style=&quot;color: red;&quot;>[username]</b> pour insérer automatiquement le nom de l\'utilisateur destinataire de l\'email. Utilisez la balise <b style=&quot;color: red;&quot;>[mygallery]</b> pour insérer le titre de votre galerie. Utilisez la balise <b style=&quot;color: red;&quot;>[myurl]</b> pour insérer l\'URL de votre galerie si renseigné dans les options de configuration de Piwigo.
    164 <br><br>
    165 Pour une utilisation multi-langues, vous pouvez utiliser les balises [lang] du plugin Extended Description si celui-ci est actif.';
    166161$lang['UAM_infotxtTitle_d'] = 'Saisissez ici le texte d\'introduction personnalisé qui apparaîtra dans l\'email d\'information.
    167162<br><br>
    … …  
    279274$lang['UAM_HidePasswTitle_d'] = 'Choisissez ici si vous souhaitez faire afficher le mot de passe choisi par le visiteur dans le mail d\'information. Si vous activez l\'option, le mot de passe apparaitra alors en clair. Si vous la désactivez, le mot de passe n\'apparaitra pas du tout.';
    280275// --------- End: New or revised $lang ---- from version 2.20.4
     276
     277
     278// --------- Starting below: New or revised $lang ---- from version 2.20.10
     279$lang['UAM_gttextTitle_d'] = 'Saisissez ici le texte qui apparaîtra dans l\'email de rappel pour inciter l\'utilisateur à revenir visiter votre galerie (NB: Le texte pré-renseigné à l\'installation du plugin est donné à titre d\'exemple).
     280<br><br>
     281Personnalisez encore plus le contenu avec les balises d\'insertion spéciales : Utilisez la balise <b style=&quot;color: red;&quot;>[username]</b> pour insérer automatiquement le nom de l\'utilisateur destinataire de l\'email. Utilisez la balise <b style=&quot;color: red;&quot;>[mygallery]</b> pour insérer le titre de votre galerie. Utilisez la balise <b style=&quot;color: red;&quot;>[myurl]</b> pour insérer l\'URL de votre galerie si renseigné dans les options de configuration de Piwigo. Utilisez la balise <b style=&quot;color: red;&quot;>[days]</b> pour insérer automatiquement le nombre de jour maximum entre deux visites.
     282<br><br>
     283Pour une utilisation multi-langues, vous pouvez utiliser les balises [lang] du plugin Extended Description si celui-ci est actif.';
     284// --------- End: New or revised $lang ---- from version 2.20.10
    281285?>

  • extensions/UserAdvManager/branches/2.20/language/it_IT/help/plugin.lang.php

    r11019 r11314  
    157157
    158158// --------- Starting below: New or revised $lang ---- from version 2.20.0
    159 /*TODO*/$lang['UAM_gttextTitle_d'] = 'Enter the text you want to appear in the email reminder to prompt the user to return to visit your gallery (NB: The text pre-filled with the installation of the plugin is provided as an example).
    160 <br><br>
    161 Further customize the content with special inserted tags : Use <b style=&quot;color: red;&quot;>[username]</b> to automatically insert the name of the destination user of the email. Use <b style=&quot;color: red;&quot;>[mygallery]</b> to insert the title of your gallery. Use <b style=&quot;color: red;&quot;>[myurl]</b> to insert your gallery URL if set in Piwigo\'s configuration options.
    162 <br><br>
    163 Per utilizzare più lingue, è possibile utilizzare i tag del plugin Extended Description, se esso è attivo.';
    164159/*TODO*/$lang['UAM_infotxtTitle_d'] = 'Inserisci il testo introduttivo che si desidera visualizzare nella e-mail informazioni.
    165160<br><br>
    … …  
    270265/*TODO*/$lang['UAM_HidePasswTitle_d'] = 'Choose here if you want to display the password chosen by the visitor in the information email. If you enable the option, the password will then appear in clear text. If you disable the password will not appear at all.';
    271266// --------- End: New or revised $lang ---- from version 2.20.4
     267
     268
     269// --------- Starting below: New or revised $lang ---- from version 2.20.10
     270/*TODO*/$lang['UAM_gttextTitle_d'] = 'Enter the text you want to appear in the email reminder to prompt the user to return to visit your gallery (NB: The text pre-filled with the installation of the plugin is provided as an example).
     271<br><br>
     272Further customize the content with special inserted tags : Use <b style=&quot;color: red;&quot;>[username]</b> to automatically insert the name of the destination user of the email. Use <b style=&quot;color: red;&quot;>[mygallery]</b> to insert the title of your gallery. Use <b style=&quot;color: red;&quot;>[myurl]</b> to insert your gallery URL if set in Piwigo\'s configuration options. Use <b style=&quot;color: red;&quot;>[days]</b> to insert the maximum numbers of days between two visits.
     273<br><br>
     274Per utilizzare più lingue, è possibile utilizzare i tag del plugin Extended Description, se esso è attivo.';
     275// --------- End: New or revised $lang ---- from version 2.20.10
    272276?>

  • extensions/UserAdvManager/branches/2.20/language/lv_LV/help/plugin.lang.php

    r11019 r11314  
    184184
    185185// --------- Starting below: New or revised $lang ---- from version 2.20.0
    186 /* TODO */$lang['UAM_gttextTitle_d'] = 'Ievadiet tekstu , ko jūs gribat atspoguļot e-pasta atgādinājumā, lai atgādinātu lietotājam apmeklēt jūsu galeriju. (NB: Spraudni instalējot, aizpildītais teksts ir piedāvāts kā paraugs).
    187 <br><br>
    188 Further customize the content with special inserted tags : Use <b style=&quot;color: red;&quot;>[username]</b> to automatically insert the name of the destination user of the email. Use <b style=&quot;color: red;&quot;>[mygallery]</b> to insert the title of your gallery. Use <b style=&quot;color: red;&quot;>[myurl]</b> to insert your gallery URL if set in Piwigo\'s configuration options.
    189 <br><br>
    190 Lai izmantotu vairākas valodas, jūs varat lietot Paplašinātā apraksta spraudņa tagus (gadījumā, ja tas ir aktīvs).';
    191186/* TODO */$lang['UAM_infotxtTitle_d'] = 'Ievadiet teksta, ko jūs gribat atspoguļot informācijas e-vēstulē, ievaddaļu.
    192187<br><br>
    … …  
    305300/*TODO*/$lang['UAM_HidePasswTitle_d'] = 'Choose here if you want to display the password chosen by the visitor in the information email. If you enable the option, the password will then appear in clear text. If you disable the password will not appear at all.';
    306301// --------- End: New or revised $lang ---- from version 2.20.4
     302
     303
     304// --------- Starting below: New or revised $lang ---- from version 2.20.10
     305/* TODO */$lang['UAM_gttextTitle_d'] = 'Ievadiet tekstu , ko jūs gribat atspoguļot e-pasta atgādinājumā, lai atgādinātu lietotājam apmeklēt jūsu galeriju. (NB: Spraudni instalējot, aizpildītais teksts ir piedāvāts kā paraugs).
     306<br><br>
     307Further customize the content with special inserted tags : Use <b style=&quot;color: red;&quot;>[username]</b> to automatically insert the name of the destination user of the email. Use <b style=&quot;color: red;&quot;>[mygallery]</b> to insert the title of your gallery. Use <b style=&quot;color: red;&quot;>[myurl]</b> to insert your gallery URL if set in Piwigo\'s configuration options. Use <b style=&quot;color: red;&quot;>[days]</b> to insert the maximum numbers of days between two visits.
     308<br><br>
     309Lai izmantotu vairākas valodas, jūs varat lietot Paplašinātā apraksta spraudņa tagus (gadījumā, ja tas ir aktīvs).';
     310// --------- End: New or revised $lang ---- from version 2.20.10
    307311?>

  • extensions/UserAdvManager/branches/2.20/main.inc.php

    r11096 r11314  
    22/*
    33Plugin Name: UserAdvManager
    4 Version: 2.20.9
     4Version: 2.20.10
    55Description: Renforcer la gestion des utilisateurs - Enforce users management
    66Plugin URI: http://piwigo.org/ext/extension_view.php?eid=216
Note: See TracChangeset for help on using the changeset viewer.