Project

General

Profile

« Previous | Next » 

Revision 1398

Added by FrankH almost 14 years ago

  1. Security fix in admin/admintools and admin/groups

View differences:

branches/2.8.x/CHANGELOG
11 11
! = Update/Change
12 12

  
13 13
------------------------------------- 2.8.2 -------------------------------------
14
20 Jan-2011 Build 1398 Frank Heyne (FrankH)
15
# Security fix in admin/admintools and admin/groups
14 16
20 Jan-2011 Build 1397 Dietmar Woellbrink (Luisehahne)
15 17
! recoded rediect timer in print_success (tks to Chio)
16 18
19 Jan-2011 Build 1396 Werner von den Decken (DarkViper)
branches/2.8.x/wb/admin/groups/get_permissions.php
1 1
<?php
2
/**
3
 *
4
 * @category        admin
5
 * @package         groups
6
 * @author          WebsiteBaker Project
7
 * @copyright       2004-2009, Ryan Djurovich
8
 * @copyright       2009-2011, Website Baker Org. e.V.
9
 * @link			http://www.websitebaker2.org/
10
 * @license         http://www.gnu.org/licenses/gpl.html
11
 * @platform        WebsiteBaker 2.8.x
12
 * @requirements    PHP 5.2.2 and higher
13
 * @version         $Id$
14
 * @filesource		$HeadURL:  $
15
 * @lastmodified    $Date:  $
16
 *
17
 */
2 18

  
3
// $Id$
4 19

  
5
/*
6

  
7
 Website Baker Project <http://www.websitebaker.org/>
8
 Copyright (C) 2004-2009, Ryan Djurovich
9

  
10
 Website Baker is free software; you can redistribute it and/or modify
11
 it under the terms of the GNU General Public License as published by
12
 the Free Software Foundation; either version 2 of the License, or
13
 (at your option) any later version.
14

  
15
 Website Baker is distributed in the hope that it will be useful,
16
 but WITHOUT ANY WARRANTY; without even the implied warranty of
17
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
18
 GNU General Public License for more details.
19

  
20
 You should have received a copy of the GNU General Public License
21
 along with Website Baker; if not, write to the Free Software
22
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23

  
24
*/
25

  
26 20
if(!defined('WB_PATH')) { exit('Direct access to this file is not allowed'); }
27 21

  
28 22
// Get system permissions
branches/2.8.x/wb/admin/groups/save.php
1 1
<?php
2
/**
3
 *
4
 * @category        admin
5
 * @package         groups
6
 * @author          WebsiteBaker Project
7
 * @copyright       2004-2009, Ryan Djurovich
8
 * @copyright       2009-2011, Website Baker Org. e.V.
9
 * @link			http://www.websitebaker2.org/
10
 * @license         http://www.gnu.org/licenses/gpl.html
11
 * @platform        WebsiteBaker 2.8.x
12
 * @requirements    PHP 5.2.2 and higher
13
 * @version         $Id$
14
 * @filesource		$HeadURL:  $
15
 * @lastmodified    $Date:  $
16
 *
17
 */
2 18

  
3
// $Id$
4

  
5
/*
6

  
7
 Website Baker Project <http://www.websitebaker.org/>
8
 Copyright (C) 2004-2009, Ryan Djurovich
9

  
10
 Website Baker is free software; you can redistribute it and/or modify
11
 it under the terms of the GNU General Public License as published by
12
 the Free Software Foundation; either version 2 of the License, or
13
 (at your option) any later version.
14

  
15
 Website Baker is distributed in the hope that it will be useful,
16
 but WITHOUT ANY WARRANTY; without even the implied warranty of
17
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
18
 GNU General Public License for more details.
19

  
20
 You should have received a copy of the GNU General Public License
21
 along with Website Baker; if not, write to the Free Software
22
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23

  
24
*/
25

  
26 19
// Print admin header
27 20
require('../../config.php');
28 21
require_once(WB_PATH.'/framework/class.admin.php');
29 22
$admin = new admin('Access', 'groups_modify');
30 23

  
31
// Create new database object
32
// $database = new database();
24
if (!$admin->checkFTAN())
25
{
26
	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL);
27
	exit();
28
}
33 29

  
34 30
// Check if group group_id is a valid number and doesnt equal 1
35 31
if(!isset($_POST['group_id']) OR !is_numeric($_POST['group_id']) OR $_POST['group_id'] == 1) {
branches/2.8.x/wb/admin/groups/groups.php
43 43
if($_POST['action'] == 'modify') {
44 44
	// Create new admin object
45 45
	$admin = new admin('Access', 'groups_modify', false);
46

  
47
	if (!$admin->checkFTAN())
48
	{
49
		$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL);
50
		exit();
51
	}
46 52
	// Print header
47 53
	$admin->print_header();
48 54
	// Get existing values
......
53 59
	$template->set_file('page', 'groups_form.htt');
54 60
	$template->set_block('page', 'main_block', 'main');
55 61
	$template->set_var(	array(
56
										'ACTION_URL' => ADMIN_URL.'/groups/save.php',
57
										'SUBMIT_TITLE' => $TEXT['SAVE'],
58
										'GROUP_ID' => $group['group_id'],
59
										'GROUP_NAME' => $group['name'],
60
										'ADVANCED_ACTION' => 'groups.php'
61
										)
62
							);
62
							'ACTION_URL' => ADMIN_URL.'/groups/save.php',
63
							'SUBMIT_TITLE' => $TEXT['SAVE'],
64
							'GROUP_ID' => $group['group_id'],
65
							'GROUP_NAME' => $group['name'],
66
							'ADVANCED_ACTION' => 'groups.php',
67
							'FTAN' => $admin->getFTAN()
68
						));
63 69
	// Tell the browser whether or not to show advanced options
64 70
	if( true == (isset( $_POST['advanced']) AND ( strpos( $_POST['advanced'], ">>") > 0 ) ) ) {
65 71
		$template->set_var('DISPLAY_ADVANCED', '');
......
118 124
		
119 125
	// Insert language text and messages
120 126
	$template->set_var(array(
121
									'TEXT_RESET' => $TEXT['RESET'],
122
									'TEXT_ACTIVE' => $TEXT['ACTIVE'],
123
									'TEXT_DISABLED' => $TEXT['DISABLED'],
124
									'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'],
125
									'TEXT_USERNAME' => $TEXT['USERNAME'],
126
									'TEXT_PASSWORD' => $TEXT['PASSWORD'],
127
									'TEXT_RETYPE_PASSWORD' => $TEXT['RETYPE_PASSWORD'],
128
									'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'],
129
									'TEXT_EMAIL' => $TEXT['EMAIL'],
130
									'TEXT_GROUP' => $TEXT['GROUP'],
131
									'TEXT_SYSTEM_PERMISSIONS' => $TEXT['SYSTEM_PERMISSIONS'],
132
									'TEXT_MODULE_PERMISSIONS' => $TEXT['MODULE_PERMISSIONS'],
133
									'TEXT_TEMPLATE_PERMISSIONS' => $TEXT['TEMPLATE_PERMISSIONS'],
134
									'TEXT_NAME' => $TEXT['NAME'],
135
									'SECTION_PAGES' => $MENU['PAGES'],
136
									'SECTION_MEDIA' => $MENU['MEDIA'],
137
									'SECTION_MODULES' => $MENU['MODULES'],
138
									'SECTION_TEMPLATES' => $MENU['TEMPLATES'],
139
									'SECTION_LANGUAGES' => $MENU['LANGUAGES'],
140
									'SECTION_SETTINGS' => $MENU['SETTINGS'],
141
									'SECTION_USERS' => $MENU['USERS'],
142
									'SECTION_GROUPS' => $MENU['GROUPS'],
143
									'SECTION_ADMINTOOLS' => $MENU['ADMINTOOLS'],
144
									'TEXT_VIEW' => $TEXT['VIEW'],
145
									'TEXT_ADD' => $TEXT['ADD'],
146
									'TEXT_LEVEL' => $TEXT['LEVEL'],
147
									'TEXT_MODIFY' => $TEXT['MODIFY'],
148
									'TEXT_DELETE' => $TEXT['DELETE'],
149
									'TEXT_MODIFY_CONTENT' => $TEXT['MODIFY_CONTENT'],
150
									'TEXT_MODIFY_SETTINGS' => $TEXT['MODIFY_SETTINGS'],
151
									'HEADING_MODIFY_INTRO_PAGE' => $HEADING['MODIFY_INTRO_PAGE'],
152
									'TEXT_CREATE_FOLDER' => $TEXT['CREATE_FOLDER'],
153
									'TEXT_RENAME' => $TEXT['RENAME'],
154
									'TEXT_UPLOAD_FILES' => $TEXT['UPLOAD_FILES'],
155
									'TEXT_BASIC' => $TEXT['BASIC'],
156
									'TEXT_ADVANCED' => $TEXT['ADVANCED'],
157
									'CHANGING_PASSWORD' => $MESSAGE['USERS']['CHANGING_PASSWORD'],
158
									'HEADING_MODIFY_GROUP' => $HEADING['MODIFY_GROUP']
159
									)
160
							);
127
				'TEXT_RESET' => $TEXT['RESET'],
128
				'TEXT_ACTIVE' => $TEXT['ACTIVE'],
129
				'TEXT_DISABLED' => $TEXT['DISABLED'],
130
				'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'],
131
				'TEXT_USERNAME' => $TEXT['USERNAME'],
132
				'TEXT_PASSWORD' => $TEXT['PASSWORD'],
133
				'TEXT_RETYPE_PASSWORD' => $TEXT['RETYPE_PASSWORD'],
134
				'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'],
135
				'TEXT_EMAIL' => $TEXT['EMAIL'],
136
				'TEXT_GROUP' => $TEXT['GROUP'],
137
				'TEXT_SYSTEM_PERMISSIONS' => $TEXT['SYSTEM_PERMISSIONS'],
138
				'TEXT_MODULE_PERMISSIONS' => $TEXT['MODULE_PERMISSIONS'],
139
				'TEXT_TEMPLATE_PERMISSIONS' => $TEXT['TEMPLATE_PERMISSIONS'],
140
				'TEXT_NAME' => $TEXT['NAME'],
141
				'SECTION_PAGES' => $MENU['PAGES'],
142
				'SECTION_MEDIA' => $MENU['MEDIA'],
143
				'SECTION_MODULES' => $MENU['MODULES'],
144
				'SECTION_TEMPLATES' => $MENU['TEMPLATES'],
145
				'SECTION_LANGUAGES' => $MENU['LANGUAGES'],
146
				'SECTION_SETTINGS' => $MENU['SETTINGS'],
147
				'SECTION_USERS' => $MENU['USERS'],
148
				'SECTION_GROUPS' => $MENU['GROUPS'],
149
				'SECTION_ADMINTOOLS' => $MENU['ADMINTOOLS'],
150
				'TEXT_VIEW' => $TEXT['VIEW'],
151
				'TEXT_ADD' => $TEXT['ADD'],
152
				'TEXT_LEVEL' => $TEXT['LEVEL'],
153
				'TEXT_MODIFY' => $TEXT['MODIFY'],
154
				'TEXT_DELETE' => $TEXT['DELETE'],
155
				'TEXT_MODIFY_CONTENT' => $TEXT['MODIFY_CONTENT'],
156
				'TEXT_MODIFY_SETTINGS' => $TEXT['MODIFY_SETTINGS'],
157
				'HEADING_MODIFY_INTRO_PAGE' => $HEADING['MODIFY_INTRO_PAGE'],
158
				'TEXT_CREATE_FOLDER' => $TEXT['CREATE_FOLDER'],
159
				'TEXT_RENAME' => $TEXT['RENAME'],
160
				'TEXT_UPLOAD_FILES' => $TEXT['UPLOAD_FILES'],
161
				'TEXT_BASIC' => $TEXT['BASIC'],
162
				'TEXT_ADVANCED' => $TEXT['ADVANCED'],
163
				'CHANGING_PASSWORD' => $MESSAGE['USERS']['CHANGING_PASSWORD'],
164
				'HEADING_MODIFY_GROUP' => $HEADING['MODIFY_GROUP'],
165
			));
161 166
	
162 167
	// Parse template object
163 168
	$template->parse('main', 'main_block', false);
......
165 170
} elseif($_POST['action'] == 'delete') {
166 171
	// Create new admin object
167 172
	$admin = new admin('Access', 'groups_delete', false);
173

  
174
	if (!$admin->checkFTAN())
175
	{
176
		$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL);
177
		exit();
178
	}
179

  
168 180
	// Print header
169 181
	$admin->print_header();
170 182
	// Delete the group
branches/2.8.x/wb/admin/groups/index.php
20 20
require('../../config.php');
21 21
require_once(WB_PATH.'/framework/class.admin.php');
22 22
$admin = new admin('Access', 'groups');
23
$ftan = $admin->getFTAN();
23 24

  
24 25
// Create new template object for the modify/remove menu
25 26
$template = new Template(THEME_PATH.'/templates');
......
30 31
$template->set_var(array(
31 32
	'ADMIN_URL' => ADMIN_URL,
32 33
	'WB_URL' => WB_URL,
33
	'THEME_URL' => THEME_URL
34
	'THEME_URL' => THEME_URL,
35
	'FTAN' => $ftan
34 36
	)
35 37
);
36 38

  
......
183 185
								'ADMIN_URL' => ADMIN_URL,
184 186
								'WB_URL' => WB_URL,
185 187
								'WB_PATH' => WB_PATH,
186
								'THEME_URL' => THEME_URL
188
								'THEME_URL' => THEME_URL,
189
								'FTAN' => $ftan
187 190
								)
188 191
						);
189 192

  
branches/2.8.x/wb/admin/groups/add.php
1 1
<?php
2
/**
3
 *
4
 * @category        admin
5
 * @package         groups
6
 * @author          WebsiteBaker Project
7
 * @copyright       2004-2009, Ryan Djurovich
8
 * @copyright       2009-2011, Website Baker Org. e.V.
9
 * @link			http://www.websitebaker2.org/
10
 * @license         http://www.gnu.org/licenses/gpl.html
11
 * @platform        WebsiteBaker 2.8.x
12
 * @requirements    PHP 5.2.2 and higher
13
 * @version         $Id$
14
 * @filesource		$HeadURL:  $
15
 * @lastmodified    $Date:  $
16
 *
17
 */
2 18

  
3
// $Id$
4

  
5
/*
6

  
7
 Website Baker Project <http://www.websitebaker.org/>
8
 Copyright (C) 2004-2009, Ryan Djurovich
9

  
10
 Website Baker is free software; you can redistribute it and/or modify
11
 it under the terms of the GNU General Public License as published by
12
 the Free Software Foundation; either version 2 of the License, or
13
 (at your option) any later version.
14

  
15
 Website Baker is distributed in the hope that it will be useful,
16
 but WITHOUT ANY WARRANTY; without even the implied warranty of
17
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
18
 GNU General Public License for more details.
19

  
20
 You should have received a copy of the GNU General Public License
21
 along with Website Baker; if not, write to the Free Software
22
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23

  
24
*/
25

  
26 19
// Print admin header
27 20
require('../../config.php');
28 21
require_once(WB_PATH.'/framework/class.admin.php');
29 22
$admin = new admin('Access', 'groups_add');
30 23

  
31
// Create new database object
32
// $database = new database();
24
if (!$admin->checkFTAN())
25
{
26
	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL);
27
	exit();
28
}
33 29

  
34 30
// Gather details entered
35 31
$group_name = $admin->get_post('group_name');
branches/2.8.x/wb/admin/interface/version.php
52 52

  
53 53
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
54 54
if(!defined('VERSION')) define('VERSION', '2.8.2.RC5');
55
if(!defined('REVISION')) define('REVISION', '1397');
55
if(!defined('REVISION')) define('REVISION', '1398');
56 56

  
57 57
?>
branches/2.8.x/wb/admin/admintools/tool.php
1 1
<?php
2
/**
3
 *
4
 * @category        admin
5
 * @package         admintools
6
 * @author          WebsiteBaker Project
7
 * @copyright       2004-2009, Ryan Djurovich
8
 * @copyright       2009-2011, Website Baker Org. e.V.
9
 * @link			http://www.websitebaker2.org/
10
 * @license         http://www.gnu.org/licenses/gpl.html
11
 * @platform        WebsiteBaker 2.8.x
12
 * @requirements    PHP 5.2.2 and higher
13
 * @version         $Id$
14
 * @filesource		$HeadURL:  $
15
 * @lastmodified    $Date:  $
16
 *
17
 */
2 18

  
3
// $Id$
4

  
5
/*
6

  
7
 Website Baker Project <http://www.websitebaker.org/>
8
 Copyright (C) 2004-2009, Ryan Djurovich
9

  
10
 Website Baker is free software; you can redistribute it and/or modify
11
 it under the terms of the GNU General Public License as published by
12
 the Free Software Foundation; either version 2 of the License, or
13
 (at your option) any later version.
14

  
15
 Website Baker is distributed in the hope that it will be useful,
16
 but WITHOUT ANY WARRANTY; without even the implied warranty of
17
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
18
 GNU General Public License for more details.
19

  
20
 You should have received a copy of the GNU General Public License
21
 along with Website Baker; if not, write to the Free Software
22
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23

  
24
*/
25

  
26 19
require('../../config.php');
27 20
require_once(WB_PATH.'/framework/class.admin.php');
28 21
require_once(WB_PATH.'/framework/functions.php');
......
35 28
}
36 29

  
37 30
// Check if tool is installed
38
$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'tool' AND directory = '".$admin->add_slashes($_GET['tool'])."'");
31
$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'tool' AND directory = '".preg_replace("/\W/", "", $_GET['tool'])."'");
39 32
if($result->numRows() == 0) {
40 33
	header("Location: index.php");
41 34
	exit(0);
branches/2.8.x/wb/admin/admintools/index.php
1 1
<?php
2
/**
3
 *
4
 * @category        admin
5
 * @package         admintools
6
 * @author          WebsiteBaker Project
7
 * @copyright       2004-2009, Ryan Djurovich
8
 * @copyright       2009-2011, Website Baker Org. e.V.
9
 * @link			http://www.websitebaker2.org/
10
 * @license         http://www.gnu.org/licenses/gpl.html
11
 * @platform        WebsiteBaker 2.8.x
12
 * @requirements    PHP 5.2.2 and higher
13
 * @version         $Id$
14
 * @filesource		$HeadURL:  $
15
 * @lastmodified    $Date:  $
16
 *
17
 */
2 18

  
3
// $Id$
4

  
5
/*
6

  
7
 Website Baker Project <http://www.websitebaker.org/>
8
 Copyright (C) 2004-2009, Ryan Djurovich
9

  
10
 Website Baker is free software; you can redistribute it and/or modify
11
 it under the terms of the GNU General Public License as published by
12
 the Free Software Foundation; either version 2 of the License, or
13
 (at your option) any later version.
14

  
15
 Website Baker is distributed in the hope that it will be useful,
16
 but WITHOUT ANY WARRANTY; without even the implied warranty of
17
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
18
 GNU General Public License for more details.
19

  
20
 You should have received a copy of the GNU General Public License
21
 along with Website Baker; if not, write to the Free Software
22
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23

  
24
*/
25

  
26 19
require('../../config.php');
27 20
require_once(WB_PATH.'/framework/class.admin.php');
28 21
$admin = new admin('admintools', 'admintools');
branches/2.8.x/wb/templates/wb_theme/templates/groups_form.htt
5 5
<form name="group" action="{ACTION_URL}" method="post" class="{DISPLAY_ADD}">
6 6
<input type="hidden" name="advanced" value="{ADVANCED}" />
7 7
<input type="hidden" name="group_id" value="{GROUP_ID}" />
8

  
8
{FTAN}
9 9
<table cellpadding="5" cellspacing="0" border="0" width="100%">
10 10
<tr>
11
	<td width="150">{TEXT_NAME}:</td>
11
	<td width="152">{TEXT_NAME}:</td>
12 12
	<td>
13 13
		<input type="text" name="group_name" maxlength="255" value="{GROUP_NAME}" style="width: 100%" />
14 14
	</td>
......
283 283
	<form name="advanced" action="{ADVANCED_ACTION}" method="post">
284 284
        <input type="hidden" name="group_id" value="{GROUP_ID}" />
285 285
        <input type="hidden" name="action" value="modify" />
286
		{FTAN}
286 287
        <input type="submit" name="advanced" onclick="window.location = '{ADVANCED_LINK}';" value="{ADVANCED_BUTTON}" />
287 288
    </form>
288 289
	</td>
branches/2.8.x/wb/templates/wb_theme/templates/groups.htt
1 1
<!-- BEGIN main_block -->
2 2

  
3 3
<form name="groups" action="groups.php" method="post">
4

  
5 4
<input type="hidden" name="action" value="delete" />
6

  
5
{FTAN}
7 6
<table cellpadding="0" cellspacing="0" border="0" width="100%">
8 7
<tr>
9 8
	<td align="left">
branches/2.8.x/wb/templates/argos_theme/templates/groups.htt
2 2

  
3 3
<form name="groups" action="groups.php" method="post">
4 4
  <input type="hidden" name="action" value="delete" />
5
  
5
 {FTAN}  
6 6
  <table cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
7 7
	<tr style="background:#f0f0f0;">
8 8
		<td align="left"><h2>{HEADING_MODIFY_DELETE_GROUP}</h2></td>
branches/2.8.x/wb/templates/argos_theme/templates/groups_form.htt
4 4
<form name="group" action="{ACTION_URL}" method="post" class="{DISPLAY_ADD}">
5 5
<input type="hidden" name="advanced" value="{ADVANCED}" />
6 6
<input type="hidden" name="group_id" value="{GROUP_ID}" />
7

  
7
{FTAN}
8 8
<table cellpadding="2" cellspacing="0" border="0" width="100%">
9 9
<tr>
10 10
	<td width="150">{TEXT_NAME}:</td>
......
265 265
<form name="advanced" action="{ADVANCED_ACTION}" method="post">
266 266
<input type="hidden" name="group_id" value="{GROUP_ID}" />
267 267
<input type="hidden" name="action" value="modify" />
268
{FTAN}
268 269
<table cellpadding="2" cellspacing="0" border="0" width="100%">
269 270
<tr>
270 271
    <td>&nbsp;</td>

Also available in: Unified diff