The SSH host key has changed on 8 April, 2022 to this one: SHA256:573uTBSeh74kvOo0HJXi5ijdzRm8me27suzNEDlGyrQ

Merge branch 'master' of w00d5t0ck.info:blueroses

master
Gergely POLONKAI 10 years ago
commit 8309843958
  1. 38
      TODO
  2. 32
      app/DoctrineMigrations/Version20120815091637.php
  3. 2
      app/Resources/views/Box/Events.html.twig
  4. 2
      app/Resources/views/Box/Login.html.twig
  5. 2
      app/Resources/views/Box/UserProfile.html.twig
  6. 4
      app/Resources/views/main_template.html.twig
  7. 5
      src/KekRozsak/FrontBundle/Controller/ArticleController.php
  8. 1
      src/KekRozsak/FrontBundle/Controller/EventController.php
  9. 16
      src/KekRozsak/SecurityBundle/DependencyInjection/Compiler/OverrideServiceCompilerPass.php
  10. 78
      src/KekRozsak/SecurityBundle/Entity/Role.php
  11. 13
      src/KekRozsak/SecurityBundle/Entity/User.php
  12. 8
      src/KekRozsak/SecurityBundle/KekRozsakSecurityBundle.php
  13. 57
      src/KekRozsak/SecurityBundle/Service/RoleHierarchy.php
  14. 10
      web/css/kekrozsak_front.css

38
TODO

@ -1,9 +1,29 @@
PDF header fix
News
sticky
* book creation
User
FavouriteForumTopics
* event creation
* "sticky" news flag
* news editor for administrators
* PDF header fix
* draft flag for Document and Article: only writer and administrators see it
from the Document/Article list, in preview mode
* full Document/Article list for administrators
* polls
* chat
* Users' favourite forum topics
* article categories
* blog
* site-based theme for ckeditor (both ui and the editor)
Poll
id
@ -29,8 +49,6 @@ PollAnswer
poll (back-reference to Poll)
text
Article check if public
UserForumViewed
User
ForumTopic
@ -79,3 +97,9 @@ GroupChatMessage
from user
to group
timestamp
PublicChatMessage
id
from user
to channel (ChatChannel class with id and name fields)
timestamp

@ -0,0 +1,32 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Migrations\AbstractMigration,
Doctrine\DBAL\Schema\Schema;
/**
* Auto-generated Migration: Please modify to your need!
*/
class Version20120815091637 extends AbstractMigration
{
public function up(Schema $schema)
{
// this up() migration is autogenerated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() != "mysql");
$this->addSql("CREATE TABLE role_hierarchy (parent_role_id INT NOT NULL, child_role_id INT NOT NULL, INDEX IDX_AB8EFB72A44B56EA (parent_role_id), INDEX IDX_AB8EFB72B4B76AB7 (child_role_id), PRIMARY KEY(parent_role_id, child_role_id)) ENGINE = InnoDB");
$this->addSql("ALTER TABLE role_hierarchy ADD CONSTRAINT FK_AB8EFB72A44B56EA FOREIGN KEY (parent_role_id) REFERENCES roles (id)");
$this->addSql("ALTER TABLE role_hierarchy ADD CONSTRAINT FK_AB8EFB72B4B76AB7 FOREIGN KEY (child_role_id) REFERENCES roles (id)");
$this->addSql("ALTER TABLE roles DROP admin, DROP superAdmin");
}
public function down(Schema $schema)
{
// this down() migration is autogenerated, please modify it to your needs
$this->abortIf($this->connection->getDatabasePlatform()->getName() != "mysql");
$this->addSql("DROP TABLE role_hierarchy");
$this->addSql("ALTER TABLE roles ADD admin TINYINT(1) NOT NULL, ADD superAdmin TINYINT(1) NOT NULL");
}
}

@ -1,7 +1,7 @@
{# vim: ft=htmljinja
#}
<div id="esemenyek-gomb">
<span id="esemeny-mutato">[események gomb]</span>
<span id="esemeny-mutato" class="gomb">[események gomb]</span>
<div id="esemeny-box">
<div id="esemeny-belso">
<p class="honap">{{ firstDay|date('Y-m') }}</p>

@ -1,7 +1,7 @@
{# vim: ft=htmljinja
#}
<div id="login-gomb">
<span id="login-mutato">Bejelentkezés</span>
<span id="login-mutato" class="gomb">Bejelentkezés</span>
<div id="login-box">
<div id="login-belso">
<form method="post" action="{{ path('KekRozsakSecurityBundle_login_check') }}">

@ -1,7 +1,7 @@
{# vim: ft=htmljinja
#}
<div id="profil-gomb">
<span id="profil-mutato">[avatar] {{ app.user.displayName }}</span>
<span id="profil-mutato" class="gomb">[avatar] {{ app.user.displayName }}</span>
<div id="profil-box">
<div id="profil-belso">
[avatar]

@ -35,15 +35,17 @@
{% include ':Box:UserProfile.html.twig' %}
{% include ':Box:Events.html.twig' %}
<div id="konyvtar-gomb">
<a href="{{ path('KekRozsakFrontBundle_bookList') }}">[könyvtár gomb]</a>
<span class="gomb"><a href="{{ path('KekRozsakFrontBundle_bookList') }}">[könyvtár gomb]</a></span>
</div>
{% else %}
{% include ':Box:Login.html.twig' %}
{% endif %}
{#
<div id="search-box">
<input type="text" />
<button type="submit">Keresés</button>
</div>
#}
</div>
<div id="top-line-padding"></div>
</div>

@ -6,6 +6,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
use KekRozsak\FrontBundle\Entity\Article;
@ -20,6 +21,10 @@ class ArticleController extends Controller
*/
public function viewAction(Article $article)
{
$scontext = $this->get('security.context');
if ((!is_object($scontext->getToken()) || !is_object($scontext->getToken()->getUser())) && !$article->isPublic())
throw new AccessDeniedException('A cikk megtekintéséhez be kell jelentkezned!');
return array(
'article' => $article,
);

@ -6,6 +6,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
use KekRozsak\FrontBundle\Entity\Event;

@ -0,0 +1,16 @@
<?php
namespace KekRozsak\SecurityBundle\DependencyInjection\Compiler;
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Reference;
class OverrideServiceCompilerPass implements CompilerPassInterface
{
public function process(ContainerBuilder $container)
{
$definition = $container->getDefinition('security.role_hierarchy');
$definition->setClass('KekRozsak\SecurityBundle\Service\RoleHierarchy');
$definition->setArguments(array(new Reference('doctrine')));
}
}

@ -78,62 +78,6 @@ class Role implements RoleInterface
return $this;
}
/**
* @var boolean $admin
* @ORM\Column(type="boolean", nullable=false)
*/
protected $admin;
/**
* Set admin
*
* @param boolean $admin
* @return Role
*/
public function setAdmin($admin)
{
$this->admin = $admin;
return $this;
}
/**
* Get admin
*
* @return boolean
*/
public function isAdmin()
{
return $this->admin;
}
/**
* @var boolean $superadmin
* @ORM\Column(type="boolean", nullable=false)
*/
protected $superAdmin;
/**
* Set superadmin
*
* @param boolean $superadmin
* @return Role
*/
public function setSuperadmin($superadmin)
{
$this->superadmin = $superadmin;
return $this;
}
/**
* Get superadmin
*
* @return boolean
*/
public function getSuperadmin()
{
return $this->superadmin;
}
/**
* @var text description
* @ORM\Column(type="string", length=150, nullable=true)
@ -199,5 +143,27 @@ class Role implements RoleInterface
{
return $this->shortDescription;
}
/**
* List of inherited Roles
*
* @ORM\ManyToMany(targetEntity="Role", fetch="LAZY")
* @ORM\JoinTable(name="role_hierarchy", joinColumns={
* @ORM\JoinColumn(name="parent_role_id", referencedColumnName="id")
* }, inverseJoinColumns={
* @ORM\JoinColumn(name="child_role_id", referencedColumnName="id")
* })
*/
protected $inheritedRoles;
/**
* Get all inherited roles
*
* @return Doctrine\Common\Collections\ArrayCollection
*/
public function getInheritedRoles()
{
return $this->inheritedRoles;
}
}

@ -323,7 +323,18 @@ class User implements UserInterface, AdvancedUserInterface
}
/**
* Get all roles
* Get all roles as an ArrayCollection
*
* @return Doctrine\Common\Collections\ArrayCollection
*/
public function getRolesCollection()
{
return $this->roles;
}
/**
* Get all roles, for UserInterface implementation. To get the
* collection, use getRolesCollection() instead
*
* @return array
*/

@ -3,7 +3,15 @@
namespace KekRozsak\SecurityBundle;
use Symfony\Component\HttpKernel\Bundle\Bundle;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use KekRozsak\SecurityBundle\DependencyInjection\Compiler\OverrideServiceCompilerPass;
class KekRozsakSecurityBundle extends Bundle
{
public function build(ContainerBuilder $container)
{
parent::build($container);
$container->addCompilerPass(new OverrideServiceCompilerPass());
}
}

@ -0,0 +1,57 @@
<?php
namespace KekRozsak\SecurityBundle\Service;
use Symfony\Component\Security\Core\Role\RoleHierarchyInterface;
use Symfony\Bridge\Doctrine\RegistryInterface;
class RoleHierarchy implements RoleHierarchyInterface
{
private $hierarchy;
private $roleRepo;
private $map;
public function __construct(RegistryInterface $doctrine)
{
$this->hierarchy = array();
$this->roleRepo = $doctrine->getRepository('KekRozsakSecurityBundle:Role');
$this->buildRoleMap();
}
public function getReachableRoles(array $roles)
{
$reachableRoles = array();
foreach ($roles as $role) {
if (!isset($this->map[$role->getRole()])) {
continue;
}
foreach ($this->map[$role->getRole()] as $r) {
if (($childRole = $this->roleRepo->findOneByName($r)) !== null) {
$reachableRoles[] = $childRole;
}
}
}
return $reachableRoles;
}
private function buildRoleMap()
{
$this->map = array();
$roles = $this->roleRepo->findAll();
foreach ($roles as $mainRole) {
$main = $mainRole->getRole();
$this->map[$main] = array();
foreach ($mainRole->getInheritedRoles() as $childRole) {
$this->map[$main][] = $childRole->getRole();
// TODO: This is one-level only. Get as deep as possible.
// BEWARE OF RECURSIVE NESTING!
foreach ($childRole->getInheritedRoles() as $grandchildRole) {
$this->map[$main][] = $grandchildRole->getRole();
}
}
}
}
}

@ -465,5 +465,15 @@ td.uj-post p .kuldes-gomb {
background-color: #cccccc;
color: black;
white-space: nowrap;
cursor: pointer;
}
#top-line .gomb {
background-color: transparent;
color: #c4d3ff;
}
.gomb a {
color: inherit !important;
}

Loading…
Cancel
Save