NB-Public/circles
14
0
Fork 0
mirror of https://github.com/netzbegruenung/circles.git synced 2024-05-11 23:56:06 +02:00
Code Issues Projects Releases Wiki Activity

Application::APP_NAME

Browse source 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
This commit is contained in:
Maxence Lange 2017-08-20 09:42:25 +02:00
parent f0d7771ac6
commit 7f5261d6fc
12 changed files with 40 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/Activity/Filter.php
View file

@ -3,6 +3,7 @@
namespace OCA\Circles\Activity;
use OCA\Circles\AppInfo\Application;
use OCP\Activity\IFilter;
use OCP\IL10N;
use OCP\IURLGenerator;
@ -25,7 +26,7 @@ class Filter implements IFilter {
* @since 11.0.0
*/
public function getIdentifier() {
return 'circles';
return Application::APP_NAME;
}
/**
@ -49,7 +50,9 @@ class Filter implements IFilter {
* @since 11.0.0
*/
public function getIcon() {
return $this->url->getAbsoluteURL($this->url->imagePath('circles', 'black_circle.svg'));
return $this->url->getAbsoluteURL(
$this->url->imagePath(Application::APP_NAME, 'black_circle.svg')
);
}
/**
@ -67,7 +70,7 @@ class Filter implements IFilter {
* @since 11.0.0
*/
public function allowedApps() {
return ['circles'];
return [Application::APP_NAME];
}
}

3
lib/Activity/Provider.php
View file

@ -29,6 +29,7 @@ namespace OCA\Circles\Activity;
use Exception;
use InvalidArgumentException;
use OCA\Circles\AppInfo\Application;
use OCA\Circles\Model\Circle;
use OCA\Circles\Model\FederatedLink;
use OCA\Circles\Model\Member;
@ -49,7 +50,7 @@ class Provider extends BaseProvider implements IProvider {
*/
public function parse($lang, IEvent $event, IEvent $previousEvent = null) {
if ($event->getApp() !== 'circles') {
if ($event->getApp() !== Application::APP_NAME) {
throw new \InvalidArgumentException();
}

4
lib/AppInfo/Application.php
View file

@ -54,6 +54,8 @@ use OCP\Util;
class Application extends App {
const APP_NAME = 'circles';
/** @var string */
private $appName;
@ -62,7 +64,7 @@ class Application extends App {
* @param array $params
*/
public function __construct(array $params = array()) {
parent::__construct('circles', $params);
parent::__construct(self::APP_NAME, $params);
$container = $this->getContainer();
$this->appName = $container->query('AppName');

3
lib/Controller/NavigationController.php
View file

@ -26,6 +26,7 @@
namespace OCA\Circles\Controller;
use OCA\Circles\AppInfo\Application;
use \OCA\Circles\Model\Circle;
use OCA\Circles\Service\ConfigService;
use OCA\Testing\Config;
@ -62,7 +63,7 @@ class NavigationController extends BaseController {
];
return new TemplateResponse(
'circles', 'navigate', $data
Application::APP_NAME, 'navigate', $data
);
}

3
lib/Migration/UsingShortenUniqueIdInsteadOfCircleId.php
View file

@ -27,6 +27,7 @@
namespace OCA\Circles\Migration;
use OC\Share\Share;
use OCA\Circles\AppInfo\Application;
use OCA\Circles\Db\CoreRequestBuilder;
use OCA\Circles\Model\Circle;
use OCP\IConfig;
@ -68,7 +69,7 @@ class UsingShortenUniqueIdInsteadOfCircleId implements IRepairStep {
public function run(IOutput $output) {
$oldVersion = explode(
'.', \OC::$server->getConfig()
->getAppValue('circles', 'installed_version', '')
->getAppValue(Application::APP_NAME, 'installed_version', '')
);
if ((int)$oldVersion[0] === 0

3
lib/Model/BaseMember.php
View file

@ -27,6 +27,7 @@
namespace OCA\Circles\Model;
use OC\L10N\L10N;
use OCA\Circles\AppInfo\Application;
use OCA\Circles\Service\MiscService;
class BaseMember implements \JsonSerializable {
@ -83,7 +84,7 @@ class BaseMember implements \JsonSerializable {
* @param int $type
*/
public function __construct($userId = '', $type = 0, $circleUniqueId = '') {
$this->l10n = \OC::$server->getL10N('circles');
$this->l10n = \OC::$server->getL10N(Application::APP_NAME);
$this->setType($type);
$this->setUserId($userId);

3
lib/Model/SharingFrame.php
View file

@ -26,6 +26,7 @@
namespace OCA\Circles\Model;
use OCA\Circles\AppInfo\Application;
use OCA\Circles\Exceptions\SharingFrameSourceCannotBeAppCirclesException;
class SharingFrame implements \JsonSerializable {
@ -293,7 +294,7 @@ class SharingFrame implements \JsonSerializable {
* @throws SharingFrameSourceCannotBeAppCirclesException
*/
public function cannotBeFromCircles() {
if (strtolower($this->getSource()) === 'circles') {
if (strtolower($this->getSource()) === Application::APP_NAME) {
throw new SharingFrameSourceCannotBeAppCirclesException();
}
}

11
lib/Service/CirclesService.php
View file

@ -27,6 +27,7 @@
namespace OCA\Circles\Service;
use OCA\Circles\AppInfo\Application;
use OCA\Circles\Db\CirclesRequest;
use OCA\Circles\Db\MembersRequest;
use OCA\Circles\Exceptions\CircleAlreadyExistsException;
@ -406,23 +407,23 @@ class CirclesService {
switch ($type) {
case Circle::CIRCLES_PERSONAL:
return $urlGen->getAbsoluteURL(
$urlGen->imagePath('circles', 'personal' . $ext)
$urlGen->imagePath(Application::APP_NAME, 'personal' . $ext)
);
case Circle::CIRCLES_CLOSED:
return $urlGen->getAbsoluteURL(
$urlGen->imagePath('circles', 'closed' . $ext)
$urlGen->imagePath(Application::APP_NAME, 'closed' . $ext)
);
case Circle::CIRCLES_SECRET:
return $urlGen->getAbsoluteURL(
$urlGen->imagePath('circles', 'secret' . $ext)
$urlGen->imagePath(Application::APP_NAME, 'secret' . $ext)
);
case Circle::CIRCLES_PUBLIC:
return $urlGen->getAbsoluteURL(
$urlGen->imagePath('circles', 'public' . $ext)
$urlGen->imagePath(Application::APP_NAME, 'public' . $ext)
);
}
return $urlGen->getAbsoluteURL($urlGen->imagePath('circles', 'black_circle' . $ext));
return $urlGen->getAbsoluteURL($urlGen->imagePath(Application::APP_NAME, 'black_circle' . $ext));
}
}

3
lib/Service/EventsService.php
View file

@ -26,6 +26,7 @@
namespace OCA\Circles\Service;
use OCA\Circles\AppInfo\Application;
use OCA\Circles\Db\CirclesRequest;
use OCA\Circles\Db\MembersRequest;
use OCA\Circles\Model\Circle;
@ -687,7 +688,7 @@ class EventsService {
*/
private function generateEvent($type) {
$event = $this->activityManager->generateEvent();
$event->setApp('circles')
$event->setApp(Application::APP_NAME)
->setType($type)
->setAuthor($this->userId);

10
templates/navigate.php
View file

@ -24,11 +24,13 @@
*
*/
script('circles', 'vendor/notyf');
style('circles', 'notyf');
use OCA\Circles\AppInfo\Application;
script(Application::APP_NAME, 'vendor/notyf');
style(Application::APP_NAME, 'notyf');
script(
'circles', [
Application::APP_NAME, [
'circles.v1', 'circles.app.elements', 'circles.app.actions',
'circles.app.navigation', 'circles.app.settings',
'circles.app', 'circles.app.results.circles', 'circles.app.results.members',
@ -36,7 +38,7 @@ script(
]
);
style('circles', 'navigation');
style(Application::APP_NAME, 'navigation');
?>

6
templates/settings.admin.php
View file

@ -1,8 +1,10 @@
<?php
script('circles', 'admin');
style('circles', 'admin');
use OCA\Circles\AppInfo\Application;
script(Application::APP_NAME, 'admin');
style(Application::APP_NAME, 'admin');
?>

4
tests/bootstrap.php
View file

@ -1,6 +1,8 @@
<?php
use OCA\Circles\AppInfo\Application;
if (!defined('PHPUNIT_RUN')) {
define('PHPUNIT_RUN', 1);
}
@ -10,7 +12,7 @@ require_once __DIR__ . '/../../../lib/base.php';
// Fix for "Autoload path not allowed: .../tests/lib/testcase.php"
\OC::$loader->addValidRoot(OC::$SERVERROOT . '/tests');
\OC_App::loadApp('circles');
\OC_App::loadApp(Application::APP_NAME);
if (!class_exists('PHPUnit_Framework_TestCase')) {
require_once('PHPUnit/Autoload.php');