From 9fbeddfa9b2315d0fbf32cfd11b1b7497aeb8e10 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Wed, 18 Mar 2015 09:48:45 +0000 Subject: [PATCH] use a proper URLGenerator in smscontroller --- appinfo/ocsmsapp.php | 1 + controller/smscontroller.php | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/appinfo/ocsmsapp.php b/appinfo/ocsmsapp.php index ad5a16e..4c04f6a 100644 --- a/appinfo/ocsmsapp.php +++ b/appinfo/ocsmsapp.php @@ -79,6 +79,7 @@ class OcSmsApp extends App { $c->query('UserId'), $c->query('SmsMapper'), $c->query('ConfigMapper'), + $c->query('ServerContainer')->getURLGenerator(), $app ); }); diff --git a/controller/smscontroller.php b/controller/smscontroller.php index 654110d..4fce87c 100644 --- a/controller/smscontroller.php +++ b/controller/smscontroller.php @@ -32,13 +32,15 @@ class SmsController extends Controller { private $configMapper; private $smsMapper; private $errorMsg; + private $urlGenerator; - public function __construct ($appName, IRequest $request, $userId, SmsMapper $mapper, ConfigMapper $cfgMapper, OcSmsApp $app){ + public function __construct ($appName, IRequest $request, $userId, SmsMapper $mapper, ConfigMapper $cfgMapper, $urlGenerator, OcSmsApp $app){ parent::__construct($appName, $request); $this->app = $app; $this->userId = $userId; $this->smsMapper = $mapper; $this->configMapper = $cfgMapper; + $this->urlGenerator = $urlGenerator; } /** @@ -50,12 +52,12 @@ class SmsController extends Controller { 'PNLConversations' => array( 'label' => 'Conversations', 'phoneNumbers' => $this->smsMapper->getAllPeersPhoneNumbers($this->userId), - 'url' => \OCP\Util::linkToAbsolute('index.php', 'apps/ocsms/', array('feed' => 'conversations')) + 'url' => $this->urlGenerator->linkToRoute('ocsms.sms.index', ['feed' => 'conversations']) ), 'PNLDrafts' => array( 'label' => 'Drafts', 'phoneNumbers' => array(), - 'url' => \OCP\Util::linkToAbsolute('index.php', 'apps/ocsms/', array('feed' => 'drafts')) + 'url' => $this->urlGenerator->linkToRoute('ocsms.sms.index', ['feed' => 'drafts']) ) );