Passed
Branch oai_solr (423cc8)
by Erik
09:50 queued 02:55
created
dlf/plugins/basket/class.tx_dlf_basket.php 2 patches
Indentation   +547 added lines, -547 removed lines patch added patch discarded remove patch
@@ -19,220 +19,220 @@  discard block
 block discarded – undo
19 19
  */
20 20
 class tx_dlf_basket extends tx_dlf_plugin {
21 21
 
22
-    public $scriptRelPath = 'plugins/basket/class.tx_dlf_basket.php';
22
+	public $scriptRelPath = 'plugins/basket/class.tx_dlf_basket.php';
23 23
 
24
-    /**
25
-     * The main method of the PlugIn
26
-     *
27
-     * @access	public
28
-     *
29
-     * @param	string		$content: The PlugIn content
30
-     * @param	array		$conf: The PlugIn configuration
31
-     *
32
-     * @return	string		The content that is displayed on the website
33
-     */
34
-    public function main($content, $conf) {
24
+	/**
25
+	 * The main method of the PlugIn
26
+	 *
27
+	 * @access	public
28
+	 *
29
+	 * @param	string		$content: The PlugIn content
30
+	 * @param	array		$conf: The PlugIn configuration
31
+	 *
32
+	 * @return	string		The content that is displayed on the website
33
+	 */
34
+	public function main($content, $conf) {
35 35
 
36
-        $this->init($conf);
36
+		$this->init($conf);
37 37
 
38
-        // Don't cache the output.
39
-        $this->setCache(FALSE);
38
+		// Don't cache the output.
39
+		$this->setCache(FALSE);
40 40
 
41
-        // Load template file.
42
-        if (!empty($this->conf['templateFile'])) {
41
+		// Load template file.
42
+		if (!empty($this->conf['templateFile'])) {
43 43
 
44
-            $this->template = $this->cObj->getSubpart($this->cObj->fileResource($this->conf['templateFile']), '###TEMPLATE###');
44
+			$this->template = $this->cObj->getSubpart($this->cObj->fileResource($this->conf['templateFile']), '###TEMPLATE###');
45 45
 
46
-        } else {
46
+		} else {
47 47
 
48
-            $this->template = $this->cObj->getSubpart($this->cObj->fileResource('EXT:dlf/plugins/basket/template.tmpl'), '###TEMPLATE###');
48
+			$this->template = $this->cObj->getSubpart($this->cObj->fileResource('EXT:dlf/plugins/basket/template.tmpl'), '###TEMPLATE###');
49 49
 
50
-        }
50
+		}
51 51
 
52
-        $subpartArray['entry'] = $this->cObj->getSubpart($this->template, '###ENTRY###');
52
+		$subpartArray['entry'] = $this->cObj->getSubpart($this->template, '###ENTRY###');
53 53
 
54
-        $markerArray['###JS###'] = '';
54
+		$markerArray['###JS###'] = '';
55 55
 
56
-        // get user session
57
-        $sessionId = $GLOBALS['TSFE']->fe_user->id;
56
+		// get user session
57
+		$sessionId = $GLOBALS['TSFE']->fe_user->id;
58 58
 
59
-        if ($GLOBALS['TSFE']->loginUser) {
59
+		if ($GLOBALS['TSFE']->loginUser) {
60 60
 
61
-            $insertArray['fe_user_id'] = $GLOBALS['TSFE']->fe_user->user['uid'];
61
+			$insertArray['fe_user_id'] = $GLOBALS['TSFE']->fe_user->user['uid'];
62 62
 
63
-            $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
64
-                '*',
65
-                'tx_dlf_basket',
66
-                'tx_dlf_basket.fe_user_id='.intval($insertArray['fe_user_id']).tx_dlf_helper::whereClause('tx_dlf_basket'),
67
-                '',
68
-                '',
69
-                '1'
70
-            );
63
+			$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
64
+				'*',
65
+				'tx_dlf_basket',
66
+				'tx_dlf_basket.fe_user_id='.intval($insertArray['fe_user_id']).tx_dlf_helper::whereClause('tx_dlf_basket'),
67
+				'',
68
+				'',
69
+				'1'
70
+			);
71 71
 
72
-        } else {
72
+		} else {
73 73
 
74
-            $GLOBALS['TSFE']->fe_user->setKey('ses', 'tx_dlf_basket', '');
74
+			$GLOBALS['TSFE']->fe_user->setKey('ses', 'tx_dlf_basket', '');
75 75
 
76
-            $GLOBALS['TSFE']->fe_user->sesData_change = true;
76
+			$GLOBALS['TSFE']->fe_user->sesData_change = true;
77 77
 
78
-            $GLOBALS['TSFE']->fe_user->storeSessionData();
78
+			$GLOBALS['TSFE']->fe_user->storeSessionData();
79 79
 
80
-            $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
81
-                '*',
82
-                'tx_dlf_basket',
83
-                'tx_dlf_basket.session_id='.$GLOBALS['TYPO3_DB']->fullQuoteStr($sessionId, 'tx_dlf_basket').tx_dlf_helper::whereClause('tx_dlf_basket'),
84
-                '',
85
-                '',
86
-                '1'
87
-            );
80
+			$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
81
+				'*',
82
+				'tx_dlf_basket',
83
+				'tx_dlf_basket.session_id='.$GLOBALS['TYPO3_DB']->fullQuoteStr($sessionId, 'tx_dlf_basket').tx_dlf_helper::whereClause('tx_dlf_basket'),
84
+				'',
85
+				'',
86
+				'1'
87
+			);
88 88
 
89
-        }
89
+		}
90 90
 
91
-        // session already exists
92
-        if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) == 1) {
91
+		// session already exists
92
+		if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) == 1) {
93 93
 
94
-            // basket found get data
95
-            $basketData = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
94
+			// basket found get data
95
+			$basketData = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
96 96
 
97
-        } else {
97
+		} else {
98 98
 
99
-            // create new basket in db
100
-            $insertArray['session_id'] = $sessionId;
99
+			// create new basket in db
100
+			$insertArray['session_id'] = $sessionId;
101 101
 
102
-            $query = $GLOBALS['TYPO3_DB']->exec_INSERTquery('tx_dlf_basket', $insertArray);
102
+			$query = $GLOBALS['TYPO3_DB']->exec_INSERTquery('tx_dlf_basket', $insertArray);
103 103
 
104
-            $res = $GLOBALS['TYPO3_DB']->sql_query($query);
104
+			$res = $GLOBALS['TYPO3_DB']->sql_query($query);
105 105
 
106
-            $basketData = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res);
106
+			$basketData = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res);
107 107
 
108
-        }
108
+		}
109 109
 
110
-        $piVars = $this->piVars;
110
+		$piVars = $this->piVars;
111 111
 
112
-        // action add to basket
113
-        if (!empty($this->piVars['id']) && $this->piVars['addToBasket']) {
112
+		// action add to basket
113
+		if (!empty($this->piVars['id']) && $this->piVars['addToBasket']) {
114 114
 
115
-            $returnData = $this->addToBasket($this->piVars, $basketData);
115
+			$returnData = $this->addToBasket($this->piVars, $basketData);
116 116
 
117
-            $basketData = $returnData['basketData'];
117
+			$basketData = $returnData['basketData'];
118 118
 
119
-            $markerArray['###JS###'] = $returnData['jsOutput'];
119
+			$markerArray['###JS###'] = $returnData['jsOutput'];
120 120
 
121
-        } else {
121
+		} else {
122 122
 
123
-            $basketData['doc_ids'] = json_decode($basketData['doc_ids']);
123
+			$basketData['doc_ids'] = json_decode($basketData['doc_ids']);
124 124
 
125
-        }
125
+		}
126 126
 
127
-        // action remove from basket
128
-        if ($this->piVars['basket_action'] == 'remove') {
127
+		// action remove from basket
128
+		if ($this->piVars['basket_action'] == 'remove') {
129 129
 
130
-            // remove entry from list
131
-            unset($piVars['basket_action']);
130
+			// remove entry from list
131
+			unset($piVars['basket_action']);
132 132
 
133
-            if (isset($this->piVars['selected'])) {
133
+			if (isset($this->piVars['selected'])) {
134 134
 
135
-                $basketData = $this->removeFromBasket($piVars, $basketData);
135
+				$basketData = $this->removeFromBasket($piVars, $basketData);
136 136
 
137
-            }
137
+			}
138 138
 
139
-        }
139
+		}
140 140
 
141
-        // action remove from basket
142
-        if ($this->piVars['basket_action'] == 'open') {
141
+		// action remove from basket
142
+		if ($this->piVars['basket_action'] == 'open') {
143 143
 
144
-            // open selected documents
145
-            unset($piVars['basket_action']);
144
+			// open selected documents
145
+			unset($piVars['basket_action']);
146 146
 
147
-            if (isset($this->piVars['selected'])) {
147
+			if (isset($this->piVars['selected'])) {
148 148
 
149
-                $basketData = $this->openFromBasket($piVars, $basketData);
149
+				$basketData = $this->openFromBasket($piVars, $basketData);
150 150
 
151
-            }
151
+			}
152 152
 
153
-        }
153
+		}
154 154
 
155
-        // action print from basket
156
-        if ($this->piVars['print_action']) {
155
+		// action print from basket
156
+		if ($this->piVars['print_action']) {
157 157
 
158
-            // open selected documents
159
-            unset($piVars['print_action']);
158
+			// open selected documents
159
+			unset($piVars['print_action']);
160 160
 
161
-            if (isset($this->piVars['selected'])) {
161
+			if (isset($this->piVars['selected'])) {
162 162
 
163
-                $basketData = $this->printDocument($piVars, $basketData);
163
+				$basketData = $this->printDocument($piVars, $basketData);
164 164
 
165
-            }
165
+			}
166 166
 
167
-        }
167
+		}
168 168
 
169
-        // action send mail
170
-        if ($this->piVars['mail_action']) {
169
+		// action send mail
170
+		if ($this->piVars['mail_action']) {
171 171
 
172
-            if (isset($this->piVars['selected'])) {
172
+			if (isset($this->piVars['selected'])) {
173 173
 
174
-                $this->sendMail($this->piVars);
174
+				$this->sendMail($this->piVars);
175 175
 
176
-            }
176
+			}
177 177
 
178
-        }
178
+		}
179 179
 
180
-        // set marker
181
-        $markerArray['###ACTION###'] = $this->pi_getPageLink($GLOBALS['TSFE']->id);
180
+		// set marker
181
+		$markerArray['###ACTION###'] = $this->pi_getPageLink($GLOBALS['TSFE']->id);
182 182
 
183
-        $markerArray['###LISTTITLE###'] = $this->pi_getLL('basket', '', TRUE);
183
+		$markerArray['###LISTTITLE###'] = $this->pi_getLL('basket', '', TRUE);
184 184
 
185
-        if ($basketData['doc_ids']) {
185
+		if ($basketData['doc_ids']) {
186 186
 
187
-            if (is_object($basketData['doc_ids'])) {
187
+			if (is_object($basketData['doc_ids'])) {
188 188
 
189
-                $basketData['doc_ids'] = get_object_vars($basketData['doc_ids']);
189
+				$basketData['doc_ids'] = get_object_vars($basketData['doc_ids']);
190 190
 
191
-            }
191
+			}
192 192
 
193
-            $markerArray['###COUNT###'] = sprintf($this->pi_getLL('count'), count($basketData['doc_ids']));
193
+			$markerArray['###COUNT###'] = sprintf($this->pi_getLL('count'), count($basketData['doc_ids']));
194 194
 
195
-        } else {
195
+		} else {
196 196
 
197
-            $markerArray['###COUNT###'] = sprintf($this->pi_getLL('count'), 0);
197
+			$markerArray['###COUNT###'] = sprintf($this->pi_getLL('count'), 0);
198 198
 
199
-        }
199
+		}
200 200
 
201
-        // get mail addresses
202
-        $resultMail = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
203
-            '*',
204
-            'tx_dlf_mail',
205
-            '1'.tx_dlf_helper::whereClause('tx_dlf_mail'),
206
-            '',
207
-            '',
208
-            ''
209
-        );
201
+		// get mail addresses
202
+		$resultMail = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
203
+			'*',
204
+			'tx_dlf_mail',
205
+			'1'.tx_dlf_helper::whereClause('tx_dlf_mail'),
206
+			'',
207
+			'',
208
+			''
209
+		);
210 210
 
211
-        if ($GLOBALS['TYPO3_DB']->sql_num_rows($resultMail) > 0) {
211
+		if ($GLOBALS['TYPO3_DB']->sql_num_rows($resultMail) > 0) {
212 212
 
213
-            $mails = array();
213
+			$mails = array();
214 214
 
215
-            $mailForm = '<select name="tx_dlf[mail_action]">';
215
+			$mailForm = '<select name="tx_dlf[mail_action]">';
216 216
 
217
-            $mailForm .= '<option value="">'.$this->pi_getLL('chooseMail', '', TRUE).'</option>';
217
+			$mailForm .= '<option value="">'.$this->pi_getLL('chooseMail', '', TRUE).'</option>';
218 218
 
219
-            while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultMail)){
219
+			while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultMail)){
220 220
 
221
-                $mails[] = $row;
221
+				$mails[] = $row;
222 222
 
223
-                $mailForm .= '<option value="'.$row['uid'].'">'.$row['name'].' ('.$row['mail'].')</option>';
223
+				$mailForm .= '<option value="'.$row['uid'].'">'.$row['name'].' ('.$row['mail'].')</option>';
224 224
 
225
-            }
225
+			}
226 226
 
227
-            $mailForm .= '</select><input type="submit">';
227
+			$mailForm .= '</select><input type="submit">';
228 228
 
229
-        }
229
+		}
230 230
 
231
-        // mail action form
232
-        $markerArray['###MAILACTION###'] = $mailForm;
231
+		// mail action form
232
+		$markerArray['###MAILACTION###'] = $mailForm;
233 233
 
234
-        // remove action form
235
-        $markerArray['###REMOVEACTION###'] = '
234
+		// remove action form
235
+		$markerArray['###REMOVEACTION###'] = '
236 236
 			<select name="tx_dlf[basket_action]">
237 237
 				<option value="">'.$this->pi_getLL('chooseAction', '', TRUE).'</option>
238 238
 				<option value="open">'.$this->pi_getLL('download', '', TRUE).'</option>
@@ -241,275 +241,275 @@  discard block
 block discarded – undo
241 241
 			<input type="submit">
242 242
 		';
243 243
 
244
-        // get mail addresses
245
-        $resultPrinter = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
246
-            '*',
247
-            'tx_dlf_printer',
248
-            '1'.tx_dlf_helper::whereClause('tx_dlf_printer'),
249
-            '',
250
-            '',
251
-            ''
252
-        );
244
+		// get mail addresses
245
+		$resultPrinter = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
246
+			'*',
247
+			'tx_dlf_printer',
248
+			'1'.tx_dlf_helper::whereClause('tx_dlf_printer'),
249
+			'',
250
+			'',
251
+			''
252
+		);
253 253
 
254
-        $printForm = '';
254
+		$printForm = '';
255 255
 
256
-        if ($GLOBALS['TYPO3_DB']->sql_num_rows($resultPrinter) > 0) {
256
+		if ($GLOBALS['TYPO3_DB']->sql_num_rows($resultPrinter) > 0) {
257 257
 
258
-            $printers = array();
258
+			$printers = array();
259 259
 
260
-            $printForm = '<select name="tx_dlf[print_action]">';
260
+			$printForm = '<select name="tx_dlf[print_action]">';
261 261
 
262
-            $printForm .= '<option value="">'.$this->pi_getLL('choosePrinter', '', TRUE).'</option>';
262
+			$printForm .= '<option value="">'.$this->pi_getLL('choosePrinter', '', TRUE).'</option>';
263 263
 
264
-            while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultPrinter)){
264
+			while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultPrinter)){
265 265
 
266
-                $printers[] = $row;
266
+				$printers[] = $row;
267 267
 
268
-                $printForm .= '<option value="'.$row['uid'].'">'.$row['label'].'</option>';
268
+				$printForm .= '<option value="'.$row['uid'].'">'.$row['label'].'</option>';
269 269
 
270
-            }
270
+			}
271 271
 
272
-            $printForm .= '</select><input type="submit" />';
272
+			$printForm .= '</select><input type="submit" />';
273 273
 
274
-        }
274
+		}
275 275
 
276
-        // print action form
277
-        $markerArray['###PRINTACTION###'] = $printForm;
276
+		// print action form
277
+		$markerArray['###PRINTACTION###'] = $printForm;
278 278
 
279
-        $entries = '';
279
+		$entries = '';
280 280
 
281
-        if (isset($basketData['doc_ids'])) {
281
+		if (isset($basketData['doc_ids'])) {
282 282
 
283
-            // get each entry
284
-            foreach ($basketData['doc_ids'] as $key => $value) {
283
+			// get each entry
284
+			foreach ($basketData['doc_ids'] as $key => $value) {
285 285
 
286
-                $entries .= $this->getEntry($value, $subpartArray);
286
+				$entries .= $this->getEntry($value, $subpartArray);
287 287
 
288
-            }
288
+			}
289 289
 
290
-        } else {
290
+		} else {
291 291
 
292
-            $entries = '';
292
+			$entries = '';
293 293
 
294
-        }
294
+		}
295 295
 
296
-        // basket go to
297
-        if ($this->conf['targetBasket'] && $this->conf['basketGoToButton'] && $this->piVars['id']) {
296
+		// basket go to
297
+		if ($this->conf['targetBasket'] && $this->conf['basketGoToButton'] && $this->piVars['id']) {
298 298
 
299
-            $label = $this->pi_getLL('goBasket', '', TRUE);
299
+			$label = $this->pi_getLL('goBasket', '', TRUE);
300 300
 
301
-            $basketConf = array (
302
-                'parameter' => $this->conf['targetBasket'],
303
-                'title' => $label
304
-            );
301
+			$basketConf = array (
302
+				'parameter' => $this->conf['targetBasket'],
303
+				'title' => $label
304
+			);
305 305
 
306
-            $markerArray['###BASKET###'] = $this->cObj->typoLink($label, $basketConf);
306
+			$markerArray['###BASKET###'] = $this->cObj->typoLink($label, $basketConf);
307 307
 
308
-        } else {
308
+		} else {
309 309
 
310
-            $markerArray['###BASKET###'] = '';
310
+			$markerArray['###BASKET###'] = '';
311 311
 
312
-        }
312
+		}
313 313
 
314
-        $content = $this->cObj->substituteMarkerArray($this->cObj->substituteSubpart($this->template, '###ENTRY###', $entries, TRUE), $markerArray);
314
+		$content = $this->cObj->substituteMarkerArray($this->cObj->substituteSubpart($this->template, '###ENTRY###', $entries, TRUE), $markerArray);
315 315
 
316
-        return $this->pi_wrapInBaseClass($content);
316
+		return $this->pi_wrapInBaseClass($content);
317 317
 
318
-    }
318
+	}
319 319
 
320
-    /**
321
-     * Return one basket entry
322
-     * @param  array $data     DocumentData
323
-     * @param  array $template Template information
324
-     * @return Template
325
-     */
326
-    public function getEntry($data, $template) {
320
+	/**
321
+	 * Return one basket entry
322
+	 * @param  array $data     DocumentData
323
+	 * @param  array $template Template information
324
+	 * @return Template
325
+	 */
326
+	public function getEntry($data, $template) {
327 327
 
328
-        if (is_object($data)) {
328
+		if (is_object($data)) {
329 329
 
330
-            $data = get_object_vars($data);
330
+			$data = get_object_vars($data);
331 331
 
332
-        }
332
+		}
333 333
 
334
-        $id = $data['id'];
334
+		$id = $data['id'];
335 335
 
336
-        $startpage = $data['startpage'];
336
+		$startpage = $data['startpage'];
337 337
 
338
-        $endpage = $data['endpage'];
338
+		$endpage = $data['endpage'];
339 339
 
340
-        $startX = $data['startX'];
340
+		$startX = $data['startX'];
341 341
 
342
-        $startY = $data['startY'];
342
+		$startY = $data['startY'];
343 343
 
344
-        $endX = $data['endX'];
344
+		$endX = $data['endX'];
345 345
 
346
-        $endY = $data['endY'];
346
+		$endY = $data['endY'];
347 347
 
348
-        $rotation = $data['rotation'];
348
+		$rotation = $data['rotation'];
349 349
 
350
-        $docData = $this->getDocumentData($id, $data);
350
+		$docData = $this->getDocumentData($id, $data);
351 351
 
352
-        $markerArray['###BASKETDATA###'] = $docData['downloadLink'];
352
+		$markerArray['###BASKETDATA###'] = $docData['downloadLink'];
353 353
 
354
-        $arrayKey = $id.'_'.$startpage;
354
+		$arrayKey = $id.'_'.$startpage;
355 355
 
356
-        if (isset($startX)) {
356
+		if (isset($startX)) {
357 357
 
358
-            $arrayKey .= '_'.$startX;
358
+			$arrayKey .= '_'.$startX;
359 359
 
360
-        }
360
+		}
361 361
 
362
-        if (isset($endX)) {
362
+		if (isset($endX)) {
363 363
 
364
-            $arrayKey .= '_'.$endX;
364
+			$arrayKey .= '_'.$endX;
365 365
 
366
-        }
366
+		}
367 367
 
368
-        $controlMark = '<input value="'.$id.'" name="tx_dlf[selected]['.$arrayKey.'][id]" type="checkbox">';
368
+		$controlMark = '<input value="'.$id.'" name="tx_dlf[selected]['.$arrayKey.'][id]" type="checkbox">';
369 369
 
370
-        $controlMark .= '<input value="'.$startpage.'" name="tx_dlf[selected]['.$arrayKey.'][startpage]" type="hidden">';
370
+		$controlMark .= '<input value="'.$startpage.'" name="tx_dlf[selected]['.$arrayKey.'][startpage]" type="hidden">';
371 371
 
372
-        $controlMark .= '<input value="'.$endpage.'" name="tx_dlf[selected]['.$arrayKey.'][endpage]" type="hidden">';
372
+		$controlMark .= '<input value="'.$endpage.'" name="tx_dlf[selected]['.$arrayKey.'][endpage]" type="hidden">';
373 373
 
374
-        // add hidden fields for detail information
375
-        if ($startX) {
374
+		// add hidden fields for detail information
375
+		if ($startX) {
376 376
 
377
-            $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][startX]" value="'.$startX.'">';
377
+			$controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][startX]" value="'.$startX.'">';
378 378
 
379
-            $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][startY]"  value="'.$startY.'">';
379
+			$controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][startY]"  value="'.$startY.'">';
380 380
 
381
-            $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][endX]"  value="'.$endX.'">';
381
+			$controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][endX]"  value="'.$endX.'">';
382 382
 
383
-            $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][endY]"  value="'.$endY.'">';
383
+			$controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][endY]"  value="'.$endY.'">';
384 384
 
385
-            $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][rotation]"  value="'.$rotation.'">';
385
+			$controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][rotation]"  value="'.$rotation.'">';
386 386
 
387
-        }
387
+		}
388 388
 
389
-        // return one entry
390
-        $markerArray['###CONTROLS###'] = $controlMark;
389
+		// return one entry
390
+		$markerArray['###CONTROLS###'] = $controlMark;
391 391
 
392
-        $markerArray['###NUMBER###'] = $docData['record_id'];
392
+		$markerArray['###NUMBER###'] = $docData['record_id'];
393 393
 
394
-        return $this->cObj->substituteMarkerArray($this->cObj->substituteSubpart($template['entry'], '###ENTRY###', $subpart, TRUE), $markerArray);
394
+		return $this->cObj->substituteMarkerArray($this->cObj->substituteSubpart($template['entry'], '###ENTRY###', $subpart, TRUE), $markerArray);
395 395
 
396
-    }
396
+	}
397 397
 
398
-    /**
399
-     * Adds documents to the basket
400
-     * @param array $_piVars    piVars
401
-     * @param array $basketData basket data
402
-     */
403
-    public function addToBasket($_piVars, $basketData) {
398
+	/**
399
+	 * Adds documents to the basket
400
+	 * @param array $_piVars    piVars
401
+	 * @param array $basketData basket data
402
+	 */
403
+	public function addToBasket($_piVars, $basketData) {
404 404
 
405
-        if (!$_piVars['startpage']) {
405
+		if (!$_piVars['startpage']) {
406 406
 
407
-            $page = 0;
407
+			$page = 0;
408 408
 
409
-        } else {
409
+		} else {
410 410
 
411
-            $page = intval($_piVars['startpage']);
411
+			$page = intval($_piVars['startpage']);
412 412
 
413
-        }
413
+		}
414 414
 
415
-        if ($page != null || $_piVars['addToBasket'] == 'list') {
415
+		if ($page != null || $_piVars['addToBasket'] == 'list') {
416 416
 
417
-            $documentItem = array(
418
-                'id' => intval($_piVars['id']),
419
-                'startpage' => intval($_piVars['startpage']),
420
-                'endpage' => intval($_piVars['endpage']),
421
-                'startX' => intval($_piVars['startX']),
422
-                'startY' => intval($_piVars['startY']),
423
-                'endX' => intval($_piVars['endX']),
424
-                'endY' => intval($_piVars['endY']),
425
-                'rotation' => intval($_piVars['rotation'])
426
-            );
417
+			$documentItem = array(
418
+				'id' => intval($_piVars['id']),
419
+				'startpage' => intval($_piVars['startpage']),
420
+				'endpage' => intval($_piVars['endpage']),
421
+				'startX' => intval($_piVars['startX']),
422
+				'startY' => intval($_piVars['startY']),
423
+				'endX' => intval($_piVars['endX']),
424
+				'endY' => intval($_piVars['endY']),
425
+				'rotation' => intval($_piVars['rotation'])
426
+			);
427 427
 
428
-            // update basket
429
-            if (!empty($basketData['doc_ids'])) {
428
+			// update basket
429
+			if (!empty($basketData['doc_ids'])) {
430 430
 
431
-                $items = json_decode($basketData['doc_ids']);
431
+				$items = json_decode($basketData['doc_ids']);
432 432
 
433
-                $items = get_object_vars($items);
433
+				$items = get_object_vars($items);
434 434
 
435
-            } else {
435
+			} else {
436 436
 
437
-                $items = array();
437
+				$items = array();
438 438
 
439
-            }
439
+			}
440 440
 
441
-            // get document instance to load further information
442
-            $document = tx_dlf_document::getInstance($documentItem['id'],0);
441
+			// get document instance to load further information
442
+			$document = tx_dlf_document::getInstance($documentItem['id'],0);
443 443
 
444
-            // set endpage for toc and subentry based on logid
445
-            if (($_piVars['addToBasket'] == 'subentry') OR ($_piVars['addToBasket'] == 'toc')) {
444
+			// set endpage for toc and subentry based on logid
445
+			if (($_piVars['addToBasket'] == 'subentry') OR ($_piVars['addToBasket'] == 'toc')) {
446 446
 
447
-                $smLinks = $document->smLinks;
447
+				$smLinks = $document->smLinks;
448 448
 
449
-                $pageCounter = sizeof($smLinks['l2p'][$_piVars['logId']]);
449
+				$pageCounter = sizeof($smLinks['l2p'][$_piVars['logId']]);
450 450
 
451
-                $documentItem['endpage'] = ($documentItem['startpage'] + $pageCounter) - 1;
451
+				$documentItem['endpage'] = ($documentItem['startpage'] + $pageCounter) - 1;
452 452
 
453
-            }
453
+			}
454 454
 
455
-            // add whole document
456
-            if ($_piVars['addToBasket'] == 'list') {
455
+			// add whole document
456
+			if ($_piVars['addToBasket'] == 'list') {
457 457
 
458
-                $documentItem['endpage'] = $document->numPages;
458
+				$documentItem['endpage'] = $document->numPages;
459 459
 
460
-            }
460
+			}
461 461
 
462
-            $arrayKey = $documentItem['id'].'_'.$page;
462
+			$arrayKey = $documentItem['id'].'_'.$page;
463 463
 
464
-            if (!empty($documentItem['startX'])) {
464
+			if (!empty($documentItem['startX'])) {
465 465
 
466
-                $arrayKey .= '_'.$documentItem['startX'];
466
+				$arrayKey .= '_'.$documentItem['startX'];
467 467
 
468
-            }
468
+			}
469 469
 
470
-            if (!empty($documentItem['endX'])) {
470
+			if (!empty($documentItem['endX'])) {
471 471
 
472
-                $arrayKey .= '_'.$documentItem['endX'];
472
+				$arrayKey .= '_'.$documentItem['endX'];
473 473
 
474
-            }
474
+			}
475 475
 
476
-            // do not add more than one identical object
477
-            if (!in_array($arrayKey, $items)) {
476
+			// do not add more than one identical object
477
+			if (!in_array($arrayKey, $items)) {
478 478
 
479
-                $items[$arrayKey] = $documentItem;
479
+				$items[$arrayKey] = $documentItem;
480 480
 
481
-                // replace url param placeholder
482
-                $pdfParams = str_replace("##startpage##", $documentItem['startpage'], $this->conf['pdfparams']);
481
+				// replace url param placeholder
482
+				$pdfParams = str_replace("##startpage##", $documentItem['startpage'], $this->conf['pdfparams']);
483 483
 
484
-                $pdfParams = str_replace("##docId##", $document->recordId, $pdfParams);
484
+				$pdfParams = str_replace("##docId##", $document->recordId, $pdfParams);
485 485
 
486
-                $pdfParams = str_replace("##startx##", $documentItem['startX'], $pdfParams);
486
+				$pdfParams = str_replace("##startx##", $documentItem['startX'], $pdfParams);
487 487
 
488
-                $pdfParams = str_replace("##starty##", $documentItem['startY'], $pdfParams);
488
+				$pdfParams = str_replace("##starty##", $documentItem['startY'], $pdfParams);
489 489
 
490
-                $pdfParams = str_replace("##endx##", $documentItem['endX'], $pdfParams);
490
+				$pdfParams = str_replace("##endx##", $documentItem['endX'], $pdfParams);
491 491
 
492
-                $pdfParams = str_replace("##endy##", $documentItem['endY'], $pdfParams);
492
+				$pdfParams = str_replace("##endy##", $documentItem['endY'], $pdfParams);
493 493
 
494
-                $pdfParams = str_replace("##rotation##", $documentItem['rotation'], $pdfParams);
494
+				$pdfParams = str_replace("##rotation##", $documentItem['rotation'], $pdfParams);
495 495
 
496
-                if ($documentItem['startpage'] != $documentItem['endpage']) {
496
+				if ($documentItem['startpage'] != $documentItem['endpage']) {
497 497
 
498
-                    $pdfParams = str_replace("##endpage##", $documentItem['endpage'], $pdfParams);
498
+					$pdfParams = str_replace("##endpage##", $documentItem['endpage'], $pdfParams);
499 499
 
500
-                } else {
500
+				} else {
501 501
 
502
-                    // remove parameter endpage
503
-                    $pdfParams = str_replace(",##endpage##", '', $pdfParams);
502
+					// remove parameter endpage
503
+					$pdfParams = str_replace(",##endpage##", '', $pdfParams);
504 504
 
505
-                }
505
+				}
506 506
 
507
-                $pdfGenerateUrl = $this->conf['pdfgenerate'].$pdfParams;
507
+				$pdfGenerateUrl = $this->conf['pdfgenerate'].$pdfParams;
508 508
 
509
-                if ($this->conf['pregeneration']) {
509
+				if ($this->conf['pregeneration']) {
510 510
 
511
-                    // send ajax request to webapp
512
-                    $output .= '
511
+					// send ajax request to webapp
512
+					$output .= '
513 513
 					<script>
514 514
 						$(document).ready(function(){
515 515
 							$.ajax({
@@ -519,440 +519,440 @@  discard block
 block discarded – undo
519 519
 						});
520 520
 					</script>';
521 521
 
522
-                }
522
+				}
523 523
 
524
-            }
524
+			}
525 525
 
526
-            $update = array('doc_ids' => json_encode($items));
526
+			$update = array('doc_ids' => json_encode($items));
527 527
 
528
-            $GLOBALS['TYPO3_DB']->exec_UPDATEquery('tx_dlf_basket', 'uid='.intval($basketData['uid']), $update);
528
+			$GLOBALS['TYPO3_DB']->exec_UPDATEquery('tx_dlf_basket', 'uid='.intval($basketData['uid']), $update);
529 529
 
530
-            $basketData['doc_ids'] = $items;
530
+			$basketData['doc_ids'] = $items;
531 531
 
532
-        }
532
+		}
533 533
 
534
-        return array('basketData' => $basketData, 'jsOutput' => $output);
534
+		return array('basketData' => $basketData, 'jsOutput' => $output);
535 535
 
536
-    }
536
+	}
537 537
 
538
-    /**
539
-     * Removes selected documents from basket
540
-     * @param  array $_piVars    plugin variables
541
-     * @param  array $basketData array with document information
542
-     * @return array             basket data
543
-     */
544
-    public function removeFromBasket($_piVars, $basketData) {
538
+	/**
539
+	 * Removes selected documents from basket
540
+	 * @param  array $_piVars    plugin variables
541
+	 * @param  array $basketData array with document information
542
+	 * @return array             basket data
543
+	 */
544
+	public function removeFromBasket($_piVars, $basketData) {
545 545
 
546
-        if (!empty($basketData['doc_ids'])) {
546
+		if (!empty($basketData['doc_ids'])) {
547 547
 
548
-            $items = $basketData['doc_ids'];
548
+			$items = $basketData['doc_ids'];
549 549
 
550
-            $items = get_object_vars($items);
550
+			$items = get_object_vars($items);
551 551
 
552
-        }
552
+		}
553 553
 
554
-        foreach ($_piVars['selected'] as $key => $value) {
554
+		foreach ($_piVars['selected'] as $key => $value) {
555 555
 
556
-            if (isset($value['id'])) {
556
+			if (isset($value['id'])) {
557 557
 
558
-                $arrayKey = $value['id'].'_'.$value['startpage'];
558
+				$arrayKey = $value['id'].'_'.$value['startpage'];
559 559
 
560
-                if (isset($value['startX'])) {
560
+				if (isset($value['startX'])) {
561 561
 
562
-                    $arrayKey .= '_'.$value['startX'];
562
+					$arrayKey .= '_'.$value['startX'];
563 563
 
564
-                }
564
+				}
565 565
 
566
-                if (isset($value['endX'])) {
566
+				if (isset($value['endX'])) {
567 567
 
568
-                    $arrayKey .= '_'.$value['endX'];
568
+					$arrayKey .= '_'.$value['endX'];
569 569
 
570
-                }
570
+				}
571 571
 
572
-                if (isset($items[$arrayKey])) {
572
+				if (isset($items[$arrayKey])) {
573 573
 
574
-                    unset($items[$arrayKey]);
574
+					unset($items[$arrayKey]);
575 575
 
576
-                }
576
+				}
577 577
 
578
-            }
578
+			}
579 579
 
580
-        }
580
+		}
581 581
 
582
-        if (empty($items)) {
582
+		if (empty($items)) {
583 583
 
584
-            $update = array('doc_ids' => '');
584
+			$update = array('doc_ids' => '');
585 585
 
586
-        } else {
586
+		} else {
587 587
 
588
-            $update = array('doc_ids' => json_encode($items));
588
+			$update = array('doc_ids' => json_encode($items));
589 589
 
590
-        }
590
+		}
591 591
 
592
-        $GLOBALS['TYPO3_DB']->exec_UPDATEquery('tx_dlf_basket', 'uid='.intval($basketData['uid']), $update);
592
+		$GLOBALS['TYPO3_DB']->exec_UPDATEquery('tx_dlf_basket', 'uid='.intval($basketData['uid']), $update);
593 593
 
594
-        $basketData['doc_ids'] = $items;
594
+		$basketData['doc_ids'] = $items;
595 595
 
596
-        return $basketData;
596
+		return $basketData;
597 597
 
598
-    }
598
+	}
599 599
 
600
-    /**
601
-     * Open selected documents from basket
602
-     * @param  array $_piVars    plugin variables
603
-     * @param  array $basketData array with document information
604
-     * @return array             basket data
605
-     */
606
-    public function openFromBasket($_piVars, $basketData) {
600
+	/**
601
+	 * Open selected documents from basket
602
+	 * @param  array $_piVars    plugin variables
603
+	 * @param  array $basketData array with document information
604
+	 * @return array             basket data
605
+	 */
606
+	public function openFromBasket($_piVars, $basketData) {
607 607
 
608
-        $pdfUrl = $this->conf['pdfgenerate'];
608
+		$pdfUrl = $this->conf['pdfgenerate'];
609 609
 
610
-        foreach ($this->piVars['selected'] as $docId => $docValue) {
610
+		foreach ($this->piVars['selected'] as $docId => $docValue) {
611 611
 
612
-            if ($docValue['id']) {
612
+			if ($docValue['id']) {
613 613
 
614
-                $filename .= $docValue['id'].'_';
614
+				$filename .= $docValue['id'].'_';
615 615
 
616
-                $docData = $this->getDocumentData($docValue['id'], $docValue);
616
+				$docData = $this->getDocumentData($docValue['id'], $docValue);
617 617
 
618
-                $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
618
+				$pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
619 619
 
620
-                $numberOfPages += $docData['pageNums'];
620
+				$numberOfPages += $docData['pageNums'];
621 621
 
622
-            }
622
+			}
623 623
 
624
-        }
624
+		}
625 625
 
626
-        header('Location: '.$pdfUrl);
626
+		header('Location: '.$pdfUrl);
627 627
 
628
-        ob_end_flush();
628
+		ob_end_flush();
629 629
 
630
-        exit;
630
+		exit;
631 631
 
632
-    }
632
+	}
633 633
 
634
-    /**
635
-     * Returns the downloadurl configured in the basket
636
-     * @param  integer $id Document id
637
-     * @return mixed     download url or false
638
-     */
639
-    public function getDocumentData($id, $data) {
634
+	/**
635
+	 * Returns the downloadurl configured in the basket
636
+	 * @param  integer $id Document id
637
+	 * @return mixed     download url or false
638
+	 */
639
+	public function getDocumentData($id, $data) {
640 640
 
641
-        // get document instance to load further information
642
-        $document = tx_dlf_document::getInstance($id,0);
641
+		// get document instance to load further information
642
+		$document = tx_dlf_document::getInstance($id,0);
643 643
 
644
-        if ($document) {
644
+		if ($document) {
645 645
 
646
-            // replace url param placeholder
647
-            $urlParams = str_replace("##page##", intval($data['page']), $this->conf['pdfparams']);
646
+			// replace url param placeholder
647
+			$urlParams = str_replace("##page##", intval($data['page']), $this->conf['pdfparams']);
648 648
 
649
-            $urlParams = str_replace("##docId##", $document->recordId, $urlParams);
649
+			$urlParams = str_replace("##docId##", $document->recordId, $urlParams);
650 650
 
651
-            $urlParams = str_replace("##startpage##", intval($data['startpage']), $urlParams);
651
+			$urlParams = str_replace("##startpage##", intval($data['startpage']), $urlParams);
652 652
 
653
-            if ($data['startpage'] != $data['endpage']) {
653
+			if ($data['startpage'] != $data['endpage']) {
654 654
 
655
-                $urlParams = str_replace("##endpage##", intval($data['endpage']), $urlParams);
655
+				$urlParams = str_replace("##endpage##", intval($data['endpage']), $urlParams);
656 656
 
657
-            } else {
657
+			} else {
658 658
 
659
-                // remove parameter endpage
660
-                $urlParams = str_replace(",##endpage##", '', $urlParams);
659
+				// remove parameter endpage
660
+				$urlParams = str_replace(",##endpage##", '', $urlParams);
661 661
 
662
-            }
662
+			}
663 663
 
664
-            $urlParams = str_replace("##startx##", intval($data['startX']), $urlParams);
664
+			$urlParams = str_replace("##startx##", intval($data['startX']), $urlParams);
665 665
 
666
-            $urlParams = str_replace("##starty##", intval($data['startY']), $urlParams);
666
+			$urlParams = str_replace("##starty##", intval($data['startY']), $urlParams);
667 667
 
668
-            $urlParams = str_replace("##endx##", intval($data['endX']), $urlParams);
668
+			$urlParams = str_replace("##endx##", intval($data['endX']), $urlParams);
669 669
 
670
-            $urlParams = str_replace("##endy##", intval($data['endY']), $urlParams);
670
+			$urlParams = str_replace("##endy##", intval($data['endY']), $urlParams);
671 671
 
672
-            $urlParams = str_replace("##rotation##", intval($data['rotation']), $urlParams);
672
+			$urlParams = str_replace("##rotation##", intval($data['rotation']), $urlParams);
673 673
 
674
-            $downloadUrl = $this->conf['pdfgenerate'].$urlParams;
674
+			$downloadUrl = $this->conf['pdfgenerate'].$urlParams;
675 675
 
676
-            $title = $document->getTitle($id, TRUE);
676
+			$title = $document->getTitle($id, TRUE);
677 677
 
678
-            if (empty($title)) {
678
+			if (empty($title)) {
679 679
 
680
-                $title = $this->pi_getLL('noTitle', '', TRUE);
680
+				$title = $this->pi_getLL('noTitle', '', TRUE);
681 681
 
682
-            }
682
+			}
683 683
 
684
-            // Set page and cutout information
685
-            $info = '';
684
+			// Set page and cutout information
685
+			$info = '';
686 686
 
687
-            if ($data['startX'] != '' && $data['endX'] != '') {
687
+			if ($data['startX'] != '' && $data['endX'] != '') {
688 688
 
689
-                // cutout
690
-                $info .= $this->pi_getLL('cutout', '', TRUE).' ';
689
+				// cutout
690
+				$info .= $this->pi_getLL('cutout', '', TRUE).' ';
691 691
 
692
-            }
692
+			}
693 693
 
694
-            if ($data['startpage'] == $data['endpage']) {
694
+			if ($data['startpage'] == $data['endpage']) {
695 695
 
696
-                // One page
697
-                $info .= $this->pi_getLL('page', '', TRUE).' '.$data['startpage'];
696
+				// One page
697
+				$info .= $this->pi_getLL('page', '', TRUE).' '.$data['startpage'];
698 698
 
699
-            } else {
699
+			} else {
700 700
 
701
-                $info .= $this->pi_getLL('page', '', TRUE).' '.$data['startpage'].'-'.$data['endpage'];
701
+				$info .= $this->pi_getLL('page', '', TRUE).' '.$data['startpage'].'-'.$data['endpage'];
702 702
 
703
-            }
703
+			}
704 704
 
705
-            $downloadLink = '<a href="'.$downloadUrl.'" target="_new">'.$title.'</a> ('.$info.')';
705
+			$downloadLink = '<a href="'.$downloadUrl.'" target="_new">'.$title.'</a> ('.$info.')';
706 706
 
707
-            if ($data['startpage'] == $data['endpage']) {
707
+			if ($data['startpage'] == $data['endpage']) {
708 708
 
709
-                $pageNums = 1;
709
+				$pageNums = 1;
710 710
 
711
-            } else {
711
+			} else {
712 712
 
713
-                $pageNums = $data['endpage'] - $data['startpage'];
713
+				$pageNums = $data['endpage'] - $data['startpage'];
714 714
 
715
-            }
715
+			}
716 716
 
717
-            return array(
718
-                'downloadUrl' => $downloadUrl,
719
-                'downloadLink' => $downloadLink,
720
-                'pageNums'	=> $pageNums,
721
-                'urlParams' => $urlParams,
722
-                'record_id' => $document->recordId,
723
-            );
717
+			return array(
718
+				'downloadUrl' => $downloadUrl,
719
+				'downloadLink' => $downloadLink,
720
+				'pageNums'	=> $pageNums,
721
+				'urlParams' => $urlParams,
722
+				'record_id' => $document->recordId,
723
+			);
724 724
 
725
-        }
725
+		}
726 726
 
727
-        return false;
727
+		return false;
728 728
 
729
-    }
729
+	}
730 730
 
731
-    /**
732
-     * Send mail with pdf download url
733
-     */
734
-    public function sendMail() {
731
+	/**
732
+	 * Send mail with pdf download url
733
+	 */
734
+	public function sendMail() {
735 735
 
736
-        // send mail
737
-        $mailId = $this->piVars['mail_action'];
736
+		// send mail
737
+		$mailId = $this->piVars['mail_action'];
738 738
 
739
-        // get id from db and send selected doc downloadlink
740
-        $resultMail = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
741
-            '*',
742
-            'tx_dlf_mail',
743
-            'tx_dlf_mail.uid="'.intval($mailId).'"'.tx_dlf_helper::whereClause('tx_dlf_mail'),
744
-            '',
745
-            '',
746
-            '1'
747
-        );
739
+		// get id from db and send selected doc downloadlink
740
+		$resultMail = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
741
+			'*',
742
+			'tx_dlf_mail',
743
+			'tx_dlf_mail.uid="'.intval($mailId).'"'.tx_dlf_helper::whereClause('tx_dlf_mail'),
744
+			'',
745
+			'',
746
+			'1'
747
+		);
748 748
 
749
-        $mailData = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultMail);
749
+		$mailData = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultMail);
750 750
 
751
-        $body = $this->pi_getLL('mailBody', '', TRUE)."\n";
751
+		$body = $this->pi_getLL('mailBody', '', TRUE)."\n";
752 752
 
753
-        $numberOfPages = 0;
753
+		$numberOfPages = 0;
754 754
 
755
-        $pdfUrl = $this->conf['pdfdownload'];
755
+		$pdfUrl = $this->conf['pdfdownload'];
756 756
 
757
-        $i = 0;
757
+		$i = 0;
758 758
 
759
-        // prepare links
760
-        foreach ($this->piVars['selected'] as $docId => $docValue) {
759
+		// prepare links
760
+		foreach ($this->piVars['selected'] as $docId => $docValue) {
761 761
 
762
-            if ($docValue['id']) {
762
+			if ($docValue['id']) {
763 763
 
764
-                $explodeId = explode("_", $docValue['id']);
764
+				$explodeId = explode("_", $docValue['id']);
765 765
 
766
-                $docData = $this->getDocumentData($explodeId[0], $docValue);
766
+				$docData = $this->getDocumentData($explodeId[0], $docValue);
767 767
 
768
-                if ($i === 0) {
768
+				if ($i === 0) {
769 769
 
770
-                    $pdfUrl .= $docData['urlParams'];
770
+					$pdfUrl .= $docData['urlParams'];
771 771
 
772
-                } else {
772
+				} else {
773 773
 
774
-                    $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
774
+					$pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
775 775
 
776
-                }
776
+				}
777 777
 
778
-                $pages = (abs(intval($docValue['startpage']) - intval($docValue['endpage'])));
778
+				$pages = (abs(intval($docValue['startpage']) - intval($docValue['endpage'])));
779 779
 
780
-                if ($pages === 0) {
780
+				if ($pages === 0) {
781 781
 
782
-                    $numberOfPages = $numberOfPages + 1;
782
+					$numberOfPages = $numberOfPages + 1;
783 783
 
784
-                } else {
784
+				} else {
785 785
 
786
-                    $numberOfPages = $numberOfPages + $pages;
786
+					$numberOfPages = $numberOfPages + $pages;
787 787
 
788
-                }
788
+				}
789 789
 
790
-                $i++;
790
+				$i++;
791 791
 
792
-            }
792
+			}
793 793
 
794
-        }
794
+		}
795 795
 
796
-        $body .= $pdfUrl;
796
+		$body .= $pdfUrl;
797 797
 
798
-        $from = \TYPO3\CMS\Core\Utility\MailUtility::getSystemFrom();
798
+		$from = \TYPO3\CMS\Core\Utility\MailUtility::getSystemFrom();
799 799
 
800
-        // send mail
801
-        $mail = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Mail\\MailMessage');
800
+		// send mail
801
+		$mail = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Mail\\MailMessage');
802 802
 
803
-        // Prepare and send the message
804
-        $mail
805
-            // subject
806
-            ->setSubject($this->pi_getLL('mailSubject', '', TRUE))
803
+		// Prepare and send the message
804
+		$mail
805
+			// subject
806
+			->setSubject($this->pi_getLL('mailSubject', '', TRUE))
807 807
 
808
-            // Set the From address with an associative array
809
-            ->setFrom($from)
808
+			// Set the From address with an associative array
809
+			->setFrom($from)
810 810
 
811
-            // Set the To addresses with an associative array
812
-            ->setTo(array($mailData['mail'] => $mailData['name']))
811
+			// Set the To addresses with an associative array
812
+			->setTo(array($mailData['mail'] => $mailData['name']))
813 813
 
814
-            ->setBody($body, 'text/html')
814
+			->setBody($body, 'text/html')
815 815
 
816
-            ->send()
817
-        ;
816
+			->send()
817
+		;
818 818
 
819
-        // protocol
820
-        $insertArray = array(
821
-            'pid' => $this->conf['pages'],
822
-            'file_name' => $pdfUrl,
823
-            'count_pages' => $numberOfPages,
824
-            'crdate' => time(),
825
-        );
819
+		// protocol
820
+		$insertArray = array(
821
+			'pid' => $this->conf['pages'],
822
+			'file_name' => $pdfUrl,
823
+			'count_pages' => $numberOfPages,
824
+			'crdate' => time(),
825
+		);
826 826
 
827
-        if ($GLOBALS["TSFE"]->loginUser) {
827
+		if ($GLOBALS["TSFE"]->loginUser) {
828 828
 
829
-            // internal user
830
-            $insertArray['user_id'] = $GLOBALS["TSFE"]->fe_user->user['uid'];
829
+			// internal user
830
+			$insertArray['user_id'] = $GLOBALS["TSFE"]->fe_user->user['uid'];
831 831
 
832
-            $insertArray['name'] = $GLOBALS["TSFE"]->fe_user->user['username'];
832
+			$insertArray['name'] = $GLOBALS["TSFE"]->fe_user->user['username'];
833 833
 
834
-            $insertArray['label'] = 'Mail: '.$mailData['mail'];
834
+			$insertArray['label'] = 'Mail: '.$mailData['mail'];
835 835
 
836
-        } else {
836
+		} else {
837 837
 
838
-            // external user
839
-            $insertArray['user_id'] = 0;
838
+			// external user
839
+			$insertArray['user_id'] = 0;
840 840
 
841
-            $insertArray['name'] = 'n/a';
841
+			$insertArray['name'] = 'n/a';
842 842
 
843
-            $insertArray['label'] = 'Mail: '.$mailData['mail'];
843
+			$insertArray['label'] = 'Mail: '.$mailData['mail'];
844 844
 
845
-        }
845
+		}
846 846
 
847
-        // add action to protocol
848
-        $GLOBALS['TYPO3_DB']->exec_INSERTquery('tx_dlf_actionlog', $insertArray);
847
+		// add action to protocol
848
+		$GLOBALS['TYPO3_DB']->exec_INSERTquery('tx_dlf_actionlog', $insertArray);
849 849
 
850
-    }
850
+	}
851 851
 
852
-    /**
853
-     * Sends document information to an external printer (url)
854
-     */
855
-    public function printDocument() {
852
+	/**
853
+	 * Sends document information to an external printer (url)
854
+	 */
855
+	public function printDocument() {
856 856
 
857
-        $pdfUrl = $this->conf['pdfprint'];
857
+		$pdfUrl = $this->conf['pdfprint'];
858 858
 
859
-        foreach ($this->piVars['selected'] as $docId => $docValue) {
859
+		foreach ($this->piVars['selected'] as $docId => $docValue) {
860 860
 
861
-            if ($docValue['id']) {
861
+			if ($docValue['id']) {
862 862
 
863
-                $docData = $this->getDocumentData($docValue['id'], $docValue);
863
+				$docData = $this->getDocumentData($docValue['id'], $docValue);
864 864
 
865
-                $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
865
+				$pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
866 866
 
867
-                $numberOfPages += $docData['pageNums'];
867
+				$numberOfPages += $docData['pageNums'];
868 868
 
869
-            }
869
+			}
870 870
 
871
-        }
871
+		}
872 872
 
873
-        // get printer data
874
-        $printerId = $this->piVars['print_action'];
873
+		// get printer data
874
+		$printerId = $this->piVars['print_action'];
875 875
 
876
-        // get id from db and send selected doc downloadlink
877
-        $resultPrinter = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
878
-            '*',
879
-            'tx_dlf_printer',
880
-            'tx_dlf_printer.uid="'.intval($printerId).'"'.tx_dlf_helper::whereClause('tx_dlf_basket'),
881
-            '',
882
-            '',
883
-            '1'
884
-        );
876
+		// get id from db and send selected doc downloadlink
877
+		$resultPrinter = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
878
+			'*',
879
+			'tx_dlf_printer',
880
+			'tx_dlf_printer.uid="'.intval($printerId).'"'.tx_dlf_helper::whereClause('tx_dlf_basket'),
881
+			'',
882
+			'',
883
+			'1'
884
+		);
885 885
 
886
-        $printerData = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultPrinter);
886
+		$printerData = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultPrinter);
887 887
 
888
-        // printer is selected
889
-        if ($printerData) {
888
+		// printer is selected
889
+		if ($printerData) {
890 890
 
891
-            $pdfUrl = $printerData['print'];
891
+			$pdfUrl = $printerData['print'];
892 892
 
893
-            $filename = 'Document_';
893
+			$filename = 'Document_';
894 894
 
895
-            $numberOfPages = 0;
895
+			$numberOfPages = 0;
896 896
 
897
-            foreach ($this->piVars['selected'] as $docId => $docValue) {
897
+			foreach ($this->piVars['selected'] as $docId => $docValue) {
898 898
 
899
-                if ($docValue['id']) {
899
+				if ($docValue['id']) {
900 900
 
901
-                    $filename .= $docValue['id'].'_';
901
+					$filename .= $docValue['id'].'_';
902 902
 
903
-                    $explodeId = explode("_", $docId);
903
+					$explodeId = explode("_", $docId);
904 904
 
905
-                    $docData = $this->getDocumentData($explodeId[0], $docValue);
905
+					$docData = $this->getDocumentData($explodeId[0], $docValue);
906 906
 
907
-                    $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
907
+					$pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
908 908
 
909
-                    $numberOfPages += $docData['pageNums'];
909
+					$numberOfPages += $docData['pageNums'];
910 910
 
911
-                }
911
+				}
912 912
 
913
-            }
913
+			}
914 914
 
915
-            $pdfUrl = trim($pdfUrl, '*');
915
+			$pdfUrl = trim($pdfUrl, '*');
916 916
 
917
-        }
917
+		}
918 918
 
919
-        // protocol
920
-        $insertArray = array(
921
-            'pid' => $this->conf['pages'],
922
-            'file_name' => $pdfUrl,
923
-            'count_pages' => $numberOfPages,
924
-            'crdate' => time(),
925
-        );
919
+		// protocol
920
+		$insertArray = array(
921
+			'pid' => $this->conf['pages'],
922
+			'file_name' => $pdfUrl,
923
+			'count_pages' => $numberOfPages,
924
+			'crdate' => time(),
925
+		);
926 926
 
927
-        if ($GLOBALS["TSFE"]->loginUser) {
927
+		if ($GLOBALS["TSFE"]->loginUser) {
928 928
 
929
-            // internal user
930
-            $insertArray['user_id'] = $GLOBALS["TSFE"]->fe_user->user['uid'];
929
+			// internal user
930
+			$insertArray['user_id'] = $GLOBALS["TSFE"]->fe_user->user['uid'];
931 931
 
932
-            $insertArray['name'] = $GLOBALS["TSFE"]->fe_user->user['username'];
932
+			$insertArray['name'] = $GLOBALS["TSFE"]->fe_user->user['username'];
933 933
 
934
-            $insertArray['label'] = 'Print: '.$printerData['label'];
934
+			$insertArray['label'] = 'Print: '.$printerData['label'];
935 935
 
936
-        } else {
936
+		} else {
937 937
 
938
-            // external user
939
-            $insertArray['user_id'] = 0;
938
+			// external user
939
+			$insertArray['user_id'] = 0;
940 940
 
941
-            $insertArray['name'] = 'n/a';
941
+			$insertArray['name'] = 'n/a';
942 942
 
943
-            $insertArray['label'] = 'Print: '.$printerData['label'];
943
+			$insertArray['label'] = 'Print: '.$printerData['label'];
944 944
 
945
-        }
945
+		}
946 946
 
947
-        // add action to protocol
948
-        $GLOBALS['TYPO3_DB']->exec_INSERTquery('tx_dlf_actionlog', $insertArray);
947
+		// add action to protocol
948
+		$GLOBALS['TYPO3_DB']->exec_INSERTquery('tx_dlf_actionlog', $insertArray);
949 949
 
950
-        header('Location: '.$pdfUrl);
950
+		header('Location: '.$pdfUrl);
951 951
 
952
-        ob_end_flush();
952
+		ob_end_flush();
953 953
 
954
-        exit;
954
+		exit;
955 955
 
956
-    }
956
+	}
957 957
 
958 958
 }
959 959
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
 
217 217
             $mailForm .= '<option value="">'.$this->pi_getLL('chooseMail', '', TRUE).'</option>';
218 218
 
219
-            while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultMail)){
219
+            while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultMail)) {
220 220
 
221 221
                 $mails[] = $row;
222 222
 
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
 
262 262
             $printForm .= '<option value="">'.$this->pi_getLL('choosePrinter', '', TRUE).'</option>';
263 263
 
264
-            while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultPrinter)){
264
+            while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultPrinter)) {
265 265
 
266 266
                 $printers[] = $row;
267 267
 
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
 
299 299
             $label = $this->pi_getLL('goBasket', '', TRUE);
300 300
 
301
-            $basketConf = array (
301
+            $basketConf = array(
302 302
                 'parameter' => $this->conf['targetBasket'],
303 303
                 'title' => $label
304 304
             );
@@ -439,7 +439,7 @@  discard block
 block discarded – undo
439 439
             }
440 440
 
441 441
             // get document instance to load further information
442
-            $document = tx_dlf_document::getInstance($documentItem['id'],0);
442
+            $document = tx_dlf_document::getInstance($documentItem['id'], 0);
443 443
 
444 444
             // set endpage for toc and subentry based on logid
445 445
             if (($_piVars['addToBasket'] == 'subentry') OR ($_piVars['addToBasket'] == 'toc')) {
@@ -639,7 +639,7 @@  discard block
 block discarded – undo
639 639
     public function getDocumentData($id, $data) {
640 640
 
641 641
         // get document instance to load further information
642
-        $document = tx_dlf_document::getInstance($id,0);
642
+        $document = tx_dlf_document::getInstance($id, 0);
643 643
 
644 644
         if ($document) {
645 645
 
Please login to merge, or discard this patch.
dlf/plugins/feeds/class.tx_dlf_feeds.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -164,10 +164,10 @@
 block discarded – undo
164 164
 					$item->appendChild($rss->createElement('title', htmlspecialchars($title, ENT_NOQUOTES, 'UTF-8')));
165 165
 
166 166
 					// Add link.
167
-					$linkConf = array (
167
+					$linkConf = array(
168 168
 						'parameter' => $this->conf['targetPid'],
169 169
 						'forceAbsoluteUrl' => 1,
170
-						'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, array ('id' => $resArray['uid']), '', TRUE, FALSE)
170
+						'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, array('id' => $resArray['uid']), '', TRUE, FALSE)
171 171
 					);
172 172
 
173 173
 					$item->appendChild($rss->createElement('link', htmlspecialchars($this->cObj->typoLink_URL($linkConf), ENT_NOQUOTES, 'UTF-8')));
Please login to merge, or discard this patch.
dlf/plugins/oai/class.tx_dlf_oai.php 1 patch
Spacing   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -43,21 +43,21 @@  discard block
 block discarded – undo
43 43
 	 * @var	array
44 44
 	 * @access protected
45 45
 	 */
46
-	protected $formats = array (
47
-		'oai_dc' => array (
46
+	protected $formats = array(
47
+		'oai_dc' => array(
48 48
 			'schema' => 'http://www.openarchives.org/OAI/2.0/oai_dc.xsd',
49 49
 			'namespace' => 'http://www.openarchives.org/OAI/2.0/oai_dc/',
50
-			'requiredFields' => array ('record_id'),
50
+			'requiredFields' => array('record_id'),
51 51
 		),
52
-		'epicur' => array (
52
+		'epicur' => array(
53 53
 			'schema' => 'http://www.persistent-identifier.de/xepicur/version1.0/xepicur.xsd',
54 54
 			'namespace' => 'urn:nbn:de:1111-2004033116',
55
-			'requiredFields' => array ('purl', 'urn'),
55
+			'requiredFields' => array('purl', 'urn'),
56 56
 		),
57
-		'mets' => array (
57
+		'mets' => array(
58 58
 			'schema' => 'http://www.loc.gov/standards/mets/version17/mets.v1-7.xsd',
59 59
 			'namespace' => 'http://www.loc.gov/METS/',
60
-			'requiredFields' => array ('location'),
60
+			'requiredFields' => array('location'),
61 61
 		)
62 62
 	);
63 63
 
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 
79 79
 		if ($GLOBALS['TYPO3_DB']->sql_affected_rows() === -1) {
80 80
 			// Deletion failed.
81
-			$this->devLog('[tx_dlf_oai->deleteExpiredTokens()] Could not delete expired resumption tokens',SYSLOG_SEVERITY_WARNING);
81
+			$this->devLog('[tx_dlf_oai->deleteExpiredTokens()] Could not delete expired resumption tokens', SYSLOG_SEVERITY_WARNING);
82 82
 		}
83 83
 	}
84 84
 
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 	 */
110 110
 	protected function getUrlParams() {
111 111
 
112
-		$allowedParams = array (
112
+		$allowedParams = array(
113 113
 			'verb',
114 114
 			'identifier',
115 115
 			'metadataPrefix',
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 		);
121 121
 
122 122
 		// Clear plugin variables.
123
-		$this->piVars = array ();
123
+		$this->piVars = array();
124 124
 
125 125
 		// Set only allowed parameters.
126 126
 		foreach ($allowedParams as $param) {
@@ -422,7 +422,7 @@  discard block
 block discarded – undo
422 422
 		}
423 423
 
424 424
 		// Add request.
425
-		$linkConf = array (
425
+		$linkConf = array(
426 426
 			'parameter' => $GLOBALS['TSFE']->id,
427 427
 			'forceAbsoluteUrl' => 1
428 428
 		);
@@ -631,7 +631,7 @@  discard block
 block discarded – undo
631 631
 		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
632 632
 			'tx_dlf_documents.tstamp AS tstamp',
633 633
 			'tx_dlf_documents',
634
-			'tx_dlf_documents.pid=' . intval($this->conf['pages']),
634
+			'tx_dlf_documents.pid='.intval($this->conf['pages']),
635 635
 			'',
636 636
 			'tx_dlf_documents.tstamp ASC',
637 637
 			'1'
@@ -641,10 +641,10 @@  discard block
 block discarded – undo
641 641
 			list ($timestamp) = $GLOBALS['TYPO3_DB']->sql_fetch_row($result);
642 642
 			$earliestDatestamp = gmdate('Y-m-d\TH:i:s\Z', $timestamp);
643 643
 		} else {
644
-			$this->devLog('[tx_dlf_oai->verbIdentify()] No records found with PID "' . $this->conf['pages'] . '"',SYSLOG_SEVERITY_NOTICE);
644
+			$this->devLog('[tx_dlf_oai->verbIdentify()] No records found with PID "'.$this->conf['pages'].'"', SYSLOG_SEVERITY_NOTICE);
645 645
 		}
646 646
 
647
-		$linkConf = array (
647
+		$linkConf = array(
648 648
 			'parameter' => $GLOBALS['TSFE']->id,
649 649
 			'forceAbsoluteUrl' => 1
650 650
 		);
@@ -653,12 +653,12 @@  discard block
 block discarded – undo
653 653
 		// Add identification node.
654 654
 		$Identify = $this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'Identify');
655 655
 		$Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'repositoryName', $repositoryName));
656
-		$Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/','baseURL', $baseURL));
657
-		$Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/','protocolVersion', '2.0'));
658
-		$Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/','adminEmail', $adminEmail));
659
-		$Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/','earliestDatestamp', $earliestDatestamp));
660
-		$Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/','deletedRecord', 'transient'));
661
-		$Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/','granularity', 'YYYY-MM-DDThh:mm:ssZ'));
656
+		$Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'baseURL', $baseURL));
657
+		$Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'protocolVersion', '2.0'));
658
+		$Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'adminEmail', $adminEmail));
659
+		$Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'earliestDatestamp', $earliestDatestamp));
660
+		$Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'deletedRecord', 'transient'));
661
+		$Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'granularity', 'YYYY-MM-DDThh:mm:ssZ'));
662 662
 
663 663
 		return $Identify;
664 664
 	}
@@ -701,7 +701,7 @@  discard block
 block discarded – undo
701 701
 
702 702
 		$resultSet->reset();
703 703
 		$resultSet->add($documentSet);
704
-		$resultSet->metadata = array (
704
+		$resultSet->metadata = array(
705 705
 			'completeListSize' => count($documentSet),
706 706
 			'metadataPrefix' => $this->piVars['metadataPrefix'],
707 707
 		);
@@ -719,7 +719,7 @@  discard block
 block discarded – undo
719 719
 	 */
720 720
 	protected function verbListMetadataFormats() {
721 721
 
722
-		$resArray = array ();
722
+		$resArray = array();
723 723
 
724 724
 		// Check for invalid arguments.
725 725
 		if (count($this->piVars) > 1) {
@@ -810,7 +810,7 @@  discard block
 block discarded – undo
810 810
 
811 811
 		$resultSet->reset();
812 812
 		$resultSet->add($documentSet);
813
-		$resultSet->metadata = array (
813
+		$resultSet->metadata = array(
814 814
 			'completeListSize' => count($documentSet),
815 815
 			'metadataPrefix' => $this->piVars['metadataPrefix'],
816 816
 		);
@@ -892,8 +892,8 @@  discard block
 block discarded – undo
892 892
 			$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
893 893
 				'tx_dlf_collections.index_name AS index_name, tx_dlf_collections.uid AS uid, tx_dlf_collections.index_search as index_query ',
894 894
 				'tx_dlf_collections',
895
-				'tx_dlf_collections.pid=' . intval($this->conf['pages']) . ' AND tx_dlf_collections.oai_name=' . $GLOBALS['TYPO3_DB']->fullQuoteStr($this->piVars['set'],
896
-					'tx_dlf_collections') . $where . tx_dlf_helper::whereClause('tx_dlf_collections'),
895
+				'tx_dlf_collections.pid='.intval($this->conf['pages']).' AND tx_dlf_collections.oai_name='.$GLOBALS['TYPO3_DB']->fullQuoteStr($this->piVars['set'],
896
+					'tx_dlf_collections').$where.tx_dlf_helper::whereClause('tx_dlf_collections'),
897 897
 				'',
898 898
 				'',
899 899
 				'1'
@@ -905,10 +905,10 @@  discard block
 block discarded – undo
905 905
 
906 906
 			$resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
907 907
 
908
-			if($resArray['index_query'] != "") {
909
-				$solr_query .= '(' . $resArray['index_query'] . ')';
908
+			if ($resArray['index_query'] != "") {
909
+				$solr_query .= '('.$resArray['index_query'].')';
910 910
 			} else {
911
-				$solr_query .= 'collection:' . '"' . $resArray['index_name'] . '"';
911
+				$solr_query .= 'collection:'.'"'.$resArray['index_name'].'"';
912 912
 			}
913 913
 
914 914
 		} else {
@@ -919,7 +919,7 @@  discard block
 block discarded – undo
919 919
 
920 920
 		// Check for required fields.
921 921
 		foreach ($this->formats[$this->piVars['metadataPrefix']]['requiredFields'] as $required) {
922
-			$solr_query .= ' NOT ' . $required . ':""';
922
+			$solr_query .= ' NOT '.$required.':""';
923 923
 		}
924 924
 
925 925
 		$from = "*";
@@ -933,7 +933,7 @@  discard block
 block discarded – undo
933 933
 				$timestamp = gmmktime($date_array['tm_hour'], $date_array['tm_min'], $date_array['tm_sec'], $date_array['tm_mon'] + 1,
934 934
 					$date_array['tm_mday'], $date_array['tm_year'] + 1900);
935 935
 
936
-			   $from = date("Y-m-d", $timestamp) . 'T' . date("H:i:s", $timestamp) .'.000Z';
936
+			   $from = date("Y-m-d", $timestamp).'T'.date("H:i:s", $timestamp).'.000Z';
937 937
 
938 938
 			} else {
939 939
 				throw new Exception('badArgument');
@@ -951,7 +951,7 @@  discard block
 block discarded – undo
951 951
 				$timestamp = gmmktime($date_array['tm_hour'], $date_array['tm_min'], $date_array['tm_sec'], $date_array['tm_mon'] + 1,
952 952
 					$date_array['tm_mday'], $date_array['tm_year'] + 1900);
953 953
 
954
-				$until = date("Y-m-d", $timestamp) . 'T' . date("H:i:s", $timestamp) . '.999Z';
954
+				$until = date("Y-m-d", $timestamp).'T'.date("H:i:s", $timestamp).'.999Z';
955 955
 
956 956
 				if ($from != "*" && $from > $until) {
957 957
 					throw new Exception('badArgument');
@@ -969,7 +969,7 @@  discard block
 block discarded – undo
969 969
 			}
970 970
 		}
971 971
 
972
-		$solr_query .= ' AND timestamp:[' . $from . ' TO ' . $until .']';
972
+		$solr_query .= ' AND timestamp:['.$from.' TO '.$until.']';
973 973
 
974 974
 		$documentSet = array();
975 975
 
@@ -1005,7 +1005,7 @@  discard block
 block discarded – undo
1005 1005
 			'tx_dlf_documents',
1006 1006
 			'tx_dlf_relations',
1007 1007
 			'tx_dlf_collections',
1008
-			'AND tx_dlf_documents.uid IN (' . implode(',', $GLOBALS['TYPO3_DB']->cleanIntArray($documentsToProcess)) . ') AND tx_dlf_documents.pid=' . intval($this->conf['pages']) . ' AND tx_dlf_collections.pid=' . intval($this->conf['pages']) . ' AND tx_dlf_relations.ident=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations') . tx_dlf_helper::whereClause('tx_dlf_collections'),
1008
+			'AND tx_dlf_documents.uid IN ('.implode(',', $GLOBALS['TYPO3_DB']->cleanIntArray($documentsToProcess)).') AND tx_dlf_documents.pid='.intval($this->conf['pages']).' AND tx_dlf_collections.pid='.intval($this->conf['pages']).' AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations').tx_dlf_helper::whereClause('tx_dlf_collections'),
1009 1009
 			'tx_dlf_documents.uid',
1010 1010
 			'tx_dlf_documents.tstamp',
1011 1011
 			$this->conf['limit']
@@ -1053,7 +1053,7 @@  discard block
 block discarded – undo
1053 1053
 					$metadata = $this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'metadata');
1054 1054
 
1055 1055
 					$metadataPrefix = $this->piVars['metadataPrefix'];
1056
-					if(!$metadataPrefix) {
1056
+					if (!$metadataPrefix) {
1057 1057
 						// If we resume an action the metadataPrefix is stored with the documentSet
1058 1058
 						$metadataPrefix = $documentListSet->metadata['metadataPrefix'];
1059 1059
 					}
@@ -1108,15 +1108,15 @@  discard block
 block discarded – undo
1108 1108
 				)
1109 1109
 			);
1110 1110
 
1111
-			if($GLOBALS['TYPO3_DB']->sql_affected_rows() == 1) {
1111
+			if ($GLOBALS['TYPO3_DB']->sql_affected_rows() == 1) {
1112 1112
 				$resumptionToken->setAttribute('resumptionToken', htmlspecialchars($token, ENT_NOQUOTES, 'UTF-8'));
1113 1113
 			} else {
1114
-				$this->devLog('[tx_dlf_oai->verb'. $this->piVars['verb'] .'()] Could not create resumption token', SYSLOG_SEVERITY_ERROR);
1114
+				$this->devLog('[tx_dlf_oai->verb'.$this->piVars['verb'].'()] Could not create resumption token', SYSLOG_SEVERITY_ERROR);
1115 1115
 			}
1116 1116
 		}
1117 1117
 
1118 1118
 		$resumptionToken->setAttribute('cursor', intval($documentListSet->metadata['completeListSize']) - count($documentListSet));
1119
-		$resumptionToken->setAttribute('completeListSize',	$documentListSet->metadata['completeListSize']);
1119
+		$resumptionToken->setAttribute('completeListSize', $documentListSet->metadata['completeListSize']);
1120 1120
 		$resumptionToken->setAttribute('expirationDate', gmdate('Y-m-d\TH:i:s\Z', $GLOBALS['EXEC_TIME'] + $this->conf['expired']));
1121 1121
 
1122 1122
 		return $resumptionToken;
@@ -1130,7 +1130,7 @@  discard block
 block discarded – undo
1130 1130
 
1131 1131
 }
1132 1132
 
1133
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dlf/plugins/oai/class.tx_dlf_oai.php'])	{
1133
+if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dlf/plugins/oai/class.tx_dlf_oai.php']) {
1134 1134
 	include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dlf/plugins/oai/class.tx_dlf_oai.php']);
1135 1135
 
1136 1136
 }
Please login to merge, or discard this patch.
dlf/plugins/navigation/class.tx_dlf_navigation.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 			if (count($list) > 0) {
39 39
 
40 40
 				// Build typolink configuration array.
41
-				$conf = array (
41
+				$conf = array(
42 42
 					'useCacheHash' => 1,
43 43
 					'parameter' => $this->conf['targetPid'],
44 44
 					'title' => $this->pi_getLL('linkToList', '', TRUE)
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 	protected function getPageSelector() {
65 65
 
66 66
 		// Configure @action URL for form.
67
-		$linkConf = array (
67
+		$linkConf = array(
68 68
 			'parameter' => $GLOBALS['TSFE']->id,
69 69
 			'forceAbsoluteUrl' => 1
70 70
 		);
@@ -131,9 +131,9 @@  discard block
 block discarded – undo
131 131
 
132 132
 				// Set default values if not set.
133 133
 				// $this->piVars['page'] may be integer or string (physical structure @ID)
134
-				if ( (int)$this->piVars['page'] > 0 || empty($this->piVars['page'])) {
134
+				if ((int) $this->piVars['page'] > 0 || empty($this->piVars['page'])) {
135 135
 
136
-					$this->piVars['page'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange((int)$this->piVars['page'], 1, $this->doc->numPages, 1);
136
+					$this->piVars['page'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange((int) $this->piVars['page'], 1, $this->doc->numPages, 1);
137 137
 
138 138
 				} else {
139 139
 
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 		// Link to first page.
171 171
 		if ($this->piVars['page'] > 1) {
172 172
 
173
-			$markerArray['###FIRST###'] = $this->makeLink($this->pi_getLL('firstPage', '', TRUE), array ('page' => 1));
173
+			$markerArray['###FIRST###'] = $this->makeLink($this->pi_getLL('firstPage', '', TRUE), array('page' => 1));
174 174
 
175 175
 		} else {
176 176
 
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
 		// Link back X pages.
182 182
 		if ($this->piVars['page'] > $pageSteps) {
183 183
 
184
-			$markerArray['###BACK###'] = $this->makeLink(sprintf($this->pi_getLL('backXPages', '', TRUE), $pageSteps), array ('page' => $this->piVars['page'] - $pageSteps));
184
+			$markerArray['###BACK###'] = $this->makeLink(sprintf($this->pi_getLL('backXPages', '', TRUE), $pageSteps), array('page' => $this->piVars['page'] - $pageSteps));
185 185
 
186 186
 		} else {
187 187
 
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
 		// Link to previous page.
193 193
 		if ($this->piVars['page'] > (1 + $this->piVars['double'])) {
194 194
 
195
-			$markerArray['###PREVIOUS###'] = $this->makeLink($this->pi_getLL('prevPage', '', TRUE), array ('page' => $this->piVars['page'] - (1 + $this->piVars['double'])));
195
+			$markerArray['###PREVIOUS###'] = $this->makeLink($this->pi_getLL('prevPage', '', TRUE), array('page' => $this->piVars['page'] - (1 + $this->piVars['double'])));
196 196
 
197 197
 		} else {
198 198
 
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
 		// Link to next page.
204 204
 		if ($this->piVars['page'] < ($this->doc->numPages - $this->piVars['double'])) {
205 205
 
206
-			$markerArray['###NEXT###'] = $this->makeLink($this->pi_getLL('nextPage', '', TRUE), array ('page' => $this->piVars['page'] + (1 + $this->piVars['double'])));
206
+			$markerArray['###NEXT###'] = $this->makeLink($this->pi_getLL('nextPage', '', TRUE), array('page' => $this->piVars['page'] + (1 + $this->piVars['double'])));
207 207
 
208 208
 		} else {
209 209
 
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 		// Link forward X pages.
215 215
 		if ($this->piVars['page'] <= ($this->doc->numPages - $pageSteps)) {
216 216
 
217
-			$markerArray['###FORWARD###'] = $this->makeLink(sprintf($this->pi_getLL('forwardXPages', '', TRUE), $pageSteps), array ('page' => $this->piVars['page'] + $pageSteps));
217
+			$markerArray['###FORWARD###'] = $this->makeLink(sprintf($this->pi_getLL('forwardXPages', '', TRUE), $pageSteps), array('page' => $this->piVars['page'] + $pageSteps));
218 218
 
219 219
 		} else {
220 220
 
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
 		// Link to last page.
226 226
 		if ($this->piVars['page'] < $this->doc->numPages) {
227 227
 
228
-			$markerArray['###LAST###'] = $this->makeLink($this->pi_getLL('lastPage', '', TRUE), array ('page' => $this->doc->numPages));
228
+			$markerArray['###LAST###'] = $this->makeLink($this->pi_getLL('lastPage', '', TRUE), array('page' => $this->doc->numPages));
229 229
 
230 230
 		} else {
231 231
 
@@ -238,17 +238,17 @@  discard block
 block discarded – undo
238 238
 
239 239
 			if (!$this->piVars['double']) {
240 240
 
241
-				$markerArray['###DOUBLEPAGE###'] = $this->makeLink($this->pi_getLL('doublePageOn', '', TRUE), array ('double' => 1), 'class="tx-dlf-navigation-doubleOn"');
241
+				$markerArray['###DOUBLEPAGE###'] = $this->makeLink($this->pi_getLL('doublePageOn', '', TRUE), array('double' => 1), 'class="tx-dlf-navigation-doubleOn"');
242 242
 
243 243
 			} else {
244 244
 
245
-				$markerArray['###DOUBLEPAGE###'] = $this->makeLink($this->pi_getLL('doublePageOff', '', TRUE), array ('double' => 0), 'class="tx-dlf-navigation-doubleOff"');
245
+				$markerArray['###DOUBLEPAGE###'] = $this->makeLink($this->pi_getLL('doublePageOff', '', TRUE), array('double' => 0), 'class="tx-dlf-navigation-doubleOff"');
246 246
 
247 247
 			}
248 248
 
249 249
 			if ($this->piVars['double'] && $this->piVars['page'] < $this->doc->numPages) {
250 250
 
251
-				$markerArray['###DOUBLEPAGE+1###'] = $this->makeLink($this->pi_getLL('doublePage+1', '', TRUE), array ('page' => $this->piVars['page'] + 1));
251
+				$markerArray['###DOUBLEPAGE+1###'] = $this->makeLink($this->pi_getLL('doublePage+1', '', TRUE), array('page' => $this->piVars['page'] + 1));
252 252
 
253 253
 			} else {
254 254
 
@@ -271,11 +271,11 @@  discard block
 block discarded – undo
271 271
 		$markerArray['###LINKLISTVIEW###'] = $this->getLinkToListview();
272 272
 
273 273
 		// fill some language labels if available
274
-		$markerArray['###ZOOM_IN###'] =  $this->pi_getLL('zoom-in', '', TRUE);
274
+		$markerArray['###ZOOM_IN###'] = $this->pi_getLL('zoom-in', '', TRUE);
275 275
 		$markerArray['###ZOOM_OUT###'] = $this->pi_getLL('zoom-out', '', TRUE);
276 276
 		$markerArray['###ZOOM_FULLSCREEN###'] = $this->pi_getLL('zoom-fullscreen', '', TRUE);
277 277
 
278
-		$markerArray['###ROTATE_LEFT###'] =  $this->pi_getLL('rotate-left', '', TRUE);
278
+		$markerArray['###ROTATE_LEFT###'] = $this->pi_getLL('rotate-left', '', TRUE);
279 279
 		$markerArray['###ROTATE_RIGHT###'] = $this->pi_getLL('rotate-right', '', TRUE);
280 280
 		$markerArray['###ROTATE_RESET###'] = $this->pi_getLL('rotate-reset', '', TRUE);
281 281
 
@@ -296,7 +296,7 @@  discard block
 block discarded – undo
296 296
 	 *
297 297
 	 * @return	string		Typolink ready to output
298 298
 	 */
299
-	protected function makeLink($label, array $overrulePIvars = array (), $aTagParams = '') {
299
+	protected function makeLink($label, array $overrulePIvars = array(), $aTagParams = '') {
300 300
 
301 301
 		// Merge plugin variables with new set of values.
302 302
 		if (is_array($this->piVars)) {
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
 		}
311 311
 
312 312
 		// Build typolink configuration array.
313
-		$conf = array (
313
+		$conf = array(
314 314
 			'useCacheHash' => 1,
315 315
 			'parameter' => $GLOBALS['TSFE']->id,
316 316
 			'ATagParams' => $aTagParams,
Please login to merge, or discard this patch.
dlf/plugins/newspaper/class.tx_dlf_newspaper.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 		// Process results.
90 90
 		while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
91 91
 
92
-			$issues[] = array (
92
+			$issues[] = array(
93 93
 				'uid' => $resArray['uid'],
94 94
 				'title' => $resArray['title'],
95 95
 				'year' => $resArray['year']
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 		}
99 99
 
100 100
 		// 	We need an array of issues with month number as key.
101
-		$calendarIssues = array ();
101
+		$calendarIssues = array();
102 102
 
103 103
 		foreach ($issues as $issue) {
104 104
 
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 
107 107
 		}
108 108
 
109
-		$allIssues = array ();
109
+		$allIssues = array();
110 110
 
111 111
 		// Get subpart templates.
112 112
 		$subparts['list'] = $this->cObj->getSubpart($this->template, '###ISSUELIST###');
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 
123 123
 		for ($i = 0; $i <= 11; $i++) {
124 124
 
125
-			$markerArray = array (
125
+			$markerArray = array(
126 126
 				'###DAYMON_NAME###' => strftime('%a', strtotime('last Monday')),
127 127
 				'###DAYTUE_NAME###' => strftime('%a', strtotime('last Tuesday')),
128 128
 				'###DAYWED_NAME###' => strftime('%a', strtotime('last Wednesday')),
@@ -130,20 +130,20 @@  discard block
 block discarded – undo
130 130
 				'###DAYFRI_NAME###' => strftime('%a', strtotime('last Friday')),
131 131
 				'###DAYSAT_NAME###' => strftime('%a', strtotime('last Saturday')),
132 132
 				'###DAYSUN_NAME###' => strftime('%a', strtotime('last Sunday')),
133
-				'###MONTHNAME###' 	=> strftime('%B', strtotime($year . '-' . ($i + 1) . '-1'))
133
+				'###MONTHNAME###' 	=> strftime('%B', strtotime($year.'-'.($i + 1).'-1'))
134 134
 			);
135 135
 
136 136
 			// Reset week content of new month.
137 137
 			$subWeekPartContent = '';
138 138
 
139
-			$firstOfMonth = strtotime($year . '-' . ($i + 1) . '-1');
139
+			$firstOfMonth = strtotime($year.'-'.($i + 1).'-1');
140 140
 			$lastOfMonth = strtotime('last day of', ($firstOfMonth));
141 141
 			$firstOfMonthStart = strtotime('last Monday', $firstOfMonth);
142 142
 
143 143
 			// There are never more than 6 weeks in a month.
144 144
 			for ($j = 0; $j <= 5; $j++) {
145 145
 
146
-				$firstDayOfWeek = strtotime('+ ' . $j . ' Week', $firstOfMonthStart);
146
+				$firstDayOfWeek = strtotime('+ '.$j.' Week', $firstOfMonthStart);
147 147
 
148 148
 				$weekArray = array(
149 149
 					'###DAYMON###' => '&nbsp;',
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
 
165 165
 						$dayLinks = '';
166 166
 
167
-						$dayLinksText = array ();
167
+						$dayLinksText = array();
168 168
 
169 169
 						$dayLinksList = '';
170 170
 
@@ -182,10 +182,10 @@  discard block
 block discarded – undo
182 182
 
183 183
 										$dayLinkLabel = empty($issue['title']) ? strftime('%x', $currentDayTime) : $issue['title'];
184 184
 
185
-										$linkConf = array (
185
+										$linkConf = array(
186 186
 											'useCacheHash' => 1,
187 187
 											'parameter' => $this->conf['targetPid'],
188
-											'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($issue['uid']),
188
+											'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($issue['uid']),
189 189
 											'ATagParams' => ' class="title"',
190 190
 										);
191 191
 
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 
213 213
 							}
214 214
 
215
-							$dayLinkDiv = '<div class="issues"><h4>' . strftime('%d', $currentDayTime) . '</h4><div>'.$dayLinksList.'</div></div>';
215
+							$dayLinkDiv = '<div class="issues"><h4>'.strftime('%d', $currentDayTime).'</h4><div>'.$dayLinksList.'</div></div>';
216 216
 						}
217 217
 
218 218
 						switch (strftime('%w', strtotime('+ '.$k.' Day', $firstDayOfWeek))) {
@@ -257,25 +257,25 @@  discard block
 block discarded – undo
257 257
 		}
258 258
 
259 259
 		// Link to years overview
260
-		$linkConf = array (
260
+		$linkConf = array(
261 261
 			'useCacheHash' => 1,
262 262
 			'parameter' => $this->conf['targetPid'],
263
-			'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($this->doc->parentId),
263
+			'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($this->doc->parentId),
264 264
 		);
265 265
 
266
-		$allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE) . ' ' . $this->doc->getTitle($this->doc->parentId), $linkConf);
266
+		$allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE).' '.$this->doc->getTitle($this->doc->parentId), $linkConf);
267 267
 
268 268
 		// Link to current year.
269
-		$linkConf = array (
269
+		$linkConf = array(
270 270
 			'useCacheHash' => 1,
271 271
 			'parameter' => $this->conf['targetPid'],
272
-			'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($this->doc->uid),
272
+			'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($this->doc->uid),
273 273
 		);
274 274
 
275 275
 		$yearLink = $this->cObj->typoLink($year, $linkConf);
276 276
 
277 277
 		// Prepare list as alternative of the calendar view.
278
-		foreach($allIssues as $dayTime => $issues) {
278
+		foreach ($allIssues as $dayTime => $issues) {
279 279
 
280 280
 			$markerArrayDay['###DATE_STRING###'] = strftime('%A, %x', $dayTime);
281 281
 
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
303 303
 
304 304
 		}
305 305
 
306
-		$markerArray = array (
306
+		$markerArray = array(
307 307
 			'###CALENDARVIEWACTIVE###' => $listViewActive ? '' : 'active',
308 308
 			'###LISTVIEWACTIVE###' => $listViewActive ? 'active' : '',
309 309
 			'###CALYEAR###' => $yearLink,
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
372 372
 		// Process results.
373 373
 		while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
374 374
 
375
-			$years[] = array (
375
+			$years[] = array(
376 376
 				'title' => $resArray['title'],
377 377
 				'uid' => $resArray['uid']
378 378
 			);
@@ -388,8 +388,8 @@  discard block
 block discarded – undo
388 388
 				$linkConf = array(
389 389
 					'useCacheHash' => 1,
390 390
 					'parameter' => $this->conf['targetPid'],
391
-					'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($year['uid']),
392
-					'title' => $titleAnchor . ': ' . $year['title']
391
+					'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($year['uid']),
392
+					'title' => $titleAnchor.': '.$year['title']
393 393
 				);
394 394
 
395 395
 				$yearArray = array(
@@ -402,15 +402,15 @@  discard block
 block discarded – undo
402 402
 		}
403 403
 
404 404
 		// link to years overview (should be itself here)
405
-		$linkConf = array (
405
+		$linkConf = array(
406 406
 			'useCacheHash' => 1,
407 407
 			'parameter' => $this->conf['targetPid'],
408
-			'additionalParams' => '&' . $this->prefixId . '[id]=' . $this->doc->uid,
408
+			'additionalParams' => '&'.$this->prefixId.'[id]='.$this->doc->uid,
409 409
 		);
410
-		$allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE) . ' ' .$this->doc->getTitle($this->doc->uid), $linkConf);
410
+		$allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE).' '.$this->doc->getTitle($this->doc->uid), $linkConf);
411 411
 
412 412
 		// Fill markers.
413
-		$markerArray = array (
413
+		$markerArray = array(
414 414
 			'###LABEL_CHOOSE_YEAR###' => $this->pi_getLL('label.please_choose_year'),
415 415
 			'###CALALLYEARS###' => $allYearsLink
416 416
 		);
Please login to merge, or discard this patch.
dlf/plugins/pagegrid/class.tx_dlf_pagegrid.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 
78 78
 		$piVars['page'] = $number;
79 79
 
80
-		$linkConf = array (
80
+		$linkConf = array(
81 81
 			'useCacheHash' => 1,
82 82
 			'parameter' => $this->conf['targetPid'],
83 83
 			'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $piVars, '', TRUE, FALSE),
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 		// Add link to previous page.
116 116
 		if ($this->piVars['pointer'] > 0) {
117 117
 
118
-			$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;
118
+			$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;
119 119
 
120 120
 		} else {
121 121
 
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 
133 133
 				if ($this->piVars['pointer'] != $i) {
134 134
 
135
-					$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;
135
+					$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;
136 136
 
137 137
 				} else {
138 138
 
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 		// Add link to next page.
158 158
 		if ($this->piVars['pointer'] < $maxPages - 1) {
159 159
 
160
-			$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);
160
+			$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);
161 161
 
162 162
 		} else {
163 163
 
@@ -225,9 +225,9 @@  discard block
 block discarded – undo
225 225
 
226 226
 		// Set some variable defaults.
227 227
 		// $this->piVars['page'] may be integer or string (physical structure @ID)
228
-		if ( (int)$this->piVars['page'] > 0 || empty($this->piVars['page'])) {
228
+		if ((int) $this->piVars['page'] > 0 || empty($this->piVars['page'])) {
229 229
 
230
-			$this->piVars['page'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange((int)$this->piVars['page'], 1, $this->doc->numPages, 1);
230
+			$this->piVars['page'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange((int) $this->piVars['page'], 1, $this->doc->numPages, 1);
231 231
 
232 232
 		} else {
233 233
 
Please login to merge, or discard this patch.
dlf/plugins/listview/class.tx_dlf_listview.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 	 * @var	array
37 37
 	 * @access	protected
38 38
 	 */
39
-	protected $metadata = array ();
39
+	protected $metadata = array();
40 40
 
41 41
 	/**
42 42
 	 * Array of sortable metadata
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 	 * @var	array
45 45
 	 * @access	protected
46 46
 	 */
47
-	protected $sortables = array ();
47
+	protected $sortables = array();
48 48
 
49 49
 	/**
50 50
 	 * Renders the page browser
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 		// Add link to previous page.
72 72
 		if ($this->piVars['pointer'] > 0) {
73 73
 
74
-			$output = $this->pi_linkTP_keepPIvars($this->pi_getLL('prevPage', '&lt;', TRUE), array ('pointer' => $this->piVars['pointer'] - 1), TRUE).$separator;
74
+			$output = $this->pi_linkTP_keepPIvars($this->pi_getLL('prevPage', '&lt;', TRUE), array('pointer' => $this->piVars['pointer'] - 1), TRUE).$separator;
75 75
 
76 76
 		} else {
77 77
 
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 
91 91
 				if ($this->piVars['pointer'] != $i) {
92 92
 
93
-					$output .= $this->pi_linkTP_keepPIvars(sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1), array ('pointer' => $i), TRUE).$separator;
93
+					$output .= $this->pi_linkTP_keepPIvars(sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1), array('pointer' => $i), TRUE).$separator;
94 94
 
95 95
 				} else {
96 96
 
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 		// Add link to next page.
116 116
 		if ($this->piVars['pointer'] < $maxPages - 1) {
117 117
 
118
-			$output .= $this->pi_linkTP_keepPIvars($this->pi_getLL('nextPage', '&gt;', TRUE), array ('pointer' => $this->piVars['pointer'] + 1), TRUE);
118
+			$output .= $this->pi_linkTP_keepPIvars($this->pi_getLL('nextPage', '&gt;', TRUE), array('pointer' => $this->piVars['pointer'] + 1), TRUE);
119 119
 
120 120
 		} else {
121 121
 
@@ -188,12 +188,12 @@  discard block
 block discarded – undo
188 188
 
189 189
 					$imgAlt = htmlspecialchars($value);
190 190
 
191
-					$additionalParams = array (
191
+					$additionalParams = array(
192 192
 						'id' => $this->list[$number]['uid'],
193 193
 						'page' => $this->list[$number]['page']
194 194
 					);
195 195
 
196
-					$conf = array (
196
+					$conf = array(
197 197
 						'useCacheHash' => 1,
198 198
 						'parameter' => $this->conf['targetPid'],
199 199
 						'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE)
@@ -269,9 +269,9 @@  discard block
 block discarded – undo
269 269
 
270 270
 		if (!empty($this->conf['basketButton']) && !empty($this->conf['targetBasket'])) {
271 271
 
272
-			$additionalParams = array ('id' => $this->list[$number]['uid'], 'startpage' => $this->list[$number]['page'], 'addToBasket' => 'list');
272
+			$additionalParams = array('id' => $this->list[$number]['uid'], 'startpage' => $this->list[$number]['page'], 'addToBasket' => 'list');
273 273
 
274
-			$conf = array (
274
+			$conf = array(
275 275
 				'useCacheHash' => 1,
276 276
 				'parameter' => $this->conf['targetBasket'],
277 277
 				'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE)
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
307 307
 		$prefix = str_replace('_', '-', get_class($this));
308 308
 
309 309
 		// Configure @action URL for form.
310
-		$linkConf = array (
310
+		$linkConf = array(
311 311
 			'parameter' => $GLOBALS['TSFE']->id,
312 312
 			'forceAbsoluteUrl' => 1
313 313
 		);
@@ -419,13 +419,13 @@  discard block
 block discarded – undo
419 419
 
420 420
 						$imgAlt = htmlspecialchars($value);
421 421
 
422
-						$additionalParams = array (
422
+						$additionalParams = array(
423 423
 							'id' => $subpart['uid'],
424 424
 							'page' => $subpart['page'],
425 425
 							'highlight_word' => preg_replace('/\s\s+/', ';', $this->list->metadata['searchString'])
426 426
 						);
427 427
 
428
-						$conf = array (
428
+						$conf = array(
429 429
 							// we don't want cHash in case of search parameters
430 430
 							'useCacheHash' => empty($this->list->metadata['searchString']) ? 1 : 0,
431 431
 							'parameter' => $this->conf['targetPid'],
@@ -505,9 +505,9 @@  discard block
 block discarded – undo
505 505
 
506 506
 			if (!empty($this->conf['basketButton']) && !empty($this->conf['targetBasket'])) {
507 507
 
508
-				$additionalParams = array ('id' => $this->list[$number]['uid'], 'startpage' => $subpart['page'], 'endpage' => $subpart['page'], 'logId' => $subpart['sid'], 'addToBasket' => 'subentry');
508
+				$additionalParams = array('id' => $this->list[$number]['uid'], 'startpage' => $subpart['page'], 'endpage' => $subpart['page'], 'logId' => $subpart['sid'], 'addToBasket' => 'subentry');
509 509
 
510
-				$conf = array (
510
+				$conf = array(
511 511
 					'useCacheHash' => 1,
512 512
 					'parameter' => $this->conf['targetBasket'],
513 513
 					'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE)
@@ -549,7 +549,7 @@  discard block
 block discarded – undo
549 549
 
550 550
 			if ($resArray['is_listed']) {
551 551
 
552
-				$this->metadata[$resArray['index_name']] = array (
552
+				$this->metadata[$resArray['index_name']] = array(
553 553
 					'wrap' => $resArray['wrap'],
554 554
 					'label' => tx_dlf_helper::translate($resArray['index_name'], 'tx_dlf_metadata', $this->conf['pages'])
555 555
 				);
Please login to merge, or discard this patch.
dlf/plugins/statistics/class.tx_dlf_statistics.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -108,12 +108,12 @@
 block discarded – undo
108 108
 		$countVolumes = $GLOBALS['TYPO3_DB']->sql_num_rows($resultVolumes);
109 109
 
110 110
 		// Set replacements.
111
-		$replace = array (
112
-			'key' => array (
111
+		$replace = array(
112
+			'key' => array(
113 113
 				'###TITLES###',
114 114
 				'###VOLUMES###'
115 115
 			),
116
-			'value' => array (
116
+			'value' => array(
117 117
 				$countTitles.($countTitles > 1 ? $this->pi_getLL('titles', '', TRUE) : $this->pi_getLL('title', '', TRUE)),
118 118
 				$countVolumes.($countVolumes > 1 ? $this->pi_getLL('volumes', '', TRUE) : $this->pi_getLL('volume', '', TRUE))
119 119
 			)
Please login to merge, or discard this patch.
dlf/plugins/toc/class.tx_dlf_toc.php 2 patches
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -67,37 +67,37 @@
 block discarded – undo
67 67
 
68 68
 			$entryArray['doNotLinkIt'] = 0;
69 69
 
70
-            if ($this->conf['basketButton']) {
70
+			if ($this->conf['basketButton']) {
71 71
 
72
-                $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>';
72
+				$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>';
73 73
 
74
-            }
74
+			}
75 75
 
76
-        } elseif (!empty($entry['points']) && is_string($entry['points'])) {
76
+		} elseif (!empty($entry['points']) && is_string($entry['points'])) {
77 77
 
78 78
 			$entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('id' => $entry['points'], 'page' => 1), TRUE, FALSE, $this->conf['targetPid']);
79 79
 
80 80
 			$entryArray['doNotLinkIt'] = 0;
81 81
 
82
-            if ($this->conf['basketButton']) {
82
+			if ($this->conf['basketButton']) {
83 83
 
84
-                $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>';
84
+				$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>';
85 85
 
86
-            }
86
+			}
87 87
 
88
-        } elseif (!empty($entry['targetUid'])) {
88
+		} elseif (!empty($entry['targetUid'])) {
89 89
 
90 90
 			$entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('id' => $entry['targetUid'], 'page' => 1), TRUE, FALSE, $this->conf['targetPid']);
91 91
 
92 92
 			$entryArray['doNotLinkIt'] = 0;
93 93
 
94
-            if ($this->conf['basketButton']) {
94
+			if ($this->conf['basketButton']) {
95 95
 
96
-                $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>';
96
+				$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>';
97 97
 
98
-            }
98
+			}
99 99
 
100
-        }
100
+		}
101 101
 
102 102
 		// Set "ITEM_STATE" to "CUR" if this entry points to current page.
103 103
 		if (in_array($entry['id'], $this->activeEntries)) {
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 	 * @var	array
28 28
 	 * @access protected
29 29
 	 */
30
-	protected $activeEntries = array ();
30
+	protected $activeEntries = array();
31 31
 
32 32
 	/**
33 33
 	 * This builds an array for one menu entry
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 	 */
42 42
 	protected function getMenuEntry(array $entry, $recursive = FALSE) {
43 43
 
44
-		$entryArray = array ();
44
+		$entryArray = array();
45 45
 
46 46
 		// Set "title", "volume", "type" and "pagination" from $entry array.
47 47
 		$entryArray['title'] = $entry['label'];
@@ -63,37 +63,37 @@  discard block
 block discarded – undo
63 63
 		// Build menu links based on the $entry['points'] array.
64 64
 		if (!empty($entry['points']) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($entry['points'])) {
65 65
 
66
-			$entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('page' => $entry['points']), TRUE, FALSE, $this->conf['targetPid']);
66
+			$entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array('page' => $entry['points']), TRUE, FALSE, $this->conf['targetPid']);
67 67
 
68 68
 			$entryArray['doNotLinkIt'] = 0;
69 69
 
70 70
             if ($this->conf['basketButton']) {
71 71
 
72
-                $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>';
72
+                $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>';
73 73
 
74 74
             }
75 75
 
76 76
         } elseif (!empty($entry['points']) && is_string($entry['points'])) {
77 77
 
78
-			$entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('id' => $entry['points'], 'page' => 1), TRUE, FALSE, $this->conf['targetPid']);
78
+			$entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array('id' => $entry['points'], 'page' => 1), TRUE, FALSE, $this->conf['targetPid']);
79 79
 
80 80
 			$entryArray['doNotLinkIt'] = 0;
81 81
 
82 82
             if ($this->conf['basketButton']) {
83 83
 
84
-                $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>';
84
+                $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>';
85 85
 
86 86
             }
87 87
 
88 88
         } elseif (!empty($entry['targetUid'])) {
89 89
 
90
-			$entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('id' => $entry['targetUid'], 'page' => 1), TRUE, FALSE, $this->conf['targetPid']);
90
+			$entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array('id' => $entry['targetUid'], 'page' => 1), TRUE, FALSE, $this->conf['targetPid']);
91 91
 
92 92
 			$entryArray['doNotLinkIt'] = 0;
93 93
 
94 94
             if ($this->conf['basketButton']) {
95 95
 
96
-                $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>';
96
+                $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>';
97 97
 
98 98
             }
99 99
 
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 			// 4. Current menu node has no corresponding images
117 117
 			if (!empty($this->conf['menuConf.']['expAll']) || $entryArray['ITEM_STATE'] == 'CUR' || is_string($entry['points']) || empty($this->doc->smLinks['l2p'][$entry['id']])) {
118 118
 
119
-				$entryArray['_SUB_MENU'] = array ();
119
+				$entryArray['_SUB_MENU'] = array();
120 120
 
121 121
 				foreach ($entry['children'] as $child) {
122 122
 
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
180 180
 
181 181
 		}
182 182
 
183
-		$TSconfig = array ();
183
+		$TSconfig = array();
184 184
 
185 185
 		$TSconfig['special'] = 'userfunction';
186 186
 
@@ -216,15 +216,15 @@  discard block
 block discarded – undo
216 216
 		if ($this->doc === NULL) {
217 217
 
218 218
 			// Quit without doing anything if required variables are not set.
219
-			return array ();
219
+			return array();
220 220
 
221 221
 		} else {
222 222
 
223 223
 			// Set default values for page if not set.
224 224
 			// $this->piVars['page'] may be integer or string (physical structure @ID)
225
-			if ( (int)$this->piVars['page'] > 0 || empty($this->piVars['page'])) {
225
+			if ((int) $this->piVars['page'] > 0 || empty($this->piVars['page'])) {
226 226
 
227
-				$this->piVars['page'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange((int)$this->piVars['page'], 1, $this->doc->numPages, 1);
227
+				$this->piVars['page'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange((int) $this->piVars['page'], 1, $this->doc->numPages, 1);
228 228
 
229 229
 			} else {
230 230
 
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
 
237 237
 		}
238 238
 
239
-		$menuArray = array ();
239
+		$menuArray = array();
240 240
 
241 241
 		// Does the document have physical elements or is it an external file?
242 242
 		if ($this->doc->physicalStructure || !\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->doc->uid)) {
@@ -293,11 +293,11 @@  discard block
 block discarded – undo
293 293
 
294 294
 				$menuArray[0]['ITEM_STATE'] = 'CURIFSUB';
295 295
 
296
-				$menuArray[0]['_SUB_MENU'] = array ();
296
+				$menuArray[0]['_SUB_MENU'] = array();
297 297
 
298 298
 				while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
299 299
 
300
-					$entry = array (
300
+					$entry = array(
301 301
 						'label' => $resArray['title'],
302 302
 						'type' => $resArray['type'],
303 303
 						'volume' => $resArray['volume'],
Please login to merge, or discard this patch.