diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b74decb --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/config.php diff --git a/admin/admins.php b/admin/admins.php index a85996a..8dd1321 100644 --- a/admin/admins.php +++ b/admin/admins.php @@ -21,7 +21,7 @@ query("SELECT id, first_name, last_name, @@ -31,9 +31,9 @@ WHERE deleted = '0' ORDER BY - id DESC") or die('Failed to query for users: '.mysql_error()); + id DESC") or die('Failed to query for users: '.$GLOBALS['mysqli']->error); -while($row_usr = mysql_fetch_array($result_usr)) +while($row_usr = $result_usr->fetch_array()) { $usr_id = $row_usr['id']; $usr_fullname = $row_usr['first_name'] . ' ' . $row_usr['last_name']; diff --git a/admin/default.php b/admin/default.php index b2471ab..897c51f 100644 --- a/admin/default.php +++ b/admin/default.php @@ -9,14 +9,14 @@ if(GPXDEBUG) { // Get version - $result_vr = @mysql_query("SELECT config_value FROM configuration WHERE config_setting = 'version' LIMIT 1"); - $row_vr = mysql_fetch_row($result_vr); + $result_vr = $GLOBALS['mysqli']->query("SELECT config_value FROM configuration WHERE config_setting = 'version' LIMIT 1"); + $row_vr = $result_vr->fetch_row(); $gpx_version = $row_vr[0]; echo 'NOTICE: Debug mode has been enabled in configuration.php.
'; echo 'DEBUG: Master Version '.$gpx_version.'
'; echo 'DEBUG: Document Root: '.DOCROOT.'
'; - if(mysql_error()) echo 'DEBUG: Last MySQL error: '.mysql_error().'
'; + if($GLOBALS['mysqli']->error) echo 'DEBUG: Last MySQL error: '.$GLOBALS['mysqli']->error.'
'; } ?> @@ -61,7 +61,7 @@ // // Check how setup they are // -$result_tpl = @mysql_query("SELECT +$result_tpl = $GLOBALS['mysqli']->query("SELECT u.id AS uid, s.id AS sid, t.id AS tid, @@ -71,9 +71,9 @@ LEFT JOIN servers AS s ON (SELECT id FROM servers LIMIT 1) LEFT JOIN templates AS t ON (SELECT id FROM templates WHERE t.status = 'complete' LIMIT 1) LEFT JOIN network AS n ON (SELECT id FROM network LIMIT 1) - LIMIT 1") or die('Failed to check setup: '.mysql_error()); + LIMIT 1") or die('Failed to check setup: '.$GLOBALS['mysqli']->error); -$row_tpl = mysql_fetch_row($result_tpl); +$row_tpl = $result_tpl->fetch_row(); $ck_u = $row_tpl[0]; $ck_s = $row_tpl[1]; $ck_t = $row_tpl[2]; diff --git a/admin/games.php b/admin/games.php index 274f9c1..f106c4c 100644 --- a/admin/games.php +++ b/admin/games.php @@ -26,7 +26,7 @@ $Plugins->do_action('games_table'); // Plugins // List supported games -$result_def = @mysql_query("SELECT +$result_def = $GLOBALS['mysqli']->query("SELECT d.id, d.steam, d.name, @@ -40,13 +40,13 @@ d.id = t.cfgid AND (t.status = 'complete' AND t.is_default = '1') GROUP BY - t.cfgid, + d.id, d.intname ORDER BY t.is_default DESC, - d.name ASC") or die('Failed to query for games: '.mysql_error()); + d.name ASC") or die('Failed to query for games: '.$GLOBALS['mysqli']->error); -while($row_def = mysql_fetch_array($result_def)) +while($row_def = $result_def->fetch_array()) { $def_gameid = $row_def['id']; $def_steam = $row_def['steam']; diff --git a/admin/gamesedit.php b/admin/gamesedit.php index 4ad98b5..3858e1d 100644 --- a/admin/gamesedit.php +++ b/admin/gamesedit.php @@ -37,13 +37,13 @@ function gamesedit_showsect(area) query("SELECT * FROM default_games WHERE id = '$url_id' LIMIT 1") or die('Failed to query for games'); -while($row = mysql_fetch_array($result)) +while($row = $result->fetch_array()) { $def_cfg_sep = $row['cfg_separator']; $def_cfg_ip = $row['cfg_ip']; diff --git a/admin/network.php b/admin/network.php index 752806e..642dcfb 100644 --- a/admin/network.php +++ b/admin/network.php @@ -23,7 +23,7 @@ query("SELECT DISTINCT n.id, n.is_local, n.ip, @@ -32,11 +32,11 @@ n.datacenter FROM network AS n WHERE - n.parentid = '0' + n.parentid IS NULL ORDER BY - n.id DESC") or die('Failed to query for network servers: '.mysql_error()); + n.id DESC") or die('Failed to query for network servers: '.$GLOBALS['mysqli']->error); -while($row_net = mysql_fetch_array($result_net)) +while($row_net = $result_net->fetch_array()) { $net_id = $row_net['id']; #$net_local = $row_net['is_local']; diff --git a/admin/networkedit.php b/admin/networkedit.php index 90c8544..6d3dadd 100644 --- a/admin/networkedit.php +++ b/admin/networkedit.php @@ -12,7 +12,7 @@ if(empty($enc_key)) die($lang['no_enc_key']); // List available Network Servers -$result_net = @mysql_query("SELECT +$result_net = $GLOBALS['mysqli']->query("SELECT id, parentid, is_local, @@ -26,9 +26,9 @@ homedir FROM network WHERE - id = '$url_id'") or die('Failed to query for network servers: '.mysql_error()); + id = '$url_id'") or die('Failed to query for network servers: '.$GLOBALS['mysqli']->error); -while($row_net = mysql_fetch_array($result_net)) +while($row_net = $result_net->fetch_array()) { $net_local = $row_net['is_local']; $net_ip = $row_net['ip']; diff --git a/admin/networkips.php b/admin/networkips.php index 0ecea8b..1182b7f 100644 --- a/admin/networkips.php +++ b/admin/networkips.php @@ -12,16 +12,16 @@ if(empty($enc_key)) die($lang['no_enc_key']); // List all IP's for this physical server -$result_net = @mysql_query("SELECT +$result_net = $GLOBALS['mysqli']->query("SELECT n.id, n.ip FROM network AS n WHERE n.parentid = '$url_id' ORDER BY - n.ip ASC") or die('Failed to query for IPs: '.mysql_error()); + n.ip ASC") or die('Failed to query for IPs: '.$GLOBALS['mysqli']->error); -$count_ips = mysql_num_rows($result_net); +$count_ips = $result_net->num_rows; // Tabs $tab = 'ips'; @@ -56,7 +56,7 @@ } -while($row_net = mysql_fetch_array($result_net)) +while($row_net = $result_net->fetch_array()) { $net_id = $row_net['id']; $net_ip = $row_net['ip']; diff --git a/admin/plugins.php b/admin/plugins.php index 901bb1d..170d16e 100644 --- a/admin/plugins.php +++ b/admin/plugins.php @@ -26,7 +26,7 @@ $Plugins->do_action('plugins_table'); // Plugins // List plugins -$result_def = @mysql_query("SELECT +$result_def = $GLOBALS['mysqli']->query("SELECT id, active, description, @@ -35,12 +35,12 @@ FROM plugins ORDER BY active DESC, - name ASC") or die('Failed to query for plugins: '.mysql_error()); + name ASC") or die('Failed to query for plugins: '.$GLOBALS['mysqli']->error); // Array of known plugins $known = array(); -while($row_def = mysql_fetch_array($result_def)) +while($row_def = $result_def->fetch_array()) { $plg_id = $row_def['id']; $plg_active = $row_def['active']; diff --git a/admin/serveradd.php b/admin/serveradd.php index fe67b7b..b9e9b8b 100644 --- a/admin/serveradd.php +++ b/admin/serveradd.php @@ -33,7 +33,7 @@ query("SELECT DISTINCT n.id, n.ip, n.parentid, @@ -43,9 +43,9 @@ LEFT JOIN network AS p ON n.parentid = p.id ORDER BY - n.ip ASC") or die('Failed to query for network servers: '.mysql_error()); + n.ip ASC") or die('Failed to query for network servers: '.$GLOBALS['mysqli']->error); - while($row_net = mysql_fetch_array($result_net)) + while($row_net = $result_net->fetch_array()) { $net_id = $row_net['id']; $net_ip = $row_net['ip']; @@ -80,16 +80,16 @@ query("SELECT id, username, first_name, last_name FROM users WHERE - deleted = '0'") or die('Failed to query for users: '.mysql_error()); + deleted = '0'") or die('Failed to query for users: '.$GLOBALS['mysqli']->error); - while($row_usr = mysql_fetch_array($result_usr)) + while($row_usr = $result_usr->fetch_array()) { $userid = $row_usr['id']; $usrname = $row_usr['username']; diff --git a/admin/servers.php b/admin/servers.php index 830e4e2..daba1bb 100644 --- a/admin/servers.php +++ b/admin/servers.php @@ -38,18 +38,18 @@ else $sql_limit = '0,15'; // Get total servers - $result_total = @mysql_query("SELECT + $result_total = $GLOBALS['mysqli']->query("SELECT COUNT(*) AS cnt FROM servers AS s LEFT JOIN default_games AS d ON s.defid = d.id - $sql_where") or die('Failed to count servers: '.mysql_error().'!'); + $sql_where") or die('Failed to count servers: '.$GLOBALS['mysqli']->error.'!'); - $row_srv = mysql_fetch_row($result_total); + $row_srv = $result_total->fetch_row(); $total_servers = $row_srv[0]; // List servers - $result_srv = @mysql_query("SELECT + $result_srv = $GLOBALS['mysqli']->query("SELECT s.id, s.userid, s.port, @@ -71,12 +71,12 @@ ORDER BY s.id DESC, n.ip ASC - LIMIT $sql_limit") or die($lang['err_query'].' ('.mysql_error().')'); + LIMIT $sql_limit") or die($lang['err_query'].' ('.$GLOBALS['mysqli']->error.')'); $json_arr = array(); $count_json = 0; - while($row_srv = mysql_fetch_array($result_srv)) + while($row_srv = $result_srv->fetch_array()) { $srv_id = $row_srv['id']; $srv_userid = $row_srv['userid']; diff --git a/admin/templates.php b/admin/templates.php index 1c1520f..44996a2 100644 --- a/admin/templates.php +++ b/admin/templates.php @@ -54,7 +54,7 @@ query("SELECT t.id, DATE_FORMAT(t.date_created, '%m/%d/%Y') AS date_created, t.is_default, @@ -70,9 +70,9 @@ WHERE t.cfgid = '$url_id' ORDER BY - t.id DESC") or die($lang['err_query'].' ('.mysql_error().')'); + t.id DESC") or die($lang['err_query'].' ('.$GLOBALS['mysqli']->error.')'); -while($row_srv = mysql_fetch_array($result_srv)) +while($row_srv = $result_srv->fetch_array()) { $tpl_id = $row_srv['id']; $tpl_date = $row_srv['date_created']; diff --git a/admin/userperms.php b/admin/userperms.php index f1ecc2b..30c5a25 100644 --- a/admin/userperms.php +++ b/admin/userperms.php @@ -4,7 +4,7 @@ $url_id = $GPXIN['id']; // Get user info -$result_usr = @mysql_query("SELECT +$result_usr = $GLOBALS['mysqli']->query("SELECT perm_ftp, perm_files, perm_startup, @@ -14,9 +14,9 @@ FROM users WHERE id = '$url_id' - LIMIT 1") or die('Failed to query for users: '.mysql_error()); + LIMIT 1") or die('Failed to query for users: '.$GLOBALS['mysqli']->error); -while($row_usr = mysql_fetch_array($result_usr)) +while($row_usr = $result_usr->fetch_array()) { $usr_usrname = $row_usr['username']; $perm_ftp = $row_usr['perm_ftp']; diff --git a/admin/users.php b/admin/users.php index a0960d0..f096f58 100644 --- a/admin/users.php +++ b/admin/users.php @@ -22,7 +22,7 @@ query("SELECT id, first_name, last_name, @@ -32,9 +32,9 @@ WHERE deleted = '0' ORDER BY - id DESC") or die('Failed to query for users: '.mysql_error()); + id DESC") or die('Failed to query for users: '.$GLOBALS['mysqli']->error); -while($row_usr = mysql_fetch_array($result_usr)) +while($row_usr = $result_usr->fetch_array()) { $usr_id = $row_usr['id']; $usr_fullname = $row_usr['first_name'] . ' ' . $row_usr['last_name']; diff --git a/admin/viewadmin.php b/admin/viewadmin.php index eb35bd1..2b86cdc 100644 --- a/admin/viewadmin.php +++ b/admin/viewadmin.php @@ -3,7 +3,7 @@ $url_id = $GPXIN['id']; // Get user info -$result_usr = @mysql_query("SELECT +$result_usr = $GLOBALS['mysqli']->query("SELECT first_name, last_name, username, @@ -13,9 +13,9 @@ FROM admins WHERE id = '$url_id' - LIMIT 1") or die('Failed to query for admins: '.mysql_error()); + LIMIT 1") or die('Failed to query for admins: '.$GLOBALS['mysqli']->error); -while($row_usr = mysql_fetch_array($result_usr)) +while($row_usr = $result_usr->fetch_array()) { $usr_fname = $row_usr['first_name']; $usr_lname = $row_usr['last_name']; diff --git a/admin/viewuser.php b/admin/viewuser.php index a921e8e..2de9b2e 100644 --- a/admin/viewuser.php +++ b/admin/viewuser.php @@ -4,7 +4,7 @@ $url_id = $GPXIN['id']; // Get user info -$result_usr = @mysql_query("SELECT +$result_usr = $GLOBALS['mysqli']->query("SELECT first_name, last_name, username, @@ -14,9 +14,9 @@ FROM users WHERE id = '$url_id' - LIMIT 1") or die('Failed to query for user details: '.mysql_error()); + LIMIT 1") or die('Failed to query for user details: '.$GLOBALS['mysqli']->error); -while($row_usr = mysql_fetch_array($result_usr)) +while($row_usr = $result_usr->fetch_array()) { $usr_fname = $row_usr['first_name']; $usr_lname = $row_usr['last_name']; diff --git a/ajax/admin_actions.php b/ajax/admin_actions.php index 0d53634..d373439 100644 --- a/ajax/admin_actions.php +++ b/ajax/admin_actions.php @@ -41,7 +41,7 @@ $sql_pass = ''; } - @mysql_query("UPDATE admins SET last_updated = NOW(),username = '$url_username',theme = '$url_theme',language = '$url_language',email_address = '$url_email',first_name = '$url_first_name',last_name = '$url_last_name'$sql_pass WHERE id = '$url_id'") or die('Failed to update admin'); + $GLOBALS['mysqli']->query("UPDATE admins SET last_updated = NOW(),username = '$url_username',theme = '$url_theme',language = '$url_language',email_address = '$url_email',first_name = '$url_first_name',last_name = '$url_last_name'$sql_pass WHERE id = '$url_id'") or die('Failed to update admin'); // Update session $_SESSION['gpx_lang'] = strtolower($url_language); @@ -56,7 +56,7 @@ // Cannot delete yourself if($gpx_userid == $url_id) die('You cannot delete your own account!'); - @mysql_query("UPDATE admins SET deleted = '1' WHERE id = '$url_id'") or die('Failed to delete the admin'); + $GLOBALS['mysqli']->query("UPDATE admins SET deleted = '1' WHERE id = '$url_id'") or die('Failed to delete the admin'); echo 'success'; } diff --git a/ajax/ajax.php b/ajax/ajax.php index 5d68be6..ae6a709 100644 --- a/ajax/ajax.php +++ b/ajax/ajax.php @@ -26,7 +26,7 @@ if(isset($_GET['a'])) $this_request = $_GET['a']; elseif(isset($_POST['a'])) $this_request = $_POST['a']; -if(!in_array($this_request, $allowed_reqs)) die('ERROR: Invalid ajax action "' . strip_tags($this_request) . '"!'); +if(!in_array($this_request, $allowed_reqs)) die('ERROR: Invalid ajax action "' . $this_request . '"!'); // Check logged-in if($this_request != 'login_actions' && !isset($_SESSION['gpx_userid'])) die('You must be logged-in to do that!'); @@ -75,9 +75,9 @@ { $login_type = $_SESSION['gpx_type']; $this_request = str_replace('main_','',$this_request); - - if($login_type == 'admin' && file_exists(DOCROOT.'/admin/'.$this_request.'.php')) require(DOCROOT.'/admin/'.$this_request.'.php'); - elseif(file_exists(DOCROOT.'/'.$this_request.'.php')) require(DOCROOT.'/'.$this_request.'.php'); + + if($login_type == 'admin') require(DOCROOT.'/admin/'.$this_request.'.php'); + else require(DOCROOT.'/'.$this_request.'.php'); } // All other pages in /ajax/ else diff --git a/ajax/cloud_actions.php b/ajax/cloud_actions.php index 31c3f09..a53c565 100644 --- a/ajax/cloud_actions.php +++ b/ajax/cloud_actions.php @@ -24,10 +24,10 @@ // Get currently installed game data - $result_cur = @mysql_query("SELECT cloudid FROM default_games ORDER BY id ASC") or die('ERROR: Failed to query for current games'); + $result_cur = $GLOBALS['mysqli']->query("SELECT cloudid FROM default_games ORDER BY id ASC") or die('ERROR: Failed to query for current games'); $arr_curr = array(); - while($row_cur = mysql_fetch_array($result_cur)) + while($row_cur = $result_cur->fetch_array()) { $arr_curr[] = $row_cur; } @@ -102,8 +102,8 @@ if(!isset($_SESSION['gpx_upd_ck'])) { // Get current version - $result_vr = @mysql_query("SELECT config_value FROM configuration WHERE config_setting = 'version' LIMIT 1"); - $row_vr = mysql_fetch_row($result_vr); + $result_vr = $GLOBALS['mysqli']->query("SELECT config_value FROM configuration WHERE config_setting = 'version' LIMIT 1"); + $row_vr = $result_vr->fetch_row(); $gpx_version = $row_vr[0]; // Check GPX Cloud for any updates diff --git a/ajax/cloud_gameinstall.php b/ajax/cloud_gameinstall.php index 6374f0f..62d63eb 100644 --- a/ajax/cloud_gameinstall.php +++ b/ajax/cloud_gameinstall.php @@ -13,37 +13,37 @@ $cloud_gameid = $_SESSION['cld_gameid']; $cloud_arr = json_decode($_SESSION['cld_gamedata'], true); -$cld_date_created = mysql_real_escape_string($cloud_arr[0]['date_created']); -$cld_last_updated = mysql_real_escape_string($cloud_arr[0]['last_updated']); -$cld_is_steam = mysql_real_escape_string($cloud_arr[0]['steam']); -$cld_steam_name = mysql_real_escape_string($cloud_arr[0]['steam_name']); -$cld_name = mysql_real_escape_string($cloud_arr[0]['name']); -$cld_description = mysql_real_escape_string($cloud_arr[0]['description']); -$cld_icon = mysql_real_escape_string($cloud_arr[0]['icon']); -$cld_port = mysql_real_escape_string($cloud_arr[0]['port']); -$cld_gameq = mysql_real_escape_string($cloud_arr[0]['gameq_name']); -$cld_intname = mysql_real_escape_string($cloud_arr[0]['intname']); -$cld_working_dir = mysql_real_escape_string($cloud_arr[0]['working_dir']); -$cld_pid_file = mysql_real_escape_string($cloud_arr[0]['pid_file']); -$cld_simplecmd = mysql_real_escape_string($cloud_arr[0]['simplecmd']); -$cld_update_cmd = mysql_real_escape_string($cloud_arr[0]['update_cmd']); -$cld_banned_chars = mysql_real_escape_string($cloud_arr[0]['banned_chars']); -$cld_maxpl = mysql_real_escape_string($cloud_arr[0]['maxplayers']); -$cld_startup = mysql_real_escape_string($cloud_arr[0]['startup']); -$cld_type = mysql_real_escape_string($cloud_arr[0]['type']); -$cld_cfg_sep = mysql_real_escape_string($cloud_arr[0]['cfg_separator']); -$cld_cfg_ip = mysql_real_escape_string($cloud_arr[0]['cfg_ip']); -$cld_cfg_port = mysql_real_escape_string($cloud_arr[0]['cfg_port']); -$cld_cfg_maxpl = mysql_real_escape_string($cloud_arr[0]['cfg_maxplayers']); -$cld_cfg_map = mysql_real_escape_string($cloud_arr[0]['cfg_map']); -$cld_cfg_hostname = mysql_real_escape_string($cloud_arr[0]['cfg_hostname']); -$cld_cfg_rcon = mysql_real_escape_string($cloud_arr[0]['cfg_rcon']); -$cld_cfg_passw = mysql_real_escape_string($cloud_arr[0]['cfg_password']); -$cld_map = mysql_real_escape_string($cloud_arr[0]['map']); -$cld_hostname = mysql_real_escape_string($cloud_arr[0]['hostname']); -$cld_config_file = mysql_real_escape_string($cloud_arr[0]['config_file']); -$cld_inst_mirr = mysql_real_escape_string($cloud_arr[0]['install_mirrors']); -$cld_inst_cmd = mysql_real_escape_string($cloud_arr[0]['install_cmd']); +$cld_date_created = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['date_created']); +$cld_last_updated = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['last_updated']); +$cld_is_steam = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['steam']); +$cld_steam_name = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['steam_name']); +$cld_name = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['name']); +$cld_description = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['description']); +$cld_icon = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['icon']); +$cld_port = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['port']); +$cld_gameq = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['gameq_name']); +$cld_intname = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['intname']); +$cld_working_dir = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['working_dir']); +$cld_pid_file = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['pid_file']); +$cld_simplecmd = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['simplecmd']); +$cld_update_cmd = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['update_cmd']); +$cld_banned_chars = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['banned_chars']); +$cld_maxpl = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['maxplayers']); +$cld_startup = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['startup']); +$cld_type = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['type']); +$cld_cfg_sep = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['cfg_separator']); +$cld_cfg_ip = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['cfg_ip']); +$cld_cfg_port = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['cfg_port']); +$cld_cfg_maxpl = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['cfg_maxplayers']); +$cld_cfg_map = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['cfg_map']); +$cld_cfg_hostname = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['cfg_hostname']); +$cld_cfg_rcon = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['cfg_rcon']); +$cld_cfg_passw = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['cfg_password']); +$cld_map = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['map']); +$cld_hostname = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['hostname']); +$cld_config_file = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['config_file']); +$cld_inst_mirr = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['install_mirrors']); +$cld_inst_cmd = $GLOBALS['mysqli']->real_escape_string($cloud_arr[0]['install_cmd']); // Make sure we have data @@ -56,27 +56,27 @@ ######################################################################## // Get default ID -$result_id = @mysql_query("SELECT id FROM default_games WHERE cloudid = '$url_id' ORDER BY id LIMIT 1"); -$row_id = mysql_fetch_row($result_id); +$result_id = $GLOBALS['mysqli']->query("SELECT id FROM default_games WHERE cloudid = '$url_id' ORDER BY id LIMIT 1"); +$row_id = $result_id->fetch_row(); $def_id = $row_id[0]; // Delete any existing default rows or startup items for this game -@mysql_query("DELETE FROM default_games WHERE cloudid = '$url_id'"); -@mysql_query("DELETE FROM default_startup WHERE defid = '$def_id'"); +$GLOBALS['mysqli']->query("DELETE FROM default_games WHERE cloudid = '$url_id'"); +$GLOBALS['mysqli']->query("DELETE FROM default_startup WHERE defid = '$def_id'"); ######################################################################## // Insert main row /* -@mysql_query("INSERT INTO default_games (cloudid,port,maxplayers,startup,steam,type,cfg_separator,gameq_name,name,intname,steam_name,working_dir,pid_file,banned_chars,description,update_cmd,simplecmd) +$GLOBALS['mysqli']->query("INSERT INTO default_games (cloudid,port,maxplayers,startup,steam,type,cfg_separator,gameq_name,name,intname,steam_name,working_dir,pid_file,banned_chars,description,update_cmd,simplecmd) VALUES('$url_id','$cld_port','$cld_is_steam','$cld_gameq', '$cld_name','$cld_intname','$cld_steam_name','$cld_working_dir', '$cld_pid_file','$cld_banned_chars','$cld_description','$cld_update_cmd','$cld_simplecmd')") or die('Failed to insert game'); */ -@mysql_query("INSERT INTO `default_games` (`cloudid`, `port`, `maxplayers`, `startup`, `steam`, `type`, `cfg_separator`, `gameq_name`, `name`, `intname`, `working_dir`, `pid_file`, `banned_chars`, `cfg_ip`, `cfg_port`, `cfg_maxplayers`, `cfg_map`, `cfg_hostname`, `cfg_rcon`, `cfg_password`, `map`, `hostname`, `config_file`, `steam_name`, `description`, `install_mirrors`, `install_cmd`, `update_cmd`, `simplecmd`) VALUES ('$url_id', '$cld_port', '$cld_maxpl', '$cld_startup', '$cld_is_steam', '$cld_type', '$cld_cfg_sep', '$cld_gameq', '$cld_name', '$cld_intname', '$cld_working_dir', '$cld_pid_file', '$cld_banned_chars', '$cld_cfg_ip', '$cld_cfg_port', '$cld_cfg_maxpl', '$cld_cfg_map', '$cld_cfg_hostname', '$cld_cfg_rcon', '$cld_cfg_passw', '$cld_map', '$cld_hostname', '$cld_config_file', '$cld_steam_name', '$cld_description', '$cld_inst_mirr', '$cld_inst_cmd', '$cld_update_cmd', '$cld_simplecmd')") or die('Failed to insert game: '.mysql_error()); +$GLOBALS['mysqli']->query("INSERT INTO `default_games` (`cloudid`, `port`, `maxplayers`, `startup`, `steam`, `type`, `cfg_separator`, `gameq_name`, `name`, `intname`, `working_dir`, `pid_file`, `banned_chars`, `cfg_ip`, `cfg_port`, `cfg_maxplayers`, `cfg_map`, `cfg_hostname`, `cfg_rcon`, `cfg_password`, `map`, `hostname`, `config_file`, `steam_name`, `description`, `install_mirrors`, `install_cmd`, `update_cmd`, `simplecmd`) VALUES ('$url_id', '$cld_port', '$cld_maxpl', '$cld_startup', '$cld_is_steam', '$cld_type', '$cld_cfg_sep', '$cld_gameq', '$cld_name', '$cld_intname', '$cld_working_dir', '$cld_pid_file', '$cld_banned_chars', '$cld_cfg_ip', '$cld_cfg_port', '$cld_cfg_maxpl', '$cld_cfg_map', '$cld_cfg_hostname', '$cld_cfg_rcon', '$cld_cfg_passw', '$cld_map', '$cld_hostname', '$cld_config_file', '$cld_steam_name', '$cld_description', '$cld_inst_mirr', '$cld_inst_cmd', '$cld_update_cmd', '$cld_simplecmd')") or die('Failed to insert game: '.$GLOBALS['mysqli']->error); -$this_defid = mysql_insert_id(); +$this_defid = $GLOBALS['mysqli']->insert_id; ######################################################################## @@ -103,15 +103,15 @@ $startup_sql = substr($startup_sql, 0, -1); // Run the insert - @mysql_query($startup_sql) or die('Failed to insert startup items'); + $GLOBALS['mysqli']->query($startup_sql) or die('Failed to insert startup items'); } ######################################################################## // Update `servers` and `templates` with new default ID -@mysql_query("UPDATE servers SET defid = '$this_defid' WHERE defid = '$def_id'") or die('Failed to update servers'); -@mysql_query("UPDATE templates SET cfgid = '$this_defid' WHERE cfgid = '$def_id'") or die('Failed to update templates'); +$GLOBALS['mysqli']->query("UPDATE servers SET defid = '$this_defid' WHERE defid = '$def_id'") or die('Failed to update servers'); +$GLOBALS['mysqli']->query("UPDATE templates SET cfgid = '$this_defid' WHERE cfgid = '$def_id'") or die('Failed to update templates'); // Kill cloud session data unset($_SESSION['cld_gameid']); diff --git a/ajax/file_upload.php b/ajax/file_upload.php index 581e33c..ddd2feb 100644 --- a/ajax/file_upload.php +++ b/ajax/file_upload.php @@ -9,8 +9,8 @@ $gpx_srvid = $_SESSION['gamesrv_id']; $gpx_userid = $_SESSION['gpx_userid']; - $result_owns = @mysql_query("SELECT id FROM servers WHERE id = '$gpx_srvid' AND userid = '$gpx_userid' LIMIT 1") or die('Failed to check ownership'); - $row_owns = mysql_fetch_row($result_owns); + $result_owns = $GLOBALS['mysqli']->query("SELECT id FROM servers WHERE id = '$gpx_srvid' AND userid = '$gpx_userid' LIMIT 1") or die('Failed to check ownership'); + $row_owns = $result_owns->fetch_row(); if(empty($row_owns[0])) die('You do not have access to this server!'); } diff --git a/ajax/games_actions.php b/ajax/games_actions.php index e8a97c8..0011bb3 100644 --- a/ajax/games_actions.php +++ b/ajax/games_actions.php @@ -54,7 +54,7 @@ if(!preg_match('/^[a-zA-Z0-9-_]+$/i', $game_intname)) die($lang['invalid_intname']); elseif(!is_numeric($game_port)) die($lang['invalid_port']); - @mysql_query("UPDATE default_games + $GLOBALS['mysqli']->query("UPDATE default_games SET startup = '$game_startup',port = '$game_port',maxplayers = '$game_maxpl',steam = '$game_steam',steam_name = '$game_steam_name',gameq_name = '$game_query_engine',name = '$game_name',intname = '$game_intname', working_dir = '$game_working_dir',pid_file = '$game_pid_file',config_file = '$game_config_file',description = '$game_descr', @@ -63,7 +63,7 @@ cfg_maxplayers = '$game_cfg_maxplayers',cfg_map = '$game_cfg_map',cfg_hostname = '$game_cfg_hostname',cfg_rcon = '$game_cfg_rcon',cfg_password = '$game_cfg_password', map = '$game_map',hostname = '$game_hostname' WHERE - id = '$url_id'") or die('Failed to update game: '.mysql_error()); + id = '$url_id'") or die('Failed to update game: '.$GLOBALS['mysqli']->error); echo 'success'; } @@ -93,10 +93,10 @@ elseif(!is_numeric($game_port)) die($lang['invalid_port']); elseif(empty($game_maxpl)) die('You must fill out the Max Players field!'); - @mysql_query("INSERT INTO default_games (port,maxplayers,steam,type,gameq_name,name,intname,working_dir,pid_file,map,hostname,config_file,steam_name,description,update_cmd,simplecmd) + $GLOBALS['mysqli']->query("INSERT INTO default_games (port,maxplayers,steam,type,gameq_name,name,intname,working_dir,pid_file,map,hostname,config_file,steam_name,description,update_cmd,simplecmd) VALUES('$game_port','$game_maxpl','$game_steam','$game_type','$game_query_engine', '$game_name','$game_intname','$game_working_dir','$game_pid_file','$game_map','$game_hostn', - '$game_config_file','$game_steam_name','$game_descr','$game_updatecmd','$game_simplecmd')") or die('Failed to add the game: '.mysql_error()); + '$game_config_file','$game_steam_name','$game_descr','$game_updatecmd','$game_simplecmd')") or die('Failed to add the game: '.$GLOBALS['mysqli']->error); echo 'success'; } @@ -111,14 +111,14 @@ // If simple, update and exit if($startup_type == 'smp') { - @mysql_query("UPDATE default_games SET startup = '0' WHERE id = '$url_id'") or die('Failed to update startup type'); + $GLOBALS['mysqli']->query("UPDATE default_games SET startup = '0' WHERE id = '$url_id'") or die('Failed to update startup type'); echo 'success'; exit; } // If Startup, update and continue elseif($startup_type == 'str') { - @mysql_query("UPDATE default_games SET startup = '1' WHERE id = '$url_id'") or die('Failed to update startup type'); + $GLOBALS['mysqli']->query("UPDATE default_games SET startup = '1' WHERE id = '$url_id'") or die('Failed to update startup type'); } @@ -177,23 +177,23 @@ if(!preg_match('/VALUES$/', $add_query)) { $add_query = substr($add_query, 0, -1); // Lose last comma - @mysql_query($add_query) or die('Failed to add items: '.mysql_error()); + $GLOBALS['mysqli']->query($add_query) or die('Failed to add items: '.$GLOBALS['mysqli']->error); } // Run updates if($hascur) { - @mysql_query($update_item_query) or die('Failed to update items: '.mysql_error()); - @mysql_query($update_val_query) or die('Failed to update values: '.mysql_error()); - @mysql_query($update_usred_query) or die('Failed to update user editable: '.mysql_error()); - if($sort_order) @mysql_query($update_sort_query) or die('Failed to update order: '.mysql_error()); + $GLOBALS['mysqli']->query($update_item_query) or die('Failed to update items: '.$GLOBALS['mysqli']->error); + $GLOBALS['mysqli']->query($update_val_query) or die('Failed to update values: '.$GLOBALS['mysqli']->error); + $GLOBALS['mysqli']->query($update_usred_query) or die('Failed to update user editable: '.$GLOBALS['mysqli']->error); + if($sort_order) $GLOBALS['mysqli']->query($update_sort_query) or die('Failed to update order: '.$GLOBALS['mysqli']->error); } // Update simplecmd with most recent order $simplecmd = ''; - $result_smp = @mysql_query("SELECT cmd_item,cmd_value FROM default_startup WHERE defid = '$url_id' ORDER BY sort_order ASC") or die('Failed to get item/vals!'); + $result_smp = $GLOBALS['mysqli']->query("SELECT cmd_item,cmd_value FROM default_startup WHERE defid = '$url_id' ORDER BY sort_order ASC") or die('Failed to get item/vals!'); - while($row_smp = mysql_fetch_array($result_smp)) + while($row_smp = $result_smp->fetch_array()) { $cmd_item = $row_smp['cmd_item']; $cmd_val = $row_smp['cmd_value']; @@ -203,7 +203,7 @@ } // Update new simplecmd - @mysql_query("UPDATE default_games SET simplecmd = '$simplecmd' WHERE id = '$url_id'") or die('Failed to update simplecmd!'); + $GLOBALS['mysqli']->query("UPDATE default_games SET simplecmd = '$simplecmd' WHERE id = '$url_id'") or die('Failed to update simplecmd!'); echo 'success'; } @@ -217,7 +217,7 @@ $server_id = $GPXIN['serverid']; if(empty($url_id) || empty($server_id)) die('No startup ID or server ID specified!'); - @mysql_query("DELETE FROM default_startup WHERE id = '$url_id' AND defid = '$server_id'") or die('Failed to delete the startup item'); + $GLOBALS['mysqli']->query("DELETE FROM default_startup WHERE id = '$url_id' AND defid = '$server_id'") or die('Failed to delete the startup item'); echo 'success'; } @@ -227,11 +227,11 @@ elseif($url_do == 'delete') { // Check for gameservers using this - $result_chk = @mysql_query("SELECT id FROM servers WHERE defid = '$url_id' LIMIT 1"); - $row_chk = mysql_fetch_row($result_chk); + $result_chk = $GLOBALS['mysqli']->query("SELECT id FROM servers WHERE defid = '$url_id' LIMIT 1"); + $row_chk = $result_chk->fetch_row(); if($row_chk[0]) die('There are servers using this game! Delete them first and try again.'); - @mysql_query("DELETE FROM default_games WHERE id = '$url_id'") or die('Failed to delete the game setup'); + $GLOBALS['mysqli']->query("DELETE FROM default_games WHERE id = '$url_id'") or die('Failed to delete the game setup'); echo 'success'; } @@ -283,12 +283,12 @@ elseif($url_do == 'submit_cloudgames') { // Get game info - $result_info = @mysql_query("SELECT * FROM default_games WHERE id = '$url_id' ORDER BY id DESC LIMIT 1") or die('Failed to query for game info!'); + $result_info = $GLOBALS['mysqli']->query("SELECT * FROM default_games WHERE id = '$url_id' ORDER BY id DESC LIMIT 1") or die('Failed to query for game info!'); $game_arr = array(); - $total_info = mysql_num_rows($result_info); + $total_info = $result_info->num_rows; if(!$total_info) die('No information found for this game!'); - while($row_info = mysql_fetch_assoc($result_info)) + while($row_info = $result_info->fetch_assoc()) { $game_arr[] = $row_info; } @@ -302,14 +302,14 @@ ################################################### // Get game startup items - $result_strt = @mysql_query("SELECT * FROM default_startup WHERE defid = '$url_id' ORDER BY sort_order ASC") or die('Failed query for game setup items!'); + $result_strt = $GLOBALS['mysqli']->query("SELECT * FROM default_startup WHERE defid = '$url_id' ORDER BY sort_order ASC") or die('Failed query for game setup items!'); $strt_arr = array(); - $total_info = mysql_num_rows($result_strt); + $total_info = $result_strt->num_rows; // Only run this if this game has startup items if($total_info) { - while($row_strt = mysql_fetch_assoc($result_strt)) + while($row_strt = $result_strt->fetch_assoc()) { $strt_arr[] = $row_strt; } diff --git a/ajax/games_startup.php b/ajax/games_startup.php index 5344d24..22de17e 100644 --- a/ajax/games_startup.php +++ b/ajax/games_startup.php @@ -45,7 +45,7 @@ '; // Get startup options - $result_str = @mysql_query("SELECT + $result_str = $GLOBALS['mysqli']->query("SELECT ds.id, ds.sort_order, ds.single, @@ -57,9 +57,9 @@ ds.defid = '$url_id' ORDER BY ds.sort_order ASC - LIMIT 999") or die('Failed to query for startup: '.mysql_error()); + LIMIT 999") or die('Failed to query for startup: '.$GLOBALS['mysqli']->error); - while($row_str = mysql_fetch_array($result_str)) + while($row_str = $result_str->fetch_array()) { $s_id = $row_str['id']; $s_sort = $row_str['sort_order']; diff --git a/ajax/login_actions.php b/ajax/login_actions.php index db4eddb..50144f0 100644 --- a/ajax/login_actions.php +++ b/ajax/login_actions.php @@ -24,8 +24,8 @@ #echo "User: $url_login_user, pass: $url_login_pass\n"; // Check login - $result_login = @mysql_query("SELECT id,setpass_3010,theme,language,email_address,first_name FROM admins WHERE username = '$url_login_user' $sql_checkpass ORDER BY id ASC LIMIT 1") or die('Failed to check login'); - $totals = mysql_num_rows($result_login); + $result_login = $GLOBALS['mysqli']->query("SELECT id,setpass_3010,theme,language,email_address,first_name FROM admins WHERE username = '$url_login_user' $sql_checkpass ORDER BY id ASC LIMIT 1") or die('Failed to check login'); + $totals = $result_login->num_rows; // Failed login if($totals == 0) die($lang['invalid_login']); @@ -33,7 +33,7 @@ // Login good, setup session session_start(); - while($row_login = mysql_fetch_array($result_login)) + while($row_login = $result_login->fetch_array()) { // Store in session $this_userid = $row_login['id']; @@ -57,7 +57,7 @@ if(!$pass_upd_3010) { $upd_pass = base64_encode(sha1('ZzaX'.$url_login_pass.'GPX88')); - @mysql_query("UPDATE admins SET `setpass_3010` = '1',`password` = '$upd_pass' WHERE id = '$this_userid'") or die('Failed to update password security: '.mysql_error()); + $GLOBALS['mysqli']->query("UPDATE admins SET `setpass_3010` = '1',`password` = '$upd_pass' WHERE id = '$this_userid'") or die('Failed to update password security: '.$GLOBALS['mysqli']->error); } // Check database for active plugins @@ -83,7 +83,7 @@ # OLD: $sql_pass = "AND password = MD5('$url_login_pass')"; // Check login - $result_login = @mysql_query("SELECT + $result_login = $GLOBALS['mysqli']->query("SELECT id, perm_ftp, perm_files, @@ -103,7 +103,7 @@ ORDER BY id ASC LIMIT 1") or die('Sorry, we were unable to check your login. Please try again soon.'); - $totals = mysql_num_rows($result_login); + $totals = $result_login->num_rows; // Failed login if($totals == 0) die($lang['invalid_login']); @@ -112,7 +112,7 @@ session_start(); $perms_arr = array(); - while($row_login = mysql_fetch_array($result_login)) + while($row_login = $result_login->fetch_array()) { // Store in session $_SESSION['gpx_userid'] = $row_login['id']; @@ -157,8 +157,8 @@ else $tblname = 'users'; $url_login_user = preg_replace('/(^xxz)?(yy$)?/', '', $url_login_user); - $result_login = @mysql_query("SELECT id,email_address FROM $tblname WHERE username = '$url_login_user' ORDER BY id ASC LIMIT 1") or die('Failed to check login'); - $row_login = mysql_fetch_row($result_login); + $result_login = $GLOBALS['mysqli']->query("SELECT id,email_address FROM $tblname WHERE username = '$url_login_user' ORDER BY id ASC LIMIT 1") or die('Failed to check login'); + $row_login = $result_login->fetch_row(); $fpw_id = $row_login[0]; $fpw_email = $row_login[1]; @@ -168,8 +168,8 @@ if(empty($sys_company)) $sys_company = 'Game Control Panel'; // Store token - $chpw_token = mysql_real_escape_string($Core->genstring('24')); - @mysql_query("UPDATE $tblname SET `chpw_token` = '$chpw_token' WHERE id = '$fpw_id'") or die('Failed to store token!'); + $chpw_token = $GLOBALS['mysqli']->real_escape_string($Core->genstring('24')); + $GLOBALS['mysqli']->query("UPDATE $tblname SET `chpw_token` = '$chpw_token' WHERE id = '$fpw_id'") or die('Failed to store token!'); // Email user their stuff $message = "$sys_company diff --git a/ajax/network_actions.php b/ajax/network_actions.php index 680cb40..c4c29ed 100644 --- a/ajax/network_actions.php +++ b/ajax/network_actions.php @@ -41,7 +41,7 @@ $enc_key = $settings['enc_key']; if(empty($enc_key)) die($lang['no_enc_key']); - @mysql_query("UPDATE network SET ip='$url_ip',is_local='$url_local',os='$url_os',datacenter='$url_dc',location='$url_location',login_user=AES_ENCRYPT('$url_login_user', '$enc_key'),login_pass=AES_ENCRYPT('$url_login_pass', '$enc_key'),login_port=AES_ENCRYPT('$url_login_port', '$enc_key'),homedir='$url_homedir' WHERE id = '$url_id'") or die('Failed to update network settings'); + $GLOBALS['mysqli']->query("UPDATE network SET ip='$url_ip',is_local='$url_local',os='$url_os',datacenter='$url_dc',location='$url_location',login_user=AES_ENCRYPT('$url_login_user', '$enc_key'),login_pass=AES_ENCRYPT('$url_login_pass', '$enc_key'),login_port=AES_ENCRYPT('$url_login_port', '$enc_key'),homedir='$url_homedir' WHERE id = '$url_id'") or die('Failed to update network settings'); echo 'success'; } @@ -55,7 +55,7 @@ // Delete IP Address elseif($url_do == 'delete_ip') { - @mysql_query("DELETE FROM network WHERE id = '$url_id'") or die('Failed to delete the IP Address'); + $GLOBALS['mysqli']->query("DELETE FROM network WHERE id = '$url_id'") or die('Failed to delete the IP Address'); echo 'success'; } @@ -66,8 +66,8 @@ elseif($url_do == 'show_addip') { // Get original IP - $result_ip = @mysql_query("SELECT ip FROM network WHERE id = '$url_id' LIMIT 1") or die('Failed to get IP!'); - $row_ip = mysql_fetch_row($result_ip); + $result_ip = $GLOBALS['mysqli']->query("SELECT ip FROM network WHERE id = '$url_id' LIMIT 1") or die('Failed to get IP!'); + $row_ip = $result_ip->fetch_row(); $this_ip = $row_ip[0]; $arr_ip = explode('.', $this_ip); @@ -84,19 +84,19 @@ elseif($url_do == 'addip') { // Check existing - $result_ip = @mysql_query("SELECT id FROM network WHERE ip = '$url_ip' LIMIT 1") or die('Failed to get IP!'); - $row_ip = mysql_fetch_row($result_ip); + $result_ip = $GLOBALS['mysqli']->query("SELECT id FROM network WHERE ip = '$url_ip' LIMIT 1") or die('Failed to get IP!'); + $row_ip = $result_ip->fetch_row(); if($row_ip[0]) die($lang['ip_exists']); // Check if any servers using this - #$result_ip = @mysql_query("SELECT id FROM servers WHERE netid = '$url_id' LIMIT 1") or die('Failed to get IP!'); - #$row_ip = mysql_fetch_row($result_ip); + #$result_ip = $GLOBALS['mysqli']->query("SELECT id FROM servers WHERE netid = '$url_id' LIMIT 1") or die('Failed to get IP!'); + #$row_ip = mysqli_fetch_row($result_ip); #if($row_ip[0]) die($lang['srv_using_ip']); // Check regex if(!preg_match('/[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/', $url_ip)) die($lang['invalid_ip']); - @mysql_query("INSERT INTO network (parentid,ip) VALUES('$url_id','$url_ip')") or die('Failed to add the IP Address: '.mysql_error()); + $GLOBALS['mysqli']->query("INSERT INTO network (parentid,ip) VALUES('$url_id','$url_ip')") or die('Failed to add the IP Address: '.$GLOBALS['mysqli']->error); echo 'success'; } diff --git a/ajax/network_edit.php b/ajax/network_edit.php index e455394..c62851b 100644 --- a/ajax/network_edit.php +++ b/ajax/network_edit.php @@ -13,7 +13,7 @@ if(empty($enc_key)) die('No encryption key found! Check "/configuration.php"'); // List available Network Servers -$result_net = @mysql_query("SELECT +$result_net = $GLOBALS['mysqli']->query("SELECT id, is_local, ip, @@ -26,9 +26,9 @@ homedir FROM network WHERE - id = '$url_id'") or die('Failed to query for network servers: '.mysql_error()); + id = '$url_id'") or die('Failed to query for network servers: '.$GLOBALS['mysqli']->error); -while($row_net = mysql_fetch_array($result_net)) +while($row_net = $result_net->fetch_array()) { $net_local = $row_net['is_local']; $net_ip = $row_net['ip']; diff --git a/ajax/plugin_actions.php b/ajax/plugin_actions.php index c73fd3f..f0a451e 100644 --- a/ajax/plugin_actions.php +++ b/ajax/plugin_actions.php @@ -15,25 +15,25 @@ if(empty($url_id)) die('No ID given!'); // Get intname - $result_int = @mysql_query("SELECT intname FROM plugins WHERE id = '$url_id'"); - $row_int = mysql_fetch_row($result_int); + $result_int = $GLOBALS['mysqli']->query("SELECT intname FROM plugins WHERE id = '$url_id'"); + $row_int = $result_int->fetch_row(); $intname = $row_int[0]; // Delete a plugin from db if($url_status == 'delete') { - @mysql_query("DELETE FROM plugins WHERE id = '$url_id'") or die('Failed to delete the plugin!'); + $GLOBALS['mysqli']->query("DELETE FROM plugins WHERE id = '$url_id'") or die('Failed to delete the plugin!'); } // Set active elseif($url_status == 'active') { - @mysql_query("UPDATE plugins SET active = '1' WHERE id = '$url_id'") or die('Failed to activate the plugin!'); + $GLOBALS['mysqli']->query("UPDATE plugins SET active = '1' WHERE id = '$url_id'") or die('Failed to activate the plugin!'); } // Set inactive elseif($url_status == 'inactive') { - @mysql_query("UPDATE plugins SET active = '0' WHERE id = '$url_id'") or die('Failed to set the plugin to inactive!'); + $GLOBALS['mysqli']->query("UPDATE plugins SET active = '0' WHERE id = '$url_id'") or die('Failed to set the plugin to inactive!'); } // Reset plugin session data @@ -71,7 +71,7 @@ } // Insert plugin - @mysql_query("INSERT INTO plugins (active,date_installed,description,intname,name) VALUES('1',NOW(),'$newplg_desc','$newplg_intname','$newplg_name')") or die('Failed to insert the plugin'); + $GLOBALS['mysqli']->query("INSERT INTO plugins (active,date_installed,description,intname,name) VALUES('1',NOW(),'$newplg_desc','$newplg_intname','$newplg_name')") or die('Failed to insert the plugin'); $_SESSION['gpx_plugins'][] = $newplg_intname; diff --git a/ajax/server_actions.php b/ajax/server_actions.php index c5e4334..5742625 100644 --- a/ajax/server_actions.php +++ b/ajax/server_actions.php @@ -101,18 +101,18 @@ { if(GPXDEBUG) echo "Saving description: $url_descr, for ID: $url_id
"; - @mysql_query("UPDATE servers SET + $GLOBALS['mysqli']->query("UPDATE servers SET netid = '$url_netid',userid = '$url_userid',port = '$url_port',maxplayers = '$url_maxpl', last_updated = NOW(),startup = '$url_startup',working_dir = '$url_working_dir',pid_file = '$url_pid_file', description = '$url_descr',update_cmd = '$url_updatecmd',simplecmd = '$url_cmd',hostname = '$url_hostn', map = '$url_map',rcon = '$url_rcon',sv_password = '$url_passw' - WHERE id = '$url_id'") or die('Failed to update admin server settings: '.mysql_error()); + WHERE id = '$url_id'") or die('Failed to update admin server settings: '.$GLOBALS['mysqli']->error); } // Clients else { - @mysql_query("UPDATE servers SET + $GLOBALS['mysqli']->query("UPDATE servers SET last_updated = NOW(),description = '$url_descr',hostname = '$url_hostn', map = '$url_map',rcon = '$url_rcon',sv_password = '$url_passw' WHERE id = '$url_id' AND userid = '$gpx_userid'") or die('Failed to update client server settings!'); @@ -152,14 +152,14 @@ { if($startup_type == 'smp') { - @mysql_query("UPDATE servers SET startup = '0' WHERE id = '$url_id'") or die('Failed to update startup type'); + $GLOBALS['mysqli']->query("UPDATE servers SET startup = '0' WHERE id = '$url_id'") or die('Failed to update startup type'); echo 'success'; exit; } // If Startup, update and continue elseif($startup_type == 'str') { - @mysql_query("UPDATE servers SET startup = '1' WHERE id = '$url_id'") or die('Failed to update startup type'); + $GLOBALS['mysqli']->query("UPDATE servers SET startup = '1' WHERE id = '$url_id'") or die('Failed to update startup type'); if($srvinfo[0]['startup'] == 0) exit; } @@ -245,20 +245,20 @@ if(isset($_SESSION['gpx_admin']) && !preg_match('/VALUES$/', $add_query)) { $add_query = substr($add_query, 0, -1); // Lose last comma - @mysql_query($add_query) or die('Failed to add items: '.mysql_error()); + $GLOBALS['mysqli']->query($add_query) or die('Failed to add items: '.$GLOBALS['mysqli']->error); } // Admins only if(isset($_SESSION['gpx_admin'])) { // Only update if changed - if(strlen($update_item_query) > 72) @mysql_query($update_item_query) or die('Failed to update items: '.mysql_error()); - if(strlen($update_usred_query) > 72) @mysql_query($update_usred_query) or die('Failed to update user editable: '.mysql_error()); - if($sort_order) @mysql_query($update_sort_query) or die('Failed to update sorting order: '.mysql_error()); + if(strlen($update_item_query) > 72) $GLOBALS['mysqli']->query($update_item_query) or die('Failed to update items: '.$GLOBALS['mysqli']->error); + if(strlen($update_usred_query) > 72) $GLOBALS['mysqli']->query($update_usred_query) or die('Failed to update user editable: '.$GLOBALS['mysqli']->error); + if($sort_order) $GLOBALS['mysqli']->query($update_sort_query) or die('Failed to update sorting order: '.$GLOBALS['mysqli']->error); } // Run updates only if new stuff - if(strlen($update_val_query) > 74) @mysql_query($update_val_query) or die('Failed to update values: '.mysql_error()); + if(strlen($update_val_query) > 74) $GLOBALS['mysqli']->query($update_val_query) or die('Failed to update values: '.$GLOBALS['mysqli']->error); ############################################################################ @@ -278,7 +278,7 @@ $server_id = $GPXIN['serverid']; if(empty($url_id) || empty($server_id)) die('No startup ID or server ID specified!'); - @mysql_query("DELETE FROM servers_startup WHERE id = '$url_id' AND srvid = '$server_id'") or die('Failed to delete the startup item'); + $GLOBALS['mysqli']->query("DELETE FROM servers_startup WHERE id = '$url_id' AND srvid = '$server_id'") or die('Failed to delete the startup item'); // Get info for cmd rebuild / Rebuild cmd line $srvinfo = $Servers->getinfo($server_id); @@ -327,7 +327,7 @@ { $url_tplid = $GPXIN['tplid']; - $result_port = @mysql_query("SELECT + $result_port = $GLOBALS['mysqli']->query("SELECT d.port FROM default_games AS d LEFT JOIN templates AS t ON @@ -336,7 +336,7 @@ t.id = '$url_tplid' LIMIT 1") or die('Failed to query for default port'); - $row_port = mysql_fetch_row($result_port); + $row_port = $result_port->fetch_row(); $this_port = $row_port[0]; if(empty($this_port)) echo '(none found)'; @@ -382,7 +382,7 @@ // List servers $total_srv = 0; - $result_srv = @mysql_query("SELECT + $result_srv = $GLOBALS['mysqli']->query("SELECT s.id, s.userid, s.port, @@ -404,12 +404,12 @@ ORDER BY s.id DESC, n.ip ASC - LIMIT 30") or die($lang['err_query'].' ('.mysql_error().')'); + LIMIT 30") or die($lang['err_query'].' ('.$GLOBALS['mysqli']->error.')'); $srv_arr = array(); #$gameq_arr = array(); - while($row_srv = mysql_fetch_assoc($result_srv)) + while($row_srv = $result_srv->fetch_assoc()) { $srv_arr[] = $row_srv; @@ -603,7 +603,7 @@ // Grab list of available games # OR t.nfsid = '$url_netid' - $result_sv = @mysql_query("SELECT + $result_sv = $GLOBALS['mysqli']->query("SELECT d.id, d.steam, d.port, @@ -625,17 +625,15 @@ WHERE (n.id = '$url_netid' OR n.parentid = '$url_netid') AND t.status = 'complete' - GROUP BY - t.id ORDER BY d.name ASC, - t.is_default DESC") or die(''); - $total_tpls = mysql_num_rows($result_sv); + t.is_default DESC") or die(''); + $total_tpls = $result_sv->num_rows; if(!$total_tpls) echo ''; else echo ''; - while($row_sv = mysql_fetch_array($result_sv)) + while($row_sv = $result_sv->fetch_array()) { $sv_id = $row_sv['id']; $sv_steam = $row_sv['steam']; diff --git a/ajax/server_settings.php b/ajax/server_settings.php index 3e82d06..3136bbe 100644 --- a/ajax/server_settings.php +++ b/ajax/server_settings.php @@ -66,14 +66,14 @@ query("SELECT id, ip FROM network ORDER BY ip ASC") or die('Failed to query for IP Addresses'); - while($row_net = mysql_fetch_array($result_net)) + while($row_net = $result_net->fetch_array()) { $net_id = $row_net['id']; $net_ip = $row_net['ip']; @@ -121,8 +121,8 @@ if(!isset($_SESSION['gpx_admin'])) { // Get netid $gamesrv_id = $_SESSION['gamesrv_id']; - $result_nid = @mysql_query("SELECT netid FROM servers WHERE id = '$gamesrv_id' LIMIT 1") or die('Failed to query for network ID'); - $row_nid = mysql_fetch_row($result_nid); + $result_nid = $GLOBALS['mysqli']->query("SELECT netid FROM servers WHERE id = '$gamesrv_id' LIMIT 1") or die('Failed to query for network ID'); + $row_nid = $result_nid; $net_id = $row_nid[0]; if(empty($net_id)) echo 'WARNING: No network ID found!
'; @@ -149,9 +149,9 @@
'; // Get startup options - $result_str = @mysql_query("SELECT + $result_str = $GLOBALS['mysqli']->query("SELECT ds.id, ds.sort_order, ds.single, @@ -73,9 +73,9 @@ ds.srvid = '$url_id' ORDER BY ds.sort_order ASC - LIMIT 999") or die('Failed to query for startup: '.mysql_error()); + LIMIT 999") or die('Failed to query for startup: '.$GLOBALS['mysqli']->error); - while($row_str = mysql_fetch_array($result_str)) + while($row_str = $result_str->fetch_array()) { $s_id = $row_str['id']; $s_sort = $row_str['sort_order']; diff --git a/ajax/settings_save.php b/ajax/settings_save.php index 9a93c86..04d6599 100644 --- a/ajax/settings_save.php +++ b/ajax/settings_save.php @@ -22,7 +22,7 @@ ######################################################################## // Update these settings -@mysql_query("UPDATE `configuration` SET +$GLOBALS['mysqli']->query("UPDATE `configuration` SET `last_updated_by` = '$this_userid', `last_updated` = NOW(), `config_value` = CASE `config_setting` @@ -34,19 +34,19 @@ WHEN 'steam_login_user' THEN '$url_steam_user' WHEN 'steam_login_pass' THEN '$url_steam_pass' WHEN 'steam_auth' THEN '$url_steam_auth' - ELSE `config_value` END") or die('Failed to update settings: '.mysql_error()); + ELSE `config_value` END") or die('Failed to update settings: '.$GLOBALS['mysqli']->error); /* * Older, inefficient (updated in 3.0.7) * -$errmsg = $lang['err_sql_update'] . ' ('.mysql_error().')'; +$errmsg = $lang['err_sql_update'] . ' ('.$GLOBALS['mysqli']->error.')'; // Run all updates -@mysql_query("UPDATE configuration SET config_value = '$url_lang' WHERE config_setting = 'language'") or die($errmsg); -@mysql_query("UPDATE configuration SET config_value = '$url_email' WHERE config_setting = 'default_email_address'") or die($errmsg); -@mysql_query("UPDATE configuration SET config_value = '$url_company' WHERE config_setting = 'company'") or die($errmsg); -@mysql_query("UPDATE configuration SET config_value = '$url_theme' WHERE config_setting = 'theme'") or die($errmsg); -@mysql_query("UPDATE configuration SET config_value = '$url_local_dir' WHERE config_setting = 'local_dir'") or die($errmsg); +$GLOBALS['mysqli']->query("UPDATE configuration SET config_value = '$url_lang' WHERE config_setting = 'language'") or die($errmsg); +$GLOBALS['mysqli']->query("UPDATE configuration SET config_value = '$url_email' WHERE config_setting = 'default_email_address'") or die($errmsg); +$GLOBALS['mysqli']->query("UPDATE configuration SET config_value = '$url_company' WHERE config_setting = 'company'") or die($errmsg); +$GLOBALS['mysqli']->query("UPDATE configuration SET config_value = '$url_theme' WHERE config_setting = 'theme'") or die($errmsg); +$GLOBALS['mysqli']->query("UPDATE configuration SET config_value = '$url_local_dir' WHERE config_setting = 'local_dir'") or die($errmsg); */ echo 'success'; diff --git a/ajax/template_actions.php b/ajax/template_actions.php index c93ac9e..ea10648 100644 --- a/ajax/template_actions.php +++ b/ajax/template_actions.php @@ -29,15 +29,15 @@ elseif($url_do == 'save') { // Get this game ID - $result_gid = @mysql_query("SELECT cfgid FROM templates WHERE id = '$url_id'"); - $row_gid = mysql_fetch_row($result_gid); + $result_gid = $GLOBALS['mysqli']->query("SELECT cfgid FROM templates WHERE id = '$url_id'"); + $row_gid = $result_gid->fetch_row(); $this_gameid = $row_gid[0]; // If default, make all others not default - if($url_default) @mysql_query("UPDATE templates SET is_default = '0' WHERE cfgid = '$this_gameid' AND netid = '$url_netid'") or die('Failed to update template settings (1)'); + if($url_default) $GLOBALS['mysqli']->query("UPDATE templates SET is_default = '0' WHERE cfgid = '$this_gameid' AND netid = '$url_netid'") or die('Failed to update template settings (1)'); // Update values - @mysql_query("UPDATE templates SET is_default = '$url_default',description = '$url_descr' WHERE id = '$url_id'") or die('Failed to update template settings (2)'); + $GLOBALS['mysqli']->query("UPDATE templates SET is_default = '$url_default',description = '$url_descr' WHERE id = '$url_id'") or die('Failed to update template settings (2)'); echo 'success'; } @@ -55,8 +55,8 @@ $Network = new Network; // Get list of unfinished templates - $result_unf = @mysql_query("SELECT id,netid,steam_percent,status FROM templates WHERE status = 'running' OR status = 'steam_running' ORDER BY id ASC"); - $total_rows = mysql_num_rows($result_unf); + $result_unf = $GLOBALS['mysqli']->query("SELECT id,netid,steam_percent,status FROM templates WHERE status = 'running' OR status = 'steam_running' ORDER BY id ASC"); + $total_rows = $result_unf->num_rows; if($total_rows > 1) $total_rows = $total_rows - 1; // Change for array counting $cntr = 1; @@ -66,7 +66,7 @@ if($total_rows) { - while($row_unf = mysql_fetch_array($result_unf)) + while($row_unf = $result_unf->fetch_array()) { $this_tpl = $row_unf['id']; $this_netid = $row_unf['netid']; @@ -96,7 +96,7 @@ if($cur_status != $this_status) { $updated = true; - @mysql_query("UPDATE templates SET status = '$this_status' WHERE id = '$this_tplid'") or die('Failed to update template check!'); + $GLOBALS['mysqli']->query("UPDATE templates SET status = '$this_status' WHERE id = '$this_tplid'") or die('Failed to update template check!'); } } @@ -127,7 +127,7 @@ if($cur_status != $this_status) { $updated = true; - @mysql_query("UPDATE templates SET status = '$this_status' WHERE id = '$this_tplid'") or die('Failed to update template check!'); + $GLOBALS['mysqli']->query("UPDATE templates SET status = '$this_status' WHERE id = '$this_tplid'") or die('Failed to update template check!'); } } diff --git a/ajax/template_create_form.php b/ajax/template_create_form.php index 5b29f30..bc36336 100644 --- a/ajax/template_create_form.php +++ b/ajax/template_create_form.php @@ -37,7 +37,7 @@ $url_id = $GPXIN['id']; // Grab list of available games - $result_sv = @mysql_query("SELECT + $result_sv = $GLOBALS['mysqli']->query("SELECT id, steam, port, @@ -48,7 +48,7 @@ FROM default_games ORDER BY name ASC"); - while($row_sv = mysql_fetch_array($result_sv)) + while($row_sv = $result_sv->fetch_array()) { $sv_id = $row_sv['id']; $sv_steam = $row_sv['steam']; @@ -76,8 +76,9 @@ query("SELECT DISTINCT p.id, + p.parentid, p.is_local, p.ip, p.location @@ -89,11 +90,11 @@ p.parentid = '0' ORDER BY p.parentid ASC, - p.ip ASC") or die('Failed to query for network servers: '.mysql_error()); + p.ip ASC") or die('Failed to query for network servers: '.$GLOBALS['mysqli']->error); - $total_nets = mysql_num_rows($result_net); + $total_nets = $result_net->num_rows; - while($row_net = mysql_fetch_array($result_net)) + while($row_net = $result_net->fetch_array()) { $net_id = $row_net['id']; $net_local = $row_net['is_local']; diff --git a/ajax/template_edit.php b/ajax/template_edit.php index ccad5d0..e3b39af 100644 --- a/ajax/template_edit.php +++ b/ajax/template_edit.php @@ -6,7 +6,7 @@ $url_id = $GPXIN['id']; // List templates -$result_srv = @mysql_query("SELECT +$result_srv = $GLOBALS['mysqli']->query("SELECT t.id, t.netid, t.date_created, @@ -24,9 +24,9 @@ LEFT JOIN default_games AS d ON t.cfgid = d.id WHERE - t.id = '$url_id'") or die($lang['err_query'].' ('.mysql_error().')'); + t.id = '$url_id'") or die($lang['err_query'].' ('.$GLOBALS['mysqli']->error.')'); -while($row_tpl = mysql_fetch_array($result_srv)) +while($row_tpl = $result_srv->fetch_array()) { $tp_id = $row_tpl['id']; $tp_netid = $row_tpl['netid']; diff --git a/ajax/template_status.php b/ajax/template_status.php index c01c7c9..a18ff71 100644 --- a/ajax/template_status.php +++ b/ajax/template_status.php @@ -6,10 +6,10 @@ // Get status info on the 20 most recent templates #WHERE (status = 'steam_running' OR status = 'running') -$result = @mysql_query("SELECT id,steam_percent,status FROM templates ORDER BY id DESC LIMIT 20") or die('Failed to query: '.mysql_error()); +$result = $GLOBALS['mysqli']->query("SELECT id,steam_percent,status FROM templates ORDER BY id DESC LIMIT 20") or die('Failed to query: '.$GLOBALS['mysqli']->error); $newarr = array(); -while($row = mysql_fetch_array($result)) +while($row = $result->fetch_array()) { #$tpl_id = $row['id']; #$tpl_status = $row['status']; diff --git a/ajax/user_actions.php b/ajax/user_actions.php index 1079ab3..edf4bfe 100644 --- a/ajax/user_actions.php +++ b/ajax/user_actions.php @@ -67,7 +67,7 @@ $perm_updetails = $GPXIN['upd']; // Admins only - if(isset($_SESSION['gpx_admin'])) @mysql_query("UPDATE users SET perm_ftp = '$perm_ftp',perm_files = '$perm_files',perm_startup = '$perm_startup',perm_chpass = '$perm_chpass',perm_updetails = '$perm_updetails' WHERE id = '$url_id'") or die('Failed to update permissions!'); + if(isset($_SESSION['gpx_admin'])) $GLOBALS['mysqli']->query("UPDATE users SET perm_ftp = '$perm_ftp',perm_files = '$perm_files',perm_startup = '$perm_startup',perm_chpass = '$perm_chpass',perm_updetails = '$perm_updetails' WHERE id = '$url_id'") or die('Failed to update permissions!'); else die('You are not authorized to do this!'); echo 'success'; diff --git a/ajax/user_edit.php b/ajax/user_edit.php index 7168b19..2b686d0 100644 --- a/ajax/user_edit.php +++ b/ajax/user_edit.php @@ -4,7 +4,7 @@ $url_id = $GPXIN['id']; // Get user info -$result_usr = @mysql_query("SELECT +$result_usr = $GLOBALS['mysqli']->query("SELECT id, first_name, last_name, @@ -13,9 +13,9 @@ FROM users WHERE id = '$url_id' - LIMIT 1") or die('Failed to query for users: '.mysql_error()); + LIMIT 1") or die('Failed to query for users: '.$GLOBALS['mysqli']->error); -while($row_usr = mysql_fetch_array($result_usr)) +while($row_usr = $result_usr->fetch_array()) { $usr_id = $row_usr['id']; $usr_fname = $row_usr['first_name']; diff --git a/api/servers.php b/api/servers.php index 12fa188..8e06f25 100644 --- a/api/servers.php +++ b/api/servers.php @@ -28,8 +28,8 @@ #var_dump($combo); echo '
'; // Get ID for this game - $result_gid = @mysql_query("SELECT id FROM default_games WHERE intname = '$usr_game_intname'"); - $row_gid = mysql_fetch_row($result_gid); + $result_gid = $GLOBALS['mysqli']->query("SELECT id FROM default_games WHERE intname = '$usr_game_intname'"); + $row_gid = $result_gid->fetch_row(); $this_gid = $row_gid[0]; if(empty($this_gid)) die('Invalid game specified!'); @@ -40,8 +40,8 @@ $srv_description = ''; // Check if username exists - $result_ck = @mysql_query("SELECT id FROM users WHERE username = '$usr_username' AND deleted = '0' LIMIT 1"); - $row_ck = mysql_fetch_row($result_ck); + $result_ck = $GLOBALS['mysqli']->query("SELECT id FROM users WHERE username = '$usr_username' AND deleted = '0' LIMIT 1"); + $row_ck = $result_ck->fetch_row(); $new_userid = $row_ck[0]; // User doesnt exist, create them diff --git a/checkallowed.php b/checkallowed.php index f5d3d65..c2fad84 100644 --- a/checkallowed.php +++ b/checkallowed.php @@ -11,8 +11,8 @@ // Normal Users - Check if this user owns this server if(!isset($_SESSION['gpx_admin']) && isset($gpx_srvid)) { - $result_owns = @mysql_query("SELECT id FROM servers WHERE id = '$gpx_srvid' AND userid = '$gpx_userid' LIMIT 1") or die('Failed to check ownership'); - $row_owns = mysql_fetch_row($result_owns); + $result_owns = $GLOBALS['mysqli']->query("SELECT id FROM servers WHERE id = '$gpx_srvid' AND userid = '$gpx_userid' LIMIT 1") or die('Failed to check ownership'); + $row_owns = $result_owns->fetch_row(); if(empty($row_owns[0])) die('You do not have access to this server!'); } diff --git a/configuration.php b/configuration.php new file mode 100644 index 0000000..1fc03bc --- /dev/null +++ b/configuration.php @@ -0,0 +1,25 @@ + \ No newline at end of file diff --git a/images/gameicons/small/cloud_actions.php b/images/gameicons/small/cloud_actions.php index 28233fc..2e2a6f3 100644 --- a/images/gameicons/small/cloud_actions.php +++ b/images/gameicons/small/cloud_actions.php @@ -23,10 +23,10 @@ // Get currently installed game data - $result_cur = @mysql_query("SELECT cloudid FROM default_games ORDER BY id ASC") or die('ERROR: Failed to query for current games'); + $result_cur = $GLOBALS['mysqli']->query("SELECT cloudid FROM default_games ORDER BY id ASC") or die('ERROR: Failed to query for current games'); $arr_curr = array(); - while($row_cur = mysql_fetch_array($result_cur)) + while($row_cur = $result_cur->fetch_array()) { $arr_curr[] = $row_cur; } @@ -101,8 +101,8 @@ if(!isset($_SESSION['gpx_upd_ck'])) { // Get current version - $result_vr = @mysql_query("SELECT config_value FROM configuration WHERE config_setting = 'version' LIMIT 1"); - $row_vr = mysql_fetch_row($result_vr); + $result_vr = $GLOBALS['mysqli']->query("SELECT config_value FROM configuration WHERE config_setting = 'version' LIMIT 1"); + $row_vr = $result_vr->fetch_row(); $gpx_version = $row_vr[0]; // Check GPX Cloud for any updates diff --git a/includes/callback.php b/includes/callback.php index 1475618..16cfb45 100644 --- a/includes/callback.php +++ b/includes/callback.php @@ -13,10 +13,10 @@ $Core = new Core; $Core->dbconnect(); -$url_do = mysql_real_escape_string($_GET['do']); -$url_token = mysql_real_escape_string($_GET['token']); -$url_id = mysql_real_escape_string($_GET['id']); -$url_status = mysql_real_escape_string($_GET['status']); +$url_do = $GLOBALS['mysqli']->real_escape_string($_GET['do']); +$url_token = $GLOBALS['mysqli']->real_escape_string($_GET['token']); +$url_id = $GLOBALS['mysqli']->real_escape_string($_GET['id']); +$url_status = $GLOBALS['mysqli']->real_escape_string($_GET['status']); // @@ -26,8 +26,8 @@ if($url_do == 'tpl_status') { // Get token - $token_result = @mysql_query("SELECT token FROM templates WHERE id = '$url_id'"); - $token_row = mysql_fetch_row($token_result); + $token_result = $GLOBALS['mysqli']->query("SELECT token FROM templates WHERE id = '$url_id'"); + $token_row = $token_result->fetch_row(); $token_tpl = $token_row[0]; // Make sure tokens match @@ -39,9 +39,9 @@ elseif($url_status == 'failed') $status = 'failed'; else $status = 'tpl_running'; - $url_size = mysql_real_escape_string($_GET['size']); + $url_size = $GLOBALS['mysqli']->real_escape_string($_GET['size']); - @mysql_query("UPDATE templates SET status = '$status',size = '$url_size' WHERE id = '$url_id'") or die('Failed to update Steam Percent!'); + $GLOBALS['mysqli']->query("UPDATE templates SET status = '$status',size = '$url_size' WHERE id = '$url_id'") or die('Failed to update Steam Percent!'); echo 'success'; } @@ -54,20 +54,20 @@ elseif($url_do == 'steam_progress') { // Get token - $token_result = @mysql_query("SELECT token FROM templates WHERE id = '$url_id'"); - $token_row = mysql_fetch_row($token_result); + $token_result = $GLOBALS['mysqli']->query("SELECT token FROM templates WHERE id = '$url_id'"); + $token_row = $token_result->fetch_row(); $token_tpl = $token_row[0]; // Make sure tokens match if($token_tpl != $url_token) die('CallBack: Invalid token provided!'); - $url_percent = mysql_real_escape_string($_GET['percent']); + $url_percent = $GLOBALS['mysqli']->real_escape_string($_GET['percent']); // Remove the % sign $url_percent = str_replace('%', '', $url_percent); $url_percent = round($url_percent); - @mysql_query("UPDATE templates SET steam_percent = '$url_percent' WHERE id = '$url_id'") or die('Failed to update Steam Percent!'); + $GLOBALS['mysqli']->query("UPDATE templates SET steam_percent = '$url_percent' WHERE id = '$url_id'") or die('Failed to update Steam Percent!'); echo 'success'; } @@ -80,14 +80,14 @@ elseif($url_do == 'createsrv_status') { // Get token - $token_result = @mysql_query("SELECT token FROM servers WHERE id = '$url_id'"); - $token_row = mysql_fetch_row($token_result); + $token_result = $GLOBALS['mysqli']->query("SELECT token FROM servers WHERE id = '$url_id'"); + $token_row = $token_result->fetch_row(); $token_srv = $token_row[0]; // Make sure tokens match if($token_srv != $url_token) die('CallBack: Invalid token provided!'); - @mysql_query("UPDATE servers SET status = '$url_status' WHERE id = '$url_id'") or die('Failed to update Steam Percent!'); + $GLOBALS['mysqli']->query("UPDATE servers SET status = '$url_status' WHERE id = '$url_id'") or die('Failed to update Steam Percent!'); echo 'success'; } @@ -100,23 +100,23 @@ { if(!preg_match('/[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/', $_GET['ip'])) die('Invalid IP Address given!'); - $url_ip = mysql_real_escape_string($_GET['ip']); - $url_freemem = mysql_real_escape_string($_GET['freemem']); - $url_totalmem = mysql_real_escape_string($_GET['totalmem']); - $url_loadavg = mysql_real_escape_string($_GET['loadavg']); + $url_ip = $GLOBALS['mysqli']->real_escape_string($_GET['ip']); + $url_freemem = $GLOBALS['mysqli']->real_escape_string($_GET['freemem']); + $url_totalmem = $GLOBALS['mysqli']->real_escape_string($_GET['totalmem']); + $url_loadavg = $GLOBALS['mysqli']->real_escape_string($_GET['loadavg']); // Make sure this is a valid token - $result_ck = @mysql_query("SELECT id FROM network WHERE token = '$url_token' LIMIT 1") or die('Failed to check valid server IP!'); - $row_ck = mysql_fetch_row($result_ck); + $result_ck = $GLOBALS['mysqli']->query("SELECT id FROM network WHERE token = '$url_token' LIMIT 1") or die('Failed to check valid server IP!'); + $row_ck = $result_ck->fetch_row(); $this_netid = $row_ck[0]; if(empty($this_netid)) die('Sorry, do not recognize that token!'); // Cleanup older than 3 days - @mysql_query("DELETE FROM loadavg WHERE `timestamp` < now() - interval 3 day"); + $GLOBALS['mysqli']->query("DELETE FROM loadavg WHERE `timestamp` < now() - interval 3 day"); // Add to load avg table (will need to be cleaned periodically) (can be cleaned up here if needed) - @mysql_query("INSERT INTO loadavg (netid,free_mem,total_mem,load_avg) VALUES('$this_netid','$url_freemem','$url_totalmem','$url_loadavg')") or die('Failed to add load average!'); + $GLOBALS['mysqli']->query("INSERT INTO loadavg (netid,free_mem,total_mem,load_avg) VALUES('$this_netid','$url_freemem','$url_totalmem','$url_loadavg')") or die('Failed to add load average!'); } ?> diff --git a/includes/classes/admins.php b/includes/classes/admins.php index c8050a9..069c239 100644 --- a/includes/classes/admins.php +++ b/includes/classes/admins.php @@ -18,14 +18,14 @@ public function create($username,$password,$email,$first_name,$last_name) if($password == '123' || $password == '1234' || $password == '12345' || $password == 'password' || $password == 'pass123' || $password == 'pass1234' || $password == 'pass12345') return 'Sorry, please choose a real password!'; // Check existing username - $result_ck = @mysql_query("SELECT id FROM admins WHERE username = '$username' LIMIT 1"); - $row_ck = mysql_fetch_row($result_ck); + $result_ck = $GLOBALS['mysqli']->query("SELECT id FROM admins WHERE username = '$username' LIMIT 1"); + $row_ck = $result_ck->fetch_row(); if($row_ck[0]) return $lang['user_exists']; // Setup pass $password = base64_encode(sha1('ZzaX'.$password.'GPX88')); - @mysql_query("INSERT INTO admins (date_created,username,password,email_address,first_name,last_name) VALUES(NOW(),'$username','$password','$email','$first_name','$last_name')") or die('Failed to create user: '.mysql_error()); + $GLOBALS['mysqli']->query("INSERT INTO admins (date_created,username,password,email_address,first_name,last_name) VALUES(NOW(),'$username','$password','$email','$first_name','$last_name')") or die('Failed to create user: '.$GLOBALS['mysqli']->error); // Output diff --git a/includes/classes/core.php b/includes/classes/core.php index 5f87c53..86cef43 100644 --- a/includes/classes/core.php +++ b/includes/classes/core.php @@ -4,11 +4,10 @@ class Core public function dbconnect() { if(!isset($config['db_host'])) require(__DIR__.'/../../configuration.php'); - - $db = @mysql_connect($settings['db_host'],$settings['db_username'],$settings['db_password']) or die('ERROR: Failed to connect to the MySQL database'); - @mysql_select_db($settings['db_name']) or die('ERROR: Failed to select the MySQL database'); - global $db; - + + $GLOBALS['mysqli'] = new mysqli($settings['db_host'],$settings['db_username'],$settings['db_password']) or die('ERROR: Failed to connect to the MySQL database'); + $GLOBALS['mysqli']->select_db($settings['db_name']) or die('ERROR: Failed to select the MySQL database'); + return true; } @@ -20,8 +19,8 @@ public function getsettings($setting=false) // Return a value for a single setting if($setting) { - $result_cfg = @mysql_query("SELECT config_value FROM configuration WHERE config_setting = '$setting' ORDER BY last_updated DESC LIMIT 1") or die('Failed to query for single configuration!'); - $row_cfg = mysql_fetch_row($result_cfg); + $result_cfg = $GLOBALS['mysqli']->query("SELECT config_value FROM configuration WHERE config_setting = '$setting' ORDER BY last_updated DESC LIMIT 1") or die('Failed to query for single configuration!'); + $row_cfg = $result_cfg->fetch_row(); return $row_cfg[0]; } @@ -29,10 +28,10 @@ public function getsettings($setting=false) else { // Get settings - $result_cfg = @mysql_query("SELECT last_updated_by,last_updated,config_setting,config_value FROM configuration ORDER BY config_setting ASC") or die('Failed to query for all configuration!'); + $result_cfg = $GLOBALS['mysqli']->query("SELECT last_updated_by,last_updated,config_setting,config_value FROM configuration ORDER BY config_setting ASC") or die('Failed to query for all configuration!'); $settings_arr = array(); - while($row_cfg = mysql_fetch_array($result_cfg)) + while($row_cfg = $result_cfg->fetch_array()) { $cfg_setting = $row_cfg['config_setting']; $cfg_value = $row_cfg['config_value']; @@ -56,7 +55,7 @@ public function genstring($length=false) $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; $string = ''; for ($p = 0; $p < $length; $p++) { - $string .= $characters[mt_rand(0, strlen($characters))]; + $string .= $characters[mt_rand(0, strlen($characters) - 1)]; } return $string; } @@ -128,8 +127,8 @@ function escape_inputs($inarr,$isapi=false) // Loop through and escape everything foreach($inarr as $posts => $postval) { - if($is_pure) $GPXIN[$posts] = mysql_real_escape_string(strip_tags($postval)); - else $GPXIN[$posts] = mysql_real_escape_string($postval); + if($is_pure) $GPXIN[$posts] = $GLOBALS['mysqli']->real_escape_string(strip_tags($postval)); + else $GPXIN[$posts] = $GLOBALS['mysqli']->real_escape_string($postval); } // Kill $_POST and $_GET -- MUST use $GPXIN for user input diff --git a/includes/classes/files.php b/includes/classes/files.php index 4cfe6e2..eac00fc 100644 --- a/includes/classes/files.php +++ b/includes/classes/files.php @@ -15,8 +15,8 @@ public function file_list($srvid,$dir,$tpl_browse=false) // Otherwise we were given a gameserver ID, get it's network id else { - $result_nid = @mysql_query("SELECT netid FROM servers WHERE id = '$srvid' LIMIT 1"); - $row_nid = mysql_fetch_row($result_nid); + $result_nid = $GLOBALS['mysqli']->query("SELECT netid FROM servers WHERE id = '$srvid' LIMIT 1"); + $row_nid = $result_nid->fetch_row(); $this_netid = $row_nid[0]; } @@ -206,8 +206,8 @@ public function delete_file($srvid,$name) if(preg_match('/(^\.+)/', $name)) return 'ERROR: Invalid filename given'; // Get network ID - $result_nid = @mysql_query("SELECT netid FROM servers WHERE id = '$srvid'"); - $row_nid = mysql_fetch_row($result_nid); + $result_nid = $GLOBALS['mysqli']->query("SELECT netid FROM servers WHERE id = '$srvid'"); + $row_nid = $result_nid->fetch_row(); $this_netid = $row_nid[0]; if(empty($this_netid)) return 'Failed to get network ID!'; @@ -281,8 +281,8 @@ public function delete_dir($srvid,$name) if(preg_match('/(^\.+)/', $name)) return 'ERROR: Invalid directory given'; // Get network ID - $result_nid = @mysql_query("SELECT netid FROM servers WHERE id = '$srvid'"); - $row_nid = mysql_fetch_row($result_nid); + $result_nid = $GLOBALS['mysqli']->query("SELECT netid FROM servers WHERE id = '$srvid'"); + $row_nid = $result_nid->fetch_row(); $this_netid = $row_nid[0]; if(empty($this_netid)) return 'Failed to get network ID!'; @@ -355,8 +355,8 @@ public function save_file($srvid,$file,$content) if(empty($file)) return 'No filename given!'; // Get network ID - $result_nid = @mysql_query("SELECT netid FROM servers WHERE id = '$srvid'"); - $row_nid = mysql_fetch_row($result_nid); + $result_nid = $GLOBALS['mysqli']->query("SELECT netid FROM servers WHERE id = '$srvid'"); + $row_nid = $result_nid->fetch_row(); $this_netid = $row_nid[0]; if(empty($this_netid)) return 'Failed to get network ID!'; @@ -422,8 +422,8 @@ public function save_newfile($srvid,$file,$content) if(empty($file)) return 'No filename given!'; // Get network ID - $result_nid = @mysql_query("SELECT netid FROM servers WHERE id = '$srvid'"); - $row_nid = mysql_fetch_row($result_nid); + $result_nid = $GLOBALS['mysqli']->query("SELECT netid FROM servers WHERE id = '$srvid'"); + $row_nid = $result_nid->fetch_row(); $this_netid = $row_nid[0]; if(empty($this_netid)) return 'Failed to get network ID!'; @@ -492,8 +492,8 @@ public function create_newdir($srvid,$dir_name) if(empty($dir_name)) return 'No directory name given!'; // Get network ID - $result_nid = @mysql_query("SELECT netid FROM servers WHERE id = '$srvid'"); - $row_nid = mysql_fetch_row($result_nid); + $result_nid = $GLOBALS['mysqli']->query("SELECT netid FROM servers WHERE id = '$srvid'"); + $row_nid = $result_nid->fetch_row(); $this_netid = $row_nid[0]; if(empty($this_netid)) return 'Failed to get network ID!'; diff --git a/includes/classes/network.php b/includes/classes/network.php index 1cdbe0e..6c8a6d9 100644 --- a/includes/classes/network.php +++ b/includes/classes/network.php @@ -11,7 +11,7 @@ public function netinfo($srvid) if(empty($enc_key)) return 'No encryption key found! Check your /configuration.php file.'; // Get all info in 1 query - $result_net = @mysql_query("SELECT + $result_net = $GLOBALS['mysqli']->query("SELECT p.is_local, AES_DECRYPT(p.login_user, '$enc_key') AS login_user, AES_DECRYPT(p.login_pass, '$enc_key') AS login_pass, @@ -36,7 +36,7 @@ public function netinfo($srvid) LIMIT 1"); $net_arr = array(); - while($row_net = mysql_fetch_array($result_net)) + while($row_net = $result_net->fetch_array()) { $net_arr['is_local'] = $row_net['is_local']; $net_arr['ssh_user'] = $row_net['login_user']; @@ -192,16 +192,16 @@ public function runcmd($srvid,$netarr,$cmd,$output=false,$gamesrv_id=false) if(empty($gamesrv_id)) return 'No userID given for this server!'; // Get sso user/pass - $result_sso = @mysql_query("SELECT + $result_sso = $GLOBALS['mysqli']->query("SELECT AES_DECRYPT(u.sso_user, '$enc_key') AS sso_user, AES_DECRYPT(u.sso_pass, '$enc_key') AS sso_pass FROM users AS u LEFT JOIN servers AS s ON u.id = s.userid WHERE - s.id = '$gamesrv_id'") or die('Failed to query for sso info: '.mysql_error()); + s.id = '$gamesrv_id'") or die('Failed to query for sso info: '.$GLOBALS['mysqli']->error); - $row_sso = mysql_fetch_row($result_sso); + $row_sso = mysqli_fetch_row($result_sso); $ssh_user = 'gpx'.$row_sso[0]; // System logins have 'gpx' prepended to them as of Remote 3.0.12 $ssh_pass = $row_sso[1]; // We don't define $ssh_homedir here since we want to user the normal gpx user's $HOME/scripts dir. @@ -268,7 +268,7 @@ public function sso_info($gamesrv_id) if(empty($enc_key)) return 'No encryption key found! Check your /configuration.php file.'; // Get sso user/pass - $result_sso = @mysql_query("SELECT + $result_sso = $GLOBALS['mysqli']->query("SELECT AES_DECRYPT(u.sso_user, '$enc_key') AS sso_user, AES_DECRYPT(u.sso_pass, '$enc_key') AS sso_pass, n.ip, @@ -279,9 +279,9 @@ public function sso_info($gamesrv_id) LEFT JOIN network AS n ON s.netid = n.id WHERE - s.id = '$gamesrv_id'") or die('Failed to query for sso info: '.mysql_error()); + s.id = '$gamesrv_id'") or die('Failed to query for sso info: '.$GLOBALS['mysqli']->error); - $row_sso = mysql_fetch_row($result_sso); + $row_sso = $result_sso->fetch_row(); $sso_user = 'gpx'.$row_sso[0]; // System logins have 'gpx' prepended to them as of Remote 3.0.12 $sso_pass = $row_sso[1]; $game_ip = $row_sso[2]; @@ -317,7 +317,7 @@ public function islocal($srvid) { if(empty($srvid)) return 'No server ID given'; - $result_net = @mysql_query("SELECT + $result_net = $GLOBALS['mysqli']->query("SELECT p.is_local FROM network AS n LEFT JOIN servers AS s ON @@ -329,7 +329,7 @@ public function islocal($srvid) s.id = '$srvid' LIMIT 1"); - $row_net = mysql_fetch_row($result_net); + $row_net = $result_net->fetch_row(); // Return 1 or 0 for local return $row_net[0]; @@ -352,8 +352,8 @@ public function create($ip,$is_local,$os,$datacenter,$location,$login_user,$logi if(empty($enc_key)) return 'Create: No encryption key found! Check your /configuration.php file.'; // Check if this IP Already exists - $result_ck = @mysql_query("SELECT id FROM network WHERE ip = '$ip'") or die('Failed to check network'); - $row_ck = mysql_fetch_row($result_ck); + $result_ck = $GLOBALS['mysqli']->query("SELECT id FROM network WHERE ip = '$ip'") or die('Failed to check network'); + $row_ck = $result_ck->fetch_row(); if(!empty($row_ck[0])) return 'Create: That IP Address aready exists!'; ################################################################ @@ -401,8 +401,8 @@ public function create($ip,$is_local,$os,$datacenter,$location,$login_user,$logi $this_callback = $cback['callback']; // Insert - @mysql_query("INSERT INTO network (ip,token,is_local,os,datacenter,location,login_user,login_pass,login_port) VALUES('$ip','$remote_token','$is_local','$os','$datacenter','$location',AES_ENCRYPT('$login_user', '$enc_key'),AES_ENCRYPT('$login_pass', '$enc_key'),AES_ENCRYPT('$login_port', '$enc_key'))") or die('Failed to insert the network server: '.mysql_error()); - $this_netid = mysql_insert_id(); + $GLOBALS['mysqli']->query("INSERT INTO network (ip,token,is_local,os,datacenter,location,login_user,login_pass,login_port) VALUES('$ip','$remote_token','$is_local','$os','$datacenter','$location',AES_ENCRYPT('$login_user', '$enc_key'),AES_ENCRYPT('$login_pass', '$enc_key'),AES_ENCRYPT('$login_port', '$enc_key'))") or die('Failed to insert the network server: '.$GLOBALS['mysqli']->error); + $this_netid = $GLOBALS['mysqli']->insert_id; ################################################################ @@ -424,15 +424,15 @@ public function create($ip,$is_local,$os,$datacenter,$location,$login_user,$logi // Add trailing slash just to be safe #if(!preg_match('\/$', $net_homedir)) $net_homedir .= '/'; - @mysql_query("UPDATE network SET homedir = '$net_homedir' WHERE id = '$this_netid'") or die('Failed to update homedir: '.mysql_error()); + $GLOBALS['mysqli']->query("UPDATE network SET homedir = '$net_homedir' WHERE id = '$this_netid'") or die('Failed to update homedir: '.$GLOBALS['mysqli']->error); ######################################################## // Get list of user accounts to be created if needed on the network server - $result_users = @mysql_query("SELECT username FROM users WHERE deleted = '0' ORDER BY username ASC"); + $result_users = $GLOBALS['mysqli']->query("SELECT username FROM users WHERE deleted = '0' ORDER BY username ASC"); $usr_list = ''; - while($row_users = mysql_fetch_array($result_users)) + while($row_users = $result_users->fetch_array()) { $usr_list .= $row_users['username'] . ','; } @@ -448,7 +448,7 @@ public function create($ip,$is_local,$os,$datacenter,$location,$login_user,$logi else { // Delete net server since this failed - @mysql_query("DELETE FROM network WHERE id = '$this_netid'") or die('Failed to delete network server: '.mysql_error()); + $GLOBALS['mysqli']->query("DELETE FROM network WHERE id = '$this_netid'") or die('Failed to delete network server: '.$GLOBALS['mysqli']->error); return 'Remote Install Check: '.$check_install; } @@ -457,7 +457,7 @@ public function create($ip,$is_local,$os,$datacenter,$location,$login_user,$logi else { // Delete net server since this failed - @mysql_query("DELETE FROM network WHERE id = '$this_netid'") or die('Failed to delete network server: '.mysql_error()); + $GLOBALS['mysqli']->query("DELETE FROM network WHERE id = '$this_netid'") or die('Failed to delete network server: '.$GLOBALS['mysqli']->error); return $net_homedir; } @@ -476,15 +476,15 @@ public function delete($netid) if(empty($netid)) return 'No network ID given!'; // Check if any servers are using this - $result_ip = @mysql_query("SELECT id FROM servers WHERE netid = '$netid' LIMIT 1") or die('Failed to get IP!'); - $row_ip = mysql_fetch_row($result_ip); + $result_ip = $GLOBALS['mysqli']->query("SELECT id FROM servers WHERE netid = '$netid' LIMIT 1") or die('Failed to get IP!'); + $row_ip = $result_ip->fetch_row(); if($row_ip[0]) return $lang['srv_using_net']; // Delete templates (we warned them!) - @mysql_query("DELETE FROM templates WHERE netid = '$netid'") or die('Failed to delete the network server'); + $GLOBALS['mysqli']->query("DELETE FROM templates WHERE netid = '$netid'") or die('Failed to delete the network server'); // Delete ID and all with this as a parent ID - @mysql_query("DELETE FROM network WHERE id = '$netid' OR parentid = '$netid'") or die('Failed to delete the network server'); + $GLOBALS['mysqli']->query("DELETE FROM network WHERE id = '$netid' OR parentid = '$netid'") or die('Failed to delete the network server'); return 'success'; } diff --git a/includes/classes/plugins.php b/includes/classes/plugins.php index ce40e99..de0fafe 100644 --- a/includes/classes/plugins.php +++ b/includes/classes/plugins.php @@ -125,15 +125,14 @@ public function setup_actions() // Reset session plugin info public function reset_session() { - $result_ac = @mysql_query("SELECT DISTINCT intname FROM plugins WHERE active = '1' ORDER BY name ASC") or die('Failed to query for plugins: '.mysql_error()); - $total_ac = mysql_num_rows($result_ac); - + $result_ac = $GLOBALS['mysqli']->query("SELECT DISTINCT intname FROM plugins WHERE active = '1' ORDER BY intname ASC") or die('Failed to query for plugins: '.$GLOBALS['mysqli']->error); + $total_ac = $result_ac->num_rows; // Reset sess if($total_ac) { // Store active plugin names in an array for later use $_SESSION['gpx_plugins'] = array(); - while($row_ac = mysql_fetch_array($result_ac)) + while($row_ac = $result_ac->fetch_array()) { $_SESSION['gpx_plugins'][] = $row_ac['intname']; } diff --git a/includes/classes/servers.php b/includes/classes/servers.php index b44b9f4..8f00781 100644 --- a/includes/classes/servers.php +++ b/includes/classes/servers.php @@ -6,7 +6,7 @@ public function getinfo($srvid) { if(empty($srvid)) return 'No server ID provided'; - $result_srv = @mysql_query("SELECT + $result_srv = $GLOBALS['mysqli']->query("SELECT s.id, s.userid, s.netid, @@ -52,9 +52,9 @@ public function getinfo($srvid) s.defid = d.id WHERE s.id = '$srvid' - LIMIT 1") or die('Failed to query for servers: '.mysql_error()); + LIMIT 1") or die('Failed to query for servers: '.$GLOBALS['mysqli']->error); $srv_info = array(); - while($row_srv = mysql_fetch_assoc($result_srv)) + while($row_srv = $result_srv->fetch_assoc()) { $srv_info[] = $row_srv; } @@ -206,7 +206,7 @@ public function stop($srvid) if(empty($srv_username) || empty($srv_ip) || empty($srv_port)) return 'stop class: Required values were left out'; // Force back to completed if updating - if($srv_info[0]['status'] == 'updating') @mysql_query("UPDATE servers SET status = 'complete' WHERE id = '$srvid'"); + if($srv_info[0]['status'] == 'updating') $GLOBALS['mysqli']->query("UPDATE servers SET status = 'complete' WHERE id = '$srvid'"); if(GPXDEBUG) $add_debug = ' -d 1'; else $add_debug = ''; @@ -269,7 +269,7 @@ public function update($srvid) // Generate and store random token for remote server callback $remote_token = $Core->genstring('16'); - @mysql_query("UPDATE servers SET token = '$remote_token' WHERE id = '$srvid'") or die('Failed to update token!'); + $GLOBALS['mysqli']->query("UPDATE servers SET token = '$remote_token' WHERE id = '$srvid'") or die('Failed to update token!'); // Get callback page $this_url = $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_NAME']; @@ -280,7 +280,7 @@ public function update($srvid) $this_page = 'http://' . $this_page; // Set as updating - #@mysql_query("UPDATE servers SET status = 'updating' WHERE id = '$srvid'") or die('Failed to update status!'); + #$GLOBALS['mysqli']->query("UPDATE servers SET status = 'updating' WHERE id = '$srvid'") or die('Failed to update status!'); // Run the command $ssh_cmd = "UpdateServer -u $srv_username -i $srv_ip -p $srv_port $add_steam -c \"$this_page\" -o \"$srv_update_cmd\""; @@ -303,8 +303,8 @@ public function checkcombo($netid,$port) { if(!$netid || !$port) return 'CheckCombo: No IP or Port specified!'; - $result_ck = @mysql_query("SELECT id FROM servers WHERE netid = '$netid' AND port = '$port' LIMIT 1"); - $row_ck = mysql_fetch_row($result_ck); + $result_ck = $GLOBALS['mysqli']->query("SELECT id FROM servers WHERE netid = '$netid' AND port = '$port' LIMIT 1"); + $row_ck = $result_ck->fetch_row(); // Return false if exists already if($row_ck[0]) return false; @@ -343,8 +343,8 @@ public function create($netid,$gameid,$ownerid,$tplid,$port,$description,$total_ { if(!empty($tplid) && is_numeric($tplid)) { // Query for gameid - $result_gmid = @mysql_query("SELECT cfgid FROM templates WHERE id = '$tplid'") or die('Failed to query for game ID'); - $row_gmid = mysql_fetch_row($result_gmid); + $result_gmid = $GLOBALS['mysqli']->query("SELECT cfgid FROM templates WHERE id = '$tplid'") or die('Failed to query for game ID'); + $row_gmid = $result_gmid->fetch_row(); $gameid = $row_gmid[0]; if(empty($gameid)) return 'Template ID specified, but no Game ID found from it!'; } @@ -354,15 +354,15 @@ public function create($netid,$gameid,$ownerid,$tplid,$port,$description,$total_ } // Get owner username - $result_name = @mysql_query("SELECT username FROM users WHERE id = '$ownerid' LIMIT 1") or die('Failed to query for username'); - $row_name = mysql_fetch_row($result_name); + $result_name = $GLOBALS['mysqli']->query("SELECT username FROM users WHERE id = '$ownerid' LIMIT 1") or die('Failed to query for username'); + $row_name = $result_name->fetch_row(); $this_usrname = $row_name[0]; // Get default template if(empty($tplid)) { - $result_tpl = @mysql_query("SELECT id FROM templates WHERE cfgid = '$gameid' AND status = 'complete' AND is_default = '1' ORDER BY id LIMIT 1") or die('Failed to get the default template'); - $row_tpl = mysql_fetch_row($result_tpl); + $result_tpl = $GLOBALS['mysqli']->query("SELECT id FROM templates WHERE cfgid = '$gameid' AND status = 'complete' AND is_default = '1' ORDER BY id LIMIT 1") or die('Failed to get the default template'); + $row_tpl = $result_tpl->fetch_row(); $this_tplid = $row_tpl[0]; } // Use given template ID @@ -391,19 +391,19 @@ public function create($netid,$gameid,$ownerid,$tplid,$port,$description,$total_ ############################################################################################ // Get some defaults - $result_dfts = @mysql_query("SELECT maxplayers,working_dir,pid_file,update_cmd,simplecmd,map,hostname FROM default_games WHERE id = '$gameid' LIMIT 1") or die('Failed to query for defaults'); + $result_dfts = $GLOBALS['mysqli']->query("SELECT maxplayers,working_dir,pid_file,update_cmd,simplecmd,map,hostname FROM default_games WHERE id = '$gameid' LIMIT 1") or die('Failed to query for defaults'); - $row_dfts = mysql_fetch_row($result_dfts); - $def_working_dir = mysql_real_escape_string($row_dfts[1]); - $def_pid_file = mysql_real_escape_string($row_dfts[2]); - $def_update_cmd = mysql_real_escape_string($row_dfts[3]); - $def_simple_cmd = mysql_real_escape_string($row_dfts[4]); - $def_map = mysql_real_escape_string($row_dfts[5]); - $def_hostname = mysql_real_escape_string($row_dfts[6]); + $row_dfts = $result_dfts->fetch_row(); + $def_working_dir = $GLOBALS['mysqli']->real_escape_string($row_dfts[1]); + $def_pid_file = $GLOBALS['mysqli']->real_escape_string($row_dfts[2]); + $def_update_cmd = $GLOBALS['mysqli']->real_escape_string($row_dfts[3]); + $def_simple_cmd = $GLOBALS['mysqli']->real_escape_string($row_dfts[4]); + $def_map = $GLOBALS['mysqli']->real_escape_string($row_dfts[5]); + $def_hostname = $GLOBALS['mysqli']->real_escape_string($row_dfts[6]); // Max player slots - use what was given, otherwise use the default - if(!empty($total_slots) && is_numeric($total_slots)) $def_maxplayers = mysql_real_escape_string($total_slots); - else $def_maxplayers = mysql_real_escape_string($row_dfts[0]); + if(!empty($total_slots) && is_numeric($total_slots)) $def_maxplayers = $GLOBALS['mysqli']->real_escape_string($total_slots); + else $def_maxplayers = $GLOBALS['mysqli']->real_escape_string($row_dfts[0]); // Generate random rcon password if not specified if(empty($rcon_password)) { @@ -413,8 +413,8 @@ public function create($netid,$gameid,$ownerid,$tplid,$port,$description,$total_ ######################################################################################### // If local, ensure we can write to the _SERVERS/accounts directory - $result_loc = @mysql_query("SELECT is_local FROM network WHERE id = '$netid' LIMIT 1"); - $row_loc = mysql_fetch_row($result_loc); + $result_loc = $GLOBALS['mysqli']->query("SELECT is_local FROM network WHERE id = '$netid' LIMIT 1"); + $row_loc = $result_loc->fetch_row(); $net_local = $row_loc[0]; if($net_local && !is_writable(DOCROOT.'/_SERVERS/accounts')) { @@ -424,17 +424,17 @@ public function create($netid,$gameid,$ownerid,$tplid,$port,$description,$total_ ######################################################################################### // Insert into db - @mysql_query("INSERT INTO servers (userid,netid,defid,port,maxplayers,status,date_created,token,working_dir,pid_file,update_cmd,description,map,rcon,hostname,sv_password) VALUES('$ownerid','$netid','$gameid','$port','$def_maxplayers','installing',NOW(),'$remote_token','$def_working_dir','$def_pid_file','$def_update_cmd','$description','$def_map','$rcon_password','$def_hostname','$private_password')") or die('Failed to insert server: '.mysql_error()); - $srv_id = mysql_insert_id(); + $GLOBALS['mysqli']->query("INSERT INTO servers (userid,netid,defid,port,maxplayers,status,date_created,token,working_dir,pid_file,update_cmd,description,map,rcon,hostname,sv_password) VALUES('$ownerid','$netid','$gameid','$port','$def_maxplayers','installing',NOW(),'$remote_token','$def_working_dir','$def_pid_file','$def_update_cmd','$description','$def_map','$rcon_password','$def_hostname','$private_password')") or die('Failed to insert server: '.$GLOBALS['mysqli']->error); + $srv_id = $GLOBALS['mysqli']->insert_id; // Insert default srv settings - $result_smp = @mysql_query("SELECT * FROM default_startup WHERE defid = '$gameid' ORDER BY sort_order ASC"); - $total_strt = mysql_num_rows($result_smp); + $result_smp = $GLOBALS['mysqli']->query("SELECT * FROM default_startup WHERE defid = '$gameid' ORDER BY sort_order ASC"); + $total_strt = $result_smp->num_rows; $insert_new = 'INSERT INTO servers_startup (srvid,sort_order,single,usr_edit,cmd_item,cmd_value) VALUES '; $simplecmd = ''; - while($row_smp = mysql_fetch_array($result_smp)) + while($row_smp = $result_smp->fetch_array()) { $cmd_sort = $row_smp['sort_order']; $cmd_single = $row_smp['single']; @@ -463,12 +463,12 @@ public function create($netid,$gameid,$ownerid,$tplid,$port,$description,$total_ // Remove last comma $insert_new = substr($insert_new, 0, -1); - @mysql_query($insert_new) or die('Failed to insert startup items: '.mysql_error()); + $GLOBALS['mysqli']->query($insert_new) or die('Failed to insert startup items: '.$GLOBALS['mysqli']->error); } // Add simplecmd if(empty($simplecmd)) $simplecmd = $def_simple_cmd; - @mysql_query("UPDATE servers SET simplecmd = '$simplecmd' WHERE id = '$srv_id'"); + $GLOBALS['mysqli']->query("UPDATE servers SET simplecmd = '$simplecmd' WHERE id = '$srv_id'"); ############################################################################################ @@ -519,8 +519,8 @@ public function create($netid,$gameid,$ownerid,$tplid,$port,$description,$total_ if($result_net_create != 'success') { // Failed on Remote Creation; delete this server - #@mysql_query("DELETE FROM servers WHERE id = '$srv_id'") or die('Failed to delete the server from the database'); - #@mysql_query("DELETE FROM servers_startup WHERE srvid = '$srv_id'") or die('Failed to delete the server startups from the database'); + #$GLOBALS['mysqli']->query("DELETE FROM servers WHERE id = '$srv_id'") or die('Failed to delete the server from the database'); + #$GLOBALS['mysqli']->query("DELETE FROM servers_startup WHERE srvid = '$srv_id'") or die('Failed to delete the server startups from the database'); $this->delete_soft($srv_id); return 'Remote Failed: '.$result_net_create; @@ -582,8 +582,8 @@ public function delete_soft($srvid) { if(empty($srvid)) return 'No server ID given'; // Delete from db - @mysql_query("DELETE FROM servers WHERE id = '$srvid'") or die('Failed to delete server from database!'); - @mysql_query("DELETE FROM servers_startup WHERE srvid = '$srvid'") or die('Failed to delete server startup items from database!'); + $GLOBALS['mysqli']->query("DELETE FROM servers WHERE id = '$srvid'") or die('Failed to delete server from database!'); + $GLOBALS['mysqli']->query("DELETE FROM servers_startup WHERE srvid = '$srvid'") or die('Failed to delete server startup items from database!'); return true; } @@ -643,9 +643,9 @@ public function update_startup_cmd($srvid,$srv_ip,$srv_port) if(empty($srvid) || empty($srv_ip) || empty($srv_port)) return 'Insufficient info given!'; $simplecmd = ''; - $result_smp = @mysql_query("SELECT cmd_item,cmd_value FROM servers_startup WHERE srvid = '$srvid' ORDER BY sort_order ASC") or die('Failed to get startup item list!'); + $result_smp = $GLOBALS['mysqli']->query("SELECT cmd_item,cmd_value FROM servers_startup WHERE srvid = '$srvid' ORDER BY sort_order ASC") or die('Failed to get startup item list!'); - while($row_smp = mysql_fetch_array($result_smp)) + while($row_smp = $result_smp->fetch_array()) { $cmd_item = $row_smp['cmd_item']; $cmd_val = $row_smp['cmd_value']; @@ -673,7 +673,7 @@ public function update_startup_cmd($srvid,$srv_ip,$srv_port) } // Update new simplecmd - @mysql_query("UPDATE servers SET simplecmd = '$simplecmd' WHERE id = '$srvid'") or die('Failed to update cmd!'); + $GLOBALS['mysqli']->query("UPDATE servers SET simplecmd = '$simplecmd' WHERE id = '$srvid'") or die('Failed to update cmd!'); return 'success'; } @@ -686,8 +686,8 @@ public function moveserver($srvid,$orig_userid,$orig_username,$orig_netid,$orig_ // Get new username if($new_userid != $orig_userid) { - $result_nu = @mysql_query("SELECT username FROM users WHERE id = '$new_userid' LIMIT 1") or die('Failed to query for username'); - $row_nu = mysql_fetch_row($result_nu); + $result_nu = $GLOBALS['mysqli']->query("SELECT username FROM users WHERE id = '$new_userid' LIMIT 1") or die('Failed to query for username'); + $row_nu = $result_nu->fetch_row(); $new_username = $row_nu[0]; } // Not moving users, just use original username @@ -697,8 +697,8 @@ public function moveserver($srvid,$orig_userid,$orig_username,$orig_netid,$orig_ } // Get current IP - $result_nip = @mysql_query("SELECT ip FROM network WHERE id = '$new_netid' LIMIT 1") or die('Failed to query for new IP'); - $row_nip = mysql_fetch_row($result_nip); + $result_nip = $GLOBALS['mysqli']->query("SELECT ip FROM network WHERE id = '$new_netid' LIMIT 1") or die('Failed to query for new IP'); + $row_nip = $result_nip->fetch_row(); $new_ip = $row_nip[0]; // Check required @@ -795,8 +795,8 @@ public function get_avail_ip_port($intname,$port='') // Get default port for this server type if(empty($port)) { - $result_def = @mysql_query("SELECT port FROM default_games WHERE intname = '$intname' ORDER BY intname DESC LIMIT 1") or die('Failed to query for default port!'); - $row_def = mysql_fetch_row($result_def); + $result_def = $GLOBALS['mysqli']->query("SELECT port FROM default_games WHERE intname = '$intname' ORDER BY intname DESC LIMIT 1") or die('Failed to query for default port!'); + $row_def = $result_def->fetch_row(); $default_port = $row_def[0]; } // Let the port be specified if needed @@ -806,15 +806,15 @@ public function get_avail_ip_port($intname,$port='') } // Get network server with lowest load - $result_low = @mysql_query("SELECT netid FROM loadavg GROUP BY netid ORDER BY load_avg ASC LIMIT 1"); - $row_low = mysql_fetch_row($result_low); + $result_low = $GLOBALS['mysqli']->query("SELECT netid FROM loadavg GROUP BY netid ORDER BY load_avg ASC LIMIT 1"); + $row_low = $result_low->fetch_row(); $this_netid = $row_low[0]; if(empty($this_netid)) { // Check if we're local (if local, no remote would call home anyway) - $result_loc = @mysql_query("SELECT id,is_local FROM network WHERE parentid = '0'"); - $row_loc = mysql_fetch_row($result_loc); + $result_loc = $GLOBALS['mysqli']->query("SELECT id,is_local FROM network WHERE parentid = '0'"); + $row_loc = $result_loc->fetch_row(); $this_netid = $row_loc[0]; $net_local = $row_loc[1]; @@ -823,7 +823,7 @@ public function get_avail_ip_port($intname,$port='') } // Try and use up all IP's with default ports first - $result_low = @mysql_query("SELECT + $result_low = $GLOBALS['mysqli']->query("SELECT n.id, n.is_local, s.port @@ -835,7 +835,7 @@ public function get_avail_ip_port($intname,$port='') // Store that stuff in an array since we'll use it more than once $net_ips_arr = array(); - while($row_ips = mysql_fetch_assoc($result_low)) + while($row_ips = $result_low->fetch_assoc()) { $net_ips_arr[] = $row_ips; } @@ -880,7 +880,7 @@ public function get_avail_ip_port($intname,$port='') for($i=$default_port+10; $i <= $default_port+60; $i++) { // No good very bad method! Need to find a better way that doesn't potentially re-query mysql so many times. - $result_av = @mysql_query("SELECT + $result_av = $GLOBALS['mysqli']->query("SELECT n.id AS netid, s.port FROM network AS n @@ -889,7 +889,7 @@ public function get_avail_ip_port($intname,$port='') s.port = '$i' LIMIT 1"); - $row_av = mysql_fetch_row($result_av); + $row_av = $result_av->fetch_row(); $found_netid = $row_av[0]; $found_port = $row_av[1]; diff --git a/includes/classes/templates.php b/includes/classes/templates.php index 4784f0f..be5603e 100644 --- a/includes/classes/templates.php +++ b/includes/classes/templates.php @@ -15,8 +15,8 @@ public function create($netid,$gameid,$file_path,$description,$is_def) if(empty($file_path)) { // Check if Steam if no file path given - $result_stm = @mysql_query("SELECT steam,steam_name,install_mirrors,install_cmd FROM default_games WHERE id = '$gameid' LIMIT 1"); - $row_stm = mysql_fetch_row($result_stm); + $result_stm = $GLOBALS['mysqli']->query("SELECT steam,steam_name,install_mirrors,install_cmd FROM default_games WHERE id = '$gameid' LIMIT 1"); + $row_stm = $result_stm->fetch_row(); $is_steam = $row_stm[0]; $steam_name = $row_stm[1]; $install_mirrors = $row_stm[2]; @@ -30,11 +30,11 @@ public function create($netid,$gameid,$file_path,$description,$is_def) ################################################################ // Mark old defaults as non-default now - if($is_def) @mysql_query("UPDATE templates SET is_default = '0' WHERE netid = '$netid' AND cfgid = '$gameid'"); + if($is_def) $GLOBALS['mysqli']->query("UPDATE templates SET is_default = '0' WHERE netid = '$netid' AND cfgid = '$gameid'"); // Insert - @mysql_query("INSERT INTO templates (netid,cfgid,date_created,is_default,status,token,description,file_path) VALUES('$netid','$gameid',NOW(),'$is_def','$tpl_status','$remote_token','$description','$file_path')") or die('Failed to insert template'); - $tpl_id = mysql_insert_id(); + $GLOBALS['mysqli']->query("INSERT INTO templates (netid,cfgid,date_created,is_default,status,token,description,file_path) VALUES('$netid','$gameid',NOW(),'$is_def','$tpl_status','$remote_token','$description','$file_path')") or die('Failed to insert template with error: ' . $GLOBALS['mysqli']->error); + $tpl_id = $GLOBALS['mysqli']->insert_id; if(empty($tpl_id)) return 'No template ID created! An unknown error occured.'; ################################################################ @@ -121,7 +121,7 @@ public function create($netid,$gameid,$file_path,$description,$is_def) else { // Delete this template since it didn't start - @mysql_query("DELETE FROM templates WHERE id = '$tpl_id'") or die('Failed to delete the template from the database'); + $GLOBALS['mysqli']->query("DELETE FROM templates WHERE id = '$tpl_id'") or die('Failed to delete the template from the database'); return '
'; } @@ -130,7 +130,7 @@ public function create($netid,$gameid,$file_path,$description,$is_def) elseif(preg_match('/That\ directory\ was\ not\ found/', $cmd_out)) { // Delete this template since it didn't start - @mysql_query("DELETE FROM templates WHERE id = '$tpl_id'") or die('Failed to delete the template from the database'); + $GLOBALS['mysqli']->query("DELETE FROM templates WHERE id = '$tpl_id'") or die('Failed to delete the template from the database'); return $cmd_out; } // OK @@ -153,12 +153,12 @@ public function delete($tplid) if(empty($tplid)) return 'Delete: No template ID provided!'; // Get netid - $result_nid = @mysql_query("SELECT netid FROM templates WHERE id = '$tplid' LIMIT 1"); - $row_nid = mysql_fetch_row($result_nid); + $result_nid = $GLOBALS['mysqli']->query("SELECT netid FROM templates WHERE id = '$tplid' LIMIT 1"); + $row_nid = $result_nid->fetch_row(); $netid = $row_nid[0]; // Delete from DB - @mysql_query("DELETE FROM templates WHERE id = '$tplid'") or die('Failed to delete the template row!'); + $GLOBALS['mysqli']->query("DELETE FROM templates WHERE id = '$tplid'") or die('Failed to delete the template row!'); // Run network deletion diff --git a/includes/classes/users.php b/includes/classes/users.php index 559f5fa..a117c62 100644 --- a/includes/classes/users.php +++ b/includes/classes/users.php @@ -23,8 +23,8 @@ public function create($username,$password,$email,$first_name,$last_name) if($password == '123' || $password == '1234' || $password == '12345' || $password == 'password' || $password == 'pass123' || $password == 'pass1234' || $password == 'pass12345') return 'Sorry, please choose a real password!'; // Check existing username - $result_ck = @mysql_query("SELECT id FROM users WHERE username = '$username' AND deleted = '0' LIMIT 1"); - $row_ck = mysql_fetch_row($result_ck); + $result_ck = $GLOBALS['mysqli']->query("SELECT id FROM users WHERE username = '$username' AND deleted = '0' LIMIT 1"); + $row_ck = $result_ck->fetch_row(); if($row_ck[0]) return $lang['user_exists']; // Setup SSO (Single Sign On) login @@ -32,8 +32,8 @@ public function create($username,$password,$email,$first_name,$last_name) $enc_key = $settings['enc_key']; if(empty($enc_key)) return 'No encryption key found! Check your /configuration.php file.'; - @mysql_query("INSERT INTO users (date_created,sso_user,sso_pass,username,password,email_address,first_name,last_name) VALUES(NOW(),AES_ENCRYPT('$username', '$enc_key'),AES_ENCRYPT('$password', '$enc_key'),'$username',MD5('$password'),'$email','$first_name','$last_name')") or die('Failed to create user: '.mysql_error()); - $this_userid = mysql_insert_id(); + $GLOBALS['mysqli']->query("INSERT INTO users (date_created,sso_user,sso_pass,username,password,email_address,first_name,last_name) VALUES(NOW(),AES_ENCRYPT('$username', '$enc_key'),AES_ENCRYPT('$password', '$enc_key'),'$username',MD5('$password'),'$email','$first_name','$last_name')") or die('Failed to create user: '.$GLOBALS['mysqli']->error); + $this_userid = $GLOBALS['mysqli']->insert_id; // Output @@ -76,8 +76,8 @@ public function update($userid,$username,$password,$email,$first_name,$last_name $theme = strip_tags($theme); // Get current username before any changes - $result_cur = @mysql_query("SELECT username FROM users WHERE id = '$userid' LIMIT 1"); - $row_cur = mysql_fetch_row($result_cur); + $result_cur = $GLOBALS['mysqli']->query("SELECT username FROM users WHERE id = '$userid' LIMIT 1"); + $row_cur = $result_cur->fetch_row(); $cur_username = $row_cur[0]; require(DOCROOT.'/includes/classes/network.php'); @@ -99,19 +99,19 @@ public function update($userid,$username,$password,$email,$first_name,$last_name #$sso_user = $Core->genstring(6) . base64_encode($sso_user) . $Core->genstring(6); #$sso_pass = $Core->genstring(6) . base64_encode($sso_pass) . $Core->genstring(6); - @mysql_query("UPDATE users SET last_updated = NOW(),theme = '$theme',sso_user = AES_ENCRYPT('$sso_user', '$enc_key'),language = '$language',username = '$username',email_address = '$email',first_name = '$first_name',last_name = '$last_name'$sql_pass WHERE id = '$userid'") or die('Failed to update user'); + $GLOBALS['mysqli']->query("UPDATE users SET last_updated = NOW(),theme = '$theme',sso_user = AES_ENCRYPT('$sso_user', '$enc_key'),language = '$language',username = '$username',email_address = '$email',first_name = '$first_name',last_name = '$last_name'$sql_pass WHERE id = '$userid'") or die('Failed to update user'); } // Otherwise update basic settings else { - @mysql_query("UPDATE users SET last_updated = NOW(),theme = '$theme',language = '$language',email_address = '$email',first_name = '$first_name',last_name = '$last_name' WHERE id = '$userid'") or die('Failed to update user'); + $GLOBALS['mysqli']->query("UPDATE users SET last_updated = NOW(),theme = '$theme',language = '$language',email_address = '$email',first_name = '$first_name',last_name = '$last_name' WHERE id = '$userid'") or die('Failed to update user'); } } // User updating their account else { - @mysql_query("UPDATE users SET last_updated = NOW(),theme = '$theme',language = '$language',email_address = '$email',first_name = '$first_name',last_name = '$last_name'$sql_pass WHERE id = '$userid'") or die('Failed to update your account!'); + $GLOBALS['mysqli']->query("UPDATE users SET last_updated = NOW(),theme = '$theme',language = '$language',email_address = '$email',first_name = '$first_name',last_name = '$last_name'$sql_pass WHERE id = '$userid'") or die('Failed to update your account!'); // Update session $_SESSION['gpx_lang'] = strtolower($language); @@ -123,12 +123,12 @@ public function update($userid,$username,$password,$email,$first_name,$last_name // Change password on network servers if(!empty($password)) { - $result_net = @mysql_query("SELECT id FROM network WHERE parentid = '0' AND is_local = '0' ORDER BY ip ASC"); + $result_net = $GLOBALS['mysqli']->query("SELECT id FROM network WHERE parentid = '0' AND is_local = '0' ORDER BY ip ASC"); // Setup crypt pass $crypt_pass = crypt($password); - while($row_net = mysql_fetch_array($result_net)) + while($row_net = $result_net->fetch_array()) { $netid = $row_net['id']; $net_arr = $Network->netinfo($netid); @@ -151,8 +151,8 @@ public function update($userid,$username,$password,$email,$first_name,$last_name /* // Get most recent network server (multi server username changes unsupported currently) - $result_net = @mysql_query("SELECT netid FROM servers WHERE userid = '$userid' ORDER BY id DESC LIMIT 1"); - $row_net = mysql_fetch_row($result_net); + $result_net = $GLOBALS['mysqli']->query("SELECT netid FROM servers WHERE userid = '$userid' ORDER BY id DESC LIMIT 1"); + $row_net = mysqli_fetch_row($result_net); $latest_netid = $row_net[0]; echo "NETID: $latest_netid
"; @@ -174,9 +174,9 @@ public function update($userid,$username,$password,$email,$first_name,$last_name */ // Run this change everywhere - $result_net = @mysql_query("SELECT id FROM network WHERE parentid = '0' AND is_local = '0' ORDER BY ip ASC"); + $result_net = $GLOBALS['mysqli']->query("SELECT id FROM network WHERE parentid = '0' AND is_local = '0' ORDER BY ip ASC"); - while($row_net = mysql_fetch_array($result_net)) + while($row_net = $result_net->fetch_array()) { $netid = $row_net['id']; $net_arr = $Network->netinfo($netid); @@ -202,30 +202,30 @@ public function delete($userid) if(empty($userid)) return 'No User ID given!'; // Check if user even exists - $result_uex = @mysql_query("SELECT username FROM users WHERE id = '$userid' LIMIT 1"); - $row_uex = mysql_fetch_row($result_uex); + $result_uex = $GLOBALS['mysqli']->query("SELECT username FROM users WHERE id = '$userid' LIMIT 1"); + $row_uex = $result_uex->fetch_row(); $uex_username = $row_uex[0]; if(empty($uex_username)) return 'That user account no longer exists!'; // Not if they have servers - $result_net = @mysql_query("SELECT netid FROM servers WHERE userid = '$userid' ORDER BY id DESC LIMIT 1"); - $row_net = mysql_fetch_row($result_net); + $result_net = $GLOBALS['mysqli']->query("SELECT netid FROM servers WHERE userid = '$userid' ORDER BY id DESC LIMIT 1"); + $row_net = $result_net->fetch_row(); $latest_netid = $row_net[0]; if($latest_netid) return 'This user has server(s) on their account! Move the server(s) to another user or delete them and try again.'; // Admins only - if(isset($_SESSION['gpx_admin'])) @mysql_query("UPDATE users SET deleted = '1' WHERE id = '$userid'") or die('Failed to delete the user'); + if(isset($_SESSION['gpx_admin'])) $GLOBALS['mysqli']->query("UPDATE users SET deleted = '1' WHERE id = '$userid'") or die('Failed to delete the user'); else return 'You are not authorized to do this!'; ############################################# // Delete SSO account - $result_net = @mysql_query("SELECT id FROM network WHERE parentid = '0' AND is_local = '0' ORDER BY ip ASC"); + $result_net = $GLOBALS['mysqli']->query("SELECT id FROM network WHERE parentid = '0' AND is_local = '0' ORDER BY ip ASC"); require(DOCROOT.'/includes/classes/network.php'); $Network = new Network; - while($row_net = mysql_fetch_array($result_net)) + while($row_net = $result_net->fetch_array()) { $netid = $row_net['id']; $net_arr = $Network->netinfo($netid); diff --git a/install/install_actions.php b/install/install_actions.php index 6c14047..f8a2f65 100644 --- a/install/install_actions.php +++ b/install/install_actions.php @@ -17,7 +17,7 @@ // Check system requirements if(!isset($_SESSION['install_req'])) { - if(!function_exists('mysql_connect')) die('You do not have MySQL support (mysql_connect) built into PHP! Rebuild your PHP install with MySQL support and try again.'); + if(!function_exists('mysqli_connect')) die('You do not have MySQL support (mysqli_connect) built into PHP! Rebuild your PHP install with MySQL support and try again.'); elseif(!function_exists('curl_init')) die('You do not have Curl support (curl_init) built into PHP! Rebuild your PHP install with cURL support and try again.'); } @@ -35,8 +35,8 @@ $url_admin_email = $_POST['admin_email']; // Test DB Connection - @mysql_connect($url_db_host, $url_db_user, $url_db_pass) or die('Failed to connect to the database ('.mysql_error().'). Check your settings and try again.'); - @mysql_select_db($url_db_name) or die('Failed to select the database ('.mysql_error().'). Check your settings and try again.'); + $GLOBALS['mysqli'] = new mysqli($url_db_host, $url_db_user, $url_db_pass) or die('Failed to connect to the database ('.$GLOBALS['mysqli']->error.'). Check your settings and try again.'); + $GLOBALS['mysqli']->select_db($url_db_name) or die('Failed to select the database ('.$GLOBALS['mysqli']->error.'). Check your settings and try again.'); ##################################################################################### @@ -92,7 +92,7 @@ foreach($arr_data as $query) { $query = trim($query); - if($query) @mysql_query($query) or die('Failed to run SQL: '.mysql_error()); + if($query) $GLOBALS['mysqli']->query($query) or die('Failed to run SQL: '.$GLOBALS['mysqli']->error); } } else @@ -185,8 +185,9 @@ if(!isset($_SESSION['install_configitems'])) { $gpx_version = GPX_VERSION; - - @mysql_query("INSERT INTO `configuration` (`config_setting`, `config_value`) VALUES('default_email_address', '$url_admin_email'),('language', '$url_language'),('company', 'GamePanelX'),('theme', 'default'),('api_key', '$api_key'),('version', '$gpx_version'),('steam_login_user',''),('steam_login_pass',''),('steam_auth','')") or die('Failed to insert configuration items: '.mysql_error()); + $admin_id = $GLOBALS['mysqli']->query("SELECT id FROM admins WHERE username = '$url_admin_user' LIMIT 1"); + $admin_id = $admin_id->fetch_row()[0]; + $GLOBALS['mysqli']->query("INSERT INTO `configuration` (`config_setting`, `config_value`, `last_updated_by`) VALUES('default_email_address', '$url_admin_email',$admin_id),('language', '$url_language',$admin_id),('company', 'GamePanelX',$admin_id),('theme', 'default',$admin_id),('api_key', '$api_key',$admin_id),('version', '$gpx_version',$admin_id),('steam_login_user','',$admin_id),('steam_login_pass','',$admin_id),('steam_auth','',$admin_id)") or die('Failed to insert configuration items: '.$GLOBALS['mysqli']->error); } $_SESSION['install_configitems'] = 1; @@ -199,11 +200,11 @@ require(DOCROOT.'/includes/classes/network.php'); $Network = new Network; $result_net = $Network->create($_SERVER['SERVER_ADDR'],'1',PHP_OS,'','Auto-Generated Local Server','','',''); - + if($result_net != 'success') die('Failed to create default network server: '.$result_net); } $_SESSION['install_addnet'] = 1; - + ##################################################################################### // Create a default sample user @@ -214,7 +215,7 @@ $fk_pass = $Core->genstring(24); $enc_key = $rand_string; - @mysql_query("INSERT INTO users (date_created,sso_user,sso_pass,username,password,first_name,last_name) VALUES(NOW(),AES_ENCRYPT('$username', '$enc_key'),AES_ENCRYPT('$password', '$enc_key'),'$username',MD5('$fk_pass'),'Example','User')") or die('Failed to create user: '.mysql_error()); + $GLOBALS['mysqli']->query("INSERT INTO users (date_created,sso_user,sso_pass,username,password,first_name,last_name,email_address) VALUES(NOW(),AES_ENCRYPT('$username', '$enc_key'),AES_ENCRYPT('$password', '$enc_key'),'$username',MD5('$fk_pass'),'Example','User','example@example.com')") or die('Failed to create user: '.$GLOBALS['mysqli']->error); } $_SESSION['install_adduser'] = 1; diff --git a/install/sql/3.0.10.sql b/install/sql/3.0.10.sql old mode 100755 new mode 100644 index 42caed7..b56b6cf --- a/install/sql/3.0.10.sql +++ b/install/sql/3.0.10.sql @@ -3,10 +3,10 @@ CREATE TABLE IF NOT EXISTS `admins` ( `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0', `setpass_3010` tinyint(1) unsigned NOT NULL DEFAULT '0', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `username` varchar(16) NOT NULL, `password` varchar(255) NOT NULL, - `theme` varchar(64) NOT NULL, + `theme` varchar(64) NULL, `language` varchar(64) NOT NULL DEFAULT 'english', `email_address` varchar(255) NOT NULL, `first_name` varchar(128) NOT NULL, @@ -17,7 +17,7 @@ CREATE TABLE IF NOT EXISTS `admins` ( CREATE TABLE IF NOT EXISTS `configuration` ( `last_updated_by` int(10) unsigned NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `config_setting` varchar(64) NOT NULL, `config_value` varchar(255) NOT NULL, KEY `config_setting` (`config_setting`) @@ -83,7 +83,7 @@ CREATE TABLE IF NOT EXISTS `loadavg` ( CREATE TABLE IF NOT EXISTS `network` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `parentid` int(10) unsigned NOT NULL, + `parentid` int(10) unsigned NOT NULL DEFAULT '0', `is_local` tinyint(1) unsigned NOT NULL DEFAULT '0', `login_user` blob NOT NULL, `login_pass` blob NOT NULL, @@ -93,7 +93,7 @@ CREATE TABLE IF NOT EXISTS `network` ( `os` varchar(64) NOT NULL, `location` varchar(128) NOT NULL, `datacenter` varchar(128) NOT NULL, - `homedir` varchar(255) NOT NULL, + `homedir` varchar(255) NULL, PRIMARY KEY (`id`), KEY `parentid` (`parentid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -113,7 +113,7 @@ CREATE TABLE IF NOT EXISTS `resellers` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `language` varchar(64) NOT NULL DEFAULT 'english', `username` varchar(16) NOT NULL, `password` varchar(64) NOT NULL, @@ -134,7 +134,7 @@ CREATE TABLE IF NOT EXISTS `servers` ( `startup` tinyint(1) unsigned NOT NULL DEFAULT '1', `status` enum('none','installing','updating','failed','complete') NOT NULL DEFAULT 'none', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `token` varchar(32) NOT NULL, `map` varchar(255) NOT NULL, `rcon` varchar(255) NOT NULL, @@ -165,11 +165,11 @@ CREATE TABLE IF NOT EXISTS `templates` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `netid` int(10) unsigned NOT NULL, `cfgid` int(10) unsigned NOT NULL, - `steam_percent` tinyint(3) unsigned NOT NULL, + `steam_percent` tinyint(3) unsigned NOT NULL DEFAULT '0', `date_created` datetime NOT NULL, `is_default` tinyint(1) unsigned NOT NULL DEFAULT '0', `status` enum('none','running','steam_running','failed','tpl_running','complete') NOT NULL DEFAULT 'none', - `size` varchar(12) NOT NULL, + `size` varchar(12) NOT NULL DEFAULT '0', `token` varchar(32) NOT NULL, `description` varchar(255) NOT NULL, `file_path` varchar(400) NOT NULL, @@ -190,10 +190,10 @@ CREATE TABLE IF NOT EXISTS `users` ( `perm_chpass` tinyint(1) unsigned NOT NULL DEFAULT '1', `perm_updetails` tinyint(1) unsigned NOT NULL DEFAULT '1', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `sso_user` blob NOT NULL, `sso_pass` blob NOT NULL, - `theme` varchar(64) NOT NULL, + `theme` varchar(64) NULL, `language` varchar(64) NOT NULL DEFAULT 'english', `username` varchar(16) NOT NULL, `password` varchar(64) NOT NULL, diff --git a/install/sql/3.0.11.sql b/install/sql/3.0.11.sql old mode 100755 new mode 100644 index 59cf64b..effd62f --- a/install/sql/3.0.11.sql +++ b/install/sql/3.0.11.sql @@ -3,10 +3,10 @@ CREATE TABLE IF NOT EXISTS `admins` ( `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0', `setpass_3010` tinyint(1) unsigned NOT NULL DEFAULT '0', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `username` varchar(16) NOT NULL, `password` varchar(255) NOT NULL, - `theme` varchar(64) NOT NULL, + `theme` varchar(64) NULL, `language` varchar(64) NOT NULL DEFAULT 'english', `email_address` varchar(255) NOT NULL, `first_name` varchar(128) NOT NULL, @@ -17,7 +17,7 @@ CREATE TABLE IF NOT EXISTS `admins` ( CREATE TABLE IF NOT EXISTS `configuration` ( `last_updated_by` int(10) unsigned NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `config_setting` varchar(64) NOT NULL, `config_value` varchar(255) NOT NULL, KEY `config_setting` (`config_setting`) @@ -83,7 +83,7 @@ CREATE TABLE IF NOT EXISTS `loadavg` ( CREATE TABLE IF NOT EXISTS `network` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `parentid` int(10) unsigned NOT NULL, + `parentid` int(10) unsigned NOT NULL DEFAULT '0', `is_local` tinyint(1) unsigned NOT NULL DEFAULT '0', `login_user` blob NOT NULL, `login_pass` blob NOT NULL, @@ -93,7 +93,7 @@ CREATE TABLE IF NOT EXISTS `network` ( `os` varchar(64) NOT NULL, `location` varchar(128) NOT NULL, `datacenter` varchar(128) NOT NULL, - `homedir` varchar(255) NOT NULL, + `homedir` varchar(255) NULL, PRIMARY KEY (`id`), KEY `parentid` (`parentid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -113,7 +113,7 @@ CREATE TABLE IF NOT EXISTS `resellers` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `language` varchar(64) NOT NULL DEFAULT 'english', `username` varchar(16) NOT NULL, `password` varchar(64) NOT NULL, @@ -134,7 +134,7 @@ CREATE TABLE IF NOT EXISTS `servers` ( `startup` tinyint(1) unsigned NOT NULL DEFAULT '1', `status` enum('none','installing','updating','failed','complete') NOT NULL DEFAULT 'none', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `token` varchar(32) NOT NULL, `map` varchar(255) NOT NULL, `rcon` varchar(255) NOT NULL, @@ -165,11 +165,11 @@ CREATE TABLE IF NOT EXISTS `templates` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `netid` int(10) unsigned NOT NULL, `cfgid` int(10) unsigned NOT NULL, - `steam_percent` tinyint(3) unsigned NOT NULL, + `steam_percent` tinyint(3) unsigned NOT NULL DEFAULT '0', `date_created` datetime NOT NULL, `is_default` tinyint(1) unsigned NOT NULL DEFAULT '0', `status` enum('none','running','steam_running','failed','tpl_running','complete') NOT NULL DEFAULT 'none', - `size` varchar(12) NOT NULL, + `size` varchar(12) NOT NULL DEFAULT '0', `token` varchar(32) NOT NULL, `description` varchar(255) NOT NULL, `file_path` varchar(400) NOT NULL, @@ -190,10 +190,10 @@ CREATE TABLE IF NOT EXISTS `users` ( `perm_chpass` tinyint(1) unsigned NOT NULL DEFAULT '1', `perm_updetails` tinyint(1) unsigned NOT NULL DEFAULT '1', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `sso_user` blob NOT NULL, `sso_pass` blob NOT NULL, - `theme` varchar(64) NOT NULL, + `theme` varchar(64) NULL, `language` varchar(64) NOT NULL DEFAULT 'english', `username` varchar(16) NOT NULL, `password` varchar(64) NOT NULL, diff --git a/install/sql/3.0.12.sql b/install/sql/3.0.12.sql old mode 100755 new mode 100644 index 59cf64b..effd62f --- a/install/sql/3.0.12.sql +++ b/install/sql/3.0.12.sql @@ -3,10 +3,10 @@ CREATE TABLE IF NOT EXISTS `admins` ( `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0', `setpass_3010` tinyint(1) unsigned NOT NULL DEFAULT '0', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `username` varchar(16) NOT NULL, `password` varchar(255) NOT NULL, - `theme` varchar(64) NOT NULL, + `theme` varchar(64) NULL, `language` varchar(64) NOT NULL DEFAULT 'english', `email_address` varchar(255) NOT NULL, `first_name` varchar(128) NOT NULL, @@ -17,7 +17,7 @@ CREATE TABLE IF NOT EXISTS `admins` ( CREATE TABLE IF NOT EXISTS `configuration` ( `last_updated_by` int(10) unsigned NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `config_setting` varchar(64) NOT NULL, `config_value` varchar(255) NOT NULL, KEY `config_setting` (`config_setting`) @@ -83,7 +83,7 @@ CREATE TABLE IF NOT EXISTS `loadavg` ( CREATE TABLE IF NOT EXISTS `network` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `parentid` int(10) unsigned NOT NULL, + `parentid` int(10) unsigned NOT NULL DEFAULT '0', `is_local` tinyint(1) unsigned NOT NULL DEFAULT '0', `login_user` blob NOT NULL, `login_pass` blob NOT NULL, @@ -93,7 +93,7 @@ CREATE TABLE IF NOT EXISTS `network` ( `os` varchar(64) NOT NULL, `location` varchar(128) NOT NULL, `datacenter` varchar(128) NOT NULL, - `homedir` varchar(255) NOT NULL, + `homedir` varchar(255) NULL, PRIMARY KEY (`id`), KEY `parentid` (`parentid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -113,7 +113,7 @@ CREATE TABLE IF NOT EXISTS `resellers` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `language` varchar(64) NOT NULL DEFAULT 'english', `username` varchar(16) NOT NULL, `password` varchar(64) NOT NULL, @@ -134,7 +134,7 @@ CREATE TABLE IF NOT EXISTS `servers` ( `startup` tinyint(1) unsigned NOT NULL DEFAULT '1', `status` enum('none','installing','updating','failed','complete') NOT NULL DEFAULT 'none', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `token` varchar(32) NOT NULL, `map` varchar(255) NOT NULL, `rcon` varchar(255) NOT NULL, @@ -165,11 +165,11 @@ CREATE TABLE IF NOT EXISTS `templates` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `netid` int(10) unsigned NOT NULL, `cfgid` int(10) unsigned NOT NULL, - `steam_percent` tinyint(3) unsigned NOT NULL, + `steam_percent` tinyint(3) unsigned NOT NULL DEFAULT '0', `date_created` datetime NOT NULL, `is_default` tinyint(1) unsigned NOT NULL DEFAULT '0', `status` enum('none','running','steam_running','failed','tpl_running','complete') NOT NULL DEFAULT 'none', - `size` varchar(12) NOT NULL, + `size` varchar(12) NOT NULL DEFAULT '0', `token` varchar(32) NOT NULL, `description` varchar(255) NOT NULL, `file_path` varchar(400) NOT NULL, @@ -190,10 +190,10 @@ CREATE TABLE IF NOT EXISTS `users` ( `perm_chpass` tinyint(1) unsigned NOT NULL DEFAULT '1', `perm_updetails` tinyint(1) unsigned NOT NULL DEFAULT '1', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `sso_user` blob NOT NULL, `sso_pass` blob NOT NULL, - `theme` varchar(64) NOT NULL, + `theme` varchar(64) NULL, `language` varchar(64) NOT NULL DEFAULT 'english', `username` varchar(16) NOT NULL, `password` varchar(64) NOT NULL, diff --git a/install/sql/3.0.3.sql b/install/sql/3.0.3.sql old mode 100755 new mode 100644 index 1e3bbe9..439d544 --- a/install/sql/3.0.3.sql +++ b/install/sql/3.0.3.sql @@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `admins` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `username` varchar(16) NOT NULL, `password` varchar(64) NOT NULL, `email_address` varchar(255) NOT NULL, @@ -14,7 +14,7 @@ CREATE TABLE IF NOT EXISTS `admins` ( CREATE TABLE IF NOT EXISTS `configuration` ( `last_updated_by` int(10) unsigned NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `config_setting` varchar(64) NOT NULL, `config_value` varchar(255) NOT NULL, KEY `config_setting` (`config_setting`) @@ -41,7 +41,7 @@ CREATE TABLE IF NOT EXISTS `default_games` ( CREATE TABLE IF NOT EXISTS `network` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `parentid` int(10) unsigned NOT NULL, + `parentid` int(10) unsigned NOT NULL DEFAULT '0', `is_local` tinyint(1) unsigned NOT NULL DEFAULT '0', `login_user` blob NOT NULL, `login_pass` blob NOT NULL, @@ -50,7 +50,7 @@ CREATE TABLE IF NOT EXISTS `network` ( `os` varchar(64) NOT NULL, `location` varchar(128) NOT NULL, `datacenter` varchar(128) NOT NULL, - `homedir` varchar(255) NOT NULL, + `homedir` varchar(255) NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -80,7 +80,7 @@ CREATE TABLE IF NOT EXISTS `resellers` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `username` varchar(16) NOT NULL, `password` varchar(64) NOT NULL, `email_address` varchar(255) NOT NULL, @@ -100,7 +100,7 @@ CREATE TABLE IF NOT EXISTS `servers` ( `type` enum('game','voice') NOT NULL DEFAULT 'game', `status` enum('none','installing','updating','failed','complete') NOT NULL DEFAULT 'none', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `token` varchar(32) NOT NULL, `working_dir` varchar(255) NOT NULL, `pid_file` varchar(255) NOT NULL, @@ -128,7 +128,7 @@ CREATE TABLE IF NOT EXISTS `templates` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `netid` int(10) unsigned NOT NULL, `cfgid` int(10) unsigned NOT NULL, - `steam_percent` tinyint(3) unsigned NOT NULL, + `steam_percent` tinyint(3) unsigned NOT NULL DEFAULT '0', `date_created` datetime NOT NULL, `is_default` tinyint(1) unsigned NOT NULL DEFAULT '0', `status` enum('none','running','steam_running','failed','tpl_running','complete') NOT NULL DEFAULT 'none', @@ -153,7 +153,7 @@ CREATE TABLE IF NOT EXISTS `users` ( `perm_chpass` tinyint(1) unsigned NOT NULL DEFAULT '1', `perm_updetails` tinyint(1) unsigned NOT NULL DEFAULT '1', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `username` varchar(16) NOT NULL, `password` varchar(64) NOT NULL, `email_address` varchar(255) NOT NULL, diff --git a/install/sql/3.0.4.sql b/install/sql/3.0.4.sql old mode 100755 new mode 100644 index 2d4b96f..2bc0614 --- a/install/sql/3.0.4.sql +++ b/install/sql/3.0.4.sql @@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `admins` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `username` varchar(16) NOT NULL, `password` varchar(64) NOT NULL, `email_address` varchar(255) NOT NULL, @@ -14,7 +14,7 @@ CREATE TABLE IF NOT EXISTS `admins` ( CREATE TABLE IF NOT EXISTS `configuration` ( `last_updated_by` int(10) unsigned NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `config_setting` varchar(64) NOT NULL, `config_value` varchar(255) NOT NULL, KEY `config_setting` (`config_setting`) @@ -42,7 +42,7 @@ CREATE TABLE IF NOT EXISTS `default_games` ( CREATE TABLE IF NOT EXISTS `network` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `parentid` int(10) unsigned NOT NULL, + `parentid` int(10) unsigned NOT NULL DEFAULT '0', `is_local` tinyint(1) unsigned NOT NULL DEFAULT '0', `login_user` blob NOT NULL, `login_pass` blob NOT NULL, @@ -51,7 +51,7 @@ CREATE TABLE IF NOT EXISTS `network` ( `os` varchar(64) NOT NULL, `location` varchar(128) NOT NULL, `datacenter` varchar(128) NOT NULL, - `homedir` varchar(255) NOT NULL, + `homedir` varchar(255) NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -81,7 +81,7 @@ CREATE TABLE IF NOT EXISTS `resellers` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `username` varchar(16) NOT NULL, `password` varchar(64) NOT NULL, `email_address` varchar(255) NOT NULL, @@ -101,7 +101,7 @@ CREATE TABLE IF NOT EXISTS `servers` ( `type` enum('game','voice') NOT NULL DEFAULT 'game', `status` enum('none','installing','updating','failed','complete') NOT NULL DEFAULT 'none', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `token` varchar(32) NOT NULL, `working_dir` varchar(255) NOT NULL, `pid_file` varchar(255) NOT NULL, @@ -129,7 +129,7 @@ CREATE TABLE IF NOT EXISTS `templates` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `netid` int(10) unsigned NOT NULL, `cfgid` int(10) unsigned NOT NULL, - `steam_percent` tinyint(3) unsigned NOT NULL, + `steam_percent` tinyint(3) unsigned NOT NULL DEFAULT '0', `date_created` datetime NOT NULL, `is_default` tinyint(1) unsigned NOT NULL DEFAULT '0', `status` enum('none','running','steam_running','failed','tpl_running','complete') NOT NULL DEFAULT 'none', @@ -154,7 +154,7 @@ CREATE TABLE IF NOT EXISTS `users` ( `perm_chpass` tinyint(1) unsigned NOT NULL DEFAULT '1', `perm_updetails` tinyint(1) unsigned NOT NULL DEFAULT '1', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `username` varchar(16) NOT NULL, `password` varchar(64) NOT NULL, `email_address` varchar(255) NOT NULL, diff --git a/install/sql/3.0.5.sql b/install/sql/3.0.5.sql old mode 100755 new mode 100644 index 2d4b96f..2bc0614 --- a/install/sql/3.0.5.sql +++ b/install/sql/3.0.5.sql @@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `admins` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `username` varchar(16) NOT NULL, `password` varchar(64) NOT NULL, `email_address` varchar(255) NOT NULL, @@ -14,7 +14,7 @@ CREATE TABLE IF NOT EXISTS `admins` ( CREATE TABLE IF NOT EXISTS `configuration` ( `last_updated_by` int(10) unsigned NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `config_setting` varchar(64) NOT NULL, `config_value` varchar(255) NOT NULL, KEY `config_setting` (`config_setting`) @@ -42,7 +42,7 @@ CREATE TABLE IF NOT EXISTS `default_games` ( CREATE TABLE IF NOT EXISTS `network` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `parentid` int(10) unsigned NOT NULL, + `parentid` int(10) unsigned NOT NULL DEFAULT '0', `is_local` tinyint(1) unsigned NOT NULL DEFAULT '0', `login_user` blob NOT NULL, `login_pass` blob NOT NULL, @@ -51,7 +51,7 @@ CREATE TABLE IF NOT EXISTS `network` ( `os` varchar(64) NOT NULL, `location` varchar(128) NOT NULL, `datacenter` varchar(128) NOT NULL, - `homedir` varchar(255) NOT NULL, + `homedir` varchar(255) NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -81,7 +81,7 @@ CREATE TABLE IF NOT EXISTS `resellers` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `username` varchar(16) NOT NULL, `password` varchar(64) NOT NULL, `email_address` varchar(255) NOT NULL, @@ -101,7 +101,7 @@ CREATE TABLE IF NOT EXISTS `servers` ( `type` enum('game','voice') NOT NULL DEFAULT 'game', `status` enum('none','installing','updating','failed','complete') NOT NULL DEFAULT 'none', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `token` varchar(32) NOT NULL, `working_dir` varchar(255) NOT NULL, `pid_file` varchar(255) NOT NULL, @@ -129,7 +129,7 @@ CREATE TABLE IF NOT EXISTS `templates` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `netid` int(10) unsigned NOT NULL, `cfgid` int(10) unsigned NOT NULL, - `steam_percent` tinyint(3) unsigned NOT NULL, + `steam_percent` tinyint(3) unsigned NOT NULL DEFAULT '0', `date_created` datetime NOT NULL, `is_default` tinyint(1) unsigned NOT NULL DEFAULT '0', `status` enum('none','running','steam_running','failed','tpl_running','complete') NOT NULL DEFAULT 'none', @@ -154,7 +154,7 @@ CREATE TABLE IF NOT EXISTS `users` ( `perm_chpass` tinyint(1) unsigned NOT NULL DEFAULT '1', `perm_updetails` tinyint(1) unsigned NOT NULL DEFAULT '1', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `username` varchar(16) NOT NULL, `password` varchar(64) NOT NULL, `email_address` varchar(255) NOT NULL, diff --git a/install/sql/3.0.6.sql b/install/sql/3.0.6.sql old mode 100755 new mode 100644 index 197adbe..d1262fd --- a/install/sql/3.0.6.sql +++ b/install/sql/3.0.6.sql @@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `admins` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `username` varchar(16) NOT NULL, `password` varchar(64) NOT NULL, `language` varchar(64) NOT NULL DEFAULT 'english', @@ -15,7 +15,7 @@ CREATE TABLE IF NOT EXISTS `admins` ( CREATE TABLE IF NOT EXISTS `configuration` ( `last_updated_by` int(10) unsigned NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `config_setting` varchar(64) NOT NULL, `config_value` varchar(255) NOT NULL, KEY `config_setting` (`config_setting`) @@ -43,7 +43,7 @@ CREATE TABLE IF NOT EXISTS `default_games` ( CREATE TABLE IF NOT EXISTS `network` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `parentid` int(10) unsigned NOT NULL, + `parentid` int(10) unsigned NOT NULL DEFAULT '0', `is_local` tinyint(1) unsigned NOT NULL DEFAULT '0', `login_user` blob NOT NULL, `login_pass` blob NOT NULL, @@ -52,7 +52,7 @@ CREATE TABLE IF NOT EXISTS `network` ( `os` varchar(64) NOT NULL, `location` varchar(128) NOT NULL, `datacenter` varchar(128) NOT NULL, - `homedir` varchar(255) NOT NULL, + `homedir` varchar(255) NULL, PRIMARY KEY (`id`), KEY `parentid` (`parentid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -85,7 +85,7 @@ CREATE TABLE IF NOT EXISTS `resellers` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `language` varchar(64) NOT NULL DEFAULT 'english', `username` varchar(16) NOT NULL, `password` varchar(64) NOT NULL, @@ -106,7 +106,7 @@ CREATE TABLE IF NOT EXISTS `servers` ( `type` enum('game','voice') NOT NULL DEFAULT 'game', `status` enum('none','installing','updating','failed','complete') NOT NULL DEFAULT 'none', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `token` varchar(32) NOT NULL, `working_dir` varchar(255) NOT NULL, `pid_file` varchar(255) NOT NULL, @@ -134,7 +134,7 @@ CREATE TABLE IF NOT EXISTS `templates` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `netid` int(10) unsigned NOT NULL, `cfgid` int(10) unsigned NOT NULL, - `steam_percent` tinyint(3) unsigned NOT NULL, + `steam_percent` tinyint(3) unsigned NOT NULL DEFAULT '0', `date_created` datetime NOT NULL, `is_default` tinyint(1) unsigned NOT NULL DEFAULT '0', `status` enum('none','running','steam_running','failed','tpl_running','complete') NOT NULL DEFAULT 'none', @@ -158,7 +158,7 @@ CREATE TABLE IF NOT EXISTS `users` ( `perm_chpass` tinyint(1) unsigned NOT NULL DEFAULT '1', `perm_updetails` tinyint(1) unsigned NOT NULL DEFAULT '1', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `language` varchar(64) NOT NULL DEFAULT 'english', `username` varchar(16) NOT NULL, `password` varchar(64) NOT NULL, diff --git a/install/sql/3.0.8.sql b/install/sql/3.0.8.sql old mode 100755 new mode 100644 index 790630c..78f9c0a --- a/install/sql/3.0.8.sql +++ b/install/sql/3.0.8.sql @@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `admins` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `username` varchar(16) NOT NULL, `password` varchar(64) NOT NULL, `theme` varchar(64) NOT NULL DEFAULT 'default', @@ -16,7 +16,7 @@ CREATE TABLE IF NOT EXISTS `admins` ( CREATE TABLE IF NOT EXISTS `configuration` ( `last_updated_by` int(10) unsigned NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `config_setting` varchar(64) NOT NULL, `config_value` varchar(255) NOT NULL, KEY `config_setting` (`config_setting`) @@ -58,7 +58,7 @@ CREATE TABLE IF NOT EXISTS `default_games` ( CREATE TABLE IF NOT EXISTS `network` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `parentid` int(10) unsigned NOT NULL, + `parentid` int(10) unsigned NOT NULL DEFAULT '0', `is_local` tinyint(1) unsigned NOT NULL DEFAULT '0', `login_user` blob NOT NULL, `login_pass` blob NOT NULL, @@ -67,7 +67,7 @@ CREATE TABLE IF NOT EXISTS `network` ( `os` varchar(64) NOT NULL, `location` varchar(128) NOT NULL, `datacenter` varchar(128) NOT NULL, - `homedir` varchar(255) NOT NULL, + `homedir` varchar(255) NULL, PRIMARY KEY (`id`), KEY `parentid` (`parentid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -100,7 +100,7 @@ CREATE TABLE IF NOT EXISTS `resellers` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `language` varchar(64) NOT NULL DEFAULT 'english', `username` varchar(16) NOT NULL, `password` varchar(64) NOT NULL, @@ -122,7 +122,7 @@ CREATE TABLE IF NOT EXISTS `servers` ( `type` enum('game','voice') NOT NULL DEFAULT 'game', `status` enum('none','installing','updating','failed','complete') NOT NULL DEFAULT 'none', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `token` varchar(32) NOT NULL, `map` varchar(255) NOT NULL, `rcon` varchar(255) NOT NULL, @@ -154,7 +154,7 @@ CREATE TABLE IF NOT EXISTS `templates` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `netid` int(10) unsigned NOT NULL, `cfgid` int(10) unsigned NOT NULL, - `steam_percent` tinyint(3) unsigned NOT NULL, + `steam_percent` tinyint(3) unsigned NOT NULL DEFAULT '0', `date_created` datetime NOT NULL, `is_default` tinyint(1) unsigned NOT NULL DEFAULT '0', `status` enum('none','running','steam_running','failed','tpl_running','complete') NOT NULL DEFAULT 'none', @@ -178,7 +178,7 @@ CREATE TABLE IF NOT EXISTS `users` ( `perm_chpass` tinyint(1) unsigned NOT NULL DEFAULT '1', `perm_updetails` tinyint(1) unsigned NOT NULL DEFAULT '1', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `theme` varchar(64) NOT NULL DEFAULT 'default', `language` varchar(64) NOT NULL DEFAULT 'english', `username` varchar(16) NOT NULL, diff --git a/install/sql/3.0.sql b/install/sql/3.0.sql old mode 100755 new mode 100644 index 1e3bbe9..439d544 --- a/install/sql/3.0.sql +++ b/install/sql/3.0.sql @@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `admins` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `username` varchar(16) NOT NULL, `password` varchar(64) NOT NULL, `email_address` varchar(255) NOT NULL, @@ -14,7 +14,7 @@ CREATE TABLE IF NOT EXISTS `admins` ( CREATE TABLE IF NOT EXISTS `configuration` ( `last_updated_by` int(10) unsigned NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `config_setting` varchar(64) NOT NULL, `config_value` varchar(255) NOT NULL, KEY `config_setting` (`config_setting`) @@ -41,7 +41,7 @@ CREATE TABLE IF NOT EXISTS `default_games` ( CREATE TABLE IF NOT EXISTS `network` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `parentid` int(10) unsigned NOT NULL, + `parentid` int(10) unsigned NOT NULL DEFAULT '0', `is_local` tinyint(1) unsigned NOT NULL DEFAULT '0', `login_user` blob NOT NULL, `login_pass` blob NOT NULL, @@ -50,7 +50,7 @@ CREATE TABLE IF NOT EXISTS `network` ( `os` varchar(64) NOT NULL, `location` varchar(128) NOT NULL, `datacenter` varchar(128) NOT NULL, - `homedir` varchar(255) NOT NULL, + `homedir` varchar(255) NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -80,7 +80,7 @@ CREATE TABLE IF NOT EXISTS `resellers` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `username` varchar(16) NOT NULL, `password` varchar(64) NOT NULL, `email_address` varchar(255) NOT NULL, @@ -100,7 +100,7 @@ CREATE TABLE IF NOT EXISTS `servers` ( `type` enum('game','voice') NOT NULL DEFAULT 'game', `status` enum('none','installing','updating','failed','complete') NOT NULL DEFAULT 'none', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `token` varchar(32) NOT NULL, `working_dir` varchar(255) NOT NULL, `pid_file` varchar(255) NOT NULL, @@ -128,7 +128,7 @@ CREATE TABLE IF NOT EXISTS `templates` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `netid` int(10) unsigned NOT NULL, `cfgid` int(10) unsigned NOT NULL, - `steam_percent` tinyint(3) unsigned NOT NULL, + `steam_percent` tinyint(3) unsigned NOT NULL DEFAULT '0', `date_created` datetime NOT NULL, `is_default` tinyint(1) unsigned NOT NULL DEFAULT '0', `status` enum('none','running','steam_running','failed','tpl_running','complete') NOT NULL DEFAULT 'none', @@ -153,7 +153,7 @@ CREATE TABLE IF NOT EXISTS `users` ( `perm_chpass` tinyint(1) unsigned NOT NULL DEFAULT '1', `perm_updetails` tinyint(1) unsigned NOT NULL DEFAULT '1', `date_created` datetime NOT NULL, - `last_updated` datetime NOT NULL, + `last_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `username` varchar(16) NOT NULL, `password` varchar(64) NOT NULL, `email_address` varchar(255) NOT NULL, diff --git a/install/update.php b/install/update.php index 8c556b0..1bffee1 100644 --- a/install/update.php +++ b/install/update.php @@ -12,12 +12,12 @@ require(DOCROOT.'/configuration.php'); // Setup db -@mysql_connect($settings['db_host'], $settings['db_username'], $settings['db_password']) or die('Failed to connect to the database! Check your settings and try again.'); -@mysql_select_db($settings['db_name']) or die('Failed to select the database! Check your settings and try again.'); +$GLOBALS['mysqli'] = new mysqli($settings['db_host'], $settings['db_username'], $settings['db_password']) or die('Failed to connect to the database! Check your settings and try again.'); +$GLOBALS['mysqli']->select_db($settings['db_name']) or die('Failed to select the database! Check your settings and try again.'); // Get current version -$result_cfg = @mysql_query("SELECT config_value FROM configuration WHERE config_setting = 'version' ORDER BY last_updated DESC LIMIT 1"); -$row_cfg = mysql_fetch_row($result_cfg); +$result_cfg = $GLOBALS['mysqli']->query("SELECT config_value FROM configuration WHERE config_setting = 'version' ORDER BY last_updated DESC LIMIT 1"); +$row_cfg = $result_cfg->fetch_row(); $cur_version = $row_cfg[0]; // Function to update version number to new version @@ -26,7 +26,7 @@ function update_gpxver($this_ver) $new_version = GPX_VERSION; if(empty($new_version)) die('No new version found! Check your "install/version.php" file.'); - @mysql_query("UPDATE configuration SET config_value = '$new_version' WHERE config_setting = 'version'") or die('Failed to update version: '.mysql_error()); + $GLOBALS['mysqli']->query("UPDATE configuration SET config_value = '$new_version' WHERE config_setting = 'version'") or die('Failed to update version: '.$GLOBALS['mysqli']->error); // Set new version to current if($this_ver) $cur_version = $this_ver; @@ -35,7 +35,7 @@ function update_gpxver($this_ver) // No version? Start with 3.0.3 (no version was in DB prior to 3.0.5) if(empty($cur_version)) { - @mysql_query("INSERT INTO configuration (config_setting,config_value) VALUES('version','3.0.3')"); + $GLOBALS['mysqli']->query("INSERT INTO configuration (config_setting,config_value) VALUES('version','3.0.3')"); $cur_version = '3.0.3'; } @@ -84,10 +84,10 @@ function update_gpxver($this_ver) echo 'Updating to 3.0.4 ...
'; // Add `banned_chars` to default_games - @mysql_query("ALTER TABLE default_games ADD `banned_chars` VARCHAR(64) NOT NULL AFTER pid_file") or die('Failed to add banned_chars: '.mysql_error()); + $GLOBALS['mysqli']->query("ALTER TABLE default_games ADD `banned_chars` VARCHAR(64) NOT NULL AFTER pid_file") or die('Failed to add banned_chars: '.$GLOBALS['mysqli']->error); // Add default banned chars to cs series games - @mysql_query("UPDATE default_games SET banned_chars = '+- ' WHERE intname IN('cs_16','cs_cz','cs_s','cs_go')") or die('Failed to update banned chars: '.mysql_error()); + $GLOBALS['mysqli']->query("UPDATE default_games SET banned_chars = '+- ' WHERE intname IN('cs_16','cs_cz','cs_s','cs_go')") or die('Failed to update banned chars: '.$GLOBALS['mysqli']->error); update_gpxver('3.0.4'); } @@ -108,17 +108,17 @@ function update_gpxver($this_ver) echo 'Updating to 3.0.6 ...
'; // Minecraft updates - @mysql_query("UPDATE default_games SET gameq_name = 'minecraft',cloudid = '6',simplecmd = 'java -Xincgc -Xmx1000M -jar craftbukkit.jar nogui' WHERE intname = 'mcraft'") or die('Failed to update Minecraft support: '.mysql_error()); + $GLOBALS['mysqli']->query("UPDATE default_games SET gameq_name = 'minecraft',cloudid = '6',simplecmd = 'java -Xincgc -Xmx1000M -jar craftbukkit.jar nogui' WHERE intname = 'mcraft'") or die('Failed to update Minecraft support: '.$GLOBALS['mysqli']->error); // Counter-Strike updates - @mysql_query("UPDATE default_games SET update_cmd = './steam -command update -game cstrike -dir .' WHERE intname = 'cs_16'") or die('Failed to update CS 1.6 support: '.mysql_error()); - @mysql_query("UPDATE default_games SET update_cmd = './steam -command update -game czero -dir .' WHERE intname = 'cs_cz'") or die('Failed to update CS CZ support: '.mysql_error()); - @mysql_query("UPDATE default_games SET update_cmd = './steam -command update -game \'Counter-Strike Source\' -dir .' WHERE intname = 'cs_s'") or die('Failed to update CS S support: '.mysql_error()); - @mysql_query("UPDATE default_games SET cloudid = '7' WHERE intname = 'cs_go'") or die('Failed to update CS GO support: '.mysql_error()); + $GLOBALS['mysqli']->query("UPDATE default_games SET update_cmd = './steam -command update -game cstrike -dir .' WHERE intname = 'cs_16'") or die('Failed to update CS 1.6 support: '.$GLOBALS['mysqli']->error); + $GLOBALS['mysqli']->query("UPDATE default_games SET update_cmd = './steam -command update -game czero -dir .' WHERE intname = 'cs_cz'") or die('Failed to update CS CZ support: '.$GLOBALS['mysqli']->error); + $GLOBALS['mysqli']->query("UPDATE default_games SET update_cmd = './steam -command update -game \'Counter-Strike Source\' -dir .' WHERE intname = 'cs_s'") or die('Failed to update CS S support: '.$GLOBALS['mysqli']->error); + $GLOBALS['mysqli']->query("UPDATE default_games SET cloudid = '7' WHERE intname = 'cs_go'") or die('Failed to update CS GO support: '.$GLOBALS['mysqli']->error); // Add language support - @mysql_query("ALTER TABLE admins ADD `language` VARCHAR(64) NOT NULL DEFAULT 'english' AFTER `password`") or die('Failed to add admin language: '.mysql_error()); - @mysql_query("ALTER TABLE users ADD `language` VARCHAR(64) NOT NULL DEFAULT 'english' AFTER `last_updated`") or die('Failed to add user language: '.mysql_error()); + $GLOBALS['mysqli']->query("ALTER TABLE admins ADD `language` VARCHAR(64) NOT NULL DEFAULT 'english' AFTER `password`") or die('Failed to add admin language: '.$GLOBALS['mysqli']->error); + $GLOBALS['mysqli']->query("ALTER TABLE users ADD `language` VARCHAR(64) NOT NULL DEFAULT 'english' AFTER `last_updated`") or die('Failed to add user language: '.$GLOBALS['mysqli']->error); update_gpxver('3.0.6'); } @@ -130,11 +130,11 @@ function update_gpxver($this_ver) echo 'Updating to 3.0.8 ...
'; // Add theme support - @mysql_query("ALTER TABLE admins ADD `theme` VARCHAR(64) NOT NULL DEFAULT 'default' AFTER `password`") or die('Failed to add admin theme: '.mysql_error()); - @mysql_query("ALTER TABLE users ADD `theme` VARCHAR(64) NOT NULL DEFAULT 'default' AFTER `last_updated`") or die('Failed to add user theme: '.mysql_error()); + $GLOBALS['mysqli']->query("ALTER TABLE admins ADD `theme` VARCHAR(64) NOT NULL DEFAULT 'default' AFTER `password`") or die('Failed to add admin theme: '.$GLOBALS['mysqli']->error); + $GLOBALS['mysqli']->query("ALTER TABLE users ADD `theme` VARCHAR(64) NOT NULL DEFAULT 'default' AFTER `last_updated`") or die('Failed to add user theme: '.$GLOBALS['mysqli']->error); // Add new columns to `default_games` - @mysql_query("ALTER TABLE `default_games` + $GLOBALS['mysqli']->query("ALTER TABLE `default_games` ADD `maxplayers` SMALLINT(4) UNSIGNED NOT NULL AFTER `port`, ADD `cfg_separator` VARCHAR(1) NOT NULL AFTER `steam`, ADD `install_mirrors` VARCHAR(600) NOT NULL AFTER `description`, @@ -148,18 +148,18 @@ function update_gpxver($this_ver) ADD `cfg_password` VARCHAR(64) NOT NULL AFTER `cfg_rcon`, ADD `map` VARCHAR(255) NOT NULL AFTER `cfg_password`, ADD `hostname` VARCHAR(255) NOT NULL AFTER `map`, - ADD `config_file` VARCHAR(255) NOT NULL AFTER `cfg_password`") or die('Failed to add default_games columns: '.mysql_error()); + ADD `config_file` VARCHAR(255) NOT NULL AFTER `cfg_password`") or die('Failed to add default_games columns: '.$GLOBALS['mysqli']->error); // Add new columns to `servers` - @mysql_query("ALTER TABLE `servers` + $GLOBALS['mysqli']->query("ALTER TABLE `servers` ADD `maxplayers` SMALLINT(4) UNSIGNED NOT NULL AFTER `port`, ADD `map` VARCHAR(255) NOT NULL AFTER `token`, ADD `rcon` VARCHAR(255) NOT NULL AFTER `map`, ADD `hostname` VARCHAR(255) NOT NULL AFTER `rcon`, - ADD `sv_password` VARCHAR(255) NOT NULL AFTER `hostname`") or die('Failed to add default_games columns: '.mysql_error()); + ADD `sv_password` VARCHAR(255) NOT NULL AFTER `hostname`") or die('Failed to add default_games columns: '.$GLOBALS['mysqli']->error); // Add local config paths for all games (including working dir) - @mysql_query("UPDATE `default_games` SET `config_file` = CASE `intname` + $GLOBALS['mysqli']->query("UPDATE `default_games` SET `config_file` = CASE `intname` WHEN 'cs_16' THEN 'cstrike/cfg/server.cfg' WHEN 'cs_cz' THEN 'cstrike/cfg/server.cfg' WHEN 'cs_s' THEN 'cstrike/cfg/server.cfg' @@ -167,12 +167,12 @@ function update_gpxver($this_ver) WHEN 'mcraft' THEN 'Server.Properties' WHEN 'gta_samp' THEN 'server.cfg' WHEN 'bf2' THEN 'mods/bf2/settings/serversettings.con' - ELSE `config_file` END") or die('Failed to update default games: '.mysql_error()); + ELSE `config_file` END") or die('Failed to update default games: '.$GLOBALS['mysqli']->error); ######## // Update all cfg_* values - @mysql_query("UPDATE `default_games` SET `cfg_separator` = CASE `intname` + $GLOBALS['mysqli']->query("UPDATE `default_games` SET `cfg_separator` = CASE `intname` WHEN 'cs_16' THEN ' ' WHEN 'cs_cz' THEN ' ' WHEN 'cs_s' THEN ' ' @@ -181,18 +181,18 @@ function update_gpxver($this_ver) WHEN 'samp' THEN ' ' WHEN 'bf2' THEN ' ' WHEN 'vent' THEN '=' - ELSE `cfg_separator` END") or die('Failed to update separators: '.mysql_error()); + ELSE `cfg_separator` END") or die('Failed to update separators: '.$GLOBALS['mysqli']->error); - @mysql_query("UPDATE `default_games` SET `cfg_ip` = CASE `intname` + $GLOBALS['mysqli']->query("UPDATE `default_games` SET `cfg_ip` = CASE `intname` WHEN 'cs_16' THEN 'ip' WHEN 'cs_cz' THEN 'ip' WHEN 'cs_s' THEN 'ip' WHEN 'cs_go' THEN 'ip' WHEN 'mcraft' THEN 'server-ip' WHEN 'bf2' THEN 'sv.serverIP' - ELSE `cfg_ip` END") or die('Failed to update ips: '.mysql_error()); + ELSE `cfg_ip` END") or die('Failed to update ips: '.$GLOBALS['mysqli']->error); - @mysql_query("UPDATE `default_games` SET `cfg_port` = CASE `intname` + $GLOBALS['mysqli']->query("UPDATE `default_games` SET `cfg_port` = CASE `intname` WHEN 'cs_16' THEN 'port' WHEN 'cs_cz' THEN 'port' WHEN 'cs_s' THEN 'port' @@ -200,9 +200,9 @@ function update_gpxver($this_ver) WHEN 'mcraft' THEN 'server-port' WHEN 'gta_samp' THEN 'port' WHEN 'bf2' THEN 'sv.serverPort' - ELSE `cfg_port` END") or die('Failed to update ports: '.mysql_error()); + ELSE `cfg_port` END") or die('Failed to update ports: '.$GLOBALS['mysqli']->error); - @mysql_query("UPDATE `default_games` SET `cfg_maxplayers` = CASE `intname` + $GLOBALS['mysqli']->query("UPDATE `default_games` SET `cfg_maxplayers` = CASE `intname` WHEN 'cs_16' THEN 'maxplayers' WHEN 'cs_cz' THEN 'maxplayers' WHEN 'cs_s' THEN 'maxplayers' @@ -211,18 +211,18 @@ function update_gpxver($this_ver) WHEN 'gta_samp' THEN 'maxplayers' WHEN 'bf2' THEN 'sv.maxPlayers' WHEN 'vent' THEN 'MaxClients' - ELSE `cfg_maxplayers` END") or die('Failed to update maxplayers: '.mysql_error()); + ELSE `cfg_maxplayers` END") or die('Failed to update maxplayers: '.$GLOBALS['mysqli']->error); - @mysql_query("UPDATE `default_games` SET `cfg_map` = CASE `intname` + $GLOBALS['mysqli']->query("UPDATE `default_games` SET `cfg_map` = CASE `intname` WHEN 'cs_16' THEN 'map' WHEN 'cs_cz' THEN 'map' WHEN 'cs_s' THEN 'map' WHEN 'cs_go' THEN 'map' WHEN 'mcraft' THEN 'level-name' WHEN 'gta_samp' THEN 'mapname' - ELSE `cfg_map` END") or die('Failed to update map: '.mysql_error()); + ELSE `cfg_map` END") or die('Failed to update map: '.$GLOBALS['mysqli']->error); - @mysql_query("UPDATE `default_games` SET `cfg_hostname` = CASE `intname` + $GLOBALS['mysqli']->query("UPDATE `default_games` SET `cfg_hostname` = CASE `intname` WHEN 'cs_16' THEN 'hostname' WHEN 'cs_cz' THEN 'hostname' WHEN 'cs_s' THEN 'hostname' @@ -231,9 +231,9 @@ function update_gpxver($this_ver) WHEN 'gta_samp' THEN 'hostname' WHEN 'bf2' THEN 'sv.serverName' WHEN 'vent' THEN 'Name' - ELSE `cfg_hostname` END") or die('Failed to update hostname: '.mysql_error()); + ELSE `cfg_hostname` END") or die('Failed to update hostname: '.$GLOBALS['mysqli']->error); - @mysql_query("UPDATE `default_games` SET `cfg_rcon` = CASE `intname` + $GLOBALS['mysqli']->query("UPDATE `default_games` SET `cfg_rcon` = CASE `intname` WHEN 'cs_16' THEN 'rcon_password' WHEN 'cs_cz' THEN 'rcon_password' WHEN 'cs_s' THEN 'rcon_password' @@ -241,9 +241,9 @@ function update_gpxver($this_ver) WHEN 'mcraft' THEN 'rcon.password' WHEN 'gta_samp' THEN 'rcon_password' WHEN 'vent' THEN 'AdminPassword' - ELSE `cfg_rcon` END") or die('Failed to update rcon: '.mysql_error()); + ELSE `cfg_rcon` END") or die('Failed to update rcon: '.$GLOBALS['mysqli']->error); - @mysql_query("UPDATE `default_games` SET `cfg_password` = CASE `intname` + $GLOBALS['mysqli']->query("UPDATE `default_games` SET `cfg_password` = CASE `intname` WHEN 'cs_16' THEN 'sv_password' WHEN 'cs_cz' THEN 'sv_password' WHEN 'cs_s' THEN 'sv_password' @@ -251,26 +251,26 @@ function update_gpxver($this_ver) WHEN 'mcraft' THEN 'rcon.password' WHEN 'gta_samp' THEN 'rcon_password' WHEN 'vent' THEN 'AdminPassword' - ELSE `cfg_password` END") or die('Failed to update rcon: '.mysql_error()); + ELSE `cfg_password` END") or die('Failed to update rcon: '.$GLOBALS['mysqli']->error); ######## // Update install config for minecraft - @mysql_query("UPDATE `default_games` SET port = '25565',install_mirrors = 'http://dl.bukkit.org/latest-rb/craftbukkit.jar',install_cmd = 'mv craftbukkit* craftbukkit.jar' WHERE intname = 'mcraft'") or die('Failed to update minecraft: '.mysql_error()); + $GLOBALS['mysqli']->query("UPDATE `default_games` SET port = '25565',install_mirrors = 'http://dl.bukkit.org/latest-rb/craftbukkit.jar',install_cmd = 'mv craftbukkit* craftbukkit.jar' WHERE intname = 'mcraft'") or die('Failed to update minecraft: '.$GLOBALS['mysqli']->error); // Update CS:GO steam name from "csgo" to "740" to use steamcmd app ID - @mysql_query("UPDATE `default_games` SET steam = '2',steam_name = '740' WHERE intname = 'cs_go'") or die('Failed to update csgo: '.mysql_error()); + $GLOBALS['mysqli']->query("UPDATE `default_games` SET steam = '2',steam_name = '740' WHERE intname = 'cs_go'") or die('Failed to update csgo: '.$GLOBALS['mysqli']->error); // Update `startup` to 0 for non-startup games - @mysql_query("UPDATE `default_games` SET `startup` = '0' WHERE intname IN ('vent','bf2','mcraft')") or die('Failed to update startup 0: '.mysql_error()); + $GLOBALS['mysqli']->query("UPDATE `default_games` SET `startup` = '0' WHERE intname IN ('vent','bf2','mcraft')") or die('Failed to update startup 0: '.$GLOBALS['mysqli']->error); // Add steam config items - @mysql_query("INSERT INTO configuration (config_setting,config_value) VALUES('steam_login_user',''),('steam_login_pass',''),('steam_auth','')") or die('Failed to update configuration: '.mysql_error()); + $GLOBALS['mysqli']->query("INSERT INTO configuration (config_setting,config_value) VALUES('steam_login_user',''),('steam_login_pass',''),('steam_auth','')") or die('Failed to update configuration: '.$GLOBALS['mysqli']->error); // Add SA:MP support - @mysql_query("INSERT INTO `default_games` (`id`, `cloudid`, `port`, `startup`, `steam`, `gameq_name`, `name`, `intname`, `working_dir`, `pid_file`, `banned_chars`, `steam_name`, `description`, `install_mirrors`, `install_cmd`, `update_cmd`, `simplecmd`) VALUES('', 9, 7777, 0, 0, 'mtasa', 'GTA: San Andreas MP', 'gta_samp', '', '', '', '', 'Grand Theft Auto: San Andreas - Multiplayer', 'http://files.sa-mp.com/samp03asvr_R4.tar.gz', 'tar -zxvf files.sa-mp.com/samp03asvr_R4.tar.gz; mv samp03/* .; rm -fr samp03 samp03asvr_R4.tar.gz', '', './samp03svr')"); + $GLOBALS['mysqli']->query("INSERT INTO `default_games` (`id`, `cloudid`, `port`, `startup`, `steam`, `gameq_name`, `name`, `intname`, `working_dir`, `pid_file`, `banned_chars`, `steam_name`, `description`, `install_mirrors`, `install_cmd`, `update_cmd`, `simplecmd`) VALUES('', 9, 7777, 0, 0, 'mtasa', 'GTA: San Andreas MP', 'gta_samp', '', '', '', '', 'Grand Theft Auto: San Andreas - Multiplayer', 'http://files.sa-mp.com/samp03asvr_R4.tar.gz', 'tar -zxvf files.sa-mp.com/samp03asvr_R4.tar.gz; mv samp03/* .; rm -fr samp03 samp03asvr_R4.tar.gz', '', './samp03svr')"); update_gpxver('3.0.8'); @@ -283,30 +283,30 @@ function update_gpxver($this_ver) echo 'Updating to 3.0.10 ...
'; // Add "type" to `default_games` - @mysql_query("ALTER TABLE `default_games` ADD `type` ENUM('game','voice','other') DEFAULT 'game' NOT NULL AFTER `steam`") or die('Failed to update default games: '.mysql_error()); + $GLOBALS['mysqli']->query("ALTER TABLE `default_games` ADD `type` ENUM('game','voice','other') DEFAULT 'game' NOT NULL AFTER `steam`") or die('Failed to update default games: '.$GLOBALS['mysqli']->error); // Drop 'type' from `servers` because, it should really be in `default_games` only - @mysql_query("ALTER TABLE `servers` DROP `type`") or die('Failed to update default games (2): '.mysql_error()); + $GLOBALS['mysqli']->query("ALTER TABLE `servers` DROP `type`") or die('Failed to update default games (2): '.$GLOBALS['mysqli']->error); // Set ventrilo as a voice server - @mysql_query("UPDATE `default_games` SET `type` = 'voice' WHERE intname = 'vent'") or die('Failed to update ventrilo: '.mysql_error()); + $GLOBALS['mysqli']->query("UPDATE `default_games` SET `type` = 'voice' WHERE intname = 'vent'") or die('Failed to update ventrilo: '.$GLOBALS['mysqli']->error); // Fix case on craftbukkit config - @mysql_query("UPDATE `default_games` SET `config_file` = 'server.properties' WHERE intname = 'mcraft'") or die('Failed to update minecraft: '.mysql_error()); + $GLOBALS['mysqli']->query("UPDATE `default_games` SET `config_file` = 'server.properties' WHERE intname = 'mcraft'") or die('Failed to update minecraft: '.$GLOBALS['mysqli']->error); // Add basic Murmur/Mumble support - @mysql_query("INSERT INTO `default_games` (`id`, `cloudid`, `port`, `maxplayers`, `startup`, `steam`, `type`, `cfg_separator`, `gameq_name`, `name`, `intname`, `working_dir`, `pid_file`, `banned_chars`, `cfg_ip`, `cfg_port`, `cfg_maxplayers`, `cfg_map`, `cfg_hostname`, `cfg_rcon`, `cfg_password`, `map`, `hostname`, `config_file`, `steam_name`, `description`, `install_mirrors`, `install_cmd`, `update_cmd`, `simplecmd`) VALUES('', 10, 64738, 16, 0, 0, 'voice', '=', '', 'Murmur', 'murmur', '', 'murmur.pid', '', 'host', 'port', 'users', '', 'welcometext', '', 'serverpassword', '', 'New GamePanelX Server', 'murmur.ini', '', 'Server for the open source Mumble client', 'http://gamepanelx.com/files/murmur-latest-x86.tar.bz2', 'tar -xvjf murmur-latest-x86.tar.bz2; rm -f murmur-latest-x86.tar.bz2; mv murmur-*/* .; rmdir murmur-static*; sed -i ''s/\\#pidfile\\=/pidfile\\=murmur\\.pid/g'' murmur.ini', '', './murmur.x86 -ini murmur.ini')"); + $GLOBALS['mysqli']->query("INSERT INTO `default_games` (`id`, `cloudid`, `port`, `maxplayers`, `startup`, `steam`, `type`, `cfg_separator`, `gameq_name`, `name`, `intname`, `working_dir`, `pid_file`, `banned_chars`, `cfg_ip`, `cfg_port`, `cfg_maxplayers`, `cfg_map`, `cfg_hostname`, `cfg_rcon`, `cfg_password`, `map`, `hostname`, `config_file`, `steam_name`, `description`, `install_mirrors`, `install_cmd`, `update_cmd`, `simplecmd`) VALUES('', 10, 64738, 16, 0, 0, 'voice', '=', '', 'Murmur', 'murmur', '', 'murmur.pid', '', 'host', 'port', 'users', '', 'welcometext', '', 'serverpassword', '', 'New GamePanelX Server', 'murmur.ini', '', 'Server for the open source Mumble client', 'http://gamepanelx.com/files/murmur-latest-x86.tar.bz2', 'tar -xvjf murmur-latest-x86.tar.bz2; rm -f murmur-latest-x86.tar.bz2; mv murmur-*/* .; rmdir murmur-static*; sed -i ''s/\\#pidfile\\=/pidfile\\=murmur\\.pid/g'' murmur.ini', '', './murmur.x86 -ini murmur.ini')"); // Add `sso_user` and `sso_pass` BLOB columns to `users` table - @mysql_query("ALTER TABLE users ADD sso_user BLOB NOT NULL AFTER last_updated, - ADD sso_pass BLOB NOT NULL AFTER sso_user") or die('Failed to add sso columns: '.mysql_error()); + $GLOBALS['mysqli']->query("ALTER TABLE users ADD sso_user BLOB NOT NULL AFTER last_updated, + ADD sso_pass BLOB NOT NULL AFTER sso_user") or die('Failed to add sso columns: '.$GLOBALS['mysqli']->error); // Increase password, add `setpass_3010` so we can see if the new pass style was used - @mysql_query("ALTER TABLE admins MODIFY `password` VARCHAR(255) NOT NULL") or die('Failed to change admins table (1): '.mysql_error()); - @mysql_query("ALTER TABLE admins ADD `setpass_3010` tinyint(1) unsigned NOT NULL DEFAULT '0' AFTER `deleted`") or die('Failed to change admins table (2): '.mysql_error()); + $GLOBALS['mysqli']->query("ALTER TABLE admins MODIFY `password` VARCHAR(255) NOT NULL") or die('Failed to change admins table (1): '.$GLOBALS['mysqli']->error); + $GLOBALS['mysqli']->query("ALTER TABLE admins ADD `setpass_3010` tinyint(1) unsigned NOT NULL DEFAULT '0' AFTER `deleted`") or die('Failed to change admins table (2): '.$GLOBALS['mysqli']->error); // Add `loadavg` table - @mysql_query("CREATE TABLE IF NOT EXISTS `loadavg` ( + $GLOBALS['mysqli']->query("CREATE TABLE IF NOT EXISTS `loadavg` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `netid` int unsigned NOT NULL, `free_mem` int unsigned NOT NULL, @@ -314,18 +314,18 @@ function update_gpxver($this_ver) `timestamp` TIMESTAMP NOT NULL, `load_avg` varchar(6) NOT NULL, PRIMARY KEY (`id`) - ) ENGINE=InnoDB DEFAULT CHARSET=utf8") or die('Failed to add loadavg table: '.mysql_error()); + ) ENGINE=InnoDB DEFAULT CHARSET=utf8") or die('Failed to add loadavg table: '.$GLOBALS['mysqli']->error); // Add `token` to network tbl - @mysql_query("ALTER TABLE network ADD `token` VARCHAR(32) NOT NULL AFTER `ip`") or die('Failed to add token to network table: '.mysql_error()); + $GLOBALS['mysqli']->query("ALTER TABLE network ADD `token` VARCHAR(32) NOT NULL AFTER `ip`") or die('Failed to add token to network table: '.$GLOBALS['mysqli']->error); // Add `size` to templates tbl - @mysql_query("ALTER TABLE templates ADD `size` VARCHAR(12) NOT NULL AFTER `status`") or die('Failed to add size to templates table: '.mysql_error()); + $GLOBALS['mysqli']->query("ALTER TABLE templates ADD `size` VARCHAR(12) NOT NULL AFTER `status`") or die('Failed to add size to templates table: '.$GLOBALS['mysqli']->error); /* // Get original admin user - $result_origad = @mysql_query("SELECT id,username FROM admins WHERE deleted = '0' ORDER BY id ASC LIMIT 1"); - $row_origad = mysql_fetch_row($result_origad); + $result_origad = $GLOBALS['mysqli']->query("SELECT id,username FROM admins WHERE deleted = '0' ORDER BY id ASC LIMIT 1"); + $row_origad = mysqli_fetch_row($result_origad); $orig_ad_id = $row_origad[0]; $orig_admin = $row_origad[1]; if(empty($orig_admin)) die('No original admin account found!'); @@ -335,7 +335,7 @@ function update_gpxver($this_ver) $password = base64_encode(sha1('ZzaX'.$new_pass.'GPX88')); // Update admin user's password - @mysql_query("UPDATE admins SET password = '$password' WHERE id = '$orig_ad_id'"); + $GLOBALS['mysqli']->query("UPDATE admins SET password = '$password' WHERE id = '$orig_ad_id'"); echo '

WARNING!! Password security has changed in this release!
Admin account "'.$orig_admin.'" password has been reset to: "'.$new_pass.'". Please login as this admin and change your password(s) accordingly.

'; diff --git a/servers.php b/servers.php index c7c7733..1a92030 100644 --- a/servers.php +++ b/servers.php @@ -36,20 +36,20 @@ else $sql_limit = '0,15'; // Get total servers - $result_total = @mysql_query("SELECT + $result_total = $GLOBALS['mysqli']->query("SELECT COUNT(*) AS cnt FROM servers AS s LEFT JOIN default_games AS d ON s.defid = d.id WHERE s.userid = '$gpx_userid' - $sql_where") or die('Failed to count servers: '.mysql_error().'!'); + $sql_where") or die('Failed to count servers: '.$GLOBALS['mysqli']->error.'!'); - $row_srv = mysql_fetch_row($result_total); + $row_srv = $result_total->fetch_row(); $total_servers = $row_srv[0]; // List servers - $result_srv = @mysql_query("SELECT + $result_srv = $GLOBALS['mysqli']->query("SELECT s.id, s.userid, s.port, @@ -73,12 +73,12 @@ ORDER BY s.id DESC, n.ip ASC - LIMIT $sql_limit") or die($lang['err_query'].' ('.mysql_error().')'); + LIMIT $sql_limit") or die($lang['err_query'].' ('.$GLOBALS['mysqli']->error.')'); $json_arr = array(); $count_json = 0; - while($row_srv = mysql_fetch_array($result_srv)) + while($row_srv = $result_srv->fetch_array()) { $srv_id = $row_srv['id']; $srv_userid = $row_srv['userid']; diff --git a/settings.php b/settings.php index 87de79d..bd524b6 100644 --- a/settings.php +++ b/settings.php @@ -4,7 +4,7 @@ if(!$_SESSION['gpx_perms']['perm_updetails']) die('Sorry, you do not have permission to access this page. Please login and try again.'); // Get user info -$result_usr = @mysql_query("SELECT +$result_usr = $GLOBALS['mysqli']->query("SELECT theme, language, first_name, @@ -16,7 +16,7 @@ id = '$gpx_userid' LIMIT 1") or die('Unable to get your settings, please try again later.'); -while($row_usr = mysql_fetch_array($result_usr)) +while($row_usr = $result_usr->fetch_array()) { $usr_theme = $row_usr['theme']; $usr_lang = $row_usr['language'];