From 0640392c38fbe9b84ff9d66cb1ac1a54189c325c Mon Sep 17 00:00:00 2001
From: dhruvhacks <sridhruv@yahoo.com>
Date: Mon, 2 Oct 2017 22:15:23 +0530
Subject: [PATCH 1/4] Fixed #1460

---
 evennia/commands/default/admin.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/evennia/commands/default/admin.py b/evennia/commands/default/admin.py
index 9aff9a396..bd6e55ada 100644
--- a/evennia/commands/default/admin.py
+++ b/evennia/commands/default/admin.py
@@ -525,13 +525,13 @@ class CmdPerm(COMMAND_DEFAULT_CLASS):
                     return
 
                 if perm in permissions:
-                    caller_result.append("\nPermission '%s' is already defined on %s." % (rhs, obj.name))
+                    caller_result.append("\nPermission '%s' is already defined on %s." % (perm, obj.name))
                 else:
                     obj.permissions.add(perm)
                     plystring = "the Account" if accountmode else "the Object/Character"
-                    caller_result.append("\nPermission '%s' given to %s (%s)." % (rhs, obj.name, plystring))
+                    caller_result.append("\nPermission '%s' given to %s (%s)." % (perm, obj.name, plystring))
                     target_result.append("\n%s gives you (%s, %s) the permission '%s'."
-                                         % (caller.name, obj.name, plystring, rhs))
+                                         % (caller.name, obj.name, plystring, perm))
         caller.msg("".join(caller_result).strip())
         if target_result:
             obj.msg("".join(target_result).strip())

From b51c94e65cb64f2d2392f5eff802e24d0ffc7b15 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Mon, 2 Oct 2017 23:45:07 +0200
Subject: [PATCH 2/4] Move noidletimeout default lock setting to the right
 place

---
 evennia/accounts/accounts.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/evennia/accounts/accounts.py b/evennia/accounts/accounts.py
index a45e51d72..43dfe7179 100644
--- a/evennia/accounts/accounts.py
+++ b/evennia/accounts/accounts.py
@@ -566,7 +566,8 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
         """
         # A basic security setup
         lockstring = "examine:perm(Admin);edit:perm(Admin);" \
-                     "delete:perm(Admin);boot:perm(Admin);msg:all()"
+                     "delete:perm(Admin);boot:perm(Admin);msg:all();" \
+                     "noidletimeout:perm(Builder) or perm(noidletimeout)"
         self.locks.add(lockstring)
 
         # The ooc account cmdset
@@ -582,8 +583,7 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
         """
         # set an (empty) attribute holding the characters this account has
         lockstring = "attrread:perm(Admins);attredit:perm(Admins);" \
-                     "attrcreate:perm(Admins);" \
-                     "noidletimeout:perm(Builder) or perm(noidletimeout)"
+                     "attrcreate:perm(Admins);"
         self.attributes.add("_playable_characters", [], lockstring=lockstring)
         self.attributes.add("_saved_protocol_flags", {}, lockstring=lockstring)
 

From 3a6fe2acae64cc3b95f7a21836a54f4bc88ffedc Mon Sep 17 00:00:00 2001
From: Nicholas Matlaga <nmatlaga@outlawtack.com>
Date: Mon, 2 Oct 2017 18:06:23 -0400
Subject: [PATCH 3/4] rename card-block to card-body

---
 .../web/website/templates/website/registration/logged_out.html  | 2 +-
 evennia/web/website/templates/website/registration/login.html   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/evennia/web/website/templates/website/registration/logged_out.html b/evennia/web/website/templates/website/registration/logged_out.html
index ec931cd42..0ee9cdcfe 100644
--- a/evennia/web/website/templates/website/registration/logged_out.html
+++ b/evennia/web/website/templates/website/registration/logged_out.html
@@ -10,7 +10,7 @@
 <div class="row">
   <div class="col">
     <div class="card">
-      <div class="card-block">
+      <div class="card-body">
         <h1 class="card-title">Logged Out</h1>
         <p>You have been logged out.</p>
         <p>Redirecting in 2 seconds...</p>
diff --git a/evennia/web/website/templates/website/registration/login.html b/evennia/web/website/templates/website/registration/login.html
index aad1c30fe..8b2213a25 100644
--- a/evennia/web/website/templates/website/registration/login.html
+++ b/evennia/web/website/templates/website/registration/login.html
@@ -11,7 +11,7 @@ Login
 <div class="row">
   <div class="col">
     <div class="card">
-      <div class="card-block">
+      <div class="card-body">
         <h1 class="card-title">Login</h1>
         <hr />
         {% if user.is_authenticated %}

From 75ad8d843db7fba685f7c62fed00b6666e63faaa Mon Sep 17 00:00:00 2001
From: amfl <amfl@none.none>
Date: Tue, 3 Oct 2017 19:38:25 +1300
Subject: [PATCH 4/4] Pass at_before_say the corrent number of arguments

---
 evennia/contrib/rpsystem.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/contrib/rpsystem.py b/evennia/contrib/rpsystem.py
index ed74e2286..a396a18ab 100644
--- a/evennia/contrib/rpsystem.py
+++ b/evennia/contrib/rpsystem.py
@@ -858,7 +858,7 @@ class CmdSay(RPCommand):  # replaces standard say
             return
 
         # calling the speech hook on the location
-        speech = caller.location.at_before_say(caller, self.args)
+        speech = caller.location.at_before_say(self.args)
         # preparing the speech with sdesc/speech parsing.
         speech = "/me says, \"{speech}\"".format(speech=speech)
         targets = self.caller.location.contents