diff --git a/webht/third_party/outlook/controllers/index.php b/webht/third_party/outlook/controllers/index.php
index 5f6ef0a7..7372af94 100644
--- a/webht/third_party/outlook/controllers/index.php
+++ b/webht/third_party/outlook/controllers/index.php
@@ -175,7 +175,10 @@ class Index extends CI_Controller {
$data['rank_month'] = $this->Outlook_model->get_person_rank($from_date, $to_date);
//年榜
$year_start = strtotime(date('Y-01-01', time()));
+ //$year_start = strtotime(date('2016-01-01'));
$year_end = strtotime(date('Y-12-31', time()));
+ //$year_end = strtotime(date('2016-12-31'));
+
$data['rank_year'] = $this->Outlook_model->get_person_rank($year_start, $year_end);
//总榜
//$data['rank_all']=$this->Outlook_model->get_person_rank();
@@ -342,12 +345,12 @@ class Index extends CI_Controller {
$tip_type = 'comment'; //等于comment时页面不弹出提示
$tpldata['list'] = $this->Outlook_model->get_comment_list($whc_whm_identify, 'comment', 'DESC');
- $tpldata['mail_text'] = $this->Outlook_model->get_mail_text($whc_whm_identify);
+ $tpldata['mail_text'] = $this->Outlook_model->get_mail_text($whc_whm_identify);
$tpldata['userinfo'] = $this->Outlook_model->get_webhtuser_by_filed('whu_email', $whc_whm_identify . '@citsguilin.com', '*');
-
+
if ($current_user->whu_uid && $linktype != 'comment' && $tpldata['userinfo']->whu_uid != $current_user->whu_uid) {
$like_count = $this->Outlook_model->get_comment_count($whc_whm_identify, $linktype, $current_user->whu_uid);
- if ($like_count < 3) {
+ if ($like_count < 3) {
$data['whc_type'] = $linktype;
$data['whc_whm_identify'] = $whc_whm_identify;
$data['whc_uid'] = $current_user->whu_uid;
@@ -373,7 +376,7 @@ class Index extends CI_Controller {
}
$tpldata['list_count'] = $this->Outlook_model->get_space_comment($tpldata['userinfo']->whu_uname, $whc_whm_identify, 'comment', true);
- $tpldata['like_list'] = $this->Outlook_model->get_space_comment($tpldata['userinfo']->whu_uname, $whc_whm_identify, 'like');
+ $tpldata['like_list'] = $this->Outlook_model->get_space_comment($tpldata['userinfo']->whu_uname, $whc_whm_identify, 'like');
$tpldata['unlike_list'] = $this->Outlook_model->get_space_comment($tpldata['userinfo']->whu_uname, $whc_whm_identify, 'unlike');
$tpldata['type'] = $tip_type;
$tpldata['current_user'] = $current_user;
@@ -627,7 +630,6 @@ class Index extends CI_Controller {
$fromemail = $fromuser->whu_email;
$subject = $this->input->post('mail_subject');
$body = $this->input->post('emailcontent') . $mailbody;
-
if (!$this->do_sendmail($fromemail, $tolist_array, $cclist_array, $subject, $body)) {
$result = 0; //"邮件发送有误: " . $mail->ErrorInfo;
} else {
@@ -659,7 +661,7 @@ class Index extends CI_Controller {
$mail->CharSet = "utf-8";
$mail->Encoding = "base64";
$mail->IsHTML(true);
-
+
$mail->From = $fromuser; //发件人
foreach ($tolist_array as $v) {
$mail->AddAddress($v); //收件人
@@ -671,7 +673,8 @@ class Index extends CI_Controller {
$mail->Body = $mailbody; //邮件内容
if (!$mail->Send()) {
- $result = false; //"邮件发送有误: " . $mail->ErrorInfo;
+ //$result = false;// echo "邮件发送有误: " . $mail->ErrorInfo;
+ echo "邮件发送有误: " . $mail->ErrorInfo;
} else {
$result = true;
}
@@ -814,6 +817,7 @@ class Index extends CI_Controller {
$whu_uname = $whu_uname[0];
$whu_ip = $this->input->post('whu_ip');
$result = $this->Outlook_model->verify_user($whu_uname, $whu_ip);
+
echo $result;
}
diff --git a/webht/third_party/outlook/models/outlook_model.php b/webht/third_party/outlook/models/outlook_model.php
index 86e6d1e0..1c8b4f3e 100644
--- a/webht/third_party/outlook/models/outlook_model.php
+++ b/webht/third_party/outlook/models/outlook_model.php
@@ -281,7 +281,7 @@ class Outlook_model extends CI_Model {
return '2';
}else{
$sql="UPDATE webht_user SET whu_ip = '$whu_ip',whu_status=1 WHERE whu_uname like '%$whu_uname%' ";
- $result = $this->HT->query($sql);
+ $result = $this->HT->query($sql);//var_dump($this->HT->last_query());
return '1';
}
}