Project

General

Profile

Revision 190

View differences:

trunk/scripts/application.js.php
920 920
    ?>    
921 921
}
922 922
if( typeof Ext == 'undefined' ) {
923
	alert( 'The ExtJS Library could not be found.\nPlease make sure that eXtplorer has been fully installed\nand the file "fetchscript.php" in the\nextplorer directory is not chmodded to 777\n(so chmod to 644 or 666)' );
924
	document.location = '<?php echo basename( $GLOBALS['script_name']) ?>';
923
	document.location = '<?php echo basename( $GLOBALS['script_name']) ?>?option=com_extplorer&nofetchscript=1';
925 924
}
926 925

  
927 926
function startExtplorer() {
trunk/webdav_authenticate.php
67 67
	}
68 68

  
69 69
	if (array_key_exists($user, $users) && $users[$user] == extEncodePassword($_SERVER['PHP_AUTH_PW']) ){
70
		activate_user($user, extEncodePassword($_SERVER['PHP_AUTH_PW']));
70
		if( !empty($GLOBALS['webdav_authentication_method']) && file_exists(_EXT_PATH.'/include/authentication/'.$GLOBALS['webdav_authentication_method'].'.php') ) {
71
			require_once( _EXT_PATH.'/include/authentication/'.$GLOBALS['webdav_authentication_method'].'.php');
72
			$classname = 'ext_'.$GLOBALS['webdav_authentication_method'].'_authentication';
73
			$auth = new $classname();
74
			
75
		} else {
76
			require_once( _EXT_PATH.'/include/authentication/extplorer.php');
77
			$auth = new ext_extplorer_authentication();
78
		}
79
		$auth->onAuthenticate(array('user' => $user, 'password' => $_SERVER['PHP_AUTH_PW'] ));
71 80
		return TRUE;
72 81
	}
73 82

  
......
76 85
	die('401 Unauthorized');
77 86
	return FALSE;
78 87
}
79
?>
trunk/CHANGELOG.txt
3 3
Version $Id$
4 4
****************************
5 5

  
6
- fixed a fatal error in the webdav module
7
- added ability to load without fetchscript.php (when it's inaccessible due to server permission problems)
8

  
6 9
--- version 2.1.0 RC3 released ---
7 10

  
8 11
- fixed filesize for files > 2GB
trunk/include/authentication/extplorer.php
185 185
		logout();
186 186
	}
187 187
} 
188
?>
trunk/include/init.php
47 47
	die("<strong>ERROR: Your PHP version is too old</strong><br/>".
48 48
	"You need at least PHP 5.0 to run eXtplorer; preferably PHP 5.2 or higher.");
49 49
}
50

  
50
if( !empty( $_GET['nofetchscript'])) {
51
	$_COOKIE['nofetchscript'] = 1;
52
}
51 53
//------------------------------------------------------------------------------
52 54
	// if gzcompress is available, we can use Zip, Tar and TGz
53 55
	if ( extension_loaded("zlib")) {
......
167 169

  
168 170
if( $action == 'include_javascript' ) {
169 171
  	while (@ob_end_clean());
172
	ob_start();
170 173
  	header("Content-Type: text/javascript; charset=".strtolower($GLOBALS["charset"]));
171 174
  	include( _EXT_PATH.'/scripts/'.basename(extGetParam($_REQUEST, 'file' )).'.php');
172 175
  	ext_exit();
trunk/include/login.php
106 106
	// Ask for Login
107 107
	$GLOBALS['mainframe']->setPageTitle( ext_Lang::msg('actlogin') );
108 108
	$GLOBALS['mainframe']->addcustomheadtag( '
109
		<script type="text/javascript" src="'. _EXT_URL . '/fetchscript.php?'
110
			.'subdir[0]=scripts/extjs3/adapter/ext/&amp;file[0]=ext-base.js'
111
			.'&amp;subdir[1]=scripts/extjs3/&amp;file[1]=ext-all.js&amp;gzip=1"></script>
109
		<script type="text/javascript" src="scripts/extjs3/adapter/ext/ext-base.js"></script>
110
		<script type="text/javascript" src="scripts/extjs3/ext-all.js"></script>
112 111
		<script type="text/javascript" src="'. $GLOBALS['script_name'].'?option=com_extplorer&amp;action=include_javascript&amp;file=functions.js"></script>
113
		<link rel="stylesheet" href="'. _EXT_URL . '/fetchscript.php?subdir[0]=scripts/extjs3/resources/css/&file[0]=ext-all.css&amp;subdir[1]=scripts/extjs3/resources/css/&file[1]=xtheme-blue.css&amp;gzip=1" />');
112
		<link rel="stylesheet" href="'. _EXT_URL . '/scripts/extjs3/resources/css/ext-all.css" />
113
		<link rel="stylesheet" href="scripts/extjs3/resources/css/xtheme-blue.css" />');
114 114

  
115 115
			
116 116
			?>
trunk/include/functions.php
4 4
/**
5 5
 * @version $Id$
6 6
 * @package eXtplorer
7
 * @copyright soeren 2007
7
 * @copyright soeren 2007-2011
8 8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
9 9
 * @author The	The QuiX project (http://quixplorer.sourceforge.net)
10 10
 * 
......
709 709
}
710 710
function ext_exit() {
711 711
	global $mainframe;
712

  
712
	if( class_exists( 'jfactory' )) {
713
		$app = jfactory::getApplication();
714
		$app->close();
715
	}
713 716
	if( is_callable( array( $mainframe, 'close' ) ) ) {
714 717
		$mainframe->close();
715 718
	} else {
......
881 884
*/
882 885
class extHTML {
883 886
	function loadExtJS() {
884
		$scriptTag = '
887
		$scripts[] = array('dir' => 'scripts/editarea/', 'file' => 'edit_area_full_with_plugins.js');
888
		$scripts[] = array('dir' => 'scripts/extjs3/adapter/ext/', 'file' => 'ext-base.js');
889
		$scripts[] = array('dir' => 'scripts/extjs3/', 'file' => 'ext-all.js');
890
		$scripts[] = array('dir' => 'scripts/extjs3-ext/ux.ondemandload/', 'file' => 'scriptloader.js');
891
		$scripts[] = array('dir' => 'scripts/extjs3-ext/ux.editareaadapater/', 'file' => 'ext-editarea-adapter.js');
892
		$scripts[] = array('dir' => 'scripts/extjs3-ext/ux.statusbar/', 'file' => 'ext-statusbar.js');
893
		$scripts[] = array('dir' => 'scripts/extjs3-ext/ux.fileuploadfield/', 'file' => 'ext-fileUploadField.js');
894
		$scripts[] = array('dir' => 'scripts/extjs3-ext/ux.locationbar/', 'file' => 'Ext.ux.LocationBar.js');
895
		
896
		$styles[] = array('dir' => 'scripts/extjs3/resources/css/', 'file' => 'ext-all.css');
897
		$styles[] = array('dir' => 'scripts/extjs3-ext/ux.locationbar/', 'file' => 'LocationBar.css');
898
		$styles[] = array('dir' => 'scripts/extjs3-ext/ux.fileuploadfield/', 'file' => 'fileuploadfield.css');
899
		$scriptTag = '';
900
		if( !empty($_GET['nofetchscript']) || !empty( $_COOKIE['nofetchscript'])) {
901
			foreach( $scripts as $script ) {
902
				$scriptTag .= '<script type="text/javascript" src="'.$script['dir'].$script['file'].'"></script>';
903
			}
904
			foreach( $styles as $style ) {
905
				$scriptTag .= '<link type="text/css" href="'.$style['dir'].$style['file'].'" rel="stylesheet" />';
906
			}			
907
		} else {
908
			$scriptTag = '
885 909
		<script type="text/javascript" src="'. _EXT_URL . '/fetchscript.php?'
886 910
			.'&amp;subdir[]=scripts/editarea/&amp;file[]=edit_area_full_with_plugins.js'
887 911
			.'&amp;subdir[]=scripts/extjs3/adapter/ext/&amp;file[]=ext-base.js'
......
891 915
			.'&amp;subdir[]=scripts/extjs3-ext/ux.statusbar/&amp;file[]=ext-statusbar.js'
892 916
			.'&amp;subdir[]=scripts/extjs3-ext/ux.fileuploadfield/&amp;file[]=ext-fileUploadField.js'
893 917
			.'&amp;subdir[]=scripts/extjs3-ext/ux.locationbar/&amp;file[]=Ext.ux.LocationBar.js'
894
			.'&amp;gzip=1"></script>
895
		<script type="text/javascript" src="'. $GLOBALS['script_name'].'?option=com_extplorer&amp;action=include_javascript&amp;file=functions.js"></script>
896
		<script type="text/javascript" >editAreaLoader.baseURL = "'. _EXT_URL .'/scripts/editarea/";</script>
918
			.'&amp;gzip=1"></script>';
919
			$scriptTag .= '
897 920
		<link rel="stylesheet" href="'. _EXT_URL . '/fetchscript.php?'
898 921
			.'subdir[]=scripts/extjs3/resources/css/&amp;file[]=ext-all.css'
899 922
			.'&amp;subdir[]=scripts/extjs3-ext/ux.locationbar/&amp;file[]=LocationBar.css'
900 923
			.'&amp;subdir[]=scripts/extjs3-ext/ux.fileuploadfield/&amp;file[]=fileuploadfield.css'
901 924
			.'&amp;gzip=1" />';
925
		}
926
		$scriptTag .= '
927
		<script type="text/javascript" src="'. $GLOBALS['script_name'].'?option=com_extplorer&amp;action=include_javascript&amp;file=functions.js"></script>
928
		<script type="text/javascript" >editAreaLoader.baseURL = "'. _EXT_URL .'/scripts/editarea/";</script>';
902 929

  
903 930
	
904 931
		if (defined('EXT_STANDALONE')) {
trunk/webdav.php
78 78

  
79 79
# Real path of your site
80 80
$server->ServeRequest($GLOBALS["home_dir"]);
81

  
82
?>
trunk/admin.extplorer.php
195 195
}
196 196
//------------------------------------------------------------------------------
197 197
// Disconnect from ftp server
198
if( ext_isFTPMode() ) {
198
if( ext_isFTPMode() && is_object($GLOBALS['FTPCONNECTION']) ) {
199 199
	$GLOBALS['FTPCONNECTION']->disconnect();
200 200
}
201 201

  
trunk/config/conf.php
17 17
													);
18 18

  
19 19
$GLOBALS['allow_webdav'] = 0;
20
$GLOBALS['webdav_authentication_method'] = 'extplorer'; // use one of the  authentication methods in /include/authentication
21

  
20 22
// The following database settings are only necessary if you want to use WebDAV in Standalone Mode.
21 23
// Joomla users don't need to enter their DB settings here, 
22 24
// because eXtplorer will read them from the Joomla configuration file instead.

Also available in: Unified diff