/ - Diff - WB 2.08.x - Tracking

 Nov-2012 Build 1824 Dietmar Woellbrink (Luisehahne)
     ! update media in look to the changes in user management
 Nov-2012 Build 1823 Dietmar Woellbrink (Luisehahne)
     ! update user management, now home folder only will be created
       if homefolders in settings are enabledPlugin

     $admin = new admin('Media', 'media', false);
     // Include the WB functions file
     require_once(WB_PATH.'/framework/functions.php');
     if(!function_exists('directory_list')) { require(WB_PATH.'/framework/functions.php'); }
     // Get the current dir
     $requestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']);

     $link = mysql_connect($DB_HOST, $DB_USER, $DB_PASS);
     mysql_select_db ( $DB_NAME, $link );
     */
     require_once(WB_PATH.'/framework/DseTwo.php');
     if(!function_exists('directory_list')) { require(WB_PATH.'/framework/functions.php'); }
     $CachePath = WB_PATH.'/temp/mediacache';
     // $ListFile = ADMIN_PATH.'/media/MediaBlackList'; // WhiteList   BlackList
     $ListFile = ADMIN_PATH.'/media/MediaWhiteList'; // WhiteList   BlackList

     $admin = new admin('Media', 'media', false);
     // Include the WB functions file
     require_once(WB_PATH.'/framework/functions.php');
     if(!function_exists('directory_list')) { require(WB_PATH.'/framework/functions.php'); }
     // check if theme language file exists for the language set by the user (e.g. DE, EN)
     if(!file_exists(THEME_PATH .'/languages/'.LANGUAGE .'.php')) {

     $starttime = $starttime[0]+$starttime[1];
     // Include the WB functions file
     require_once(WB_PATH.'/framework/functions.php');
     if(!function_exists('directory_list')) { require(WB_PATH.'/framework/functions.php'); }
     include ('parameters.php');
     // check if theme language file exists for the language set by the user (e.g. DE, EN)
-...
     $template->set_block('page', 'main_block', 'main');
     // Get the current dir
     $currentHome = $admin->get_home_folder();
     //$currentHome = $admin->get_home_folder();
     $currentHome = (defined('HOME_FOLDERS') && HOME_FOLDERS) ? $admin->get_home_folder() : '';
     // set directory if you call from menu
     $directory =	(($currentHome) AND (!array_key_exists('dir',$_GET)))
+    				?
-...
     if ($currentHome && stripos(WB_PATH.MEDIA_DIRECTORY.$directory,WB_PATH.MEDIA_DIRECTORY.$currentHome)===false) {
     	$directory = $currentHome;
+    }
     if($directory == '/' OR $directory == '\\') {$directory = '';}
     if($directory == '/' OR $directory == '\\') {
     	$directory = '';
     $sBackLink = WB_PATH.MEDIA_DIRECTORY.$directory;
     if(!is_readable( $sBackLink )) {
     $directory = dirname($directory);
     // reload parent page to rebuild the dropdowns
     echo "<script type=\"text/javascript\">
     <!--
     // Get the location object
     var locationObj = document.location;
     // Set the value of the location object
     parent.document.location = 'index.php';
     -->
     </script>";
+    }
     $dir_backlink = 'browse.php?dir='.$directory;
-...
     			);
     // Get home folder not to show
     $home_folders = get_home_folders();
     //$home_folders = get_home_folders();
     $home_folders = (defined('HOME_FOLDERS') && HOME_FOLDERS) ? get_home_folders() : array();
     // Generate list
     $template->set_block('main_block', 'list_block', 'list');
-...
     	$template->set_var('DISPLAY_NONE_FOUND', 'hide');
+    }
     if($currentHome=='') {
     //if($currentHome=='') {
     if( !in_array($admin->get_username(), explode('/',$directory)) ) {
     // Insert permissions values
         if($admin->get_permission('media_rename') != true) {
         	$template->set_var('DISPLAY_RENAME', 'hide');

     $admin = new admin('Media', 'media', false);
     // Include the WB functions file
     require_once(WB_PATH.'/framework/functions.php');
     if(!function_exists('directory_list')) { require(WB_PATH.'/framework/functions.php'); }
     // Get the current dir
     $directory = $admin->get_get('dir');

+    }
     if(!class_exists('admin', false)){ include(WB_PATH.'/framework/class.admin.php'); }
     // Include the WB functions file
     require_once(WB_PATH.'/framework/functions.php');
     if(!function_exists('directory_list')) { require(WB_PATH.'/framework/functions.php'); }
     // suppress to print the header, so no new FTAN will be set
     $admin = new admin('Media', 'media_create', false);

+     *
      */
     // Must include code to stop this file being access directly
     if(defined('WB_PATH') == false) { die("Cannot access this file directly"); }
     /* -------------------------------------------------------- */
     // Must include code to stop this file being accessed directly
     if(!defined('WB_URL')) {
     	require_once(dirname(dirname(dirname(__FILE__))).'/framework/globalExceptionHandler.php');
     	throw new IllegalFileException();
+    }
     /* -------------------------------------------------------- */
     function __unserialize($sObject) {  // found in php manual :-)
         if($sObject=='') { return array( 'global' => array( 'admin_only' => false,'show_thumbs' => false ) );}

     $target = (isset(${$requestMethod}['target'])) ? ${$requestMethod}['target'] : '';
     // Include the WB functions file
     require_once(WB_PATH.'/framework/functions.php');
     if(!function_exists('directory_list')) { require(WB_PATH.'/framework/functions.php'); }
     $directory = ($target == '/') ?  '' : $target;
     $dirlink = 'index.php?dir='.$directory;

     $template->set_block('page', 'main_block', 'main');
     // Include the WB functions file
     require_once(WB_PATH.'/framework/functions.php');
     if(!function_exists('directory_list')) { require(WB_PATH.'/framework/functions.php'); }
     // Target location
     $requestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']);
-...
     $rootlink = 'index.php?dir=';
     // Get home folder not to show
     $home_folders = get_home_folders();
     $home_folders = (defined('HOME_FOLDERS') && HOME_FOLDERS) ? get_home_folders() : array();
     // Insert values
     $template->set_block('main_block', 'dir_list_block', 'dir_list');
     $dirs = directory_list(WB_PATH.MEDIA_DIRECTORY);
     $currentHome = $admin->get_home_folder();
     $currentHome = (defined('HOME_FOLDERS') && HOME_FOLDERS) ? $admin->get_home_folder() : '';
     if ($currentHome!=''){
     	$dirs = directory_list(WB_PATH.MEDIA_DIRECTORY.$currentHome);
+    }

     $admin = new admin('Media', 'media', false);
     // Include the WB functions file
     require_once(WB_PATH.'/framework/functions.php');
     if(!function_exists('directory_list')) { require(WB_PATH.'/framework/functions.php'); }
     // Get the current dir
     $directory = $admin->get_get('dir');

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', '1823');
	54	if(!defined('REVISION')) define('REVISION', '1824');
55	55	if(!defined('SP')) define('SP', '');

     	return $result_list;
+    }
     function remove_home_subs($directory = '/', $home_folders = '')
+    {
     	if( ($handle = opendir(WB_PATH.MEDIA_DIRECTORY.$directory)) )
+    	{
     		// Loop through the dirs to check the home folders sub-dirs are not shown
     		while(false !== ($file = readdir($handle)))
+    		{
     			if($file[0] != '.' && $file != 'index.php')
+    			{
     				if(is_dir(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$file))
+    				{
     					if($directory != '/') {
     						$file = $directory.'/'.$file;
     					}else {
     						$file = '/'.$file;
+    					}
     					foreach($home_folders AS $hf)
+    					{
     						$hf_length = strlen($hf);
     						if($hf_length > 0) {
     							if(substr($file, 0, $hf_length+1) == $hf) {
     								$home_folders[$file] = $file;
+    							}
+    						}
+    					}
     					$home_folders = remove_home_subs($file, $home_folders);
+    				}
+    			}
+    		}
+    	}
     	return $home_folders;
+    }
     // Function to get a list of home folders not to show
     function get_home_folders()
+    {
-...
     				$home_folders[$folder['home_folder']] = $folder['home_folder'];
+    			}
+    		}
     		function remove_home_subs($directory = '/', $home_folders = '')
+    		{
     			if( ($handle = opendir(WB_PATH.MEDIA_DIRECTORY.$directory)) )
+    			{
     				// Loop through the dirs to check the home folders sub-dirs are not shown
     				while(false !== ($file = readdir($handle)))
+    				{
     					if($file[0] != '.' && $file != 'index.php')
+    					{
     						if(is_dir(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$file))
+    						{
     							if($directory != '/') {
     								$file = $directory.'/'.$file;
     							}else {
     								$file = '/'.$file;
+    							}
     							foreach($home_folders AS $hf)
+    							{
     								$hf_length = strlen($hf);
     								if($hf_length > 0) {
     									if(substr($file, 0, $hf_length+1) == $hf) {
     										$home_folders[$file] = $file;
+    									}
+    								}
+    							}
     							$home_folders = remove_home_subs($file, $home_folders);
+    						}
+    					}
+    				}
+    			}
     			return $home_folders;
+    		}
     		$home_folders = remove_home_subs('/', $home_folders);
+    	}
     	return $home_folders;
-...
+    {
     	$path = str_replace($vars, '', $path);
+    }
     /*
      * @param object &$wb: $wb from frontend or $admin from backend
      * @return array: list of ro-dirs

Project

General

Profile

WB 2.08.x

Revision 1824

Added by Dietmar almost 12 years ago