summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérôme Schneider <jschneider@entrouvert.com>2011-09-08 13:25:31 (GMT)
committerJérôme Schneider <jschneider@entrouvert.com>2011-09-08 13:25:31 (GMT)
commitbd7f98a776fa66154b29face4c4805fa6d53df1a (patch)
treeb7a1293805c515ddb0628c759a9343e049398e9c
parent009bafa7733f92a5a7d6bd63788dfaf75269dec3 (diff)
downloadlarpe-master.zip
larpe-master.tar.gz
larpe-master.tar.bz2
Fix Ciril plugin for the new releaseHEADmaster
-rw-r--r--larpe/plugins/site_authentication/ciril_net_rh.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/larpe/plugins/site_authentication/ciril_net_rh.py b/larpe/plugins/site_authentication/ciril_net_rh.py
index 417804c..51dea70 100644
--- a/larpe/plugins/site_authentication/ciril_net_rh.py
+++ b/larpe/plugins/site_authentication/ciril_net_rh.py
@@ -28,13 +28,13 @@ class CirilSiteAuthentication(SiteAuthentication):
success = False
return_content = redirect(self.host.get_return_url())
- regexp = re.compile(
- """javascript\:window\.open\('(/net_rh/accueil.php\?.*?)', '_blank'\)""",
- re.DOTALL | re.IGNORECASE)
- match = regexp.findall(data)
- if match:
+ regexp = re.compile("""window.open\('/net_rh/accueil.php\?(.+?)'\,'_blank'""",
+ re.DOTALL | re.IGNORECASE)
+ m = regexp.search(data)
+ if m:
success = True
- return_content = redirect(match[0])
+ link = "/net_rh/accueil.php?%s" % m.group(1)
+ return_content = redirect(link)
return success, return_content