git.cweiske.de
/
phorkie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
warn about remote fork config in setup and help
[phorkie.git]
/
src
/
phorkie
/
SetupCheck.php
diff --git
a/src/phorkie/SetupCheck.php
b/src/phorkie/SetupCheck.php
index 16631db673e2c75e5096b39cfb5fe204ad0062a7..69cffd8f073e7b200dfb861eeb1a92183f2858ce 100644
(file)
--- a/
src/phorkie/SetupCheck.php
+++ b/
src/phorkie/SetupCheck.php
@@
-11,13
+11,15
@@
class SetupCheck
'pear.php.net/OpenID' => 'OpenID',
'pear.php.net/Pager' => 'Pager',
'pear.php.net/Services_Libravatar' => 'Services_Libravatar',
'pear.php.net/OpenID' => 'OpenID',
'pear.php.net/Pager' => 'Pager',
'pear.php.net/Services_Libravatar' => 'Services_Libravatar',
- 'pear2.php.net/Services_Linkback' => '\\PEAR2\\Services\\Linkback\\Client',
+ 'pear2.php.net/
PEAR2_
Services_Linkback' => '\\PEAR2\\Services\\Linkback\\Client',
'zustellzentrum.cweiske.de/MIME_Type_PlainDetect' => 'MIME_Type_PlainDetect',
);
protected $writableDirs;
protected $elasticsearch;
'zustellzentrum.cweiske.de/MIME_Type_PlainDetect' => 'MIME_Type_PlainDetect',
);
protected $writableDirs;
protected $elasticsearch;
+ public $messages = array();
+
public function __construct()
{
$cfg = $GLOBALS['phorkie']['cfg'];
public function __construct()
{
$cfg = $GLOBALS['phorkie']['cfg'];
@@
-31,11
+33,26
@@
class SetupCheck
public static function run()
{
$sc = new self();
public static function run()
{
$sc = new self();
+ $sc->checkConfigFiles();
$sc->checkDeps();
$sc->checkDirs();
$sc->checkGit();
$sc->checkDatabase();
$sc->checkMimeTypeDetection();
$sc->checkDeps();
$sc->checkDirs();
$sc->checkGit();
$sc->checkDatabase();
$sc->checkMimeTypeDetection();
+ $sc->checkRemoteForking();
+
+ return $sc->messages;
+ }
+
+ public function checkConfigFiles()
+ {
+ foreach ($GLOBALS['phorkie']['cfgfiles'] as $file => $loaded) {
+ if ($loaded) {
+ $this->ok('Loaded config file: ' . $file);
+ } else {
+ $this->info('Possible config file: ' . $file . ' (not loaded)');
+ }
+ }
}
public function checkDeps()
}
public function checkDeps()
@@
-46,16
+63,21
@@
class SetupCheck
}
}
}
}
- $geshi = stream_resolve_include_path(
- $GLOBALS['phorkie']['cfg']['geshi']
- );
- if ($geshi === false) {
- $this->fail('GeSHi not available');
+ if (!class_exists('geshi', true)) {
+ $geshi = stream_resolve_include_path(
+ $GLOBALS['phorkie']['cfg']['geshi']
+ );
+ if ($geshi === false) {
+ $this->fail('GeSHi not available');
+ }
}
}
- $markdown = stream_resolve_include_path('markdown.php');
- if ($markdown === false) {
- $this->fail('Markdown renderer not available');
+ if (!class_exists('\\Michelf\\Markdown', true)) {
+ //PEAR-installed version 1.0.2 has a different API
+ $markdown = stream_resolve_include_path('markdown.php');
+ if ($markdown === false) {
+ $this->fail('Markdown renderer not available');
+ }
}
}
}
}
@@
-64,8
+86,7
@@
class SetupCheck
foreach ($this->writableDirs as $name => $dir) {
if (!is_dir($dir)) {
$this->fail($name . ' directory does not exist at ' . $dir);
foreach ($this->writableDirs as $name => $dir) {
if (!is_dir($dir)) {
$this->fail($name . ' directory does not exist at ' . $dir);
- }
- if (!is_writable($dir)) {
+ } else if (!is_writable($dir)) {
$this->fail($name . ' directory is not writable at ' . $dir);
}
}
$this->fail($name . ' directory is not writable at ' . $dir);
}
}
@@
-113,9
+134,31
@@
class SetupCheck
}
}
}
}
+ public function checkRemoteForking()
+ {
+ if (!isset($GLOBALS['phorkie']['cfg']['git']['public'])
+ || $GLOBALS['phorkie']['cfg']['git']['public'] == ''
+ ) {
+ $this->fail(
+ 'No public git URL prefix configured.'
+ . ' Remote forking will not work'
+ );
+ }
+ }
+
public function fail($msg)
{
public function fail($msg)
{
- throw new Exception($msg);
+ $this->messages[] = array('error', $msg);
+ }
+
+ public function info($msg)
+ {
+ $this->messages[] = array('info', $msg);
+ }
+
+ public function ok($msg)
+ {
+ $this->messages[] = array('ok', $msg);
}
}
}
}