xpressengine / xe-core

classes/security/phphtmlparser/src/html2text.inc

Indentation +182 added lines, -182 removed lines

@@ -18,197 +18,197 @@
  */

 class Html2Text {

 

-    // Private fields

+	// Private fields

   

-    var $iCurrentLine = "";

-    var $iCurrentWord = "";

-    var $iCurrentWordArray;

-    var $iCurrentWordIndex;

-    var $iInScript;

-    var $iListLevel = 0;

-    var $iHtmlText;

-    var $iMaxColumns;

-    var $iHtmlParser;

+	var $iCurrentLine = "";

+	var $iCurrentWord = "";

+	var $iCurrentWordArray;

+	var $iCurrentWordIndex;

+	var $iInScript;

+	var $iListLevel = 0;

+	var $iHtmlText;

+	var $iMaxColumns;

+	var $iHtmlParser;

 

-    // Constants

+	// Constants

 

-    var $TOKEN_BR       = 0;

-    var $TOKEN_P        = 1;

-    var $TOKEN_LI       = 2;

-    var $TOKEN_AFTERLI  = 3;

-    var $TOKEN_UL       = 4;

-    var $TOKEN_ENDUL    = 5;

+	var $TOKEN_BR       = 0;

+	var $TOKEN_P        = 1;

+	var $TOKEN_LI       = 2;

+	var $TOKEN_AFTERLI  = 3;

+	var $TOKEN_UL       = 4;

+	var $TOKEN_ENDUL    = 5;

    

-    function Html2Text ($aHtmlText, $aMaxColumns) {

-        $this->iHtmlText = $aHtmlText;

-        $this->iMaxColumns = $aMaxColumns;

-    }

+	function Html2Text ($aHtmlText, $aMaxColumns) {

+		$this->iHtmlText = $aHtmlText;

+		$this->iMaxColumns = $aMaxColumns;

+	}

 

-    function convert() {

-        $this->iHtmlParser = new HtmlParser($this->iHtmlText);

-        $wholeText = "";

-        while (($line = $this->getLine()) !== false) {

-            $wholeText .= ($line . "\r\n");

-        }

-        return $wholeText;

-    }

+	function convert() {

+		$this->iHtmlParser = new HtmlParser($this->iHtmlText);

+		$wholeText = "";

+		while (($line = $this->getLine()) !== false) {

+			$wholeText .= ($line . "\r\n");

+		}

+		return $wholeText;

+	}

 

-    function getLine() {

-        while (true) {

-            if (!$this->addWordToLine($this->iCurrentWord)) {

-                $retvalue = $this->iCurrentLine;

-                $this->iCurrentLine = "";

-                return $retvalue;

-            }                

-            $word = $this->getWord();

-            if ($word === false) {

-                if ($this->iCurrentLine == "") {

-                    break;

-                }

-                $retvalue = $this->iCurrentLine;

-                $this->iCurrentLine = "";

-                $this->iInText = false;

-                $this->iCurrentWord = "";

-                return $retvalue;                

-            }

-        }

-        return false;

-    }

+	function getLine() {

+		while (true) {

+			if (!$this->addWordToLine($this->iCurrentWord)) {

+				$retvalue = $this->iCurrentLine;

+				$this->iCurrentLine = "";

+				return $retvalue;

+			}                

+			$word = $this->getWord();

+			if ($word === false) {

+				if ($this->iCurrentLine == "") {

+					break;

+				}

+				$retvalue = $this->iCurrentLine;

+				$this->iCurrentLine = "";

+				$this->iInText = false;

+				$this->iCurrentWord = "";

+				return $retvalue;                

+			}

+		}

+		return false;

+	}

 

-    function addWordToLine ($word) {

-        if ($this->iInScript) {

-            return true;

-        }

-        $prevLine = $this->iCurrentLine;

-        if ($word === $this->TOKEN_BR) {

-            $this->iCurrentWord = "";

-            return false;

-        }

-        if ($word === $this->TOKEN_P) {

-            $this->iCurrentWord = $this->TOKEN_BR;

-            return false;

-        }

-        if ($word === $this->TOKEN_UL) {

-            $this->iCurrentWord = $this->TOKEN_BR;

-            return false;

-        }

-        if ($word === $this->TOKEN_ENDUL) {

-            $this->iCurrentWord = $this->TOKEN_BR;

-            return false;

-        }

-        if ($word === $this->TOKEN_LI) {

-            $this->iCurrentWord = $this->TOKEN_AFTERLI;

-            return false;

-        }

-        $toAdd = $word;

-        if ($word === $this->TOKEN_AFTERLI) {

-            $toAdd = "";

-        }

-        if ($prevLine != "") {

-            $prevLine .= " ";

-        }

-        else {

-            $prevLine = $this->getIndentation($word === $this->TOKEN_AFTERLI);

-        }

-        $candidateLine = $prevLine . $toAdd;

-        if (strlen ($candidateLine) > $this->iMaxColumns && $prevLine != "") {

-            return false;

-        }

-        $this->iCurrentLine = $candidateLine;

-        return true;

-    }

+	function addWordToLine ($word) {

+		if ($this->iInScript) {

+			return true;

+		}

+		$prevLine = $this->iCurrentLine;

+		if ($word === $this->TOKEN_BR) {

+			$this->iCurrentWord = "";

+			return false;

+		}

+		if ($word === $this->TOKEN_P) {

+			$this->iCurrentWord = $this->TOKEN_BR;

+			return false;

+		}

+		if ($word === $this->TOKEN_UL) {

+			$this->iCurrentWord = $this->TOKEN_BR;

+			return false;

+		}

+		if ($word === $this->TOKEN_ENDUL) {

+			$this->iCurrentWord = $this->TOKEN_BR;

+			return false;

+		}

+		if ($word === $this->TOKEN_LI) {

+			$this->iCurrentWord = $this->TOKEN_AFTERLI;

+			return false;

+		}

+		$toAdd = $word;

+		if ($word === $this->TOKEN_AFTERLI) {

+			$toAdd = "";

+		}

+		if ($prevLine != "") {

+			$prevLine .= " ";

+		}

+		else {

+			$prevLine = $this->getIndentation($word === $this->TOKEN_AFTERLI);

+		}

+		$candidateLine = $prevLine . $toAdd;

+		if (strlen ($candidateLine) > $this->iMaxColumns && $prevLine != "") {

+			return false;

+		}

+		$this->iCurrentLine = $candidateLine;

+		return true;

+	}

 

-    function getWord() {

-        while (true) {

-            if ($this->iHtmlParser->iNodeType == NODE_TYPE_TEXT) {

-                if (!$this->iInText) {

-                    $words = $this->splitWords($this->iHtmlParser->iNodeValue);

-                    $this->iCurrentWordArray = $words;

-                    $this->iCurrentWordIndex = 0;

-                    $this->iInText = true;

-                }

-                if ($this->iCurrentWordIndex < count($this->iCurrentWordArray)) {

-                    $this->iCurrentWord = $this->iCurrentWordArray[$this->iCurrentWordIndex++];

-                    return $this->iCurrentWord;

-                }

-                else {

-                    $this->iInText = false;

-                }

-            }

-            else if ($this->iHtmlParser->iNodeType == NODE_TYPE_ELEMENT) {

-                if (strcasecmp ($this->iHtmlParser->iNodeName, "br") == 0) {

-                    $this->iHtmlParser->parse();

-                    $this->iCurrentWord = $this->TOKEN_BR;

-                    return $this->iCurrentWord;

-                }

-                else if (strcasecmp ($this->iHtmlParser->iNodeName, "p") == 0) {

-                    $this->iHtmlParser->parse();

-                    $this->iCurrentWord = $this->TOKEN_P;

-                    return $this->iCurrentWord;

-                }

-                else if (strcasecmp ($this->iHtmlParser->iNodeName, "script") == 0) {

-                    $this->iHtmlParser->parse();

-                    $this->iCurrentWord = "";

-                    $this->iInScript = true;

-                    return $this->iCurrentWord;

-                }

-                else if (strcasecmp ($this->iHtmlParser->iNodeName, "ul") == 0 || strcasecmp ($this->iHtmlParser->iNodeName, "ol") == 0) {

-                    $this->iHtmlParser->parse();

-                    $this->iCurrentWord = $this->TOKEN_UL;

-                    $this->iListLevel++;

-                    return $this->iCurrentWord;

-                }

-                else if (strcasecmp ($this->iHtmlParser->iNodeName, "li") == 0) {

-                    $this->iHtmlParser->parse();

-                    $this->iCurrentWord = $this->TOKEN_LI;

-                    return $this->iCurrentWord;

-                }

-            }

-            else if ($this->iHtmlParser->iNodeType == NODE_TYPE_ENDELEMENT) {

-                if (strcasecmp ($this->iHtmlParser->iNodeName, "script") == 0) {

-                    $this->iHtmlParser->parse();

-                    $this->iCurrentWord = "";

-                    $this->iInScript = false;

-                    return $this->iCurrentWord;

-                }

-                else if (strcasecmp ($this->iHtmlParser->iNodeName, "ul") == 0 || strcasecmp ($this->iHtmlParser->iNodeName, "ol") == 0) {

-                    $this->iHtmlParser->parse();

-                    $this->iCurrentWord = $this->TOKEN_ENDUL;

-                    if ($this->iListLevel > 0) {

-                        $this->iListLevel--;

-                    }

-                    return $this->iCurrentWord;

-                }

-            }

-            if (!$this->iHtmlParser->parse()) {

-                break;

-            }

-        }

-        return false;

-    }

+	function getWord() {

+		while (true) {

+			if ($this->iHtmlParser->iNodeType == NODE_TYPE_TEXT) {

+				if (!$this->iInText) {

+					$words = $this->splitWords($this->iHtmlParser->iNodeValue);

+					$this->iCurrentWordArray = $words;

+					$this->iCurrentWordIndex = 0;

+					$this->iInText = true;

+				}

+				if ($this->iCurrentWordIndex < count($this->iCurrentWordArray)) {

+					$this->iCurrentWord = $this->iCurrentWordArray[$this->iCurrentWordIndex++];

+					return $this->iCurrentWord;

+				}

+				else {

+					$this->iInText = false;

+				}

+			}

+			else if ($this->iHtmlParser->iNodeType == NODE_TYPE_ELEMENT) {

+				if (strcasecmp ($this->iHtmlParser->iNodeName, "br") == 0) {

+					$this->iHtmlParser->parse();

+					$this->iCurrentWord = $this->TOKEN_BR;

+					return $this->iCurrentWord;

+				}

+				else if (strcasecmp ($this->iHtmlParser->iNodeName, "p") == 0) {

+					$this->iHtmlParser->parse();

+					$this->iCurrentWord = $this->TOKEN_P;

+					return $this->iCurrentWord;

+				}

+				else if (strcasecmp ($this->iHtmlParser->iNodeName, "script") == 0) {

+					$this->iHtmlParser->parse();

+					$this->iCurrentWord = "";

+					$this->iInScript = true;

+					return $this->iCurrentWord;

+				}

+				else if (strcasecmp ($this->iHtmlParser->iNodeName, "ul") == 0 || strcasecmp ($this->iHtmlParser->iNodeName, "ol") == 0) {

+					$this->iHtmlParser->parse();

+					$this->iCurrentWord = $this->TOKEN_UL;

+					$this->iListLevel++;

+					return $this->iCurrentWord;

+				}

+				else if (strcasecmp ($this->iHtmlParser->iNodeName, "li") == 0) {

+					$this->iHtmlParser->parse();

+					$this->iCurrentWord = $this->TOKEN_LI;

+					return $this->iCurrentWord;

+				}

+			}

+			else if ($this->iHtmlParser->iNodeType == NODE_TYPE_ENDELEMENT) {

+				if (strcasecmp ($this->iHtmlParser->iNodeName, "script") == 0) {

+					$this->iHtmlParser->parse();

+					$this->iCurrentWord = "";

+					$this->iInScript = false;

+					return $this->iCurrentWord;

+				}

+				else if (strcasecmp ($this->iHtmlParser->iNodeName, "ul") == 0 || strcasecmp ($this->iHtmlParser->iNodeName, "ol") == 0) {

+					$this->iHtmlParser->parse();

+					$this->iCurrentWord = $this->TOKEN_ENDUL;

+					if ($this->iListLevel > 0) {

+						$this->iListLevel--;

+					}

+					return $this->iCurrentWord;

+				}

+			}

+			if (!$this->iHtmlParser->parse()) {

+				break;

+			}

+		}

+		return false;

+	}

 

-    function splitWords ($text) {

-        $words = split ("[ \t\r\n]+", $text);

-        for ($idx = 0; $idx < count($words); $idx++) {

-            $words[$idx] = $this->htmlDecode($words[$idx]);

-        }

-        return $words;

-    }

+	function splitWords ($text) {

+		$words = split ("[ \t\r\n]+", $text);

+		for ($idx = 0; $idx < count($words); $idx++) {

+			$words[$idx] = $this->htmlDecode($words[$idx]);

+		}

+		return $words;

+	}

 

-    function htmlDecode ($text) {

-        // TBD

-        return $text;

-    } 

+	function htmlDecode ($text) {

+		// TBD

+		return $text;

+	} 

 

-    function getIndentation ($hasLI) {

-        $indent = "";

-        $idx = 0;

-        for ($idx = 0; $idx < ($this->iListLevel - 1); $idx++) {

-            $indent .= "  ";

-        }

-        if ($this->iListLevel > 0) {

-            $indent = $hasLI ? ($indent . "- ") : ($indent . "  ");

-        }

-        return $indent;

-    }

+	function getIndentation ($hasLI) {

+		$indent = "";

+		$idx = 0;

+		for ($idx = 0; $idx < ($this->iListLevel - 1); $idx++) {

+			$indent .= "  ";

+		}

+		if ($this->iListLevel > 0) {

+			$indent = $hasLI ? ($indent . "- ") : ($indent . "  ");

+		}

+		return $indent;

+	}

 }

Braces +9 added lines, -18 removed lines

@@ -106,8 +106,7 @@ 
         }

         if ($prevLine != "") {

             $prevLine .= " ";

-        }

-        else {

+        } else {

             $prevLine = $this->getIndentation($word === $this->TOKEN_AFTERLI);

         }

         $candidateLine = $prevLine . $toAdd;

@@ -130,48 +129,40 @@ 
                 if ($this->iCurrentWordIndex < count($this->iCurrentWordArray)) {

                     $this->iCurrentWord = $this->iCurrentWordArray[$this->iCurrentWordIndex++];

                     return $this->iCurrentWord;

-                }

-                else {

+                } else {

                     $this->iInText = false;

                 }

-            }

-            else if ($this->iHtmlParser->iNodeType == NODE_TYPE_ELEMENT) {

+            } else if ($this->iHtmlParser->iNodeType == NODE_TYPE_ELEMENT) {

                 if (strcasecmp ($this->iHtmlParser->iNodeName, "br") == 0) {

                     $this->iHtmlParser->parse();

                     $this->iCurrentWord = $this->TOKEN_BR;

                     return $this->iCurrentWord;

-                }

-                else if (strcasecmp ($this->iHtmlParser->iNodeName, "p") == 0) {

+                } else if (strcasecmp ($this->iHtmlParser->iNodeName, "p") == 0) {

                     $this->iHtmlParser->parse();

                     $this->iCurrentWord = $this->TOKEN_P;

                     return $this->iCurrentWord;

-                }

-                else if (strcasecmp ($this->iHtmlParser->iNodeName, "script") == 0) {

+                } else if (strcasecmp ($this->iHtmlParser->iNodeName, "script") == 0) {

                     $this->iHtmlParser->parse();

                     $this->iCurrentWord = "";

                     $this->iInScript = true;

                     return $this->iCurrentWord;

-                }

-                else if (strcasecmp ($this->iHtmlParser->iNodeName, "ul") == 0 || strcasecmp ($this->iHtmlParser->iNodeName, "ol") == 0) {

+                } else if (strcasecmp ($this->iHtmlParser->iNodeName, "ul") == 0 || strcasecmp ($this->iHtmlParser->iNodeName, "ol") == 0) {

                     $this->iHtmlParser->parse();

                     $this->iCurrentWord = $this->TOKEN_UL;

                     $this->iListLevel++;

                     return $this->iCurrentWord;

-                }

-                else if (strcasecmp ($this->iHtmlParser->iNodeName, "li") == 0) {

+                } else if (strcasecmp ($this->iHtmlParser->iNodeName, "li") == 0) {

                     $this->iHtmlParser->parse();

                     $this->iCurrentWord = $this->TOKEN_LI;

                     return $this->iCurrentWord;

                 }

-            }

-            else if ($this->iHtmlParser->iNodeType == NODE_TYPE_ENDELEMENT) {

+            } else if ($this->iHtmlParser->iNodeType == NODE_TYPE_ENDELEMENT) {

                 if (strcasecmp ($this->iHtmlParser->iNodeName, "script") == 0) {

                     $this->iHtmlParser->parse();

                     $this->iCurrentWord = "";

                     $this->iInScript = false;

                     return $this->iCurrentWord;

-                }

-                else if (strcasecmp ($this->iHtmlParser->iNodeName, "ul") == 0 || strcasecmp ($this->iHtmlParser->iNodeName, "ol") == 0) {

+                } else if (strcasecmp ($this->iHtmlParser->iNodeName, "ul") == 0 || strcasecmp ($this->iHtmlParser->iNodeName, "ol") == 0) {

                     $this->iHtmlParser->parse();

                     $this->iCurrentWord = $this->TOKEN_ENDUL;

                     if ($this->iListLevel > 0) {

Spacing +17 added lines, -17 removed lines

@@ -39,7 +39,7 @@ 
     var $TOKEN_UL       = 4;

     var $TOKEN_ENDUL    = 5;

    

-    function Html2Text ($aHtmlText, $aMaxColumns) {

+    function Html2Text($aHtmlText, $aMaxColumns) {

         $this->iHtmlText = $aHtmlText;

         $this->iMaxColumns = $aMaxColumns;

     }

@@ -48,7 +48,7 @@ 
         $this->iHtmlParser = new HtmlParser($this->iHtmlText);

         $wholeText = "";

         while (($line = $this->getLine()) !== false) {

-            $wholeText .= ($line . "\r\n");

+            $wholeText .= ($line."\r\n");

         }

         return $wholeText;

     }

@@ -75,7 +75,7 @@ 
         return false;

     }

 

-    function addWordToLine ($word) {

+    function addWordToLine($word) {

         if ($this->iInScript) {

             return true;

         }

@@ -110,8 +110,8 @@ 
         else {

             $prevLine = $this->getIndentation($word === $this->TOKEN_AFTERLI);

         }

-        $candidateLine = $prevLine . $toAdd;

-        if (strlen ($candidateLine) > $this->iMaxColumns && $prevLine != "") {

+        $candidateLine = $prevLine.$toAdd;

+        if (strlen($candidateLine) > $this->iMaxColumns && $prevLine != "") {

             return false;

         }

         $this->iCurrentLine = $candidateLine;

@@ -136,42 +136,42 @@ 
                 }

             }

             else if ($this->iHtmlParser->iNodeType == NODE_TYPE_ELEMENT) {

-                if (strcasecmp ($this->iHtmlParser->iNodeName, "br") == 0) {

+                if (strcasecmp($this->iHtmlParser->iNodeName, "br") == 0) {

                     $this->iHtmlParser->parse();

                     $this->iCurrentWord = $this->TOKEN_BR;

                     return $this->iCurrentWord;

                 }

-                else if (strcasecmp ($this->iHtmlParser->iNodeName, "p") == 0) {

+                else if (strcasecmp($this->iHtmlParser->iNodeName, "p") == 0) {

                     $this->iHtmlParser->parse();

                     $this->iCurrentWord = $this->TOKEN_P;

                     return $this->iCurrentWord;

                 }

-                else if (strcasecmp ($this->iHtmlParser->iNodeName, "script") == 0) {

+                else if (strcasecmp($this->iHtmlParser->iNodeName, "script") == 0) {

                     $this->iHtmlParser->parse();

                     $this->iCurrentWord = "";

                     $this->iInScript = true;

                     return $this->iCurrentWord;

                 }

-                else if (strcasecmp ($this->iHtmlParser->iNodeName, "ul") == 0 || strcasecmp ($this->iHtmlParser->iNodeName, "ol") == 0) {

+                else if (strcasecmp($this->iHtmlParser->iNodeName, "ul") == 0 || strcasecmp($this->iHtmlParser->iNodeName, "ol") == 0) {

                     $this->iHtmlParser->parse();

                     $this->iCurrentWord = $this->TOKEN_UL;

                     $this->iListLevel++;

                     return $this->iCurrentWord;

                 }

-                else if (strcasecmp ($this->iHtmlParser->iNodeName, "li") == 0) {

+                else if (strcasecmp($this->iHtmlParser->iNodeName, "li") == 0) {

                     $this->iHtmlParser->parse();

                     $this->iCurrentWord = $this->TOKEN_LI;

                     return $this->iCurrentWord;

                 }

             }

             else if ($this->iHtmlParser->iNodeType == NODE_TYPE_ENDELEMENT) {

-                if (strcasecmp ($this->iHtmlParser->iNodeName, "script") == 0) {

+                if (strcasecmp($this->iHtmlParser->iNodeName, "script") == 0) {

                     $this->iHtmlParser->parse();

                     $this->iCurrentWord = "";

                     $this->iInScript = false;

                     return $this->iCurrentWord;

                 }

-                else if (strcasecmp ($this->iHtmlParser->iNodeName, "ul") == 0 || strcasecmp ($this->iHtmlParser->iNodeName, "ol") == 0) {

+                else if (strcasecmp($this->iHtmlParser->iNodeName, "ul") == 0 || strcasecmp($this->iHtmlParser->iNodeName, "ol") == 0) {

                     $this->iHtmlParser->parse();

                     $this->iCurrentWord = $this->TOKEN_ENDUL;

                     if ($this->iListLevel > 0) {

@@ -187,27 +187,27 @@ 
         return false;

     }

 

-    function splitWords ($text) {

-        $words = split ("[ \t\r\n]+", $text);

+    function splitWords($text) {

+        $words = split("[ \t\r\n]+", $text);

         for ($idx = 0; $idx < count($words); $idx++) {

             $words[$idx] = $this->htmlDecode($words[$idx]);

         }

         return $words;

     }

 

-    function htmlDecode ($text) {

+    function htmlDecode($text) {

         // TBD

         return $text;

     } 

 

-    function getIndentation ($hasLI) {

+    function getIndentation($hasLI) {

         $indent = "";

         $idx = 0;

         for ($idx = 0; $idx < ($this->iListLevel - 1); $idx++) {

             $indent .= "  ";

         }

         if ($this->iListLevel > 0) {

-            $indent = $hasLI ? ($indent . "- ") : ($indent . "  ");

+            $indent = $hasLI ? ($indent."- ") : ($indent."  ");

         }

         return $indent;

     }

Doc Comments +9 added lines

@@ -75,6 +75,9 @@ 
         return false;

     }

 

+    /**
+     * @param string $word
+     */
     function addWordToLine ($word) {

         if ($this->iInScript) {

             return true;

@@ -187,6 +190,9 @@ 
         return false;

     }

 

+    /**
+     * @param string $text
+     */
     function splitWords ($text) {

         $words = split ("[ \t\r\n]+", $text);

         for ($idx = 0; $idx < count($words); $idx++) {

@@ -200,6 +206,9 @@ 
         return $text;

     } 

 

+    /**
+     * @param boolean $hasLI
+     */
     function getIndentation ($hasLI) {

         $indent = "";

         $idx = 0;

classes/security/phphtmlparser/src/htmlparser.inc

Braces +7 added lines, -14 removed lines

@@ -129,8 +129,7 @@ 
                         $this->iNodeName = "Comment";

                         $this->iNodeValue = "<" . $name . ">";

                         $comment = true;                        

-                    }

-                    else {

+                    } else {

                         $rest = $this->skipToStringInTag ("-->");    

                         if ($rest != "") {

                             $this->iNodeType = NODE_TYPE_COMMENT;

@@ -148,8 +147,7 @@ 
                     $this->iNodeValue = "<" . $name;

                     return true;

                 }

-        }

-        else {

+        } else {

                 $this->iNodeType = NODE_TYPE_ELEMENT;

                 $this->iNodeValue = "";

                 $this->iNodeName = $name;

@@ -162,8 +160,7 @@ 
                             $this->skipBlanksInTag();

                             $value = $this->readValueInTag();

                             $this->iNodeAttributes[strtolower($attrName)] = $value;

-                        }

-                        else {

+                        } else {

                             $this->iNodeAttributes[strtolower($attrName)] = "";

                         }

                     }

@@ -204,13 +201,11 @@ 
             $this->skipMaxInTag ("\"", 1);

             $value = $this->skipToInTag ("\"");

             $this->skipMaxInTag ("\"", 1);

-        }

-        else if ($ch == "'") {

+        } else if ($ch == "'") {

             $this->skipMaxInTag ("'", 1);

             $value = $this->skipToInTag ("'");

             $this->skipMaxInTag ("'", 1);

-        }                

-        else {

+        } else {

             $value = $this->skipToBlanksInTag();

         }

         return $value;

@@ -220,8 +215,7 @@ 
         $this->iHtmlTextIndex = $index;

         if ($index >= $this->iHtmlTextLength) {

             $this->iCurrentChar = -1;

-        }

-        else {

+        } else {

             $this->iCurrentChar = $this->iHtmlText{$index};

         }

     }

@@ -230,8 +224,7 @@ 
         if ($this->iHtmlTextIndex < $this->iHtmlTextLength) {

             $this->setTextIndex ($this->iHtmlTextIndex + 1);

             return true;

-        }

-        else {

+        } else {

             return false;

         }

     }

Indentation +299 added lines, -299 removed lines

@@ -30,336 +30,336 @@
  */

 class HtmlParser {

 

-    /**

-     * Field iNodeType.

-     * May be one of the NODE_TYPE_* constants above.

-     */

-    var $iNodeType;

+	/**

+	 * Field iNodeType.

+	 * May be one of the NODE_TYPE_* constants above.

+	 */

+	var $iNodeType;

 

-    /**

-     * Field iNodeName.

-     * For elements, it's the name of the element.

-     */

-    var $iNodeName = "";

+	/**

+	 * Field iNodeName.

+	 * For elements, it's the name of the element.

+	 */

+	var $iNodeName = "";

 

-    /**

-     * Field iNodeValue.

-     * For text nodes, it's the text.

-     */

-    var $iNodeValue = "";

+	/**

+	 * Field iNodeValue.

+	 * For text nodes, it's the text.

+	 */

+	var $iNodeValue = "";

 

-    /**

-     * Field iNodeAttributes.

-     * A string-indexed array containing attribute values

-     * of the current node. Indexes are always lowercase.

-     */

-    var $iNodeAttributes;

+	/**

+	 * Field iNodeAttributes.

+	 * A string-indexed array containing attribute values

+	 * of the current node. Indexes are always lowercase.

+	 */

+	var $iNodeAttributes;

 

-    // The following fields should be 

-    // considered private:

+	// The following fields should be 

+	// considered private:

 

-    var $iHtmlText;

-    var $iHtmlTextLength;

-    var $iHtmlTextIndex = 0;

-    var $iHtmlCurrentChar;

-    var $BOE_ARRAY;

-    var $B_ARRAY;

-    var $BOS_ARRAY;

+	var $iHtmlText;

+	var $iHtmlTextLength;

+	var $iHtmlTextIndex = 0;

+	var $iHtmlCurrentChar;

+	var $BOE_ARRAY;

+	var $B_ARRAY;

+	var $BOS_ARRAY;

     

-    /**

-     * Constructor.

-     * Constructs an HtmlParser instance with

-     * the HTML text given.

-     */

-    function HtmlParser ($aHtmlText) {

-        $this->iHtmlText = $aHtmlText;

-        $this->iHtmlTextLength = strlen($aHtmlText);

-        $this->iNodeAttributes = array();

-        $this->setTextIndex (0);

+	/**

+	 * Constructor.

+	 * Constructs an HtmlParser instance with

+	 * the HTML text given.

+	 */

+	function HtmlParser ($aHtmlText) {

+		$this->iHtmlText = $aHtmlText;

+		$this->iHtmlTextLength = strlen($aHtmlText);

+		$this->iNodeAttributes = array();

+		$this->setTextIndex (0);

 

-        $this->BOE_ARRAY = array (" ", "\t", "\r", "\n", "=" );

-        $this->B_ARRAY = array (" ", "\t", "\r", "\n" );

-        $this->BOS_ARRAY = array (" ", "\t", "\r", "\n", "/" );

-    }

+		$this->BOE_ARRAY = array (" ", "\t", "\r", "\n", "=" );

+		$this->B_ARRAY = array (" ", "\t", "\r", "\n" );

+		$this->BOS_ARRAY = array (" ", "\t", "\r", "\n", "/" );

+	}

 

-    /**

-     * Method parse.

-     * Parses the next node. Returns false only if

-     * the end of the HTML text has been reached.

-     * Updates values of iNode* fields.

-     */

-    function parse() {

-        $text = $this->skipToElement();

-        if ($text != "") {

-            $this->iNodeType = NODE_TYPE_TEXT;

-            $this->iNodeName = "Text";

-            $this->iNodeValue = $text;

-            return true;

-        }

-        return $this->readTag();

-    }

+	/**

+	 * Method parse.

+	 * Parses the next node. Returns false only if

+	 * the end of the HTML text has been reached.

+	 * Updates values of iNode* fields.

+	 */

+	function parse() {

+		$text = $this->skipToElement();

+		if ($text != "") {

+			$this->iNodeType = NODE_TYPE_TEXT;

+			$this->iNodeName = "Text";

+			$this->iNodeValue = $text;

+			return true;

+		}

+		return $this->readTag();

+	}

 

-    function clearAttributes() {

-        $this->iNodeAttributes = array();

-    }

+	function clearAttributes() {

+		$this->iNodeAttributes = array();

+	}

 

-    function readTag() {

-        if ($this->iCurrentChar != "<") {

-            $this->iNodeType = NODE_TYPE_DONE;

-            return false;

-        }

-        $this->clearAttributes();

-        $this->skipMaxInTag ("<", 1);

-        if ($this->iCurrentChar == '/') {

-            $this->moveNext();

-            $name = $this->skipToBlanksInTag();

-            $this->iNodeType = NODE_TYPE_ENDELEMENT;

-            $this->iNodeName = $name;

-            $this->iNodeValue = "";            

-            $this->skipEndOfTag();

-            return true;

-        }

-        $name = $this->skipToBlanksOrSlashInTag();

-        if (!$this->isValidTagIdentifier ($name)) {

-                $comment = false;

-                if (strpos($name, "!--") === 0) {

-                    $ppos = strpos($name, "--", 3);

-                    if (strpos($name, "--", 3) === (strlen($name) - 2)) {

-                        $this->iNodeType = NODE_TYPE_COMMENT;

-                        $this->iNodeName = "Comment";

-                        $this->iNodeValue = "<" . $name . ">";

-                        $comment = true;                        

-                    }

-                    else {

-                        $rest = $this->skipToStringInTag ("-->");    

-                        if ($rest != "") {

-                            $this->iNodeType = NODE_TYPE_COMMENT;

-                            $this->iNodeName = "Comment";

-                            $this->iNodeValue = "<" . $name . $rest;

-                            $comment = true;

-                            // Already skipped end of tag

-                            return true;

-                        }

-                    }

-                }

-                if (!$comment) {

-                    $this->iNodeType = NODE_TYPE_TEXT;

-                    $this->iNodeName = "Text";

-                    $this->iNodeValue = "<" . $name;

-                    return true;

-                }

-        }

-        else {

-                $this->iNodeType = NODE_TYPE_ELEMENT;

-                $this->iNodeValue = "";

-                $this->iNodeName = $name;

-                while ($this->skipBlanksInTag()) {

-                    $attrName = $this->skipToBlanksOrEqualsInTag();

-                    if ($attrName != "" && $attrName != "/") {

-                        $this->skipBlanksInTag();

-                        if ($this->iCurrentChar == "=") {

-                            $this->skipEqualsInTag();

-                            $this->skipBlanksInTag();

-                            $value = $this->readValueInTag();

-                            $this->iNodeAttributes[strtolower($attrName)] = $value;

-                        }

-                        else {

-                            $this->iNodeAttributes[strtolower($attrName)] = "";

-                        }

-                    }

-                }

-        }

-        $this->skipEndOfTag();

-        return true;            

-    }

+	function readTag() {

+		if ($this->iCurrentChar != "<") {

+			$this->iNodeType = NODE_TYPE_DONE;

+			return false;

+		}

+		$this->clearAttributes();

+		$this->skipMaxInTag ("<", 1);

+		if ($this->iCurrentChar == '/') {

+			$this->moveNext();

+			$name = $this->skipToBlanksInTag();

+			$this->iNodeType = NODE_TYPE_ENDELEMENT;

+			$this->iNodeName = $name;

+			$this->iNodeValue = "";            

+			$this->skipEndOfTag();

+			return true;

+		}

+		$name = $this->skipToBlanksOrSlashInTag();

+		if (!$this->isValidTagIdentifier ($name)) {

+				$comment = false;

+				if (strpos($name, "!--") === 0) {

+					$ppos = strpos($name, "--", 3);

+					if (strpos($name, "--", 3) === (strlen($name) - 2)) {

+						$this->iNodeType = NODE_TYPE_COMMENT;

+						$this->iNodeName = "Comment";

+						$this->iNodeValue = "<" . $name . ">";

+						$comment = true;                        

+					}

+					else {

+						$rest = $this->skipToStringInTag ("-->");    

+						if ($rest != "") {

+							$this->iNodeType = NODE_TYPE_COMMENT;

+							$this->iNodeName = "Comment";

+							$this->iNodeValue = "<" . $name . $rest;

+							$comment = true;

+							// Already skipped end of tag

+							return true;

+						}

+					}

+				}

+				if (!$comment) {

+					$this->iNodeType = NODE_TYPE_TEXT;

+					$this->iNodeName = "Text";

+					$this->iNodeValue = "<" . $name;

+					return true;

+				}

+		}

+		else {

+				$this->iNodeType = NODE_TYPE_ELEMENT;

+				$this->iNodeValue = "";

+				$this->iNodeName = $name;

+				while ($this->skipBlanksInTag()) {

+					$attrName = $this->skipToBlanksOrEqualsInTag();

+					if ($attrName != "" && $attrName != "/") {

+						$this->skipBlanksInTag();

+						if ($this->iCurrentChar == "=") {

+							$this->skipEqualsInTag();

+							$this->skipBlanksInTag();

+							$value = $this->readValueInTag();

+							$this->iNodeAttributes[strtolower($attrName)] = $value;

+						}

+						else {

+							$this->iNodeAttributes[strtolower($attrName)] = "";

+						}

+					}

+				}

+		}

+		$this->skipEndOfTag();

+		return true;            

+	}

 

-    function isValidTagIdentifier ($name) {

-        return preg_match ("/^[A-Za-z0-9_\\-]+$/", $name);

-    }

+	function isValidTagIdentifier ($name) {

+		return preg_match ("/^[A-Za-z0-9_\\-]+$/", $name);

+	}

     

-    function skipBlanksInTag() {

-        return "" != ($this->skipInTag ($this->B_ARRAY));

-    }

+	function skipBlanksInTag() {

+		return "" != ($this->skipInTag ($this->B_ARRAY));

+	}

 

-    function skipToBlanksOrEqualsInTag() {

-        return $this->skipToInTag ($this->BOE_ARRAY);

-    }

+	function skipToBlanksOrEqualsInTag() {

+		return $this->skipToInTag ($this->BOE_ARRAY);

+	}

 

-    function skipToBlanksInTag() {

-        return $this->skipToInTag ($this->B_ARRAY);

-    }

+	function skipToBlanksInTag() {

+		return $this->skipToInTag ($this->B_ARRAY);

+	}

 

-    function skipToBlanksOrSlashInTag() {

-        return $this->skipToInTag ($this->BOS_ARRAY);

-    }

+	function skipToBlanksOrSlashInTag() {

+		return $this->skipToInTag ($this->BOS_ARRAY);

+	}

 

-    function skipEqualsInTag() {

-        return $this->skipMaxInTag ("=", 1);

-    }

+	function skipEqualsInTag() {

+		return $this->skipMaxInTag ("=", 1);

+	}

 

-    function readValueInTag() {

-        $ch = $this->iCurrentChar;

-        $value = "";

-        if ($ch == "\"") {

-            $this->skipMaxInTag ("\"", 1);

-            $value = $this->skipToInTag ("\"");

-            $this->skipMaxInTag ("\"", 1);

-        }

-        else if ($ch == "'") {

-            $this->skipMaxInTag ("'", 1);

-            $value = $this->skipToInTag ("'");

-            $this->skipMaxInTag ("'", 1);

-        }                

-        else {

-            $value = $this->skipToBlanksInTag();

-        }

-        return $value;

-    }

+	function readValueInTag() {

+		$ch = $this->iCurrentChar;

+		$value = "";

+		if ($ch == "\"") {

+			$this->skipMaxInTag ("\"", 1);

+			$value = $this->skipToInTag ("\"");

+			$this->skipMaxInTag ("\"", 1);

+		}

+		else if ($ch == "'") {

+			$this->skipMaxInTag ("'", 1);

+			$value = $this->skipToInTag ("'");

+			$this->skipMaxInTag ("'", 1);

+		}                

+		else {

+			$value = $this->skipToBlanksInTag();

+		}

+		return $value;

+	}

 

-    function setTextIndex ($index) {

-        $this->iHtmlTextIndex = $index;

-        if ($index >= $this->iHtmlTextLength) {

-            $this->iCurrentChar = -1;

-        }

-        else {

-            $this->iCurrentChar = $this->iHtmlText{$index};

-        }

-    }

+	function setTextIndex ($index) {

+		$this->iHtmlTextIndex = $index;

+		if ($index >= $this->iHtmlTextLength) {

+			$this->iCurrentChar = -1;

+		}

+		else {

+			$this->iCurrentChar = $this->iHtmlText{$index};

+		}

+	}

 

-    function moveNext() {

-        if ($this->iHtmlTextIndex < $this->iHtmlTextLength) {

-            $this->setTextIndex ($this->iHtmlTextIndex + 1);

-            return true;

-        }

-        else {

-            return false;

-        }

-    }

+	function moveNext() {

+		if ($this->iHtmlTextIndex < $this->iHtmlTextLength) {

+			$this->setTextIndex ($this->iHtmlTextIndex + 1);

+			return true;

+		}

+		else {

+			return false;

+		}

+	}

 

-    function skipEndOfTag() {

-        while (($ch = $this->iCurrentChar) !== -1) {

-            if ($ch == ">") {

-                $this->moveNext();

-                return;

-            }

-            $this->moveNext();

-        }

-    }

+	function skipEndOfTag() {

+		while (($ch = $this->iCurrentChar) !== -1) {

+			if ($ch == ">") {

+				$this->moveNext();

+				return;

+			}

+			$this->moveNext();

+		}

+	}

 

-    function skipInTag ($chars) {

-        $sb = "";

-        while (($ch = $this->iCurrentChar) !== -1) {

-            if ($ch == ">") {

-                return $sb;

-            } else {

-                $match = false;

-                for ($idx = 0; $idx < count($chars); $idx++) {

-                    if ($ch == $chars[$idx]) {

-                        $match = true;

-                        break;

-                    }

-                }

-                if (!$match) {

-                    return $sb;

-                }

-                $sb .= $ch;

-                $this->moveNext();

-            }

-        }

-        return $sb;

-    }

+	function skipInTag ($chars) {

+		$sb = "";

+		while (($ch = $this->iCurrentChar) !== -1) {

+			if ($ch == ">") {

+				return $sb;

+			} else {

+				$match = false;

+				for ($idx = 0; $idx < count($chars); $idx++) {

+					if ($ch == $chars[$idx]) {

+						$match = true;

+						break;

+					}

+				}

+				if (!$match) {

+					return $sb;

+				}

+				$sb .= $ch;

+				$this->moveNext();

+			}

+		}

+		return $sb;

+	}

 

-    function skipMaxInTag ($chars, $maxChars) {

-        $sb = "";

-        $count = 0;

-        while (($ch = $this->iCurrentChar) !== -1 && $count++ < $maxChars) {

-            if ($ch == ">") {

-                return $sb;

-            } else {

-                $match = false;

-                for ($idx = 0; $idx < count($chars); $idx++) {

-                    if ($ch == $chars[$idx]) {

-                        $match = true;

-                        break;

-                    }

-                }

-                if (!$match) {

-                    return $sb;

-                }

-                $sb .= $ch;

-                $this->moveNext();

-            }

-        }

-        return $sb;

-    }

+	function skipMaxInTag ($chars, $maxChars) {

+		$sb = "";

+		$count = 0;

+		while (($ch = $this->iCurrentChar) !== -1 && $count++ < $maxChars) {

+			if ($ch == ">") {

+				return $sb;

+			} else {

+				$match = false;

+				for ($idx = 0; $idx < count($chars); $idx++) {

+					if ($ch == $chars[$idx]) {

+						$match = true;

+						break;

+					}

+				}

+				if (!$match) {

+					return $sb;

+				}

+				$sb .= $ch;

+				$this->moveNext();

+			}

+		}

+		return $sb;

+	}

 

-    function skipToInTag ($chars) {

-        $sb = "";

-        while (($ch = $this->iCurrentChar) !== -1) {

-            $match = $ch == ">";

-            if (!$match) {

-                for ($idx = 0; $idx < count($chars); $idx++) {

-                    if ($ch == $chars[$idx]) {

-                        $match = true;

-                        break;

-                    }

-                }

-            }

-            if ($match) {

-                return $sb;

-            }

-            $sb .= $ch;

-            $this->moveNext();

-        }

-        return $sb;

-    }

+	function skipToInTag ($chars) {

+		$sb = "";

+		while (($ch = $this->iCurrentChar) !== -1) {

+			$match = $ch == ">";

+			if (!$match) {

+				for ($idx = 0; $idx < count($chars); $idx++) {

+					if ($ch == $chars[$idx]) {

+						$match = true;

+						break;

+					}

+				}

+			}

+			if ($match) {

+				return $sb;

+			}

+			$sb .= $ch;

+			$this->moveNext();

+		}

+		return $sb;

+	}

 

-    function skipToElement() {

-        $sb = "";

-        while (($ch = $this->iCurrentChar) !== -1) {

-            if ($ch == "<") {

-                return $sb;

-            }

-            $sb .= $ch;

-            $this->moveNext();

-        }

-        return $sb;             

-    }

+	function skipToElement() {

+		$sb = "";

+		while (($ch = $this->iCurrentChar) !== -1) {

+			if ($ch == "<") {

+				return $sb;

+			}

+			$sb .= $ch;

+			$this->moveNext();

+		}

+		return $sb;             

+	}

 

-    /**

-     * Returns text between current position and $needle,

-     * inclusive, or "" if not found. The current index is moved to a point

-     * after the location of $needle, or not moved at all

-     * if nothing is found.

-     */

-    function skipToStringInTag ($needle) {

-        $pos = strpos ($this->iHtmlText, $needle, $this->iHtmlTextIndex);

-        if ($pos === false) {

-            return "";

-        }

-        $top = $pos + strlen($needle);

-        $retvalue = substr ($this->iHtmlText, $this->iHtmlTextIndex, $top - $this->iHtmlTextIndex);

-        $this->setTextIndex ($top);

-        return $retvalue;

-    }

+	/**

+	 * Returns text between current position and $needle,

+	 * inclusive, or "" if not found. The current index is moved to a point

+	 * after the location of $needle, or not moved at all

+	 * if nothing is found.

+	 */

+	function skipToStringInTag ($needle) {

+		$pos = strpos ($this->iHtmlText, $needle, $this->iHtmlTextIndex);

+		if ($pos === false) {

+			return "";

+		}

+		$top = $pos + strlen($needle);

+		$retvalue = substr ($this->iHtmlText, $this->iHtmlTextIndex, $top - $this->iHtmlTextIndex);

+		$this->setTextIndex ($top);

+		return $retvalue;

+	}

 }

 

 function HtmlParser_ForFile ($fileName) { 

-    return HtmlParser_ForURL($fileName);

+	return HtmlParser_ForURL($fileName);

 }

 

 function HtmlParser_ForURL ($url) {

-    $fp = fopen ($url, "r");

-    $content = "";

-    while (true) {

-        $data = fread ($fp, 8192);

-        if (strlen($data) == 0) {

-            break;

-        }

-        $content .= $data;

-    }

-    fclose ($fp);

-    return new HtmlParser ($content);

+	$fp = fopen ($url, "r");

+	$content = "";

+	while (true) {

+		$data = fread ($fp, 8192);

+		if (strlen($data) == 0) {

+			break;

+		}

+		$content .= $data;

+	}

+	fclose ($fp);

+	return new HtmlParser ($content);

 }

 

 php?>

Spacing +45 added lines, -45 removed lines

@@ -10,12 +10,12 @@ 
  * - Leo West (performance improvements)

  */

 

-define ("NODE_TYPE_START",0);

-define ("NODE_TYPE_ELEMENT",1);

-define ("NODE_TYPE_ENDELEMENT",2);

-define ("NODE_TYPE_TEXT",3);

-define ("NODE_TYPE_COMMENT",4);

-define ("NODE_TYPE_DONE",5);

+define("NODE_TYPE_START", 0);

+define("NODE_TYPE_ELEMENT", 1);

+define("NODE_TYPE_ENDELEMENT", 2);

+define("NODE_TYPE_TEXT", 3);

+define("NODE_TYPE_COMMENT", 4);

+define("NODE_TYPE_DONE", 5);

 

 /**

  * Class HtmlParser.

@@ -71,15 +71,15 @@ 
      * Constructs an HtmlParser instance with

      * the HTML text given.

      */

-    function HtmlParser ($aHtmlText) {

+    function HtmlParser($aHtmlText) {

         $this->iHtmlText = $aHtmlText;

         $this->iHtmlTextLength = strlen($aHtmlText);

         $this->iNodeAttributes = array();

-        $this->setTextIndex (0);

+        $this->setTextIndex(0);

 

-        $this->BOE_ARRAY = array (" ", "\t", "\r", "\n", "=" );

-        $this->B_ARRAY = array (" ", "\t", "\r", "\n" );

-        $this->BOS_ARRAY = array (" ", "\t", "\r", "\n", "/" );

+        $this->BOE_ARRAY = array(" ", "\t", "\r", "\n", "=");

+        $this->B_ARRAY = array(" ", "\t", "\r", "\n");

+        $this->BOS_ARRAY = array(" ", "\t", "\r", "\n", "/");

     }

 

     /**

@@ -109,7 +109,7 @@ 
             return false;

         }

         $this->clearAttributes();

-        $this->skipMaxInTag ("<", 1);

+        $this->skipMaxInTag("<", 1);

         if ($this->iCurrentChar == '/') {

             $this->moveNext();

             $name = $this->skipToBlanksInTag();

@@ -120,22 +120,22 @@ 
             return true;

         }

         $name = $this->skipToBlanksOrSlashInTag();

-        if (!$this->isValidTagIdentifier ($name)) {

+        if (!$this->isValidTagIdentifier($name)) {

                 $comment = false;

                 if (strpos($name, "!--") === 0) {

                     $ppos = strpos($name, "--", 3);

                     if (strpos($name, "--", 3) === (strlen($name) - 2)) {

                         $this->iNodeType = NODE_TYPE_COMMENT;

                         $this->iNodeName = "Comment";

-                        $this->iNodeValue = "<" . $name . ">";

+                        $this->iNodeValue = "<".$name.">";

                         $comment = true;                        

                     }

                     else {

-                        $rest = $this->skipToStringInTag ("-->");    

+                        $rest = $this->skipToStringInTag("-->");    

                         if ($rest != "") {

                             $this->iNodeType = NODE_TYPE_COMMENT;

                             $this->iNodeName = "Comment";

-                            $this->iNodeValue = "<" . $name . $rest;

+                            $this->iNodeValue = "<".$name.$rest;

                             $comment = true;

                             // Already skipped end of tag

                             return true;

@@ -145,7 +145,7 @@ 
                 if (!$comment) {

                     $this->iNodeType = NODE_TYPE_TEXT;

                     $this->iNodeName = "Text";

-                    $this->iNodeValue = "<" . $name;

+                    $this->iNodeValue = "<".$name;

                     return true;

                 }

         }

@@ -173,42 +173,42 @@ 
         return true;            

     }

 

-    function isValidTagIdentifier ($name) {

-        return preg_match ("/^[A-Za-z0-9_\\-]+$/", $name);

+    function isValidTagIdentifier($name) {

+        return preg_match("/^[A-Za-z0-9_\\-]+$/", $name);

     }

     

     function skipBlanksInTag() {

-        return "" != ($this->skipInTag ($this->B_ARRAY));

+        return "" != ($this->skipInTag($this->B_ARRAY));

     }

 

     function skipToBlanksOrEqualsInTag() {

-        return $this->skipToInTag ($this->BOE_ARRAY);

+        return $this->skipToInTag($this->BOE_ARRAY);

     }

 

     function skipToBlanksInTag() {

-        return $this->skipToInTag ($this->B_ARRAY);

+        return $this->skipToInTag($this->B_ARRAY);

     }

 

     function skipToBlanksOrSlashInTag() {

-        return $this->skipToInTag ($this->BOS_ARRAY);

+        return $this->skipToInTag($this->BOS_ARRAY);

     }

 

     function skipEqualsInTag() {

-        return $this->skipMaxInTag ("=", 1);

+        return $this->skipMaxInTag("=", 1);

     }

 

     function readValueInTag() {

         $ch = $this->iCurrentChar;

         $value = "";

         if ($ch == "\"") {

-            $this->skipMaxInTag ("\"", 1);

-            $value = $this->skipToInTag ("\"");

-            $this->skipMaxInTag ("\"", 1);

+            $this->skipMaxInTag("\"", 1);

+            $value = $this->skipToInTag("\"");

+            $this->skipMaxInTag("\"", 1);

         }

         else if ($ch == "'") {

-            $this->skipMaxInTag ("'", 1);

-            $value = $this->skipToInTag ("'");

-            $this->skipMaxInTag ("'", 1);

+            $this->skipMaxInTag("'", 1);

+            $value = $this->skipToInTag("'");

+            $this->skipMaxInTag("'", 1);

         }                

         else {

             $value = $this->skipToBlanksInTag();

@@ -216,7 +216,7 @@ 
         return $value;

     }

 

-    function setTextIndex ($index) {

+    function setTextIndex($index) {

         $this->iHtmlTextIndex = $index;

         if ($index >= $this->iHtmlTextLength) {

             $this->iCurrentChar = -1;

@@ -228,7 +228,7 @@ 
 

     function moveNext() {

         if ($this->iHtmlTextIndex < $this->iHtmlTextLength) {

-            $this->setTextIndex ($this->iHtmlTextIndex + 1);

+            $this->setTextIndex($this->iHtmlTextIndex + 1);

             return true;

         }

         else {

@@ -246,7 +246,7 @@ 
         }

     }

 

-    function skipInTag ($chars) {

+    function skipInTag($chars) {

         $sb = "";

         while (($ch = $this->iCurrentChar) !== -1) {

             if ($ch == ">") {

@@ -269,7 +269,7 @@ 
         return $sb;

     }

 

-    function skipMaxInTag ($chars, $maxChars) {

+    function skipMaxInTag($chars, $maxChars) {

         $sb = "";

         $count = 0;

         while (($ch = $this->iCurrentChar) !== -1 && $count++ < $maxChars) {

@@ -293,7 +293,7 @@ 
         return $sb;

     }

 

-    function skipToInTag ($chars) {

+    function skipToInTag($chars) {

         $sb = "";

         while (($ch = $this->iCurrentChar) !== -1) {

             $match = $ch == ">";

@@ -332,34 +332,34 @@ 
      * after the location of $needle, or not moved at all

      * if nothing is found.

      */

-    function skipToStringInTag ($needle) {

-        $pos = strpos ($this->iHtmlText, $needle, $this->iHtmlTextIndex);

+    function skipToStringInTag($needle) {

+        $pos = strpos($this->iHtmlText, $needle, $this->iHtmlTextIndex);

         if ($pos === false) {

             return "";

         }

         $top = $pos + strlen($needle);

-        $retvalue = substr ($this->iHtmlText, $this->iHtmlTextIndex, $top - $this->iHtmlTextIndex);

-        $this->setTextIndex ($top);

+        $retvalue = substr($this->iHtmlText, $this->iHtmlTextIndex, $top - $this->iHtmlTextIndex);

+        $this->setTextIndex($top);

         return $retvalue;

     }

 }

 

-function HtmlParser_ForFile ($fileName) { 

+function HtmlParser_ForFile($fileName) { 

     return HtmlParser_ForURL($fileName);

 }

 

-function HtmlParser_ForURL ($url) {

-    $fp = fopen ($url, "r");

+function HtmlParser_ForURL($url) {

+    $fp = fopen($url, "r");

     $content = "";

     while (true) {

-        $data = fread ($fp, 8192);

+        $data = fread($fp, 8192);

         if (strlen($data) == 0) {

             break;

         }

         $content .= $data;

     }

-    fclose ($fp);

-    return new HtmlParser ($content);

+    fclose($fp);

+    return new HtmlParser($content);

 }

 

 php?>

Doc Comments +14 added lines

@@ -173,6 +173,9 @@ 
         return true;            

     }

 

+    /**
+     * @param string $name
+     */
     function isValidTagIdentifier ($name) {

         return preg_match ("/^[A-Za-z0-9_\\-]+$/", $name);

     }

@@ -216,6 +219,9 @@ 
         return $value;

     }

 

+    /**
+     * @param integer $index
+     */
     function setTextIndex ($index) {

         $this->iHtmlTextIndex = $index;

         if ($index >= $this->iHtmlTextLength) {

@@ -246,6 +252,9 @@ 
         }

     }

 

+    /**
+     * @param string[] $chars
+     */
     function skipInTag ($chars) {

         $sb = "";

         while (($ch = $this->iCurrentChar) !== -1) {

@@ -269,6 +278,10 @@ 
         return $sb;

     }

 

+    /**
+     * @param string $chars
+     * @param integer $maxChars
+     */
     function skipMaxInTag ($chars, $maxChars) {

         $sb = "";

         $count = 0;

@@ -331,6 +344,7 @@ 
      * inclusive, or "" if not found. The current index is moved to a point

      * after the location of $needle, or not moved at all

      * if nothing is found.

+     * @param string $needle
      */

     function skipToStringInTag ($needle) {

         $pos = strpos ($this->iHtmlText, $needle, $this->iHtmlTextIndex);

libs/PEAR.1.9.5/HTTP/Request2/Adapter.php

Indentation +86 added lines, -86 removed lines

@@ -39,99 +39,99 @@
  */

 abstract class HTTP_Request2_Adapter

 {

-    /**

-     * A list of methods that MUST NOT have a request body, per RFC 2616

-     * @var  array

-     */

-    protected static $bodyDisallowed = array('TRACE');

+	/**

+	 * A list of methods that MUST NOT have a request body, per RFC 2616

+	 * @var  array

+	 */

+	protected static $bodyDisallowed = array('TRACE');

 

-    /**

-     * Methods having defined semantics for request body

-     *

-     * Content-Length header (indicating that the body follows, section 4.3 of

-     * RFC 2616) will be sent for these methods even if no body was added

-     *

-     * @var  array

-     * @link http://pear.php.net/bugs/bug.php?id=12900

-     * @link http://pear.php.net/bugs/bug.php?id=14740

-     */

-    protected static $bodyRequired = array('POST', 'PUT');

+	/**

+	 * Methods having defined semantics for request body

+	 *

+	 * Content-Length header (indicating that the body follows, section 4.3 of

+	 * RFC 2616) will be sent for these methods even if no body was added

+	 *

+	 * @var  array

+	 * @link http://pear.php.net/bugs/bug.php?id=12900

+	 * @link http://pear.php.net/bugs/bug.php?id=14740

+	 */

+	protected static $bodyRequired = array('POST', 'PUT');

 

-    /**

-     * Request being sent

-     * @var  HTTP_Request2

-     */

-    protected $request;

+	/**

+	 * Request being sent

+	 * @var  HTTP_Request2

+	 */

+	protected $request;

 

-    /**

-     * Request body

-     * @var  string|resource|HTTP_Request2_MultipartBody

-     * @see  HTTP_Request2::getBody()

-     */

-    protected $requestBody;

+	/**

+	 * Request body

+	 * @var  string|resource|HTTP_Request2_MultipartBody

+	 * @see  HTTP_Request2::getBody()

+	 */

+	protected $requestBody;

 

-    /**

-     * Length of the request body

-     * @var  integer

-     */

-    protected $contentLength;

+	/**

+	 * Length of the request body

+	 * @var  integer

+	 */

+	protected $contentLength;

 

-    /**

-     * Sends request to the remote server and returns its response

-     *

-     * @param HTTP_Request2 $request HTTP request message

-     *

-     * @return   HTTP_Request2_Response

-     * @throws   HTTP_Request2_Exception

-     */

-    abstract public function sendRequest(HTTP_Request2 $request);

+	/**

+	 * Sends request to the remote server and returns its response

+	 *

+	 * @param HTTP_Request2 $request HTTP request message

+	 *

+	 * @return   HTTP_Request2_Response

+	 * @throws   HTTP_Request2_Exception

+	 */

+	abstract public function sendRequest(HTTP_Request2 $request);

 

-    /**

-     * Calculates length of the request body, adds proper headers

-     *

-     * @param array &$headers associative array of request headers, this method

-     *                        will add proper 'Content-Length' and 'Content-Type'

-     *                        headers to this array (or remove them if not needed)

-     */

-    protected function calculateRequestLength(&$headers)

-    {

-        $this->requestBody = $this->request->getBody();

+	/**

+	 * Calculates length of the request body, adds proper headers

+	 *

+	 * @param array &$headers associative array of request headers, this method

+	 *                        will add proper 'Content-Length' and 'Content-Type'

+	 *                        headers to this array (or remove them if not needed)

+	 */

+	protected function calculateRequestLength(&$headers)

+	{

+		$this->requestBody = $this->request->getBody();

 

-        if (is_string($this->requestBody)) {

-            $this->contentLength = strlen($this->requestBody);

-        } elseif (is_resource($this->requestBody)) {

-            $stat = fstat($this->requestBody);

-            $this->contentLength = $stat['size'];

-            rewind($this->requestBody);

-        } else {

-            $this->contentLength = $this->requestBody->getLength();

-            $headers['content-type'] = 'multipart/form-data; boundary=' .

-                                       $this->requestBody->getBoundary();

-            $this->requestBody->rewind();

-        }

+		if (is_string($this->requestBody)) {

+			$this->contentLength = strlen($this->requestBody);

+		} elseif (is_resource($this->requestBody)) {

+			$stat = fstat($this->requestBody);

+			$this->contentLength = $stat['size'];

+			rewind($this->requestBody);

+		} else {

+			$this->contentLength = $this->requestBody->getLength();

+			$headers['content-type'] = 'multipart/form-data; boundary=' .

+									   $this->requestBody->getBoundary();

+			$this->requestBody->rewind();

+		}

 

-        if (in_array($this->request->getMethod(), self::$bodyDisallowed)

-            || 0 == $this->contentLength

-        ) {

-            // No body: send a Content-Length header nonetheless (request #12900),

-            // but do that only for methods that require a body (bug #14740)

-            if (in_array($this->request->getMethod(), self::$bodyRequired)) {

-                $headers['content-length'] = 0;

-            } else {

-                unset($headers['content-length']);

-                // if the method doesn't require a body and doesn't have a

-                // body, don't send a Content-Type header. (request #16799)

-                unset($headers['content-type']);

-            }

-        } else {

-            if (empty($headers['content-type'])) {

-                $headers['content-type'] = 'application/x-www-form-urlencoded';

-            }

-            // Content-Length should not be sent for chunked Transfer-Encoding (bug #20125)

-            if (!isset($headers['transfer-encoding'])) {

-                $headers['content-length'] = $this->contentLength;

-            }

-        }

-    }

+		if (in_array($this->request->getMethod(), self::$bodyDisallowed)

+			|| 0 == $this->contentLength

+		) {

+			// No body: send a Content-Length header nonetheless (request #12900),

+			// but do that only for methods that require a body (bug #14740)

+			if (in_array($this->request->getMethod(), self::$bodyRequired)) {

+				$headers['content-length'] = 0;

+			} else {

+				unset($headers['content-length']);

+				// if the method doesn't require a body and doesn't have a

+				// body, don't send a Content-Type header. (request #16799)

+				unset($headers['content-type']);

+			}

+		} else {

+			if (empty($headers['content-type'])) {

+				$headers['content-type'] = 'application/x-www-form-urlencoded';

+			}

+			// Content-Length should not be sent for chunked Transfer-Encoding (bug #20125)

+			if (!isset($headers['transfer-encoding'])) {

+				$headers['content-length'] = $this->contentLength;

+			}

+		}

+	}

 }

 ?>

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
             rewind($this->requestBody);

         } else {

             $this->contentLength = $this->requestBody->getLength();

-            $headers['content-type'] = 'multipart/form-data; boundary=' .

+            $headers['content-type'] = 'multipart/form-data; boundary='.

                                        $this->requestBody->getBoundary();

             $this->requestBody->rewind();

         }

modules/document/document.controller.php

Indentation +3 added lines, -3 removed lines

@@ -219,8 +219,8 @@ 
 		if(!$obj->email_address) $obj->email_address = '';
 		if(!$isRestore) $obj->ipaddress = $_SERVER['REMOTE_ADDR'];
 
-                // can modify regdate only manager
-                $grant = Context::get('grant');
+				// can modify regdate only manager
+				$grant = Context::get('grant');
 		if(!$grant->manager)
 		{
 			unset($obj->regdate);
@@ -422,7 +422,7 @@ 
 		if($obj->notify_message != 'Y') $obj->notify_message = 'N';
 		
 		// can modify regdate only manager
-                $grant = Context::get('grant');
+				$grant = Context::get('grant');
 		if(!$grant->manager)
 		{
 			unset($obj->regdate);

Doc Comments +2 added lines, -2 removed lines

@@ -716,7 +716,7 @@ 
 
 	/**
 	 * Move the doc into the trash
-	 * @param object $obj
+	 * @param stdClass $obj
 	 * @return object
 	 */
 	function moveDocumentToTrash($obj)
@@ -1811,7 +1811,7 @@ 
 	 * Occasionally the xml file is not generated after menu is configued on the admin page \n
 	 * The administrator can manually update the file in this case \n
 	 * Although the issue is not currently reproduced, it is unnecessay to remove.
-	 * @return void
+	 * @return BaseObject|null
 	 */
 	function procDocumentMakeXmlFile()
 	{

Spacing +369 added lines, -369 removed lines

@@ -24,19 +24,19 @@ 
 	 */
 	function procDocumentVoteUp()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_invalid_request');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_invalid_request');
 
 		$document_srl = Context::get('target_srl');
-		if(!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
 		$module_srl = $oDocument->get('module_srl');
-		if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oModuleModel = getModel('module');
-		$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
-		if($document_config->use_vote_up=='N') return new BaseObject(-1, 'msg_invalid_request');
+		$document_config = $oModuleModel->getModulePartConfig('document', $module_srl);
+		if ($document_config->use_vote_up == 'N') return new BaseObject(-1, 'msg_invalid_request');
 
 		$point = 1;
 		$output = $this->updateVotedCount($document_srl, $point);
@@ -69,19 +69,19 @@ 
 	 */
 	function procDocumentVoteDown()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_invalid_request');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_invalid_request');
 
 		$document_srl = Context::get('target_srl');
-		if(!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
 		$module_srl = $oDocument->get('module_srl');
-		if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oModuleModel = getModel('module');
-		$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
-		if($document_config->use_vote_down=='N') return new BaseObject(-1, 'msg_invalid_request');
+		$document_config = $oModuleModel->getModulePartConfig('document', $module_srl);
+		if ($document_config->use_vote_down == 'N') return new BaseObject(-1, 'msg_invalid_request');
 
 		$point = -1;
 		$output = $this->updateVotedCount($document_srl, $point);
@@ -95,10 +95,10 @@ 
 	 */
 	function procDocumentDeclare()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_invalid_request');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_invalid_request');
 
 		$document_srl = Context::get('target_srl');
-		if(!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 		return $this->declaredDocument($document_srl);
 	}
@@ -140,7 +140,7 @@ 
 		$args->history_srl = $history_srl;
 		$args->module_srl = $module_srl;
 		$args->document_srl = $document_srl;
-		if(!$args->history_srl && !$args->module_srl && !$args->document_srl) return;
+		if (!$args->history_srl && !$args->module_srl && !$args->document_srl) return;
 		executeQuery("document.deleteHistory", $args);
 	}
 
@@ -152,15 +152,15 @@ 
 	function triggerDeleteModuleDocuments(&$obj)
 	{
 		$module_srl = $obj->module_srl;
-		if(!$module_srl) return new BaseObject();
+		if (!$module_srl) return new BaseObject();
 		// Delete the document
 		$oDocumentAdminController = getAdminController('document');
 		$output = $oDocumentAdminController->deleteModuleDocument($module_srl);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Delete the category
 		$oDocumentController = getController('document');
 		$output = $oDocumentController->deleteModuleCategory($module_srl);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Delete extra key and variable, because module deleted
 		$this->deleteDocumentExtraKeys($module_srl);
 
@@ -193,7 +193,7 @@ 
 	 */
 	function insertDocument($obj, $manual_inserted = false, $isRestore = false, $isLatest = true)
 	{
-		if(!$manual_inserted && !checkCSRF())
+		if (!$manual_inserted && !checkCSRF())
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -202,32 +202,32 @@ 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
 		// List variables
-		if($obj->comment_status) $obj->commentStatus = $obj->comment_status;
-		if(!$obj->commentStatus) $obj->commentStatus = 'DENY';
-		if($obj->commentStatus == 'DENY') $this->_checkCommentStatusForOldVersion($obj);
-		if($obj->allow_trackback!='Y') $obj->allow_trackback = 'N';
-		if($obj->homepage) 
+		if ($obj->comment_status) $obj->commentStatus = $obj->comment_status;
+		if (!$obj->commentStatus) $obj->commentStatus = 'DENY';
+		if ($obj->commentStatus == 'DENY') $this->_checkCommentStatusForOldVersion($obj);
+		if ($obj->allow_trackback != 'Y') $obj->allow_trackback = 'N';
+		if ($obj->homepage) 
 		{
 			$obj->homepage = escape($obj->homepage);
-			if(!preg_match('/^[a-z]+:\/\//i',$obj->homepage))
+			if (!preg_match('/^[a-z]+:\/\//i', $obj->homepage))
 			{
 				$obj->homepage = 'http://'.$obj->homepage;
 			}
 		}
 		
-		if($obj->notify_message != 'Y') $obj->notify_message = 'N';
-		if(!$obj->email_address) $obj->email_address = '';
-		if(!$isRestore) $obj->ipaddress = $_SERVER['REMOTE_ADDR'];
+		if ($obj->notify_message != 'Y') $obj->notify_message = 'N';
+		if (!$obj->email_address) $obj->email_address = '';
+		if (!$isRestore) $obj->ipaddress = $_SERVER['REMOTE_ADDR'];
 
                 // can modify regdate only manager
                 $grant = Context::get('grant');
-		if(!$grant->manager)
+		if (!$grant->manager)
 		{
 			unset($obj->regdate);
 		}
 		
 		// Serialize the $extra_vars, check the extra_vars type, because duplicate serialized avoid
-		if(!is_string($obj->extra_vars)) $obj->extra_vars = serialize($obj->extra_vars);
+		if (!is_string($obj->extra_vars)) $obj->extra_vars = serialize($obj->extra_vars);
 		// Remove the columns for automatic saving
 		unset($obj->_saved_doc_srl);
 		unset($obj->_saved_doc_title);
@@ -235,34 +235,34 @@ 
 		unset($obj->_saved_doc_message);
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('document.insertDocument', 'before', $obj);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Register it if no given document_srl exists
-		if(!$obj->document_srl) $obj->document_srl = getNextSequence();
-		elseif(!$manual_inserted && !$isRestore && !checkUserSequence($obj->document_srl)) return new BaseObject(-1, 'msg_not_permitted');
+		if (!$obj->document_srl) $obj->document_srl = getNextSequence();
+		elseif (!$manual_inserted && !$isRestore && !checkUserSequence($obj->document_srl)) return new BaseObject(-1, 'msg_not_permitted');
 
 		$oDocumentModel = getModel('document');
 		// Set to 0 if the category_srl doesn't exist
-		if($obj->category_srl)
+		if ($obj->category_srl)
 		{
 			$category_list = $oDocumentModel->getCategoryList($obj->module_srl);
-			if(count($category_list) > 0 && !$category_list[$obj->category_srl]->grant)
+			if (count($category_list) > 0 && !$category_list[$obj->category_srl]->grant)
 			{
 				return new BaseObject(-1, 'msg_not_permitted');
 			}
-			if(count($category_list) > 0 && !$category_list[$obj->category_srl]) $obj->category_srl = 0;
+			if (count($category_list) > 0 && !$category_list[$obj->category_srl]) $obj->category_srl = 0;
 		}
 		// Set the read counts and update order.
-		if(!$obj->readed_count) $obj->readed_count = 0;
-		if($isLatest) $obj->update_order = $obj->list_order = $obj->document_srl * -1;
+		if (!$obj->readed_count) $obj->readed_count = 0;
+		if ($isLatest) $obj->update_order = $obj->list_order = $obj->document_srl * -1;
 		else $obj->update_order = $obj->list_order;
 		// Check the status of password hash for manually inserting. Apply hashing for otherwise.
-		if($obj->password && !$obj->password_is_hashed)
+		if ($obj->password && !$obj->password_is_hashed)
 		{
 			$obj->password = getModel('member')->hashPassword($obj->password);
 		}
 		// Insert member's information only if the member is logged-in and not manually registered.
 		$logged_info = Context::get('logged_info');
-		if(Context::get('is_logged') && !$manual_inserted && !$isRestore)
+		if (Context::get('is_logged') && !$manual_inserted && !$isRestore)
 		{
 			$obj->member_srl = $logged_info->member_srl;
 
@@ -276,61 +276,61 @@ 
 		// If the tile is empty, extract string from the contents.
 		$obj->title = htmlspecialchars($obj->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		settype($obj->title, "string");
-		if($obj->title == '') $obj->title = cut_str(trim(strip_tags(nl2br($obj->content))),20,'...');
+		if ($obj->title == '') $obj->title = cut_str(trim(strip_tags(nl2br($obj->content))), 20, '...');
 		// If no tile extracted from the contents, leave it untitled.
-		if($obj->title == '') $obj->title = 'Untitled';
+		if ($obj->title == '') $obj->title = 'Untitled';
 		// Remove XE's own tags from the contents.
 		$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
-		if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
+		if (Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
 		{
-			if($obj->use_html != 'Y')
+			if ($obj->use_html != 'Y')
 			{
 				$obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 			}
 			$obj->content = nl2br($obj->content);
 		}
 		// Remove iframe and script if not a top adminisrator in the session.
-		if($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content);
+		if ($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content);
 		// An error appears if both log-in info and user name don't exist.
-		if(!$logged_info->member_srl && !$obj->nick_name) return new BaseObject(-1,'msg_invalid_request');
+		if (!$logged_info->member_srl && !$obj->nick_name) return new BaseObject(-1, 'msg_invalid_request');
 
 		$obj->lang_code = Context::getLangType();
 		// Insert data into the DB
-		if(!$obj->status) $this->_checkDocumentStatusForOldVersion($obj);
+		if (!$obj->status) $this->_checkDocumentStatusForOldVersion($obj);
 		$output = executeQuery('document.insertDocument', $obj);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 		// Insert extra variables if the document successfully inserted.
 		$extra_keys = $oDocumentModel->getExtraKeys($obj->module_srl);
-		if(count($extra_keys))
+		if (count($extra_keys))
 		{
-			foreach($extra_keys as $idx => $extra_item)
+			foreach ($extra_keys as $idx => $extra_item)
 			{
 				$value = NULL;
-				if(isset($obj->{'extra_vars'.$idx}))
+				if (isset($obj->{'extra_vars'.$idx}))
 				{
 					$tmp = $obj->{'extra_vars'.$idx};
-					if(is_array($tmp))
+					if (is_array($tmp))
 						$value = implode('|@|', $tmp);
 					else
 						$value = trim($tmp);
 				}
-				else if(isset($obj->{$extra_item->name})) $value = trim($obj->{$extra_item->name});
-				if($value == NULL) continue;
+				else if (isset($obj->{$extra_item->name})) $value = trim($obj->{$extra_item->name});
+				if ($value == NULL) continue;
 
 				$this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, $idx, $value, $extra_item->eid);
 			}
 		}
 		// Update the category if the category_srl exists.
-		if($obj->category_srl) $this->updateCategoryCount($obj->module_srl, $obj->category_srl);
+		if ($obj->category_srl) $this->updateCategoryCount($obj->module_srl, $obj->category_srl);
 		// Call a trigger (after)
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$trigger_output = ModuleHandler::triggerCall('document.insertDocument', 'after', $obj);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -341,12 +341,12 @@ 
 		$oDB->commit();
 
 		// return
-		if(!$manual_inserted)
+		if (!$manual_inserted)
 		{
 			$this->addGrant($obj->document_srl);
 		}
-		$output->add('document_srl',$obj->document_srl);
-		$output->add('category_srl',$obj->category_srl);
+		$output->add('document_srl', $obj->document_srl);
+		$output->add('category_srl', $obj->category_srl);
 
 		return $output;
 	}
@@ -362,41 +362,41 @@ 
 	{
 		$logged_info = Context::get('logged_info');
 
-		if(!$manual_updated && !checkCSRF())
+		if (!$manual_updated && !checkCSRF())
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
-		if(!$source_obj->document_srl || !$obj->document_srl) return new BaseObject(-1,'msg_invalied_request');
-		if(!$obj->status && $obj->is_secret == 'Y') $obj->status = 'SECRET';
-		if(!$obj->status) $obj->status = 'PUBLIC';
+		if (!$source_obj->document_srl || !$obj->document_srl) return new BaseObject(-1, 'msg_invalied_request');
+		if (!$obj->status && $obj->is_secret == 'Y') $obj->status = 'SECRET';
+		if (!$obj->status) $obj->status = 'PUBLIC';
 
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('document.updateDocument', 'before', $obj);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// begin transaction
 		$oDB = &DB::getInstance();
 		$oDB->begin();
 
 		$oModuleModel = getModel('module');
-		if(!$obj->module_srl) $obj->module_srl = $source_obj->get('module_srl');
+		if (!$obj->module_srl) $obj->module_srl = $source_obj->get('module_srl');
 		$module_srl = $obj->module_srl;
 		$document_config = $oModuleModel->getModulePartConfig('document', $module_srl);
-		if(!$document_config)
+		if (!$document_config)
 		{
 			$document_config = new stdClass();
 		}
-		if(!isset($document_config->use_history)) $document_config->use_history = 'N';
+		if (!isset($document_config->use_history)) $document_config->use_history = 'N';
 		$bUseHistory = $document_config->use_history == 'Y' || $document_config->use_history == 'Trace';
 
-		if($bUseHistory)
+		if ($bUseHistory)
 		{
 			$args = new stdClass;
 			$args->history_srl = getNextSequence();
 			$args->document_srl = $obj->document_srl;
 			$args->module_srl = $module_srl;
-			if($document_config->use_history == 'Y') $args->content = $source_obj->get('content');
+			if ($document_config->use_history == 'Y') $args->content = $source_obj->get('content');
 			$args->nick_name = $source_obj->get('nick_name');
 			$args->member_srl = $source_obj->get('member_srl');
 			$args->regdate = $source_obj->get('last_update');
@@ -408,30 +408,30 @@ 
 			$obj->ipaddress = $source_obj->get('ipaddress');
 		}
 		// List variables
-		if($obj->comment_status) $obj->commentStatus = $obj->comment_status;
-		if(!$obj->commentStatus) $obj->commentStatus = 'DENY';
-		if($obj->commentStatus == 'DENY') $this->_checkCommentStatusForOldVersion($obj);
-		if($obj->allow_trackback!='Y') $obj->allow_trackback = 'N';
-		if($obj->homepage)
+		if ($obj->comment_status) $obj->commentStatus = $obj->comment_status;
+		if (!$obj->commentStatus) $obj->commentStatus = 'DENY';
+		if ($obj->commentStatus == 'DENY') $this->_checkCommentStatusForOldVersion($obj);
+		if ($obj->allow_trackback != 'Y') $obj->allow_trackback = 'N';
+		if ($obj->homepage)
 		{
 			$obj->homepage = escape($obj->homepage);
-			if(!preg_match('/^[a-z]+:\/\//i',$obj->homepage))
+			if (!preg_match('/^[a-z]+:\/\//i', $obj->homepage))
 			{
 				$obj->homepage = 'http://'.$obj->homepage;
 			}
 		}
 		
-		if($obj->notify_message != 'Y') $obj->notify_message = 'N';
+		if ($obj->notify_message != 'Y') $obj->notify_message = 'N';
 		
 		// can modify regdate only manager
                 $grant = Context::get('grant');
-		if(!$grant->manager)
+		if (!$grant->manager)
 		{
 			unset($obj->regdate);
 		}
 		
 		// Serialize the $extra_vars
-		if(!is_string($obj->extra_vars)) $obj->extra_vars = serialize($obj->extra_vars);
+		if (!is_string($obj->extra_vars)) $obj->extra_vars = serialize($obj->extra_vars);
 		// Remove the columns for automatic saving
 		unset($obj->_saved_doc_srl);
 		unset($obj->_saved_doc_title);
@@ -440,23 +440,23 @@ 
 
 		$oDocumentModel = getModel('document');
 		// Set the category_srl to 0 if the changed category is not exsiting.
-		if($source_obj->get('category_srl')!=$obj->category_srl)
+		if ($source_obj->get('category_srl') != $obj->category_srl)
 		{
 			$category_list = $oDocumentModel->getCategoryList($obj->module_srl);
-			if(!$category_list[$obj->category_srl]) $obj->category_srl = 0;
+			if (!$category_list[$obj->category_srl]) $obj->category_srl = 0;
 		}
 		// Change the update order
 		$obj->update_order = getNextSequence() * -1;
 		// Hash the password if it exists
-		if($obj->password)
+		if ($obj->password)
 		{
 			$obj->password = getModel('member')->hashPassword($obj->password);
 		}
 
 		// If an author is identical to the modifier or history is used, use the logged-in user's information.
-		if(Context::get('is_logged') && !$manual_updated)
+		if (Context::get('is_logged') && !$manual_updated)
 		{
-			if($source_obj->get('member_srl')==$logged_info->member_srl)
+			if ($source_obj->get('member_srl') == $logged_info->member_srl)
 			{
 				$obj->member_srl = $logged_info->member_srl;
 				$obj->user_name = htmlspecialchars_decode($logged_info->user_name);
@@ -467,7 +467,7 @@ 
 		}
 
 		// For the document written by logged-in user however no nick_name exists
-		if($source_obj->get('member_srl')&& !$obj->nick_name)
+		if ($source_obj->get('member_srl') && !$obj->nick_name)
 		{
 			$obj->member_srl = $source_obj->get('member_srl');
 			$obj->user_name = $source_obj->get('user_name');
@@ -478,24 +478,24 @@ 
 		// If the tile is empty, extract string from the contents.
 		$obj->title = htmlspecialchars($obj->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		settype($obj->title, "string");
-		if($obj->title == '') $obj->title = cut_str(strip_tags($obj->content),20,'...');
+		if ($obj->title == '') $obj->title = cut_str(strip_tags($obj->content), 20, '...');
 		// If no tile extracted from the contents, leave it untitled.
-		if($obj->title == '') $obj->title = 'Untitled';
+		if ($obj->title == '') $obj->title = 'Untitled';
 		// Remove XE's own tags from the contents.
 		$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
-		if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
+		if (Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
 		{
-			if($obj->use_html != 'Y')
+			if ($obj->use_html != 'Y')
 			{
 				$obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 			}
 			$obj->content = nl2br($obj->content);
 		}
 		// Change not extra vars but language code of the original document if document's lang_code is different from author's setting.
-		if($source_obj->get('lang_code') != Context::getLangType())
+		if ($source_obj->get('lang_code') != Context::getLangType())
 		{
 			// Change not extra vars but language code of the original document if document's lang_code doesn't exist.
-			if(!$source_obj->get('lang_code'))
+			if (!$source_obj->get('lang_code'))
 			{
 				$lang_code_args->document_srl = $source_obj->get('document_srl');
 				$lang_code_args->lang_code = Context::getLangType();
@@ -515,59 +515,59 @@ 
 			}
 		}
 		// Remove iframe and script if not a top adminisrator in the session.
-		if($logged_info->is_admin != 'Y')
+		if ($logged_info->is_admin != 'Y')
 		{
 			$obj->content = removeHackTag($obj->content);
 		}
 		// if temporary document, regdate is now setting
-		if($source_obj->get('status') == $this->getConfigStatus('temp')) $obj->regdate = date('YmdHis');
+		if ($source_obj->get('status') == $this->getConfigStatus('temp')) $obj->regdate = date('YmdHis');
 
 		// Insert data into the DB
 		$output = executeQuery('document.updateDocument', $obj);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 		// Remove all extra variables
-		if(Context::get('act')!='procFileDelete')
+		if (Context::get('act') != 'procFileDelete')
 		{
 			$this->deleteDocumentExtraVars($source_obj->get('module_srl'), $obj->document_srl, null, Context::getLangType());
 			// Insert extra variables if the document successfully inserted.
 			$extra_keys = $oDocumentModel->getExtraKeys($obj->module_srl);
-			if(count($extra_keys))
+			if (count($extra_keys))
 			{
-				foreach($extra_keys as $idx => $extra_item)
+				foreach ($extra_keys as $idx => $extra_item)
 				{
 					$value = NULL;
-					if(isset($obj->{'extra_vars'.$idx}))
+					if (isset($obj->{'extra_vars'.$idx}))
 					{
 						$tmp = $obj->{'extra_vars'.$idx};
-						if(is_array($tmp))
+						if (is_array($tmp))
 							$value = implode('|@|', $tmp);
 						else
 							$value = trim($tmp);
 					}
-					else if(isset($obj->{$extra_item->name})) $value = trim($obj->{$extra_item->name});
-					if($value == NULL) continue;
+					else if (isset($obj->{$extra_item->name})) $value = trim($obj->{$extra_item->name});
+					if ($value == NULL) continue;
 					$this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, $idx, $value, $extra_item->eid);
 				}
 			}
 			// Inert extra vars for multi-language support of title and contents.
-			if($extra_content->title) $this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, -1, $extra_content->title, 'title_'.Context::getLangType());
-			if($extra_content->content) $this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, -2, $extra_content->content, 'content_'.Context::getLangType());
+			if ($extra_content->title) $this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, -1, $extra_content->title, 'title_'.Context::getLangType());
+			if ($extra_content->content) $this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, -2, $extra_content->content, 'content_'.Context::getLangType());
 		}
 		// Update the category if the category_srl exists.
-		if($source_obj->get('category_srl') != $obj->category_srl || $source_obj->get('module_srl') == $logged_info->member_srl)
+		if ($source_obj->get('category_srl') != $obj->category_srl || $source_obj->get('module_srl') == $logged_info->member_srl)
 		{
-			if($source_obj->get('category_srl') != $obj->category_srl) $this->updateCategoryCount($obj->module_srl, $source_obj->get('category_srl'));
-			if($obj->category_srl) $this->updateCategoryCount($obj->module_srl, $obj->category_srl);
+			if ($source_obj->get('category_srl') != $obj->category_srl) $this->updateCategoryCount($obj->module_srl, $source_obj->get('category_srl'));
+			if ($obj->category_srl) $this->updateCategoryCount($obj->module_srl, $obj->category_srl);
 		}
 		// Call a trigger (after)
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$trigger_output = ModuleHandler::triggerCall('document.updateDocument', 'after', $obj);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -577,15 +577,15 @@ 
 		// commit
 		$oDB->commit();
 		// Remove the thumbnail file
-		FileHandler::removeDir(sprintf('files/thumbnails/%s',getNumberingPath($obj->document_srl, 3)));
+		FileHandler::removeDir(sprintf('files/thumbnails/%s', getNumberingPath($obj->document_srl, 3)));
 
-		$output->add('document_srl',$obj->document_srl);
+		$output->add('document_srl', $obj->document_srl);
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			//remove document item from cache
-			$cache_key = 'document_item:'. getNumberingPath($obj->document_srl) . $obj->document_srl;
+			$cache_key = 'document_item:'.getNumberingPath($obj->document_srl).$obj->document_srl;
 			$oCacheHandler->delete($cache_key);
 		}
 
@@ -606,33 +606,33 @@ 
 		$trigger_obj = new stdClass();
 		$trigger_obj->document_srl = $document_srl;
 		$output = ModuleHandler::triggerCall('document.deleteDocument', 'before', $trigger_obj);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// begin transaction
 		$oDB = &DB::getInstance();
 		$oDB->begin();
 
-		if(!$isEmptyTrash)
+		if (!$isEmptyTrash)
 		{
 			// get model object of the document
 			$oDocumentModel = getModel('document');
 			// Check if the documnet exists
 			$oDocument = $oDocumentModel->getDocument($document_srl, $is_admin);
 		}
-		else if($isEmptyTrash && $oDocument == null) return new BaseObject(-1, 'document is not exists');
+		else if ($isEmptyTrash && $oDocument == null) return new BaseObject(-1, 'document is not exists');
 
-		if(!$oDocument->isExists() || $oDocument->document_srl != $document_srl) return new BaseObject(-1, 'msg_invalid_document');
+		if (!$oDocument->isExists() || $oDocument->document_srl != $document_srl) return new BaseObject(-1, 'msg_invalid_document');
 		// Check if a permossion is granted
-		if(!$oDocument->isGranted()) return new BaseObject(-1, 'msg_not_permitted');
+		if (!$oDocument->isGranted()) return new BaseObject(-1, 'msg_not_permitted');
 
 		//if empty trash, document already deleted, therefore document not delete
 		$args = new stdClass();
 		$args->document_srl = $document_srl;
-		if(!$isEmptyTrash)
+		if (!$isEmptyTrash)
 		{
 			// Delete the document
 			$output = executeQuery('document.deleteDocument', $args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
@@ -643,7 +643,7 @@ 
 
 		$this->deleteDocumentHistory(null, $document_srl, null);
 		// Update category information if the category_srl exists.
-		if($oDocument->get('category_srl')) $this->updateCategoryCount($oDocument->get('module_srl'),$oDocument->get('category_srl'));
+		if ($oDocument->get('category_srl')) $this->updateCategoryCount($oDocument->get('module_srl'), $oDocument->get('category_srl'));
 		// Delete a declared list
 		executeQuery('document.deleteDeclared', $args);
 		// Delete extra variable
@@ -651,11 +651,11 @@ 
 
 		//this
 		// Call a trigger (after)
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$trigger_obj = $oDocument->getObjectVars();
 			$trigger_output = ModuleHandler::triggerCall('document.deleteDocument', 'after', $trigger_obj);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -667,16 +667,16 @@ 
 		$this->_deleteDocumentVotedLog($args);
 
 		// Remove the thumbnail file
-		FileHandler::removeDir(sprintf('files/thumbnails/%s',getNumberingPath($document_srl, 3)));
+		FileHandler::removeDir(sprintf('files/thumbnails/%s', getNumberingPath($document_srl, 3)));
 
 		// commit
 		$oDB->commit();
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$cache_key = 'document_item:'. getNumberingPath($document_srl) . $document_srl;
+			$cache_key = 'document_item:'.getNumberingPath($document_srl).$document_srl;
 			$oCacheHandler->delete($cache_key);
 		}
 
@@ -723,7 +723,7 @@ 
 	{
 		$trash_args = new stdClass();
 		// Get trash_srl if a given trash_srl doesn't exist
-		if(!$obj->trash_srl) $trash_args->trash_srl = getNextSequence();
+		if (!$obj->trash_srl) $trash_args->trash_srl = getNextSequence();
 		else $trash_args->trash_srl = $obj->trash_srl;
 		// Get its module_srl which the document belongs to
 		$oDocumentModel = getModel('document');
@@ -732,12 +732,12 @@ 
 		$trash_args->module_srl = $oDocument->get('module_srl');
 		$obj->module_srl = $oDocument->get('module_srl');
 		// Cannot throw data from the trash to the trash
-		if($trash_args->module_srl == 0) return false;
+		if ($trash_args->module_srl == 0) return false;
 		// Data setting
 		$trash_args->document_srl = $obj->document_srl;
 		$trash_args->description = $obj->description;
 		// Insert member's information only if the member is logged-in and not manually registered.
-		if(Context::get('is_logged')&&!$manual_inserted)
+		if (Context::get('is_logged') && !$manual_inserted)
 		{
 			$logged_info = Context::get('logged_info');
 			$trash_args->member_srl = $logged_info->member_srl;
@@ -773,14 +773,14 @@ 
 
 		$oTrashAdminController = getAdminController('trash');
 		$output = $oTrashAdminController->insertTrash($oTrashVO);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
 		$output = executeQuery('document.deleteDocument', $trash_args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -793,12 +793,12 @@ 
 		  }*/
 
 		// update category
-		if($oDocument->get('category_srl')) $this->updateCategoryCount($oDocument->get('module_srl'),$oDocument->get('category_srl'));
+		if ($oDocument->get('category_srl')) $this->updateCategoryCount($oDocument->get('module_srl'), $oDocument->get('category_srl'));
 
 		// remove thumbnails
-		FileHandler::removeDir(sprintf('files/thumbnails/%s',getNumberingPath($obj->document_srl, 3)));
+		FileHandler::removeDir(sprintf('files/thumbnails/%s', getNumberingPath($obj->document_srl, 3)));
 		// Set the attachment to be invalid state
-		if($oDocument->hasUploadedFiles())
+		if ($oDocument->hasUploadedFiles())
 		{
 			$args = new stdClass();
 			$args->upload_target_srl = $oDocument->document_srl;
@@ -806,10 +806,10 @@ 
 			executeQuery('file.updateFileValid', $args);
 		}
 		// Call a trigger (after)
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$trigger_output = ModuleHandler::triggerCall('document.moveDocumentToTrash', 'after', $obj);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -821,9 +821,9 @@ 
 
 		// Clear cache
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$cache_key = 'document_item:'. getNumberingPath($oDocument->document_srl) . $oDocument->document_srl;
+			$cache_key = 'document_item:'.getNumberingPath($oDocument->document_srl).$oDocument->document_srl;
 			$oCacheHandler->delete($cache_key);
 		}
 
@@ -838,7 +838,7 @@ 
 	function updateReadedCount(&$oDocument)
 	{
 		// Pass if Crawler access
-		if(isCrawler()) return false;
+		if (isCrawler()) return false;
 		
 		$document_srl = $oDocument->document_srl;
 		$member_srl = $oDocument->get('member_srl');
@@ -846,19 +846,19 @@ 
 
 		// Call a trigger when the read count is updated (before)
 		$trigger_output = ModuleHandler::triggerCall('document.updateReadedCount', 'before', $oDocument);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if (!$trigger_output->toBool()) return $trigger_output;
 
 		// Pass if read count is increaded on the session information
-		if($_SESSION['readed_document'][$document_srl]) return false;
+		if ($_SESSION['readed_document'][$document_srl]) return false;
 
 		// Pass if the author's IP address is as same as visitor's.
-		if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
+		if ($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
 		{
 			$_SESSION['readed_document'][$document_srl] = true;
 			return false;
 		}
 		// Pass ater registering sesscion if the author is a member and has same information as the currently logged-in user.
-		if($member_srl && $logged_info->member_srl == $member_srl)
+		if ($member_srl && $logged_info->member_srl == $member_srl)
 		{
 			$_SESSION['readed_document'][$document_srl] = true;
 			return false;
@@ -874,7 +874,7 @@ 
 
 		// Call a trigger when the read count is updated (after)
 		$trigger_output = ModuleHandler::triggerCall('document.updateReadedCount', 'after', $oDocument);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			$oDB->rollback();
 			return $trigger_output;
@@ -883,15 +883,15 @@ 
 		$oDB->commit();
 
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			//remove document item from cache
-			$cache_key = 'document_item:'. getNumberingPath($document_srl) . $document_srl;
+			$cache_key = 'document_item:'.getNumberingPath($document_srl).$document_srl;
 			$oCacheHandler->delete($cache_key);
 		}
 
 		// Register session
-		if(!$_SESSION['banned_document'][$document_srl]) 
+		if (!$_SESSION['banned_document'][$document_srl]) 
 		{
 			$_SESSION['readed_document'][$document_srl] = true;
 		}
@@ -914,21 +914,21 @@ 
 	 */
 	function insertDocumentExtraKey($module_srl, $var_idx, $var_name, $var_type, $var_is_required = 'N', $var_search = 'N', $var_default = '', $var_desc = '', $eid)
 	{
-		if(!$module_srl || !$var_idx || !$var_name || !$var_type || !$eid) return new BaseObject(-1,'msg_invalid_request');
+		if (!$module_srl || !$var_idx || !$var_name || !$var_type || !$eid) return new BaseObject(-1, 'msg_invalid_request');
 
 		$obj = new stdClass();
 		$obj->module_srl = $module_srl;
 		$obj->var_idx = $var_idx;
 		$obj->var_name = $var_name;
 		$obj->var_type = $var_type;
-		$obj->var_is_required = $var_is_required=='Y'?'Y':'N';
-		$obj->var_search = $var_search=='Y'?'Y':'N';
+		$obj->var_is_required = $var_is_required == 'Y' ? 'Y' : 'N';
+		$obj->var_search = $var_search == 'Y' ? 'Y' : 'N';
 		$obj->var_default = $var_default;
 		$obj->var_desc = $var_desc;
 		$obj->eid = $eid;
 
 		$output = executeQuery('document.getDocumentExtraKeys', $obj);
-		if(!$output->data)
+		if (!$output->data)
 		{
 			$output = executeQuery('document.insertDocumentExtraKey', $obj);
 		}
@@ -940,7 +940,7 @@ 
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$object_key = 'module_document_extra_keys:'.$module_srl;
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
@@ -958,42 +958,42 @@ 
 	 */
 	function deleteDocumentExtraKeys($module_srl, $var_idx = null)
 	{
-		if(!$module_srl) return new BaseObject(-1,'msg_invalid_request');
+		if (!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
 		$obj = new stdClass();
 		$obj->module_srl = $module_srl;
-		if(!is_null($var_idx)) $obj->var_idx = $var_idx;
+		if (!is_null($var_idx)) $obj->var_idx = $var_idx;
 
 		$oDB = DB::getInstance();
 		$oDB->begin();
 
 		$output = $oDB->executeQuery('document.deleteDocumentExtraKeys', $obj);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
-		if($var_idx != NULL)
+		if ($var_idx != NULL)
 		{
 			$output = $oDB->executeQuery('document.updateDocumentExtraKeyIdxOrder', $obj);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
 			}
 		}
 
-		$output =  executeQuery('document.deleteDocumentExtraVars', $obj);
-		if(!$output->toBool())
+		$output = executeQuery('document.deleteDocumentExtraVars', $obj);
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
-		if($var_idx != NULL)
+		if ($var_idx != NULL)
 		{
 			$output = $oDB->executeQuery('document.updateDocumentExtraVarIdxOrder', $obj);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
@@ -1003,7 +1003,7 @@ 
 		$oDB->commit();
 
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$object_key = 'module_document_extra_keys:'.$module_srl;
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
@@ -1025,8 +1025,8 @@ 
 	 */
 	function insertDocumentExtraVar($module_srl, $document_srl, $var_idx, $value, $eid = null, $lang_code = '')
 	{
-		if(!$module_srl || !$document_srl || !$var_idx || !isset($value)) return new BaseObject(-1,'msg_invalid_request');
-		if(!$lang_code) $lang_code = Context::getLangType();
+		if (!$module_srl || !$document_srl || !$var_idx || !isset($value)) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$lang_code) $lang_code = Context::getLangType();
 
 		$obj = new stdClass;
 		$obj->module_srl = $module_srl;
@@ -1052,10 +1052,10 @@ 
 	{
 		$obj = new stdClass();
 		$obj->module_srl = $module_srl;
-		if(!is_null($document_srl)) $obj->document_srl = $document_srl;
-		if(!is_null($var_idx)) $obj->var_idx = $var_idx;
-		if(!is_null($lang_code)) $obj->lang_code = $lang_code;
-		if(!is_null($eid)) $obj->eid = $eid;
+		if (!is_null($document_srl)) $obj->document_srl = $document_srl;
+		if (!is_null($var_idx)) $obj->var_idx = $var_idx;
+		if (!is_null($lang_code)) $obj->lang_code = $lang_code;
+		if (!is_null($eid)) $obj->eid = $eid;
 		$output = executeQuery('document.deleteDocumentExtraVars', $obj);
 		return $output;
 	}
@@ -1069,10 +1069,10 @@ 
 	 */
 	function updateVotedCount($document_srl, $point = 1)
 	{
-		if($point > 0) $failed_voted = 'failed_voted';
+		if ($point > 0) $failed_voted = 'failed_voted';
 		else $failed_voted = 'failed_blamed';
 		// Return fail if session already has information about votes
-		if($_SESSION['voted_document'][$document_srl])
+		if ($_SESSION['voted_document'][$document_srl])
 		{
 			return new BaseObject(-1, $failed_voted);
 		}
@@ -1080,7 +1080,7 @@ 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
 		// Pass if the author's IP address is as same as visitor's.
-		if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
+		if ($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
 		{
 			$_SESSION['voted_document'][$document_srl] = true;
 			return new BaseObject(-1, $failed_voted);
@@ -1091,10 +1091,10 @@ 
 		$member_srl = $oMemberModel->getLoggedMemberSrl();
 
 		// Check if document's author is a member.
-		if($oDocument->get('member_srl'))
+		if ($oDocument->get('member_srl'))
 		{
 			// Pass after registering a session if author's information is same as the currently logged-in user's.
-			if($member_srl && $member_srl == abs($oDocument->get('member_srl')))
+			if ($member_srl && $member_srl == abs($oDocument->get('member_srl')))
 			{
 				$_SESSION['voted_document'][$document_srl] = true;
 				return new BaseObject(-1, $failed_voted);
@@ -1103,7 +1103,7 @@ 
 
 		// Use member_srl for logged-in members and IP address for non-members.
 		$args = new stdClass;
-		if($member_srl)
+		if ($member_srl)
 		{
 			$args->member_srl = $member_srl;
 		}
@@ -1114,7 +1114,7 @@ 
 		$args->document_srl = $document_srl;
 		$output = executeQuery('document.getDocumentVotedLogInfo', $args);
 		// Pass after registering a session if log information has vote-up logs
-		if($output->data->count)
+		if ($output->data->count)
 		{
 			$_SESSION['voted_document'][$document_srl] = true;
 			return new BaseObject(-1, $failed_voted);
@@ -1130,7 +1130,7 @@ 
 		$trigger_obj->before_point = ($point < 0) ? $oDocument->get('blamed_count') : $oDocument->get('voted_count');
 		$trigger_obj->after_point = $trigger_obj->before_point + $point;
 		$trigger_output = ModuleHandler::triggerCall('document.updateVotedCount', 'before', $trigger_obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			return $trigger_output;
 		}
@@ -1140,7 +1140,7 @@ 
 		$oDB->begin();
 
 		// Update the voted count
-		if($trigger_obj->update_target === 'blamed_count')
+		if ($trigger_obj->update_target === 'blamed_count')
 		{
 			$args->blamed_count = $trigger_obj->after_point;
 			$output = executeQuery('document.updateBlamedCount', $args);
@@ -1150,16 +1150,16 @@ 
 			$args->voted_count = $trigger_obj->after_point;
 			$output = executeQuery('document.updateVotedCount', $args);
 		}
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// Leave logs
 		$args->point = $trigger_obj->point;
 		$output = executeQuery('document.insertDocumentVotedLog', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// Call a trigger (after)
 		$trigger_output = ModuleHandler::triggerCall('document.updateVotedCount', 'after', $trigger_obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			$oDB->rollback();
 			return $trigger_output;
@@ -1168,10 +1168,10 @@ 
 		$oDB->commit();
 
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			//remove document item from cache
-			$cache_key = 'document_item:'. getNumberingPath($document_srl) . $document_srl;
+			$cache_key = 'document_item:'.getNumberingPath($document_srl).$document_srl;
 			$oCacheHandler->delete($cache_key);
 		}
 
@@ -1180,7 +1180,7 @@ 
 
 		// Return result
 		$output = new BaseObject();
-		if($trigger_obj->update_target === 'voted_count')
+		if ($trigger_obj->update_target === 'voted_count')
 		{
 			$output->setMessage('success_voted');
 			$output->add('voted_count', $trigger_obj->after_point);
@@ -1202,13 +1202,13 @@ 
 	function declaredDocument($document_srl)
 	{
 		// Fail if session information already has a reported document
-		if($_SESSION['declared_document'][$document_srl]) return new BaseObject(-1, 'failed_declared');
+		if ($_SESSION['declared_document'][$document_srl]) return new BaseObject(-1, 'failed_declared');
 
 		// Check if previously reported
 		$args = new stdClass();
 		$args->document_srl = $document_srl;
 		$output = executeQuery('document.getDeclaredDocument', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$declared_count = ($output->data->declared_count) ? $output->data->declared_count : 0;
 
@@ -1218,7 +1218,7 @@ 
 
 		// Call a trigger (before)
 		$trigger_output = ModuleHandler::triggerCall('document.declaredDocument', 'before', $trigger_obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			return $trigger_output;
 		}
@@ -1228,19 +1228,19 @@ 
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
 
 		// Pass if the author's IP address is as same as visitor's.
-		if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR']) {
+		if ($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR']) {
 			$_SESSION['declared_document'][$document_srl] = true;
 			return new BaseObject(-1, 'failed_declared');
 		}
 
 		// Check if document's author is a member.
-		if($oDocument->get('member_srl'))
+		if ($oDocument->get('member_srl'))
 		{
 			// Create a member model object
 			$oMemberModel = getModel('member');
 			$member_srl = $oMemberModel->getLoggedMemberSrl();
 			// Pass after registering a session if author's information is same as the currently logged-in user's.
-			if($member_srl && $member_srl == abs($oDocument->get('member_srl')))
+			if ($member_srl && $member_srl == abs($oDocument->get('member_srl')))
 			{
 				$_SESSION['declared_document'][$document_srl] = true;
 				return new BaseObject(-1, 'failed_declared');
@@ -1249,7 +1249,7 @@ 
 
 		// Use member_srl for logged-in members and IP address for non-members.
 		$args = new stdClass;
-		if($member_srl)
+		if ($member_srl)
 		{
 			$args->member_srl = $member_srl;
 		}
@@ -1262,7 +1262,7 @@ 
 		$output = executeQuery('document.getDocumentDeclaredLogInfo', $args);
 
 		// Pass after registering a sesson if reported/declared documents are in the logs.
-		if($output->data->count)
+		if ($output->data->count)
 		{
 			$_SESSION['declared_document'][$document_srl] = true;
 			return new BaseObject(-1, 'failed_declared');
@@ -1273,23 +1273,23 @@ 
 		$oDB->begin();
 
 		// Add the declared document
-		if($declared_count > 0) $output = executeQuery('document.updateDeclaredDocument', $args);
+		if ($declared_count > 0) $output = executeQuery('document.updateDeclaredDocument', $args);
 		else $output = executeQuery('document.insertDeclaredDocument', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Leave logs
 		$output = executeQuery('document.insertDocumentDeclaredLog', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
-		$this->add('declared_count', $declared_count+1);
+		$this->add('declared_count', $declared_count + 1);
 
 		// Call a trigger (after)
 		$trigger_obj->declared_count = $declared_count + 1;
 		$trigger_output = ModuleHandler::triggerCall('document.declaredDocument', 'after', $trigger_obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			$oDB->rollback();
 			return $trigger_output;
@@ -1319,16 +1319,16 @@ 
 		$args->document_srl = $document_srl;
 		$args->comment_count = $comment_count;
 
-		if($comment_inserted)
+		if ($comment_inserted)
 		{
-			$args->update_order = -1*getNextSequence();
+			$args->update_order = -1 * getNextSequence();
 			$args->last_updater = $last_updater;
 
 			$oCacheHandler = CacheHandler::getInstance('object');
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				//remove document item from cache
-				$cache_key = 'document_item:'. getNumberingPath($document_srl) . $document_srl;
+				$cache_key = 'document_item:'.getNumberingPath($document_srl).$document_srl;
 				$oCacheHandler->delete($cache_key);
 			}
 		}
@@ -1349,10 +1349,10 @@ 
 		$args->trackback_count = $trackback_count;
 
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			//remove document item from cache
-			$cache_key = 'document_item:'. getNumberingPath($document_srl) . $document_srl;
+			$cache_key = 'document_item:'.getNumberingPath($document_srl).$document_srl;
 			$oCacheHandler->delete($cache_key);
 		}
 
@@ -1367,14 +1367,14 @@ 
 	function insertCategory($obj)
 	{
 		// Sort the order to display if a child category is added
-		if($obj->parent_srl)
+		if ($obj->parent_srl)
 		{
 			// Get its parent category
 			$oDocumentModel = getModel('document');
 			$parent_category = $oDocumentModel->getCategory($obj->parent_srl);
 			$obj->list_order = $parent_category->list_order;
-			$this->updateCategoryListOrder($parent_category->module_srl, $parent_category->list_order+1);
-			if(!$obj->category_srl) $obj->category_srl = getNextSequence();
+			$this->updateCategoryListOrder($parent_category->module_srl, $parent_category->list_order + 1);
+			if (!$obj->category_srl) $obj->category_srl = getNextSequence();
 		}
 		else
 		{
@@ -1382,7 +1382,7 @@ 
 		}
 
 		$output = executeQuery('document.insertCategory', $obj);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$output->add('category_srl', $obj->category_srl);
 			$this->makeCategoryFile($obj->module_srl);
@@ -1416,13 +1416,13 @@ 
 	{
 		// Create a document model object
 		$oDocumentModel = getModel('document');
-		if(!$document_count) $document_count = $oDocumentModel->getCategoryDocumentCount($module_srl,$category_srl);
+		if (!$document_count) $document_count = $oDocumentModel->getCategoryDocumentCount($module_srl, $category_srl);
 
 		$args = new stdClass;
 		$args->category_srl = $category_srl;
 		$args->document_count = $document_count;
 		$output = executeQuery('document.updateCategoryCount', $args);
-		if($output->toBool()) $this->makeCategoryFile($module_srl);
+		if ($output->toBool()) $this->makeCategoryFile($module_srl);
 
 		return $output;
 	}
@@ -1435,7 +1435,7 @@ 
 	function updateCategory($obj)
 	{
 		$output = executeQuery('document.updateCategory', $obj);
-		if($output->toBool()) $this->makeCategoryFile($obj->module_srl);
+		if ($output->toBool()) $this->makeCategoryFile($obj->module_srl);
 		return $output;
 	}
 
@@ -1452,32 +1452,32 @@ 
 		$category_info = $oDocumentModel->getCategory($category_srl);
 		// Display an error that the category cannot be deleted if it has a child
 		$output = executeQuery('document.getChildCategoryCount', $args);
-		if(!$output->toBool()) return $output;
-		if($output->data->count>0) return new BaseObject(-1, 'msg_cannot_delete_for_child');
+		if (!$output->toBool()) return $output;
+		if ($output->data->count > 0) return new BaseObject(-1, 'msg_cannot_delete_for_child');
 		// Delete a category information
 		$output = executeQuery('document.deleteCategory', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->makeCategoryFile($category_info->module_srl);
 		// remvove cache
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$page = 0;
-			while(true) {
+			while (true) {
 				$args = new stdClass();
 				$args->category_srl = $category_srl;
 				$args->list_count = 100;
 				$args->page = ++$page;
 				$output = executeQuery('document.getDocumentList', $args, array('document_srl'));
 
-				if($output->data == array())
+				if ($output->data == array())
 					break;
 
-				foreach($output->data as $val)
+				foreach ($output->data as $val)
 				{
 					//remove document item from cache
-					$cache_key = 'document_item:'. getNumberingPath($val->document_srl) . $val->document_srl;
+					$cache_key = 'document_item:'.getNumberingPath($val->document_srl).$val->document_srl;
 					$oCacheHandler->delete($cache_key);
 				}
 			}
@@ -1524,18 +1524,18 @@ 
 		// Seek a full list of categories
 		$category_list = $oDocumentModel->getCategoryList($module_srl);
 		$category_srl_list = array_keys($category_list);
-		if(count($category_srl_list)<2) return new BaseObject();
+		if (count($category_srl_list) < 2) return new BaseObject();
 
 		$prev_category = NULL;
-		foreach($category_list as $key => $val)
+		foreach ($category_list as $key => $val)
 		{
-			if($key==$category_srl) break;
+			if ($key == $category_srl) break;
 			$prev_category = $val;
 		}
 		// Return if the previous category doesn't exist
-		if(!$prev_category) return new BaseObject(-1,Context::getLang('msg_category_not_moved'));
+		if (!$prev_category) return new BaseObject(-1, Context::getLang('msg_category_not_moved'));
 		// Return if the selected category is the top level
-		if($category_srl_list[0]==$category_srl) return new BaseObject(-1,Context::getLang('msg_category_not_moved'));
+		if ($category_srl_list[0] == $category_srl) return new BaseObject(-1, Context::getLang('msg_category_not_moved'));
 		// Information of the selected category
 		$cur_args = new stdClass;
 		$cur_args->category_srl = $category_srl;
@@ -1571,15 +1571,15 @@ 
 		// Seek a full list of categories
 		$category_list = $oDocumentModel->getCategoryList($module_srl);
 		$category_srl_list = array_keys($category_list);
-		if(count($category_srl_list)<2) return new BaseObject();
+		if (count($category_srl_list) < 2) return new BaseObject();
 
-		for($i=0;$i<count($category_srl_list);$i++)
+		for ($i = 0; $i < count($category_srl_list); $i++)
 		{
-			if($category_srl_list[$i]==$category_srl) break;
+			if ($category_srl_list[$i] == $category_srl) break;
 		}
 
-		$next_category_srl = $category_srl_list[$i+1];
-		if(!$category_list[$next_category_srl]) return new BaseObject(-1,Context::getLang('msg_category_not_moved'));
+		$next_category_srl = $category_srl_list[$i + 1];
+		if (!$category_list[$next_category_srl]) return new BaseObject(-1, Context::getLang('msg_category_not_moved'));
 		$next_category = $category_list[$next_category_srl];
 		// Information of the selected category
 		$cur_args = new stdClass;
@@ -1606,7 +1606,7 @@ 
 	{
 		$oDocumentModel = getModel('document');
 		$extra_keys = $oDocumentModel->getExtraKeys($module_srl);
-		if(!count($extra_keys)) return;
+		if (!count($extra_keys)) return;
 
 		$js_code = array();
 		$js_code[] = '<script>//<![CDATA[';
@@ -1616,16 +1616,16 @@ 
 
 		$logged_info = Context::get('logged_info');
 
-		foreach($extra_keys as $idx => $val)
+		foreach ($extra_keys as $idx => $val)
 		{
 			$idx = $val->idx;
-			if($val->type == 'kr_zip')
+			if ($val->type == 'kr_zip')
 			{
 				$idx .= '[]';
 			}
 			$name = str_ireplace(array('<script', '</script'), array('<scr" + "ipt', '</scr" + "ipt'), $val->name);
 			$js_code[] = sprintf('validator.cast("ADD_MESSAGE", ["extra_vars%s","%s"]);', $idx, $name);
-			if($val->is_required == 'Y') $js_code[] = sprintf('validator.cast("ADD_EXTRA_FIELD", ["extra_vars%s", { required:true }]);', $idx);
+			if ($val->is_required == 'Y') $js_code[] = sprintf('validator.cast("ADD_EXTRA_FIELD", ["extra_vars%s", { required:true }]);', $idx);
 		}
 
 		$js_code[] = '})(jQuery);';
@@ -1643,12 +1643,12 @@ 
 	function procDocumentInsertCategory($args = null)
 	{
 		// List variables
-		if(!$args) $args = Context::gets('module_srl','category_srl','parent_srl','category_title','category_description','expand','group_srls','category_color','mid');
+		if (!$args) $args = Context::gets('module_srl', 'category_srl', 'parent_srl', 'category_title', 'category_description', 'expand', 'group_srls', 'category_color', 'mid');
 		$args->title = $args->category_title;
 		$args->description = $args->category_description;
 		$args->color = $args->category_color;
 
-		if(!$args->module_srl && $args->mid)
+		if (!$args->module_srl && $args->mid)
 		{
 			$mid = $args->mid;
 			unset($args->mid);
@@ -1659,28 +1659,28 @@ 
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
-		if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
+		if (!$grant->manager) return new BaseObject(-1, 'msg_not_permitted');
 
-		if($args->expand !="Y") $args->expand = "N";
-		if(!is_array($args->group_srls)) $args->group_srls = str_replace('|@|',',',$args->group_srls);
+		if ($args->expand != "Y") $args->expand = "N";
+		if (!is_array($args->group_srls)) $args->group_srls = str_replace('|@|', ',', $args->group_srls);
 		else $args->group_srls = implode(',', $args->group_srls);
-		$args->parent_srl = (int)$args->parent_srl;
+		$args->parent_srl = (int) $args->parent_srl;
 
 		$oDocumentModel = getModel('document');
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
 		// Check if already exists
-		if($args->category_srl)
+		if ($args->category_srl)
 		{
 			$category_info = $oDocumentModel->getCategory($args->category_srl);
-			if($category_info->category_srl != $args->category_srl) $args->category_srl = null;
+			if ($category_info->category_srl != $args->category_srl) $args->category_srl = null;
 		}
 		// Update if exists
-		if($args->category_srl)
+		if ($args->category_srl)
 		{
 			$output = $this->updateCategory($args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
@@ -1690,7 +1690,7 @@ 
 		else
 		{
 			$output = $this->insertCategory($args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
@@ -1729,11 +1729,11 @@ 
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($source_category->module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
-		if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
+		if (!$grant->manager) return new BaseObject(-1, 'msg_not_permitted');
 
 		// First child of the parent_category_srl
 		$source_args = new stdClass;
-		if($parent_category_srl > 0 || ($parent_category_srl == 0 && $target_category_srl == 0))
+		if ($parent_category_srl > 0 || ($parent_category_srl == 0 && $target_category_srl == 0))
 		{
 			$parent_category = $oDocumentModel->getCategory($parent_category_srl);
 
@@ -1742,30 +1742,30 @@ 
 			$args->parent_srl = $parent_category_srl;
 			$output = executeQuery('document.getChildCategoryMinListOrder', $args);
 
-			if(!$output->toBool()) return $output;
-			$args->list_order = (int)$output->data->list_order;
-			if(!$args->list_order) $args->list_order = 0;
+			if (!$output->toBool()) return $output;
+			$args->list_order = (int) $output->data->list_order;
+			if (!$args->list_order) $args->list_order = 0;
 			$args->list_order--;
 
 			$source_args->category_srl = $source_category_srl;
 			$source_args->parent_srl = $parent_category_srl;
 			$source_args->list_order = $args->list_order;
 			$output = $this->updateCategory($source_args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 			// Sibling of the $target_category_srl
 		}
-		else if($target_category_srl > 0)
+		else if ($target_category_srl > 0)
 		{
 			$target_category = $oDocumentModel->getCategory($target_category_srl);
 			// Move all siblings of the $target_category down
-			$output = $this->updateCategoryListOrder($target_category->module_srl, $target_category->list_order+1);
-			if(!$output->toBool()) return $output;
+			$output = $this->updateCategoryListOrder($target_category->module_srl, $target_category->list_order + 1);
+			if (!$output->toBool()) return $output;
 
 			$source_args->category_srl = $source_category_srl;
 			$source_args->parent_srl = $target_category->parent_srl;
-			$source_args->list_order = $target_category->list_order+1;
+			$source_args->list_order = $target_category->list_order + 1;
 			$output = $this->updateCategory($source_args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 		// Re-generate the xml file
 		$xml_file = $this->makeCategoryFile($source_category->module_srl);
@@ -1781,7 +1781,7 @@ 
 	function procDocumentDeleteCategory()
 	{
 		// List variables
-		$args = Context::gets('module_srl','category_srl');
+		$args = Context::gets('module_srl', 'category_srl');
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -1790,17 +1790,17 @@ 
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
-		if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
+		if (!$grant->manager) return new BaseObject(-1, 'msg_not_permitted');
 
 		$oDocumentModel = getModel('document');
 		// Get original information
 		$category_info = $oDocumentModel->getCategory($args->category_srl);
-		if($category_info->parent_srl) $parent_srl = $category_info->parent_srl;
+		if ($category_info->parent_srl) $parent_srl = $category_info->parent_srl;
 		// Display an error that the category cannot be deleted if it has a child node
-		if($oDocumentModel->getCategoryChlidCount($args->category_srl)) return new BaseObject(-1, 'msg_cannot_delete_for_child');
+		if ($oDocumentModel->getCategoryChlidCount($args->category_srl)) return new BaseObject(-1, 'msg_cannot_delete_for_child');
 		// Remove from the DB
 		$output = $this->deleteCategory($args->category_srl);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -1831,11 +1831,11 @@ 
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
-		if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
+		if (!$grant->manager) return new BaseObject(-1, 'msg_not_permitted');
 
 		$xml_file = $this->makeCategoryFile($module_srl);
 		// Set return value
-		$this->add('xml_file',$xml_file);
+		$this->add('xml_file', $xml_file);
 	}
 
 	/**
@@ -1846,9 +1846,9 @@ 
 	function makeCategoryFile($module_srl)
 	{
 		// Return if there is no information you need for creating a cache file
-		if(!$module_srl) return false;
+		if (!$module_srl) return false;
 
-		$module_srl = (int)$module_srl;
+		$module_srl = (int) $module_srl;
 
 		// Get module information (to obtain mid)
 		$oModuleModel = getModel('module');
@@ -1856,7 +1856,7 @@ 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
 		$mid = $module_info->mid;
 
-		if(!is_dir('./files/cache/document_category')) FileHandler::makeDir('./files/cache/document_category');
+		if (!is_dir('./files/cache/document_category')) FileHandler::makeDir('./files/cache/document_category');
 		// Cache file's name
 		$xml_file = sprintf("./files/cache/document_category/%s.xml.php", $module_srl);
 		$php_file = sprintf("./files/cache/document_category/%s.php", $module_srl);
@@ -1868,17 +1868,17 @@ 
 
 		$category_list = $output->data;
 
-		if(!is_array($category_list)) $category_list = array($category_list);
+		if (!is_array($category_list)) $category_list = array($category_list);
 
 		$category_count = count($category_list);
-		for($i=0;$i<$category_count;$i++)
+		for ($i = 0; $i < $category_count; $i++)
 		{
 			$category_srl = $category_list[$i]->category_srl;
-			if(!preg_match('/^[0-9,]+$/', $category_list[$i]->group_srls)) $category_list[$i]->group_srls = '';
+			if (!preg_match('/^[0-9,]+$/', $category_list[$i]->group_srls)) $category_list[$i]->group_srls = '';
 			$list[$category_srl] = $category_list[$i];
 		}
 		// Create the xml file without node data if no data is obtained
-		if(!$list)
+		if (!$list)
 		{
 			$xml_buff = "<root />";
 			FileHandler::writeFile($xml_file, $xml_buff);
@@ -1886,12 +1886,12 @@ 
 			return $xml_file;
 		}
 		// Change to an array if only a single data is obtained
-		if(!is_array($list)) $list = array($list);
+		if (!is_array($list)) $list = array($list);
 		// Create a tree for loop
-		foreach($list as $category_srl => $node)
+		foreach ($list as $category_srl => $node)
 		{
 			$node->mid = $mid;
-			$parent_srl = (int)$node->parent_srl;
+			$parent_srl = (int) $node->parent_srl;
 			$tree[$parent_srl][$category_srl] = $node;
 		}
 		// A common header to set permissions and groups of the cache file
@@ -1965,13 +1965,13 @@ 
 	 */
 	function getXmlTree($source_node, $tree, $site_srl, &$xml_header_buff)
 	{
-		if(!$source_node) return;
+		if (!$source_node) return;
 
-		foreach($source_node as $category_srl => $node)
+		foreach ($source_node as $category_srl => $node)
 		{
 			$child_buff = "";
 			// Get data of the child nodes
-			if($category_srl && $tree[$category_srl]) $child_buff = $this->getXmlTree($tree[$category_srl], $tree, $site_srl, $xml_header_buff);
+			if ($category_srl && $tree[$category_srl]) $child_buff = $this->getXmlTree($tree[$category_srl], $tree, $site_srl, $xml_header_buff);
 			// List variables
 			$expand = ($node->expand) ? $node->expand : 'N';
 			$group_srls = ($node->group_srls) ? $node->group_srls : '';
@@ -1981,27 +1981,27 @@ 
 			$color = ($node->color) ? $node->color : '';
 			$description = ($node->description) ? $node->description : '';
 			// If node->group_srls value exists
-			if($group_srls) $group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s)))))',$group_srls);
+			if ($group_srls) $group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s)))))', $group_srls);
 			else $group_check_code = "true";
 
 			$title = $node->title;
 			$oModuleAdminModel = getAdminModel('module');
 
 			$langs = $oModuleAdminModel->getLangCode($site_srl, $title);
-			if(count($langs))
+			if (count($langs))
 			{
-				foreach($langs as $key => $val)
+				foreach ($langs as $key => $val)
 				{
-					$xml_header_buff .= sprintf('$_titles[%d]["%s"] = %s; ', $category_srl, $key, var_export(str_replace('"','\\"',htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)), true));
+					$xml_header_buff .= sprintf('$_titles[%d]["%s"] = %s; ', $category_srl, $key, var_export(str_replace('"', '\\"', htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)), true));
 				}
 			}
 
 			$langx = $oModuleAdminModel->getLangCode($site_srl, $description);
-			if(count($langx))
+			if (count($langx))
 			{
-				foreach($langx as $key => $val)
+				foreach ($langx as $key => $val)
 				{
-					$xml_header_buff .= sprintf('$_descriptions[%d]["%s"] = %s; ', $category_srl, $key, var_export(str_replace('"','\\"',htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)), true));
+					$xml_header_buff .= sprintf('$_descriptions[%d]["%s"] = %s; ', $category_srl, $key, var_export(str_replace('"', '\\"', htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)), true));
 				}
 			}
 
@@ -2014,7 +2014,7 @@ 
 				$category_srl,
 				$group_check_code,
 				$category_srl,
-				var_export(getUrl('','mid',$node->mid,'category',$category_srl), true),
+				var_export(getUrl('', 'mid', $node->mid, 'category', $category_srl), true),
 				var_export($expand, true),
 				var_export($color, true),
 				$group_check_code,
@@ -2022,8 +2022,8 @@ 
 				$node->document_count
 			);
 
-			if($child_buff) $buff .= sprintf('<node %s>%s</node>', $attribute, $child_buff);
-			else $buff .=  sprintf('<node %s />', $attribute);
+			if ($child_buff) $buff .= sprintf('<node %s>%s</node>', $attribute, $child_buff);
+			else $buff .= sprintf('<node %s />', $attribute);
 		}
 		return $buff;
 	}
@@ -2042,13 +2042,13 @@ 
 	function getPhpCacheCode($source_node, $tree, $site_srl, &$php_header_buff)
 	{
 		$output = array("buff"=>"", "category_srl_list"=>array());
-		if(!$source_node) return $output;
+		if (!$source_node) return $output;
 
 		// Set to an arraty for looping and then generate php script codes to be included
-		foreach($source_node as $category_srl => $node)
+		foreach ($source_node as $category_srl => $node)
 		{
 			// Get data from child nodes first if exist.
-			if($category_srl && $tree[$category_srl]){
+			if ($category_srl && $tree[$category_srl]) {
 				$child_output = $this->getPhpCacheCode($tree[$category_srl], $tree, $site_srl, $php_header_buff);
 			} else {
 				$child_output = array("buff"=>"", "category_srl_list"=>array());
@@ -2059,14 +2059,14 @@ 
 			$output['category_srl_list'] = array_merge($output['category_srl_list'], $child_output['category_srl_list']);
 
 			// If node->group_srls value exists
-			if($node->group_srls) {
-				$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s)))))',$node->group_srls);
+			if ($node->group_srls) {
+				$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s)))))', $node->group_srls);
 			} else {
 				$group_check_code = "true";
 			}
 
 			// List variables
-			$selected = '"' . implode('","', $child_output['category_srl_list']) . '"';
+			$selected = '"'.implode('","', $child_output['category_srl_list']).'"';
 			$child_buff = $child_output['buff'];
 			$expand = $node->expand;
 
@@ -2075,32 +2075,32 @@ 
 			$oModuleAdminModel = getAdminModel('module');
 			$langs = $oModuleAdminModel->getLangCode($site_srl, $title);
 
-			if(count($langs))
+			if (count($langs))
 			{
-				foreach($langs as $key => $val)
+				foreach ($langs as $key => $val)
 				{
 					$val = htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 					$php_header_buff .= sprintf(
 						'$_titles[%d]["%s"] = %s; ',
 						$category_srl,
 						$key,
-						var_export(str_replace('"','\\"', $val), true)
+						var_export(str_replace('"', '\\"', $val), true)
 					);
 				}
 			}
 
 			$langx = $oModuleAdminModel->getLangCode($site_srl, $description);
 
-			if(count($langx))
+			if (count($langx))
 			{
-				foreach($langx as $key => $val)
+				foreach ($langx as $key => $val)
 				{
 					$val = htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 					$php_header_buff .= sprintf(
 						'$_descriptions[%d]["%s"] = %s; ',
 						$category_srl,
 						$key,
-						var_export(str_replace('"','\\"', $val), true)
+						var_export(str_replace('"', '\\"', $val), true)
 					);
 				}
 			}
@@ -2124,7 +2124,7 @@ 
 			);
 
 			// Generate buff data
-			$output['buff'] .=  sprintf('%s=>array(%s),', $node->category_srl, $attribute);
+			$output['buff'] .= sprintf('%s=>array(%s),', $node->category_srl, $attribute);
 		}
 
 		return $output;
@@ -2141,7 +2141,7 @@ 
 	function addDocumentPopupMenu($url, $str, $icon = '', $target = 'self')
 	{
 		$document_popup_menu_list = Context::get('document_popup_menu_list');
-		if(!is_array($document_popup_menu_list)) $document_popup_menu_list = array();
+		if (!is_array($document_popup_menu_list)) $document_popup_menu_list = array();
 
 		$obj = new stdClass();
 		$obj->url = $url;
@@ -2159,68 +2159,68 @@ 
 	 */
 	function procDocumentAddCart()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted');
 
 		// Get document_srl
-		$srls = explode(',',Context::get('srls'));
-		for($i = 0; $i < count($srls); $i++)
+		$srls = explode(',', Context::get('srls'));
+		for ($i = 0; $i < count($srls); $i++)
 		{
 			$srl = trim($srls[$i]);
 
-			if(!$srl) continue;
+			if (!$srl) continue;
 
 			$document_srls[] = $srl;
 		}
-		if(!count($document_srls)) return;
+		if (!count($document_srls)) return;
 
 		// Get module_srl of the documents
 		$args = new stdClass;
 		$args->list_count = count($document_srls);
-		$args->document_srls = implode(',',$document_srls);
+		$args->document_srls = implode(',', $document_srls);
 		$args->order_type = 'asc';
 		$output = executeQueryArray('document.getDocuments', $args);
-		if(!$output->data) return new BaseObject();
+		if (!$output->data) return new BaseObject();
 
 		unset($document_srls);
-		foreach($output->data as $key => $val)
+		foreach ($output->data as $key => $val)
 		{
 			$document_srls[$val->module_srl][] = $val->document_srl;
 		}
-		if(!$document_srls || !count($document_srls)) return new BaseObject();
+		if (!$document_srls || !count($document_srls)) return new BaseObject();
 
 		// Check if each of module administrators exists. Top-level administator will have a permission to modify every document of all modules.(Even to modify temporarily saved or trashed documents)
 		$oModuleModel = getModel('module');
 		$module_srls = array_keys($document_srls);
-		for($i=0;$i<count($module_srls);$i++)
+		for ($i = 0; $i < count($module_srls); $i++)
 		{
 			$module_srl = $module_srls[$i];
 			$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
 			$logged_info = Context::get('logged_info');
-			if($logged_info->is_admin != 'Y')
+			if ($logged_info->is_admin != 'Y')
 			{
-				if(!$module_info)
+				if (!$module_info)
 				{
 					unset($document_srls[$module_srl]);
 					continue;
 				}
 				$grant = $oModuleModel->getGrant($module_info, $logged_info);
-				if(!$grant->manager)
+				if (!$grant->manager)
 				{
 					unset($document_srls[$module_srl]);
 					continue;
 				}
 			}
 		}
-		if(!count($document_srls)) return new BaseObject();
+		if (!count($document_srls)) return new BaseObject();
 
-		foreach($document_srls as $module_srl => $documents)
+		foreach ($document_srls as $module_srl => $documents)
 		{
 			$cnt = count($documents);
-			for($i=0;$i<$cnt;$i++)
+			for ($i = 0; $i < $cnt; $i++)
 			{
-				$document_srl = (int)trim($documents[$i]);
-				if(!$document_srls) continue;
-				if($_SESSION['document_management'][$document_srl]) unset($_SESSION['document_management'][$document_srl]);
+				$document_srl = (int) trim($documents[$i]);
+				if (!$document_srls) continue;
+				if ($_SESSION['document_management'][$document_srl]) unset($_SESSION['document_management'][$document_srl]);
 				else $_SESSION['document_management'][$document_srl] = true;
 			}
 		}
@@ -2233,9 +2233,9 @@ 
 	function procDocumentManageCheckedDocument()
 	{
 		@set_time_limit(0);
-		if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted');
 
-		if(!checkCSRF())
+		if (!checkCSRF())
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -2243,45 +2243,45 @@ 
 		$type = Context::get('type');
 		$target_module = Context::get('target_module_srl');
 		$module_srl = Context::get('module_srl');
-		if($target_module && !$module_srl) $module_srl = $target_module;
+		if ($target_module && !$module_srl) $module_srl = $target_module;
 		$category_srl = Context::get('target_category_srl');
 		$message_content = strip_tags(Context::get('message_content'));
-		if($message_content) $message_content = nl2br($message_content);
+		if ($message_content) $message_content = nl2br($message_content);
 
 		$cart = Context::get('cart');
 		$document_srl_list = (!is_array($cart)) ? explode('|@|', $cart) : $cart;
 
-		array_map(function ($value) { return (int)$value; }, $document_srl_list);
+		array_map(function($value) { return (int) $value; }, $document_srl_list);
 
 		$document_srl_count = count($document_srl_list);
 
 		$oDocumentModel = getModel('document');
 		$document_items = array();
-		foreach($document_srl_list as $document_srl)
+		foreach ($document_srl_list as $document_srl)
 		{
 			$oDocument = $oDocumentModel->getDocument($document_srl);
 			$document_items[] = $oDocument;
-			if(!$oDocument->isGranted()) return $this->stop('msg_not_permitted');
+			if (!$oDocument->isGranted()) return $this->stop('msg_not_permitted');
 		}
 
 		// Send a message
-		if($message_content)
+		if ($message_content)
 		{
 
 			$oCommunicationController = getController('communication');
 
 			$logged_info = Context::get('logged_info');
 
-			$title = cut_str($message_content,10,'...');
+			$title = cut_str($message_content, 10, '...');
 			$sender_member_srl = $logged_info->member_srl;
 
-			foreach($document_items as $oDocument)
+			foreach ($document_items as $oDocument)
 			{
-				if(!$oDocument->get('member_srl') || $oDocument->get('member_srl')==$sender_member_srl) continue;
+				if (!$oDocument->get('member_srl') || $oDocument->get('member_srl') == $sender_member_srl) continue;
 
-				if($type=='move') $purl = sprintf("<a href=\"%s\" target=\"_blank\">%s</a>", $oDocument->getPermanentUrl(), $oDocument->getPermanentUrl());
+				if ($type == 'move') $purl = sprintf("<a href=\"%s\" target=\"_blank\">%s</a>", $oDocument->getPermanentUrl(), $oDocument->getPermanentUrl());
 				else $purl = "";
-				$content = sprintf("<div>%s</div><hr />%s<div style=\"font-weight:bold\">%s</div>%s",$message_content, $purl, $oDocument->getTitleText(), $oDocument->getContent(false, false, false));
+				$content = sprintf("<div>%s</div><hr />%s<div style=\"font-weight:bold\">%s</div>%s", $message_content, $purl, $oDocument->getTitleText(), $oDocument->getContent(false, false, false));
 
 				$oCommunicationController->sendMessage($sender_member_srl, $oDocument->get('member_srl'), $title, $content, false);
 			}
@@ -2291,54 +2291,54 @@ 
 		$oSpamController->setAvoidLog();
 
 		$oDocumentAdminController = getAdminController('document');
-		if($type == 'move')
+		if ($type == 'move')
 		{
-			if(!$module_srl) return new BaseObject(-1, 'fail_to_move');
+			if (!$module_srl) return new BaseObject(-1, 'fail_to_move');
 
 			$output = $oDocumentAdminController->moveDocumentModule($document_srl_list, $module_srl, $category_srl);
-			if(!$output->toBool()) return new BaseObject(-1, 'fail_to_move');
+			if (!$output->toBool()) return new BaseObject(-1, 'fail_to_move');
 
 			$msg_code = 'success_moved';
 
 		}
-		else if($type == 'copy')
+		else if ($type == 'copy')
 		{
-			if(!$module_srl) return new BaseObject(-1, 'fail_to_move');
+			if (!$module_srl) return new BaseObject(-1, 'fail_to_move');
 
 			$output = $oDocumentAdminController->copyDocumentModule($document_srl_list, $module_srl, $category_srl);
-			if(!$output->toBool()) return new BaseObject(-1, 'fail_to_move');
+			if (!$output->toBool()) return new BaseObject(-1, 'fail_to_move');
 
 			$msg_code = 'success_copied';
 		}
-		else if($type =='delete')
+		else if ($type == 'delete')
 		{
 			$oDB = &DB::getInstance();
 			$oDB->begin();
-			for($i=0;$i<$document_srl_count;$i++)
+			for ($i = 0; $i < $document_srl_count; $i++)
 			{
 				$document_srl = $document_srl_list[$i];
 				$output = $this->deleteDocument($document_srl, true);
-				if(!$output->toBool()) return new BaseObject(-1, 'fail_to_delete');
+				if (!$output->toBool()) return new BaseObject(-1, 'fail_to_delete');
 			}
 			$oDB->commit();
 			$msg_code = 'success_deleted';
 		}
-		else if($type == 'trash')
+		else if ($type == 'trash')
 		{
 			$args = new stdClass();
 			$args->description = $message_content;
 
 			$oDB = &DB::getInstance();
 			$oDB->begin();
-			for($i=0;$i<$document_srl_count;$i++) {
+			for ($i = 0; $i < $document_srl_count; $i++) {
 				$args->document_srl = $document_srl_list[$i];
 				$output = $this->moveDocumentToTrash($args);
-				if(!$output || !$output->toBool()) return new BaseObject(-1, 'fail_to_trash');
+				if (!$output || !$output->toBool()) return new BaseObject(-1, 'fail_to_trash');
 			}
 			$oDB->commit();
 			$msg_code = 'success_trashed';
 		}
-		else if($type == 'cancelDeclare')
+		else if ($type == 'cancelDeclare')
 		{
 			$args->document_srl = $document_srl_list;
 			$output = executeQuery('document.deleteDeclaredDocuments', $args);
@@ -2360,27 +2360,27 @@ 
 	function procDocumentInsertModuleConfig()
 	{
 		$module_srl = Context::get('target_module_srl');
-		if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
+		if (preg_match('/^([0-9,]+)$/', $module_srl)) $module_srl = explode(',', $module_srl);
 		else $module_srl = array($module_srl);
 
 		$document_config = new stdClass();
 		$document_config->use_history = Context::get('use_history');
-		if(!$document_config->use_history) $document_config->use_history = 'N';
+		if (!$document_config->use_history) $document_config->use_history = 'N';
 
 		$document_config->use_vote_up = Context::get('use_vote_up');
-		if(!$document_config->use_vote_up) $document_config->use_vote_up = 'Y';
+		if (!$document_config->use_vote_up) $document_config->use_vote_up = 'Y';
 
 		$document_config->use_vote_down = Context::get('use_vote_down');
-		if(!$document_config->use_vote_down) $document_config->use_vote_down = 'Y';
+		if (!$document_config->use_vote_down) $document_config->use_vote_down = 'Y';
 
 		$document_config->use_status = Context::get('use_status');
 
 		$oModuleController = getController('module');
-		for($i=0;$i<count($module_srl);$i++)
+		for ($i = 0; $i < count($module_srl); $i++)
 		{
 			$srl = trim($module_srl[$i]);
-			if(!$srl) continue;
-			$output = $oModuleController->insertModulePartConfig('document',$srl,$document_config);
+			if (!$srl) continue;
+			$output = $oModuleController->insertModulePartConfig('document', $srl, $document_config);
 		}
 		$this->setError(-1);
 		$this->setMessage('success_updated', 'info');
@@ -2396,7 +2396,7 @@ 
 	function procDocumentTempSave()
 	{
 		// Check login information
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_logged');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_logged');
 		$module_info = Context::get('module_info');
 		$logged_info = Context::get('logged_info');
 
@@ -2408,7 +2408,7 @@ 
 		unset($obj->is_notice);
 
 		// Extract from beginning part of contents in the guestbook
-		if(!$obj->title)
+		if (!$obj->title)
 		{
 			$obj->title = cut_str(strip_tags($obj->content), 20, '...');
 		}
@@ -2419,13 +2419,13 @@ 
 		$oDocument = $oDocumentModel->getDocument($obj->document_srl, $this->grant->manager);
 
 		// Update if already exists
-		if($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl)
+		if ($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl)
 		{
-			if($oDocument->get('module_srl') != $obj->module_srl)
+			if ($oDocument->get('module_srl') != $obj->module_srl)
 			{
 				return new BaseObject(-1, 'msg_invalid_request');
 			}
-			if(!$oDocument->isGranted())
+			if (!$oDocument->isGranted())
 			{
 				return new BaseObject(-1, 'msg_invalid_request');
 			}
@@ -2443,7 +2443,7 @@ 
 			$oDocument = $oDocumentModel->getDocument($obj->document_srl, $this->grant->manager);
 		}
 		// Set the attachment to be invalid state
-		if($oDocument->hasUploadedFiles())
+		if ($oDocument->hasUploadedFiles())
 		{
 			$args = new stdClass;
 			$args->upload_target_srl = $oDocument->document_srl;
@@ -2461,11 +2461,11 @@ 
 	 */
 	function procDocumentGetList()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted');
 		$documentSrls = Context::get('document_srls');
-		if($documentSrls) $documentSrlList = explode(',', $documentSrls);
+		if ($documentSrls) $documentSrlList = explode(',', $documentSrls);
 
-		if(count($documentSrlList) > 0)
+		if (count($documentSrlList) > 0)
 		{
 			$oDocumentModel = getModel('document');
 			$columnList = array('document_srl', 'title', 'nick_name', 'status');
@@ -2489,10 +2489,10 @@ 
 	 */
 	function _checkCommentStatusForOldVersion(&$obj)
 	{
-		if(!isset($obj->allow_comment)) $obj->allow_comment = 'N';
-		if(!isset($obj->lock_comment)) $obj->lock_comment = 'N';
+		if (!isset($obj->allow_comment)) $obj->allow_comment = 'N';
+		if (!isset($obj->lock_comment)) $obj->lock_comment = 'N';
 
-		if($obj->allow_comment == 'Y' && $obj->lock_comment == 'N') $obj->commentStatus = 'ALLOW';
+		if ($obj->allow_comment == 'Y' && $obj->lock_comment == 'N') $obj->commentStatus = 'ALLOW';
 		else $obj->commentStatus = 'DENY';
 	}
 
@@ -2503,8 +2503,8 @@ 
 	 */
 	function _checkDocumentStatusForOldVersion(&$obj)
 	{
-		if(!$obj->status && $obj->is_secret == 'Y') $obj->status = $this->getConfigStatus('secret');
-		if(!$obj->status && $obj->is_secret != 'Y') $obj->status = $this->getConfigStatus('public');
+		if (!$obj->status && $obj->is_secret == 'Y') $obj->status = $this->getConfigStatus('secret');
+		if (!$obj->status && $obj->is_secret != 'Y') $obj->status = $this->getConfigStatus('public');
 	}
 
 	public function updateUploaedCount($documentSrlList)
@@ -2512,10 +2512,10 @@ 
 		$oDocumentModel = getModel('document');
 		$oFileModel = getModel('file');
 
-		if(is_array($documentSrlList))
+		if (is_array($documentSrlList))
 		{
 			$documentSrlList = array_unique($documentSrlList);
-			foreach($documentSrlList AS $key => $documentSrl)
+			foreach ($documentSrlList AS $key => $documentSrl)
 			{
 				$fileCount = $oFileModel->getFilesCount($documentSrl);
 				$args = new stdClass();
@@ -2536,14 +2536,14 @@ 
 		$oDocumentModel = getModel('document');
 		$documentExtraKeys = $oDocumentModel->getExtraKeys($obj->originModuleSrl);
 
-		if(is_array($documentExtraKeys) && is_array($obj->moduleSrlList))
+		if (is_array($documentExtraKeys) && is_array($obj->moduleSrlList))
 		{
-			$oDocumentController=getController('document');
-			foreach($obj->moduleSrlList AS $key=>$value)
+			$oDocumentController = getController('document');
+			foreach ($obj->moduleSrlList AS $key=>$value)
 			{
-				foreach($documentExtraKeys AS $extraItem)
+				foreach ($documentExtraKeys AS $extraItem)
 				{
-					$oDocumentController->insertDocumentExtraKey($value, $extraItem->idx, $extraItem->name, $extraItem->type, $extraItem->is_required , $extraItem->search , $extraItem->default , $extraItem->desc, $extraItem->eid) ;
+					$oDocumentController->insertDocumentExtraKey($value, $extraItem->idx, $extraItem->name, $extraItem->type, $extraItem->is_required, $extraItem->search, $extraItem->default, $extraItem->desc, $extraItem->eid);
 				}
 			}
 		}
@@ -2555,9 +2555,9 @@ 
 		$documentConfig = $oModuleModel->getModulePartConfig('document', $obj->originModuleSrl);
 
 		$oModuleController = getController('module');
-		if(is_array($obj->moduleSrlList))
+		if (is_array($obj->moduleSrlList))
 		{
-			foreach($obj->moduleSrlList AS $key=>$moduleSrl)
+			foreach ($obj->moduleSrlList AS $key=>$moduleSrl)
 			{
 				$oModuleController->insertModulePartConfig('document', $moduleSrl, $documentConfig);
 			}

Braces +530 added lines, -214 removed lines

@@ -24,19 +24,27 @@ 
 	 */
 	function procDocumentVoteUp()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_invalid_request');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$document_srl = Context::get('target_srl');
-		if(!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$document_srl) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
 		$module_srl = $oDocument->get('module_srl');
-		if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$module_srl) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$oModuleModel = getModel('module');
 		$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
-		if($document_config->use_vote_up=='N') return new BaseObject(-1, 'msg_invalid_request');
+		if($document_config->use_vote_up=='N') {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$point = 1;
 		$output = $this->updateVotedCount($document_srl, $point);
@@ -69,19 +77,27 @@ 
 	 */
 	function procDocumentVoteDown()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_invalid_request');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$document_srl = Context::get('target_srl');
-		if(!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$document_srl) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
 		$module_srl = $oDocument->get('module_srl');
-		if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$module_srl) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$oModuleModel = getModel('module');
 		$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
-		if($document_config->use_vote_down=='N') return new BaseObject(-1, 'msg_invalid_request');
+		if($document_config->use_vote_down=='N') {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$point = -1;
 		$output = $this->updateVotedCount($document_srl, $point);
@@ -95,10 +111,14 @@ 
 	 */
 	function procDocumentDeclare()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_invalid_request');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$document_srl = Context::get('target_srl');
-		if(!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$document_srl) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		return $this->declaredDocument($document_srl);
 	}
@@ -140,7 +160,9 @@ 
 		$args->history_srl = $history_srl;
 		$args->module_srl = $module_srl;
 		$args->document_srl = $document_srl;
-		if(!$args->history_srl && !$args->module_srl && !$args->document_srl) return;
+		if(!$args->history_srl && !$args->module_srl && !$args->document_srl) {
+			return;
+		}
 		executeQuery("document.deleteHistory", $args);
 	}
 
@@ -152,15 +174,21 @@ 
 	function triggerDeleteModuleDocuments(&$obj)
 	{
 		$module_srl = $obj->module_srl;
-		if(!$module_srl) return new BaseObject();
+		if(!$module_srl) {
+			return new BaseObject();
+		}
 		// Delete the document
 		$oDocumentAdminController = getAdminController('document');
 		$output = $oDocumentAdminController->deleteModuleDocument($module_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Delete the category
 		$oDocumentController = getController('document');
 		$output = $oDocumentController->deleteModuleCategory($module_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Delete extra key and variable, because module deleted
 		$this->deleteDocumentExtraKeys($module_srl);
 
@@ -202,10 +230,18 @@ 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
 		// List variables
-		if($obj->comment_status) $obj->commentStatus = $obj->comment_status;
-		if(!$obj->commentStatus) $obj->commentStatus = 'DENY';
-		if($obj->commentStatus == 'DENY') $this->_checkCommentStatusForOldVersion($obj);
-		if($obj->allow_trackback!='Y') $obj->allow_trackback = 'N';
+		if($obj->comment_status) {
+			$obj->commentStatus = $obj->comment_status;
+		}
+		if(!$obj->commentStatus) {
+			$obj->commentStatus = 'DENY';
+		}
+		if($obj->commentStatus == 'DENY') {
+			$this->_checkCommentStatusForOldVersion($obj);
+		}
+		if($obj->allow_trackback!='Y') {
+			$obj->allow_trackback = 'N';
+		}
 		if($obj->homepage) 
 		{
 			$obj->homepage = escape($obj->homepage);
@@ -215,9 +251,15 @@ 
 			}
 		}
 		
-		if($obj->notify_message != 'Y') $obj->notify_message = 'N';
-		if(!$obj->email_address) $obj->email_address = '';
-		if(!$isRestore) $obj->ipaddress = $_SERVER['REMOTE_ADDR'];
+		if($obj->notify_message != 'Y') {
+			$obj->notify_message = 'N';
+		}
+		if(!$obj->email_address) {
+			$obj->email_address = '';
+		}
+		if(!$isRestore) {
+			$obj->ipaddress = $_SERVER['REMOTE_ADDR'];
+		}
 
                 // can modify regdate only manager
                 $grant = Context::get('grant');
@@ -227,7 +269,9 @@ 
 		}
 		
 		// Serialize the $extra_vars, check the extra_vars type, because duplicate serialized avoid
-		if(!is_string($obj->extra_vars)) $obj->extra_vars = serialize($obj->extra_vars);
+		if(!is_string($obj->extra_vars)) {
+			$obj->extra_vars = serialize($obj->extra_vars);
+		}
 		// Remove the columns for automatic saving
 		unset($obj->_saved_doc_srl);
 		unset($obj->_saved_doc_title);
@@ -235,10 +279,15 @@ 
 		unset($obj->_saved_doc_message);
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('document.insertDocument', 'before', $obj);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Register it if no given document_srl exists
-		if(!$obj->document_srl) $obj->document_srl = getNextSequence();
-		elseif(!$manual_inserted && !$isRestore && !checkUserSequence($obj->document_srl)) return new BaseObject(-1, 'msg_not_permitted');
+		if(!$obj->document_srl) {
+			$obj->document_srl = getNextSequence();
+		} elseif(!$manual_inserted && !$isRestore && !checkUserSequence($obj->document_srl)) {
+			return new BaseObject(-1, 'msg_not_permitted');
+		}
 
 		$oDocumentModel = getModel('document');
 		// Set to 0 if the category_srl doesn't exist
@@ -249,12 +298,19 @@ 
 			{
 				return new BaseObject(-1, 'msg_not_permitted');
 			}
-			if(count($category_list) > 0 && !$category_list[$obj->category_srl]) $obj->category_srl = 0;
+			if(count($category_list) > 0 && !$category_list[$obj->category_srl]) {
+				$obj->category_srl = 0;
+			}
 		}
 		// Set the read counts and update order.
-		if(!$obj->readed_count) $obj->readed_count = 0;
-		if($isLatest) $obj->update_order = $obj->list_order = $obj->document_srl * -1;
-		else $obj->update_order = $obj->list_order;
+		if(!$obj->readed_count) {
+			$obj->readed_count = 0;
+		}
+		if($isLatest) {
+			$obj->update_order = $obj->list_order = $obj->document_srl * -1;
+		} else {
+			$obj->update_order = $obj->list_order;
+		}
 		// Check the status of password hash for manually inserting. Apply hashing for otherwise.
 		if($obj->password && !$obj->password_is_hashed)
 		{
@@ -276,9 +332,13 @@ 
 		// If the tile is empty, extract string from the contents.
 		$obj->title = htmlspecialchars($obj->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		settype($obj->title, "string");
-		if($obj->title == '') $obj->title = cut_str(trim(strip_tags(nl2br($obj->content))),20,'...');
+		if($obj->title == '') {
+			$obj->title = cut_str(trim(strip_tags(nl2br($obj->content))),20,'...');
+		}
 		// If no tile extracted from the contents, leave it untitled.
-		if($obj->title == '') $obj->title = 'Untitled';
+		if($obj->title == '') {
+			$obj->title = 'Untitled';
+		}
 		// Remove XE's own tags from the contents.
 		$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
 		if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
@@ -290,13 +350,19 @@ 
 			$obj->content = nl2br($obj->content);
 		}
 		// Remove iframe and script if not a top adminisrator in the session.
-		if($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content);
+		if($logged_info->is_admin != 'Y') {
+			$obj->content = removeHackTag($obj->content);
+		}
 		// An error appears if both log-in info and user name don't exist.
-		if(!$logged_info->member_srl && !$obj->nick_name) return new BaseObject(-1,'msg_invalid_request');
+		if(!$logged_info->member_srl && !$obj->nick_name) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$obj->lang_code = Context::getLangType();
 		// Insert data into the DB
-		if(!$obj->status) $this->_checkDocumentStatusForOldVersion($obj);
+		if(!$obj->status) {
+			$this->_checkDocumentStatusForOldVersion($obj);
+		}
 		$output = executeQuery('document.insertDocument', $obj);
 		if(!$output->toBool())
 		{
@@ -313,19 +379,25 @@ 
 				if(isset($obj->{'extra_vars'.$idx}))
 				{
 					$tmp = $obj->{'extra_vars'.$idx};
-					if(is_array($tmp))
-						$value = implode('|@|', $tmp);
-					else
-						$value = trim($tmp);
+					if(is_array($tmp)) {
+											$value = implode('|@|', $tmp);
+					} else {
+											$value = trim($tmp);
+					}
+				} else if(isset($obj->{$extra_item->name})) {
+					$value = trim($obj->{$extra_item->name});
+				}
+				if($value == NULL) {
+					continue;
 				}
-				else if(isset($obj->{$extra_item->name})) $value = trim($obj->{$extra_item->name});
-				if($value == NULL) continue;
 
 				$this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, $idx, $value, $extra_item->eid);
 			}
 		}
 		// Update the category if the category_srl exists.
-		if($obj->category_srl) $this->updateCategoryCount($obj->module_srl, $obj->category_srl);
+		if($obj->category_srl) {
+			$this->updateCategoryCount($obj->module_srl, $obj->category_srl);
+		}
 		// Call a trigger (after)
 		if($output->toBool())
 		{
@@ -367,27 +439,39 @@ 
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
-		if(!$source_obj->document_srl || !$obj->document_srl) return new BaseObject(-1,'msg_invalied_request');
-		if(!$obj->status && $obj->is_secret == 'Y') $obj->status = 'SECRET';
-		if(!$obj->status) $obj->status = 'PUBLIC';
+		if(!$source_obj->document_srl || !$obj->document_srl) {
+			return new BaseObject(-1,'msg_invalied_request');
+		}
+		if(!$obj->status && $obj->is_secret == 'Y') {
+			$obj->status = 'SECRET';
+		}
+		if(!$obj->status) {
+			$obj->status = 'PUBLIC';
+		}
 
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('document.updateDocument', 'before', $obj);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// begin transaction
 		$oDB = &DB::getInstance();
 		$oDB->begin();
 
 		$oModuleModel = getModel('module');
-		if(!$obj->module_srl) $obj->module_srl = $source_obj->get('module_srl');
+		if(!$obj->module_srl) {
+			$obj->module_srl = $source_obj->get('module_srl');
+		}
 		$module_srl = $obj->module_srl;
 		$document_config = $oModuleModel->getModulePartConfig('document', $module_srl);
 		if(!$document_config)
 		{
 			$document_config = new stdClass();
 		}
-		if(!isset($document_config->use_history)) $document_config->use_history = 'N';
+		if(!isset($document_config->use_history)) {
+			$document_config->use_history = 'N';
+		}
 		$bUseHistory = $document_config->use_history == 'Y' || $document_config->use_history == 'Trace';
 
 		if($bUseHistory)
@@ -396,22 +480,31 @@ 
 			$args->history_srl = getNextSequence();
 			$args->document_srl = $obj->document_srl;
 			$args->module_srl = $module_srl;
-			if($document_config->use_history == 'Y') $args->content = $source_obj->get('content');
+			if($document_config->use_history == 'Y') {
+				$args->content = $source_obj->get('content');
+			}
 			$args->nick_name = $source_obj->get('nick_name');
 			$args->member_srl = $source_obj->get('member_srl');
 			$args->regdate = $source_obj->get('last_update');
 			$args->ipaddress = $_SERVER['REMOTE_ADDR'];
 			$output = executeQuery("document.insertHistory", $args);
-		}
-		else
+		} else
 		{
 			$obj->ipaddress = $source_obj->get('ipaddress');
 		}
 		// List variables
-		if($obj->comment_status) $obj->commentStatus = $obj->comment_status;
-		if(!$obj->commentStatus) $obj->commentStatus = 'DENY';
-		if($obj->commentStatus == 'DENY') $this->_checkCommentStatusForOldVersion($obj);
-		if($obj->allow_trackback!='Y') $obj->allow_trackback = 'N';
+		if($obj->comment_status) {
+			$obj->commentStatus = $obj->comment_status;
+		}
+		if(!$obj->commentStatus) {
+			$obj->commentStatus = 'DENY';
+		}
+		if($obj->commentStatus == 'DENY') {
+			$this->_checkCommentStatusForOldVersion($obj);
+		}
+		if($obj->allow_trackback!='Y') {
+			$obj->allow_trackback = 'N';
+		}
 		if($obj->homepage)
 		{
 			$obj->homepage = escape($obj->homepage);
@@ -421,7 +514,9 @@ 
 			}
 		}
 		
-		if($obj->notify_message != 'Y') $obj->notify_message = 'N';
+		if($obj->notify_message != 'Y') {
+			$obj->notify_message = 'N';
+		}
 		
 		// can modify regdate only manager
                 $grant = Context::get('grant');
@@ -431,7 +526,9 @@ 
 		}
 		
 		// Serialize the $extra_vars
-		if(!is_string($obj->extra_vars)) $obj->extra_vars = serialize($obj->extra_vars);
+		if(!is_string($obj->extra_vars)) {
+			$obj->extra_vars = serialize($obj->extra_vars);
+		}
 		// Remove the columns for automatic saving
 		unset($obj->_saved_doc_srl);
 		unset($obj->_saved_doc_title);
@@ -443,7 +540,9 @@ 
 		if($source_obj->get('category_srl')!=$obj->category_srl)
 		{
 			$category_list = $oDocumentModel->getCategoryList($obj->module_srl);
-			if(!$category_list[$obj->category_srl]) $obj->category_srl = 0;
+			if(!$category_list[$obj->category_srl]) {
+				$obj->category_srl = 0;
+			}
 		}
 		// Change the update order
 		$obj->update_order = getNextSequence() * -1;
@@ -478,9 +577,13 @@ 
 		// If the tile is empty, extract string from the contents.
 		$obj->title = htmlspecialchars($obj->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		settype($obj->title, "string");
-		if($obj->title == '') $obj->title = cut_str(strip_tags($obj->content),20,'...');
+		if($obj->title == '') {
+			$obj->title = cut_str(strip_tags($obj->content),20,'...');
+		}
 		// If no tile extracted from the contents, leave it untitled.
-		if($obj->title == '') $obj->title = 'Untitled';
+		if($obj->title == '') {
+			$obj->title = 'Untitled';
+		}
 		// Remove XE's own tags from the contents.
 		$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
 		if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
@@ -500,8 +603,7 @@ 
 				$lang_code_args->document_srl = $source_obj->get('document_srl');
 				$lang_code_args->lang_code = Context::getLangType();
 				$output = executeQuery('document.updateDocumentsLangCode', $lang_code_args);
-			}
-			else
+			} else
 			{
 				$extra_content = new stdClass;
 				$extra_content->title = $obj->title;
@@ -520,7 +622,9 @@ 
 			$obj->content = removeHackTag($obj->content);
 		}
 		// if temporary document, regdate is now setting
-		if($source_obj->get('status') == $this->getConfigStatus('temp')) $obj->regdate = date('YmdHis');
+		if($source_obj->get('status') == $this->getConfigStatus('temp')) {
+			$obj->regdate = date('YmdHis');
+		}
 
 		// Insert data into the DB
 		$output = executeQuery('document.updateDocument', $obj);
@@ -543,25 +647,37 @@ 
 					if(isset($obj->{'extra_vars'.$idx}))
 					{
 						$tmp = $obj->{'extra_vars'.$idx};
-						if(is_array($tmp))
-							$value = implode('|@|', $tmp);
-						else
-							$value = trim($tmp);
+						if(is_array($tmp)) {
+													$value = implode('|@|', $tmp);
+						} else {
+													$value = trim($tmp);
+						}
+					} else if(isset($obj->{$extra_item->name})) {
+						$value = trim($obj->{$extra_item->name});
+					}
+					if($value == NULL) {
+						continue;
 					}
-					else if(isset($obj->{$extra_item->name})) $value = trim($obj->{$extra_item->name});
-					if($value == NULL) continue;
 					$this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, $idx, $value, $extra_item->eid);
 				}
 			}
 			// Inert extra vars for multi-language support of title and contents.
-			if($extra_content->title) $this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, -1, $extra_content->title, 'title_'.Context::getLangType());
-			if($extra_content->content) $this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, -2, $extra_content->content, 'content_'.Context::getLangType());
+			if($extra_content->title) {
+				$this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, -1, $extra_content->title, 'title_'.Context::getLangType());
+			}
+			if($extra_content->content) {
+				$this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, -2, $extra_content->content, 'content_'.Context::getLangType());
+			}
 		}
 		// Update the category if the category_srl exists.
 		if($source_obj->get('category_srl') != $obj->category_srl || $source_obj->get('module_srl') == $logged_info->member_srl)
 		{
-			if($source_obj->get('category_srl') != $obj->category_srl) $this->updateCategoryCount($obj->module_srl, $source_obj->get('category_srl'));
-			if($obj->category_srl) $this->updateCategoryCount($obj->module_srl, $obj->category_srl);
+			if($source_obj->get('category_srl') != $obj->category_srl) {
+				$this->updateCategoryCount($obj->module_srl, $source_obj->get('category_srl'));
+			}
+			if($obj->category_srl) {
+				$this->updateCategoryCount($obj->module_srl, $obj->category_srl);
+			}
 		}
 		// Call a trigger (after)
 		if($output->toBool())
@@ -606,7 +722,9 @@ 
 		$trigger_obj = new stdClass();
 		$trigger_obj->document_srl = $document_srl;
 		$output = ModuleHandler::triggerCall('document.deleteDocument', 'before', $trigger_obj);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// begin transaction
 		$oDB = &DB::getInstance();
@@ -618,12 +736,17 @@ 
 			$oDocumentModel = getModel('document');
 			// Check if the documnet exists
 			$oDocument = $oDocumentModel->getDocument($document_srl, $is_admin);
+		} else if($isEmptyTrash && $oDocument == null) {
+			return new BaseObject(-1, 'document is not exists');
 		}
-		else if($isEmptyTrash && $oDocument == null) return new BaseObject(-1, 'document is not exists');
 
-		if(!$oDocument->isExists() || $oDocument->document_srl != $document_srl) return new BaseObject(-1, 'msg_invalid_document');
+		if(!$oDocument->isExists() || $oDocument->document_srl != $document_srl) {
+			return new BaseObject(-1, 'msg_invalid_document');
+		}
 		// Check if a permossion is granted
-		if(!$oDocument->isGranted()) return new BaseObject(-1, 'msg_not_permitted');
+		if(!$oDocument->isGranted()) {
+			return new BaseObject(-1, 'msg_not_permitted');
+		}
 
 		//if empty trash, document already deleted, therefore document not delete
 		$args = new stdClass();
@@ -643,7 +766,9 @@ 
 
 		$this->deleteDocumentHistory(null, $document_srl, null);
 		// Update category information if the category_srl exists.
-		if($oDocument->get('category_srl')) $this->updateCategoryCount($oDocument->get('module_srl'),$oDocument->get('category_srl'));
+		if($oDocument->get('category_srl')) {
+			$this->updateCategoryCount($oDocument->get('module_srl'),$oDocument->get('category_srl'));
+		}
 		// Delete a declared list
 		executeQuery('document.deleteDeclared', $args);
 		// Delete extra variable
@@ -723,8 +848,11 @@ 
 	{
 		$trash_args = new stdClass();
 		// Get trash_srl if a given trash_srl doesn't exist
-		if(!$obj->trash_srl) $trash_args->trash_srl = getNextSequence();
-		else $trash_args->trash_srl = $obj->trash_srl;
+		if(!$obj->trash_srl) {
+			$trash_args->trash_srl = getNextSequence();
+		} else {
+			$trash_args->trash_srl = $obj->trash_srl;
+		}
 		// Get its module_srl which the document belongs to
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($obj->document_srl);
@@ -732,7 +860,9 @@ 
 		$trash_args->module_srl = $oDocument->get('module_srl');
 		$obj->module_srl = $oDocument->get('module_srl');
 		// Cannot throw data from the trash to the trash
-		if($trash_args->module_srl == 0) return false;
+		if($trash_args->module_srl == 0) {
+			return false;
+		}
 		// Data setting
 		$trash_args->document_srl = $obj->document_srl;
 		$trash_args->description = $obj->description;
@@ -793,7 +923,9 @@ 
 		  }*/
 
 		// update category
-		if($oDocument->get('category_srl')) $this->updateCategoryCount($oDocument->get('module_srl'),$oDocument->get('category_srl'));
+		if($oDocument->get('category_srl')) {
+			$this->updateCategoryCount($oDocument->get('module_srl'),$oDocument->get('category_srl'));
+		}
 
 		// remove thumbnails
 		FileHandler::removeDir(sprintf('files/thumbnails/%s',getNumberingPath($obj->document_srl, 3)));
@@ -838,7 +970,9 @@ 
 	function updateReadedCount(&$oDocument)
 	{
 		// Pass if Crawler access
-		if(isCrawler()) return false;
+		if(isCrawler()) {
+			return false;
+		}
 		
 		$document_srl = $oDocument->document_srl;
 		$member_srl = $oDocument->get('member_srl');
@@ -846,10 +980,14 @@ 
 
 		// Call a trigger when the read count is updated (before)
 		$trigger_output = ModuleHandler::triggerCall('document.updateReadedCount', 'before', $oDocument);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if(!$trigger_output->toBool()) {
+			return $trigger_output;
+		}
 
 		// Pass if read count is increaded on the session information
-		if($_SESSION['readed_document'][$document_srl]) return false;
+		if($_SESSION['readed_document'][$document_srl]) {
+			return false;
+		}
 
 		// Pass if the author's IP address is as same as visitor's.
 		if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
@@ -914,7 +1052,9 @@ 
 	 */
 	function insertDocumentExtraKey($module_srl, $var_idx, $var_name, $var_type, $var_is_required = 'N', $var_search = 'N', $var_default = '', $var_desc = '', $eid)
 	{
-		if(!$module_srl || !$var_idx || !$var_name || !$var_type || !$eid) return new BaseObject(-1,'msg_invalid_request');
+		if(!$module_srl || !$var_idx || !$var_name || !$var_type || !$eid) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$obj = new stdClass();
 		$obj->module_srl = $module_srl;
@@ -931,8 +1071,7 @@ 
 		if(!$output->data)
 		{
 			$output = executeQuery('document.insertDocumentExtraKey', $obj);
-		}
-		else
+		} else
 		{
 			$output = executeQuery('document.updateDocumentExtraKey', $obj);
 			// Update the extra var(eid)
@@ -958,10 +1097,14 @@ 
 	 */
 	function deleteDocumentExtraKeys($module_srl, $var_idx = null)
 	{
-		if(!$module_srl) return new BaseObject(-1,'msg_invalid_request');
+		if(!$module_srl) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 		$obj = new stdClass();
 		$obj->module_srl = $module_srl;
-		if(!is_null($var_idx)) $obj->var_idx = $var_idx;
+		if(!is_null($var_idx)) {
+			$obj->var_idx = $var_idx;
+		}
 
 		$oDB = DB::getInstance();
 		$oDB->begin();
@@ -1025,8 +1168,12 @@ 
 	 */
 	function insertDocumentExtraVar($module_srl, $document_srl, $var_idx, $value, $eid = null, $lang_code = '')
 	{
-		if(!$module_srl || !$document_srl || !$var_idx || !isset($value)) return new BaseObject(-1,'msg_invalid_request');
-		if(!$lang_code) $lang_code = Context::getLangType();
+		if(!$module_srl || !$document_srl || !$var_idx || !isset($value)) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
+		if(!$lang_code) {
+			$lang_code = Context::getLangType();
+		}
 
 		$obj = new stdClass;
 		$obj->module_srl = $module_srl;
@@ -1052,10 +1199,18 @@ 
 	{
 		$obj = new stdClass();
 		$obj->module_srl = $module_srl;
-		if(!is_null($document_srl)) $obj->document_srl = $document_srl;
-		if(!is_null($var_idx)) $obj->var_idx = $var_idx;
-		if(!is_null($lang_code)) $obj->lang_code = $lang_code;
-		if(!is_null($eid)) $obj->eid = $eid;
+		if(!is_null($document_srl)) {
+			$obj->document_srl = $document_srl;
+		}
+		if(!is_null($var_idx)) {
+			$obj->var_idx = $var_idx;
+		}
+		if(!is_null($lang_code)) {
+			$obj->lang_code = $lang_code;
+		}
+		if(!is_null($eid)) {
+			$obj->eid = $eid;
+		}
 		$output = executeQuery('document.deleteDocumentExtraVars', $obj);
 		return $output;
 	}
@@ -1069,8 +1224,11 @@ 
 	 */
 	function updateVotedCount($document_srl, $point = 1)
 	{
-		if($point > 0) $failed_voted = 'failed_voted';
-		else $failed_voted = 'failed_blamed';
+		if($point > 0) {
+			$failed_voted = 'failed_voted';
+		} else {
+			$failed_voted = 'failed_blamed';
+		}
 		// Return fail if session already has information about votes
 		if($_SESSION['voted_document'][$document_srl])
 		{
@@ -1106,8 +1264,7 @@ 
 		if($member_srl)
 		{
 			$args->member_srl = $member_srl;
-		}
-		else
+		} else
 		{
 			$args->ipaddress = $_SERVER['REMOTE_ADDR'];
 		}
@@ -1144,18 +1301,21 @@ 
 		{
 			$args->blamed_count = $trigger_obj->after_point;
 			$output = executeQuery('document.updateBlamedCount', $args);
-		}
-		else
+		} else
 		{
 			$args->voted_count = $trigger_obj->after_point;
 			$output = executeQuery('document.updateVotedCount', $args);
 		}
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// Leave logs
 		$args->point = $trigger_obj->point;
 		$output = executeQuery('document.insertDocumentVotedLog', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// Call a trigger (after)
 		$trigger_output = ModuleHandler::triggerCall('document.updateVotedCount', 'after', $trigger_obj);
@@ -1184,8 +1344,7 @@ 
 		{
 			$output->setMessage('success_voted');
 			$output->add('voted_count', $trigger_obj->after_point);
-		}
-		else
+		} else
 		{
 			$output->setMessage('success_blamed');
 			$output->add('blamed_count', $trigger_obj->after_point);
@@ -1202,13 +1361,17 @@ 
 	function declaredDocument($document_srl)
 	{
 		// Fail if session information already has a reported document
-		if($_SESSION['declared_document'][$document_srl]) return new BaseObject(-1, 'failed_declared');
+		if($_SESSION['declared_document'][$document_srl]) {
+			return new BaseObject(-1, 'failed_declared');
+		}
 
 		// Check if previously reported
 		$args = new stdClass();
 		$args->document_srl = $document_srl;
 		$output = executeQuery('document.getDeclaredDocument', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$declared_count = ($output->data->declared_count) ? $output->data->declared_count : 0;
 
@@ -1252,8 +1415,7 @@ 
 		if($member_srl)
 		{
 			$args->member_srl = $member_srl;
-		}
-		else
+		} else
 		{
 			$args->ipaddress = $_SERVER['REMOTE_ADDR'];
 		}
@@ -1273,9 +1435,14 @@ 
 		$oDB->begin();
 
 		// Add the declared document
-		if($declared_count > 0) $output = executeQuery('document.updateDeclaredDocument', $args);
-		else $output = executeQuery('document.insertDeclaredDocument', $args);
-		if(!$output->toBool()) return $output;
+		if($declared_count > 0) {
+			$output = executeQuery('document.updateDeclaredDocument', $args);
+		} else {
+			$output = executeQuery('document.insertDeclaredDocument', $args);
+		}
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Leave logs
 		$output = executeQuery('document.insertDocumentDeclaredLog', $args);
 		if(!$output->toBool())
@@ -1374,9 +1541,10 @@ 
 			$parent_category = $oDocumentModel->getCategory($obj->parent_srl);
 			$obj->list_order = $parent_category->list_order;
 			$this->updateCategoryListOrder($parent_category->module_srl, $parent_category->list_order+1);
-			if(!$obj->category_srl) $obj->category_srl = getNextSequence();
-		}
-		else
+			if(!$obj->category_srl) {
+				$obj->category_srl = getNextSequence();
+			}
+		} else
 		{
 			$obj->list_order = $obj->category_srl = getNextSequence();
 		}
@@ -1416,13 +1584,17 @@ 
 	{
 		// Create a document model object
 		$oDocumentModel = getModel('document');
-		if(!$document_count) $document_count = $oDocumentModel->getCategoryDocumentCount($module_srl,$category_srl);
+		if(!$document_count) {
+			$document_count = $oDocumentModel->getCategoryDocumentCount($module_srl,$category_srl);
+		}
 
 		$args = new stdClass;
 		$args->category_srl = $category_srl;
 		$args->document_count = $document_count;
 		$output = executeQuery('document.updateCategoryCount', $args);
-		if($output->toBool()) $this->makeCategoryFile($module_srl);
+		if($output->toBool()) {
+			$this->makeCategoryFile($module_srl);
+		}
 
 		return $output;
 	}
@@ -1435,7 +1607,9 @@ 
 	function updateCategory($obj)
 	{
 		$output = executeQuery('document.updateCategory', $obj);
-		if($output->toBool()) $this->makeCategoryFile($obj->module_srl);
+		if($output->toBool()) {
+			$this->makeCategoryFile($obj->module_srl);
+		}
 		return $output;
 	}
 
@@ -1452,11 +1626,17 @@ 
 		$category_info = $oDocumentModel->getCategory($category_srl);
 		// Display an error that the category cannot be deleted if it has a child
 		$output = executeQuery('document.getChildCategoryCount', $args);
-		if(!$output->toBool()) return $output;
-		if($output->data->count>0) return new BaseObject(-1, 'msg_cannot_delete_for_child');
+		if(!$output->toBool()) {
+			return $output;
+		}
+		if($output->data->count>0) {
+			return new BaseObject(-1, 'msg_cannot_delete_for_child');
+		}
 		// Delete a category information
 		$output = executeQuery('document.deleteCategory', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->makeCategoryFile($category_info->module_srl);
 		// remvove cache
@@ -1471,8 +1651,9 @@ 
 				$args->page = ++$page;
 				$output = executeQuery('document.getDocumentList', $args, array('document_srl'));
 
-				if($output->data == array())
-					break;
+				if($output->data == array()) {
+									break;
+				}
 
 				foreach($output->data as $val)
 				{
@@ -1524,18 +1705,26 @@ 
 		// Seek a full list of categories
 		$category_list = $oDocumentModel->getCategoryList($module_srl);
 		$category_srl_list = array_keys($category_list);
-		if(count($category_srl_list)<2) return new BaseObject();
+		if(count($category_srl_list)<2) {
+			return new BaseObject();
+		}
 
 		$prev_category = NULL;
 		foreach($category_list as $key => $val)
 		{
-			if($key==$category_srl) break;
+			if($key==$category_srl) {
+				break;
+			}
 			$prev_category = $val;
 		}
 		// Return if the previous category doesn't exist
-		if(!$prev_category) return new BaseObject(-1,Context::getLang('msg_category_not_moved'));
+		if(!$prev_category) {
+			return new BaseObject(-1,Context::getLang('msg_category_not_moved'));
+		}
 		// Return if the selected category is the top level
-		if($category_srl_list[0]==$category_srl) return new BaseObject(-1,Context::getLang('msg_category_not_moved'));
+		if($category_srl_list[0]==$category_srl) {
+			return new BaseObject(-1,Context::getLang('msg_category_not_moved'));
+		}
 		// Information of the selected category
 		$cur_args = new stdClass;
 		$cur_args->category_srl = $category_srl;
@@ -1571,15 +1760,21 @@ 
 		// Seek a full list of categories
 		$category_list = $oDocumentModel->getCategoryList($module_srl);
 		$category_srl_list = array_keys($category_list);
-		if(count($category_srl_list)<2) return new BaseObject();
+		if(count($category_srl_list)<2) {
+			return new BaseObject();
+		}
 
 		for($i=0;$i<count($category_srl_list);$i++)
 		{
-			if($category_srl_list[$i]==$category_srl) break;
+			if($category_srl_list[$i]==$category_srl) {
+				break;
+			}
 		}
 
 		$next_category_srl = $category_srl_list[$i+1];
-		if(!$category_list[$next_category_srl]) return new BaseObject(-1,Context::getLang('msg_category_not_moved'));
+		if(!$category_list[$next_category_srl]) {
+			return new BaseObject(-1,Context::getLang('msg_category_not_moved'));
+		}
 		$next_category = $category_list[$next_category_srl];
 		// Information of the selected category
 		$cur_args = new stdClass;
@@ -1606,7 +1801,9 @@ 
 	{
 		$oDocumentModel = getModel('document');
 		$extra_keys = $oDocumentModel->getExtraKeys($module_srl);
-		if(!count($extra_keys)) return;
+		if(!count($extra_keys)) {
+			return;
+		}
 
 		$js_code = array();
 		$js_code[] = '<script>//<![CDATA[';
@@ -1625,7 +1822,9 @@ 
 			}
 			$name = str_ireplace(array('<script', '</script'), array('<scr" + "ipt', '</scr" + "ipt'), $val->name);
 			$js_code[] = sprintf('validator.cast("ADD_MESSAGE", ["extra_vars%s","%s"]);', $idx, $name);
-			if($val->is_required == 'Y') $js_code[] = sprintf('validator.cast("ADD_EXTRA_FIELD", ["extra_vars%s", { required:true }]);', $idx);
+			if($val->is_required == 'Y') {
+				$js_code[] = sprintf('validator.cast("ADD_EXTRA_FIELD", ["extra_vars%s", { required:true }]);', $idx);
+			}
 		}
 
 		$js_code[] = '})(jQuery);';
@@ -1643,7 +1842,9 @@ 
 	function procDocumentInsertCategory($args = null)
 	{
 		// List variables
-		if(!$args) $args = Context::gets('module_srl','category_srl','parent_srl','category_title','category_description','expand','group_srls','category_color','mid');
+		if(!$args) {
+			$args = Context::gets('module_srl','category_srl','parent_srl','category_title','category_description','expand','group_srls','category_color','mid');
+		}
 		$args->title = $args->category_title;
 		$args->description = $args->category_description;
 		$args->color = $args->category_color;
@@ -1659,11 +1860,18 @@ 
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
-		if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
+		if(!$grant->manager) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 
-		if($args->expand !="Y") $args->expand = "N";
-		if(!is_array($args->group_srls)) $args->group_srls = str_replace('|@|',',',$args->group_srls);
-		else $args->group_srls = implode(',', $args->group_srls);
+		if($args->expand !="Y") {
+			$args->expand = "N";
+		}
+		if(!is_array($args->group_srls)) {
+			$args->group_srls = str_replace('|@|',',',$args->group_srls);
+		} else {
+			$args->group_srls = implode(',', $args->group_srls);
+		}
 		$args->parent_srl = (int)$args->parent_srl;
 
 		$oDocumentModel = getModel('document');
@@ -1674,7 +1882,9 @@ 
 		if($args->category_srl)
 		{
 			$category_info = $oDocumentModel->getCategory($args->category_srl);
-			if($category_info->category_srl != $args->category_srl) $args->category_srl = null;
+			if($category_info->category_srl != $args->category_srl) {
+				$args->category_srl = null;
+			}
 		}
 		// Update if exists
 		if($args->category_srl)
@@ -1686,8 +1896,7 @@ 
 				return $output;
 			}
 			// Insert if not exist
-		}
-		else
+		} else
 		{
 			$output = $this->insertCategory($args);
 			if(!$output->toBool())
@@ -1729,7 +1938,9 @@ 
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($source_category->module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
-		if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
+		if(!$grant->manager) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 
 		// First child of the parent_category_srl
 		$source_args = new stdClass;
@@ -1742,30 +1953,39 @@ 
 			$args->parent_srl = $parent_category_srl;
 			$output = executeQuery('document.getChildCategoryMinListOrder', $args);
 
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 			$args->list_order = (int)$output->data->list_order;
-			if(!$args->list_order) $args->list_order = 0;
+			if(!$args->list_order) {
+				$args->list_order = 0;
+			}
 			$args->list_order--;
 
 			$source_args->category_srl = $source_category_srl;
 			$source_args->parent_srl = $parent_category_srl;
 			$source_args->list_order = $args->list_order;
 			$output = $this->updateCategory($source_args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 			// Sibling of the $target_category_srl
-		}
-		else if($target_category_srl > 0)
+		} else if($target_category_srl > 0)
 		{
 			$target_category = $oDocumentModel->getCategory($target_category_srl);
 			// Move all siblings of the $target_category down
 			$output = $this->updateCategoryListOrder($target_category->module_srl, $target_category->list_order+1);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 
 			$source_args->category_srl = $source_category_srl;
 			$source_args->parent_srl = $target_category->parent_srl;
 			$source_args->list_order = $target_category->list_order+1;
 			$output = $this->updateCategory($source_args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 		// Re-generate the xml file
 		$xml_file = $this->makeCategoryFile($source_category->module_srl);
@@ -1790,14 +2010,20 @@ 
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
-		if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
+		if(!$grant->manager) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 
 		$oDocumentModel = getModel('document');
 		// Get original information
 		$category_info = $oDocumentModel->getCategory($args->category_srl);
-		if($category_info->parent_srl) $parent_srl = $category_info->parent_srl;
+		if($category_info->parent_srl) {
+			$parent_srl = $category_info->parent_srl;
+		}
 		// Display an error that the category cannot be deleted if it has a child node
-		if($oDocumentModel->getCategoryChlidCount($args->category_srl)) return new BaseObject(-1, 'msg_cannot_delete_for_child');
+		if($oDocumentModel->getCategoryChlidCount($args->category_srl)) {
+			return new BaseObject(-1, 'msg_cannot_delete_for_child');
+		}
 		// Remove from the DB
 		$output = $this->deleteCategory($args->category_srl);
 		if(!$output->toBool())
@@ -1831,7 +2057,9 @@ 
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
-		if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
+		if(!$grant->manager) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 
 		$xml_file = $this->makeCategoryFile($module_srl);
 		// Set return value
@@ -1846,7 +2074,9 @@ 
 	function makeCategoryFile($module_srl)
 	{
 		// Return if there is no information you need for creating a cache file
-		if(!$module_srl) return false;
+		if(!$module_srl) {
+			return false;
+		}
 
 		$module_srl = (int)$module_srl;
 
@@ -1856,7 +2086,9 @@ 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
 		$mid = $module_info->mid;
 
-		if(!is_dir('./files/cache/document_category')) FileHandler::makeDir('./files/cache/document_category');
+		if(!is_dir('./files/cache/document_category')) {
+			FileHandler::makeDir('./files/cache/document_category');
+		}
 		// Cache file's name
 		$xml_file = sprintf("./files/cache/document_category/%s.xml.php", $module_srl);
 		$php_file = sprintf("./files/cache/document_category/%s.php", $module_srl);
@@ -1868,13 +2100,17 @@ 
 
 		$category_list = $output->data;
 
-		if(!is_array($category_list)) $category_list = array($category_list);
+		if(!is_array($category_list)) {
+			$category_list = array($category_list);
+		}
 
 		$category_count = count($category_list);
 		for($i=0;$i<$category_count;$i++)
 		{
 			$category_srl = $category_list[$i]->category_srl;
-			if(!preg_match('/^[0-9,]+$/', $category_list[$i]->group_srls)) $category_list[$i]->group_srls = '';
+			if(!preg_match('/^[0-9,]+$/', $category_list[$i]->group_srls)) {
+				$category_list[$i]->group_srls = '';
+			}
 			$list[$category_srl] = $category_list[$i];
 		}
 		// Create the xml file without node data if no data is obtained
@@ -1886,7 +2122,9 @@ 
 			return $xml_file;
 		}
 		// Change to an array if only a single data is obtained
-		if(!is_array($list)) $list = array($list);
+		if(!is_array($list)) {
+			$list = array($list);
+		}
 		// Create a tree for loop
 		foreach($list as $category_srl => $node)
 		{
@@ -1965,13 +2203,17 @@ 
 	 */
 	function getXmlTree($source_node, $tree, $site_srl, &$xml_header_buff)
 	{
-		if(!$source_node) return;
+		if(!$source_node) {
+			return;
+		}
 
 		foreach($source_node as $category_srl => $node)
 		{
 			$child_buff = "";
 			// Get data of the child nodes
-			if($category_srl && $tree[$category_srl]) $child_buff = $this->getXmlTree($tree[$category_srl], $tree, $site_srl, $xml_header_buff);
+			if($category_srl && $tree[$category_srl]) {
+				$child_buff = $this->getXmlTree($tree[$category_srl], $tree, $site_srl, $xml_header_buff);
+			}
 			// List variables
 			$expand = ($node->expand) ? $node->expand : 'N';
 			$group_srls = ($node->group_srls) ? $node->group_srls : '';
@@ -1981,8 +2223,11 @@ 
 			$color = ($node->color) ? $node->color : '';
 			$description = ($node->description) ? $node->description : '';
 			// If node->group_srls value exists
-			if($group_srls) $group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s)))))',$group_srls);
-			else $group_check_code = "true";
+			if($group_srls) {
+				$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s)))))',$group_srls);
+			} else {
+				$group_check_code = "true";
+			}
 
 			$title = $node->title;
 			$oModuleAdminModel = getAdminModel('module');
@@ -2022,8 +2267,11 @@ 
 				$node->document_count
 			);
 
-			if($child_buff) $buff .= sprintf('<node %s>%s</node>', $attribute, $child_buff);
-			else $buff .=  sprintf('<node %s />', $attribute);
+			if($child_buff) {
+				$buff .= sprintf('<node %s>%s</node>', $attribute, $child_buff);
+			} else {
+				$buff .=  sprintf('<node %s />', $attribute);
+			}
 		}
 		return $buff;
 	}
@@ -2042,7 +2290,9 @@ 
 	function getPhpCacheCode($source_node, $tree, $site_srl, &$php_header_buff)
 	{
 		$output = array("buff"=>"", "category_srl_list"=>array());
-		if(!$source_node) return $output;
+		if(!$source_node) {
+			return $output;
+		}
 
 		// Set to an arraty for looping and then generate php script codes to be included
 		foreach($source_node as $category_srl => $node)
@@ -2141,7 +2391,9 @@ 
 	function addDocumentPopupMenu($url, $str, $icon = '', $target = 'self')
 	{
 		$document_popup_menu_list = Context::get('document_popup_menu_list');
-		if(!is_array($document_popup_menu_list)) $document_popup_menu_list = array();
+		if(!is_array($document_popup_menu_list)) {
+			$document_popup_menu_list = array();
+		}
 
 		$obj = new stdClass();
 		$obj->url = $url;
@@ -2159,7 +2411,9 @@ 
 	 */
 	function procDocumentAddCart()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1, 'msg_not_permitted');
+		}
 
 		// Get document_srl
 		$srls = explode(',',Context::get('srls'));
@@ -2167,11 +2421,15 @@ 
 		{
 			$srl = trim($srls[$i]);
 
-			if(!$srl) continue;
+			if(!$srl) {
+				continue;
+			}
 
 			$document_srls[] = $srl;
 		}
-		if(!count($document_srls)) return;
+		if(!count($document_srls)) {
+			return;
+		}
 
 		// Get module_srl of the documents
 		$args = new stdClass;
@@ -2179,14 +2437,18 @@ 
 		$args->document_srls = implode(',',$document_srls);
 		$args->order_type = 'asc';
 		$output = executeQueryArray('document.getDocuments', $args);
-		if(!$output->data) return new BaseObject();
+		if(!$output->data) {
+			return new BaseObject();
+		}
 
 		unset($document_srls);
 		foreach($output->data as $key => $val)
 		{
 			$document_srls[$val->module_srl][] = $val->document_srl;
 		}
-		if(!$document_srls || !count($document_srls)) return new BaseObject();
+		if(!$document_srls || !count($document_srls)) {
+			return new BaseObject();
+		}
 
 		// Check if each of module administrators exists. Top-level administator will have a permission to modify every document of all modules.(Even to modify temporarily saved or trashed documents)
 		$oModuleModel = getModel('module');
@@ -2211,7 +2473,9 @@ 
 				}
 			}
 		}
-		if(!count($document_srls)) return new BaseObject();
+		if(!count($document_srls)) {
+			return new BaseObject();
+		}
 
 		foreach($document_srls as $module_srl => $documents)
 		{
@@ -2219,9 +2483,14 @@ 
 			for($i=0;$i<$cnt;$i++)
 			{
 				$document_srl = (int)trim($documents[$i]);
-				if(!$document_srls) continue;
-				if($_SESSION['document_management'][$document_srl]) unset($_SESSION['document_management'][$document_srl]);
-				else $_SESSION['document_management'][$document_srl] = true;
+				if(!$document_srls) {
+					continue;
+				}
+				if($_SESSION['document_management'][$document_srl]) {
+					unset($_SESSION['document_management'][$document_srl]);
+				} else {
+					$_SESSION['document_management'][$document_srl] = true;
+				}
 			}
 		}
 	}
@@ -2233,7 +2502,9 @@ 
 	function procDocumentManageCheckedDocument()
 	{
 		@set_time_limit(0);
-		if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 
 		if(!checkCSRF())
 		{
@@ -2243,10 +2514,14 @@ 
 		$type = Context::get('type');
 		$target_module = Context::get('target_module_srl');
 		$module_srl = Context::get('module_srl');
-		if($target_module && !$module_srl) $module_srl = $target_module;
+		if($target_module && !$module_srl) {
+			$module_srl = $target_module;
+		}
 		$category_srl = Context::get('target_category_srl');
 		$message_content = strip_tags(Context::get('message_content'));
-		if($message_content) $message_content = nl2br($message_content);
+		if($message_content) {
+			$message_content = nl2br($message_content);
+		}
 
 		$cart = Context::get('cart');
 		$document_srl_list = (!is_array($cart)) ? explode('|@|', $cart) : $cart;
@@ -2261,7 +2536,9 @@ 
 		{
 			$oDocument = $oDocumentModel->getDocument($document_srl);
 			$document_items[] = $oDocument;
-			if(!$oDocument->isGranted()) return $this->stop('msg_not_permitted');
+			if(!$oDocument->isGranted()) {
+				return $this->stop('msg_not_permitted');
+			}
 		}
 
 		// Send a message
@@ -2277,10 +2554,15 @@ 
 
 			foreach($document_items as $oDocument)
 			{
-				if(!$oDocument->get('member_srl') || $oDocument->get('member_srl')==$sender_member_srl) continue;
+				if(!$oDocument->get('member_srl') || $oDocument->get('member_srl')==$sender_member_srl) {
+					continue;
+				}
 
-				if($type=='move') $purl = sprintf("<a href=\"%s\" target=\"_blank\">%s</a>", $oDocument->getPermanentUrl(), $oDocument->getPermanentUrl());
-				else $purl = "";
+				if($type=='move') {
+					$purl = sprintf("<a href=\"%s\" target=\"_blank\">%s</a>", $oDocument->getPermanentUrl(), $oDocument->getPermanentUrl());
+				} else {
+					$purl = "";
+				}
 				$content = sprintf("<div>%s</div><hr />%s<div style=\"font-weight:bold\">%s</div>%s",$message_content, $purl, $oDocument->getTitleText(), $oDocument->getContent(false, false, false));
 
 				$oCommunicationController->sendMessage($sender_member_srl, $oDocument->get('member_srl'), $title, $content, false);
@@ -2293,24 +2575,30 @@ 
 		$oDocumentAdminController = getAdminController('document');
 		if($type == 'move')
 		{
-			if(!$module_srl) return new BaseObject(-1, 'fail_to_move');
+			if(!$module_srl) {
+				return new BaseObject(-1, 'fail_to_move');
+			}
 
 			$output = $oDocumentAdminController->moveDocumentModule($document_srl_list, $module_srl, $category_srl);
-			if(!$output->toBool()) return new BaseObject(-1, 'fail_to_move');
+			if(!$output->toBool()) {
+				return new BaseObject(-1, 'fail_to_move');
+			}
 
 			$msg_code = 'success_moved';
 
-		}
-		else if($type == 'copy')
+		} else if($type == 'copy')
 		{
-			if(!$module_srl) return new BaseObject(-1, 'fail_to_move');
+			if(!$module_srl) {
+				return new BaseObject(-1, 'fail_to_move');
+			}
 
 			$output = $oDocumentAdminController->copyDocumentModule($document_srl_list, $module_srl, $category_srl);
-			if(!$output->toBool()) return new BaseObject(-1, 'fail_to_move');
+			if(!$output->toBool()) {
+				return new BaseObject(-1, 'fail_to_move');
+			}
 
 			$msg_code = 'success_copied';
-		}
-		else if($type =='delete')
+		} else if($type =='delete')
 		{
 			$oDB = &DB::getInstance();
 			$oDB->begin();
@@ -2318,12 +2606,13 @@ 
 			{
 				$document_srl = $document_srl_list[$i];
 				$output = $this->deleteDocument($document_srl, true);
-				if(!$output->toBool()) return new BaseObject(-1, 'fail_to_delete');
+				if(!$output->toBool()) {
+					return new BaseObject(-1, 'fail_to_delete');
+				}
 			}
 			$oDB->commit();
 			$msg_code = 'success_deleted';
-		}
-		else if($type == 'trash')
+		} else if($type == 'trash')
 		{
 			$args = new stdClass();
 			$args->description = $message_content;
@@ -2333,12 +2622,13 @@ 
 			for($i=0;$i<$document_srl_count;$i++) {
 				$args->document_srl = $document_srl_list[$i];
 				$output = $this->moveDocumentToTrash($args);
-				if(!$output || !$output->toBool()) return new BaseObject(-1, 'fail_to_trash');
+				if(!$output || !$output->toBool()) {
+					return new BaseObject(-1, 'fail_to_trash');
+				}
 			}
 			$oDB->commit();
 			$msg_code = 'success_trashed';
-		}
-		else if($type == 'cancelDeclare')
+		} else if($type == 'cancelDeclare')
 		{
 			$args->document_srl = $document_srl_list;
 			$output = executeQuery('document.deleteDeclaredDocuments', $args);
@@ -2360,18 +2650,27 @@ 
 	function procDocumentInsertModuleConfig()
 	{
 		$module_srl = Context::get('target_module_srl');
-		if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
-		else $module_srl = array($module_srl);
+		if(preg_match('/^([0-9,]+)$/',$module_srl)) {
+			$module_srl = explode(',',$module_srl);
+		} else {
+			$module_srl = array($module_srl);
+		}
 
 		$document_config = new stdClass();
 		$document_config->use_history = Context::get('use_history');
-		if(!$document_config->use_history) $document_config->use_history = 'N';
+		if(!$document_config->use_history) {
+			$document_config->use_history = 'N';
+		}
 
 		$document_config->use_vote_up = Context::get('use_vote_up');
-		if(!$document_config->use_vote_up) $document_config->use_vote_up = 'Y';
+		if(!$document_config->use_vote_up) {
+			$document_config->use_vote_up = 'Y';
+		}
 
 		$document_config->use_vote_down = Context::get('use_vote_down');
-		if(!$document_config->use_vote_down) $document_config->use_vote_down = 'Y';
+		if(!$document_config->use_vote_down) {
+			$document_config->use_vote_down = 'Y';
+		}
 
 		$document_config->use_status = Context::get('use_status');
 
@@ -2379,7 +2678,9 @@ 
 		for($i=0;$i<count($module_srl);$i++)
 		{
 			$srl = trim($module_srl[$i]);
-			if(!$srl) continue;
+			if(!$srl) {
+				continue;
+			}
 			$output = $oModuleController->insertModulePartConfig('document',$srl,$document_config);
 		}
 		$this->setError(-1);
@@ -2396,7 +2697,9 @@ 
 	function procDocumentTempSave()
 	{
 		// Check login information
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_logged');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1, 'msg_not_logged');
+		}
 		$module_info = Context::get('module_info');
 		$logged_info = Context::get('logged_info');
 
@@ -2434,8 +2737,7 @@ 
 			$output = $oDocumentController->updateDocument($oDocument, $obj);
 			$msg_code = 'success_updated';
 			// Otherwise, get a new
-		}
-		else
+		} else
 		{
 			$output = $oDocumentController->insertDocument($obj);
 			$msg_code = 'success_registed';
@@ -2461,17 +2763,20 @@ 
 	 */
 	function procDocumentGetList()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 		$documentSrls = Context::get('document_srls');
-		if($documentSrls) $documentSrlList = explode(',', $documentSrls);
+		if($documentSrls) {
+			$documentSrlList = explode(',', $documentSrls);
+		}
 
 		if(count($documentSrlList) > 0)
 		{
 			$oDocumentModel = getModel('document');
 			$columnList = array('document_srl', 'title', 'nick_name', 'status');
 			$documentList = $oDocumentModel->getDocuments($documentSrlList, $this->grant->is_admin, false, $columnList);
-		}
-		else
+		} else
 		{
 			global $lang;
 			$documentList = array();
@@ -2489,11 +2794,18 @@ 
 	 */
 	function _checkCommentStatusForOldVersion(&$obj)
 	{
-		if(!isset($obj->allow_comment)) $obj->allow_comment = 'N';
-		if(!isset($obj->lock_comment)) $obj->lock_comment = 'N';
+		if(!isset($obj->allow_comment)) {
+			$obj->allow_comment = 'N';
+		}
+		if(!isset($obj->lock_comment)) {
+			$obj->lock_comment = 'N';
+		}
 
-		if($obj->allow_comment == 'Y' && $obj->lock_comment == 'N') $obj->commentStatus = 'ALLOW';
-		else $obj->commentStatus = 'DENY';
+		if($obj->allow_comment == 'Y' && $obj->lock_comment == 'N') {
+			$obj->commentStatus = 'ALLOW';
+		} else {
+			$obj->commentStatus = 'DENY';
+		}
 	}
 
 	/**
@@ -2503,8 +2815,12 @@ 
 	 */
 	function _checkDocumentStatusForOldVersion(&$obj)
 	{
-		if(!$obj->status && $obj->is_secret == 'Y') $obj->status = $this->getConfigStatus('secret');
-		if(!$obj->status && $obj->is_secret != 'Y') $obj->status = $this->getConfigStatus('public');
+		if(!$obj->status && $obj->is_secret == 'Y') {
+			$obj->status = $this->getConfigStatus('secret');
+		}
+		if(!$obj->status && $obj->is_secret != 'Y') {
+			$obj->status = $this->getConfigStatus('public');
+		}
 	}
 
 	public function updateUploaedCount($documentSrlList)

classes/security/htmlpurifier/library/HTMLPurifier.safe-includes.php

Spacing +201 added lines, -201 removed lines

@@ -12,204 +12,204 @@
 
 $__dir = dirname(__FILE__);
 
-require_once $__dir . '/HTMLPurifier.php';
-require_once $__dir . '/HTMLPurifier/AttrCollections.php';
-require_once $__dir . '/HTMLPurifier/AttrDef.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform.php';
-require_once $__dir . '/HTMLPurifier/AttrTypes.php';
-require_once $__dir . '/HTMLPurifier/AttrValidator.php';
-require_once $__dir . '/HTMLPurifier/Bootstrap.php';
-require_once $__dir . '/HTMLPurifier/Definition.php';
-require_once $__dir . '/HTMLPurifier/CSSDefinition.php';
-require_once $__dir . '/HTMLPurifier/ChildDef.php';
-require_once $__dir . '/HTMLPurifier/Config.php';
-require_once $__dir . '/HTMLPurifier/ConfigSchema.php';
-require_once $__dir . '/HTMLPurifier/ContentSets.php';
-require_once $__dir . '/HTMLPurifier/Context.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCacheFactory.php';
-require_once $__dir . '/HTMLPurifier/Doctype.php';
-require_once $__dir . '/HTMLPurifier/DoctypeRegistry.php';
-require_once $__dir . '/HTMLPurifier/ElementDef.php';
-require_once $__dir . '/HTMLPurifier/Encoder.php';
-require_once $__dir . '/HTMLPurifier/EntityLookup.php';
-require_once $__dir . '/HTMLPurifier/EntityParser.php';
-require_once $__dir . '/HTMLPurifier/ErrorCollector.php';
-require_once $__dir . '/HTMLPurifier/ErrorStruct.php';
-require_once $__dir . '/HTMLPurifier/Exception.php';
-require_once $__dir . '/HTMLPurifier/Filter.php';
-require_once $__dir . '/HTMLPurifier/Generator.php';
-require_once $__dir . '/HTMLPurifier/HTMLDefinition.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule.php';
-require_once $__dir . '/HTMLPurifier/HTMLModuleManager.php';
-require_once $__dir . '/HTMLPurifier/IDAccumulator.php';
-require_once $__dir . '/HTMLPurifier/Injector.php';
-require_once $__dir . '/HTMLPurifier/Language.php';
-require_once $__dir . '/HTMLPurifier/LanguageFactory.php';
-require_once $__dir . '/HTMLPurifier/Length.php';
-require_once $__dir . '/HTMLPurifier/Lexer.php';
-require_once $__dir . '/HTMLPurifier/PercentEncoder.php';
-require_once $__dir . '/HTMLPurifier/PropertyList.php';
-require_once $__dir . '/HTMLPurifier/PropertyListIterator.php';
-require_once $__dir . '/HTMLPurifier/Strategy.php';
-require_once $__dir . '/HTMLPurifier/StringHash.php';
-require_once $__dir . '/HTMLPurifier/StringHashParser.php';
-require_once $__dir . '/HTMLPurifier/TagTransform.php';
-require_once $__dir . '/HTMLPurifier/Token.php';
-require_once $__dir . '/HTMLPurifier/TokenFactory.php';
-require_once $__dir . '/HTMLPurifier/URI.php';
-require_once $__dir . '/HTMLPurifier/URIDefinition.php';
-require_once $__dir . '/HTMLPurifier/URIFilter.php';
-require_once $__dir . '/HTMLPurifier/URIParser.php';
-require_once $__dir . '/HTMLPurifier/URIScheme.php';
-require_once $__dir . '/HTMLPurifier/URISchemeRegistry.php';
-require_once $__dir . '/HTMLPurifier/UnitConverter.php';
-require_once $__dir . '/HTMLPurifier/VarParser.php';
-require_once $__dir . '/HTMLPurifier/VarParserException.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/Clone.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/Enum.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/Integer.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/Lang.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/Switch.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/Text.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Number.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/AlphaValue.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Background.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Border.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Color.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Composite.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Filter.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Font.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/FontFamily.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Ident.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Length.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/ListStyle.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Multiple.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Percentage.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/TextDecoration.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/URI.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Bool.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Nmtokens.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Class.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Color.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/FrameTarget.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/ID.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Pixels.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Length.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/LinkTypes.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/MultiLength.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI/Email.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI/Host.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI/IPv4.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI/IPv6.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Background.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/BdoDir.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/BgColor.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/BoolToCSS.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Border.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/EnumToCSS.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/ImgRequired.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/ImgSpace.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Input.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Lang.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Length.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Name.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/NameSync.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Nofollow.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/SafeEmbed.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/SafeObject.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/SafeParam.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/ScriptRequired.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/TargetBlank.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Textarea.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Chameleon.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Custom.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Empty.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/List.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Required.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Optional.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/StrictBlockquote.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Table.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache/Decorator.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache/Null.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache/Serializer.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache/Decorator/Memory.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Bdo.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/CommonAttributes.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Edit.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Forms.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Hypertext.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Iframe.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Image.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Legacy.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/List.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Name.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Nofollow.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Object.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Presentation.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Proprietary.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Ruby.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/SafeEmbed.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/SafeObject.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Scripting.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/StyleAttribute.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tables.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Target.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/TargetBlank.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Text.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/XMLCommonAttributes.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Name.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Proprietary.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Strict.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Transitional.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/XHTML.php';
-require_once $__dir . '/HTMLPurifier/Injector/AutoParagraph.php';
-require_once $__dir . '/HTMLPurifier/Injector/DisplayLinkURI.php';
-require_once $__dir . '/HTMLPurifier/Injector/Linkify.php';
-require_once $__dir . '/HTMLPurifier/Injector/PurifierLinkify.php';
-require_once $__dir . '/HTMLPurifier/Injector/RemoveEmpty.php';
-require_once $__dir . '/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php';
-require_once $__dir . '/HTMLPurifier/Injector/SafeObject.php';
-require_once $__dir . '/HTMLPurifier/Lexer/DOMLex.php';
-require_once $__dir . '/HTMLPurifier/Lexer/DirectLex.php';
-require_once $__dir . '/HTMLPurifier/Strategy/Composite.php';
-require_once $__dir . '/HTMLPurifier/Strategy/Core.php';
-require_once $__dir . '/HTMLPurifier/Strategy/FixNesting.php';
-require_once $__dir . '/HTMLPurifier/Strategy/MakeWellFormed.php';
-require_once $__dir . '/HTMLPurifier/Strategy/RemoveForeignElements.php';
-require_once $__dir . '/HTMLPurifier/Strategy/ValidateAttributes.php';
-require_once $__dir . '/HTMLPurifier/TagTransform/Font.php';
-require_once $__dir . '/HTMLPurifier/TagTransform/Simple.php';
-require_once $__dir . '/HTMLPurifier/Token/Comment.php';
-require_once $__dir . '/HTMLPurifier/Token/Tag.php';
-require_once $__dir . '/HTMLPurifier/Token/Empty.php';
-require_once $__dir . '/HTMLPurifier/Token/End.php';
-require_once $__dir . '/HTMLPurifier/Token/Start.php';
-require_once $__dir . '/HTMLPurifier/Token/Text.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/DisableExternal.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/DisableExternalResources.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/DisableResources.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/HostBlacklist.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/MakeAbsolute.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/Munge.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/SafeIframe.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/data.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/file.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/ftp.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/http.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/https.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/mailto.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/news.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/nntp.php';
-require_once $__dir . '/HTMLPurifier/VarParser/Flexible.php';
-require_once $__dir . '/HTMLPurifier/VarParser/Native.php';
+require_once $__dir.'/HTMLPurifier.php';
+require_once $__dir.'/HTMLPurifier/AttrCollections.php';
+require_once $__dir.'/HTMLPurifier/AttrDef.php';
+require_once $__dir.'/HTMLPurifier/AttrTransform.php';
+require_once $__dir.'/HTMLPurifier/AttrTypes.php';
+require_once $__dir.'/HTMLPurifier/AttrValidator.php';
+require_once $__dir.'/HTMLPurifier/Bootstrap.php';
+require_once $__dir.'/HTMLPurifier/Definition.php';
+require_once $__dir.'/HTMLPurifier/CSSDefinition.php';
+require_once $__dir.'/HTMLPurifier/ChildDef.php';
+require_once $__dir.'/HTMLPurifier/Config.php';
+require_once $__dir.'/HTMLPurifier/ConfigSchema.php';
+require_once $__dir.'/HTMLPurifier/ContentSets.php';
+require_once $__dir.'/HTMLPurifier/Context.php';
+require_once $__dir.'/HTMLPurifier/DefinitionCache.php';
+require_once $__dir.'/HTMLPurifier/DefinitionCacheFactory.php';
+require_once $__dir.'/HTMLPurifier/Doctype.php';
+require_once $__dir.'/HTMLPurifier/DoctypeRegistry.php';
+require_once $__dir.'/HTMLPurifier/ElementDef.php';
+require_once $__dir.'/HTMLPurifier/Encoder.php';
+require_once $__dir.'/HTMLPurifier/EntityLookup.php';
+require_once $__dir.'/HTMLPurifier/EntityParser.php';
+require_once $__dir.'/HTMLPurifier/ErrorCollector.php';
+require_once $__dir.'/HTMLPurifier/ErrorStruct.php';
+require_once $__dir.'/HTMLPurifier/Exception.php';
+require_once $__dir.'/HTMLPurifier/Filter.php';
+require_once $__dir.'/HTMLPurifier/Generator.php';
+require_once $__dir.'/HTMLPurifier/HTMLDefinition.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule.php';
+require_once $__dir.'/HTMLPurifier/HTMLModuleManager.php';
+require_once $__dir.'/HTMLPurifier/IDAccumulator.php';
+require_once $__dir.'/HTMLPurifier/Injector.php';
+require_once $__dir.'/HTMLPurifier/Language.php';
+require_once $__dir.'/HTMLPurifier/LanguageFactory.php';
+require_once $__dir.'/HTMLPurifier/Length.php';
+require_once $__dir.'/HTMLPurifier/Lexer.php';
+require_once $__dir.'/HTMLPurifier/PercentEncoder.php';
+require_once $__dir.'/HTMLPurifier/PropertyList.php';
+require_once $__dir.'/HTMLPurifier/PropertyListIterator.php';
+require_once $__dir.'/HTMLPurifier/Strategy.php';
+require_once $__dir.'/HTMLPurifier/StringHash.php';
+require_once $__dir.'/HTMLPurifier/StringHashParser.php';
+require_once $__dir.'/HTMLPurifier/TagTransform.php';
+require_once $__dir.'/HTMLPurifier/Token.php';
+require_once $__dir.'/HTMLPurifier/TokenFactory.php';
+require_once $__dir.'/HTMLPurifier/URI.php';
+require_once $__dir.'/HTMLPurifier/URIDefinition.php';
+require_once $__dir.'/HTMLPurifier/URIFilter.php';
+require_once $__dir.'/HTMLPurifier/URIParser.php';
+require_once $__dir.'/HTMLPurifier/URIScheme.php';
+require_once $__dir.'/HTMLPurifier/URISchemeRegistry.php';
+require_once $__dir.'/HTMLPurifier/UnitConverter.php';
+require_once $__dir.'/HTMLPurifier/VarParser.php';
+require_once $__dir.'/HTMLPurifier/VarParserException.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/CSS.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/Clone.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/Enum.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/Integer.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/Lang.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/Switch.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/Text.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/URI.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/CSS/Number.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/CSS/AlphaValue.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/CSS/Background.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/CSS/Border.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/CSS/Color.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/CSS/Composite.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/CSS/Filter.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/CSS/Font.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/CSS/FontFamily.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/CSS/Ident.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/CSS/Length.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/CSS/ListStyle.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/CSS/Multiple.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/CSS/Percentage.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/CSS/TextDecoration.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/CSS/URI.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/HTML/Bool.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/HTML/Nmtokens.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/HTML/Class.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/HTML/Color.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/HTML/FrameTarget.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/HTML/ID.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/HTML/Pixels.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/HTML/Length.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/HTML/LinkTypes.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/HTML/MultiLength.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/URI/Email.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/URI/Host.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/URI/IPv4.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/URI/IPv6.php';
+require_once $__dir.'/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php';
+require_once $__dir.'/HTMLPurifier/AttrTransform/Background.php';
+require_once $__dir.'/HTMLPurifier/AttrTransform/BdoDir.php';
+require_once $__dir.'/HTMLPurifier/AttrTransform/BgColor.php';
+require_once $__dir.'/HTMLPurifier/AttrTransform/BoolToCSS.php';
+require_once $__dir.'/HTMLPurifier/AttrTransform/Border.php';
+require_once $__dir.'/HTMLPurifier/AttrTransform/EnumToCSS.php';
+require_once $__dir.'/HTMLPurifier/AttrTransform/ImgRequired.php';
+require_once $__dir.'/HTMLPurifier/AttrTransform/ImgSpace.php';
+require_once $__dir.'/HTMLPurifier/AttrTransform/Input.php';
+require_once $__dir.'/HTMLPurifier/AttrTransform/Lang.php';
+require_once $__dir.'/HTMLPurifier/AttrTransform/Length.php';
+require_once $__dir.'/HTMLPurifier/AttrTransform/Name.php';
+require_once $__dir.'/HTMLPurifier/AttrTransform/NameSync.php';
+require_once $__dir.'/HTMLPurifier/AttrTransform/Nofollow.php';
+require_once $__dir.'/HTMLPurifier/AttrTransform/SafeEmbed.php';
+require_once $__dir.'/HTMLPurifier/AttrTransform/SafeObject.php';
+require_once $__dir.'/HTMLPurifier/AttrTransform/SafeParam.php';
+require_once $__dir.'/HTMLPurifier/AttrTransform/ScriptRequired.php';
+require_once $__dir.'/HTMLPurifier/AttrTransform/TargetBlank.php';
+require_once $__dir.'/HTMLPurifier/AttrTransform/Textarea.php';
+require_once $__dir.'/HTMLPurifier/ChildDef/Chameleon.php';
+require_once $__dir.'/HTMLPurifier/ChildDef/Custom.php';
+require_once $__dir.'/HTMLPurifier/ChildDef/Empty.php';
+require_once $__dir.'/HTMLPurifier/ChildDef/List.php';
+require_once $__dir.'/HTMLPurifier/ChildDef/Required.php';
+require_once $__dir.'/HTMLPurifier/ChildDef/Optional.php';
+require_once $__dir.'/HTMLPurifier/ChildDef/StrictBlockquote.php';
+require_once $__dir.'/HTMLPurifier/ChildDef/Table.php';
+require_once $__dir.'/HTMLPurifier/DefinitionCache/Decorator.php';
+require_once $__dir.'/HTMLPurifier/DefinitionCache/Null.php';
+require_once $__dir.'/HTMLPurifier/DefinitionCache/Serializer.php';
+require_once $__dir.'/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php';
+require_once $__dir.'/HTMLPurifier/DefinitionCache/Decorator/Memory.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/Bdo.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/CommonAttributes.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/Edit.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/Forms.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/Hypertext.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/Iframe.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/Image.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/Legacy.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/List.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/Name.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/Nofollow.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/Object.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/Presentation.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/Proprietary.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/Ruby.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/SafeEmbed.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/SafeObject.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/Scripting.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/StyleAttribute.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/Tables.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/Target.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/TargetBlank.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/Text.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/Tidy.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/XMLCommonAttributes.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/Tidy/Name.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/Tidy/Proprietary.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/Tidy/Strict.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/Tidy/Transitional.php';
+require_once $__dir.'/HTMLPurifier/HTMLModule/Tidy/XHTML.php';
+require_once $__dir.'/HTMLPurifier/Injector/AutoParagraph.php';
+require_once $__dir.'/HTMLPurifier/Injector/DisplayLinkURI.php';
+require_once $__dir.'/HTMLPurifier/Injector/Linkify.php';
+require_once $__dir.'/HTMLPurifier/Injector/PurifierLinkify.php';
+require_once $__dir.'/HTMLPurifier/Injector/RemoveEmpty.php';
+require_once $__dir.'/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php';
+require_once $__dir.'/HTMLPurifier/Injector/SafeObject.php';
+require_once $__dir.'/HTMLPurifier/Lexer/DOMLex.php';
+require_once $__dir.'/HTMLPurifier/Lexer/DirectLex.php';
+require_once $__dir.'/HTMLPurifier/Strategy/Composite.php';
+require_once $__dir.'/HTMLPurifier/Strategy/Core.php';
+require_once $__dir.'/HTMLPurifier/Strategy/FixNesting.php';
+require_once $__dir.'/HTMLPurifier/Strategy/MakeWellFormed.php';
+require_once $__dir.'/HTMLPurifier/Strategy/RemoveForeignElements.php';
+require_once $__dir.'/HTMLPurifier/Strategy/ValidateAttributes.php';
+require_once $__dir.'/HTMLPurifier/TagTransform/Font.php';
+require_once $__dir.'/HTMLPurifier/TagTransform/Simple.php';
+require_once $__dir.'/HTMLPurifier/Token/Comment.php';
+require_once $__dir.'/HTMLPurifier/Token/Tag.php';
+require_once $__dir.'/HTMLPurifier/Token/Empty.php';
+require_once $__dir.'/HTMLPurifier/Token/End.php';
+require_once $__dir.'/HTMLPurifier/Token/Start.php';
+require_once $__dir.'/HTMLPurifier/Token/Text.php';
+require_once $__dir.'/HTMLPurifier/URIFilter/DisableExternal.php';
+require_once $__dir.'/HTMLPurifier/URIFilter/DisableExternalResources.php';
+require_once $__dir.'/HTMLPurifier/URIFilter/DisableResources.php';
+require_once $__dir.'/HTMLPurifier/URIFilter/HostBlacklist.php';
+require_once $__dir.'/HTMLPurifier/URIFilter/MakeAbsolute.php';
+require_once $__dir.'/HTMLPurifier/URIFilter/Munge.php';
+require_once $__dir.'/HTMLPurifier/URIFilter/SafeIframe.php';
+require_once $__dir.'/HTMLPurifier/URIScheme/data.php';
+require_once $__dir.'/HTMLPurifier/URIScheme/file.php';
+require_once $__dir.'/HTMLPurifier/URIScheme/ftp.php';
+require_once $__dir.'/HTMLPurifier/URIScheme/http.php';
+require_once $__dir.'/HTMLPurifier/URIScheme/https.php';
+require_once $__dir.'/HTMLPurifier/URIScheme/mailto.php';
+require_once $__dir.'/HTMLPurifier/URIScheme/news.php';
+require_once $__dir.'/HTMLPurifier/URIScheme/nntp.php';
+require_once $__dir.'/HTMLPurifier/VarParser/Flexible.php';
+require_once $__dir.'/HTMLPurifier/VarParser/Native.php';

classes/security/htmlpurifier/library/HTMLPurifier.path.php

Spacing +1 added lines, -1 removed lines

@@ -6,6 +6,6 @@
  * without any other side-effects.
  */
 
-set_include_path(dirname(__FILE__) . PATH_SEPARATOR . get_include_path() );
+set_include_path(dirname(__FILE__).PATH_SEPARATOR.get_include_path());
 
 // vim: et sw=4 sts=4

classes/security/htmlpurifier/library/HTMLPurifier.auto.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
  * This is a stub include that automatically configures the include path.
  */
 
-set_include_path(dirname(__FILE__) . PATH_SEPARATOR . get_include_path() );
+set_include_path(dirname(__FILE__).PATH_SEPARATOR.get_include_path());
 require_once 'HTMLPurifier/Bootstrap.php';
 require_once 'HTMLPurifier.autoload.php';
 

classes/cache/CacheApc.class.php

Spacing +11 added lines, -11 removed lines

@@ -18,7 +18,7 @@ 
 	 */
 	function getInstance($opt = null)
 	{
-		if(!$GLOBALS['__CacheApc__'])
+		if (!$GLOBALS['__CacheApc__'])
 		{
 			$GLOBALS['__CacheApc__'] = new CacheApc();
 		}
@@ -56,12 +56,12 @@ 
 	 */
 	function put($key, $buff, $valid_time = 0)
 	{
-		if($valid_time == 0)
+		if ($valid_time == 0)
 		{
 			$valid_time = $this->valid_time;
 		}
 
-		return apc_store(md5(_XE_PATH_ . $key), array($_SERVER['REQUEST_TIME'], $buff), $valid_time);
+		return apc_store(md5(_XE_PATH_.$key), array($_SERVER['REQUEST_TIME'], $buff), $valid_time);
 	}
 
 	/**
@@ -74,15 +74,15 @@ 
 	 */
 	function isValid($key, $modified_time = 0)
 	{
-		$_key = md5(_XE_PATH_ . $key);
+		$_key = md5(_XE_PATH_.$key);
 		$obj = apc_fetch($_key, $success);
-		if(!$success || !is_array($obj))
+		if (!$success || !is_array($obj))
 		{
 			return false;
 		}
 		unset($obj[1]);
 
-		if($modified_time > 0 && $modified_time > $obj[0])
+		if ($modified_time > 0 && $modified_time > $obj[0])
 		{
 			$this->delete($key);
 			return false;
@@ -101,14 +101,14 @@ 
 	 */
 	function get($key, $modified_time = 0)
 	{
-		$_key = md5(_XE_PATH_ . $key);
+		$_key = md5(_XE_PATH_.$key);
 		$obj = apc_fetch($_key, $success);
-		if(!$success || !is_array($obj))
+		if (!$success || !is_array($obj))
 		{
 			return false;
 		}
 
-		if($modified_time > 0 && $modified_time > $obj[0])
+		if ($modified_time > 0 && $modified_time > $obj[0])
 		{
 			$this->delete($key);
 			return false;
@@ -125,7 +125,7 @@ 
 	 */
 	function delete($key)
 	{
-		$_key = md5(_XE_PATH_ . $key);
+		$_key = md5(_XE_PATH_.$key);
 		return apc_delete($_key);
 	}
 
@@ -148,7 +148,7 @@ 
 	}
 }
 
-CacheApc::$isSupport  = function_exists('apc_add');
+CacheApc::$isSupport = function_exists('apc_add');
 
 /* End of file CacheApc.class.php */
 /* Location: ./classes/cache/CacheApc.class.php */

classes/cache/CacheWincache.class.php

Spacing +10 added lines, -10 removed lines

@@ -20,7 +20,7 @@ 
 	 */
 	function getInstance($opt = null)
 	{
-		if(!$GLOBALS['__CacheWincache__'])
+		if (!$GLOBALS['__CacheWincache__'])
 		{
 			$GLOBALS['__CacheWincache__'] = new CacheWincache();
 		}
@@ -59,11 +59,11 @@ 
 	 */
 	function put($key, $buff, $valid_time = 0)
 	{
-		if($valid_time == 0)
+		if ($valid_time == 0)
 		{
 			$valid_time = $this->valid_time;
 		}
-		return wincache_ucache_set(md5(_XE_PATH_ . $key), array($_SERVER['REQUEST_TIME'], $buff), $valid_time);
+		return wincache_ucache_set(md5(_XE_PATH_.$key), array($_SERVER['REQUEST_TIME'], $buff), $valid_time);
 	}
 
 	/**
@@ -76,15 +76,15 @@ 
 	 */
 	function isValid($key, $modified_time = 0)
 	{
-		$_key = md5(_XE_PATH_ . $key);
+		$_key = md5(_XE_PATH_.$key);
 		$obj = wincache_ucache_get($_key, $success);
-		if(!$success || !is_array($obj))
+		if (!$success || !is_array($obj))
 		{
 			return false;
 		}
 		unset($obj[1]);
 
-		if($modified_time > 0 && $modified_time > $obj[0])
+		if ($modified_time > 0 && $modified_time > $obj[0])
 		{
 			$this->_delete($_key);
 			return false;
@@ -103,14 +103,14 @@ 
 	 */
 	function get($key, $modified_time = 0)
 	{
-		$_key = md5(_XE_PATH_ . $key);
+		$_key = md5(_XE_PATH_.$key);
 		$obj = wincache_ucache_get($_key, $success);
-		if(!$success || !is_array($obj))
+		if (!$success || !is_array($obj))
 		{
 			return false;
 		}
 
-		if($modified_time > 0 && $modified_time > $obj[0])
+		if ($modified_time > 0 && $modified_time > $obj[0])
 		{
 			$this->_delete($_key);
 			return false;
@@ -138,7 +138,7 @@ 
 	 */
 	function delete($key)
 	{
-		$_key = md5(_XE_PATH_ . $key);
+		$_key = md5(_XE_PATH_.$key);
 		$this->_delete($_key);
 	}