* -------------------------------------------------------------------- *
* Kurzbeschreibung : Mehr Cache-Dateien nachladen *
* -------------------------------------------------------------------- *
- * $Revision:: 856 $ *
- * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009) $ *
+ * $Revision:: $ *
+ * $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
- * $Author:: stelzi $ *
+ * $Author:: $ *
* Needs to be in all Files and every File needs "svn propset *
* svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
// Some security stuff...
if (!defined('__SECURITY')) {
- $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+ $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
require($INC);
} // END - if
// Let's start with the admins table...
-if (($GLOBALS['cache_instance']->loadCacheFile("admins")) && ($GLOBALS['cache_instance']->extensionVersionMatches("admins"))) {
+if (($GLOBALS['cache_instance']->loadCacheFile('admins')) && ($GLOBALS['cache_instance']->extensionVersionMatches('admins'))) {
// Load cache
$GLOBALS['cache_array']['admins'] = $GLOBALS['cache_instance']->getArrayFromCache();
// Rewrite all entries
foreach ($GLOBALS['cache_array']['admins'] as $key=>$entryArray) {
// Rewrite the entry
- if ($key == "aid") {
+ if ($key == 'aid') {
// Rewrite admin id (use login name as index)
$GLOBALS['cache_array']['admins']['aid'][$GLOBALS['cache_array']['admins']['login'][$idx]] = $entryArray[$idx];
} else {
$GLOBALS['cache_instance']->destroyCacheFile();
unset($GLOBALS['cache_array']['admins']);
}
-} elseif ((getConfig('cache_admins') == "Y") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) {
+} elseif ((getConfig('cache_admins') == 'Y') && ($GLOBALS['output_mode'] != '1') && ($GLOBALS['output_mode'] != '-1')) {
// Create cache file
- $GLOBALS['cache_instance']->init("ADMINS");
- $GLOBALS['cache_instance']->storeExtensionVersion("admins");
+ $GLOBALS['cache_instance']->init('ADMINS');
+ $GLOBALS['cache_instance']->storeExtensionVersion('admins');
// Load every data from DB to cache file
- $ADD = runFilterChain('sql_admin_extra_data');
+ $add = runFilterChain('sql_admin_extra_data');
// Query the database about this
- $result_admins = SQL_QUERY("SELECT id AS aid, login, password, email".$ADD."
+ $result_admins = SQL_QUERY('SELECT id AS aid, login, password, email'.$add.'
FROM `{!_MYSQL_PREFIX!}_admins`
-ORDER BY login", __FILE__, __LINE__);
+ORDER BY login', __FILE__, __LINE__);
while ($dummy = SQL_FETCHARRAY($result_admins)) {
// Save row
$GLOBALS['cache_instance']->addRow($dummy);
}
// Next cached table are the admins_acls...
-if (GET_EXT_VERSION("admins") >= "0.3") {
+if (GET_EXT_VERSION('admins') >= '0.3') {
// Check for cache file
- if (($GLOBALS['cache_instance']->loadCacheFile("admins_acls")) && ($GLOBALS['cache_instance']->extensionVersionMatches("admins"))) {
+ if (($GLOBALS['cache_instance']->loadCacheFile('admins_acls')) && ($GLOBALS['cache_instance']->extensionVersionMatches('admins'))) {
// Load referal system from cache
$GLOBALS['cache_array']['admin_acls'] = $GLOBALS['cache_instance']->getArrayFromCache();
- } elseif ((getConfig('cache_acls') == "Y") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) {
+ } elseif ((getConfig('cache_acls') == 'Y') && ($GLOBALS['output_mode'] != '1') && ($GLOBALS['output_mode'] != '-1')) {
// Create cache file here
- $GLOBALS['cache_instance']->init("ADMINS_ACLS");
- $GLOBALS['cache_instance']->storeExtensionVersion("admins");
+ $GLOBALS['cache_instance']->init('ADMINS_ACLS');
+ $GLOBALS['cache_instance']->storeExtensionVersion('admins');
- // Load all modules and their data
- $result = SQL_QUERY("SELECT id, admin_id, action_menu, what_menu, access_mode FROM `{!_MYSQL_PREFIX!}_admins_acls` ORDER BY admin_id, action_menu, what_menu", __FILE__, __LINE__);
+ // Load all modules and their data (column 'id' is no longer required)
+ $result = SQL_QUERY('SELECT admin_id, action_menu, what_menu, access_mode FROM `{!_MYSQL_PREFIX!}_admins_acls` ORDER BY admin_id, action_menu, what_menu', __FILE__, __LINE__);
// Add all rows
while ($data = SQL_FETCHARRAY($result)) {