Project

General

Profile

Revision 194

View differences:

trunk/extplorer.list.php
4 4
/**
5 5
 * @version $Id$
6 6
 * @package eXtplorer
7
 * @copyright soeren 2007
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
7
 * @copyright soeren 2007-2011
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * @author The	The QuiX project (http://quixplorer.sourceforge.net)
10 10
 * @license
11 11
 * The contents of this file are subject to the Mozilla Public License
......
139 139
	global $dir_up;
140 140
	if(!is_array($list)) return;
141 141
	if( $dir != "" || strstr( $dir, _EXT_PATH ) ) {
142
	echo "<tr class=\"sectiontableentry1\"><td valign=\"baseline\"><a href=\"".make_link("list",$dir_up,NULL)."\">";
142
	echo "<tr class=\"sectiontableentry1\"><td valign=\"baseline\"><a href=\"".ext_make_link("list",$dir_up,NULL)."\">";
143 143
	echo "<img border=\"0\" align=\"absmiddle\" src=\""._EXT_URL."/images/_up.png\" ";
144 144
	echo "alt=\"".$GLOBALS["messages"]["uplink"]."\" title=\"".$GLOBALS["messages"]["uplink"]."\"/>&nbsp;&nbsp;..</a></td>\n";
145 145
	echo "<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>";
......
163 163
		$is_file = false;
164 164
		//if(is_link($abs_item)) $extra=" -> ".@readlink($abs_item);
165 165
		if(@is_dir($abs_item)) {
166
			$link = make_link("list",get_rel_item($dir, $item),NULL);
166
			$link = ext_make_link("list",get_rel_item($dir, $item),NULL);
167 167
		} else { //if(get_is_editable($dir,$item) || get_is_image($dir,$item)) {
168
			$link = make_link("download",$dir,$item);
168
			$link = ext_make_link("download",$dir,$item);
169 169
			$is_file = true;
170 170
		} //else $link = "";
171 171

  
......
227 227

  
228 228
	$dirs = explode( "/", $dir );
229 229
	$implode = "";
230
	$dir_links = "<a href=\"".make_link( "list", "", null )."\">..</a>&nbsp;/&nbsp;";
230
	$dir_links = "<a href=\"".ext_make_link( "list", "", null )."\">..</a>&nbsp;/&nbsp;";
231 231
	foreach( $dirs as $directory ) {
232 232
	if( $directory != "" ) {
233 233
		$implode .= $directory."/";
234
		$dir_links .= "<a href=\"".make_link( "list", $implode, null )."\">$directory</a>&nbsp;/&nbsp;";
234
		$dir_links .= "<a href=\"".ext_make_link( "list", $implode, null )."\">$directory</a>&nbsp;/&nbsp;";
235 235
	}
236 236
	}
237 237
	echo '<div class="componentheading">'.$GLOBALS["messages"]["actdir"].": ".$dir_links.'</div>';
......
250 250
	// PARENT DIR
251 251
	echo "<td>";
252 252
	if( $dir != "" ) {
253
	echo "<a href=\"".make_link("list",$dir_up,NULL)."\">";
253
	echo "<a href=\"".ext_make_link("list",$dir_up,NULL)."\">";
254 254
	echo "<img border=\"0\" width=\"22\" height=\"22\" align=\"absmiddle\" src=\""._EXT_URL."/images/_up.png\" ";
255 255
	echo "alt=\"".$GLOBALS["messages"]["uplink"]."\" title=\"".$GLOBALS["messages"]["uplink"]."\"></a>";
256 256
	}
257 257
	echo "</td>\n";
258 258
	// HOME DIR
259
	echo "<td><a href=\"".make_link("list",NULL,NULL)."\">";
259
	echo "<td><a href=\"".ext_make_link("list",NULL,NULL)."\">";
260 260
	echo "<img border=\"0\" width=\"22\" height=\"22\" align=\"absmiddle\" src=\""._EXT_URL."/images/_home.gif\" ";
261 261
	echo "alt=\"".$GLOBALS["messages"]["homelink"]."\" title=\"".$GLOBALS["messages"]["homelink"]."\"></a></td>\n";
262 262
	// RELOAD
......
264 264
	echo "align=\"absmiddle\" src=\""._EXT_URL."/images/_refresh.gif\" alt=\"".$GLOBALS["messages"]["reloadlink"];
265 265
	echo "\" title=\"".$GLOBALS["messages"]["reloadlink"]."\"></A></td>\n";
266 266
	// SEARCH
267
	echo "<td><a href=\"".make_link("search",$dir,NULL)."\">";
267
	echo "<td><a href=\"".ext_make_link("search",$dir,NULL)."\">";
268 268
	echo "<img border=\"0\" width=\"22\" height=\"22\" align=\"absmiddle\" src=\""._EXT_URL."/images/_search.gif\" ";
269 269
	echo "alt=\"".$GLOBALS["messages"]["searchlink"]."\" title=\"".$GLOBALS["messages"]["searchlink"];
270 270
	echo "\"></a></td>\n";
......
272 272
	echo "<td><img src=\"images/menu_divider.png\" height=\"22\" width=\"2\" border=\"0\" alt=\"|\" /></td>";
273 273

  
274 274
	// Joomla Sysinfo
275
	echo "<td><a href=\"".make_link("sysinfo",$dir,NULL)."\">";
275
	echo "<td><a href=\"".ext_make_link("sysinfo",$dir,NULL)."\">";
276 276
	echo "<img border=\"0\" width=\"22\" height=\"22\" align=\"absmiddle\" src=\""._EXT_URL."/images/systeminfo.gif\" ";
277 277
	echo "alt=\"" . $GLOBALS['messages']['mossysinfolink'] . "\" title=\"" .$GLOBALS['messages']['mossysinfolink'] . "\"></a></td>\n";
278 278

  
......
296 296
		echo "align=\"absmiddle\" src=\""._EXT_URL."/images/_chmod.gif\" alt=\"chmod\" title=\"" . $GLOBALS['messages']['chmodlink'] . "\"></a></td>\n";
297 297
		// UPLOAD
298 298
		if(ini_get("file_uploads")) {
299
			echo "<td><a href=\"".make_link("upload",$dir,NULL)."\">";
299
			echo "<td><a href=\"".ext_make_link("upload",$dir,NULL)."\">";
300 300
			echo "<img border=\"0\" width=\"22\" height=\"22\" align=\"absmiddle\" ";
301 301
			echo "src=\""._EXT_URL."/images/_upload.gif\" alt=\"".$GLOBALS["messages"]["uploadlink"];
302 302
			echo "\" title=\"".$GLOBALS["messages"]["uploadlink"]."\"></A></td>\n";
......
335 335
		echo "<td>::</td>";
336 336
		// ADMIN
337 337
		if($admin) {
338
			echo "<td><a href=\"".make_link("admin",$dir,NULL)."\">";
338
			echo "<td><a href=\"".ext_make_link("admin",$dir,NULL)."\">";
339 339
			echo "<img border=\"0\" width=\"22\" height=\"22\" align=\"absmiddle\" ";
340 340
			echo "src=\""._EXT_URL."/images/_admin.gif\" alt=\"".$GLOBALS["messages"]["adminlink"]."\" title=\"";
341 341
			echo $GLOBALS["messages"]["adminlink"]."\"></A></td>\n";
342 342
		}
343 343
		// LOGOUT
344
		echo "<td><a href=\"".make_link("logout",NULL,NULL)."\">";
344
		echo "<td><a href=\"".ext_make_link("logout",NULL,NULL)."\">";
345 345
		echo "<img border=\"0\" width=\"22\" height=\"22\" align=\"absmiddle\" ";
346 346
		echo "src=\""._EXT_URL."/images/_logout.gif\" alt=\"".$GLOBALS["messages"]["logoutlink"]."\" title=\"";
347 347
		echo $GLOBALS["messages"]["logoutlink"]."\"></a></td>\n";
......
359 359
	// Create File / Dir
360 360

  
361 361
	if($allow && is_writable($GLOBALS['home_dir'].'/'.$dir)) {
362
		echo "<td align=\"right\"><table><form action=\"".make_link("mkitem",$dir,NULL)."\" method=\"post\">\n<tr><td>";
362
		echo "<td align=\"right\"><table><form action=\"".ext_make_link("mkitem",$dir,NULL)."\" method=\"post\">\n<tr><td>";
363 363
		echo "<select name=\"mktype\"><option value=\"file\">".$GLOBALS["mimes"]["file"]."</option>";
364 364
		echo "<option value=\"dir\">".$GLOBALS["mimes"]["dir"]."</option></select>\n";
365 365
		echo "<input name=\"mkname\" type=\"text\" size=\"15\">";
......
376 376
	echo"<table width=\"95%\" cellpadding=\"5\" cellspacing=\"2\"><tr class=\"sectiontableheader\">\n";
377 377
	echo "<th width=\"44%\"><b>\n";
378 378
	if($GLOBALS["order"]=="name") $new_srt = $_srt;	else $new_srt = "yes";
379
	echo "<a href=\"".make_link("list",$dir,NULL,"name",$new_srt)."\">".$GLOBALS["messages"]["nameheader"];
379
	echo "<a href=\"".ext_make_link("list",$dir,NULL,"name",$new_srt)."\">".$GLOBALS["messages"]["nameheader"];
380 380
	if($GLOBALS["order"]=="name") echo $images;
381 381
	echo "</a></b></td>\n<th width=\"10%\"><b>";
382 382
	if($GLOBALS["order"]=="size") $new_srt = $_srt;	else $new_srt = "yes";
383
	echo "<a href=\"".make_link("list",$dir,NULL,"size",$new_srt)."\">".$GLOBALS["messages"]["sizeheader"];
383
	echo "<a href=\"".ext_make_link("list",$dir,NULL,"size",$new_srt)."\">".$GLOBALS["messages"]["sizeheader"];
384 384
	if($GLOBALS["order"]=="size") echo $images;
385 385
	echo "</a></b></th>\n<th width=\"12%\" ><b>";
386 386
	if($GLOBALS["order"]=="type") $new_srt = $_srt;	else $new_srt = "yes";
387
	echo "<a href=\"".make_link("list",$dir,NULL,"type",$new_srt)."\">".$GLOBALS["messages"]["typeheader"];
387
	echo "<a href=\"".ext_make_link("list",$dir,NULL,"type",$new_srt)."\">".$GLOBALS["messages"]["typeheader"];
388 388
	if($GLOBALS["order"]=="type") echo $images;
389 389
	echo "</a></b></th>\n<th width=\"12%\"><b>";
390 390
	if($GLOBALS["order"]=="mod") $new_srt = $_srt;	else $new_srt = "yes";
391
	echo "<a href=\"".make_link("list",$dir,NULL,"mod",$new_srt)."\">".$GLOBALS["messages"]["modifheader"];
391
	echo "<a href=\"".ext_make_link("list",$dir,NULL,"mod",$new_srt)."\">".$GLOBALS["messages"]["modifheader"];
392 392
	if($GLOBALS["order"]=="mod") echo $images;
393 393
	echo "</a></b></th></tr>\n";
394 394

  
trunk/scripts/application.js.php
3 3
if( !defined( '_JEXEC' ) && !defined( '_VALID_MOS' ) ) die( 'Restricted access' );
4 4
/**
5 5
 * @package eXtplorer
6
 * @copyright soeren 2007-2009
7
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
6
 * @copyright soeren 2007-2011
7
 * @author The eXtplorer project (http://extplorer.net)
8 8
 * @license
9 9
 * @version $Id$
10 10
 * The contents of this file are subject to the Mozilla Public License
......
283 283
                          	    		icon: '<?php echo _EXT_URL ?>/images/_logout.png',
284 284
                          	    		tooltip: '<?php echo ext_Lang::msg('logoutlink', true ) ?>',
285 285
                          	    		cls:'x-btn-icon',
286
                          	    		handler: function() { document.location.href='<?php echo make_link('logout', null ) ?>'; }
286
                          	    		handler: function() { document.location.href='<?php echo ext_make_link('logout', null ) ?>'; }
287 287
                          	    	},		
288 288
                          	    	'-',
289 289
                          			<?php
trunk/scripts/functions.js.php
5 5
 * @version $Id$
6 6
 * @package eXtplorer
7 7
 * @copyright soeren 2007-2009
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * @author The	The QuiX project (http://quixplorer.sourceforge.net)
10 10
 * @license
11 11
 * The contents of this file are subject to the Mozilla Public License
trunk/application.php
5 5
 * @package eXtplorer
6 6
 * @version $Id$
7 7
 * @copyright soeren 2007-2010
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * @license
10 10
 * The contents of this file are subject to the Mozilla Public License
11 11
 * Version 1.1 (the "License"); you may not use this file except in
trunk/extplorer.php
5 5
 * @version $Id$
6 6
 * @package eXtplorer
7 7
 * @copyright soeren 2007-2010
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * @author The	The QuiX project (http://quixplorer.sourceforge.net)
10 10
 * @license
11 11
 * The contents of this file are subject to the Mozilla Public License
trunk/extplorer.init.php
81 81
if(!file_exists($GLOBALS["home_dir"])) {
82 82
  if(!file_exists($GLOBALS["home_dir"].$GLOBALS["separator"])) {
83 83
	if(!empty($GLOBALS["require_login"])) {
84
		$extra="<a href=\"".make_link("logout",NULL,NULL)."\">".
84
		$extra="<a href=\"".ext_make_link("logout",NULL,NULL)."\">".
85 85
			$GLOBALS["messages"]["btnlogout"]."</A>";
86 86
	} 
87 87
	else {
trunk/include/authentication/ftp.php
2 2
// ensure this file is being included by a parent file
3 3
if( !defined( '_JEXEC' ) && !defined( '_VALID_MOS' ) ) die( 'Restricted access' );
4 4
/**
5
 * @version $Id: ftp_authentication.php 143 2009-04-01 18:48:16Z soeren $
5
 * @version $Id: ftp_authentication.php 194 2011-05-30 18:48:16Z sloarch $
6 6
 * @package eXtplorer
7
 * @copyright soeren 2007-2010
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
7
 * @copyright soeren 2007-2011
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * 
10 10
 * @license
11 11
 * The contents of this file are subject to the Mozilla Public License
......
184 184
		unset($_SESSION['credentials_ftp']);
185 185
		unset($_SESSION['ftp_host']);
186 186
		session_write_close();
187
		extRedirect( make_link(null, null, null, null, null, null, '&file_mode=extplorer') );
187
		extRedirect( ext_make_link(null, null, null, null, null, null, '&file_mode=extplorer') );
188 188
	}
189 189
}
trunk/include/authentication/ssh2.php
2 2
// ensure this file is being included by a parent file
3 3
if( !defined( '_JEXEC' ) && !defined( '_VALID_MOS' ) ) die( 'Restricted access' );
4 4
/**
5
 * @version $Id: ftp_authentication.php 143 2009-04-01 18:48:16Z soeren $
5
 * @version $Id: ftp_authentication.php 194 2011-05-30 18:48:16Z sloarch $
6 6
 * @package eXtplorer
7
 * @copyright soeren 2007-2010
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
7
 * @copyright soeren 2007-2011
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * 
10 10
 * @license
11 11
 * The contents of this file are subject to the Mozilla Public License
......
184 184
		unset($_SESSION['credentials_ssh2']);
185 185
		unset($_SESSION['ssh2_host']);
186 186
		session_write_close();
187
		extRedirect( make_link(null, null, null, null, null, null, '&file_mode=file') );
187
		extRedirect( ext_make_link(null, null, null, null, null, null, '&file_mode=file') );
188 188
	}
189 189
}
trunk/include/authentication/extplorer.php
2 2
// ensure this file is being included by a parent file
3 3
if( !defined( '_JEXEC' ) && !defined( '_VALID_MOS' ) ) die( 'Restricted access' );
4 4
/**
5
 * @version $Id: ftp_authentication.php 143 2009-04-01 18:48:16Z soeren $
5
 * @version $Id: ftp_authentication.php 143 2009-05-30 20:22:16Z sloarch $
6 6
 * @package eXtplorer
7 7
 * @copyright soeren 2007-2010
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * @author The	The QuiX project (http://quixplorer.sourceforge.net)
10 10
 * 
11 11
 * @license
......
41 41
		// Check Login
42 42
		//------------------------------------------------------------------------------
43 43

  
44
		$data=find_user($credentials['username'], $credentials['password'] );
44
		$data=ext_find_user($credentials['username'], $credentials['password'] );
45 45
		if($data==NULL) {
46 46
			return false;
47 47
		}
trunk/include/chmod.php
5 5
 * @version $Id$
6 6
 * @package eXtplorer
7 7
 * @copyright soeren 2007-2009
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * @author The	The QuiX project (http://quixplorer.sourceforge.net)
10 10
 * 
11 11
 * @license
trunk/include/system_info.php
5 5
 * @version $Id$
6 6
 * @package eXtplorer
7 7
 * @copyright soeren 2007-2009
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * 
10 10
 * @license
11 11
 * The contents of this file are subject to the Mozilla Public License
trunk/include/copy_move.php
5 5
 * @version $Id$
6 6
 * @package eXtplorer
7 7
 * @copyright soeren 2007-2009
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * @author The	The QuiX project (http://quixplorer.sourceforge.net)
10 10
 *
11 11
 * @license
......
36 36
/**
37 37
 * File/Directory Copy & Move Functions
38 38
 */
39
function copy_move_items($dir) {		// copy/move file/dir
39
function ext_copy_move_items($dir) {		// copy/move file/dir
40 40
	$action = extGetParam( $_REQUEST, 'action' );
41 41
	if(($GLOBALS["permissions"]&01)!=01){
42 42
		ext_Result::sendResult( $action, false, $GLOBALS["error_msg"]["accessfunc"]);
......
50 50
	$cnt=count($GLOBALS['__POST']["selitems"]);
51 51

  
52 52
	if (!$new_dir) {
53
	    copy_move_dialog($dir);
53
	    ext_copy_move_dialog($dir);
54 54
	    return;
55 55
	}
56 56

  
......
147 147
	ext_Result::sendResult( $action, true, 'The File(s)/Directory(s) were successfully '.($action=='copy'?'copied':'moved').'.' );
148 148
}
149 149

  
150
function copy_move_dialog($dir='') {
150
function ext_copy_move_dialog($dir='') {
151 151
    $action = extGetParam( $_REQUEST, 'action' );
152 152
    ?>
153 153
{
trunk/include/users.php
5 5
 * @version $Id$
6 6
 * @package eXtplorer
7 7
 * @copyright soeren 2007-2009
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * @author The	The QuiX project (http://quixplorer.sourceforge.net)
10 10
 * 
11 11
 * @license
......
32 32
 * 
33 33
 * Administrative Functions regarding users
34 34
 */
35
function load_users() {
35
function ext_load_users() {
36 36
	require _EXT_PATH."/config/.htusers.php";
37 37
}
38 38
//------------------------------------------------------------------------------
39
function save_users() {
39
function ext_save_users() {
40 40
	$cnt=count($GLOBALS["users"]);
41 41
	if($cnt>0) sort($GLOBALS["users"]);
42 42

  
......
63 63
	return true;
64 64
}
65 65
//------------------------------------------------------------------------------
66
function &find_user($user,$pass) {
66
function &ext_find_user($user,$pass) {
67 67
	$return = null;
68 68
	$cnt=count($GLOBALS["users"]);
69 69
	for($i=0;$i<$cnt;++$i) {
......
80 80
}
81 81

  
82 82
//------------------------------------------------------------------------------
83
function update_user($user,$new_data) {
84
	$data=&find_user($user,NULL);
83
function ext_update_user($user,$new_data) {
84
	$data=&ext_find_user($user,NULL);
85 85
	if($data==NULL) return false;
86 86

  
87 87
	$data=$new_data;
88
	return save_users();
88
	return ext_save_users();
89 89
}
90 90
//------------------------------------------------------------------------------
91 91
function ext_add_user($data) {
92
	if(find_user($data[0],NULL)) return false;
92
	if(ext_find_user($data[0],NULL)) return false;
93 93

  
94 94
	$GLOBALS["users"][]=$data;
95
	return save_users();
95
	return ext_save_users();
96 96
}
97 97
//------------------------------------------------------------------------------
98
function remove_user($user) {
99
	$data=&find_user($user,NULL);
98
function ext_remove_user($user) {
99
	$data=&ext_find_user($user,NULL);
100 100
	if($data==NULL) return false;
101 101

  
102 102
	// Remove
......
105 105
	// Copy Valid Users
106 106
	$cnt=count($GLOBALS["users"]);
107 107
	for($i=0;$i<$cnt;++$i) {
108
		if($GLOBALS["users"][$i]!=NULL) $save_users[]=$GLOBALS["users"][$i];
108
		if($GLOBALS["users"][$i]!=NULL) $ext_save_users[]=$GLOBALS["users"][$i];
109 109
	}
110
	$GLOBALS["users"]=$save_users;
111
	return save_users();
110
	$GLOBALS["users"]=$ext_save_users;
111
	return ext_save_users();
112 112
}
113 113
//------------------------------------------------------------------------------
114 114
/*
trunk/include/delete.php
5 5
 * @version $Id$
6 6
 * @package eXtplorer
7 7
 * @copyright soeren 2007
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * @author The	The QuiX project (http://quixplorer.sourceforge.net)
10 10
 * 
11 11
 * @license
trunk/include/init.php
4 4
/**
5 5
 * @version $Id$
6 6
 * @package eXtplorer
7
 * @copyright soeren 2007-2009
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
7
 * @copyright soeren 2007-2011
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * @author The	The QuiX project (http://quixplorer.sourceforge.net)
10 10
 * 
11 11
 * @license
......
139 139
} else {
140 140
	if (@$_REQUEST['file_mode'] != @$_SESSION['file_mode'] && in_array($_REQUEST['file_mode'], $GLOBALS['ext_conf']['authentication_methods_allowed'])) {
141 141
		if ($action != 'login' && empty($_SESSION['credentials_'.extGetParam($_REQUEST, 'file_mode')])) {
142
			extRedirect(make_link( 'login','',null,null,null,null,'&type='.urlencode(extGetParam($_REQUEST, 'file_mode'))));
142
			extRedirect(ext_make_link( 'login','',null,null,null,null,'&type='.urlencode(extGetParam($_REQUEST, 'file_mode'))));
143 143
		} else {
144 144
			$GLOBALS['file_mode'] = $_SESSION['file_mode'] = extGetParam($_REQUEST, 'file_mode', $GLOBALS['ext_conf']['authentication_method_default']);
145 145
		}
......
236 236
if (!file_exists($GLOBALS["home_dir"])) {
237 237
  if (!file_exists($GLOBALS["home_dir"].$GLOBALS["separator"])) {
238 238
	if ($GLOBALS["require_login"]) {
239
		$extra = "<a href=\"" . make_link("logout",NULL,NULL) . "\">" . $GLOBALS["messages"]["btnlogout"] . "</a>";
239
		$extra = "<a href=\"" . ext_make_link("logout",NULL,NULL) . "\">" . $GLOBALS["messages"]["btnlogout"] . "</a>";
240 240
	} else {
241 241
		$extra = NULL;
242 242
	}
trunk/include/search.php
4 4
/**
5 5
 * @version $Id$
6 6
 * @package eXtplorer
7
 * @copyright soeren 2007-2009
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
7
 * @copyright soeren 2007-2011
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * @author The	The QuiX project (http://quixplorer.sourceforge.net)
10 10
 *
11 11
 * @license
......
103 103

  
104 104
		if(get_is_dir($dir,$item)) {
105 105
			$img = "dir.png";
106
			$link = make_link("list",get_rel_item($dir, $item),NULL);
106
			$link = ext_make_link("list",get_rel_item($dir, $item),NULL);
107 107
		} else {
108 108
			$img = get_mime_type( $item, "img");
109 109
			//if(get_is_editable($dir,$item) || get_is_image($dir,$item)) {
......
117 117
		/*if($link!="")*/
118 118
		$response .= "<a href=\"".$link."\" target=\"".$target."\">";
119 119
		//else echo "<a>";
120
		$response .= $s_item."</a></td><td><a href=\"" . make_link("list",$dir,null)."\"> /";
120
		$response .= $s_item."</a></td><td><a href=\"" . ext_make_link("list",$dir,null)."\"> /";
121 121
		$response .= $s_dir."</a></td></tr>\n";
122 122
	}
123 123
	return $response;
......
137 137
		
138 138
		if(get_is_dir($dir,$item)) {
139 139
			$img = "dir.png";
140
			$link = make_link("list",get_rel_item($dir, $item),NULL);
140
			$link = ext_make_link("list",get_rel_item($dir, $item),NULL);
141 141
		} else {
142 142
			$img = get_mime_type( $item, "img");
143 143
			//if(get_is_editable($dir,$item) || get_is_image($dir,$item)) {
......
156 156
	return $array;
157 157
}
158 158
//------------------------------------------------------------------------------
159
function search_items($dir) {	// search for item
159
function ext_search_items($dir) {	// search for item
160 160
    if( empty($dir) && !empty($GLOBALS['__POST']["item"]) ) {
161 161
        $dir = $GLOBALS['__POST']["item"];
162 162
    }
trunk/include/rename.php
5 5
 * @version $Id$
6 6
 * @package eXtplorer
7 7
 * @copyright soeren 2007-2009
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * @author The	The QuiX project (http://quixplorer.sourceforge.net)
10 10
 * 
11 11
 * @license
trunk/include/download.php
5 5
 * @version $Id$
6 6
 * @package eXtplorer
7 7
 * @copyright soeren 2007-2009
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * @author The	The QuiX project (http://quixplorer.sourceforge.net)
10 10
 * 
11 11
 * @license
trunk/include/login.php
5 5
 * @version $Id$
6 6
 * @package eXtplorer
7 7
 * @copyright soeren 2007-2009
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * @author The	The QuiX project (http://quixplorer.sourceforge.net)
10 10
 * 
11 11
 * @license
......
35 35

  
36 36
//------------------------------------------------------------------------------
37 37
require_once _EXT_PATH."/include/users.php";
38
load_users();
38
ext_load_users();
39 39
//------------------------------------------------------------------------------
40 40

  
41 41
$GLOBALS['__SESSION']=&$_SESSION;
......
116 116
			?>
117 117
		<div style="width: 400px;" id="formContainer">
118 118
			<div id="ext_logo" style="text-align:center;">
119
			<a href="http://extplorer.sourceforge.net" target="_blank">
119
			<a href="http://extplorer.net" target="_blank">
120 120
				<img src="<?php echo _EXT_URL ?>/images/eXtplorer-horizontal2.png" align="middle" alt="eXtplorer Logo" style="border:none;" />
121 121
			</a>
122 122
			</div>
trunk/include/diff.php
5 5
 * @version $Id: edit.php 129 2009-01-26 16:14:53Z ryu_ms $
6 6
 * @package eXtplorer
7 7
 * @copyright Geoffrey Tran 2009
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * @author The  The QuiX project (http://quixplorer.sourceforge.net)
10 10
 *
11 11
 * @license
trunk/include/functions.php
5 5
 * @version $Id$
6 6
 * @package eXtplorer
7 7
 * @copyright soeren 2007-2011
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * @author The	The QuiX project (http://quixplorer.sourceforge.net)
10 10
 * 
11 11
 * @license
......
36 36
 * THESE ARE NUMEROUS HELPER FUNCTIONS FOR THE OTHER INCLUDE FILES
37 37
 */
38 38

  
39
function make_link($_action,$_dir,$_item=NULL,$_order=NULL,$_srt=NULL,$languages=NULL, $extra=null) {
39
function ext_make_link($_action,$_dir,$_item=NULL,$_order=NULL,$_srt=NULL,$languages=NULL, $extra=null) {
40 40
	// make link to next page
41 41
	if($_action=="" || $_action==NULL) $_action="list";
42 42

  
trunk/include/view.php
4 4
/**
5 5
 * @version $Id$
6 6
 * @package eXtplorer
7
 * @copyright soeren 2007-2009
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
7
 * @copyright soeren 2007-2011
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * 
10 10
 * @license
11 11
 * The contents of this file are subject to the Mozilla Public License
......
41 41
		global $action;
42 42
		
43 43
		if( @eregi($GLOBALS["images_ext"], $item)) {
44
			$html =  '<img src="'.make_link( 'get_image', $dir, rawurlencode($item)).'" alt="'.$GLOBALS["messages"]["actview"].": ".$item.'" /><br /><br />';
44
			$html =  '<img src="'.ext_make_link( 'get_image', $dir, rawurlencode($item)).'" alt="'.$GLOBALS["messages"]["actview"].": ".$item.'" /><br /><br />';
45 45
		}
46 46

  
47 47
		elseif( @eregi($GLOBALS["editable_ext"], $item)) {
......
108 108

  
109 109
		} else {
110 110
			$html = '
111
			<iframe src="'. make_link('download', $dir, $item, null, null, null, '&action2=view' ) .'" id="iframe1" width="100%" height="100%" frameborder="0"></iframe>';
111
			<iframe src="'. ext_make_link('download', $dir, $item, null, null, null, '&action2=view' ) .'" id="iframe1" width="100%" height="100%" frameborder="0"></iframe>';
112 112
			
113 113
		}
114 114
		$html = str_replace(Array("\r", "\n"), Array('\r', '\n') , addslashes($html));
trunk/include/extract.php
6 6
 * @version $Id$
7 7
 * @package eXtplorer
8 8
 * @copyright soeren 2007-2010
9
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
9
 * @author The eXtplorer project (http://extplorer.net)
10 10
 * 
11 11
 * @license
12 12
 * The contents of this file are subject to the Mozilla Public License
trunk/include/list.php
5 5
 * @version $Id$
6 6
 * @package eXtplorer
7 7
 * @copyright soeren 2007-2010
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * @author The	The QuiX project (http://quixplorer.sourceforge.net)
10 10
 * 
11 11
 * @license
trunk/include/archive.php
4 4
/**
5 5
 * @version $Id$
6 6
 * @package eXtplorer
7
 * @copyright soeren 2007-2010
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
7
 * @copyright soeren 2007-2011
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * @author The	The QuiX project (http://quixplorer.sourceforge.net)
10 10
 * @license
11 11
 * @version $Id$
......
164 164
				$response = Array( 'action' => 'archive',
165 165
				'success' => true,
166 166
				'message' => ext_Lang::msg('archive_created'),
167
				'newlocation' => make_link( 'download', $dir, basename($archive_name) )
167
				'newlocation' => ext_make_link( 'download', $dir, basename($archive_name) )
168 168
				);
169 169

  
170 170
			}
trunk/include/result.class.php
5 5
 * @version $Id$
6 6
 * @package eXtplorer
7 7
 * @copyright soeren 2007-2010
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * 
10 10
 * @license
11 11
 * The contents of this file are subject to the Mozilla Public License
trunk/include/transfer.php
5 5
 * @version $Id$
6 6
 * @package eXtplorer
7 7
 * @copyright soeren 2007-2009
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * @license
10 10
 * The contents of this file are subject to the Mozilla Public License
11 11
 * Version 1.1 (the "License"); you may not use this file except in
trunk/include/upload.php
5 5
 * @version $Id$
6 6
 * @package eXtplorer
7 7
 * @copyright soeren 2007-2009
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * @author The	The QuiX project (http://quixplorer.sourceforge.net)
10 10
 * @license
11 11
 * The contents of this file are subject to the Mozilla Public License
trunk/include/edit.php
5 5
 * @version $Id$
6 6
 * @package eXtplorer
7 7
 * @copyright soeren 2007-2009
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * @author The	The QuiX project (http://quixplorer.sourceforge.net)
10 10
 * 
11 11
 * @license
trunk/include/mkitem.php
5 5
 * @version $Id$
6 6
 * @package eXtplorer
7 7
 * @copyright soeren 2007-2009
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * @author The	The QuiX project (http://quixplorer.sourceforge.net)
10 10
 * 
11 11
 * @license
trunk/include/header.php
5 5
 * @version $Id$
6 6
 * @package eXtplorer
7 7
 * @copyright soeren 2007-2009
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * @author The	The QuiX project (http://quixplorer.sourceforge.net)
10 10
 * 
11 11
 * @license
trunk/include/ftp_authentication.php
4 4
/**
5 5
 * @version $Id$
6 6
 * @package eXtplorer
7
 * @copyright soeren 2007-2010
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
7
 * @copyright soeren 2007-2011
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * 
10 10
 * @license
11 11
 * The contents of this file are subject to the Mozilla Public License
......
163 163
	unset($_SESSION['ftp_pass']);
164 164
	unset($_SESSION['ftp_host']);
165 165
	session_write_close();
166
	extRedirect( make_link(null, null, null, null, null, null, '&file_mode=file') );
166
	extRedirect( ext_make_link(null, null, null, null, null, null, '&file_mode=file') );
167 167
}
trunk/include/bookmarks.php
4 4
/**
5 5
 * @version $Id$
6 6
 * @package eXtplorer
7
 * @copyright soeren 2007-2010
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
7
 * @copyright soeren 2007-2011
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * 
10 10
 * @license
11 11
 * The contents of this file are subject to the Mozilla Public License
......
72 72
 *
73 73
 * @param string $dir
74 74
 */
75
function modify_bookmark( $task, $dir ) {
75
function ext_modify_bookmark( $task, $dir ) {
76 76
	global $my, $user, $mainframe;
77 77
	$alias = substr( extGetParam($_REQUEST,'alias'), 0, 150 );
78 78
	$bookmarks = read_bookmarks();
......
128 128
	file_put_contents( $bookmarkfile, $inifile );
129 129

  
130 130
	echo $msg;
131
	echo list_bookmarks($dir);
131
	echo ext_list_bookmarks($dir);
132 132
	exit;
133 133
}
134 134

  
......
137 137
 *
138 138
 * @param string $dir
139 139
 */
140
function list_bookmarks( $dir ) {
140
function ext_list_bookmarks( $dir ) {
141 141

  
142 142
	$bookmarks = read_bookmarks();
143 143
	$bookmarks = array_flip($bookmarks);
......
163 163
	$addlink=$removelink='';
164 164

  
165 165
	if( !isset( $bookmarks[$dir] ) && $dir != '' && $dir != '/' ) {
166
		$addlink = '<a href="'.make_link('modify_bookmark', $dir ).'&task=add" onclick="'
166
		$addlink = '<a href="'.ext_make_link('modify_bookmark', $dir ).'&task=add" onclick="'
167 167
		.'Ext.Msg.prompt(\''.ext_Lang::msg('lbl_add_bookmark',true).'\', \''.ext_Lang::msg('enter_alias_name', true ).':\', '
168 168
		.'function(btn, text){ '
169 169
			.'if (btn == \'ok\') { '
......
182 182
			.'}'
183 183
		.'}); return false;" title="'.$GLOBALS['messages']['lbl_add_bookmark'].'" >'.$img_add.'</a>';
184 184
	} elseif( $dir != '' && $dir != '/' ) {
185
		$removelink = '<a href="'.make_link('modify_bookmark', $dir ).'&task=remove" onclick="'
185
		$removelink = '<a href="'.ext_make_link('modify_bookmark', $dir ).'&task=remove" onclick="'
186 186
		.'Ext.Msg.confirm(\''.ext_Lang::msg('lbl_remove_bookmark', true ).'\',\''.ext_Lang::msg('lbl_remove_bookmark', true ).'?\', '
187 187
		.'function(btn, text){ '
188 188
			.'if (btn == \'yes\') { '
trunk/include/admin.php
5 5
 * @version $Id$
6 6
 * @package eXtplorer
7 7
 * @copyright soeren 2007-2009
8
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
8
 * @author The eXtplorer project (http://extplorer.net)
9 9
 * @author The	The QuiX project (http://quixplorer.sourceforge.net)
10 10
 * @license
11 11
 * @version $Id$
......
283 283
		ext_Result::sendResult('changepwd', false, $GLOBALS["error_msg"]["miscnopassmatch"]);
284 284
	}
285 285

  
286
	$data=find_user($GLOBALS['__SESSION']['credentials_extplorer']['username'],$pwd);
286
	$data=ext_find_user($GLOBALS['__SESSION']['credentials_extplorer']['username'],$pwd);
287 287
	if($data==NULL) {
288 288
		ext_Result::sendResult('changepwd', false, $GLOBALS["error_msg"]["miscnouserpass"]);
289 289
	}
290 290

  
291 291
	$data[1]=extEncodePassword(stripslashes($GLOBALS['__POST']["newpwd1"]));
292
	if(!update_user($data[0],$data)) {
292
	if(!ext_update_user($data[0],$data)) {
293 293
		ext_Result::sendResult('changepwd', false, $data[0].": ".$GLOBALS["error_msg"]["chpass"]);
294 294
	}
295 295
	require_once(_EXT_PATH.'/include/authentication/extplorer.php');
......
308 308
		if($GLOBALS['__POST']["pass1"]!=$GLOBALS['__POST']["pass2"]) {
309 309
			ext_Result::sendResult('adduser', false, $GLOBALS["error_msg"]["miscnopassmatch"]);
310 310
		}
311
		$data=find_user($user,NULL);
311
		$data=ext_find_user($user,NULL);
312 312
		if($data!=NULL) {
313 313
			ext_Result::sendResult('adduser', false, $user.": ".$GLOBALS["error_msg"]["miscuserexist"]);
314 314
		}
......
331 331
//------------------------------------------------------------------------------
332 332
function edituser($dir) {			// Edit User
333 333
	$user=stripslashes($GLOBALS['__POST']["nuser"]);
334
	$data=find_user($user,NULL);
334
	$data=ext_find_user($user,NULL);
335 335
	if($data==NULL) {
336 336
		ext_Result::sendResult('edituser', false, $user.": ".$GLOBALS["error_msg"]["miscnofinduser"]);
337 337
	}
......
357 357
			stripslashes($GLOBALS['__POST']["home_url"]),$GLOBALS['__POST']["show_hidden"],
358 358
			stripslashes($GLOBALS['__POST']["no_access"]),$GLOBALS['__POST']["permissions"],$GLOBALS['__POST']["active"]);
359 359

  
360
		if(!update_user($user,$data)) {
360
		if(!ext_update_user($user,$data)) {
361 361
			ext_Result::sendResult('edituser', false, $user.": ".$GLOBALS["error_msg"]["saveuser"]);
362 362
		}
363 363
		/*if($self) {
......
546 546
	if($user==$GLOBALS['__SESSION']['credentials_extplorer']['username']) {
547 547
		ext_Result::sendResult('removeuser', false, $GLOBALS["error_msg"]["miscselfremove"]);
548 548
	}
549
	if(!remove_user($user)) {
549
	if(!ext_remove_user($user)) {
550 550
		ext_Result::sendResult('removeuser', false, $user.": ".$GLOBALS["error_msg"]["deluser"]);
551 551
	}
552 552
	ext_Result::sendResult('removeuser', true, $user." was successfully removed." );
553 553

  
554 554
}
555 555
//------------------------------------------------------------------------------
556
function show_admin($dir) {			// Execute Admin Action
556
function ext_show_admin($dir) {			// Execute Admin Action
557 557
	$pwd=(($GLOBALS["permissions"]&2)==2);
558 558
	$admin=(($GLOBALS["permissions"]&4)==4);
559 559

  
trunk/webdav.php
27 27
$phpcgi = substr(PHP_SAPI, 0, 3) == 'cgi';
28 28
$realm = 'Restricted Area: eXtplorer WebDAV';
29 29

  
30
load_users();
30
ext_load_users();
31 31

  
32 32
foreach( $GLOBALS["users"] as $user ) {
33 33
	$users[$user[0]] = $user[1];
trunk/admin.extplorer.php
8 8
 * 
9 9
 * @package eXtplorer
10 10
 * @copyright soeren 2007-2009
11
 * @author The eXtplorer project (http://sourceforge.net/projects/extplorer)
11
 * @author The eXtplorer project (http://extplorer.net)
12 12
 * @author The	The QuiX project (http://quixplorer.sourceforge.net)
13 13
 * @license
14 14
 * The contents of this file are subject to the Mozilla Public License
......
40 40

  
41 41
// The eXtplorer version number
42 42
$GLOBALS['ext_version'] = '2.1.0';
43
$GLOBALS['ext_home'] = 'http://extplorer.sourceforge.net';
43
$GLOBALS['ext_home'] = 'http://extplorer.net';
44 44

  
45 45
//------------------------------------------------------------------------------
46 46
if( defined( 'E_STRICT' ) ) { // Suppress Strict Standards Warnings
......
120 120
	// COPY/MOVE FILE(S)/DIR(S)
121 121
	case "copy":	case "move":
122 122
		require_once( _EXT_PATH ."/include/copy_move.php" );
123
		copy_move_items($dir);
123
		ext_copy_move_items($dir);
124 124
	break;
125 125

  
126 126
	//------------------------------------------------------------------------------
127 127
	// SEARCH FOR FILE(S)/DIR(S)
128 128
	case "search":
129 129
		require_once( _EXT_PATH ."/include/search.php" );
130
		search_items($dir);
130
		ext_search_items($dir);
131 131
	break;
132 132

  
133 133
	//------------------------------------------------------------------------------
134 134
	// USER-ADMINISTRATION
135 135
	case "admin":
136 136
		require_once( _EXT_PATH . "/include/admin.php" );
137
		show_admin($dir);
137
		ext_show_admin($dir);
138 138
	break;
139 139

  
140 140
	//------------------------------------------------------------------------------
......
142 142
	case 'modify_bookmark':
143 143
		$task = extGetParam( $_REQUEST, 'task' );
144 144
		require_once( _EXT_PATH.'/include/bookmarks.php' );
145
		modify_bookmark( $task, $dir );
145
		ext_modify_bookmark( $task, $dir );
146 146

  
147 147
		break;
148 148
	//------------------------------------------------------------------------------
......
169 169
			break;
170 170
	case 'chdir_event':
171 171
			require_once( _EXT_PATH.'/include/bookmarks.php' );
172
			$response = Array( 'bookmarks' => list_bookmarks($dir) );
172
			$response = Array( 'bookmarks' => ext_list_bookmarks($dir) );
173 173
			$classname = class_exists('ext_Json') ? 'ext_Json' : 'Services_JSON';
174 174
			$json = new $classname();
175 175
			echo $json->encode( $response );

Also available in: Unified diff