diff --git a/src/new/src/PSC/Shop/EntityBundle/Document/Cms.php b/src/new/src/PSC/Shop/EntityBundle/Document/Cms.php
index 0c36dcc49..c1ecfd1a7 100755
--- a/src/new/src/PSC/Shop/EntityBundle/Document/Cms.php
+++ b/src/new/src/PSC/Shop/EntityBundle/Document/Cms.php
@@ -29,8 +29,6 @@ class Cms
#[Field(type: 'boolean')]
protected bool $noIndex = false;
- #[Field(type: 'hash')]
- protected array $accounts = [];
#[Field(type: 'hash')]
protected $pluginSettings = [];
@@ -120,13 +118,4 @@ class Cms
{
$this->noIndex = $noIndex;
}
- public function getAccounts(): array
- {
- return (array)$this->accounts;
- }
-
- public function setAccounts(array $var): void
- {
- $this->accounts = $var;
- }
}
diff --git a/src/new/src/PSC/Shop/EntityBundle/Entity/Account.php b/src/new/src/PSC/Shop/EntityBundle/Entity/Account.php
index 6a03f033f..b051cc195 100755
--- a/src/new/src/PSC/Shop/EntityBundle/Entity/Account.php
+++ b/src/new/src/PSC/Shop/EntityBundle/Entity/Account.php
@@ -446,7 +446,7 @@ class Account
#[ORM\JoinTable(name: 'account_cms')]
#[ORM\JoinColumn(name: 'account_id', referencedColumnName: 'id')]
- #[ORM\InverseJoinColumn(name: 'account_id', referencedColumnName: 'id')]
+ #[ORM\InverseJoinColumn(name: 'cms_id', referencedColumnName: 'id')]
#[ORM\ManyToMany(targetEntity: 'Cms', inversedBy: 'accounts')]
public $cms;
diff --git a/src/new/src/PSC/Shop/EntityBundle/Entity/Cms.php b/src/new/src/PSC/Shop/EntityBundle/Entity/Cms.php
index d9240d7db..0f2713cd9 100755
--- a/src/new/src/PSC/Shop/EntityBundle/Entity/Cms.php
+++ b/src/new/src/PSC/Shop/EntityBundle/Entity/Cms.php
@@ -29,7 +29,6 @@ class Cms
{
protected $extraSettings;
- protected $accounts = [];
protected $noIndex = false;
protected $pluginSettings = [];
@@ -694,13 +693,4 @@ class Cms
{
$this->noIndex = $noIndex;
}
- public function getAccounts(): array
- {
- return (array)$this->accounts;
- }
-
- public function setAccounts(array $var): void
- {
- $this->accounts = $var;
- }
}
diff --git a/src/old/application/data/models/AccountCms.php b/src/old/application/data/models/AccountCms.php
new file mode 100644
index 000000000..64a403bcf
--- /dev/null
+++ b/src/old/application/data/models/AccountCms.php
@@ -0,0 +1,40 @@
+
+ * @copyright 1997-2009 Thomas Peterson
+ * @license Not Public
+ * @version SVN: $Id: ContactPaymenttype.php 5162 2010-11-06 01:42:44Z boonkerz $
+ * @link http://www.printshopcreator.de
+ */
+
+/**
+ * ContactCms Modelclass
+ *
+ * ContactCms Modelsuperclass
+ *
+ * PHP versions 4 and 5
+ *
+ * @category Data
+ * @package Model
+ * @subpackage Supermodel
+ * @author Thomas petersomn
+ * @copyright 1997-2009 Thomas Peterson
+ * @license Not Public
+ * @version Release: $Id: ContactPaymenttype.php 5162 2010-11-06 01:42:44Z boonkerz $
+ * @link http://www.printshopcreator.de
+ */
+
+class AccountCms extends BaseAccountCms
+{
+}
+
diff --git a/src/old/application/data/models/generated/BaseAccount.php b/src/old/application/data/models/generated/BaseAccount.php
index ec12eeb96..454c8621a 100755
--- a/src/old/application/data/models/generated/BaseAccount.php
+++ b/src/old/application/data/models/generated/BaseAccount.php
@@ -50,8 +50,8 @@
*/
abstract class BaseAccount extends Doctrine_Record
{
-
- public function setTableDefinition() {
+ public function setTableDefinition()
+ {
$this->setTableName('account');
$this->hasColumn('id', 'integer', 8, array(
'primary' => true,
@@ -230,7 +230,8 @@ abstract class BaseAccount extends Doctrine_Record
$this->hasColumn('lastname2', 'string', 255);
}
- public function setUp() {
+ public function setUp()
+ {
parent::setUp();
$this->hasOne('Install', array(
'local' => 'install_id',
@@ -284,6 +285,12 @@ abstract class BaseAccount extends Doctrine_Record
$this->hasMany('Motiv', array(
'local' => 'id',
'foreign' => 'account_id'));
+
+ $this->hasMany('AccountCms', array(
+ 'local' => 'id',
+ 'foreign' => 'account_id'));
+
}
-}
\ No newline at end of file
+}
+
diff --git a/src/old/application/data/models/generated/BaseAccountCms.php b/src/old/application/data/models/generated/BaseAccountCms.php
new file mode 100644
index 000000000..501b1da4c
--- /dev/null
+++ b/src/old/application/data/models/generated/BaseAccountCms.php
@@ -0,0 +1,47 @@
+
+ * @version SVN: $Id: BaseContactPaymenttype.php 5162 2010-11-06 01:42:44Z boonkerz $
+ */
+abstract class BaseAccountCms extends Doctrine_Record
+{
+ public function setTableDefinition()
+ {
+ $this->setTableName('account_cms');
+ $this->hasColumn('account_id', 'integer', 8, array(
+ 'type' => 'integer',
+ 'primary' => true,
+ 'length' => '8',
+ ));
+ $this->hasColumn('cms_id', 'integer', 8, array(
+ 'type' => 'integer',
+ 'primary' => true,
+ 'length' => '8',
+ ));
+ }
+
+ public function setUp()
+ {
+ parent::setUp();
+ $this->hasOne('Cms', array(
+ 'local' => 'cms_id',
+ 'foreign' => 'id'));
+
+ $this->hasOne('Account', array(
+ 'local' => 'account_id',
+ 'foreign' => 'id'));
+ }
+}
+
diff --git a/src/old/application/data/models/generated/BaseCms.php b/src/old/application/data/models/generated/BaseCms.php
index 172b3e3f1..03f239bae 100755
--- a/src/old/application/data/models/generated/BaseCms.php
+++ b/src/old/application/data/models/generated/BaseCms.php
@@ -32,8 +32,8 @@
*/
abstract class BaseCms extends Doctrine_Record
{
-
- public function setTableDefinition() {
+ public function setTableDefinition()
+ {
$this->setTableName('cms');
$this->hasColumn('id', 'integer', 8, array(
'primary' => true,
@@ -128,7 +128,8 @@ abstract class BaseCms extends Doctrine_Record
$this->hasColumn('enable', 'boolean');
}
- public function setUp() {
+ public function setUp()
+ {
parent::setUp();
$this->hasOne('Install', array(
'local' => 'install_id',
@@ -149,6 +150,10 @@ abstract class BaseCms extends Doctrine_Record
$this->hasMany('ContactCms', array(
'local' => 'id',
'foreign' => 'cms_id'));
+ $this->hasMany('AccountCms', array(
+ 'local' => 'id',
+ 'foreign' => 'cms_id'));
+
$sluggable0 = new Doctrine_Template_Sluggable(array(
'unique' => true,
@@ -165,4 +170,5 @@ abstract class BaseCms extends Doctrine_Record
$this->actAs($sluggable0);
}
-}
\ No newline at end of file
+}
+
diff --git a/src/old/application/helpers/Cms.php b/src/old/application/helpers/Cms.php
index 8cf48e482..839f932e4 100755
--- a/src/old/application/helpers/Cms.php
+++ b/src/old/application/helpers/Cms.php
@@ -29,24 +29,29 @@ class TP_View_Helper_Cms
$tmp = [];
+ foreach ($cms as $row) {
+ $tmp[] = $row;
+ }
+
if (Zend_Auth::getInstance()->hasIdentity()) {
- $accountId = Zend_Auth::getInstance()->getIdentity()['account_id'];
+ $user = Zend_Auth::getInstance()->getIdentity();
+
+ $cms = Doctrine_Query::create()->from('Cms c')->leftJoin('c.ContactCms a')->where('c.private = 1 AND c.enable = 1 AND a.contact_id = ? AND c.shop_id = ? AND
+ (c.language = ? OR language = \'all\')', array($user['id'], $shop ['id'], Zend_Registry::get('locale')))->orderBy('c.sor ASC')->execute();
foreach ($cms as $row) {
- $accounts = $row->getAccounts();
- if (count($accounts) === 0 || in_array($accountId, $accounts)) {
- $tmp[] = $row;
- }
+ $tmp[] = $row;
+ }
+
+ $cms = Doctrine_Query::create()->from('Cms c')->leftJoin('c.AccountCms a')->where('c.private = 1 AND c.enable = 1 AND a.account_id = ? AND c.shop_id = ? AND
+ (c.language = ? OR language = \'all\')', array($user['account_id'], $shop ['id'], Zend_Registry::get('locale')))->orderBy('c.sor ASC')->execute();
+
+ foreach ($cms as $row) {
+ $tmp[] = $row;
}
return $tmp;
}
- foreach ($cms as $row) {
- $accounts = $row->getAccounts();
- if (count($accounts) === 0) {
- $tmp[] = $row;
- }
- }
return $tmp;
diff --git a/src/old/application/modules/default/controllers/CmsController.php b/src/old/application/modules/default/controllers/CmsController.php
index b46fe6453..5950c7a1b 100755
--- a/src/old/application/modules/default/controllers/CmsController.php
+++ b/src/old/application/modules/default/controllers/CmsController.php
@@ -35,8 +35,8 @@
*/
class CmsController extends TP_Controller_Action
{
-
- public function preDispatch() {
+ public function preDispatch()
+ {
//self::preDispatch();
}
@@ -48,7 +48,8 @@ class CmsController extends TP_Controller_Action
* @param string $page
* @return void
*/
- public function indexAction($page = 'Overview') {
+ public function indexAction($page = 'Overview')
+ {
$this->view->actmenu[] = $this->_request->getParam('page');
@@ -86,7 +87,20 @@ class CmsController extends TP_Controller_Action
return;
}
- if ($page->display_only_logged_in && !Zend_Auth::getInstance()->hasIdentity()) {
+
+ if ($page->private && Zend_Auth::getInstance()->hasIdentity()) {
+ $user = Zend_Auth::getInstance()->getIdentity();
+ $count = 0;
+ $cms += Doctrine_Query::create()->from('ContactCms c')->where('c.contact_id = ? AND c.cms_id = ?', array($user['id'], $page->id))->execute()->count();
+
+ $cms += Doctrine_Query::create()->from('AccountCms a')->where('a.account_id = ? AND a.cms_id = ?', array($user['account_id'], $page->id))->execute()->count();
+
+ if ($cms === 0) {
+ $this->_redirect('/user/login');
+ }
+ }
+
+ if (($page->private || $page->display_only_logged_in) && !Zend_Auth::getInstance()->hasIdentity()) {
$this->_redirect('/user/login');
}
@@ -181,7 +195,7 @@ class CmsController extends TP_Controller_Action
if ($this->shop->private && !Zend_Auth::getInstance()->hasIdentity()) {
$this->_helper->layout->setLayout('private');
}
- if($this->view->page->template != "") {
+ if ($this->view->page->template != "") {
$this->render($this->view->page->template);
}
if ($this->_getParam('help')) {