Project

General

Profile

« Previous | Next » 

Revision 1255

Added by Dietmar over 14 years ago

Ticket #912 fix Search Template bug

View differences:

index.php
1 1
<?php
2
/****************************************************************************
3
* SVN Version information:
2
/*
4 3
*
5
* $Id$
4
*                       About WebsiteBaker
6 5
*
7
*****************************************************************************
8
*                          WebsiteBaker
9
*
10
* WebsiteBaker Project <http://www.websitebaker2.org/>
11
* Copyright (C) 2009, Website Baker Org. e.V.
12
*         http://start.websitebaker2.org/impressum-datenschutz.php
13
* Copyright (C) 2004-2009, Ryan Djurovich
14
*
15
*                        About WebsiteBaker
16
*
17 6
* Website Baker is a PHP-based Content Management System (CMS)
18 7
* designed with one goal in mind: to enable its users to produce websites
19 8
* with ease.
20 9
*
21
*****************************************************************************
10
*                       LICENSE INFORMATION
22 11
*
23
*****************************************************************************
24
*                        LICENSE INFORMATION
25
*
26 12
* WebsiteBaker is free software; you can redistribute it and/or
27 13
* modify it under the terms of the GNU General Public License
28 14
* as published by the Free Software Foundation; either version 2
......
36 22
* You should have received a copy of the GNU General Public License
37 23
* along with this program; if not, write to the Free Software
38 24
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
39
****************************************************************************
40 25
*
41 26
*                   WebsiteBaker Extra Information
42 27
*
43 28
*
44
*
45
*
46
*****************************************************************************/
29
*/
47 30
/**
48 31
 *
49
 * @category     admin
50
 * @package      settings
51
 * @author       Ryan Djurovich
52
 * @copyright    2004-2009, Ryan Djurovich
53
 * @copyright    2009-2010, Website Baker Org. e.V.
54
 * @version      $Id$
55
 * @platform     WebsiteBaker 2.8.x
56
 * @requirements >= PHP 4.3.4
57
 * @license      http://www.gnu.org/licenses/gpl.html
32
 * @category        admin
33
 * @package         settings
34
 * @author          Ryan Djurovich
35
 * @copyright       2004-2009, Ryan Djurovich
36
 * @copyright       2009-2010, Website Baker Org. e.V.
37
 * @filesource		$HeadURL$
38
 * @author          Ryan Djurovich
39
 * @copyright       2004-2009, Ryan Djurovich
58 40
 *
41
 * @author          WebsiteBaker Project
42
 * @link			http://www.websitebaker2.org/
43
 * @copyright       2009-2010, Website Baker Org. e.V.
44
 * @link			http://start.websitebaker2.org/impressum-datenschutz.php
45
 * @license         http://www.gnu.org/licenses/gpl.html
46
 * @version         $Id$
47
 * @platform        WebsiteBaker 2.8.x
48
 * @requirements    PHP 4.3.4 and higher
49
 * @lastmodified    $Date$
50
 *
59 51
 */
60 52

  
61 53
require('../../config.php');
......
304 296
$template->set_var('SELECTED', $selected);
305 297
$template->parse('editor_list', 'editor_list_block', true);  
306 298
$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'wysiwyg'");
307
if($result->numRows() > 0) {
308
	while($addon = $result->fetchRow()) {
299
if($result->numRows() > 0)
300
{
301
	while($addon = $result->fetchRow())
302
    {
309 303
		$template->set_var('FILE', $addon['directory']);
310 304
		$template->set_var('NAME', $addon['name']);
311 305
		if((defined('WYSIWYG_EDITOR') AND $addon['directory'] == WYSIWYG_EDITOR) ? $selected = ' selected="selected"' : $selected = '');
......
316 310

  
317 311
// Insert templates for search settings
318 312
$template->set_block('main_block', 'search_template_list_block', 'search_template_list');
319
$search_template = ($search_template == DEFAULT_TEMPLATE) ? '' : $search_template;
320
if( $search_template == '')
321
{
322
    $selected = ' selected="selected"';
323
}
324
else
325
{
326
  $selected = '';
327
}
328 313

  
314
$search_template = ( ($search_template == DEFAULT_TEMPLATE) OR ($search_template == '') ) ? '' : $search_template;
315

  
316
$selected = ( ($search_template != DEFAULT_TEMPLATE) ) ?  ' selected="selected"' : $selected = '';
317

  
329 318
$template->set_var(array(
330
        'FILE' => DEFAULT_TEMPLATE,
319
        'FILE' => '',
331 320
        'NAME' => $TEXT['SYSTEM_DEFAULT'],
332 321
        'SELECTED' => $selected
333 322
    ));
......
341 330
    {
342 331
		$template->set_var('FILE', $addon['directory']);
343 332
		$template->set_var('NAME', $addon['name']);
333
        $selected = ($addon['directory'] == $search_template) ? ' selected="selected"' :  $selected = '';
334
		$template->set_var('SELECTED', $selected);
344 335

  
345
		if($addon['directory'] == $search_template)
346
        {
347
            $selected = ' selected="selected"';
348
        }
349
        else
350
        {
351
            $selected = '';
352
        }
353

  
354
		$template->set_var('SELECTED', $selected);
355 336
		$template->parse('search_template_list', 'search_template_list_block', true);
356 337
	}
357 338
}
......
362 343
foreach($ER_LEVELS AS $value => $title) {
363 344
	$template->set_var('VALUE', $value);
364 345
	$template->set_var('NAME', $title);
365
	if(ER_LEVEL == $value) {
366
		$template->set_var('SELECTED', ' selected="selected"');
367
	} else {
368
		$template->set_var('SELECTED', '');
369
	}
346
    $selected = (ER_LEVEL == $value) ? ' selected="selected"' : '';
347
    $template->set_var('SELECTED', $selected);
348

  
370 349
	$template->parse('error_reporting_list', 'error_reporting_list_block', true);
371 350
}
372 351

  
......
377 356

  
378 357
// Insert page level limits
379 358
$template->set_block('main_block', 'page_level_limit_list_block', 'page_level_limit_list');
380
for($i = 1; $i <= 10; $i++) {
359
for($i = 1; $i <= 10; $i++)
360
{
381 361
	$template->set_var('NUMBER', $i);
382
	if(PAGE_LEVEL_LIMIT == $i) {
362
	if(PAGE_LEVEL_LIMIT == $i)
363
    {
383 364
		$template->set_var('SELECTED', ' selected="selected"');
384 365
	} else {
385 366
		$template->set_var('SELECTED', '');
386 367

  

Also available in: Unified diff