diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 5efd20f62d..c4d872de2a 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -140,82 +140,6 @@ function make_jumpbox()
return($boxstring);
}
-// NOTE: This function should check is_dir($file), however the is_dir function seems to be buggy on my
-// system so its not currently implemented that way
-// - James
-function template_select($default)
-{
- $dir = opendir("templates");
- $template_select = "";
- closedir($dir);
- return($template_select);
-}
-
-function language_select($default, $name="language", $dirname="language/")
-{
- global $phpEx;
- $dir = opendir($dirname);
- $lang_select = "\n";
- closedir($dir);
- return $lang_select;
-}
-
-function theme_select($default)
-{
- global $db;
- $sql = "SELECT themes_id, themes_name
- FROM ".THEMES_TABLE."
- ORDER BY themes_name";
- if($result = $db->sql_query($sql))
- {
- $num = $db->sql_numrows($result);
- $rowset = $db->sql_fetchrowset($result);
- $theme_select = "\n";
- }
- else
- {
- $theme_select = "";
- }
- return($theme_select);
-}
//
// Initialise user settings on page load
function init_userprefs($userdata)
@@ -299,119 +223,29 @@ function setuptheme($theme)
return($myrow);
}
-function tz_select($default)
-{
- global $board_tz;
- if(!isset($default))
- {
- $default == $board_tz;
- }
- $tz_select = "\n";
- return($tz_select);
-}
-
-function validate_username(&$username)
-{
-
- global $db;
-
- $username = trim($username);
- $username = strip_tags($username);
- $username = htmlspecialchars($username);
- if(empty($username))
- {
- return(FALSE);
- }
-
- $valid_name = TRUE;
- $sql = "SELECT LOWER(username) FROM ".USERS_TABLE." WHERE username = '$username'";
- if($result = $db->sql_query($sql))
- {
- if( ($numrows = $db->sql_numrows($result) ) > 0)
- {
- $valid_name = FALSE;
- }
- }
-
- $sql = "SELECT disallow_username FROM ".DISALLOW_TABLE." WHERE disallow_username = '$username'";
- if($result = $db->sql_query($sql))
- {
- if(($numrows = $db->sql_numrows($result)) > 0)
- {
- $valid_name = FALSE;
- }
- }
-
- return($valid_name);
-}
function generate_activation_key()
{
$chars = array(
- "a","A","b","B","c","C","d","D","e","E","f","F","g","G","h","H","i","I","j","J",
- "k","K","l","L","m","M","n","N","o","O","p","P","q","Q","r","R","s","S","t","T",
- "u","U","v","V","w","W","x","X","y","Y","z","Z","1","2","3","4","5","6","7","8",
- "9","0"
- );
- $max_elements = count($chars) - 1;
- srand((double)microtime()*1000000);
- $act_key = $chars[rand(0,$max_elements)];
- $act_key .= $chars[rand(0,$max_elements)];
- $act_key .= $chars[rand(0,$max_elements)];
- $act_key .= $chars[rand(0,$max_elements)];
- $act_key .= $chars[rand(0,$max_elements)];
- $act_key .= $chars[rand(0,$max_elements)];
- $act_key .= $chars[rand(0,$max_elements)];
- $act_key .= $chars[rand(0,$max_elements)];
- $act_key_md = md5($act_key);
+ "a","A","b","B","c","C","d","D","e","E","f","F","g","G","h","H","i","I","j","J",
+ "k","K","l","L","m","M","n","N","o","O","p","P","q","Q","r","R","s","S","t","T",
+ "u","U","v","V","w","W","x","X","y","Y","z","Z","1","2","3","4","5","6","7","8",
+ "9","0"
+ );
- return($act_key_md);
+ $max_elements = count($chars) - 1;
+ srand((double)microtime()*1000000);
+
+ $act_key = '';
+ for($i = 0; $i < 8; $i++)
+ {
+ $act_key .= $chars[rand(0,$max_elements)];
+ }
+ $act_key_md = md5($act_key);
+
+ return($act_key_md);
}
+
function encode_ip($dotquad_ip)
{
$ip_sep = explode(".", $dotquad_ip);