0e8d4998ed35 — Bill Welliver 2 years ago
static -> protected
M classes/account_controller.pike +1 -1
@@ 2,7 2,7 @@ inherit Fins.DocController;
 
 int __quiet = 1;
 
-static void start()
+protected void start()
 {
   around_filter(app->mandatory_user_filter);
 }

          
M classes/admin_controller.pike +1 -1
@@ 12,7 12,7 @@ object list = Fins.DataSource._default.f
  if(!app->is_list_owner(list, id->misc->session_variables->user)) \
  {response->set_data("You must be an owner of a list in order to access this function."); return;  }
 
-static void start()
+protected void start()
 {
   around_filter(app->mandatory_user_filter);
 }

          
M classes/auth/controller.pike +9 -9
@@ 48,7 48,7 @@ void start()
 
 //! default user authenticator, for data models where a user object represents 
 //! a user and the password is saved as a plain text string. 
-static mixed default_validate_user(Request id, Response response, Template.View t) 
+protected mixed default_validate_user(Request id, Response response, Template.View t) 
 { 
   mixed r = Fins.Model.find.subscribers( ([ "email": id->variables->username,
                                       "password": id->variables->password

          
@@ 63,7 63,7 @@ static mixed default_validate_user(Reque
 
 //! default user authenticator, for data models where a user object represents
 //! a user and the password field contains a MD5 crypt string.
-static mixed md5_validate_user(Request id, Response response, Template.View t)
+protected mixed md5_validate_user(Request id, Response response, Template.View t)
 {
   mixed r = Fins.Model.find.subscribers( ([ "email": id->variables->username,
                                     ]) );

          
@@ 89,7 89,7 @@ string password_template_name = "auth/se
 //!  this method receives a password which the user has typed twice (in order
 //!  to prevent typos. This method should perform other QA checks if necessary
 //!  (such as password complexity and aging tests).
-static mixed default_reset_password(Request id, Response response, Template.View t, mixed user, string newpassword)
+protected mixed default_reset_password(Request id, Response response, Template.View t, mixed user, string newpassword)
 {
   user["password"] = newpassword;
   return 1;

          
@@ 107,7 107,7 @@ static mixed default_reset_password(Requ
 //! @note
 //!  this method requires a field length longer than the maximum acceptable
 //!  password length. 
-static mixed md5_reset_password(Request id, Response response, Template.View t, mixed user, string newpassword)
+protected mixed md5_reset_password(Request id, Response response, Template.View t, mixed user, string newpassword)
 {
   user["password"] = Crypto.make_crypt_md5(newpassword);
   return 1;

          
@@ 115,7 115,7 @@ static mixed md5_reset_password(Request 
 
 //! default user password locator
 //! 
-static mixed default_find_user_password(Request id, Response response, Template.View t)
+protected mixed default_find_user_password(Request id, Response response, Template.View t)
 {
 
   mixed r = Fins.Model.find.subscribers( ([ "email": id->variables->username

          
@@ 131,7 131,7 @@ static mixed default_find_user_password(
 //! 
 //! @note
 //!  this method will reset the password of the user, as the original password isn't available.
-static mixed md5_find_user_password(Request id, Response response, Template.View t)
+protected mixed md5_find_user_password(Request id, Response response, Template.View t)
 {
 
   mixed r = Fins.Model.find.subscribers( ([ "email": id->variables->username

          
@@ 147,19 147,19 @@ static mixed md5_find_user_password(Requ
  return (["email": r[0]["email"], "password": newpass]);
 }
 
-static string generate_password()
+protected string generate_password()
 {
   return "";
 }
 
 //! override this method to set the mail host for retrieved password emails.
-static string get_mail_host()
+protected string get_mail_host()
 {
   return gethostname();
 }
 
 //! override this method to set the return address for retrieved password emails.
-static string get_return_address()
+protected string get_return_address()
 {
   return "password-retrieval@" + gethostname();
 }

          
M classes/list_controller.pike +1 -1
@@ 1,6 1,6 @@ 
 inherit Fins.DocController;
 
-static void start()
+protected void start()
 {
   around_filter(app->user_filter);
 }

          
M classes/mylists_controller.pike +1 -1
@@ 2,7 2,7 @@ inherit Fins.DocController;
 
 int __quiet = 1;
 
-static void start()
+protected void start()
 {
   around_filter(app->mandatory_user_filter);
 }

          
M classes/newlist_controller.pike +1 -1
@@ 7,7 7,7 @@ int __quiet=1;
  if(!app->is_list_master(id->misc->session_variables->user)) \
  {response->set_data("You must be a list master in order to access this function."); return;  }}
 
-static void start()
+protected void start()
 {
   around_filter(app->mandatory_user_filter);
 }

          
M classes/plugin_controller.pike +1 -1
@@ 12,7 12,7 @@ int __quiet=1;
 if(!app->is_list_master(id->misc->session_variables->user)) \
 {response->set_data("You must be an admin user in order to access this function."); return;  }
 
-static void start()
+protected void start()
 {
   around_filter(app->mandatory_user_filter);
 }

          
M classes/preference_controller.pike +1 -1
@@ 15,7 15,7 @@ protected string vtype = "";
 
 int __quiet=1;
 
-static void start()
+protected void start()
 {
   around_filter(app->mandatory_user_filter);
 }

          
M classes/rpc.pike +1 -1
@@ 59,7 59,7 @@ int send_message(object request, string 
   return 1;
 }
 
-static int send_message_as_mime(string campaign_id, string sender, object mime, mapping options)
+protected int send_message_as_mime(string campaign_id, string sender, object mime, mapping options)
 {
   object rq = SpeedyDelivery.Request(app, mime, sender, campaign_id + "@" + app->getmyhostname());
   app->distribute_message(rq);

          
M modules/FullText.pmod/RemoteError.pike +1 -1
@@ 4,7 4,7 @@ constant __is_xmlrpc_remote_error = 1;
 
 Protocols.XMLRPC.Fault fault;
 
-static void create(Protocols.XMLRPC.Fault e)
+protected void create(Protocols.XMLRPC.Fault e)
 {
   fault = e;
   ::create("Remote Error: " + e->fault_string);

          
M modules/FullText.pmod/UpdateClient.pike +1 -1
@@ 3,7 3,7 @@ inherit .BaseClient;
 string type="update";
 
 //!
-static void create(string|void index_url, string|void index_name, string auth, int|void create_if_new)
+protected void create(string|void index_url, string|void index_name, string auth, int|void create_if_new)
 {
   ::create(index_url, index_name, auth);
   int e = exists(name);

          
M modules/Mail.pmod/MailAddress.pike +1 -1
@@ 8,7 8,7 @@ constant STATE_HAVE_HOST = 8;
 constant STATE_IN_ADDRESS = 16;
 
 
-static void create(string address)
+protected void create(string address)
 {
   array x = MIME.decode_words_tokenized_remapped(address);
 

          
M modules/Mail.pmod/RobustMIMEMessage.pike +1 -1
@@ 2,7 2,7 @@ inherit MIME.Message;
 
 string body;
 
-static void create(string c, int|void msgid)
+protected void create(string c, int|void msgid)
 {
   ::create(c);
   body = SpeedyDelivery.getfullbodymimetext(this, 0, 0, msgid);

          
M modules/SpeedyDelivery.pmod/Request.pike +1 -1
@@ 12,7 12,7 @@ string functionname;
 mixed parse_failure;
 int(0..1) lenient_parsing;
 
-static void create(Fins.Application _app, object _mime, string _sender, string _recipient,
+protected void create(Fins.Application _app, object _mime, string _sender, string _recipient,
                      void|string _raw, object|void _smtp)
 {
   fins_app = _app;