[Phpgroupware-cvs] email/inc/class.spell.inc.php, 1.2.2.4

[nomail]

Update of /email/inc
Modified Files:
        Branch: Version-0_9_16-branch
          class.spell.inc.php

date: 2004/05/25 23:29:38;  author: skwashd;  state: Exp;  lines: +7 -4

Log Message:
fix spell problem - reported on lists
=====================================================================
Index: email/inc/class.spell.inc.php
diff -u email/inc/class.spell.inc.php:1.2.2.3 
email/inc/class.spell.inc.php:1.2.2.4
--- email/inc/class.spell.inc.php:1.2.2.3       Thu Nov 13 18:43:02 2003
+++ email/inc/class.spell.inc.php       Tue May 25 23:29:38 2004
@@ -160,7 +160,7 @@
                        $this->body_display = '';
                        
                        
-                       $this->my_validator = 
CreateObject("phpgwapi.validator");
+                       //$this->my_validator = 
CreateObject("phpgwapi.validator");
                        $this->widgets = CreateObject("email.html_widgets");
                        $this->user_lang = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'];
                        if ($this->user_lang == '')
@@ -493,16 +493,19 @@
                                $this->reject_reason = "don't spellcheck email 
addresses";
                                return False;
                        }
-                       elseif ($this->my_validator->is_url($str) == True)
+                       //elseif ($this->my_validator->is_url($str) == True)
+                       elseif (preg_match('/[a-zA-Z0-9 
\-\.]+\.([a-zA-Z]{2,4})/', $str))
                        {
-                               $this->reject_reason = "don't spellcheck a URL";
+                               $this->reject_reason = "don't spellcheck a URL 
or hostname";
                                return False;
                        }
+                       /*
                        elseif ($this->my_validator->is_hostname($str) == True)
                        {
                                $this->reject_reason = "don't spellcheck 
internet hostnames";
                                return False;
                        }
+                       */
                        elseif (preg_match('/^<.*>$/', $str))
                        {
                                $this->reject_reason = "don't spellcheck 
bracked markup tags";