From a6babfe0e323ede3256f20c7af2002987f4cd28d Mon Sep 17 00:00:00 2001 From: Stefan Brannfjell Date: Sun, 15 Jun 2014 00:55:50 +0200 Subject: [PATCH] When uploading guild images, it will give you an error message if it fails. Guild motd will display on guild page, and the leader can also update it. Fixed two bugs with name change in shop. (sync error and name validation) Fixed some warnings. My account now shows how many days you have of premium account. --- config.php | 13 +++++++------ engine/function/general.php | 10 +++++----- engine/function/users.php | 6 ++++++ engine/guildimg/default@logo.gif | Bin 1883 -> 2854 bytes engine/init.php | 2 +- guilds.php | 30 ++++++++++++++++++++++++++---- myaccount.php | 12 +++++++----- 7 files changed, 52 insertions(+), 21 deletions(-) diff --git a/config.php b/config.php index 5457d21..b9ebd46 100644 --- a/config.php +++ b/config.php @@ -4,9 +4,9 @@ // TFS 0.3 = TFS_03 (If ur using 0.3.6, set $config['salt'] to false)! // TFS 0.4 = TFS_03 // TFS 1.0 = TFS_10 (Under developement) - $config['TFSVersion'] = 'TFS_03'; + $config['TFSVersion'] = 'TFS_10'; // As far as I know, OTX is based on TFS_03, so make sure TFS version is configured TFS_03 - $config['CustomVersion'] = 'OTX'; // Not using OTX? Replace 'OTX' with: false + $config['CustomVersion'] = false; $config['site_title'] = 'Znote AAC'; $config['site_title_context'] = 'Because open communities are good communities. :3'; @@ -20,13 +20,13 @@ // ------------------------ \\ // phpmyadmin username for OT server: (DONT USE "root" if ur hosting to public.). - $config['sqlUser'] = 'otx03'; + $config['sqlUser'] = 'tfs10'; // phpmyadmin password for OT server: - $config['sqlPassword'] = 'otx03'; + $config['sqlPassword'] = 'tfs10'; // The database name to connect to. (This is usually same as username). - $config['sqlDatabase'] = 'otx03'; + $config['sqlDatabase'] = 'tfs10'; // Hostname is usually localhost or 127.0.0.1. $config['sqlHost'] = 'localhost'; @@ -335,7 +335,7 @@ $config['page_admin_access'] = array( //'otland0', //'otland1', - //'znote' + 'znote' ); // Built-in FORUM @@ -380,6 +380,7 @@ $config['zeotss'] = array( 'enabled' => false, 'visitors' => true, + 'debug' => false, 'server' => "http://zeotss.znote.eu/" ); // Don't touch this unless you know what you are doing. (modifying this(key value) also requires modifications in OT files /XML/commands.xml). diff --git a/engine/function/general.php b/engine/function/general.php index 5de0446..eb0cae7 100644 --- a/engine/function/general.php +++ b/engine/function/general.php @@ -460,7 +460,7 @@ function check_image($image) { if ($path_info['extension'] === 'gif') { // Resize image - $img = resize_imagex($image_data, 150, 150); + $img = resize_imagex($image_data, 100, 100); if ($img) { @@ -470,25 +470,25 @@ function check_image($image) { } else { - header('Location: guilds.php?name='. $_GET['name']); + header('Location: guilds.php?error=Only gif images accepted, you uploaded:['.$path_info['extension'].'].&name='. $_GET['name']); exit(); } } else { - header('Location: guilds.php?name='. $_GET['name']); + header('Location: guilds.php?error=Only gif images accepted, you uploaded:['.$check['mime'].'].&name='. $_GET['name']); exit(); } } else { - header('Location: guilds.php?name='. $_GET['name']); + header('Location: guilds.php?error=Uploaded image is invalid.&name='. $_GET['name']); exit(); } } else { - header('Location: guilds.php?name='. $_GET['name']); + header('Location: guilds.php?error=Only gif images are accepted, you uploaded:['.$image_data['type'].'].&name='. $_GET['name']); exit(); } } diff --git a/engine/function/users.php b/engine/function/users.php index aa2b6b0..4ca5a93 100644 --- a/engine/function/users.php +++ b/engine/function/users.php @@ -490,6 +490,12 @@ function get_guild_id($name) { return ($data !== false) ? $data['id'] : false; } +// Returns guild data from name +function get_guild_data($name) { + $name = sanitize($name); + return mysql_select_single("SELECT `id`, `name`, `ownerid`, `creationdata`, `motd` FROM `guilds` WHERE `name`='$name' LIMIT 1;"); +} + // Get complete list of guilds function get_guilds_list() { return mysql_select_multi("SELECT `id`, `name`, `creationdata` FROM `guilds` ORDER BY `name`;"); diff --git a/engine/guildimg/default@logo.gif b/engine/guildimg/default@logo.gif index 11b1585a2b26bee0f97b305f47ce45e9811322e8..404a0df8c95da49936f86f02a720160321c094fd 100644 GIT binary patch literal 2854 zcmeH}>r+#A0)~I*%IH zG)#d347>sFg95++fU^J!+)yAyfd~a*3ot+w1H>~x3IoU%;DDS3a#B7O^c~CE=0yDo4pbjp@2pwNH0-) z9W{VB>u{LV^LBM~_~r9&MXK?$>BTpv@4Xh@XiQbx$X(iJ;w%9t@>kMRz2c0nSK2fZ z1V6+{J9m;tZ+|{oophsUrOe^QSihm&9Wv;%V0zHdw)S z(?K4>)=2u=CNV(+!QKN!a9rpN{L}ullgHPWrxR^{j^|q9UwH{}61E%ZJsBgTjt z6%J4#924g+>H0ATc2c4kBSv%8cy0CTVAe+oPHd>hU-kOimWn6N*k0MaKX5oSjS3d6 z6PrOsansLE4v2=Y0CtQyEXlWqECf-=9z|Y~-?Ct^y!U4EnB>x*cVn6NWv+Sqv)*vQ z_g+%5UH|IiHI0iWh2r`1{L{yu$Nam9ec|&zT=3|L+)pQ>?WtbB;E<+UmK@A}+Lzm4WoOZJF+b*oy5_7EG<`v#X zl9FySAII3Pj)rM$x2UP4ZvYN0=VyC20E)6ML%>&js>Z`U%Db?{#hidf{Jsg=ZLQB$+>BUq?;q@fM@N^n z3OwhThch!mtf%EvMOtcn6%i0a+QyZx@`(f8vb#aHE^*7YX5EcDxY05UbUHO1tMuoW z&;!h|NHR`)a1lpCaYz}-V|84=GQjUURF&$8vKTtknss^WT5+h%!<96fM=rfXj|U9V zsli+?%>%_W4kNb`nR{Wgj!CmN9tGIG{GY88ew!mDkX}lVs`;MHNC}AloOh{Me2C{J$x35&I2kGE@AG*K=yHr{k5eDS zfvaeo-QcpfW#!S1GxJwpa&=F9;J)~h;0qFBk4Z&x4c4_kdK9wsn&3=+veK~}g`dm) zYSJa;9~2+!dcl3MD{2YX9TicFbyGlNld0`~w zM4ORh9E*bZIK)apj4}Sc(eKcV^(C>7@k-Cez$iPKw06<(E%@!z-Y$I0mrD<}pZs|B z&7_tsD?aGi8L3aJg#6{VxK{^+WyiA9tu=|)HG}m{i{`N_?9o`hjT!ZKIjo%h&GgV~ zY^UMOju5UKum0Ec9ti^?&BqU(_42Gb6YTQ_U!Tn9h_clOT<$;5?EK2$xsu;}e&h4; zi$~ek#1$NqrmD3BIq<}<^6MXR9@g|N@get2tg)4@Ex7YCdvVTHPe-GknLwCTEStmarj#^TRF0*T;|6C!Fxx=26k%q$Hfvq+jGa{tYrA}vL9JGGfI9a%By&c2B ze9q^|w`%@EF-V?M)eerP2*4X{;}9vz1ss-=CFrVPJ7m4!xmOLg`Q{M)1BWvm1I zQr14}eeN8fN_$I+?$?r89+xOH#V?BLapcAPMM^xMw6q~SAbM11`_7M~Ngbp>Ae72} nR=U{t&xe7deSNF!p1C~$0X+Mz8}yCO=Dab*bcNl*BM$!`|0Iu- literal 1883 zcmV-h2c-B%Nk%w1VU_@v0K@83y2;jS49@}xUy;x_ zRoCKc4!$A;PGJz3-!om+Gz_5H3tnC zsB-pf#y><23^HuN36ZBA`Vf)Y7(-MZ200M_?h-_DhO1FFF7AS0pe2nzh*-u5x$D6~ zn==L+LR8a*%48o=2spq%BhV3s5P3@>Qw;=oa#RdRFqGfZ6P2Vo9l=vssyus86fk*Z z(Dg|7zZX{g`Cc^V3uJb zfb~jJ5o_~2NHBJ?2*m&vX!CNiVt@jV!!*s;H%tST1Q0O517Wu500JODNPzD!m|lQI zgk1wmgyTGsf%A>?IWS<%p7o9x41i_mIHSo7P!M~K*WUqH$5DMkK;^{&rtkC4Aer0A z%a0RBF`%|*V&#Dm-BO)Bf&hAVf#HDvb|pj=M}6Rt7QlD`V(|!rZ!y503i%;(8)y)& z5uSs9NQU4E3S2Yb0R;l^;Rp^%W#Wmag=h%^;*kg4j2)6w8hWS!(m+uK*r<$zDWvET zjU; zQV9cgE-v)WfxiX$0GAZ*C<9%xJ@cKLK)Ny{h@z?af^k@w6Q6%m1%?hj0<`I3VRyc# zhGrsgB~Nm{ah36KGQ!ac6N;%)dO%Kfs2?jg@0mxsK zo!YocQSBEB_$s(HL#PqGrm$Buck3g%P8QYDRJfhTo0{edw@m~rZi3Id5Dc7{JR?n2 z*9KS($&3P2qqpUByA5pr-B^re2;rcgCU>#~$K}yjcf;HSFSh=T2ui8Da6p9}vtW2z zxwG)ERct>_@7uwvz$Iz#*fl=#DK7ydB%spLN50(rP8|$DK;z0r6BB|9 zg2`wA$wnYBIXDn#7}Ov#%E77v6zBm83|m>(JW&q?Br6vtV;+Ez7S4+oJ7hUokK%S z;w(s!1da%k@qjxTgkN<@WyppSM$n+}8V-;b0mSqGRwC_m20*|I5mCY?#sQTqI3RC) zW10bU(i+|=kON{V9WmWZeF=FZ8nKWy39cY&Q$kROs)@L!f{V#Ek_Upm=e# ziZf5cB5`ck6la1206lZ&r7Z>!biyj9S~NAH^aVHX7!|&t==Q}nOPK&krz1ata2=&P07wuKXetXU?Qek8oXp- VtsRsOQybgb+V-}%9YF{H06Q?@D#HK( diff --git a/engine/init.php b/engine/init.php index 58fe6d2..e405099 100644 --- a/engine/init.php +++ b/engine/init.php @@ -33,7 +33,7 @@ Token::generate(); if (user_logged_in() === true) { $session_user_id = $_SESSION['user_id']; - $user_data = user_data($session_user_id, 'id', 'name', 'password', 'email'); + $user_data = user_data($session_user_id, 'id', 'name', 'password', 'email', 'premdays'); $user_znote_data = user_znote_account_data($session_user_id, 'ip', 'created', 'points', 'cooldown'); } diff --git a/guilds.php b/guilds.php index 5d80414..59ee96b 100644 --- a/guilds.php +++ b/guilds.php @@ -25,7 +25,10 @@ if (empty($_GET['name'])) {

Guild List:

@@ -124,7 +127,8 @@ if (user_logged_in() === true) {
+ ".sanitize($_GET['error'])."

" : ""; ?>
@@ -176,7 +181,7 @@ if (user_logged_in() === true) {

Guild:

-

Motive of the Guild

+

@@ -382,6 +387,13 @@ if ($highest_access >= 2) { } else echo 'That character is already invited(or a member) on this guild.'; } else echo 'That character name does not exist.'; } + // Guild Message (motd) + if (!empty($_POST['motd'])) { + $motd = sanitize($_POST['motd']); + mysql_update("UPDATE `guilds` SET `motd`='$motd' WHERE `id`='$gid' LIMIT 1;"); + header('Location: guilds.php?name='. $_GET['name']); + exit(); + } if (!empty($_POST['disband'])) { // @@ -561,7 +573,7 @@ if ($highest_access >= 2) {
    -
  • Upload guild logo:
    +
  • Upload guild logo [.gif images only, 100x100px size]:
    • @@ -587,6 +599,16 @@ if ($highest_access >= 2) {
+ + +
    +
  • Change guild message:
    • +
  • +
    + +
    • +
+ 1) { ?> diff --git a/myaccount.php b/myaccount.php index b23f8a3..6e8b457 100644 --- a/myaccount.php +++ b/myaccount.php @@ -76,8 +76,9 @@ if (!empty($_POST['change_name'])) { } else $player = mysql_select_single("SELECT `id`, `account_id`, `online` FROM `players` WHERE `name` = '$oldname'"); // Check if player has bough ticket - $order = mysql_select_single("SELECT `id`, `account_id` FROM `znote_shop_orders` WHERE `type`='4' LIMIT 1;"); + $order = mysql_select_single("SELECT `id`, `account_id` FROM `znote_shop_orders` WHERE `type`='4' AND `account_id`='".$player['account_id']."' LIMIT 1;"); if ($order !== false) { + //data_dump($order, array($player['account_id'], $session_user_id), "data"); // Check if player and account matches if ($session_user_id == $player['account_id'] && $session_user_id == $order['account_id']) { // Check if new name is not occupied @@ -88,7 +89,7 @@ if (!empty($_POST['change_name'])) { if ($newname !== false) { $error = false; // name restriction - $resname = explode(" ", $_POST['name']); + $resname = explode(" ", $newname); foreach($resname as $res) { if(in_array(strtolower($res), $config['invalidNameTags'])) { $error = true; @@ -217,10 +218,11 @@ if (!empty($_POST['selected_comment'])) { ?>

My account

-

Welcome to your account page,

- +

Welcome to your account page,
+ You have days remaining premium account.

Character List: characters.