Skip to content

Instantly share code, notes, and snippets.

@residentkrm

residentkrm/acp.diff

Created July 17, 2013 16:20
Show Gist options
  • Save residentkrm/6022112 to your computer and use it in GitHub Desktop.
Save residentkrm/6022112 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
acp.diff
diff --git a/config/config.php b/config/config.php
index 885e782..04dd7f4 100644
--- a/config/config.php
+++ b/config/config.php
@@ -12,25 +12,25 @@ $k_userdb = 'root';
$k_pw = '12345';
$k_db = 'acp';
-//realmd
+// realmd/auth
$r_ip = '127.0.0.1';
$r_userdb = 'root';
$r_pw = '12345';
$r_db = 'realmd';
-//characters
+// characters
$c_ip = $MyRealms[$_SESSION['realmd']]['c_ip'];
$c_userdb = $MyRealms[$_SESSION['realmd']]['c_userdb'];
$c_pw = $MyRealms[$_SESSION['realmd']]['c_pw'];
$c_db = $MyRealms[$_SESSION['realmd']]['c_db'];
-//mangos
+// mangos/world
$m_ip = $MyRealms[$_SESSION['realmd']]['m_ip'];
$m_userdb = $MyRealms[$_SESSION['realmd']]['m_userdb'];
$m_pw = $MyRealms[$_SESSION['realmd']]['m_pw'];
$m_db = $MyRealms[$_SESSION['realmd']]['m_db'];
-//sd2 - заполняется только для МАНГОСа!!!
+// sd2 - заполняется только для МАНГОСа!!!
if ($ServerSystem <> 1)
{
$s_ip = $MyRealms[$_SESSION['realmd']]['s_ip'];
@@ -143,6 +143,7 @@ $WriteBagreport = 1; // Включить модуль багрепорта. 0=
$PageBagReport = 10; // количество записей на странице баг-репорта.
$ThanksBagReport = 100000; // благодарность за багрепорт (в игровых денежных еденицах).
$PrefDirForUser = 'realmd_users_'; // Префикс
+$bugold = 90; // Количество дней, после которых записи в баг-репортах будут считаться старыми
//=====================================================
// новости (0=off, 1=on)
$LoginNews = 1; // новости для всех (при авторизации)
@@ -179,4 +180,4 @@ $ActiveGuildChar = 30; // Количество активных членов г
error_reporting(E_ERROR | E_PARSE | E_WARNING);
//error_reporting(E_ALL);
//ini_set('display_errors', 0); //disable on production servers!
-?>
\ No newline at end of file
+?>
diff --git a/include/auth.php b/include/auth.php
index 706e09e..57f38ef 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -81,6 +81,7 @@ if (isset($_POST['auth_name']))
else
$_SESSION['gnom'] = (int) $row['gmlevel'];
// Clear login_failed for this IP.
+ $k_connect = mysql_connect($k_ip, $k_userdb, $k_pw);
$query = 'DELETE FROM `login_failed` WHERE `ip` = "' . $_SERVER['REMOTE_ADDR'] . '"';
mysql_select_db($k_db, $k_connect);
mysql_query($query);
@@ -88,6 +89,7 @@ if (isset($_POST['auth_name']))
}
else if ($Block_login == 1)
{
+ $k_connect = mysql_connect($k_ip, $k_userdb, $k_pw);
$query = 'insert `login_failed` (`ip`) VALUES ("' . $_SERVER['REMOTE_ADDR'] . '")';
mysql_select_db($k_db, $k_connect);
mysql_query($query);
@@ -101,4 +103,4 @@ if (isset($_GET['action']) AND $_GET['action'] == "logout")
header("Location: http://" . $_SERVER['HTTP_HOST'] . "/");
exit;
}
-?>
\ No newline at end of file
+?>
diff --git a/include/func.php b/include/func.php
index 84b6791..58643f9 100644
--- a/include/func.php
+++ b/include/func.php
@@ -479,5 +479,27 @@ function ValidationFieldLen($String, $MinLen = 3, $MaxLen = 16)
return true;
}
+function ReturnToBT($Retime)
+ {
+ echo '
+<script type="text/javascript"> <!--
+function exec_refresh(){
+ window.status = "reloading..." + myvar;
+ myvar = myvar + " .";
+ var timerID = setTimeout("exec_refresh();", 100);
+ if (timeout > 0){
+ timeout -= 1;
+ }else{
+ clearTimeout(timerID);
+ window.status = "";
+ window.location = "index.php?modul=bagtrack";
+ }
+}
+var myvar = "";
+var timeout = ' . $Retime . ';
+exec_refresh();
+//--> </script>';
+ }
+
require "include/rev.php";
?>
diff --git a/include/text.en.php b/include/text.en.php
index 26e35c7..58c3df8 100644
--- a/include/text.en.php
+++ b/include/text.en.php
@@ -206,7 +206,7 @@ $txt = array(
203 => 'Пока не исправимо',
204 => 'Это не баг',
205 => 'Не подтвердилось',
- 206 => 'Удалить все "устаревшие"',
+ 206 => 'Удалить все "архивные"',
207 => 'Удалить все старые записи',
208 => 'Пометить как архивный баг-репорт',
// ===========================
@@ -370,5 +370,6 @@ $txt = array(
366 => '',
367 => '',
368 => '',
+ 369 => 'Успешно удалено',
);
?>
diff --git a/include/text.ru.php b/include/text.ru.php
index 26e35c7..58c3df8 100644
--- a/include/text.ru.php
+++ b/include/text.ru.php
@@ -206,7 +206,7 @@ $txt = array(
203 => 'Пока не исправимо',
204 => 'Это не баг',
205 => 'Не подтвердилось',
- 206 => 'Удалить все "устаревшие"',
+ 206 => 'Удалить все "архивные"',
207 => 'Удалить все старые записи',
208 => 'Пометить как архивный баг-репорт',
// ===========================
@@ -370,5 +370,6 @@ $txt = array(
366 => '',
367 => '',
368 => '',
+ 369 => 'Успешно удалено',
);
?>
diff --git a/modules/bageditor.php b/modules/bageditor.php
index fcc8850..f1217b3 100644
--- a/modules/bageditor.php
+++ b/modules/bageditor.php
@@ -7,58 +7,129 @@ if (isset($_POST['cmd']) AND ($_SESSION['gnom'] > 1))
mysql_select_db($k_db, $k_connect);
mysql_query("SET NAMES 'utf8'");
// if....
- if (($_POST['cmd'] > 0) AND !isset($_POST['id']))
+ if (($_POST['cmd'] > 0) AND !isset($_POST['id']) AND ($_POST['cmd'] != 9) AND ($_POST['cmd'] != 10))
{
echo $txt[218];
+ ReturnToBT(60);
} else
{
// edit
- if (($_POST['cmd'] == 1) AND isset($_POST['id']) AND ($_POST['id'] > 0))
+ if (isset($_POST['cmd']) AND ($_POST['cmd'] > 0))
{
- require("include/edit.php");
- echo $edit_script;
- $edQuery = 'select * from `bagreports` where `id` = ' . (int) $_POST['id'] . ' limit 1';
- $res = mysql_query($edQuery) or trigger_error(mysql_error());
- $tres = mysql_fetch_array($res);
- echo '<form method="post"><table width="490" border="0" cellspacing="0" cellpadding="0"><tr><td width="80" height="30" align="right" valign="middle">';
- echo $txt[145] . '</td><td width="10" height="30" >&nbsp;</td><td width="400" height="30" align="left" valign="middle"><input name="modul" value="bagtrack" type=hidden>';
- echo '<input name="cmd" value="edit" type=hidden><input type="text" name="tema" size="60" value="' . $tres['theme'] . '"></td></tr>';
- echo '<tr><td width="80" height="30" align="right" valign="middle">' . $txt[146] . '</td><td width="10" height="30" >&nbsp;</td>';
- echo '<td width="400" height="30" align="left" valign="middle"><input type=hidden name="id" value=' . $tres['id'] . ' ><input type=hidden name="charid" value=' . $tres['charid'] . ' >';
- echo '<select name=kategor>';
- for ($i = 1; $i <= 10; $i++)
- {
- echo '<option value="' . $i . '"';
- if ($tres['type'] == $i)
- echo ' selected>';
- else
- echo '>';
- echo $txt[$i + 150] . '</option>';
- }
- echo '</select>';
- // if (($tres['thanks'] == 0) AND ($_SESSION['gnom'] < 2)){
- if ($tres['thanks'] == 0)
- {
- echo '&nbsp;&nbsp;' . $txt[201] . ' <input type=checkbox name=thx value=1> ' . $txt[219] . ' - ' . getgold($ThanksBagReport);
- }
- else
- echo '<font color=navy>' . $txt[220] . '</font>';
- echo '</td></tr></table><b><font color=green>' . $txt[197] . '</font></b><br><textarea name="report" style="width:480">' . $tres['report'] . '</textarea><br>';
- echo'<b><font color=red>' . $txt[147] . '</font></b><br><textarea name="adminnote" style="width:480">' . $tres['adminnote'] . '</textarea><br>';
- echo '<table width="480" border="0" cellspacing="0" cellpadding="0"><tr><td width="80" height="30" align="right" valign="middle">' . $txt[148];
- echo '</td><td width="10" height="30" >&nbsp;</td><td width="260" height="30" align="left" valign="middle"><select name=status>';
- for ($i = 1; $i <= 8; $i++)
- {
- echo '<option value="' . $i . '"';
- if ($tres['status'] + 1 == $i)
- echo ' selected>';
- else
- echo '>';
- echo $txt[$i + 162] . '</option>';
- }
- echo '</select><br></td><td width="10" height="30" >&nbsp;</td>';
- echo '<td width="120" height="30" align="right"><input type="submit" value="' . $txt[182] . '"></td></tr></table></form>';
- }
+ switch($_POST['cmd']){
+ case 1:
+ require("include/edit.php");
+ echo $edit_script;
+ $edQuery = 'select * from `bagreports` where `id` = ' . (int) $_POST['id'] . ' limit 1';
+ $res = mysql_query($edQuery) or trigger_error(mysql_error());
+ $tres = mysql_fetch_array($res);
+ echo '<form method="post"><table width="490" border="0" cellspacing="0" cellpadding="0"><tr><td width="80" height="30" align="right" valign="middle">';
+ echo $txt[145] . '</td><td width="10" height="30" >&nbsp;</td><td width="400" height="30" align="left" valign="middle"><input name="modul" value="bagtrack" type=hidden>';
+ echo '<input name="cmd" value="edit" type=hidden><input type="text" name="tema" size="60" value="' . $tres['theme'] . '"></td></tr>';
+ echo '<tr><td width="80" height="30" align="right" valign="middle">' . $txt[146] . '</td><td width="10" height="30" >&nbsp;</td>';
+ echo '<td width="400" height="30" align="left" valign="middle"><input type=hidden name="id" value=' . $tres['id'] . ' ><input type=hidden name="charid" value=' . $tres['charid'] . ' >';
+ echo '<select name=kategor>';
+ for ($i = 1; $i <= 10; $i++)
+ {
+ echo '<option value="' . $i . '"';
+ if ($tres['type'] == $i)
+ echo ' selected>';
+ else
+ echo '>';
+ echo $txt[$i + 150] . '</option>';
+ }
+ echo '</select>';
+ // if (($tres['thanks'] == 0) AND ($_SESSION['gnom'] < 2))
+ if ($tres['thanks'] == 0)
+ {
+ echo '&nbsp;&nbsp;' . $txt[201] . ' <input type=checkbox name=thx value=1> ' . $txt[219] . ' - ' . getgold($ThanksBagReport);
+ }
+ else
+ echo '<font color=navy>' . $txt[220] . '</font>';
+ echo '</td></tr></table><b><font color=green>' . $txt[197] . '</font></b><br><textarea name="report" style="width:480">' . $tres['report'] . '</textarea><br>';
+ echo'<b><font color=red>' . $txt[147] . '</font></b><br><textarea name="adminnote" style="width:480">' . $tres['adminnote'] . '</textarea><br>';
+ echo '<table width="480" border="0" cellspacing="0" cellpadding="0"><tr><td width="80" height="30" align="right" valign="middle">' . $txt[148];
+ echo '</td><td width="10" height="30" >&nbsp;</td><td width="260" height="30" align="left" valign="middle"><select name=status>';
+ for ($i = 1; $i <= 8; $i++)
+ {
+ echo '<option value="' . $i . '"';
+ if ($tres['status'] + 1 == $i)
+ echo ' selected>';
+ else
+ echo '>';
+ echo $txt[$i + 162] . '</option>';
+ }
+ echo '</select><br></td><td width="10" height="30" >&nbsp;</td>';
+ echo '<td width="120" height="30" align="right"><input type="submit" value="' . $txt[182] . '"></td></tr></table></form>';
+ ReturnToBT(60);
+ break;
+ case 2:
+ $upd_status = mysql_query("UPDATE `bagreports` SET `status`='1' WHERE (`id`= " . (int) $_POST['id'] . ")");
+ if($upd_status)
+ echo $txt[97];
+ else
+ echo $txt[99];
+ ReturnToBT(60);
+ break;
+ case 3:
+ $rm_report = mysql_query("DELETE FROM `bagreports` WHERE (`id`= " . (int) $_POST['id'] . ")");
+ if($rm_report)
+ echo $txt[360];
+ else
+ echo $txt[99];
+ ReturnToBT(60);
+ break;
+ // case 4: -- Not yet implemented
+ case 5:
+ $upd_status = mysql_query("UPDATE `bagreports` SET `status`='4' WHERE (`id`= " . (int) $_POST['id'] . ")");
+ if($upd_status)
+ echo $txt[97];
+ else
+ echo $txt[99];
+ ReturnToBT(60);
+ break;
+ case 6:
+ case 7:
+ $upd_status = mysql_query("UPDATE `bagreports` SET `status`='5' WHERE (`id`= " . (int) $_POST['id'] . ")");
+ if($upd_status)
+ echo $txt[97];
+ else
+ echo $txt[99];
+ ReturnToBT(60);
+ break;
+ case 8:
+ $upd_status = mysql_query("UPDATE `bagreports` SET `status`='3' WHERE (`id`= " . (int) $_POST['id'] . ")");
+ if($upd_status)
+ echo $txt[97];
+ else
+ echo $txt[99];
+ ReturnToBT(60);
+ break;
+ case 9:
+ $rm_archive = mysql_query("DELETE FROM `bagreports` WHERE `status` = '7'");
+ if($rm_archive)
+ echo $txt[360];
+ else
+ echo $txt[99];
+ ReturnToBT(60);
+ break;
+ case 10:
+ $rm_old = mysql_query("DELETE FROM `bagreports` WHERE `datewrite` < ADDDATE(CURDATE(), INTERVAL -" . $bugold . " DAY)");
+ if($rm_old)
+ echo $txt[369];
+ else
+ echo $txt[99];
+ ReturnToBT(60);
+ break;
+ case 11:
+ $upd_status = mysql_query("UPDATE `bagreports` SET `status`='7' WHERE (`id`= " . (int) $_POST['id'] . ")");
+ if($upd_status)
+ echo $txt[97];
+ else
+ echo $txt[99];
+ ReturnToBT(60);
+ break;
+ }
// end all commands
}
}
diff --git a/modules/command.php b/modules/command.php
index 881df29..6583cbf 100644
--- a/modules/command.php
+++ b/modules/command.php
@@ -82,7 +82,7 @@ $kol = 1;
$m_connect = mysql_connect($m_ip, $m_userdb, $m_pw);
mysql_select_db($m_db, $m_connect);
mysql_query("SET NAMES 'utf8'");
-$query = "SELECT `name`,`help` FROM `command` WHERE `security` = " . $lvl . " order by `name`";
+$query = "SELECT `name`,`help` FROM `command` WHERE `security` <= " . $lvl . " order by `name`";
$res = mysql_query($query) or trigger_error(mysql_error() . $query);
while ($mres = mysql_fetch_array($res))
{
@@ -97,4 +97,4 @@ if ($kol == 1)
echo '<tr><td height="30" colspan="3" align="center" valign="middle" ><b>' . $txt[69] . '</b></td></tr>';
}
echo '</table><br>';
-?>
\ No newline at end of file
+?>
diff --git a/modules/stat.php b/modules/stat.php
index 0626ce4..03e0c50 100644
--- a/modules/stat.php
+++ b/modules/stat.php
@@ -16,13 +16,15 @@ if ($statid == 0)
{
// Онлайн сервера
$koll = 0;
+ $realmid = $_SESSION['realmd'];
+ settype($realmid,'integer');
$r_connect = mysql_connect($r_ip, $r_userdb, $r_pw);
mysql_select_db($r_db, $r_connect);
mysql_query("SET NAMES 'utf8'");
$fp = @fsockopen($r_ip, "3724", $errno, $errstr, 1);
if ($fp)
{
- $res = mysql_fetch_array(mysql_query("select `starttime`,UNIX_TIMESTAMP(now()) as noww from `uptime` order by `starttime` desc limit 1 "));
+ $res = mysql_fetch_array(mysql_query("select `starttime`,UNIX_TIMESTAMP(now()) as noww from `uptime` where `realmid`='$realmid' order by `starttime` desc limit 1 "));
$koll = $res['starttime'];
$noww = $res['noww'];
$uptime = (int) $noww - (int) $koll;
@@ -47,7 +49,7 @@ if ($statid == 0)
}
// MAX Онлайн сервера
$koll = 0;
- $res = mysql_fetch_array(mysql_query("select `maxplayers` from `uptime` order by `maxplayers` desc limit 1 "));
+ $res = mysql_fetch_array(mysql_query("select `maxplayers` from `uptime` where `realmid`='$realmid' order by `maxplayers` desc limit 1 "));
$koll = $res[0];
if ($koll > 0)
echo '<tr><td height="35" align="left" valign="middle">' . $txt[290] . '</td>'
@@ -99,7 +101,7 @@ if ($statid == 0)
$c_connect = mysql_connect($c_ip, $c_userdb, $c_pw);
mysql_select_db($c_db, $c_connect);
mysql_query("SET NAMES 'utf8'");
- $res = mysql_fetch_array(mysql_query("SELECT * FROM `saved_variables`"));
+ @$res = mysql_fetch_array(mysql_query("SELECT * FROM `saved_variables`")); // don't show errors for different server systems
if ($res['NextArenaPointDistributionTime'] >= time())
echo '<tr><td height="35" align="left" valign="middle">' . $txt[315] . '</td>'
. '<td height="35" align="right" valign="middle">' . date('j-n-Y, H:i (D)', $res['NextArenaPointDistributionTime']) . ' </td></tr>';
@@ -123,9 +125,9 @@ if ($statid == 0)
mysql_select_db($m_db, $m_connect);
mysql_query("SET NAMES 'utf8'");
if ($ServerSystem == 1)
- $res = mysql_fetch_array(mysql_query("select * from `version` "));
+ $res = @mysql_fetch_array(mysql_query("select * from `version` ")); // don't show error if not exist table version... just empty string
else
- $res = mysql_fetch_array(mysql_query("select * from `db_version` "));
+ $res = @mysql_fetch_array(mysql_query("select * from `db_version` ")); // don't show error if not exist table db_version... just empty string
if ($ServerSystem == 1)
{
echo '<tr><td height="35" colspan="2" align="left" valign="middle">' . $txt[295] . $res[1] . '</td></tr>';
@@ -139,9 +141,9 @@ if ($statid == 0)
if ($ServerSystem <> 1)
{
$s_connect = mysql_connect($s_ip, $s_userdb, $s_pw);
- mysql_select_db($s_db, $s_connect);
+ @mysql_select_db($s_db, $s_connect); // don't show error if not exist scriptdev2 database
mysql_query("SET NAMES 'utf8'");
- $res = mysql_fetch_array(mysql_query("select * from `sd2_db_version` "));
+ $res = @mysql_fetch_array(mysql_query("select * from `sd2_db_version` ")); // don't show error if not exist sd2_db_version table or database... just empty string
echo '<tr><td height="35" colspan="2" align="left" valign="middle">' . $txt[297] . $res[0] . '</td></tr>';
}
}
diff --git a/panel.php b/panel.php
index ab8e31b..92e6112 100644
--- a/panel.php
+++ b/panel.php
@@ -26,7 +26,10 @@ if (!isset($_SESSION['user_id']) or ($_SESSION['ip'] != $_SERVER['REMOTE_ADDR'])
{
$ra_id = $row['id'];
$ra_username = $row['username'];
- $ra_gmlevel = $txt[70 + $_SESSION['gnom']];
+ if($_SESSION['gnom'] < 5)
+ $ra_gmlevel = $txt[70 + $_SESSION['gnom']];
+ else
+ $ra_gmlevel = $txt[74];
$ra_email = $row['email'];
$ra_joindate = $row['joindate'];
$ra_last_ip = $row['last_ip'];
@@ -188,4 +191,4 @@ require 'realmdselect.php';
crlf();
echo '<br/>'.$d;
html_comment('panel end');
-?>
\ No newline at end of file
+?>
diff --git a/sql/acp(2011-12-21).sql b/sql/acp(2011-12-21).sql
index 14d58ba..6cf4517 100644
--- a/sql/acp(2011-12-21).sql
+++ b/sql/acp(2011-12-21).sql
@@ -2,7 +2,8 @@
SQLyog Ultimate v8.82
MySQL - 5.5.15 : Database - acp
*********************************************************************
-*/
+*/
+
/*!40101 SET NAMES utf8 */;
@@ -12,7 +13,6 @@ MySQL - 5.5.15 : Database - acp
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-CREATE DATABASE /*!32312 IF NOT EXISTS*/`acp` /*!40100 DEFAULT CHARACTER SET utf8 */;
/*Table structure for table `bagreports` */
@@ -63,7 +63,7 @@ CREATE TABLE `links` (
/*Data for the table `links` */
-insert into `links`(`id`,`linkname`,`linkstr`,`image`,`gmlevel`) values (1,'WOWHead','http://ru.wowhead.com','images/links/wowhead.gif',0),(2,'RU-Mangos','http://ru-mangos.ru','images/links/rumangos.gif',2),(3,'YTDB','http://www.ytdb.ru','images/links/ytdb.gif',3);
+insert into `links`(`id`,`linkname`,`linkstr`,`image`,`gmlevel`) values (1,'WOWHead','http://ru.wowhead.com','images/links/wowhead.gif',0),(2,'RU-Mangos','http://ru-mangos.ru','images/links/rumangos.gif',2),(3,'YTDB','http://www.ytdb.ru','images/links/ytdb.gif',2);
/*Table structure for table `log` */
diff --git a/xmlqueres/stat_txt.php b/xmlqueres/stat_txt.php
index 9a97fc7..aff04b9 100644
--- a/xmlqueres/stat_txt.php
+++ b/xmlqueres/stat_txt.php
@@ -28,7 +28,7 @@ $stat_class = Array(
2 => 'Паладин',
3 => 'Охотник',
4 => 'Разбойник',
- 5 => 'Священник',
+ 5 => 'Жрец',
6 => 'Рыцарь смерти',
7 => 'Шаман',
8 => 'Маг',
@@ -45,7 +45,7 @@ $stat_race = Array(
6 => 'Таурены',
7 => 'Гномы',
8 => 'Троли',
- 9 => 'Гоблены',
+ 9 => 'Гоблины',
10 => 'Эльфы Крови',
11 => 'Дренеи',
22 => 'Ворген',
@@ -55,4 +55,4 @@ $stat_pol = Array(
0 => 'Мужчины',
1 => 'Женщины',
);
-?>
\ No newline at end of file
+?>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment