Changeset 21542

Timestamp:

Mar 14, 2013, 4:23:37 PM (11 years ago)

Author:

mistic100

Message:

directly use Piwigo functions for email and url check (break compatibility < 2.5)

Location:

extensions/GuestBook/include

Files:

• functions.inc.php (modified) (1 diff)
• functions_comment.inc.php (modified) (2 diffs)

extensions/GuestBook/include/functions.inc.php

@@ -1 +1 @@
 <?php
-
 if (!defined('GUESTBOOK_PATH')) die('Hacking attempt!');
-
-function gb_is_valid_email($mail_address)
-{
-  if (function_exists('email_check_format'))
-  {
-    return email_check_format($email_address);
-  }
-  else 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';
-
-    return (bool)preg_match($regex, $mail_address);
-  }
-}
-
-function gb_is_valid_url($url)
-{
-  if (function_exists('url_check_format'))
-  {
-    return url_check_format($url);
-  }
-  else if (version_compare(PHP_VERSION, '5.2.0') >= 0)
-  {
-    return filter_var($url, FILTER_VALIDATE_URL)!==false;
-  }
-  else
-  {
-    $regex = '#^(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?$#i';
-
-    return (bool)preg_match($regex, $url);
-  }
-}
 
 function get_stars($score, $path)

extensions/GuestBook/include/functions_comment.inc.php

@@ -74 +74 @@
     $comm['email'] = $user['email'];
   }
-  else if ( !empty($comm['email']) and !gb_is_valid_email($comm['email']) )
+  else if ( !empty($comm['email']) and !email_check_format($comm['email']) )
   {
     array_push($page['errors'], l10n('mail address must be like xxx@yyy.eee (example : jack@altern.org)'));
@@ -85 +85 @@
     $comm['website'] = 'http://'.$comm['website'];
   }
-  if ( !empty($comm['website']) and !gb_is_valid_url($comm['website']) )
+  if ( !empty($comm['website']) and !url_check_format($comm['website']) )
   {
     array_push($page['errors'], l10n('invalid website address'));