Caudalie/Git-Center
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Suppression de l'opérateur et support de rbash

Browse Source
This commit is contained in:
Michel Roux 2015-02-03 16:47:23 +01:00
parent c96fca406f
commit 3ce19681c0
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ajax.php
View File

@ -38,29 +38,38 @@ if (!empty($_POST['action'])) {
if ($session->isConnected()) { if ($session->isConnected()) {
$operator = !empty($config['operator']) ? ' ' . $config['operator'] . ' ' : ' && '; $operator = !empty($config['operator']) ? ' ' . $config['operator'] . ' ' : ' && ';
$gitstatus = 'git fetch' . $operator . 'git status'; $gitcommand = 'git --git-dir=' . $config['path'] . '/.git --work-tree=' . $config['path'];
if ($_POST['action'] == 'status') { if ($_POST['action'] == 'status') {
echo ansi2html($session->exec('cd ' . $config['path'] . $operator . $gitstatus)); echo ansi2html($session->exec($gitcommand . ' fetch'));
echo ansi2html($session->exec($gitcommand . ' status'));
exit; exit;
} else if (strpos($_POST['action'], 'push') !== false) { } else if (strpos($_POST['action'], 'push') !== false) {
if (strpos($_POST['action'], 'force') !== false) { if (strpos($_POST['action'], 'force') !== false) {
echo ansi2html($session->exec('cd ' . $config['path'] . $operator . 'git push' . $operator . $gitstatus)); echo ansi2html($session->exec($gitcommand . ' push'));
echo ansi2html($session->exec($gitcommand . ' fetch'));
echo ansi2html($session->exec($gitcommand . ' status'));
if (!empty($config['after_push'])) { if (!empty($config['after_push'])) {
echo ansi2html($session->exec('cd ' . $config['path'] . $operator . $config['after_push'])); echo ansi2html($session->exec($config['after_push']));
} }
} else { } else {
$message = empty($_POST['message']) ? 'FTP' : str_replace(array('"', "'"), ' ', stripslashes($_POST['message'])); $message = empty($_POST['message']) ? 'FTP' : str_replace(array('"', "'"), ' ', stripslashes($_POST['message']));
echo ansi2html($session->exec('cd ' . $config['path'] . $operator . 'git add -A' . $operator . 'git commit -m "' . $message . '"' . $operator . 'git push' . $operator . $gitstatus)); echo ansi2html($session->exec($gitcommand . ' add -A'));
echo ansi2html($session->exec($gitcommand . ' commit -m "' . $message . '"'));
echo ansi2html($session->exec($gitcommand . ' push'));
echo ansi2html($session->exec($gitcommand . ' fetch'));
echo ansi2html($session->exec($gitcommand . ' status'));
if (!empty($config['after_push'])) { if (!empty($config['after_push'])) {
echo ansi2html($session->exec('cd ' . $config['path'] . $operator . $config['after_push'])); echo ansi2html($session->exec($config['after_push']));
} }
} }
exit; exit;
} else if ($_POST['action'] == 'pull') { } else if ($_POST['action'] == 'pull') {
echo ansi2html($session->exec('cd ' . $config['path'] . $operator . 'git pull' . $operator . $gitstatus)); echo ansi2html($session->exec($gitcommand . ' pull'));
echo ansi2html($session->exec($gitcommand . ' fetch'));
echo ansi2html($session->exec($gitcommand . ' status'));
if (!empty($config['after_pull'])) { if (!empty($config['after_pull'])) {
echo ansi2html($session->exec('cd ' . $config['path'] . $operator . $config['after_pull'])); echo ansi2html($session->exec($config['after_pull']));
} }
exit; exit;
} else { } else {

2
config-sample.php
View File

@ -22,7 +22,6 @@ $servers = array(
'pass' => 'root', 'pass' => 'root',
'path' => '/home/user/root', 'path' => '/home/user/root',
'after_push' => 'php -f TAMERE.php', 'after_push' => 'php -f TAMERE.php',
'operator' => '&&' # bash style
), ),
'test1' => array( 'test1' => array(
'title' => 'Test de la mort', 'title' => 'Test de la mort',
@ -32,7 +31,6 @@ $servers = array(
'pass' => 'blbl', 'pass' => 'blbl',
'path' => '/home/user/test', 'path' => '/home/user/test',
'after_pull' => 'php -f TONPERE.php', 'after_pull' => 'php -f TONPERE.php',
'operator' => '; and' # fish style
), ),
'prod2' => array( 'prod2' => array(
'title' => 'Production de la mort', 'title' => 'Production de la mort',