Project

General

Profile

« Previous | Next » 

Revision 1844

Added by Luisehahne about 12 years ago

  1. fixed Use of undefined constant PAGE_ID in /account/forgot.php
    ! change return value to boolean in user management delete.php, add.php
    ! change WEBSITE_SIGNATURE to WBMAIL_SIGNATURE

View differences:

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

  
14 14

  
15
28 Dez-2012 Build 1844 Dietmar Woellbrink (Luisehahne)
16
# fixed Use of undefined constant PAGE_ID in /account/forgot.php
17
! change return value to boolean in user management delete.php, add.php
18
! change WEBSITE_SIGNATURE to WBMAIL_SIGNATURE 
15 19
27 Dez-2012 Build 1843 Dietmar Woellbrink (Luisehahne)
16 20
! trash only will be shown in sectionmanagement if more than one section exists
17 21
! In the server settings the renaming of the page_directory is only possible, if no page exists
branches/2.8.x/wb/upgrade-script.php
515 515
    $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
516 516

  
517 517
    /**********************************************************
518
     *  - Adding website_signature to settings table
518
     *  - Adding wbmail_signature to settings table
519 519
     */
520
    $aDebugMessage[] = "<span>Adding/updating website_signature to settings table</span>";
520
    $aDebugMessage[] = "<span>Adding/updating wbmail_signature to settings table</span>";
521 521
    $cfg = array(
522
    	'website_signature' => (defined('WEBSITE_SIGNATURE') ? WEBSITE_SIGNATURE : '')
522
    	'wbmail_signature' => (defined('WBMAIL_SIGNATURE') ? WBMAIL_SIGNATURE : '')
523 523
    );
524 524

  
525 525
    $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
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 class="{PAGES_EDIT_TYPE}" type="{PAGES_EDIT_TYPE}" name="pages_directory"{PAGES_READONLY} value="{PAGES_DIRECTORY}" />
587
				<input class="{PAGES_EDIT_TYPE}" type="text" name="pages_directory"{PAGES_READONLY} value="{PAGES_DIRECTORY}" />
588 588
			</div>
589 589
		</div>
590 590

  
......
674 674
		</div>
675 675
		<div class="mbox sub-row">
676 676
			<label class="setting_name">{TEXT_WEBSITE_SIGNATURE}:</label>
677
			<textarea class="vert" name="website_signature" cols="50" rows="4">{WEBSITE_SIGNATURE}</textarea>
677
			<textarea class="vert" name="wbmail_signature" cols="50" rows="4">{WBMAIL_SIGNATURE}</textarea>
678 678
		</div>
679 679

  
680 680
		<div class="mbox sub-row">
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', '1843');
54
if(!defined('REVISION')) define('REVISION', '1844');
55 55
if(!defined('SP')) define('SP', '');
branches/2.8.x/wb/admin/settings/save.php
173 173
$allow_tags_in_fields = array(
174 174
    'website_header',
175 175
    'website_footer',
176
    'website_signature'
176
    'wbmail_signature'
177 177
    );
178 178
$allow_empty_values = array(
179 179
    'website_header',
180 180
    'website_footer',
181
    'website_signature',
181
    'wbmail_signature',
182 182
    'wysiwyg_style',
183 183
    'pages_directory',
184 184
    'page_icon_dir',
......
196 196
    'website_title',
197 197
    'website_description',
198 198
    'website_keywords',
199
    'website_signature',
199
    'wbmail_signature',
200 200
    'wysiwyg_style',
201 201
    'pages_directory',
202 202
    'page_icon_dir',
branches/2.8.x/wb/admin/settings/index.php
34 34

  
35 35
// add new values, later in upgrade-script
36 36
$cfg = array(
37
	'website_signature' => defined('WEBSITE_SIGNATURE') ? WEBSITE_SIGNATURE : '',
37
	'wbmail_signature' => defined('WBMAIL_SIGNATURE') ? WBMAIL_SIGNATURE : '',
38 38
	'confirmed_registration' => (defined('CONFIRMED_REGISTRATION') ? CONFIRMED_REGISTRATION : '0'),
39 39
	'modules_upgrade_list' => (defined('MODULES_UPGRADE_LIST') ? MODULES_UPGRADE_LIST : ''),
40 40
	);
......
1024 1024
	$sPagesEditType = 'text';
1025 1025
	if( $bPagesCanModify = ($database->get_one('SELECT COUNT(*) FROM `'.TABLE_PREFIX.'pages`'))!=0 ) {
1026 1026
		$sReadOnly = ' readonly="readonly"';
1027
		$sPagesEditType = 'button';
1027
		$sPagesEditType = 'grey bold';
1028 1028
	}
1029 1029

  
1030 1030
	$oTpl->set_var(array(
branches/2.8.x/wb/admin/users/delete.php
100 100
		}
101 101
    }
102 102
    if(isset($aActionRequest['clearmsg'])) { msgQueue::clear();  }
103
    return $user_id;
103
    return $bRetVal;
104 104
}
105 105

  
106 106
if(!isset($aActionRequest)) {
branches/2.8.x/wb/admin/users/index.php
54 54
			case 'delete_outdated': // delete Users awaiting activation
55 55
    			$admin = new admin('Access', 'users_delete',false);
56 56
				include($sAdminPath.'/delete.php');
57
    			$output = delete_user($admin,$aActionRequest);
58

  
59
        		if( ($msg = msgQueue::getError()) != '')
60
        		{
61
        		}
57
    			delete_user($admin,$aActionRequest);
62 58
                $aActionRequest['cancel_url'] = ADMIN_URL.'/access/index.php';
63 59
				$admin = new admin('Access', 'users');
64 60
				include($sAdminPath.'/user_list.php');
......
67 63
			case 'add': // insert/update user
68 64
                $admin = new admin('Access', 'users_add',false);
69 65
				include($sAdminPath.'/add.php');
70
    			$output = add_user($admin,$aActionRequest);
66
    			add_user($admin,$aActionRequest);
71 67
                $aActionRequest['cancel_url'] = ADMIN_URL.'/access/index.php';
72 68
				$admin = new admin('Access', 'users');
73 69
				include($sAdminPath.'/user_list.php');
branches/2.8.x/wb/admin/users/add.php
176 176
                    '';
177 177
            if($database->query($sql)) {
178 178
            	msgQueue::add($MESSAGE['USERS_ADDED'], true);
179
		        $bRetVal = true;
179 180
            }
180 181
            if($database->is_error()) {
181 182
                msgQueue::add( implode('<br />',explode(';',$database->get_error())) );
......
183 184
        } else {
184 185
        	msgQueue::add($HEADING['ADD_USER'].' '.$MESSAGE['GENERIC_NOT_COMPARE']);
185 186

  
186
       }
187
    }
188
//
187
		}
188
		return $bRetVal;
189
   }
branches/2.8.x/wb/account/forgot.php
28 28

  
29 29
$wb = new frontend(false);
30 30

  
31
$page_id = defined('REFERRER_ID') ? REFERRER_ID : isset($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : PAGE_ID;
31
$page_id = defined('PAGE_ID') ? PAGE_ID : 0;
32
$page_id = defined('REFERRER_ID') ? REFERRER_ID : isset($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : $page_id;
32 33

  
33 34
// Required page details
34 35
$page_description = '';
branches/2.8.x/wb/install/save.php
415 415
	." (55, 'page_icon_dir', '/templates/*/title_images'),"
416 416
	." (56, 'dev_infos', 'false'),"
417 417
	." (57, 'groups_updated', '".time()."'),"
418
	." (58, 'website_signature', ''),"
418
	." (58, 'wbmail_signature', ''),"
419 419
	." (59, 'confirmed_registration', '1'),"
420 420
	." (60, 'page_extended', 'true'),"
421 421
	." (61, 'modules_upgrade_list', 'news,wysiwyg,form'),"
branches/2.8.x/wb/modules/news/comment.php
18 18
// Include config file
19 19
require('../../config.php');
20 20
require_once(WB_PATH.'/framework/class.wb.php');
21
$wb = new wb;
22

  
21
if( !(isset($wb) && is_object($wb)) ) { $wb = new wb(); }
23 22
// Check if there is a post id
24 23
// $post_id = $wb->checkIDKEY('post_id', false, 'GET');
25 24

  

Also available in: Unified diff