Changeset 21340 for extensions/Subscribe_to_comments/include/functions.inc.php

Timestamp:

Mar 7, 2013, 10:06:42 PM (11 years ago)

Author:

mistic100

Message:

too many changes

File:

• extensions/Subscribe_to_comments/include/functions.inc.php (modified) (14 diffs)

extensions/Subscribe_to_comments/include/functions.inc.php

@@ -157 +157 @@
   
   // check email
-  if ( !empty($email) and !is_valid_email($email) )
+  if ( !empty($email) and !email_check_format($email) )
   {
     array_push($page['errors'], l10n('mail address must be like xxx@yyy.eee (example : jack@altern.org)'));
@@ -172 +172 @@
   }
   
-  // search if already registered (can use ODKU because we want to get the id of inserted OR updated row)
+  // search if already registered (can't use ODKU because we want to get the id of inserted OR updated row)
   $query = '
 SELECT id
@@ -213 +213 @@
   
   // notify admins
-  if ( pwg_db_changes(null) != 0 and $conf['Subscribe_to_Comments']['notify_admin_on_subscribe'] )
+  if ( pwg_db_changes() != 0 and $conf['Subscribe_to_Comments']['notify_admin_on_subscribe'] )
   {
     stc_mail_notification_admins($email, $type, $element_id, $inserted_id);
@@ -219 +219 @@
   
   // send validation mail
-  if ( is_a_guest() and pwg_db_changes(null) != 0 )
+  if ( is_a_guest() and pwg_db_changes() != 0 )
   {
     set_make_full_url();
@@ -267 +267 @@
   }
   // just display confirmation message
-  else if (pwg_db_changes(null) != 0)
+  else if (pwg_db_changes() != 0)
   {
     array_push($page['infos'], l10n('You have been added to the list of subscribers.'));
@@ -285 +285 @@
 function un_subscribe_to_comments($email, $id)
 {  
-  if (empty($id))
-  {
-    trigger_error('un_subscribe_to_comment: missing id', E_USER_WARNING);
+  if ( !empty($email) and !email_check_format($email) )
+  {
+    trigger_error('un_subscribe_to_comment: bad email', E_USER_WARNING);
+    return false;
+  }
+  
+  if (!preg_match('#^[0-9]+$#', $id))
+  {
+    trigger_error('un_subscribe_to_comment: bad id', E_USER_WARNING);
     return false;
   }
@@ -308 +314 @@
   WHERE 
     email = "'.pwg_db_real_escape_string($email).'"
-    AND id = "'.pwg_db_real_escape_string($id).'"
+    AND id = '.$id.'
 ;';
   pwg_query($query);
-      
-  if (pwg_db_changes(null) != 0) return true;
-  return false;
+  
+  return (pwg_db_changes() != 0);
 }
 
@@ -325 +330 @@
 function validate_subscriptions($email, $id)
 {
-  if (empty($email))
-  {
-    trigger_error('validate_subscriptions: missing email', E_USER_WARNING);
-    return false;
-  }
-  
-  if (empty($id))
-  {
-    trigger_error('validate_subscriptions: missing id', E_USER_WARNING);
+  if (!email_check_format($email))
+  {
+    trigger_error('validate_subscriptions: bad email', E_USER_WARNING);
+    return false;
+  }
+  
+  if (!preg_match('#^[0-9]+$#', $id))
+  {
+    trigger_error('validate_subscriptions: bad id', E_USER_WARNING);
     return false;
   }
@@ -342 +347 @@
   WHERE 
     email = "'.pwg_db_real_escape_string($email).'"
-    AND id = '.pwg_db_real_escape_string($id).'
+    AND id = '.$id.'
 ;';
   pwg_query($query);
-      
-  if (pwg_db_changes(null) != 0) return true;
-  return false;
+  
+  return (pwg_db_changes() != 0);
 }
 
@@ -371 +375 @@
   $template->set_filename('stc_mail', dirname(__FILE__).'/../template/mail/admin.tpl');
     
-  $subject = '['.strip_tags($conf['gallery_title']).'] '.sprintf(l10n('%s has subscribed to comments on'), is_a_guest()?$email:$user['username']);
+  $subject = '['.strip_tags($conf['gallery_title']).'] '.sprintf(l10n('%s has subscribed to comments on %s.'), is_a_guest()?$email:$user['username'], null);
     
   switch ($type)
@@ -401 +405 @@
   $template->assign('STC', array(
     'ELEMENT' => $element['on'],
-    'USER' => sprintf(l10n('%s has subscribed to comments on'), is_a_guest() ? '<b>'.$email.'</b>' : '<b>'.$user['username'].'</b> ('.$email.')'), 
+    'USER' => is_a_guest() ? '<b>'.$email.'</b>' : '<b>'.$user['username'].'</b> ('.$email.')', 
     'GALLERY_TITLE' => $conf['gallery_title'],
     'TECHNICAL' => implode('<br>', $technical_infos),
@@ -504 +508 @@
   $headers.= 'MIME-Version: 1.0'."\n";
   $headers.= 'X-Mailer: Piwigo Mailer'."\n";
-  // $headers.= 'Content-Transfer-Encoding: Quoted-Printable'."\n";
   $headers.= 'Content-Transfer-Encoding: 8bit'."\n";
   $headers.= 'Content-Type: text/html; charset="'.get_pwg_charset().'";'."\n";
@@ -523 +526 @@
   $content = $template->parse('stc_mail_header', true) . $content . $template->parse('stc_mail_footer', true);
   
-  // $content = quoted_printable_encode($content);
-  $content = wordwrap($content, 70, "\n", true);
+  $content = wordwrap($content, 70, "\n", false);
 
   unset_make_full_url();
@@ -687 +689 @@
 
 /**
- * check if mail adress is valid
- * @param: string email
- * @return: bool
- */
-if (!function_exists('is_valid_email'))
-{
-  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