Project

General

Profile

« Previous | Next » 

Revision 1843

Added by Dietmar almost 12 years ago

! trash only will be shown if more than one section exists
! In the server settings the renaming of the page_directory is only possible, if no page exists

View differences:

branches/2.8.x/CHANGELOG
12 12
===============================================================================
13 13

  
14 14

  
15
27 Dez-2012 Build 1843 Dietmar Woellbrink (Luisehahne)
16
! trash only will be shown in sectionmanagement if more than one section exists
17
! In the server settings the renaming of the page_directory is only possible, if no page exists
15 18
26 Dez-2012 Build 1842 Dietmar Woellbrink (Luisehahne)
16 19
# fixed output activation conformation
17 20
# fixed deleting Users awaiting activation
branches/2.8.x/wb/admin/skel/themes/htt/settings.htt
584 584
		<div class="mbox sub-row">
585 585
	 		<label class="setting_name">{TEXT_PAGES_DIRECTORY}:</label>
586 586
			<div class="input" >
587
				<input type="text" name="pages_directory" value="{PAGES_DIRECTORY}" />
587
				<input class="{PAGES_EDIT_TYPE}" type="{PAGES_EDIT_TYPE}" name="pages_directory"{PAGES_READONLY} value="{PAGES_DIRECTORY}" />
588 588
			</div>
589 589
		</div>
590 590

  
591
		<div class="mbox sub-row hide">
592
	 		<label for="rebuild_access_files" class="setting_name">{TEXT_REBUILD_ACCESS_FILES}:</label>
593
			<div class="input" >
594
				<input type="checkbox" name="rebuild_access_files" id="rebuild_access_files" value="true" />
595
                {HELP_REBUILD_ACCESS_FILES}
596
			</div>
597
		</div>
598

  
599 591
		<div class="mbox sub-row">
600 592
	 		<label class="setting_name">{TEXT_MODULES_DIRECTORY}:</label>
601 593
			<div class="input" >
branches/2.8.x/wb/admin/skel/themes/htt/pages_sections.htt
80 80
        <td>{VAR_MOVE_DOWN_URL}</td>
81 81

  
82 82
        <td>
83
            <a href="#" onclick="javascript: confirm_link('{TEXT_ARE_YOU_SURE}', '{ADMIN_URL}/pages/sections.php?page_id={PAGE_IDKEY}&amp;section_id={VAR_SECTION_IDKEY}');">
83
	<!-- BEGIN delete_block -->
84
            <a href="#" onclick="javascript:confirm_link('{TEXT_ARE_YOU_SURE}', '{ADMIN_URL}/pages/sections.php?page_id={PAGE_IDKEY}&amp;section_id={VAR_SECTION_IDKEY}');">
84 85
            <img src="{THEME_URL}/images/{DELETE_16_PNG}" alt="{TEXT_DELETE}" border="0" />
85 86
            </a>
87
	<!-- END delete_block -->
88
			&nbsp;
86 89
        </td>
87 90

  
88 91
        <td class="list_section_id">{VAR_SECTION_ID}</td>
89 92

  
90 93
        <td class="list_section_id" {DISPLAY_DEBUG}>{POSITION}</td>
91 94
    </tr>
95

  
92 96
<!-- END section_block -->
93 97
    <tr>
94 98
        <td align="left" colspan="{DEBUG_COLSPAN_SIZE}">
......
108 112
    	<tr>
109 113
    		<td width="50%" valign="middle">
110 114
    			<select name="module" class="input_large">
115
   			 <option value="">&nbsp;</option>
111 116
                <!-- BEGIN module_block -->
112 117
    			 <option value="{VALUE}"{SELECTED}>{NAME}</option>
113 118
                 <!-- END module_block -->
branches/2.8.x/wb/admin/pages/sections.php
5 5
 * @package         pages
6 6
 * @author          Ryan Djurovich, WebsiteBaker Project
7 7
 * @copyright       2009-2012, WebsiteBaker Org. e.V.
8
 * @link			http://www.websitebaker2.org/
8
 * @link            http://www.websitebaker2.org/
9 9
 * @license         http://www.gnu.org/licenses/gpl.html
10 10
 * @platform        WebsiteBaker 2.8.x
11 11
 * @requirements    PHP 5.2.2 and higher
12 12
 * @version         $Id$
13
 * @filesource		$HeadURL$
13
 * @filesource      $HeadURL$
14 14
 * @lastmodified    $Date$
15 15
 *
16 16
 */
......
308 308
						'MODIFY_LINK' => ADMIN_URL.'/pages/modify.php?page_id='.$results_array['page_id']
309 309
						)
310 310
					);
311
// setting trash only if more than one section exists
312
		$tpl->set_block('section_block', 'delete_block', 'delete');
313
		if( $bSectionCanDelete = ($database->get_one('SELECT COUNT(*) FROM `'.TABLE_PREFIX.'sections` WHERE `page_id`='.$page_id))!=1 ) {
314
		}
311 315

  
312 316
		$sql  = 'SELECT `section_id`,`module`,`position`,`block`,`publ_start`,`publ_end` ';
313 317
		$sql .= 'FROM `'.TABLE_PREFIX.'sections` ';
......
444 448
									)
445 449
								);
446 450
					}
451

  
447 452
				} else {
448 453
				  continue;
449 454
				}
......
471 476
									)
472 477
								);
473 478
				}
479
				if($bSectionCanDelete) {
480
					$tpl->parse('delete', 'delete_block', false);
481
				} else {
482
					$tpl->parse('delete', '', false);
483
				} 
474 484
				$tpl->parse('section_list', 'section_block', true);
475 485
			}
486

  
476 487
		}
477 488

  
478 489
		// now add the calendars -- remember to to set the range to [1970, 2037] if the date is used as timestamp!
branches/2.8.x/wb/admin/interface/version.php
51 51

  
52 52
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
53 53
if(!defined('VERSION')) define('VERSION', '2.8.3');
54
if(!defined('REVISION')) define('REVISION', '1842');
54
if(!defined('REVISION')) define('REVISION', '1843');
55 55
if(!defined('SP')) define('SP', '');
branches/2.8.x/wb/admin/settings/save.php
208 208
    'modules_upgrade_list'
209 209
    );
210 210

  
211
$bRebuildAccessFiles = ( (isset( $_POST['rebuild_access_files']) && ( $_POST['rebuild_access_files'] == true )) ? true : false ) ;
212

  
213 211
// Query current settings in the db, then loop through them and update the db with the new value
214 212
$settings = array();
215 213
$old_settings = array();
......
243 241
				$value=(($value=='') ? 'section_' : $value);
244 242
	 			$passed = true;
245 243
				break;
244
			case 'media_directory':
245
				if(strpos($value,'/',0)===false) {	$value= '/'.$value;	}
246
	 			$passed = true;
247
				break;
246 248
			case 'pages_directory':
247
                $value = $admin->StripCodeFromText($value);
248
                $bNewPageFile = ( ( $value!= $old_settings['pages_directory'] ) ? true :  false );
249
	 			$passed = $bNewPageFile;
250
                $sGetId = '&amp;id='.$bNewPageFile;
251
//                if(!is_dir(WB_PATH.$value) && is_writable(WB_PATH)) {
252
//                    $passed = make_dir(WB_PATH.$value);
253
//                }
254
                $value  = (($passed == true) ? $value : $old_settings['pages_directory']);
255
                $sPageDirectory = $value;
249
				if( ($database->get_one('SELECT COUNT(*) FROM `'.TABLE_PREFIX.'pages`'))==0 ) {
250
					$value = $admin->StripCodeFromText($value);
251
					$passed = true;
252
				} else {
253
					$value = $old_settings[$setting_name];
254
				}
255
				if(strpos($value,'/',0)===false) {	$value= '/'.$value;	}
256 256
				break;
257 257
			case 'wbmailer_smtp_auth':
258
				// $value = isset($_POST[$setting_name]) ? $_POST[$setting_name] : '' ;
259 258
				$value = true ;
260 259
	 			$passed = true;
261 260
				break;
......
288 287
		}
289 288
	}
290 289

  
291
    if(($bRebuildAccessFiles==true) && ($_POST['modules_upgrade_list']!='') && ($sPageDirectory==$old_settings['pages_directory']) ) {
292
        rebuild_all_accessfiles();
293
        $aModuleList = ( explode(',', $_POST['modules_upgrade_list']));
294
        upgrade_modules($aModuleList);
295
    }
296

  
297 290
}
298 291
/**
299 292
 * now save search settings
branches/2.8.x/wb/admin/settings/index.php
5 5
 * @package         settings
6 6
 * @author          Ryan Djurovich, WebsiteBaker Project
7 7
 * @copyright       2009-2012, WebsiteBaker Org. e.V.
8
 * @link			http://www.websitebaker2.org/
8
 * @link            http://www.websitebaker2.org/
9 9
 * @license         http://www.gnu.org/licenses/gpl.html
10 10
 * @platform        WebsiteBaker 2.8.x
11 11
 * @requirements    PHP 5.2.2 and higher
12 12
 * @version         $Id$
13
 * @filesource		$HeadURL$
13
 * @filesource      $HeadURL$
14 14
 * @lastmodified    $Date$
15 15
 *
16 16
 */
17 17

  
18
require('../../config.php');
19
require_once(WB_PATH.'/framework/class.admin.php');
18
// Include config file
19
if(!defined('WB_URL'))
20
{
21
    $config_file = realpath('../../config.php');
22
    if(file_exists($config_file) && !defined('WB_URL'))
23
    {
24
    	require($config_file);
25
    }
26
}
27
if(!class_exists('admin', false)){ include(WB_PATH.'/framework/class.admin.php'); }
20 28

  
21 29
if(isset($_GET['advanced']) && $_GET['advanced'] == 'yes') {
22 30
	$admin = new admin('Settings', 'settings_advanced');
......
63 71
    	$setting_name = $setting['name'];
64 72
    	$setting_value = ( $setting_name != 'wbmailer_smtp_password' ) ? htmlspecialchars($setting['value']) : htmlentities($setting['value'], ENT_COMPAT, 'UTF-8');
65 73
    	$oTpl->set_var(strtoupper($setting_name),($setting_value));
66
//        $oTpl->parse('main', 'main_block', true);
67 74
    }
68 75
}
69 76

  
......
1013 1020
	{
1014 1021
		$oTpl->set_var('DIR_O_E_CHECKED', $checked);
1015 1022
	}
1023
	$sReadOnly = '';
1024
	$sPagesEditType = 'text';
1025
	if( $bPagesCanModify = ($database->get_one('SELECT COUNT(*) FROM `'.TABLE_PREFIX.'pages`'))!=0 ) {
1026
		$sReadOnly = ' readonly="readonly"';
1027
		$sPagesEditType = 'button';
1028
	}
1016 1029

  
1017 1030
	$oTpl->set_var(array(
1018 1031
		'PAGES_DIRECTORY' => PAGES_DIRECTORY,
1032
		'PAGES_READONLY' => $sReadOnly,
1033
		'PAGES_EDIT_TYPE' => $sPagesEditType,
1019 1034
		'MODULES_DIRECTORY' => MODULES_UPGRADE_LIST,
1020 1035
		'PAGE_ICON_DIR'   => PAGE_ICON_DIR,
1021 1036
		'MEDIA_DIRECTORY' => MEDIA_DIRECTORY,

Also available in: Unified diff