From 3e80ce7e9b96a1b7179c9ae7992febae4243cfe1 Mon Sep 17 00:00:00 2001
From: Dominik Vitt <dominik.vitt.hr@gmail.com>
Date: Fri, 18 May 2018 18:13:52 +0200
Subject: [PATCH] Fixed issue #12653: Search users

---
 application/controllers/admin/useraction.php |  7 +++++
 application/models/User.php                  |  8 +++--
 application/views/admin/user/editusers.php   | 32 ++++++++++++++++++--
 3 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/application/controllers/admin/useraction.php b/application/controllers/admin/useraction.php
index d155773c20e..84dcdeaa42b 100755
--- a/application/controllers/admin/useraction.php
+++ b/application/controllers/admin/useraction.php
@@ -71,7 +71,14 @@ public function index()
 
         $aData['title_bar']['title'] = gT('User administration');
         $model = new User();
+
+        // Search
+        if (isset($_GET['User']['searched_value'])){
+            $model->searched_value = $_GET['User']['searched_value'];
+        }
+
         $aData['model'] = $model;
+        $aData['formUrl'] = 'admin/user/sa/index';
         $this->_renderWrappedTemplate('user', 'editusers', $aData);
     }
 
diff --git a/application/models/User.php b/application/models/User.php
index 008ea6fc810..5c576b73a6e 100644
--- a/application/models/User.php
+++ b/application/models/User.php
@@ -40,6 +40,7 @@ class User extends LSActiveRecord
      * @var string $lang Default value for user language
      */
     public $lang = 'auto';
+    public $searched_value;
 
 
     /**
@@ -511,13 +512,14 @@ public function search()
         $pageSize = Yii::app()->user->getState('pageSize', Yii::app()->params['defaultPageSize']);
         $criteria = new CDbCriteria;
 
+        $criteria->compare('full_name',$this->searched_value,true);
+        $criteria->compare('users_name',$this->searched_value,true, 'OR');
+        $criteria->compare('email',$this->searched_value,true, 'OR');
+
         // $criteria->compare('uid',$this->uid);
-        // $criteria->compare('users_name',$this->users_name,true);
         // $criteria->compare('password',$this->password,true);
-        // $criteria->compare('full_name',$this->full_name,true);
         // $criteria->compare('parent_id',$this->parent_id);
         // $criteria->compare('lang',$this->lang,true);
-        // $criteria->compare('email',$this->email,true);
         // $criteria->compare('htmleditormode',$this->htmleditormode,true);
         // $criteria->compare('templateeditormode',$this->templateeditormode,true);
         // $criteria->compare('questionselectormode',$this->questionselectormode,true);
diff --git a/application/views/admin/user/editusers.php b/application/views/admin/user/editusers.php
index 3994b21ed12..a767b351c92 100644
--- a/application/views/admin/user/editusers.php
+++ b/application/views/admin/user/editusers.php
@@ -7,13 +7,39 @@
 
 ?>
 <div class="container-fluid">
-<div class="pagetitle h3"><?php eT("User control");?></div>
     <div class="row">
-        <div class="col-md-2 col-sm-4 col-xs-12  col-md-offset-10 col-sm-offset-8">
-            <button id="add_user_admin" data-target="#adduser-modal" data-toggle="modal" title="<?php eT('Add a new survey administrator'); ?>" class="btn btn-primary btn-block"><?php eT("Add user");?></button>
+        <div class="col-12">
+            <button id="add_user_admin" data-target="#adduser-modal" data-toggle="modal" title="<?php eT('Add a new survey administrator'); ?>" class="btn btn-default"><span class="icon-add text-success"></span> <?php eT("Add user");?></button>
         </div>
+    </div>
+<div class="pagetitle h3"><?php eT("User control");?></div>
+    <!-- Search Box -->
+    <div class="row">
+        <div class="pull-right">
+            <div class="form text-right">
+                <!-- Begin Form -->
+                <?php $form  =  $this->beginWidget('CActiveForm', array(
+                    'action' => Yii::app()->createUrl($formUrl),
+                    'method' => 'get',
+                    'htmlOptions'=>array(
+                        'class'=>'form-inline',
+                    ),
+                )); ?>
+
+                <!-- search input -->
+                <div class="form-group">
+                    <?php echo $form->label($model, 'searched_value', array('label'=>gT('Search:'),'class'=>'control-label')); ?>
+                    <?php echo $form->textField($model, 'searched_value', array('class'=>'form-control')); ?>
+                </div>
+
+                <?php echo CHtml::submitButton(gT('Search','unescaped'), array('class'=>'btn btn-success')); ?>
+                <a href="<?php echo Yii::app()->createUrl('admin/user/sa/index');?>" class="btn btn-warning"><?php eT('Reset');?></a>
 
+                <?php $this->endWidget(); ?>
+            </div>
+        </div>
     </div>
+
     <div class="row" style="margin-bottom: 100px">
         <div class="container-fluid">
             <?php