Revision 1740
Added by Dietmar about 12 years ago
| branches/2.8.x/CHANGELOG | ||
|---|---|---|
| 13 | 13 |
|
| 14 | 14 |
|
| 15 | 15 |
|
| 16 |
05 Sep-2012 Build 1740 Dietmar Woellbrink (Luisehahne) |
|
| 17 |
! frontend.functions.php remove return $content in page_content(), |
|
| 18 |
incompatible with search logic |
|
| 19 |
! /include/jquery forgot jquery version.txt |
|
| 20 |
# /form/view.php fixed wrong compare syntax |
|
| 21 |
! group management, design style, set max-heights for permission boxes |
|
| 16 | 22 |
05 Sep-2012 Build 1739 Dietmar Woellbrink (Luisehahne) |
| 17 | 23 |
! update jquery ui to version 1.8.23 |
| 18 | 24 |
05 Sep-2012 Build 1738 Dietmar Woellbrink (Luisehahne) |
| branches/2.8.x/wb/include/jquery/version.txt | ||
|---|---|---|
| 1 | 1 |
jQuery 1.8.1 |
| 2 |
jQuery UI 1.8.17 |
|
| 2 |
jQuery UI 1.8.23 |
|
| branches/2.8.x/wb/admin/skel/themes/htt/groups_form.htt | ||
|---|---|---|
| 78 | 78 |
<!-- BEGIN show_cmd_hidden_advanced_permission_list_block --> |
| 79 | 79 |
<input name="{SYS_NAME}" type="hidden" value="{SYS_VALUE}" />
|
| 80 | 80 |
<!-- END show_cmd_hidden_advanced_permission_list_block --> |
| 81 |
<div class="mbox curved min_h100 floatbox"> |
|
| 81 |
<div class="mbox curved min_h100 floatbox" style="height: 180px;">
|
|
| 82 | 82 |
<h6>{FILESYSTEM_PERMISSIONS} {MENU_PAGES}</h6>
|
| 83 | 83 |
<ul> |
| 84 | 84 |
<li class="c100"> |
| ... | ... | |
| 115 | 115 |
</div> |
| 116 | 116 |
<div class="cleft col_width33"> |
| 117 | 117 |
<div class="col_content"> |
| 118 |
<div class="mbox curved min_h100 floatbox"> |
|
| 118 |
<div class="mbox curved min_h100 floatbox" style="height: 180px;">
|
|
| 119 | 119 |
<h6>{TEXT_FILESYSTEM_PERMISSIONS} {MENU_MEDIA}</h6>
|
| 120 | 120 |
<ul> |
| 121 | 121 |
<li class="c100"> |
| ... | ... | |
| 147 | 147 |
</div> |
| 148 | 148 |
<div class="cleft col_width33"> |
| 149 | 149 |
<div class="col_content"> |
| 150 |
<div class="mbox curved min_h100 floatbox"> |
|
| 150 |
<div class="mbox curved min_h100 floatbox" style="height: 180px;">
|
|
| 151 | 151 |
<h6>{FILESYSTEM_PERMISSIONS} {MENU_SETTINGS}</h6>
|
| 152 | 152 |
<ul> |
| 153 | 153 |
<li class="c100"> |
| ... | ... | |
| 294 | 294 |
<!-- END show_cmd_advanced_permission_block --> |
| 295 | 295 |
<hr class="clear" /> |
| 296 | 296 |
<div class="cleft col_width33"> |
| 297 |
{HEADER_MODULE_FUNCTION}
|
|
| 297 | 298 |
<div class="col_content"> |
| 298 |
{HEADER_MODULE_FUNCTION}
|
|
| 299 |
<div class="mbox curved min_h100" style="overflow: hidden;">
|
|
| 299 |
<div class="mbox curved min_h100" style="overflow: auto; margin-top: 0;height: 300px;">
|
|
| 300 |
<div style="overflow: hidden;">
|
|
| 300 | 301 |
<ul style="margin: 0; padding: 0; "> |
| 301 | 302 |
<!-- BEGIN pages_module_list_block --> |
| 302 | 303 |
<li class="c100"> |
| ... | ... | |
| 305 | 306 |
<input class="radio" type="checkbox" name="module_permissions[]" id="m_{MOD_VALUE}" value="{MOD_VALUE}" {MOD_CHECKED} />
|
| 306 | 307 |
<label class="" for="m_{MOD_VALUE}">{MOD_NAME}</label>
|
| 307 | 308 |
</div> |
| 308 |
|
|
| 309 |
</li> |
|
| 309 |
</li> |
|
| 310 | 310 |
<!-- END pages_module_list_block --> |
| 311 |
</ul> |
|
| 311 |
</ul>
|
|
| 312 | 312 |
</div> |
| 313 |
</div> |
|
| 313 | 314 |
</div> |
| 314 | 315 |
</div> |
| 315 | 316 |
<div class="cleft col_width33"> |
| 316 |
<div class="col_content"> |
|
| 317 | 317 |
{HEADER_MODULE_FUNCTION}
|
| 318 |
<div class="mbox curved min_h100" style="overflow: hidden;"> |
|
| 318 |
<div class="col_content" > |
|
| 319 |
<div class="mbox curved min_h100" style="overflow: auto; margin-top: 0;height: 300px"> |
|
| 320 |
<div style="overflow: hidden;"> |
|
| 319 | 321 |
<ul style="margin: 0; padding: 0; "> |
| 320 | 322 |
<!-- BEGIN tools_module_list_block --> |
| 321 | 323 |
<li class="c100"> |
| ... | ... | |
| 328 | 330 |
<!-- END tools_module_list_block --> |
| 329 | 331 |
</ul> |
| 330 | 332 |
</div> |
| 333 |
</div> |
|
| 331 | 334 |
</div> |
| 332 | 335 |
</div> |
| 333 | 336 |
<div class="cleft col_width33"> |
| 334 |
<div class="col_content"> |
|
| 335 | 337 |
{HEADER_TEMPLATE_FUNCTION}
|
| 336 |
<div class="mbox curved min_h100" style="overflow: hidden;"> |
|
| 338 |
<div class="col_content" > |
|
| 339 |
<div class="mbox curved min_h100" style="overflow: auto; margin-top: 0;height: 300px"> |
|
| 340 |
<div style="overflow: hidden;"> |
|
| 337 | 341 |
<ul style="margin: 0; padding: 0; "> |
| 338 | 342 |
<!-- BEGIN template_list_block --> |
| 339 | 343 |
<li class="c100"> |
| 340 | 344 |
{TEMPLATE_FUNCTION}
|
| 341 | 345 |
<input class="radio" type="checkbox" name="template_permissions[]" id="m_{TMP_VALUE}" value="{TMP_VALUE}" {TMP_CHECKED} />
|
| 342 | 346 |
<label class="" for="m_{TMP_VALUE}">{TMP_NAME}</label>
|
| 343 |
</li> |
|
| 347 |
</li>
|
|
| 344 | 348 |
<!-- END template_list_block --> |
| 345 |
</ul> |
|
| 349 |
</ul>
|
|
| 346 | 350 |
</div> |
| 351 |
</div> |
|
| 347 | 352 |
</div> |
| 348 | 353 |
</div> |
| 349 | 354 |
<hr class="clear" /> |
| 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', '1739');
|
|
| 54 |
if(!defined('REVISION')) define('REVISION', '1740');
|
|
| 55 | 55 |
if(!defined('SP')) define('SP', '');
|
| branches/2.8.x/wb/framework/frontend.functions.php | ||
|---|---|---|
| 240 | 240 |
* @param boolean true to print $content, false return $content |
| 241 | 241 |
* @return void |
| 242 | 242 |
*/ |
| 243 |
function page_content($block = 1, $echo=true) {
|
|
| 243 |
function page_content($block = 1) {
|
|
| 244 | 244 |
// Get outside objects |
| 245 | 245 |
global $TEXT,$MENU,$HEADING,$MESSAGE; |
| 246 | 246 |
global $globals; |
| 247 | 247 |
global $database; |
| 248 | 248 |
global $wb; |
| 249 | 249 |
$admin = $wb; |
| 250 |
$retVal = ''; |
|
| 250 | 251 |
if ($wb->page_access_denied==true) {
|
| 251 | 252 |
echo $MESSAGE['FRONTEND_SORRY_NO_VIEWING_PERMISSIONS']; |
| 252 | 253 |
return; |
| ... | ... | |
| 266 | 267 |
if(!defined('PAGE_CONTENT') OR $block!=1)
|
| 267 | 268 |
{
|
| 268 | 269 |
$page_id = intval($wb->page_id); |
| 269 |
/* move to class.frontend |
|
| 270 |
// set session variable to save page_id only if PAGE_CONTENT is empty |
|
| 271 |
$_SESSION['PAGE_ID'] = !isset($_SESSION['PAGE_ID']) ? $page_id : $_SESSION['PAGE_ID']; |
|
| 272 |
// set to new value if page_id changed and not 0 |
|
| 273 |
if(($page_id != 0) && ($_SESSION['PAGE_ID'] <> $page_id)) |
|
| 274 |
{
|
|
| 275 |
$_SESSION['PAGE_ID'] = $page_id; |
|
| 276 |
} |
|
| 277 |
*/ |
|
| 270 |
|
|
| 278 | 271 |
// First get all sections for this page |
| 279 | 272 |
$sql = 'SELECT `section_id`, `module`, `publ_start`, `publ_end` '; |
| 280 | 273 |
$sql .= 'FROM `'.TABLE_PREFIX.'sections` '; |
| 281 | 274 |
$sql .= 'WHERE `page_id`='.$page_id.' AND `block`='.$block.' '; |
| 282 | 275 |
$sql .= 'ORDER BY `position`'; |
| 283 |
if( !($query_sections = $database->query($sql)) ) { return; }
|
|
| 276 |
if( !($oSections = $database->query($sql)) ) { return; }
|
|
| 284 | 277 |
// If none were found, check if default content is supposed to be shown |
| 285 |
if($query_sections->numRows() == 0) {
|
|
| 278 |
if($oSections->numRows() == 0) {
|
|
| 286 | 279 |
if($wb->default_block_content == 'none') { return; }
|
| 287 | 280 |
if (is_numeric($wb->default_block_content)) {
|
| 288 | 281 |
$page_id = $wb->default_block_content; |
| 289 | 282 |
} else {
|
| 290 | 283 |
$page_id = $wb->default_page_id; |
| 291 | 284 |
} |
| 285 |
|
|
| 292 | 286 |
$sql = 'SELECT `section_id`, `module`, `publ_start`, `publ_end` '; |
| 293 | 287 |
$sql .= 'FROM `'.TABLE_PREFIX.'sections` '; |
| 294 | 288 |
$sql .= 'WHERE `page_id`='.$page_id.' AND `block`='.$block.' '; |
| 295 | 289 |
$sql .= 'ORDER BY `position`'; |
| 296 |
if( !($query_sections = $database->query($sql)) ) { return; }
|
|
| 290 |
if( !($oSections = $database->query($sql)) ) { return; }
|
|
| 297 | 291 |
// Still no cotent found? Give it up, there's just nothing to show! |
| 298 |
if($query_sections->numRows() == 0) { return; }
|
|
| 292 |
if($oSections->numRows() == 0) { return; }
|
|
| 299 | 293 |
} |
| 294 |
|
|
| 300 | 295 |
// Loop through them and include their module file |
| 301 |
while($section = $query_sections->fetchRow()) {
|
|
| 296 |
while($section = $oSections->fetchRow()) {
|
|
| 302 | 297 |
// skip this section if it is out of publication-date |
| 303 | 298 |
$now = time(); |
| 304 | 299 |
if( !(($now<=$section['publ_end'] || $section['publ_end']==0) && ($now>=$section['publ_start'] || $section['publ_start']==0)) ) {
|
| ... | ... | |
| 306 | 301 |
} |
| 307 | 302 |
$section_id = $section['section_id']; |
| 308 | 303 |
$module = $section['module']; |
| 309 |
// make a anchor for every section. |
|
| 310 |
if(defined('SEC_ANCHOR') && SEC_ANCHOR!='') {
|
|
| 311 |
echo '<a class="section_anchor" id="'.SEC_ANCHOR.$section_id.'" name="'.SEC_ANCHOR.$section_id.'"></a>'; |
|
| 312 |
} |
|
| 313 | 304 |
// check if module exists - feature: write in errorlog |
| 314 | 305 |
if(file_exists(WB_PATH.'/modules/'.$module.'/view.php')) {
|
| 315 | 306 |
// fetch content -- this is where to place possible output-filters (before highlighting) |
| 316 | 307 |
ob_start(); // fetch original content |
| 308 |
// make a anchor for every section |
|
| 309 |
if(defined('SEC_ANCHOR') && SEC_ANCHOR!='') {
|
|
| 310 |
echo "\n".'<a class="section_anchor" id="'.SEC_ANCHOR.$section_id.'" name="'.SEC_ANCHOR.$section_id.'"></a>'."\n"; |
|
| 311 |
} |
|
| 317 | 312 |
require(WB_PATH.'/modules/'.$module.'/view.php'); |
| 318 | 313 |
$content = ob_get_clean(); |
| 319 | 314 |
} else {
|
| 320 | 315 |
continue; |
| 321 | 316 |
} |
| 317 |
|
|
| 322 | 318 |
// highlights searchresults |
| 323 |
if(isset($_GET['searchresult']) && is_numeric($_GET['searchresult']) && !isset($_GET['nohighlight']) && isset($_GET['sstring']) && !empty($_GET['sstring'])) {
|
|
| 319 |
if(isset($_GET['searchresult']) && is_numeric($_GET['searchresult']) && !isset($_GET['nohighlight']) && isset($_GET['sstring']) && !empty($_GET['sstring'])) |
|
| 320 |
{
|
|
| 324 | 321 |
$arr_string = explode(" ", $_GET['sstring']);
|
| 325 |
if($_GET['searchresult']==2) { // exact match
|
|
| 322 |
if($_GET['searchresult']==2) { //exact match
|
|
| 326 | 323 |
$arr_string[0] = str_replace("_", " ", $arr_string[0]);
|
| 327 | 324 |
} |
| 328 | 325 |
echo search_highlight($content, $arr_string); |
| 329 |
} elseif($echo==true) {
|
|
| 326 |
} else {
|
|
| 330 | 327 |
echo $content; |
| 331 |
} else {
|
|
| 332 |
return $content; |
|
| 333 | 328 |
} |
| 334 | 329 |
} |
| 335 | 330 |
} else {
|
| 336 | 331 |
require(PAGE_CONTENT); |
| 337 | 332 |
} |
| 333 |
return $retVal; |
|
| 334 |
|
|
| 338 | 335 |
} |
| 339 | 336 |
} |
| 340 | 337 |
|
| branches/2.8.x/wb/modules/form/view.php | ||
|---|---|---|
| 221 | 221 |
$options = explode(',', $value);
|
| 222 | 222 |
array_walk($options, 'make_option', (isset($_SESSION['field'.$field_id])?$_SESSION['field'.$field_id]:array())); |
| 223 | 223 |
$field['extra'] = explode(',',$field['extra']);
|
| 224 |
$field['extra'][1] = ($field['extra'][1]='multiple') ? $field['extra'][1].'="'.$field['extra'][1].'"' : ''; |
|
| 224 |
$field['extra'][1] = ($field['extra'][1]=='multiple') ? $field['extra'][1].'="'.$field['extra'][1].'"' : '';
|
|
| 225 | 225 |
$values[] = '<select name="field'.$field_id.'[]" id="field'.$field_id.'" size="'.$field['extra'][0].'" '.$field['extra'][1].' class="frm-select">'.implode($options).'</select>'.PHP_EOL; |
| 226 | 226 |
} elseif($field['type'] == 'heading') {
|
| 227 | 227 |
$vars[] = '{FIELD}';
|
Also available in: Unified diff
incompatible with search logic
! /include/jquery forgot jquery version.txt