Some temporary work on reg controller, make searchArrayToWhere work again on Postgres, a=chris

Chris Pollett [2016-02-10 17:Feb:th]
Some temporary work on reg controller, make searchArrayToWhere work again on Postgres, a=chris
Filename
src/controllers/RegisterController.php
src/models/GroupModel.php
src/models/Model.php
diff --git a/src/controllers/RegisterController.php b/src/controllers/RegisterController.php
index ea5aa2db5..6f89d9f77 100755
--- a/src/controllers/RegisterController.php
+++ b/src/controllers/RegisterController.php
@@ -52,7 +52,8 @@ class RegisterController extends Controller implements CrawlConstants
      */
     public $activities = ["createAccount", "emailVerification",
         "processAccountData", "processRecoverData", "recoverPassword",
-        "recoverComplete", "suggestUrl"];
+        "recoverComplete", "resendComplete", "resendRegistration",
+        "suggestUrl"];
     /**
      * Non-recovery question fields needed to register a Yioop account.
      * @var array
@@ -389,15 +390,8 @@ class RegisterController extends Controller implements CrawlConstants
                         $data['FIRST'], $data['LAST'], $data['EMAIL'],
                         C\INACTIVE_STATUS, $data['PASSWORD']);
                 }
-                $data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >".
-                    tl('register_controller_account_request_made')."</h1>');";
-                $server = new MailServer(C\MAIL_SENDER, C\MAIL_SERVER,
-                    C\MAIL_SERVERPORT, C\MAIL_USERNAME, C\MAIL_PASSWORD,
-                    C\MAIL_SECURITY);
-                $subject = tl('register_controller_admin_activation_request');
-                $message = tl('register_controller_admin_activation_message',
-                    $data['FIRST'], $data['LAST'], $data['USER']);
-                $server->send($subject, C\MAIL_SENDER, C\MAIL_SENDER, $message);
+                $this->sendActivationMail($data['FIRST'], $data['LAST'],
+                    $data['USER']);
                 break;
         }
         $user = $user_model->getUser($data['USER']);
@@ -410,6 +404,27 @@ class RegisterController extends Controller implements CrawlConstants
         unset($_SESSION['RECOVERY']);
         return $data;
     }
+    /**
+     * Use to send the account activation email
+     *
+     * @param string $first_name first name of user to send activation email for
+     * @param string $last_name last name of user to send activation email for
+     * @param string $user_name username of  user to send activation email for
+     * @param array $data field to be sent to view so can set sent mail
+     *  interface message
+     */
+    function sendActivationMail($first_name, $last_name, $user_name, &$data)
+    {
+        $data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >".
+            tl('register_controller_account_request_made')."</h1>');";
+        $server = new MailServer(C\MAIL_SENDER, C\MAIL_SERVER,
+            C\MAIL_SERVERPORT, C\MAIL_USERNAME, C\MAIL_PASSWORD,
+            C\MAIL_SECURITY);
+        $subject = tl('register_controller_admin_activation_request');
+        $message = tl('register_controller_admin_activation_message',
+            $first_name, $last_name, $user_name);
+        $server->send($subject, C\MAIL_SENDER, C\MAIL_SENDER, $message);
+    }
     /**
      * Used to verify the email sent to a user try to set up an account.
      * If the email is legit the account is activated
diff --git a/src/models/GroupModel.php b/src/models/GroupModel.php
index 72ee7ef4a..b2c1239aa 100644
--- a/src/models/GroupModel.php
+++ b/src/models/GroupModel.php
@@ -1204,7 +1204,7 @@ class GroupModel extends Model implements MediaConstants
         $group_path = "$group_prefix_path/$group_page_folder";
         $thumb_path = "$thumb_prefix_path/$thumb_page_folder";
         if (file_exists($group_path) && file_exists($thumb_path)) {
-            if ($check_redirect &&
+            if ($check_redirect &&
                 file_exists($group_path . "/$redirect_filename")) {
                 $tmp_path = file_get_contents($group_path .
                     "/$redirect_filename");
diff --git a/src/models/Model.php b/src/models/Model.php
index adb530174..10f9157b5 100755
--- a/src/models/Model.php
+++ b/src/models/Model.php
@@ -457,12 +457,12 @@ class Model implements CrawlConstants
                 $where .= $where_and;
                 switch ($comparison) {
                     case "=":
-                         $where .= "LOWER($field_name)=LOWER('".
+                         $where .= "$field_name)='".
                             $db->escapeString($value)."')";
                         break;
                     case "!=":
-                         $where .= "LOWER($field_name)!=LOWER('".
-                            $db->escapeString($value)."')";
+                         $where .= "$field_name!='".
+                            $db->escapeString($value)."'";
                         break;
                     case "CONTAINS":
                          $where .= "LOWER($field_name) LIKE LOWER('%".
ViewGit