Changeset 1681

Timestamp:

12/12/2007 08:04:09 PM (13 months ago)

Author:

driehle

Message:

updated Stringparser-Class to version 0.3.2

Location:

trunk/scripts

Files:

• stringparser.class.php (modified) (2 diffs)
• stringparser_bbcode.class.php (modified) (8 diffs)

trunk/scripts/stringparser.class.php

@@ -7 +7 @@
  * upon this class.
  * 
- * Version: 0.3.1
+ * Version: 0.3.2
  *
  * @author Christian Seiler <spam@christian-seiler.de>
@@ -13 +13 @@
  * @package stringparser
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of either:
+ * The MIT License
  *
- *  a) the GNU General Public License as published by the Free
- *  Software Foundation; either version 1, or (at your option) any
- *  later version, or
+ * Copyright (c) 2004-2007 Christian Seiler
  *
- *  b) the Artistic License as published by Larry Wall, either version 2.0,
- *     or (at your option) any later version.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See either
- *  the GNU General Public License or the Artistic License for more details.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- *  You should have received a copy of the Artistic License with this Kit,
- *  in the file named "Artistic.clarified".  If not, I'll be glad to provide
- *  one.
- *
- *  You should also have received a copy of the GNU General Public License
- *  along with this program in the file named "COPYING"; if not, write to
- *  the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA 02111-1307, USA.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 

trunk/scripts/stringparser_bbcode.class.php

@@ -3 +3 @@
  * BB code string parsing class
  *
- * Version: 0.3.1
+ * Version: 0.3.2
  *
  * @author Christian Seiler <spam@christian-seiler.de>
@@ -9 +9 @@
  * @package stringparser
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of either:
+ * The MIT License
  *
- *  a) the GNU General Public License as published by the Free
- *  Software Foundation; either version 1, or (at your option) any
- *  later version, or
+ * Copyright (c) 2004-2007 Christian Seiler
  *
- *  b) the Artistic License as published by Larry Wall, either version 2.0,
- *     or (at your option) any later version.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See either
- *  the GNU General Public License or the Artistic License for more details.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- *  You should have received a copy of the Artistic License with this Kit,
- *  in the file named "Artistic.clarified".  If not, I'll be glad to provide
- *  one.
- *
- *  You should also have received a copy of the GNU General Public License
- *  along with this program in the file named "COPYING"; if not, write to
- *  the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA 02111-1307, USA.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
  
@@ -773 +771 @@
          */
         function _openElement ($type = 0) {
-                $name = $this->_topNode ('name');
-                if (!isset ($this->_codes[$name])) {
-                        if (isset ($this->_codes[strtolower ($name)]) && (!$this->getCodeFlag (strtolower ($name), 'case_sensitive', 'boolean', true) || !$this->_caseSensitive)) {
-                                $name = strtolower ($name);
-                        } else {
-                                return $this->_reparseAfterCurrentBlock ();
-                        }
+                $name = $this->_getCanonicalName ($this->_topNode ('name'));
+                //var_dump ($name);
+                if ($name === false) {
+                        return $this->_reparseAfterCurrentBlock ();
                 }
                 $occ_type = $this->getCodeFlag ($name, 'occurrence_type', 'string');
@@ -926 +921 @@
          */
         function _isOpenableWithClose ($name, &$closecount) {
-                $tnname = $this->_topNode ('name');
-                if (isset ($this->_codes[strtolower($tnname)]) && (!$this->getCodeFlag (strtolower($tnname), 'case_sensitive', 'boolean', true) || !$this->_caseSensitive)) {
-                        $tnname = strtolower($tnname);
-                }
+                $tnname = $this->_getCanonicalName ($this->_topNode ('name'));
                 if (!in_array ($this->getCodeFlag ($tnname, 'closetag', 'integer', BBCODE_CLOSETAG_IMPLICIT), array (BBCODE_CLOSETAG_FORBIDDEN, BBCODE_CLOSETAG_OPTIONAL))) {
                         return false;
@@ -991 +983 @@
          */
         function &_findNamedNode ($name, $searchdeeper = false) {
-                $lname = strtolower ($name);
-                if (isset ($this->_codes[$lname]) && (!$this->getCodeFlag ($lname, 'case_sensitive', 'boolean', true) || !$this->_caseSensitive)) {
-                        $name = $lname;
-                        $case_sensitive = false;
-                } else {
-                        $case_sensitive = true;
+                $lname = $this->_getCanonicalName ($name);
+                $case_sensitive = $this->_caseSensitive && $this->getCodeFlag ($lname, 'case_sensitive', 'boolean', true);
+                if ($case_sensitive) {
+                        $name = strtolower ($name);
                 }
                 $scount = count ($this->_stack);
@@ -1343 +1333 @@
          */
         function _isUseContent (&$node, $check_attrs = false) {
-                $name = strtolower($node->name ());
+                $name = $this->_getCanonicalName ($node->name ());
+                // this should NOT happen
+                if ($name === false) {
+                        return false;
+                }
                 if ($this->_codes[$name]['callback_type'] == 'usecontent') {
                         return true;
@@ -1370 +1364 @@
                 }
                 return !$result;
+        }
+
+        /**
+        * Get canonical name of a code
+        *
+        * @access protected
+        * @param string $name
+        * @return string
+        */
+        function _getCanonicalName ($name) {
+                if (isset ($this->_codes[$name])) {
+                        return $name;
+                }
+                $found = false;
+                // try to find the code in the code list
+                foreach (array_keys ($this->_codes) as $rname) {
+                        // match
+                        if (strtolower ($rname) == strtolower ($name)) {
+                                $found = $rname;
+                                break;
+                        }
+                }
+                if ($found === false || ($this->_caseSensitive && $this->getCodeFlag ($found, 'case_sensitive', 'boolean', true))) {
+                        return false;
+                }
+                return $rname;
         }
 }
@@ -1813 +1833 @@
         function &_findPrevAdjentTextNodeHelper () {
                 $lastnode =& $this->lastChild ();
-                if ($lastnode->_type == STRINGPARSER_NODE_TEXT) {
+                if ($lastnode === null || $lastnode->_type == STRINGPARSER_NODE_TEXT) {
                         return $lastnode;
                 }