RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleaned up tabbing and sessions in index

Browse Source
This commit is contained in:
xisi 2014-01-24 15:07:00 -05:00
parent c192cbb0bd
commit 4e18ff318b
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
public/index.php
View File

@ -36,27 +36,26 @@ $master_template = 'master.tpl';
// Start a session // Start a session
session_set_cookie_params(time()+$config['cookie']['duration'], $config['cookie']['path'], $config['cookie']['domain'], $config['cookie']['secure'], $config['cookie']['httponly']); session_set_cookie_params(time()+$config['cookie']['duration'], $config['cookie']['path'], $config['cookie']['domain'], $config['cookie']['secure'], $config['cookie']['httponly']);
if (!@session_start()) { $session_start = @session_start();
$user->logoutUser(); if (!$session_start) {
if (!@session_regenerate_id(true)) { session_destroy();
$user->logoutUser(); session_regenerate_id(true);
} session_start();
if(!@setcookie(session_name(), session_id(), time()+$config['cookie']['duration'], $config['cookie']['path'], $config['cookie']['domain'], $config['cookie']['secure'], $config['cookie']['httponly'])) {
@setcookie(session_name(),session_id(), time()-$config['cookie']['duration'], $config['cookie']['path'], $config['cookie']['domain'], $config['cookie']['secure'], $config['cookie']['httponly']);
}
} }
@setcookie(session_name(), session_id(), time()+$config['cookie']['duration'], $config['cookie']['path'], $config['cookie']['domain'], $config['cookie']['secure'], $config['cookie']['httponly']);
// Load Classes, they name defines the $ variable used // Load Classes, they name defines the $ variable used
// We include all needed files here, even though our templates could load them themself // We include all needed files here, even though our templates could load them themself
require_once(INCLUDE_DIR . '/autoloader.inc.php'); require_once(INCLUDE_DIR . '/autoloader.inc.php');
// Create our pages array from existing files // Create our pages array from existing files
if (is_dir(INCLUDE_DIR . '/pages/')) { if (is_dir(INCLUDE_DIR . '/pages/')) {
foreach (glob(INCLUDE_DIR . '/pages/*.inc.php') as $filepath) { foreach (glob(INCLUDE_DIR . '/pages/*.inc.php') as $filepath) {
$filename = basename($filepath); $filename = basename($filepath);
$pagename = substr($filename, 0, strlen($filename) - 8); $pagename = substr($filename, 0, strlen($filename) - 8);
$arrPages[$pagename] = $filename; $arrPages[$pagename] = $filename;
$debug->append("Adding $pagename as " . $filename . " to accessible pages", 4); $debug->append("Adding $pagename as " . $filename . " to accessible pages", 4);
} }
} }
// Set a default action here if no page has been requested // Set a default action here if no page has been requested
@ -71,12 +70,12 @@ if (isset($_REQUEST['page']) && isset($arrPages[$_REQUEST['page']])) {
// Create our pages array from existing files // Create our pages array from existing files
if (is_dir(INCLUDE_DIR . '/pages/' . $page)) { if (is_dir(INCLUDE_DIR . '/pages/' . $page)) {
foreach (glob(INCLUDE_DIR . '/pages/' . $page . '/*.inc.php') as $filepath) { foreach (glob(INCLUDE_DIR . '/pages/' . $page . '/*.inc.php') as $filepath) {
$filename = basename($filepath); $filename = basename($filepath);
$pagename = substr($filename, 0, strlen($filename) - 8); $pagename = substr($filename, 0, strlen($filename) - 8);
$arrActions[$pagename] = $filename; $arrActions[$pagename] = $filename;
$debug->append("Adding $pagename as " . $filename . ".inc.php to accessible actions", 4); $debug->append("Adding $pagename as " . $filename . ".inc.php to accessible actions", 4);
} }
} }
// Default to empty (nothing) if nothing set or not known // Default to empty (nothing) if nothing set or not known
$action = (isset($_REQUEST['action']) && !is_array($_REQUEST['action'])) && isset($arrActions[$_REQUEST['action']]) ? $_REQUEST['action'] : ""; $action = (isset($_REQUEST['action']) && !is_array($_REQUEST['action'])) && isset($arrActions[$_REQUEST['action']]) ? $_REQUEST['action'] : "";
@ -91,11 +90,11 @@ if ($config['csrf']['enabled']) $smarty->assign('CTOKEN', $csrftoken->getBasic($
// Load the page code setting the content for the page OR the page action instead if set // Load the page code setting the content for the page OR the page action instead if set
if (!empty($action)) { if (!empty($action)) {
$debug->append('Loading Action: ' . $action . ' -> ' . $arrActions[$action], 1); $debug->append('Loading Action: ' . $action . ' -> ' . $arrActions[$action], 1);
require_once(PAGES_DIR . '/' . $page . '/' . $arrActions[$action]); require_once(PAGES_DIR . '/' . $page . '/' . $arrActions[$action]);
} else { } else {
$debug->append('Loading Page: ' . $page . ' -> ' . $arrPages[$page], 1); $debug->append('Loading Page: ' . $page . ' -> ' . $arrPages[$page], 1);
require_once(PAGES_DIR . '/' . $arrPages[$page]); require_once(PAGES_DIR . '/' . $arrPages[$page]);
} }
define('PAGE', $page); define('PAGE', $page);
@ -118,4 +117,5 @@ if (!@$supress_master) $smarty->display($master_template, $smarty_cache_key);
// Unset any temporary values here // Unset any temporary values here
unset($_SESSION['POPUP']); unset($_SESSION['POPUP']);
?>
?>