// Include more admins data?
if (GET_EXT_VERSION("admins") >= "0.7.0") {
// Load them here
- $data['login_failtures'] = $cacheArray['admins']['login_failtures'][$aid];
- $data['last_failture'] = $cacheArray['admins']['last_failture'][$aid];
+ $data['login_failures'] = $cacheArray['admins']['login_failures'][$aid];
+ $data['last_failure'] = $cacheArray['admins']['last_failure'][$aid];
} // END - if
} elseif (!EXT_IS_ACTIVE("cache")) {
// Add extra data via filter now
$data['password'] = generateHash($password);
// Do we have 0.7.0 of admins or later?
- // Remmeber login failtures if available
- if (GET_EXT_VERSION("admins") >= "0.7.0") {
+ // Remmeber login failures if available
+ if (GET_EXT_VERSION("admins") >= "0.7.2") {
// Store it in session
- set_session('mxchange_admin_failtures', $data['login_failtures']);
- set_session('mxchange_admin_last_fail', $data['last_failture']);
+ set_session('mxchange_admin_failures', $data['login_failures']);
+ set_session('mxchange_admin_last_fail', $data['last_failure']);
- // Update password and reset login failtures
- SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET password='%s',login_failtures=0,last_failture='0000-00-00 00:00:00' WHERE id=%s LIMIT 1",
+ // Update password and reset login failures
+ SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET password='%s',login_failures=0,last_failure='0000-00-00 00:00:00' WHERE id=%s LIMIT 1",
array($data['password'], $aid), __FILE__, __LINE__);
} else {
// Update password
} // END - if
}
- // Count login failture if admins extension version is 0.7.0+
+ // Count login failure if admins extension version is 0.7.0+
if (($ret == "pass") && (GET_EXT_VERSION("admins") >= "0.7.0")) {
// Update counter
- SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET login_failtures=login_failtures+1,last_failture=NOW() WHERE id=%s LIMIT 1",
+ SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET login_failures=login_failures+1,last_failure=NOW() WHERE id=%s LIMIT 1",
array($aid), __FILE__, __LINE__);
// Rebuild cache
function LOGIN_ADMIN ($adminLogin, $passHash) {
global $cacheInstance;
- // Reset failture counter on matching admins version
+ // Reset failure counter on matching admins version
if ((GET_EXT_VERSION("admins") >= "0.7.0") && ((EXT_VERSION_IS_OLDER("sql_patches", "0.3.6")) || (GET_EXT_VERSION("sql_patches") == ""))) {
// Reset counter on out-dated sql_patches version
- SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET login_failtures=0,last_failture='0000-00-00 00:00:00' WHERE login='%s' LIMIT 1",
+ SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET login_failures=0,last_failure='0000-00-00 00:00:00' WHERE login='%s' LIMIT 1",
array($adminLogin), __FILE__, __LINE__);
// Rebuild cache
$tmp = $file.".tmp";
// Open the source file
- $fp = @fopen($file, 'r') or OUTPUT_HTML("<STRONG>READ:</STRONG> ".$file."<br />");
+ $fp = @fopen($file, 'r') or OUTPUT_HTML("<strong>READ:</strong> ".$file."<br />");
// Is the resource valid?
if (is_resource($fp)) {
// Open temporary file
- $fp_tmp = @fopen($tmp, 'w') or OUTPUT_HTML("<STRONG>WRITE:</STRONG> ".$tmp."<br />");
+ $fp_tmp = @fopen($tmp, 'w') or OUTPUT_HTML("<strong>WRITE:</strong> ".$tmp."<br />");
// Is the resource again valid?
if (is_resource($fp_tmp)) {
@unlink($tmp);
define('_FATAL', false);
} elseif (!$found) {
- OUTPUT_HTML("<STRONG>CHANGE:</STRONG> 404!");
+ OUTPUT_HTML("<strong>CHANGE:</strong> 404!");
define('_FATAL', true);
} else {
- OUTPUT_HTML("<STRONG>TMP:</STRONG> UNDONE!");
+ OUTPUT_HTML("<strong>TMP:</strong> UNDONE!");
define('_FATAL', true);
}
}
} else {
// File not found, not readable or writeable
- OUTPUT_HTML("<STRONG>404:</STRONG> ".$file."<br />");
+ OUTPUT_HTML("<strong>404:</strong> ".$file."<br />");
}
}
$INC = sprintf("%sinc/modules/admin/action-%s.php", PATH, $act);
if ((FILE_READABLE($INC)) && (VALIDATE_MENU_ACTION("admin", $act, $wht)) && (__ACL_ALLOW == true)) {
// Ok, we finally load the admin action module
- include($INC);
+ require($INC);
} elseif (__ACL_ALLOW == false) {
// Access denied
LOAD_TEMPLATE("admin_menu_failed", false, ADMIN_ACCESS_DENIED);
- ADD_FATAL(ADMIN_ACCESS_DENIED);
+ addFatalMessage(ADMIN_ACCESS_DENIED);
} else {
// Include file not found! :-(
LOAD_TEMPLATE("admin_menu_failed", false, ADMIN_404_ACTION);
- ADD_FATAL(ADMIN_404_ACTION_1.$act.ADMIN_404_ACTION_2);
+ addFatalMessage(ADMIN_404_ACTION_1.$act.ADMIN_404_ACTION_2);
}
} else {
// Invalid action/what pair found!
LOAD_TEMPLATE("admin_menu_failed", false, ADMIN_INVALID_ACTION);
- ADD_FATAL(ADMIN_INVALID_ACTION_1.$act."/".$wht.ADMIN_INVALID_ACTION_2);
+ addFatalMessage(ADMIN_INVALID_ACTION_1.$act."/".$wht.ADMIN_INVALID_ACTION_2);
}
// Free memory
$result_main = SQL_QUERY("SELECT action, title, descr FROM `"._MYSQL_PREFIX."_admin_menu` WHERE (what='' OR what IS NULL) ORDER BY sort, id DESC", __FILE__, __LINE__);
if (SQL_NUMROWS($result_main) > 0)
{
- $OUT = "<TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_main\">
-<TR><TD colspan=\"2\" height=\"7\" class=\"seperator\"> </TD></TR>\n";
+ $OUT = "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_main\">
+<tr><td colspan=\"2\" height=\"7\" class=\"seperator\"> </td></tr>\n";
while (list($menu, $title, $descr) = SQL_FETCHROW($result_main))
{
if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2"))
$menuTitle[$menu] = $title;
$menuDesription[$menu] = $descr;
}
- $OUT .= "<TR>
- <TD class=\"admin_menu\" colspan=\"2\">
- <NOBR> <STRONG>·</STRONG> ";
+ $OUT .= "<tr>
+ <td class=\"admin_menu\" colspan=\"2\">
+ <NOBR> <strong>·</strong> ";
if (($menu == $act) && (empty($wht)))
{
- $OUT .= "<STRONG>";
+ $OUT .= "<strong>";
}
else
{
- $OUT .= "[<A href=\"".URL."/modules.php?module=admin&action=".$menu."\">";
+ $OUT .= "[<a href=\"".URL."/modules.php?module=admin&action=".$menu."\">";
}
$OUT .= $title;
if (($menu == $act) && (empty($wht)))
{
- $OUT .= "</STRONG>";
+ $OUT .= "</strong>";
}
else
{
- $OUT .= "</A>]";
+ $OUT .= "</a>]";
}
- $OUT .= "</NOBR></TD>
-</TR>\n";
+ $OUT .= "</NOBR></td>
+</tr>\n";
$result_what = SQL_QUERY_ESC("SELECT what, title, descr FROM `"._MYSQL_PREFIX."_admin_menu` WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort, id DESC",
array($menu), __FILE__, __LINE__);
if ((SQL_NUMROWS($result_what) > 0) && ($act == $menu))
{
$menuDesription = array();
$menuTitle = array(); $SUB = true;
- $OUT .= "<TR>
- <TD width=\"10\" class=\"seperator\"> </TD>
- <TD class=\"admin_menu\">
- <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_sub\">\n";
+ $OUT .= "<tr>
+ <td width=\"10\" class=\"seperator\"> </td>
+ <td class=\"admin_menu\">
+ <table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_sub\">\n";
while (list($wht_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what)) {
// Filename
$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $wht_sub);
// Insert compiled title and description
$menuTitle[$wht_sub] = $title_what;
$menuDesription[$wht_sub] = $desc_what;
- $OUT .= "<TR>
- <TD class=\"admin_menu\" colspan=\"2\">
- <NOBR> <STRONG>--></STRONG> ";
+ $OUT .= "<tr>
+ <td class=\"admin_menu\" colspan=\"2\">
+ <NOBR> <strong>--></strong> ";
if ($readable)
{
if ($wht == $wht_sub)
{
- $OUT .= "<STRONG>";
+ $OUT .= "<strong>";
}
else
{
- $OUT .= "[<A href=\"".URL."/modules.php?module=admin&what=".$wht_sub."\">";
+ $OUT .= "[<a href=\"".URL."/modules.php?module=admin&what=".$wht_sub."\">";
}
}
else
{
if ($wht == $wht_sub)
{
- $OUT .= "</STRONG>";
+ $OUT .= "</strong>";
}
else
{
- $OUT .= "</A>]";
+ $OUT .= "</a>]";
}
}
else
{
- $OUT .= "</I>";
+ $OUT .= "</em>";
}
- $OUT .= "</NOBR></TD>
-</TR>\n";
+ $OUT .= "</NOBR></td>
+</tr>\n";
}
}
// Free memory
SQL_FREERESULT($result_what);
- $OUT .= " </TABLE>
- </TD>
-</TR>\n";
+ $OUT .= " </table>
+ </td>
+</tr>\n";
}
- $OUT .= "<TR><TD height=\"7\" colspan=\"2\"></TD></TR>\n";
+ $OUT .= "<tr><td height=\"7\" colspan=\"2\"></td></tr>\n";
}
}
// Free memory
SQL_FREERESULT($result_main);
- $OUT .= "</TABLE>\n";
+ $OUT .= "</table>\n";
}
// Compile and run the code here. This inserts all constants into the
$OUT = "";
// USe this only for adding points (e.g. adding refs really makes no sence ;-) )
- if ($add_all) $OUT = " <OPTION value=\"all\">".ALL_MEMBERS."</OPTION>\n";
- elseif ($none) $OUT = " <OPTION value=\"0\">".SELECT_NONE."</OPTION>\n";
+ if ($add_all) $OUT = " <option value=\"all\">".ALL_MEMBERS."</option>\n";
+ elseif ($none) $OUT = " <option value=\"0\">".SELECT_NONE."</option>\n";
while (list($id, $sname, $fname) = SQL_FETCHROW($result))
{
- $OUT .= " <OPTION value=\"".bigintval($id)."\"";
+ $OUT .= " <option value=\"".bigintval($id)."\"";
if ($def == $id) $OUT .= " selected=\"selected\"";
- $OUT .= ">".$sname." ".$fname." (".bigintval($id).")</OPTION>\n";
+ $OUT .= ">".$sname." ".$fname." (".bigintval($id).")</option>\n";
}
// Free memory
array($MODE), __FILE__, __LINE__);
if (SQL_NUMROWS($result) > 0) {
// Load menu as selection
- $OUT = "<SELECT name=\"".$MODE."_menu";
+ $OUT = "<select name=\"".$MODE."_menu";
if ((!empty($defid)) || ($defid == "0")) $OUT .= "[".$defid."]";
$OUT .= "\" size=\"1\" class=\"admin_select\">
- <OPTION value=\"\">".SELECT_NONE."</OPTION>\n";
+ <option value=\"\">".SELECT_NONE."</option>\n";
while (list($menu, $title) = SQL_FETCHROW($result)) {
- $OUT .= " <OPTION value=\"".$menu."\"";
+ $OUT .= " <option value=\"".$menu."\"";
if ((!empty($default)) && ($default == $menu)) $OUT .= " selected=\"selected\"";
- $OUT .= ">".$title."</OPTION>\n";
+ $OUT .= ">".$title."</option>\n";
} // END - while
// Free memory
SQL_FREERESULT($result);
- $OUT .= "</SELECT>\n";
+ $OUT .= "</select>\n";
} else {
// No menus???
$OUT = ADMIN_PROBLEM_NO_MENU;
return $title;
} // END - if
- //* DEBUG: */ echo "A:".$title."<br />";
+ //* DEBUG: */ echo "a:".$title."<br />";
// Return link
- return "<A href=\"".URL."/modules.php?module=admin&what=".$wht."&u_id=".$uid."\" title=\"".ADMIN_USER_PROFILE_TITLE."\">".$title."</A>";
+ return "<a href=\"".URL."/modules.php?module=admin&what=".$wht."&u_id=".$uid."\" title=\"".ADMIN_USER_PROFILE_TITLE."\">".$title."</a>";
}
//
function ADMIN_CHECK_MENU_MODE() {