flywithu/ocsms
1
0
Fork 0
mirror of https://github.com/nextcloud/ocsms.git synced 2026-08-20 21:03:05 +00:00
Code Issues Releases Wiki Activity

Fix and use the new setting: country. International mapping can now be okay and will remove duplicates. We need a little more fix"

Browse Source
This commit is contained in:
Loic Blot
2015-01-09 18:02:41 +00:00
parent 74ed1e7527
commit 38d0cea3df
4 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
appinfo/ocsmsapp.php
+7 -4
View File
@@ -123,6 +123,9 @@ class OcSmsApp extends App {
self::$contacts = array();
self::$contactsInverted = array();
// Cache country because of loops
$configuredCountry = $this->c->query('ConfigMapper')->getCountry();
$cm = $this->c['ContactsManager'];
if ($cm == null) {
return;
@@ -136,11 +139,11 @@ class OcSmsApp extends App {
if (is_array($phoneIds)) {
$countPhone = count($phoneIds);
for ($i=0; $i < $countPhone; $i++) {
$this->pushPhoneNumberToCache($phoneIds[$i], $r["FN"]);
$this->pushPhoneNumberToCache($phoneIds[$i], $r["FN"], $configuredCountry);
}
}
else {
$this->pushPhoneNumberToCache($phoneIds, $r["FN"]);
$this->pushPhoneNumberToCache($phoneIds, $r["FN"], $configuredCountry);
}
}
@@ -152,9 +155,9 @@ class OcSmsApp extends App {
}
}
private function pushPhoneNumberToCache($rawPhone, $contactName) {
private function pushPhoneNumberToCache($rawPhone, $contactName, $country) {
$phoneNb = PhoneNumberFormatter::format($rawPhone);
$phoneNb = PhoneNumberFormatter::format($country, $rawPhone);
self::$contacts[$phoneNb] = $contactName;
// Inverted contacts
if (!isset(self::$contactsInverted[$contactName])) {