From d7f6d6a6be9b3b63848f1e98fd259197d284f843 Mon Sep 17 00:00:00 2001 From: Ulrich Block Date: Sun, 8 Sep 2013 17:21:34 +0200 Subject: [PATCH] Ticket 65 https://github.com/easy-wi/developer/issues/65 --- web/ajax.php | 14 +-- web/images.php | 16 +-- web/install/install.php | 14 +-- web/install/update.php | 14 +-- web/install/update_1x-20.php | 30 ++--- web/install/update_200-201.php | 4 +- web/install/update_201-202.php | 4 +- web/install/update_202-203.php | 4 +- web/install/update_203-204.php | 4 +- web/install/update_204-205.php | 4 +- web/install/update_205-206.php | 4 +- web/install/update_206-207.php | 6 +- web/install/update_207-208.php | 18 +-- web/install/update_208-209.php | 6 +- web/install/update_209-210.php | 6 +- web/install/update_210-211.php | 22 ++-- web/install/update_211-300.php | 2 +- web/install/update_300-301.php | 2 +- web/install/update_301-302.php | 4 +- web/install/update_302-303.php | 14 +-- web/install/update_303-304.php | 2 +- web/install/update_304-305.php | 2 +- web/install/update_305-306.php | 6 +- web/install/update_306-307.php | 4 +- web/install/update_307-308.php | 2 +- web/install/update_308-309.php | 2 +- web/install/update_320-330.php | 2 +- web/lend.php | 106 +++++++++--------- web/login.php | 10 +- web/protectioncheck.php | 14 +-- web/reboot.php | 2 +- web/serverallocation.php | 36 +++--- web/statuscheck.php | 64 +++++------ web/stuff/adminhome.php | 2 +- web/stuff/api_gserver.php | 4 +- web/stuff/class_masterserver.php | 10 +- web/stuff/class_validator.php | 2 +- web/stuff/class_voice.php | 16 +-- web/stuff/functions.php | 39 ++++--- web/stuff/ip_bans.php | 2 +- web/stuff/lendserver.php | 18 +-- web/stuff/logdata.php | 2 +- web/stuff/maillog.php | 4 +- web/stuff/masterserver.php | 2 +- web/stuff/page_news_edit.php | 6 +- web/stuff/page_page.php | 9 +- web/stuff/page_pages.php | 6 +- web/stuff/root_virtual_hosts.php | 28 ++--- web/stuff/root_virtual_server.php | 78 ++++++------- web/stuff/traffic.php | 2 +- web/stuff/userpanel_backup.php | 2 +- web/stuff/userpanel_gserver.php | 20 ++-- web/stuff/userpanel_home.php | 2 +- web/stuff/userpanel_logdata.php | 2 +- web/stuff/userpanel_restartcalendar.php | 28 ++--- web/stuff/userpanel_voice.php | 22 ++-- web/stuff/versioncheck.php | 4 +- web/stuff/voice_master.php | 6 +- web/switch.php | 12 +- .../default/admin_root_vserver_add.tpl | 8 +- .../default/admin_voiceserver_add.tpl | 6 +- .../default/ajax_admin_vserver_allocation.tpl | 4 +- .../userpanel_gserver_calendar_list.tpl | 42 +++---- .../userpanel_gserver_config_edit_easy.tpl | 2 +- web/trafficdata.php | 26 ++--- 65 files changed, 430 insertions(+), 430 deletions(-) diff --git a/web/ajax.php b/web/ajax.php index 21bac9c1..09585ee4 100644 --- a/web/ajax.php +++ b/web/ajax.php @@ -51,14 +51,14 @@ if (isset($admin_id)) { foreach ($userpermissionquery->fetchall() as $userpermissionrow) { if ($userpermissionrow['root']=="Y") { foreach ($userpermissionrow as $key => $value) { - $pa["$key"]=true; + $pa[$key]=true; } } else { foreach ($userpermissionrow as $key => $value) { if ($value=="Y") { - $pa["$key"]=true; + $pa[$key]=true; } else { - $pa["$key"]=false; + $pa[$key]=false; } } } @@ -70,17 +70,17 @@ if (isset($user_id)) { foreach ($userpermissionquery->fetchall() as $userpermissionrow) { if ($userpermissionrow['miniroot']=="Y") { foreach ($userpermissionrow as $key => $value) { - $pau["$key"]=true; + $pau[$key]=true; } } else { foreach ($userpermissionrow as $key => $value) { if (isset($admin_id)) { - $pau["$key"]=true; + $pau[$key]=true; } else { if ($value=="Y") { - $pau["$key"]=true; + $pau[$key]=true; } else { - $pau["$key"]=false; + $pau[$key]=false; } } } diff --git a/web/images.php b/web/images.php index 3a4e9bfc..f6051f63 100644 --- a/web/images.php +++ b/web/images.php @@ -163,7 +163,7 @@ if (isset($admin_id) and $ui->st('img','get')) { $ingoing=($multiplier * $row['ingoing']) / $divisor; $outgoing=($multiplier * $row['outgoing']) / $divisor; $total=($multiplier * $row['total']) / $divisor; - $values["$day2"]=array($ingoing,$outgoing,$total); + $values[$day2]=array($ingoing,$outgoing,$total); } } if ($reseller_id==0 and isset($get_shorten)) { @@ -213,12 +213,12 @@ if (isset($admin_id) and $ui->st('img','get')) { $ingoing=($multiplier * $row2['ingoing']) / $divisor; $outgoing=($multiplier * $row2['outgoing']) / $divisor; $total=($multiplier * $row2['total']) / $divisor; - if (isset($values["$day2"])) { - $ingoing=$ingoing+$values["$day2"]['0']; - $outgoing=$outgoing+$values["$day2"]['1']; - $total=$total+$values["$day2"]['2']; + if (isset($values[$day2])) { + $ingoing=$ingoing+$values[$day2][0]; + $outgoing=$outgoing+$values[$day2][1]; + $total=$total+$values[$day2][2]; } - $values["$day2"]=array($ingoing,$outgoing,$total); + $values[$day2]=array($ingoing,$outgoing,$total); } } $i++; @@ -401,7 +401,7 @@ if (isset($admin_id) and $ui->st('img','get')) { else $averageused=round($row['averageused']); if (!isset($row['averageinstalled'])) $averageinstalled="0"; else $averageinstalled=round($row['averageinstalled']); - $values["$day2"]=array($averageused,$averageinstalled); + $values[$day2]=array($averageused,$averageinstalled); } /*if (isset($get_shorten)) { $pselect=$sql->prepare("SELECT SUM(`used`)/COUNT(`id`) AS `averageused`,SUM(`installed`)/COUNT(`id`) AS `averageinstalled` FROM `voice_server_stats_hours` WHERE `date` LIKE ? AND `sid`=? AND `resellerid`=?"); @@ -421,7 +421,7 @@ if (isset($admin_id) and $ui->st('img','get')) { else $averageused=round($row['averageused']); if (!isset($row['averageinstalled'])) $averageinstalled="0"; else $averageinstalled=round($row['averageinstalled']); - $values["$day2"]=array($averageused,$averageinstalled); + $values[$day2]=array($averageused,$averageinstalled); }*/ } $i++; diff --git a/web/install/install.php b/web/install/install.php index 433055ea..e7f7f4c3 100644 --- a/web/install/install.php +++ b/web/install/install.php @@ -244,13 +244,13 @@ function getconfigcvars($file) { foreach ($lines as $line) { if(strpos(strtolower($line), strtolower("//")) === false and strpos(strtolower($line), strtolower("=")) == true) { $data=explode("=", $line); - $cvar=preg_replace('/\s+/', '', $data['0']); + $cvar=preg_replace('/\s+/', '', $data[0]); $cvar=str_replace('$', "", $cvar); - $data2=explode(";", $data['1']); - $stringlenght=strlen($data2['0']); + $data2=explode(";", $data[1]); + $stringlenght=strlen($data2[0]); $stop=$stringlenght-2; - $value=substr($data2['0'],"1",$stop); - $vars["$cvar"]=$value; + $value=substr($data2[0],"1",$stop); + $vars[$cvar]=$value; } } return $vars; @@ -425,7 +425,7 @@ $aeskey="'.$_POST['aeskey'].'"; $randompass=""; for($i=1; $i<=10; $i++){ $wuerfeln = mt_rand(0,$anzahlcorrect); - $randompass .= $zeichen["$wuerfeln"]; + $randompass .= $zeichen[$wuerfeln]; } ?> @@ -804,7 +804,7 @@ $aeskey="'.$_POST['aeskey'].'"; $randompass=""; for($i=1; $i<=30; $i++){ $wuerfeln = mt_rand(0,$anzahlcorrect); - $randompass .= $zeichen["$wuerfeln"]; + $randompass .= $zeichen[$wuerfeln]; } ?> diff --git a/web/install/update.php b/web/install/update.php index 7a33ecf1..9746435a 100644 --- a/web/install/update.php +++ b/web/install/update.php @@ -58,13 +58,13 @@ if (!isset($updateinclude) or $updateinclude==false) { foreach ($lines as $line) { if(strpos(strtolower($line), strtolower("//")) === false and strpos(strtolower($line), strtolower("=")) == true) { $data=explode("=", $line); - $cvar=preg_replace('/\s+/', '', $data['0']); + $cvar=preg_replace('/\s+/', '', $data[0]); $cvar=str_replace('$', "", $cvar); - $data2=explode(";", $data['1']); - $stringlenght=strlen($data2['0']); + $data2=explode(";", $data[1]); + $stringlenght=strlen($data2[0]); $stop=$stringlenght-2; - $value=substr($data2['0'],"1",$stop); - $vars["$cvar"]=$value; + $value=substr($data2[0],"1",$stop); + $vars[$cvar]=$value; } } return $vars; @@ -130,7 +130,7 @@ function versioncheck ($current,$new,$file,$response,$sql) { $response->add('
Action: update_easywiversion done: '); $error=$update_easywiversion->errorinfo(); $update_easywiversion->closecursor(); - if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); + if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); } return true; @@ -145,7 +145,7 @@ $admin_id=1; $main=1; $reseller_id=0; $error=$query->errorinfo(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) { +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) { $response->add("Current database version: 1.9
"); $version="1.9"; } else { diff --git a/web/install/update_1x-20.php b/web/install/update_1x-20.php index 04e22634..5cde0d01 100644 --- a/web/install/update_1x-20.php +++ b/web/install/update_1x-20.php @@ -43,7 +43,7 @@ $drop_serverlist_qstat->execute(); $response->add('Action: drop_serverlist_qstat done: '); $error=$drop_serverlist_qstat->errorinfo(); $drop_serverlist_qstat->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $drop_gsswitch_restarttime=$sql->prepare("ALTER TABLE `gsswitch` DROP `restarttime`"); @@ -51,7 +51,7 @@ $drop_gsswitch_restarttime->execute(); $response->add('Action: drop_gsswitch_restarttime done: '); $error=$drop_gsswitch_restarttime->errorinfo(); $drop_gsswitch_restarttime->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $create_easywiversion=$sql->prepare("CREATE TABLE IF NOT EXISTS `easywi_version` ( @@ -63,7 +63,7 @@ $create_easywiversion->execute(); $response->add('Action: create_easywiversion done: '); $error=$create_easywiversion->errorinfo(); $create_easywiversion->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $add_rservermasterg_installstarted=$sql->prepare("ALTER TABLE `rservermasterg` ADD COLUMN `installstarted` DATETIME NOT NULL AFTER `installing`"); @@ -71,7 +71,7 @@ $add_rservermasterg_installstarted->execute(); $response->add('Action: add_rservermasterg_installstarted done: '); $error=$add_rservermasterg_installstarted->errorinfo(); $add_rservermasterg_installstarted->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $insert_easywiversion=$sql->prepare("INSERT INTO `easywi_version` (`version`) VALUES ('2.00')"); @@ -79,7 +79,7 @@ $insert_easywiversion->execute(); $response->add('Action: insert_easywiversion done: '); $error=$insert_easywiversion->errorinfo(); $insert_easywiversion->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $create_voice_masterserver=$sql->prepare("CREATE TABLE IF NOT EXISTS `voice_masterserver` ( @@ -120,7 +120,7 @@ $create_voice_masterserver->execute(); $response->add('Action: create_voice_masterserver done: '); $error=$create_voice_masterserver->errorinfo(); $create_voice_masterserver->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $create_voice_server=$sql->prepare("CREATE TABLE IF NOT EXISTS `voice_server` ( @@ -156,7 +156,7 @@ $create_voice_server->execute(); $response->add('Action: create_voice_server done: '); $error=$create_voice_server->errorinfo(); $create_voice_server->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $create_traffic_settings=$sql->prepare("CREATE TABLE IF NOT EXISTS `traffic_settings` ( `id` INT(30) UNSIGNED NOT NULL AUTO_INCREMENT, @@ -198,7 +198,7 @@ $create_traffic_settings->execute(); $response->add('Action: create_traffic_settings done: '); $error=$create_traffic_settings->errorinfo(); $create_traffic_settings->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else { $response->add('OK
'); $insert_traffic_settings=$sql->prepare("INSERT INTO `traffic_settings` (`type`) VALUES ('mysql')"); @@ -206,7 +206,7 @@ else { $response->add('Action: insert_traffic_settings done: '); $error=$insert_traffic_settings->errorinfo(); $insert_traffic_settings->closecursor(); - if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); + if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); } @@ -218,7 +218,7 @@ $add_userpermissions->execute(); $response->add('Action: add_userpermissions done: '); $error=$add_userpermissions->errorinfo(); $add_userpermissions->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $add_reseller_maxvoserver=$sql->prepare("ALTER TABLE `resellerdata` ADD COLUMN `maxvoserver` INT(10) UNSIGNED DEFAULT '20' AFTER `maxgserver`"); @@ -226,7 +226,7 @@ $add_reseller_maxvoserver->execute(); $response->add('Action: add_reseller_maxvoserver done: '); $error=$add_reseller_maxvoserver->errorinfo(); $add_reseller_maxvoserver->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $add_settings_emailpwrecovery=$sql->prepare("ALTER TABLE `settings` ADD COLUMN `emailpwrecovery` BLOB AFTER `emailgserverupdate`"); @@ -234,7 +234,7 @@ $add_settings_emailpwrecovery->execute(); $response->add('Action: add_settings_emailpwrecovery done: '); $error=$add_settings_emailpwrecovery->errorinfo(); $add_settings_emailpwrecovery->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $update_settings_emailpwrecovery=$sql->prepare("UPDATE `settings` SET `emailpwrecovery`=0x78dae5554d8fd330103d77a5fd0fc628b756f9585a8a7022ad4a7b854339709c24d3c4c2b183e316caaf679ca4da6db5d276e18010be789ec7f366fc3c71c4ab0f1f57db2f9fd6ac768dcad8ed8da811caecf666229c740ab3c0995616810807e81d0d3aa0fdae9de1b7bd3ca47c65b443ed66db638b9c15034ab9c31f2ef4bcef595183ed90d63e6f37b325271a118e89446eca23cbabc2286353fe7ad30fce14ee5c03b6923ae5116754c6233498df65e96ac2e969a14659d5aedfa1a4fe4a6cc97c31bf4f383b5c6018f1aa1f444fb5128c68dcddf1e1fc902b64b9b125da9e724c17475140a744a55a284ba9abdee971d7423162cf3061c2d9de9830324b762a2f794446540f675fc58bfb64c33352bb7c26f0ddf22c723d7f338f93ab229f49c9c8b2e716cd5e8b97aa12ff812cd1efeab23c8fa4568ad68bbee176d4976c0705a61cac0435ad511dd0c902a607b42568983aa84d039c75f227eda23e109db346570f5fc18845e8d93291dbb06fe17e0a3a507b074e1a1db060dfa1d5d06030bdd8e55b2d0e2e43d1521117ab27a736165b757cda3b8871c5b54757defb3f7ddb8bb711e50db001a976c638afe9dfd7e6bf791f44e85ff3e179f73f945f1b1bc32f"); @@ -242,7 +242,7 @@ $update_settings_emailpwrecovery->execute(); $response->add('Action: update_settings_emailpwrecovery done: '); $error=$update_settings_emailpwrecovery->errorinfo(); $update_settings_emailpwrecovery->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $pselect3=$sql->prepare("SELECT `resellerid` FROM `settings`"); @@ -258,7 +258,7 @@ foreach ($pselect3->fetchAll() as $mess_row) { $response->add('Action: update_settings_emailpwrecovery done: '); $error=$update_settings_emailpwrecovery->errorinfo(); $update_settings_emailpwrecovery->closecursor(); - if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); + if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); } else { $pupdate2=$sql->prepare("INSERT INTO `email_languages` (`language`,`xml`,`content`,`resellerid`) VALUES ('de',0x78da4d904d4ec3301085d72071875156454a53ba43284da50ad80012a2f400269924239c71648fe9cf79b809176392b6888d65799ebff7e6e5cb5d67e10b7d20c78b649edd24805cba8ab859249bf7c7e96d02cbe2ea320fbd37658b7abdc8c5f55416af2684adf3026f583a45ecf3d971304882b1518c28b55863eba1413d0527fe3a9ffd9b8d34dcc9bcd87480c4c01831c01fdaf021d6ce57e839051f6b645813c2078920d4ce36c895bead30c8cfb75013b90996f8134cacef34cf881e4cd879ecedbe98dc93f229c8e0862a13d7699450b6630b034ec90fd317433683d5e863588630276fa6b215a88c578b14b648162a652af5f80b9e1c8b3bc97423cd0ecfa6c1c1343d69021c2260d7d78675834c3b39e7d3a667e7aa7f01cd578f66,'emailpwrecovery',?)"); @@ -273,7 +273,7 @@ foreach ($pselect3->fetchAll() as $mess_row) { $response->add('Action: update_settings_emailpwrecovery done: '); $error=$update_settings_emailpwrecovery->errorinfo(); $update_settings_emailpwrecovery->closecursor(); - if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); + if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); } else { $pupdate2=$sql->prepare("INSERT INTO `email_languages` (`language`,`xml`,`content`,`resellerid`) VALUES ('uk',0x78da4d90b16ac3400c86e716fa0ec2533bd46eb6522ece523a67701f409c95e4e85972ef7471fcf6951d0c050984f4ebfb85dce13644b852ca41785fedeab70a88bdf481cffbeabbfb7a7dafe0d03e3dba3c26f417b2f2c1a98cc1b747cc7992d443222f86985d731f2c928cb128aa51db4fc2e49a7f8d154137ddb59dd8f26f09890081698271638e91301314cb93c428931d04e8355c5706c4c03f1f66b86216204ba231ceed737709192c90018bca804a3d0c18620dc73bb417605158f5a002412107f6047ab13bbc97c2ba10bcf0299c4bb27d5365e21e84e35cbfb86673b3c734db67fe001cdc7269,'emailpwrecovery',?)"); diff --git a/web/install/update_200-201.php b/web/install/update_200-201.php index 29255f79..95a52bda 100644 --- a/web/install/update_200-201.php +++ b/web/install/update_200-201.php @@ -49,7 +49,7 @@ $alter_lendsettings->execute(); $response->add('Action: alter_lendsettings done: '); $error=$alter_lendsettings->errorinfo(); $alter_lendsettings->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $update_easywiversion=$sql->prepare("UPDATE `easywi_version` SET `version`='2.01'"); @@ -57,7 +57,7 @@ $update_easywiversion->execute(); $response->add('Action: update_easywiversion done: '); $error=$update_easywiversion->errorinfo(); $update_easywiversion->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); } else { echo "Error: this file needs to be included by the updater!
"; diff --git a/web/install/update_201-202.php b/web/install/update_201-202.php index 1d3eae36..b889aa56 100644 --- a/web/install/update_201-202.php +++ b/web/install/update_201-202.php @@ -43,7 +43,7 @@ $drop_voice_masterserver_ftpport->execute(); $response->add('Action: drop_voice_masterserver_ftpport done: '); $error=$drop_voice_masterserver_ftpport->errorinfo(); $drop_voice_masterserver_ftpport->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $update_easywiversion=$sql->prepare("UPDATE `easywi_version` SET `version`='2.02'"); @@ -51,7 +51,7 @@ $update_easywiversion->execute(); $response->add('Action: update_easywiversion done: '); $error=$update_easywiversion->errorinfo(); $update_easywiversion->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); } else { echo "Error: this file needs to be included by the updater!
"; diff --git a/web/install/update_202-203.php b/web/install/update_202-203.php index 332914ac..aa544fae 100644 --- a/web/install/update_202-203.php +++ b/web/install/update_202-203.php @@ -97,7 +97,7 @@ $instert_voice_stats_settings->execute(); $response->add('Action: instert_voice_stats_settings done: '); $error=$instert_voice_stats_settings->errorinfo(); $instert_voice_stats_settings->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $pselect=$sql->prepare("SELECT `resellerid` FROM `resellerdata`"); $pselect->execute(array()); @@ -107,7 +107,7 @@ foreach ($pselect->fetchall() as $row) { $response->add('Action: instert_voice_stats_settings done: '); $error=$instert_voice_stats_settings->errorinfo(); $instert_voice_stats_settings->closecursor(); - if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); + if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); } } else { diff --git a/web/install/update_203-204.php b/web/install/update_203-204.php index ef074489..84d65578 100644 --- a/web/install/update_203-204.php +++ b/web/install/update_203-204.php @@ -55,7 +55,7 @@ $drop_rootstatus->execute(); $response->add('Action: drop_rootstatus done: '); $error=$drop_rootstatus->errorinfo(); $drop_rootstatus->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $alter_voice_masterserver=$sql->prepare("ALTER TABLE `voice_masterserver` ADD COLUMN `autorestart` ENUM('Y','N') DEFAULT 'Y' AFTER `notified`"); @@ -63,7 +63,7 @@ $alter_voice_masterserver->execute(); $response->add('Action: alter_voice_masterserver done: '); $error=$alter_voice_masterserver->errorinfo(); $alter_voice_masterserver->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); } else { echo "Error: this file needs to be included by the updater!
"; diff --git a/web/install/update_204-205.php b/web/install/update_204-205.php index 4aa63b2d..d6d6751c 100644 --- a/web/install/update_204-205.php +++ b/web/install/update_204-205.php @@ -42,14 +42,14 @@ $alter_lendedserver->execute(); $response->add('Action: alter_lendedserver done: '); $error=$alter_lendedserver->errorinfo(); $alter_lendedserver->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $alter_lendsettings=$sql->prepare("ALTER TABLE `lendsettings` CHANGE `lendhostip` `lendhostip` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL"); $alter_lendsettings->execute(); $response->add('Action: alter_lendsettings done: '); $error=$alter_lendsettings->errorinfo(); $alter_lendsettings->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); } else { echo "Error: this file needs to be included by the updater!
"; diff --git a/web/install/update_205-206.php b/web/install/update_205-206.php index 2afe55eb..9b25b159 100644 --- a/web/install/update_205-206.php +++ b/web/install/update_205-206.php @@ -51,7 +51,7 @@ $create_voice_server_backup->execute(); $response->add('Action: create_voice_server_backup done: '); $error=$create_voice_server_backup->errorinfo(); $create_voice_server_backup->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $alter_settings=$sql->prepare("ALTER TABLE `settings` @@ -62,7 +62,7 @@ $alter_settings->execute(); $response->add('Action: alter_settings done: '); $error=$alter_settings->errorinfo(); $alter_settings->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); } else { echo "Error: this file needs to be included by the updater!
"; diff --git a/web/install/update_206-207.php b/web/install/update_206-207.php index e0ffa3fb..5c161f51 100644 --- a/web/install/update_206-207.php +++ b/web/install/update_206-207.php @@ -42,7 +42,7 @@ $alter_voice_server_add->execute(); $response->add('Action: alter_voice_server_add done: '); $error=$alter_voice_server_add->errorinfo(); $alter_voice_server_add->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $alter_voice_server_change=$sql->prepare("ALTER TABLE `voice_server` CHANGE `file_sent` `maxtraffic` INT( 255 ) NULL DEFAULT '1048576000', CHANGE `file_received` `filetraffic` INT( 255 ) UNSIGNED NULL DEFAULT NULL , @@ -51,14 +51,14 @@ $alter_voice_server_change->execute(); $response->add('Action: alter_voice_server_change done: '); $error=$alter_voice_server_change->errorinfo(); $alter_voice_server_change->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $alter_voice_server_drop=$sql->prepare("ALTER TABLE `voice_server` DROP `received`"); $alter_voice_server_drop->execute(); $response->add('Action: alter_voice_server_drop done: '); $error=$alter_voice_server_drop->errorinfo(); $alter_voice_server_drop->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); } else { echo "Error: this file needs to be included by the updater!
"; diff --git a/web/install/update_207-208.php b/web/install/update_207-208.php index 4e9bdf95..312f9065 100644 --- a/web/install/update_207-208.php +++ b/web/install/update_207-208.php @@ -43,7 +43,7 @@ $insert_qstatshorten_gtasamp->execute(); $response->add('Action: insert_qstatshorten_gtasamp done: '); $error=$insert_qstatshorten_gtasamp->errorinfo(); $insert_qstatshorten_gtasamp->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $alter_servertypes_configedit=$sql->prepare("ALTER TABLE `servertypes` ADD COLUMN `configedit` TEXT AFTER `configs`"); @@ -51,7 +51,7 @@ $alter_servertypes_configedit->execute(); $response->add('Action: alter_servertypes_configedit done: '); $error=$alter_servertypes_configedit->errorinfo(); $alter_servertypes_configedit->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $alter_rserverdata_hyperthreading_cores=$sql->prepare("ALTER TABLE `rserverdata` @@ -61,7 +61,7 @@ $alter_rserverdata_hyperthreading_cores->execute(); $response->add('Action: alter_rserverdata_hyperthreading_cores done: '); $error=$alter_rserverdata_hyperthreading_cores->errorinfo(); $alter_rserverdata_hyperthreading_cores->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $alter_serverlist=$sql->prepare("ALTER TABLE `serverlist` @@ -77,7 +77,7 @@ $alter_serverlist->execute(); $response->add('Action: alter_serverlist done: '); $error=$alter_serverlist->errorinfo(); $alter_serverlist->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $alter_gserver_restarts_worldsafe=$sql->prepare("ALTER TABLE `gserver_restarts` @@ -87,7 +87,7 @@ $alter_gserver_restarts_worldsafe->execute(); $response->add('Action: alter_gserver_restarts_worldsafe done: '); $error=$alter_gserver_restarts_worldsafe->errorinfo(); $alter_gserver_restarts_worldsafe->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $alter_easywi_version=$sql->prepare("ALTER TABLE `easywi_version` @@ -97,7 +97,7 @@ $alter_easywi_version->execute(); $response->add('Action: alter_easywi_version done: '); $error=$alter_easywi_version->errorinfo(); $alter_easywi_version->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $alter_settings=$sql->prepare("ALTER TABLE `settings` @@ -107,7 +107,7 @@ $alter_settings->execute(); $response->add('Action: alter_settings done: '); $error=$alter_settings->errorinfo(); $alter_settings->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $pselect=$sql->prepare("SELECT `resellerid` FROM `settings`"); @@ -118,7 +118,7 @@ foreach ($pselect->fetchAll() as $row) { $response->add('Action: inster_servertypes_mc (Resellerid '.$row['resellerid'].') done: '); $error=$inster_servertypes_mc->errorinfo(); $inster_servertypes_mc->closecursor(); - if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); + if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); } @@ -321,7 +321,7 @@ $insert_easywi_version->execute(); $response->add('Action: insert_easywi_version done: '); $error=$insert_easywi_version->errorinfo(); $insert_easywi_version->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); } else { diff --git a/web/install/update_208-209.php b/web/install/update_208-209.php index 16e1d6fe..7db121a4 100644 --- a/web/install/update_208-209.php +++ b/web/install/update_208-209.php @@ -63,7 +63,7 @@ $insert_easywi_version->execute(); $response->add('Action: insert_easywi_version done: '); $error=$insert_easywi_version->errorinfo(); $insert_easywi_version->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $create_mysql_external_servers=$sql->prepare("CREATE TABLE IF NOT EXISTS `mysql_external_servers` ( @@ -86,7 +86,7 @@ $create_mysql_external_servers->execute(); $response->add('Action: create_mysql_external_servers done: '); $error=$create_mysql_external_servers->errorinfo(); $create_mysql_external_servers->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $create_mysql_external_dbs=$sql->prepare("CREATE TABLE IF NOT EXISTS `mysql_external_dbs` ( @@ -109,7 +109,7 @@ $create_mysql_external_dbs->execute(); $response->add('Action: create_mysql_external_dbs done: '); $error=$create_mysql_external_dbs->errorinfo(); $create_mysql_external_dbs->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); } else { diff --git a/web/install/update_209-210.php b/web/install/update_209-210.php index 83d908a4..0ca95176 100644 --- a/web/install/update_209-210.php +++ b/web/install/update_209-210.php @@ -65,7 +65,7 @@ $insert_easywi_version->execute(); $response->add('Action: insert_easywi_version done: '); $error=$insert_easywi_version->errorinfo(); $insert_easywi_version->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $alter_gsswitch=$sql->prepare("ALTER TABLE `gsswitch` ADD COLUMN `newlayout` ENUM('Y','N') DEFAULT 'Y' AFTER `secnotified`"); @@ -73,7 +73,7 @@ $alter_gsswitch->execute(); $response->add('Action: alter_gsswitch done: '); $error=$alter_gsswitch->errorinfo(); $alter_gsswitch->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $update_gsswitch=$sql->prepare("UPDATE `gsswitch` SET `newlayout`='N'"); @@ -81,7 +81,7 @@ $update_gsswitch->execute(); $response->add('Action: update_gsswitch done: '); $error=$update_gsswitch->errorinfo(); $update_gsswitch->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); } else { diff --git a/web/install/update_210-211.php b/web/install/update_210-211.php index f19e03de..da23e406 100644 --- a/web/install/update_210-211.php +++ b/web/install/update_210-211.php @@ -48,7 +48,7 @@ $updateSettings->execute(); $response->add('Action: updateSettings done: '); $error=$updateSettings->errorinfo(); $updateSettings->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $insert_easywi_version=$sql->prepare("INSERT INTO `easywi_version` (`version`,`de`,`en`) VALUES @@ -113,7 +113,7 @@ $insert_easywi_version->execute(); $response->add('Action: insert_easywi_version done: '); $error=$insert_easywi_version->errorinfo(); $insert_easywi_version->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $insert_page_settings=$sql->prepare("INSERT INTO `page_settings` (`resellerid`) VALUES ('0')"); @@ -121,7 +121,7 @@ $insert_page_settings->execute(); $response->add('Action: insert_page_settings done: '); $error=$insert_page_settings->errorinfo(); $insert_page_settings->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $insert_about_page_pages=$sql->prepare("INSERT INTO `page_pages` (`authorid`,`type`) VALUES ('0','about')"); @@ -129,7 +129,7 @@ $insert_about_page_pages->execute(); $response->add('Action: insert_about_page_pages done: '); $error=$insert_about_page_pages->errorinfo(); $insert_about_page_pages->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $insert_usergroups=$sql->prepare("INSERT INTO `usergroups` (`defaultgroup`,`name`,`grouptype`,`root`,`miniroot`) VALUES @@ -140,7 +140,7 @@ $insert_usergroups->execute(); $response->add('Action: insert_usergroups done: '); $error=$insert_usergroups->errorinfo(); $insert_usergroups->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $select=$sql->prepare("SELECT `id`,`resellerid` FROM `userdata` WHERE `accounttype`='r'"); @@ -151,7 +151,7 @@ foreach ($select->fetchAll(PDO::FETCH_ASSOC) as $row) { $response->add('Action: insert_usergroups done: '); $error=$insert_usergroups->errorinfo(); $insert_usergroups->closecursor(); - if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !is_numeric($error['2'])) $response->add($error['2'].'
'); + if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !is_numeric($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); if ($row['id']==$row['resellerid']) { $select2=$sql->prepare("SELECT * FROM `userpermissions` WHERE `userid`=? LIMIT 1"); @@ -171,7 +171,7 @@ foreach ($select->fetchAll(PDO::FETCH_ASSOC) as $row) { $response->add('Action: insert_usergroups done: '); $error=$insert_usergroups->errorinfo(); $insert_usergroups->closecursor(); - if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !is_numeric($error['2'])) $response->add($error['2'].'
'); + if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !is_numeric($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); } } @@ -184,7 +184,7 @@ $alter_userpermissions->execute(); $response->add('Action: alter_userpermissions done: '); $error=$alter_userpermissions->errorinfo(); $alter_userpermissions->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $alter_userdata=$sql->prepare("ALTER TABLE `userdata` ADD COLUMN `usergroup` INT(30) UNSIGNED DEFAULT '0' NOT NULL AFTER `mail_vserver`"); @@ -192,7 +192,7 @@ $alter_userdata->execute(); $response->add('Action: alter_userdata done: '); $error=$alter_userdata->errorinfo(); $alter_userdata->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $alter_settings=$sql->prepare("ALTER TABLE `settings` ADD COLUMN `down_checks` INT(1) DEFAULT '2' AFTER `paneldomain`"); @@ -200,7 +200,7 @@ $alter_settings->execute(); $response->add('Action: alter_settings done: '); $error=$alter_settings->errorinfo(); $alter_settings->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $alter_notified=$sql->prepare("ALTER TABLE `dhcpdata` CHANGE `notified` `notified` INT( 11 ) NULL DEFAULT '0'; @@ -215,7 +215,7 @@ $alter_notified->execute(); $response->add('Action: alter_notified done: '); $error=$alter_notified->errorinfo(); $alter_notified->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); diff --git a/web/install/update_211-300.php b/web/install/update_211-300.php index ceddd38d..8ea25cae 100644 --- a/web/install/update_211-300.php +++ b/web/install/update_211-300.php @@ -100,7 +100,7 @@ $insert_easywi_version->execute(); $response->add('Action: insert_easywi_version done: '); $error=$insert_easywi_version->errorinfo(); $insert_easywi_version->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); } else { diff --git a/web/install/update_300-301.php b/web/install/update_300-301.php index 65a966a1..f303d028 100644 --- a/web/install/update_300-301.php +++ b/web/install/update_300-301.php @@ -65,7 +65,7 @@ $insert_easywi_version->execute(); $response->add('Action: insert_easywi_version done: '); $error=$insert_easywi_version->errorinfo(); $insert_easywi_version->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); } else { diff --git a/web/install/update_301-302.php b/web/install/update_301-302.php index 8657f9dc..03f5d768 100644 --- a/web/install/update_301-302.php +++ b/web/install/update_301-302.php @@ -91,7 +91,7 @@ $insert_easywi_version->execute(); $response->add('Action: insert_easywi_version done: '); $error=$insert_easywi_version->errorinfo(); $insert_easywi_version->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $query="CREATE TABLE IF NOT EXISTS `feeds_url` ( @@ -115,7 +115,7 @@ foreach ($pselect->fetchall() as $row) { $response->add('Action: instert_feeds_url done: '); $error=$instert_feeds_url->errorinfo(); $instert_feeds_url->closecursor(); - if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); + if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); } diff --git a/web/install/update_302-303.php b/web/install/update_302-303.php index 8339a09b..9ffc49eb 100644 --- a/web/install/update_302-303.php +++ b/web/install/update_302-303.php @@ -106,7 +106,7 @@ $insert_easywi_version->execute(); $response->add('Action: insert_easywi_version done: '); $error=$insert_easywi_version->errorinfo(); $insert_easywi_version->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); // SteamAppIDs nachtragen @@ -115,7 +115,7 @@ $alter_servertypes->execute(); $response->add('Action: alter_servertypes done: '); $error=$alter_servertypes->errorinfo(); $alter_servertypes->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); foreach (array('cstrike'=>10,'tfc'=>20,'dod'=>30,'czero'=>80,'css'=>240,'dods'=>300,'hl2mp'=>360,'tf'=>440,'left4dead'=>500,'left4dead'=>550,'dota2'=>570,'csgo'=>730,'ageofchivalry'=>17510,'insurgency'=>17700,'zps'=>17500) as $key => $value) { @@ -129,7 +129,7 @@ $alter_serverlist->execute(); $response->add('Action: alter_serverlist done: '); $error=$alter_serverlist->errorinfo(); $alter_serverlist->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); // Add serverID column to restart table @@ -138,7 +138,7 @@ $alter_gserver_restarts->execute(); $response->add('Action: alter_gserver_restarts done: '); $error=$alter_gserver_restarts->errorinfo(); $alter_gserver_restarts->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); // Alter gsswitch table @@ -172,8 +172,8 @@ $alter_gsswitch->execute(); $response->add('Action: alter_gsswitch done: '); $error=$alter_gsswitch->errorinfo(); $alter_gsswitch->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) { - $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) { + $response->add($error[2].'
'); } else { $response->add('OK
'); // First get users and their password than get his servers and update tables @@ -233,5 +233,5 @@ $drop_gsstatus->execute(); $response->add('Action: drop_gsstatus done: '); $error=$drop_gsstatus->errorinfo(); $drop_gsstatus->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); \ No newline at end of file diff --git a/web/install/update_303-304.php b/web/install/update_303-304.php index ea6d0c20..2bb47e5b 100644 --- a/web/install/update_303-304.php +++ b/web/install/update_303-304.php @@ -51,7 +51,7 @@ $insert_easywi_version->execute(); $response->add('Action: insert_easywi_version done: '); $error=$insert_easywi_version->errorinfo(); $insert_easywi_version->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); diff --git a/web/install/update_304-305.php b/web/install/update_304-305.php index 9c11a99e..c6303d3e 100644 --- a/web/install/update_304-305.php +++ b/web/install/update_304-305.php @@ -69,7 +69,7 @@ $insert_easywi_version->execute(); $response->add('Action: insert_easywi_version done: '); $error=$insert_easywi_version->errorinfo(); $insert_easywi_version->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); diff --git a/web/install/update_305-306.php b/web/install/update_305-306.php index 02379d7f..8ca1f786 100644 --- a/web/install/update_305-306.php +++ b/web/install/update_305-306.php @@ -105,7 +105,7 @@ $insert_easywi_version->execute(); $response->add('Action: insert_easywi_version done: '); $error=$insert_easywi_version->errorinfo(); $insert_easywi_version->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $alter_servertypes_modcmds=$sql->prepare("ALTER TABLE `servertypes` ADD COLUMN `modcmds` TEXT DEFAULT NULL AFTER `cmd`"); @@ -113,7 +113,7 @@ $alter_servertypes_modcmds->execute(); $response->add('Action: alter_servertypes_modcmds done: '); $error=$alter_servertypes_modcmds->errorinfo(); $alter_servertypes_modcmds->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $update_servertypes_csgo=$sql->prepare("UPDATE `servertypes` SET `steamgame`='S',`appID`=730,`updates`=1,`description`='Counter-Strike: Global Offensive',`type`='gserver',`gamebinary`='srcds_run',`binarydir`=NULL,`modfolder`='csgo',`fps`=NULL,`slots`=12,`map`='de_dust',`cmd`='./%binary% -game csgo -console -usercon +ip %ip% +port %port% -maxplayers_override %slots% +map %map% +mapgroup %mapgroup%',`modcmds`='[Classic Casual = default]\r\n+game_type 0 +game_mode 0\r\n\r\n[Classic Competitive]\r\n+game_type 0 +game_mode 1\r\n\r\n[Arms Race]\r\n+game_type 1 +game_mode 0\r\n\r\n[Demolition]\r\n+game_type 1 +game_mode 1',`tic`=NULL,`qstat`='a2s',`gamemod`='N',`gamemod2`='css',`configs`='cfg/server.cfg both\r\ncfg/autoexec.cfg both\r\ngamemodes.txt\r\ngamemodes_server.txt',`configedit`=NULL,`qstatpassparam`='password:1',`portStep`=100,`portMax`=5,`portOne`=27015,`portTwo`=27016,`portThree`=27017,`portFour`=27018,`portFive`=27019,`mapGroup`='mg_bomb' WHERE `shorten`='csgo'"); @@ -121,7 +121,7 @@ $update_servertypes_csgo->execute(); $response->add('Action: update_servertypes_csgo done: '); $error=$update_servertypes_csgo->errorinfo(); $update_servertypes_csgo->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); diff --git a/web/install/update_306-307.php b/web/install/update_306-307.php index c23a65cd..8a153bd8 100644 --- a/web/install/update_306-307.php +++ b/web/install/update_306-307.php @@ -168,7 +168,7 @@ $insert_easywi_version->execute(); $response->add('Action: insert_easywi_version done: '); $error=$insert_easywi_version->errorinfo(); $insert_easywi_version->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $update_servertypes_csgo=$sql->prepare("UPDATE `servertypes` SET `steamgame`='S' WHERE `shorten`='csgo'"); @@ -176,7 +176,7 @@ $update_servertypes_csgo->execute(); $response->add('Action: update_servertypes_csgo done: '); $error=$update_servertypes_csgo->errorinfo(); $update_servertypes_csgo->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); } else { diff --git a/web/install/update_307-308.php b/web/install/update_307-308.php index 386b006e..580a46cd 100644 --- a/web/install/update_307-308.php +++ b/web/install/update_307-308.php @@ -168,7 +168,7 @@ $insert_easywi_version->execute(); $response->add('Action: insert_easywi_version done: '); $error=$insert_easywi_version->errorinfo(); $insert_easywi_version->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); } else { diff --git a/web/install/update_308-309.php b/web/install/update_308-309.php index 221c9681..24768578 100644 --- a/web/install/update_308-309.php +++ b/web/install/update_308-309.php @@ -149,7 +149,7 @@ $query->execute(); $response->add('Action: Change voice_server table done: '); $error=$query->errorinfo(); $query->closecursor(); -if (isset($error['2']) and $error['2']!="" and $error['2']!=null and !isinteger($error['2'])) $response->add($error['2'].'
'); +if (isset($error[2]) and $error[2]!="" and $error[2]!=null and !isinteger($error[2])) $response->add($error[2].'
'); else $response->add('OK
'); $query=$sql->prepare("UPDATE `voice_server` SET `max_download_total_bandwidth`='' WHERE `max_download_total_bandwidth`='0'; diff --git a/web/install/update_320-330.php b/web/install/update_320-330.php index 33743fbf..92361263 100644 --- a/web/install/update_320-330.php +++ b/web/install/update_320-330.php @@ -133,7 +133,7 @@ if (isset($include) and $include==true) { $insert=$sql->prepare("INSERT INTO `custom_columns` (`customID`,`itemID`,`var`) VALUES (?,?,?) ON DUPLICATE KEY UPDATE `var`=VALUES(`var`)"); foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { foreach ($copy as $k=>$v){ - $val=$row["${v}"]==null ? '' : $row["${v}"]; + $val=$row[$v]==null ? '' : $row[$v]; $insert->execute(array($k,$row['id'],$val)); } } diff --git a/web/lend.php b/web/lend.php index 783818e8..740ae3b4 100644 --- a/web/lend.php +++ b/web/lend.php @@ -435,25 +435,25 @@ if((!isset($servertype) and isset($page_include) and $ui->id('xml',1,'post')!=1) $query2->execute(array($row['id'],$reseller_id)); foreach ($query2->fetchall(PDO::FETCH_ASSOC) as $row2) { $shorten=$row2['shorten']; - $serverids["$shorten"][]=$row2['id']; - if (isset($gscounts["$shorten"])) { - $gscounts["$shorten"]++; + $serverids[$shorten][]=$row2['id']; + if (isset($gscounts[$shorten])) { + $gscounts[$shorten]++; } else { - $gscounts["$shorten"]=1; - $gsused["$shorten"]=0; + $gscounts[$shorten]=1; + $gsused[$shorten]=0; } $shortens[]=$shorten; } $shortenlist=implode('|',$shortens); foreach ($shortens as $shorten) { - if (isset($switchcount["$shortenlist"]["$shorten"]['exist'])) { - $switchcount["$shortenlist"]["$shorten"]['exist']++; + if (isset($switchcount[$shortenlist][$shorten]['exist'])) { + $switchcount[$shortenlist][$shorten]['exist']++; } else { - $switchcount["$shortenlist"]["$shorten"]['exist']=1; - $switchcount["$shortenlist"]["$shorten"]['used']=0; + $switchcount[$shortenlist][$shorten]['exist']=1; + $switchcount[$shortenlist][$shorten]['used']=0; } - foreach ($serverids["$shorten"] as $id) { - $switchcount["$shortenlist"]["$shorten"]['freeids'][]=$id; + foreach ($serverids[$shorten] as $id) { + $switchcount[$shortenlist][$shorten]['freeids'][]=$id; } } } @@ -478,17 +478,17 @@ if((!isset($servertype) and isset($page_include) and $ui->id('xml',1,'post')!=1) $query3->execute(array($switchID,$reseller_id)); foreach ($query3->fetchall(PDO::FETCH_ASSOC) as $row3) { $shorten=$row3['shorten']; - $gsused["$shorten"]++; + $gsused[$shorten]++; $shortens[]=$shorten; - $serverids["$shorten"][]=$row3['id']; + $serverids[$shorten][]=$row3['id']; } $shortenlist=implode('|',$shortens); foreach ($shortens as $shorten) { - $switchcount["$shortenlist"]["$shorten"]['used']++; - foreach ($serverids["$shorten"] as $id) { - $key=array_search($id, $switchcount["$shortenlist"]["$shorten"]['freeids']); + $switchcount[$shortenlist][$shorten]['used']++; + foreach ($serverids[$shorten] as $id) { + $key=array_search($id, $switchcount[$shortenlist][$shorten]['freeids']); if ($key==0 or isinteger($key)) { - unset($switchcount["$shortenlist"]["$shorten"]['freeids']["$key"]); + unset($switchcount[$shortenlist][$shorten]['freeids'][$key]); } } } @@ -503,8 +503,8 @@ if((!isset($servertype) and isset($page_include) and $ui->id('xml',1,'post')!=1) foreach ($query->fetchall(PDO::FETCH_ASSOC) as $row) { $description=$row['description']; } - $amount=$value-$gsused["$key"]; - $switchcount["$shortenlist"]["$shorten"]; + $amount=$value-$gsused[$key]; + $switchcount[$shortenlist][$shorten]; if ($amount>0) { $serveravailable=true; $gameselect[$key]=$description; @@ -513,7 +513,7 @@ if((!isset($servertype) and isset($page_include) and $ui->id('xml',1,'post')!=1) $gscount=0; $text=$sprache->used; } - $status["$description"]=array('text'=>$text,'amount'=>$amount,'total'=>$value); + $status[$description]=array('text'=>$text,'amount'=>$amount,'total'=>$value); } if ((!isset($nextfree) and $gscount>0) or (isset($nextfree) and $gscount>0)){ $nextfree=0; @@ -559,26 +559,26 @@ if((!isset($servertype) and isset($page_include) and $ui->id('xml',1,'post')!=1) if ($fail==0) { if ($ftpupload=='Y' and isurl($postedftpuploadpath) and $postedftpuploadpath!='ftp://username:password@1.1.1.1/demos') { $split=preg_split('/\//', $postedftpuploadpath, -1, PREG_SPLIT_NO_EMPTY); - $split2=preg_split('/@/', $split['1'], -1, PREG_SPLIT_NO_EMPTY); - if (isset($split2['1'])) { - $ftpipport=$split2['1']; - $userpass=explode(':',$split2['0']); - $ftpuser=$userpass['0']; - if (isset($userpass['1'])) { - $ftppass=$userpass['1']; + $split2=preg_split('/@/', $split[1], -1, PREG_SPLIT_NO_EMPTY); + if (isset($split2[1])) { + $ftpipport=$split2[1]; + $userpass=explode(':',$split2[0]); + $ftpuser=$userpass[0]; + if (isset($userpass[1])) { + $ftppass=$userpass[1]; } else { $ftppass=''; } } else { - $ftpipport=$split2['0']; + $ftpipport=$split2[0]; $ftpuser='anonymous'; $ftppass=''; } $ftpipport=preg_split('/:/', $ftpipport, -1, PREG_SPLIT_NO_EMPTY); - if (isset($ftpipport['1'])) { - $ftp_connect= @ftp_connect($ftpipport['0'],$ftpipport['1'],5); + if (isset($ftpipport[1])) { + $ftp_connect= @ftp_connect($ftpipport[0],$ftpipport[1],5); } else { - $ftp_connect= @ftp_connect($ftpipport['0'],21,5); + $ftp_connect= @ftp_connect($ftpipport[0],21,5); } if ($ftp_connect) { $ftp_login= @ftp_login($ftp_connect,$ftpuser,$ftppass); @@ -588,31 +588,31 @@ if((!isset($servertype) and isset($page_include) and $ui->id('xml',1,'post')!=1) } ftp_close($ftp_connect); } - $free=$gscounts["$game"]-$gsused["$game"]; + $free=$gscounts[$game]-$gsused[$game]; if ($free>0) { - if (isset($switchcount["$game"]["$game"]['freeids']) and count($switchcount["$game"]["$game"]['freeids'])>0) { - $random=array_rand($switchcount["$game"]["$game"]['freeids'],1); - $serverid=$switchcount["$game"]["$game"]['freeids']["$random"]; + if (isset($switchcount[$game][$game]['freeids']) and count($switchcount[$game][$game]['freeids'])>0) { + $random=array_rand($switchcount[$game][$game]['freeids'],1); + $serverid=$switchcount[$game][$game]['freeids'][$random]; } else { $mostleft=array(); foreach ($switchcount as $key=>$arrays) { - if (isset($switchcount["$key"]["$game"]['freeids']) and count($switchcount["$key"]["$game"]['freeids'])>0) { + if (isset($switchcount[$key][$game]['freeids']) and count($switchcount[$key][$game]['freeids'])>0) { foreach ($switchcount as $leftkey=>$leftarrays) { if ($leftkey!=$key) { foreach ($leftarrays as $gametype => $values) { - if (isset($leftservers["$gametype"])) { - $leftservers["$key"]["$gametype"]=$leftservers["$gametype"]+($values['exist']-$values['used']); + if (isset($leftservers[$gametype])) { + $leftservers[$key][$gametype]=$leftservers[$gametype]+($values['exist']-$values['used']); } else { - $leftservers["$key"]["$gametype"]=$values['exist']-$values['used']; + $leftservers[$key][$gametype]=$values['exist']-$values['used']; } } } } foreach ($arrays as $gametype => $values) { - if (isset($leftservers["$gametype"])) { - $leftservers["$key"]["$gametype"]=$leftservers["$gametype"]+($values['exist']-$values['used']-1); + if (isset($leftservers[$gametype])) { + $leftservers[$key][$gametype]=$leftservers[$gametype]+($values['exist']-$values['used']-1); } else { - $leftservers["$key"]["$gametype"]=$values['exist']-$values['used']-1; + $leftservers[$key][$gametype]=$values['exist']-$values['used']-1; } } } @@ -620,14 +620,14 @@ if((!isset($servertype) and isset($page_include) and $ui->id('xml',1,'post')!=1) foreach ($leftservers as $keys=>$arrays) { $percent=0; foreach ($arrays as $key=>$count) { - $percent=$percent+((100/$switchcount["$keys"]["$key"]['exist'])*($count)); + $percent=$percent+((100/$switchcount[$keys][$key]['exist'])*($count)); } - $mostleft["$keys"]=$percent; + $mostleft[$keys]=$percent; } arsort($mostleft); $bestmultigame=key($mostleft); - $random=array_rand($switchcount["$bestmultigame"]["$game"]['freeids'],1); - $serverid=$switchcount["$bestmultigame"]["$game"]['freeids']["$random"]; + $random=array_rand($switchcount[$bestmultigame][$game]['freeids'],1); + $serverid=$switchcount[$bestmultigame][$game]['freeids'][$random]; } $timeleft=$lendtime; if (!$ui->id('xml',1,'post')==1) { @@ -731,7 +731,7 @@ XML; '.$password.' '; foreach ($gscounts as $key=>$value){ - $amount=$value-$gsused["$key"]; + $amount=$value-$gsused[$key]; $xml .=' <'.$key.'> '.$amount.' @@ -779,7 +779,7 @@ XML; $lendable=false; } if ($lendable==true) { - $mastervoiceids["$masterid"][]=$row2['id']; + $mastervoiceids[$masterid][]=$row2['id']; } $slots=$slots+$row2['slots']; $vomacount++; @@ -789,16 +789,16 @@ XML; $nextfree=0; } if ($vomacount>0) { - $masterservers["$masterid"]=$serverpercent=(100/$vomacount)*$usedvoice; + $masterservers[$masterid]=$serverpercent=(100/$vomacount)*$usedvoice; } } asort($masterservers); $bestmaster=key($masterservers); - if ($masterservers["$bestmaster"]!='100') { + if ($masterservers[$bestmaster]!='100') { $serveravailable=true; - $counmaster=count($mastervoiceids["$bestmaster"]); + $counmaster=count($mastervoiceids[$bestmaster]); $arrayid=mt_rand(0,$counmaster-1); - $tousevoiceid=$mastervoiceids["$bestmaster"]["$arrayid"]; + $tousevoiceid=$mastervoiceids[$bestmaster][$arrayid]; } if ($serveravailable==true and ($lendaccess==1 or $lendaccess==2) and (($ui->id('xml',1,'post') and $ui->w('game',20,'post') or $ui->w('password',20,'post')))) { $fail=0; @@ -882,7 +882,7 @@ XML; $connection->ModServer($volocalserverid,$slots,$voip,$voport,$password,$name,$welcome,$max_download_total_bandwidth,$max_upload_total_bandwidth,$banner_url,$banner_gfx,$button_url,$button_gfx,$tooltip); $reply=$connection->PermReset($volocalserverid); $connection->CloseConnection(); - $rcon=$reply['0']['token']; + $rcon=$reply[0]['token']; if (!$ui->id('xml',1,'post')) { $_SESSION['lend']['vs']=$tousevoiceid; } diff --git a/web/login.php b/web/login.php index 77520130..0894ebf1 100644 --- a/web/login.php +++ b/web/login.php @@ -115,7 +115,7 @@ if ($w=='lo') { $i=0; $path=""; while ($i<$amount) { - $path .=$folders["$i"]."/"; + $path .=$folders[$i]."/"; $i++; } $webhostdomain=(isset($ui->server['HTTPS'])) ? "https://".$ui->server['HTTP_HOST'].$path : "http://".$ui->server['HTTP_HOST'].$path; @@ -169,7 +169,7 @@ if ($w=='lo') { $md5=md5($row['userid'].$row['logintime'].$row['cname'].$row['lastlogin'].mt_rand()); foreach (explode('|', $row['security']) as $user) { $ex=explode(':',str_replace(array("\r","\n"),"",$user)); - if (isset($ex['1'])) $ts3userlist[$ex['0']]=$ex['1']; + if (isset($ex[1])) $ts3userlist[$ex[0]]=$ex[1]; } } $text=$sprache->nouser; @@ -183,7 +183,7 @@ if ($w=='lo') { $i=0; $path=""; while ($i<$amount) { - $path .=$folders["$i"]."/"; + $path .=$folders[$i]."/"; $i++; } $webhostdomain=(isset($ui->server['HTTPS'])) ? "https://".$ui->server['HTTP_HOST'].$path : "http://".$ui->server['HTTP_HOST'].$path; @@ -354,7 +354,7 @@ XML; $ref=$ui->domain('HTTP_REFERER','server'); } $referrer=explode('/', str_replace(array('http://', 'https://'),'',strtolower($ref))); - if (isset($referrer['1']) and $referrer['1']=='login.php') $topanel=true; + if (isset($referrer[1]) and $referrer[1]=='login.php') $topanel=true; if (!isset($user_id) and !isset($admin_id)) { header('Location: login.php&r=lo'); } else if(isset($user_id)) { @@ -365,7 +365,7 @@ XML; $i=0; $path=""; while ($i<$amount) { - $path .=$folders["$i"]."/"; + $path .=$folders[$i]."/"; $i++; } $webhostdomain=(isset($ui->server['HTTPS'])) ? "https://".$ui->server['HTTP_HOST'].$path : "http://".$ui->server['HTTP_HOST'].$path; diff --git a/web/protectioncheck.php b/web/protectioncheck.php index bf710404..9b3f7569 100644 --- a/web/protectioncheck.php +++ b/web/protectioncheck.php @@ -75,8 +75,8 @@ if ($ui->ipport('serveraddress','post') or (isset($server_ip) and isset($server_ if ($ui->ipport('serveraddress','post')) { $serveraddress=$ui->ipport('serveraddress','post'); $adresse_awk=explode(":",$serveraddress); - $ip=$adresse_awk['0']; - $port=$adresse_awk['1']; + $ip=$adresse_awk[0]; + $port=$adresse_awk[1]; } else if (isset($server_ip) and isset($server_port)) { $ip=$server_ip; $port=$server_port; @@ -101,11 +101,11 @@ if ($ui->ipport('serveraddress','post') or (isset($server_ip) and isset($server_ $query->execute(array($psince,$customer,'%'.$serveraddress.'%')); foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { $logentry=explode(" ", $row['useraction']); - if (($logentry['1']=="%gserver%" or $logentry['1']=="%addon%") and ($logentry['0']!='%resync%' and $logentry['0']!='%mod%')) { + if (($logentry[1]=="%gserver%" or $logentry[1]=="%addon%") and ($logentry[0]!='%resync%' and $logentry[0]!='%mod%')) { if ($default_language=="de") { $time=explode(' ', $row['logdate']); - $time2=explode('-', $time['0']); - $time3=$time2['2'].".".$time2['1'].".".$time2['0']." ".$time['1']; + $time2=explode('-', $time[0]); + $time3=$time2[2].".".$time2[1].".".$time2[0]." ".$time[1]; } else { $time3=$row['logdate']; } @@ -116,10 +116,10 @@ if ($ui->ipport('serveraddress','post') or (isset($server_ip) and isset($server_ $replacedpics=str_replace($placeholders1,$replace1,$row['useraction']); $replacedwords=str_replace($placeholders2,$replace2,$row['useraction']); if (!empty($replacedpics)) { - if ($logentry['1']=="%gserver%") { + if ($logentry[1]=="%gserver%") { $logs[]="$replacedpics: $time3"; } - $xmllogs["$time3"]="$replacedwords"; + $xmllogs[$time3]="$replacedwords"; } } } diff --git a/web/reboot.php b/web/reboot.php index 0925739e..17a3e884 100644 --- a/web/reboot.php +++ b/web/reboot.php @@ -154,7 +154,7 @@ if (!isset($ip) or $_SERVER['SERVER_ADDR']==$ip) { $folders='cd '; } while ($i<=$folderfilecount) { - $folders=$folders.$split_config["$i"]."/"; + $folders=$folders.$split_config[$i]."/"; $i++; } if ($folders=='cd ') { diff --git a/web/serverallocation.php b/web/serverallocation.php index 83c5df63..8c4a2237 100644 --- a/web/serverallocation.php +++ b/web/serverallocation.php @@ -101,17 +101,17 @@ if ($ui->smallletters('w',5,'get')=='check') { $hdd_rows=explode("\r\n", $row['hdd']); foreach ($hdd_rows as $hddline) { $data_explode=explode(" ", $hddline); - if (isset($data_explode['1'])) { - $mountpoint=$data_explode['0']; - $mountsize["$mountpoint"]=$data_explode['1']; - $mountunused["$mountpoint"]=0; + if (isset($data_explode[1])) { + $mountpoint=$data_explode[0]; + $mountsize[$mountpoint]=$data_explode[1]; + $mountunused[$mountpoint]=0; $hdd[]=$mountpoint; } } $i=1; while ($i<=$cores) { $core[]=$i; - $cpucore["$i"]=0; + $cpucore[$i]=0; $i++; } $i=1; @@ -128,24 +128,24 @@ if ($ui->smallletters('w',5,'get')=='check') { $i2=0; foreach ($query2->fetchAll(PDO::FETCH_ASSOC) as $row2) { $mountpoint=$row2['mountpoint']; - $addstracthdd=$mountunused["$mountpoint"]+($row2['hddsize']*($percent/100)); - $mountunused["$mountpoint"]=$addstracthdd; + $addstracthdd=$mountunused[$mountpoint]+($row2['hddsize']*($percent/100)); + $mountunused[$mountpoint]=$addstracthdd; $addstractram=$ramused+$row2['minram']; $ramused=$addstractram; $cpuhz=$row2['cores']*$row2['minmhz']; - $addcpu=$cpucore['1']+$cpuhz; + $addcpu=$cpucore[1]+$cpuhz; if ($addcpu<=$mhz) { - $cpucore['1']=$addcpu; + $cpucore[1]=$addcpu; } else { - $cpucore['1']=$mhz; + $cpucore[1]=$mhz; $nextcore="2"; while ($nextcore<=$cores) { $extra=$addcpu-$mhz; - $addcpu=$cpucore["$nextcore"]+$extra; + $addcpu=$cpucore[$nextcore]+$extra; if ($addcpu<=$mhz and $addcpu>=0) { - $cpucore["$nextcore"]=$addcpu; + $cpucore[$nextcore]=$addcpu; } else if ($addcpu>=0) { - $cpucore["$nextcore"]=$mhz; + $cpucore[$nextcore]=$mhz; } $nextcore++; } @@ -153,7 +153,7 @@ if ($ui->smallletters('w',5,'get')=='check') { $i2++; } foreach ($hdd as $mountpoint) { - $freespace["$mountpoint"]=$mountsize["$mountpoint"]-($mountunused["$mountpoint"]*($percent/100)); + $freespace[$mountpoint]=$mountsize[$mountpoint]-($mountunused[$mountpoint]*($percent/100)); } natsort($freespace); $freespace=array_reverse($freespace); @@ -195,7 +195,7 @@ if ($ui->smallletters('w',5,'get')=='check') { $userips=ipstoarray($row['ips']); foreach ($userips as $ip) { $ip_ex=explode(".",$ip); - $ips[]=$ip_ex['0'].".".$ip_ex['1'].".".$ip_ex['2']."."; + $ips[]=$ip_ex[0].".".$ip_ex[1].".".$ip_ex[2]."."; } } $subnets=array_unique($ips); @@ -353,10 +353,10 @@ if ($ui->smallletters('w',5,'get')=='check') { $gamelist=array(); $count=count($games); while ($i<$count) { - if ($games["$i"]!='' and !in_array($games["$i"],$gamelist)) { - $gamelist[]=$games["$i"]; + if ($games[$i]!='' and !in_array($games[$i],$gamelist)) { + $gamelist[]=$games[$i]; $query=$sql->prepare("SELECT `id` FROM `servertypes` WHERE `shorten`=? AND `resellerid`=? LIMIT 1"); - $query->execute(array($games["$i"],$reseller_id)); + $query->execute(array($games[$i],$reseller_id)); $typeID=$query->fetchColumn(); $rootServer->collectData($typeID,true); } diff --git a/web/statuscheck.php b/web/statuscheck.php index 57b19d41..3ef5c799 100644 --- a/web/statuscheck.php +++ b/web/statuscheck.php @@ -326,7 +326,7 @@ if (!isset($ip) or $_SERVER['SERVER_ADDR']==$ip) { foreach ($badxml as $badxml2) { $address=$badxml2['address']; $status=$badxml2['status']; - $badstatus["$address"]=array('status'=>$status); + $badstatus[$address]=array('status'=>$status); if ($badxml2['status']=="UP") { if ($badxml2['type']!="A2S") { $gametype=$badxml2->gametype; @@ -342,7 +342,7 @@ if (!isset($ip) or $_SERVER['SERVER_ADDR']==$ip) { $numplayers=$badxml2->numplayers; $maxplayers=$badxml2->maxplayers; $map=$badxml2->map; - $badstatus["$address"]=array('gametype'=>$gametype,'name'=>$name,'numplayers'=>$numplayers,'maxplayers'=>$maxplayers,'map'=>$map,'rules'=>$badxml2->rules->rule); + $badstatus[$address]=array('gametype'=>$gametype,'name'=>$name,'numplayers'=>$numplayers,'maxplayers'=>$maxplayers,'map'=>$map,'rules'=>$badxml2->rules->rule); } } } @@ -353,8 +353,8 @@ if (!isset($ip) or $_SERVER['SERVER_ADDR']==$ip) { $address=$xml2['address']; $password=''; $addressarray=explode(':', $address); - $ip=$addressarray['0']; - $port=$addressarray['1']; + $ip=$addressarray[0]; + $port=$addressarray[1]; $query=$sql->prepare("SELECT g.*,t.`shorten`,t.`qstat` FROM `gsswitch` g INNER JOIN `serverlist` s ON g.`serverid`=s.`id` INNER JOIN `servertypes` t ON s.`servertype`=t.`id` WHERE g.`serverip`=? AND g.`port`=? LIMIT 1"); $query->execute(array($ip,$port)); foreach ($query->fetchall(PDO::FETCH_ASSOC) as $row) { @@ -390,7 +390,7 @@ if (!isset($ip) or $_SERVER['SERVER_ADDR']==$ip) { $passparams=explode(":", $qstatpassparam); } unset($password,$rulebreak,$maxplayers,$name); - if (($xml2['status']=="DOWN" or $xml2['status']=="TIMEOUT") and (!isset($badstatus["$address"]['status']) or $badstatus["$address"]['status']=="DOWN" or $badstatus["$address"]['status']=="TIMEOUT")) { + if (($xml2['status']=="DOWN" or $xml2['status']=="TIMEOUT") and (!isset($badstatus[$address]['status']) or $badstatus[$address]['status']=="DOWN" or $badstatus[$address]['status']=="TIMEOUT")) { $status="DOWN"; $name=''; $numplayers=0; @@ -398,21 +398,21 @@ if (!isset($ip) or $_SERVER['SERVER_ADDR']==$ip) { $map=''; $gametype=''; print "recheck status for $address is still: $status\r\n"; - } else if (($xml2['status']=="DOWN" or $xml2['status']=="TIMEOUT") and isset($badstatus["$address"]['status']) and $badstatus["$address"]['status']=="UP") { + } else if (($xml2['status']=="DOWN" or $xml2['status']=="TIMEOUT") and isset($badstatus[$address]['status']) and $badstatus[$address]['status']=="UP") { $status="UP"; - foreach ($badstatus["$address"]['rules'] as $rule) { + foreach ($badstatus[$address]['rules'] as $rule) { switch((string) $rule['name']) { - case $passparams['0']: - if ($rule==$passparams['1']) $password="Y"; + case $passparams[0]: + if ($rule==$passparams[1]) $password="Y"; else $password="N"; break; } } - $name=$status=$badstatus["$address"]['name']; - $numplayers=$status=$badstatus["$address"]['numplayers']; - $maxplayers=$status=$badstatus["$address"]['maxplayers']; - $map=$status=$badstatus["$address"]['map']; - $gametype=$status=$badstatus["$address"]['gametype']; + $name=$status=$badstatus[$address]['name']; + $numplayers=$status=$badstatus[$address]['numplayers']; + $maxplayers=$status=$badstatus[$address]['maxplayers']; + $map=$status=$badstatus[$address]['map']; + $gametype=$status=$badstatus[$address]['gametype']; } else { $status="UP"; $name=$xml2->name; @@ -428,8 +428,8 @@ if (!isset($ip) or $_SERVER['SERVER_ADDR']==$ip) { case 'gamename': $gametype=$rule; break; - case $passparams['0']: - if ($rule==$passparams['1']) $password="Y"; + case $passparams[0]: + if ($rule==$passparams[1]) $password="Y"; else $password="N"; break; } @@ -451,8 +451,8 @@ if (!isset($ip) or $_SERVER['SERVER_ADDR']==$ip) { $address=$array['server']; $server=explode(':',$address); $qstat=$array['qstat']; - $serverip=$server['0']; - $port=$server['1']; + $serverip=$server[0]; + $port=$server[1]; $switchID=$array['switchID']; $query=$sql->prepare("SELECT s.`id`,t.`description`,g.`slots`,g.`war`,g.`brandname`,g.`secnotified`,g.`notified`,g.`lendserver`,g.`userid`,g.`resellerid`,g.`rootID` FROM `gsswitch` g INNER JOIN `serverlist` s ON g.`serverid`=s.`id` INNER JOIN `servertypes` t ON s.`servertype`=t.`id` WHERE g.`id`=? LIMIT 1"); $query->execute(array($switchID)); @@ -589,7 +589,7 @@ if (!isset($ip) or $_SERVER['SERVER_ADDR']==$ip) { $folders=(substr($row['serverdir'],0,1)=='/') ? 'cd /' : 'cd '; $lastFolder=''; while ($i<=$folderfilecount) { - $folders=$folders.$split_config["$i"]."/"; + $folders=$folders.$split_config[$i]."/"; $lastFolder=$split_config[$i]; $i++; } @@ -719,7 +719,7 @@ if (!isset($ip) or $_SERVER['SERVER_ADDR']==$ip) { $folders='cd '; } while ($i<=$folderfilecount) { - $folders=$folders.$split_config["$i"]."/"; + $folders=$folders.$split_config[$i]."/"; $i++; } if ($folders=='cd ') { @@ -766,7 +766,7 @@ if (!isset($ip) or $_SERVER['SERVER_ADDR']==$ip) { $pupdate->execute(array($ts3masterid)); } $serverlist=$connection->ServerList(); - if (!isset($serverlist['0']['id']) or $serverlist['0']['id']=='0') { + if (!isset($serverlist[0]['id']) or $serverlist[0]['id']=='0') { foreach ($serverlist as $server) { unset($modbadserver); $modbadserver=array(); @@ -868,26 +868,26 @@ if (!isset($ip) or $_SERVER['SERVER_ADDR']==$ip) { } if (isset($ts3id) and $forcebanner=='Y') { foreach (array('virtualserver_hostbanner_url','virtualserver_hostbanner_gfx_url') as $param) { - if ($default["$param"]!='' and $sd["$param"]!=$default["$param"]) { - $modbadserver["$param"]=$default["$param"]; - print $vrow['type']." server $address $param != ".$default["$param"].". The name converted to ISO-8859-1 is ".iconv('UTF-8','ISO-8859-1//TRANSLIT',$server['virtualserver_name'])."\r\n"; + if ($default[$param]!='' and $sd[$param]!=$default[$param]) { + $modbadserver[$param]=$default[$param]; + print $vrow['type']." server $address $param != ".$default[$param].". The name converted to ISO-8859-1 is ".iconv('UTF-8','ISO-8859-1//TRANSLIT',$server['virtualserver_name'])."\r\n"; if (isset($rulebreak)) { - $rulebreak .="
".$param." ".$vosprache->isnot." ".$default["$param"]; + $rulebreak .="
".$param." ".$vosprache->isnot." ".$default[$param]; } else { - $rulebreak=$param." ".$vosprache->isnot." ".$default["$param"]; + $rulebreak=$param." ".$vosprache->isnot." ".$default[$param]; } } } } if (isset($ts3id) and $forcebutton=='Y') { foreach (array('virtualserver_hostbutton_tooltip','virtualserver_hostbutton_url','virtualserver_hostbutton_gfx_url') as $param) { - if ($default["$param"]!='' and $sd["$param"]!=$default["$param"]) { - $modbadserver["$param"]=$default["$param"]; - print $vrow['type']." server $address $param != ".$default["$param"].". The name converted to ISO-8859-1 is ".iconv('UTF-8','ISO-8859-1//TRANSLIT',$server['virtualserver_name'])."\r\n"; + if ($default[$param]!='' and $sd[$param]!=$default[$param]) { + $modbadserver[$param]=$default[$param]; + print $vrow['type']." server $address $param != ".$default[$param].". The name converted to ISO-8859-1 is ".iconv('UTF-8','ISO-8859-1//TRANSLIT',$server['virtualserver_name'])."\r\n"; if (isset($rulebreak)) { - $rulebreak .="
".$param." ".$vosprache->isnot." ".$default["$param"]; + $rulebreak .="
".$param." ".$vosprache->isnot." ".$default[$param]; } else { - $rulebreak=$param." ".$vosprache->isnot." ".$default["$param"]; + $rulebreak=$param." ".$vosprache->isnot." ".$default[$param]; } } } @@ -1017,7 +1017,7 @@ if (!isset($ip) or $_SERVER['SERVER_ADDR']==$ip) { } } } - } else print "Error: ".$serverlist['0']['msg']."\r\n"; + } else print "Error: ".$serverlist[0]['msg']."\r\n"; } if (isset($connection)) { $connection->CloseConnection(); diff --git a/web/stuff/adminhome.php b/web/stuff/adminhome.php index e3b4deaa..90e693b4 100644 --- a/web/stuff/adminhome.php +++ b/web/stuff/adminhome.php @@ -173,7 +173,7 @@ if($ui->smallletters('w',2,'get')=='da' or (!$ui->smallletters('w',2,'get') and if ($row['merge']=='Y'){ $feedArray['News'][]=$theNews; } else { - $feedArray["$url"][]=$theNews; + $feedArray[$url][]=$theNews; } } } diff --git a/web/stuff/api_gserver.php b/web/stuff/api_gserver.php index 64b6812d..85ff87f8 100644 --- a/web/stuff/api_gserver.php +++ b/web/stuff/api_gserver.php @@ -132,9 +132,9 @@ if (!isset($success['false']) and array_value_exists('action','add',$data) and 1 } $typeIDList[]=$row['id']; $shortenToID[$row['id']]=$singleShorten; - $typeIDs["$singleShorten"]=array('id'=>$row['id'],'map'=>$row['map'],'mapGroup'=>$row['mapGroup'],'tic'=>$row['tic'],'cmd'=>$row['cmd'],'gamemod'=>$row['gamemod'],'gamemod2'=>$row['gamemod2']); + $typeIDs[$singleShorten]=array('id'=>$row['id'],'map'=>$row['map'],'mapGroup'=>$row['mapGroup'],'tic'=>$row['tic'],'cmd'=>$row['cmd'],'gamemod'=>$row['gamemod'],'gamemod2'=>$row['gamemod2']); } - if (!isset($typeIDs["$singleShorten"])) { + if (!isset($typeIDs[$singleShorten])) { $success['false'][]='image with the shorten '.$singleShorten.' does not exists'; } } diff --git a/web/stuff/class_masterserver.php b/web/stuff/class_masterserver.php index 5d008dbf..cd98f560 100644 --- a/web/stuff/class_masterserver.php +++ b/web/stuff/class_masterserver.php @@ -82,7 +82,7 @@ class masterServer { // Get the imageserver if possible and use Easy-WI server as fallback $mainip=explode('.',$this->sship); - $mainsubnet=$mainip['0'].'.'.$mainip['1'].'.'.$mainip['2']; + $mainsubnet=$mainip[0].'.'.$mainip[1].'.'.$mainip[2]; $query=$sql->prepare("SELECT AES_DECRYPT(`imageserver`,?) AS `decryptedimageserver` FROM `settings` WHERE `resellerid`=? LIMIT 1"); $query->execute(array($aeskey,$this->resellerID)); $splitImageservers=preg_split('/\r\n/',$query->fetchColumn(),-1,PREG_SPLIT_NO_EMPTY); @@ -92,7 +92,7 @@ class masterServer { if (isurl($server)) { $imageservers[]=$server; $split1=preg_split('/\//',$server,-1,PREG_SPLIT_NO_EMPTY); - if (isset($split1['1'])) { + if (isset($split1[1])) { $split2=preg_split('/\@/',$split1[1],-1,PREG_SPLIT_NO_EMPTY); } else { $split2=preg_split('/\@/',$split1[0],-1,PREG_SPLIT_NO_EMPTY); @@ -100,7 +100,7 @@ class masterServer { } else if (isRsync($server)) { $imageservers[]=$server; $split1=preg_split('/\//',$server,-1,PREG_SPLIT_NO_EMPTY); - if (isset($split1['1'])) { + if (isset($split1[1])) { $split2=preg_split('/\:/',$split1[1],-1,PREG_SPLIT_NO_EMPTY); } else { $split2=preg_split('/\:/',$split1[0],-1,PREG_SPLIT_NO_EMPTY); @@ -111,7 +111,7 @@ class masterServer { $noSync=true; } else if (isip($splitip,'all')) { $ipparts=explode('.',$splitip); - $subnet=$ipparts['0'].'.'.$ipparts['1'].'.'.$ipparts['2']; + $subnet=$ipparts[0].'.'.$ipparts[1].'.'.$ipparts[2]; if ($mainsubnet==$subnet) { $imageserver=$server; } @@ -121,7 +121,7 @@ class masterServer { if (!isset($imageserver) and count($imageservers)>0) { $imageserver_count=count($imageservers)-1; $arrayentry=rand(0,$imageserver_count); - $imageserver=$imageservers["$arrayentry"]; + $imageserver=$imageservers[$arrayentry]; } if (!isset($imageserver)) { $imageserver='easywi'; diff --git a/web/stuff/class_validator.php b/web/stuff/class_validator.php index 2796b286..d2ae2ef7 100644 --- a/web/stuff/class_validator.php +++ b/web/stuff/class_validator.php @@ -163,7 +163,7 @@ class ValidateUserinput { if (is_string($check)) $check=trim($check); if($check and is_string($check) and filter_var($check,FILTER_VALIDATE_EMAIL)) { $exploded=explode('@',$check); - if (!checkdnsrr($exploded['1'],'MX') and !checkdnsrr($exploded['1'],'A')) return false; + if (!checkdnsrr($exploded[1],'MX') and !checkdnsrr($exploded[1],'A')) return false; return strtolower($check); } else if ($check) { return $this->loop($check,'ismail',$type); diff --git a/web/stuff/class_voice.php b/web/stuff/class_voice.php index 2b4a2386..9fc58e7b 100644 --- a/web/stuff/class_voice.php +++ b/web/stuff/class_voice.php @@ -70,7 +70,7 @@ class TS3 { $i=1; $buffered=''; while ($i<$count) { - $buffered .=$splitted["$i"]; + $buffered .=$splitted[$i]; $i++; } $splitted[1]=$buffered; @@ -287,9 +287,9 @@ class TS3 { $virtualserver_ip=(isset($serverdetails_query[0]['virtualserver_ip']) and isip($serverdetails_query[0]['virtualserver_ip'],'all')) ? $serverdetails_query[0]['virtualserver_ip'] : $this->ip; $serverdetails_query=$this->SendCommand('serverinfo'); $virtualserver_server=$virtualserver_ip.':'.$server['virtualserver_port']; - $virtualserver_dns=(array_key_exists($virtualserver_server,$dnsarray)) ? $dnsarray["$virtualserver_server"] :''; + $virtualserver_dns=(array_key_exists($virtualserver_server,$dnsarray)) ? $dnsarray[$virtualserver_server] :''; if (isset($serverdetails_query[0])) { - $serverdetails["$virtualserver_id"]=array( + $serverdetails[$virtualserver_id]=array( 'virtualserver_ip'=>$virtualserver_ip, 'virtualserver_maxclients'=>$serverdetails_query[0]['virtualserver_maxclients'], 'virtualserver_port'=>$server['virtualserver_port'], @@ -306,7 +306,7 @@ class TS3 { 'virtualserver_hostbutton_gfx_url'=>$serverdetails_query[0]['virtualserver_hostbutton_gfx_url'] ); } else { - $serverdetails["$virtualserver_id"]=array( + $serverdetails[$virtualserver_id]=array( 'virtualserver_ip'=>$virtualserver_ip, 'virtualserver_maxclients'=>$serverdetails_query[0]['virtualserver_maxclients'], 'virtualserver_port'=>$server['virtualserver_port'], @@ -327,10 +327,10 @@ class TS3 { if ($server['virtualserver_status']=='offline') { $this->StopServer($virtualserver_id); } - if (!isset($serverdetails["$virtualserver_id"])) { + if (!isset($serverdetails[$virtualserver_id])) { $virtualserver_ip=(isset($virtualserver_ip)) ? $virtualserver_ip :''; $virtualserver_dns=(isset($virtualserver_dns)) ? $virtualserver_dns :''; - $serverdetails["$virtualserver_id"]=array( + $serverdetails[$virtualserver_id]=array( 'virtualserver_ip'=>$virtualserver_ip, 'virtualserver_maxclients'=>$server['virtualserver_maxclients'], 'virtualserver_port'=>$server['virtualserver_port'], @@ -457,7 +457,7 @@ class TS3 { $cldbid=$userid['cldbid']; $userdata=$this->SendCommand("clientdbinfo cldbid=".$cldbid); $client_unique_identifier=$this->ReplaceFromTS3($userdata[0]['client_unique_identifier']); - $adminlist["$cldbid"]=$client_unique_identifier; + $adminlist[$cldbid]=$client_unique_identifier; } } else { $adminlist=array(); @@ -767,7 +767,7 @@ function tsdns ($action,$sship,$sshport,$sshuser,$keyuse,$sshkey,$sshpw,$notifie if (isset($dnsconfig[1])) { $linedns=$dnsconfig[0]; $lineserver=$dnsconfig[1]; - $dnsarray["$lineserver"]=$linedns; + $dnsarray[$lineserver]=$linedns; } } } diff --git a/web/stuff/functions.php b/web/stuff/functions.php index 845ba638..87874b72 100644 --- a/web/stuff/functions.php +++ b/web/stuff/functions.php @@ -284,13 +284,13 @@ if (!function_exists('passwordgenerate')) { foreach (explode("\r\n", $value) as $exip) { if (isips($exip)) { $exploded_ip=explode(".", $exip); - if (is_numeric($exploded_ip['3'])){ + if (is_numeric($exploded_ip[3])){ $ips_array[]=$exip; } else { - $range=explode("/", $exploded_ip['3']); + $range=explode("/", $exploded_ip[3]); $i=$range[0]; while ($i <= $range[1]) { - $ips_array[]=$exploded_ip[0].".".$exploded_ip[1].".".$exploded_ip['2'].".".$i; + $ips_array[]=$exploded_ip[0].".".$exploded_ip[1].".".$exploded_ip[2].".".$i; $i++; } } @@ -393,7 +393,7 @@ if (!function_exists('passwordgenerate')) { $stringlenght=strlen($data2[0]); $stop=$stringlenght-2; $value=substr($data2[0],1,$stop); - $vars["$cvar"]=$value; + $vars[$cvar]=$value; } } return $vars; @@ -706,10 +706,10 @@ if (!function_exists('passwordgenerate')) { $i=0; $folders="/$pserver$serverfolder"; while ($i<$folderfilecount) { - $folders .="/".$split_config["$i"]; + $folders .="/".$split_config[$i]; $i++; } - $uploadfile=$split_config["$i"]; + $uploadfile=$split_config[$i]; @ftp_chdir($ftp_connect,$folders); if (strlen($uploadfile)>0 and @ftp_fget($ftp_connect,$temp,$uploadfile,FTP_ASCII,0)) { fseek($temp,0); @@ -995,12 +995,12 @@ if (!function_exists('passwordgenerate')) { $array=$query->fetchAll(PDO::FETCH_ASSOC); foreach ($array as $row) { if (($accounttype=='u' and $row['miniroot']=='Y')) { - foreach ($row as $key => $value) $pa["$key"]=true; + foreach ($row as $key => $value) $pa[$key]=true; } else if (($accounttype!='u' and $row['root']=='Y')) { - foreach ($row as $key => $value) $pa["$key"]=true; + foreach ($row as $key => $value) $pa[$key]=true; } else { foreach ($row as $key => $value) { - if ((isset($pa["$key"]) and $pa["$key"]===false) or !isset($pa["$key"])) $pa["$key"]=($value=='Y') ? true : false; + if ((isset($pa[$key]) and $pa[$key]===false) or !isset($pa[$key])) $pa[$key]=($value=='Y') ? true : false; } } } @@ -1179,16 +1179,16 @@ if (!function_exists('passwordgenerate')) { $query2=$sql->prepare("UPDATE `settings` SET `licence`=?,`version`=?,`releasenotesDE`=?,`releasenotesEN`=? WHERE `resellerid`=0 LIMIT 1"); $query2->execute(array($licencecode,$json->v,$json->de,$json->en)); } - if ($return==true) return $licencecode; + return ($return==true) ? $licencecode : false; } function token ($check=false) { global $ui,$_SESSION; if ($check==false) { $token=md5(mt_rand()); - if ($ui->id('id',10,'get') and $ui->smallletters('d',10,'get')) $_SESSION[$ui->smallletters('w',10,'get')][$ui->smallletters('d',10,'get')][$ui->id('id',10,'get')]=array('t'=>$token,'d'=>strtotime("+20 minutes")); - else if (!$ui->id('id',10,'get') and $ui->smallletters('d',10,'get')) $_SESSION[$ui->smallletters('w',10,'get')][$ui->smallletters('d',10,'get')]=array('t'=>$token,'d'=>strtotime("+20 minutes")); - else if ($ui->id('id',10,'get') and !$ui->smallletters('d',10,'get')) $_SESSION[$ui->smallletters('w',10,'get')][$ui->id('id',10,'get')]=array('t'=>$token,'d'=>strtotime("+20 minutes")); - else $_SESSION[$ui->smallletters('w',10,'get')]=array('t'=>$token,'d'=>strtotime("+15 minutes")); + if ($ui->id('id',10,'get') and $ui->smallletters('d',10,'get')) $_SESSION[$ui->smallletters('w',10,'get')][$ui->smallletters('d',10,'get')][$ui->id('id',10,'get')]=array('t'=>$token,'d'=>strtotime("+40 minutes")); + else if (!$ui->id('id',10,'get') and $ui->smallletters('d',10,'get')) $_SESSION[$ui->smallletters('w',10,'get')][$ui->smallletters('d',10,'get')]=array('t'=>$token,'d'=>strtotime("+40 minutes")); + else if ($ui->id('id',10,'get') and !$ui->smallletters('d',10,'get')) $_SESSION[$ui->smallletters('w',10,'get')][$ui->id('id',10,'get')]=array('t'=>$token,'d'=>strtotime("+40 minutes")); + else $_SESSION[$ui->smallletters('w',10,'get')]=array('t'=>$token,'d'=>strtotime("+40 minutes")); return $token; } else { if (isset($_SESSION[$ui->smallletters('w',10,'get')][$ui->smallletters('d',10,'get')][$ui->id('id',10,'get')]['t']) and $_SESSION[$ui->smallletters('w',10,'get')][$ui->smallletters('d',10,'get')][$ui->id('id',10,'get')]['t']==$ui->w('token',32,'post') and $_SESSION[$ui->smallletters('w',10,'get')][$ui->smallletters('d',10,'get')][$ui->id('id',10,'get')]['d']>=strtotime("now")) { @@ -1203,10 +1203,9 @@ if (!function_exists('passwordgenerate')) { } else if (isset($_SESSION[$ui->smallletters('w',10,'get')]['t']) and $_SESSION[$ui->smallletters('w',10,'get')]['t']==$ui->w('token',32,'post') and $_SESSION[$ui->smallletters('w',10,'get')]['d']>=strtotime("now")) { deleteOldToken($ui->smallletters('w',10,'get')); return true; - } else { - deleteOldToken(); - return false; } + deleteOldToken(); + return false; } } function deleteOldToken ($w='',$d='',$id='') { @@ -1271,9 +1270,9 @@ if (!function_exists('passwordgenerate')) { } else { foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { if ($row['type']=='I') { - $var=isid($api["${row['name']}"],$row['length']); - } else if (names($api["${row['name']}"],$row['length'])) { - $var=names($api["${row['name']}"],$row['length']); + $var=isid($api[$row['name']],$row['length']); + } else if (names($api[$row['name']],$row['length'])) { + $var=names($api[$row['name']],$row['length']); } else { $var=''; } diff --git a/web/stuff/ip_bans.php b/web/stuff/ip_bans.php index 4365752f..b06d20a5 100644 --- a/web/stuff/ip_bans.php +++ b/web/stuff/ip_bans.php @@ -84,7 +84,7 @@ if (isset($action) and $action=='dl') { $pselect->execute(); foreach ($pselect->fetchall() as $row) { $logdate=explode(' ', $row['bantime']); - if (isset($row['id']) and isid($row['id'],'30') and isset($logdate['1'])) { + if (isset($row['id']) and isid($row['id'],'30') and isset($logdate[1])) { $table[]=array('id'=>$row['id'],'logday'=>$logdate[0],'loghour'=>$logdate[0],'badip'=>$row['badip'],'failcount'=>$row['failcount'],'reason'=>$row['reason']); } } diff --git a/web/stuff/lendserver.php b/web/stuff/lendserver.php index 9fadd016..c012f68e 100644 --- a/web/stuff/lendserver.php +++ b/web/stuff/lendserver.php @@ -110,10 +110,10 @@ if ($ui->w('action',4,'post') and !token(true)) { $lendtime=$row['lendtime']; $shorten=$row['shorten']; $slots=$row['slots']; - if (isset($statistic["$lenddate"]["$shorten"])) { - $statistic["$lenddate"]["$shorten"]++; + if (isset($statistic[$lenddate][$shorten])) { + $statistic[$lenddate][$shorten]++; } else { - $statistic["$lenddate"]["$shorten"]=1; + $statistic[$lenddate][$shorten]=1; } } $stats=""; @@ -178,11 +178,11 @@ if ($ui->w('action',4,'post') and !token(true)) { $query2->execute(array($row['id'],$reseller_id)); foreach ($query2->fetchall(PDO::FETCH_ASSOC) as $row2) { $shorten=$row2['shorten']; - if (isset($gscounts["$shorten"])) { - $gscounts["$shorten"]++; + if (isset($gscounts[$shorten])) { + $gscounts[$shorten]++; } else { - $gscounts["$shorten"]=1; - $gsused["$shorten"]=0; + $gscounts[$shorten]=1; + $gsused[$shorten]=0; } } } @@ -260,7 +260,7 @@ if ($ui->w('action',4,'post') and !token(true)) { $query7->execute(array($row2['id'],$reseller_id)); foreach ($query7->fetchall(PDO::FETCH_ASSOC) as $row3) { $shortenExists=$row3['shorten']; - $gsused["$shortenExists"]++; + $gsused[$shortenExists]++; } } } else if ($servertype=='v') { @@ -281,7 +281,7 @@ if ($ui->w('action',4,'post') and !token(true)) { $nextcheck=$query->fetchColumn(); $nextcheck=($nextcheck>0) ? ceil($nextcheck) : ceil($nextcheck)*-1; $used[]='Teamspeak 3: '.$voused.'/'.$voTotalCount; - foreach ($gscounts as $key=>$value) $used[]=$key.': '.$gsused["$key"].'/'.$value; + foreach ($gscounts as $key=>$value) $used[]=$key.': '.$gsused[$key].'/'.$value; $template_file="admin_lendserver_list.tpl"; } } \ No newline at end of file diff --git a/web/stuff/logdata.php b/web/stuff/logdata.php index 1eac14aa..a7886cec 100644 --- a/web/stuff/logdata.php +++ b/web/stuff/logdata.php @@ -111,7 +111,7 @@ foreach ($pselect->fetchall() as $row) { $replace=array($gsprache->voiceserver,$gsprache->gameserver,$gsprache->user,$gsprache->groups,$gsprache->fastdownload,$gsprache->master,$gsprache->user,$gsprache->root,$gsprache->addon2,$gsprache->settings,$gsprache->virtual,$gsprache->support,$gsprache->reseller,$gsprache->hostsystem,'Easy Anti Cheat',$gssprache->resync,$gsprache->virtual.' '.$gsprache->template,$gsprache->template,$gsprache->voiceserver,'E-Mail '.$gsprache->settings,'TSDNS','TSDNS',$gssprache->protect,$gsprache->comments); $replacedwords=str_replace($placeholders,$replace,$replacedpics); $logdate=explode(' ', $row['logdate']); - $table[]=array('logday'=>$logdate['0'],'loghour'=>$logdate['1'],'ip'=>$ip,'hostname'=>$hostname,'username'=>$username,'useraction'=>$replacedwords); + $table[]=array('logday'=>$logdate[0],'loghour'=>$logdate[1],'ip'=>$ip,'hostname'=>$hostname,'username'=>$username,'useraction'=>$replacedwords); } $next=$start+$amount; if ($reseller_id==0) { diff --git a/web/stuff/maillog.php b/web/stuff/maillog.php index 5751b02c..c1beaf0a 100644 --- a/web/stuff/maillog.php +++ b/web/stuff/maillog.php @@ -91,8 +91,8 @@ if (isset($action) and $action=='dl' and $ui->id('id',30,'post')) { $username=$row['cname'].' ('.$row['mail'].')'; } $logdate=explode(' ', $row['date']); - if (isset($row['id']) and isid($row['id'],'30') and isset($logdate['1'])) { - $table[]=array('id'=>$row['id'],'logday'=>$logdate['0'],'loghour'=>$logdate['1'],'username'=>$username,'topic'=>$row['topic']); + if (isset($row['id']) and isid($row['id'],'30') and isset($logdate[1])) { + $table[]=array('id'=>$row['id'],'logday'=>$logdate[0],'loghour'=>$logdate[1],'username'=>$username,'topic'=>$row['topic']); } } $next=$start+$amount; diff --git a/web/stuff/masterserver.php b/web/stuff/masterserver.php index f2fafc29..3025359d 100644 --- a/web/stuff/masterserver.php +++ b/web/stuff/masterserver.php @@ -303,7 +303,7 @@ if ($ui->w('action',4,'post') and !token(true)) { $query=$sql->prepare("SELECT `ip` FROM `rserverdata` WHERE `id`=? AND `resellerid`=? LIMIT 1"); $query->execute(array($id,$reseller_id)); foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { - $ips["$id"]=$row['ip']; + $ips[$id]=$row['ip']; } } } diff --git a/web/stuff/page_news_edit.php b/web/stuff/page_news_edit.php index 8944442e..380274ec 100644 --- a/web/stuff/page_news_edit.php +++ b/web/stuff/page_news_edit.php @@ -471,11 +471,11 @@ if ($ui->w('action',4,'post') and !token(true)) { } } $explodedtime=explode(' ', $row['date']); - $explodedtime2=explode('-', $explodedtime['0']); + $explodedtime2=explode('-', $explodedtime[0]); if ($user_language=='de') { - $date=$explodedtime2['2'].".".$explodedtime2['1'].".".$explodedtime2['0']." ".$explodedtime['1']; + $date=$explodedtime2[2].".".$explodedtime2[1].".".$explodedtime2[0]." ".$explodedtime[1]; } else { - $date=$explodedtime2['1'].".".$explodedtime2['2'].".".$explodedtime2['0']." ".$explodedtime['1']; + $date=$explodedtime2[1].".".$explodedtime2[2].".".$explodedtime2[0]." ".$explodedtime[1]; } $table[]=array('id'=>$row['id'],'author'=>$author,'date'=>$date,'released'=>$released,'title'=>$page_title,'link'=>$link,'languages'=>$p_languages); } diff --git a/web/stuff/page_page.php b/web/stuff/page_page.php index 7987126f..6a1aa7ea 100644 --- a/web/stuff/page_page.php +++ b/web/stuff/page_page.php @@ -47,11 +47,15 @@ if (isset($default_page_id)) { $page_id=$ui->id('id',19,'get'); } if (isset($page_id) and is_numeric($page_id)) { + function pre_replace($m) { + return str_replace($m[1],htmlentities($m[1]),$m[0]); + } $query=$sql->prepare("SELECT t.`title`,t.`text`,t.`id`,p.`subpage` FROM `page_pages` p LEFT JOIN `page_pages_text` t ON p.`id`=t.`pageid` WHERE p.`id`=? AND `type`='page' AND t.`language`=? AND p.`released`='1' AND p.`resellerid`='0' LIMIT 1"); $query->execute(array($page_id,$user_language)); foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { $page_title=$row['title']; $page_text=str_replace('%url%',$page_data->pageurl,$row['text']); + $page_text=preg_replace_callback('/(.*?)<\/pre>/imsu','pre_replace',$page_text); $page_keywords=array(); $tag_tags=array(); $breadcrumbID=$row['subpage']; @@ -235,10 +239,7 @@ $langLinks=array(); if (isset($s) and $s=='page') { $query=$sql->prepare("SELECT `title`,`language` FROM `page_pages_text` WHERE `pageid`=?"); $query->execute(array($page_id)); - foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { - $langLinks[$row['language']]=($page_data->seo=='Y') ? szrp($row['title']) : '?s=page&id='.$page_id; - } - + foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) $langLinks[$row['language']]=($page_data->seo=='Y') ? szrp($row['title']) : '?s=page&id='.$page_id; } else if (isset($s)) { foreach ($languages as $l) { $tempLanguage=getlanguagefile('page',$l,0); diff --git a/web/stuff/page_pages.php b/web/stuff/page_pages.php index 0d2cf789..7da347a0 100644 --- a/web/stuff/page_pages.php +++ b/web/stuff/page_pages.php @@ -451,11 +451,11 @@ if ($ui->w('action',4,'post') and !token(true)) { } } $explodedtime=explode(' ', $row['date']); - $explodedtime2=explode('-', $explodedtime['0']); + $explodedtime2=explode('-', $explodedtime[0]); if ($user_language=='de') { - $date=$explodedtime2['2'].".".$explodedtime2['1'].".".$explodedtime2['0']." ".$explodedtime['1']; + $date=$explodedtime2[2].".".$explodedtime2[1].".".$explodedtime2[0]." ".$explodedtime[1]; } else { - $date=$explodedtime2['1'].".".$explodedtime2['2'].".".$explodedtime2['0']." ".$explodedtime['1']; + $date=$explodedtime2[1].".".$explodedtime2[2].".".$explodedtime2[0]." ".$explodedtime[1]; } array_push($table,array('id'=>$row['id'],'author'=>$author,'date'=>$date,'released'=>$released,'title'=>$page_title,'link'=>$link,'languages'=>$p_languages,'sort'=>$row['sort'])); } diff --git a/web/stuff/root_virtual_hosts.php b/web/stuff/root_virtual_hosts.php index bc96754a..5de3b9a4 100644 --- a/web/stuff/root_virtual_hosts.php +++ b/web/stuff/root_virtual_hosts.php @@ -130,7 +130,7 @@ if ($ui->w('action',4,'post') and !token(true)) { $i=0; $count=count($uiddata)-1; while ($i<$count) { - list($uid,$space)=explode(":", $uiddata["$i"]); + list($uid,$space)=explode(":", $uiddata[$i]); if(strpos(strtolower($space), strtolower('TB')) === false) { $hddamount=str_replace('GB,', '', $space); } else { @@ -322,18 +322,18 @@ if ($ui->w('action',4,'post') and !token(true)) { $hdd_rows=explode("\r\n", $row['hdd']); foreach ($hdd_rows as $hddline) { $data_explode=explode(" ", $hddline); - if (isset($data_explode['1'])) { - $mountpoint=$data_explode['0']; + if (isset($data_explode[1])) { + $mountpoint=$data_explode[0]; $hdd[]=$mountpoint; - $mountsize["$mountpoint"]=$data_explode['1']; - $mountunused["$mountpoint"]=0; + $mountsize[$mountpoint]=$data_explode[1]; + $mountunused[$mountpoint]=0; } } $i="1"; $cpucores=""; while ($i<=$cores) { $cpucores[]=$i; - $cpucore["$i"]=0; + $cpucore[$i]=0; $i++; } $pselect2=$sql->prepare("SELECT `cores`,`minmhz`,`maxmhz`,`hddsize`,`mountpoint`,`minram` FROM `virtualcontainer` WHERE `hostid`=?"); @@ -341,24 +341,24 @@ if ($ui->w('action',4,'post') and !token(true)) { $i2=0; foreach ($pselect2->fetchAll(PDO::FETCH_ASSOC) as $row2) { $mountpoint=$row2['mountpoint']; - $addstracthdd=$mountunused["$mountpoint"]+$row2['hddsize']; - $mountunused["$mountpoint"]=$addstracthdd; + $addstracthdd=$mountunused[$mountpoint]+$row2['hddsize']; + $mountunused[$mountpoint]=$addstracthdd; $addstractram=$ramused+$row2['minram']; $ramused=$addstractram; $cpuhz=$row2['cores']*$row2['minmhz']; - $addcpu=$cpucore['1']+$cpuhz; + $addcpu=$cpucore[1]+$cpuhz; if ($addcpu<=$mhz) { - $cpucore['1']=$addcpu; + $cpucore[1]=$addcpu; } else { - $cpucore['1']=$mhz; + $cpucore[1]=$mhz; $nextcore="2"; while ($nextcore<=$cores) { $extra=$addcpu-$mhz; - $addcpu=$cpucore["$nextcore"]+$extra; + $addcpu=$cpucore[$nextcore]+$extra; if ($addcpu<=$mhz and $addcpu>=0) { - $cpucore["$nextcore"]=$addcpu; + $cpucore[$nextcore]=$addcpu; } else if ($addcpu>=0) { - $cpucore["$nextcore"]=$mhz; + $cpucore[$nextcore]=$mhz; } $nextcore++; } diff --git a/web/stuff/root_virtual_server.php b/web/stuff/root_virtual_server.php index 319eace8..e09fd777 100644 --- a/web/stuff/root_virtual_server.php +++ b/web/stuff/root_virtual_server.php @@ -86,11 +86,11 @@ if ($ui->st('d','get')=='ad' and is_numeric($licenceDetails['lVs']) and $licence $hdd_rows=explode("\r\n", $row['hdd']); foreach ($hdd_rows as $hddline) { $data_explode=explode(" ", $hddline); - if (isset($data_explode['1'])) { - $mountpoint=$data_explode['0']; + if (isset($data_explode[1])) { + $mountpoint=$data_explode[0]; $hdd[]=$mountpoint; - $mountsize["$mountpoint"]=$data_explode['1']; - $mountunused["$mountpoint"]=0; + $mountsize[$mountpoint]=$data_explode[1]; + $mountunused[$mountpoint]=0; } } $i=1; @@ -105,20 +105,20 @@ if ($ui->st('d','get')=='ad' and is_numeric($licenceDetails['lVs']) and $licence $i2=0; foreach ($query2->fetchAll(PDO::FETCH_ASSOC) as $row2) { $mountpoint=$row2['mountpoint']; - $addstracthdd=$mountunused["$mountpoint"]+($row2['hddsize']*($percent/100)); - $mountunused["$mountpoint"]=$addstracthdd; + $addstracthdd=$mountunused[$mountpoint]+($row2['hddsize']*($percent/100)); + $mountunused[$mountpoint]=$addstracthdd; $addstractram=$ramused+$row2['minram']; $ramused=$addstractram; $cpuhz=$row2['cores']*$row2['minmhz']; - $addcpu=$cpucore['1']+$cpuhz; + $addcpu=$cpucore[1]+$cpuhz; if ($addcpu<=$mhz) { - $cpucore['1']=$addcpu; + $cpucore[1]=$addcpu; } else { - $cpucore['1']=$mhz; + $cpucore[1]=$mhz; $nextcore="2"; while ($nextcore<=$cores) { $extra=$addcpu-$mhz; - $addcpu=$cpucore["$nextcore"]+$extra; + $addcpu=$cpucore[$nextcore]+$extra; if ($addcpu<=$mhz and $addcpu>=0) $cpucore[$nextcore]=$addcpu; else if ($addcpu>=0) $cpucore[$nextcore]=$mhz; $nextcore++; @@ -133,10 +133,10 @@ if ($ui->st('d','get')=='ad' and is_numeric($licenceDetails['lVs']) and $licence unset($percentserver); unset($percentusedhdd); while ($i<=$cores) { - if($cpucore["$i"]==0) { - $percentusedcpu["$i"]=0; + if($cpucore[$i]==0) { + $percentusedcpu[$i]=0; } else { - $percentusedcpu["$i"]=$cpucore["$i"]/($mhz/100); + $percentusedcpu[$i]=$cpucore[$i]/($mhz/100); } $i++; } @@ -188,18 +188,18 @@ if ($ui->st('d','get')=='ad' and is_numeric($licenceDetails['lVs']) and $licence $hdd_rows=explode("\r\n", $row['hdd']); foreach ($hdd_rows as $hddline) { $data_explode=explode(" ", $hddline); - if (isset($data_explode['1'])) { - $mountpoint=$data_explode['0']; - $mountsize["$mountpoint"]=$data_explode['1']; + if (isset($data_explode[1])) { + $mountpoint=$data_explode[0]; + $mountsize[$mountpoint]=$data_explode[1]; } } - foreach ($serverused["$bestserver"]['freespace'] as $mountpoint => $free) { + foreach ($serverused[$bestserver]['freespace'] as $mountpoint => $free) { $hdd[]=$mountpoint; if (!isset($firstfreespace)) { $firstfreespace=$free; } } - $firstpoint=$hdd['0']; + $firstpoint=$hdd[0]; } } if ($reseller_id!=0 and (!isset($bestserver) or !isid($bestserver,10))) { @@ -234,18 +234,18 @@ if ($ui->st('d','get')=='ad' and is_numeric($licenceDetails['lVs']) and $licence $hdd_rows=explode("\r\n", $row['hdd']); foreach ($hdd_rows as $hddline) { $data_explode=explode(" ", $hddline); - if (isset($data_explode['1'])) { - $mountpoint=$data_explode['0']; - $mountsize["$mountpoint"]=$data_explode['1']; + if (isset($data_explode[1])) { + $mountpoint=$data_explode[0]; + $mountsize[$mountpoint]=$data_explode[1]; } } - foreach ($serverused["$bestserver"]['freespace'] as $mountpoint => $free) { + foreach ($serverused[$bestserver]['freespace'] as $mountpoint => $free) { $hdd[]=$mountpoint; if (!isset($firstfreespace)) { $firstfreespace=$free; } } - $firstpoint=$hdd['0']; + $firstpoint=$hdd[0]; $table[]=array('id'=>$bestserver,'ip'=>$row['ip']); } } @@ -255,7 +255,7 @@ if ($ui->st('d','get')=='ad' and is_numeric($licenceDetails['lVs']) and $licence $maxserver=''; $core=array(); $hdd=array(); - $serverused['1']=array('ram'=>"",'cpu'=>"",'server'=>"",'hdd'=>""); + $serverused[1]=array('ram'=>"",'cpu'=>"",'server'=>"",'hdd'=>""); $bestserver=1; } $reseller=array(); @@ -457,8 +457,8 @@ if ($ui->st('d','get')=='ad' and is_numeric($licenceDetails['lVs']) and $licence $hdd_rows=explode("\r\n", $row['hdd']); foreach ($hdd_rows as $hddline) { $data_explode=explode(" ", $hddline); - if (isset($data_explode['1']) and $data_explode['0']==$mountpoint) { - $mountspace=$data_explode['1']; + if (isset($data_explode[1]) and $data_explode[0]==$mountpoint) { + $mountspace=$data_explode[1]; } } $query2->execute(array($hostid,$mountpoint)); @@ -488,37 +488,37 @@ if ($ui->st('d','get')=='ad' and is_numeric($licenceDetails['lVs']) and $licence $row=1; while ($row==1) { $ex_mac=explode(":", $mac); - $ex_mac1=hexdec($ex_mac['3']); - $ex_mac2=hexdec($ex_mac['4']); - $ex_mac3=hexdec($ex_mac['5']); - if (hexdec($ex_mac['5'])=="255") { + $ex_mac1=hexdec($ex_mac[3]); + $ex_mac2=hexdec($ex_mac[4]); + $ex_mac3=hexdec($ex_mac[5]); + if (hexdec($ex_mac[5])=="255") { $ex_mac3="00"; - if (hexdec($ex_mac['4'])=="255") { + if (hexdec($ex_mac[4])=="255") { $ex_mac2="00"; - $ex_mac1=hexdec($ex_mac['3'])+1; + $ex_mac1=hexdec($ex_mac[3])+1; if ($ex_mac1<="15") { $ex_mac1="0".strtolower(dechex($ex_mac1)); } else { $ex_mac1=strtolower(dechex($ex_mac1)); } } else { - $ex_mac2=hexdec($ex_mac['4'])+1; + $ex_mac2=hexdec($ex_mac[4])+1; if ($ex_mac2<="15") { $ex_mac2="0".strtolower(dechex($ex_mac2)); } else { $ex_mac2=strtolower(dechex($ex_mac2)); } - $ex_mac1=$ex_mac['3']; + $ex_mac1=$ex_mac[3]; } } else { - $ex_mac3=hexdec($ex_mac['5'])+1; + $ex_mac3=hexdec($ex_mac[5])+1; if ($ex_mac3<="15") { $ex_mac3="0".strtolower(dechex($ex_mac3)); } else { $ex_mac3=strtolower(dechex($ex_mac3)); } - $ex_mac1=$ex_mac['3']; - $ex_mac2=$ex_mac['4']; + $ex_mac1=$ex_mac[3]; + $ex_mac2=$ex_mac[4]; } $mac="00:50:56:$ex_mac1:$ex_mac2:$ex_mac3"; $query=$sql->prepare("SELECT `id` FROM `virtualcontainer` WHERE `mac`=? LIMIT 1"); @@ -733,8 +733,8 @@ if ($ui->st('d','get')=='ad' and is_numeric($licenceDetails['lVs']) and $licence } if ($ui->post['ip']==$oldip or in_array($ui->post['ip'],$freeips)) { $ip=$ui->post['ip']; - } else if(isset($checked_ips['0']) and isip($checked_ips['0'],'all')) { - $ip=$checked_ips['0']; + } else if(isset($checked_ips[0]) and isip($checked_ips[0],'all')) { + $ip=$checked_ips[0]; } if (!isset($ips)) { $ips=''; diff --git a/web/stuff/traffic.php b/web/stuff/traffic.php index c1f5f953..9678df5c 100644 --- a/web/stuff/traffic.php +++ b/web/stuff/traffic.php @@ -165,7 +165,7 @@ if ($d=='se' and $reseller_id==0) { $userips=ipstoarray($row['ips']); foreach ($userips as $ip) { $ip_ex=explode(".",$ip); - $ips[]=$ip_ex['0'].".".$ip_ex['1'].".".$ip_ex['2']."."; + $ips[]=$ip_ex[0].".".$ip_ex[1].".".$ip_ex[2]."."; } } $subnets=array_unique($ips); diff --git a/web/stuff/userpanel_backup.php b/web/stuff/userpanel_backup.php index 5d5bdbb2..0ce2e05d 100644 --- a/web/stuff/userpanel_backup.php +++ b/web/stuff/userpanel_backup.php @@ -107,7 +107,7 @@ if ($ui->id('id',10,'get') and (!isset($_SESSION['sID']) or in_array($ui->id('id $i=0; $path=''; while ($i<$amount) { - $path .=$folders["$i"]."/"; + $path .=$folders[$i]."/"; $i++; } $webhostdomain=(isset($ui->server['HTTPS'])) ? "https://".$ui->server['HTTP_HOST'].$path : $webhostdomain="http://".$ui->server['HTTP_HOST'].$path; diff --git a/web/stuff/userpanel_gserver.php b/web/stuff/userpanel_gserver.php index 4399e8c8..aaa5793f 100644 --- a/web/stuff/userpanel_gserver.php +++ b/web/stuff/userpanel_gserver.php @@ -507,8 +507,8 @@ if ($ui->w('action',4,'post') and !token(true)) { $cvar=str_replace(" ", "", $split[0]); $value=$split[1]; if ($cvar!="exec") { - if (isset($ui->post["$cvar"])) { - if (isset($ui->post['oldrcon']) and $cvar=="rcon_password" and $ui->post["$cvar"]!=$ui->post['oldrcon'] and $configname=="server.cfg" and (($anticheat==2 or $anticheat==3 or $anticheat==4 or $anticheat==5)) and ($qstat=="a2s" or $qstat=="hla2s") and $eacallowed=='Y') { + if (isset($ui->post[$cvar])) { + if (isset($ui->post['oldrcon']) and $cvar=="rcon_password" and $ui->post[$cvar]!=$ui->post['oldrcon'] and $configname=="server.cfg" and (($anticheat==2 or $anticheat==3 or $anticheat==4 or $anticheat==5)) and ($qstat=="a2s" or $qstat=="hla2s") and $eacallowed=='Y') { eacchange('change',$id,$ui->post[$cvar],$reseller_id); } $newconfig .=$cvar." \"".$ui->post[$cvar]."\""."\r\n"; @@ -531,8 +531,8 @@ if ($ui->w('action',4,'post') and !token(true)) { $value=''; } if ($cvar!="exec") { - if (isset($ui->post["$cvar"])) { - if (isset($ui->post['oldrcon']) and $cvar=="rcon_password" and $ui->post["$cvar"]!=$ui->post['oldrcon'] and $configname=="server.cfg" and (($anticheat==2 or $anticheat==3 or $anticheat==4 or $anticheat==5)) and ($qstat=="a2s" or $qstat=="hla2s") and $eacallowed=='Y') { + if (isset($ui->post[$cvar])) { + if (isset($ui->post['oldrcon']) and $cvar=="rcon_password" and $ui->post[$cvar]!=$ui->post['oldrcon'] and $configname=="server.cfg" and (($anticheat==2 or $anticheat==3 or $anticheat==4 or $anticheat==5)) and ($qstat=="a2s" or $qstat=="hla2s") and $eacallowed=='Y') { eacchange('change',$id,$ui->post[$cvar],$reseller_id); } $newconfig .=$cvar." \"".$ui->post[$cvar]."\""."\r\n"; @@ -598,10 +598,10 @@ if ($ui->w('action',4,'post') and !token(true)) { $i=0; $folders=$pserver.$serverip.'_'.$port.'/'.$ftpshorten; while ($i<$folderfilecount) { - $folders .="/".$split_config["$i"]; + $folders .="/".$split_config[$i]; $i++; } - $uploadfile=$split_config["$i"]; + $uploadfile=$split_config[$i]; ftp_chdir($ftp_connect,$folders); $checkupload=@ftp_fput($ftp_connect,$uploadfile,$temp,FTP_ASCII); $template_file=($checkupload) ? $sprache->updated." ".$uploadfile : $sprache->failed." ".$folders.'/'.$uploadfile; @@ -628,9 +628,9 @@ if ($ui->w('action',4,'post') and !token(true)) { $value=$split[1]; if ($cvar!="exec") { if (in_array($cvar, $general_cvar) or in_array($cvar, $game_cvars)) { - $linearray["$cvar"]=$value; + $linearray[$cvar]=$value; } else { - $unknownarray["$cvar"]=$value; + $unknownarray[$cvar]=$value; } } } else { @@ -640,9 +640,9 @@ if ($ui->w('action',4,'post') and !token(true)) { $value=(isset($split[1])) ? $split[1] : ''; if ($cvar!="exec") { if (in_array($cvar, $general_cvar) or in_array($cvar, $game_cvars)) { - $linearray["$cvar"]=$value; + $linearray[$cvar]=$value; } else { - $unknownarray["$cvar"]=$value; + $unknownarray[$cvar]=$value; } } } diff --git a/web/stuff/userpanel_home.php b/web/stuff/userpanel_home.php index 0029abeb..826732bc 100644 --- a/web/stuff/userpanel_home.php +++ b/web/stuff/userpanel_home.php @@ -143,7 +143,7 @@ if($ui->smallletters('w',2,'get')=='da' or (!$ui->smallletters('w',2,'get') and if ($row['merge']=='Y'){ $feedArray['News'][]=$theNews; } else { - $feedArray["$url"][]=$theNews; + $feedArray[$url][]=$theNews; } } } diff --git a/web/stuff/userpanel_logdata.php b/web/stuff/userpanel_logdata.php index 278f3b6f..ae1b3a7f 100644 --- a/web/stuff/userpanel_logdata.php +++ b/web/stuff/userpanel_logdata.php @@ -70,7 +70,7 @@ foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { $replace=array($gsprache->voiceserver,$gsprache->gameserver,$gsprache->user,$gsprache->fastdownload,$gsprache->master,$gsprache->user,$gsprache->root,$gsprache->addon2,$gsprache->settings,$gsprache->virtual,$gsprache->support,$gsprache->reseller,$gsprache->hostsystem,'Easy Anti Cheat',$gssprache->resync,$gsprache->virtual.' '.$gsprache->template,$gsprache->template,$gsprache->voiceserver,'E-Mail '.$gsprache->settings,'TSDNS','TSDNS',$gssprache->protect); $replacedwords=str_replace($placeholders,$replace,$replacedpics); $logdate=explode(' ', $row['logdate']); - $table[]=array('logday'=>$logdate['0'],'loghour'=>$logdate['1'],'ip'=>$ip,'username'=>$username,'useraction'=>$replacedwords); + $table[]=array('logday'=>$logdate[0],'loghour'=>$logdate[1],'ip'=>$ip,'username'=>$username,'useraction'=>$replacedwords); } $next=$start+$amount; $query=$sql->prepare("SELECT `id` FROM `userlog` WHERE `usertype`='user' AND `userid`=? AND `resellerid`=?"); diff --git a/web/stuff/userpanel_restartcalendar.php b/web/stuff/userpanel_restartcalendar.php index d7a7ab63..05bb10c0 100644 --- a/web/stuff/userpanel_restartcalendar.php +++ b/web/stuff/userpanel_restartcalendar.php @@ -62,22 +62,22 @@ if (!isset($rowcount) or $rowcount==0) redirect('userpanel.php'); if ($ui->smallletters('edit',4,'post')=='edit' and isset($serverip) and isset($port)) { $date2=$ui->gamestring('date','post'); $date=explode('_',$date2); - if ($date['0']=="mon") { + if ($date[0]=="mon") { $day=$sprache->monday; - } else if ($date['0']=="tue") { + } else if ($date[0]=="tue") { $day=$sprache->tuesday; - } else if ($date['0']=="wed") { + } else if ($date[0]=="wed") { $day=$sprache->wednesday; - } else if ($date['0']=="thu") { + } else if ($date[0]=="thu") { $day=$sprache->thursday; - } else if ($date['0']=="fri") { + } else if ($date[0]=="fri") { $day=$sprache->friday; - } else if ($date['0']=="sat") { + } else if ($date[0]=="sat") { $day=$sprache->saturday; - } else if ($date['0']=="sun") { + } else if ($date[0]=="sun") { $day=$sprache->sunday; } - $hour=$date['1'].":00"; + $hour=$date[1].":00"; $table=array(); $query=$sql->prepare("SELECT `id`,`normal_3`,`normal_4`,`hlds_3`,`hlds_4`,`hlds_5`,`hlds_6` FROM `eac` WHERE `active`='Y' AND `resellerid`=? LIMIT 1"); $query->execute(array($reseller_id)); @@ -95,7 +95,7 @@ if ($ui->smallletters('edit',4,'post')=='edit' and isset($serverip) and isset($p foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { $shorten=$row['shorten']; $uploadallowed[]=$row['upload']; - $qstat_array["$shorten"]=$row['qstat']; + $qstat_array[$shorten]=$row['qstat']; if (!isset($qstat)) { $qstat=$row['qstat']; } @@ -122,7 +122,7 @@ if ($ui->smallletters('edit',4,'post')=='edit' and isset($serverip) and isset($p $restart=$row['restart']; $backup=$row['backup']; $worldsafe=$row['worldsafe']; - $qstat=$qstat_array["$gsswitch"]; + $qstat=$qstat_array[$gsswitch]; if (in_array('a2s',$qstat_array) and (in_array(2,$uploadallowed) or in_array(3,$uploadallowed))) { $upload=$row['upload']; } @@ -281,8 +281,8 @@ if ($ui->smallletters('edit',4,'post')=='edit' and isset($serverip) and isset($p $query->execute(array($ui->id('id',19,'get'),$reseller_id)); foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { $restarttime=explode("_",$row['restarttime']); - $day=$restarttime['0']; - $hour=$restarttime['1']; + $day=$restarttime[0]; + $hour=$restarttime[1]; $shorten=$row['gsswitch']; $template=$row['template']; $restart=$row['restart']; @@ -340,9 +340,9 @@ if ($ui->smallletters('edit',4,'post')=='edit' and isset($serverip) and isset($p $imgName='16_protected'; $imgAlt='Protected'; } - $restarts["$hour"]["$day"]=array('out'=>$routput,'img'=>$imgName,'alt'=>$imgAlt); + $restarts[$hour][$day]=array('out'=>$routput,'img'=>$imgName,'alt'=>$imgAlt); } else { - $restarts["$hour"]["$day"]=array('out'=>$routput); + $restarts[$hour][$day]=array('out'=>$routput); } } $template_file="userpanel_gserver_calendar_list.tpl"; diff --git a/web/stuff/userpanel_voice.php b/web/stuff/userpanel_voice.php index fe5f71dc..36724fee 100644 --- a/web/stuff/userpanel_voice.php +++ b/web/stuff/userpanel_voice.php @@ -120,9 +120,9 @@ if ($ui->st('d','get')=='bu' and $ui->id('id',10,'get') and (!isset($_SESSION['s $connection->StartServer($volocalserverid); $rawsnapshot=$connection->Snapshotcreate($volocalserverid); $channelSnapshot=$connection->channelList($volocalserverid); - if (is_array($rawsnapshot) and isset($rawsnapshot['0']['msg'])) { - $template_file=$spracheResponse->error_ts_query.$rawsnapshot['0']['msg']; - } else if (is_array($rawsnapshot) and !isset($rawsnapshot['0']['msg'])) { + if (is_array($rawsnapshot) and isset($rawsnapshot[0]['msg'])) { + $template_file=$spracheResponse->error_ts_query.$rawsnapshot[0]['msg']; + } else if (is_array($rawsnapshot) and !isset($rawsnapshot[0]['msg'])) { $template_file='Unknown error'; } else { $snapshot=gzcompress($rawsnapshot,9); @@ -169,7 +169,7 @@ if ($ui->st('d','get')=='bu' and $ui->id('id',10,'get') and (!isset($_SESSION['s } else { $connection->StartServer($volocalserverid); $reply=$connection->Snapshotdeploy($volocalserverid,$snapshot); - if (isset($reply['0']['id']) and $reply['0']['id']=='0') { + if (isset($reply[0]['id']) and $reply[0]['id']=='0') { $move=array(); $channelListOld=@json_decode($row['channels']); $channelListDeployed=@json_decode($connection->channelList($volocalserverid)); @@ -181,7 +181,7 @@ if ($ui->st('d','get')=='bu' and $ui->id('id',10,'get') and (!isset($_SESSION['s $loguseraction="%use% %voserver% %backup% ${row['name']} ${address}"; $insertlog->execute(); } - $template_file=$spracheResponse->ts_query_success.$reply['0']['msg']; + $template_file=$spracheResponse->ts_query_success.$reply[0]['msg']; } $connection->CloseConnection(); } @@ -237,13 +237,13 @@ if ($ui->st('d','get')=='bu' and $ui->id('id',10,'get') and (!isset($_SESSION['s $newkey=$connection->AddKey($localserverid,$ui->id('group',255,'post')); $loguseraction="%add% %voserver% Token ${address}"; $insertlog->execute(); - $template_file=$spracheResponse->ts_query_success.$newkey['0']['token']; + $template_file=$spracheResponse->ts_query_success.$newkey[0]['token']; } } else if ($ui->smallletters('action',2,'post')=='dl') { $loguseraction="%del% %voserver% Token ${address}"; $insertlog->execute(); $del=$connection->DelKey($localserverid,$ui->post['token']); - $template_file=$spracheResponse->ts_query_success.$del['0']['msg']; + $template_file=$spracheResponse->ts_query_success.$del[0]['msg']; } } $connection->CloseConnection(); @@ -300,8 +300,8 @@ if ($ui->st('d','get')=='bu' and $ui->id('id',10,'get') and (!isset($_SESSION['s $reply=$connection->PermReset($volocalserverid); $loguseraction="%reinstall% %voserver% ${voip}:${voport}"; $insertlog->execute(); - if (isset($reply['0']['token'])) { - $template_file=$spracheResponse->ts_query_success.$reply['0']['token']; + if (isset($reply[0]['token'])) { + $template_file=$spracheResponse->ts_query_success.$reply[0]['token']; if ($forcebanner=='Y') { $removelist[]='b_virtualserver_modify_hostbanner'; $removelist[]='i_needed_modify_power_virtualserver_modify_hostbanner'; @@ -535,7 +535,7 @@ if ($ui->st('d','get')=='bu' and $ui->id('id',10,'get') and (!isset($_SESSION['s $virtualserver_reserved_slots=($ui->id('virtualserver_reserved_slots',4,'post') and $ui->id('virtualserver_reserved_slots',4,'post')<$slots) ? $ui->id('virtualserver_reserved_slots',4,'post') : 0; $mod=$connection->ModServer($localserverid,$slots,$ip,$port,$initialpassword,$name,$welcome,$max_download_total_bandwidth,$max_upload_total_bandwidth,$banner_url,$banner_gfx,$button_url,$button_gfx,$tooltip,$virtualserver_reserved_slots,$virtualserver_needed_identity_security_level,$virtualserver_hostmessage_mode,$virtualserver_hostbanner_gfx_interval,$virtualserver_antiflood_points_tick_reduce,$virtualserver_antiflood_points_needed_command_block,$virtualserver_antiflood_points_needed_ip_block); - $template_file=$spracheResponse->table_add.'
'.$spracheResponse->ts_query_success.$mod['0']['msg']; + $template_file=$spracheResponse->table_add.'
'.$spracheResponse->ts_query_success.$mod[0]['msg']; } $connection->CloseConnection(); $query=$sql->prepare("UPDATE `voice_server` SET `dns`=?,`initialpassword`=? WHERE `id`=? AND `resellerid`=? LIMIT 1"); @@ -589,7 +589,7 @@ if ($ui->st('d','get')=='bu' and $ui->id('id',10,'get') and (!isset($_SESSION['s if (isset($reply)) { $query=$sql->prepare("UPDATE `voice_server` SET `uptime`=? WHERE `id`=? AND `resellerid`=? LIMIT 1"); $query->execute(array($uptime,$id,$reseller_id)); - $template_file=$spracheResponse->ts_query_success.$reply['0']['msg']; + $template_file=$spracheResponse->ts_query_success.$reply[0]['msg']; } else { $template_file='Unknown Error'; } diff --git a/web/stuff/versioncheck.php b/web/stuff/versioncheck.php index bcf4642a..06ecb548 100644 --- a/web/stuff/versioncheck.php +++ b/web/stuff/versioncheck.php @@ -180,11 +180,11 @@ if ($ui->st('d','get')=='ud' and $reseller_id==0 and $pa['updateEW'] and ($ewVer $column='en'; $release='releasenotesEN'; } - $release='
'.$vcsprache->releaseNotes.'
'; + $release='
'.$vcsprache->releaseNotes.'
'; $query=$sql->prepare("SELECT `version`,`$column` FROM `easywi_version` ORDER BY `id` DESC"); $query->execute(); foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { - if ($row["$column"]!=null and $row["$column"]!='') $table[]=array('version'=>$row['version'],'text'=>$row["$column"]); + if ($row[$column]!=null and $row[$column]!='') $table[]=array('version'=>$row['version'],'text'=>$row[$column]); } $update=($reseller_id==0 and isset($pa['updateEW']) and $pa['updateEW']==true) ? '
Update
' : ''; if ($ewVersions['cVersion']<$ewVersions['version']) { diff --git a/web/stuff/voice_master.php b/web/stuff/voice_master.php index 04dedbd1..a5c3af6d 100644 --- a/web/stuff/voice_master.php +++ b/web/stuff/voice_master.php @@ -400,7 +400,7 @@ if ($ui->w('action',4,'post') and !token(true)) { $query->execute(array($virtualserver_id,$values['virtualserver_ip'],$reseller_id)); $colcount=$query->rowCount(); if ($colcount==1 or $i>25) { - unset($servers["$virtualserver_id"]); + unset($servers[$virtualserver_id]); } else { $i++; } @@ -471,9 +471,9 @@ if ($ui->w('action',4,'post') and !token(true)) { $i=0; while ($i<=$folderfilecount) { if (isset($folders)) { - $folders .=$split_config["$i"]."/"; + $folders .=$split_config[$i]."/"; } else { - $folders='cd '.$split_config["$i"]."/"; + $folders='cd '.$split_config[$i]."/"; } $i++; } diff --git a/web/switch.php b/web/switch.php index abb90aa0..8b237aa6 100644 --- a/web/switch.php +++ b/web/switch.php @@ -49,9 +49,9 @@ if ($reseller_id!=0 and isset($admin_id) and $admin_id!=$reseller_id) { } if (isset($server_id)) { $referrer=explode('/', str_replace(array('http://','https://'),'',strtolower($ui->escaped('HTTP_REFERER','server')))); - $refstring=explode('?',$referrer['1']); - if (isset($refstring['1'])) { - $from=explode('&',$refstring['1']); + $refstring=explode('?',$referrer[1]); + if (isset($refstring[1])) { + $from=explode('&',$refstring[1]); } $query=$sql->prepare("SELECT `resellerid`,`accounttype` FROM `userdata` WHERE `id`=? LIMIT 1"); $query->execute(array($server_id)); @@ -65,13 +65,13 @@ if (isset($server_id)) { } if (isset($accounttype) and $accounttype=='u') { $_SESSION['userid']=$server_id; - if (isset($from) and $from['0']=="w=gs") { + if (isset($from) and $from[0]=="w=gs") { header('Location: userpanel.php?w=gs'); die('Please allow redirection'); - } else if (isset($from) and $from['0']=="w=vo") { + } else if (isset($from) and $from[0]=="w=vo") { header('Location: userpanel.php?w=vo'); die('Please allow redirection'); - } else if (isset($from) and $from['0']=="w=my") { + } else if (isset($from) and $from[0]=="w=my") { header('Location: userpanel.php?w=my'); die('Please allow redirection'); } else { diff --git a/web/template/default/admin_root_vserver_add.tpl b/web/template/default/admin_root_vserver_add.tpl index a4d4944c..f1942733 100644 --- a/web/template/default/admin_root_vserver_add.tpl +++ b/web/template/default/admin_root_vserver_add.tpl @@ -43,13 +43,13 @@
virtual;?>
-
+
ram;?>
-
+
cpu." ".$sprache->cores;?>
-
core." ".$core_row." ".$serverused["$bestserver"]['cpu']["$core_row"]."/".$mhz.$sprache->mhz;?>
+
core." ".$core_row." ".$serverused[$bestserver]['cpu'][$core_row]."/".$mhz.$sprache->mhz;?>
hdd;?>
-

+

diff --git a/web/template/default/admin_voiceserver_add.tpl b/web/template/default/admin_voiceserver_add.tpl index e6fba68b..7e71e6e0 100644 --- a/web/template/default/admin_voiceserver_add.tpl +++ b/web/template/default/admin_voiceserver_add.tpl @@ -35,9 +35,9 @@
- - installedslots." ".$table2['0']['uslots']."/".$table2['0']['installedslots']."/".$table2['0']['maxslots'];?>
- installedserver." ".$table2['0']['installedserver']."/".$table2['0']['maxserver'];?> + + installedslots." ".$table2[0]['uslots']."/".$table2[0]['installedslots']."/".$table2[0]['maxslots'];?>
+ installedserver." ".$table2[0]['installedserver']."/".$table2[0]['maxserver'];?>
diff --git a/web/template/default/ajax_admin_vserver_allocation.tpl b/web/template/default/ajax_admin_vserver_allocation.tpl index 93b167b5..79f4e79c 100644 --- a/web/template/default/ajax_admin_vserver_allocation.tpl +++ b/web/template/default/ajax_admin_vserver_allocation.tpl @@ -2,13 +2,13 @@
cpu;?>:
cpu." ".$sprache->cores;?>:
-
core." ".$core_row.": ".$cpucore["$core_row"]."/".$mhz.$sprache->mhz;?>
+
core." ".$core_row.": ".$cpucore[$core_row]."/".$mhz.$sprache->mhz;?>
virtual;?>:
ram;?>:
hdd;?>:
-

+

diff --git a/web/template/default/userpanel_gserver_calendar_list.tpl b/web/template/default/userpanel_gserver_calendar_list.tpl index 43a74540..c300f80f 100644 --- a/web/template/default/userpanel_gserver_calendar_list.tpl +++ b/web/template/default/userpanel_gserver_calendar_list.tpl @@ -28,16 +28,16 @@ 9) echo $i; else echo "$i";?>:00 - +
-
.png" alt="" width="16" height="16"/> +
<?php echo $restarts[$i]['mon']['alt'];?>
- +
@@ -55,16 +55,16 @@
- +
-
.png" alt="" width="16" height="16"/> +
<?php echo $restarts[$i]['tue']['alt'];?>
- + @@ -82,16 +82,16 @@
- +
-
.png" alt="" width="16" height="16"/> +
<?php echo $restarts[$i]['wed']['alt'];?>
- + @@ -109,16 +109,16 @@
- +
-
.png" alt="" width="16" height="16"/> +
<?php echo $restarts[$i]['thu']['alt'];?>
- + @@ -136,16 +136,16 @@
- +
-
.png" alt="" width="16" height="16"/> +
<?php echo $restarts[$i]['fri']['alt'];?>
- + @@ -163,16 +163,16 @@
- +
-
.png" alt="" width="16" height="16"/> +
<?php echo $restarts[$i]['sat']['alt'];?>
- + @@ -190,16 +190,16 @@
- +
-
.png" alt="" width="16" height="16"/> +
<?php echo $restarts[$i]['sun']['alt'];?>
- + diff --git a/web/template/default/userpanel_gserver_config_edit_easy.tpl b/web/template/default/userpanel_gserver_config_edit_easy.tpl index c4817c76..6323a86e 100644 --- a/web/template/default/userpanel_gserver_config_edit_easy.tpl +++ b/web/template/default/userpanel_gserver_config_edit_easy.tpl @@ -720,7 +720,7 @@
- "> +
diff --git a/web/trafficdata.php b/web/trafficdata.php index 41ee78c4..9df74cfe 100644 --- a/web/trafficdata.php +++ b/web/trafficdata.php @@ -99,7 +99,7 @@ if (!isset($remoteip) or $_SERVER['SERVER_ADDR']==$remoteip) { $query->execute(); foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { $ids=$row['resellerid']."-".$row['resellersid']; - $userips["$ids"]=ipstoarray($row['ips']); + $userips[$ids]=ipstoarray($row['ips']); } $query=$sql->prepare("SELECT `id`,`ip`,`ips` FROM `virtualcontainer`"); $query->execute(); @@ -110,7 +110,7 @@ if (!isset($remoteip) or $_SERVER['SERVER_ADDR']==$remoteip) { foreach(ipstoarray($row['ips']) as $vip) { $vserverip[]=$vip; } - $vserverips["$vserverid"]=$vserverip; + $vserverips[$vserverid]=$vserverip; } $query=$sql2->prepare("SHOW PROCESSLIST"); $query->execute(); @@ -146,13 +146,13 @@ if (!isset($remoteip) or $_SERVER['SERVER_ADDR']==$remoteip) { unset($trafficData[$id]); unset($serverid); $data_id=$row['id']; - $ip_src=$row["$column_sourceip"]; - $ip_dst=$row["$column_destip"]; - $bytes=$row["$column_byte"]; - $stamp_updated=$row["$column_date"]; - $date=explode(' ',$row["$column_date"]); - $hour=explode(':',$date['1']); - $day=$date['0']." ".$hour['0'].":00:00"; + $ip_src=$row[$column_sourceip]; + $ip_dst=$row[$column_destip]; + $bytes=$row[$column_byte]; + $stamp_updated=$row[$column_date]; + $date=explode(' ',$row[$column_date]); + $hour=explode(':',$date[1]); + $day=$date[0]." ".$hour[0].":00:00"; if (searchinnerarray($ip_src,$vserverips) or searchinnerarray($ip_dst,$vserverips)) { if (searchinnerarray($ip_src,$vserverips)) { $direction="out"; @@ -179,15 +179,15 @@ if (!isset($remoteip) or $_SERVER['SERVER_ADDR']==$remoteip) { $serverid="0"; $userids=searchinnerarray($ip_src,$userips); $uids=explode("-",$userids); - $userid=$uids['0']; - $resellerid=$uids['1']; + $userid=$uids[0]; + $resellerid=$uids[1]; } else if (searchinnerarray($ip_dst,$userips)) { $direction="in"; $serverid="0"; $userids=searchinnerarray($ip_dst,$userips); $uids=explode("-",$userids); - $userid=$uids['0']; - $resellerid=$uids['1']; + $userid=$uids[0]; + $resellerid=$uids[1]; } if (isset($serverid)) { if($direction=="in") {