...

5 files changed, 13 insertions, 13 deletions

diff --git a/expansions/allweb/code.py b/expansions/allweb/code.py
index 152bbf7..0db0c16 100644
--- a/expansions/allweb/code.py
+++ b/expansions/allweb/code.py
@@ -3,7 +3,7 @@
 #  BlackSmith mark.2
 # exp_name = "allweb" # /code.py v.x23
 #  Id: 25~23c
-#  Code © (2011-2012) by WitcherGeralt [alkorgun@gmail.com]
+#  Code © (2011-2013) by WitcherGeralt [alkorgun@gmail.com]
 
 class expansion_temp(expansion):
 
@@ -883,7 +883,7 @@ class expansion_temp(expansion):
 							data = data.decode("utf-8")
 							mark = get_text(data, "<th colspan=\"2\">", "</th>")
 							if Numb != 0:
-								comp = compile__('<tr class="tbody">\s+?<th.*?>(.+?)</th>\s+?<td.+?/></td>\s+?</tr>\s+?<tr>\s+?<td.+?>(.+?)</td>\s+?</tr>\s+?<tr class="dl">\s+?<td>&nbsp;</td>\s+?<td class="clpersp"><p>(.+?)</p></td>\s+?</tr>\s+?<tr class="dl"><td class="left">(.+?)</td><td>(.+?)</td></tr>\s+?<tr class="dl"><td class="left">(.+?)</td><td>(.+?)</td></tr>\s+?<tr class="dl bottom"><td class="left">(.+?)</td><td>(.+?)</td></tr>', 16)
+								comp = compile__('<tr class="tbody">\s+?<th.*?>(.+?)</th>\s+?<td.+?/></td>\s+?</tr>\s+?<tr>\s+?<td.+?>(.+?)</td>\s+?</tr>\s+?<tr class="dl">\s+?<td>&nbsp;</td>\s+?<td class="clpersp"><p>(.*?)</p></td>\s+?</tr>\s+?<tr class="dl"><td class="left">(.+?)</td><td>(.+?)</td></tr>\s+?<tr class="dl"><td class="left">(.+?)</td><td>(.+?)</td></tr>\s+?<tr class="dl bottom"><td class="left">(.+?)</td><td>(.+?)</td></tr>', 16)
 								list = comp.findall(data)
 								if list:
 									ls = [(self.decodeHTML(mark) if mark else "\->")]
@@ -894,7 +894,7 @@ class expansion_temp(expansion):
 								else:
 									answer = self.AnsBase[1]
 							else:
-								comp = compile__('<tr class="tbody">\s+?<td class="date" colspan="3"><a.+?>(.+?)</a></td>\s+?</tr>\s+?<tr>\s+?<td rowspan="2"><a.+?/></a></td>\s+?<td class="clpersp"><p>(.+?)</p></td>\s+?</tr>\s+?<tr>\s+?<td.+?>(.+?)</td>', 16)
+								comp = compile__('<tr class="tbody">\s+?<td class="date" colspan="3"><a.+?>(.+?)</a></td>\s+?</tr>\s+?<tr>\s+?<td rowspan="2"><a.+?/></a></td>\s+?<td class="clpersp"><p>(.*?)</p></td>\s+?</tr>\s+?<tr>\s+?<td.+?>(.+?)</td>', 16)
 								list = comp.findall(data)
 								if list:
 									ls = [(self.decodeHTML(mark) if mark else "\->")]
diff --git a/expansions/allweb/currency.ru b/expansions/allweb/currency.ru
index 15511c3..26078a2 100644
--- a/expansions/allweb/currency.ru
+++ b/expansions/allweb/currency.ru
@@ -8,5 +8,5 @@
 бот покажет список основных валют

 */{command} аббревиатура chf

 бот расшифрует аббревиатуру валюты (CHF: Швейцарский франк)

-*/{command} перевести 20 eur

+*/{command} перевести 22 eur

 бот покажет стоимость двадцати двух евро в рублях
\ No newline at end of file
diff --git a/expansions/config/code.py b/expansions/config/code.py
index 0f33eac..d46b2f0 100644
--- a/expansions/config/code.py
+++ b/expansions/config/code.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
 #  BlackSmith mark.2
-# exp_name = "config" # /code.py v.x5
-#  Id: 19~4c
-#  Code © (2011-2012) by WitcherGeralt [alkorgun@gmail.com]
+# exp_name = "config" # /code.py v.x6
+#  Id: 19~5c
+#  Code © (2011-2013) by WitcherGeralt [alkorgun@gmail.com]
 
 class expansion_temp(expansion):
 
@@ -195,12 +195,12 @@ class expansion_temp(expansion):
 							for x in xrange(24):
 								code += choice(symbols)
 						if locals().has_key("changed"):
-							self.answer_register(disp, xmpp.Iq(Types[8]), stype, source, code)
+							self.answer_register(disp, xmpp.Iq(Types[8]), stype, source, code, disp)
 						elif online(Name):
 							Disp = Clients[Name]
 							iq = xmpp.Iq(Types[9] , xmpp.NS_REGISTER, to = Disp.Server, payload = [xmpp.Node("username", payload = [Disp.User]), xmpp.Node("password", payload = [code])])
 							Info["outiq"].plus()
-							CallForResponse(Disp, iq, self.answer_register, {"stype": stype, "source": source, "code": code})
+							CallForResponse(Disp, iq, self.answer_register, {"stype": stype, "source": source, "code": code, "str_disp": get_disp(disp)})
 						else:
 							answer = self.AnsBase[12]
 					else:
@@ -218,7 +218,7 @@ class expansion_temp(expansion):
 		if locals().has_key(Types[6]):
 			Answer(answer, stype, source)
 
-	def answer_register(self, disp, stanza, stype, source, code):
+	def answer_register(self, disp, stanza, stype, source, code, str_disp):
 		if xmpp.isResultNode(stanza):
 			Name = get_disp(disp)
 			if Name == GenDisp:
@@ -238,7 +238,7 @@ class expansion_temp(expansion):
 			answer = AnsBase[4]
 		else:
 			answer = AnsBase[7]
-		Answer(answer, stype, source, disp)
+		Answer(answer, stype, source, str_disp)
 
 	commands = (
 		(command_config, "config", 8,),
diff --git a/expansions/get_iq/idle.ru b/expansions/get_iq/idle.ru
index 9af7f2a..f5d6ef1 100644
--- a/expansions/get_iq/idle.ru
+++ b/expansions/get_iq/idle.ru
@@ -2,5 +2,5 @@
 {command} [nick/jid]

 */{command} Dude

 бот время простоя "Dude" (если клиент его выдаст)

-*/пинг dude@jab.ru

+*/{command} dude@jab.ru

 бот время простоя "dude@jab.ru"
\ No newline at end of file
diff --git a/expansions/get_iq/insc.py b/expansions/get_iq/insc.py
index 08fe9f2..b1c450b 100644
--- a/expansions/get_iq/insc.py
+++ b/expansions/get_iq/insc.py
@@ -10,7 +10,7 @@ if DefLANG in ("RU", "UA"):
 		"«%s» - сейчас нет в чате.", # 5
 		"Нет ответа.", # 6
 		"Время работы «%s» - %s.", # 7
-		"Послеедняя активность «%s» - %s назад.", # 8
+		"Последняя активность «%s» - %s назад.", # 8
 		"Нет cовпадений.", # 9
 		"Вкард не заполнен.", # 10
 		"\n\n** Всего %d пунктов." # 11