mirror of
https://github.com/nerzhul/ocsms.git
synced 2025-06-07 16:06:15 +00:00
MERGE
This commit is contained in:
commit
aaff8e9e4c
@ -20,7 +20,7 @@ use \OCA\OcSms\Db\Sms;
|
|||||||
use \OCA\OcSms\Db\SmsMapper;
|
use \OCA\OcSms\Db\SmsMapper;
|
||||||
|
|
||||||
|
|
||||||
class Application extends App {
|
class OcSmsApp extends App {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var array used to cache the parsed contacts for every request
|
* @var array used to cache the parsed contacts for every request
|
||||||
@ -88,6 +88,8 @@ class Application extends App {
|
|||||||
foreach ($result as $r) {
|
foreach ($result as $r) {
|
||||||
if (isset ($r["TEL"])) {
|
if (isset ($r["TEL"])) {
|
||||||
self::$contacts[$r["TEL"]] = $r["FN"];
|
self::$contacts[$r["TEL"]] = $r["FN"];
|
||||||
|
$phoneId = preg_replace("#[ ]#", "", $r["TEL"]);
|
||||||
|
self::$contacts[$phoneId] = $r["FN"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -25,7 +25,7 @@ class SmsController extends Controller {
|
|||||||
private $smsMapper;
|
private $smsMapper;
|
||||||
private $errorMsg;
|
private $errorMsg;
|
||||||
|
|
||||||
public function __construct ($appName, IRequest $request, $userId, SmsMapper $mapper, Application $app){
|
public function __construct ($appName, IRequest $request, $userId, SmsMapper $mapper, OcSmsApp $app){
|
||||||
parent::__construct($appName, $request);
|
parent::__construct($appName, $request);
|
||||||
$this->app = $app;
|
$this->app = $app;
|
||||||
$this->userId = $userId;
|
$this->userId = $userId;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user