Project

General

Profile

« Previous | Next » 

Revision 1322

Added by Luisehahne almost 15 years ago

Ticket #984 Removing outdated comment-block in class.login.php
Ticket #983 Sorting order of modules and templates inside groups.php

View differences:

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

  
13 13
------------------------------------- 2.8.1 -------------------------------------
14
14-Apr-2010 Dietmar Woellbrink (Luisehahne)
15
#	Ticket #984 Removing outdated comment-block in class.login.php
16
#	Ticket #983 Sorting order of modules and templates inside groups.php
14 17
14-Apr-2010 Dietrich Roland Pehlke (Aldus)
15 18
#	Ticket #982 - Wrong use of heredoc-syntax in some language-files (BG, CS and HR) breaks the installation-process.
16 19
14-Apr-2010 Dietmar Woellbrink (Luisehahne)
branches/2.8.x/wb/admin/groups/groups.php
86 86
	
87 87
	// Insert values into module list
88 88
	$template->set_block('main_block', 'module_list_block', 'module_list');
89
	$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'page'");
89
	$result = $database->query('SELECT * FROM `'.TABLE_PREFIX.'addons` WHERE `type` = "module" AND `function` = "page" ORDER BY `name`');
90 90
	if($result->numRows() > 0) {
91 91
		while($addon = $result->fetchRow()) {
92 92
			$template->set_var('VALUE', $addon['directory']);
......
102 102
	
103 103
	// Insert values into template list
104 104
	$template->set_block('main_block', 'template_list_block', 'template_list');
105
	$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template'");
105
	$result = $database->query('SELECT * FROM `'.TABLE_PREFIX.'addons` WHERE `type` = "template" ORDER BY `name`');
106 106
	if($result->numRows() > 0) {
107 107
		while($addon = $result->fetchRow()) {
108 108
			$template->set_var('VALUE', $addon['directory']);
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.x');
55
if(!defined('REVISION')) define('REVISION', '1321');
55
if(!defined('REVISION')) define('REVISION', '1322');
56 56

  
57 57
?>
branches/2.8.x/wb/framework/class.login.php
187 187
				// Set a session var so apps can tell user is using default time format
188 188
				$_SESSION['USE_DEFAULT_TIME_FORMAT'] = true;
189 189
			}
190

  
190 191
			// Get group information
191
//			$query = "SELECT * FROM ".$this->GROUPS_TABLE." WHERE group_id = '".$this->get_session('GROUP_ID')."'";
192
//			$results = $database->query($query);
193
//			$results_array = $results->fetchRow();
194
//			$_SESSION['GROUP_NAME'] = $results_array['name'];
195
//			// Set system permissions
196
//			if($results_array['system_permissions'] != '') {
197
//				$_SESSION['SYSTEM_PERMISSIONS'] = explode(',', $results_array['system_permissions']);
198
//			} else {
199
//				$_SESSION['SYSTEM_PERMISSIONS'] = array();
200
//			}
201
//			// Set module permissions
202
//			if($results_array['module_permissions'] != '') {
203
//				$_SESSION['MODULE_PERMISSIONS'] = explode(',', $results_array['module_permissions']);
204
//			} else {
205
//				$_SESSION['MODULE_PERMISSIONS'] = array();
206
//			}
207
//			// Set template permissions
208
//			if($results_array['template_permissions'] != '') {
209
//				$_SESSION['TEMPLATE_PERMISSIONS'] = explode(',', $results_array['template_permissions']);
210
//			} else {
211
//				$_SESSION['TEMPLATE_PERMISSIONS'] = array();
212
//			}
213

  
214 192
			$_SESSION['SYSTEM_PERMISSIONS'] = array();
215 193
			$_SESSION['MODULE_PERMISSIONS'] = array();
216 194
			$_SESSION['TEMPLATE_PERMISSIONS'] = array();

Also available in: Unified diff