Theme My Login - Version 5.1

Version Description

  • Display "Log Out" when page is shown in pagelist and logged in
  • Forward profile.php to themed profile when module is active
  • Allow for %user_id% in custom user links
  • Add inline descriptions to all settings
  • Various tweaks and preps for WP 3.0
  • Add Italian translation
  • Add Danish translation
  • Add Polish translation
  • Add Spanish translation
Download this release

Release Info

Developer jfarthing84
Plugin Icon 128x128 Theme My Login
Version 5.1
Comparing to
See all releases

Code changes from version 5.0.6 to 5.1

admin/includes/admin.php CHANGED
@@ -22,7 +22,7 @@ function wdbj_tml_password_change_notification_override_notice() {
22
 
23
  function wdbj_tml_admin_menu() {
24
  // Create our settings link in the default WP "Settings" menu
25
- add_options_page(__('Theme My Login', 'theme-my-login'), __('Theme My Login', 'theme-my-login'), 8, 'theme-my-login/admin/options.php');
26
  }
27
 
28
  function wdbj_tml_admin_init() {
@@ -47,7 +47,11 @@ function wdbj_tml_load_settings_page() {
47
  wp_enqueue_style('theme-my-login-admin', plugins_url('/theme-my-login/admin/css/theme-my-login-admin.css'));
48
 
49
  // Set the correct admin style according to user setting (Only supports default admin schemes)
50
- $admin_color = get_usermeta($user_ID, 'admin_color');
 
 
 
 
51
  if ( 'classic' == $admin_color )
52
  wp_enqueue_style('theme-my-login-colors-classic', plugins_url('/theme-my-login/admin/css/colors-classic.css'));
53
  else
@@ -171,8 +175,7 @@ function wdbj_tml_install() {
171
  'post_title' => 'Login',
172
  'post_status' => 'publish',
173
  'post_type' => 'page',
174
- 'post_author' => 1,
175
- 'post_content' => '[theme-my-login show_title="0" before_widget="" after_widget="" instance_id="tml-page"]',
176
  'comment_status' => 'closed',
177
  'ping_status' => 'closed'
178
  );
22
 
23
  function wdbj_tml_admin_menu() {
24
  // Create our settings link in the default WP "Settings" menu
25
+ add_options_page(__('Theme My Login', 'theme-my-login'), __('Theme My Login', 'theme-my-login'), 'manage_options', 'theme-my-login/admin/options.php');
26
  }
27
 
28
  function wdbj_tml_admin_init() {
47
  wp_enqueue_style('theme-my-login-admin', plugins_url('/theme-my-login/admin/css/theme-my-login-admin.css'));
48
 
49
  // Set the correct admin style according to user setting (Only supports default admin schemes)
50
+ if ( function_exists('get_user_meta') )
51
+ $admin_color = get_user_meta($user_ID, 'admin_color');
52
+ else
53
+ $admin_color = get_usermeta($user_ID, 'admin_color');
54
+
55
  if ( 'classic' == $admin_color )
56
  wp_enqueue_style('theme-my-login-colors-classic', plugins_url('/theme-my-login/admin/css/colors-classic.css'));
57
  else
175
  'post_title' => 'Login',
176
  'post_status' => 'publish',
177
  'post_type' => 'page',
178
+ 'post_content' => '[theme-my-login-page]',
 
179
  'comment_status' => 'closed',
180
  'ping_status' => 'closed'
181
  );
admin/options-basic.php CHANGED
@@ -3,7 +3,7 @@
3
  <th scope="row"><label for="theme_my_login_page_id"><?php _e('Page ID', 'theme-my-login'); ?></label></th>
4
  <td>
5
  <input name="theme_my_login[page_id]" type="text" id="theme_my_login_page_id" value="<?php echo (int) $theme_my_login->options['page_id']; ?>" class="small-text" />
6
- <p class="description"><?php _e('This should be the ID of the WordPress page that includes the [theme-my-login] shortcode. By default, this page is titled "Login".', 'theme-my-login'); ?></p>
7
  </td>
8
  </tr>
9
  <tr valign="top">
3
  <th scope="row"><label for="theme_my_login_page_id"><?php _e('Page ID', 'theme-my-login'); ?></label></th>
4
  <td>
5
  <input name="theme_my_login[page_id]" type="text" id="theme_my_login_page_id" value="<?php echo (int) $theme_my_login->options['page_id']; ?>" class="small-text" />
6
+ <p class="description"><?php _e('This should be the ID of the WordPress page that includes the [theme-my-login-page] shortcode. By default, this page is titled "Login".', 'theme-my-login'); ?></p>
7
  </td>
8
  </tr>
9
  <tr valign="top">
includes/hook-functions.php CHANGED
@@ -58,12 +58,12 @@ function wdbj_tml_get_pages($pages, $attributes = '') {
58
 
59
  // It sucks there's not really a better way to do this
60
  if ( wdbj_tml_get_option('show_page') ) {
61
- foreach ( $pages as $page ) {
62
  if ( $page->ID == $tml_page ) {
63
  if ( is_user_logged_in() )
64
- $page->post_title = __('Log Out', 'theme-my-login');
65
  else
66
- $page->post_title = __('Log In', 'theme-my-login');
67
  }
68
  }
69
  }
58
 
59
  // It sucks there's not really a better way to do this
60
  if ( wdbj_tml_get_option('show_page') ) {
61
+ foreach ( $pages as $key => $page ) {
62
  if ( $page->ID == $tml_page ) {
63
  if ( is_user_logged_in() )
64
+ $pages[$key]->post_title = __('Log Out', 'theme-my-login');
65
  else
66
+ $pages[$key]->post_title = __('Log In', 'theme-my-login');
67
  }
68
  }
69
  }
includes/template-functions.php CHANGED
@@ -195,7 +195,7 @@ function wdbj_tml_get_login_form() {
195
  wdbj_tml_get_header();
196
 
197
  if ( isset($_POST['log']) )
198
- $user_login = ( wdbj_tml_get_error('incorrect_password') || wdbj_tml_get_error('empty_password') ) ? attribute_escape(stripslashes($_POST['log'])) : '';
199
 
200
  $user_login = ( $current_instance['is_active'] && isset($user_login) ) ? $user_login : '';
201
 
@@ -241,11 +241,11 @@ function wdbj_tml_get_register_form() {
241
  <form name="registerform" id="registerform-<?php echo $current_instance['instance_id']; ?>" action="<?php echo esc_url(wdbj_tml_get_current_url('action=register&instance=' . $current_instance['instance_id'])); ?>" method="post">
242
  <p>
243
  <label for="user_login-<?php echo $current_instance['instance_id']; ?>"><?php _e('Username', 'theme-my-login') ?></label>
244
- <input type="text" name="user_login" id="user_login-<?php echo $current_instance['instance_id']; ?>" class="input" value="<?php echo attribute_escape(stripslashes($user_login)); ?>" size="20" />
245
  </p>
246
  <p>
247
  <label for="user_email-<?php echo $current_instance['instance_id']; ?>"><?php _e('E-mail', 'theme-my-login') ?></label>
248
- <input type="text" name="user_email" id="user_email-<?php echo $current_instance['instance_id']; ?>" class="input" value="<?php echo attribute_escape(stripslashes($user_email)); ?>" size="20" />
249
  </p>
250
  <?php do_action('register_form', $current_instance['instance_id']); ?>
251
  <p class="submit">
@@ -270,7 +270,7 @@ function wdbj_tml_get_lost_password_form() {
270
  <form name="lostpasswordform" id="lostpasswordform-<?php echo $current_instance['instance_id']; ?>" action="<?php echo esc_url(wdbj_tml_get_current_url('action=lostpassword&instance=' . $current_instance['instance_id'])); ?>" method="post">
271
  <p>
272
  <label for="user_login-<?php echo $current_instance['instance_id']; ?>"><?php _e('Username or E-mail:', 'theme-my-login') ?></label>
273
- <input type="text" name="user_login" id="user_login-<?php echo $current_instance['instance_id']; ?>" class="input" value="<?php echo attribute_escape($user_login); ?>" size="20" />
274
  </p>
275
  <?php do_action('lostpassword_form', $current_instance['instance_id']); ?>
276
  <p class="submit">
195
  wdbj_tml_get_header();
196
 
197
  if ( isset($_POST['log']) )
198
+ $user_login = ( wdbj_tml_get_error('incorrect_password') || wdbj_tml_get_error('empty_password') ) ? esc_attr(stripslashes($_POST['log'])) : '';
199
 
200
  $user_login = ( $current_instance['is_active'] && isset($user_login) ) ? $user_login : '';
201
 
241
  <form name="registerform" id="registerform-<?php echo $current_instance['instance_id']; ?>" action="<?php echo esc_url(wdbj_tml_get_current_url('action=register&instance=' . $current_instance['instance_id'])); ?>" method="post">
242
  <p>
243
  <label for="user_login-<?php echo $current_instance['instance_id']; ?>"><?php _e('Username', 'theme-my-login') ?></label>
244
+ <input type="text" name="user_login" id="user_login-<?php echo $current_instance['instance_id']; ?>" class="input" value="<?php echo esc_attr(stripslashes($user_login)); ?>" size="20" />
245
  </p>
246
  <p>
247
  <label for="user_email-<?php echo $current_instance['instance_id']; ?>"><?php _e('E-mail', 'theme-my-login') ?></label>
248
+ <input type="text" name="user_email" id="user_email-<?php echo $current_instance['instance_id']; ?>" class="input" value="<?php echo esc_attr(stripslashes($user_email)); ?>" size="20" />
249
  </p>
250
  <?php do_action('register_form', $current_instance['instance_id']); ?>
251
  <p class="submit">
270
  <form name="lostpasswordform" id="lostpasswordform-<?php echo $current_instance['instance_id']; ?>" action="<?php echo esc_url(wdbj_tml_get_current_url('action=lostpassword&instance=' . $current_instance['instance_id'])); ?>" method="post">
271
  <p>
272
  <label for="user_login-<?php echo $current_instance['instance_id']; ?>"><?php _e('Username or E-mail:', 'theme-my-login') ?></label>
273
+ <input type="text" name="user_login" id="user_login-<?php echo $current_instance['instance_id']; ?>" class="input" value="<?php echo esc_attr($user_login); ?>" size="20" />
274
  </p>
275
  <?php do_action('lostpassword_form', $current_instance['instance_id']); ?>
276
  <p class="submit">
language/theme-my-login-da_DK.mo ADDED
Binary file
language/theme-my-login-es_ES.mo ADDED
Binary file
language/theme-my-login-fr_FR.po DELETED
@@ -1,819 +0,0 @@
1
- # Translation of the WordPress plugin Theme My Login 5.0 by Jeff Farthing.
2
- # Copyright (C) 2010 Jeff Farthing
3
- # This file is distributed under the same license as the Theme My Login package.
4
- # FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
5
- #
6
- msgid ""
7
- msgstr ""
8
- "Project-Id-Version: Theme My Login 5.0\n"
9
- "Report-Msgid-Bugs-To: http://wordpress.org/tag/theme-my-login\n"
10
- "POT-Creation-Date: 2010-03-09 18:41+0000\n"
11
- "PO-Revision-Date: 2010-03-10 01:49+0100\n"
12
- "Last-Translator: pidou <contact@portableapps-blog.fr>\n"
13
- "Language-Team: theme-my-login-fr_FR <contact@theme-my-login-fr_FR>\n"
14
- "MIME-Version: 1.0\n"
15
- "Content-Type: text/plain; charset=UTF-8\n"
16
- "Content-Transfer-Encoding: 8bit\n"
17
- "X-Poedit-Language: French\n"
18
- "X-Poedit-Country: FRANCE\n"
19
- "X-Poedit-SourceCharset: utf-8\n"
20
-
21
- #: admin/includes/admin.php:4
22
- msgid "<strong>WARNING</strong>: The function <em>wp_new_user_notification</em> has already been overridden by another plugin. "
23
- msgstr "<strong>ATTENTION</ strong>: La fonction <em><wp_new_user_notification</ em> a déjà été annulés par un autre plugin."
24
-
25
- #: admin/includes/admin.php:5
26
- #: admin/includes/admin.php:11
27
- msgid "Some features of <em>Theme My Login</em> may not function properly."
28
- msgstr "Certaines fonctionnalités du <em>Theme My Login</em> peuvent ne pas fonctionner correctement."
29
-
30
- #: admin/includes/admin.php:10
31
- msgid "<strong>WARNING</strong>: The function <em>wp_password_change_notification</em> has already been overridden by another plugin. "
32
- msgstr "<strong>ATTENTION</ strong>: La fonction <em>wp_password_change_notification</em> a déjà été annulés par un autre plugin."
33
-
34
- #. #-#-#-#-# plugin.pot (Theme My Login 5.0) #-#-#-#-#
35
- #. Plugin Name of a plugin/theme
36
- #: admin/includes/admin.php:17
37
- #: includes/widget.php:8
38
- msgid "Theme My Login"
39
- msgstr "Theme My Login"
40
-
41
- #: admin/includes/admin.php:103
42
- #, php-format
43
- msgid "ERROR: The module \"$module\" could not be activated (%s)."
44
- msgstr "ERREUR: Le module \"$ module\" ne pouvait pas être activée (%s)."
45
-
46
- #: admin/includes/module.php:68
47
- msgid "One of the plugins is invalid."
48
- msgstr "Un des plugins est invalide."
49
-
50
- #: admin/includes/module.php:75
51
- msgid "Invalid plugin path."
52
- msgstr "Plugin est invalide."
53
-
54
- #: admin/includes/module.php:77
55
- msgid "Plugin file does not exist."
56
- msgstr "Plugin fichier n'existe pas."
57
-
58
- #: admin/includes/module.php:81
59
- msgid "The plugin does not have a valid header."
60
- msgstr "Le plugin n'a pas une en-tête valide."
61
-
62
- #: admin/options-basic.php:3
63
- msgid "Page ID"
64
- msgstr "Page ID"
65
-
66
- #: admin/options-basic.php:6
67
- msgid "This should be the ID of the WordPress page that includes the [theme-my-login] shortcode. By default, this page is titled \"Login\"."
68
- msgstr "Cela devrait être l'ID de la page WordPress qui inclut le [theme-my-login] shortcode. Par défaut, cette page est intitulée \"Login\"."
69
-
70
- #: admin/options-basic.php:10
71
- msgid "Pagelist"
72
- msgstr "Page de la liste"
73
-
74
- #: admin/options-basic.php:13
75
- msgid "Show Page In Pagelist"
76
- msgstr "Voir la page Dans Page de la liste"
77
-
78
- #: admin/options-basic.php:14
79
- msgid "Enable this setting to add login/logout links to the pagelist generated by functions like wp_list_pages() and wp_page_menu()."
80
- msgstr "Activez ce paramètre pour ajouter (Connexion) login / logout (Déconnexion) des liens à la pagelist généré par des fonctions comme wp_list_pages () et wp_page_menu ()."
81
-
82
- #: admin/options-basic.php:18
83
- msgid "Links"
84
- msgstr "liens"
85
-
86
- #: admin/options-basic.php:21
87
- msgid "Rewrite Login Links"
88
- msgstr "Réécrire Liens de connexion"
89
-
90
- #: admin/options-basic.php:22
91
- msgid "Enable this setting to rewrite links generated by functions like wp_loginout() and wp_register()."
92
- msgstr "Activez ce paramètre afin de réécrire les liens générés par des fonctions comme wp_loginout() et wp_register()."
93
-
94
- #: admin/options-basic.php:26
95
- msgid "Stylesheet"
96
- msgstr "Feuille de style"
97
-
98
- #: admin/options-basic.php:29
99
- msgid "Enable \"theme-my-login.css\""
100
- msgstr "Activer \"theme-my-login.css\""
101
-
102
- #: admin/options-basic.php:30
103
- msgid "In order to keep changes between upgrades, you can store your customized \"theme-my-login.css\" in your current theme directory."
104
- msgstr "Afin de suivre les changements entre les mises à niveau, vous pouvez stocker vos données personnalisées \"theme-my-login.css\" dans votre répertoire du thème actuel."
105
-
106
- #: admin/options-modules.php:3
107
- #: admin/options.php:6
108
- msgid "Modules"
109
- msgstr "Modules"
110
-
111
- #: admin/options-modules.php:8
112
- #, php-format
113
- msgid "Enable %s"
114
- msgstr "Activer %s"
115
-
116
- #: admin/options-modules.php:10
117
- msgid "No modules found."
118
- msgstr "Pas de modules trouvés."
119
-
120
- #: admin/options-optimization.php:3
121
- #: admin/options.php:7
122
- msgid "Optimization"
123
- msgstr "Optimisation"
124
-
125
- #: admin/options-optimization.php:6
126
- msgid "Enable Template Tag"
127
- msgstr "Activer la balise de modèle"
128
-
129
- #: admin/options-optimization.php:7
130
- msgid "Enable this setting if you wish to use the theme_my_login() template tag. Otherwise, leave it disabled for optimization purposes."
131
- msgstr "Activez ce paramètre si vous souhaitez utiliser le theme_my_login () balise de modèle. Sinon, laissez-les désactiver à des fins d'optimisation."
132
-
133
- #: admin/options-optimization.php:10
134
- msgid "Enable Widget"
135
- msgstr "Activer Widget"
136
-
137
- #: admin/options-optimization.php:11
138
- msgid "Enable this setting if you wish to use the \"Theme My Login\" widget. Otherwise, leave it disabled for optimization purposes."
139
- msgstr "Activez ce paramètre si vous souhaitez utiliser le \"Theme My Login\" widget. Sinon, laissez-le désactiver à des fins d'optimisation."
140
-
141
- #: admin/options.php:4
142
- #: modules/custom-email/admin/admin.php:6
143
- msgid "General"
144
- msgstr "Général"
145
-
146
- #: admin/options.php:5
147
- msgid "Basic"
148
- msgstr "Basic"
149
-
150
- #: admin/options.php:15
151
- msgid "If you like this plugin, please help keep it up to date by <a href=\"http://www.jfarthing.com/donate\">donating through PayPal</a>!"
152
- msgstr "Si vous aimez ce plugin, s'il vous plaît m'aider à tenir à jour par un <a href=\"http://www.jfarthing.com/donate\"> don via PayPal </ a>!"
153
-
154
- #: admin/options.php:20
155
- msgid "Theme My Login Settings"
156
- msgstr "Theme My Login Paramètres"
157
-
158
- #: admin/options.php:26
159
- #: admin/options.php:84
160
- msgid "Save Changes"
161
- msgstr "Enregistrer les modifications"
162
-
163
- #: includes/hook-functions.php:64
164
- msgid "Log Out"
165
- msgstr "Déconnexion"
166
-
167
- #: includes/hook-functions.php:66
168
- #: includes/template-functions.php:102
169
- #: includes/template-functions.php:217
170
- msgid "Log In"
171
- msgstr "Connexion"
172
-
173
- #: includes/login-actions.php:48
174
- msgid "Sorry, that key does not appear to be valid."
175
- msgstr "Désolé, cette clef ne semble pas être valide."
176
-
177
- #: includes/login-functions.php:16
178
- msgid "<strong>ERROR</strong>: Enter a username or e-mail address."
179
- msgstr "<strong>ERREUR</ strong>: Entrez un nom d'utilisateur ou adresse e-mail."
180
-
181
- #: includes/login-functions.php:21
182
- msgid "<strong>ERROR</strong>: There is no user registered with that email address."
183
- msgstr "<strong>ERREUR</ strong>: Il n'y a pas d'utilisateur enregistré avec cette adresse e-mail."
184
-
185
- #: includes/login-functions.php:33
186
- msgid "<strong>ERROR</strong>: Invalid username or e-mail."
187
- msgstr "<strong>ERREUR</ strong>: Nom d'utilisateur incorrect ou e-mail non valide"
188
-
189
- #: includes/login-functions.php:47
190
- msgid "Password reset is not allowed for this user"
191
- msgstr "Récuperation Mot de passe oublié n'est pas autorisé pour cet utilisateur"
192
-
193
- #: includes/login-functions.php:59
194
- msgid "Someone has asked to reset the password for the following site and username."
195
- msgstr "Quelqu'un a demandé de réinitialiser le mot de passe pour le site suivant et nom d'utilisateur."
196
-
197
- #: includes/login-functions.php:61
198
- #: includes/login-functions.php:110
199
- #: includes/pluggable-functions.php:56
200
- #: includes/pluggable-functions.php:71
201
- #: modules/custom-passwords/includes/functions.php:37
202
- #: modules/user-moderation/includes/functions.php:87
203
- #: modules/user-moderation/includes/functions.php:150
204
- #, php-format
205
- msgid "Username: %s"
206
- msgstr "Nom d'utilisateur: %s"
207
-
208
- #: includes/login-functions.php:62
209
- msgid "To reset your password visit the following address, otherwise just ignore this email and nothing will happen."
210
- msgstr "Pour réinitialiser votre mot de passe visitez l'adresse suivante, sinon ignorer simplement ce message et rien ne se passera."
211
-
212
- #: includes/login-functions.php:69
213
- #, php-format
214
- msgid "[%s] Password Reset"
215
- msgstr "[%s] Mot de passe oublié"
216
-
217
- #: includes/login-functions.php:75
218
- #: includes/login-functions.php:124
219
- #: modules/custom-passwords/includes/functions.php:51
220
- #: modules/user-moderation/admin/admin.php:59
221
- #: modules/user-moderation/includes/functions.php:97
222
- msgid "The e-mail could not be sent."
223
- msgstr "L'e-mail n'a pas pu être envoyé."
224
-
225
- #: includes/login-functions.php:75
226
- #: includes/login-functions.php:124
227
- #: modules/custom-passwords/includes/functions.php:51
228
- #: modules/user-moderation/admin/admin.php:59
229
- #: modules/user-moderation/includes/functions.php:97
230
- msgid "Possible reason: your host may have disabled the mail() function..."
231
- msgstr "Cause possible: Vous avez désactivé la fonction mail de votre hôte () ..."
232
-
233
- #: includes/login-functions.php:94
234
- #: includes/login-functions.php:97
235
- #: includes/login-functions.php:101
236
- #: modules/custom-passwords/includes/functions.php:9
237
- #: modules/custom-passwords/includes/functions.php:12
238
- #: modules/custom-passwords/includes/functions.php:16
239
- #: modules/user-moderation/includes/functions.php:17
240
- #: modules/user-moderation/includes/functions.php:20
241
- #: modules/user-moderation/includes/functions.php:24
242
- msgid "Invalid key"
243
- msgstr "Clé non valide"
244
-
245
- #: includes/login-functions.php:111
246
- #: includes/pluggable-functions.php:72
247
- #: modules/custom-passwords/includes/functions.php:38
248
- #: modules/user-moderation/includes/functions.php:88
249
- #, php-format
250
- msgid "Password: %s"
251
- msgstr "Mot de passe: %s"
252
-
253
- #: includes/login-functions.php:118
254
- #: modules/custom-passwords/includes/functions.php:45
255
- #, php-format
256
- msgid "[%s] Your new password"
257
- msgstr "[%s] Votre nouveau mot de passe"
258
-
259
- #: includes/login-functions.php:146
260
- msgid "<strong>ERROR</strong>: Please enter a username."
261
- msgstr "<strong>ERREUR</ strong>: S'il vous plaît entrer un nom d'utilisateur."
262
-
263
- #: includes/login-functions.php:148
264
- msgid "<strong>ERROR</strong>: This username is invalid. Please enter a valid username."
265
- msgstr "<strong>ERREUR</ strong>: Ce nom d'utilisateur n'est pas valide. S'il vous plaît entrer un nom d'utilisateur valide."
266
-
267
- #: includes/login-functions.php:151
268
- msgid "<strong>ERROR</strong>: This username is already registered, please choose another one."
269
- msgstr "<strong> ERREUR </ strong>: Ce nom d'utilisateur existe déjà, en choisir un autre s'il vous plaît."
270
-
271
- #: includes/login-functions.php:155
272
- msgid "<strong>ERROR</strong>: Please type your e-mail address."
273
- msgstr "<strong> ERREUR</ strong>: S'il vous plaît entrez votre adresse email"
274
-
275
- #: includes/login-functions.php:157
276
- msgid "<strong>ERROR</strong>: The email address isn&#8217;t correct."
277
- msgstr "<strong>ERREUR</ strong >: L'adresse email n'est pas correcte."
278
-
279
- #: includes/login-functions.php:160
280
- msgid "<strong>ERROR</strong>: This email is already registered, please choose another one."
281
- msgstr "<strong>ERREUR</ strong>: Ce courriel existe déjà, s'il vous plaît choisir un autre."
282
-
283
- #: includes/login-functions.php:176
284
- #, php-format
285
- msgid "<strong>ERROR</strong>: Couldn&#8217;t register you... please contact the <a href=\"mailto:%s\">webmaster</a> !"
286
- msgstr "<strong> ERREUR </ strong>: Impossible de vous inscrire ... s'il vous plaît contacter le <a href=\"mailto:%s\">webmaster</a> !"
287
-
288
- #: includes/pluggable-functions.php:17
289
- #, php-format
290
- msgid "Password Lost and Changed for user: %s"
291
- msgstr "Mot de passe perdu et changé pour l'utilisateur: %s"
292
-
293
- #: includes/pluggable-functions.php:22
294
- #, php-format
295
- msgid "[%s] Password Lost/Changed"
296
- msgstr "[%s] Mot de passe Perdu/Changé"
297
-
298
- #: includes/pluggable-functions.php:55
299
- #, php-format
300
- msgid "New user registration on your blog %s:"
301
- msgstr "Enregistrement nouvel utilisateur sur votre blog %s:"
302
-
303
- #: includes/pluggable-functions.php:57
304
- #: modules/user-moderation/includes/functions.php:151
305
- #, php-format
306
- msgid "E-mail: %s"
307
- msgstr "E-mail: %s"
308
-
309
- #: includes/pluggable-functions.php:59
310
- #, php-format
311
- msgid "[%s] New User Registration"
312
- msgstr "[%s] Inscription des nouveaux membres"
313
-
314
- #: includes/pluggable-functions.php:75
315
- #, php-format
316
- msgid "[%s] Your username and password"
317
- msgstr "[%s] Votre nom d'utilisateur et mot de passe"
318
-
319
- #: includes/template-functions.php:23
320
- #: modules/custom-user-links/custom-user-links.php:57
321
- msgid "Dashboard"
322
- msgstr "Tableau de bord"
323
-
324
- #: includes/template-functions.php:24
325
- #: modules/custom-user-links/custom-user-links.php:58
326
- msgid "Profile"
327
- msgstr "Profil"
328
-
329
- #: includes/template-functions.php:32
330
- #: modules/custom-redirection/admin/admin.php:29
331
- msgid "Log out"
332
- msgstr "Déconnexion"
333
-
334
- #: includes/template-functions.php:88
335
- #, php-format
336
- msgid "Welcome, %s"
337
- msgstr "Bienvenue, %s"
338
-
339
- #: includes/template-functions.php:92
340
- #: includes/template-functions.php:252
341
- msgid "Register"
342
- msgstr "Inscrivez-vous"
343
-
344
- #: includes/template-functions.php:98
345
- msgid "Lost Password"
346
- msgstr "Mot de passe perdu"
347
-
348
- #: includes/template-functions.php:179
349
- msgid "<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href='http://www.google.com/cookies.html'>enable cookies</a> to use WordPress."
350
- msgstr "<strong>ERREUR</ strong>: Les cookies sont bloqués ou non supportés par votre navigateur. Vous devez <a href='http://www.google.com/cookies.html'> activer les cookies </ a> pour utiliser WordPress."
351
-
352
- #: includes/template-functions.php:184
353
- msgid "You are now logged out."
354
- msgstr "Vous êtes maintenant déconnecté."
355
-
356
- #: includes/template-functions.php:186
357
- msgid "User registration is currently not allowed."
358
- msgstr "L'nregistrement d'utilisateur n'est pas autorisé actuellement."
359
-
360
- #: includes/template-functions.php:188
361
- msgid "Check your e-mail for the confirmation link."
362
- msgstr "Vérifiez votre e-mail pour le lien de confirmation."
363
-
364
- #: includes/template-functions.php:190
365
- msgid "Check your e-mail for your new password."
366
- msgstr "Vérifiez votre e-mail et votre nouveau mot de passe."
367
-
368
- #: includes/template-functions.php:192
369
- msgid "Registration complete. Please check your e-mail."
370
- msgstr "Inscription complète. Vérifier votre e-mail s'il vous plaît."
371
-
372
- #: includes/template-functions.php:207
373
- #: includes/template-functions.php:243
374
- #: modules/themed-profiles/includes/template-functions.php:33
375
- msgid "Username"
376
- msgstr "Nom d'utilisateur"
377
-
378
- #: includes/template-functions.php:211
379
- msgid "Password"
380
- msgstr "Mot de passe"
381
-
382
- #: includes/template-functions.php:215
383
- msgid "Remember Me"
384
- msgstr "Se souvenir de moi"
385
-
386
- #: includes/template-functions.php:237
387
- msgid "A password will be e-mailed to you."
388
- msgstr "Un mot de passe sera envoyé par courrier électronique."
389
-
390
- #: includes/template-functions.php:247
391
- #: modules/custom-email/admin/admin.php:5
392
- #: modules/themed-profiles/includes/template-functions.php:86
393
- msgid "E-mail"
394
- msgstr "E-mail"
395
-
396
- #: includes/template-functions.php:264
397
- msgid "Please enter your username or e-mail address. You will receive a new password via e-mail."
398
- msgstr "S'il vous plaît entrer votre nom d'utilisateur ou adresse e-mail. Vous recevrez un nouveau mot de passe par e-mail."
399
-
400
- #: includes/template-functions.php:272
401
- msgid "Username or E-mail:"
402
- msgstr "Nom d'utilisateur ou E-mail:"
403
-
404
- #: includes/template-functions.php:277
405
- msgid "Get New Password"
406
- msgstr "Obtenir un nouveau mot de passe"
407
-
408
- #: includes/widget.php:7
409
- msgid "A login form for your blog."
410
- msgstr "Un formulaire de connexion pour votre blog."
411
-
412
- #: includes/widget.php:56
413
- msgid "Show When Logged In"
414
- msgstr "Afficher Lorsque vous êtes connecté"
415
-
416
- #: includes/widget.php:58
417
- msgid "Show Title"
418
- msgstr "Afficher le titre"
419
-
420
- #: includes/widget.php:60
421
- msgid "Show Login Link"
422
- msgstr "Afficher lien de connexion"
423
-
424
- #: includes/widget.php:62
425
- msgid "Show Register Link"
426
- msgstr "Afficher le lien d'enregistrement"
427
-
428
- #: includes/widget.php:64
429
- msgid "Show Lost Password Link"
430
- msgstr "Affixcher le lien mot de passe perdu"
431
-
432
- #: includes/widget.php:66
433
- msgid "Show Gravatar"
434
- msgstr "Afficher Gravatar"
435
-
436
- #: includes/widget.php:67
437
- msgid "Gravatar Size"
438
- msgstr "Taille du gravatar"
439
-
440
- #: includes/widget.php:69
441
- msgid "Allow Registration"
442
- msgstr "Permettre l'enregistrement"
443
-
444
- #: includes/widget.php:71
445
- msgid "Allow Password Recovery"
446
- msgstr "Permettre la récupération du mot de passe"
447
-
448
- #: modules/custom-email/admin/admin.php:7
449
- msgid "New User"
450
- msgstr "Nouveaux membres"
451
-
452
- #: modules/custom-email/admin/admin.php:8
453
- msgid "Retrieve Password"
454
- msgstr "Récupérer le mot de passe"
455
-
456
- #: modules/custom-email/admin/admin.php:9
457
- msgid "Reset Password"
458
- msgstr "Réinitialiser mot de passe"
459
-
460
- #: modules/custom-email/admin/options-general.php:4
461
- msgid "From Name"
462
- msgstr "Depuis votre nom"
463
-
464
- #: modules/custom-email/admin/options-general.php:10
465
- msgid "From E-mail"
466
- msgstr "Depuis votre email"
467
-
468
- #: modules/custom-email/admin/options-general.php:16
469
- msgid "E-mail Format"
470
- msgstr "Format E-mail "
471
-
472
- #: modules/custom-email/admin/options-new-user.php:4
473
- #: modules/custom-email/admin/options-reset-pass.php:4
474
- #: modules/custom-email/admin/options-retrieve-pass.php:4
475
- #: modules/user-moderation/admin/options-user-activation-email.php:4
476
- #: modules/user-moderation/admin/options-user-approval-email.php:4
477
- #: modules/user-moderation/admin/options-user-denial-email.php:4
478
- msgid "Available Variables"
479
- msgstr "Variables disponibles"
480
-
481
- #: modules/custom-email/admin/options-new-user.php:5
482
- #: modules/custom-email/admin/options-reset-pass.php:5
483
- #: modules/custom-email/admin/options-retrieve-pass.php:5
484
- #: modules/user-moderation/admin/options-user-activation-email.php:5
485
- #: modules/user-moderation/admin/options-user-approval-email.php:5
486
- #: modules/user-moderation/admin/options-user-denial-email.php:5
487
- msgid "Subject"
488
- msgstr "Sujet"
489
-
490
- #: modules/custom-email/admin/options-new-user.php:7
491
- #: modules/custom-email/admin/options-reset-pass.php:7
492
- #: modules/custom-email/admin/options-retrieve-pass.php:7
493
- #: modules/user-moderation/admin/options-user-activation-email.php:7
494
- #: modules/user-moderation/admin/options-user-approval-email.php:7
495
- #: modules/user-moderation/admin/options-user-denial-email.php:7
496
- msgid "Message"
497
- msgstr "Message"
498
-
499
- #: modules/custom-email/admin/options-reset-pass.php:10
500
- msgid "Disable Admin Notification"
501
- msgstr "Désactiver Notification de l'administrateur"
502
-
503
- #: modules/custom-passwords/includes/hook-functions.php:5
504
- msgid "Password:"
505
- msgstr "Mot de passe:"
506
-
507
- #: modules/custom-passwords/includes/hook-functions.php:7
508
- #: modules/custom-passwords/includes/hook-functions.php:66
509
- msgid "Confirm Password:"
510
- msgstr "Confirmer le mot de passe:"
511
-
512
- #: modules/custom-passwords/includes/hook-functions.php:14
513
- msgid "<strong>ERROR</strong>: Please enter a password."
514
- msgstr "<strong>ERREUR</ strong>: S'il vous plaît entrer un mot de passe."
515
-
516
- #: modules/custom-passwords/includes/hook-functions.php:16
517
- msgid "<strong>ERROR</strong>: Your passwords do not match."
518
- msgstr "<strong>ERREUR</ strong>: Vos mots de passe ne correspondent pas."
519
-
520
- #: modules/custom-passwords/includes/hook-functions.php:18
521
- msgid "<strong>ERROR</strong>: Your password must be at least 6 characters in length."
522
- msgstr "<strong>ERREUR</ strong>: Votre mot de passe doit comporter au moins 6 caractères."
523
-
524
- #: modules/custom-passwords/includes/hook-functions.php:54
525
- msgid "Please enter a new password."
526
- msgstr "S'il vous plaît entrer un nouveau mot de passe."
527
-
528
- #: modules/custom-passwords/includes/hook-functions.php:62
529
- msgid "New Password:"
530
- msgstr "Nouveau mot de passe:"
531
-
532
- #: modules/custom-passwords/includes/hook-functions.php:71
533
- msgid "Change Password"
534
- msgstr "Changer de mot de passe"
535
-
536
- #: modules/custom-passwords/includes/hook-functions.php:102
537
- msgid "Please enter your username or e-mail address. You will recieve an e-mail with a link to reset your password."
538
- msgstr "S'il vous plaît entrer votre nom d'utilisateur ou adresse e-mail. Vous recevrez un e-mail avec un lien pour réinitialiser votre mot de passe."
539
-
540
- #: modules/custom-passwords/includes/hook-functions.php:108
541
- msgid "Registration complete. You may now log in."
542
- msgstr "Inscription complète. Vous pouvez vous connecter maintenant."
543
-
544
- #: modules/custom-passwords/includes/hook-functions.php:110
545
- msgid "Your password has been saved. You may now log in."
546
- msgstr "Votre mot de passe a été enregistré. Vous pouvez vous connecter maintenant."
547
-
548
- #: modules/custom-redirection/admin/admin.php:6
549
- msgid "Redirection"
550
- msgstr "Redirection"
551
-
552
- #: modules/custom-redirection/admin/admin.php:20
553
- msgid "Log in"
554
- msgstr "Connexion"
555
-
556
- #: modules/custom-redirection/admin/admin.php:22
557
- #: modules/custom-redirection/admin/admin.php:31
558
- msgid "Default"
559
- msgstr "Défaut"
560
-
561
- #: modules/custom-redirection/admin/admin.php:23
562
- #: modules/custom-redirection/admin/admin.php:32
563
- msgid "Referer"
564
- msgstr "Diriger vers"
565
-
566
- #: modules/custom-user-links/admin/admin.php:6
567
- msgid "User Links"
568
- msgstr "Liens utilisateur"
569
-
570
- #: modules/custom-user-links/admin/admin.php:103
571
- #: modules/custom-user-links/admin/admin.php:119
572
- #: modules/custom-user-links/admin/admin.php:150
573
- #: modules/custom-user-links/admin/admin.php:167
574
- msgid "Title"
575
- msgstr "Titre"
576
-
577
- #: modules/custom-user-links/admin/admin.php:104
578
- #: modules/custom-user-links/admin/admin.php:120
579
- #: modules/custom-user-links/admin/admin.php:154
580
- #: modules/custom-user-links/admin/admin.php:168
581
- msgid "URL"
582
- msgstr "URL"
583
-
584
- #: modules/custom-user-links/admin/admin.php:156
585
- msgid "Delete"
586
- msgstr "Supprimer"
587
-
588
- #: modules/custom-user-links/admin/admin.php:157
589
- msgid "Update"
590
- msgstr "Mettre à jour"
591
-
592
- #: modules/custom-user-links/admin/admin.php:163
593
- msgid "Add New link:"
594
- msgstr "Ajouter un nouveau lien:"
595
-
596
- #: modules/custom-user-links/admin/admin.php:179
597
- msgid "Add link"
598
- msgstr "Add lien"
599
-
600
- #: modules/themed-profiles/includes/hook-functions.php:22
601
- msgid "Your Profile"
602
- msgstr "Votre profil"
603
-
604
- #: modules/themed-profiles/includes/template-functions.php:21
605
- msgid "Personal Options"
606
- msgstr "Options personnelles"
607
-
608
- #: modules/themed-profiles/includes/template-functions.php:29
609
- msgid "Name"
610
- msgstr "Nom:"
611
-
612
- #: modules/themed-profiles/includes/template-functions.php:34
613
- msgid "Your username cannot be changed."
614
- msgstr "Votre nom d'utilisateur ne peut pas être changé."
615
-
616
- #: modules/themed-profiles/includes/template-functions.php:38
617
- msgid "First name"
618
- msgstr "Prénom"
619
-
620
- #: modules/themed-profiles/includes/template-functions.php:43
621
- msgid "Last name"
622
- msgstr "Nom de famille"
623
-
624
- #: modules/themed-profiles/includes/template-functions.php:48
625
- msgid "Nickname"
626
- msgstr "Pseudo"
627
-
628
- #: modules/themed-profiles/includes/template-functions.php:48
629
- #: modules/themed-profiles/includes/template-functions.php:86
630
- msgid "(required)"
631
- msgstr "(requis)"
632
-
633
- #: modules/themed-profiles/includes/template-functions.php:53
634
- msgid "Display name publicly as"
635
- msgstr "Affichage du nom publiquement comme"
636
-
637
- #: modules/themed-profiles/includes/template-functions.php:82
638
- msgid "Contact Info"
639
- msgstr "Contact Info"
640
-
641
- #: modules/themed-profiles/includes/template-functions.php:91
642
- msgid "Website"
643
- msgstr "Website"
644
-
645
- #: modules/themed-profiles/includes/template-functions.php:108
646
- msgid "About Yourself"
647
- msgstr "À propos de vous"
648
-
649
- #: modules/themed-profiles/includes/template-functions.php:112
650
- msgid "Biographical Info"
651
- msgstr "Informations biographiques"
652
-
653
- #: modules/themed-profiles/includes/template-functions.php:114
654
- msgid "Share a little biographical information to fill out your profile. This may be shown publicly."
655
- msgstr "Partagez un peu d'informations biographiques pour remplir votre profil. Ces informations peuvent avoir la possibilité d' être montré publiquement."
656
-
657
- #: modules/themed-profiles/includes/template-functions.php:122
658
- msgid "New Password"
659
- msgstr "Nouveau mot de passe"
660
-
661
- #: modules/themed-profiles/includes/template-functions.php:123
662
- msgid "If you would like to change the password type a new one. Otherwise leave this blank."
663
- msgstr "Si vous souhaitez changer le type de mot de passe une nouvelle fois. Sinon, laissez ce champ vide."
664
-
665
- #: modules/themed-profiles/includes/template-functions.php:124
666
- msgid "Type your new password again."
667
- msgstr "Tapez votre nouveau mot de passe."
668
-
669
- #: modules/themed-profiles/includes/template-functions.php:125
670
- msgid "Strength indicator"
671
- msgstr "Indicateur de sécurité"
672
-
673
- #: modules/themed-profiles/includes/template-functions.php:126
674
- msgid "Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! \" ? $ % ^ &amp; )."
675
- msgstr "Astuce: Le mot de passe doit comporter au moins sept caractères. Pour rendre plus sécurisé, utiliser les majuscules et minuscules, chiffres et symboles tels que ! \" ? $ % ^ &amp; )."
676
-
677
- #: modules/themed-profiles/includes/template-functions.php:140
678
- msgid "Additional Capabilities"
679
- msgstr "Possibilités supplémentaires"
680
-
681
- #: modules/themed-profiles/includes/template-functions.php:160
682
- msgid "Update Profile"
683
- msgstr "Modifier votre profil"
684
-
685
- #: modules/themed-profiles/themed-profiles.php:45
686
- msgid "You do not have permission to edit this user."
687
- msgstr "Vous n'avez pas la permission de modifier cet utilisateur."
688
-
689
- #: modules/user-moderation/admin/admin.php:12
690
- #: modules/user-moderation/admin/admin.php:15
691
- #: modules/user-moderation/admin/admin.php:21
692
- msgid "You can&#8217;t edit that user."
693
- msgstr "Vous ne pouvez pas modifier cet utilisateur."
694
-
695
- #: modules/user-moderation/admin/admin.php:52
696
- #, php-format
697
- msgid "You have been denied access to %s"
698
- msgstr "L'accès vous avez été refusé à %s"
699
-
700
- #: modules/user-moderation/admin/admin.php:53
701
- #, php-format
702
- msgid "[%s] Registration Denied"
703
- msgstr "[%s] refusées à l'enregistrement"
704
-
705
- #: modules/user-moderation/admin/admin.php:63
706
- msgid "Moderation"
707
- msgstr "Modération"
708
-
709
- #: modules/user-moderation/admin/admin.php:66
710
- msgid "User Activation"
711
- msgstr "Activation utilisateur"
712
-
713
- #: modules/user-moderation/admin/admin.php:67
714
- msgid "User Approval"
715
- msgstr "Approbation Utilisateur"
716
-
717
- #: modules/user-moderation/admin/admin.php:68
718
- msgid "User Denial"
719
- msgstr "Le déni de l'utilisateur"
720
-
721
- #: modules/user-moderation/admin/admin.php:77
722
- msgid "User Moderation"
723
- msgstr "Modération utilisateur"
724
-
725
- #: modules/user-moderation/admin/admin.php:80
726
- msgid "None"
727
- msgstr "Aucun"
728
-
729
- #: modules/user-moderation/admin/admin.php:83
730
- msgid "E-mail Confirmation"
731
- msgstr "E-Mail Confirmation"
732
-
733
- #: modules/user-moderation/admin/admin.php:86
734
- msgid "Admin Approval"
735
- msgstr "Approbation administrateur"
736
-
737
- #: modules/user-moderation/includes/functions.php:41
738
- #: modules/user-moderation/includes/functions.php:76
739
- msgid "Same as when you signed up."
740
- msgstr "Même que lors de votre inscription."
741
-
742
- #: modules/user-moderation/includes/functions.php:86
743
- #, php-format
744
- msgid "You have been approved access to %s"
745
- msgstr "Vous avez été approuvé l'accès à %s"
746
-
747
- #: modules/user-moderation/includes/functions.php:91
748
- #, php-format
749
- msgid "[%s] Registration Approved"
750
- msgstr "[%s] Enregistrement Approuvé"
751
-
752
- #: modules/user-moderation/includes/functions.php:126
753
- #, php-format
754
- msgid "[%s] Activate Your Account"
755
- msgstr "[%s] Activer votre compte"
756
-
757
- #: modules/user-moderation/includes/functions.php:127
758
- #, php-format
759
- msgid "Thanks for registering at %s! To complete the activation of your account please click the following link: "
760
- msgstr "Merci pour votre inscription sur %s! Pour terminer l'activation de votre compte s'il vous plaît cliquer sur le lien suivant:"
761
-
762
- #: modules/user-moderation/includes/functions.php:149
763
- #, php-format
764
- msgid "New user requires approval on your blog %s:"
765
- msgstr "Nouvel utilisateur requiert l'approbation de votre blog %s:"
766
-
767
- #: modules/user-moderation/includes/functions.php:152
768
- msgid "To approve or deny this user:"
769
- msgstr "Approuver ou refuser cet utilisateur:"
770
-
771
- #: modules/user-moderation/includes/functions.php:155
772
- #, php-format
773
- msgid "[%s] New User Awaiting Approval"
774
- msgstr "[%s] Nouveaux membres en attente de validation"
775
-
776
- #: modules/user-moderation/includes/hook-functions.php:30
777
- msgid "<strong>ERROR</strong>: You have not yet confirmed your e-mail address."
778
- msgstr "<strong> ERREUR</ strong>: Vous n'avez pas encore confirmé votre adresse e-mail."
779
-
780
- #: modules/user-moderation/includes/hook-functions.php:32
781
- msgid "<strong>ERROR</strong>: Your registration has not yet been approved."
782
- msgstr "<strong>ERREUR</ strong>: Votre inscription n'a pas encore été approuvé."
783
-
784
- #: modules/user-moderation/user-moderation.php:30
785
- msgid "Your registration was successful but you must now confirm your email address before you can log in. Please check your email and click on the link provided."
786
- msgstr "Votre inscription a réussie, mais vous devez maintenant confirmer votre adresse e-mail pour pouvoir vous connecter, S'il vous plaît vérifiez votre email et cliquez sur le lien fourni."
787
-
788
- #: modules/user-moderation/user-moderation.php:32
789
- msgid "Your registration was successful but you must now be approved by an administrator before you can log in. You will be notified by e-mail once your account has been reviewed."
790
- msgstr "Votre inscription a réussie, mais vous devez maintenant être approuvé par l'administrateur avant de pouvoir vous connecter. Vous serez averti par e-mail dès que votre compte a été approuvé"
791
-
792
- #: modules/user-moderation/user-moderation.php:35
793
- msgid "Your account has been activated. You may now log in."
794
- msgstr "Votre compte a été activé. Vous pouvez vous connecter maintenant"
795
-
796
- #: modules/user-moderation/user-moderation.php:37
797
- msgid "Your account has been activated. Please check your e-mail for your password."
798
- msgstr "Votre compte a été activé. S'il vous plaît vérifier votre e-mail et votre mot de passe."
799
-
800
- #: modules/user-moderation/user-moderation.php:41
801
- msgid "<strong>ERROR</strong>: Sorry, that key does not appear to be valid."
802
- msgstr "<strong>ERREUR</ strong>: Désolé, cette clef ne semble pas être valide."
803
-
804
- #. Plugin URI of a plugin/theme
805
- msgid "http://www.jfarthing.com/wordpress-plugins/theme-my-login-plugin"
806
- msgstr "http://www.jfarthing.com/wordpress-plugins/theme-my-login-plugin"
807
-
808
- #. Description of a plugin/theme
809
- msgid "Themes the WordPress login, registration and forgot password pages according to your theme."
810
- msgstr "Thèmes de la connexion WordPress, d'enregistrement et mot de passe oublié pages en fonction de votre thème."
811
-
812
- #. Author of a plugin/theme
813
- msgid "Jeff Farthing"
814
- msgstr "Jeff Farthing"
815
-
816
- #. Author URI of a plugin/theme
817
- msgid "http://www.jfarthing.com"
818
- msgstr "http://www.jfarthing.com"
819
-
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
language/theme-my-login-it_IT.mo ADDED
Binary file
language/theme-my-login-pl_PL.mo ADDED
Binary file
language/theme-my-login.pot CHANGED
@@ -554,7 +554,7 @@ msgstr ""
554
 
555
  #: modules/custom-passwords/includes/hook-functions.php:102
556
  msgid ""
557
- "Please enter your username or e-mail address. You will recieve an e-mail "
558
  "with a link to reset your password."
559
  msgstr ""
560
 
554
 
555
  #: modules/custom-passwords/includes/hook-functions.php:102
556
  msgid ""
557
+ "Please enter your username or e-mail address. You will receive an e-mail "
558
  "with a link to reset your password."
559
  msgstr ""
560
 
modules/custom-email/admin/options-general.php CHANGED
@@ -3,12 +3,14 @@
3
  <td>
4
  <label for="theme_my_login_mail_from_name"><?php _e('From Name', 'theme-my-login'); ?></label><br />
5
  <input name="theme_my_login[email][mail_from_name]" type="text" id="theme_my_login_mail_from_name" value="<?php echo $theme_my_login->options['email']['mail_from_name']; ?>" class="regular-text" />
 
6
  </td>
7
  </tr>
8
  <tr valign="top">
9
  <td>
10
  <label for="theme_my_login_mail_from"><?php _e('From E-mail', 'theme-my-login'); ?></label><br />
11
  <input name="theme_my_login[email][mail_from]" type="text" id="theme_my_login_mail_from" value="<?php echo $theme_my_login->options['email']['mail_from']; ?>" class="regular-text" />
 
12
  </td>
13
  </tr>
14
  <tr valign="top">
@@ -18,6 +20,7 @@
18
  <option value="plain"<?php if ('plain' == $theme_my_login->options['email']['mail_content_type']) echo ' selected="selected"'; ?>>Plain Text</option>
19
  <option value="html"<?php if ('html' == $theme_my_login->options['email']['mail_content_type']) echo ' selected="selected"'; ?>>HTML</option>
20
  </select>
 
21
  </td>
22
  </tr>
23
  </table>
3
  <td>
4
  <label for="theme_my_login_mail_from_name"><?php _e('From Name', 'theme-my-login'); ?></label><br />
5
  <input name="theme_my_login[email][mail_from_name]" type="text" id="theme_my_login_mail_from_name" value="<?php echo $theme_my_login->options['email']['mail_from_name']; ?>" class="regular-text" />
6
+ <p class="description"><?php _e('Enter the name you wish for e-mails to be sent from. If left blank, the default will be used.', 'theme-my-login'); ?></p>
7
  </td>
8
  </tr>
9
  <tr valign="top">
10
  <td>
11
  <label for="theme_my_login_mail_from"><?php _e('From E-mail', 'theme-my-login'); ?></label><br />
12
  <input name="theme_my_login[email][mail_from]" type="text" id="theme_my_login_mail_from" value="<?php echo $theme_my_login->options['email']['mail_from']; ?>" class="regular-text" />
13
+ <p class="description"><?php _e('Enter the e-mail address you wish for e-mails to be sent from. If left blank, the default will be used.', 'theme-my-login'); ?></p>
14
  </td>
15
  </tr>
16
  <tr valign="top">
20
  <option value="plain"<?php if ('plain' == $theme_my_login->options['email']['mail_content_type']) echo ' selected="selected"'; ?>>Plain Text</option>
21
  <option value="html"<?php if ('html' == $theme_my_login->options['email']['mail_content_type']) echo ' selected="selected"'; ?>>HTML</option>
22
  </select>
23
+ <p class="description"><?php _e('If you are going to use HTML markup in your e-mail messages, select "HTML" for this setting. Otherwise, select "Plain Text".', 'theme-my-login'); ?></p>
24
  </td>
25
  </tr>
26
  </table>
modules/custom-email/admin/options-new-user.php CHANGED
@@ -1,14 +1,18 @@
1
  <table class="form-table">
2
  <tr>
3
  <td>
4
- <p><em><?php _e('Available Variables', 'theme-my-login'); ?>: %blogname%, %siteurl%, %user_login%, %user_email%, %user_pass%, %user_ip%</em></p>
 
 
 
 
 
5
  <label for="theme_my_login_new_user_title"><?php _e('Subject', 'theme-my-login'); ?></label><br />
6
  <input name="theme_my_login[email][new_user][title]" type="text" id="theme_my_login_new_user_title" value="<?php echo $theme_my_login->options['email']['new_user']['title']; ?>" class="full-text" /><br />
7
  <label for="theme_my_login_new_user_message"><?php _e('Message', 'theme-my-login'); ?></label><br />
8
  <textarea name="theme_my_login[email][new_user][message]" id="theme_my_login_new_user_message" class="large-text" rows="10"><?php echo $theme_my_login->options['email']['new_user']['message']; ?></textarea><br />
9
- <p>
10
- <label for="theme_my_login_new_user_admin_disable"><input name="theme_my_login[email][new_user][admin_disable]" type="checkbox" id="theme_my_login_new_user_admin_disable" value="1"<?php checked(1, $theme_my_login->options['email']['new_user']['admin_disable']); ?> /> Disable Admin Notification</label>
11
- </p>
12
  </td>
13
  </tr>
14
  </table>
1
  <table class="form-table">
2
  <tr>
3
  <td>
4
+ <p class="description">
5
+ <?php _e('This e-mail will be sent to a new user upon registration.', 'theme-my-login'); ?>
6
+ <?php _e('Please be sure to include the variable %user_pass% if using default passwords or else the user will not know their password!', 'theme-my-login'); ?>
7
+ <?php _e('If either field is left empty, the default will be used instead.', 'theme-my-login'); ?>
8
+ </p>
9
+ <p class="description"><?php _e('Available Variables', 'theme-my-login'); ?>: %blogname%, %siteurl%, %user_login%, %user_email%, %user_pass%, %user_ip%</p>
10
  <label for="theme_my_login_new_user_title"><?php _e('Subject', 'theme-my-login'); ?></label><br />
11
  <input name="theme_my_login[email][new_user][title]" type="text" id="theme_my_login_new_user_title" value="<?php echo $theme_my_login->options['email']['new_user']['title']; ?>" class="full-text" /><br />
12
  <label for="theme_my_login_new_user_message"><?php _e('Message', 'theme-my-login'); ?></label><br />
13
  <textarea name="theme_my_login[email][new_user][message]" id="theme_my_login_new_user_message" class="large-text" rows="10"><?php echo $theme_my_login->options['email']['new_user']['message']; ?></textarea><br />
14
+ <label for="theme_my_login_new_user_admin_disable"><input name="theme_my_login[email][new_user][admin_disable]" type="checkbox" id="theme_my_login_new_user_admin_disable" value="1"<?php checked(1, $theme_my_login->options['email']['new_user']['admin_disable']); ?> /> Disable Admin Notification</label>
15
+ <p class="description"><?php _e('Check this option if you do not wish to receive notification everytime someone registers for your blog.', 'theme-my-login'); ?></p>
 
16
  </td>
17
  </tr>
18
  </table>
modules/custom-email/admin/options-reset-pass.php CHANGED
@@ -1,14 +1,18 @@
1
  <table class="form-table">
2
  <tr>
3
  <td>
4
- <p><em><?php _e('Available Variables', 'theme-my-login'); ?>: %blogname%, %siteurl%, %user_login%, %user_email%, %user_pass%, %user_ip%</em></p>
 
 
 
 
 
5
  <label for="theme_my_login_reset_pass_title"><?php _e('Subject', 'theme-my-login'); ?></label><br />
6
  <input name="theme_my_login[email][reset_pass][title]" type="text" id="theme_my_login_reset_pass_title" value="<?php echo $theme_my_login->options['email']['reset_pass']['title']; ?>" class="full-text" /><br />
7
  <label for="theme_my_login_reset_pass_message"><?php _e('Message', 'theme-my-login'); ?></label><br />
8
  <textarea name="theme_my_login[email][reset_pass][message]" id="theme_my_login_reset_pass_message" class="large-text" rows="10"><?php echo $theme_my_login->options['email']['reset_pass']['message']; ?></textarea><br />
9
- <p>
10
  <label for="theme_my_login_reset_pass_admin_disable"><input name="theme_my_login[email][reset_pass][admin_disable]" type="checkbox" id="theme_my_login_reset_pass_admin_disable" value="1"<?php checked(1, $theme_my_login->options['email']['reset_pass']['admin_disable']); ?> /> <?php _e('Disable Admin Notification', 'theme-my-login'); ?></label>
11
- </p>
12
  </td>
13
  </tr>
14
  </table>
1
  <table class="form-table">
2
  <tr>
3
  <td>
4
+ <p class="description">
5
+ <?php _e('This e-mail will be sent to a user upon successful password recovery.', 'theme-my-login'); ?>
6
+ <?php _e('Please be sure to include the variable %user_pass% if using default passwords or else the user will not know their password!', 'theme-my-login'); ?>
7
+ <?php _e('If either field is left empty, the default will be used instead.', 'theme-my-login'); ?>
8
+ </p>
9
+ <p class="description"><?php _e('Available Variables', 'theme-my-login'); ?>: %blogname%, %siteurl%, %user_login%, %user_email%, %user_pass%, %user_ip%</p>
10
  <label for="theme_my_login_reset_pass_title"><?php _e('Subject', 'theme-my-login'); ?></label><br />
11
  <input name="theme_my_login[email][reset_pass][title]" type="text" id="theme_my_login_reset_pass_title" value="<?php echo $theme_my_login->options['email']['reset_pass']['title']; ?>" class="full-text" /><br />
12
  <label for="theme_my_login_reset_pass_message"><?php _e('Message', 'theme-my-login'); ?></label><br />
13
  <textarea name="theme_my_login[email][reset_pass][message]" id="theme_my_login_reset_pass_message" class="large-text" rows="10"><?php echo $theme_my_login->options['email']['reset_pass']['message']; ?></textarea><br />
 
14
  <label for="theme_my_login_reset_pass_admin_disable"><input name="theme_my_login[email][reset_pass][admin_disable]" type="checkbox" id="theme_my_login_reset_pass_admin_disable" value="1"<?php checked(1, $theme_my_login->options['email']['reset_pass']['admin_disable']); ?> /> <?php _e('Disable Admin Notification', 'theme-my-login'); ?></label>
15
+ <p class="description"><?php _e('Check this option if you do not wish to receive notification everytime someone recovers their password for your blog.', 'theme-my-login'); ?></p>
16
  </td>
17
  </tr>
18
  </table>
modules/custom-email/admin/options-retrieve-pass.php CHANGED
@@ -1,6 +1,11 @@
1
  <table class="form-table">
2
  <tr>
3
  <td>
 
 
 
 
 
4
  <p><em><?php _e('Available Variables', 'theme-my-login'); ?>: %blogname%, %siteurl%, %reseturl%, %user_login%, %user_email%, %user_ip%</em></p>
5
  <label for="theme_my_login_reset_pass_title"><?php _e('Subject', 'theme-my-login'); ?></label><br />
6
  <input name="theme_my_login[email][retrieve_pass][title]" type="text" id="theme_my_login_retrieve_pass_title" value="<?php echo $theme_my_login->options['email']['retrieve_pass']['title']; ?>" class="full-text" /><br />
1
  <table class="form-table">
2
  <tr>
3
  <td>
4
+ <p class="description">
5
+ <?php _e('This e-mail will be sent to a user when they attempt to recover their password.', 'theme-my-login'); ?>
6
+ <?php _e('Please be sure to include the variable %reseturl% or else the user will not be able to recover their password!', 'theme-my-login'); ?>
7
+ <?php _e('If either field is left empty, the default will be used instead.', 'theme-my-login'); ?>
8
+ </p>
9
  <p><em><?php _e('Available Variables', 'theme-my-login'); ?>: %blogname%, %siteurl%, %reseturl%, %user_login%, %user_email%, %user_ip%</em></p>
10
  <label for="theme_my_login_reset_pass_title"><?php _e('Subject', 'theme-my-login'); ?></label><br />
11
  <input name="theme_my_login[email][retrieve_pass][title]" type="text" id="theme_my_login_retrieve_pass_title" value="<?php echo $theme_my_login->options['email']['retrieve_pass']['title']; ?>" class="full-text" /><br />
modules/custom-passwords/includes/hook-functions.php CHANGED
@@ -99,7 +99,7 @@ function wdbj_tml_custom_pass_login_message($message) {
99
  }
100
 
101
  function wdbj_tml_custom_pass_lostpassword_message($message) {
102
- $message = __('Please enter your username or e-mail address. You will recieve an e-mail with a link to reset your password.', 'theme-my-login');
103
  return $message;
104
  }
105
 
99
  }
100
 
101
  function wdbj_tml_custom_pass_lostpassword_message($message) {
102
+ $message = __('Please enter your username or e-mail address. You will receive an e-mail with a link to reset your password.', 'theme-my-login');
103
  return $message;
104
  }
105
 
modules/custom-redirection/admin/admin.php CHANGED
@@ -19,19 +19,25 @@ function wdbj_tml_custom_redirect_user_role_admin_page($role) {
19
  <tr valign="top">
20
  <th scope="row"><?php _e('Log in', 'theme-my-login'); ?></th>
21
  <td>
22
- <input name="theme_my_login[redirection][<?php echo $role; ?>][login_type]" type="radio" id="theme_my_login_redirection_<?php echo $role; ?>_login_type_default" value="default"<?php checked('default', $redirection['login_type']); ?> /> <label for="theme_my_login_redirection_<?php echo $role; ?>_login_type_default"><?php _e('Default', 'theme-my-login'); ?></label><br />
23
- <input name="theme_my_login[redirection][<?php echo $role; ?>][login_type]" type="radio" id="theme_my_login_redirection_<?php echo $role; ?>_login_type_referer" value="referer"<?php checked('referer', $redirection['login_type']); ?> /> <label for="theme_my_login_redirection_<?php echo $role; ?>_login_type_referer"><?php _e('Referer', 'theme-my-login'); ?></label><br />
 
 
24
  <input name="theme_my_login[redirection][<?php echo $role; ?>][login_type]" type="radio" id="theme_my_login_redirection_<?php echo $role; ?>_login_type_custom" value="custom"<?php checked('custom', $redirection['login_type']); ?> />
25
  <input name="theme_my_login[redirection][<?php echo $role; ?>][login_url]" type="text" id="theme_my_login_redirection_<?php echo $role; ?>_login_url" value="<?php echo $redirection['login_url']; ?>" class="regular-text" />
 
26
  </td>
27
  </tr>
28
  <tr valign="top">
29
  <th scope="row"><?php _e('Log out', 'theme-my-login'); ?></th>
30
  <td>
31
  <input name="theme_my_login[redirection][<?php echo $role; ?>][logout_type]" type="radio" id="theme_my_login_redirection_<?php echo $role; ?>_logout_type_default" value="default"<?php checked('default', $redirection['logout_type']); ?> /> <label for="theme_my_login_redirection_<?php echo $role; ?>_logout_type_default"><?php _e('Default', 'theme-my-login'); ?></label><br />
32
- <input name="theme_my_login[redirection][<?php echo $role; ?>][logout_type]" type="radio" id="theme_my_login_redirection_<?php echo $role; ?>_logout_type_referer" value="referer"<?php checked('referer', $redirection['logout_type']); ?> /> <label for="theme_my_login_redirection_<?php echo $role; ?>_logout_type_referer"><?php _e('Referer', 'theme-my-login'); ?></label><br />
 
 
33
  <input name="theme_my_login[redirection][<?php echo $role; ?>][logout_type]" type="radio" id="theme_my_login_redirection_<?php echo $role; ?>_logout_type_custom" value="custom"<?php checked('custom', $redirection['logout_type']); ?> />
34
  <input name="theme_my_login[redirection][<?php echo $role; ?>][logout_url]" type="text" id="theme_my_login_redirection_<?php echo $role; ?>_logout_url" value="<?php echo $redirection['logout_url']; ?>" class="regular-text" />
 
35
  </td>
36
  </tr>
37
  </table>
19
  <tr valign="top">
20
  <th scope="row"><?php _e('Log in', 'theme-my-login'); ?></th>
21
  <td>
22
+ <input name="theme_my_login[redirection][<?php echo $role; ?>][login_type]" type="radio" id="theme_my_login_redirection_<?php echo $role; ?>_login_type_default" value="default"<?php checked('default', $redirection['login_type']); ?> /> <label for="theme_my_login_redirection_<?php echo $role; ?>_login_type_default"><?php _e('Default', 'theme-my-login'); ?></label>
23
+ <p class="description"><?php _e('Check this option to send the user to their WordPress Dashboard/Profile.', 'theme-my-login'); ?></p>
24
+ <input name="theme_my_login[redirection][<?php echo $role; ?>][login_type]" type="radio" id="theme_my_login_redirection_<?php echo $role; ?>_login_type_referer" value="referer"<?php checked('referer', $redirection['login_type']); ?> /> <label for="theme_my_login_redirection_<?php echo $role; ?>_login_type_referer"><?php _e('Referer', 'theme-my-login'); ?></label>
25
+ <p class="description"><?php _e('Check this option to send the user back to the page they were visiting before logging in.', 'theme-my-login'); ?></p>
26
  <input name="theme_my_login[redirection][<?php echo $role; ?>][login_type]" type="radio" id="theme_my_login_redirection_<?php echo $role; ?>_login_type_custom" value="custom"<?php checked('custom', $redirection['login_type']); ?> />
27
  <input name="theme_my_login[redirection][<?php echo $role; ?>][login_url]" type="text" id="theme_my_login_redirection_<?php echo $role; ?>_login_url" value="<?php echo $redirection['login_url']; ?>" class="regular-text" />
28
+ <p class="description"><?php _e('Check this option to send the user to a custom location, specified by the textbox above.', 'theme-my-login'); ?></p>
29
  </td>
30
  </tr>
31
  <tr valign="top">
32
  <th scope="row"><?php _e('Log out', 'theme-my-login'); ?></th>
33
  <td>
34
  <input name="theme_my_login[redirection][<?php echo $role; ?>][logout_type]" type="radio" id="theme_my_login_redirection_<?php echo $role; ?>_logout_type_default" value="default"<?php checked('default', $redirection['logout_type']); ?> /> <label for="theme_my_login_redirection_<?php echo $role; ?>_logout_type_default"><?php _e('Default', 'theme-my-login'); ?></label><br />
35
+ <p class="description"><?php _e('Check this option to send the user to the log in page, displaying a message that they have successfully logged out.', 'theme-my-login'); ?></p>
36
+ <input name="theme_my_login[redirection][<?php echo $role; ?>][logout_type]" type="radio" id="theme_my_login_redirection_<?php echo $role; ?>_logout_type_referer" value="referer"<?php checked('referer', $redirection['logout_type']); ?> /> <label for="theme_my_login_redirection_<?php echo $role; ?>_logout_type_referer"><?php _e('Referer', 'theme-my-login'); ?></label><br />
37
+ <p class="description"><?php _e('Check this option to send the user back to the page they were visiting before logging out. (Note: If the previous page being visited was an admin page, this can have unexpected results.)', 'theme-my-login'); ?></p>
38
  <input name="theme_my_login[redirection][<?php echo $role; ?>][logout_type]" type="radio" id="theme_my_login_redirection_<?php echo $role; ?>_logout_type_custom" value="custom"<?php checked('custom', $redirection['logout_type']); ?> />
39
  <input name="theme_my_login[redirection][<?php echo $role; ?>][logout_url]" type="text" id="theme_my_login_redirection_<?php echo $role; ?>_logout_url" value="<?php echo $redirection['logout_url']; ?>" class="regular-text" />
40
+ <p class="description"><?php _e('Check this option to send the user to a custom location, specified by the textbox above.', 'theme-my-login'); ?></p>
41
  </td>
42
  </tr>
43
  </table>
modules/custom-user-links/custom-user-links.php CHANGED
@@ -19,12 +19,22 @@ function wdbj_tml_custom_user_links($links) {
19
  $links = wdbj_tml_get_option('user_links', $user_role);
20
  if ( !is_array($links) || empty($links) )
21
  $links = array();
 
 
 
 
 
 
22
  return $links;
23
  }
24
 
25
  add_action('tml_admin_init', 'wdbj_tml_custom_user_links_admin_init');
26
  function wdbj_tml_custom_user_links_admin_init() {
27
  global $wp_roles;
 
 
 
 
28
  require_once (TML_MODULE_DIR . '/custom-user-links/admin/admin.php');
29
  add_action('tml_admin_menu', 'wdbj_tml_custom_user_links_admin_menu');
30
  add_filter('tml_save_settings', 'wdbj_tml_custom_user_links_save_settings');
19
  $links = wdbj_tml_get_option('user_links', $user_role);
20
  if ( !is_array($links) || empty($links) )
21
  $links = array();
22
+
23
+ // Allow for user_id variable in link
24
+ foreach ( $links as $key => $link ) {
25
+ $links[$key]['url'] = str_replace('%user_id%', $current_user->ID, $link['url']);
26
+ }
27
+
28
  return $links;
29
  }
30
 
31
  add_action('tml_admin_init', 'wdbj_tml_custom_user_links_admin_init');
32
  function wdbj_tml_custom_user_links_admin_init() {
33
  global $wp_roles;
34
+
35
+ if ( empty($wp_roles) )
36
+ $wp_roles = new WP_Roles();
37
+
38
  require_once (TML_MODULE_DIR . '/custom-user-links/admin/admin.php');
39
  add_action('tml_admin_menu', 'wdbj_tml_custom_user_links_admin_menu');
40
  add_filter('tml_save_settings', 'wdbj_tml_custom_user_links_save_settings');
modules/themed-profiles/themed-profiles.php CHANGED
@@ -63,4 +63,15 @@ function wdbj_tml_themed_profiles_content($content) {
63
  return $content;
64
  }
65
 
 
 
 
 
 
 
 
 
 
 
 
66
  ?>
63
  return $content;
64
  }
65
 
66
+ add_action('init', 'wdbj_tml_themed_profiles_template_redirect');
67
+ function wdbj_tml_themed_profiles_template_redirect() {
68
+ global $pagenow;
69
+ if ( 'profile.php' == $pagenow ) {
70
+ $redirect_to = add_query_arg( 'action', 'profile', get_page_link(wdbj_tml_get_option('page_id')) );
71
+ $redirect_to = add_query_arg( $_GET, $redirect_to );
72
+ wp_redirect($redirect_to);
73
+ exit;
74
+ }
75
+ }
76
+
77
  ?>
modules/user-moderation/admin/admin.php CHANGED
@@ -78,12 +78,13 @@ function wdbj_tml_user_mod_admin_page() {
78
  <td>
79
  <input name="theme_my_login[moderation][type]" type="radio" id="theme_my_login_moderation_type_none" value="none" <?php if ( 'none' == $moderation ) { echo 'checked="checked"'; } ?> />
80
  <label for="theme_my_login_moderation_type_none"><?php _e('None', 'theme-my-login'); ?></label>
81
- <br />
82
  <input name="theme_my_login[moderation][type]" type="radio" id="theme_my_login_moderation_type_email" value="email" <?php if ( 'email' == $moderation ) { echo 'checked="checked"'; } ?> />
83
  <label for="theme_my_login_moderation_type_email"><?php _e('E-mail Confirmation', 'theme-my-login'); ?></label>
84
- <br />
85
  <input name="theme_my_login[moderation][type]" type="radio" id="theme_my_login_moderation_type_admin" value="admin" <?php if ( 'admin' == $moderation ) { echo 'checked="checked"'; } ?> />
86
  <label for="theme_my_login_moderation_type_admin"><?php _e('Admin Approval', 'theme-my-login'); ?></label>
 
87
  </td>
88
  </tr>
89
  </table>
78
  <td>
79
  <input name="theme_my_login[moderation][type]" type="radio" id="theme_my_login_moderation_type_none" value="none" <?php if ( 'none' == $moderation ) { echo 'checked="checked"'; } ?> />
80
  <label for="theme_my_login_moderation_type_none"><?php _e('None', 'theme-my-login'); ?></label>
81
+ <p class="description"><?php _e('Check this option to require no moderation.', 'theme-my-login'); ?></p>
82
  <input name="theme_my_login[moderation][type]" type="radio" id="theme_my_login_moderation_type_email" value="email" <?php if ( 'email' == $moderation ) { echo 'checked="checked"'; } ?> />
83
  <label for="theme_my_login_moderation_type_email"><?php _e('E-mail Confirmation', 'theme-my-login'); ?></label>
84
+ <p class="description"><?php _e('Check this option to require new users to confirm their e-mail address before they may log in.', 'theme-my-login'); ?></p>
85
  <input name="theme_my_login[moderation][type]" type="radio" id="theme_my_login_moderation_type_admin" value="admin" <?php if ( 'admin' == $moderation ) { echo 'checked="checked"'; } ?> />
86
  <label for="theme_my_login_moderation_type_admin"><?php _e('Admin Approval', 'theme-my-login'); ?></label>
87
+ <p class="description"><?php _e('Check this option to require new users to be approved by an administrator before they may log in.', 'theme-my-login'); ?></p>
88
  </td>
89
  </tr>
90
  </table>
modules/user-moderation/admin/options-user-activation-email.php CHANGED
@@ -1,7 +1,12 @@
1
  <table class="form-table">
2
  <tr>
3
  <td>
4
- <p><em><?php _e('Available Variables', 'theme-my-login'); ?>: %blogname%, %siteurl%, %activateurl%, %user_login%, %user_email%, %user_ip%</em></p>
 
 
 
 
 
5
  <label for="theme_my_login_user_activation_title"><?php _e('Subject', 'theme-my-login'); ?></label><br />
6
  <input name="theme_my_login[email][user_activation][title]" type="text" id="theme_my_login_user_activation_title" value="<?php if ( isset($theme_my_login->options['email']['user_activation']['title']) ) echo $theme_my_login->options['email']['user_activation']['title']; ?>" class="full-text" /><br />
7
  <label for="theme_my_login_user_activation_message"><?php _e('Message', 'theme-my-login'); ?></label><br />
1
  <table class="form-table">
2
  <tr>
3
  <td>
4
+ <p class="description">
5
+ <?php _e('This e-mail will be sent to a new user upon registration when "E-mail Confirmation" is checked for "User Moderation".', 'theme-my-login'); ?>
6
+ <?php _e('Please be sure to include the variable %activateurl% or else the user will not be able to activate their account!', 'theme-my-login'); ?>
7
+ <?php _e('If either field is left empty, the default will be used instead.', 'theme-my-login'); ?>
8
+ </p>
9
+ <p class="description"><?php _e('Available Variables', 'theme-my-login'); ?>: %blogname%, %siteurl%, %activateurl%, %user_login%, %user_email%, %user_pass%, %user_ip%</p>
10
  <label for="theme_my_login_user_activation_title"><?php _e('Subject', 'theme-my-login'); ?></label><br />
11
  <input name="theme_my_login[email][user_activation][title]" type="text" id="theme_my_login_user_activation_title" value="<?php if ( isset($theme_my_login->options['email']['user_activation']['title']) ) echo $theme_my_login->options['email']['user_activation']['title']; ?>" class="full-text" /><br />
12
  <label for="theme_my_login_user_activation_message"><?php _e('Message', 'theme-my-login'); ?></label><br />
modules/user-moderation/admin/options-user-approval-email.php CHANGED
@@ -1,7 +1,12 @@
1
  <table class="form-table">
2
  <tr>
3
  <td>
4
- <p><em><?php _e('Available Variables', 'theme-my-login'); ?>: %blogname%, %siteurl%, %user_login%, %user_email%, %user_pass%</em></p>
 
 
 
 
 
5
  <label for="theme_my_login_user_approval_title"><?php _e('Subject', 'theme-my-login'); ?></label><br />
6
  <input name="theme_my_login[email][user_approval][title]" type="text" id="theme_my_login_user_approval_title" value="<?php if ( isset($theme_my_login->options['email']['user_approval']['title']) ) echo $theme_my_login->options['email']['user_approval']['title']; ?>" class="full-text" /><br />
7
  <label for="theme_my_login_user_approval_message"><?php _e('Message', 'theme-my-login'); ?></label><br />
1
  <table class="form-table">
2
  <tr>
3
  <td>
4
+ <p class="description">
5
+ <?php _e('This e-mail will be sent to a new user upon admin approval when "Admin Approval" is checked for "User Moderation".', 'theme-my-login'); ?>
6
+ <?php _e('Please be sure to include the variable %user_pass% if using default passwords or else the user will not know their password!', 'theme-my-login'); ?>
7
+ <?php _e('If either field is left empty, the default will be used instead.', 'theme-my-login'); ?>
8
+ </p>
9
+ <p class="description"><?php _e('Available Variables', 'theme-my-login'); ?>: %blogname%, %siteurl%, %activateurl%, %user_login%, %user_email%, %user_pass%</p>
10
  <label for="theme_my_login_user_approval_title"><?php _e('Subject', 'theme-my-login'); ?></label><br />
11
  <input name="theme_my_login[email][user_approval][title]" type="text" id="theme_my_login_user_approval_title" value="<?php if ( isset($theme_my_login->options['email']['user_approval']['title']) ) echo $theme_my_login->options['email']['user_approval']['title']; ?>" class="full-text" /><br />
12
  <label for="theme_my_login_user_approval_message"><?php _e('Message', 'theme-my-login'); ?></label><br />
modules/user-moderation/admin/options-user-denial-email.php CHANGED
@@ -1,7 +1,11 @@
1
  <table class="form-table">
2
  <tr>
3
  <td>
4
- <p><em><?php _e('Available Variables', 'theme-my-login'); ?>: %blogname%, %siteurl%, %user_login%, %user_email%</em></p>
 
 
 
 
5
  <label for="theme_my_login_user_denial_title"><?php _e('Subject', 'theme-my-login'); ?></label><br />
6
  <input name="theme_my_login[email][user_denial][title]" type="text" id="theme_my_login_user_denial_title" value="<?php if ( isset($theme_my_login->options['email']['user_denial']['title']) ) echo $theme_my_login->options['email']['user_denial']['title']; ?>" class="full-text" /><br />
7
  <label for="theme_my_login_user_denial_message"><?php _e('Message', 'theme-my-login'); ?></label><br />
1
  <table class="form-table">
2
  <tr>
3
  <td>
4
+ <p class="description">
5
+ <?php _e('This e-mail will be sent to a user who is deleted/denied when "Admin Approval" is checked for "User Moderation" and the user\'s role is "Pending".', 'theme-my-login'); ?>
6
+ <?php _e('If either field is left empty, the default will be used instead.', 'theme-my-login'); ?>
7
+ </p>
8
+ <p class="description"><?php _e('Available Variables', 'theme-my-login'); ?>: %blogname%, %siteurl%, %user_login%, %user_email%</p>
9
  <label for="theme_my_login_user_denial_title"><?php _e('Subject', 'theme-my-login'); ?></label><br />
10
  <input name="theme_my_login[email][user_denial][title]" type="text" id="theme_my_login_user_denial_title" value="<?php if ( isset($theme_my_login->options['email']['user_denial']['title']) ) echo $theme_my_login->options['email']['user_denial']['title']; ?>" class="full-text" /><br />
11
  <label for="theme_my_login_user_denial_message"><?php _e('Message', 'theme-my-login'); ?></label><br />
modules/user-moderation/includes/email-functions.php CHANGED
@@ -28,8 +28,7 @@ function wdbj_tml_user_mod_user_activation_title($title) {
28
  function wdbj_tml_user_mod_user_activation_message($message, $user_id, $activation_url) {
29
  $_message = wdbj_tml_get_option('email', 'user_activation', 'message');
30
  $replacements = array(
31
- '%activateurl%' => $activation_url,
32
- '%user_pass%' => $new_pass
33
  );
34
  return empty($_message) ? $message : wdbj_tml_custom_email_replace_vars($_message, $user_id, $replacements);
35
  }
28
  function wdbj_tml_user_mod_user_activation_message($message, $user_id, $activation_url) {
29
  $_message = wdbj_tml_get_option('email', 'user_activation', 'message');
30
  $replacements = array(
31
+ '%activateurl%' => $activation_url
 
32
  );
33
  return empty($_message) ? $message : wdbj_tml_custom_email_replace_vars($_message, $user_id, $replacements);
34
  }
modules/user-moderation/includes/functions.php CHANGED
@@ -23,7 +23,7 @@ function wdbj_tml_user_mod_activate_new_user($key, $login, $newpass = false) {
23
  if ( empty( $user ) )
24
  return new WP_Error('invalid_key', __('Invalid key', 'theme-my-login'));
25
 
26
- do_action('user_activation_post', $user->user_login, $user->user_email, $errors);
27
 
28
  // Allow plugins to short-circuit process and send errors
29
  $errors = new WP_Error();
23
  if ( empty( $user ) )
24
  return new WP_Error('invalid_key', __('Invalid key', 'theme-my-login'));
25
 
26
+ do_action('user_activation_post', $user->user_login, $user->user_email);
27
 
28
  // Allow plugins to short-circuit process and send errors
29
  $errors = new WP_Error();
readme.txt CHANGED
@@ -43,6 +43,17 @@ None yet. Please visit http://www.jfarthing.com/forum for any support!
43
 
44
  == Changelog ==
45
 
 
 
 
 
 
 
 
 
 
 
 
46
  = 5.0.6 =
47
  * Pass $theme_my_login by reference in option functions
48
  * Remove accidental invalid characters
43
 
44
  == Changelog ==
45
 
46
+ = 5.1 =
47
+ * Display "Log Out" when page is shown in pagelist and logged in
48
+ * Forward profile.php to themed profile when module is active
49
+ * Allow for %user_id% in custom user links
50
+ * Add inline descriptions to all settings
51
+ * Various tweaks and preps for WP 3.0
52
+ * Add Italian translation
53
+ * Add Danish translation
54
+ * Add Polish translation
55
+ * Add Spanish translation
56
+
57
  = 5.0.6 =
58
  * Pass $theme_my_login by reference in option functions
59
  * Remove accidental invalid characters
theme-my-login.php CHANGED
@@ -1,18 +1,14 @@
1
  <?php
2
  /*
3
  Plugin Name: Theme My Login
4
- Plugin URI: http://www.jfarthing.com/wordpress-plugins/theme-my-login-plugin
5
  Description: Themes the WordPress login, registration and forgot password pages according to your theme.
6
- Version: 5.0.6
7
  Author: Jeff Farthing
8
  Author URI: http://www.jfarthing.com
9
  Text Domain: theme-my-login
10
  */
11
 
12
- // Bailout if we're at the default login
13
- if ( 'wp-login.php' == $pagenow )
14
- return;
15
-
16
  // Set the default module directory
17
  if ( !defined('TML_MODULE_DIR') )
18
  define('TML_MODULE_DIR', WP_PLUGIN_DIR . '/theme-my-login/modules');
@@ -58,6 +54,12 @@ require_once( WP_PLUGIN_DIR . '/theme-my-login/includes/pluggable-functions.php'
58
 
59
  add_action('plugins_loaded', 'wdbj_tml_load');
60
  function wdbj_tml_load() {
 
 
 
 
 
 
61
  require_once( WP_PLUGIN_DIR . '/theme-my-login/includes/hook-functions.php' );
62
 
63
  do_action('tml_load');
1
  <?php
2
  /*
3
  Plugin Name: Theme My Login
4
+ Plugin URI: http://www.jfarthing.com/wordpress-plugins/theme-my-login
5
  Description: Themes the WordPress login, registration and forgot password pages according to your theme.
6
+ Version: 5.1
7
  Author: Jeff Farthing
8
  Author URI: http://www.jfarthing.com
9
  Text Domain: theme-my-login
10
  */
11
 
 
 
 
 
12
  // Set the default module directory
13
  if ( !defined('TML_MODULE_DIR') )
14
  define('TML_MODULE_DIR', WP_PLUGIN_DIR . '/theme-my-login/modules');
54
 
55
  add_action('plugins_loaded', 'wdbj_tml_load');
56
  function wdbj_tml_load() {
57
+ global $pagenow;
58
+
59
+ // Bailout if we're at the default login
60
+ if ( 'wp-login.php' == $pagenow )
61
+ return;
62
+
63
  require_once( WP_PLUGIN_DIR . '/theme-my-login/includes/hook-functions.php' );
64
 
65
  do_action('tml_load');