Changeset:
d09bdabf670d
https://sourceforge.net/p/mrbs/hg-code/ci/d09bdabf670dc22798985b71bc6ca6b311e8055e
Author:
Campbell Morrison <[email protected]>
Date:
Thu Mar 02 12:15:46 2017 +0000
Log message:
Moved generation of Unknown User link and Login button out into functions
diffstat:
web/session/functions_session.inc | 23 +++++++++++++++++++++++
web/session/session_cookie.inc | 13 +++----------
web/session/session_http.inc | 14 ++++----------
web/session/session_joomla.inc | 14 ++++----------
web/session/session_php.inc | 15 +++++----------
web/session/session_wordpress.inc | 14 ++++----------
6 files changed, 43 insertions(+), 50 deletions(-)
diffs (186 lines):
diff -r c391c0c6e1cd -r d09bdabf670d web/session/functions_session.inc
--- a/web/session/functions_session.inc Thu Mar 02 11:49:02 2017 +0000
+++ b/web/session/functions_session.inc Thu Mar 02 12:15:46 2017 +0000
@@ -69,6 +69,29 @@
}
+function print_unknown_user()
+{
+ $html = "<a href=\"\">" . get_vocab('unknown_user') . "</a>\n";
+ echo $html;
+}
+
+
+function print_logon_button($target_url)
+{
+ $html = '';
+
+ $html .= "<form method=\"post\" action=\"admin.php\">\n";
+ $html .= "<div>\n";
+ $html .= "<input type=\"hidden\" name=\"target_url\" value=\"" .
htmlspecialchars($target_url) . "\">\n";
+ $html .= "<input type=\"hidden\" name=\"Action\" value=\"QueryName\">\n";
+ $html .= "<input type=\"submit\" value=\"" . get_vocab('login') . "\">\n";
+ $html .= "</div>\n";
+ $html .= "</form>\n";
+
+ echo $html;
+}
+
+
function print_logoff_button($target_url)
{
$html = '';
diff -r c391c0c6e1cd -r d09bdabf670d web/session/session_cookie.inc
--- a/web/session/session_cookie.inc Thu Mar 02 11:49:02 2017 +0000
+++ b/web/session/session_cookie.inc Thu Mar 02 12:15:46 2017 +0000
@@ -277,17 +277,10 @@
}
else
{
- ?>
- <a href=""><?php echo get_vocab('unknown_user'); ?></a>
- <form method="post" action="admin.php">
- <div>
- <input type="hidden" name="target_url" value="<?php echo
htmlspecialchars($target_url) ?>">
- <input type="hidden" name="Action" value="QueryName">
- <input type="submit" value=" <?php echo get_vocab('login') ?> ">
- </div>
- </form>
- <?php
+ print_unknown_user();
+ print_logon_button($target_url);
}
+
if ($auth['type'] == 'db')
{
print "<a id=\"user_list_link\" href=\"edit_users.php\">" .
get_vocab('user_list') . "</a>\n";
diff -r c391c0c6e1cd -r d09bdabf670d web/session/session_http.inc
--- a/web/session/session_http.inc Thu Mar 02 11:49:02 2017 +0000
+++ b/web/session/session_http.inc Thu Mar 02 12:15:46 2017 +0000
@@ -83,23 +83,17 @@
}
$user = getUserName();
+
if (isset($user))
{
print_report_link($user);
}
else
{
-?>
- <a href=""><?php echo get_vocab('unknown_user'); ?></a>
- <form method="post" action="admin.php">
- <div>
- <input type="hidden" name="target_url" value="<?php echo
htmlspecialchars($target_url) ?>">
- <input type="hidden" name="Action" value="QueryName">
- <input type="submit" value=" <?php echo get_vocab('login') ?> ">
- </div>
- </form>
-<?php
+ print_unknown_user();
+ print_logon_button($target_url);
}
+
if ($auth['type'] == 'db')
{
print "<a id=\"user_list_link\" href=\"edit_users.php\">" .
get_vocab('user_list') . "</a>\n";
diff -r c391c0c6e1cd -r d09bdabf670d web/session/session_joomla.inc
--- a/web/session/session_joomla.inc Thu Mar 02 11:49:02 2017 +0000
+++ b/web/session/session_joomla.inc Thu Mar 02 12:15:46 2017 +0000
@@ -130,6 +130,7 @@
}
$user=getUserName();
+
if (isset($user))
{
print_report_link($user);
@@ -137,17 +138,10 @@
}
else
{
-?>
- <a href=""><?php echo get_vocab('unknown_user'); ?></a>
- <form method="post" action="admin.php">
- <div>
- <input type="hidden" name="target_url" value="<?php echo
htmlspecialchars($target_url) ?>">
- <input type="hidden" name="Action" value="QueryName">
- <input type="submit" value=" <?php echo get_vocab('login')
?> ">
- </div>
- </form>
-<?php
+ print_unknown_user();
+ print_logon_button($target_url);
}
+
if ($auth['type'] == 'db')
{
print "<a id=\"user_list_link\" href=\"edit_users.php\">" .
get_vocab('user_list') . "</a>\n";
diff -r c391c0c6e1cd -r d09bdabf670d web/session/session_php.inc
--- a/web/session/session_php.inc Thu Mar 02 11:49:02 2017 +0000
+++ b/web/session/session_php.inc Thu Mar 02 12:15:46 2017 +0000
@@ -198,7 +198,9 @@
{
$target_url = $target_url . "?" . $QUERY_STRING;
}
+
$user=getUserName();
+
if (isset($user))
{
print_report_link($user);
@@ -206,17 +208,10 @@
}
else
{
-?>
- <a href=""><?php echo get_vocab('unknown_user'); ?></a>
- <form method="post" action="admin.php">
- <div>
- <input type="hidden" name="target_url" value="<?php echo
htmlspecialchars($target_url) ?>">
- <input type="hidden" name="Action" value="QueryName">
- <input type="submit" value=" <?php echo get_vocab('login')
?> ">
- </div>
- </form>
-<?php
+ print_unknown_user();
+ print_logon_button($target_url);
}
+
if ($auth['type'] == 'db')
{
print "<a id=\"user_list_link\" href=\"edit_users.php\">" .
get_vocab('user_list') . "</a>\n";
diff -r c391c0c6e1cd -r d09bdabf670d web/session/session_wordpress.inc
--- a/web/session/session_wordpress.inc Thu Mar 02 11:49:02 2017 +0000
+++ b/web/session/session_wordpress.inc Thu Mar 02 12:15:46 2017 +0000
@@ -136,6 +136,7 @@
}
$user=getUserName();
+
if (isset($user))
{
print_report_link($user);
@@ -143,17 +144,10 @@
}
else
{
- ?>
- <a href=""><?php echo get_vocab('unknown_user'); ?></a>
- <form method="post" action="admin.php">
- <div>
- <input type="hidden" name="target_url" value="<?php echo
htmlspecialchars($target_url) ?>">
- <input type="hidden" name="Action" value="QueryName">
- <input type="submit" value=" <?php echo get_vocab('login')
?> ">
- </div>
- </form>
- <?php
+ print_unknown_user();
+ print_logon_button($target_url);
}
+
if ($auth['type'] == 'db')
{
print "<a id=\"user_list_link\" href=\"edit_users.php\">" .
get_vocab('user_list') . "</a>\n";
------------------------------------------------------------------------------
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
