if ($name == '') {
if ($bUpload) {
- $name = Tools::sanitizeFilename($_FILES['files']['name'][$num]['upload']);
+ $name = Tools::sanitizeFilename(
+ $_FILES['files']['name'][$num]['upload']
+ );
} else {
$name = $this->getNextNumberedFile('phork')
. '.' . $arFile['type'];
$bCommit = true;
} else if ($bUpload) {
move_uploaded_file(
- $_FILES['files']['tmp_name'][$num]['upload'], $file->getFullPath()
+ $_FILES['files']['tmp_name'][$num]['upload'],
+ $file->getFullPath()
);
$command = $vc->getCommand('add')
->addArgument($file->getFilename())
->execute();
$bCommit = true;
- } else if ($bNew || (isset($arFile['content']) && $file->getContent() != $arFile['content'])) {
+ } else if ($bNew
+ || (isset($arFile['content'])
+ && $file->getContent() != $arFile['content']
+ )
+ ) {
file_put_contents($file->getFullPath(), $arFile['content']);
$command = $vc->getCommand('add')
->addArgument($file->getFilename())
}
}
- $commitmsg = "phorkie commit";
if (isset($sessionData['identity'])) {
- $commitmsg .= " from ".$sessionData['identity'];
+ $notes = $sessionData['identity'];
} else {
- $commitmsg .= " by ".$sessionData['ipaddr'];
+ $notes = $sessionData['ipaddr'];
}
if ($bCommit) {
$vc->getCommand('commit')
- ->setOption('message', $commitmsg)
- ->setOption('author', $sessionData['name'].' <'.$sessionData['email'].'>')
+ ->setOption('message', '')
+ ->setOption('allow-empty-message')
+ ->setOption(
+ 'author',
+ $sessionData['name'] . ' <' . $sessionData['email'] . '>'
+ )
+ ->execute();
+ //FIXME: git needs ref BEFORE add
+ //quick hack until http://pear.php.net/bugs/bug.php?id=19605 is fixed
+ $vc->getCommand('notes --ref=identity add')
+ ->setOption('force')
+ ->setOption('message', "$notes")
->execute();
$bChanged = true;
}
$vc->getCommand('init')
//this should be setOption, but it fails with a = between name and value
->addArgument('--separate-git-dir')
- ->addArgument($GLOBALS['phorkie']['cfg']['gitdir'] . '/' . $repo->id . '.git')
+ ->addArgument(
+ $GLOBALS['phorkie']['cfg']['gitdir'] . '/' . $repo->id . '.git'
+ )
->addArgument($repo->workDir)
->execute();