Project

General

Profile

« Previous | Next » 

Revision 1979

Added by darkviper about 11 years ago

Packet AccessFile fixed indifferent handling of './..' directory entries

View differences:

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

  		




  
  14
  
    
10 Oct-2013 Build 1979 Manuela v.d.Decken(DarkViper)


  		




  
  15
  
    
# /admin/pages/PageTree forgotten changes from rev.1973


  		




  14
  16
  
    
08 Oct-2013 Build 1978 Dietmar Woellbrink (Luisehahne)


  		




  15
  17
  
    
! /framework/functions.php::rebuild_all_accessfiles()  output of detailed log corrected


  		




  16
  18
  
    
06 Oct-2013 Build 1977 Dietmar Woellbrink (Luisehahne)


  		












  

    
      branches/2.8.x/wb/admin/pages/PageTree.php
    
  





  262
  262
  
    
		if((bool)$aPage['children']) {


  		




  263
  263
  
    
			$sOutput .= '<a href="javascript:toggle_visibility(\'p'.$aPage['page_id'].'\');" '


  		




  264
  264
  
    
			          . 'title="'.$this->_oTrans->TEXT_EXPAND.'/'.$this->_oTrans->TEXT_COLLAPSE.'">'


  		




  265
  
  
    
			          . '<span><img src="'.$this->_oReg->ThemeRel.'/images/'


  		




  
  265
  
    
			          . '<span><img src="'.$this->_oReg->ThemeRel.'images/'


  		




  266
  266
  
    
			          . ( ((isset($_COOKIE['p'.$aPage['page_id']]) 


  		




  267
  267
  
    
						  && $_COOKIE['p'.$aPage['page_id']] == '1') ? 'minus' : 'plus')


  		




  268
  268
  
    
						)


  		




  ......




  275
  275
  
    
	// --- TAB 2 --- (menu title) --------------------------------------------------------


  		




  276
  276
  
    
		$sOutput .= $this->_Tabs(0).'<td class="list_menu_title">';


  		




  277
  277
  
    
		if($this->_oApp->get_permission('pages_modify') && $aPage['iswriteable']) {


  		




  278
  
  
    
			$sOutput .= '<a href="'.$this->_oReg->AcpRel.'/pages/modify.php?page_id='


  		




  
  278
  
    
			$sOutput .= '<a href="'.$this->_oReg->AcpRel.'pages/modify.php?page_id='


  		




  279
  279
  
    
			          . $aPage['page_id'].'" title="'.$this->_oTrans->TEXT_MODIFY.'">';


  		




  280
  280
  
    
		}


  		




  281
  
  
    
		$sIcon = $this->_oReg->ThemeRel.'/images/'.$aPage['visibility'].'_16.png';


  		




  282
  
  
    
		if(!is_readable($this->_oReg->DocumentRoot.$sIcon)) {


  		




  283
  
  
    
			$sIcon = $this->_oReg->ThemeRel.'/images/public_16.png';


  		




  
  281
  
    
		$sIcon = $this->_oReg->ThemeRel.'images/'.$aPage['visibility'].'_16.png';


  		




  
  282
  
    
		if(!is_readable(rtrim($this->_oReg->DocumentRoot, '/').$sIcon)) {


  		




  
  283
  
    
			$sIcon = $this->_oReg->ThemeRel.'images/public_16.png';


  		




  284
  284
  
    
		}


  		




  285
  285
  
    
		$sOutput .= '<img src="'.$sIcon.'" alt="'.$this->_oTrans->TEXT_VISIBILITY.': '


  		




  286
  286
  
    
				  . $this->_oTrans->{'TEXT_'.strtoupper($aPage['visibility'])}  .'" class="page_list_rights" />';


  		




  ......




  303
  303
  
    
			                                 $this->_oApp->page_link($aPage['link'])


  		




  304
  304
  
    
			                                );


  		




  305
  305
  
    
			$sOutput .= '<a href="'.$sPageLink.'" target="_blank" title="'.$this->_oTrans->TEXT_VIEW


  		




  306
  
  
    
			          . '"><img src="'.$this->_oReg->ThemeRel.'/images/view_16.png" alt="'


  		




  
  306
  
    
			          . '"><img src="'.$this->_oReg->ThemeRel.'images/view_16.png" alt="'


  		




  307
  307
  
    
			          . $this->_oTrans->TEXT_VIEW.'" /></a>';


  		




  308
  308
  
    
		}else { 


  		




  309
  
  
    
			$sOutput .= '<img src="'.$this->_oReg->ThemeRel.'/images/blank_16.gif" alt=" " />';


  		




  
  309
  
    
			$sOutput .= '<img src="'.$this->_oReg->ThemeRel.'images/blank_16.gif" alt=" " />';


  		




  310
  310
  
    
		}


  		




  311
  311
  
    
		$sOutput .= '</td>'.PHP_EOL;


  		




  312
  312
  
    

  		




  ......




  314
  314
  
    
		$sOutput .= $this->_Tabs(0).'<td class="list_actions">';


  		




  315
  315
  
    
		if($aPage['visibility'] != 'deleted') { 


  		




  316
  316
  
    
			if($this->_oApp->get_permission('pages_settings') && $aPage['iswriteable']) {


  		




  317
  
  
    
				$sOutput .= '<a href="'.$this->_oReg->AcpRel.'/pages/settings.php?page_id='


  		




  
  317
  
    
				$sOutput .= '<a href="'.$this->_oReg->AcpRel.'pages/settings.php?page_id='


  		




  318
  318
  
    
				          . $aPage['page_id'].'" title="'.$this->_oTrans->TEXT_SETTINGS.'">'


  		




  319
  
  
    
				          . '<img src="'.$this->_oReg->ThemeRel.'/images/modify_16.png" alt="'


  		




  
  319
  
    
				          . '<img src="'.$this->_oReg->ThemeRel.'images/modify_16.png" alt="'


  		




  320
  320
  
    
				          . $this->_oTrans->TEXT_SETTINGS.'" /></a>';


  		




  321
  321
  
    
			}


  		




  322
  322
  
    
		}else {


  		




  323
  
  
    
			$sOutput .= '<a href="'.$this->_oReg->AcpRel.'/pages/restore.php?page_id='.$aPage['page_id'].'" '


  		




  
  323
  
    
			$sOutput .= '<a href="'.$this->_oReg->AcpRel.'pages/restore.php?page_id='.$aPage['page_id'].'" '


  		




  324
  324
  
    
			          . 'title="'.$this->_oTrans->TEXT_RESTORE.'"><img src="'.$this->_oReg->ThemeRel


  		




  325
  
  
    
			          . '/images/restore_16.png" alt="'.$this->_oTrans->TEXT_RESTORE.'" /></a>';


  		




  
  325
  
    
			          . 'images/restore_16.png" alt="'.$this->_oTrans->TEXT_RESTORE.'" /></a>';


  		




  326
  326
  
    
		}


  		




  327
  327
  
    
		$sOutput .= '</td>'.PHP_EOL;


  		




  328
  328
  
    

  		




  ......




  331
  331
  
    
		if( $this->_oReg->ManageSections && $this->_oApp->get_permission('pages_add') && $aPage['iswriteable'] ) {


  		




  332
  332
  
    
			$file = $this->_oApp->page_is_active($aPage) ? "clock_16.png" : "clock_red_16.png";


  		




  333
  333
  
    
			$file = ($aPage['published'] && $aPage['module'] != 'menu_link') ? $file : 'noclock_16.png';


  		




  334
  
  
    
			$sOutput .= '<a href="'.$this->_oReg->AcpRel.'/pages/sections.php?page_id='


  		




  
  334
  
    
			$sOutput .= '<a href="'.$this->_oReg->AcpRel.'pages/sections.php?page_id='


  		




  335
  335
  
    
			          . $aPage['page_id'].'" title="'.$this->_oTrans->HEADING_MANAGE_SECTIONS.'">'


  		




  336
  
  
    
			          . '<img src="'.$this->_oReg->ThemeRel.'/images/'.$file.'" alt="'


  		




  
  336
  
    
			          . '<img src="'.$this->_oReg->ThemeRel.'images/'.$file.'" alt="'


  		




  337
  337
  
    
			          . $this->_oTrans->HEADING_MANAGE_SECTIONS.'" /></a>';


  		




  338
  338
  
    
		}else { 


  		




  339
  
  
    
			$sOutput .= '<img src="'.$this->_oReg->ThemeRel.'/images/blank_16.gif" alt=" " />';


  		




  
  339
  
    
			$sOutput .= '<img src="'.$this->_oReg->ThemeRel.'images/blank_16.gif" alt=" " />';


  		




  340
  340
  
    
		}


  		




  341
  341
  
    
		$sOutput .= '</td>'.PHP_EOL;


  		




  342
  342
  
    

  		




  ......




  345
  345
  
    
		if($aPage['position'] > $aPage['min_position']) {


  		




  346
  346
  
    
			if($aPage['visibility'] != 'deleted') {


  		




  347
  347
  
    
				if($this->_oApp->get_permission('pages_settings') && $aPage['iswriteable']) {


  		




  348
  
  
    
					$sOutput .= '<a href="'.$this->_oReg->AcpRel.'/pages/move_up.php?page_id='


  		




  
  348
  
    
					$sOutput .= '<a href="'.$this->_oReg->AcpRel.'pages/move_up.php?page_id='


  		




  349
  349
  
    
					          . $aPage['page_id'].'" title="'.$this->_oTrans->TEXT_MOVE_UP


  		




  350
  
  
    
					          . '"><img src="'.$this->_oReg->ThemeRel.'/images/up_16.png" alt="'


  		




  
  350
  
    
					          . '"><img src="'.$this->_oReg->ThemeRel.'images/up_16.png" alt="'


  		




  351
  351
  
    
					          . $this->_oTrans->TEXT_MOVE_UP.'" /></a>';


  		




  352
  352
  
    
				}


  		




  353
  353
  
    
			}


  		




  ......




  359
  359
  
    
		if($aPage['position'] < $aPage['max_position']) {


  		




  360
  360
  
    
			if($aPage['visibility'] != 'deleted') {


  		




  361
  361
  
    
				if($this->_oApp->get_permission('pages_settings') && $aPage['iswriteable']) {


  		




  362
  
  
    
					$sOutput .= '<a href="'.$this->_oReg->AcpRel.'/pages/move_down.php?page_id='


  		




  
  362
  
    
					$sOutput .= '<a href="'.$this->_oReg->AcpRel.'pages/move_down.php?page_id='


  		




  363
  363
  
    
					          . $aPage['page_id'].'" title="'.$this->_oTrans->TEXT_MOVE_DOWN


  		




  364
  
  
    
					          . '"><img src="'.$this->_oReg->ThemeRel.'/images/down_16.png" alt="'


  		




  
  364
  
    
					          . '"><img src="'.$this->_oReg->ThemeRel.'images/down_16.png" alt="'


  		




  365
  365
  
    
					          . $this->_oTrans->TEXT_MOVE_DOWN.'" /></a>';


  		




  366
  366
  
    
				}


  		




  367
  367
  
    
			}


  		




  ......




  372
  372
  
    
		$sOutput .= $this->_Tabs(0).'<td class="list_actions">';


  		




  373
  373
  
    
		if($this->_oApp->get_permission('pages_delete') && $aPage['iswriteable']) {


  		




  374
  374
  
    
			$sOutput .= '<a href="javascript:confirm_link(pages_delete_confirm+\'?\',\''


  		




  375
  
  
    
			          . $this->_oReg->AcpRel.'/pages/delete.php?page_id='


  		




  
  375
  
    
			          . $this->_oReg->AcpRel.'pages/delete.php?page_id='


  		




  376
  376
  
    
			          . $this->_oApp->getIDKEY($aPage['page_id']).'\');" title="'


  		




  377
  377
  
    
			          . $this->_oTrans->TEXT_DELETE.'"><img src="'.$this->_oReg->ThemeRel


  		




  378
  
  
    
			          . '/images/delete_16.png" alt="'.$this->_oTrans->TEXT_DELETE.'" /></a>';


  		




  
  378
  
    
			          . 'images/delete_16.png" alt="'.$this->_oTrans->TEXT_DELETE.'" /></a>';


  		




  379
  379
  
    
		}else { 


  		




  380
  
  
    
			$sOutput .= '<img src="'.$this->_oReg->ThemeRel.'/images/blank_16.gif" alt=" " />';


  		




  
  380
  
    
			$sOutput .= '<img src="'.$this->_oReg->ThemeRel.'images/blank_16.gif" alt=" " />';


  		




  381
  381
  
    
		}


  		




  382
  382
  
    
		$sOutput .= '</td>'.PHP_EOL;


  		




  383
  383
  
    

  		




  ......




  392
  392
  
    
		{


  		




  393
  393
  
    
			$sOutput .= '<a href="javascript:add_child_page(\''.$aPage['page_id'].'\');" '


  		




  394
  394
  
    
			          . 'title="'.$this->_oTrans->HEADING_ADD_CHILD_PAGE.'"><img src="'


  		




  395
  
  
    
			          . $this->_oReg->ThemeRel.'/images/siteadd.png" name="addpage_'.$aPage['page_id']


  		




  
  395
  
    
			          . $this->_oReg->ThemeRel.'images/siteadd.png" name="addpage_'.$aPage['page_id']


  		




  396
  396
  
    
			          . '" alt="'.$this->_oTrans->HEADING_ADD_CHILD_PAGE.'" /></a>';


  		




  397
  397
  
    
		}else { 


  		




  398
  398
  
    
			$sOutput .= '&nbsp;'; 


  		












  

    
      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', '1978');


  		




  
  54
  
    
if(!defined('REVISION')) define('REVISION', '1979');


  		




  55
  55
  
    
if(!defined('SP')) define('SP', '');


  		












Also available in:  Unified diff