Actually, probably simpler for most situations to check by council

3 files changed, 18 insertions, 18 deletions

diff --git a/perllib/Cobrand.pm b/perllib/Cobrand.pm
index 7611103d5..528a338da 100644
--- a/perllib/Cobrand.pm
+++ b/perllib/Cobrand.pm
@@ -7,7 +7,7 @@
 # Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved.
 # Email: louise@mysociety.org. WWW: http://www.mysociety.org
 #
-# $Id: Cobrand.pm,v 1.29 2009-10-19 16:44:55 louise Exp $
+# $Id: Cobrand.pm,v 1.30 2009-10-20 11:55:50 louise Exp $
 
 package Cobrand;
 use strict;
@@ -509,21 +509,21 @@ sub allow_photo_display {
     }
 }
 
-=item location_check COBRAND LOCATION QUERY
+=item council_check COBRAND COUNCILS QUERY
 
-Return a boolean indicating whether the location passed any extra location checks defined by the cobrand
+Return a boolean indicating whether the councils for the location passed any extra checks defined by the cobrand
 using data in the query
 =cut
-sub location_check {
-    my ($cobrand, $location, $query) = @_;
+sub council_check {
+    my ($cobrand, $councils, $query, $context) = @_;
     my $handle;
     if ($cobrand){
         $handle = cobrand_handle($cobrand);
     }
-    if ( !$cobrand || !$handle || !$handle->can('location_check')){
-        return 1;
+    if ( !$cobrand || !$handle || !$handle->can('council_check')){
+        return (1, '');
     } else{
-        return $handle->location_check($location, $query);
+        return $handle->council_check($councils, $query, $context);
     }
 } 
 
diff --git a/t/Cobrand.t b/t/Cobrand.t
index 71f38a3a0..db55cf054 100755
--- a/t/Cobrand.t
+++ b/t/Cobrand.t
@@ -6,7 +6,7 @@
 #  Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved.
 # Email: louise@mysociety.org; WWW: http://www.mysociety.org/
 #
-# $Id: Cobrand.t,v 1.19 2009-10-19 16:44:55 louise Exp $
+# $Id: Cobrand.t,v 1.20 2009-10-20 11:55:50 louise Exp $
 #
 
 use strict;
@@ -258,16 +258,16 @@ sub test_allow_photo_display {
     is($photo_display, 1, 'allow_photo_display returns 1 if there is no allow_photo_display function defined by the cobrand');
 }
 
-sub test_location_check {
+sub test_council_check {
     my $cobrand = 'mysite';
-    my $location = 'near here';
+    my $councils = {};
     my $query = new MockQuery('mysite');
-    my $check_result = Cobrand::location_check($cobrand, $location, $query);
-    is($check_result, 0, 'location_check returns output from cobrand module');
+    my ($check_result, $error) = Cobrand::council_check($cobrand, $councils, $query);
+    is($check_result, 0, 'council_check returns output from cobrand module');
     
     $cobrand = 'nosite';
-    $check_result = Cobrand::location_check($cobrand, $location, $query);
-    is($check_result, 1, 'location_check returns 1 if there is no location_check function defined by the cobrand');
+    ($check_result, $error) = Cobrand::council_check($cobrand, $councils, $query);
+    is($check_result, 1, 'council_check returns 1 if there is no council_check function defined by the cobrand');
 }
 
 ok(test_cobrand_handle() == 1, 'Ran all tests for the cobrand_handle function');
@@ -289,4 +289,4 @@ ok(test_url() == 1, 'Ran all tests for url');
 ok(test_show_watermark() == 1, 'Ran all tests for show_watermark');
 ok(test_allow_photo_upload() == 1, 'Ran all tests for allow_photo_upload');
 ok(test_allow_photo_display() == 1, 'Ran all tests for allow_photo_display');
-ok(test_location_check() == 1, 'Ran all tests for location_check');
+ok(test_council_check() == 1, 'Ran all tests for council_check');
diff --git a/t/Cobrands/Mysite/Util.pm b/t/Cobrands/Mysite/Util.pm
index 4e691a092..aadf1edd9 100644
--- a/t/Cobrands/Mysite/Util.pm
+++ b/t/Cobrands/Mysite/Util.pm
@@ -7,7 +7,7 @@
 # Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved.
 # Email: louise@mysociety.org. WWW: http://www.mysociety.org
 #
-# $Id: Util.pm,v 1.18 2009-10-19 16:44:56 louise Exp $
+# $Id: Util.pm,v 1.19 2009-10-20 11:55:51 louise Exp $
 
 package Cobrands::Mysite::Util;
 use Page;
@@ -99,7 +99,7 @@ sub allow_photo_display {
     return 0;
 }
 
-sub location_check { 
+sub council_check { 
     return 0;
 }
 1;