Merge branch 'master' of https://github.com/TheRestartProject/Fixometer

Author: IronRunes

app/controller/usercontroller.ctrl.php

@@ -56,6 +56,16 @@ public function login(){
                 }
                 $this->set('waste_bar_chart_stats', array_reverse($wstats, true));
 
+                if($_SERVER['REQUEST_METHOD'] == 'GET' && !empty($_GET)){
+                    $reset_result = $_GET['reset'];
+
+                    if (!empty($reset_result) && $reset_result == 'ok') {
+                        $response['success'] = '<strong>Password reset successfully</strong>. You can now login with your new password.';
+
+                        $this->set('response', $response);
+                    }
+                }
+
                 if($_SERVER['REQUEST_METHOD'] == 'POST' && !empty($_POST)){
 
                     $response = array();
@@ -140,10 +150,16 @@ public function recover(){
                 $this->User->update($data, $id);
 
                 // send email to User
-                $message = "You've requested to recover your password for <strong>" . APPNAME . "</strong>.<br />
-                            Please click on this link to recover your password: <a href=\"" . BASE_URL . "/user/reset/?recovery=" . $data['recovery'] . "\">" . BASE_URL . "/user/reset/?recovery=" . $data['recovery'] . "</a>. <br />
-                            If the link doesn't work, please copy and paste it in the address bar of your browser.<br />
-                            The link will be active for the next 24 hours.";
+                $message = "<p>Hi,</p>" .
+                         "<p>You've requested to recover your password for the " . APPNAME . ".</p>" .
+                         "<hr/>" .
+                         "<p>Please click on this link to recover your password: <a href=\"" . BASE_URL . "/user/reset/?recovery=" . $data['recovery'] . "\">" . BASE_URL . "/user/reset/?recovery=" . $data['recovery'] . "</a>.</p>" .
+                         "<p>If the link doesn't work, please copy and paste it in the address bar of your browser.</p>" .
+                         "<p>The link will be active for the next 24 hours.</p>" .
+                         "<hr/>" .
+                         "<p>If you have any issues, or if you did <strong>not</strong> ask to recover your password, please contact <a href='mailto:" . SUPPORT_CONTACT_EMAIL . "'>" . SUPPORT_CONTACT_EMAIL . "</a>.</p>" .
+                "<p>Thanks for using the " . APPNAME . "!</p>" .
+                "<p><em>The Restart Project</em></p>";
                 $subject = APPNAME . ": Password recovery";
                 $headers = "From: " . APPEMAIL . "\r\n";
                 $headers .= "MIME-Version: 1.0\r\n";
@@ -155,7 +171,7 @@ public function recover(){
                     $response['danger'] = 'Could not send email with reset instructions.';
                 }
                 else {
-                    $response['success'] = 'Email Sent! Please check your inbox and follow instructions.';
+                    $response['success'] = 'Email Sent! Please check your inbox and follow instructions.  <strong>Please allow up to 10 minutes for your email to arrive, and please check your spam folder.</strong>';
                 }
 
               } else {
@@ -174,7 +190,6 @@ public function reset(){
             $valid_code = false;
           } else {
             $recovery = filter_var($_GET['recovery'], FILTER_SANITIZE_STRING);
-            echo $recovery;
             $user = $this->User->find(array('recovery' => $recovery));
 
             if( strtotime($user[0]->recovery_expires) > time() ) {

app/view/search/index.php

@@ -303,8 +303,6 @@
               <section class="row" id="impact-header">
                   <div class="col-sm-12 text-center">
 
-                      <h2>The Restart Project</h2>
-
                       <p class="big">
                           <span class="big blue"><?php echo $pax; ?> participants</span> aided by <span class="big blue"><?php echo $hours; ?> hours of volunteered time</span> worked on <span class="big blue"><?php echo ($device_count_status[0]->counter + $device_count_status[1]->counter + $device_count_status[2]->counter) ?> devices.</span>
                       </p>

app/view/user/login.php

@@ -14,7 +14,9 @@
                 <div class="form-group">
                     <label for="password" class="text-center">password</label>
                     <input type="password" class="form-control" name="password" id="password" placeholder="Your password...">
-                    <a class="btn btn-link btn-sm" href="/user/recover">password forgot?</a> 
+                    <div class="forgot-password-container">
+                        <a href="/user/recover">forgotten your password?</a> 
+                    </div>
                 </div>
                 <div class="form-group text-center">
 

app/view/user/recover.php

@@ -2,11 +2,13 @@
     <div class="text-center">
         <img src="/assets/images/logo_mini.png" alt="The Restart Project">
     </div>
-<p class="login-text">Please input the email address you used to register with the Fixometer. The system will send you an email with instructions on how to recover access to your account. </p>
+    <p class="login-text"><span class="patua-blue">Welcome to our community space,</span> where you can share upcoming Restart Parties and track their social and environmental impact. By doing so, we can empower and motivate at a local level, but also build global momentum for a change.</p>
     <?php if(isset($response)) { printResponse($response); } ?>
     <div class="shader"></div>
     <h2><span class="title-text">recover your password</span></h2>
 
+    <p class="explainer-text">Please input the email address that was used when you first registered with the Fixometer. The system will send you an email with instructions on how to recover the access to your account. </p>
+
     <form class="" method="post" action="/user/recover">
 
         <div class="form-group">

app/view/user/reset.php

@@ -2,14 +2,16 @@
     <div class="text-center">
         <img src="/assets/images/logo_mini.png" alt="The Restart Project">
     </div>
+    <p class="login-text"><span class="patua-blue">Welcome to our community space,</span> where you can share upcoming Restart Parties and track their social and environmental impact. By doing so, we can empower and motivate at a local level, but also build global momentum for a change.</p>
     <?php if($valid_code == false) { ?>
     <p class="login-text text-center">The recovery code you're using is invalid. Please proceed to request a new recovery link <a href="/user/recover">here</a>.</p>
     <?php  } else { ?>
-    <p class="login-text text-center">Please input your new password here.</p>
     <?php if(isset($response)) { printResponse($response); } ?>
     <div class="shader"></div>
     <h2><span class="title-text">Reset your password</span></h2>
 
+    <p class="explainer-text">Please input your new password here, and then click the button below to reset your password.</p>
+
     <form class="" method="post" action="/user/reset?recovery=<?php echo $recovery; ?>">
         <input type="hidden" name="recovery" value="<?php echo $recovery; ?>">
         <div class="form-group">

config/config.example.php

@@ -2,7 +2,8 @@
 /** Application Name **/
 define( 'APPNAME',  'Fixometer');
 define( 'APPKEY',   'l[56pOkjg_I8874.');  // should be a random string
-define( 'APPEMAIL', 'your@email.org');
+define( 'APPEMAIL', 'your@email.org'); // auto generated emails are sent from this address
+define( 'SUPPORT_CONTACT_EMAIL', "fry@planetexpress.com"); // address users can contact for help
 
 /** Secret! **/
 define( 'SECRET',   strrev(md5(APPKEY)));

public/dist/css/main.css

@@ -299,7 +299,6 @@ h3 {
             *vertical-align: auto;
             position: relative;
             padding: 0 20px;
-            line-height: 90%;
             &:before, &:after {
                 content: '';
                 display: block;
@@ -332,13 +331,23 @@ h3 {
   button.btn.btn-primary.login-button {
     width: 100px;
     height: 100px;
-    margin-top: 35px;
+    margin-top: 15px;
     .border-radius(50px);
     i.fa { font-size: 50px; }
 
 
   }
+
+  .forgot-password-container {
+      text-align:right;
+      margin-top:10px;
+  }
+
+  .explainer-text {
+      font-size: 16px;
+  }
 }
+
 .login-deets {
   width: 50%;
   float: left;