diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php index dbf219dd6..ffaa72cf4 100644 --- a/inc/inc.Utils.php +++ b/inc/inc.Utils.php @@ -1,105 +1,103 @@ -1000000000) return number_format($size_bytes/1000000000,1,".","")." GBytes"; else if ($size_bytes>1000000) return number_format($size_bytes/1000000,1,".","")." MBytes"; else if ($size_bytes>1000) return number_format($size_bytes/1000,1,".","")." KBytes"; return number_format($size_bytes,0,"","")." Bytes"; -} - -function getReadableDate($timestamp) { - return date("d.m.Y", $timestamp); -} - -function getLongReadableDate($timestamp) { - return date("d/m/Y H:i", $timestamp); +} /* }}} */ + +function getReadableDate($timestamp) { + return date("d.m.Y", $timestamp); } -// -// The original string sanitizer, kept for reference. -//function sanitizeString($string) { -// $string = str_replace("'", "'", $string); -// $string = str_replace("--", "", $string); -// $string = str_replace("<", "<", $string); -// $string = str_replace(">", ">", $string); -// $string = str_replace("/*", "", $string); -// $string = str_replace("*/", "", $string); -// $string = str_replace("\"", """, $string); -// -// return $string; -//} - -function sanitizeString($string) { - - $string = (string) $string; - if (get_magic_quotes_gpc()) { - $string = stripslashes($string); - } - - $string = str_replace("\\", "\\\\", $string); - $string = str_replace("--", "\-\-", $string); - $string = str_replace(";", "\;", $string); - // Use HTML entities to represent the other characters that have special - // meaning in SQL. These can be easily converted back to ASCII / UTF-8 - // with a decode function if need be. - $string = str_replace("&", "&", $string); - $string = str_replace("%", "%", $string); // percent - $string = str_replace("\"", """, $string); // double quote - $string = str_replace("/*", "/*", $string); // start of comment - $string = str_replace("*/", "*/", $string); // end of comment - $string = str_replace("<", "<", $string); - $string = str_replace(">", ">", $string); - $string = str_replace("=", "=", $string); - $string = str_replace(")", ")", $string); - $string = str_replace("(", "(", $string); - $string = str_replace("'", "'", $string); - $string = str_replace("+", "+", $string); - - return trim($string); -} - -function mydmsDecodeString($string) { - - $string = (string)$string; - - $string = str_replace("&", "&", $string); - $string = str_replace("%", "%", $string); // percent - $string = str_replace(""", "\"", $string); // double quote - $string = str_replace("/*", "/*", $string); // start of comment - $string = str_replace("*/", "*/", $string); // end of comment - $string = str_replace("<", "<", $string); - $string = str_replace(">", ">", $string); - $string = str_replace("=", "=", $string); - $string = str_replace(")", ")", $string); - $string = str_replace("(", "(", $string); - $string = str_replace("'", "'", $string); - $string = str_replace("+", "+", $string); - - return $string; +function getLongReadableDate($timestamp) { + return date("d/m/Y H:i", $timestamp); } -function createVersionigFile($document) -{ - global $settings; +// +// The original string sanitizer, kept for reference. +//function sanitizeString($string) { +// $string = str_replace("'", "'", $string); +// $string = str_replace("--", "", $string); +// $string = str_replace("<", "<", $string); +// $string = str_replace(">", ">", $string); +// $string = str_replace("/*", "", $string); +// $string = str_replace("*/", "", $string); +// $string = str_replace("\"", """, $string); +// +// return $string; +//} + +function sanitizeString($string) { /* {{{ */ + + $string = (string) $string; + if (get_magic_quotes_gpc()) { + $string = stripslashes($string); + } + + $string = str_replace("\\", "\\\\", $string); + $string = str_replace("--", "\-\-", $string); + $string = str_replace(";", "\;", $string); + // Use HTML entities to represent the other characters that have special + // meaning in SQL. These can be easily converted back to ASCII / UTF-8 + // with a decode function if need be. + $string = str_replace("&", "&", $string); + $string = str_replace("%", "%", $string); // percent + $string = str_replace("\"", """, $string); // double quote + $string = str_replace("/*", "/*", $string); // start of comment + $string = str_replace("*/", "*/", $string); // end of comment + $string = str_replace("<", "<", $string); + $string = str_replace(">", ">", $string); + $string = str_replace("=", "=", $string); + $string = str_replace(")", ")", $string); + $string = str_replace("(", "(", $string); + $string = str_replace("'", "'", $string); + $string = str_replace("+", "+", $string); + + return trim($string); +} /* }}} */ + +function mydmsDecodeString($string) { /* {{{ */ + + $string = (string)$string; + + $string = str_replace("&", "&", $string); + $string = str_replace("%", "%", $string); // percent + $string = str_replace(""", "\"", $string); // double quote + $string = str_replace("/*", "/*", $string); // start of comment + $string = str_replace("*/", "*/", $string); // end of comment + $string = str_replace("<", "<", $string); + $string = str_replace(">", ">", $string); + $string = str_replace("=", "=", $string); + $string = str_replace(")", ")", $string); + $string = str_replace("(", "(", $string); + $string = str_replace("'", "'", $string); + $string = str_replace("+", "+", $string); + + return $string; +} /* }}} */ + +function createVersionigFile($document) { /* {{{ */ + global $settings, $dms; // if directory has been removed recreate it if (!file_exists($settings->_contentDir . $document->getDir())) @@ -116,7 +114,7 @@ function createVersionigFile($document) $tmp = getMLText("owner")." = ".$owner->getFullName()." <".$owner->getEmail().">\n"; fwrite($handle, $tmp); - $tmp = getMLText("creation_date")." = ".getLongReadableDate($document->getDate())."\n"; + $tmp = getMLText("creation_date")." = ".getLongReadableDate($document->getDate())."\n"; fwrite($handle, $tmp); $latestContent = $document->getLatestContent(); @@ -125,14 +123,14 @@ function createVersionigFile($document) $tmp = getMLText("version")." = ".$latestContent->getVersion()."\n"; fwrite($handle, $tmp); - + $tmp = getMLText("file")." = ".$latestContent->getOriginalFileName()." (".$latestContent->getMimeType().")\n"; fwrite($handle, $tmp); - + $tmp = getMLText("comment")." = ". mydmsDecodeString($latestContent->getComment())."\n"; fwrite($handle, $tmp); - $status = $latestContent->getStatus(); + $status = $latestContent->getStatus(); $tmp = getMLText("status")." = ".getOverallStatusText($status["status"])."\n"; fwrite($handle, $tmp); @@ -142,62 +140,62 @@ function createVersionigFile($document) foreach ($reviewStatus as $r) { - switch ($r["type"]) { - case 0: // Reviewer is an individual. - $required = $dms->getUser($r["required"]); - if (!is_object($required)) $reqName = getMLText("unknown_user")." = ".$r["required"]; - else $reqName = getMLText("user")." = ".$required->getFullName(); - break; - case 1: // Reviewer is a group. - $required = $dms->getGroup($r["required"]); - if (!is_object($required)) $reqName = getMLText("unknown_group")." = ".$r["required"]; - else $reqName = getMLText("group")." = ".$required->getName(); + switch ($r["type"]) { + case 0: // Reviewer is an individual. + $required = $dms->getUser($r["required"]); + if (!is_object($required)) $reqName = getMLText("unknown_user")." = ".$r["required"]; + else $reqName = getMLText("user")." = ".$required->getFullName(); + break; + case 1: // Reviewer is a group. + $required = $dms->getGroup($r["required"]); + if (!is_object($required)) $reqName = getMLText("unknown_group")." = ".$r["required"]; + else $reqName = getMLText("group")." = ".$required->getName(); break; } $tmp = "\n".$reqName."\n"; fwrite($handle, $tmp); - + $tmp = getMLText("status")." = ".getReviewStatusText($r["status"])."\n"; fwrite($handle, $tmp); - + $tmp = getMLText("comment")." = ". mydmsDecodeString($r["comment"])."\n"; fwrite($handle, $tmp); - + $tmp = getMLText("last_update")." = ".$r["date"]."\n"; fwrite($handle, $tmp); } - + $approvalStatus = $latestContent->getApprovalStatus(); $tmp = "\n### ".getMLText("approvers")." ###\n"; fwrite($handle, $tmp); foreach ($approvalStatus as $r) { - switch ($r["type"]) { - case 0: // Reviewer is an individual. - $required = $dms->getUser($r["required"]); - if (!is_object($required)) $reqName = getMLText("unknown_user")." = ".$r["required"]; - else $reqName = getMLText("user")." = ".$required->getFullName(); - break; - case 1: // Reviewer is a group. - $required = $dms->getGroup($r["required"]); - if (!is_object($required)) $reqName = getMLText("unknown_group")." = ".$r["required"]; - else $reqName = getMLText("group")." = ".$required->getName(); + switch ($r["type"]) { + case 0: // Reviewer is an individual. + $required = $dms->getUser($r["required"]); + if (!is_object($required)) $reqName = getMLText("unknown_user")." = ".$r["required"]; + else $reqName = getMLText("user")." = ".$required->getFullName(); + break; + case 1: // Reviewer is a group. + $required = $dms->getGroup($r["required"]); + if (!is_object($required)) $reqName = getMLText("unknown_group")." = ".$r["required"]; + else $reqName = getMLText("group")." = ".$required->getName(); break; } $tmp = "\n".$reqName."\n"; fwrite($handle, $tmp); - + $tmp = getMLText("status")." = ".getApprovalStatusText($r["status"])."\n"; fwrite($handle, $tmp); - + $tmp = getMLText("comment")." = ". mydmsDecodeString($r["comment"])."\n"; fwrite($handle, $tmp); - + $tmp = getMLText("last_update")." = ".$r["date"]."\n"; fwrite($handle, $tmp); @@ -206,33 +204,32 @@ function createVersionigFile($document) $versions = $document->getContent(); $tmp = "\n### ".getMLText("previous_versions")." ###\n"; fwrite($handle, $tmp); - + for ($i = count($versions)-2; $i >= 0; $i--){ - $version = $versions[$i]; + $version = $versions[$i]; $status = $version->getStatus(); $tmp = "\n".getMLText("version")." = ".$version->getVersion()."\n"; fwrite($handle, $tmp); - + $tmp = getMLText("file")." = ".$version->getOriginalFileName()." (".$version->getMimeType().")\n"; fwrite($handle, $tmp); - + $tmp = getMLText("comment")." = ". mydmsDecodeString($version->getComment())."\n"; fwrite($handle, $tmp); - $status = $latestContent->getStatus(); + $status = $latestContent->getStatus(); $tmp = getMLText("status")." = ".getOverallStatusText($status["status"])."\n"; fwrite($handle, $tmp); } - + fclose($handle); return true; -} +} /* }}} */ -function add_log_line($msg="") -{ +function add_log_line($msg="") { /* {{{ */ global $settings,$user; if ($settings->_logFileEnable!=TRUE) return; @@ -245,16 +242,15 @@ function add_log_line($msg="") fwrite($h,date("Y/m/d H:i", time())." ".$user->getLogin()." (".$_SERVER['REMOTE_ADDR'].") ".basename($_SERVER["REQUEST_URI"], ".php").$msg."\n"); fclose($h); } -} +} /* }}} */ -function showtree() -{ +function showtree() { /* {{{ */ global $settings; if (isset($_GET["showtree"])) return $_GET["showtree"]; else if ($settings->_enableFolderTree==0) return 0; return 1; -} - -?> +} /* }}} */ + +?>