/ - Diff - WB 2.08.x - Tracking

     ===============================================================================
 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
 Dez-2012 Build 1842 Dietmar Woellbrink (Luisehahne)
     # fixed output activation conformation
     # fixed deleting Users awaiting activation

     		<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" >

             <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>
             <td class="list_section_id" {DISPLAY_DEBUG}>{POSITION}</td>
         </tr>
     <!-- END section_block -->
         <tr>
             <td align="left" colspan="{DEBUG_COLSPAN_SIZE}">
-...
         	<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 -->

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', '');

         '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();
-...
     				$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;
-...
+    		}
+    	}
         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

      * @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');
-...
         	$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);
+        }
+    }
-...
+    	{
     		$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,

Project

General

Profile

WB 2.08.x

Revision 1843

Added by Dietmar over 11 years ago