diff --git a/library/Class/Import/Typo3.php b/library/Class/Import/Typo3.php index 7d0bd04467d4304772c7123b4218ff51d8fe48d0..451f6df5128b4b9f54723f9ed83b5e82cb505117 100644 --- a/library/Class/Import/Typo3.php +++ b/library/Class/Import/Typo3.php @@ -590,12 +590,11 @@ class Typo3DB { } public function findAllSites() { - return $this->t3db->fetchAll("select * from tt_news where deleted=0 and ext_url>'' order by uid ASC"); + return $this->t3db->fetchAll("select * from tt_news where deleted=0 and hidden=0 and ext_url>'' order by uid ASC"); } - public function findAllArticles() { - return $this->t3db->fetchAll("select * from tt_news where deleted=0 and ext_url='' order by uid ASC"); + return $this->t3db->fetchAll("select * from tt_news where deleted=0 and hidden=0 and ext_url='' order by uid ASC"); } public function findAllForeignUidForNewsCat($uid) { @@ -608,11 +607,11 @@ class Typo3DB { public function findAllCalendarEvents() { - return $this->t3db->fetchAll("select * from tx_cal_event where deleted=0 order by uid ASC"); + return $this->t3db->fetchAll("select * from tx_cal_event where deleted=0 and hidden=0 order by uid ASC"); } public function findAllContents() { - return $this->t3db->fetchAll("select * from tt_content where deleted=0 and header>'' and bodytext>'' and (ctype='text' or ctype='textpic') order by uid ASC"); + return $this->t3db->fetchAll("select * from tt_content where deleted=0 and hidden=0 and header>'' and bodytext>'' and (ctype='text' or ctype='textpic') order by uid ASC"); } } ?> \ No newline at end of file diff --git a/library/Trait/TreeNode.php b/library/Trait/TreeNode.php index da19ee3d40fb2a7f5ac6629c6626466f56283eb3..abc6b1cae2955c59e4b30f75d79e7e23f1264253 100644 --- a/library/Trait/TreeNode.php +++ b/library/Trait/TreeNode.php @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE * along with AFI-OPAC 2.0; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ trait Trait_TreeNode { @@ -55,20 +55,20 @@ trait Trait_TreeNode { public function getParentsAndSelf() { - return ($parent = $this->getParent()) - ? array_merge($parent->getParentsAndSelf(), [$this]) - : [$this]; + return ($parent = $this->getParent()) + ? array_merge($parent->getParentsAndSelf(), [$this]) + : [$this]; } public function getParents() { - return ($parent = $this->getParent()) - ? $parent->getParentsAndSelf() + return ($parent = $this->getParent()) + ? $parent->getParentsAndSelf() : []; } - abstract public function getParent(); + abstract public function getParent(); abstract public function getChildren();