Merge pull request #91 from 2mxdev/master

bugfixed

Author: mishamx

UserModule.php

@@ -224,9 +224,13 @@ public static function getAdmins() {
 	/**
 	 * Send to user mail
 	 */
-	public static function sendMail($email,$subject,$message) {
-    	$adminEmail = Yii::app()->params['adminEmail'];
-	    $headers = "MIME-Version: 1.0\r\nFrom: $adminEmail\r\nReply-To: $adminEmail\r\nContent-Type: text/html; charset=utf-8";
+	public static function sendMail($email,$subject,$message,$from='',$cc='') {
+    	if (!$from)
+            $from = Yii::app()->params['adminEmail'];
+	    $headers = "MIME-Version: 1.0\r\nFrom: $from\r\nReply-To: $from\r\nContent-Type: text/html; charset=utf-8\r\n";
+        if ($cc) {
+            $headers .= "Cc: ".$cc."\r\n";
+        }
 	    $message = wordwrap($message, 70);
 	    $message = str_replace("\n.", "\n..", $message);
 	    return mail($email,'=?UTF-8?B?'.base64_encode($subject).'?=',$message,$headers);

messages/ru/user.php

@@ -129,5 +129,6 @@
 	'Search' => 'Искать',
 	'Advanced Search' => 'Расширенный поиск',
 	'You may optionally enter a comparison operator (<b>&lt;</b>, <b>&lt;=</b>, <b>&gt;</b>, <b>&gt;=</b>, <b>&lt;&gt;</b> or <b>=</b>) at the beginning of each of your search values to specify how the comparison should be done.'=>'Вы можете использовать операторы сравнения (<b>&lt;</b>, <b>&lt;=</b>, <b>&gt;</b>, <b>&gt;=</b>, <b>&lt;&gt;</b> or <b>=</b>) установив их перед значением.',
+	'You have requested the password recovery site {site_name}' => 'Запрос на восстановление пароля на сайте {site_name}',
 );
 

models/UserRecoveryForm.php

@@ -18,7 +18,7 @@ public function rules()
 		return array(
 			// username and password are required
 			array('login_or_email', 'required'),
-			array('login_or_email', 'match', 'pattern' => '/^[[email protected]\s,]+$/u','message' => UserModule::t("Incorrect symbols (A-z0-9).")),
+			array('login_or_email', 'match', 'pattern' => '/^[A-Za-z0-9@.\-\s,]+$/u','message' => UserModule::t("Incorrect symbols (A-z0-9).")),
 			// password needs to be authenticated
 			array('login_or_email', 'checkexists'),
 		);