kitodo / kitodo-presentation

plugins/newspaper/class.tx_dlf_newspaper.php

Braces +10 added lines, -5 removed lines

@@ -18,7 +18,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_newspaper extends tx_dlf_plugin {
+class tx_dlf_newspaper extends tx_dlf_plugin
+{
 
     public $extKey = 'dlf';
 
@@ -36,7 +37,8 @@ 
      *
      * @return	string		The content that is displayed on the website
      */
-    public function main($content, $conf) {
+    public function main($content, $conf)
+    {
 
         // Nothing to do here.
         return $content;
@@ -53,7 +55,8 @@ 
      *
      * @return	string		The content that is displayed on the website
      */
-    public function calendar($content, $conf) {
+    public function calendar($content, $conf)
+    {
 
         $this->init($conf);
 
@@ -210,7 +213,8 @@ 
      * @param int $firstMonth - January - 1, February - 2, ..., December - 12
      * @param int $lastMonth - January - 1, February - 2, ..., December - 12
      */
-    private function getCalendarYear($calendarIssues, $year, $firstMonth = 1, $lastMonth = 12) {
+    private function getCalendarYear($calendarIssues, $year, $firstMonth = 1, $lastMonth = 12)
+    {
 
         // Get subpart templates.
         $subparts['list'] = $this->cObj->getSubpart($this->template, '###ISSUELIST###');
@@ -370,7 +374,8 @@ 
      *
      * @return	string		The content that is displayed on the website
      */
-    public function years($content, $conf) {
+    public function years($content, $conf)
+    {
 
         $this->init($conf);
 

Spacing +32 added lines, -32 removed lines

@@ -24,7 +24,7 @@ 
 
     public $scriptRelPath = 'plugins/newspaper/class.tx_dlf_newspaper.php';
 
-    private $allIssues = array ();
+    private $allIssues = array();
 
     /**
      * The main method of the PlugIn
@@ -82,7 +82,7 @@ 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'tx_dlf_documents.uid AS uid, tx_dlf_documents.mets_label AS label, tx_dlf_documents.mets_orderlabel AS orderlabel, tx_dlf_documents.title AS title, tx_dlf_documents.year AS year',
             'tx_dlf_documents',
-            '(tx_dlf_documents.structure='.tx_dlf_helper::getIdFromIndexName('issue', 'tx_dlf_structures', $this->doc->pid).' AND tx_dlf_documents.partof='.intval($this->doc->uid).')'.tx_dlf_helper::whereClause('tx_dlf_documents'),
+            '(tx_dlf_documents.structure=' . tx_dlf_helper::getIdFromIndexName('issue', 'tx_dlf_structures', $this->doc->pid) . ' AND tx_dlf_documents.partof=' . intval($this->doc->uid) . ')' . tx_dlf_helper::whereClause('tx_dlf_documents'),
             '',
             'tx_dlf_documents.mets_orderlabel, tx_dlf_documents.mets_label ASC',
             ''
@@ -100,7 +100,7 @@ 
                 }
             }
 
-            $issues[] = array (
+            $issues[] = array(
                 'uid' => $resArray['uid'],
                 'title' => $title,
                 'year' => $resArray['year']
@@ -109,7 +109,7 @@ 
         }
 
         // We need an array of issues with month number as key.
-        $calendarIssuesByYear = array ();
+        $calendarIssuesByYear = array();
         foreach ($issues as $issue) {
             $dateTs = strtotime($issue['year']);
             $calendarIssuesByYear[date('Y', $dateTs)][date('n', $dateTs)][date('j', $dateTs)][] = $issue;
@@ -139,19 +139,19 @@ 
         }
 
         // Link to years overview
-        $linkConf = array (
+        $linkConf = array(
             'useCacheHash' => 1,
             'parameter' => $this->conf['targetPid'],
-            'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($this->doc->parentId),
+            'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($this->doc->parentId),
         );
 
-        $allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE).' '.$this->doc->getTitle($this->doc->parentId), $linkConf);
+        $allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE) . ' ' . $this->doc->getTitle($this->doc->parentId), $linkConf);
 
         // Link to current year.
-        $linkConf = array (
+        $linkConf = array(
             'useCacheHash' => 1,
             'parameter' => $this->conf['targetPid'],
-            'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($this->doc->uid),
+            'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($this->doc->uid),
         );
 
         $titleData = $this->doc->getTitledata();
@@ -192,7 +192,7 @@ 
 
         }
 
-        $markerArray = array (
+        $markerArray = array(
             '###CALENDARVIEWACTIVE###' => $listViewActive ? '' : 'active',
             '###LISTVIEWACTIVE###' => $listViewActive ? 'active' : '',
             '###CALYEAR###' => $yearLink,
@@ -230,7 +230,7 @@ 
 
         for ($i = $firstMonth; $i <= $lastMonth; $i++) {
 
-            $markerArray = array (
+            $markerArray = array(
                 '###DAYMON_NAME###' => strftime('%a', strtotime('last Monday')),
                 '###DAYTUE_NAME###' => strftime('%a', strtotime('last Tuesday')),
                 '###DAYWED_NAME###' => strftime('%a', strtotime('last Wednesday')),
@@ -238,23 +238,23 @@ 
                 '###DAYFRI_NAME###' => strftime('%a', strtotime('last Friday')),
                 '###DAYSAT_NAME###' => strftime('%a', strtotime('last Saturday')),
                 '###DAYSUN_NAME###' => strftime('%a', strtotime('last Sunday')),
-                '###MONTHNAME###' => strftime('%B', strtotime($year.'-'.$i.'-1')) . ' ' . $year,
+                '###MONTHNAME###' => strftime('%B', strtotime($year . '-' . $i . '-1')) . ' ' . $year,
                 '###CALYEAR###' => ($i == $firstMonth) ? '<div class="year">' . $year . '</div>' : ''
             );
 
             // Reset week content of new month.
             $subWeekPartContent = '';
 
-            $firstOfMonth = strtotime($year.'-'.$i.'-1');
+            $firstOfMonth = strtotime($year . '-' . $i . '-1');
             $lastOfMonth = strtotime('last day of', ($firstOfMonth));
             $firstOfMonthStart = strtotime('last Monday', $firstOfMonth);
 
             // There are never more than 6 weeks in a month.
             for ($j = 0; $j <= 5; $j++) {
 
-                $firstDayOfWeek = strtotime('+ '.$j.' Week', $firstOfMonthStart);
+                $firstDayOfWeek = strtotime('+ ' . $j . ' Week', $firstOfMonthStart);
 
-                $weekArray = array (
+                $weekArray = array(
                     '###DAYMON###' => '&nbsp;',
                     '###DAYTUE###' => '&nbsp;',
                     '###DAYWED###' => '&nbsp;',
@@ -267,13 +267,13 @@ 
                 // Every week has seven days. ;-)
                 for ($k = 0; $k <= 6; $k++) {
 
-                    $currentDayTime = strtotime('+ '.$k.' Day', $firstDayOfWeek);
+                    $currentDayTime = strtotime('+ ' . $k . ' Day', $firstDayOfWeek);
 
                     if ($currentDayTime >= $firstOfMonth && $currentDayTime <= $lastOfMonth) {
 
                         $dayLinks = '';
 
-                        $dayLinksText = array ();
+                        $dayLinksText = array();
 
                         $dayLinksList = '';
 
@@ -291,10 +291,10 @@ 
 
                                         $dayLinkLabel = empty($issue['title']) ? strftime('%x', $currentDayTime) : $issue['title'];
 
-                                        $linkConf = array (
+                                        $linkConf = array(
                                             'useCacheHash' => 1,
                                             'parameter' => $this->conf['targetPid'],
-                                            'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($issue['uid']),
+                                            'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($issue['uid']),
                                             'ATagParams' => ' class="title"',
                                         );
 
@@ -313,7 +313,7 @@ 
 
                                 foreach ($dayLinksText as $link) {
 
-                                    $dayLinksList .= '<li>'.$link.'</li>';
+                                    $dayLinksList .= '<li>' . $link . '</li>';
 
                                 }
 
@@ -321,10 +321,10 @@ 
 
                             }
 
-                            $dayLinkDiv = '<div class="issues"><h4>'.strftime('%d', $currentDayTime).'</h4><div>'.$dayLinksList.'</div></div>';
+                            $dayLinkDiv = '<div class="issues"><h4>' . strftime('%d', $currentDayTime) . '</h4><div>' . $dayLinksList . '</div></div>';
                         }
 
-                        switch (strftime('%w', strtotime('+ '.$k.' Day', $firstDayOfWeek))) {
+                        switch (strftime('%w', strtotime('+ ' . $k . ' Day', $firstDayOfWeek))) {
 
                             case '0': $weekArray['###DAYSUN###'] = ((int) $dayLinks === (int) date('j', $currentDayTime)) ? $dayLinkDiv : strftime('%d', $currentDayTime);
                                 break;
@@ -412,7 +412,7 @@ 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'tx_dlf_documents.uid AS uid, tx_dlf_documents.mets_label AS label, tx_dlf_documents.mets_orderlabel AS orderlabel, tx_dlf_documents.title AS title',
             'tx_dlf_documents',
-            '(tx_dlf_documents.structure='.tx_dlf_helper::getIdFromIndexName('year', 'tx_dlf_structures', $this->doc->pid).' AND tx_dlf_documents.partof='.intval($this->doc->uid).')'.tx_dlf_helper::whereClause('tx_dlf_documents'),
+            '(tx_dlf_documents.structure=' . tx_dlf_helper::getIdFromIndexName('year', 'tx_dlf_structures', $this->doc->pid) . ' AND tx_dlf_documents.partof=' . intval($this->doc->uid) . ')' . tx_dlf_helper::whereClause('tx_dlf_documents'),
             '',
             'tx_dlf_documents.volume_sorting ASC',
             ''
@@ -420,7 +420,7 @@ 
 
         // Process results.
         while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
-            $years[] = array (
+            $years[] = array(
                 'title' => !empty($resArray['label']) ? $resArray['label'] : (!empty($resArray['orderlabel']) ? $resArray['orderlabel'] : $resArray['title']),
                 'uid' => $resArray['uid']
             );
@@ -432,14 +432,14 @@ 
 
             foreach ($years as $year) {
 
-                $linkConf = array (
+                $linkConf = array(
                     'useCacheHash' => 1,
                     'parameter' => $this->conf['targetPid'],
-                    'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($year['uid']),
-                    'title' => $titleAnchor.': '.$year['title']
+                    'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($year['uid']),
+                    'title' => $titleAnchor . ': ' . $year['title']
                 );
 
-                $yearArray = array (
+                $yearArray = array(
                     '###YEARNAME###' => $this->cObj->typoLink($year['title'], $linkConf),
                 );
 
@@ -449,15 +449,15 @@ 
         }
 
         // link to years overview (should be itself here)
-        $linkConf = array (
+        $linkConf = array(
             'useCacheHash' => 1,
             'parameter' => $this->conf['targetPid'],
-            'additionalParams' => '&'.$this->prefixId.'[id]='.$this->doc->uid,
+            'additionalParams' => '&' . $this->prefixId . '[id]=' . $this->doc->uid,
         );
-        $allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE).' '.$this->doc->getTitle($this->doc->uid), $linkConf);
+        $allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE) . ' ' . $this->doc->getTitle($this->doc->uid), $linkConf);
 
         // Fill markers.
-        $markerArray = array (
+        $markerArray = array(
             '###LABEL_CHOOSE_YEAR###' => $this->pi_getLL('label.please_choose_year'),
             '###CALALLYEARS###' => $allYearsLink
         );

Upper-Lower-Casing +7 added lines, -7 removed lines

@@ -60,7 +60,7 @@ 
         // Load current document.
         $this->loadDocument();
 
-        if ($this->doc === NULL) {
+        if ($this->doc === null) {
 
             // Quit without doing anything if required variables are not set.
             return $content;
@@ -95,7 +95,7 @@ 
                 $title = $resArray['title'];
             } else {
                 $title = !empty($resArray['label']) ? $resArray['label'] : $resArray['orderlabel'];
-                if (strtotime($title) !== FALSE) {
+                if (strtotime($title) !== false) {
                     $title = strftime('%x', strtotime($title));
                 }
             }
@@ -145,7 +145,7 @@ 
             'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($this->doc->parentId),
         );
 
-        $allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE).' '.$this->doc->getTitle($this->doc->parentId), $linkConf);
+        $allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', true).' '.$this->doc->getTitle($this->doc->parentId), $linkConf);
 
         // Link to current year.
         $linkConf = array (
@@ -184,11 +184,11 @@ 
 
         if (count($this->allIssues) < 6) {
 
-            $listViewActive = TRUE;
+            $listViewActive = true;
 
         } else {
 
-            $listViewActive = FALSE;
+            $listViewActive = false;
 
         }
 
@@ -384,7 +384,7 @@ 
         // Load current document.
         $this->loadDocument();
 
-        if ($this->doc === NULL) {
+        if ($this->doc === null) {
 
             // Quit without doing anything if required variables are not set.
             return $content;
@@ -454,7 +454,7 @@ 
             'parameter' => $this->conf['targetPid'],
             'additionalParams' => '&'.$this->prefixId.'[id]='.$this->doc->uid,
         );
-        $allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE).' '.$this->doc->getTitle($this->doc->uid), $linkConf);
+        $allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', true).' '.$this->doc->getTitle($this->doc->uid), $linkConf);
 
         // Fill markers.
         $markerArray = array (

plugins/pagegrid/class.tx_dlf_pagegrid.php

Spacing +10 added lines, -10 removed lines

@@ -62,11 +62,11 @@ 
 
         } else {
 
-            $thumbnailFile = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pagegrid/placeholder.jpg';
+            $thumbnailFile = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/pagegrid/placeholder.jpg';
 
         }
 
-        $thumbnail = '<img alt="'.$markerArray['###PAGINATION###'].'" src="'.$thumbnailFile.'" />';
+        $thumbnail = '<img alt="' . $markerArray['###PAGINATION###'] . '" src="' . $thumbnailFile . '" />';
 
         // Get new plugin variables for typolink.
         $piVars = $this->piVars;
@@ -77,7 +77,7 @@ 
 
         $piVars['page'] = $number;
 
-        $linkConf = array (
+        $linkConf = array(
             'useCacheHash' => 1,
             'parameter' => $this->conf['targetPid'],
             'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $piVars, '', TRUE, FALSE),
@@ -115,11 +115,11 @@ 
         // Add link to previous page.
         if ($this->piVars['pointer'] > 0) {
 
-            $output = $this->pi_linkTP_keepPIvars($this->pi_getLL('prevPage', '&lt;', TRUE), array ('pointer' => $this->piVars['pointer'] - 1, 'page' => (($this->piVars['pointer'] - 1) * $this->conf['limit']) + 1), TRUE).$separator;
+            $output = $this->pi_linkTP_keepPIvars($this->pi_getLL('prevPage', '&lt;', TRUE), array('pointer' => $this->piVars['pointer'] - 1, 'page' => (($this->piVars['pointer'] - 1) * $this->conf['limit']) + 1), TRUE) . $separator;
 
         } else {
 
-            $output = $this->pi_getLL('prevPage', '&lt;', TRUE).$separator;
+            $output = $this->pi_getLL('prevPage', '&lt;', TRUE) . $separator;
 
         }
 
@@ -132,11 +132,11 @@ 
 
                 if ($this->piVars['pointer'] != $i) {
 
-                    $output .= $this->pi_linkTP_keepPIvars(sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1), array ('pointer' => $i, 'page' => ($i * $this->conf['limit']) + 1), TRUE).$separator;
+                    $output .= $this->pi_linkTP_keepPIvars(sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1), array('pointer' => $i, 'page' => ($i * $this->conf['limit']) + 1), TRUE) . $separator;
 
                 } else {
 
-                    $output .= sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1).$separator;
+                    $output .= sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1) . $separator;
 
                 }
 
@@ -144,7 +144,7 @@ 
 
             } elseif ($skip == TRUE) {
 
-                $output .= $this->pi_getLL('skip', '...', TRUE).$separator;
+                $output .= $this->pi_getLL('skip', '...', TRUE) . $separator;
 
                 $skip = FALSE;
 
@@ -157,7 +157,7 @@ 
         // Add link to next page.
         if ($this->piVars['pointer'] < $maxPages - 1) {
 
-            $output .= $this->pi_linkTP_keepPIvars($this->pi_getLL('nextPage', '&gt;', TRUE), array ('pointer' => $this->piVars['pointer'] + 1, 'page' => ($this->piVars['pointer'] + 1) * $this->conf['limit'] + 1), TRUE);
+            $output .= $this->pi_linkTP_keepPIvars($this->pi_getLL('nextPage', '&gt;', TRUE), array('pointer' => $this->piVars['pointer'] + 1, 'page' => ($this->piVars['pointer'] + 1) * $this->conf['limit'] + 1), TRUE);
 
         } else {
 
@@ -214,7 +214,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_pagegrid->main('.$content.', [data])] No template subpart for list entry found', $this->extKey, SYSLOG_SEVERITY_WARNING, $conf);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_pagegrid->main(' . $content . ', [data])] No template subpart for list entry found', $this->extKey, SYSLOG_SEVERITY_WARNING, $conf);
 
             }
 

Braces +8 added lines, -4 removed lines

@@ -18,7 +18,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_pagegrid extends tx_dlf_plugin {
+class tx_dlf_pagegrid extends tx_dlf_plugin
+{
 
     public $scriptRelPath = 'plugins/pagegrid/class.tx_dlf_pagegrid.php';
 
@@ -32,7 +33,8 @@ 
      *
      * @return	string		The rendered entry ready for output
      */
-    protected function getEntry($number, $template) {
+    protected function getEntry($number, $template)
+    {
 
         // Set current page if applicable.
         if (!empty($this->piVars['page']) && $this->piVars['page'] == $number) {
@@ -97,7 +99,8 @@ 
      *
      * @return	string		The rendered page browser ready for output
      */
-    protected function getPageBrowser() {
+    protected function getPageBrowser()
+    {
 
         // Get overall number of pages.
         $maxPages = intval(ceil($this->doc->numPages / $this->conf['limit']));
@@ -179,7 +182,8 @@ 
      *
      * @return	string		The content that is displayed on the website
      */
-    public function main($content, $conf) {
+    public function main($content, $conf)
+    {
 
         $this->init($conf);
 

Upper-Lower-Casing +14 added lines, -14 removed lines

@@ -80,7 +80,7 @@ 
         $linkConf = array (
             'useCacheHash' => 1,
             'parameter' => $this->conf['targetPid'],
-            'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $piVars, '', TRUE, FALSE),
+            'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $piVars, '', true, false),
             'title' => $markerArray['###PAGINATION###']
         );
 
@@ -110,16 +110,16 @@ 
         }
 
         // Get separator.
-        $separator = $this->pi_getLL('separator', ' - ', TRUE);
+        $separator = $this->pi_getLL('separator', ' - ', true);
 
         // Add link to previous page.
         if ($this->piVars['pointer'] > 0) {
 
-            $output = $this->pi_linkTP_keepPIvars($this->pi_getLL('prevPage', '<', TRUE), array ('pointer' => $this->piVars['pointer'] - 1, 'page' => (($this->piVars['pointer'] - 1) * $this->conf['limit']) + 1), TRUE).$separator;
+            $output = $this->pi_linkTP_keepPIvars($this->pi_getLL('prevPage', '<', true), array ('pointer' => $this->piVars['pointer'] - 1, 'page' => (($this->piVars['pointer'] - 1) * $this->conf['limit']) + 1), true).$separator;
 
         } else {
 
-            $output = $this->pi_getLL('prevPage', '<', TRUE).$separator;
+            $output = $this->pi_getLL('prevPage', '<', true).$separator;
 
         }
 
@@ -132,21 +132,21 @@ 
 
                 if ($this->piVars['pointer'] != $i) {
 
-                    $output .= $this->pi_linkTP_keepPIvars(sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1), array ('pointer' => $i, 'page' => ($i * $this->conf['limit']) + 1), TRUE).$separator;
+                    $output .= $this->pi_linkTP_keepPIvars(sprintf($this->pi_getLL('page', '%d', true), $i + 1), array ('pointer' => $i, 'page' => ($i * $this->conf['limit']) + 1), true).$separator;
 
                 } else {
 
-                    $output .= sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1).$separator;
+                    $output .= sprintf($this->pi_getLL('page', '%d', true), $i + 1).$separator;
 
                 }
 
-                $skip = TRUE;
+                $skip = true;
 
-            } elseif ($skip == TRUE) {
+            } elseif ($skip == true) {
 
-                $output .= $this->pi_getLL('skip', '...', TRUE).$separator;
+                $output .= $this->pi_getLL('skip', '...', true).$separator;
 
-                $skip = FALSE;
+                $skip = false;
 
             }
 
@@ -157,11 +157,11 @@ 
         // Add link to next page.
         if ($this->piVars['pointer'] < $maxPages - 1) {
 
-            $output .= $this->pi_linkTP_keepPIvars($this->pi_getLL('nextPage', '&gt;', TRUE), array ('pointer' => $this->piVars['pointer'] + 1, 'page' => ($this->piVars['pointer'] + 1) * $this->conf['limit'] + 1), TRUE);
+            $output .= $this->pi_linkTP_keepPIvars($this->pi_getLL('nextPage', '&gt;', true), array ('pointer' => $this->piVars['pointer'] + 1, 'page' => ($this->piVars['pointer'] + 1) * $this->conf['limit'] + 1), true);
 
         } else {
 
-            $output .= $this->pi_getLL('nextPage', '&gt;', TRUE);
+            $output .= $this->pi_getLL('nextPage', '&gt;', true);
 
         }
 
@@ -185,7 +185,7 @@ 
 
         $this->loadDocument();
 
-        if ($this->doc === NULL || $this->doc->numPages < 1 || empty($this->conf['fileGrpThumbs'])) {
+        if ($this->doc === null || $this->doc->numPages < 1 || empty($this->conf['fileGrpThumbs'])) {
 
             // Quit without doing anything if required variables are not set.
             return $content;
@@ -281,7 +281,7 @@ 
         $markerArray['###PAGEBROWSER###'] = $this->getPageBrowser();
 
         // Merge everything with template.
-        $content = $this->cObj->substituteMarkerArray($this->cObj->substituteSubpart($this->template, '###ENTRY###', $content, TRUE), $markerArray);
+        $content = $this->cObj->substituteMarkerArray($this->cObj->substituteSubpart($this->template, '###ENTRY###', $content, true), $markerArray);
 
         return $this->pi_wrapInBaseClass($content);
 

plugins/audioplayer/class.tx_dlf_audioplayer.php

Spacing +10 added lines, -10 removed lines

@@ -27,7 +27,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $audio = array ();
+    protected $audio = array();
 
     /**
      * Adds Player javascript
@@ -38,13 +38,13 @@ 
      */
     protected function addPlayerJS() {
 
-        $output = array ();
+        $output = array();
 
-        $output[] = '<link type="text/css" rel="stylesheet" href="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'lib/jPlayer/blue.monday/css/jplayer.blue.monday.min.css">';
+        $output[] = '<link type="text/css" rel="stylesheet" href="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'lib/jPlayer/blue.monday/css/jplayer.blue.monday.min.css">';
 
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'lib/jPlayer/jquery.jplayer.min.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'lib/jPlayer/jquery.jplayer.min.js"></script>';
 
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/audioplayer/js/tx_dlf_audioplayer.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/audioplayer/js/tx_dlf_audioplayer.js"></script>';
 
         // Add player configuration.
         $output[] = '
@@ -55,12 +55,12 @@ 
 			$(document).ready(function() {
 				tx_dlf_audioplayer = new dlfAudioPlayer({
 					audio: {
-						mimeType: "' . $this->audio['mimetype'].'",
-						title: "' . $this->audio['label'].'",
-						url:  "' . $this->audio['url'].'"
+						mimeType: "' . $this->audio['mimetype'] . '",
+						title: "' . $this->audio['label'] . '",
+						url:  "' . $this->audio['url'] . '"
 					},
 					parentElId: "tx-dlf-audio",
-					swfPath: "'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'lib/jPlayer/jquery.jplayer.swf"
+					swfPath: "'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'lib/jPlayer/jquery.jplayer.swf"
 				});
 			});
 		</script>';
@@ -138,7 +138,7 @@ 
         }
 
         // Fill in the template markers.
-        $markerArray = array (
+        $markerArray = array(
             '###PLAYER_JS###' => $this->addPlayerJS()
         );
 

Braces +6 added lines, -3 removed lines

@@ -17,7 +17,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_audioplayer extends tx_dlf_plugin {
+class tx_dlf_audioplayer extends tx_dlf_plugin
+{
 
     public $scriptRelPath = 'plugins/audioplayer/class.tx_dlf_audioplayer.php';
 
@@ -36,7 +37,8 @@ 
      *
      * @return	string		Player script tags ready for output
      */
-    protected function addPlayerJS() {
+    protected function addPlayerJS()
+    {
 
         $output = array ();
 
@@ -79,7 +81,8 @@ 
      *
      * @return	string		The content that is displayed on the website
      */
-    public function main($content, $conf) {
+    public function main($content, $conf)
+    {
 
         $this->init($conf);
 

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
         // Load current document.
         $this->loadDocument();
 
-        if ($this->doc === NULL || $this->doc->numPages < 1) {
+        if ($this->doc === null || $this->doc->numPages < 1) {
 
             // Quit without doing anything if required variables are not set.
             return $content;

plugins/navigation/class.tx_dlf_navigation.php

Braces +10 added lines, -5 removed lines

@@ -17,7 +17,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_navigation extends tx_dlf_plugin {
+class tx_dlf_navigation extends tx_dlf_plugin
+{
 
     public $scriptRelPath = 'plugins/navigation/class.tx_dlf_navigation.php';
 
@@ -28,7 +29,8 @@ 
      *
      * @return	string		Link to the list view ready to output
      */
-    protected function getLinkToListview() {
+    protected function getLinkToListview()
+    {
 
         if (!empty($this->conf['targetPid'])) {
 
@@ -61,7 +63,8 @@ 
      *
      * @return	string		Page selector ready to output
      */
-    protected function getPageSelector() {
+    protected function getPageSelector()
+    {
 
         // Configure @action URL for form.
         $linkConf = array (
@@ -108,7 +111,8 @@ 
      *
      * @return	string		The content that is displayed on the website
      */
-    public function main($content, $conf) {
+    public function main($content, $conf)
+    {
 
         $this->init($conf);
 
@@ -303,7 +307,8 @@ 
      *
      * @return	string		Typolink ready to output
      */
-    protected function makeLink($label, array $overrulePIvars = array (), $aTagParams = '') {
+    protected function makeLink($label, array $overrulePIvars = array (), $aTagParams = '')
+    {
 
         // Merge plugin variables with new set of values.
         if (is_array($this->piVars)) {

Upper-Lower-Casing +30 added lines, -30 removed lines

@@ -41,10 +41,10 @@ 
                 $conf = array (
                     'useCacheHash' => 1,
                     'parameter' => $this->conf['targetPid'],
-                    'title' => $this->pi_getLL('linkToList', '', TRUE)
+                    'title' => $this->pi_getLL('linkToList', '', true)
                 );
 
-                return $this->cObj->typoLink($this->pi_getLL('linkToList', '', TRUE), $conf);
+                return $this->cObj->typoLink($this->pi_getLL('linkToList', '', true), $conf);
 
             }
 
@@ -84,7 +84,7 @@ 
         // Add page selector.
         $uniqId = uniqid(str_replace('_', '-', get_class($this)).'-');
 
-        $output .= '<label for="'.$uniqId.'">'.$this->pi_getLL('selectPage', '', TRUE).'</label><select id="'.$uniqId.'" name="'.$this->prefixId.'[page]" onchange="javascript:this.form.submit();"'.($this->doc->numPages < 1 ? ' disabled="disabled"' : '').'>';
+        $output .= '<label for="'.$uniqId.'">'.$this->pi_getLL('selectPage', '', true).'</label><select id="'.$uniqId.'" name="'.$this->prefixId.'[page]" onchange="javascript:this.form.submit();"'.($this->doc->numPages < 1 ? ' disabled="disabled"' : '').'>';
 
         for ($i = 1; $i <= $this->doc->numPages; $i++) {
 
@@ -113,12 +113,12 @@ 
         $this->init($conf);
 
         // Turn cache on.
-        $this->setCache(TRUE);
+        $this->setCache(true);
 
         // Load current document.
         $this->loadDocument();
 
-        if ($this->doc === NULL) {
+        if ($this->doc === null) {
 
             // Quit without doing anything if required variables are not set.
             return $content;
@@ -177,66 +177,66 @@ 
         // Link to first page.
         if ($this->piVars['page'] > 1) {
 
-            $markerArray['###FIRST###'] = $this->makeLink($this->pi_getLL('firstPage', '', TRUE), array ('page' => 1));
+            $markerArray['###FIRST###'] = $this->makeLink($this->pi_getLL('firstPage', '', true), array ('page' => 1));
 
         } else {
 
-            $markerArray['###FIRST###'] = '<span>'.$this->pi_getLL('firstPage', '', TRUE).'</span>';
+            $markerArray['###FIRST###'] = '<span>'.$this->pi_getLL('firstPage', '', true).'</span>';
 
         }
 
         // Link back X pages.
         if ($this->piVars['page'] > $pageSteps) {
 
-            $markerArray['###BACK###'] = $this->makeLink(sprintf($this->pi_getLL('backXPages', '', TRUE), $pageSteps), array ('page' => $this->piVars['page'] - $pageSteps));
+            $markerArray['###BACK###'] = $this->makeLink(sprintf($this->pi_getLL('backXPages', '', true), $pageSteps), array ('page' => $this->piVars['page'] - $pageSteps));
 
         } else {
 
-            $markerArray['###BACK###'] = '<span>'.sprintf($this->pi_getLL('backXPages', '', TRUE), $pageSteps).'</span>';
+            $markerArray['###BACK###'] = '<span>'.sprintf($this->pi_getLL('backXPages', '', true), $pageSteps).'</span>';
 
         }
 
         // Link to previous page.
         if ($this->piVars['page'] > (1 + $this->piVars['double'])) {
 
-            $markerArray['###PREVIOUS###'] = $this->makeLink($this->pi_getLL('prevPage', '', TRUE), array ('page' => $this->piVars['page'] - (1 + $this->piVars['double'])));
+            $markerArray['###PREVIOUS###'] = $this->makeLink($this->pi_getLL('prevPage', '', true), array ('page' => $this->piVars['page'] - (1 + $this->piVars['double'])));
 
         } else {
 
-            $markerArray['###PREVIOUS###'] = '<span>'.$this->pi_getLL('prevPage', '', TRUE).'</span>';
+            $markerArray['###PREVIOUS###'] = '<span>'.$this->pi_getLL('prevPage', '', true).'</span>';
 
         }
 
         // Link to next page.
         if ($this->piVars['page'] < ($this->doc->numPages - $this->piVars['double'])) {
 
-            $markerArray['###NEXT###'] = $this->makeLink($this->pi_getLL('nextPage', '', TRUE), array ('page' => $this->piVars['page'] + (1 + $this->piVars['double'])));
+            $markerArray['###NEXT###'] = $this->makeLink($this->pi_getLL('nextPage', '', true), array ('page' => $this->piVars['page'] + (1 + $this->piVars['double'])));
 
         } else {
 
-            $markerArray['###NEXT###'] = '<span>'.$this->pi_getLL('nextPage', '', TRUE).'</span>';
+            $markerArray['###NEXT###'] = '<span>'.$this->pi_getLL('nextPage', '', true).'</span>';
 
         }
 
         // Link forward X pages.
         if ($this->piVars['page'] <= ($this->doc->numPages - $pageSteps)) {
 
-            $markerArray['###FORWARD###'] = $this->makeLink(sprintf($this->pi_getLL('forwardXPages', '', TRUE), $pageSteps), array ('page' => $this->piVars['page'] + $pageSteps));
+            $markerArray['###FORWARD###'] = $this->makeLink(sprintf($this->pi_getLL('forwardXPages', '', true), $pageSteps), array ('page' => $this->piVars['page'] + $pageSteps));
 
         } else {
 
-            $markerArray['###FORWARD###'] = '<span>'.sprintf($this->pi_getLL('forwardXPages', '', TRUE), $pageSteps).'</span>';
+            $markerArray['###FORWARD###'] = '<span>'.sprintf($this->pi_getLL('forwardXPages', '', true), $pageSteps).'</span>';
 
         }
 
         // Link to last page.
         if ($this->piVars['page'] < $this->doc->numPages) {
 
-            $markerArray['###LAST###'] = $this->makeLink($this->pi_getLL('lastPage', '', TRUE), array ('page' => $this->doc->numPages));
+            $markerArray['###LAST###'] = $this->makeLink($this->pi_getLL('lastPage', '', true), array ('page' => $this->doc->numPages));
 
         } else {
 
-            $markerArray['###LAST###'] = '<span>'.$this->pi_getLL('lastPage', '', TRUE).'</span>';
+            $markerArray['###LAST###'] = '<span>'.$this->pi_getLL('lastPage', '', true).'</span>';
 
         }
 
@@ -245,29 +245,29 @@ 
 
             if (!$this->piVars['double']) {
 
-                $markerArray['###DOUBLEPAGE###'] = $this->makeLink($this->pi_getLL('doublePageOn', '', TRUE), array ('double' => 1), 'class="tx-dlf-navigation-doubleOn"');
+                $markerArray['###DOUBLEPAGE###'] = $this->makeLink($this->pi_getLL('doublePageOn', '', true), array ('double' => 1), 'class="tx-dlf-navigation-doubleOn"');
 
             } else {
 
-                $markerArray['###DOUBLEPAGE###'] = $this->makeLink($this->pi_getLL('doublePageOff', '', TRUE), array ('double' => 0), 'class="tx-dlf-navigation-doubleOff"');
+                $markerArray['###DOUBLEPAGE###'] = $this->makeLink($this->pi_getLL('doublePageOff', '', true), array ('double' => 0), 'class="tx-dlf-navigation-doubleOff"');
 
             }
 
             if ($this->piVars['double'] && $this->piVars['page'] < $this->doc->numPages) {
 
-                $markerArray['###DOUBLEPAGE+1###'] = $this->makeLink($this->pi_getLL('doublePage+1', '', TRUE), array ('page' => $this->piVars['page'] + 1));
+                $markerArray['###DOUBLEPAGE+1###'] = $this->makeLink($this->pi_getLL('doublePage+1', '', true), array ('page' => $this->piVars['page'] + 1));
 
             } else {
 
-                $markerArray['###DOUBLEPAGE+1###'] = '<span>'.$this->pi_getLL('doublePage+1', '', TRUE).'</span>';
+                $markerArray['###DOUBLEPAGE+1###'] = '<span>'.$this->pi_getLL('doublePage+1', '', true).'</span>';
 
             }
 
         } else {
 
-            $markerArray['###DOUBLEPAGE###'] = '<span>'.$this->pi_getLL('doublePageOn', '', TRUE).'</span>';
+            $markerArray['###DOUBLEPAGE###'] = '<span>'.$this->pi_getLL('doublePageOn', '', true).'</span>';
 
-            $markerArray['###DOUBLEPAGE+1###'] = '<span>'.$this->pi_getLL('doublePage+1', '', TRUE).'</span>';
+            $markerArray['###DOUBLEPAGE+1###'] = '<span>'.$this->pi_getLL('doublePage+1', '', true).'</span>';
 
         }
 
@@ -278,13 +278,13 @@ 
         $markerArray['###LINKLISTVIEW###'] = $this->getLinkToListview();
 
         // fill some language labels if available
-        $markerArray['###ZOOM_IN###'] = $this->pi_getLL('zoom-in', '', TRUE);
-        $markerArray['###ZOOM_OUT###'] = $this->pi_getLL('zoom-out', '', TRUE);
-        $markerArray['###ZOOM_FULLSCREEN###'] = $this->pi_getLL('zoom-fullscreen', '', TRUE);
+        $markerArray['###ZOOM_IN###'] = $this->pi_getLL('zoom-in', '', true);
+        $markerArray['###ZOOM_OUT###'] = $this->pi_getLL('zoom-out', '', true);
+        $markerArray['###ZOOM_FULLSCREEN###'] = $this->pi_getLL('zoom-fullscreen', '', true);
 
-        $markerArray['###ROTATE_LEFT###'] = $this->pi_getLL('rotate-left', '', TRUE);
-        $markerArray['###ROTATE_RIGHT###'] = $this->pi_getLL('rotate-right', '', TRUE);
-        $markerArray['###ROTATE_RESET###'] = $this->pi_getLL('rotate-reset', '', TRUE);
+        $markerArray['###ROTATE_LEFT###'] = $this->pi_getLL('rotate-left', '', true);
+        $markerArray['###ROTATE_RIGHT###'] = $this->pi_getLL('rotate-right', '', true);
+        $markerArray['###ROTATE_RESET###'] = $this->pi_getLL('rotate-reset', '', true);
 
             $content .= $this->cObj->substituteMarkerArray($this->template, $markerArray);
 
@@ -321,7 +321,7 @@ 
             'useCacheHash' => 1,
             'parameter' => $GLOBALS['TSFE']->id,
             'ATagParams' => $aTagParams,
-            'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $overrulePIvars, '', TRUE, FALSE),
+            'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $overrulePIvars, '', true, false),
             'title' => $label
         );
 

Spacing +27 added lines, -27 removed lines

@@ -38,7 +38,7 @@ 
             if (count($list) > 0) {
 
                 // Build typolink configuration array.
-                $conf = array (
+                $conf = array(
                     'useCacheHash' => 1,
                     'parameter' => $this->conf['targetPid'],
                     'title' => $this->pi_getLL('linkToList', '', TRUE)
@@ -64,31 +64,31 @@ 
     protected function getPageSelector() {
 
         // Configure @action URL for form.
-        $linkConf = array (
+        $linkConf = array(
             'parameter' => $GLOBALS['TSFE']->id
         );
 
-        $output = '<form action="'.$this->cObj->typoLink_URL($linkConf).'" method="get"><div><input type="hidden" name="id" value="'.$GLOBALS['TSFE']->id.'" />';
+        $output = '<form action="' . $this->cObj->typoLink_URL($linkConf) . '" method="get"><div><input type="hidden" name="id" value="' . $GLOBALS['TSFE']->id . '" />';
 
         // Add plugin variables.
         foreach ($this->piVars as $piVar => $value) {
 
             if ($piVar != 'page' && $piVars != 'DATA' && !empty($value)) {
 
-                $output .= '<input type="hidden" name="'.$this->prefixId.'['.preg_replace('/[^A-Za-z0-9_-]/', '', $piVar).']" value="'.htmlspecialchars($value).'" />';
+                $output .= '<input type="hidden" name="' . $this->prefixId . '[' . preg_replace('/[^A-Za-z0-9_-]/', '', $piVar) . ']" value="' . htmlspecialchars($value) . '" />';
 
             }
 
         }
 
         // Add page selector.
-        $uniqId = uniqid(str_replace('_', '-', get_class($this)).'-');
+        $uniqId = uniqid(str_replace('_', '-', get_class($this)) . '-');
 
-        $output .= '<label for="'.$uniqId.'">'.$this->pi_getLL('selectPage', '', TRUE).'</label><select id="'.$uniqId.'" name="'.$this->prefixId.'[page]" onchange="javascript:this.form.submit();"'.($this->doc->numPages < 1 ? ' disabled="disabled"' : '').'>';
+        $output .= '<label for="' . $uniqId . '">' . $this->pi_getLL('selectPage', '', TRUE) . '</label><select id="' . $uniqId . '" name="' . $this->prefixId . '[page]" onchange="javascript:this.form.submit();"' . ($this->doc->numPages < 1 ? ' disabled="disabled"' : '') . '>';
 
         for ($i = 1; $i <= $this->doc->numPages; $i++) {
 
-            $output .= '<option value="'.$i.'"'.($this->piVars['page'] == $i ? ' selected="selected"' : '').'>['.$i.']'.($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$i]]['orderlabel'] ? ' - '.htmlspecialchars($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$i]]['orderlabel']) : '').'</option>';
+            $output .= '<option value="' . $i . '"' . ($this->piVars['page'] == $i ? ' selected="selected"' : '') . '>[' . $i . ']' . ($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$i]]['orderlabel'] ? ' - ' . htmlspecialchars($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$i]]['orderlabel']) : '') . '</option>';
 
         }
 
@@ -177,66 +177,66 @@ 
         // Link to first page.
         if ($this->piVars['page'] > 1) {
 
-            $markerArray['###FIRST###'] = $this->makeLink($this->pi_getLL('firstPage', '', TRUE), array ('page' => 1));
+            $markerArray['###FIRST###'] = $this->makeLink($this->pi_getLL('firstPage', '', TRUE), array('page' => 1));
 
         } else {
 
-            $markerArray['###FIRST###'] = '<span>'.$this->pi_getLL('firstPage', '', TRUE).'</span>';
+            $markerArray['###FIRST###'] = '<span>' . $this->pi_getLL('firstPage', '', TRUE) . '</span>';
 
         }
 
         // Link back X pages.
         if ($this->piVars['page'] > $pageSteps) {
 
-            $markerArray['###BACK###'] = $this->makeLink(sprintf($this->pi_getLL('backXPages', '', TRUE), $pageSteps), array ('page' => $this->piVars['page'] - $pageSteps));
+            $markerArray['###BACK###'] = $this->makeLink(sprintf($this->pi_getLL('backXPages', '', TRUE), $pageSteps), array('page' => $this->piVars['page'] - $pageSteps));
 
         } else {
 
-            $markerArray['###BACK###'] = '<span>'.sprintf($this->pi_getLL('backXPages', '', TRUE), $pageSteps).'</span>';
+            $markerArray['###BACK###'] = '<span>' . sprintf($this->pi_getLL('backXPages', '', TRUE), $pageSteps) . '</span>';
 
         }
 
         // Link to previous page.
         if ($this->piVars['page'] > (1 + $this->piVars['double'])) {
 
-            $markerArray['###PREVIOUS###'] = $this->makeLink($this->pi_getLL('prevPage', '', TRUE), array ('page' => $this->piVars['page'] - (1 + $this->piVars['double'])));
+            $markerArray['###PREVIOUS###'] = $this->makeLink($this->pi_getLL('prevPage', '', TRUE), array('page' => $this->piVars['page'] - (1 + $this->piVars['double'])));
 
         } else {
 
-            $markerArray['###PREVIOUS###'] = '<span>'.$this->pi_getLL('prevPage', '', TRUE).'</span>';
+            $markerArray['###PREVIOUS###'] = '<span>' . $this->pi_getLL('prevPage', '', TRUE) . '</span>';
 
         }
 
         // Link to next page.
         if ($this->piVars['page'] < ($this->doc->numPages - $this->piVars['double'])) {
 
-            $markerArray['###NEXT###'] = $this->makeLink($this->pi_getLL('nextPage', '', TRUE), array ('page' => $this->piVars['page'] + (1 + $this->piVars['double'])));
+            $markerArray['###NEXT###'] = $this->makeLink($this->pi_getLL('nextPage', '', TRUE), array('page' => $this->piVars['page'] + (1 + $this->piVars['double'])));
 
         } else {
 
-            $markerArray['###NEXT###'] = '<span>'.$this->pi_getLL('nextPage', '', TRUE).'</span>';
+            $markerArray['###NEXT###'] = '<span>' . $this->pi_getLL('nextPage', '', TRUE) . '</span>';
 
         }
 
         // Link forward X pages.
         if ($this->piVars['page'] <= ($this->doc->numPages - $pageSteps)) {
 
-            $markerArray['###FORWARD###'] = $this->makeLink(sprintf($this->pi_getLL('forwardXPages', '', TRUE), $pageSteps), array ('page' => $this->piVars['page'] + $pageSteps));
+            $markerArray['###FORWARD###'] = $this->makeLink(sprintf($this->pi_getLL('forwardXPages', '', TRUE), $pageSteps), array('page' => $this->piVars['page'] + $pageSteps));
 
         } else {
 
-            $markerArray['###FORWARD###'] = '<span>'.sprintf($this->pi_getLL('forwardXPages', '', TRUE), $pageSteps).'</span>';
+            $markerArray['###FORWARD###'] = '<span>' . sprintf($this->pi_getLL('forwardXPages', '', TRUE), $pageSteps) . '</span>';
 
         }
 
         // Link to last page.
         if ($this->piVars['page'] < $this->doc->numPages) {
 
-            $markerArray['###LAST###'] = $this->makeLink($this->pi_getLL('lastPage', '', TRUE), array ('page' => $this->doc->numPages));
+            $markerArray['###LAST###'] = $this->makeLink($this->pi_getLL('lastPage', '', TRUE), array('page' => $this->doc->numPages));
 
         } else {
 
-            $markerArray['###LAST###'] = '<span>'.$this->pi_getLL('lastPage', '', TRUE).'</span>';
+            $markerArray['###LAST###'] = '<span>' . $this->pi_getLL('lastPage', '', TRUE) . '</span>';
 
         }
 
@@ -245,29 +245,29 @@ 
 
             if (!$this->piVars['double']) {
 
-                $markerArray['###DOUBLEPAGE###'] = $this->makeLink($this->pi_getLL('doublePageOn', '', TRUE), array ('double' => 1), 'class="tx-dlf-navigation-doubleOn"');
+                $markerArray['###DOUBLEPAGE###'] = $this->makeLink($this->pi_getLL('doublePageOn', '', TRUE), array('double' => 1), 'class="tx-dlf-navigation-doubleOn"');
 
             } else {
 
-                $markerArray['###DOUBLEPAGE###'] = $this->makeLink($this->pi_getLL('doublePageOff', '', TRUE), array ('double' => 0), 'class="tx-dlf-navigation-doubleOff"');
+                $markerArray['###DOUBLEPAGE###'] = $this->makeLink($this->pi_getLL('doublePageOff', '', TRUE), array('double' => 0), 'class="tx-dlf-navigation-doubleOff"');
 
             }
 
             if ($this->piVars['double'] && $this->piVars['page'] < $this->doc->numPages) {
 
-                $markerArray['###DOUBLEPAGE+1###'] = $this->makeLink($this->pi_getLL('doublePage+1', '', TRUE), array ('page' => $this->piVars['page'] + 1));
+                $markerArray['###DOUBLEPAGE+1###'] = $this->makeLink($this->pi_getLL('doublePage+1', '', TRUE), array('page' => $this->piVars['page'] + 1));
 
             } else {
 
-                $markerArray['###DOUBLEPAGE+1###'] = '<span>'.$this->pi_getLL('doublePage+1', '', TRUE).'</span>';
+                $markerArray['###DOUBLEPAGE+1###'] = '<span>' . $this->pi_getLL('doublePage+1', '', TRUE) . '</span>';
 
             }
 
         } else {
 
-            $markerArray['###DOUBLEPAGE###'] = '<span>'.$this->pi_getLL('doublePageOn', '', TRUE).'</span>';
+            $markerArray['###DOUBLEPAGE###'] = '<span>' . $this->pi_getLL('doublePageOn', '', TRUE) . '</span>';
 
-            $markerArray['###DOUBLEPAGE+1###'] = '<span>'.$this->pi_getLL('doublePage+1', '', TRUE).'</span>';
+            $markerArray['###DOUBLEPAGE+1###'] = '<span>' . $this->pi_getLL('doublePage+1', '', TRUE) . '</span>';
 
         }
 
@@ -303,7 +303,7 @@ 
      *
      * @return	string		Typolink ready to output
      */
-    protected function makeLink($label, array $overrulePIvars = array (), $aTagParams = '') {
+    protected function makeLink($label, array $overrulePIvars = array(), $aTagParams = '') {
 
         // Merge plugin variables with new set of values.
         if (is_array($this->piVars)) {
@@ -317,7 +317,7 @@ 
         }
 
         // Build typolink configuration array.
-        $conf = array (
+        $conf = array(
             'useCacheHash' => 1,
             'parameter' => $GLOBALS['TSFE']->id,
             'ATagParams' => $aTagParams,

plugins/statistics/class.tx_dlf_statistics.php

Spacing +10 added lines, -10 removed lines

@@ -43,7 +43,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_statistics->main('.$content.', [data])] Incomplete plugin configuration', $this->extKey, SYSLOG_SEVERITY_WARNING, $conf);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_statistics->main(' . $content . ', [data])] Incomplete plugin configuration', $this->extKey, SYSLOG_SEVERITY_WARNING, $conf);
 
             }
 
@@ -63,7 +63,7 @@ 
                 'tx_dlf_documents',
                 'tx_dlf_relations',
                 'tx_dlf_collections',
-                'AND tx_dlf_documents.pid='.intval($this->conf['pages']).' AND tx_dlf_collections.pid='.intval($this->conf['pages']).' AND tx_dlf_documents.partof=0 AND tx_dlf_collections.uid IN ('.$GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']).') AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations').tx_dlf_helper::whereClause('tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_collections'),
+                'AND tx_dlf_documents.pid=' . intval($this->conf['pages']) . ' AND tx_dlf_collections.pid=' . intval($this->conf['pages']) . ' AND tx_dlf_documents.partof=0 AND tx_dlf_collections.uid IN (' . $GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']) . ') AND tx_dlf_relations.ident=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations') . tx_dlf_helper::whereClause('tx_dlf_documents') . tx_dlf_helper::whereClause('tx_dlf_collections'),
                 'tx_dlf_documents.uid',
                 '',
                 ''
@@ -74,7 +74,7 @@ 
                 'tx_dlf_documents',
                 'tx_dlf_relations',
                 'tx_dlf_collections',
-                'AND tx_dlf_documents.pid='.intval($this->conf['pages']).' AND tx_dlf_collections.pid='.intval($this->conf['pages']).' AND NOT tx_dlf_documents.uid IN (SELECT DISTINCT tx_dlf_documents.partof FROM tx_dlf_documents WHERE NOT tx_dlf_documents.partof=0'.tx_dlf_helper::whereClause('tx_dlf_documents').') AND tx_dlf_collections.uid IN ('.$GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']).') AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations').tx_dlf_helper::whereClause('tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_collections'),
+                'AND tx_dlf_documents.pid=' . intval($this->conf['pages']) . ' AND tx_dlf_collections.pid=' . intval($this->conf['pages']) . ' AND NOT tx_dlf_documents.uid IN (SELECT DISTINCT tx_dlf_documents.partof FROM tx_dlf_documents WHERE NOT tx_dlf_documents.partof=0' . tx_dlf_helper::whereClause('tx_dlf_documents') . ') AND tx_dlf_collections.uid IN (' . $GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']) . ') AND tx_dlf_relations.ident=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations') . tx_dlf_helper::whereClause('tx_dlf_documents') . tx_dlf_helper::whereClause('tx_dlf_collections'),
                 'tx_dlf_documents.uid',
                 '',
                 ''
@@ -86,7 +86,7 @@ 
             $resultTitles = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'tx_dlf_documents.uid AS uid',
                 'tx_dlf_documents',
-                'tx_dlf_documents.pid='.intval($this->conf['pages']).' AND tx_dlf_documents.partof=0'.tx_dlf_helper::whereClause('tx_dlf_documents'),
+                'tx_dlf_documents.pid=' . intval($this->conf['pages']) . ' AND tx_dlf_documents.partof=0' . tx_dlf_helper::whereClause('tx_dlf_documents'),
                 '',
                 '',
                 ''
@@ -95,7 +95,7 @@ 
             $resultVolumes = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'tx_dlf_documents.uid AS uid',
                 'tx_dlf_documents',
-                'tx_dlf_documents.pid='.intval($this->conf['pages']).' AND NOT tx_dlf_documents.uid IN (SELECT DISTINCT tx_dlf_documents.partof FROM tx_dlf_documents WHERE NOT tx_dlf_documents.partof=0'.tx_dlf_helper::whereClause('tx_dlf_documents').')'.tx_dlf_helper::whereClause('tx_dlf_documents'),
+                'tx_dlf_documents.pid=' . intval($this->conf['pages']) . ' AND NOT tx_dlf_documents.uid IN (SELECT DISTINCT tx_dlf_documents.partof FROM tx_dlf_documents WHERE NOT tx_dlf_documents.partof=0' . tx_dlf_helper::whereClause('tx_dlf_documents') . ')' . tx_dlf_helper::whereClause('tx_dlf_documents'),
                 '',
                 '',
                 ''
@@ -108,14 +108,14 @@ 
         $countVolumes = $GLOBALS['TYPO3_DB']->sql_num_rows($resultVolumes);
 
         // Set replacements.
-        $replace = array (
-            'key' => array (
+        $replace = array(
+            'key' => array(
                 '###TITLES###',
                 '###VOLUMES###'
             ),
-            'value' => array (
-                $countTitles.($countTitles > 1 ? $this->pi_getLL('titles', '', TRUE) : $this->pi_getLL('title', '', TRUE)),
-                $countVolumes.($countVolumes > 1 ? $this->pi_getLL('volumes', '', TRUE) : $this->pi_getLL('volume', '', TRUE))
+            'value' => array(
+                $countTitles . ($countTitles > 1 ? $this->pi_getLL('titles', '', TRUE) : $this->pi_getLL('title', '', TRUE)),
+                $countVolumes . ($countVolumes > 1 ? $this->pi_getLL('volumes', '', TRUE) : $this->pi_getLL('volume', '', TRUE))
             )
         );
 

Braces +4 added lines, -2 removed lines

@@ -17,7 +17,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_statistics extends tx_dlf_plugin {
+class tx_dlf_statistics extends tx_dlf_plugin
+{
 
     public $scriptRelPath = 'plugins/statistics/class.tx_dlf_statistics.php';
 
@@ -31,7 +32,8 @@ 
      *
      * @return	string		The content that is displayed on the website
      */
-    public function main($content, $conf) {
+    public function main($content, $conf)
+    {
 
         $this->init($conf);
 

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -36,7 +36,7 @@ 
         $this->init($conf);
 
         // Turn cache on.
-        $this->setCache(TRUE);
+        $this->setCache(true);
 
         // Quit without doing anything if required configuration variables are not set.
         if (empty($this->conf['pages'])) {
@@ -114,8 +114,8 @@ 
                 '###VOLUMES###'
             ),
             'value' => array (
-                $countTitles.($countTitles > 1 ? $this->pi_getLL('titles', '', TRUE) : $this->pi_getLL('title', '', TRUE)),
-                $countVolumes.($countVolumes > 1 ? $this->pi_getLL('volumes', '', TRUE) : $this->pi_getLL('volume', '', TRUE))
+                $countTitles.($countTitles > 1 ? $this->pi_getLL('titles', '', true) : $this->pi_getLL('title', '', true)),
+                $countVolumes.($countVolumes > 1 ? $this->pi_getLL('volumes', '', true) : $this->pi_getLL('volume', '', true))
             )
         );
 

plugins/pageview/class.tx_dlf_geturl_eid.php

Braces +4 added lines, -2 removed lines

@@ -20,7 +20,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_geturl_eid extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
+class tx_dlf_geturl_eid extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
+{
 
     /**
      *
@@ -38,7 +39,8 @@ 
      *
      * @return	void
      */
-    public function main($content = '', $conf = array ()) {
+    public function main($content = '', $conf = array ())
+    {
 
         $this->cObj = GeneralUtility::makeInstance('TYPO3\\CMS\\Frontend\\ContentObject\\ContentObjectRenderer');
 

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
         $fetchedHeader = explode("\n", GeneralUtility::getUrl($url, 2));
 
         foreach ($fetchedHeader as $headerline) {
-            if (stripos($headerline, 'Last-Modified:') !== FALSE) {
+            if (stripos($headerline, 'Last-Modified:') !== false) {
                 header($headerline);
             }
         }

Spacing +4 added lines, -4 removed lines

@@ -38,7 +38,7 @@ 
      *
      * @return	void
      */
-    public function main($content = '', $conf = array ()) {
+    public function main($content = '', $conf = array()) {
 
         $this->cObj = GeneralUtility::makeInstance('TYPO3\\CMS\\Frontend\\ContentObject\\ContentObjectRenderer');
 
@@ -60,11 +60,11 @@ 
         $fetchedData = GeneralUtility::getUrl($url);
 
         // add some self calculated header tags
-        header('Last-Modified: '.gmdate("D, d M Y H:i:s").'GMT');
+        header('Last-Modified: ' . gmdate("D, d M Y H:i:s") . 'GMT');
         header('Cache-Control: max-age=3600, must-revalidate');
-        header('Content-Length: '.strlen($fetchedData));
+        header('Content-Length: ' . strlen($fetchedData));
         $fi = finfo_open(FILEINFO_MIME);
-        header('Content-Type: '.finfo_buffer($fi, $fetchedData));
+        header('Content-Type: ' . finfo_buffer($fi, $fetchedData));
 
         // take some tags from request header and overwrite in case already set
         $fetchedHeader = explode("\n", GeneralUtility::getUrl($url, 2));

plugins/pageview/class.tx_dlf_pageview.php

Braces +14 added lines, -7 removed lines

@@ -17,7 +17,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_pageview extends tx_dlf_plugin {
+class tx_dlf_pageview extends tx_dlf_plugin
+{
 
     public $scriptRelPath = 'plugins/pageview/class.tx_dlf_pageview.php';
 
@@ -52,7 +53,8 @@ 
      *
      * @return	string		Viewer script tags ready for output
      */
-    protected function addViewerJS() {
+    protected function addViewerJS()
+    {
 
         $output = array ();
 
@@ -107,7 +109,8 @@ 
      *
      * @return	array		Marker array
      */
-    protected function addInteraction() {
+    protected function addInteraction()
+    {
 
         $markerArray = array ();
 
@@ -155,7 +158,8 @@ 
      *
      * @return	array		Marker array
      */
-    protected function addBasketForm() {
+    protected function addBasketForm()
+    {
 
         $markerArray = array ();
 
@@ -232,7 +236,8 @@ 
      *
      * @return	array		URL and MIME type of image file
      */
-    protected function getImage($page) {
+    protected function getImage($page)
+    {
 
         $image = array ();
 
@@ -285,7 +290,8 @@ 
      *
      * @return	array		URL and MIME type of fulltext file
      */
-    protected function getFulltext($page) {
+    protected function getFulltext($page)
+    {
 
         $fulltext = array ();
 
@@ -328,7 +334,8 @@ 
      *
      * @return	string		The content that is displayed on the website
      */
-    public function main($content, $conf) {
+    public function main($content, $conf)
+    {
 
         $this->init($conf);
 

Upper-Lower-Casing +7 added lines, -7 removed lines

@@ -121,9 +121,9 @@ 
 
             if ($this->conf['crop']) {
 
-                $markerArray['###EDITBUTTON###'] = '<a href="javascript: tx_dlf_viewer.activateSelection();">'.$this->pi_getLL('editMode', '', TRUE).'</a>';
+                $markerArray['###EDITBUTTON###'] = '<a href="javascript: tx_dlf_viewer.activateSelection();">'.$this->pi_getLL('editMode', '', true).'</a>';
 
-                $markerArray['###EDITREMOVE###'] = '<a href="javascript: tx_dlf_viewer.resetCropSelection();">'.$this->pi_getLL('editRemove', '', TRUE).'</a>';
+                $markerArray['###EDITREMOVE###'] = '<a href="javascript: tx_dlf_viewer.resetCropSelection();">'.$this->pi_getLL('editRemove', '', true).'</a>';
 
             } else {
 
@@ -135,7 +135,7 @@ 
 
             if ($this->conf['magnifier']) {
 
-                $markerArray['###MAGNIFIER###'] = '<a href="javascript: tx_dlf_viewer.activateMagnifier();">'.$this->pi_getLL('magnifier', '', TRUE).'</a>';
+                $markerArray['###MAGNIFIER###'] = '<a href="javascript: tx_dlf_viewer.activateMagnifier();">'.$this->pi_getLL('magnifier', '', true).'</a>';
 
             } else {
 
@@ -162,11 +162,11 @@ 
         // Add basket button
         if ($this->conf['basketButton'] && $this->conf['targetBasket'] && $this->piVars['id']) {
 
-            $label = $this->pi_getLL('addBasket', '', TRUE);
+            $label = $this->pi_getLL('addBasket', '', true);
 
             $params = array (
                 'id' => $this->piVars['id'],
-                'addToBasket' => TRUE
+                'addToBasket' => true
             );
 
             if (empty($this->piVars['page'])) {
@@ -177,7 +177,7 @@ 
 
             $basketConf = array (
                 'parameter' => $this->conf['targetBasket'],
-                'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $params, '', TRUE, FALSE),
+                'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $params, '', true, false),
                 'title' => $label
             );
 
@@ -335,7 +335,7 @@ 
         // Load current document.
         $this->loadDocument();
 
-        if ($this->doc === NULL || $this->doc->numPages < 1) {
+        if ($this->doc === null || $this->doc->numPages < 1) {
 
             // Quit without doing anything if required variables are not set.
             return $content;

Spacing +40 added lines, -40 removed lines

@@ -27,7 +27,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $controls = array ();
+    protected $controls = array();
 
     /**
      * Holds the current images' URLs and MIME types
@@ -35,7 +35,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $images = array ();
+    protected $images = array();
 
     /**
      * Holds the current fulltexts' URLs
@@ -43,7 +43,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $fulltexts = array ();
+    protected $fulltexts = array();
 
     /**
      * Adds Viewer javascript
@@ -54,31 +54,31 @@ 
      */
     protected function addViewerJS() {
 
-        $output = array ();
+        $output = array();
 
         // Add OpenLayers library.
-        $output[] = '<link type="text/css" rel="stylesheet" href="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'lib/OpenLayers/ol3.css">';
+        $output[] = '<link type="text/css" rel="stylesheet" href="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'lib/OpenLayers/ol3.css">';
 
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'lib/OpenLayers/glif.min.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'lib/OpenLayers/glif.min.js"></script>';
 
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'lib/OpenLayers/ol3-dlf.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'lib/OpenLayers/ol3-dlf.js"></script>';
 
         // Add viewer library.
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_utils.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/pageview/tx_dlf_utils.js"></script>';
 
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_ol3.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/pageview/tx_dlf_ol3.js"></script>';
 
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_ol3_styles.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/pageview/tx_dlf_ol3_styles.js"></script>';
 
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_ol3_source.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/pageview/tx_dlf_ol3_source.js"></script>';
 
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_altoparser.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/pageview/tx_dlf_altoparser.js"></script>';
 
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_pageview_imagemanipulation_control.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/pageview/tx_dlf_pageview_imagemanipulation_control.js"></script>';
 
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_pageview_fulltext_control.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/pageview/tx_dlf_pageview_fulltext_control.js"></script>';
 
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_pageview.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/pageview/tx_dlf_pageview.js"></script>';
 
         // Add viewer configuration.
         $output[] = '
@@ -86,11 +86,11 @@ 
 			window.onload = function() {
 				if (dlfUtils.exists(dlfViewer)) {
 					tx_dlf_viewer = new dlfViewer({
-						controls: ["'.implode('", "', $this->controls).'"],
-						div: "'.$this->conf['elementId'].'",
-						images: '.json_encode($this->images).',
-						fulltexts: '.json_encode($this->fulltexts).',
-						useInternalProxy: '.($this->conf['useInternalProxy'] ? 1 : 0).'
+						controls: ["'.implode('", "', $this->controls) . '"],
+						div: "'.$this->conf['elementId'] . '",
+						images: '.json_encode($this->images) . ',
+						fulltexts: '.json_encode($this->fulltexts) . ',
+						useInternalProxy: '.($this->conf['useInternalProxy'] ? 1 : 0) . '
 					})
 				}
 			}
@@ -109,7 +109,7 @@ 
      */
     protected function addInteraction() {
 
-        $markerArray = array ();
+        $markerArray = array();
 
         if ($this->piVars['id']) {
 
@@ -121,9 +121,9 @@ 
 
             if ($this->conf['crop']) {
 
-                $markerArray['###EDITBUTTON###'] = '<a href="javascript: tx_dlf_viewer.activateSelection();">'.$this->pi_getLL('editMode', '', TRUE).'</a>';
+                $markerArray['###EDITBUTTON###'] = '<a href="javascript: tx_dlf_viewer.activateSelection();">' . $this->pi_getLL('editMode', '', TRUE) . '</a>';
 
-                $markerArray['###EDITREMOVE###'] = '<a href="javascript: tx_dlf_viewer.resetCropSelection();">'.$this->pi_getLL('editRemove', '', TRUE).'</a>';
+                $markerArray['###EDITREMOVE###'] = '<a href="javascript: tx_dlf_viewer.resetCropSelection();">' . $this->pi_getLL('editRemove', '', TRUE) . '</a>';
 
             } else {
 
@@ -135,7 +135,7 @@ 
 
             if ($this->conf['magnifier']) {
 
-                $markerArray['###MAGNIFIER###'] = '<a href="javascript: tx_dlf_viewer.activateMagnifier();">'.$this->pi_getLL('magnifier', '', TRUE).'</a>';
+                $markerArray['###MAGNIFIER###'] = '<a href="javascript: tx_dlf_viewer.activateMagnifier();">' . $this->pi_getLL('magnifier', '', TRUE) . '</a>';
 
             } else {
 
@@ -157,14 +157,14 @@ 
      */
     protected function addBasketForm() {
 
-        $markerArray = array ();
+        $markerArray = array();
 
         // Add basket button
         if ($this->conf['basketButton'] && $this->conf['targetBasket'] && $this->piVars['id']) {
 
             $label = $this->pi_getLL('addBasket', '', TRUE);
 
-            $params = array (
+            $params = array(
                 'id' => $this->piVars['id'],
                 'addToBasket' => TRUE
             );
@@ -175,17 +175,17 @@ 
 
             }
 
-            $basketConf = array (
+            $basketConf = array(
                 'parameter' => $this->conf['targetBasket'],
                 'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $params, '', TRUE, FALSE),
                 'title' => $label
             );
 
-            $output = '<form id="addToBasketForm" action="'.$this->cObj->typoLink_URL($basketConf).'" method="post">';
+            $output = '<form id="addToBasketForm" action="' . $this->cObj->typoLink_URL($basketConf) . '" method="post">';
 
-            $output .= '<input type="hidden" name="tx_dlf[startpage]" id="startpage" value="'.htmlspecialchars($this->piVars['page']).'">';
+            $output .= '<input type="hidden" name="tx_dlf[startpage]" id="startpage" value="' . htmlspecialchars($this->piVars['page']) . '">';
 
-            $output .= '<input type="hidden" name="tx_dlf[endpage]" id="endpage" value="'.htmlspecialchars($this->piVars['page']).'">';
+            $output .= '<input type="hidden" name="tx_dlf[endpage]" id="endpage" value="' . htmlspecialchars($this->piVars['page']) . '">';
 
             $output .= '<input type="hidden" name="tx_dlf[startX]" id="startX">';
 
@@ -197,7 +197,7 @@ 
 
             $output .= '<input type="hidden" name="tx_dlf[rotation]" id="rotation">';
 
-            $output .= '<button id="submitBasketForm" onclick="this.form.submit()">'.$label.'</button>';
+            $output .= '<button id="submitBasketForm" onclick="this.form.submit()">' . $label . '</button>';
 
             $output .= '</form>';
 
@@ -234,7 +234,7 @@ 
      */
     protected function getImage($page) {
 
-        $image = array ();
+        $image = array();
 
         // Get @USE value of METS fileGrp.
         $fileGrps = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $this->conf['fileGrps']);
@@ -248,9 +248,9 @@ 
 
                 if ($this->conf['useInternalProxy']) {
                     // Configure @action URL for form.
-                    $linkConf = array (
+                    $linkConf = array(
                         'parameter' => $GLOBALS['TSFE']->id,
-                        'additionalParams' => '&eID=tx_dlf_geturl_eid&url='.urlencode($image['url']) . '&uHash=' . \TYPO3\CMS\Core\Utility\GeneralUtility::hmac($image['url'], 'PageViewProxy'),
+                        'additionalParams' => '&eID=tx_dlf_geturl_eid&url=' . urlencode($image['url']) . '&uHash=' . \TYPO3\CMS\Core\Utility\GeneralUtility::hmac($image['url'], 'PageViewProxy'),
                     );
 
                     $image['url'] = $this->cObj->typoLink_URL($linkConf);
@@ -264,7 +264,7 @@ 
 
                 if (TYPO3_DLOG) {
 
-                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_pageview->getImage('.$page.')] File not found in fileGrp "'.$fileGrp.'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
+                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_pageview->getImage(' . $page . ')] File not found in fileGrp "' . $fileGrp . '"', $this->extKey, SYSLOG_SEVERITY_WARNING);
 
                 }
 
@@ -287,7 +287,7 @@ 
      */
     protected function getFulltext($page) {
 
-        $fulltext = array ();
+        $fulltext = array();
 
         // Get fulltext link.
         if (!empty($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$page]]['files'][$this->conf['fileGrpFulltext']])) {
@@ -295,9 +295,9 @@ 
             $fulltext['url'] = $this->doc->getFileLocation($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$page]]['files'][$this->conf['fileGrpFulltext']]);
 
             // Configure @action URL for form.
-            $linkConf = array (
+            $linkConf = array(
                 'parameter' => $GLOBALS['TSFE']->id,
-                'additionalParams' => '&eID=tx_dlf_geturl_eid&url='.urlencode($fulltext['url']) . '&uHash=' . \TYPO3\CMS\Core\Utility\GeneralUtility::hmac($fulltext['url'], 'PageViewProxy'),
+                'additionalParams' => '&eID=tx_dlf_geturl_eid&url=' . urlencode($fulltext['url']) . '&uHash=' . \TYPO3\CMS\Core\Utility\GeneralUtility::hmac($fulltext['url'], 'PageViewProxy'),
             );
 
             $fulltext['url'] = $this->cObj->typoLink_URL($linkConf);
@@ -308,7 +308,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_pageview->getFulltext('.$page.')] File not found in fileGrp "'.$this->conf['fileGrpFulltext'].'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_pageview->getFulltext(' . $page . ')] File not found in fileGrp "' . $this->conf['fileGrpFulltext'] . '"', $this->extKey, SYSLOG_SEVERITY_WARNING);
 
             }
 
@@ -392,7 +392,7 @@ 
         $this->controls = explode(',', $this->conf['features']);
 
         // Fill in the template markers.
-        $markerArray = array (
+        $markerArray = array(
             '###VIEWER_JS###' => $this->addViewerJS()
         );
 

plugins/validator/class.tx_dlf_validator.php

Braces +4 added lines, -2 removed lines

@@ -17,7 +17,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_validator extends tx_dlf_plugin {
+class tx_dlf_validator extends tx_dlf_plugin
+{
 
     public $scriptRelPath = 'plugins/validator/class.tx_dlf_validator.php';
 
@@ -31,7 +32,8 @@ 
      *
      * @return	string		The content that is displayed on the website
      */
-    public function main($content, $conf) {
+    public function main($content, $conf)
+    {
 
         $this->init($conf);
 

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
         $this->init($conf);
 
         // Disable caching for this plugin.
-        $this->setCache(FALSE);
+        $this->setCache(false);
 
         // Load template file.
         if (!empty($this->conf['templateFile'])) {
@@ -52,7 +52,7 @@ 
         // Load current document.
         $this->loadDocument();
 
-        if ($this->doc === NULL) {
+        if ($this->doc === null) {
 
             // Document could not be loaded.
             // Check:

plugins/toc/class.tx_dlf_toc.php

Spacing +18 added lines, -18 removed lines

@@ -27,7 +27,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $activeEntries = array ();
+    protected $activeEntries = array();
 
     /**
      * This builds an array for one menu entry
@@ -41,7 +41,7 @@ 
      */
     protected function getMenuEntry(array $entry, $recursive = FALSE) {
 
-        $entryArray = array ();
+        $entryArray = array();
 
         // Set "title", "volume", "type" and "pagination" from $entry array.
         $entryArray['title'] = !empty($entry['label']) ? $entry['label'] : $entry['orderlabel'];
@@ -63,37 +63,37 @@ 
         // Build menu links based on the $entry['points'] array.
         if (!empty($entry['points']) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($entry['points'])) {
 
-            $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('page' => $entry['points']), TRUE, FALSE, $this->conf['targetPid']);
+            $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array('page' => $entry['points']), TRUE, FALSE, $this->conf['targetPid']);
 
             $entryArray['doNotLinkIt'] = 0;
 
             if ($this->conf['basketButton']) {
 
-                $entryArray['basketButtonHref'] = '<a href="'.$this->pi_linkTP_keepPIvars_url(array ('addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['points']), TRUE, FALSE, $this->conf['targetBasket']).'">'.$this->pi_getLL('basketButton', '', TRUE).'</a>';
+                $entryArray['basketButtonHref'] = '<a href="' . $this->pi_linkTP_keepPIvars_url(array('addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['points']), TRUE, FALSE, $this->conf['targetBasket']) . '">' . $this->pi_getLL('basketButton', '', TRUE) . '</a>';
 
             }
 
         } elseif (!empty($entry['points']) && is_string($entry['points'])) {
 
-            $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('id' => $entry['points'], 'page' => 1), TRUE, FALSE, $this->conf['targetPid']);
+            $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array('id' => $entry['points'], 'page' => 1), TRUE, FALSE, $this->conf['targetPid']);
 
             $entryArray['doNotLinkIt'] = 0;
 
             if ($this->conf['basketButton']) {
 
-                $entryArray['basketButtonHref'] = '<a href="'.$this->pi_linkTP_keepPIvars_url(array ('addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['points']), TRUE, FALSE, $this->conf['targetBasket']).'">'.$this->pi_getLL('basketButton', '', TRUE).'</a>';
+                $entryArray['basketButtonHref'] = '<a href="' . $this->pi_linkTP_keepPIvars_url(array('addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['points']), TRUE, FALSE, $this->conf['targetBasket']) . '">' . $this->pi_getLL('basketButton', '', TRUE) . '</a>';
 
             }
 
         } elseif (!empty($entry['targetUid'])) {
 
-            $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('id' => $entry['targetUid'], 'page' => 1), TRUE, FALSE, $this->conf['targetPid']);
+            $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array('id' => $entry['targetUid'], 'page' => 1), TRUE, FALSE, $this->conf['targetPid']);
 
             $entryArray['doNotLinkIt'] = 0;
 
             if ($this->conf['basketButton']) {
 
-                $entryArray['basketButtonHref'] = '<a href="'.$this->pi_linkTP_keepPIvars_url(array ('addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['targetUid']), TRUE, FALSE, $this->conf['targetBasket']).'">'.$this->pi_getLL('basketButton', '', TRUE).'</a>';
+                $entryArray['basketButtonHref'] = '<a href="' . $this->pi_linkTP_keepPIvars_url(array('addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['targetUid']), TRUE, FALSE, $this->conf['targetBasket']) . '">' . $this->pi_getLL('basketButton', '', TRUE) . '</a>';
 
             }
 
@@ -116,7 +116,7 @@ 
             // 4. Current menu node has no corresponding images
             if (!empty($this->conf['menuConf.']['expAll']) || $entryArray['ITEM_STATE'] == 'CUR' || is_string($entry['points']) || empty($this->doc->smLinks['l2p'][$entry['id']])) {
 
-                $entryArray['_SUB_MENU'] = array ();
+                $entryArray['_SUB_MENU'] = array();
 
                 foreach ($entry['children'] as $child) {
 
@@ -134,7 +134,7 @@ 
             }
 
             // Append "IFSUB" to "ITEM_STATE" if this entry has sub-entries.
-            $entryArray['ITEM_STATE'] = ($entryArray['ITEM_STATE'] == 'NO' ? 'IFSUB' : $entryArray['ITEM_STATE'].'IFSUB');
+            $entryArray['ITEM_STATE'] = ($entryArray['ITEM_STATE'] == 'NO' ? 'IFSUB' : $entryArray['ITEM_STATE'] . 'IFSUB');
 
         }
 
@@ -161,7 +161,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_toc->main('.$content.', [data])] Incomplete plugin configuration', $this->extKey, SYSLOG_SEVERITY_WARNING, $conf);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_toc->main(' . $content . ', [data])] Incomplete plugin configuration', $this->extKey, SYSLOG_SEVERITY_WARNING, $conf);
 
             }
 
@@ -180,7 +180,7 @@ 
 
         }
 
-        $TSconfig = array ();
+        $TSconfig = array();
 
         $TSconfig['special'] = 'userfunction';
 
@@ -216,7 +216,7 @@ 
         if ($this->doc === NULL) {
 
             // Quit without doing anything if required variables are not set.
-            return array ();
+            return array();
 
         } else {
 
@@ -244,7 +244,7 @@ 
 
         }
 
-        $menuArray = array ();
+        $menuArray = array();
 
         // Does the document have physical elements or is it an external file?
         if ($this->doc->physicalStructure || !\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->doc->uid)) {
@@ -279,11 +279,11 @@ 
             }
 
             // Get all child documents from database.
-            $whereClause = 'tx_dlf_documents.partof='.intval($this->doc->uid).' AND tx_dlf_documents.structure=tx_dlf_structures.uid AND tx_dlf_structures.pid='.$this->doc->pid.tx_dlf_helper::whereClause('tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_structures');
+            $whereClause = 'tx_dlf_documents.partof=' . intval($this->doc->uid) . ' AND tx_dlf_documents.structure=tx_dlf_structures.uid AND tx_dlf_structures.pid=' . $this->doc->pid . tx_dlf_helper::whereClause('tx_dlf_documents') . tx_dlf_helper::whereClause('tx_dlf_structures');
 
             if ($this->conf['excludeOther']) {
 
-                $whereClause .= ' AND tx_dlf_documents.pid='.intval($this->conf['pages']);
+                $whereClause .= ' AND tx_dlf_documents.pid=' . intval($this->conf['pages']);
 
             }
 
@@ -301,11 +301,11 @@ 
 
                 $menuArray[0]['ITEM_STATE'] = 'CURIFSUB';
 
-                $menuArray[0]['_SUB_MENU'] = array ();
+                $menuArray[0]['_SUB_MENU'] = array();
 
                 while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-                    $entry = array (
+                    $entry = array(
                         'label' => $resArray['title'],
                         'type' => $resArray['type'],
                         'volume' => $resArray['volume'],

Braces +8 added lines, -4 removed lines

@@ -17,7 +17,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_toc extends tx_dlf_plugin {
+class tx_dlf_toc extends tx_dlf_plugin
+{
 
     public $scriptRelPath = 'plugins/toc/class.tx_dlf_toc.php';
 
@@ -39,7 +40,8 @@ 
      *
      * @return	array		HMENU array for menu entry
      */
-    protected function getMenuEntry(array $entry, $recursive = FALSE) {
+    protected function getMenuEntry(array $entry, $recursive = FALSE)
+    {
 
         $entryArray = array ();
 
@@ -152,7 +154,8 @@ 
      *
      * @return	string		The content that is displayed on the website
      */
-    public function main($content, $conf) {
+    public function main($content, $conf)
+    {
 
         $this->init($conf);
 
@@ -206,7 +209,8 @@ 
      *
      * @return	array		HMENU array
      */
-    public function makeMenuArray($content, $conf) {
+    public function makeMenuArray($content, $conf)
+    {
 
         $this->init($conf);
 

Upper-Lower-Casing +13 added lines, -13 removed lines

@@ -39,7 +39,7 @@ 
      *
      * @return	array		HMENU array for menu entry
      */
-    protected function getMenuEntry(array $entry, $recursive = FALSE) {
+    protected function getMenuEntry(array $entry, $recursive = false) {
 
         $entryArray = array ();
 
@@ -63,37 +63,37 @@ 
         // Build menu links based on the $entry['points'] array.
         if (!empty($entry['points']) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($entry['points'])) {
 
-            $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('page' => $entry['points']), TRUE, FALSE, $this->conf['targetPid']);
+            $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('page' => $entry['points']), true, false, $this->conf['targetPid']);
 
             $entryArray['doNotLinkIt'] = 0;
 
             if ($this->conf['basketButton']) {
 
-                $entryArray['basketButtonHref'] = '<a href="'.$this->pi_linkTP_keepPIvars_url(array ('addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['points']), TRUE, FALSE, $this->conf['targetBasket']).'">'.$this->pi_getLL('basketButton', '', TRUE).'</a>';
+                $entryArray['basketButtonHref'] = '<a href="'.$this->pi_linkTP_keepPIvars_url(array ('addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['points']), true, false, $this->conf['targetBasket']).'">'.$this->pi_getLL('basketButton', '', true).'</a>';
 
             }
 
         } elseif (!empty($entry['points']) && is_string($entry['points'])) {
 
-            $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('id' => $entry['points'], 'page' => 1), TRUE, FALSE, $this->conf['targetPid']);
+            $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('id' => $entry['points'], 'page' => 1), true, false, $this->conf['targetPid']);
 
             $entryArray['doNotLinkIt'] = 0;
 
             if ($this->conf['basketButton']) {
 
-                $entryArray['basketButtonHref'] = '<a href="'.$this->pi_linkTP_keepPIvars_url(array ('addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['points']), TRUE, FALSE, $this->conf['targetBasket']).'">'.$this->pi_getLL('basketButton', '', TRUE).'</a>';
+                $entryArray['basketButtonHref'] = '<a href="'.$this->pi_linkTP_keepPIvars_url(array ('addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['points']), true, false, $this->conf['targetBasket']).'">'.$this->pi_getLL('basketButton', '', true).'</a>';
 
             }
 
         } elseif (!empty($entry['targetUid'])) {
 
-            $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('id' => $entry['targetUid'], 'page' => 1), TRUE, FALSE, $this->conf['targetPid']);
+            $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('id' => $entry['targetUid'], 'page' => 1), true, false, $this->conf['targetPid']);
 
             $entryArray['doNotLinkIt'] = 0;
 
             if ($this->conf['basketButton']) {
 
-                $entryArray['basketButtonHref'] = '<a href="'.$this->pi_linkTP_keepPIvars_url(array ('addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['targetUid']), TRUE, FALSE, $this->conf['targetBasket']).'">'.$this->pi_getLL('basketButton', '', TRUE).'</a>';
+                $entryArray['basketButtonHref'] = '<a href="'.$this->pi_linkTP_keepPIvars_url(array ('addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['targetUid']), true, false, $this->conf['targetBasket']).'">'.$this->pi_getLL('basketButton', '', true).'</a>';
 
             }
 
@@ -107,7 +107,7 @@ 
         }
 
         // Build sub-menu if available and called recursively.
-        if ($recursive == TRUE && !empty($entry['children'])) {
+        if ($recursive == true && !empty($entry['children'])) {
 
             // Build sub-menu only if one of the following conditions apply:
             // 1. "expAll" is set for menu
@@ -127,7 +127,7 @@ 
 
                     }
 
-                    $entryArray['_SUB_MENU'][] = $this->getMenuEntry($child, TRUE);
+                    $entryArray['_SUB_MENU'][] = $this->getMenuEntry($child, true);
 
                 }
 
@@ -213,7 +213,7 @@ 
         // Load current document.
         $this->loadDocument();
 
-        if ($this->doc === NULL) {
+        if ($this->doc === null) {
 
             // Quit without doing anything if required variables are not set.
             return array ();
@@ -265,7 +265,7 @@ 
             // Go through table of contents and create all menu entries.
             foreach ($this->doc->tableOfContents as $entry) {
 
-                $menuArray[] = $this->getMenuEntry($entry, TRUE);
+                $menuArray[] = $this->getMenuEntry($entry, true);
 
             }
 
@@ -274,7 +274,7 @@ 
             // Go through table of contents and create top-level menu entries.
             foreach ($this->doc->tableOfContents as $entry) {
 
-                $menuArray[] = $this->getMenuEntry($entry, FALSE);
+                $menuArray[] = $this->getMenuEntry($entry, false);
 
             }
 
@@ -313,7 +313,7 @@ 
                         'targetUid' => $resArray['uid']
                     );
 
-                    $menuArray[0]['_SUB_MENU'][] = $this->getMenuEntry($entry, FALSE);
+                    $menuArray[0]['_SUB_MENU'][] = $this->getMenuEntry($entry, false);
 
                 }