mirror of
https://gitlab.archlinux.org/archlinux/aurweb.git
synced 2025-02-03 10:43:03 +01:00
Use an INI-style configuration file
Replace web/lib/config.inc.php with an INI-style configuration file. This allows us to get rid of several globals and makes it easier to use the same configuration file in external scripts. Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
This commit is contained in:
parent
a0a5230708
commit
76343fb915
24 changed files with 200 additions and 216 deletions
|
@ -8,10 +8,14 @@ if (empty($dir)) {
|
|||
}
|
||||
|
||||
set_include_path(get_include_path() . PATH_SEPARATOR . "$dir/lib");
|
||||
include("config.inc.php");
|
||||
include("confparser.inc.php");
|
||||
|
||||
$user = config_get('database', 'user');
|
||||
$password = config_get('database', 'password');
|
||||
$name = config_get('database', 'name');
|
||||
|
||||
exec($dir . "/../scripts/aurblup/aurblup " .
|
||||
"-S /var/run/mysqld/mysqld.sock " .
|
||||
"-u " . escapeshellarg(AUR_db_user) . " " .
|
||||
"-p " . escapeshellarg(AUR_db_pass) . " " .
|
||||
"-D " . escapeshellarg(AUR_db_name));
|
||||
"-u " . escapeshellarg($user) . " " .
|
||||
"-p " . escapeshellarg($password) . " " .
|
||||
"-D " . escapeshellarg($name));
|
||||
|
|
|
@ -16,24 +16,25 @@ if (empty($dir)) {
|
|||
}
|
||||
|
||||
set_include_path(get_include_path() . PATH_SEPARATOR . "$dir/lib");
|
||||
include("config.inc.php");
|
||||
include("confparser.inc.php");
|
||||
include("aur.inc.php");
|
||||
include("pkgfuncs.inc.php");
|
||||
|
||||
$count = 0;
|
||||
|
||||
$buckets = scandir(INCOMING_DIR);
|
||||
$incoming_dir = config_get('paths', 'storage');
|
||||
$buckets = scandir($incoming_dir);
|
||||
foreach ($buckets as $bucket) {
|
||||
$bucketpath = INCOMING_DIR . $bucket;
|
||||
$bucketpath = $incoming_dir . $bucket;
|
||||
if ($bucket == '.' || $bucket == '..' || !is_dir($bucketpath)) {
|
||||
continue;
|
||||
}
|
||||
$files = scandir(INCOMING_DIR . $bucket);
|
||||
$files = scandir($incoming_dir . $bucket);
|
||||
foreach ($files as $pkgname) {
|
||||
if ($pkgname == '.' || $pkgname == '..') {
|
||||
continue;
|
||||
}
|
||||
$fullpath = INCOMING_DIR . $bucket . "/" . $pkgname;
|
||||
$fullpath = $incoming_dir . $bucket . "/" . $pkgname;
|
||||
if (!pkg_from_name($pkgname) && is_dir($fullpath)) {
|
||||
echo 'Removing ' . $fullpath . "\n";
|
||||
rm_tree($fullpath);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue