bglacial/nriault
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

TEst pull via sh

Browse Source
This commit is contained in:
bglacial
2018-06-27 19:47:49 +02:00
parent 1e751e8eae
commit c8b5cc37cf
3 changed files with 68 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
helper/shell-gitpull.sh Normal file
View File

@ -0,0 +1 @@
cd .. && git pull origin master

10
module/Application/config/module.config.php
View File

@ -24,6 +24,16 @@ return [
], ],
], ],
], ],
'srcpull' => [
'type' => Literal::class,
'options' => [
'route' => '/pull',
'defaults' => [
'controller' => Controller\IndexController::class,
'action' => 'pull',
],
],
],
'contact' => [ 'contact' => [
'type' => Literal::class, 'type' => Literal::class,
'options' => [ 'options' => [

29
module/Application/src/Controller/IndexController.php
View File

@ -16,7 +16,26 @@ use PHPMailer\PHPMailer\Exception;
class IndexController extends AbstractActionController class IndexController extends AbstractActionController
{ {
public function indexAction() public function indexAction()
{ $view = new ViewModel(); {
$view = new ViewModel();
$view->setTerminal(true);
return $view;
}
public function pullAction()
{
$view = new JsonModel();
$old_path = getcwd();
var_dump($old_path);
var_dump($old_path.'/helper');
chdir($old_path.'/helper' );
//make sure to make the shell file executeable first before running the shell_exec function
$output = shell_exec('./shell-gitpull.sh');
var_dump($output);
echo $output;
die;
$view->setTerminal(true); $view->setTerminal(true);
return $view; return $view;
} }
@ -29,18 +48,18 @@ class IndexController extends AbstractActionController
$isEnvoye = FALSE; $isEnvoye = FALSE;
ini_set('SMTP', 'smtp.free.fr'); ini_set('SMTP', 'smtp.free.fr');
if(isset($_POST['name']) && isset($_POST['email']) && isset($_POST['subject']) && isset($_POST['message'])){ if (isset($_POST['name']) && isset($_POST['email']) && isset($_POST['subject']) && isset($_POST['message'])) {
$name = $_POST['name']; $name = $_POST['name'];
$email = $_POST['email']; $email = $_POST['email'];
$subject = $_POST['subject']; $subject = $_POST['subject'];
$message = nl2br($_POST['message']); $message = nl2br($_POST['message']);
$to = "nicolas.riault@gmail.com"; $to = "nicolas.riault@gmail.com";
$from = $email; $from = $email;
$message_format = '<b>Nom:</b> '.$name.' <br><b>Email:</b> '.$email.' <p>'.$message.'</p>'; $message_format = '<b>Nom:</b> ' . $name . ' <br><b>Email:</b> ' . $email . ' <p>' . $message . '</p>';
$headers = "From: $from\n"; $headers = "From: $from\n";
$headers .= "MIME-Version: 1.0\n"; $headers .= "MIME-Version: 1.0\n";
$headers .= "content-type: text/html; charset=iso-8859-1\n"; $headers .= "content-type: text/html; charset=iso-8859-1\n";
if(mail($to, $subject, $message_format, $headers)){ if (mail($to, $subject, $message_format, $headers)) {
$retMessage = "Le mail est envoyé."; $retMessage = "Le mail est envoyé.";
$isEnvoye = TRUE; $isEnvoye = TRUE;
} }
@ -84,7 +103,7 @@ class IndexController extends AbstractActionController
$isEnvoye = FALSE; $isEnvoye = FALSE;
} }
} }
*/ */
$result = array( $result = array(
'result' => array( 'result' => array(
'content' => array( 'content' => array(