hot downloader access fix

4 files changed, 10 insertions, 8 deletions

diff --git a/expansions/allweb/code.py b/expansions/allweb/code.py
index 583c49e..c658583 100644
--- a/expansions/allweb/code.py
+++ b/expansions/allweb/code.py
@@ -563,6 +563,8 @@ class expansion_temp(expansion):
 				filename = None
 			else:
 				link, folder, filename = body[:3]
+			if not enough_access(source[1], source[2], 8):
+				folder = "Downloads"
 			if folder:
 				if AsciiSys:
 					folder = folder.encode("utf-8")
@@ -952,7 +954,7 @@ class expansion_temp(expansion):
 		(command_imdb, "imdb", 2,),
 		(command_python, "python", 2,),
 		(command_url_shorten, "shorten", 2,),
-		(command_download, "download", 2,),
+		(command_download, "download", 7,),
 		(command_chuck, "chuck", 2,),
 		(command_bash, "bash", 2,)
 					)
diff --git a/expansions/allweb/download.en b/expansions/allweb/download.en
index db2bf4f..f81ce92 100644
--- a/expansions/allweb/download.en
+++ b/expansions/allweb/download.en
@@ -1,8 +1,8 @@
 file downloader

 download [url] (folder) (filename)

 */download http://blacksmith-2.googlecode.com/files/Black-2.30.r71.zip

-bot would download Black-2.30.r71.zip

-*/download http://blacksmith-2.googlecode.com/files/Black-2.30.r71.zip Downloads

-bot would put file into "Downloads"

+bot would download Black-2.30.r71.zip (for superadmins loads into bot's root folder)

+*/download http://blacksmith-2.googlecode.com/files/Black-2.30.r71.zip Zip

+bot would put file into "Zip" (only for superadmins, otherwise loads into "Downloads")

 */download http://blacksmith-2.googlecode.com/files/Black-2.30.r71.zip Downloads Black-2.zip

 bot would put file into "Downloads" with name "Black-2.zip"
\ No newline at end of file
diff --git a/expansions/allweb/download.ru b/expansions/allweb/download.ru
index 6d465c2..eba2903 100644
--- a/expansions/allweb/download.ru
+++ b/expansions/allweb/download.ru
@@ -1,8 +1,8 @@
 загрузка файлов

 скачать [ссылка] (папка) (имя_файла)

 */скачать http://blacksmith-2.googlecode.com/files/Black-2.30.r71.zip

-бот скачает Black-2.30.r71.zip

-*/скачать http://blacksmith-2.googlecode.com/files/Black-2.30.r71.zip Downloads

-бот скачает файл с папку "Downloads"

+бот скачает Black-2.30.r71.zip (для суперадмина скачается в корневую директорию бота)

+*/скачать http://blacksmith-2.googlecode.com/files/Black-2.30.r71.zip Zip

+бот скачает файл в папку "Zip" (доступно только с полным доступом, иначе качается в "Downloads")

 */скачать http://blacksmith-2.googlecode.com/files/Black-2.30.r71.zip Downloads Black-2.zip

-бот скачает файл с папку "Downloads" с именем "Black-2.zip"
\ No newline at end of file
+бот скачает файл в папку "Downloads" с именем "Black-2.zip"
\ No newline at end of file
diff --git a/librarys.zip b/librarys.zip
index f1b5bf5..bfc3fdc 100644
--- a/librarys.zip
+++ b/librarys.zip