From: <ri...@us...> - 2011-04-03 20:20:45
|
Revision: 33796 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=33796&view=rev Author: ripero Date: 2011-04-03 20:20:39 +0000 (Sun, 03 Apr 2011) Log Message: ----------- [bp/r33677][FIX] Function check_rules corrected: * Banning by IP was broken, IP is now split into bytes before the comparisons. * Minor change: space added between the colon and the section name in the ban message. [bp/33681][FIX] Call to php function split, introduced in function check_rules at r33677, has been replaced by a call to php function explode (split deprecated in php 5.3). Thanks pkdille. Modified Paths: -------------- branches/7.x/lib/tikilib.php Property Changed: ---------------- branches/7.x/ Property changes on: branches/7.x ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 /branches/6.x:29486-31409,33409 /branches/experimental/big-blue-button:26681-26698 /branches/experimental/declfilter:15787-16031 /branches/experimental/edit_fixup:20923-21573 /branches/experimental/kaltura_integration_two:20962-22011 /branches/experimental/moz-metrics:23452-23480 /branches/experimental/ui-revamp2:16728-16731,16999-17002 /branches/experimental/wysiwyg_ckeditor_update:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402 /branches/experimental/xajax_removal:31497 /branches/proposals/4.x:24005 /trunk:33708-33712 + /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 /branches/6.x:29486-31409,33409 /branches/experimental/big-blue-button:26681-26698 /branches/experimental/declfilter:15787-16031 /branches/experimental/edit_fixup:20923-21573 /branches/experimental/kaltura_integration_two:20962-22011 /branches/experimental/moz-metrics:23452-23480 /branches/experimental/ui-revamp2:16728-16731,16999-17002 /branches/experimental/wysiwyg_ckeditor_update:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402 /branches/experimental/xajax_removal:31497 /branches/proposals/4.x:24005 /trunk:33677,33681,33708-33712 Modified: branches/7.x/lib/tikilib.php =================================================================== --- branches/7.x/lib/tikilib.php 2011-04-03 19:24:09 UTC (rev 33795) +++ branches/7.x/lib/tikilib.php 2011-04-03 20:20:39 UTC (rev 33796) @@ -373,13 +373,14 @@ if ($user == 'admin') return false; - $ips = $this->get_ip_address(); + $fullip = $this->get_ip_address(); + $ips = explode(".", $fullip); $query = "select tb.`message`,tb.`user`,tb.`ip1`,tb.`ip2`,tb.`ip3`,tb.`ip4`,tb.`mode` from `tiki_banning` tb, `tiki_banning_sections` tbs where tbs.`banId`=tb.`banId` and tbs.`section`=? and ( (tb.`use_dates` = ?) or (tb.`date_from` <= ? and tb.`date_to` >= ?))"; $result = $this->fetchAll($query,array($section,'n',(int)$this->now,(int)$this->now)); foreach ( $result as $res ) { if (!$res['message']) { - $res['message'] = tra('You are banned from'). ':' . $section; + $res['message'] = tra('You are banned from'). ': ' . $section; } if ($user && $res['mode'] == 'user') { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |