BBCode toolbar: Selectboxes of attachments and images are being sorted by name;

fixed redirects after login

fp-plugins/bbcode/plugin.bbcode.php

@@ -669,11 +669,15 @@ function plugin_bbcode_toolbar() {
 	// get all available images
 	$indexer = new fs_filelister(IMAGES_DIR);
 	$imageslist = $indexer->getList();
+	// sort by name
+	sort($imageslist);
 	array_unshift($imageslist, '--');
 	$_FP_SMARTY->assign('images_list', $imageslist);
 	// get all available attachements
 	$indexer = new fs_filelister(ATTACHS_DIR);
 	$attachslist = $indexer->getList();
+	// sort by name
+	sort($attachslist);
 	array_unshift($attachslist, '--');
 	$_FP_SMARTY->assign('attachs_list', $attachslist);
 	// DMKE: does not work

login.php

@@ -1,33 +1,32 @@
 <?php
 
-	// Example of use
+// Example of use
-	require_once 'defaults.php';
+require_once 'defaults.php';
-	require_once (INCLUDES_DIR.'includes.php');
+require_once (INCLUDES_DIR . 'includes.php');
 
-	require(SMARTY_DIR . 'SmartyValidate.class.php');
+require (SMARTY_DIR . 'SmartyValidate.class.php');
 
+$tpl = 'default.tpl';
 
-	$tpl = 'default.tpl';
+function login_validate() {
-
-	function login_validate() {
 	global $smarty, $lang;
 
-		$user = trim(@$_POST['user']);
+	$user = trim(@$_POST ['user']);
-		$pass = trim(@$_POST['pass']);
+	$pass = trim(@$_POST ['pass']);
 
 	$error = array();
-		$lerr =& $lang['login']['error'];
+	$lerr = & $lang ['login'] ['error'];
 
 	if (!$user) {
-			$error['user'] = $lerr['user']; 
+		$error ['user'] = $lerr ['user'];
 	}
 
 	if (!$pass) {
-                 	$error['pass'] = $lerr['pass'];
+		$error ['pass'] = $lerr ['pass'];
 	}
 
 	if (!$error && !user_login($user, $pass)) {
-			$error['match'] = $lerr['match']; 
+		$error ['match'] = $lerr ['match'];
 	}
 
 	if ($error) {
@@ -36,58 +35,50 @@
 	}
 
 	return 1;
+}
 
-	}
+function main() {
-		
-	function main() {
 	global $lang, $smarty;
 
 	if (user_loggedin()) {
 
-			if(isset($_GET['do']) && ($_GET['do']=='logout')) {
+		if (isset($_GET ['do']) && ($_GET ['do'] == 'logout')) {
 			user_logout();
 
 			function myredirect() {
-					login_redirect('index.php');
+				// login_redirect('.');
 			}
 
 			add_filter('wp_head', 'myredirect');
 
 			$content = (SHARED_TPLS . 'login.tpl');
-				
 		} elseif (user_loggedin()) {
 
 			function myredirect() {
-					login_redirect('index.php');
+				login_redirect('admin.php');
 			}
 
 			add_filter('wp_head', 'myredirect');
 
 			$content = (SHARED_TPLS . 'login_success.tpl');
-		
 		} else {
 
 			utils_redirect();
-				
 		}
-			
 	} elseif (sess_remove('logout_done')) {
 
 		function myredirect() {
-					login_redirect('index.php');
+			// login_redirect('.');
 		}
 
 		add_filter('wp_head', 'myredirect');
 
 		$content = (SHARED_TPLS . 'login_success.tpl');
-
+	} elseif (empty($_POST)) {
-		
-		
-		} elseif(empty($_POST)) {
 		$content = (SHARED_TPLS . 'login.tpl');
 	} else {
 		// validate after a POST
-			if(login_validate()) {
+		if (login_validate()) {
 			utils_redirect('login.php');
 		} else {
 			$smarty->assign($_POST);
@@ -100,31 +91,24 @@
 	// Content can be both a shared tpl or raw html content; in this last case
 	// you have to set the third optional parameter to true
 
-		$smarty->assign('subject', $lang['login']['head']);
+	$smarty->assign('subject', $lang ['login'] ['head']);
 	$smarty->assign('content', $content);
+}
 
-	}
+function login_redirect($url, $secs = 0) {
+	echo '<meta http-equiv="refresh" content="' . "$secs;url=$url" . '" />';
+}
 
-
+function login_title($title, $sep) {
-	
-	
-	function login_redirect($url, $secs=5){
-		echo '<meta http-equiv="refresh" content="'."$secs;url=$url".'" />';
-	}
-	
-	function login_title($title, $sep) {
 	global $lang;
 	return $title = "$title $sep {$lang['login']['head']}";
-	}
+}
 
-	add_filter('wp_title', 'login_title', 10, 2);
+add_filter('wp_title', 'login_title', 10, 2);
-	
-			
-
-	system_init();
-	main();
-	theme_init($smarty);
-	$smarty->display('default.tpl');
 
+system_init();
+main();
+theme_init($smarty);
+$smarty->display('default.tpl');
 
 ?>