采用新界面后基本功能正常，还有不少地方需要修正，尤其是控制面板，联系人模块

dfar2008 · Jul 1, 2013 · 5d5330c · 5d5330c
1 parent 38da140
commit 5d5330c
Show file tree

Hide file tree

Showing 380 changed files with 19,412 additions and 18,118 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,54 @@
+/Smarty/templates_c/%%00^00A^00AEAECB%%SetMenu.tpl.php
+/Smarty/templates_c/%%01^018^0181B2C4%%ListViewEntries.tpl.php
+/Smarty/templates_c/%%03^032^0328A38A%%Buttons_List1.tpl.php
+/Smarty/templates_c/%%09^094^0944400B%%ListViewEntries.tpl.php
+/Smarty/templates_c/%%27^27B^27B328ED%%DetailViewFields.tpl.php
+/Smarty/templates_c/%%2F^2F6^2F699D44%%EditMoreInfo.tpl.php
+/Smarty/templates_c/%%32^32D^32DE0AF5%%ListViewEntries.tpl.php
+/Smarty/templates_c/%%33^33E^33E164C6%%Settings.tpl.php
+/Smarty/templates_c/%%35^351^35138630%%SmsLogs.tpl.php
+/Smarty/templates_c/%%37^372^37254E3D%%Buttons_List_edit.tpl.php
+/Smarty/templates_c/%%3C^3C4^3C46CB17%%ListView.tpl.php
+/Smarty/templates_c/%%3D^3D3^3D3C399C%%AdvanceSearch.tpl.php
+/Smarty/templates_c/%%41^417^4171261C%%ListView.tpl.php
+/Smarty/templates_c/%%55^55E^55EC5246%%SmsUser.tpl.php
+/Smarty/templates_c/%%59^59B^59BA81AA%%RelatedListsHidden.tpl.php
+/Smarty/templates_c/%%5A^5AF^5AF7ADA0%%EditView.tpl.php
+/Smarty/templates_c/%%60^60B^60B3678A%%ListView.tpl.php
+/Smarty/templates_c/%%69^69C^69CF8F8F%%ListView.tpl.php
+/Smarty/templates_c/%%76^761^761D48EA%%ListViewEntries.tpl.php
+/Smarty/templates_c/%%79^798^798DEB56%%ListView.tpl.php
+/Smarty/templates_c/%%7E^7EC^7ECD8DF5%%ReportGraph.tpl.php
+/Smarty/templates_c/%%84^84D^84DEA603%%Settings.tpl.php
+/Smarty/templates_c/%%88^881^8817832C%%Buttons_List.tpl.php
+/Smarty/templates_c/%%90^907^9075F619%%ListViewEntries.tpl.php
+/Smarty/templates_c/%%90^90E^90EEF15A%%CreateView.tpl.php
+/Smarty/templates_c/%%91^91C^91C382D3%%Buttons_List_details.tpl.php
+/Smarty/templates_c/%%95^951^9513D631%%DetailViewHidden.tpl.php
+/Smarty/templates_c/%%97^97A^97A555DF%%ListView.tpl.php
+/Smarty/templates_c/%%A6^A68^A686271F%%EditMoreInfo.tpl.php
+/Smarty/templates_c/%%A8^A89^A891A716%%Buttons_List_create.tpl.php
+/Smarty/templates_c/%%B0^B00^B002D5EA%%RelatedListNew.tpl.php
+/Smarty/templates_c/%%B3^B34^B34C0E05%%ListView.tpl.php
+/Smarty/templates_c/%%B8^B8A^B8AE4258%%Header.tpl.php
+/Smarty/templates_c/%%BC^BC6^BC63A375%%RelatedListContents.tpl.php
+/Smarty/templates_c/%%BE^BE4^BE444FFA%%DisplayFields.tpl.php
+/Smarty/templates_c/%%CE^CE1^CE1A2F41%%CreateMoreInfo.tpl.php
+/Smarty/templates_c/%%D2^D26^D26E9347%%ListView.tpl.php
+/Smarty/templates_c/%%D5^D51^D519E688%%DetailView.tpl.php
+/Smarty/templates_c/%%D6^D65^D6501767%%ListViewEntries.tpl.php
+/Smarty/templates_c/%%DA^DA8^DA827BD6%%ListViewEntries.tpl.php
+/Smarty/templates_c/%%DA^DAC^DACB02F9%%ListView.tpl.php
+/Smarty/templates_c/%%DE^DE9^DE9B4A35%%ListViewEntries.tpl.php
+/Smarty/templates_c/%%E9^E90^E90F0EDA%%ListView.tpl.php
+/Smarty/templates_c/%%EA^EAD^EADCA48A%%SmsAccount.tpl.php
+/Smarty/templates_c/%%F3^F31^F31BCFE1%%ListViewEntries.tpl.php
+/Smarty/templates_c/%%FC^FC1^FC120A44%%ListViewEntries.tpl.php
+
+/Smarty/templates_c/%%14^145^145E2E23%%SettingLeft.tpl.php
+/Smarty/templates_c/%%28^28C^28CF95BA%%SettingLeft.tpl.php
+/Smarty/templates_c/%%34^349^3499A618%%MessageConfig.tpl.php
+/Smarty/templates_c/%%56^568^56812478%%EmailConfig.tpl.php
+/Smarty/templates_c/%%6F^6FB^6FBEBFE7%%EditPwd.tpl.php
+/Smarty/templates_c/%%7E^7E3^7E3C50F6%%PopupContents.tpl.php
+/Smarty/templates_c/%%B4^B4B^B4B8A411%%MailLogs.tpl.php
diff --git a/DoSendPwd.php b/DoSendPwd.php
@@ -3,15 +3,14 @@
 require_once('modules/Users/Users.php');
 require_once('include/logging.php');
 require_once('include/utils/UserInfoUtil.php');
-require_once('dosendmail.php');
 global $adb;
-$user_email = $_REQUEST['user_email'];
+$user_name = $_REQUEST['user_name'];
 
-$query = "SELECT id FROM ec_users WHERE deleted=0 and email1 ='".$user_email."'";
+$query = "SELECT id FROM ec_users WHERE deleted=0 and user_name ='".$user_name."'";
 $row = $adb->getFirstLine($query);
 if(empty($row))
 {
-	echo 'Email:',$user_email,'不存在!';
+	echo 'Email:',$user_name,'不存在!';
 	die;
 }
 else
@@ -46,48 +45,20 @@
 	//change pwd to new pwd
 	$query = "UPDATE ec_users SET user_password='$new_password', user_hash='$user_hash' where id='$id'";
 	$adb->query($query);
-	/*
+
 	$mail = new SaeMail();
 	$subject = "找回密码";
 	$content = "尊敬的用户,您好,易客CRM已经收到您的找回密码请求,现已将您的密码重置为:".$pass.",请重新登录后修改.";
 	global $log;
 	$log->info($content);
-	$sql="select * from ec_systems where server_type = 'email' and smownerid='$id'";
-	$server_row = $adb->getFirstLine($sql);
-	if(empty($server_row))
-	{
-		$from_email = "[email protected]";
-		$pwd = "c3crm321";
-		$server_name ="smtp.sina.com";
-		$server_port = "25";
-	}else{
-		$from_email = $server_row['from_email'];
-		$pwd = $server_row['server_password'];
-		$server_name = $server_row['server'];
-		$server_port = $server_row['server_port'];
-	}
-	
+	$from_email = "[email protected]";
+	$pwd = "c3crm321";
+	$server_name ="smtp.sina.com";
+	$server_port = "25";
 
-	$ret = $mail->quickSend( $user_email , $subject , $content , $from_email , $pwd ,$server_name , $server_port);
+	$ret = $mail->quickSend( $user_name , $subject , $content , $from_email , $pwd ,$server_name , $server_port);
 	if ($ret === false)
 	{	$errMsg = $mail->errmsg();
-		echo '发送失败'.$pass;
-		die;
-	}else{
-		echo '发送成功';
-		die;
-	}*/
-	//change pwd to new pwd
-
-	$subject = "找回密码";
-	$content = "尊敬的用户,您好,易客CRM已经收到您的找回密码请求,现已将您的密码重置为:".$pass.",请重新登录后修改.";
-	global $log;
-	$log->info($content);
-	$msg = send_webmail($user_email,$last_name,'','',$subject,$content,'',$id); 
-
-	if(!empty($msg))
-	{
-		echo '发送失败'.$msg;
 		die;
 	}else{
 		echo '发送成功';

diff --git a/Popup.php b/Popup.php
@@ -290,7 +290,7 @@
 
 if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true')
 {
-	list($where, $ustring) = explode("#@@#",getWhereCondition($currentModule));
+	list($where, $ustring) = split("#@@#",getWhereCondition($currentModule));
 	$url_string .="&query=true".$ustring;
 }