claunia/qemudb
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix indenting and formatting

Browse Source
This commit is contained in:
Chris Morgan
2006-06-22 22:34:56 +00:00
committed by WineHQ
parent eea66ec98c
commit 58b267506f
1 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
include/util.php
View File

@@ -9,21 +9,21 @@ function makeSafe($var)
function build_urlarg($vars) function build_urlarg($vars)
{ {
$arr = array(); $arr = array();
while(list($key, $val) = each($vars)) while(list($key, $val) = each($vars))
{ {
if(is_array($val)) if(is_array($val))
{ {
while(list($idx, $value) = each($val)) while(list($idx, $value) = each($val))
{ {
//echo "Encoding $key / $value<br>"; //echo "Encoding $key / $value<br>";
$arr[] = rawurlencode($key."[]")."=".rawurlencode($value); $arr[] = rawurlencode($key."[]")."=".rawurlencode($value);
} }
} }
else else
$arr[] = $key."=".rawurlencode($val); $arr[] = $key."=".rawurlencode($val);
} }
return implode("&", $arr); return implode("&", $arr);
} }
@@ -735,8 +735,9 @@ function display_page_range($currentPage=1, $pageRange=1, $totalPages=1, $linkur
echo "<a href='".$linkurl."&page=$nextPage'>&gt</a> "; echo "<a href='".$linkurl."&page=$nextPage'>&gt</a> ";
echo "<a href='".$linkurl."&page=$totalPages'>&gt|</a> "; echo "<a href='".$linkurl."&page=$totalPages'>&gt|</a> ";
} else } else
{
echo "&gt &gt|"; echo "&gt &gt|";
}
} }
// Expand a path like /something/somedirectory/../ to /something // Expand a path like /something/somedirectory/../ to /something
@@ -744,13 +745,16 @@ function display_page_range($currentPage=1, $pageRange=1, $totalPages=1, $linkur
function SimplifyPath($path) { function SimplifyPath($path) {
$dirs = explode('/',$path); $dirs = explode('/',$path);
for($i=0; $i<count($dirs);$i++) { for($i=0; $i<count($dirs);$i++)
if($dirs[$i]=="." || $dirs[$i]=="") { {
if($dirs[$i]=="." || $dirs[$i]=="")
{
array_splice($dirs,$i,1); array_splice($dirs,$i,1);
$i--; $i--;
} }
if($dirs[$i]=="..") { if($dirs[$i]=="..")
{
$cnt = count($dirs); $cnt = count($dirs);
$dirs=Simplify($dirs, $i); $dirs=Simplify($dirs, $i);
$i-= $cnt-count($dirs); $i-= $cnt-count($dirs);
@@ -759,7 +763,8 @@ function SimplifyPath($path) {
return implode('/',$dirs); return implode('/',$dirs);
} }
function Simplify($dirs, $idx) { function Simplify($dirs, $idx)
{
if($idx==0) return $dirs; if($idx==0) return $dirs;
if($dirs[$idx-1]=="..") Simplify($dirs, $idx-1); if($dirs[$idx-1]=="..") Simplify($dirs, $idx-1);