From 59ee192e1da6f19d5a742c2da52578076557181a Mon Sep 17 00:00:00 2001
From: Ismo Vuorinen <ismo.vuorinen@tampere.fi>
Date: Wed, 17 Jul 2013 14:39:33 +0300
Subject: [PATCH] Admins can now change passwords

---
 application/controllers/yllapito.php      |  6 ++++
 application/models/user_model.php         | 10 ++++++
 application/views/yllapito/users_show.php | 43 +++++++++++++++++++++++
 assets/js/scripts.js                      |  8 +++++
 4 files changed, 67 insertions(+)

diff --git a/application/controllers/yllapito.php b/application/controllers/yllapito.php
index d221ef9..9fa8c97 100644
--- a/application/controllers/yllapito.php
+++ b/application/controllers/yllapito.php
@@ -152,6 +152,12 @@ class Yllapito extends CI_Controller
                 $this->users->save($user_id, $data);
                 redirect($from);
                 break;
+            case 'password':
+                $data = $this->input->post();
+                $from = $data['from_page'];
+                $this->users->savePassword($user_id, $data['password']);
+                redirect($from);
+                break;
             case 'show':
                 $data['userid'] = $user_id;
                 $data['userdata'] = $this->users->get($user_id);
diff --git a/application/models/user_model.php b/application/models/user_model.php
index 4f33e63..038a604 100644
--- a/application/models/user_model.php
+++ b/application/models/user_model.php
@@ -27,6 +27,16 @@ class User_model extends MY_Model
         return $this->update($uid, $data);
     }
 
+    public function savePassword($uid = null, $password = null)
+    {
+        if (empty($uid) || empty($password)) {
+            return false;
+        }
+
+        $password = $this->passwordhash($password);
+        return $this->update($uid, array('password' => $password));
+    }
+
     public function passwordhash($password = null)
     {
         return hash(
diff --git a/application/views/yllapito/users_show.php b/application/views/yllapito/users_show.php
index 91364ec..6075618 100644
--- a/application/views/yllapito/users_show.php
+++ b/application/views/yllapito/users_show.php
@@ -96,6 +96,49 @@ if ($user->can_seeusers == "no") {
                     </div>
                 </form>
             </div>
+            <div class="row">
+                <form action="<?php echo $post_url."/password/".$userid; ?>" method="post"
+                    accept-charset="utf-8" id="user_password" class="custom">
+                    <input type="hidden" name="from_page" value="<?php echo current_url(); ?>">
+                    <div clas="large-12 small-12 columns">
+                        <div class="panel">
+                            <h3>Salasana</h3>
+                            <div class="row">
+                                <div class="large-6 small-12 columns">
+                                    <?php
+                                        $password = array(
+                                            'id'        => 'password',
+                                            'name'      => 'password',
+                                            'minlength' => "2",
+                                            'value'     => '',
+                                            'required'  => null
+                                        );
+                                        echo form_label('Salasana', 'password') . "\n";
+                                        echo form_password($password) . "\n";
+                                    ?>
+                                </div>
+                                <div class="large-6 small-12 columns">
+                                    <?php
+                                        $password['id'] = 'password_again';
+                                        $password['name'] = 'password_again';
+                                        echo form_label('Salasana uudelleen', 'password_again') . "\n";
+                                        echo form_password($password) . "\n";
+                                    ?>
+                                </div>
+                            </div>
+                            <?php
+    echo form_submit(
+        array(
+            'name' => 'savepassword',
+            'value' => 'Tallenna uusi salasana',
+            'class' => 'button small large-12 small-12'
+        )
+    );
+                            ?>
+                        </div>
+                    </div>
+                </form>
+            </div>
 
     <?php
 }
diff --git a/assets/js/scripts.js b/assets/js/scripts.js
index f9ca015..95a3175 100644
--- a/assets/js/scripts.js
+++ b/assets/js/scripts.js
@@ -12,6 +12,14 @@ jQuery(document).ready(function($) {
         }
     });
 
+    // Trigger jQuery validation of user password form
+    $('#user_password').validate({
+          rules: {
+            password: "required",
+            password_again: {
+                equalTo: "#password"
+            }
+        },
         submitHandler: function(form) {
             form.submit();
         }