Mercurial > SimpleWebPresenter
diff common-functions.inc @ 33:511b6514823f
Remove more globals.
| author | Tom Fredrik "BFG" Klaussen <bfg@blenning.no> |
|---|---|
| date | Thu, 04 Oct 2012 21:05:11 +0200 |
| parents | 9dab5b96b789 |
| children | ca76d31b7d48 |
line wrap: on
line diff
--- a/common-functions.inc Thu Oct 04 19:46:11 2012 +0200 +++ b/common-functions.inc Thu Oct 04 21:05:11 2012 +0200 @@ -3,71 +3,71 @@ function loadFile($sFilename, $sCharset = 'UTF-8') { - if (floatval(phpversion()) >= 4.3) { - if (!file_exists($sFilename)) return -3; - $sData = file_get_contents($sFilename); - } else { - if (!file_exists($sFilename)) return -3; - $rHandle = fopen($sFilename, 'r'); - if (!$rHandle) return -2; - - $sData = ''; - while(!feof($rHandle)) - $sData .= fread($rHandle, filesize($sFilename)); - fclose($rHandle); + if (floatval(phpversion()) >= 4.3) { + if (!file_exists($sFilename)) + return -3; + $sData = file_get_contents($sFilename); + } + else { + if (!file_exists($sFilename)) + return -3; + $rHandle = fopen($sFilename, 'r'); + if (!$rHandle) + return -2; + + $sData = ''; + while(!feof($rHandle)) + $sData .= fread($rHandle, filesize($sFilename)); + fclose($rHandle); + } + if ($sEncoding = mb_detect_encoding($sData, 'auto', true) != $sCharset) { + if ($sEncoding != 1) { + $sData = mb_convert_encoding($sData, $sCharset, $sEncoding); } - if ($sEncoding = mb_detect_encoding($sData, 'auto', true) != $sCharset) { - if ($sEncoding != 1) { - $sData = mb_convert_encoding($sData, $sCharset, $sEncoding); - } - } - return $sData; + } + return $sData; } -function errorPage($errorText, $errorCode=403) +function errorPage($errorText, $errorCode = 403) { header(StatusCodes::httpHeaderFor($errorCode)); print "<div id=\"page\"><h1>${errorText}</h1></div>"; exit; } -function genUrl($keys=array()) { - $out="?"; - $first=1; - $URL_PARAMS=$GLOBALS['URL_PARAMS']; - $new_params=array(); - foreach($URL_PARAMS as $param) { - $new_params[$param]=$GLOBALS[$param]; - } - foreach($keys as $param => $val) { - $new_params[$param]=$val; - } - foreach($new_params as $param => $val) { - if($first) - $first=0; - else - $out.="&"; - $out.=urlencode($param).'='.urlencode($val); - } - return $out; +function genUrl($urlParams, $keys = array()) { + $out = "?"; + $first = 1; + $new_params = $urlParams; + foreach($keys as $param => $val) { + $new_params[$param] = $val; + } + foreach($new_params as $param => $val) { + if($first) + $first = 0; + else + $out .= "&"; + $out .= urlencode($param) . '=' . urlencode($val); + } + return $out; } function getElementByTagName($obj, $name) { - $elems=$obj->getElementsByTagName($name); + $elems = $obj->getElementsByTagName($name); if ($elems->length != 1) { exit; } - $elem=$elems->item(0); + $elem = $elems->item(0); return $elem; } function getXmlContent($node) { - $text=$node->ownerDocument->saveXml($node); - $pattern="/^<".$node->tagName."[^>]*>/is"; - $text=preg_replace($pattern, '' , $text); - $pattern='/<\/'.$node->tagName.'[^>]*>$/is'; - $text=preg_replace($pattern, '' , $text); + $text = $node->ownerDocument->saveXml($node); + $pattern = "/^<" . $node->tagName."[^>]*>/is"; + $text = preg_replace($pattern, '' , $text); + $pattern = '/<\/' . $node->tagName . '[^>]*>$/is'; + $text = preg_replace($pattern, '' , $text); return $text; }
