fix for older versions (c75049bb) · Commits · e / infra / ecloud / nextcloud-apps / Esms

controller/smscontroller.php

+24 −12

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ use \OCP\AppFramework\Http\JSONResponse;
		use \OCP\AppFramework\Http;
		use OCA\DAV\Connector\Sabre\Principal;
		use OCA\DAV\CardDAV\CardDavBackend;
		use \OCP\IDBConnection;

		use \OCA\ESms\Db\ConfigMapper;
		use \OCA\ESms\Db\SmsMapper;
		@@ -51,13 +52,23 @@ class SmsController extends Controller {
		public function __construct ($appName, IRequest $request, $userId,
		SmsMapper $mapper, ConversationStateMapper $cmapper,
		ConfigMapper $ConfigMapper,
		IContactsManager $contactsManager, IURLGenerator $urlGenerator, $db) {
		IContactsManager $contactsManager, IURLGenerator $urlGenerator, IDBConnection $db) {
		parent::__construct($appName, $request);
		$this->userId = $userId;
		$this->smsMapper = $mapper;
		$this->convStateMapper = $cmapper;
		$this->configMapper = $ConfigMapper;
		$this->urlGenerator = $urlGenerator;
		if(\OCP\Util::getVersion()[0]<=17){
		$principalBackend = new Principal(
		\OC::$server->getUserManager(),
		\OC::$server->getGroupManager(),
		\OC::$server->getShareManager(),
		\OC::$server->getUserSession(),
		\OC::$server->getConfig(),
		\OC::$server->getAppManager()
		);
		} else {
		$principalBackend = new Principal(
		\OC::$server->getUserManager(),
		\OC::$server->getGroupManager(),
		@@ -68,6 +79,7 @@ class SmsController extends Controller {
		\OC::$server->getConfig(),
		'principals/'
		);
		}

		$this->contactCache = new ContactCache($ConfigMapper, $contactsManager, new CardDavBackend($db, $principalBackend, \OC::$server->getUserManager(), \OC::$server->getGroupManager(), \OC::$server->getEventDispatcher()), $db, $userId);
		}

lib/contactcache.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -104,7 +104,7 @@ class ContactCache {
		->select('name', 'value', 'cardid')
		->from('cards_properties')
		->where($qb->expr()->andX(
		$qb->expr()->eq('addressbookid', $addressBook['id']),
		$qb->expr()->eq('addressbookid', $qb->createNamedParameter((int)$addressBook['id'])),
		)
		);
		$result = $qb->execute();