Project

General

Profile

« Previous | Next » 

Revision 1726

Added by Dietmar about 12 years ago

! change multi-dimensional arrays (variables) to similar arrays
! change message if uploaded file exists

View differences:

branches/2.8.x/CHANGELOG
13 13 

  		




  14
  14
  
    

  		




  15
  15
  
    

  		




  
  16
  
    
30 Aug-2012 Build 1726 Dietmar Woellbrink (Luisehahne)


  		




  
  17
  
    
! change multi-dimensional arrays (variables) to similar arrays


  		




  
  18
  
    
! change message if uploaded file exists


  		




  16
  19
  
    
30 Aug-2012 Build 1725 Dietmar Woellbrink (Luisehahne)


  		




  17
  20
  
    
+ add missing preferences rights for sysadmin in install


  		




  18
  21
  
    
30 Aug-2012 Build 1724 Dietmar Woellbrink (Luisehahne)


  		












  

    
      branches/2.8.x/wb/admin/media/upload.php
    
  





  3
  3
  
    
 *


  		




  4
  4
  
    
 * @category        admin


  		




  5
  5
  
    
 * @package         media


  		




  6
  
  
    
 * @author          WebsiteBaker Project


  		




  7
  
  
    
 * @copyright       2004-2009, Ryan Djurovich


  		




  8
  
  
    
 * @copyright       2009-2011, Website Baker Org. e.V.


  		




  
  6
  
    
 * @author          Ryan Djurovich,WebsiteBaker Project


  		




  
  7
  
    
 * @copyright       2009-2012, WebsiteBaker Org. e.V.


  		




  9
  8
  
    
 * @link			http://www.websitebaker2.org/


  		




  10
  9
  
    
 * @license         http://www.gnu.org/licenses/gpl.html


  		




  11
  10
  
    
 * @platform        WebsiteBaker 2.8.x


  		




  12
  11
  
    
 * @requirements    PHP 5.2.2 and higher


  		




  13
  12
  
    
 * @version         $Id$


  		




  14
  
  
    
 * @filesource		$HeadURL:  $


  		




  15
  
  
    
 * @lastmodified    $Date:  $


  		




  
  13
  
    
 * @filesource		$HeadURL$


  		




  
  14
  
    
 * @lastmodified    $Date$


  		




  16
  15
  
    
 *


  		




  17
  16
  
    
 */


  		




  18
  17
  
    

  		




  ......




  48
  47
  
    
// Check to see if target contains ../


  		




  49
  48
  
    
if (!check_media_path($target, false))


  		




  50
  49
  
    
{


  		




  51
  
  
    
	$admin->print_error($MESSAGE['MEDIA']['TARGET_DOT_DOT_SLASH'] );


  		




  
  50
  
    
	$admin->print_error($MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] );


  		




  52
  51
  
    
}


  		




  53
  52
  
    

  		




  54
  53
  
    
// Create relative path of the target location for the file


  		




  ......




  170
  169
  
    
unset($list);


  		




  171
  170
  
    

  		




  172
  171
  
    
if($sum_files == 1) {


  		




  173
  
  
    
	$admin->print_success($sum_files.' '.$MESSAGE['MEDIA']['SINGLE_UPLOADED'] );


  		




  
  172
  
    
	$admin->print_success($sum_files.' '.$MESSAGE['MEDIA_SINGLE_UPLOADED'] );


  		




  174
  173
  
    
} elseif($sum_files > 1) {


  		




  175
  
  
    
	$admin->print_success($sum_files.' '.$MESSAGE['MEDIA']['UPLOADED'] );


  		




  
  174
  
    
	$admin->print_success($sum_files.' '.$MESSAGE['MEDIA_UPLOADED'] );


  		




  176
  175
  
    
} else {


  		




  177
  
  
    
	$admin->print_error($MESSAGE['MEDIA_NO_FILE_UPLOADED'] );


  		




  
  176
  
    

  		




  
  177
  
    
	if(file_exists($relative.$filename)) {


  		




  
  178
  
    
    	$admin->print_error($MESSAGE['MEDIA_FILE_EXISTS'] );


  		




  
  179
  
    
    } else {


  		




  
  180
  
    
    	$admin->print_error($MESSAGE['MEDIA_NO_FILE_UPLOADED'] );


  		




  
  181
  
    
    }


  		




  178
  182
  
    
}


  		




  179
  183
  
    

  		




  180
  184
  
    
// Print admin


  		




  181
  185
  
    

  		












  

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





  3
  3
  
    
 *


  		




  4
  4
  
    
 * @category        admin


  		




  5
  5
  
    
 * @package         pages


  		




  6
  
  
    
 * @author          WebsiteBaker Project


  		




  7
  
  
    
 * @copyright       2004-2009, Ryan Djurovich


  		




  8
  
  
    
 * @copyright       2009-2011, Website Baker Org. e.V.


  		




  
  6
  
    
 * @author          Ryan Djurovich,WebsiteBaker Project


  		




  
  7
  
    
 * @copyright       2009-2012, WebsiteBaker Org. e.V.


  		




  9
  8
  
    
 * @link			http://www.websitebaker2.org/


  		




  10
  9
  
    
 * @license         http://www.gnu.org/licenses/gpl.html


  		




  11
  10
  
    
 * @platform        WebsiteBaker 2.8.x


  		




  ......




  46
  45
  
    
	$admin->print_error($MESSAGE['PAGES_NOT_SAVED']);


  		




  47
  46
  
    
} else {


  		




  48
  47
  
    
	change_mode($filename);


  		




  49
  
  
    
	$admin->print_success($MESSAGE['PAGES']['INTRO_SAVED']);


  		




  
  48
  
    
	$admin->print_success($MESSAGE['PAGES_INTRO_SAVED']);


  		




  50
  49
  
    
}


  		




  51
  50
  
    
if(!is_writable($filename)) {


  		




  52
  
  
    
	$admin->print_error($MESSAGE['PAGES']['INTRO_NOT_WRITABLE']);


  		




  
  51
  
    
	$admin->print_error($MESSAGE['PAGES_INTRO_NOT_WRITABLE']);


  		




  53
  52
  
    
}


  		




  54
  53
  
    

  		




  55
  54
  
    
// Print admin footer


  		












  

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


  		




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


  		




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


  		












Also available in:  Unified diff