Merge "Bug 1847001: Change check_email_exist() to check_email_exists()"

htdocs/admin/users/add.php

@@ -274,7 +274,7 @@ function adduser_validate(Pieform $form, $values) {
                 $form->set_error('email', get_string('invalidemailaddress', 'artefact.internal'));
             }
 
-            if (check_email_exist($email)) {
+            if (check_email_exists($email)) {
                 $form->set_error('email', get_string('emailalreadytaken', 'auth.internal'));
             }
         }

htdocs/artefact/internal/index.php

@@ -266,7 +266,7 @@ function profileform_validate(Pieform $form, $values) {
                 $form->set_error('email', get_string('invalidemailaddress', 'artefact.internal') . ': ' . hsc($email));
                 break;
             }
-            else if (check_email_exist($email)) {
+            else if (check_email_exists($email)) {
                 $form->set_error('email', get_string('unvalidatedemailalreadytaken', 'artefact.internal'));
                 break;
             }

htdocs/auth/lib.php

@@ -3019,7 +3019,7 @@ function auth_register_validate(Pieform $form, $values) {
             $form->set_error('email', get_string('invalidemailaddress', 'artefact.internal'));
         }
 
-        if (check_email_exist($values['email'])) {
+        if (check_email_exists($values['email'])) {
             $form->set_error('email', get_string('emailalreadytaken', 'auth.internal'));
         }
     }

htdocs/lib/user.php

@@ -916,7 +916,7 @@ function generate_email_processing_address($userid, $userto, $type='B') {
 * Case insensitive checking for emails to existing db
 * @return bool if the emails exists or not
 */
-function check_email_exist($email, $ownerid = 0) {
+function check_email_exists($email, $ownerid = 0) {
     // get existing users 'usr','email'
     $resultarray = get_column_sql("SELECT email FROM {usr} WHERE id != ?", array($ownerid));
     $resultarray = array_merge($resultarray, get_column_sql("SELECT email FROM {artefact_internal_profile_email} WHERE owner != ?", array($ownerid)));