From 88c922353cc353fe148e21c7d27d7c0076d6fdda Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 28 Nov 2012 15:46:32 +0000 Subject: [PATCH] Code moved to other include file: - Moved a lot SQL functions which doesn't encapsulate a corresponding mysql_foo() function to sql-functions.php - rewrote loader part - TODOs.txt updated --- DOCS/TODOs.txt | 22 +- inc/db/lib-mysql3.php | 460 ----------------------------------- inc/extensions-functions.php | 45 +++- inc/mysql-connect.php | 13 +- inc/sql-functions.php | 460 +++++++++++++++++++++++++++++++++++ 5 files changed, 513 insertions(+), 487 deletions(-) diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 6488912587..d88844211d 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -45,10 +45,10 @@ ./inc/extensions/ext-nickname.php:52: // @TODO NOT NULL DEFAULT '' is bad practice, use NULL ./inc/extensions/ext-yoomedia.php:121: // @TODO Can this be moved into a database table? ./inc/extensions/ext-yoomedia.php:54:// @TODO Only deprecated when 'ext-network' is ready! setExtensionDeprecated('Y'); -./inc/extensions-functions.php:2176:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable' -./inc/extensions-functions.php:424: // @TODO This redirect is still needed to register sql_patches! Please try to avoid it -./inc/extensions-functions.php:440:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) ) -./inc/extensions-functions.php:580: // @TODO Extension is loaded, what next? +./inc/extensions-functions.php:2181:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable' +./inc/extensions-functions.php:429: // @TODO This redirect is still needed to register sql_patches! Please try to avoid it +./inc/extensions-functions.php:445:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) ) +./inc/extensions-functions.php:585: // @TODO Extension is loaded, what next? ./inc/filter/bonus_filter.php:56: // @TODO This query isn't right, it will only update if the user was for a longer time away! ./inc/filter/cache_filter.php:94: // @TODO This should be rewritten not to load the cache file for just checking if it is there for save removal. ./inc/filter/forced_filter.php:73: // @TODO This part is unfinished @@ -180,13 +180,13 @@ ./inc/modules/member/what-unconfirmed.php:178: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY() ./inc/modules/member/what-unconfirmed.php:247: // @TODO This 'userid' cannot be saved because of encapsulated EL code ./inc/modules/order.php:78: // @TODO Unused: 2,4 -./inc/mysql-manager.php:1440: // @TODO Rewrite these lines to a filter -./inc/mysql-manager.php:1464: // @TODO Rewrite this to a filter -./inc/mysql-manager.php:1770: // @TODO Rewrite this to a filter -./inc/mysql-manager.php:1967: // @TODO If we can rewrite the EL sub-system to support more than one parameter, this call_user_func_array() can be avoided -./inc/mysql-manager.php:2090: // @TODO Used generic 'userid' here -./inc/mysql-manager.php:2311:// @TODO cacheFiles is not yet supported -./inc/mysql-manager.php:398: // @TODO Try to rewrite this to one or more functions +./inc/mysql-manager.php:1450: // @TODO Rewrite these lines to a filter +./inc/mysql-manager.php:1474: // @TODO Rewrite this to a filter +./inc/mysql-manager.php:1780: // @TODO Rewrite this to a filter +./inc/mysql-manager.php:1977: // @TODO If we can rewrite the EL sub-system to support more than one parameter, this call_user_func_array() can be avoided +./inc/mysql-manager.php:2100: // @TODO Used generic 'userid' here +./inc/mysql-manager.php:2321:// @TODO cacheFiles is not yet supported +./inc/mysql-manager.php:408: // @TODO Try to rewrite this to one or more functions ./inc/mysql-manager.php:44:// @TODO Can we cache this? ./inc/purge/purge-inact.php:55: // @TODO Rewrite these if() blocks to a filter ./inc/revision-functions.php:168:// @TODO This function does also set and get in 'cache_array' diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php index e9ebc79cfc..e577551244 100644 --- a/inc/db/lib-mysql3.php +++ b/inc/db/lib-mysql3.php @@ -266,37 +266,6 @@ function SQL_FREERESULT ($resource) { return $res; } -// SQL string escaping -function SQL_QUERY_ESC ($sqlString, $data, $F, $L, $run = TRUE, $strip = TRUE, $secure = TRUE) { - // Link is there? - if ((!SQL_IS_LINK_UP()) || (!is_array($data))) { - // Link is down or data is not an array - /* DEBUG: */ logDebugMessage($F, $L, 'SQL_IS_LINK_UP()=' . intval(SQL_IS_LINK_UP()) . ',data[]=' . gettype($data) . ',sqlString=' . $sqlString . ': ABORTING!'); - return FALSE; - } // END - if - - // Init array for escape'd data with SQL string - $dataSecured = array( - '__sql_string' => $sqlString - ); - - // Escape all data - foreach ($data as $key => $value) { - $dataSecured[$key] = SQL_ESCAPE($value, $secure, $strip); - } // END - foreach - - // Generate query - $query = call_user_func_array('sprintf', $dataSecured); - - if ($run === TRUE) { - // Run SQL query (default) - return SQL_QUERY($query, $F, $L); - } else { - // Return secured string - return $query; - } -} - // Get id from last INSERT command function SQL_INSERTID () { if (!SQL_IS_LINK_UP()) return FALSE; @@ -365,253 +334,6 @@ function SQL_ESCAPE ($str, $secureString = TRUE, $strip = TRUE) { return $GLOBALS['sql_escapes']['' . $str . '']; } -// SELECT query string from table, columns and so on... ;-) -function SQL_RESULT_FROM_ARRAY ($table, $columns, $idRow, $id, $F, $L) { - // Is columns an array? - if (!is_array($columns)) { - // No array - reportBug(__FUNCTION__, __LINE__, sprintf("columns is not an array. %s != array, file=%s, line=%s", - gettype($columns), - basename($F), - $L - )); - - // Abort here with 'false' - return FALSE; - } // END - if - - // Is this is a simple array? - if ((is_array($columns[0])) && (isset($columns[0]['column']))) { - // Begin with SQL query - $sql = 'SELECT '; - - // No, it comes from XML, so get it back from it - $sql .= getSqlPartFromXmlArray($columns); - - // Finalize it - $sql .= " FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s' LIMIT 1"; - } else { - // Yes, prepare the SQL statement - $sql = 'SELECT `' . implode('`, `', $columns) . "` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s' LIMIT 1"; - } - - // Return the result - return SQL_QUERY_ESC($sql, - array( - $table, - $idRow, - bigintval($id), - ), $F, $L - ); -} - -// ALTER TABLE wrapper function -function SQL_ALTER_TABLE ($sql, $F, $L, $enableCodes = TRUE) { - // Abort if link is down - if (!SQL_IS_LINK_UP()) return FALSE; - - // This is the default result... - $result = FALSE; - - // Determine index/fulltext/unique word - $isAlterIndex = ( - ( - isInString('INDEX', $sql) - ) || ( - isInString('KEY', $sql) - ) || ( - isInString('FULLTEXT', $sql) - ) || ( - isInString('UNIQUE', $sql) - ) - ); - - // Extract table name - $tableArray = explode(' ', $sql); - $tableName = str_replace('`', '', $tableArray[2]); - - // Debug log - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sql . ',tableName=' . $tableName . ',tableArray=
' . print_r($tableArray, TRUE) . '
,isAlterIndex=' . intval($isAlterIndex)); - - // Shall we add/drop? - if (((isInString('ADD', $sql)) || (isInString('DROP', $sql)) || (isInString('CHANGE', $sql))) && ($isAlterIndex === FALSE)) { - // Try two columns, one should fix - foreach (array(4,5) as $idx) { - // If an entry is not set, abort here - if (!isset($tableArray[$idx])) { - // Debug log this - logDebugMessage(__FUNCTION__, __LINE__, 'columnName=' . $columnName . ',idx=' . $idx . ',sql=' . $sql . ' is missing!'); - break; - } // END - if - - // And column name as well - $columnName = $tableArray[$idx]; - - // Debug log - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'columnName=' . $columnName . ',idx=' . $idx . ',sql=' . $sql . ',hasZeroNums=' . intval(ifSqlTableColumnExists($tableName, $columnName))); - - // Is there no entry on ADD or an entry on DROP/CHANGE? - if (((!ifSqlTableColumnExists($tableName, $columnName)) && (isInString('ADD', $sql))) || ((ifSqlTableColumnExists($tableName, $columnName)) && ((isInString('DROP', $sql)) || ((isInString('CHANGE', $sql)) && ($idx == 4) && ((!ifSqlTableColumnExists($tableName, $tableArray[5])) || ($columnName == $tableArray[5])))))) { - // Do the query - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Executing: ' . $sql); - $result = SQL_QUERY($sql, $F, $L, FALSE); - - // Skip further attempt(s) - break; - } elseif ((((ifSqlTableColumnExists($tableName, $columnName)) && (isInString('ADD', $sql))) || ((!ifSqlTableColumnExists($tableName, $columnName)) && ((isInString('DROP', $sql))) || (isInString('CHANGE', $sql)))) && ($columnName != 'KEY')) { - // Abort here because it is alreay there - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Skipped: sql=' . $sql . ',columnName=' . $columnName . ',idx=' . $idx); - break; - } elseif ((!ifSqlTableColumnExists($tableName, $columnName)) && (isInString('DROP', $sql))) { - // Abort here because we tried to drop a column which is not there (never created maybe) - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'No drop: ' . $sql); - break; - } elseif ($columnName != 'KEY') { - // Something didn't fit, we better log it - logDebugMessage(__FUNCTION__, __LINE__, 'Possible problem: ' . $sql . ',hasZeroNums=' . intval(ifSqlTableColumnExists($tableName, $columnName)) . ''); - } - } // END - foreach - } elseif ((getTableType() == 'InnoDB') && (isInString('FULLTEXT', $sql))) { - // Skip this query silently because InnoDB does not understand fulltext indexes - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Skipped FULLTEXT: sql=%s,tableName=%s,hasZeroNums=%d,file=%s,line=%s", $sql, $tableName, intval((is_bool($result)) ? 0 : ifSqlTableColumnExists($columnName)), $F, $L)); - } elseif ($isAlterIndex === TRUE) { - // And column name as well without backticks - $keyName = str_replace('`', '', $tableArray[5]); - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'keyName=' . $keyName . ',tableArray=
' . print_r($tableArray, TRUE) . '
'); - - // Is this "UNIQUE" or so? FULLTEXT has been handled the elseif() block above - if (in_array(strtoupper($tableArray[4]), array('INDEX', 'UNIQUE', 'KEY', 'FULLTEXT'))) { - // Init loop - $begin = 1; - $keyName = ','; - while (isInString(',', $keyName)) { - // Use last - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'keyName=' . $keyName . 'begin=' . $begin . ' - BEFORE'); - $keyName = str_replace('`', '', $tableArray[count($tableArray) - $begin]); - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'keyName=' . $keyName . 'begin=' . $begin . ' - BETWEEN'); - - // Remove brackes - $keyName = str_replace(array('(', ')'), array('', ''), $keyName); - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'keyName=' . $keyName . 'begin=' . $begin . ' - AFTER'); - - // Continue - $begin++; - } // END while - } // END - if - - // Shall we run it? - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ', tableArray[3]=' . $tableArray[3] . ',keyName=' . $keyName); - if (($tableArray[3] == 'ADD') && (!ifSqlTableIndexExist($tableName, $keyName))) { - // Send it to the SQL_QUERY() function to add it - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sql . ' - ADDING!'); - $result = SQL_QUERY($sql, $F, $L, $enableCodes); - } elseif (($tableArray[3] == 'DROP') && (ifSqlTableIndexExist($tableName, $keyName))) { - // Send it to the SQL_QUERY() function to drop it - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sql . ' - DROPPING!'); - $result = SQL_QUERY($sql, $F, $L, $enableCodes); - } else { - // Not executed - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Not executed: ' . $sql); - } - } else { - // Other ALTER TABLE query - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $sql); - $result = SQL_QUERY($sql, $F, $L, $enableCodes); - } - - // Return result - return $result; -} - -// Getter for SQL link -function SQL_GET_LINK () { - // Init link - $link = NULL; - - // Is it in the globals? - if (isset($GLOBALS['sql_link'])) { - // Then take it - $link = $GLOBALS['sql_link']; - } // END - if - - // Return it - return $link; -} - -// Setter for link -function SQL_SET_LINK ($link) { - // Is this a resource or null? - if ((ifFatalErrorsDetected()) && (isInstallationPhase())) { - // This may happen in installation phase - return; - } elseif ((!is_resource($link)) && (!is_null($link))) { - // This should never happen! - reportBug(__FUNCTION__, __LINE__, sprintf("Type of link is not resource or null, type=%s", gettype($link))); - } // END - if - - // Set it - $GLOBALS['sql_link'] = $link; - - // Re-init cache - $GLOBALS['is_sql_link_up'] = is_resource($link); -} - -// Checks if the link is up -function SQL_IS_LINK_UP () { - // Is there cached this? - if (!isset($GLOBALS['is_sql_link_up'])) { - // Determine it - $GLOBALS['is_sql_link_up'] = is_resource(SQL_GET_LINK()); - } // END - if - - // Return the result - return $GLOBALS['is_sql_link_up']; -} - -// Wrapper function to make code more readable -function SQL_HASZERONUMS ($result) { - // Just pass it through - return (SQL_NUMROWS($result) === 0); -} - -// Wrapper function to make code more readable -function SQL_HASZEROAFFECTED () { - // Just pass it through - return (SQL_AFFECTEDROWS() === 0); -} - -// Private function to prepare the SQL query string -function SQL_PREPARE_SQL_STRING ($sqlString, $enableCodes = TRUE) { - // Debug message - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlString=' . $sqlString . ',enableCodes=' . intval($enableCodes) . ' - ENTERED!'); - - // Is it already cached? - if (!isset($GLOBALS['sql_strings']['' . $sqlString . ''])) { - // Preserve escaping and compile URI codes+config+expression code - $sqlString2 = FILTER_COMPILE_EXPRESSION_CODE(FILTER_COMPILE_CONFIG($sqlString)); - - // Debug message - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlString2=' . $sqlString2); - - // Do final compilation and revert {ESCAPE} - $GLOBALS['sql_strings']['' . $sqlString . ''] = doFinalCompilation($sqlString2, FALSE, $enableCodes); - } else { - // Log message - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlString=' . $sqlString . ' - CACHE!'); - } - - // Debug message - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlString=' . $sqlString . ',enableCodes=' . intval($enableCodes) . ',sql_strings=' . $GLOBALS['sql_strings']['' . $sqlString . ''] . ' - EXIT!'); - - // Return it - return $GLOBALS['sql_strings']['' . $sqlString . '']; -} - -// Creates a MySQL TIMESTAMP compatible string from given Uni* timestamp -function SQL_EPOCHE_TO_TIMESTAMP ($timestamp) { - return generateDateTime($timestamp, 7); -} - // Log SQL errors to debug.log in installation phase or call reportBug() function SQL_ERROR ($file, $line, $message) { // Remember plain error in last_sql_error @@ -630,187 +352,5 @@ function SQL_ERROR ($file, $line, $message) { } } -// Check if there is a SQL table created -function ifSqlTableExists ($tableName) { - // Make sure double-prefixes are being removed - $tableName = str_replace('{?_MYSQL_PREFIX?}_', '', $tableName); - - // Log message - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ' - ENTERED!'); - - // Is there cache? - if (!isset($GLOBALS[__FUNCTION__][$tableName])) { - // Check if the table is there - $result = SQL_QUERY_ESC("SHOW TABLES FROM `{?__DB_NAME?}` WHERE `Tables_in_{?__DB_NAME?}`='{?_MYSQL_PREFIX?}_%s'", - array($tableName), __FILE__, __LINE__); - - // Is a link there? - if (!is_resource($result)) { - // Is installation phase? - if (isInstallationPhase()) { - // Then silently abort here - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'result[]=' . gettype($result) . ',isLinkUp=' . intval(SQL_IS_LINK_UP()) . ',tableName=' . $tableName . ' - Returning FALSE ...'); - return FALSE; - } else { - // Please report this - reportBug(__FUNCTION__, __LINE__, 'result[]=' . gettype($result) . ' is not a resource.'); - } - } // END - if - - // Is there an entry? - $GLOBALS[__FUNCTION__][$tableName] = (SQL_NUMROWS($result) == 1); - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',numRows=' . intval($GLOBALS[__FUNCTION__][$tableName])); - } // END - if - - // Return cache - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',result=' . intval($GLOBALS[__FUNCTION__][$tableName]) . ' - EXIT!'); - return $GLOBALS[__FUNCTION__][$tableName]; -} - -// Is a table column there? -function ifSqlTableColumnExists ($tableName, $columnName, $forceFound = FALSE) { - // Remove back-ticks - $columnName = str_replace('`', '', $columnName); - - // Debug message - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',columnName=' . $columnName . ' - ENTERED!'); - - // If the table is not there, it is okay - if (!ifSqlTableExists($tableName)) { - // Then abort here - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Table ' . $tableName . ' does not exist, columnName=' . $columnName . ',forceFound=' . intval($forceFound)); - return (($forceFound === FALSE) && (isInstallationPhase())); - } // END - if - - // Get column information - $result = SQL_QUERY_ESC("SHOW COLUMNS FROM `%s` LIKE '%s'", - array( - $tableName, - $columnName - ), __FUNCTION__, __LINE__); - - // Is a link there? - if (!is_resource($result)) { - // Is installation phase? - if (isInstallationPhase()) { - // Then silently abort here - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'result[]=' . gettype($result) . ',isLinkUp=' . intval(SQL_IS_LINK_UP()) . ',tableName=' . $tableName . ',columnName=' . $columnName . ' - Returning FALSE ...'); - return $forceFound; - } else { - // Please report this - reportBug(__FUNCTION__, __LINE__, 'result[]=' . gettype($result) . ' is not a resource.'); - } - } // END - if - - // Determine it - $doesExist = (!SQL_HASZERONUMS($result)); - - // Free result - SQL_FREERESULT($result); - - // Return cache - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',columnName=' . $columnName . ',doesExist=' . intval($doesExist) . ' - EXIT!'); - return $doesExist; -} - -// Checks depending on the mode if the index is there -function ifSqlTableIndexExist ($tableName, $keyName, $forceFound = FALSE) { - // Remove back-ticks - $keyName = str_replace('`', '', $keyName); - - // Debug message - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',keyName=' . $keyName . ' - ENTERED!'); - - // If the table is not there, it is okay - if (!ifSqlTableExists($tableName)) { - // Then abort here - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Table ' . $tableName . ' does not exist, keyName=' . $keyName . ',forceFound=' . intval($forceFound)); - return (($forceFound === FALSE) && (isInstallationPhase())); - } // END - if - - // Show indexes - $result = SQL_QUERY_ESC("SHOW INDEX FROM `%s`", array($tableName), __FUNCTION__, __LINE__); - - // Is a link there? - if (!is_resource($result)) { - // Is installation phase? - if (isInstallationPhase()) { - // Then silently abort here - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'result[]=' . gettype($result) . ',isLinkUp=' . intval(SQL_IS_LINK_UP()) . ',tableName=' . $tableName . ',keyName=' . $keyName . ' - Returning FALSE ...'); - return $forceFound; - } else { - // Please report this - reportBug(__FUNCTION__, __LINE__, 'result[]=' . gettype($result) . ' is not a resource.'); - } - } // END - if - - // The key is not found by default - $doesExist = FALSE; - - // Walk through all - while ($content = SQL_FETCHARRAY($result)) { - // Is it the requested one? - if ($content['Key_name'] == $keyName) { - // Then it is found and exit - $doesExist = TRUE; - break; - } // END - if - } // END - while - - // Free result - SQL_FREERESULT($result); - - // Return cache - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',keyName=' . $keyName . ',doesExist=' . intval($doesExist) . ' - EXIT!'); - return $doesExist; -} - -// Init database layer -function initDatabaseLayer () { - // Set all required variables: - $GLOBALS['last_sql_error'] = ''; -} - -// Get last SQL error -function getLastSqlError () { - return $GLOBALS['last_sql_error']; -} - -// Gets an array (or false if none is found) from all supported engines -function getArrayFromSupportedSqlEngines ($requestedEngine = 'ALL') { - // Init array - $engines = array(); - - // This also worked, now we need to check if the selected database type is supported - $result = SQL_QUERY('SHOW ENGINES', __FUNCTION__, __LINE__); - - // Are there entries? (Bad if not) - if (!SQL_HASZERONUMS($result)) { - // Load all and check for active entries - while ($content = SQL_FETCHARRAY($result)) { - // Debug message - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'support=' . $requestedEngine . ',Engine=' . $content['Engine'] . ',Support=' . $content['Support']); - - // Is this supported? - if ((($requestedEngine == 'ALL') || ($content['Engine'] == $requestedEngine)) && (in_array($content['Support'], array('YES', 'DEFAULT')))) { - // Add it - array_push($engines, $content); - } elseif (isDebugModeEnabled()) { - // Log it away in debug mode - logDebugMessage(__FUNCTION__, __LINE__, 'Engine ' . $content['Engine'] . ' is not supported (' . $content['Supported'] . ' - ' . $requestedEngine . ')'); - } - } // END - if - } else { - // No engines! :( - $engines = FALSE; - } - - // Free result - SQL_FREERESULT($result); - - // Return result - return $engines; -} - // [EOF] ?> diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php index e6fcb897ee..3a5696cd6b 100644 --- a/inc/extensions-functions.php +++ b/inc/extensions-functions.php @@ -120,7 +120,7 @@ function loadExtension ($ext_name, $ext_mode, $ext_ver = '0.0.0', $isDryRun = FA } // END - if // Load extension's own language file if not in test mode - if ((getExtensionMode() != 'test') && (ifExtensionHasLanguageFile($ext_name))) { + if ((getExtensionMode() != 'test') && (isExtensionLanguageFileReadable($ext_name))) { // Load it loadLanguageFile($ext_name); } // END - if @@ -359,40 +359,45 @@ function registerExtension ($ext_name, $taskId, $isDryRun = FALSE, $ignoreUpdate // Run installation pre-installation filters runFilterChain('pre_extension_installed', array('dry_run' => isExtensionDryRun(), 'ext_installing' => TRUE, 'enable_codes' => FALSE)); + // Copy current name to save calls + $currentName = getCurrentExtensionName(); + // Register extension - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'insert=' . getCurrentExtensionName() . '/' . getCurrentExtensionVersion() . ' - INSERT!'); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'insert=' . $currentName . '/' . getCurrentExtensionVersion() . ' - INSERT!'); if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) { // New way, with CSS - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName() . ',always_active=' . getThisExtensionAlwaysActive() . ', ext_ver=' . getCurrentExtensionVersion() . 'ext_css=' . getExtensionHasCss()); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $currentName . ',always_active=' . getThisExtensionAlwaysActive() . ', ext_ver=' . getCurrentExtensionVersion() . 'ext_css=' . getExtensionHasCss()); SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_extensions` (`ext_name`, `ext_active`, `ext_version`, `ext_has_css`) VALUES ('%s','%s','%s','%s')", array( - getCurrentExtensionName(), + $currentName, getThisExtensionAlwaysActive(), getCurrentExtensionVersion(), getExtensionHasCss() ), __FUNCTION__, __LINE__); } else { // Old way, no CSS - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName() . ',always_active=' . getThisExtensionAlwaysActive() . ', ext_ver=' . getCurrentExtensionVersion()); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $currentName . ',always_active=' . getThisExtensionAlwaysActive() . ', ext_ver=' . getCurrentExtensionVersion()); SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_extensions` (`ext_name`, `ext_active`, `ext_version`) VALUES ('%s','%s','%s')", array( - getCurrentExtensionName(), + $currentName, getThisExtensionAlwaysActive(), getCurrentExtensionVersion() ), __FUNCTION__, __LINE__); } - // Use the insert id as extension id and cache it for early usage - $GLOBALS['cache_array']['extension']['ext_id'][getCurrentExtensionName()] = SQL_INSERTID(); - $GLOBALS['cache_array']['extension']['ext_name'][SQL_INSERTID()] = getCurrentExtensionName(); + /* + * Use the insert id as extension id and "cache" all data for + * this extension for early usage. + */ + copyCurrentExtensionDataToCacheArray($ext_name, SQL_INSERTID()); // Mark it as installed - $GLOBALS['ext_is_installed'][getCurrentExtensionName()] = TRUE; + $GLOBALS['ext_is_installed'][$currentName] = TRUE; // Remove cache file(s) if extension is active runFilterChain('post_extension_installed', array( 'pool' => 'extension', - 'ext_name' => getCurrentExtensionName(), + 'ext_name' => $currentName, 'task_id' => $taskId )); @@ -1754,8 +1759,8 @@ function getExtensionHasCss () { return $GLOBALS[__FUNCTION__][getCurrentExtensionName()][getCurrentTheme()]; } -// Checks whether the given extension has a language file -function ifExtensionHasLanguageFile ($ext_name) { +// Checks whether the given extension's language file is readable +function isExtensionLanguageFileReadable ($ext_name) { // Is there cache? if (isset($GLOBALS['cache_array']['extension']['ext_lang'][$ext_name])) { // Count cache hits @@ -2246,5 +2251,19 @@ function isExtensionLibraryLoaded ($ext_name) { return ((isset($GLOBALS['ext_loaded']['library'][$ext_name])) && ($GLOBALS['ext_loaded']['library'][$ext_name] === TRUE)); } +// Copies the given extension's data to cache_array (USE THIS ONLY IN REGISTRATION PHASE!) +function copyExtensionDataToCacheArray ($ext_name, $ext_id) { + // Copy all data + $GLOBALS['cache_array']['extension']['ext_id'][$currentName] = $ext_id; + $GLOBALS['cache_array']['extension']['ext_name'][$ext_id] = $currentName; + $GLOBALS['cache_array']['extension']['ext_version'][$currentName] = getCurrentExtensionVersion(); + $GLOBALS['cache_array']['extension']['ext_active'][$currentName] = getThisExtensionAlwaysActive(); + $GLOBALS['cache_array']['extension']['ext_lang'][$currentName] = convertBooleanToYesNo(isExtensionLanguageFileReadable($currentName)); + $GLOBALS['cache_array']['extension']['ext_func'][$currentName] = convertBooleanToYesNo(isExtensionFunctionFileReadable($currentName)); + $GLOBALS['cache_array']['extension']['ext_menu'][$currentName] = convertBooleanToYesNo(ifModuleHasMenu($currentName)); + $GLOBALS['cache_array']['extension']['ext_css'][$currentName] = convertBooleanToYesNo(getExtensionHasCss()); + $GLOBALS['cache_array']['extension']['ext_deprecated'][$currentName] = 'N'; +} + // [EOF] ?> diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php index 77eb4bb074..f94fdb8b40 100644 --- a/inc/mysql-connect.php +++ b/inc/mysql-connect.php @@ -40,6 +40,9 @@ if (!defined('__SECURITY')) { die(); } // END - if +// Init array +$__functions = array(); + // Init include file array as it follows same naming scheme foreach ( array( 'stats', @@ -56,16 +59,20 @@ foreach ( array( 'filter', 'revision', 'extensions') as $lib) { - // Load special functions - loadIncludeOnce('inc/' . $lib . '-functions.php'); + + // Add it + $__functions[] = $lib . '-functions'; } // END - foreach // Load more function libraries or includes -foreach (array('filters', 'mysql-manager', 'handler') as $lib) { +foreach (array_merge($__functions, array('filters', 'mysql-manager', 'handler')) as $lib) { // Load special functions loadIncludeOnce('inc/' . $lib . '.php'); } // END - foreach +// Remove array +unset($__functions); + // Set error handler set_error_handler('__errorHandler'); diff --git a/inc/sql-functions.php b/inc/sql-functions.php index e61f393804..671a866744 100644 --- a/inc/sql-functions.php +++ b/inc/sql-functions.php @@ -278,5 +278,465 @@ function importSqlDump ($path, $dumpName, $sqlPool) { mergeSqls(explode(";\n", $fileContent), $sqlPool); } +// SQL string escaping +function SQL_QUERY_ESC ($sqlString, $data, $F, $L, $run = TRUE, $strip = TRUE, $secure = TRUE) { + // Link is there? + if ((!SQL_IS_LINK_UP()) || (!is_array($data))) { + // Link is down or data is not an array + /* DEBUG: */ logDebugMessage($F, $L, 'SQL_IS_LINK_UP()=' . intval(SQL_IS_LINK_UP()) . ',data[]=' . gettype($data) . ',sqlString=' . $sqlString . ': ABORTING!'); + return FALSE; + } // END - if + + // Init array for escape'd data with SQL string + $dataSecured = array( + '__sql_string' => $sqlString + ); + + // Escape all data + foreach ($data as $key => $value) { + $dataSecured[$key] = SQL_ESCAPE($value, $secure, $strip); + } // END - foreach + + // Generate query + $query = call_user_func_array('sprintf', $dataSecured); + + if ($run === TRUE) { + // Run SQL query (default) + return SQL_QUERY($query, $F, $L); + } else { + // Return secured string + return $query; + } +} + +// SELECT query string from table, columns and so on... ;-) +function SQL_RESULT_FROM_ARRAY ($table, $columns, $idRow, $id, $F, $L) { + // Is columns an array? + if (!is_array($columns)) { + // No array + reportBug(__FUNCTION__, __LINE__, sprintf("columns is not an array. %s != array, file=%s, line=%s", + gettype($columns), + basename($F), + $L + )); + + // Abort here with 'false' + return FALSE; + } // END - if + + // Is this is a simple array? + if ((is_array($columns[0])) && (isset($columns[0]['column']))) { + // Begin with SQL query + $sql = 'SELECT '; + + // No, it comes from XML, so get it back from it + $sql .= getSqlPartFromXmlArray($columns); + + // Finalize it + $sql .= " FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s' LIMIT 1"; + } else { + // Yes, prepare the SQL statement + $sql = 'SELECT `' . implode('`, `', $columns) . "` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s' LIMIT 1"; + } + + // Return the result + return SQL_QUERY_ESC($sql, + array( + $table, + $idRow, + bigintval($id), + ), $F, $L + ); +} + +// ALTER TABLE wrapper function +function SQL_ALTER_TABLE ($sql, $F, $L, $enableCodes = TRUE) { + // Abort if link is down + if (!SQL_IS_LINK_UP()) return FALSE; + + // This is the default result... + $result = FALSE; + + // Determine index/fulltext/unique word + $isAlterIndex = ( + ( + isInString('INDEX', $sql) + ) || ( + isInString('KEY', $sql) + ) || ( + isInString('FULLTEXT', $sql) + ) || ( + isInString('UNIQUE', $sql) + ) + ); + + // Extract table name + $tableArray = explode(' ', $sql); + $tableName = str_replace('`', '', $tableArray[2]); + + // Debug log + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sql . ',tableName=' . $tableName . ',tableArray=
' . print_r($tableArray, TRUE) . '
,isAlterIndex=' . intval($isAlterIndex)); + + // Shall we add/drop? + if (((isInString('ADD', $sql)) || (isInString('DROP', $sql)) || (isInString('CHANGE', $sql))) && ($isAlterIndex === FALSE)) { + // Try two columns, one should fix + foreach (array(4,5) as $idx) { + // If an entry is not set, abort here + if (!isset($tableArray[$idx])) { + // Debug log this + logDebugMessage(__FUNCTION__, __LINE__, 'columnName=' . $columnName . ',idx=' . $idx . ',sql=' . $sql . ' is missing!'); + break; + } // END - if + + // And column name as well + $columnName = $tableArray[$idx]; + + // Debug log + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'columnName=' . $columnName . ',idx=' . $idx . ',sql=' . $sql . ',hasZeroNums=' . intval(ifSqlTableColumnExists($tableName, $columnName))); + + // Is there no entry on ADD or an entry on DROP/CHANGE? + if (((!ifSqlTableColumnExists($tableName, $columnName)) && (isInString('ADD', $sql))) || ((ifSqlTableColumnExists($tableName, $columnName)) && ((isInString('DROP', $sql)) || ((isInString('CHANGE', $sql)) && ($idx == 4) && ((!ifSqlTableColumnExists($tableName, $tableArray[5])) || ($columnName == $tableArray[5])))))) { + // Do the query + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Executing: ' . $sql); + $result = SQL_QUERY($sql, $F, $L, FALSE); + + // Skip further attempt(s) + break; + } elseif ((((ifSqlTableColumnExists($tableName, $columnName)) && (isInString('ADD', $sql))) || ((!ifSqlTableColumnExists($tableName, $columnName)) && ((isInString('DROP', $sql))) || (isInString('CHANGE', $sql)))) && ($columnName != 'KEY')) { + // Abort here because it is alreay there + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Skipped: sql=' . $sql . ',columnName=' . $columnName . ',idx=' . $idx); + break; + } elseif ((!ifSqlTableColumnExists($tableName, $columnName)) && (isInString('DROP', $sql))) { + // Abort here because we tried to drop a column which is not there (never created maybe) + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'No drop: ' . $sql); + break; + } elseif ($columnName != 'KEY') { + // Something didn't fit, we better log it + logDebugMessage(__FUNCTION__, __LINE__, 'Possible problem: ' . $sql . ',hasZeroNums=' . intval(ifSqlTableColumnExists($tableName, $columnName)) . ''); + } + } // END - foreach + } elseif ((getTableType() == 'InnoDB') && (isInString('FULLTEXT', $sql))) { + // Skip this query silently because InnoDB does not understand fulltext indexes + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Skipped FULLTEXT: sql=%s,tableName=%s,hasZeroNums=%d,file=%s,line=%s", $sql, $tableName, intval((is_bool($result)) ? 0 : ifSqlTableColumnExists($columnName)), $F, $L)); + } elseif ($isAlterIndex === TRUE) { + // And column name as well without backticks + $keyName = str_replace('`', '', $tableArray[5]); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'keyName=' . $keyName . ',tableArray=
' . print_r($tableArray, TRUE) . '
'); + + // Is this "UNIQUE" or so? FULLTEXT has been handled the elseif() block above + if (in_array(strtoupper($tableArray[4]), array('INDEX', 'UNIQUE', 'KEY', 'FULLTEXT'))) { + // Init loop + $begin = 1; + $keyName = ','; + while (isInString(',', $keyName)) { + // Use last + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'keyName=' . $keyName . 'begin=' . $begin . ' - BEFORE'); + $keyName = str_replace('`', '', $tableArray[count($tableArray) - $begin]); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'keyName=' . $keyName . 'begin=' . $begin . ' - BETWEEN'); + + // Remove brackes + $keyName = str_replace(array('(', ')'), array('', ''), $keyName); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'keyName=' . $keyName . 'begin=' . $begin . ' - AFTER'); + + // Continue + $begin++; + } // END while + } // END - if + + // Shall we run it? + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ', tableArray[3]=' . $tableArray[3] . ',keyName=' . $keyName); + if (($tableArray[3] == 'ADD') && (!ifSqlTableIndexExist($tableName, $keyName))) { + // Send it to the SQL_QUERY() function to add it + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sql . ' - ADDING!'); + $result = SQL_QUERY($sql, $F, $L, $enableCodes); + } elseif (($tableArray[3] == 'DROP') && (ifSqlTableIndexExist($tableName, $keyName))) { + // Send it to the SQL_QUERY() function to drop it + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sql . ' - DROPPING!'); + $result = SQL_QUERY($sql, $F, $L, $enableCodes); + } else { + // Not executed + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Not executed: ' . $sql); + } + } else { + // Other ALTER TABLE query + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $sql); + $result = SQL_QUERY($sql, $F, $L, $enableCodes); + } + + // Return result + return $result; +} + +// Getter for SQL link +function SQL_GET_LINK () { + // Init link + $link = NULL; + + // Is it in the globals? + if (isset($GLOBALS['sql_link'])) { + // Then take it + $link = $GLOBALS['sql_link']; + } // END - if + + // Return it + return $link; +} + +// Setter for link +function SQL_SET_LINK ($link) { + // Is this a resource or null? + if ((ifFatalErrorsDetected()) && (isInstallationPhase())) { + // This may happen in installation phase + return; + } elseif ((!is_resource($link)) && (!is_null($link))) { + // This should never happen! + reportBug(__FUNCTION__, __LINE__, sprintf("Type of link is not resource or null, type=%s", gettype($link))); + } // END - if + + // Set it + $GLOBALS['sql_link'] = $link; + + // Re-init cache + $GLOBALS['is_sql_link_up'] = is_resource($link); +} + +// Checks if the link is up +function SQL_IS_LINK_UP () { + // Is there cached this? + if (!isset($GLOBALS['is_sql_link_up'])) { + // Determine it + $GLOBALS['is_sql_link_up'] = is_resource(SQL_GET_LINK()); + } // END - if + + // Return the result + return $GLOBALS['is_sql_link_up']; +} + +// Wrapper function to make code more readable +function SQL_HASZERONUMS ($result) { + // Just pass it through + return (SQL_NUMROWS($result) === 0); +} + +// Wrapper function to make code more readable +function SQL_HASZEROAFFECTED () { + // Just pass it through + return (SQL_AFFECTEDROWS() === 0); +} + +// Private function to prepare the SQL query string +function SQL_PREPARE_SQL_STRING ($sqlString, $enableCodes = TRUE) { + // Debug message + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlString=' . $sqlString . ',enableCodes=' . intval($enableCodes) . ' - ENTERED!'); + + // Is it already cached? + if (!isset($GLOBALS['sql_strings']['' . $sqlString . ''])) { + // Preserve escaping and compile URI codes+config+expression code + $sqlString2 = FILTER_COMPILE_EXPRESSION_CODE(FILTER_COMPILE_CONFIG($sqlString)); + + // Debug message + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlString2=' . $sqlString2); + + // Do final compilation and revert {ESCAPE} + $GLOBALS['sql_strings']['' . $sqlString . ''] = doFinalCompilation($sqlString2, FALSE, $enableCodes); + } else { + // Log message + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlString=' . $sqlString . ' - CACHE!'); + } + + // Debug message + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlString=' . $sqlString . ',enableCodes=' . intval($enableCodes) . ',sql_strings=' . $GLOBALS['sql_strings']['' . $sqlString . ''] . ' - EXIT!'); + + // Return it + return $GLOBALS['sql_strings']['' . $sqlString . '']; +} + +// Creates a MySQL TIMESTAMP compatible string from given Uni* timestamp +function SQL_EPOCHE_TO_TIMESTAMP ($timestamp) { + return generateDateTime($timestamp, 7); +} + +// Check if there is a SQL table created +function ifSqlTableExists ($tableName) { + // Make sure double-prefixes are being removed + $tableName = str_replace('{?_MYSQL_PREFIX?}_', '', $tableName); + + // Log message + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ' - ENTERED!'); + + // Is there cache? + if (!isset($GLOBALS[__FUNCTION__][$tableName])) { + // Check if the table is there + $result = SQL_QUERY_ESC("SHOW TABLES FROM `{?__DB_NAME?}` WHERE `Tables_in_{?__DB_NAME?}`='{?_MYSQL_PREFIX?}_%s'", + array($tableName), __FILE__, __LINE__); + + // Is a link there? + if (!is_resource($result)) { + // Is installation phase? + if (isInstallationPhase()) { + // Then silently abort here + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'result[]=' . gettype($result) . ',isLinkUp=' . intval(SQL_IS_LINK_UP()) . ',tableName=' . $tableName . ' - Returning FALSE ...'); + return FALSE; + } else { + // Please report this + reportBug(__FUNCTION__, __LINE__, 'result[]=' . gettype($result) . ' is not a resource.'); + } + } // END - if + + // Is there an entry? + $GLOBALS[__FUNCTION__][$tableName] = (SQL_NUMROWS($result) == 1); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',numRows=' . intval($GLOBALS[__FUNCTION__][$tableName])); + } // END - if + + // Return cache + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',result=' . intval($GLOBALS[__FUNCTION__][$tableName]) . ' - EXIT!'); + return $GLOBALS[__FUNCTION__][$tableName]; +} + +// Is a table column there? +function ifSqlTableColumnExists ($tableName, $columnName, $forceFound = FALSE) { + // Remove back-ticks + $columnName = str_replace('`', '', $columnName); + + // Debug message + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',columnName=' . $columnName . ' - ENTERED!'); + + // If the table is not there, it is okay + if (!ifSqlTableExists($tableName)) { + // Then abort here + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Table ' . $tableName . ' does not exist, columnName=' . $columnName . ',forceFound=' . intval($forceFound)); + return (($forceFound === FALSE) && (isInstallationPhase())); + } // END - if + + // Get column information + $result = SQL_QUERY_ESC("SHOW COLUMNS FROM `%s` LIKE '%s'", + array( + $tableName, + $columnName + ), __FUNCTION__, __LINE__); + + // Is a link there? + if (!is_resource($result)) { + // Is installation phase? + if (isInstallationPhase()) { + // Then silently abort here + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'result[]=' . gettype($result) . ',isLinkUp=' . intval(SQL_IS_LINK_UP()) . ',tableName=' . $tableName . ',columnName=' . $columnName . ' - Returning FALSE ...'); + return $forceFound; + } else { + // Please report this + reportBug(__FUNCTION__, __LINE__, 'result[]=' . gettype($result) . ' is not a resource.'); + } + } // END - if + + // Determine it + $doesExist = (!SQL_HASZERONUMS($result)); + + // Free result + SQL_FREERESULT($result); + + // Return cache + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',columnName=' . $columnName . ',doesExist=' . intval($doesExist) . ' - EXIT!'); + return $doesExist; +} + +// Checks depending on the mode if the index is there +function ifSqlTableIndexExist ($tableName, $keyName, $forceFound = FALSE) { + // Remove back-ticks + $keyName = str_replace('`', '', $keyName); + + // Debug message + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',keyName=' . $keyName . ' - ENTERED!'); + + // If the table is not there, it is okay + if (!ifSqlTableExists($tableName)) { + // Then abort here + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Table ' . $tableName . ' does not exist, keyName=' . $keyName . ',forceFound=' . intval($forceFound)); + return (($forceFound === FALSE) && (isInstallationPhase())); + } // END - if + + // Show indexes + $result = SQL_QUERY_ESC("SHOW INDEX FROM `%s`", array($tableName), __FUNCTION__, __LINE__); + + // Is a link there? + if (!is_resource($result)) { + // Is installation phase? + if (isInstallationPhase()) { + // Then silently abort here + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'result[]=' . gettype($result) . ',isLinkUp=' . intval(SQL_IS_LINK_UP()) . ',tableName=' . $tableName . ',keyName=' . $keyName . ' - Returning FALSE ...'); + return $forceFound; + } else { + // Please report this + reportBug(__FUNCTION__, __LINE__, 'result[]=' . gettype($result) . ' is not a resource.'); + } + } // END - if + + // The key is not found by default + $doesExist = FALSE; + + // Walk through all + while ($content = SQL_FETCHARRAY($result)) { + // Is it the requested one? + if ($content['Key_name'] == $keyName) { + // Then it is found and exit + $doesExist = TRUE; + break; + } // END - if + } // END - while + + // Free result + SQL_FREERESULT($result); + + // Return cache + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',keyName=' . $keyName . ',doesExist=' . intval($doesExist) . ' - EXIT!'); + return $doesExist; +} + +// Init database layer +function initDatabaseLayer () { + // Set all required variables: + $GLOBALS['last_sql_error'] = ''; +} + +// Get last SQL error +function getLastSqlError () { + return $GLOBALS['last_sql_error']; +} + +// Gets an array (or false if none is found) from all supported engines +function getArrayFromSupportedSqlEngines ($requestedEngine = 'ALL') { + // Init array + $engines = array(); + + // This also worked, now we need to check if the selected database type is supported + $result = SQL_QUERY('SHOW ENGINES', __FUNCTION__, __LINE__); + + // Are there entries? (Bad if not) + if (!SQL_HASZERONUMS($result)) { + // Load all and check for active entries + while ($content = SQL_FETCHARRAY($result)) { + // Debug message + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'support=' . $requestedEngine . ',Engine=' . $content['Engine'] . ',Support=' . $content['Support']); + + // Is this supported? + if ((($requestedEngine == 'ALL') || ($content['Engine'] == $requestedEngine)) && (in_array($content['Support'], array('YES', 'DEFAULT')))) { + // Add it + array_push($engines, $content); + } elseif (isDebugModeEnabled()) { + // Log it away in debug mode + logDebugMessage(__FUNCTION__, __LINE__, 'Engine ' . $content['Engine'] . ' is not supported (' . $content['Supported'] . ' - ' . $requestedEngine . ')'); + } + } // END - if + } else { + // No engines! :( + $engines = FALSE; + } + + // Free result + SQL_FREERESULT($result); + + // Return result + return $engines; +} + // [EOF] ?> -- 2.39.2