diff --git a/helper/shell-gitpull.sh b/helper/shell-gitpull.sh
new file mode 100644
index 0000000..78e05aa
--- /dev/null
+++ b/helper/shell-gitpull.sh
@@ -0,0 +1 @@
+cd .. && git pull origin master
\ No newline at end of file
diff --git a/module/Application/config/module.config.php b/module/Application/config/module.config.php
index 1a0a993..df33574 100644
--- a/module/Application/config/module.config.php
+++ b/module/Application/config/module.config.php
@@ -24,6 +24,16 @@ return [
],
],
],
+ 'srcpull' => [
+ 'type' => Literal::class,
+ 'options' => [
+ 'route' => '/pull',
+ 'defaults' => [
+ 'controller' => Controller\IndexController::class,
+ 'action' => 'pull',
+ ],
+ ],
+ ],
'contact' => [
'type' => Literal::class,
'options' => [
diff --git a/module/Application/src/Controller/IndexController.php b/module/Application/src/Controller/IndexController.php
index bb9fe5c..9000261 100644
--- a/module/Application/src/Controller/IndexController.php
+++ b/module/Application/src/Controller/IndexController.php
@@ -16,7 +16,26 @@ use PHPMailer\PHPMailer\Exception;
class IndexController extends AbstractActionController
{
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);
return $view;
}
@@ -29,62 +48,62 @@ class IndexController extends AbstractActionController
$isEnvoye = FALSE;
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'];
$email = $_POST['email'];
$subject = $_POST['subject'];
$message = nl2br($_POST['message']);
$to = "nicolas.riault@gmail.com";
$from = $email;
- $message_format = 'Nom: '.$name.'
Email: '.$email.'
'.$message.'
'; + $message_format = 'Nom: ' . $name . '' . $message . '
'; $headers = "From: $from\n"; $headers .= "MIME-Version: 1.0\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é."; $isEnvoye = TRUE; } } - /* if(isset($_POST['name']) && isset($_POST['email']) && isset($_POST['subject']) && isset($_POST['message'])){ - $name = $_POST['name']; - $email = $_POST['email']; - $subject = $_POST['subject']; - $message = nl2br($_POST['message']); - $to = "nicolas.riault@gmail.com"; - $from = $email; - $message_format = 'Nom: '.$name.''.$message.'
'; + /* if(isset($_POST['name']) && isset($_POST['email']) && isset($_POST['subject']) && isset($_POST['message'])){ + $name = $_POST['name']; + $email = $_POST['email']; + $subject = $_POST['subject']; + $message = nl2br($_POST['message']); + $to = "nicolas.riault@gmail.com"; + $from = $email; + $message_format = 'Nom: '.$name.''.$message.'
'; - $mail = new PHPMailer(); // Passing `true` enables exceptions - try { - //Server settings // Enable verbose debug output - $mail->isSMTP(); // Set mailer to use SMTP - $mail->Host = 'smtp.gmail.com'; // Specify main and backup SMTP servers - $mail->SMTPAuth = true; // Enable SMTP authentication - $mail->Username = $to; // SMTP username - $mail->Password = 'Dpz9jou99'; // SMTP password - $mail->SMTPSecure = 'tls'; // Enable TLS encryption, `ssl` also accepted - $mail->Port = 587; // TCP port to connect to + $mail = new PHPMailer(); // Passing `true` enables exceptions + try { + //Server settings // Enable verbose debug output + $mail->isSMTP(); // Set mailer to use SMTP + $mail->Host = 'smtp.gmail.com'; // Specify main and backup SMTP servers + $mail->SMTPAuth = true; // Enable SMTP authentication + $mail->Username = $to; // SMTP username + $mail->Password = 'Dpz9jou99'; // SMTP password + $mail->SMTPSecure = 'tls'; // Enable TLS encryption, `ssl` also accepted + $mail->Port = 587; // TCP port to connect to - //Recipients - $mail->setFrom($from, 'Mailer'); - $mail->addReplyTo($to, 'Nicolas Riault'); + //Recipients + $mail->setFrom($from, 'Mailer'); + $mail->addReplyTo($to, 'Nicolas Riault'); - //Content - $mail->isHTML(true); // Set email format to HTML - $mail->Subject = $subject; - $mail->Body = $message_format; + //Content + $mail->isHTML(true); // Set email format to HTML + $mail->Subject = $subject; + $mail->Body = $message_format; - $mail->send(); - $retMessage = "Le mail est envoyé."; - $isEnvoye = TRUE; - } catch (Exception $e) { + $mail->send(); + $retMessage = "Le mail est envoyé."; + $isEnvoye = TRUE; + } catch (Exception $e) { - $retMessage = "Le server n'a pas pu envoyer le message." . $mail->ErrorInfo; - $isEnvoye = FALSE; - } - } -*/ + $retMessage = "Le server n'a pas pu envoyer le message." . $mail->ErrorInfo; + $isEnvoye = FALSE; + } + } + */ $result = array( 'result' => array( 'content' => array(