Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1842)
+++ branches/2.8.x/CHANGELOG	(revision 1843)
@@ -12,6 +12,9 @@
 ===============================================================================
 
 
+27 Dez-2012 Build 1843 Dietmar Woellbrink (Luisehahne)
+! trash only will be shown in sectionmanagement if more than one section exists
+! In the server settings the renaming of the page_directory is only possible, if no page exists
 26 Dez-2012 Build 1842 Dietmar Woellbrink (Luisehahne)
 # fixed output activation conformation
 # fixed deleting Users awaiting activation
Index: branches/2.8.x/wb/admin/skel/themes/htt/settings.htt
===================================================================
--- branches/2.8.x/wb/admin/skel/themes/htt/settings.htt	(revision 1842)
+++ branches/2.8.x/wb/admin/skel/themes/htt/settings.htt	(revision 1843)
@@ -584,18 +584,10 @@
 		<div class="mbox sub-row">
 	 		<label class="setting_name">{TEXT_PAGES_DIRECTORY}:</label>
 			<div class="input" >
-				<input type="text" name="pages_directory" value="{PAGES_DIRECTORY}" />
+				<input class="{PAGES_EDIT_TYPE}" type="{PAGES_EDIT_TYPE}" name="pages_directory"{PAGES_READONLY} value="{PAGES_DIRECTORY}" />
 			</div>
 		</div>
 
-		<div class="mbox sub-row hide">
-	 		<label for="rebuild_access_files" class="setting_name">{TEXT_REBUILD_ACCESS_FILES}:</label>
-			<div class="input" >
-				<input type="checkbox" name="rebuild_access_files" id="rebuild_access_files" value="true" />
-                {HELP_REBUILD_ACCESS_FILES}
-			</div>
-		</div>
-
 		<div class="mbox sub-row">
 	 		<label class="setting_name">{TEXT_MODULES_DIRECTORY}:</label>
 			<div class="input" >
Index: branches/2.8.x/wb/admin/skel/themes/htt/pages_sections.htt
===================================================================
--- branches/2.8.x/wb/admin/skel/themes/htt/pages_sections.htt	(revision 1842)
+++ branches/2.8.x/wb/admin/skel/themes/htt/pages_sections.htt	(revision 1843)
@@ -80,9 +80,12 @@
         <td>{VAR_MOVE_DOWN_URL}</td>
 
         <td>
-            <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}');">
+	<!-- BEGIN delete_block -->
+            <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}');">
             <img src="{THEME_URL}/images/{DELETE_16_PNG}" alt="{TEXT_DELETE}" border="0" />
             </a>
+	<!-- END delete_block -->
+			&nbsp;
         </td>
 
         <td class="list_section_id">{VAR_SECTION_ID}</td>
@@ -89,6 +92,7 @@
 
         <td class="list_section_id" {DISPLAY_DEBUG}>{POSITION}</td>
     </tr>
+
 <!-- END section_block -->
     <tr>
         <td align="left" colspan="{DEBUG_COLSPAN_SIZE}">
@@ -108,6 +112,7 @@
     	<tr>
     		<td width="50%" valign="middle">
     			<select name="module" class="input_large">
+   			 <option value="">&nbsp;</option>
                 <!-- BEGIN module_block -->
     			 <option value="{VALUE}"{SELECTED}>{NAME}</option>
                  <!-- END module_block -->
Index: branches/2.8.x/wb/admin/pages/sections.php
===================================================================
--- branches/2.8.x/wb/admin/pages/sections.php	(revision 1842)
+++ branches/2.8.x/wb/admin/pages/sections.php	(revision 1843)
@@ -5,12 +5,12 @@
  * @package         pages
  * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2012, WebsiteBaker Org. e.V.
- * @link			http://www.websitebaker2.org/
+ * @link            http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL$
+ * @filesource      $HeadURL$
  * @lastmodified    $Date$
  *
  */
@@ -308,6 +308,10 @@
 						'MODIFY_LINK' => ADMIN_URL.'/pages/modify.php?page_id='.$results_array['page_id']
 						)
 					);
+// setting trash only if more than one section exists
+		$tpl->set_block('section_block', 'delete_block', 'delete');
+		if( $bSectionCanDelete = ($database->get_one('SELECT COUNT(*) FROM `'.TABLE_PREFIX.'sections` WHERE `page_id`='.$page_id))!=1 ) {
+		}
 
 		$sql  = 'SELECT `section_id`,`module`,`position`,`block`,`publ_start`,`publ_end` ';
 		$sql .= 'FROM `'.TABLE_PREFIX.'sections` ';
@@ -444,6 +448,7 @@
 									)
 								);
 					}
+
 				} else {
 				  continue;
 				}
@@ -471,8 +476,14 @@
 									)
 								);
 				}
+				if($bSectionCanDelete) {
+					$tpl->parse('delete', 'delete_block', false);
+				} else {
+					$tpl->parse('delete', '', false);
+				} 
 				$tpl->parse('section_list', 'section_block', true);
 			}
+
 		}
 
 		// now add the calendars -- remember to to set the range to [1970, 2037] if the date is used as timestamp!
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1842)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1843)
@@ -51,5 +51,5 @@
 
 // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
 if(!defined('VERSION')) define('VERSION', '2.8.3');
-if(!defined('REVISION')) define('REVISION', '1842');
+if(!defined('REVISION')) define('REVISION', '1843');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/admin/settings/save.php
===================================================================
--- branches/2.8.x/wb/admin/settings/save.php	(revision 1842)
+++ branches/2.8.x/wb/admin/settings/save.php	(revision 1843)
@@ -208,8 +208,6 @@
     'modules_upgrade_list'
     );
 
-$bRebuildAccessFiles = ( (isset( $_POST['rebuild_access_files']) && ( $_POST['rebuild_access_files'] == true )) ? true : false ) ;
-
 // Query current settings in the db, then loop through them and update the db with the new value
 $settings = array();
 $old_settings = array();
@@ -243,19 +241,20 @@
 				$value=(($value=='') ? 'section_' : $value);
 	 			$passed = true;
 				break;
+			case 'media_directory':
+				if(strpos($value,'/',0)===false) {	$value= '/'.$value;	}
+	 			$passed = true;
+				break;
 			case 'pages_directory':
-                $value = $admin->StripCodeFromText($value);
-                $bNewPageFile = ( ( $value!= $old_settings['pages_directory'] ) ? true :  false );
-	 			$passed = $bNewPageFile;
-                $sGetId = '&amp;id='.$bNewPageFile;
-//                if(!is_dir(WB_PATH.$value) && is_writable(WB_PATH)) {
-//                    $passed = make_dir(WB_PATH.$value);
-//                }
-                $value  = (($passed == true) ? $value : $old_settings['pages_directory']);
-                $sPageDirectory = $value;
+				if( ($database->get_one('SELECT COUNT(*) FROM `'.TABLE_PREFIX.'pages`'))==0 ) {
+					$value = $admin->StripCodeFromText($value);
+					$passed = true;
+				} else {
+					$value = $old_settings[$setting_name];
+				}
+				if(strpos($value,'/',0)===false) {	$value= '/'.$value;	}
 				break;
 			case 'wbmailer_smtp_auth':
-				// $value = isset($_POST[$setting_name]) ? $_POST[$setting_name] : '' ;
 				$value = true ;
 	 			$passed = true;
 				break;
@@ -288,12 +287,6 @@
 		}
 	}
 
-    if(($bRebuildAccessFiles==true) && ($_POST['modules_upgrade_list']!='') && ($sPageDirectory==$old_settings['pages_directory']) ) {
-        rebuild_all_accessfiles();
-        $aModuleList = ( explode(',', $_POST['modules_upgrade_list']));
-        upgrade_modules($aModuleList);
-    }
-
 }
 /**
  * now save search settings
Index: branches/2.8.x/wb/admin/settings/index.php
===================================================================
--- branches/2.8.x/wb/admin/settings/index.php	(revision 1842)
+++ branches/2.8.x/wb/admin/settings/index.php	(revision 1843)
@@ -5,18 +5,26 @@
  * @package         settings
  * @author          Ryan Djurovich, WebsiteBaker Project
  * @copyright       2009-2012, WebsiteBaker Org. e.V.
- * @link			http://www.websitebaker2.org/
+ * @link            http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL$
+ * @filesource      $HeadURL$
  * @lastmodified    $Date$
  *
  */
 
-require('../../config.php');
-require_once(WB_PATH.'/framework/class.admin.php');
+// Include config file
+if(!defined('WB_URL'))
+{
+    $config_file = realpath('../../config.php');
+    if(file_exists($config_file) && !defined('WB_URL'))
+    {
+    	require($config_file);
+    }
+}
+if(!class_exists('admin', false)){ include(WB_PATH.'/framework/class.admin.php'); }
 
 if(isset($_GET['advanced']) && $_GET['advanced'] == 'yes') {
 	$admin = new admin('Settings', 'settings_advanced');
@@ -63,7 +71,6 @@
     	$setting_name = $setting['name'];
     	$setting_value = ( $setting_name != 'wbmailer_smtp_password' ) ? htmlspecialchars($setting['value']) : htmlentities($setting['value'], ENT_COMPAT, 'UTF-8');
     	$oTpl->set_var(strtoupper($setting_name),($setting_value));
-//        $oTpl->parse('main', 'main_block', true);
     }
 }
 
@@ -1013,9 +1020,17 @@
 	{
 		$oTpl->set_var('DIR_O_E_CHECKED', $checked);
 	}
+	$sReadOnly = '';
+	$sPagesEditType = 'text';
+	if( $bPagesCanModify = ($database->get_one('SELECT COUNT(*) FROM `'.TABLE_PREFIX.'pages`'))!=0 ) {
+		$sReadOnly = ' readonly="readonly"';
+		$sPagesEditType = 'button';
+	}
 
 	$oTpl->set_var(array(
 		'PAGES_DIRECTORY' => PAGES_DIRECTORY,
+		'PAGES_READONLY' => $sReadOnly,
+		'PAGES_EDIT_TYPE' => $sPagesEditType,
 		'MODULES_DIRECTORY' => MODULES_UPGRADE_LIST,
 		'PAGE_ICON_DIR'   => PAGE_ICON_DIR,
 		'MEDIA_DIRECTORY' => MEDIA_DIRECTORY,