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

ocsmsapp.php cleanup & fix

Browse Source
This commit is contained in:
Loic Blot
2016-05-19 18:51:41 +02:00
parent 06f8f37237
commit a5d0869dd7
4 changed files with 36 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controller/apicontroller.php
+1 -5
View File
@@ -17,20 +17,16 @@ use \OCP\AppFramework\Http;
use \OCP\AppFramework\Controller;
use \OCP\AppFramework\Http\JSONResponse;
use \OCA\OcSms\AppInfo\OcSmsApp;
use \OCA\OcSms\Db\SmsMapper;
class ApiController extends Controller {
private $app;
private $userId;
private $smsMapper;
private $errorMsg;
public function __construct ($appName, IRequest $request, $userId, SmsMapper $mapper, OcSmsApp $app) {
public function __construct ($appName, IRequest $request, $userId, SmsMapper $mapper) {
parent::__construct($appName, $request);
$this->app = $app;
$this->userId = $userId;
$this->smsMapper = $mapper;
}
controller/settingscontroller.php
+1 -5
View File
@@ -17,20 +17,16 @@ use \OCP\AppFramework\Controller;
use \OCP\AppFramework\Http\JSONResponse;
use \OCP\AppFramework\Http;
use \OCA\OcSms\AppInfo\OcSmsApp;
use \OCA\OcSms\Db\ConfigMapper;
use \OCA\OcSms\Lib\CountryCodes;
class SettingsController extends Controller {
private $app;
private $configMapper;
public function __construct ($appName, IRequest $request, ConfigMapper $cfgMapper, OcSmsApp $app){
public function __construct ($appName, IRequest $request, ConfigMapper $cfgMapper){
parent::__construct($appName, $request);
$this->app = $app;
$this->configMapper = $cfgMapper;
}
controller/smscontroller.php
+12 -5
View File
@@ -13,14 +13,13 @@ namespace OCA\OcSms\Controller;
use \OCP\IRequest;
use \OCP\IURLGenerator;
use \OCP\Contacts\IManager as IContactsManager;
use \OCP\AppFramework\Http\TemplateResponse;
use \OCP\AppFramework\Controller;
use \OCP\AppFramework\Http\JSONResponse;
use \OCP\AppFramework\Http;
use \OCA\OcSms\AppInfo\OcSmsApp;
use \OCA\OcSms\Db\ConfigMapper;
use \OCA\OcSms\Db\SmsMapper;
@@ -29,17 +28,25 @@ use \OCA\OcSms\Lib\PhoneNumberFormatter;
class SmsController extends Controller {
private $app;
private $userId;
private $configMapper;
private $smsMapper;
private $urlGenerator;
private $contactCache;
/**
* SmsController constructor.
* @param string $appName
* @param IRequest $request
* @param $userId
* @param SmsMapper $mapper
* @param ConfigMapper $cfgMapper
* @param IContactsManager $contactsManager
* @param $urlGenerator
*/
public function __construct ($appName, IRequest $request, $userId, SmsMapper $mapper, ConfigMapper $cfgMapper,
IContactsManager $contactsManager, $urlGenerator, OcSmsApp $app) {
IContactsManager $contactsManager, IURLGenerator $urlGenerator) {
parent::__construct($appName, $request);
$this->app = $app;
$this->userId = $userId;
$this->smsMapper = $mapper;
$this->configMapper = $cfgMapper;