Fix warnings:

- Warning: parse_ini_file(config.ini) [function.parse-ini-file]: failed to open stream: No such file or directory in /home/mablo/www/gitlist/index.php on line 8

- Warning: file_exists() [function.file-exists]: open_basedir restriction in effect. File(/home/mablo/git/index.php/.git/HEAD) is not within the allowed path(s): (/usr/local/php5) in /home/mablo/www/gitlist/lib/Git/Client.php on line 90
This commit is contained in:
Michał Prochowski
2012-07-04 17:02:06 +02:00
parent d77f05d825
commit c253b2f96b
2 changed files with 25 additions and 19 deletions

View File

@@ -5,6 +5,10 @@
* https://github.com/klaussilveira/gitlist
*/
if (!file_exists('config.ini')) {
die("Please, create the config.ini file.");
}
$config = parse_ini_file('config.ini', true);
if (empty($config['git']['repositories']) || !is_dir($config['git']['repositories'])) {

View File

@@ -85,28 +85,30 @@ class Client
continue;
}
$isBare = file_exists($file->getPathname() . '/HEAD');
$isRepository = file_exists($file->getPathname() . '/.git/HEAD');
if ($file->isDir()) {
$isBare = file_exists($file->getPathname() . '/HEAD');
$isRepository = file_exists($file->getPathname() . '/.git/HEAD');
if ($file->isDir() && $isRepository || $isBare) {
if (in_array($file->getPathname(), $this->app['hidden'])) {
if ($isRepository || $isBare) {
if (in_array($file->getPathname(), $this->app['hidden'])) {
continue;
}
if ($isBare) {
$description = $file->getPathname() . '/description';
} else {
$description = $file->getPathname() . '/.git/description';
}
if (file_exists($description)) {
$description = file_get_contents($description);
} else {
$description = 'There is no repository description file. Please, create one to remove this message.';
}
$repositories[] = array('name' => $file->getFilename(), 'path' => $file->getPathname(), 'description' => $description);
continue;
}
if ($isBare) {
$description = $file->getPathname() . '/description';
} else {
$description = $file->getPathname() . '/.git/description';
}
if (file_exists($description)) {
$description = file_get_contents($description);
} else {
$description = 'There is no repository description file. Please, create one to remove this message.';
}
$repositories[] = array('name' => $file->getFilename(), 'path' => $file->getPathname(), 'description' => $description);
continue;
}
}