Merge remote-tracking branch 'origin/master'

This commit is contained in:
lopar 2018-12-21 22:48:34 +02:00
commit c0405e0aa3
4 changed files with 47 additions and 209 deletions

View File

@ -2,86 +2,59 @@
ob_start("ob_gzhandler"); ob_start("ob_gzhandler");
session_start(); session_start();
if ($_SESSION['uid'] == null) header("Location: index.php"); if ($_SESSION['uid'] == null) header("Location: index.php");
require_once 'config.php';
require_once 'functions.php'; if (input::post('friendadd')) {
$friend = db::c()->query('SELECT * FROM `friends` WHERE `user` = ?i', $_SESSION['uid'])->fetch_assoc(); $q = db::c()->query('SELECT `id` FROM `users` WHERE `login` = "?s"', input::post('friendadd'))->fetch_assoc();
$q2 = db::c()->query('SELECT 1 FROM `friends` WHERE `user` = ?i AND `friend` = ?i', $_SESSION['uid'], $q['id']);
if ($_POST['sd4'] && $_POST['friendadd']) { if (!$q['id']) $status = 'Персонаж не найден.';
$_POST['friendadd'] = htmlspecialchars($_POST['friendadd'], NULL, 'cp1251'); elseif ($q['id'] == $_SESSION['uid']) $status = 'Себя добавить нельзя.';
if (preg_match('/^[- \p{L}\d]+$/u', $_POST['friendadd'])) $status = 'Персонаж не найден.'; elseif ($q2->getNumRows()) $status = 'Персонаж уже есть в списке.';
else $igogo = mysql_fetch_array(mysql_query("SELECT id FROM `users` WHERE `login` = '{$_POST['friendadd']}' LIMIT 1;"));
$_POST['comment'] = htmlspecialchars($_POST['comment'], NULL, "");
$igogo2 = mysql_fetch_array(mysql_query("SELECT friend FROM `friends` WHERE `user` = '" . $user['id'] . "' and `friend`=" . $igogo['id'] . " LIMIT 1;"));
if (!$igogo['id']) $status = 'Персонаж не найден.';
elseif ($igogo['id'] == $user['id']) $status = 'Себя добавить нельзя.';
elseif (preg_match('/^[- \p{L}\d]+$/u', $_POST['comment'])) $status = 'Ошибка ввода: запрещённые символы!';
elseif ($igogo2['friend']) $status = 'Персонаж уже есть в списке.';
else { else {
if ($_POST['group'] == 0) $friend = $igogo['id']; db::c()->query('INSERT INTO `friends` (`user`, `friend`, `comment`) VALUES (?i,?i,"?s")', $_SESSION['uid'], $q['id'], input::post('comment'));
mysql_query("INSERT INTO `friends` (`user`, `friend`, `comment`) VALUES(" . $user['id'] . ", " . $friend . ", '" . $_POST['comment'] . "');");
$status = 'Контакт добавлен.'; $status = 'Контакт добавлен.';
} }
} }
if ($_POST['friendremove']) { if (input::post('friendremove')) {
$_POST['friendremove'] = htmlspecialchars($_POST['friendremove'], NULL, 'cp1251'); $q = db::c()->query('SELECT `id` FROM `users` WHERE `login` = "?s"', input::post('friendremove'))->fetch_assoc();
if (preg_match('/^[- \p{L}\d]+$/u', $_POST['friendremove'])) $status = 'Персонаж не найден.'; $q2 = db::c()->query('SELECT 1 FROM `friends` WHERE `user` = ?i AND `friend` = ?i', $_SESSION['uid'], $q['id']);
else $igogo = mysql_fetch_array(mysql_query("SELECT id FROM `users` WHERE `login` = '{$_POST['friendremove']}' LIMIT 1;"));
if (!$igogo['id']) $status = 'Персонаж не найден.'; if (!$q['id'] OR !$q2->getNumRows()) $status = 'Персонаж не найден.';
else { else {
$igogo2 = mysql_fetch_array(mysql_query("SELECT enemy,friend,notinlist FROM `friends` WHERE `user` = '" . $user['id'] . "' and `friend`=" . $igogo['id'] . " LIMIT 1;")); db::c()->query('DELETE FROM `friends` WHERE `user` = ?i AND `friend` = ?i', $_SESSION['uid'], $q['id']);
if (!$igogo2['friend']) $status = 'Персонаж не найден.'; $status = 'Контакт удалён.';
else {
$per = "`friend`='" . $igogo2['friend'] . "'";
mysql_query("DELETE FROM `friends` WHERE `user`='" . $user['id'] . "' and " . $per . ";");
$status = 'Контакт удалён.';
}
} }
} }
if ($_POST['friendedit']) { if (input::post('friendedit')) {
$_POST['friendedit'] = htmlspecialchars($_POST['friendedit'], NULL, 'cp1251'); $q = db::c()->query('SELECT `id` FROM `users` WHERE `login` = "?s"', input::post('friendedit'))->fetch_assoc();
if (preg_match('/^[- \p{L}\d]+$/u', $_POST['friendedit'])) $status = 'Персонаж не найден.'; $q2 = db::c()->query('SELECT 1 FROM `friends` WHERE `user` = ?i AND `friend` = ?i', $_SESSION['uid'], $q['id']);
else $igogo = mysql_fetch_array(mysql_query("SELECT id FROM `users` WHERE `login` = '{$_POST['friendedit']}' LIMIT 1;"));
$_POST['comment'] = htmlspecialchars($_POST['comment'], NULL, ""); if (!$q2['friend']) $status = 'Персонаж не найден.';
if (!$igogo['id']) $status = 'Персонаж не найден.';
elseif ($igogo['id'] == $user['id']) $status = 'Себя отредактировать нельзя.';
elseif (preg_match('/^[- \p{L}\d]+$/u', $_POST['comment'])) $status = 'Ошибка ввода: запрещённые символы!';
else { else {
if ($_POST['group'] == 0) $friend = $igogo['id']; db::c()->query('UPDATE `friends` SET `comment` = "?s" WHERE `user` = ?i AND `friend` = ?i', input::post('comment'), $_SESSION['uid'], $q['id']);
$status = 'Контакт изменён.';
$igogo2 = mysql_fetch_array(mysql_query("SELECT friend FROM `friends` WHERE `user` = '" . $user['id'] . "' and `friend`=" . $igogo['id'] . " LIMIT 1;"));
if (!$igogo2['friend']) $status = 'Персонаж не найден.';
else {
$per = "`friend`='" . $igogo2['friend'] . "'";
mysql_query("UPDATE `friends` SET `friend` = " . $friend . ",`comment` = " . $_POST['comment'] . " WHERE `user`='" . $user['id'] . "' and " . $per . "");
$status = 'Контакт изменён.';
}
} }
} }
$admins_list = db::c()->query('SELECT `id` FROM `users` WHERE `admin` = 1 ORDER BY `login` ASC', (time() - 60)); $admins_list = db::c()->query('SELECT `id` FROM `users` WHERE `admin` = 1 ORDER BY `login` ASC', (time() - 60));
$contacts_list = db::c()->query('SELECT `friend`,`comment` FROM `friends` WHERE `friend` > 0 AND `user` = ?i', $_SESSION['uid']); $contacts_list = db::c()->query('SELECT `friend`,`comment` FROM `friends` WHERE `friend` > 0 AND `user` = ?i', $_SESSION['uid']);
?> ?>
<!doctype html>
<HTML> <HTML>
<HEAD> <HEAD>
<meta charset="utf-8"> <meta charset="utf-8">
<link rel=stylesheet href="css/main.css"> <link rel=stylesheet href="css/main.css">
<link rel=stylesheet href="css/friend/main.css">
<link href="css/friend/design3.css" rel="stylesheet" type="text/css">
</HEAD> </HEAD>
<body> <body>
<div style="text-align: right"> <div style="text-align: right">
<input type='button' style='width: 100px' value='Добавить контакт' onclick='addcontact()'> <input type='button' value='Добавить контакт' onclick='addcontact()'>
<input type='button' style='width: 100px' value='Удалить контакт' onclick='removecontact()'> <input type='button' value='Удалить контакт' onclick='removecontact()'>
<input type='button' value='Обновить' style='width: 75px' onclick='location="/contacts.php?friends=<?= mt_rand() ?>"'> <input type='button' value='Обновить' style='width: 75px'
onclick='location="/contacts.php?friends=<?= mt_rand() ?>"'>
<input TYPE='button' value='Вернуться' style='width: 75px' onclick='location="main.php"'> <input TYPE='button' value='Вернуться' style='width: 75px' onclick='location="main.php"'>
</div> </div>
<div id=hint4 class=ahint> <div id=hint4 class=ahint>
@ -92,7 +65,7 @@ $contacts_list = db::c()->query('SELECT `friend`,`comment` FROM `friends` WHERE
<TABLE width="100%"> <TABLE width="100%">
<TR> <TR>
<TD style="vertical-align: top; background: silver;"> <TD style="vertical-align: top; background: silver;">
<TABLE cellspacing=0 cellpadding=2 width="100%"> <TABLE cellspacing=1 width="100%">
<tr> <tr>
<td colspan="3"><h3>Контакты</h3></td> <td colspan="3"><h3>Контакты</h3></td>
</tr> </tr>
@ -107,12 +80,13 @@ $contacts_list = db::c()->query('SELECT `friend`,`comment` FROM `friends` WHERE
else echo "<span style='color: grey'>" . nick::id($us['id'])->full() . "</span><br>"; else echo "<span style='color: grey'>" . nick::id($us['id'])->full() . "</span><br>";
?> ?>
</TD> </TD>
<TD style="background: #efeded; width: 60%; font-style: italic;"> <TD style="background: darkgrey; width: 65%; padding: 0.2em 1em; border-radius: 2px;">
<small><?= $row['comment'] ?></small> <small><?= $row['comment'] ?></small>
</TD> </TD>
<TD width="1%"> <TD width="1%">
<input type='button' style="float: right" value="Редактировать" <input type='button' style="background: darkgrey; border: 1px solid grey; border-radius: 2px;" value="Редактировать"
onclick='editcontact("<?= $us['login'] ?>", "<?= $row['comment'] ?>")'> onclick='use("comment","wow")'>
<!-- editcontact("<?= $us['login'] ?>", "<?= $row['comment'] ?>") -->
</TD> </TD>
</TR> </TR>
<? endwhile; ?> <? endwhile; ?>
@ -127,8 +101,8 @@ $contacts_list = db::c()->query('SELECT `friend`,`comment` FROM `friends` WHERE
<script> <script>
function editcontact(login, comment) { function editcontact(login, comment) {
var s = '<table width=250 bgcolor=CCC3AA><tr><td align=center><b>Редактировать контакт</b></td><td width=20 align=right valign=top style="cursor: hand" onclick="closehint();"><b>x</td></tr><tr><td colspan=2>'; var s = '<table width=250 bgcolor=CCC3AA><tr><td align=center><b>Редактировать контакт</b></td><td width=20 align=right valign=top style="cursor: hand" onclick="closehint();"><b>x</td></tr><tr><td colspan=2>';
s += '<table width=100% align=center bgcolor=FFF6DD><form method=POST>'; s += '<table width=100% align=center bgcolor=FFF6DD><form action="contacts.php" method=POST>';
s += '<tr><td><input type="hidden" name="friendedit" value="' + login + '"><input type="hidden" name="sd4">'; s += '<tr><td><input type="hidden" name="friendedit" value="' + login + '">';
s += '<input name="comment" value="' + comment + '" placeholder="Комментарий" style="width: 105px"> '; s += '<input name="comment" value="' + comment + '" placeholder="Комментарий" style="width: 105px"> ';
s += '<input type="submit" value="Сохранить"></td></tr></form></table>'; s += '<input type="submit" value="Сохранить"></td></tr></form></table>';
s += '</td></tr></table>'; s += '</td></tr></table>';
@ -142,10 +116,10 @@ $contacts_list = db::c()->query('SELECT `friend`,`comment` FROM `friends` WHERE
function addcontact() { function addcontact() {
var s = '<table width=250 bgcolor=CCC3AA><tr><td align=center><B>Добавить контакт</td><td width=20 align=right valign=top style="cursor: hand" onclick="closehint();"><b>x</td></tr><tr><td colspan=2>'; var s = '<table width=250 bgcolor=CCC3AA><tr><td align=center><B>Добавить контакт</td><td width=20 align=right valign=top style="cursor: hand" onclick="closehint();"><b>x</td></tr><tr><td colspan=2>';
s += '<table width=100% bgcolor=FFF6DD align=center><form method=POST>'; s += '<table width=100% bgcolor=FFF6DD align=center><form action="contacts.php" method=POST>';
s += '<tr><td><input name="friendadd" placeholder="Логин" style="width:105px"> '; s += '<tr><td><input name="friendadd" placeholder="Логин" style="width:105px"> ';
s += '<input name="comment" placeholder="Комментарий" style="width:105px"></td></tr>'; s += '<input name="comment" placeholder="Комментарий" style="width:105px"></td></tr>';
s += '<tr><td><input type="submit" value="Добавить запись"><input type="hidden" name="sd4"></td></tr></form></table>'; s += '<tr><td><input type="submit" value="Добавить запись"></td></tr></form></table>';
s += '</td></tr></table>'; s += '</td></tr></table>';
document.getElementById("hint4").innerHTML = s; document.getElementById("hint4").innerHTML = s;
document.getElementById("hint4").style.visibility = "visible"; document.getElementById("hint4").style.visibility = "visible";
@ -157,23 +131,25 @@ $contacts_list = db::c()->query('SELECT `friend`,`comment` FROM `friends` WHERE
function removecontact() { function removecontact() {
var s = '<table width=250 bgcolor=CCC3AA><tr><td align=center><b>Удалить контакт</b></td><td width=20 align=right valign=top style="cursor: hand" onclick="closehint();"><b>x</td></tr><tr><td colspan=2>'; var s = '<table width=250 bgcolor=CCC3AA><tr><td align=center><b>Удалить контакт</b></td><td width=20 align=right valign=top style="cursor: hand" onclick="closehint();"><b>x</td></tr><tr><td colspan=2>';
s += '<table width=100% align=center bgcolor=FFF6DD><form method=POST>'; s += '<table width=100% align=center bgcolor=FFF6DD><form action="contacts.php" method=POST>';
s += '<tr><td><input type="hidden" name="sd4">'; s += '<tr><td><input name="friendremove" placeholder="Логин" style="width: 105px"> ';
s += '<input name="friendremove" placeholder="Логин" style="width: 105px"> ';
s += '<input type="submit" value="Удалить"></td></tr></form></table>'; s += '<input type="submit" value="Удалить"></td></tr></form></table>';
s += '</td></tr></table>'; s += '</td></tr></table>';
document.getElementById("hint4").innerHTML = s; document.getElementById("hint4").innerHTML = s;
document.getElementById("hint4").style.visibility = "visible"; document.getElementById("hint4").style.visibility = "visible";
document.getElementById("hint4").style.left = 100; document.getElementById("hint4").style.left = 100;
document.getElementById("hint4").style.top = document.body.scrollTop+50; document.getElementById("hint4").style.top = document.body.scrollTop + 50;
document.getElementById(name).focus(); document.getElementById(name).focus();
Hint3Name = name; Hint3Name = name;
} }
function closehint() function closehint() {
{ document.getElementById("hint4").style.visibility = "hidden";
document.getElementById("hint4").style.visibility="hidden"; Hint3Name = '';
Hint3Name=''; }
function use(option, placeholder) {
document.getElementById(option).innerHTML = "<form method='post'><input placeholder='"+placeholder+"' name='"+option+"'><input value='Ок' type='submit'></form>";
} }
</script> </script>
</body> </body>

View File

@ -1,99 +0,0 @@
body {
margin: 0px 1px 0px 1px;
padding: 0px 1px 0px 1px;
background-color: #dedede;
color: #000000;
}
.main_text {
font-weight: bold;
font-size: 10px;
text-decoration: none;
color:#f0f0f0;
cursor:hand;
}
.menutop, a.menutop:visited, a.menutop:active {
font-weight: bold;
font-size: 10px;
text-decoration: none;
color: #3B3936;
}
a.menutop:hover {
color: #76726b;
}
.name {
font-weight: bold;
font-size: 12px;
}
.parametr_title {
font-weight: bold;
font-size: 11px;
color: #777773;
}
.prname {
padding-left: 4px;
font-size: 11px;
font-family: Arial, Helvetica, sans-serif;
}
.prvalue {
font-size: 11px;
font-family: Arial, Helvetica, sans-serif;
}
.btn {
border: 1px double #9a9996;
font-size: 12px;
color: #dfdfdf;
background-color:#504F4C;
}
.mainmenu {
color: #23292C;
border-top-width: 1px;
border-right-width: 1px;
border-bottom-width: 1px;
border-left-width: 1px;
border-top-style: solid;
border-right-style: none;
border-bottom-style: solid;
border-left-style: solid;
border-top-color: #969697;
border-right-color: #969697;
border-bottom-color: #000000;
border-left-color: #969697;
background-color: #BABABB;
cursor:hand;
}
.maptext {
font-weight: bold;
font-size: 12px;
color: #000000;
font-family: Arial, Helvetica, sans-serif;
}
.posit {
border-top-width: 1px;
border-right-width: 1px;
border-bottom-width: 1px;
border-left-width: 1px;
border-top-style: solid;
border-right-style: solid;
border-bottom-style: solid;
border-left-style: solid;
border-top-color: #FFFFFF;
border-right-color: #666666;
border-bottom-color: #666666;
border-left-color: #FFFFFF;
padding: 2px;
}
td {
font-size: 10pt;
font-family: Verdana, Arial, Helvetica, Tahoma, sans-serif;
}

View File

@ -1,40 +0,0 @@
body, td, ol, ul, li , p {
FONT-SIZE: 10pt;
FONT-FAMILY: Verdana, Arial, Helvetica, Tahoma, sans-serif;
}
.text {
FONT-SIZE: 10pt; COLOR: #000000; FONT-WEIGHT: normal;
FONT-FAMILY: Verdana, Arial, Helvetica, Tahoma, sans-serif;
}
H3 { COLOR: #8f0000; FONT-FAMILY: Arial; FONT-SIZE: 12pt; FONT-WEIGHT: bold; TEXT-ALIGN: center }
H4 { COLOR: #8f0000; FONT-FAMILY: Arial; FONT-SIZE: 11pt; FONT-WEIGHT: bold; MARGIN-BOTTOM: 5px;}
H5 { COLOR: #4f0000; FONT-FAMILY: Arial; FONT-SIZE: 11pt; FONT-WEIGHT: bold; MARGIN-BOTTOM: 0px; MARGIN-TOP: 0px;}
a,a:visited { text-decoration: none; FONT-WEIGHT: bold; color: #003388; }
a:active { color: #6F0000}
a:hover { color: #0066FF}
.date { font-family: Courier; font-size: 8pt; text-decoration:none; font-weight:normal; color: #007000}
.date2 { font-family: Courier; font-size: 8pt; text-decoration:none; font-weight:normal; color: #007000; background-color: #00FFAA}
.sysdate { font-family: Courier; font-size: 8pt; text-decoration:none; font-weight:normal; color: #B00000}
.private { font-weight:bold; color: red; background-color: #FAE0E0}
.number { font-size: 11pt; font-weight: bold; color: #6F0000}
.dsc { color: #606060; font-weight:normal; }
select,textarea,input { border: solid 1pt #B0B0B0; font-family: MS Sans Serif; font-size: 10px; color: #191970; MARGIN-BOTTOM: 2px; MARGIN-TOP: 1px;}
.ahint {font-family: MS Sans Serif; font-size:8px; text-decoration:none; color:#000080;z-index: 99;}
#hint2 {position:absolute; width:140; background-color:#FFF6DD; layer-background-color:#FFF6DD; visibility:hidden}
#hint3 {position:absolute; width:240; background-color:#FFF6DD; layer-background-color:#FFF6DD; visibility:hidden}
#hint4 {position:absolute; width:240; visibility:hidden}
.B1 { font-weight: bold; color: #6666CC}
.B2 { font-weight: bold; color: #B06A00}
.B3 { font-weight: bold; color: #269088}
.B4 { font-weight: bold; color: #A0AF20}
.B5 { font-weight: bold; color: #0F79D3}
.B6 { font-weight: bold; color: #D85E23}
.B7 { font-weight: bold; color: #5C832F}
.B8 { font-weight: bold; color: #842B61}
.B9 { font-weight: bold; color: navy}
.Bs1 { font-size: 8pt; font-weight:bold; color: #6666CC}
.Bs2 { font-weight:bold; color: #B06A00}
img,table {border:0}

View File

@ -75,7 +75,8 @@ SELECT, TEXTAREA, INPUT {
.ahint { .ahint {
FONT-SIZE: 8px; FONT-SIZE: 8px;
COLOR: #000080; COLOR: #000080;
TEXT-DECORATION: none TEXT-DECORATION: none;
z-index: 50;
} }
#hint3 { #hint3 {