* $Author:: $ *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team *
* For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
$SQL .= '`' . $entry . '`=NULL,';
} elseif ((substr($value, -2, 2) == '()') || (substr($value, 0, 1) == '`')) {
// SQL function needs no ticks (')
- $SQL .= '`' . $entry . '`=' . SQL_ESCAPE($value) . ',';
+ $SQL .= '`' . $entry . '`=' . sqlEscapeString($value) . ',';
} elseif ('' . bigintval($value, TRUE, FALSE) . '' == '' . $value . '') {
// No need for ticks (')
$SQL .= '`' . $entry . '`=' . $value . ',';
+ } elseif ('' . (float) $value . '' == '' . $value . '') {
+ // Float number detected
+ $SQL .= '`' . $entry . '`=' . sprintf(getConfig('FLOAT_MASK'), $value) . ',';
} else {
// Strings need ticks (') around them
- $SQL .= '`' . $entry . "`='" . SQL_ESCAPE($value) . "',";
+ $SQL .= '`' . $entry . "`='" . sqlEscapeString($value) . "',";
}
} else {
// Handle multi-dimensional data
$SQL .= '`' . $entry . '`=NULL,';
} elseif ((substr($value[$multiDimId], -2, 2) == '()') || (substr($value[$multiDimId], 0, 1) == '`')) {
// SQL function needs no ticks (')
- $SQL .= '`' . $entry . '`=' . SQL_ESCAPE($value[$multiDimId]) . ',';
+ $SQL .= '`' . $entry . '`=' . sqlEscapeString($value[$multiDimId]) . ',';
} elseif (('' . bigintval($value[$multiDimId], TRUE, FALSE) . '' == '' . $value[$multiDimId] . '')) {
// No need for ticks (')
$SQL .= '`' . $entry . '`=' . $value[$multiDimId] . ',';
+ } elseif ('' . (float) $value[$multiDimId] . '' == '' . $value[$multiDimId] . '') {
+ // Float number detected
+ $SQL .= '`' . $entry . '`=' . sprintf(getConfig('FLOAT_MASK'), $value[$multiDimId]) . ',';
} else {
// Strings need ticks (') around them
- $SQL .= '`' . $entry . "`='" . SQL_ESCAPE($value[$multiDimId]) . "',";
+ $SQL .= '`' . $entry . "`='" . sqlEscapeString($value[$multiDimId]) . "',";
}
}
} // END - foreach
// "Getter" for an "INSERT INTO" SQL query
function getInsertSqlFromArray ($array, $tableName) {
// Init SQL
- $SQL = 'INSERT INTO
-`{?_MYSQL_PREFIX?}_' . $tableName . '`
-(
-`' . implode('`, `', array_keys($array)) . '`
-) VALUES (';
+ $SQL = 'INSERT INTO `{?_MYSQL_PREFIX?}_' . $tableName . '` (`' . implode('`, `', array_keys($array)) . '`) VALUES (';
// Walk through all entries
foreach ($array as $key => $value) {
$SQL .= 'NULL,';
} elseif (substr($value, -2, 2) == '()') {
// SQL function needs no ticks (')
- $SQL .= SQL_ESCAPE($value) . ',';
+ $SQL .= sqlEscapeString($value) . ',';
} elseif ('' . bigintval($value, TRUE, FALSE) . '' == '' . $value . '') {
// Number detected, no need for ticks (')
$SQL .= bigintval($value) . ',';
} elseif ('' . (float) $value . '' == '' . $value . '') {
// Float number detected
- $SQL .= sprintf('%01.5f', $value);
+ $SQL .= sprintf(getConfig('FLOAT_MASK'), $value) . ',';
} else {
// Everything else might be a string, so add ticks around it
- $SQL .= chr(39) . SQL_ESCAPE($value) . chr(39) . ',';
+ $SQL .= chr(39) . sqlEscapeString($value) . chr(39) . ',';
}
} // END - foreach
$SQL = substr($SQL, 0, -1) . ')';
// Return SQL query
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',sql=' . $SQL);
return $SQL;
}
// Function to unset __is_sql_link_up
-function unsetSqlLinkUp ($F, $L) {
+function unsetSqlLinkUp ($file, $line) {
// Unset it
- //* DEBUG: */ logDebugMessage($F, $L, __FUNCTION__ . ': Called!');
- SQL_SET_LINK($F, $L, NULL);
+ //* DEBUG: */ logDebugMessage($file, $line, __FUNCTION__ . ': Called!');
+ setSqlLink($file, $line, NULL);
}
// Initializes the SQL link by bringing it up if set
unsetSqlLinkUp(__FUNCTION__, __LINE__);
// Do this only if link is down
- assert(!SQL_IS_LINK_UP());
+ assert(!isSqlLinkUp());
// Is the configuration data set?
if ((!empty($GLOBALS['mysql']['host'])) && (!empty($GLOBALS['mysql']['login'])) && (!empty($GLOBALS['mysql']['dbase']))) {
unsetSqlLinkUp(__FUNCTION__, __LINE__);
// Connect to DB
- SQL_CONNECT($GLOBALS['mysql']['host'], $GLOBALS['mysql']['login'], $GLOBALS['mysql']['password'], __FUNCTION__, __LINE__);
+ sqlConnectToDatabase($GLOBALS['mysql']['host'], $GLOBALS['mysql']['login'], $GLOBALS['mysql']['password'], __FUNCTION__, __LINE__);
// Is the link valid?
- if (SQL_IS_LINK_UP()) {
+ if (isSqlLinkUp()) {
// Enable exit on error
enableExitOnError();
// Is it a valid resource?
- if (SQL_SELECT_DB($GLOBALS['mysql']['dbase'], __FUNCTION__, __LINE__) === TRUE) {
+ if (sqlSelectDatabase($GLOBALS['mysql']['dbase'], __FUNCTION__, __LINE__) === TRUE) {
// Set database name (required for ext-optimize and ifSqlTableExists())
setConfigEntry('__DB_NAME', $GLOBALS['mysql']['dbase']);
}
// SQL string escaping
-function SQL_QUERY_ESC ($sqlString, $data, $F, $L, $run = TRUE, $strip = TRUE, $secure = TRUE) {
+function sqlQueryEscaped ($sqlString, $data, $file, $line, $run = TRUE, $strip = TRUE, $secure = TRUE) {
// Link is there?
- if ((!SQL_IS_LINK_UP()) || (!is_array($data))) {
+ if ((!isSqlLinkUp()) || (!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!');
+ //* DEBUG: */ logDebugMessage($file, $line, 'isSqlLinkUp()=' . intval(isSqlLinkUp()) . ',data[]=' . gettype($data) . ',sqlString=' . $sqlString . ': ABORTING!');
return FALSE;
} // END - if
// Escape all data
foreach ($data as $key => $value) {
- $dataSecured[$key] = SQL_ESCAPE($value, $secure, $strip);
+ $dataSecured[$key] = sqlEscapeString($value, $secure, $strip);
} // END - foreach
// Generate query
if ($run === TRUE) {
// Run SQL query (default)
- return SQL_QUERY($query, $F, $L);
+ return sqlQuery($query, $file, $line);
} 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) {
+function getSqlResultFromArray ($table, $columns, $idRow, $id, $file, $line) {
// 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
+ basename($file),
+ $line
));
// Abort here with 'false'
}
// Return the result
- return SQL_QUERY_ESC($sql,
+ return sqlQueryEscaped($sql,
array(
$table,
$idRow,
bigintval($id),
- ), $F, $L
+ ), $file, $line
);
}
// ALTER TABLE wrapper function
-function SQL_ALTER_TABLE ($sql, $F, $L, $enableCodes = TRUE) {
+function sqlQueryAlterTable ($sql, $file, $line, $enableCodes = TRUE) {
// Abort if link is down
- if (!SQL_IS_LINK_UP()) return FALSE;
+ if (!isSqlLinkUp()) return FALSE;
// This is the default result...
$result = FALSE;
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);
+ $result = sqlQuery($sql, $file, $line, FALSE);
// Skip further attempt(s)
break;
} // 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));
+ //* 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)), $file, $line));
} elseif ($isAlterIndex === TRUE) {
// And column name as well without backticks
$keyName = str_replace('`', '', $tableArray[5]);
// 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
+ // Send it to the sqlQuery() function to add it
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sql . ' - ADDING!');
- $result = SQL_QUERY($sql, $F, $L, $enableCodes);
+ $result = sqlQuery($sql, $file, $line, $enableCodes);
} elseif (($tableArray[3] == 'DROP') && (ifSqlTableIndexExist($tableName, $keyName))) {
- // Send it to the SQL_QUERY() function to drop it
+ // Send it to the sqlQuery() function to drop it
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sql . ' - DROPPING!');
- $result = SQL_QUERY($sql, $F, $L, $enableCodes);
+ $result = sqlQuery($sql, $file, $line, $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);
+ $result = sqlQuery($sql, $file, $line, $enableCodes);
}
// Return result
}
// Getter for SQL link
-function SQL_GET_LINK () {
+function getSqlLink () {
// Init link
$link = NULL;
}
// Setter for link
-function SQL_SET_LINK ($F, $L, $link) {
- //* DEBUG: */ logDebugMessage($F . ':' . __FUNCTION__, $L . ':' . __LINE__, 'link[]=' . gettype($link) . ' - ENTERED!');
+function setSqlLink ($file, $line, $link) {
+ //* DEBUG: */ logDebugMessage($file . ':' . __FUNCTION__, $line . ':' . __LINE__, 'link[]=' . gettype($link) . ' - ENTERED!');
// Is this a resource or null?
if ((ifFatalErrorsDetected()) && (isInstallationPhase())) {
// This may happen in installation phase
- //* DEBUG: */ logDebugMessage($F . ':' . __FUNCTION__, $L . ':' . __LINE__, 'Some fatal errors detected in installation phase.');
+ //* DEBUG: */ logDebugMessage($file . ':' . __FUNCTION__, $line . ':' . __LINE__, 'Some fatal errors detected in installation phase.');
return;
} elseif ((!is_resource($link)) && (!is_null($link))) {
// This should never happen!
- reportBug($F . ':' . __FUNCTION__, $L . ':' . __LINE__, sprintf("Type of link is not resource or null, type=%s", gettype($link)));
+ reportBug($file . ':' . __FUNCTION__, $line . ':' . __LINE__, sprintf("Type of link is not resource or null, type=%s", gettype($link)));
} // END - if
// Set it
// Re-init cache
$GLOBALS['__is_sql_link_up'] = is_resource($link);
- //* DEBUG: */ logDebugMessage($F . ':' . __FUNCTION__, $L . ':' . __LINE__, '__is_sql_link_up=' . intval($GLOBALS['__is_sql_link_up']) . ' - EXIT!');
+ //* DEBUG: */ logDebugMessage($file . ':' . __FUNCTION__, $line . ':' . __LINE__, '__is_sql_link_up=' . intval($GLOBALS['__is_sql_link_up']) . ' - EXIT!');
}
// Checks if the link is up
-function SQL_IS_LINK_UP () {
+function isSqlLinkUp () {
// Is there cached this?
if (!isset($GLOBALS['__is_sql_link_up'])) {
// Something bad went wrong
}
// Wrapper function to make code more readable
-function SQL_HASZERONUMS ($result) {
+function ifSqlHasZeroNums ($result) {
// Just pass it through
- return (SQL_NUMROWS($result) === 0);
+ return (sqlNumRows($result) === 0);
}
// Wrapper function to make code more readable
-function SQL_HASZEROAFFECTED () {
+function ifSqlHasZeroAffectedRows () {
// Just pass it through
- return (SQL_AFFECTEDROWS() === 0);
+ return (sqlAffectedRows() === 0);
}
// Private function to prepare the SQL query string
-function SQL_PREPARE_SQL_STRING ($sqlString, $enableCodes = TRUE) {
+function sqlPrepareQueryString ($sqlString, $enableCodes = TRUE) {
// Debug message
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlString=' . $sqlString . ',enableCodes=' . intval($enableCodes) . ' - ENTERED!');
}
// Creates a MySQL TIMESTAMP compatible string from given Uni* timestamp
-function SQL_EPOCHE_TO_TIMESTAMP ($timestamp) {
- return generateDateTime($timestamp, 7);
+function getSqlTimestampFromUnix ($timestamp) {
+ return generateDateTime($timestamp, '7');
}
// Check if there is a SQL table created
// 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'",
+ $result = sqlQueryEscaped("SHOW TABLES FROM `{?__DB_NAME?}` WHERE `Tables_in_{?__DB_NAME?}`='{?_MYSQL_PREFIX?}_%s'",
array($tableName), __FUNCTION__, __LINE__);
// Is a link there?
// 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 ...');
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'result[]=' . gettype($result) . ',isLinkUp=' . intval(isSqlLinkUp()) . ',tableName=' . $tableName . ' - Returning FALSE ...');
return FALSE;
} else {
// Please report this
} // END - if
// Is there an entry?
- $GLOBALS[__FUNCTION__][$tableName] = (SQL_NUMROWS($result) == 1);
+ $GLOBALS[__FUNCTION__][$tableName] = (sqlNumRows($result) == 1);
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',numRows=' . intval($GLOBALS[__FUNCTION__][$tableName]));
} // END - if
} // END - if
// Get column information
- $result = SQL_QUERY_ESC("SHOW COLUMNS FROM `%s` LIKE '%s'",
+ $result = sqlQueryEscaped("SHOW COLUMNS FROM `%s` LIKE '%s'",
array(
$tableName,
$columnName
// 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 ...');
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'result[]=' . gettype($result) . ',isLinkUp=' . intval(isSqlLinkUp()) . ',tableName=' . $tableName . ',columnName=' . $columnName . ' - Returning FALSE ...');
return $forceFound;
} else {
// Please report this
} // END - if
// Determine it
- $doesExist = (!SQL_HASZERONUMS($result));
+ $doesExist = (!ifSqlHasZeroNums($result));
// Free result
- SQL_FREERESULT($result);
+ sqlFreeResult($result);
// Return cache
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',columnName=' . $columnName . ',doesExist=' . intval($doesExist) . ' - EXIT!');
} // END - if
// Show indexes
- $result = SQL_QUERY_ESC("SHOW INDEX FROM `%s`", array($tableName), __FUNCTION__, __LINE__);
+ $result = sqlQueryEscaped("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 ...');
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'result[]=' . gettype($result) . ',isLinkUp=' . intval(isSqlLinkUp()) . ',tableName=' . $tableName . ',keyName=' . $keyName . ' - Returning FALSE ...');
return $forceFound;
} else {
// Please report this
$doesExist = FALSE;
// Walk through all
- while ($content = SQL_FETCHARRAY($result)) {
+ while ($content = sqlFetchArray($result)) {
// Is it the requested one?
if ($content['Key_name'] == $keyName) {
// Then it is found and exit
} // END - while
// Free result
- SQL_FREERESULT($result);
+ sqlFreeResult($result);
// Return cache
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',keyName=' . $keyName . ',doesExist=' . intval($doesExist) . ' - EXIT!');
$engines = array();
// This also worked, now we need to check if the selected database type is supported
- $result = SQL_QUERY('SHOW ENGINES', __FUNCTION__, __LINE__);
+ $result = sqlQuery('SHOW ENGINES', __FUNCTION__, __LINE__);
// Are there entries? (Bad if not)
- if (!SQL_HASZERONUMS($result)) {
+ if (!ifSqlHasZeroNums($result)) {
// Load all and check for active entries
- while ($content = SQL_FETCHARRAY($result)) {
+ while ($content = sqlFetchArray($result)) {
// Debug message
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'support=' . $requestedEngine . ',Engine=' . $content['Engine'] . ',Support=' . $content['Support']);
}
// Free result
- SQL_FREERESULT($result);
+ sqlFreeResult($result);
// Return result
return $engines;
projects / mailer.git / blobdiff