flywithu/ocsms
1
0
Fork 0
mirror of https://github.com/nerzhul/ocsms.git synced 2025-06-07 16:06:15 +00:00
Code Issues Releases Wiki Activity

Contact names are now get with peerlist

Browse Source
This commit is contained in:
Loic Blot 2014-10-05 08:54:44 +00:00
parent 4c9b653018
commit 71d6ed693b
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
appinfo/ocsmsapp.php
View File

@ -87,9 +87,17 @@ class OcSmsApp extends App {
$result = $cm->search('',array('FN')); $result = $cm->search('',array('FN'));
foreach ($result as $r) { foreach ($result as $r) {
if (isset ($r["TEL"])) { if (isset ($r["TEL"])) {
self::$contacts[$r["TEL"]] = $r["FN"]; $phoneIds = $r["TEL"];
$phoneId = preg_replace("#[ ]#", "", $r["TEL"]); if (is_array($phoneIds)) {
self::$contacts[$phoneId] = $r["FN"]; $countPhone = count($phoneIds);
for ($i=0; $i<$countPhone; $i++) {
$phoneNb = preg_replace("#[ ]#", "", $phoneIds[$i]);
self::$contacts[$phoneNb] = $r["FN"];
}
}
else {
self::$contacts[$phoneIds] = $r["FN"];
}
} }
} }
} }

19
controller/smscontroller.php
View File

@ -71,8 +71,17 @@ class SmsController extends Controller {
*/ */
public function retrieveAllPeers () { public function retrieveAllPeers () {
$phoneList = $this->smsMapper->getAllPeersPhoneNumbers($this->userId); $phoneList = $this->smsMapper->getAllPeersPhoneNumbers($this->userId);
$contactsSrc = $this->app->getContacts();
$contacts = array();
$countPhone = count($phoneList);
for ($i=0; $i < $countPhone; $i++) {
if (isset($contactsSrc[$phoneList[$i]])) {
$contacts[$phoneList[$i]] = $contactsSrc[$phoneList[$i]];
}
}
// @ TODO: filter correctly // @ TODO: filter correctly
return new JSONResponse(array("phonelist" => $phoneList)); return new JSONResponse(array("phonelist" => $phoneList, "contacts" => $contacts));
} }
/** /**
@ -81,8 +90,14 @@ class SmsController extends Controller {
*/ */
public function getConversation ($phoneNumber, $lastDate = 0) { public function getConversation ($phoneNumber, $lastDate = 0) {
$messages = $this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $phoneNumber, $lastDate); $messages = $this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $phoneNumber, $lastDate);
$contacts = $this->app->getContacts();
$contactName = "";
if (isset($contacts[$phoneNumber])) {
$contactName = $contacts[$phoneNumber];
}
// @ TODO: filter correctly // @ TODO: filter correctly
return new JSONResponse(array("conversation" => $messages, "contacts" => $this->app->getContacts())); return new JSONResponse(array("conversation" => $messages, "contactName" => $contactName));
} }
/** /**

1
js/script.js
View File

@ -14,7 +14,6 @@ var selectedConversation = null;
var curPhoneNumber = null; var curPhoneNumber = null;
var lastMsgDate = 0; var lastMsgDate = 0;
// Source: http://www.sitepoint.com/url-parameters-jquery/
$.urlParam = function(name){ $.urlParam = function(name){
var results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(window.location.href); var results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(window.location.href);
if (results == null) { if (results == null) {