@@ -20,7 +20,7 @@ |
||
| 20 | 20 | public function prePersist($entity) |
| 21 | 21 | { |
| 22 | 22 | if ($entity->getGuid() === null) { |
| 23 | - $entity->setGuid((string)Uuid::uuid4()); |
|
| 23 | + $entity->setGuid((string) Uuid::uuid4()); |
|
| 24 | 24 | } |
| 25 | 25 | } |
| 26 | 26 | } |
@@ -13,26 +13,26 @@ discard block |
||
| 13 | 13 | */ |
| 14 | 14 | class UserLogs |
| 15 | 15 | { |
| 16 | - /** |
|
| 17 | - * @var integer |
|
| 18 | - * |
|
| 19 | - * @ORM\Column(name="id", type="integer", nullable=false, options={"unsigned"=true}) |
|
| 20 | - * @ORM\Id |
|
| 21 | - * @ORM\GeneratedValue(strategy="NONE") |
|
| 22 | - */ |
|
| 23 | - private $id; |
|
| 16 | + /** |
|
| 17 | + * @var integer |
|
| 18 | + * |
|
| 19 | + * @ORM\Column(name="id", type="integer", nullable=false, options={"unsigned"=true}) |
|
| 20 | + * @ORM\Id |
|
| 21 | + * @ORM\GeneratedValue(strategy="NONE") |
|
| 22 | + */ |
|
| 23 | + private $id; |
|
| 24 | 24 | |
| 25 | - /** |
|
| 26 | - * @var \User |
|
| 27 | - * |
|
| 28 | - * @ORM\Id |
|
| 29 | - * @ORM\GeneratedValue(strategy="NONE") |
|
| 30 | - * @ORM\OneToOne(targetEntity="User") |
|
| 31 | - * @ORM\JoinColumns({ |
|
| 32 | - * @ORM\JoinColumn(name="user_id", referencedColumnName="id") |
|
| 33 | - * }) |
|
| 34 | - */ |
|
| 35 | - private $user; |
|
| 25 | + /** |
|
| 26 | + * @var \User |
|
| 27 | + * |
|
| 28 | + * @ORM\Id |
|
| 29 | + * @ORM\GeneratedValue(strategy="NONE") |
|
| 30 | + * @ORM\OneToOne(targetEntity="User") |
|
| 31 | + * @ORM\JoinColumns({ |
|
| 32 | + * @ORM\JoinColumn(name="user_id", referencedColumnName="id") |
|
| 33 | + * }) |
|
| 34 | + */ |
|
| 35 | + private $user; |
|
| 36 | 36 | |
| 37 | 37 | /** |
| 38 | 38 | * @var \DateTime |
@@ -50,37 +50,37 @@ discard block |
||
| 50 | 50 | */ |
| 51 | 51 | private $updateDate; |
| 52 | 52 | |
| 53 | - /** |
|
| 54 | - * @return int |
|
| 55 | - */ |
|
| 56 | - public function getId() |
|
| 57 | - { |
|
| 58 | - return $this->id; |
|
| 59 | - } |
|
| 53 | + /** |
|
| 54 | + * @return int |
|
| 55 | + */ |
|
| 56 | + public function getId() |
|
| 57 | + { |
|
| 58 | + return $this->id; |
|
| 59 | + } |
|
| 60 | 60 | |
| 61 | - /** |
|
| 62 | - * @param int $id |
|
| 63 | - */ |
|
| 64 | - public function setId($id) |
|
| 65 | - { |
|
| 66 | - $this->id = $id; |
|
| 67 | - } |
|
| 61 | + /** |
|
| 62 | + * @param int $id |
|
| 63 | + */ |
|
| 64 | + public function setId($id) |
|
| 65 | + { |
|
| 66 | + $this->id = $id; |
|
| 67 | + } |
|
| 68 | 68 | |
| 69 | - /** |
|
| 70 | - * @return \User |
|
| 71 | - */ |
|
| 72 | - public function getUser() |
|
| 73 | - { |
|
| 74 | - return $this->user; |
|
| 75 | - } |
|
| 69 | + /** |
|
| 70 | + * @return \User |
|
| 71 | + */ |
|
| 72 | + public function getUser() |
|
| 73 | + { |
|
| 74 | + return $this->user; |
|
| 75 | + } |
|
| 76 | 76 | |
| 77 | - /** |
|
| 78 | - * @param \User $user |
|
| 79 | - */ |
|
| 80 | - public function setUser($user) |
|
| 81 | - { |
|
| 82 | - $this->user = $user; |
|
| 83 | - } |
|
| 77 | + /** |
|
| 78 | + * @param \User $user |
|
| 79 | + */ |
|
| 80 | + public function setUser($user) |
|
| 81 | + { |
|
| 82 | + $this->user = $user; |
|
| 83 | + } |
|
| 84 | 84 | |
| 85 | 85 | /** |
| 86 | 86 | * @return \DateTime |
@@ -14,49 +14,49 @@ discard block |
||
| 14 | 14 | */ |
| 15 | 15 | class Page |
| 16 | 16 | { |
| 17 | - /** |
|
| 18 | - * @var integer |
|
| 19 | - * |
|
| 20 | - * @ORM\Column(name="id", type="integer", nullable=false, options={"unsigned"=true}) |
|
| 21 | - * @ORM\Id |
|
| 22 | - * @ORM\GeneratedValue(strategy="IDENTITY") |
|
| 23 | - */ |
|
| 24 | - private $id; |
|
| 25 | - |
|
| 26 | - /** |
|
| 27 | - * @var string |
|
| 28 | - * |
|
| 29 | - * @ORM\Column(name="guid", type="string", length=255, nullable=false) |
|
| 30 | - */ |
|
| 31 | - private $guid; |
|
| 32 | - |
|
| 33 | - /** |
|
| 34 | - * @var string |
|
| 35 | - * |
|
| 36 | - * @ORM\Column(name="title_tag", type="string", length=70, nullable=true) |
|
| 37 | - */ |
|
| 38 | - private $titleTag; |
|
| 39 | - |
|
| 40 | - /** |
|
| 41 | - * @var string |
|
| 42 | - * |
|
| 43 | - * @ORM\Column(name="description_tag", type="string", length=160, nullable=true) |
|
| 44 | - */ |
|
| 45 | - private $descriptionTag; |
|
| 46 | - |
|
| 47 | - /** |
|
| 48 | - * @var string |
|
| 49 | - * |
|
| 50 | - * @ORM\Column(name="title", type="string", length=255, nullable=false) |
|
| 51 | - */ |
|
| 52 | - private $title; |
|
| 17 | + /** |
|
| 18 | + * @var integer |
|
| 19 | + * |
|
| 20 | + * @ORM\Column(name="id", type="integer", nullable=false, options={"unsigned"=true}) |
|
| 21 | + * @ORM\Id |
|
| 22 | + * @ORM\GeneratedValue(strategy="IDENTITY") |
|
| 23 | + */ |
|
| 24 | + private $id; |
|
| 25 | + |
|
| 26 | + /** |
|
| 27 | + * @var string |
|
| 28 | + * |
|
| 29 | + * @ORM\Column(name="guid", type="string", length=255, nullable=false) |
|
| 30 | + */ |
|
| 31 | + private $guid; |
|
| 32 | + |
|
| 33 | + /** |
|
| 34 | + * @var string |
|
| 35 | + * |
|
| 36 | + * @ORM\Column(name="title_tag", type="string", length=70, nullable=true) |
|
| 37 | + */ |
|
| 38 | + private $titleTag; |
|
| 39 | + |
|
| 40 | + /** |
|
| 41 | + * @var string |
|
| 42 | + * |
|
| 43 | + * @ORM\Column(name="description_tag", type="string", length=160, nullable=true) |
|
| 44 | + */ |
|
| 45 | + private $descriptionTag; |
|
| 46 | + |
|
| 47 | + /** |
|
| 48 | + * @var string |
|
| 49 | + * |
|
| 50 | + * @ORM\Column(name="title", type="string", length=255, nullable=false) |
|
| 51 | + */ |
|
| 52 | + private $title; |
|
| 53 | 53 | |
| 54 | 54 | /** |
| 55 | 55 | * @var string |
| 56 | 56 | * |
| 57 | 57 | * @ORM\Column(name="template", type="string", length=255, nullable=false) |
| 58 | 58 | */ |
| 59 | - private $template; |
|
| 59 | + private $template; |
|
| 60 | 60 | |
| 61 | 61 | /** |
| 62 | 62 | * @var string |
@@ -65,43 +65,43 @@ discard block |
||
| 65 | 65 | */ |
| 66 | 66 | private $url; |
| 67 | 67 | |
| 68 | - /** |
|
| 69 | - * @var string |
|
| 70 | - * |
|
| 71 | - * @ORM\Column(name="content", type="text", nullable=true) |
|
| 72 | - */ |
|
| 73 | - private $content; |
|
| 74 | - |
|
| 75 | - /** |
|
| 76 | - * @var integer |
|
| 77 | - * |
|
| 78 | - * @ORM\Column(name="active", type="integer", nullable=false) |
|
| 79 | - */ |
|
| 80 | - private $active; |
|
| 81 | - |
|
| 82 | - /** |
|
| 83 | - * @var integer |
|
| 84 | - * |
|
| 85 | - * @ORM\Column(name="order", type="integer", nullable=false) |
|
| 86 | - */ |
|
| 87 | - private $order; |
|
| 88 | - |
|
| 89 | - /** |
|
| 90 | - * @var integer |
|
| 91 | - * |
|
| 92 | - * @ORM\Column(name="displayed", type="integer", nullable=false) |
|
| 93 | - */ |
|
| 94 | - private $displayed; |
|
| 95 | - |
|
| 96 | - /** |
|
| 97 | - * @var \Page |
|
| 98 | - * |
|
| 99 | - * @ORM\ManyToOne(targetEntity="Page") |
|
| 100 | - * @ORM\JoinColumns({ |
|
| 101 | - * @ORM\JoinColumn(name="parent", referencedColumnName="id") |
|
| 102 | - * }) |
|
| 103 | - */ |
|
| 104 | - private $parent; |
|
| 68 | + /** |
|
| 69 | + * @var string |
|
| 70 | + * |
|
| 71 | + * @ORM\Column(name="content", type="text", nullable=true) |
|
| 72 | + */ |
|
| 73 | + private $content; |
|
| 74 | + |
|
| 75 | + /** |
|
| 76 | + * @var integer |
|
| 77 | + * |
|
| 78 | + * @ORM\Column(name="active", type="integer", nullable=false) |
|
| 79 | + */ |
|
| 80 | + private $active; |
|
| 81 | + |
|
| 82 | + /** |
|
| 83 | + * @var integer |
|
| 84 | + * |
|
| 85 | + * @ORM\Column(name="order", type="integer", nullable=false) |
|
| 86 | + */ |
|
| 87 | + private $order; |
|
| 88 | + |
|
| 89 | + /** |
|
| 90 | + * @var integer |
|
| 91 | + * |
|
| 92 | + * @ORM\Column(name="displayed", type="integer", nullable=false) |
|
| 93 | + */ |
|
| 94 | + private $displayed; |
|
| 95 | + |
|
| 96 | + /** |
|
| 97 | + * @var \Page |
|
| 98 | + * |
|
| 99 | + * @ORM\ManyToOne(targetEntity="Page") |
|
| 100 | + * @ORM\JoinColumns({ |
|
| 101 | + * @ORM\JoinColumn(name="parent", referencedColumnName="id") |
|
| 102 | + * }) |
|
| 103 | + */ |
|
| 104 | + private $parent; |
|
| 105 | 105 | |
| 106 | 106 | /** |
| 107 | 107 | * @var \DateTime |
@@ -119,85 +119,85 @@ discard block |
||
| 119 | 119 | */ |
| 120 | 120 | private $updateDate; |
| 121 | 121 | |
| 122 | - /** |
|
| 123 | - * @return int |
|
| 124 | - */ |
|
| 125 | - public function getId() |
|
| 126 | - { |
|
| 127 | - return $this->id; |
|
| 128 | - } |
|
| 129 | - |
|
| 130 | - /** |
|
| 131 | - * @param int $id |
|
| 132 | - */ |
|
| 133 | - public function setId($id) |
|
| 134 | - { |
|
| 135 | - $this->id = $id; |
|
| 136 | - } |
|
| 137 | - |
|
| 138 | - /** |
|
| 139 | - * @return string |
|
| 140 | - */ |
|
| 141 | - public function getGuid() |
|
| 142 | - { |
|
| 143 | - return $this->guid; |
|
| 144 | - } |
|
| 145 | - |
|
| 146 | - /** |
|
| 147 | - * @param string $guid |
|
| 148 | - */ |
|
| 149 | - public function setGuid($guid) |
|
| 150 | - { |
|
| 151 | - $this->guid = $guid; |
|
| 152 | - } |
|
| 153 | - |
|
| 154 | - /** |
|
| 155 | - * @return string |
|
| 156 | - */ |
|
| 157 | - public function getTitleTag() |
|
| 158 | - { |
|
| 159 | - return $this->titleTag; |
|
| 160 | - } |
|
| 161 | - |
|
| 162 | - /** |
|
| 163 | - * @param string $titleTag |
|
| 164 | - */ |
|
| 165 | - public function setTitleTag($titleTag) |
|
| 166 | - { |
|
| 167 | - $this->titleTag = $titleTag; |
|
| 168 | - } |
|
| 169 | - |
|
| 170 | - /** |
|
| 171 | - * @return string |
|
| 172 | - */ |
|
| 173 | - public function getDescriptionTag() |
|
| 174 | - { |
|
| 175 | - return $this->descriptionTag; |
|
| 176 | - } |
|
| 177 | - |
|
| 178 | - /** |
|
| 179 | - * @param string $descriptionTag |
|
| 180 | - */ |
|
| 181 | - public function setDescriptionTag($descriptionTag) |
|
| 182 | - { |
|
| 183 | - $this->descriptionTag = $descriptionTag; |
|
| 184 | - } |
|
| 185 | - |
|
| 186 | - /** |
|
| 187 | - * @return string |
|
| 188 | - */ |
|
| 189 | - public function getTitle() |
|
| 190 | - { |
|
| 191 | - return $this->title; |
|
| 192 | - } |
|
| 193 | - |
|
| 194 | - /** |
|
| 195 | - * @param string $title |
|
| 196 | - */ |
|
| 197 | - public function setTitle($title) |
|
| 198 | - { |
|
| 199 | - $this->title = $title; |
|
| 200 | - } |
|
| 122 | + /** |
|
| 123 | + * @return int |
|
| 124 | + */ |
|
| 125 | + public function getId() |
|
| 126 | + { |
|
| 127 | + return $this->id; |
|
| 128 | + } |
|
| 129 | + |
|
| 130 | + /** |
|
| 131 | + * @param int $id |
|
| 132 | + */ |
|
| 133 | + public function setId($id) |
|
| 134 | + { |
|
| 135 | + $this->id = $id; |
|
| 136 | + } |
|
| 137 | + |
|
| 138 | + /** |
|
| 139 | + * @return string |
|
| 140 | + */ |
|
| 141 | + public function getGuid() |
|
| 142 | + { |
|
| 143 | + return $this->guid; |
|
| 144 | + } |
|
| 145 | + |
|
| 146 | + /** |
|
| 147 | + * @param string $guid |
|
| 148 | + */ |
|
| 149 | + public function setGuid($guid) |
|
| 150 | + { |
|
| 151 | + $this->guid = $guid; |
|
| 152 | + } |
|
| 153 | + |
|
| 154 | + /** |
|
| 155 | + * @return string |
|
| 156 | + */ |
|
| 157 | + public function getTitleTag() |
|
| 158 | + { |
|
| 159 | + return $this->titleTag; |
|
| 160 | + } |
|
| 161 | + |
|
| 162 | + /** |
|
| 163 | + * @param string $titleTag |
|
| 164 | + */ |
|
| 165 | + public function setTitleTag($titleTag) |
|
| 166 | + { |
|
| 167 | + $this->titleTag = $titleTag; |
|
| 168 | + } |
|
| 169 | + |
|
| 170 | + /** |
|
| 171 | + * @return string |
|
| 172 | + */ |
|
| 173 | + public function getDescriptionTag() |
|
| 174 | + { |
|
| 175 | + return $this->descriptionTag; |
|
| 176 | + } |
|
| 177 | + |
|
| 178 | + /** |
|
| 179 | + * @param string $descriptionTag |
|
| 180 | + */ |
|
| 181 | + public function setDescriptionTag($descriptionTag) |
|
| 182 | + { |
|
| 183 | + $this->descriptionTag = $descriptionTag; |
|
| 184 | + } |
|
| 185 | + |
|
| 186 | + /** |
|
| 187 | + * @return string |
|
| 188 | + */ |
|
| 189 | + public function getTitle() |
|
| 190 | + { |
|
| 191 | + return $this->title; |
|
| 192 | + } |
|
| 193 | + |
|
| 194 | + /** |
|
| 195 | + * @param string $title |
|
| 196 | + */ |
|
| 197 | + public function setTitle($title) |
|
| 198 | + { |
|
| 199 | + $this->title = $title; |
|
| 200 | + } |
|
| 201 | 201 | |
| 202 | 202 | /** |
| 203 | 203 | * @return string |
@@ -231,85 +231,85 @@ discard block |
||
| 231 | 231 | $this->url = $url; |
| 232 | 232 | } |
| 233 | 233 | |
| 234 | - /** |
|
| 235 | - * @return string |
|
| 236 | - */ |
|
| 237 | - public function getContent() |
|
| 238 | - { |
|
| 239 | - return $this->content; |
|
| 240 | - } |
|
| 241 | - |
|
| 242 | - /** |
|
| 243 | - * @param string $content |
|
| 244 | - */ |
|
| 245 | - public function setContent($content) |
|
| 246 | - { |
|
| 247 | - $this->content = $content; |
|
| 248 | - } |
|
| 249 | - |
|
| 250 | - /** |
|
| 251 | - * @return int |
|
| 252 | - */ |
|
| 253 | - public function getActive() |
|
| 254 | - { |
|
| 255 | - return $this->active; |
|
| 256 | - } |
|
| 257 | - |
|
| 258 | - /** |
|
| 259 | - * @param int $active |
|
| 260 | - */ |
|
| 261 | - public function setActive($active) |
|
| 262 | - { |
|
| 263 | - $this->active = $active; |
|
| 264 | - } |
|
| 265 | - |
|
| 266 | - /** |
|
| 267 | - * @return int |
|
| 268 | - */ |
|
| 269 | - public function getOrder() |
|
| 270 | - { |
|
| 271 | - return $this->order; |
|
| 272 | - } |
|
| 273 | - |
|
| 274 | - /** |
|
| 275 | - * @param int $order |
|
| 276 | - */ |
|
| 277 | - public function setOrder($order) |
|
| 278 | - { |
|
| 279 | - $this->order = $order; |
|
| 280 | - } |
|
| 281 | - |
|
| 282 | - /** |
|
| 283 | - * @return int |
|
| 284 | - */ |
|
| 285 | - public function getDisplayed() |
|
| 286 | - { |
|
| 287 | - return $this->displayed; |
|
| 288 | - } |
|
| 289 | - |
|
| 290 | - /** |
|
| 291 | - * @param int $displayed |
|
| 292 | - */ |
|
| 293 | - public function setDisplayed($displayed) |
|
| 294 | - { |
|
| 295 | - $this->displayed = $displayed; |
|
| 296 | - } |
|
| 297 | - |
|
| 298 | - /** |
|
| 299 | - * @return \Page |
|
| 300 | - */ |
|
| 301 | - public function getParent() |
|
| 302 | - { |
|
| 303 | - return $this->parent; |
|
| 304 | - } |
|
| 305 | - |
|
| 306 | - /** |
|
| 307 | - * @param \Page $parent |
|
| 308 | - */ |
|
| 309 | - public function setParent($parent) |
|
| 310 | - { |
|
| 311 | - $this->parent = $parent; |
|
| 312 | - } |
|
| 234 | + /** |
|
| 235 | + * @return string |
|
| 236 | + */ |
|
| 237 | + public function getContent() |
|
| 238 | + { |
|
| 239 | + return $this->content; |
|
| 240 | + } |
|
| 241 | + |
|
| 242 | + /** |
|
| 243 | + * @param string $content |
|
| 244 | + */ |
|
| 245 | + public function setContent($content) |
|
| 246 | + { |
|
| 247 | + $this->content = $content; |
|
| 248 | + } |
|
| 249 | + |
|
| 250 | + /** |
|
| 251 | + * @return int |
|
| 252 | + */ |
|
| 253 | + public function getActive() |
|
| 254 | + { |
|
| 255 | + return $this->active; |
|
| 256 | + } |
|
| 257 | + |
|
| 258 | + /** |
|
| 259 | + * @param int $active |
|
| 260 | + */ |
|
| 261 | + public function setActive($active) |
|
| 262 | + { |
|
| 263 | + $this->active = $active; |
|
| 264 | + } |
|
| 265 | + |
|
| 266 | + /** |
|
| 267 | + * @return int |
|
| 268 | + */ |
|
| 269 | + public function getOrder() |
|
| 270 | + { |
|
| 271 | + return $this->order; |
|
| 272 | + } |
|
| 273 | + |
|
| 274 | + /** |
|
| 275 | + * @param int $order |
|
| 276 | + */ |
|
| 277 | + public function setOrder($order) |
|
| 278 | + { |
|
| 279 | + $this->order = $order; |
|
| 280 | + } |
|
| 281 | + |
|
| 282 | + /** |
|
| 283 | + * @return int |
|
| 284 | + */ |
|
| 285 | + public function getDisplayed() |
|
| 286 | + { |
|
| 287 | + return $this->displayed; |
|
| 288 | + } |
|
| 289 | + |
|
| 290 | + /** |
|
| 291 | + * @param int $displayed |
|
| 292 | + */ |
|
| 293 | + public function setDisplayed($displayed) |
|
| 294 | + { |
|
| 295 | + $this->displayed = $displayed; |
|
| 296 | + } |
|
| 297 | + |
|
| 298 | + /** |
|
| 299 | + * @return \Page |
|
| 300 | + */ |
|
| 301 | + public function getParent() |
|
| 302 | + { |
|
| 303 | + return $this->parent; |
|
| 304 | + } |
|
| 305 | + |
|
| 306 | + /** |
|
| 307 | + * @param \Page $parent |
|
| 308 | + */ |
|
| 309 | + public function setParent($parent) |
|
| 310 | + { |
|
| 311 | + $this->parent = $parent; |
|
| 312 | + } |
|
| 313 | 313 | |
| 314 | 314 | /** |
| 315 | 315 | * @return \DateTime |
@@ -39,8 +39,7 @@ |
||
| 39 | 39 | ]); |
| 40 | 40 | |
| 41 | 41 | foreach ($modules as $module) { |
| 42 | - $navigation = json_decode(file_get_contents($this->get("ribs_admin.globals")->getBaseBundlePath |
|
| 43 | - ($module->getPackageName()) . "/Resources/json/navigation.json"), true); |
|
| 42 | + $navigation = json_decode(file_get_contents($this->get("ribs_admin.globals")->getBaseBundlePath($module->getPackageName()) . "/Resources/json/navigation.json"), true); |
|
| 44 | 43 | |
| 45 | 44 | foreach ($navigation["items"] as $item) { |
| 46 | 45 | if ($this->get("ribs_admin.acess_rights")->testRight($item["right"])) { |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | foreach ($modules as $module) { |
| 37 | 37 | $modules_data[] = [ |
| 38 | 38 | "name" => $module->getTitle(), |
| 39 | - "rights" => (array)json_decode(file_get_contents($this->globals->getBaseBundlePath($module->getPackageName()) . "/Resources/json/ribsadmin_rights.json")) |
|
| 39 | + "rights" => (array) json_decode(file_get_contents($this->globals->getBaseBundlePath($module->getPackageName()) . "/Resources/json/ribsadmin_rights.json")) |
|
| 40 | 40 | ]; |
| 41 | 41 | } |
| 42 | 42 | |
@@ -59,6 +59,6 @@ discard block |
||
| 59 | 59 | $rights[] = json_decode(file_get_contents($this->globals->getBaseBundlePath($module->getPackageName()) . "/Resources/json/ribsadmin_rights.json")); |
| 60 | 60 | } |
| 61 | 61 | |
| 62 | - return (object)$rights; |
|
| 62 | + return (object) $rights; |
|
| 63 | 63 | } |
| 64 | 64 | } |
| 65 | 65 | \ No newline at end of file |
@@ -75,14 +75,14 @@ |
||
| 75 | 75 | $username = $data->getUser()->getFirstName() . " " . $data->getUser()->getLastName(); |
| 76 | 76 | |
| 77 | 77 | if ($guid === null) { |
| 78 | - $this->addFlash("success-flash", "the account of ". $username . " was created"); |
|
| 78 | + $this->addFlash("success-flash", "the account of " . $username . " was created"); |
|
| 79 | 79 | } else { |
| 80 | - $this->addFlash("success-flash", "the account of ". $username . " was edited"); |
|
| 80 | + $this->addFlash("success-flash", "the account of " . $username . " was edited"); |
|
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | return $this->redirectToRoute("ribsadmin_accounts"); |
| 84 | 84 | } else { |
| 85 | - $this->addFlash("error-flash", "An account with username ". $data->getUsername() . " already exist"); |
|
| 85 | + $this->addFlash("error-flash", "An account with username " . $data->getUsername() . " already exist"); |
|
| 86 | 86 | return $this->redirectToRoute($request->get("_route"), ["guid" => $guid]); |
| 87 | 87 | } |
| 88 | 88 | } |
@@ -14,21 +14,21 @@ discard block |
||
| 14 | 14 | */ |
| 15 | 15 | class User |
| 16 | 16 | { |
| 17 | - /** |
|
| 18 | - * @var integer |
|
| 19 | - * |
|
| 20 | - * @ORM\Column(name="id", type="integer", nullable=false, options={"unsigned"=true}) |
|
| 21 | - * @ORM\Id |
|
| 22 | - * @ORM\GeneratedValue(strategy="IDENTITY") |
|
| 23 | - */ |
|
| 24 | - private $id; |
|
| 25 | - |
|
| 26 | - /** |
|
| 27 | - * @var string |
|
| 28 | - * |
|
| 29 | - * @ORM\Column(name="guid", type="string", length=255, nullable=false) |
|
| 30 | - */ |
|
| 31 | - private $guid; |
|
| 17 | + /** |
|
| 18 | + * @var integer |
|
| 19 | + * |
|
| 20 | + * @ORM\Column(name="id", type="integer", nullable=false, options={"unsigned"=true}) |
|
| 21 | + * @ORM\Id |
|
| 22 | + * @ORM\GeneratedValue(strategy="IDENTITY") |
|
| 23 | + */ |
|
| 24 | + private $id; |
|
| 25 | + |
|
| 26 | + /** |
|
| 27 | + * @var string |
|
| 28 | + * |
|
| 29 | + * @ORM\Column(name="guid", type="string", length=255, nullable=false) |
|
| 30 | + */ |
|
| 31 | + private $guid; |
|
| 32 | 32 | |
| 33 | 33 | /** |
| 34 | 34 | * @var AccessRight |
@@ -36,63 +36,63 @@ discard block |
||
| 36 | 36 | * @ORM\ManyToOne(targetEntity="PiouPiou\RibsAdminBundle\Entity\AccessRight", inversedBy="users") |
| 37 | 37 | * @ORM\JoinColumn(name="id_access_right", referencedColumnName="id", nullable=true) |
| 38 | 38 | */ |
| 39 | - private $accessRightList; |
|
| 39 | + private $accessRightList; |
|
| 40 | 40 | |
| 41 | 41 | /** |
| 42 | 42 | * @var boolean |
| 43 | 43 | * |
| 44 | 44 | * @ORM\Column(name="admin", type="boolean", nullable=true, options={"default": false}) |
| 45 | 45 | */ |
| 46 | - private $admin; |
|
| 47 | - |
|
| 48 | - /** |
|
| 49 | - * @var string |
|
| 50 | - * |
|
| 51 | - * @ORM\Column(name="firstname", type="string", length=255, nullable=false) |
|
| 52 | - */ |
|
| 53 | - private $firstname; |
|
| 54 | - |
|
| 55 | - /** |
|
| 56 | - * @var string |
|
| 57 | - * |
|
| 58 | - * @ORM\Column(name="lastname", type="string", length=255, nullable=false) |
|
| 59 | - */ |
|
| 60 | - private $lastname; |
|
| 61 | - |
|
| 62 | - /** |
|
| 63 | - * @var string |
|
| 64 | - * |
|
| 65 | - * @ORM\Column(name="adress", type="string", length=255, nullable=true) |
|
| 66 | - */ |
|
| 67 | - private $adress; |
|
| 68 | - |
|
| 69 | - /** |
|
| 70 | - * @var string |
|
| 71 | - * |
|
| 72 | - * @ORM\Column(name="postal_code", type="string", length=100, nullable=true) |
|
| 73 | - */ |
|
| 74 | - private $postalCode; |
|
| 75 | - |
|
| 76 | - /** |
|
| 77 | - * @var string |
|
| 78 | - * |
|
| 79 | - * @ORM\Column(name="country", type="string", length=100, nullable=true) |
|
| 80 | - */ |
|
| 81 | - private $country; |
|
| 82 | - |
|
| 83 | - /** |
|
| 84 | - * @var string |
|
| 85 | - * |
|
| 86 | - * @ORM\Column(name="state", type="string", length=255, nullable=true) |
|
| 87 | - */ |
|
| 88 | - private $state; |
|
| 89 | - |
|
| 90 | - /** |
|
| 91 | - * @var string |
|
| 92 | - * |
|
| 93 | - * @ORM\Column(name="access_rights", type="text", nullable=true) |
|
| 94 | - */ |
|
| 95 | - private $accessRights; |
|
| 46 | + private $admin; |
|
| 47 | + |
|
| 48 | + /** |
|
| 49 | + * @var string |
|
| 50 | + * |
|
| 51 | + * @ORM\Column(name="firstname", type="string", length=255, nullable=false) |
|
| 52 | + */ |
|
| 53 | + private $firstname; |
|
| 54 | + |
|
| 55 | + /** |
|
| 56 | + * @var string |
|
| 57 | + * |
|
| 58 | + * @ORM\Column(name="lastname", type="string", length=255, nullable=false) |
|
| 59 | + */ |
|
| 60 | + private $lastname; |
|
| 61 | + |
|
| 62 | + /** |
|
| 63 | + * @var string |
|
| 64 | + * |
|
| 65 | + * @ORM\Column(name="adress", type="string", length=255, nullable=true) |
|
| 66 | + */ |
|
| 67 | + private $adress; |
|
| 68 | + |
|
| 69 | + /** |
|
| 70 | + * @var string |
|
| 71 | + * |
|
| 72 | + * @ORM\Column(name="postal_code", type="string", length=100, nullable=true) |
|
| 73 | + */ |
|
| 74 | + private $postalCode; |
|
| 75 | + |
|
| 76 | + /** |
|
| 77 | + * @var string |
|
| 78 | + * |
|
| 79 | + * @ORM\Column(name="country", type="string", length=100, nullable=true) |
|
| 80 | + */ |
|
| 81 | + private $country; |
|
| 82 | + |
|
| 83 | + /** |
|
| 84 | + * @var string |
|
| 85 | + * |
|
| 86 | + * @ORM\Column(name="state", type="string", length=255, nullable=true) |
|
| 87 | + */ |
|
| 88 | + private $state; |
|
| 89 | + |
|
| 90 | + /** |
|
| 91 | + * @var string |
|
| 92 | + * |
|
| 93 | + * @ORM\Column(name="access_rights", type="text", nullable=true) |
|
| 94 | + */ |
|
| 95 | + private $accessRights; |
|
| 96 | 96 | |
| 97 | 97 | /** |
| 98 | 98 | * @var boolean |
@@ -117,37 +117,37 @@ discard block |
||
| 117 | 117 | */ |
| 118 | 118 | private $updateDate; |
| 119 | 119 | |
| 120 | - /** |
|
| 121 | - * @return int |
|
| 122 | - */ |
|
| 123 | - public function getId() |
|
| 124 | - { |
|
| 125 | - return $this->id; |
|
| 126 | - } |
|
| 127 | - |
|
| 128 | - /** |
|
| 129 | - * @param int $id |
|
| 130 | - */ |
|
| 131 | - public function setId($id) |
|
| 132 | - { |
|
| 133 | - $this->id = $id; |
|
| 134 | - } |
|
| 135 | - |
|
| 136 | - /** |
|
| 137 | - * @return string |
|
| 138 | - */ |
|
| 139 | - public function getGuid() |
|
| 140 | - { |
|
| 141 | - return $this->guid; |
|
| 142 | - } |
|
| 143 | - |
|
| 144 | - /** |
|
| 145 | - * @param string $guid |
|
| 146 | - */ |
|
| 147 | - public function setGuid($guid) |
|
| 148 | - { |
|
| 149 | - $this->guid = $guid; |
|
| 150 | - } |
|
| 120 | + /** |
|
| 121 | + * @return int |
|
| 122 | + */ |
|
| 123 | + public function getId() |
|
| 124 | + { |
|
| 125 | + return $this->id; |
|
| 126 | + } |
|
| 127 | + |
|
| 128 | + /** |
|
| 129 | + * @param int $id |
|
| 130 | + */ |
|
| 131 | + public function setId($id) |
|
| 132 | + { |
|
| 133 | + $this->id = $id; |
|
| 134 | + } |
|
| 135 | + |
|
| 136 | + /** |
|
| 137 | + * @return string |
|
| 138 | + */ |
|
| 139 | + public function getGuid() |
|
| 140 | + { |
|
| 141 | + return $this->guid; |
|
| 142 | + } |
|
| 143 | + |
|
| 144 | + /** |
|
| 145 | + * @param string $guid |
|
| 146 | + */ |
|
| 147 | + public function setGuid($guid) |
|
| 148 | + { |
|
| 149 | + $this->guid = $guid; |
|
| 150 | + } |
|
| 151 | 151 | |
| 152 | 152 | /** |
| 153 | 153 | * @return AccessRight |
@@ -181,133 +181,133 @@ discard block |
||
| 181 | 181 | $this->admin = $admin; |
| 182 | 182 | } |
| 183 | 183 | |
| 184 | - /** |
|
| 185 | - * @return string |
|
| 186 | - */ |
|
| 187 | - public function getFirstname() |
|
| 188 | - { |
|
| 189 | - return $this->firstname; |
|
| 190 | - } |
|
| 191 | - |
|
| 192 | - /** |
|
| 193 | - * @param string $firstname |
|
| 194 | - */ |
|
| 195 | - public function setFirstname($firstname) |
|
| 196 | - { |
|
| 197 | - $this->firstname = $firstname; |
|
| 198 | - } |
|
| 199 | - |
|
| 200 | - /** |
|
| 201 | - * @return string |
|
| 202 | - */ |
|
| 203 | - public function getLastname() |
|
| 204 | - { |
|
| 205 | - return $this->lastname; |
|
| 206 | - } |
|
| 207 | - |
|
| 208 | - /** |
|
| 209 | - * @param string $lastname |
|
| 210 | - */ |
|
| 211 | - public function setLastname($lastname) |
|
| 212 | - { |
|
| 213 | - $this->lastname = $lastname; |
|
| 214 | - } |
|
| 215 | - |
|
| 216 | - /** |
|
| 217 | - * @return string |
|
| 218 | - */ |
|
| 219 | - public function getAdress() |
|
| 220 | - { |
|
| 221 | - return $this->adress; |
|
| 222 | - } |
|
| 223 | - |
|
| 224 | - /** |
|
| 225 | - * @param string $adress |
|
| 226 | - */ |
|
| 227 | - public function setAdress($adress) |
|
| 228 | - { |
|
| 229 | - $this->adress = $adress; |
|
| 230 | - } |
|
| 231 | - |
|
| 232 | - /** |
|
| 233 | - * @return string |
|
| 234 | - */ |
|
| 235 | - public function getPostalCode() |
|
| 236 | - { |
|
| 237 | - return $this->postalCode; |
|
| 238 | - } |
|
| 239 | - |
|
| 240 | - /** |
|
| 241 | - * @param string $postalCode |
|
| 242 | - */ |
|
| 243 | - public function setPostalCode($postalCode) |
|
| 244 | - { |
|
| 245 | - $this->postalCode = $postalCode; |
|
| 246 | - } |
|
| 247 | - |
|
| 248 | - /** |
|
| 249 | - * @return string |
|
| 250 | - */ |
|
| 251 | - public function getCountry() |
|
| 252 | - { |
|
| 253 | - return $this->country; |
|
| 254 | - } |
|
| 255 | - |
|
| 256 | - /** |
|
| 257 | - * @param string $country |
|
| 258 | - */ |
|
| 259 | - public function setCountry($country) |
|
| 260 | - { |
|
| 261 | - $this->country = $country; |
|
| 262 | - } |
|
| 263 | - |
|
| 264 | - /** |
|
| 265 | - * @return string |
|
| 266 | - */ |
|
| 267 | - public function getState() |
|
| 268 | - { |
|
| 269 | - return $this->state; |
|
| 270 | - } |
|
| 271 | - |
|
| 272 | - /** |
|
| 273 | - * @param string $state |
|
| 274 | - */ |
|
| 275 | - public function setState($state) |
|
| 276 | - { |
|
| 277 | - $this->state = $state; |
|
| 278 | - } |
|
| 279 | - |
|
| 280 | - /** |
|
| 281 | - * @return string |
|
| 282 | - */ |
|
| 283 | - public function getAccessRights() |
|
| 284 | - { |
|
| 285 | - return $this->accessRights; |
|
| 286 | - } |
|
| 287 | - |
|
| 288 | - /** |
|
| 289 | - * @param string $accessRights |
|
| 290 | - */ |
|
| 291 | - public function setAccessRights($accessRights) |
|
| 292 | - { |
|
| 293 | - $this->accessRights = $accessRights; |
|
| 294 | - } |
|
| 295 | - |
|
| 296 | - /** |
|
| 297 | - * @return \DateTime |
|
| 298 | - */ |
|
| 299 | - public function getCreationDate() |
|
| 300 | - { |
|
| 301 | - return $this->creationDate; |
|
| 302 | - } |
|
| 303 | - |
|
| 304 | - /** |
|
| 305 | - * @param \DateTime $creationDate |
|
| 306 | - */ |
|
| 307 | - public function setCreationDate($creationDate) |
|
| 308 | - { |
|
| 309 | - $this->creationDate = $creationDate; |
|
| 310 | - } |
|
| 184 | + /** |
|
| 185 | + * @return string |
|
| 186 | + */ |
|
| 187 | + public function getFirstname() |
|
| 188 | + { |
|
| 189 | + return $this->firstname; |
|
| 190 | + } |
|
| 191 | + |
|
| 192 | + /** |
|
| 193 | + * @param string $firstname |
|
| 194 | + */ |
|
| 195 | + public function setFirstname($firstname) |
|
| 196 | + { |
|
| 197 | + $this->firstname = $firstname; |
|
| 198 | + } |
|
| 199 | + |
|
| 200 | + /** |
|
| 201 | + * @return string |
|
| 202 | + */ |
|
| 203 | + public function getLastname() |
|
| 204 | + { |
|
| 205 | + return $this->lastname; |
|
| 206 | + } |
|
| 207 | + |
|
| 208 | + /** |
|
| 209 | + * @param string $lastname |
|
| 210 | + */ |
|
| 211 | + public function setLastname($lastname) |
|
| 212 | + { |
|
| 213 | + $this->lastname = $lastname; |
|
| 214 | + } |
|
| 215 | + |
|
| 216 | + /** |
|
| 217 | + * @return string |
|
| 218 | + */ |
|
| 219 | + public function getAdress() |
|
| 220 | + { |
|
| 221 | + return $this->adress; |
|
| 222 | + } |
|
| 223 | + |
|
| 224 | + /** |
|
| 225 | + * @param string $adress |
|
| 226 | + */ |
|
| 227 | + public function setAdress($adress) |
|
| 228 | + { |
|
| 229 | + $this->adress = $adress; |
|
| 230 | + } |
|
| 231 | + |
|
| 232 | + /** |
|
| 233 | + * @return string |
|
| 234 | + */ |
|
| 235 | + public function getPostalCode() |
|
| 236 | + { |
|
| 237 | + return $this->postalCode; |
|
| 238 | + } |
|
| 239 | + |
|
| 240 | + /** |
|
| 241 | + * @param string $postalCode |
|
| 242 | + */ |
|
| 243 | + public function setPostalCode($postalCode) |
|
| 244 | + { |
|
| 245 | + $this->postalCode = $postalCode; |
|
| 246 | + } |
|
| 247 | + |
|
| 248 | + /** |
|
| 249 | + * @return string |
|
| 250 | + */ |
|
| 251 | + public function getCountry() |
|
| 252 | + { |
|
| 253 | + return $this->country; |
|
| 254 | + } |
|
| 255 | + |
|
| 256 | + /** |
|
| 257 | + * @param string $country |
|
| 258 | + */ |
|
| 259 | + public function setCountry($country) |
|
| 260 | + { |
|
| 261 | + $this->country = $country; |
|
| 262 | + } |
|
| 263 | + |
|
| 264 | + /** |
|
| 265 | + * @return string |
|
| 266 | + */ |
|
| 267 | + public function getState() |
|
| 268 | + { |
|
| 269 | + return $this->state; |
|
| 270 | + } |
|
| 271 | + |
|
| 272 | + /** |
|
| 273 | + * @param string $state |
|
| 274 | + */ |
|
| 275 | + public function setState($state) |
|
| 276 | + { |
|
| 277 | + $this->state = $state; |
|
| 278 | + } |
|
| 279 | + |
|
| 280 | + /** |
|
| 281 | + * @return string |
|
| 282 | + */ |
|
| 283 | + public function getAccessRights() |
|
| 284 | + { |
|
| 285 | + return $this->accessRights; |
|
| 286 | + } |
|
| 287 | + |
|
| 288 | + /** |
|
| 289 | + * @param string $accessRights |
|
| 290 | + */ |
|
| 291 | + public function setAccessRights($accessRights) |
|
| 292 | + { |
|
| 293 | + $this->accessRights = $accessRights; |
|
| 294 | + } |
|
| 295 | + |
|
| 296 | + /** |
|
| 297 | + * @return \DateTime |
|
| 298 | + */ |
|
| 299 | + public function getCreationDate() |
|
| 300 | + { |
|
| 301 | + return $this->creationDate; |
|
| 302 | + } |
|
| 303 | + |
|
| 304 | + /** |
|
| 305 | + * @param \DateTime $creationDate |
|
| 306 | + */ |
|
| 307 | + public function setCreationDate($creationDate) |
|
| 308 | + { |
|
| 309 | + $this->creationDate = $creationDate; |
|
| 310 | + } |
|
| 311 | 311 | |
| 312 | 312 | /** |
| 313 | 313 | * @return boolean |
@@ -325,21 +325,21 @@ discard block |
||
| 325 | 325 | $this->archived = $archived; |
| 326 | 326 | } |
| 327 | 327 | |
| 328 | - /** |
|
| 329 | - * @return \DateTime |
|
| 330 | - */ |
|
| 331 | - public function getUpdateDate() |
|
| 332 | - { |
|
| 333 | - return $this->updateDate; |
|
| 334 | - } |
|
| 335 | - |
|
| 336 | - /** |
|
| 337 | - * @param \DateTime $updateDate |
|
| 338 | - */ |
|
| 339 | - public function setUpdateDate($updateDate) |
|
| 340 | - { |
|
| 341 | - $this->updateDate = $updateDate; |
|
| 342 | - } |
|
| 328 | + /** |
|
| 329 | + * @return \DateTime |
|
| 330 | + */ |
|
| 331 | + public function getUpdateDate() |
|
| 332 | + { |
|
| 333 | + return $this->updateDate; |
|
| 334 | + } |
|
| 335 | + |
|
| 336 | + /** |
|
| 337 | + * @param \DateTime $updateDate |
|
| 338 | + */ |
|
| 339 | + public function setUpdateDate($updateDate) |
|
| 340 | + { |
|
| 341 | + $this->updateDate = $updateDate; |
|
| 342 | + } |
|
| 343 | 343 | |
| 344 | 344 | |
| 345 | 345 | } |
@@ -94,8 +94,8 @@ |
||
| 94 | 94 | { |
| 95 | 95 | $string = "abcdefghijklmnopqrstuvwxyzABCDEFGHJKMNPQRSTUVWXYZ23456789"; |
| 96 | 96 | $token = ""; |
| 97 | - srand((double)microtime() * 1000000); |
|
| 98 | - for ($i = 0 ; $i < $length ; $i++) { |
|
| 97 | + srand((double) microtime() * 1000000); |
|
| 98 | + for ($i = 0; $i < $length; $i++) { |
|
| 99 | 99 | $token .= $string[rand() % strlen($string)]; |
| 100 | 100 | } |
| 101 | 101 | |
@@ -79,7 +79,7 @@ |
||
| 79 | 79 | |
| 80 | 80 | $ribs_admin_rights = json_decode(file_get_contents($this->globals->getBaseBundlePath() . "/Resources/json/ribsadmin_rights.json")); |
| 81 | 81 | $modules_rights = $this->module->getModuleRights(); |
| 82 | - $ribs_admin_rights = (object)array_merge((array)$ribs_admin_rights, (array)$modules_rights); |
|
| 82 | + $ribs_admin_rights = (object) array_merge((array) $ribs_admin_rights, (array) $modules_rights); |
|
| 83 | 83 | |
| 84 | 84 | if ($admin_page == "ribsadmin" && $api !== "api" && strpos($route, "login") === false && strpos($route, "register") === false) { |
| 85 | 85 | //redirection si user pas connecté |