flywithu/ocsms
1
0
Fork 0
mirror of https://github.com/nextcloud/ocsms.git synced 2026-08-11 16:32:55 +00:00
Code Issues Releases Wiki Activity

Move formatphonenumber.php to proper dir and rename.

Browse Source 
* fix some coding styles
* Add contributor
This commit is contained in:
Loic Blot
2014-11-27 14:04:25 +00:00
parent 2211252004
commit 5f0263f71e
4 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controller/smscontroller.php
+5 -5
View File
@@ -18,7 +18,7 @@ use \OCP\AppFramework\Controller;
use \OCP\AppFramework\Http\JSONResponse;
use \OCA\OcSms\AppInfo\OcSmsApp;
use \OCA\OcSms\Db\SmsMapper;
use \OCA\OcSms\AppInfo\FormatPhoneNumber;
use \OCA\OcSms\Lib\PhoneNumberFormatter;
class SmsController extends Controller {
@@ -100,7 +100,7 @@ class SmsController extends Controller {
$countPhone = count($phoneList);
foreach ($phoneList as $number => $ts) {
$fmtPN = FormatPhoneNumber::formatPhoneNumber($number);
$fmtPN = PhoneNumberFormatter::format($number);
if (isset($contactsSrc[$number])) {
$contacts[$number] = $contactsSrc[$number];
} elseif (isset($contactsSrc[$fmtPN])) {
@@ -123,7 +123,7 @@ class SmsController extends Controller {
$contacts = $this->app->getContacts();
$iContacts = $this->app->getInvertedContacts();
$contactName = "";
$fmtPN = FormatPhoneNumber::formatPhoneNumber($phoneNumber);
$fmtPN = PhoneNumberFormatter::format($phoneNumber);
if (isset($contacts[$fmtPN])) {
$contactName = $contacts[$fmtPN];
}
@@ -137,7 +137,7 @@ class SmsController extends Controller {
foreach($iContacts[$contactName] as $cnumber) {
$messages = $messages + $this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $cnumber, $lastDate);
$msgCount += $this->smsMapper->countMessagesForPhoneNumber($this->userId, $cnumber);
$phoneNumbers[] = FormatPhoneNumber::formatPhoneNumber($cnumber);
$phoneNumbers[] = PhoneNumberFormatter::format($cnumber);
}
}
else {
@@ -149,7 +149,7 @@ class SmsController extends Controller {
$msgCount += $this->smsMapper->countMessagesForPhoneNumber($this->userId, $cnumber);
}
}
$phoneNumbers[] = FormatPhoneNumber::formatPhoneNumber($phoneNumber);
$phoneNumbers[] = PhoneNumberFormatter::format($phoneNumber);
}
// Order by id (date)
ksort($messages);