Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/polls.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/AppInfo/Application.php29
-rw-r--r--lib/Controller/PageController.php45
2 files changed, 39 insertions, 35 deletions
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 5f7c7ef4..b6277fb3 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -23,8 +23,6 @@
namespace OCA\Polls\AppInfo;
-
-use OC\AppFramework\Utility\SimpleContainer;
use OCA\Polls\Controller\PageController;
use OCA\Polls\Db\CommentMapper;
use OCA\Polls\Db\DateMapper;
@@ -34,6 +32,7 @@ use OCA\Polls\Db\ParticipationMapper;
use OCA\Polls\Db\ParticipationTextMapper;
use OCA\Polls\Db\TextMapper;
use OCP\AppFramework\App;
+use OCP\IContainer;
class Application extends App {
@@ -50,7 +49,7 @@ class Application extends App {
/**
* Controllers
*/
- $container->registerService('PageController', function (SimpleContainer $c) {
+ $container->registerService('PageController', function (IContainer $c) {
return new PageController(
$c->query('AppName'),
$c->query('Request'),
@@ -71,63 +70,63 @@ class Application extends App {
);
});
- $container->registerService('UserManager', function (SimpleContainer $c) {
+ $container->registerService('UserManager', function (IContainer $c) {
return $c->query('ServerContainer')->getUserManager();
});
- $container->registerService('GroupManager', function (SimpleContainer $c) {
+ $container->registerService('GroupManager', function (IContainer $c) {
return $c->query('ServerContainer')->getGroupManager();
});
- $container->registerService('AvatarManager', function (SimpleContainer $c) {
+ $container->registerService('AvatarManager', function (IContainer $c) {
return $c->query('ServerContainer')->getAvatarManager();
});
- $container->registerService('Logger', function (SimpleContainer $c) {
+ $container->registerService('Logger', function (IContainer $c) {
return $c->query('ServerContainer')->getLogger();
});
- $container->registerService('L10N', function (SimpleContainer $c) {
+ $container->registerService('L10N', function (IContainer $c) {
return $c->query('ServerContainer')->getL10N($c->query('AppName'));
});
- $container->registerService('CommentMapper', function (SimpleContainer $c) use ($server) {
+ $container->registerService('CommentMapper', function (IContainer $c) use ($server) {
return new CommentMapper(
$server->getDatabaseConnection()
);
});
- $container->registerService('DateMapper', function (SimpleContainer $c) use ($server) {
+ $container->registerService('DateMapper', function (IContainer $c) use ($server) {
return new DateMapper(
$server->getDatabaseConnection()
);
});
- $container->registerService('EventMapper', function (SimpleContainer $c) use ($server) {
+ $container->registerService('EventMapper', function (IContainer $c) use ($server) {
return new EventMapper(
$server->getDatabaseConnection()
);
});
- $container->registerService('NotificationMapper', function (SimpleContainer $c) use ($server) {
+ $container->registerService('NotificationMapper', function (IContainer $c) use ($server) {
return new NotificationMapper(
$server->getDatabaseConnection()
);
});
- $container->registerService('ParticipationMapper', function (SimpleContainer $c) use ($server) {
+ $container->registerService('ParticipationMapper', function (IContainer $c) use ($server) {
return new ParticipationMapper(
$server->getDatabaseConnection()
);
});
- $container->registerService('ParticipationTextMapper', function (SimpleContainer $c) use ($server) {
+ $container->registerService('ParticipationTextMapper', function (IContainer $c) use ($server) {
return new ParticipationTextMapper(
$server->getDatabaseConnection()
);
});
- $container->registerService('TextMapper', function (SimpleContainer $c) use ($server) {
+ $container->registerService('TextMapper', function (IContainer $c) use ($server) {
return new TextMapper(
$server->getDatabaseConnection()
);
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 24b2641c..05421169 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -39,6 +39,7 @@ use OCA\Polls\Db\Text;
use OCA\Polls\Db\TextMapper;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\AppFramework\Http\ContentSecurityPolicy;
use OCP\AppFramework\Http\JSONResponse;
use OCP\AppFramework\Http\RedirectResponse;
use OCP\AppFramework\Http\TemplateResponse;
@@ -73,7 +74,7 @@ class PageController extends Controller {
/**
* PageController constructor.
- * @param $appName
+ * @param string $appName
* @param IRequest $request
* @param IUserManager $userMgr
* @param IGroupManager $groupManager
@@ -81,7 +82,7 @@ class PageController extends Controller {
* @param ILogger $logger
* @param IL10N $trans
* @param IURLGenerator $urlGenerator
- * @param $userId
+ * @param string $userId
* @param CommentMapper $commentMapper
* @param DateMapper $dateMapper
* @param EventMapper $eventMapper
@@ -143,10 +144,8 @@ class PageController extends Controller {
'userMgr' => $this->userMgr,
'urlGenerator' => $this->urlGenerator
]);
- if (class_exists('OCP\AppFramework\Http\ContentSecurityPolicy')) {
- $csp = new \OCP\AppFramework\Http\ContentSecurityPolicy();
- $response->setContentSecurityPolicy($csp);
- }
+ $csp = new ContentSecurityPolicy();
+ $response->setContentSecurityPolicy($csp);
return $response;
}
@@ -162,7 +161,7 @@ class PageController extends Controller {
continue;
}
$email = \OC::$server->getConfig()->getUserValue($notification->getUserId(), 'settings', 'email');
- if (strlen($email) === 0 || !isset($email)) {
+ if ($email === null || !filter_var($email, FILTER_VALIDATE_EMAIL)) {
continue;
}
$url = $this->urlGenerator->getAbsoluteURL(
@@ -191,7 +190,7 @@ class PageController extends Controller {
$msg .= '<br/><br/>';
$toName = $this->userMgr->get($notification->getUserId())->getDisplayName();
- $subject = $this->trans->t('Polls App - New Comment');
+ $subject = $this->trans->t('Polls App - New Activity');
$fromAddress = Util::getDefaultEmailAddress('no-reply');
$fromName = $this->trans->t('Polls App') . ' (' . $from . ')';
@@ -336,6 +335,8 @@ class PageController extends Controller {
$isAnonymous,
$hideNames
) {
+
+
$event = $this->eventMapper->find($pollId);
$event->setTitle(htmlspecialchars(strip_tags($pollTitle)));
$event->setDescription(htmlspecialchars(strip_tags($pollDesc)));
@@ -365,6 +366,7 @@ class PageController extends Controller {
}
}
$event->setAccess($accessType);
+ /** @var string[] $chosenDates */
$chosenDates = json_decode($chosenDates);
$expire = null;
@@ -391,8 +393,8 @@ class PageController extends Controller {
$this->eventMapper->update($event);
foreach ($chosenDates as $el) {
$text = new Text();
- $text->setText($el);
$text->setPollId($pollId);
+ $text->setText($el);
$this->textMapper->insert($text);
}
}
@@ -473,6 +475,7 @@ class PageController extends Controller {
}
}
$event->setAccess($accessType);
+ /** @var string[] $chosenDates */
$chosenDates = json_decode($chosenDates);
$expire = null;
@@ -485,23 +488,23 @@ class PageController extends Controller {
if ($pollType === 'event') {
$event->setType(0);
$ins = $this->eventMapper->insert($event);
- $poll_id = $ins->getId();
+ $pollId = $ins->getId();
sort($chosenDates);
foreach ($chosenDates as $el) {
$date = new Date();
- $date->setPollId($poll_id);
+ $date->setPollId($pollId);
$date->setDt(date('Y-m-d H:i:s', $el));
$this->dateMapper->insert($date);
}
} else {
$event->setType(1);
$ins = $this->eventMapper->insert($event);
- $poll_id = $ins->getId();
+ $pollId = $ins->getId();
$cnt = 1;
foreach ($chosenDates as $el) {
$text = new Text();
+ $text->setPollId($pollId);
$text->setText($el . '_' . $cnt);
- $text->setPollId($poll_id);
$this->textMapper->insert($text);
$cnt++;
}
@@ -597,14 +600,16 @@ class PageController extends Controller {
$comment->setDt(date('Y-m-d H:i:s'));
$this->commentMapper->insert($comment);
$this->sendNotifications($pollId, $userId);
- $newUserId = $userId;
- if ($this->userMgr->get($userId) !== null) {
- $newUserId = $this->userMgr->get($userId)->getDisplayName();
+ $displayName = $userId;
+ $user = $this->userMgr->get($userId);
+ if ($user !== null) {
+ $displayName = $user->getDisplayName();
}
return new JSONResponse(array(
'comment' => $commentBox,
'date' => date('Y-m-d H:i:s'),
- 'userName' => $newUserId
+ 'userId' => $userId,
+ 'displayName' => $displayName
));
}
@@ -725,13 +730,13 @@ class PageController extends Controller {
return true;
}
Util::writeLog('polls', $this->userId, Util::ERROR);
- $user_groups = $this->getGroups();
+ $userGroups = $this->getGroups();
$arr = explode(';', $access);
foreach ($arr as $item) {
if (strpos($item, 'group_') === 0) {
$grp = substr($item, 6);
- foreach ($user_groups as $user_group) {
- if ($user_group === $grp) {
+ foreach ($userGroups as $userGroup) {
+ if ($userGroup === $grp) {
return true;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-24 17:41:47 +0300