From 218096a5c4c95e52ce9a6f51f74517b99b296795 Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Mon, 26 Sep 2011 17:32:52 -0400
Subject: [PATCH] moved source passwords into config

---
 app/logical/sources/strategies/pixiv.rb  |  4 ++--
 app/logical/sources/strategies/tinami.rb |  4 ++--
 config/danbooru_default_config.rb        | 16 ++++++++++++++++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/logical/sources/strategies/pixiv.rb b/app/logical/sources/strategies/pixiv.rb
index 78aa51b27..4abc22c55 100644
--- a/app/logical/sources/strategies/pixiv.rb
+++ b/app/logical/sources/strategies/pixiv.rb
@@ -88,8 +88,8 @@ module Sources
           mech.get("http://www.pixiv.net") do |page|
             page.form_with(:action => "/login.php") do |form|
               form['mode'] = "login"
-              form['login_pixiv_id'] = "uroobnad"
-              form['pass'] = "uroobnad556"
+              form['login_pixiv_id'] = Danbooru.config.pixiv_login
+              form['pass'] = Danbooru.config.pixiv_password
             end.click_button
           end
 
diff --git a/app/logical/sources/strategies/tinami.rb b/app/logical/sources/strategies/tinami.rb
index 90dc86056..9c8aa8efa 100644
--- a/app/logical/sources/strategies/tinami.rb
+++ b/app/logical/sources/strategies/tinami.rb
@@ -74,8 +74,8 @@ module Sources
           mech.get("http://www.tinami.com/login") do |page|
             page.form_with do |form|
               form["action_login"] = "true"
-              form['username'] = "r888888888@gmail.com"
-              form['password'] = "uroobnad556"
+              form['username'] = Danbooru.config.tinami_login
+              form['password'] = Danbooru.config.tinami_password
               form["rem"] = "1"
             end.click_button
           end
diff --git a/config/danbooru_default_config.rb b/config/danbooru_default_config.rb
index fdf64575b..5c8818f21 100644
--- a/config/danbooru_default_config.rb
+++ b/config/danbooru_default_config.rb
@@ -234,5 +234,21 @@ module Danbooru
     def select_posts_visible_to_user(user, posts)
       posts.select {|x| can_user_see_post?(x)}
     end
+    
+    def pixiv_login
+      nil
+    end
+    
+    def pixiv_password
+      nil
+    end
+    
+    def tinami_login
+      nil
+    end
+    
+    def tinami_password
+      nil
+    end
   end
 end