Changeset 20181 for extensions/GuestBook/include

Timestamp:

Jan 16, 2013, 2:15:29 AM (12 years ago)

Author:

mistic100

Message:

impove display, add LiveValidation

Location:

extensions/GuestBook/include

Files:

• functions.inc.php (modified) (2 diffs)
• functions_comment.inc.php (modified) (5 diffs)
• guestbook.inc.php (modified) (5 diffs)

extensions/GuestBook/include/functions.inc.php

@@ -3 +3 @@
 if (!defined('GUESTBOOK_PATH')) die('Hacking attempt!');
 
-if (!function_exists('is_valid_email'))
+function gb_is_valid_email($mail_address)
 {
-  function is_valid_email($mail_address)
+  if (function_exists('email_check_format'))
   {
-    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 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';
 
-      if (!preg_match($regex, $mail_address)) return false;
-      return true;
-    }
+    return (bool)preg_match($regex, $mail_address);
   }
 }
 
-function is_valid_url($url)
+function gb_is_valid_url($url)
 {
-  if (version_compare(PHP_VERSION, '5.2.0') >= 0)
+  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;
@@ -33 +37 @@
     $regex = '#^(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?$#i';
 
-    if (!preg_match($regex, $url)) return false;
-    return true;
+    return (bool)preg_match($regex, $url);
   }
 }

extensions/GuestBook/include/functions_comment.inc.php

@@ -6 +6 @@
   EVENT_HANDLER_PRIORITY_NEUTRAL, 2);
 
-function insert_user_comment_guestbook( &$comm, $key, &$infos )
+function insert_user_comment_guestbook( &$comm, $key )
 {
   global $conf, $user, $page;
@@ -16 +16 @@
     )
    );
-
-  $infos = array();
+  
   if (!$conf['guestbook']['comments_validation'] or is_admin())
   {
@@ -75 +74 @@
     $comm['email'] = $user['email'];
   }
-  else if ( !empty($comm['email']) and !is_valid_email($comm['email']) )
+  else if ( !empty($comm['email']) and !gb_is_valid_email($comm['email']) )
   {
     array_push($page['errors'], l10n('mail address must be like xxx@yyy.eee (example : jack@altern.org)'));
@@ -86 +85 @@
     $comm['website'] = 'http://'.$comm['website'];
   }
-  if ( !empty($comm['website']) and !is_valid_url($comm['website']) )
+  if ( !empty($comm['website']) and !gb_is_valid_url($comm['website']) )
   {
     array_push($page['errors'], l10n('invalid website address'));
@@ -121 +120 @@
     if ($counter > 0)
     {
-      array_push( $infos, l10n('Anti-flood system : please wait for a moment before trying to post another comment') );
+      array_push($page['errors'], l10n('Anti-flood system : please wait for a moment before trying to post another comment') );
       $comment_action='reject';
     }

extensions/GuestBook/include/guestbook.inc.php

@@ -1 +1 @@
 <?php
 if (!defined('GUESTBOOK_PATH')) die('Hacking attempt!');
+
+global $user;
 
 include(GUESTBOOK_PATH . '/include/functions.inc.php');
@@ -116 +118 @@
   include_once(GUESTBOOK_PATH.'include/functions_comment.inc.php');
 
-  $comment_action = insert_user_comment_guestbook($comm, @$_POST['key'], $page['infos']);
+  $comment_action = insert_user_comment_guestbook($comm, @$_POST['key']);
 
   switch ($comment_action)
@@ -303 +305 @@
     }
   }
+  if (is_classic_user())
+  {
+    $author = $user['username'];
+    $email = $user['email'];
+  }
+  if (empty($conf['comments_email_mandatory'])) // < 2.5 compatibility
+  {
+    $conf['comments_email_mandatory'] = false;
+  }
+
   $template->assign('comment_add',
       array(
@@ -308 +320 @@
         'KEY' => get_ephemeral_key(3),
         'CONTENT' => $content,
-        'SHOW_AUTHOR' => !is_classic_user(),
-        'AUTHOR' => $author ,
-        'WEBSITE' => $website ,
-        'EMAIL' => $email ,
+        'IS_LOGGED' => is_classic_user(),
+        'AUTHOR' => $author,
+        'WEBSITE' => $website,
+        'EMAIL' => $email,
         'ACTIVATE_RATING' => $conf['guestbook']['activate_rating'],
+        'EMAIL_MANDATORY' => $conf['comments_email_mandatory'],
       ));
 }
@@ -319 +332 @@
 $template->assign('GUESTBOOK_PATH', GUESTBOOK_PATH);
 
-$template->assign('clear_themes', array(
-  'clear',
-  'gally-minimalist',
-  'hr_os',
-  'hr_os_xl',
-  'kardon',
-  'montblancxl',
-  'Naive',
-  'OS_glass_clear',
-  'p0w0',
-  'Pure_autumn',
-  'Pure_clear_blue',
-  'Pure_sky',
-  'Pure_tr_clear_blue',
-  'simple-white',
-  'VerticalWhite',
-  ));
-
 $template->set_filename('index', dirname(__FILE__).'/../template/guestbook.tpl');