hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 20:43:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed codestyle

Browse Source
This commit is contained in:
Andrey
2013-08-13 17:28:32 +02:00
parent f8c4041733
commit cedd924e31
12 changed files with 74 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Controller/Admin/Publications.php
View File

@@ -37,7 +37,6 @@ class Publications implements ControllerProviderInterface
});
$controllers->get('/list/', function(PhraseaApplication $app) {
$feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser(
$app['authentication']->getUser()
);
@@ -47,7 +46,6 @@ class Publications implements ControllerProviderInterface
})->bind('admin_feeds_list');
$controllers->post('/create/', function(PhraseaApplication $app, Request $request) {
if ('' === $title = trim($request->request->get('title', ''))) {
$app->abort(400, "Bad request");
}

18
lib/Alchemy/Phrasea/Controller/Prod/Feed.php
View File

@@ -215,13 +215,11 @@ class Feed implements ControllerProviderInterface
$feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser($app['authentication']->getUser());
$datas = $app['twig']->render('prod/feeds/feeds.html.twig'
, array(
'feeds' => $feeds
, 'feed' => new Aggregate($app['EM'], $feeds)
, 'page' => $page
)
);
$datas = $app['twig']->render('prod/feeds/feeds.html.twig', array(
'feeds' => $feeds,
'feed' => new Aggregate($app['EM'], $feeds),
'page' => $page
));
return new Response($datas);
})->bind('prod_feeds');
@@ -247,7 +245,11 @@ class Feed implements ControllerProviderInterface
$aggregate = new Aggregate($app['EM'], $feeds);
$link = $app['feed.aggregate-link-generator']->generate($aggregate, $app['authentication']->getUser(), AggregateLinkGenerator::FORMAT_RSS, null, $renew);
$link = $app['feed.aggregate-link-generator']->generate($aggregate,
$app['authentication']->getUser(),
AggregateLinkGenerator::FORMAT_RSS,
null, $renew
);
$output = array(
'texte' => '<p>' . _('publication::Voici votre fil RSS personnel. Il vous permettra d\'etre tenu au courrant des publications.')

6
lib/Alchemy/Phrasea/Feed/Aggregate.php
View File

@@ -204,14 +204,14 @@ class Aggregate implements FeedInterface
/**
* {@inheritdoc}
*/
public function hasPage($page, $pageSize)
public function hasPage($pageNumber, $nbEntriesByPage)
{
if (0 >= $pageSize) {
if (0 >= $nbEntriesByPage) {
throw new LogicException;
}
$count = $this->getCountTotalEntries();
if (0 > $page && $page <= $count / $pageSize) {
if (0 > $pageNumber && $pageNumber <= $count / $nbEntriesByPage) {
return true;
}

6
lib/Alchemy/Phrasea/Feed/FeedInterface.php
View File

@@ -68,10 +68,10 @@ interface FeedInterface
/**
* Returns a boolean indicating whether the feed has a given page.
*
* @param integer $page
* @param integer $pageSize
* @param integer $pageNumber
* @param integer $nbEntriesByPage
*
* @return \DateTime
*/
public function hasPage($page, $pageSize);
public function hasPage($pageNumber, $nbEntriesByPage);
}

7
lib/Doctrine/Entities/Feed.php
View File

@@ -531,14 +531,13 @@ class Feed implements FeedInterface
*
* @return boolean
*/
public function hasPage($page, $pageSize)
public function hasPage($pageNumber, $nbEntriesByPage)
{
if (0 >= $pageSize) {
if (0 >= $nbEntriesByPage) {
throw new LogicException;
}
$count = $this->getCountTotalEntries();
if (0 > $page && $page <= $count / $pageSize) {
if (0 > $pageNumber && $pageNumber <= $count / $nbEntriesByPage) {
return true;
}

9
lib/Doctrine/Repositories/AggregateTokenRepository.php
View File

@@ -1,5 +1,14 @@
<?php
/*
* This file is part of Phraseanet
*
* (c) 2005-2013 Alchemy
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Repositories;
use Doctrine\ORM\EntityRepository;

9
lib/Doctrine/Repositories/FeedTokenRepository.php
View File

@@ -1,5 +1,14 @@
<?php
/*
* This file is part of Phraseanet
*
* (c) 2005-2013 Alchemy
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Repositories;
use Doctrine\ORM\EntityRepository;

9
lib/Doctrine/Repositories/OrderElementRepository.php
View File

@@ -1,5 +1,14 @@
<?php
/*
* This file is part of Phraseanet
*
* (c) 2005-2013 Alchemy
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Repositories;
use Doctrine\ORM\EntityRepository;

9
lib/Doctrine/Repositories/SessionModuleRepository.php
View File

@@ -1,5 +1,14 @@
<?php
/*
* This file is part of Phraseanet
*
* (c) 2005-2013 Alchemy
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Repositories;
use Doctrine\ORM\EntityRepository;

9
lib/Doctrine/Repositories/SessionRepository.php
View File

@@ -1,5 +1,14 @@
<?php
/*
* This file is part of Phraseanet
*
* (c) 2005-2013 Alchemy
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Repositories;
use Alchemy\Phrasea\Application;

9
lib/Doctrine/Repositories/UserSettingRepository.php
View File

@@ -1,5 +1,14 @@
<?php
/*
* This file is part of Phraseanet
*
* (c) 2005-2013 Alchemy
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Repositories;
use Doctrine\ORM\EntityRepository;

1
lib/classes/eventsmanager/notify/feed.php
View File

@@ -121,7 +121,6 @@ class eventsmanager_notify_feed extends eventsmanager_notifyAbstract
}
$this->broker->notify($user_to_notif->get_id(), __CLASS__, $datas, $mailed);
}
$start += $perLoop;
} while (count($results) > 0);