Merge lp:~sebastian-meyer/goobi-presentation/bug826641 into lp:goobi-presentation/1.0

[Sebastian Meyer]

Fix Bug #826641: Page view doesn't default to first page

[Sebastian Meyer (sebastian-meyer)]

review: Approve

=== modified file 'dlf/common/class.tx_dlf_plugin.php'
--- dlf/common/class.tx_dlf_plugin.php	2011-08-02 17:38:33 +0000
+++ dlf/common/class.tx_dlf_plugin.php	2011-08-15 15:30:34 +0000
@@ -66,29 +66,6 @@
 	protected $template = '';
 
 	/**
-	 * Checks $this->piVars array for common required fields and sets some default values
-	 *
-	 * @access	protected
-	 *
-	 * @param	boolean		$dontSetDefaults: If TRUE only checks for required fields are performed
-	 *
-	 * @return	boolean		TRUE on success or FALSE when required fields are missing
-	 */
-	protected function checkPIvars($dontSetDefaults = FALSE) {
-
-		if (!$dontSetDefaults) {
-
-			// Set default values for some fields if not set.
-			$this->piVars['page'] = (!empty($this->piVars['page']) ? max(intval($this->piVars['page']), 1) : 1);
-
-		}
-
-		// Check for required fields.
-		return !empty($this->piVars['id']);
-
-	}
-
-	/**
 	 * All the needed configuration values are stored in class variables
 	 * Priority: Flexforms > TS-Templates > Extension Configuration > ext_localconf.php
 	 *
@@ -179,8 +156,8 @@
 	 */
 	protected function loadDocument() {
 
-		// Check for required fields.
-		if ($this->checkPIvars(TRUE)) {
+		// Check for required variable.
+		if (!empty($this->piVars['id'])) {
 
 			// Should we exclude documents from other pages than $this->conf['pages']?
 			$pid = (!empty($this->conf['excludeOther']) ? intval($this->conf['pages']) : 0);
@@ -196,7 +173,7 @@
 
 		} else {
 
-			trigger_error('Required parameters are not set', E_USER_ERROR);
+			trigger_error('No UID given for document', E_USER_ERROR);
 
 		}
 

=== modified file 'dlf/plugins/navigation/class.tx_dlf_navigation.php'
--- dlf/plugins/navigation/class.tx_dlf_navigation.php	2011-08-02 17:38:33 +0000
+++ dlf/plugins/navigation/class.tx_dlf_navigation.php	2011-08-15 15:30:34 +0000
@@ -63,7 +63,8 @@
 
 		} else {
 
-			$this->piVars['page'] = min($this->piVars['page'], $this->doc->numPages);
+			// Set default values for page if not set.
+			$this->piVars['page'] = t3lib_div::intInRange($this->piVars['page'], 1, $this->doc->numPages, 1);
 
 		}
 

=== modified file 'dlf/plugins/pageview/class.tx_dlf_pageview.php'
--- dlf/plugins/pageview/class.tx_dlf_pageview.php	2011-08-02 17:38:33 +0000
+++ dlf/plugins/pageview/class.tx_dlf_pageview.php	2011-08-15 15:30:34 +0000
@@ -159,7 +159,8 @@
 
 		} else {
 
-			$this->piVars['page'] = min($this->piVars['page'], $this->doc->numPages);
+			// Set default values for page if not set.
+			$this->piVars['page'] = t3lib_div::intInRange($this->piVars['page'], 1, $this->doc->numPages, 1);
 
 		}
 

=== modified file 'dlf/plugins/toc/class.tx_dlf_toc.php'
--- dlf/plugins/toc/class.tx_dlf_toc.php	2011-08-10 16:08:20 +0000
+++ dlf/plugins/toc/class.tx_dlf_toc.php	2011-08-15 15:30:34 +0000
@@ -169,9 +169,15 @@
 
 		}
 
-		// Quit without doing anything if required piVars are not set.
-		if (!$this->checkPIvars()) {
-
+		// Check for required variable.
+		if (!empty($this->piVars['id'])) {
+
+			// Set default values for page if not set.
+			$this->piVars['page'] = (!empty($this->piVars['page']) ? max(intval($this->piVars['page']), 1) : 1);
+
+		} else {
+
+			// Quit without doing anything.
 			return $content;
 
 		}

=== modified file 'dlf/plugins/toolbox/class.tx_dlf_toolbox.php'
--- dlf/plugins/toolbox/class.tx_dlf_toolbox.php	2011-04-01 15:53:16 +0000
+++ dlf/plugins/toolbox/class.tx_dlf_toolbox.php	2011-08-15 15:30:34 +0000
@@ -56,8 +56,8 @@
 		// Turn cache off.
 		$this->setCache(FALSE);
 
-		// Quit without doing anything if required piVars are not set.
-		if (!$this->checkPIvars(TRUE)) {
+		// Quit without doing anything if required variable is not set.
+		if (empty($this->piVars['id'])) {
 
 			return $content;