X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=cf46a9366eec52d36dc4ac18b2a0037248ff37a4;hb=98e932344cf1462454f0a875a25fed3d1df4f812;hp=f9f775a00363cd6860966e8573424bc9a216efdf;hpb=55e6ddf528028536b88b1397ef8297655782de69;p=mailer.git diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index f9f775a003..cf46a9366e 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -1,7 +1,7 @@ "; - if ((strlen($pass) == 32) && ($pass == md5($password))) - { - // Generate new hash - $pass = generateHash($password); - if (($ret == "pass") && (GET_EXT_VERSION("sql_patches") < "0.3.6")) $ret = "done"; - } - elseif ((GET_EXT_VERSION("sql_patches") < "0.3.6") || (GET_EXT_VERSION("sql_patches") == "")) - { - // Old hashing way - return $ret; - } +// This function will be executed when the admin is not logged in and has submitted his login data +function ifAdminLoginDataIsValid ($adminLogin, $adminPassword) { + // First of all, no admin login is found + $ret = '404'; - // Generate salt of password - define('__SALT', substr($pass, 0, -40)); - $salt = __SALT; - - // Check if password is same - if (($ret == "pass") && ($pass == generateHash($password, $salt)) && (!empty($salt))) - { - // Update password - $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET password='%s' WHERE login='%s' LIMIT 1", - array($pass, $admin_login), __FILE__, __LINE__); - - // Shall I remove the cache file? - if ((EXT_IS_ACTIVE("cache")) && ($cacheInstance != false)) - { - if ($cacheInstance->cache_file("admins", true)) $cacheInstance->cache_destroy(); - } + // Then we need to lookup the login name by getting the admin hash + $adminHash = getAdminHash($adminLogin); - // Password matches! - $ret = "done"; - } - elseif ((empty($salt)) && ($ret == "pass")) - { - // Something bad went wrong - $ret = "failed"; - } - return $ret; -} -// Only be executed on cookie checking -function CHECK_ADMIN_COOKIES ($admin_login, $password) { - global $cacheArray, $_CONFIG; - $ret = "404"; $pass = ""; - if (!empty($cacheArray['admins']['aid'][$admin_login])) { - // Get password from cache - $pass = $cacheArray['admins']['password'][$admin_login]; - $ret = "pass"; - $_CONFIG['cache_hits']++; - } else { - // Get password from DB - $result = SQL_QUERY_ESC("SELECT password FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1", - array($admin_login), __FILE__, __LINE__); - if (SQL_NUMROWS($result) == 1) { - $ret = "pass"; - list($pass) = SQL_FETCHROW($result); - SQL_FREERESULT($result); + // If this is fine, we can continue + if ($adminHash != '-1') { + // Get admin id and set it as current + setCurrentAdminId(getAdminId($adminLogin)); + + // Now, we need to encode the password in the same way the one is encoded in database + $testHash = generateHash($adminPassword, $adminHash); + + // If they both match, the login data is valid + if ($testHash == $adminHash) { + // All fine + $ret = 'done'; + } else { + // Set status + $ret = 'pass'; } - } + } // END - if - //* DEBUG: */ echo "*".$pass."/".$password."
"; + // Prepare data array + $data = array( + 'login' => $adminLogin, + 'plain_pass' => $adminPassword, + 'pass_hash' => $adminHash + ); - // Check if password matches - if (($ret == "pass") && ((generatePassString($pass) == $password) || ($pass == $password))) { - // Passwords matches! - $ret = "done"; - } + // Run a special filter + runFilterChain('do_admin_login_' . $ret, $data); - // Return result + // Return status return $ret; } -// -function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0) -{ - $done = false; $seek++; $found = false; - if (file_exists($file)) - { - $search = "CFG: ".$comment; - $tmp = $file.".tmp"; - $fp = fopen($file, 'r') or OUTPUT_HTML("READ: ".$file."
"); - if ($fp) - { - $fp_tmp = fopen($tmp, 'w') or OUTPUT_HTML("WRITE: ".$tmp."
"); - if ($fp_tmp) - { - while (! feof($fp)) - { - $line = fgets ($fp, 1024); - if (strpos($line, $search) > -1) { $next = 0; $found = true; } - if ($next > -1) - { - if ($next == $seek) - { - $next = -1; - $line = $prefix . $DATA . $suffix."\n"; - } - else - { - $next++; - } - } - fputs($fp_tmp, $line); - } - fclose($fp_tmp); - // Finished writing tmp file - $done = true; - } - fclose($fp); - if (($done) && ($found)) - { - // Copy back tmp file and delete tmp :-) - @copy($tmp, $file); - @unlink($tmp); - define('_FATAL', false); - } - elseif (!$found) - { - OUTPUT_HTML("CHANGE: 404!"); - define('_FATAL', true); - } - else - { - OUTPUT_HTML("TMP: UNDONE!"); - define('_FATAL', true); - } + +// Only be executed on cookie checking +function ifAdminCookiesAreValid ($adminLogin, $passHash) { + // First of all, no admin login is found + $ret = '404'; + + // Then we need to lookup the login name by getting the admin hash + $adminHash = getAdminHash($adminLogin); + + // If this is fine, we can continue + if ($adminHash != '-1') { + // Now, we need to encode the password in the same way the one is encoded in database + $testHash = encodeHashForCookie($adminHash); + //* DEBUG: */ outputHtml('adminLogin='.$adminLogin.',
passHash='.$passHash.',
adminHash='.$adminHash.',
testHash='.$testHash.'
'); + + // If they both match, the login data is valid + if ($testHash == $passHash) { + // All fine + $ret = 'done'; + } else { + // Set status + $ret = 'pass'; } - } - else - { - OUTPUT_HTML("404: ".$file."
"); - } + } // END - if + + // Return status + //* DEBUG: */ outputHtml('ret='.$ret); + return $ret; } -// -function ADMIN_DO_ACTION($wht) -{ - global $menuDesription, $menuTitle, $_CONFIG, $cacheArray, $link, $DATA, $DEPTH; - //* DEBUG: */ echo __LINE__."*".$wht."/".$GLOBALS['module']."/".$GLOBALS['action']."/".$GLOBALS['what']."*
\n"; - if (EXT_IS_ACTIVE("cache")) - { - // Include cache instance - global $cacheInstance; - } + +// Do an admin action +function doAdminAction () { + // Get default what + $what = getWhat(); + + //* DEBUG: */ outputHtml(__LINE__.'*'.$what.'/'.getModule().'/'.getAction().'/'.getWhat().'*
'); // Remove any spaces from variable - if (empty($wht)) - { + if (empty($what)) { // Default admin action is the overview page - $wht = "overview"; - } - else - { - // Compile out some chars - $wht = COMPILE_CODE($wht, false, false, false); + $what = 'overview'; + } else { + // Secure it + $what = secureString($what); } // Get action value - $act = GET_ACTION($GLOBALS['module'], $wht); + $action = getActionFromModuleWhat(getModule(), $what); - // Define admin login name and ID number - define('__ADMIN_LOGIN', SQL_ESCAPE(get_session('admin_login'))); - define('__ADMIN_ID' , GET_ADMIN_ID(get_session('admin_login'))); + // Define admin login name and id number + $content['login'] = getSession('admin_login'); + $content['id'] = getCurrentAdminId(); // Preload templates - if (EXT_IS_ACTIVE("admins")) { - define('__ADMIN_WELCOME', LOAD_TEMPLATE("admin_welcome_admins", true)); + if (isExtensionActive('admins')) { + $content['welcome'] = loadTemplate('admin_welcome_admins', true, $content); } else { - define('__ADMIN_WELCOME', LOAD_TEMPLATE("admin_welcome", true)); + $content['welcome'] = loadTemplate('admin_welcome', true, $content); } - define('__ADMIN_FOOTER' , LOAD_TEMPLATE("admin_footer" , true)); - define('__ADMIN_MENU' , ADD_ADMIN_MENU($act, $wht, true)); + $content['footer'] = loadTemplate('admin_footer' , true, $content); + $content['menu'] = addAdminMenu($action, $what, true); // Tableset header - LOAD_TEMPLATE("admin_main_header"); + loadTemplate('admin_main_header', false, $content); // Check if action/what pair is valid - $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_admin_menu -WHERE action='%s' AND ((what='%s' AND what != 'overview') OR (what='' AND '%s'='overview')) -LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__); - if (SQL_NUMROWS($result) == 1) - { - // Free memory - SQL_FREERESULT($result); - + $result_action = SQL_QUERY_ESC("SELECT + `id` +FROM + `{?_MYSQL_PREFIX?}_admin_menu` +WHERE + `action`='%s' AND + ( + ( + `what`='%s' AND `what` != 'overview' + ) OR ( + ( + `what`='' OR `what` IS NULL + ) AND ( + '%s'='overview' + ) + ) + ) +LIMIT 1", + array( + $action, + $what, + $what + ), __FUNCTION__, __LINE__); + + // Do we have an entry? + if (SQL_NUMROWS($result_action) == 1) { // Is valid but does the inlcude file exists? - $INC = sprintf(PATH."inc/modules/admin/action-%s.php", $act); - if ((file_exists($INC)) && (is_readable($INC)) && (VALIDATE_MENU_ACTION("admin", $act, $wht)) && (__ACL_ALLOW == true)) - { + $inc = sprintf("inc/modules/admin/action-%s.php", $action); + if ((isIncludeReadable($inc)) && (isMenuActionValid('admin', $action, $what)) && ($GLOBALS['acl_allow'] === true)) { // Ok, we finally load the admin action module - include($INC); - } - elseif (__ACL_ALLOW == false) - { + loadInclude($inc); + } elseif ($GLOBALS['acl_allow'] === false) { // Access denied - LOAD_TEMPLATE("admin_menu_failed", false, ADMINS_ACCESS_DENIED); - ADD_FATAL(ADMINS_ACCESS_DENIED); - } - else - { + loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACCESS_DENIED', $what)); + } 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); + loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACTION_404', $action)); } } 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); + loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACTION_INVALID', $action . '/' . $what)); } + // Free memory + SQL_FREERESULT($result_action); + // Tableset footer - LOAD_TEMPLATE("admin_main_footer"); + loadTemplate('admin_main_footer', false, $content); } -// -function ADD_ADMIN_MENU($act, $wht,$return=false) -{ - global $menuDesription, $menuTitle, $link; + +// Adds an admin menu +function addAdminMenu ($action, $what, $return=false) { + // Init variables $SUB = false; + $OUT = ''; // Menu descriptions - $menuDesription = array(); - $menuTitle = array(); + $GLOBALS['menu']['description'] = array(); + $GLOBALS['menu']['title'] = array(); // Build main menu - $result_main = SQL_QUERY("SELECT action, title, descr FROM "._MYSQL_PREFIX."_admin_menu WHERE what='' ORDER BY sort, id DESC", __FILE__, __LINE__); - $OUT = ""; - if (SQL_NUMROWS($result_main) > 0) - { - $OUT = " -\n"; - while (list($menu, $title, $descr) = SQL_FETCHROW($result_main)) - { - if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2")) - { - $ACL = ADMINS_CHECK_ACL($menu, ""); - } - else - { - // ACL is "allow"... hmmm + $result_main = SQL_QUERY("SELECT + `action`, `title`, `descr` +FROM + `{?_MYSQL_PREFIX?}_admin_menu` +WHERE + (`what`='' OR `what` IS NULL) +ORDER BY + `sort` ASC, + `id` DESC", __FUNCTION__, __LINE__); + + // Do we have entries? + if (SQL_NUMROWS($result_main) > 0) { + $OUT .= ' - -\n"; - $result_what = SQL_QUERY_ESC("SELECT what, title, descr FROM "._MYSQL_PREFIX."_admin_menu WHERE action='%s' AND what != '' ORDER BY sort, id DESC", - array($menu), __FILE__, __LINE__); - if ((SQL_NUMROWS($result_what) > 0) && ($act == $menu)) - { - $menuDesription = array(); - $menuTitle = array(); $SUB = true; - $OUT .= " - - -\n"; - } - $OUT .= "\n"; - } - } + $OUT .= ' +'; + } // END - if + } // END - if + } // END - while // Free memory SQL_FREERESULT($result_main); - $OUT .= "
 
-  · "; - if (($menu == $act) && (empty($wht))) - { - $OUT .= ""; - } - else - { - $OUT .= "[ "; + $OUT .= '
  • +
    · '; + + if ($readable === true) { + if (($menu == $action) && (empty($what))) { + $OUT .= ''; + } else { + $OUT .= '['; + } + } else { + $OUT .= ''; } + $OUT .= $title; - if (($menu == $act) && (empty($wht))) - { - $OUT .= ""; - } - else - { - $OUT .= " ]"; + + if ($readable === true) { + if (($menu == $action) && (empty($what))) { + $OUT .= ''; + } else { + $OUT .= ']'; + } + } else { + $OUT .= ''; } - $OUT .= "
    •   - \n"; - while (list($wht_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what)) - { - // Filename - $INC = sprintf(PATH."inc/modules/admin/what-%s.php", $wht_sub); - if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2")) - { - $ACL = ADMINS_CHECK_ACL("", $wht_sub); - } - else - { - // ACL is "allow"... hmmm + + $OUT .= ' +'; + + // Check for menu entries + $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` ASC, + `id` DESC", + array($menu), __FUNCTION__, __LINE__); + + // Remember the count for later checks + setAdminMenuHasEntries($menu, ((SQL_NUMROWS($result_what) > 0) && ($action == $menu))); + + // Do we have entries? + if ((ifAdminMenuHasEntries($menu)) && (SQL_NUMROWS($result_what) > 0)) { + $GLOBALS['menu']['description'] = array(); + $GLOBALS['menu']['title'] = array(); $SUB = true; + $OUT .= '
    • '; + // @TODO Rewrite this to $content = SQL_FETCHARRAY() + while (list($what_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what)) { + // Check for access level + if (isExtensionInstalledAndNewer('admins', '0.2.0')) { + $ACL = adminsCheckAdminAcl('', $what_sub); + } else { + // @TODO ACL is 'allow'... hmmm $ACL = true; } - $readable = ((file_exists($INC)) && (is_readable($INC))); - if ($ACL) - { + + // Filename + $inc = sprintf("inc/modules/admin/what-%s.php", $what_sub); + + // Is the file readable? + $readable = isIncludeReadable($inc); + + // Access allowed? + if ($ACL === true) { // Insert compiled title and description - $menuTitle[$wht_sub] = $title_what; - $menuDesription[$wht_sub] = $desc_what; - $OUT .= "
    • - -\n"; - } - } + $OUT .= ' +'; + } // END - if + } // END - while // Free memory SQL_FREERESULT($result_what); - $OUT .= "
    -  --> "; - if ($readable) - { - if ($wht == $wht_sub) - { - $OUT .= ""; - } - else - { - $OUT .= "[ "; + $GLOBALS['menu']['title'][$what_sub] = $title_what; + $GLOBALS['menu']['description'][$what_sub] = $desc_what; + $OUT .= '
  • +
    --> '; + if ($readable === true) { + if ($what == $what_sub) { + $OUT .= ''; + } else { + $OUT .= '['; } + } else { + $OUT .= ''; } - else - { - $OUT .= ""; - } + $OUT .= $title_what; - if ($readable) - { - if ($wht == $wht_sub) - { - $OUT .= ""; - } - else - { - $OUT .= " ]"; + + if ($readable === true) { + if ($what == $what_sub) { + $OUT .= ''; + } else { + $OUT .= ']'; } + } else { + $OUT .= ''; } - else - { - $OUT .= ""; - } - $OUT .= "
    • -
    \n"; + $OUT .= ''; } - // Compile and run the code here. This inserts all constants into the - // HTML output. Costs me some time to figure this out... *sigh* Quix0r - $eval = "\$OUT = \"".COMPILE_CODE(addslashes($OUT))."\";"; - eval($eval); - + // Is there a cache instance again? // Return or output content? - if ($return) { + if ($return === true) { return $OUT; } else { - OUTPUT_HTML($OUT); + outputHtml($OUT); } } -// -function ADD_MEMBER_SELECTION_BOX($add_all = false, $return = false, $none = false, $def = "0") -{ + +// Create member selection box +function addMemberSelectionBox ($def = 0, $add_all = false, $return = false, $none = false, $field = 'userid') { // Output selection form with all confirmed user accounts listed - $result = SQL_QUERY("SELECT userid, surname, family FROM "._MYSQL_PREFIX."_user_data ORDER BY userid", __FILE__, __LINE__); - $OUT = ""; + $result = SQL_QUERY("SELECT `userid`, `surname`, `family` FROM `{?_MYSQL_PREFIX?}_user_data` ORDER BY `userid` ASC", __FUNCTION__, __LINE__); + + // Default output + $OUT = ''; // USe this only for adding points (e.g. adding refs really makes no sence ;-) ) - if ($add_all) $OUT = " \n"; - elseif ($none) $OUT = " \n"; - while (list($id, $sname, $fname) = SQL_FETCHROW($result)) - { - $OUT .= " '; + elseif ($none === true) $OUT = ' '; + + while ($content = SQL_FETCHARRAY($result)) { + $OUT .= ''; + // Load all entries + while ($content = SQL_FETCHARRAY($result)) { + $OUT .= ''; + + // Walk through all files + foreach ($menuArray as $file) { // Is this a PHP script? - if (($file != ".") && ($file != "..") && ($file != "lost+found") && (strpos($file, "".$type."-") > -1) && (strpos($file, ".php") > 0)) { + if ((!isDirectory($file)) && (strpos($file, '' . $type . '-') > -1) && (strpos($file, '.php') > 0)) { // Then test if the file is readable - $test = PATH."inc/modules/".$menu."/".$file; - if (is_readable($test)) { + $test = sprintf("inc/modules/%s/%s", $menu, $file); + + // Is the file there? + if (isIncludeReadable($test)) { // Extract the value for what=xxx - $part = substr($file, (strlen($type) + 1)); $part = substr($part, 0, strpos($part, ".php")); + $part = substr($file, (strlen($type) + 1)); + $part = substr($part, 0, -4); // Is that part different from the overview? - if ($part != "overview") { - $OUT .= "