kitodo / kitodo-presentation

dlf/plugins/pageview/class.tx_dlf_pageview.php

Indentation +73 added lines, -73 removed lines

@@ -101,130 +101,130 @@ 
 	}
 
 	/**
-     * Adds pageview interaction (crop, magnifier and rotation)
-     *
-     * @access	protected
-     *
-     * @return	array		Marker array
-     */
-    protected function addInteraction() {
+	 * Adds pageview interaction (crop, magnifier and rotation)
+	 *
+	 * @access	protected
+	 *
+	 * @return	array		Marker array
+	 */
+	protected function addInteraction() {
 
-        $markerArray = array();
+		$markerArray = array();
 
-        if ($this->piVars['id']) {
+		if ($this->piVars['id']) {
 
-            if (empty($this->piVars['page'])) {
+			if (empty($this->piVars['page'])) {
 
-                $params['page'] = 1;
+				$params['page'] = 1;
 
-            }
+			}
 
-            if ($this->conf['crop']) {
+			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 {
+			} else {
 
-                $markerArray['###EDITBUTTON###'] = '';
+				$markerArray['###EDITBUTTON###'] = '';
 
-                $markerArray['###EDITREMOVE###'] = '';
+				$markerArray['###EDITREMOVE###'] = '';
 
-            }
+			}
 
-            if ($this->conf['magnifier']) {
+			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 {
+			} else {
 
-                $markerArray['###MAGNIFIER###'] = '';
+				$markerArray['###MAGNIFIER###'] = '';
 
-            }
+			}
 
-        }
+		}
 
-        return $markerArray;
-    }
+		return $markerArray;
+	}
 
-    /**
-     * Adds form to save cropping data to basket
-     *
-     * @access	protected
-     *
-     * @return	array		Marker array
-     */
-    protected function addBasketForm() {
+	/**
+	 * Adds form to save cropping data to basket
+	 *
+	 * @access	protected
+	 *
+	 * @return	array		Marker array
+	 */
+	protected function addBasketForm() {
 
-        $markerArray = array();
+		$markerArray = array();
 
-        // Add basket button
-        if ($this->conf['basketButton'] && $this->conf['targetBasket'] && $this->piVars['id']) {
+		// 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
-            );
+			$params = array(
+				'id' => $this->piVars['id'],
+				'addToBasket' => true
+			);
 
-            if (empty($this->piVars['page'])) {
+			if (empty($this->piVars['page'])) {
 
-                $params['page'] = 1;
+				$params['page'] = 1;
 
-            }
+			}
 
-            $basketConf = array (
-                'parameter' => $this->conf['targetBasket'],
-                'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $params, '', TRUE, FALSE),
-                'title' => $label
-            );
+			$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="'.$this->piVars['page'].'">';
+			$output .= '<input type="hidden" name="tx_dlf[startpage]" id="startpage" value="'.$this->piVars['page'].'">';
 
-            $output .= '<input type="hidden" name="tx_dlf[endpage]" id="endpage" value="'.$this->piVars['page'].'">';
+			$output .= '<input type="hidden" name="tx_dlf[endpage]" id="endpage" value="'.$this->piVars['page'].'">';
 
-            $output .= '<input type="hidden" name="tx_dlf[startX]" id="startX">';
+			$output .= '<input type="hidden" name="tx_dlf[startX]" id="startX">';
 
-            $output .= '<input type="hidden" name="tx_dlf[startY]" id="startY">';
+			$output .= '<input type="hidden" name="tx_dlf[startY]" id="startY">';
 
-            $output .= '<input type="hidden" name="tx_dlf[endX]" id="endX">';
+			$output .= '<input type="hidden" name="tx_dlf[endX]" id="endX">';
 
-            $output .= '<input type="hidden" name="tx_dlf[endY]" id="endY">';
+			$output .= '<input type="hidden" name="tx_dlf[endY]" id="endY">';
 
-            $output .= '<input type="hidden" name="tx_dlf[rotation]" id="rotation">';
+			$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>';
+			$output .= '</form>';
 
-            $output .= '<script>';
+			$output .= '<script>';
 
-            $output .= '
+			$output .= '
 			$(document).ready(function() {
 				$("#submitBasketForm").click(function() {
 					$("#addToBasketForm").submit();
 				});
 			});';
 
-            $output .= '</script>';
+			$output .= '</script>';
 
-            $markerArray['###BASKETBUTTON###'] = $output;
+			$markerArray['###BASKETBUTTON###'] = $output;
 
-        } else {
+		} else {
 
-            $markerArray['###BASKETBUTTON###'] = '';
+			$markerArray['###BASKETBUTTON###'] = '';
 
-        }
+		}
 
-        return $markerArray;
-    }
+		return $markerArray;
+	}
 
-    /**
-     * Get image's URL and MIME type
+	/**
+	 * Get image's URL and MIME type
 	 *
 	 * @access	protected
 	 *
@@ -390,7 +390,7 @@ 
 
 		$markerArray = array_merge($markerArray, $this->addInteraction(), $this->addBasketForm());
 
-        $content .= $this->cObj->substituteMarkerArray($this->template, $markerArray);
+		$content .= $this->cObj->substituteMarkerArray($this->template, $markerArray);
 
 		return $this->pi_wrapInBaseClass($content);
 

dlf/plugins/pageview/class.tx_dlf_geturl_eid.php

Indentation +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 		$this->scriptRelPath = 'plugins/pageview/class.tx_dlf_geturl_eid.php';
 
 		$url = GeneralUtility::_GP('url');
-    $includeHeader = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange(GeneralUtility::_GP('header'), 0, 2, 0);
+	$includeHeader = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange(GeneralUtility::_GP('header'), 0, 2, 0);
 
 		// first we fetch header separately
 		$fetchedHeader = GeneralUtility::getUrl($url, 2);

dlf/plugins/toc/class.tx_dlf_toc.php

Indentation +12 added lines, -12 removed lines

@@ -67,37 +67,37 @@
 
 			$entryArray['doNotLinkIt'] = 0;
 
-            if ($this->conf['basketButton']) {
+			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'])) {
+		} 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['doNotLinkIt'] = 0;
 
-            if ($this->conf['basketButton']) {
+			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'])) {
+		} elseif (!empty($entry['targetUid'])) {
 
 			$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']) {
+			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>';
 
-            }
+			}
 
-        }
+		}
 
 		// Set "ITEM_STATE" to "CUR" if this entry points to current page.
 		if (in_array($entry['id'], $this->activeEntries)) {

dlf/plugins/basket/class.tx_dlf_basket.php

Indentation +544 added lines, -544 removed lines

@@ -19,220 +19,220 @@ 
  */
 class tx_dlf_basket extends tx_dlf_plugin {
 
-    public $scriptRelPath = 'plugins/basket/class.tx_dlf_basket.php';
+	public $scriptRelPath = 'plugins/basket/class.tx_dlf_basket.php';
 
-    /**
-     * The main method of the PlugIn
-     *
-     * @access	public
-     *
-     * @param	string		$content: The PlugIn content
-     * @param	array		$conf: The PlugIn configuration
-     *
-     * @return	string		The content that is displayed on the website
-     */
-    public function main($content, $conf) {
+	/**
+	 * The main method of the PlugIn
+	 *
+	 * @access	public
+	 *
+	 * @param	string		$content: The PlugIn content
+	 * @param	array		$conf: The PlugIn configuration
+	 *
+	 * @return	string		The content that is displayed on the website
+	 */
+	public function main($content, $conf) {
 
-        $this->init($conf);
+		$this->init($conf);
 
-        // Don't cache the output.
-        $this->setCache(FALSE);
+		// Don't cache the output.
+		$this->setCache(FALSE);
 
-        // Load template file.
-        if (!empty($this->conf['templateFile'])) {
+		// Load template file.
+		if (!empty($this->conf['templateFile'])) {
 
-            $this->template = $this->cObj->getSubpart($this->cObj->fileResource($this->conf['templateFile']), '###TEMPLATE###');
+			$this->template = $this->cObj->getSubpart($this->cObj->fileResource($this->conf['templateFile']), '###TEMPLATE###');
 
-        } else {
+		} else {
 
-            $this->template = $this->cObj->getSubpart($this->cObj->fileResource('EXT:dlf/plugins/basket/template.tmpl'), '###TEMPLATE###');
+			$this->template = $this->cObj->getSubpart($this->cObj->fileResource('EXT:dlf/plugins/basket/template.tmpl'), '###TEMPLATE###');
 
-        }
+		}
 
-        $subpartArray['entry'] = $this->cObj->getSubpart($this->template, '###ENTRY###');
+		$subpartArray['entry'] = $this->cObj->getSubpart($this->template, '###ENTRY###');
 
-        $markerArray['###JS###'] = '';
+		$markerArray['###JS###'] = '';
 
-        // get user session
-        $sessionId = $GLOBALS['TSFE']->fe_user->id;
+		// get user session
+		$sessionId = $GLOBALS['TSFE']->fe_user->id;
 
-        if ($GLOBALS['TSFE']->loginUser) {
+		if ($GLOBALS['TSFE']->loginUser) {
 
-            $insertArray['fe_user_id'] = $GLOBALS['TSFE']->fe_user->user['uid'];
+			$insertArray['fe_user_id'] = $GLOBALS['TSFE']->fe_user->user['uid'];
 
-            $query = $GLOBALS['TYPO3_DB']->SELECTquery(
-                '*',
-                'tx_dlf_basket',
-                'tx_dlf_basket.fe_user_id='.intval($insertArray['fe_user_id']).tx_dlf_helper::whereClause('tx_dlf_basket'),
-                '',
-                '',
-                '1'
-            );
+			$query = $GLOBALS['TYPO3_DB']->SELECTquery(
+				'*',
+				'tx_dlf_basket',
+				'tx_dlf_basket.fe_user_id='.intval($insertArray['fe_user_id']).tx_dlf_helper::whereClause('tx_dlf_basket'),
+				'',
+				'',
+				'1'
+			);
 
-        } else {
+		} else {
 
-            $GLOBALS['TSFE']->fe_user->setKey('ses', 'tx_dlf_basket', '');
+			$GLOBALS['TSFE']->fe_user->setKey('ses', 'tx_dlf_basket', '');
 
-            $GLOBALS['TSFE']->fe_user->sesData_change = true;
+			$GLOBALS['TSFE']->fe_user->sesData_change = true;
 
-            $GLOBALS['TSFE']->fe_user->storeSessionData();
+			$GLOBALS['TSFE']->fe_user->storeSessionData();
 
-            $query = $GLOBALS['TYPO3_DB']->SELECTquery(
-                '*',
-                'tx_dlf_basket',
-                'tx_dlf_basket.session_id='.$GLOBALS['TYPO3_DB']->fullQuoteStr($sessionId, 'tx_dlf_basket').tx_dlf_helper::whereClause('tx_dlf_basket'),
-                '',
-                '',
-                '1'
-            );
+			$query = $GLOBALS['TYPO3_DB']->SELECTquery(
+				'*',
+				'tx_dlf_basket',
+				'tx_dlf_basket.session_id='.$GLOBALS['TYPO3_DB']->fullQuoteStr($sessionId, 'tx_dlf_basket').tx_dlf_helper::whereClause('tx_dlf_basket'),
+				'',
+				'',
+				'1'
+			);
 
-        }
+		}
 
-        $result = $GLOBALS['TYPO3_DB']->sql_query($query);
+		$result = $GLOBALS['TYPO3_DB']->sql_query($query);
 
-        // session already exists
-        if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) == 0) {
+		// session already exists
+		if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) == 0) {
 
-            // create new basket in db
-            $insertArray['session_id'] = $sessionId;
-            $insertArray['doc_ids'] = '';
-            $insertArray['label'] = '';
-            $insertArray['l18n_diffsource'] = '';
+			// create new basket in db
+			$insertArray['session_id'] = $sessionId;
+			$insertArray['doc_ids'] = '';
+			$insertArray['label'] = '';
+			$insertArray['l18n_diffsource'] = '';
 
-            $GLOBALS['TYPO3_DB']->exec_INSERTquery('tx_dlf_basket', $insertArray);
+			$GLOBALS['TYPO3_DB']->exec_INSERTquery('tx_dlf_basket', $insertArray);
 
-            $result = $GLOBALS['TYPO3_DB']->sql_query($query);
+			$result = $GLOBALS['TYPO3_DB']->sql_query($query);
 
-        }
+		}
 
-        $basketData = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
+		$basketData = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
 
-        $piVars = $this->piVars;
+		$piVars = $this->piVars;
 
-        // action add to basket
-        if (!empty($this->piVars['id']) && $this->piVars['addToBasket']) {
+		// action add to basket
+		if (!empty($this->piVars['id']) && $this->piVars['addToBasket']) {
 
-            $returnData = $this->addToBasket($this->piVars, $basketData);
+			$returnData = $this->addToBasket($this->piVars, $basketData);
 
-            $basketData = $returnData['basketData'];
+			$basketData = $returnData['basketData'];
 
-            $markerArray['###JS###'] = $returnData['jsOutput'];
+			$markerArray['###JS###'] = $returnData['jsOutput'];
 
-        } else {
+		} else {
 
-            $basketData['doc_ids'] = json_decode($basketData['doc_ids']);
+			$basketData['doc_ids'] = json_decode($basketData['doc_ids']);
 
-        }
+		}
 
-        // action remove from basket
-        if ($this->piVars['basket_action'] == 'remove') {
+		// action remove from basket
+		if ($this->piVars['basket_action'] == 'remove') {
 
-            // remove entry from list
-            unset($piVars['basket_action']);
+			// remove entry from list
+			unset($piVars['basket_action']);
 
-            if (isset($this->piVars['selected'])) {
+			if (isset($this->piVars['selected'])) {
 
-                $basketData = $this->removeFromBasket($piVars, $basketData);
+				$basketData = $this->removeFromBasket($piVars, $basketData);
 
-            }
+			}
 
-        }
+		}
 
-        // action remove from basket
-        if ($this->piVars['basket_action'] == 'open') {
+		// action remove from basket
+		if ($this->piVars['basket_action'] == 'open') {
 
-            // open selected documents
-            unset($piVars['basket_action']);
+			// open selected documents
+			unset($piVars['basket_action']);
 
-            if (isset($this->piVars['selected'])) {
+			if (isset($this->piVars['selected'])) {
 
-                $basketData = $this->openFromBasket($piVars, $basketData);
+				$basketData = $this->openFromBasket($piVars, $basketData);
 
-            }
+			}
 
-        }
+		}
 
-        // action print from basket
-        if ($this->piVars['print_action']) {
+		// action print from basket
+		if ($this->piVars['print_action']) {
 
-            // open selected documents
-            unset($piVars['print_action']);
+			// open selected documents
+			unset($piVars['print_action']);
 
-            if (isset($this->piVars['selected'])) {
+			if (isset($this->piVars['selected'])) {
 
-                $basketData = $this->printDocument($piVars, $basketData);
+				$basketData = $this->printDocument($piVars, $basketData);
 
-            }
+			}
 
-        }
+		}
 
-        // action send mail
-        if ($this->piVars['mail_action']) {
+		// action send mail
+		if ($this->piVars['mail_action']) {
 
-            if (isset($this->piVars['selected'])) {
+			if (isset($this->piVars['selected'])) {
 
-                $this->sendMail($this->piVars);
+				$this->sendMail($this->piVars);
 
-            }
+			}
 
-        }
+		}
 
-        // set marker
-        $markerArray['###ACTION###'] = $this->pi_getPageLink($GLOBALS['TSFE']->id);
+		// set marker
+		$markerArray['###ACTION###'] = $this->pi_getPageLink($GLOBALS['TSFE']->id);
 
-        $markerArray['###LISTTITLE###'] = $this->pi_getLL('basket', '', TRUE);
+		$markerArray['###LISTTITLE###'] = $this->pi_getLL('basket', '', TRUE);
 
-        if ($basketData['doc_ids']) {
+		if ($basketData['doc_ids']) {
 
-            if (is_object($basketData['doc_ids'])) {
+			if (is_object($basketData['doc_ids'])) {
 
-                $basketData['doc_ids'] = get_object_vars($basketData['doc_ids']);
+				$basketData['doc_ids'] = get_object_vars($basketData['doc_ids']);
 
-            }
+			}
 
-            $markerArray['###COUNT###'] = sprintf($this->pi_getLL('count'), count($basketData['doc_ids']));
+			$markerArray['###COUNT###'] = sprintf($this->pi_getLL('count'), count($basketData['doc_ids']));
 
-        } else {
+		} else {
 
-            $markerArray['###COUNT###'] = sprintf($this->pi_getLL('count'), 0);
+			$markerArray['###COUNT###'] = sprintf($this->pi_getLL('count'), 0);
 
-        }
+		}
 
-        // get mail addresses
-        $resultMail = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-            '*',
-            'tx_dlf_mail',
-            '1'.tx_dlf_helper::whereClause('tx_dlf_mail'),
-            '',
-            'tx_dlf_mail.sorting',
-            ''
-        );
+		// get mail addresses
+		$resultMail = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+			'*',
+			'tx_dlf_mail',
+			'1'.tx_dlf_helper::whereClause('tx_dlf_mail'),
+			'',
+			'tx_dlf_mail.sorting',
+			''
+		);
 
-        if ($GLOBALS['TYPO3_DB']->sql_num_rows($resultMail) > 0) {
+		if ($GLOBALS['TYPO3_DB']->sql_num_rows($resultMail) > 0) {
 
-            $mails = array();
+			$mails = array();
 
-            $mailForm = '<select name="tx_dlf[mail_action]">';
+			$mailForm = '<select name="tx_dlf[mail_action]">';
 
-            $mailForm .= '<option value="">'.$this->pi_getLL('chooseMail', '', TRUE).'</option>';
+			$mailForm .= '<option value="">'.$this->pi_getLL('chooseMail', '', TRUE).'</option>';
 
-            while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultMail)){
+			while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultMail)){
 
-                $mails[] = $row;
+				$mails[] = $row;
 
-                $mailForm .= '<option value="'.$row['uid'].'">'.$row['name'].' ('.$row['mail'].')</option>';
+				$mailForm .= '<option value="'.$row['uid'].'">'.$row['name'].' ('.$row['mail'].')</option>';
 
-            }
+			}
 
-            $mailForm .= '</select><input type="submit">';
+			$mailForm .= '</select><input type="submit">';
 
-        }
+		}
 
-        // mail action form
-        $markerArray['###MAILACTION###'] = $mailForm;
+		// mail action form
+		$markerArray['###MAILACTION###'] = $mailForm;
 
-        // remove action form
-        $markerArray['###REMOVEACTION###'] = '
+		// remove action form
+		$markerArray['###REMOVEACTION###'] = '
 			<select name="tx_dlf[basket_action]">
 				<option value="">'.$this->pi_getLL('chooseAction', '', TRUE).'</option>
 				<option value="open">'.$this->pi_getLL('download', '', TRUE).'</option>
@@ -241,275 +241,275 @@ 
 			<input type="submit">
 		';
 
-        // get mail addresses
-        $resultPrinter = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-            '*',
-            'tx_dlf_printer',
-            '1'.tx_dlf_helper::whereClause('tx_dlf_printer'),
-            '',
-            '',
-            ''
-        );
+		// get mail addresses
+		$resultPrinter = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+			'*',
+			'tx_dlf_printer',
+			'1'.tx_dlf_helper::whereClause('tx_dlf_printer'),
+			'',
+			'',
+			''
+		);
 
-        $printForm = '';
+		$printForm = '';
 
-        if ($GLOBALS['TYPO3_DB']->sql_num_rows($resultPrinter) > 0) {
+		if ($GLOBALS['TYPO3_DB']->sql_num_rows($resultPrinter) > 0) {
 
-            $printers = array();
+			$printers = array();
 
-            $printForm = '<select name="tx_dlf[print_action]">';
+			$printForm = '<select name="tx_dlf[print_action]">';
 
-            $printForm .= '<option value="">'.$this->pi_getLL('choosePrinter', '', TRUE).'</option>';
+			$printForm .= '<option value="">'.$this->pi_getLL('choosePrinter', '', TRUE).'</option>';
 
-            while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultPrinter)){
+			while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultPrinter)){
 
-                $printers[] = $row;
+				$printers[] = $row;
 
-                $printForm .= '<option value="'.$row['uid'].'">'.$row['label'].'</option>';
+				$printForm .= '<option value="'.$row['uid'].'">'.$row['label'].'</option>';
 
-            }
+			}
 
-            $printForm .= '</select><input type="submit" />';
+			$printForm .= '</select><input type="submit" />';
 
-        }
+		}
 
-        // print action form
-        $markerArray['###PRINTACTION###'] = $printForm;
+		// print action form
+		$markerArray['###PRINTACTION###'] = $printForm;
 
-        $entries = '';
+		$entries = '';
 
-        if (isset($basketData['doc_ids'])) {
+		if (isset($basketData['doc_ids'])) {
 
-            // get each entry
-            foreach ($basketData['doc_ids'] as $key => $value) {
+			// get each entry
+			foreach ($basketData['doc_ids'] as $key => $value) {
 
-                $entries .= $this->getEntry($value, $subpartArray);
+				$entries .= $this->getEntry($value, $subpartArray);
 
-            }
+			}
 
-        } else {
+		} else {
 
-            $entries = '';
+			$entries = '';
 
-        }
+		}
 
-        // basket go to
-        if ($this->conf['targetBasket'] && $this->conf['basketGoToButton'] && $this->piVars['id']) {
+		// basket go to
+		if ($this->conf['targetBasket'] && $this->conf['basketGoToButton'] && $this->piVars['id']) {
 
-            $label = $this->pi_getLL('goBasket', '', TRUE);
+			$label = $this->pi_getLL('goBasket', '', TRUE);
 
-            $basketConf = array (
-                'parameter' => $this->conf['targetBasket'],
-                'title' => $label
-            );
+			$basketConf = array (
+				'parameter' => $this->conf['targetBasket'],
+				'title' => $label
+			);
 
-            $markerArray['###BASKET###'] = $this->cObj->typoLink($label, $basketConf);
+			$markerArray['###BASKET###'] = $this->cObj->typoLink($label, $basketConf);
 
-        } else {
+		} else {
 
-            $markerArray['###BASKET###'] = '';
+			$markerArray['###BASKET###'] = '';
 
-        }
+		}
 
-        $content = $this->cObj->substituteMarkerArray($this->cObj->substituteSubpart($this->template, '###ENTRY###', $entries, TRUE), $markerArray);
+		$content = $this->cObj->substituteMarkerArray($this->cObj->substituteSubpart($this->template, '###ENTRY###', $entries, TRUE), $markerArray);
 
-        return $this->pi_wrapInBaseClass($content);
+		return $this->pi_wrapInBaseClass($content);
 
-    }
+	}
 
-    /**
-     * Return one basket entry
-     * @param  array $data     DocumentData
-     * @param  array $template Template information
-     * @return Template
-     */
-    public function getEntry($data, $template) {
+	/**
+	 * Return one basket entry
+	 * @param  array $data     DocumentData
+	 * @param  array $template Template information
+	 * @return Template
+	 */
+	public function getEntry($data, $template) {
 
-        if (is_object($data)) {
+		if (is_object($data)) {
 
-            $data = get_object_vars($data);
+			$data = get_object_vars($data);
 
-        }
+		}
 
-        $id = $data['id'];
+		$id = $data['id'];
 
-        $startpage = $data['startpage'];
+		$startpage = $data['startpage'];
 
-        $endpage = $data['endpage'];
+		$endpage = $data['endpage'];
 
-        $startX = $data['startX'];
+		$startX = $data['startX'];
 
-        $startY = $data['startY'];
+		$startY = $data['startY'];
 
-        $endX = $data['endX'];
+		$endX = $data['endX'];
 
-        $endY = $data['endY'];
+		$endY = $data['endY'];
 
-        $rotation = $data['rotation'];
+		$rotation = $data['rotation'];
 
-        $docData = $this->getDocumentData($id, $data);
+		$docData = $this->getDocumentData($id, $data);
 
-        $markerArray['###BASKETDATA###'] = $docData['downloadLink'];
+		$markerArray['###BASKETDATA###'] = $docData['downloadLink'];
 
-        $arrayKey = $id.'_'.$startpage;
+		$arrayKey = $id.'_'.$startpage;
 
-        if (isset($startX)) {
+		if (isset($startX)) {
 
-            $arrayKey .= '_'.$startX;
+			$arrayKey .= '_'.$startX;
 
-        }
+		}
 
-        if (isset($endX)) {
+		if (isset($endX)) {
 
-            $arrayKey .= '_'.$endX;
+			$arrayKey .= '_'.$endX;
 
-        }
+		}
 
-        $controlMark = '<input value="'.$id.'" name="tx_dlf[selected]['.$arrayKey.'][id]" type="checkbox">';
+		$controlMark = '<input value="'.$id.'" name="tx_dlf[selected]['.$arrayKey.'][id]" type="checkbox">';
 
-        $controlMark .= '<input value="'.$startpage.'" name="tx_dlf[selected]['.$arrayKey.'][startpage]" type="hidden">';
+		$controlMark .= '<input value="'.$startpage.'" name="tx_dlf[selected]['.$arrayKey.'][startpage]" type="hidden">';
 
-        $controlMark .= '<input value="'.$endpage.'" name="tx_dlf[selected]['.$arrayKey.'][endpage]" type="hidden">';
+		$controlMark .= '<input value="'.$endpage.'" name="tx_dlf[selected]['.$arrayKey.'][endpage]" type="hidden">';
 
-        // add hidden fields for detail information
-        if ($startX) {
+		// add hidden fields for detail information
+		if ($startX) {
 
-            $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][startX]" value="'.$startX.'">';
+			$controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][startX]" value="'.$startX.'">';
 
-            $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][startY]"  value="'.$startY.'">';
+			$controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][startY]"  value="'.$startY.'">';
 
-            $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][endX]"  value="'.$endX.'">';
+			$controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][endX]"  value="'.$endX.'">';
 
-            $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][endY]"  value="'.$endY.'">';
+			$controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][endY]"  value="'.$endY.'">';
 
-            $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][rotation]"  value="'.$rotation.'">';
+			$controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][rotation]"  value="'.$rotation.'">';
 
-        }
+		}
 
-        // return one entry
-        $markerArray['###CONTROLS###'] = $controlMark;
+		// return one entry
+		$markerArray['###CONTROLS###'] = $controlMark;
 
-        $markerArray['###NUMBER###'] = $docData['record_id'];
+		$markerArray['###NUMBER###'] = $docData['record_id'];
 
-        return $this->cObj->substituteMarkerArray($this->cObj->substituteSubpart($template['entry'], '###ENTRY###', $subpart, TRUE), $markerArray);
+		return $this->cObj->substituteMarkerArray($this->cObj->substituteSubpart($template['entry'], '###ENTRY###', $subpart, TRUE), $markerArray);
 
-    }
+	}
 
-    /**
-     * Adds documents to the basket
-     * @param array $_piVars    piVars
-     * @param array $basketData basket data
-     */
-    public function addToBasket($_piVars, $basketData) {
+	/**
+	 * Adds documents to the basket
+	 * @param array $_piVars    piVars
+	 * @param array $basketData basket data
+	 */
+	public function addToBasket($_piVars, $basketData) {
 
-        if (!$_piVars['startpage']) {
+		if (!$_piVars['startpage']) {
 
-            $page = 0;
+			$page = 0;
 
-        } else {
+		} else {
 
-            $page = intval($_piVars['startpage']);
+			$page = intval($_piVars['startpage']);
 
-        }
+		}
 
-        if ($page != null || $_piVars['addToBasket'] == 'list') {
+		if ($page != null || $_piVars['addToBasket'] == 'list') {
 
-            $documentItem = array(
-                'id' => intval($_piVars['id']),
-                'startpage' => intval($_piVars['startpage']),
-                'endpage' => intval($_piVars['endpage']),
-                'startX' => intval($_piVars['startX']),
-                'startY' => intval($_piVars['startY']),
-                'endX' => intval($_piVars['endX']),
-                'endY' => intval($_piVars['endY']),
-                'rotation' => intval($_piVars['rotation'])
-            );
+			$documentItem = array(
+				'id' => intval($_piVars['id']),
+				'startpage' => intval($_piVars['startpage']),
+				'endpage' => intval($_piVars['endpage']),
+				'startX' => intval($_piVars['startX']),
+				'startY' => intval($_piVars['startY']),
+				'endX' => intval($_piVars['endX']),
+				'endY' => intval($_piVars['endY']),
+				'rotation' => intval($_piVars['rotation'])
+			);
 
-            // update basket
-            if (!empty($basketData['doc_ids'])) {
+			// update basket
+			if (!empty($basketData['doc_ids'])) {
 
-                $items = json_decode($basketData['doc_ids']);
+				$items = json_decode($basketData['doc_ids']);
 
-                $items = get_object_vars($items);
+				$items = get_object_vars($items);
 
-            } else {
+			} else {
 
-                $items = array();
+				$items = array();
 
-            }
+			}
 
-            // get document instance to load further information
-            $document = tx_dlf_document::getInstance($documentItem['id'],0);
+			// get document instance to load further information
+			$document = tx_dlf_document::getInstance($documentItem['id'],0);
 
-            // set endpage for toc and subentry based on logid
-            if (($_piVars['addToBasket'] == 'subentry') OR ($_piVars['addToBasket'] == 'toc')) {
+			// set endpage for toc and subentry based on logid
+			if (($_piVars['addToBasket'] == 'subentry') OR ($_piVars['addToBasket'] == 'toc')) {
 
-                $smLinks = $document->smLinks;
+				$smLinks = $document->smLinks;
 
-                $pageCounter = sizeof($smLinks['l2p'][$_piVars['logId']]);
+				$pageCounter = sizeof($smLinks['l2p'][$_piVars['logId']]);
 
-                $documentItem['endpage'] = ($documentItem['startpage'] + $pageCounter) - 1;
+				$documentItem['endpage'] = ($documentItem['startpage'] + $pageCounter) - 1;
 
-            }
+			}
 
-            // add whole document
-            if ($_piVars['addToBasket'] == 'list') {
+			// add whole document
+			if ($_piVars['addToBasket'] == 'list') {
 
-                $documentItem['endpage'] = $document->numPages;
+				$documentItem['endpage'] = $document->numPages;
 
-            }
+			}
 
-            $arrayKey = $documentItem['id'].'_'.$page;
+			$arrayKey = $documentItem['id'].'_'.$page;
 
-            if (!empty($documentItem['startX'])) {
+			if (!empty($documentItem['startX'])) {
 
-                $arrayKey .= '_'.$documentItem['startX'];
+				$arrayKey .= '_'.$documentItem['startX'];
 
-            }
+			}
 
-            if (!empty($documentItem['endX'])) {
+			if (!empty($documentItem['endX'])) {
 
-                $arrayKey .= '_'.$documentItem['endX'];
+				$arrayKey .= '_'.$documentItem['endX'];
 
-            }
+			}
 
-            // do not add more than one identical object
-            if (!in_array($arrayKey, $items)) {
+			// do not add more than one identical object
+			if (!in_array($arrayKey, $items)) {
 
-                $items[$arrayKey] = $documentItem;
+				$items[$arrayKey] = $documentItem;
 
-                // replace url param placeholder
-                $pdfParams = str_replace("##startpage##", $documentItem['startpage'], $this->conf['pdfparams']);
+				// replace url param placeholder
+				$pdfParams = str_replace("##startpage##", $documentItem['startpage'], $this->conf['pdfparams']);
 
-                $pdfParams = str_replace("##docId##", $document->recordId, $pdfParams);
+				$pdfParams = str_replace("##docId##", $document->recordId, $pdfParams);
 
-                $pdfParams = str_replace("##startx##", $documentItem['startX'], $pdfParams);
+				$pdfParams = str_replace("##startx##", $documentItem['startX'], $pdfParams);
 
-                $pdfParams = str_replace("##starty##", $documentItem['startY'], $pdfParams);
+				$pdfParams = str_replace("##starty##", $documentItem['startY'], $pdfParams);
 
-                $pdfParams = str_replace("##endx##", $documentItem['endX'], $pdfParams);
+				$pdfParams = str_replace("##endx##", $documentItem['endX'], $pdfParams);
 
-                $pdfParams = str_replace("##endy##", $documentItem['endY'], $pdfParams);
+				$pdfParams = str_replace("##endy##", $documentItem['endY'], $pdfParams);
 
-                $pdfParams = str_replace("##rotation##", $documentItem['rotation'], $pdfParams);
+				$pdfParams = str_replace("##rotation##", $documentItem['rotation'], $pdfParams);
 
-                if ($documentItem['startpage'] != $documentItem['endpage']) {
+				if ($documentItem['startpage'] != $documentItem['endpage']) {
 
-                    $pdfParams = str_replace("##endpage##", $documentItem['endpage'], $pdfParams);
+					$pdfParams = str_replace("##endpage##", $documentItem['endpage'], $pdfParams);
 
-                } else {
+				} else {
 
-                    // remove parameter endpage
-                    $pdfParams = str_replace(",##endpage##", '', $pdfParams);
+					// remove parameter endpage
+					$pdfParams = str_replace(",##endpage##", '', $pdfParams);
 
-                }
+				}
 
-                $pdfGenerateUrl = $this->conf['pdfgenerate'].$pdfParams;
+				$pdfGenerateUrl = $this->conf['pdfgenerate'].$pdfParams;
 
-                if ($this->conf['pregeneration']) {
+				if ($this->conf['pregeneration']) {
 
-                    // send ajax request to webapp
-                    $output .= '
+					// send ajax request to webapp
+					$output .= '
 					<script>
 						$(document).ready(function(){
 							$.ajax({
@@ -519,431 +519,431 @@ 
 						});
 					</script>';
 
-                }
+				}
 
-            }
+			}
 
-            $update = array('doc_ids' => json_encode($items));
+			$update = array('doc_ids' => json_encode($items));
 
-            $GLOBALS['TYPO3_DB']->exec_UPDATEquery('tx_dlf_basket', 'uid='.intval($basketData['uid']), $update);
+			$GLOBALS['TYPO3_DB']->exec_UPDATEquery('tx_dlf_basket', 'uid='.intval($basketData['uid']), $update);
 
-            $basketData['doc_ids'] = $items;
+			$basketData['doc_ids'] = $items;
 
-        }
+		}
 
-        return array('basketData' => $basketData, 'jsOutput' => $output);
+		return array('basketData' => $basketData, 'jsOutput' => $output);
 
-    }
+	}
 
-    /**
-     * Removes selected documents from basket
-     * @param  array $_piVars    plugin variables
-     * @param  array $basketData array with document information
-     * @return array             basket data
-     */
-    public function removeFromBasket($_piVars, $basketData) {
+	/**
+	 * Removes selected documents from basket
+	 * @param  array $_piVars    plugin variables
+	 * @param  array $basketData array with document information
+	 * @return array             basket data
+	 */
+	public function removeFromBasket($_piVars, $basketData) {
 
-        if (!empty($basketData['doc_ids'])) {
+		if (!empty($basketData['doc_ids'])) {
 
-            $items = $basketData['doc_ids'];
+			$items = $basketData['doc_ids'];
 
-            $items = get_object_vars($items);
+			$items = get_object_vars($items);
 
-        }
+		}
 
-        foreach ($_piVars['selected'] as $key => $value) {
+		foreach ($_piVars['selected'] as $key => $value) {
 
-            if (isset($value['id'])) {
+			if (isset($value['id'])) {
 
-                $arrayKey = $value['id'].'_'.$value['startpage'];
+				$arrayKey = $value['id'].'_'.$value['startpage'];
 
-                if (isset($value['startX'])) {
+				if (isset($value['startX'])) {
 
-                    $arrayKey .= '_'.$value['startX'];
+					$arrayKey .= '_'.$value['startX'];
 
-                }
+				}
 
-                if (isset($value['endX'])) {
+				if (isset($value['endX'])) {
 
-                    $arrayKey .= '_'.$value['endX'];
+					$arrayKey .= '_'.$value['endX'];
 
-                }
+				}
 
-                if (isset($items[$arrayKey])) {
+				if (isset($items[$arrayKey])) {
 
-                    unset($items[$arrayKey]);
+					unset($items[$arrayKey]);
 
-                }
+				}
 
-            }
+			}
 
-        }
+		}
 
-        if (empty($items)) {
+		if (empty($items)) {
 
-            $update = array('doc_ids' => '');
+			$update = array('doc_ids' => '');
 
-        } else {
+		} else {
 
-            $update = array('doc_ids' => json_encode($items));
+			$update = array('doc_ids' => json_encode($items));
 
-        }
+		}
 
-        $GLOBALS['TYPO3_DB']->exec_UPDATEquery('tx_dlf_basket', 'uid='.intval($basketData['uid']), $update);
+		$GLOBALS['TYPO3_DB']->exec_UPDATEquery('tx_dlf_basket', 'uid='.intval($basketData['uid']), $update);
 
-        $basketData['doc_ids'] = $items;
+		$basketData['doc_ids'] = $items;
 
-        return $basketData;
+		return $basketData;
 
-    }
+	}
 
-    /**
-     * Open selected documents from basket
-     * @param  array $_piVars    plugin variables
-     * @param  array $basketData array with document information
-     * @return array             basket data
-     */
-    public function openFromBasket($_piVars, $basketData) {
+	/**
+	 * Open selected documents from basket
+	 * @param  array $_piVars    plugin variables
+	 * @param  array $basketData array with document information
+	 * @return array             basket data
+	 */
+	public function openFromBasket($_piVars, $basketData) {
 
-        $pdfUrl = $this->conf['pdfgenerate'];
+		$pdfUrl = $this->conf['pdfgenerate'];
 
-        foreach ($this->piVars['selected'] as $docId => $docValue) {
+		foreach ($this->piVars['selected'] as $docId => $docValue) {
 
-            if ($docValue['id']) {
+			if ($docValue['id']) {
 
-                $filename .= $docValue['id'].'_';
+				$filename .= $docValue['id'].'_';
 
-                $docData = $this->getDocumentData($docValue['id'], $docValue);
+				$docData = $this->getDocumentData($docValue['id'], $docValue);
 
-                $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
+				$pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
 
-                $numberOfPages += $docData['pageNums'];
+				$numberOfPages += $docData['pageNums'];
 
-            }
+			}
 
-        }
+		}
 
-        header('Location: '.$pdfUrl);
+		header('Location: '.$pdfUrl);
 
-        ob_end_flush();
+		ob_end_flush();
 
-        exit;
+		exit;
 
-    }
+	}
 
-    /**
-     * Returns the downloadurl configured in the basket
-     * @param  integer $id Document id
-     * @return mixed     download url or false
-     */
-    public function getDocumentData($id, $data) {
+	/**
+	 * Returns the downloadurl configured in the basket
+	 * @param  integer $id Document id
+	 * @return mixed     download url or false
+	 */
+	public function getDocumentData($id, $data) {
 
-        // get document instance to load further information
-        $document = tx_dlf_document::getInstance($id,0);
+		// get document instance to load further information
+		$document = tx_dlf_document::getInstance($id,0);
 
-        if ($document) {
+		if ($document) {
 
-            // replace url param placeholder
-            $urlParams = str_replace("##page##", intval($data['page']), $this->conf['pdfparams']);
+			// replace url param placeholder
+			$urlParams = str_replace("##page##", intval($data['page']), $this->conf['pdfparams']);
 
-            $urlParams = str_replace("##docId##", $document->recordId, $urlParams);
+			$urlParams = str_replace("##docId##", $document->recordId, $urlParams);
 
-            $urlParams = str_replace("##startpage##", intval($data['startpage']), $urlParams);
+			$urlParams = str_replace("##startpage##", intval($data['startpage']), $urlParams);
 
-            if ($data['startpage'] != $data['endpage']) {
+			if ($data['startpage'] != $data['endpage']) {
 
-                $urlParams = str_replace("##endpage##", intval($data['endpage']), $urlParams);
+				$urlParams = str_replace("##endpage##", intval($data['endpage']), $urlParams);
 
-            } else {
+			} else {
 
-                // remove parameter endpage
-                $urlParams = str_replace(",##endpage##", '', $urlParams);
+				// remove parameter endpage
+				$urlParams = str_replace(",##endpage##", '', $urlParams);
 
-            }
+			}
 
-            $urlParams = str_replace("##startx##", intval($data['startX']), $urlParams);
+			$urlParams = str_replace("##startx##", intval($data['startX']), $urlParams);
 
-            $urlParams = str_replace("##starty##", intval($data['startY']), $urlParams);
+			$urlParams = str_replace("##starty##", intval($data['startY']), $urlParams);
 
-            $urlParams = str_replace("##endx##", intval($data['endX']), $urlParams);
+			$urlParams = str_replace("##endx##", intval($data['endX']), $urlParams);
 
-            $urlParams = str_replace("##endy##", intval($data['endY']), $urlParams);
+			$urlParams = str_replace("##endy##", intval($data['endY']), $urlParams);
 
-            $urlParams = str_replace("##rotation##", intval($data['rotation']), $urlParams);
+			$urlParams = str_replace("##rotation##", intval($data['rotation']), $urlParams);
 
-            $downloadUrl = $this->conf['pdfgenerate'].$urlParams;
+			$downloadUrl = $this->conf['pdfgenerate'].$urlParams;
 
-            $title = $document->getTitle($id, TRUE);
+			$title = $document->getTitle($id, TRUE);
 
-            if (empty($title)) {
+			if (empty($title)) {
 
-                $title = $this->pi_getLL('noTitle', '', TRUE);
+				$title = $this->pi_getLL('noTitle', '', TRUE);
 
-            }
+			}
 
-            // Set page and cutout information
-            $info = '';
+			// Set page and cutout information
+			$info = '';
 
-            if ($data['startX'] != '' && $data['endX'] != '') {
+			if ($data['startX'] != '' && $data['endX'] != '') {
 
-                // cutout
-                $info .= $this->pi_getLL('cutout', '', TRUE).' ';
+				// cutout
+				$info .= $this->pi_getLL('cutout', '', TRUE).' ';
 
-            }
+			}
 
-            if ($data['startpage'] == $data['endpage']) {
+			if ($data['startpage'] == $data['endpage']) {
 
-                // One page
-                $info .= $this->pi_getLL('page', '', TRUE).' '.$data['startpage'];
+				// One page
+				$info .= $this->pi_getLL('page', '', TRUE).' '.$data['startpage'];
 
-            } else {
+			} else {
 
-                $info .= $this->pi_getLL('page', '', TRUE).' '.$data['startpage'].'-'.$data['endpage'];
+				$info .= $this->pi_getLL('page', '', TRUE).' '.$data['startpage'].'-'.$data['endpage'];
 
-            }
+			}
 
-            $downloadLink = '<a href="'.$downloadUrl.'" target="_blank">'.$title.'</a> ('.$info.')';
+			$downloadLink = '<a href="'.$downloadUrl.'" target="_blank">'.$title.'</a> ('.$info.')';
 
-            if ($data['startpage'] == $data['endpage']) {
+			if ($data['startpage'] == $data['endpage']) {
 
-                $pageNums = 1;
+				$pageNums = 1;
 
-            } else {
+			} else {
 
-                $pageNums = $data['endpage'] - $data['startpage'];
+				$pageNums = $data['endpage'] - $data['startpage'];
 
-            }
+			}
 
-            return array(
-                'downloadUrl' => $downloadUrl,
-                'downloadLink' => $downloadLink,
-                'pageNums'	=> $pageNums,
-                'urlParams' => $urlParams,
-                'record_id' => $document->recordId,
-            );
+			return array(
+				'downloadUrl' => $downloadUrl,
+				'downloadLink' => $downloadLink,
+				'pageNums'	=> $pageNums,
+				'urlParams' => $urlParams,
+				'record_id' => $document->recordId,
+			);
 
-        }
+		}
 
-        return false;
+		return false;
 
-    }
+	}
 
-    /**
-     * Send mail with pdf download url
-     */
-    public function sendMail() {
+	/**
+	 * Send mail with pdf download url
+	 */
+	public function sendMail() {
 
-        // send mail
-        $mailId = $this->piVars['mail_action'];
+		// send mail
+		$mailId = $this->piVars['mail_action'];
 
-        // get id from db and send selected doc downloadlink
-        $resultMail = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-            '*',
-            'tx_dlf_mail',
-            'tx_dlf_mail.uid="'.intval($mailId).'"'.tx_dlf_helper::whereClause('tx_dlf_mail'),
-            '',
-            '',
-            '1'
-        );
+		// get id from db and send selected doc downloadlink
+		$resultMail = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+			'*',
+			'tx_dlf_mail',
+			'tx_dlf_mail.uid="'.intval($mailId).'"'.tx_dlf_helper::whereClause('tx_dlf_mail'),
+			'',
+			'',
+			'1'
+		);
 
-        $mailData = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultMail);
+		$mailData = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultMail);
 
-        $body = $this->pi_getLL('mailBody', '', TRUE)."\n";
+		$body = $this->pi_getLL('mailBody', '', TRUE)."\n";
 
-        $numberOfPages = 0;
+		$numberOfPages = 0;
 
-        $pdfUrl = $this->conf['pdfdownload'];
+		$pdfUrl = $this->conf['pdfdownload'];
 
-        // prepare links
-        foreach ($this->piVars['selected'] as $docId => $docValue) {
+		// prepare links
+		foreach ($this->piVars['selected'] as $docId => $docValue) {
 
-            if ($docValue['id']) {
+			if ($docValue['id']) {
 
-                $explodeId = explode("_", $docValue['id']);
+				$explodeId = explode("_", $docValue['id']);
 
-                $docData = $this->getDocumentData($explodeId[0], $docValue);
+				$docData = $this->getDocumentData($explodeId[0], $docValue);
 
-                $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
+				$pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
 
-                $pages = (abs(intval($docValue['startpage']) - intval($docValue['endpage'])));
+				$pages = (abs(intval($docValue['startpage']) - intval($docValue['endpage'])));
 
-                if ($pages === 0) {
+				if ($pages === 0) {
 
-                    $numberOfPages = $numberOfPages + 1;
+					$numberOfPages = $numberOfPages + 1;
 
-                } else {
+				} else {
 
-                    $numberOfPages = $numberOfPages + $pages;
+					$numberOfPages = $numberOfPages + $pages;
 
-                }
+				}
 
-            }
+			}
 
-        }
+		}
 
-        // Remove leading/tailing pdfparamseperator
-        $pdfUrl = trim($pdfUrl, $this->conf['pdfparamseparator']);
+		// Remove leading/tailing pdfparamseperator
+		$pdfUrl = trim($pdfUrl, $this->conf['pdfparamseparator']);
 
-        $body .= $pdfUrl;
+		$body .= $pdfUrl;
 
-        $from = \TYPO3\CMS\Core\Utility\MailUtility::getSystemFrom();
+		$from = \TYPO3\CMS\Core\Utility\MailUtility::getSystemFrom();
 
-        // send mail
-        $mail = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Mail\\MailMessage');
+		// send mail
+		$mail = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Mail\\MailMessage');
 
-        // Prepare and send the message
-        $mail
-            // subject
-            ->setSubject($this->pi_getLL('mailSubject', '', TRUE))
+		// Prepare and send the message
+		$mail
+			// subject
+			->setSubject($this->pi_getLL('mailSubject', '', TRUE))
 
-            // Set the From address with an associative array
-            ->setFrom($from)
+			// Set the From address with an associative array
+			->setFrom($from)
 
-            // Set the To addresses with an associative array
-            ->setTo(array($mailData['mail'] => $mailData['name']))
+			// Set the To addresses with an associative array
+			->setTo(array($mailData['mail'] => $mailData['name']))
 
-            ->setBody($body, 'text/html')
+			->setBody($body, 'text/html')
 
-            ->send()
-        ;
+			->send()
+		;
 
-        // protocol
-        $insertArray = array(
-            'pid' => $this->conf['pages'],
-            'file_name' => $pdfUrl,
-            'count_pages' => $numberOfPages,
-            'crdate' => time(),
-        );
+		// protocol
+		$insertArray = array(
+			'pid' => $this->conf['pages'],
+			'file_name' => $pdfUrl,
+			'count_pages' => $numberOfPages,
+			'crdate' => time(),
+		);
 
-        if ($GLOBALS["TSFE"]->loginUser) {
+		if ($GLOBALS["TSFE"]->loginUser) {
 
-            // internal user
-            $insertArray['user_id'] = $GLOBALS["TSFE"]->fe_user->user['uid'];
+			// internal user
+			$insertArray['user_id'] = $GLOBALS["TSFE"]->fe_user->user['uid'];
 
-            $insertArray['name'] = $GLOBALS["TSFE"]->fe_user->user['username'];
+			$insertArray['name'] = $GLOBALS["TSFE"]->fe_user->user['username'];
 
-            $insertArray['label'] = 'Mail: '.$mailData['mail'];
+			$insertArray['label'] = 'Mail: '.$mailData['mail'];
 
-        } else {
+		} else {
 
-            // external user
-            $insertArray['user_id'] = 0;
+			// external user
+			$insertArray['user_id'] = 0;
 
-            $insertArray['name'] = 'n/a';
+			$insertArray['name'] = 'n/a';
 
-            $insertArray['label'] = 'Mail: '.$mailData['mail'];
+			$insertArray['label'] = 'Mail: '.$mailData['mail'];
 
-        }
+		}
 
-        // add action to protocol
-        $GLOBALS['TYPO3_DB']->exec_INSERTquery('tx_dlf_actionlog', $insertArray);
+		// add action to protocol
+		$GLOBALS['TYPO3_DB']->exec_INSERTquery('tx_dlf_actionlog', $insertArray);
 
-    }
+	}
 
-    /**
-     * Sends document information to an external printer (url)
-     */
-    public function printDocument() {
+	/**
+	 * Sends document information to an external printer (url)
+	 */
+	public function printDocument() {
 
-        $pdfUrl = $this->conf['pdfprint'];
+		$pdfUrl = $this->conf['pdfprint'];
 
-        foreach ($this->piVars['selected'] as $docId => $docValue) {
+		foreach ($this->piVars['selected'] as $docId => $docValue) {
 
-            if ($docValue['id']) {
+			if ($docValue['id']) {
 
-                $docData = $this->getDocumentData($docValue['id'], $docValue);
+				$docData = $this->getDocumentData($docValue['id'], $docValue);
 
-                $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
+				$pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
 
-                $numberOfPages += $docData['pageNums'];
+				$numberOfPages += $docData['pageNums'];
 
-            }
+			}
 
-        }
+		}
 
-        // get printer data
-        $printerId = $this->piVars['print_action'];
+		// get printer data
+		$printerId = $this->piVars['print_action'];
 
-        // get id from db and send selected doc downloadlink
-        $resultPrinter = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-            '*',
-            'tx_dlf_printer',
-            'tx_dlf_printer.uid="'.intval($printerId).'"'.tx_dlf_helper::whereClause('tx_dlf_basket'),
-            '',
-            '',
-            '1'
-        );
+		// get id from db and send selected doc downloadlink
+		$resultPrinter = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+			'*',
+			'tx_dlf_printer',
+			'tx_dlf_printer.uid="'.intval($printerId).'"'.tx_dlf_helper::whereClause('tx_dlf_basket'),
+			'',
+			'',
+			'1'
+		);
 
-        $printerData = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultPrinter);
+		$printerData = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultPrinter);
 
-        // printer is selected
-        if ($printerData) {
+		// printer is selected
+		if ($printerData) {
 
-            $pdfUrl = $printerData['print'];
+			$pdfUrl = $printerData['print'];
 
-            $filename = 'Document_';
+			$filename = 'Document_';
 
-            $numberOfPages = 0;
+			$numberOfPages = 0;
 
-            foreach ($this->piVars['selected'] as $docId => $docValue) {
+			foreach ($this->piVars['selected'] as $docId => $docValue) {
 
-                if ($docValue['id']) {
+				if ($docValue['id']) {
 
-                    $filename .= $docValue['id'].'_';
+					$filename .= $docValue['id'].'_';
 
-                    $explodeId = explode("_", $docId);
+					$explodeId = explode("_", $docId);
 
-                    $docData = $this->getDocumentData($explodeId[0], $docValue);
+					$docData = $this->getDocumentData($explodeId[0], $docValue);
 
-                    $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
+					$pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
 
-                    $numberOfPages += $docData['pageNums'];
+					$numberOfPages += $docData['pageNums'];
 
-                }
+				}
 
-            }
+			}
 
-            $pdfUrl = trim($pdfUrl, $this->conf['pdfparamseparator']);
+			$pdfUrl = trim($pdfUrl, $this->conf['pdfparamseparator']);
 
-        }
+		}
 
-        // protocol
-        $insertArray = array(
-            'pid' => $this->conf['pages'],
-            'file_name' => $pdfUrl,
-            'count_pages' => $numberOfPages,
-            'crdate' => time(),
-        );
+		// protocol
+		$insertArray = array(
+			'pid' => $this->conf['pages'],
+			'file_name' => $pdfUrl,
+			'count_pages' => $numberOfPages,
+			'crdate' => time(),
+		);
 
-        if ($GLOBALS["TSFE"]->loginUser) {
+		if ($GLOBALS["TSFE"]->loginUser) {
 
-            // internal user
-            $insertArray['user_id'] = $GLOBALS["TSFE"]->fe_user->user['uid'];
+			// internal user
+			$insertArray['user_id'] = $GLOBALS["TSFE"]->fe_user->user['uid'];
 
-            $insertArray['name'] = $GLOBALS["TSFE"]->fe_user->user['username'];
+			$insertArray['name'] = $GLOBALS["TSFE"]->fe_user->user['username'];
 
-            $insertArray['label'] = 'Print: '.$printerData['label'];
+			$insertArray['label'] = 'Print: '.$printerData['label'];
 
-        } else {
+		} else {
 
-            // external user
-            $insertArray['user_id'] = 0;
+			// external user
+			$insertArray['user_id'] = 0;
 
-            $insertArray['name'] = 'n/a';
+			$insertArray['name'] = 'n/a';
 
-            $insertArray['label'] = 'Print: '.$printerData['label'];
+			$insertArray['label'] = 'Print: '.$printerData['label'];
 
-        }
+		}
 
-        // add action to protocol
-        $GLOBALS['TYPO3_DB']->exec_INSERTquery('tx_dlf_actionlog', $insertArray);
+		// add action to protocol
+		$GLOBALS['TYPO3_DB']->exec_INSERTquery('tx_dlf_actionlog', $insertArray);
 
-        header('Location: '.$pdfUrl);
+		header('Location: '.$pdfUrl);
 
-        ob_end_flush();
+		ob_end_flush();
 
-        exit;
+		exit;
 
-    }
+	}
 
 }
\ No newline at end of file

dlf/lib/SolrPhpClient/Apache/Solr/Service.php

Braces +14 added lines, -28 removed lines

@@ -268,8 +268,7 @@ 
 			}
 
 			$queryString = $this->_queryDelimiter . implode($this->_queryStringDelimiter, $escapedParams);
-		}
-		else
+		} else
 		{
 			$queryString = '';
 		}
@@ -309,8 +308,7 @@ 
 		{
 			$queryString = http_build_query($params, null, $this->_queryStringDelimiter);
 			return preg_replace('/%5B(?:[0-9]|[1-9][0-9]+)%5D=/', '=', $queryString);
-		}
-		else
+		} else
 		{
 			$queryString = http_build_query($params);
 			return preg_replace('/\\[(?:[0-9]|[1-9][0-9]+)\\]=/', '=', $queryString);
@@ -390,8 +388,7 @@ 
 		if (empty($host))
 		{
 			throw new Apache_Solr_InvalidArgumentException('Host parameter is empty');
-		}
-		else
+		} else
 		{
 			$this->_host = $host;
 		}
@@ -427,8 +424,7 @@ 
 		if ($port <= 0)
 		{
 			throw new Apache_Solr_InvalidArgumentException('Port is not a valid port number');
-		}
-		else
+		} else
 		{
 			$this->_port = $port;
 		}
@@ -635,8 +631,7 @@ 
 		if ($solrResponse->getHttpStatus() == 200)
 		{
 			return microtime(true) - $start;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -772,8 +767,7 @@ 
 
 					$xml .= '>' . $multivalue . '</field>';
 				}
-			}
-			else
+			} else
 			{
 				$xml .= '<field name="' . $key . '"';
 
@@ -950,8 +944,7 @@ 
 			{
 				throw new Apache_Solr_InvalidArgumentException("\$params must be a valid array or null");
 			}
-		}
-		else
+		} else
 		{
 			$params = array();
 		}
@@ -975,8 +968,7 @@ 
 
 			// delegate the rest to extractFromString
 			return $this->extractFromString($contents, $params, $document, $mimetype);
-		}
-		else
+		} else
 		{
 			throw new Apache_Solr_InvalidArgumentException("File '{$file}' is empty or could not be read");
 		}
@@ -1011,8 +1003,7 @@ 
 			{
 				throw new Apache_Solr_InvalidArgumentException("\$params must be a valid array or null");
 			}
-		}
-		else
+		} else
 		{
 			$params = array();
 		}
@@ -1074,8 +1065,7 @@ 
 			{
 				throw new Apache_Solr_InvalidArgumentException("\$params must be a valid array or null");
 			}
-		}
-		else
+		} else
 		{
 			$params = array();
 		}
@@ -1096,8 +1086,7 @@ 
 
 			// delegate the rest to extractFromString
 			return $this->extractFromString($httpResponse->getBody(), $params, $document, $mimetype);
-		}
-		else
+		} else
 		{
 			throw new Apache_Solr_InvalidArgumentException("URL '{$url}' returned non 200 response code");
 		}
@@ -1147,8 +1136,7 @@ 
 				// params was specified but was not an array - invalid
 				throw new Apache_Solr_InvalidArgumentException("\$params must be a valid array or null");
 			}
-		}
-		else
+		} else
 		{
 			$params = array();
 		}
@@ -1168,12 +1156,10 @@ 
 		if ($method == self::METHOD_GET)
 		{
 			return $this->_sendRawGet($this->_searchUrl . $this->_queryDelimiter . $queryString);
-		}
-		else if ($method == self::METHOD_POST)
+		} else if ($method == self::METHOD_POST)
 		{
 			return $this->_sendRawPost($this->_searchUrl, $queryString, FALSE, 'application/x-www-form-urlencoded; charset=UTF-8');
-		}
-		else
+		} else
 		{
 			throw new Apache_Solr_InvalidArgumentException("Unsupported method '$method', please use the Apache_Solr_Service::METHOD_* constants");
 		}

dlf/lib/SolrPhpClient/Apache/Solr/Document.php

Braces +4 added lines, -8 removed lines

@@ -121,8 +121,7 @@ 
 		if ($boost > 0.0)
 		{
 			$this->_documentBoost = $boost;
-		}
-		else
+		} else
 		{
 			$this->_documentBoost = false;
 		}
@@ -157,8 +156,7 @@ 
 		{
 			// create holding array if this is the first value
 			$this->_fields[$key] = array();
-		}
-		else if (!is_array($this->_fields[$key]))
+		} else if (!is_array($this->_fields[$key]))
 		{
 			// move existing value into array if it is not already an array
 			$this->_fields[$key] = array($this->_fields[$key]);
@@ -168,8 +166,7 @@ 
 		{
 			// boost not already set, set it now
 			$this->setFieldBoost($key, $boost);
-		}
-		else if ((float) $boost > 0.0)
+		} else if ((float) $boost > 0.0)
 		{
 			// multiply passed boost with current field boost - similar to SolrJ implementation
 			$this->_fieldBoosts[$key] *= (float) $boost;
@@ -252,8 +249,7 @@ 
 		if ($boost > 0.0)
 		{
 			$this->_fieldBoosts[$key] = $boost;
-		}
-		else
+		} else
 		{
 			$this->_fieldBoosts[$key] = false;
 		}

dlf/lib/SolrPhpClient/Apache/Solr/Service/Balancer.php

Braces +61 added lines, -62 removed lines

@@ -176,16 +176,14 @@ 
 			$id = $this->_getServiceId($service->getHost(), $service->getPort(), $service->getPath());
 
 			$this->_readableServices[$id] = $service;
-		}
-		else if (is_array($service))
+		} else if (is_array($service))
 		{
 			if (isset($service['host']) && isset($service['port']) && isset($service['path']))
 			{
 				$id = $this->_getServiceId((string)$service['host'], (int)$service['port'], (string)$service['path']);
 
 				$this->_readableServices[$id] = $service;
-			}
-			else
+			} else
 			{
 				throw new Apache_Solr_InvalidArgumentException('A Readable Service description array does not have all required elements of host, port, and path');
 			}
@@ -206,19 +204,16 @@ 
 		if ($service instanceof Apache_Solr_Service)
 		{
 			$id = $this->_getServiceId($service->getHost(), $service->getPort(), $service->getPath());
-		}
-		else if (is_array($service))
+		} else if (is_array($service))
 		{
 			if (isset($service['host']) && isset($service['port']) && isset($service['path']))
 			{
 				$id = $this->_getServiceId((string)$service['host'], (int)$service['port'], (string)$service['path']);
-			}
-			else
+			} else
 			{
 				throw new Apache_Solr_InvalidArgumentException('A Readable Service description array does not have all required elements of host, port, and path');
 			}
-		}
-		else if (is_string($service))
+		} else if (is_string($service))
 		{
 			$id = $service;
 		}
@@ -244,16 +239,14 @@ 
 			$id = $this->_getServiceId($service->getHost(), $service->getPort(), $service->getPath());
 
 			$this->_writeableServices[$id] = $service;
-		}
-		else if (is_array($service))
+		} else if (is_array($service))
 		{
 			if (isset($service['host']) && isset($service['port']) && isset($service['path']))
 			{
 				$id = $this->_getServiceId((string)$service['host'], (int)$service['port'], (string)$service['path']);
 
 				$this->_writeableServices[$id] = $service;
-			}
-			else
+			} else
 			{
 				throw new Apache_Solr_InvalidArgumentException('A Writeable Service description array does not have all required elements of host, port, and path');
 			}
@@ -274,19 +267,16 @@ 
 		if ($service instanceof Apache_Solr_Service)
 		{
 			$id = $this->_getServiceId($service->getHost(), $service->getPort(), $service->getPath());
-		}
-		else if (is_array($service))
+		} else if (is_array($service))
 		{
 			if (isset($service['host']) && isset($service['port']) && isset($service['path']))
 			{
 				$id = $this->_getServiceId((string)$service['host'], (int)$service['port'], (string)$service['path']);
-			}
-			else
+			} else
 			{
 				throw new Apache_Solr_InvalidArgumentException('A Readable Service description array does not have all required elements of host, port, and path');
 			}
-		}
-		else if (is_string($service))
+		} else if (is_string($service))
 		{
 			$id = $service;
 		}
@@ -335,8 +325,7 @@ 
 
 				$service->setCreateDocuments($this->_createDocuments);
 				$this->_currentReadService = $id;
-			}
-			else
+			} else
 			{
 				throw new Apache_Solr_NoServiceAvailableException('No read services were available');
 			}
@@ -387,8 +376,7 @@ 
 				}
 
 				$this->_currentWriteService = $id;
-			}
-			else
+			} else
 			{
 				throw new Apache_Solr_NoServiceAvailableException('No write services were available');
 			}
@@ -441,8 +429,7 @@ 
 					}
 
 				} while($this->_writeableServices[$this->_currentWriteService]->ping($backoff) === false);
-			}
-			else
+			} else
 			{
 				throw new Apache_Solr_NoServiceAvailableException('No write services were available');
 			}
@@ -497,13 +484,14 @@ 
 			try
 			{
 				return $service->add($rawPost);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
+			} catch (Apache_Solr_HttpTransportException $e)
 			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+				if ($e->getCode() != 0) {
+					//IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -532,13 +520,14 @@ 
 			try
 			{
 				return $service->addDocument($document, $allowDups, $overwritePending, $overwriteCommitted);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
+			} catch (Apache_Solr_HttpTransportException $e)
 			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+				if ($e->getCode() != 0) {
+					//IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -567,13 +556,14 @@ 
 			try
 			{
 				return $service->addDocuments($documents, $allowDups, $overwritePending, $overwriteCommitted);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
+			} catch (Apache_Solr_HttpTransportException $e)
 			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+				if ($e->getCode() != 0) {
+					//IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -601,13 +591,14 @@ 
 			try
 			{
 				return $service->commit($optimize, $waitFlush, $waitSearcher, $timeout);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
+			} catch (Apache_Solr_HttpTransportException $e)
 			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+				if ($e->getCode() != 0) {
+					//IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -635,13 +626,14 @@ 
 			try
 			{
 				return $service->delete($rawPost, $timeout);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
+			} catch (Apache_Solr_HttpTransportException $e)
 			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+				if ($e->getCode() != 0) {
+					//IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -670,13 +662,14 @@ 
 			try
 			{
 				return $service->deleteById($id, $fromPending, $fromCommitted, $timeout);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
+			} catch (Apache_Solr_HttpTransportException $e)
 			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+				if ($e->getCode() != 0) {
+					//IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -705,13 +698,14 @@ 
 			try
 			{
 				return $service->deleteByMultipleId($ids, $fromPending, $fromCommitted, $timeout);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
+			} catch (Apache_Solr_HttpTransportException $e)
 			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+				if ($e->getCode() != 0) {
+					//IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -740,13 +734,14 @@ 
 			try
 			{
 				return $service->deleteByQuery($rawQuery, $fromPending, $fromCommitted, $timeout);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
+			} catch (Apache_Solr_HttpTransportException $e)
 			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+				if ($e->getCode() != 0) {
+					//IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -782,13 +777,14 @@ 
 			try
 			{
 				return $service->extract($file, $params, $document, $mimetype);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
+			} catch (Apache_Solr_HttpTransportException $e)
 			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+				if ($e->getCode() != 0) {
+					//IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -826,13 +822,14 @@ 
 			try
 			{
 				return $service->extractFromString($data, $params, $document, $mimetype);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
+			} catch (Apache_Solr_HttpTransportException $e)
 			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+				if ($e->getCode() != 0) {
+					//IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -861,13 +858,14 @@ 
 			try
 			{
 				return $service->optimize($waitFlush, $waitSearcher, $timeout);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
+			} catch (Apache_Solr_HttpTransportException $e)
 			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+				if ($e->getCode() != 0) {
+					//IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectWriteService(true);
@@ -897,13 +895,14 @@ 
 			try
 			{
 				return $service->search($query, $offset, $limit, $params, $method);
-			}
-			catch (Apache_Solr_HttpTransportException $e)
+			} catch (Apache_Solr_HttpTransportException $e)
 			{
-				if ($e->getCode() != 0) //IF NOT COMMUNICATION ERROR
+				if ($e->getCode() != 0) {
+					//IF NOT COMMUNICATION ERROR
 				{
 					throw $e;
 				}
+				}
 			}
 
 			$service = $this->_selectReadService(true);

dlf/lib/SolrPhpClient/Apache/Solr/Response.php

Braces +1 added lines, -2 removed lines

@@ -217,8 +217,7 @@
 				if ($this->_createDocuments)
 				{
 					$document = new Apache_Solr_Document();
-				}
-				else
+				} else
 				{
 					$document = $originalDocument;
 				}

dlf/lib/SolrPhpClient/Apache/Solr/HttpTransport/FileGetContents.php

Braces +1 added lines, -2 removed lines

@@ -81,8 +81,7 @@
 			$timeout = (float) $timeout / 2;
 
 			stream_context_set_option($this->_getContext, 'http', 'timeout', $timeout);
-		}
-		else
+		} else
 		{
 			// use the default timeout pulled from default_socket_timeout otherwise
 			stream_context_set_option($this->_getContext, 'http', 'timeout', $this->getDefaultTimeout());