summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEudyptula <eitan@mosenkis.net>2009-08-04 17:58:55 -0400
committerEudyptula <eitan@mosenkis.net>2009-08-04 17:58:55 -0400
commitd3da989d3e2d2cb03cdc4bd2e23783f716ef5035 (patch)
tree2f9f8c413d2800a3f72282dec0f86170a00ff4f6 /backend/functions/get_pkgdirs.php
parentAdd visibility column to builds, configurations (diff)
downloadingenue-d3da989d3e2d2cb03cdc4bd2e23783f716ef5035.tar.gz
ingenue-d3da989d3e2d2cb03cdc4bd2e23783f716ef5035.tar.bz2
ingenue-d3da989d3e2d2cb03cdc4bd2e23783f716ef5035.zip
Widespread cleanup - moved $conf, $death into $S; $S is given as arg to init_x() and body_x(); $request removed in favor of $_REQUEST; query() replaces $S[pdo]->query(); etc.
Diffstat (limited to 'backend/functions/get_pkgdirs.php')
-rw-r--r--backend/functions/get_pkgdirs.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/backend/functions/get_pkgdirs.php b/backend/functions/get_pkgdirs.php
index 1f39420..b441f38 100644
--- a/backend/functions/get_pkgdirs.php
+++ b/backend/functions/get_pkgdirs.php
@@ -1,12 +1,12 @@
<?php
function get_pkgdirs($dir=null) {
- global $conf;
+ global $S;
if ($dir===null) {
- $dir=$conf['pkgdir_root'];
+ $dir=$S['conf']['pkgdir_root'];
}
if (is_file($dir.'/Packages')) {
// We assume that a dir with a Packages file will not contain other complete ppkgdirs
- return array(substr($dir, strlen($conf['pkgdir_root'])+1));
+ return array(substr($dir, strlen($S['conf']['pkgdir_root'])+1));
} else {
$return=array();
foreach (glob ($dir.'/*', GLOB_ONLYDIR) as $subdir) {