From: Hendrik B. <nh...@us...> - 2011-05-28 09:25:08
|
Update of /cvsroot/arianne/stendhal_website/scripts In directory vz-cvs-4.sog:/tmp/cvs-serv9470/scripts Modified Files: achievement.php Log Message: added test=inactive url parameter to show inactive achievements Index: achievement.php =================================================================== RCS file: /cvsroot/arianne/stendhal_website/scripts/achievement.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** achievement.php 22 May 2011 18:40:11 -0000 1.28 --- achievement.php 28 May 2011 09:25:06 -0000 1.29 *************** *** 92,97 **** . 'LEFT JOIN reached_achievement ON achievement.id = reached_achievement.achievement_id ' . 'AND reached_achievement.charname = \''.mysql_real_escape_string($charname).'\' ' ! . 'LEFT JOIN reached_achievement As allReached ON allReached.achievement_id=achievement.id ' ! .' WHERE achievement.active = 1 ' . 'GROUP BY achievement.id, achievement.identifier, achievement.title, ' . 'achievement.category, achievement.base_score, achievement.description ' --- 92,100 ---- . 'LEFT JOIN reached_achievement ON achievement.id = reached_achievement.achievement_id ' . 'AND reached_achievement.charname = \''.mysql_real_escape_string($charname).'\' ' ! . 'LEFT JOIN reached_achievement As allReached ON allReached.achievement_id=achievement.id '; ! if (!isset($_REQUEST['test']) || $_REQUEST['test'] != 'inactive') { ! $query = $query .' WHERE achievement.active = 1 '; ! } ! $query = $query . 'GROUP BY achievement.id, achievement.identifier, achievement.title, ' . 'achievement.category, achievement.base_score, achievement.description ' *************** *** 110,115 **** . 'FROM achievement ' . 'LEFT JOIN reached_achievement ON achievement.id = reached_achievement.achievement_id ' ! . 'LEFT JOIN character_stats ON reached_achievement.charname = character_stats.name AND character_stats.admin <= 600 '.$where ! .' AND achievement.active = 1 ' . 'GROUP BY achievement.id, achievement.identifier, achievement.title, ' . 'achievement.category, achievement.base_score, achievement.description ' --- 113,121 ---- . 'FROM achievement ' . 'LEFT JOIN reached_achievement ON achievement.id = reached_achievement.achievement_id ' ! . 'LEFT JOIN character_stats ON reached_achievement.charname = character_stats.name AND character_stats.admin <= 600 '.$where; ! if (!isset($_REQUEST['test']) || $_REQUEST['test'] != 'inactive') { ! $query = $query .' AND achievement.active = 1 '; ! } ! $query = $query . 'GROUP BY achievement.id, achievement.identifier, achievement.title, ' . 'achievement.category, achievement.base_score, achievement.description ' |