Project

General

Profile

« Previous | Next » 

Revision 1711

Added by Dietmar about 12 years ago

! update folder admin/start, admin/admintools, admin/skel/htt

View differences:

branches/2.8.x/CHANGELOG
13 13

  
14 14

  
15 15

  
16
29 Aug-2012 Build 1711 Dietmar Woellbrink (Luisehahne)
17
! update folder admin/start, admin/admintools, admin/skel/htt
16 18
29 Aug-2012 Build 1710 Dietmar Woellbrink (Luisehahne)
17 19
! update folder admin/groups, admin/users, admin/skel/htt
18 20
29 Aug-2012 Build 1709 Dietmar Woellbrink (Luisehahne)
19 21

  
branches/2.8.x/wb/admin/start/index.php
4 4
 * @category        admin
5 5
 * @package         start
6 6
 * @author          Ryan Djurovich, WebsiteBaker Project
7
 * @copyright       2009-2011, Website Baker Org. e.V.
7
 * @copyright       2009-2012, WebsiteBaker Org. e.V.
8 8
 * @link			http://www.websitebaker2.org/
9 9
 * @license         http://www.gnu.org/licenses/gpl.html
10 10
 * @platform        WebsiteBaker 2.8.x
......
13 13
 * @filesource		$HeadURL$
14 14
 * @lastmodified    $Date$
15 15
 *
16
*/
17

  
16
 */
17
//$string = "pages,pages_view,pages_add,pages_add_l0,pages_settings,pages_modify,pages_intro,pages_delete,media,media_view,media_upload,media_rename,media_delete,media_create,addons,modules,modules_view,modules_install,modules_uninstall,templates,templates_view,templates_install,templates_uninstall,languages,languages_view,languages_install,languages_uninstall,settings,settings_basic,settings_advanced,access,users,users_view,users_add,users_modify,users_delete,groups,groups_view,groups_add,groups_modify,groups_delete,admintools
18
//media,media_create,media_upload,media_view,preferences,preferences_view,pages,pages_modify,pages_view";
19
//$regex = "/(pages)+[a-z]*[_]([a-z_0-9]+)[^,]/im";
20
//preg_match_all ($regex, $string, $output);
21
//
18 22
require('../../config.php');
19 23
require_once(WB_PATH.'/framework/class.admin.php');
20 24
$admin = new admin('Start','start');
21 25
// ---------------------------------------
26
//	$database = WbDatabase::getInstance();
22 27

  
23 28
if(defined('FINALIZE_SETUP')) {
24 29
	require_once(WB_PATH.'/framework/functions.php');
......
52 57
	if($database->query($sql)) { }
53 58
}
54 59
// ---------------------------------------
55
$msg = '<br />';
56 60
// check if it is neccessary to start the uograde-script
61
$msg = '';
62

  
63
// ---------------------------------------
64
// check if it is neccessary to start the uograde-script
65
// ---------------------------------------
57 66
if(($admin->get_user_id()==1) && file_exists(WB_PATH.'/upgrade-script.php')) {
58 67
	// check if it is neccessary to start the uograde-script
59 68
	$sql = 'SELECT `value` FROM `'.TABLE_PREFIX.'settings` WHERE `name`=\'wb_revision\'';
......
72 81
	}
73 82
	$msg .= ''.$MESSAGE['START_UPGRADE_SCRIPT_EXISTS'].'<br />';
74 83
}
84
// ---------------------------------------
85
// workout to upgrade the groups system_permissions
86
// ---------------------------------------
87
if( ($admin->get_user_id()==1) &&
88
	file_exists(ADMIN_PATH.'/groups/upgradePermissions.php') &&
89
	!defined('GROUPS_UPDATED') )
90
{
91
	// check if it is neccessary to start the uograde-script
92
	$sql = 'SELECT `value` FROM `'.TABLE_PREFIX.'settings` WHERE `name`=\'wb_revision\'';
93
	if($wb_revision = $database->get_one($sql)) {
75 94

  
95
	}
96
	if (version_compare($wb_revision, '1691' ) < 0) {
97
		require_once (ADMIN_PATH.'/groups/upgradePermissions.php');
98
		// build new or changed $sTempPermissions
99
		if(upgrade_group_system_permissions()){
100
			$cfg = array(
101
				'groups_updated' => time()
102
			);
103
			if(db_update_key_value( 'settings', $cfg )) {
104
			    echo "<div class=\"note center rounded\"><h3>Hello Systemadministrator!</h3>".
105
				     "<p style=\"text-align:center;\">".
106
				     "The <strong>Administrator Groups Rights </strong> were updated automatically.\n" .
107
			         "Please click <a style=\"font-weight:bold;\" " .
108
			         "href=\"".ADMIN_URL."/logout/index.php\">on this link</a> to login again!</p>\n".
109
			         "<h3>Upgrading only start, if groups rights are not up to date!</h3></div>";
110
				// Print admin footer
111
				$admin->print_footer();
112
			    exit(0);
113

  
114
			}
115
		}
116
	}
117
}
118

  
119
// ---------------------------------------
76 120
// Setup template object, parse vars to it, then parse it
77 121
// Create new template object
78
$template = new Template(dirname($admin->correct_theme_source('start.htt')));
79
$template->set_file('page', 'start.htt');
80
$template->set_block('page', 'main_block', 'main');
122
$oTpl = new Template(dirname($admin->correct_theme_source('start.htt')),'keep');
123
$oTpl->set_file('page', 'start.htt');
124
$oTpl->set_block('page', 'main_block', 'main');
81 125

  
82 126
// Insert values into the template object
83
$template->set_var(array(
84
					'WELCOME_MESSAGE' => $MESSAGE['START']['WELCOME_MESSAGE'],
85
					'CURRENT_USER' => $MESSAGE['START']['CURRENT_USER'],
127
$oTpl->set_var(array(
128
					'WELCOME_MESSAGE' => $MESSAGE['START_WELCOME_MESSAGE'],
129
					'CURRENT_USER' => $MESSAGE['START_CURRENT_USER'],
86 130
					'DISPLAY_NAME' => $admin->get_display_name(),
87 131
					'ADMIN_URL' => ADMIN_URL,
88 132
					'WB_URL' => WB_URL,
89 133
					'THEME_URL' => THEME_URL,
90
					'WB_VERSION' => WB_VERSION
134
					'WB_VERSION' => WB_VERSION,
135
					'NO_CONTENT' => ''
91 136
				)
92 137
			);
93 138

  
139

  
94 140
// Insert permission values into the template object
141
$oTpl->set_block('main_block', 'show_pages_block', 'show_pages');
95 142
if($admin->get_permission('pages') != true)
96 143
{
97
	$template->set_var('DISPLAY_PAGES', 'display:none;');
144
	$oTpl->set_block('show_pages', '');
145
} else {
146
	$oTpl->parse('show_pages', 'show_pages_block', true);
98 147
}
148

  
149
$oTpl->set_block('main_block', 'show_addons_block', 'show_addons');
150
if($admin->get_permission('addons') != true)
151
{
152
	$oTpl->set_block('show_addons', '');
153
} else {
154
	$oTpl->parse('show_addons', 'show_addons_block', true);
155
}
156

  
157
$oTpl->set_block('main_block', 'show_settings_block', 'show_settings');
158
if($admin->get_permission('settings') != true)
159
{
160
	$oTpl->set_block('show_settings', '');
161
} else {
162
	$oTpl->parse('show_settings', 'show_settings_block', true);
163
}
164

  
165
$oTpl->set_block('main_block', 'show_access_block', 'show_access');
166
if($admin->get_permission('access') != true)
167
{
168
	$oTpl->set_block('show_access', '');
169
} else {
170
	$oTpl->parse('show_access', 'show_access_block', true);
171
}
172

  
173
$oTpl->set_block('main_block', 'show_media_block', 'show_media');
99 174
if($admin->get_permission('media') != true)
100 175
{
101
	$template->set_var('DISPLAY_MEDIA', 'display:none;');
176
	$oTpl->set_block('show_media', '');
177
} else {
178
	$oTpl->parse('show_media', 'show_media_block', true);
102 179
}
180

  
181
$oTpl->set_block('main_block', 'show_admintools_block', 'show_admintools');
182
if($admin->get_permission('admintools') != true)
183
{
184
	$oTpl->set_block('show_admintools', '');
185
} else {
186
	$oTpl->parse('show_admintools', 'show_admintools_block', true);
187
}
188

  
189
$oTpl->set_block('main_block', 'show_preferences_block', 'show_preferences');
190
if($admin->get_permission('preferences') != true)
191
{
192
	$oTpl->set_block('show_preferences', '');
193
} else {
194
	$oTpl->parse('show_preferences', 'show_preferences_block', true);
195
}
196

  
197
$oTpl->set_block('main_block', 'show_install_block', 'show_install');
198
if($admin->ami_group_member('1') != true)
199
{
200
	$oTpl->set_block('show_install', '');
201
} else {
202
	$oTpl->parse('show_install', 'show_install_block', true);
203
}
204

  
205
/*
206
if($admin->get_permission('pages') != true)
207
{
208
	$oTpl->set_var('DISPLAY_PAGES', 'display:none;');
209
}
210
if($admin->get_permission('media') != true)
211
{
212
	$oTpl->set_var('DISPLAY_MEDIA', 'display:none;');
213
}
103 214
if($admin->get_permission('addons') != true)
104 215
{
105
	$template->set_var('DISPLAY_ADDONS', 'display:none;');
216
	$oTpl->set_var('DISPLAY_ADDONS', 'display:none;');
106 217
}
107 218
if($admin->get_permission('access') != true)
108 219
{
109
	$template->set_var('DISPLAY_ACCESS', 'display:none;');
220
	$oTpl->set_var('DISPLAY_ACCESS', 'display:none;');
110 221
}
111 222
if($admin->get_permission('settings') != true)
112 223
{
113
	$template->set_var('DISPLAY_SETTINGS', 'display:none;');
224
	$oTpl->set_var('DISPLAY_SETTINGS', 'display:none;');
114 225
}
115 226
if($admin->get_permission('admintools') != true)
116 227
{
117
	$template->set_var('DISPLAY_ADMINTOOLS', 'display:none;');
228
	$oTpl->set_var('DISPLAY_ADMINTOOLS', 'display:none;');
118 229
}
230
*/
119 231

  
120
$msg .= (file_exists(WB_PATH.'/install/')) ?  $MESSAGE['START']['INSTALL_DIR_EXISTS'] : '';
232
$msg .= (file_exists(WB_PATH.'/install/')) ?  $MESSAGE['START_INSTALL_DIR_EXISTS'] : '';
121 233

  
122 234
// Check if installation directory still exists
123 235
if(file_exists(WB_PATH.'/install/') || file_exists(WB_PATH.'/upgrade-script.php') ) {
124 236
	// Check if user is part of Adminstrators group
125 237
	if(in_array(1, $admin->get_groups_id()))
126 238
    {
127
		$template->set_var('WARNING', $msg );
239
		$oTpl->set_var('WARNING', $msg );
128 240
	} else {
129
		$template->set_var('DISPLAY_WARNING', 'display:none;');
241
		$oTpl->set_var('DISPLAY_WARNING', 'display:none;');
130 242
	}
131 243
} else {
132
	$template->set_var('DISPLAY_WARNING', 'display:none;');
244
	$oTpl->set_var('DISPLAY_WARNING', 'display:none;');
133 245
}
134 246

  
135 247
// Insert "Add-ons" section overview (pretty complex compared to normal)
......
166 278
}
167 279

  
168 280
// Insert section names and descriptions
169
$template->set_var(array(
281
$oTpl->set_var(array(
170 282
					'PAGES' => $MENU['PAGES'],
171 283
					'MEDIA' => $MENU['MEDIA'],
172 284
					'ADDONS' => $MENU['ADDONS'],
......
186 298
			);
187 299

  
188 300
// Parse template object
189
$template->parse('main', 'main_block', false);
190
$template->pparse('output', 'page');
301
$oTpl->parse('main', 'main_block', false);
302
$oTpl->pparse('output', 'page');
191 303

  
192 304
// Print admin footer
193 305
$admin->print_footer();
branches/2.8.x/wb/admin/skel/themes/htt/admintools.htt
1 1
<!-- BEGIN main_block -->
2
<h2>{HEADING_ADMINISTRATION_TOOLS} </h2>
3
<div id="admintools">
4
	<ul>
5
	<!-- BEGIN tool_list_block -->
6
	<li>
7
		<table summary="" cellpadding="0" cellspacing="0" border="0" class="section" width="100%">
8
		<tr>
9
			<td class="graphic" align="center" valign="middle" rowspan="2">
10
				<a class= "title" href="{ADMIN_URL}/admintools/tool.php?tool={TOOL_DIR}">
11
				<img src="{TOOL_ICON}" border="0" alt="{TOOL_NAME}" align="left" /></a>
12
			</td>
13
			<td class="description" valign="top">
14
				<a href="{ADMIN_URL}/admintools/tool.php?tool={TOOL_DIR}"><span class="title">{TOOL_NAME}</span></a>{TOOL_DESCRIPTION}
15
			</td>
16
		</tr>
17
		</table>
18
	</li>
19
	<!-- END tool_list_block -->
20
	</ul>
21
	{TOOL_LIST}
22
</div>
2
	<div class="content_box">
3
		<h2>{HEADING_ADMINISTRATION_TOOLS}</h2>
4
		<ul>
5
		<!-- BEGIN tool_list_block -->
6
			<li class="c50">
7
				<div class="mbox curved mbox-icon " style="background-image: url({TOOL_ICON});">
8
					<div class="h80 floatbox">
9
						<p class="title"><a href="{ADMIN_URL}/admintools/tool.php?tool={TOOL_DIR}">{TOOL_NAME}</a></p>
10
						{TOOL_DESCRIPTION}
11
					</div>
12
				</div>
13
				{NO_CONTENT}
14
			</li>
15
		<!-- END tool_list_block -->
16
			{TOOL_LIST}
17
		</ul>
18
	</div>
23 19
<!-- END main_block -->
branches/2.8.x/wb/admin/skel/themes/htt/start.htt
1 1
<!-- BEGIN main_block -->
2

  
3
<table summary="" cellpadding="0" cellspacing="0" border="0" width="99%" align="center">
4
  <tr>
5
    <td colspan="3">{WELCOME_MESSAGE}. {CURRENT_USER} {DISPLAY_NAME}. </td>
6
  </tr>
7
  <tr style="{DISPLAY_WARNING};">
8
    <td colspan="3" align="center" style="color: #FF0000; font-weight: bold;">{WARNING}</td>
9
  </tr>
10
  <tr>
11
    <td align="center" valign="top" width="49%">
12
      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_PAGES};">
13
        <tr>
14
          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/pages/index.php"> <img src="{THEME_URL}/icons/pages.png" border="0" alt="{PAGES}" /> </a> </td>
15
          <td class="description" valign="top"> <a href="{ADMIN_URL}/pages/index.php"><span class="title">{PAGES}</span></a>
16
		  {PAGES_OVERVIEW}
17
		  </td>
18
        </tr>
19

  
20
      </table>
21
      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_ADDONS};">
22
        <tr>
23
          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/addons/index.php"> <img src="{THEME_URL}/icons/addons.png" border="0" alt="{ADDONS}" /> </a> </td>
24
          <td class="description" valign="top"> <a href="{ADMIN_URL}/addons/index.php"><span class="title">{ADDONS}</span></a>
25
		  {ADDONS_OVERVIEW}
26
		  </td>
27
        </tr>
28
      </table>
29
      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_SETTINGS};">
30
        <tr>
31
          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/settings/index.php"> <img src="{THEME_URL}/icons/settings.png" border="0" alt="{SETTINGS}" /> </a> </td>
32
          <td class="description" valign="top"> <a href="{ADMIN_URL}/settings/index.php"><span class="title">{SETTINGS}</span></a>
33
		  {SETTINGS_OVERVIEW}
34
		  </td>
35
        </tr>
36
      </table>
37
      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_ACCESS};">
38
        <tr>
39
          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/access/index.php"> <img src="{THEME_URL}/icons/access.png" border="0" alt="{ACCESS}" /> </a> </td>
40
          <td class="description" valign="top"> <a href="{ADMIN_URL}/access/index.php"><span class="title">{ACCESS}</span></a>
41
		  {ACCESS_OVERVIEW}
42
		  </td>
43
        </tr>
44
      </table>
45
    </td>
46
    <td width="10">&nbsp; </td>
47
    <td align="center" valign="top">
48
	  <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_MEDIA};">
49
        <tr>
50
          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/media/index.php"> <img src="{THEME_URL}/icons/media.png" border="0" alt="{MEDIA}" /> </a> </td>
51
          <td class="description" valign="top"> <a href="{ADMIN_URL}/media/index.php"><span class="title">{MEDIA}</span></a>
52
		  {MEDIA_OVERVIEW}
53
		  </td>
54
        </tr>
55
      </table>	  
56
      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section">
57
        <tr>
58
          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/preferences/index.php"> <img src="{THEME_URL}/icons/preferences.png" border="0" alt="{PREFERENCES}" /> </a> </td>
59
          <td class="description" valign="top"> <a href="{ADMIN_URL}/preferences/index.php"><span class="title">{PREFERENCES}</span></a>
60
		  {PREFERENCES_OVERVIEW}
61
		  </td>
62
        </tr>
63
      </table>
64
      <table summary="" cellpadding="0" cellspacing="0" border="0" class="section" style="{DISPLAY_ADMINTOOLS};">
65
        <tr>
66
          <td class="graphic" align="center" valign="middle" rowspan="2"> <a href="{ADMIN_URL}/admintools/index.php"> <img src="{THEME_URL}/icons/admintools.png" border="0" alt="{ADMINTOOLS}" /> </a> </td>
67
          <td class="description" valign="top"> <a href="{ADMIN_URL}/admintools/index.php"><span class="title">{ADMINTOOLS}</span></a>
68
		  {ADMINTOOLS_OVERVIEW}
69
		  </td>
70
        </tr>
71
      </table>
72
    </td>
73
  </tr>
74
</table>
2
	<div class="content_box">
3
	    <h4 class="center">{WELCOME_MESSAGE}. {CURRENT_USER} {DISPLAY_NAME}</h4>
4
 	<!-- BEGIN show_install_block -->
5
         <h4 style="{DISPLAY_WARNING}" class="warning center">{WARNING}</h4>
6
	<!-- END show_install_block -->
7
	</div>
8
	<div class="content_box">
9
		<ul>
10
 	<!-- BEGIN show_pages_block -->
11
			<li class="c50">
12
				<div class="mbox curved mbox-icon" style=" background-image: url({THEME_URL}/icons/pages.png); overflow:hidden;">
13
					<div class="h65">
14
						<p class="title"><a href="{ADMIN_URL}/pages/index.php" title="{PAGES_OVERVIEW}">{PAGES}</a></p>
15
						{PAGES_OVERVIEW}
16
					</div>
17
				</div>
18
			</li>
19
	<!-- END show_pages_block -->
20
 	<!-- BEGIN show_addons_block -->
21
			<li class="c50">
22
				<div class="mbox curved mbox-icon" style=" background-image: url({THEME_URL}/icons/addons.png); overflow:hidden;">
23
					<div class="h65">
24
						<p class="title"><a href="{ADMIN_URL}/addons/index.php" title="{ADDONS}">{ADDONS}</a></p>
25
						{ADDONS_OVERVIEW}
26
					</div>
27
				</div>
28
			</li>
29
	<!-- END show_addons_block -->
30
 	<!-- BEGIN show_settings_block -->
31
			<li class="c50">
32
				<div class="mbox curved mbox-icon" style=" background-image: url({THEME_URL}/icons/settings.png); overflow:hidden;">
33
					<div class="h65">
34
					<p class="title"><a href="{ADMIN_URL}/settings/index.php" title="{SETTINGS_OVERVIEW}">{SETTINGS}</a></p>
35
					{SETTINGS_OVERVIEW}
36
					</div>
37
				</div>
38
			</li>
39
	<!-- END show_settings_block -->
40
 	<!-- BEGIN show_access_block -->
41
			<li class="c50">
42
				<div class="mbox curved mbox-icon" style=" background-image: url({THEME_URL}/icons/access.png); overflow:hidden;">
43
					<div class="h65">
44
						<p class="title"><a href="{ADMIN_URL}/access/index.php" title="{ACCESS}">{ACCESS}</a></p>
45
						{ACCESS_OVERVIEW}
46
					</div>
47
				</div>
48
			</li>
49
 	<!-- END show_access_block -->
50
			{NO_CONTENT}
51
		</ul>
52
		<ul>
53
 	<!-- BEGIN show_media_block -->
54
			<li class="c50">
55
				<div class="mbox curved mbox-icon" style=" background-image: url({THEME_URL}/icons/media.png); overflow:hidden;">
56
					<div class="h65">
57
						<p class="title"><a href="{ADMIN_URL}/media/index.php" title="{MEDIA_OVERVIEW}">{MEDIA}</a></p>
58
						{MEDIA_OVERVIEW}
59
					</div>
60
				</div>
61
			</li>
62
 	<!-- END show_media_block -->
63
 	<!-- BEGIN show_preferences_block -->
64
			<li class="c50">
65
				<div class="mbox curved mbox-icon" style=" background-image: url({THEME_URL}/icons/preferences.png); overflow:hidden;">
66
					<div class="h65">
67
						<p class="title"><a href="{ADMIN_URL}/preferences/index.php" title="{PREFERENCES_OVERVIEW}">{PREFERENCES}</a></p>
68
						{PREFERENCES_OVERVIEW}
69
					</div>
70
				</div>
71
			</li>
72
 	<!-- END show_preferences_block -->
73
 	<!-- BEGIN show_admintools_block -->
74
			<li class="c50">
75
				<div class="mbox curved mbox-icon" style=" background-image: url({THEME_URL}/icons/admintools.png); overflow:hidden;">
76
					<div class="h65">
77
						<p class="title"><a href="{ADMIN_URL}/admintools/index.php" title="{ADMINTOOLS_OVERVIEW}" class="link">{ADMINTOOLS}</a><br /></p>
78
						{ADMINTOOLS_OVERVIEW}
79
					</div>
80
				</div>
81
			</li>
82
 	<!-- END show_admintools_block -->
83
			{NO_CONTENT}
84
		</ul>
85
	</div>
75 86
<!-- END main_block -->
branches/2.8.x/wb/admin/skel/themes/htt/media_browse.htt
3 3
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
4 4
<head>
5 5
<title>Browse Media</title>
6
<link href="{THEME_URL}/browse.css" rel="stylesheet" type="text/css" />
6
<link href="{THEME_URL}/css/browse.css" rel="stylesheet" type="text/css" />
7 7
<script type="text/javascript">
8 8
function confirm_link(message, url) {
9 9
	if(confirm(message)) location.href = url;
10 10
}
11 11
</script>
12
<script type="text/javascript" src="overlib.js"></script>
12
<script src="{WB_URL}/include/jquery/overlib_mini.js" type="text/javascript"></script>
13 13
</head>
14 14
<body onload="parent.document.create.target.value = '{MEDIA_DIRECTORY}{CURRENT_DIR}'; parent.document.upload.target.value = '{MEDIA_DIRECTORY}{CURRENT_DIR}';">
15 15

  
branches/2.8.x/wb/admin/skel/themes/htt/preferences.htt
1 1
<!-- BEGIN main_block -->
2
<h2>{HEADING_MY_SETTINGS}</h2>
3
<div class="content_box">
4
	<form name="{FORM_NAME}" id="{FORM_NAME}" action="{ACTION_URL}" method="post">
2
<form name="{FORM_NAME}" class="settings_table" action="{ACTION_URL}" method="post">
5 3
		{FTAN}
6
			<div class="subcolumns">
7
				<div class="c25l">
8
					<label>{TEXT_USERNAME}:</label><br />
9
				</div>
10
				<div class="c60l">
11
					<div id="username">{USERNAME}</div><br />
12
				</div>
13
			</div>
14
			<div class="subcolumns">
15
				<div class="c25l">
16
					<label>{TEXT_DISPLAY_NAME}:</label><br />
17
				</div>
18
				<div class="c60l">
19
					<input type="text" id="display_name" name="display_name" value="{DISPLAY_NAME}" /><br />
20
				</div>
21
			</div>
22
			<div class="subcolumns">
23
				<div class="c25l">
24
					<label>{TEXT_LANGUAGE}:</label><br />
25
				</div>
26
				<div class="c60l">
27
				<select name="language" id="language">
28
					<!-- BEGIN language_list_block -->
29
						<option value="{CODE}"{SELECTED} style="background: url({FLAG}.png) no-repeat center left; padding-left: 20px;">{NAME} ({CODE})</option>
30
					<!-- END language_list_block -->
31
					</select>
32
				</div>
33
			</div>
34
			<div class="subcolumns">
35
				<div class="c25l">
36
					<label>{TEXT_TIMEZONE}:</label><br />
37
				</div>
38
				<div class="c60l">
39
					<select name="timezone" id="timezone">
40
						<!-- BEGIN timezone_list_block -->
41
							<option value="{VALUE}"{SELECTED}>{NAME}</option>
42
						<!-- END timezone_list_block -->
43
					</select>
44
				</div>
45
			</div>
46
			<div class="subcolumns">
47
				<div class="c25l">
48
					<label>{TEXT_DATE_FORMAT}:</label><br />
49
				</div>
50
				<div class="c60l">
51
					<select name="date_format" id="date_format">
52
						<!-- BEGIN date_format_list_block -->
53
							<option value="{VALUE}"{SELECTED}>{NAME}</option>
54
						<!-- END date_format_list_block -->
55
					</select>
56
				</div>
57
			</div>
58
			<div class="subcolumns">
59
				<div class="c25l">
60
					<label>{TEXT_TIME_FORMAT}:</label><br />
61
				</div>
62
				<div class="c60l">
4
	<fieldset style="margin-bottom: 0; padding-bottom: 0;">
5
		<legend>{HEADING_MY_SETTINGS}</legend>
6
		<div class="sub-row">
7
			<label class="setting_name rBold">{TEXT_USERNAME}:</label>
8
			<input class="button" type="button" value="{USERNAME}" disabled="disabled" readonly="readonly" />
9
		</div>
10

  
11
		<div class="sub-row">
12
			<label class="setting_name rBold">{TEXT_DISPLAY_NAME}:</label>
13
			<input type="text" id="display_name" name="display_name" value="{DISPLAY_NAME}" />
14
		</div>
15

  
16
		<div class="sub-row">
17
			<label class="setting_name rBold">{TEXT_LANGUAGE}:</label>
18
			<select name="language" id="language">
19
				<!-- BEGIN language_list_block -->
20
					<option value="{CODE}"{SELECTED} style="background: url({FLAG}.png) no-repeat center left; padding-left: 20px;">{NAME} ({CODE})</option>
21
				<!-- END language_list_block -->
22
			</select>
23
		</div>
24
		<div class="sub-row">
25
			<label class="setting_name rBold">{TEXT_TIMEZONE}:</label>
26
			<select name="timezone" id="timezone">
27
				<!-- BEGIN timezone_list_block -->
28
					<option value="{VALUE}"{SELECTED}>{NAME}</option>
29
				<!-- END timezone_list_block -->
30
			</select>
31
		</div>
32
		<div class="sub-row">
33
			<label class="setting_name rBold">{TEXT_DATE_FORMAT}:</label>
34
			<select name="date_format" id="date_format">
35
				<!-- BEGIN date_format_list_block -->
36
					<option value="{VALUE}"{SELECTED}>{NAME}</option>
37
				<!-- END date_format_list_block -->
38
			</select>
39
		</div>
40
		<div class="sub-row">
41
			<label class="setting_name rBold">{TEXT_TIME_FORMAT}:</label>
63 42
					<select name="time_format" id="time_format">
64 43
						<!-- BEGIN time_format_list_block -->
65 44
							<option value="{VALUE}"{SELECTED}>{NAME}</option>
66 45
						<!-- END time_format_list_block -->
67 46
					</select>
68 47
				</div>
48
		<div class="sub-row">
49
			<label class="setting_name rBold">{TEXT_EMAIL}:</label>
50
			<input type="text" id="email" name="email" value="{EMAIL}" />
69 51
			</div>
70

  
71
			<div class="subcolumns">
72
				<div class="c25l">
73
					<label>{TEXT_EMAIL}:</label><br />
52
		<div class="sub-row">
53
			<label class="setting_name rBold">{TEXT_NEW_PASSWORD}:</label>
54
			<input type="password" id="new_password_1" name="new_password_1" value="{EMPTY_STRING}" />
74 55
				</div>
75
				<div class="c60l">
76
					<input type="text" id="email" name="email" value="{EMAIL}" /><br />
56
		<div class="sub-row">
57
			<label class="setting_name rBold">{TEXT_RETYPE_NEW_PASSWORD}:</label>
58
			<input type="password" id="new_password_2" name="new_password_2" value="{EMPTY_STRING}" />
77 59
				</div>
78
			</div>
79
			<div class="subcolumns">
80
				<div class="c25l">
81
					<label>{TEXT_NEW_PASSWORD}:</label><br />
82
				</div>
83
				<div class="c60l">
84
					<input type="password" id="new_password_1" name="new_password_1" value="{EMPTY_STRING}" /><br />
85
				</div>
86
			</div>
87
			<div class="subcolumns">
88
				<div class="c25l">
89
					<label>{TEXT_RETYPE_NEW_PASSWORD}:</label><br />
90
				</div>
91
				<div class="c60l">
92
					<input type="password" id="new_password_2" name="new_password_2" value="{EMPTY_STRING}" /><br />
93
				</div>
94
			</div>
95 60
			<hr />
96
			<div class="subcolumns">
97
				<div class="c25l">
98
					<label>{TEXT_NEED_CURRENT_PASSWORD}:</label><br />
61
		<div class="sub-row">
62
			<label class="setting_name rBold">{TEXT_NEED_CURRENT_PASSWORD}:</label>
63
			<input type="password" id="current_password" name="current_password" value="{EMPTY_STRING}" />
99 64
				</div>
100
				<div class="c60l">
101
					<input type="password" id="current_password" name="current_password" value="{EMPTY_STRING}" /><br />
102
				</div>
103
			</div>
104
			<div class="subcolumns save_section">
105
				<div class="c60l">
65
		<div class="sub-row">
106 66
					<input type="submit" id="submit" name="submit" value="{TEXT_SAVE}" />
107 67
					<input type="reset" id="reset" name="reset" value="{TEXT_RESET}" />
108 68
				</div>
109
				<div class="c25l">&nbsp;</div>
110
			</div>
111
	</form>
112
</div>
113

  
69
	</fieldset>
70
</form>
114 71
<!-- END main_block -->
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', '1710');
54
if(!defined('REVISION')) define('REVISION', '1711');
55 55
if(!defined('SP')) define('SP', '');
branches/2.8.x/wb/admin/admintools/tool.php
4 4
 * @category        admin
5 5
 * @package         admintools
6 6
 * @author          WB-Project, Werner v.d. Decken
7
 * @copyright       2011, Website Baker Org. e.V.
7
 * @copyright       2012, WebsiteBaker Org. e.V.
8 8
 * @link			http://www.websitebaker2.org/
9 9
 * @license         http://www.gnu.org/licenses/gpl.html
10 10
 * @platform        WebsiteBaker 2.8.2
......
40 40
			// include modules tool.php
41 41
			require(WB_PATH.'/modules/'.$toolDir.'/tool.php');
42 42
			$admin->print_footer();
43
		}else {
43
		} else {
44 44
		// no installed module found, jump to index.php of admintools
45
			header('location: '.ADMIN_URL.'/admintools/index.php');
46
			exit(0);
45
//			header('location: '.ADMIN_URL.'/admintools/index.php');
46
//			exit(0);
47
			$admin->send_header(ADMIN_URL.'/admintools/index.php');
47 48
		}
48 49
	}else {
49 50
	// invalid module name requested, jump to index.php of admintools
50
		header('location: '.ADMIN_URL.'/admintools/index.php');
51
		exit(0);
51
//		header('location: '.ADMIN_URL.'/admintools/index.php');
52
//		exit(0);
53
		$admin->send_header(ADMIN_URL.'/admintools/index.php');
52 54
	}
branches/2.8.x/wb/admin/admintools/index.php
4 4
 * @category        admin
5 5
 * @package         admintools
6 6
 * @author          WB-Project, Werner v.d. Decken
7
 * @copyright       2011, Website Baker Org. e.V.
7
 * @copyright       2012, WebsiteBaker Org. e.V.
8 8
 * @link			http://www.websitebaker2.org/
9 9
 * @license         http://www.gnu.org/licenses/gpl.html
10 10
 * @platform        WebsiteBaker 2.8.x
......
24 24

  
25 25
// Setup template object, parse vars to it, then parse it
26 26
// Create new template object
27
$template = new Template(dirname($admin->correct_theme_source('admintools.htt')));
27
$template = new Template(dirname($admin->correct_theme_source('admintools.htt')),'keep');
28 28
// $template->debug = true;
29 29
$template->set_file('page', 'admintools.htt');
30 30
$template->set_block('page', 'main_block', 'main');
......
36 36

  
37 37
// Insert tools into tool list
38 38
$template->set_block('main_block', 'tool_list_block', 'tool_list');
39
$template->set_var('TOOL_NAME', '');
40
$template->set_var('TOOL_DIR', '');
41
$template->set_var('TOOL_DESCRIPTION', '');
42
$template->set_var('NO_CONTENT', '');
43

  
39 44
$results = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'tool' order by name");
40 45
if($results->numRows() > 0) {
41
	while($tool = $results->fetchRow()) {
42
		$template->set_var('TOOL_NAME', $tool['name']);
43
		$template->set_var('TOOL_DIR', $tool['directory']);
46
	while( $tool = $results->fetchRow() ) {
47

  
48
		if( $admin->get_permission($tool['directory'],'module' ) )
49
		{
50
			$template->set_var('TOOL_NAME', $tool['name']);
51
			$template->set_var('TOOL_DIR', $tool['directory']);
44 52
// /icons/admintools.png
45 53
		// check if a module description exists for the displayed backend language
46
		$tool_description = false;
47
		if(function_exists('file_get_contents') && file_exists(WB_PATH.'/modules/'.$tool['directory'].'/languages/'.LANGUAGE .'.php')) {
48
			// read contents of the module language file into string
49
			$data = @file_get_contents(WB_PATH .'/modules/' .$tool['directory'] .'/languages/' .LANGUAGE .'.php');
50
			$tool_description = get_variable_content('module_description', $data, true, false);
51
		}		
52
		if(file_exists(WB_PATH .'/modules/' .$tool['directory'].'/tool_icon.png'))
53
		{
54
			$template->set_var('TOOL_ICON', WB_URL.'/modules/' .$tool['directory'].'/tool_icon.png');
55
		} else {
56
			$template->set_var('TOOL_ICON', THEME_URL.'/icons/admintools.png');
54
			$tool_description = false;
55
			if(function_exists('file_get_contents') && file_exists(WB_PATH.'/modules/'.$tool['directory'].'/languages/'.LANGUAGE .'.php')) {
56
				// read contents of the module language file into string
57
				$data = @file_get_contents(WB_PATH .'/modules/' .$tool['directory'] .'/languages/' .LANGUAGE .'.php');
58
				$tool_description = get_variable_content('module_description', $data, true, false);
59
			}
60
			if(file_exists(WB_PATH .'/modules/' .$tool['directory'].'/tool_icon.png'))
61
			{
62
				$template->set_var('TOOL_ICON', WB_URL.'/modules/' .$tool['directory'].'/tool_icon.png');
63
			} else {
64
				$template->set_var('TOOL_ICON', THEME_URL.'/icons/admintools.png');
65
			}
66
			$template->set_var('TOOL_DESCRIPTION', ($tool_description === False)? $tool['description'] :$tool_description);
67
			$template->parse('tool_list', 'tool_list_block', true);
57 68
		}
58
		$template->set_var('TOOL_DESCRIPTION', ($tool_description === False)? $tool['description'] :$tool_description);
59
		$template->parse('tool_list', 'tool_list_block', true);
60 69
	}
70

  
61 71
} else {
62
	$template->set_var('TOOL_LIST', $TEXT['NONE_FOUND']);	
72
	$template->set_var('TOOL_LIST', $TEXT['NONE_FOUND']);
63 73
}
64 74

  
75
$template->set_var('TOOL_LIST', '<li>&nbsp;</li>');
65 76
// Parse template objects output
66 77
$template->parse('main', 'main_block', false);
67 78
$template->pparse('output', 'page');

Also available in: Unified diff