git.cweiske.de
/
phorkie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix stripping ".git" from dir names
[phorkie.git]
/
src
/
phorkie
/
Repositories.php
diff --git
a/src/phorkie/Repositories.php
b/src/phorkie/Repositories.php
index ab97c566a47291fbd58158e785f3bfe7413ca039..c6059961a3f6ed2b2124276729698ab4ef46fd37 100644
(file)
--- a/
src/phorkie/Repositories.php
+++ b/
src/phorkie/Repositories.php
@@
-16,23
+16,25
@@
class Repositories
{
chdir($this->gitDir);
$dirs = glob('*.git', GLOB_ONLYDIR);
{
chdir($this->gitDir);
$dirs = glob('*.git', GLOB_ONLYDIR);
- array_walk(
- $dirs,
- function ($dir) {
- return substr($dir, 0, -4);
- }
- );
+ foreach ($dirs as $key => $dir) {
+ $dirs[$key] = substr($dir, 0, -4);
+ }
sort($dirs, SORT_NUMERIC);
sort($dirs, SORT_NUMERIC);
- $n = end($dirs) + 1;
+
+ if ($GLOBALS['phorkie']['cfg']['randomIds']) {
+ $n = end($dirs) + mt_rand(65536, 16777216);
+ } else {
+ $n = end($dirs) + 1;
+ }
chdir($this->workDir);
$dir = $this->workDir . '/' . $n . '/';
chdir($this->workDir);
$dir = $this->workDir . '/' . $n . '/';
- mkdir($dir,
0777);//FIXME
+ mkdir($dir,
fileperms($this->workDir) & 0777);
$r = new Repository();
$r->id = $n;
$r->workDir = $dir;
$r->gitDir = $this->gitDir . '/' . $n . '.git/';
$r = new Repository();
$r->id = $n;
$r->workDir = $dir;
$r->gitDir = $this->gitDir . '/' . $n . '.git/';
- mkdir($r->gitDir,
0777);//FIXME
+ mkdir($r->gitDir,
fileperms($this->gitDir) & 0777);
return $r;
}
return $r;
}