Changeset 15648

Timestamp:

Jun 12, 2012, 1:27:14 PM (12 years ago)

Author:

mistic100

Message:

check email validity before subscribe

Location:

extensions/Subscribe_to_comments

Files:

• include/functions.inc.php (modified) (2 diffs)
• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (1 diff)
• template/form_standalone.tpl (modified) (2 diffs)
• template/mail/confirm.tpl (modified) (1 diff)
• template/mail/notification.tpl (modified) (1 diff)
• template/subscribtions_page.tpl (modified) (1 diff)

extensions/Subscribe_to_comments/include/functions.inc.php

@@ -157 +157 @@
   
   // check email
+  if ( !empty($email) and !is_valid_email($email) )
+  {
+    array_push($page['errors'], l10n('mail address must be like xxx@yyy.eee (example : jack@altern.org)'));
+    return false;
+  }
   if ( ( is_a_guest() or empty($user['email']) ) and empty($email) )
   {
@@ -679 +684 @@
 
 /**
+ * check if mail adress is valid
+ * @param: string email
+ * @return: bool
+ */
+function is_valid_email($mail_address)
+{
+  if (version_compare(PHP_VERSION, '5.2.0') >= 0)
+  {
+    return filter_var($mail_address, FILTER_VALIDATE_EMAIL)!==false;
+  }
+  else
+  {
+    $atom   = '[-a-z0-9!#$%&\'*+\\/=?^_`{|}~]';   // before  arobase
+    $domain = '([a-z0-9]([-a-z0-9]*[a-z0-9]+)?)'; // domain name
+    $regex = '/^' . $atom . '+' . '(\.' . $atom . '+)*' . '@' . '(' . $domain . '{1,63}\.)+' . $domain . '{2,63}$/i';
+
+    if (!preg_match($regex, $mail_address)) return false;
+    return true;
+  }
+}
+
+
+/**
  * crypt a string using mcrypt extension or
  * http://stackoverflow.com/questions/800922/how-to-encrypt-string-without-mcrypt-library-in-php/802957#802957

extensions/Subscribe_to_comments/language/en_UK/plugin.lang.php

@@ -35 +35 @@
 
 /* buttons */
-$lang['Manage my subscribtions'] = 'Manage my subscribtions';
+$lang['Manage my subscriptions'] = 'Manage my subscriptions';
 $lang['Subscribe'] = 'Subscribe';
 $lang['Unsubscribe'] = 'Unsubscribe';

extensions/Subscribe_to_comments/language/fr_FR/plugin.lang.php

@@ -21 +21 @@
 $lang['Confirm your subscribtion to comments'] = 'Confirmez votre inscription aux commentaires';
 $lang['Followed on'] = 'Inscrit depuis';
-$lang['Manage my subscribtions'] = 'Gérer mes suivis';
+$lang['Manage my subscriptions'] = 'Gérer mes suivis';
 $lang['New subscription on'] = 'Nouveau suivi sur';
 $lang['Not found.'] = 'Non trouvé.';

extensions/Subscribe_to_comments/template/form_standalone.tpl

@@ -5 +5 @@
   {if $SUBSCRIBED_ALL_IMAGES}
     {'You are currently subscribed to comments on'|@translate} {'all pictures of the gallery'|@translate}.
-    <a href="{$MANAGE_LINK}">{'Manage my subscribtions'|@translate}</a> 
+    <a href="{$MANAGE_LINK}">{'Manage my subscriptions'|@translate}</a> 
     
   {elseif $SUBSCRIBED_ALBUM_IMAGES}
@@ -17 +17 @@
   {elseif $SUBSCRIBED_ALL_ALBUMS}
     {'You are currently subscribed to comments on'|@translate} {'all albums of the gallery'|@translate}.
-    <a href="{$MANAGE_LINK}">{'Manage my subscribtions'|@translate}</a>
+    <a href="{$MANAGE_LINK}">{'Manage my subscriptions'|@translate}</a>
     
   {elseif $SUBSCRIBED_ALBUM}

extensions/Subscribe_to_comments/template/mail/confirm.tpl

@@ -15 +15 @@
 <p><a href="{$STC.VALIDATE_URL}" class="button">{'Confirm subscription'|@translate}</a></p>
 
-<p>{'Want to edit your notifications options?'|@translate} <a href="{$STC.MANAGE_URL}">{'Manage my subscribtions'|@translate}</a>.</p>
+<p>{'Want to edit your notifications options?'|@translate} <a href="{$STC.MANAGE_URL}">{'Manage my subscriptions'|@translate}</a>.</p>
 
 </div>

extensions/Subscribe_to_comments/template/mail/notification.tpl

@@ -17 +17 @@
 <p>
   <a href="{$STC.UNSUB_URL}">{'Stop receiving notifications'|@translate}</a><br>
-  <a href="{$STC.MANAGE_URL}">{'Manage my subscribtions'|@translate}</a>
+  <a href="{$STC.MANAGE_URL}">{'Manage my subscriptions'|@translate}</a>
 </p>
 

extensions/Subscribe_to_comments/template/subscribtions_page.tpl

@@ -18 +18 @@
 <p>
   {if !empty($element)}<a href="{$element.url}" title="{$element.name}">{'Return to item page'|@translate}</a><br>{/if}
-  <a href="{$MANAGE_LINK}">{'Manage my subscriptions to comments'|@translate}</a>
+  <a href="{$MANAGE_LINK}">{'Manage my subscriptions'|@translate}</a>
 </p>
 {/if}