Changeset:
d9f9c8993ad4
https://sourceforge.net/p/mrbs/hg-code/ci/d9f9c8993ad4741a23c4ff81e424bcca7dc9a966
Author:
Campbell Morrison <[email protected]>
Date:
Sun Feb 26 17:07:00 2017 +0000
Log message:
Moved and renamed functions_logon.inc
diffstat:
web/functions_logon.inc | 58 ---------------------------------------
web/session/functions_session.inc | 58 +++++++++++++++++++++++++++++++++++++++
web/session/session_cookie.inc | 2 +-
web/session/session_joomla.inc | 2 +-
web/session/session_php.inc | 2 +-
web/session/session_wordpress.inc | 1 +
6 files changed, 62 insertions(+), 61 deletions(-)
diffs (171 lines):
diff -r e946da8db624 -r d9f9c8993ad4 web/functions_logon.inc
--- a/web/functions_logon.inc Sun Feb 26 11:18:54 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-<?php
-namespace MRBS;
-
-/*
- Display the login form.
- Will eventually return to $target_url with query string returl=$returl
-*/
-function printLoginForm($action, $target_url, $returl)
-{
- $html = '';
-
- $html .= "<form class=\"form_general\" id=\"logon\" method=\"post\"".
- " action=\"" . htmlspecialchars($action) . "\">\n";
- $html .= "<fieldset>\n";
- $html .= "<legend>" . get_vocab("please_login") . "</legend>\n";
-
- $html .= "<div>\n";
-
- if (function_exists(__NAMESPACE__ . "\\canValidateByEmail")
- && canValidateByEmail())
- {
- $placeholder = get_vocab("username_or_email");
- }
- else
- {
- $placeholder = get_vocab("users.name");
- }
-
- $html .= "<label for=\"NewUserName\" title=\"$placeholder\">" .
- get_vocab("user") . ":</label>\n";
- $html .= "<input type=\"text\" id=\"NewUserName\" name=\"NewUserName\" " .
- " placeholder=\"$placeholder\">\n";
- $html .= "</div>\n";
-
- $html .= "<div>\n";
- $html .= "<label for=\"NewUserPassword\">" . get_vocab("users.password") .
":</label>\n";
- $html .= "<input type=\"password\" id=\"NewUserPassword\"
name=\"NewUserPassword\">\n";
- $html .= "</div>\n";
-
-
- $html .= "<input type=\"hidden\" name=\"returl\" value=\"" .
htmlspecialchars($returl) . "\">\n";
- $html .= "<input type=\"hidden\" name=\"target_url\" value=\"" .
htmlspecialchars($target_url) . "\">\n";
- $html .= "<input type=\"hidden\" name=\"Action\" value=\"SetName\">\n";
-
- $html .= "<div id=\"logon_submit\">\n";
- $html .= "<input class=\"submit\" type=\"submit\" value=\"" .
get_vocab('login') . "\">\n";
- $html .= "</div>\n";
-
- $html .= "</fieldset>\n";
- $html .= "</form>\n";
-
- $html .= "</div>"; // Close of the contents div
-
- echo $html;
-
- // Print footer and exit
- print_footer(TRUE);
-}
diff -r e946da8db624 -r d9f9c8993ad4 web/session/functions_session.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web/session/functions_session.inc Sun Feb 26 17:07:00 2017 +0000
@@ -0,0 +1,58 @@
+<?php
+namespace MRBS;
+
+/*
+ Display the login form.
+ Will eventually return to $target_url with query string returl=$returl
+*/
+function printLoginForm($action, $target_url, $returl)
+{
+ $html = '';
+
+ $html .= "<form class=\"form_general\" id=\"logon\" method=\"post\"".
+ " action=\"" . htmlspecialchars($action) . "\">\n";
+ $html .= "<fieldset>\n";
+ $html .= "<legend>" . get_vocab("please_login") . "</legend>\n";
+
+ $html .= "<div>\n";
+
+ if (function_exists(__NAMESPACE__ . "\\canValidateByEmail")
+ && canValidateByEmail())
+ {
+ $placeholder = get_vocab("username_or_email");
+ }
+ else
+ {
+ $placeholder = get_vocab("users.name");
+ }
+
+ $html .= "<label for=\"NewUserName\" title=\"$placeholder\">" .
+ get_vocab("user") . ":</label>\n";
+ $html .= "<input type=\"text\" id=\"NewUserName\" name=\"NewUserName\" " .
+ " placeholder=\"$placeholder\">\n";
+ $html .= "</div>\n";
+
+ $html .= "<div>\n";
+ $html .= "<label for=\"NewUserPassword\">" . get_vocab("users.password") .
":</label>\n";
+ $html .= "<input type=\"password\" id=\"NewUserPassword\"
name=\"NewUserPassword\">\n";
+ $html .= "</div>\n";
+
+
+ $html .= "<input type=\"hidden\" name=\"returl\" value=\"" .
htmlspecialchars($returl) . "\">\n";
+ $html .= "<input type=\"hidden\" name=\"target_url\" value=\"" .
htmlspecialchars($target_url) . "\">\n";
+ $html .= "<input type=\"hidden\" name=\"Action\" value=\"SetName\">\n";
+
+ $html .= "<div id=\"logon_submit\">\n";
+ $html .= "<input class=\"submit\" type=\"submit\" value=\"" .
get_vocab('login') . "\">\n";
+ $html .= "</div>\n";
+
+ $html .= "</fieldset>\n";
+ $html .= "</form>\n";
+
+ $html .= "</div>"; // Close of the contents div
+
+ echo $html;
+
+ // Print footer and exit
+ print_footer(TRUE);
+}
diff -r e946da8db624 -r d9f9c8993ad4 web/session/session_cookie.inc
--- a/web/session/session_cookie.inc Sun Feb 26 11:18:54 2017 +0000
+++ b/web/session/session_cookie.inc Sun Feb 26 17:07:00 2017 +0000
@@ -16,7 +16,7 @@
* *
\*****************************************************************************/
-require_once MRBS_ROOT . '/functions_logon.inc';
+require_once MRBS_ROOT . '/session/functions_session.inc';
global $PHP_SELF, $HTTP_REFERER;
global $auth;
diff -r e946da8db624 -r d9f9c8993ad4 web/session/session_joomla.inc
--- a/web/session/session_joomla.inc Sun Feb 26 11:18:54 2017 +0000
+++ b/web/session/session_joomla.inc Sun Feb 26 17:07:00 2017 +0000
@@ -2,7 +2,7 @@
namespace MRBS;
require_once MRBS_ROOT . '/auth/cms/joomla.inc';
-require_once MRBS_ROOT . '/functions_logon.inc';
+require_once MRBS_ROOT . '/session/functions_session.inc';
$mainframe = JFactory::getApplication('site');
$mainframe->initialise();
diff -r e946da8db624 -r d9f9c8993ad4 web/session/session_php.inc
--- a/web/session/session_php.inc Sun Feb 26 11:18:54 2017 +0000
+++ b/web/session/session_php.inc Sun Feb 26 17:07:00 2017 +0000
@@ -13,7 +13,7 @@
* *
\*****************************************************************************/
-require_once MRBS_ROOT . '/functions_logon.inc';
+require_once MRBS_ROOT . '/session/functions_session.inc';
global $PHP_SELF, $HTTP_REFERER;
global $auth;
diff -r e946da8db624 -r d9f9c8993ad4 web/session/session_wordpress.inc
--- a/web/session/session_wordpress.inc Sun Feb 26 11:18:54 2017 +0000
+++ b/web/session/session_wordpress.inc Sun Feb 26 17:07:00 2017 +0000
@@ -2,6 +2,7 @@
namespace MRBS;
require_once MRBS_ROOT . '/auth/cms/wordpress.inc';
+require_once MRBS_ROOT . '/session/functions_session.inc';
// Get non-standard form variables
$Action = get_form_var('Action', 'string');
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
