php/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Better use of variable references [hopefully]

Browse Source
This commit is contained in:
Garvin Hicking
2006-08-03 11:26:40 +00:00
parent 80e14346a5
commit 93e2755406
3 changed files with 52 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/NEWS
+4
View File
@@ -3,6 +3,10 @@
Version 1.1-alpha7() Version 1.1-alpha7()
------------------------------------------------------------------------ ------------------------------------------------------------------------
* Better use of "return by references" in some vital areas.
Improves performance. Might introduce glitches. Keep an eye on this!
(garvinhicking)
* Add new template 'comments_by_author' which show comments made * Add new template 'comments_by_author' which show comments made
by authors. New permalink structure: by authors. New permalink structure:
"/comments/[AUTHORNAME]/comments|trackbacks|comments_and_trackbacks/P[PAGENUMBER]/FROM [YYYY-MM-DD]/TO [YYYY-MM-DD]" "/comments/[AUTHORNAME]/comments|trackbacks|comments_and_trackbacks/P[PAGENUMBER]/FROM [YYYY-MM-DD]/TO [YYYY-MM-DD]"
include/functions_config.inc.php
+21 -13
View File
@@ -297,12 +297,12 @@ function serendipity_load_configuration($author = null) {
if (!empty($author)) { if (!empty($author)) {
// Replace default configuration directives with user-relevant data // Replace default configuration directives with user-relevant data
$rows = serendipity_db_query("SELECT name,value $rows =& serendipity_db_query("SELECT name,value
FROM {$serendipity['dbPrefix']}config FROM {$serendipity['dbPrefix']}config
WHERE authorid = '". (int)$author ."'"); WHERE authorid = '". (int)$author ."'");
} else { } else {
// Only get default variables, user-independent (frontend) // Only get default variables, user-independent (frontend)
$rows = serendipity_db_query("SELECT name, value $rows =& serendipity_db_query("SELECT name, value
FROM {$serendipity['dbPrefix']}config FROM {$serendipity['dbPrefix']}config
WHERE authorid = 0"); WHERE authorid = 0");
} }
@@ -410,7 +410,7 @@ function serendipity_checkAutologin($ident, $iv) {
global $serendipity; global $serendipity;
// Fetch login data from DB // Fetch login data from DB
$autologin = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}options WHERE okey = '" . serendipity_db_escape_string($ident) . "' LIMIT 1", true, 'assoc'); $autologin =& serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}options WHERE okey = '" . serendipity_db_escape_string($ident) . "' LIMIT 1", true, 'assoc');
if (!is_array($autologin)) { if (!is_array($autologin)) {
return false; return false;
} }
@@ -472,7 +472,7 @@ function serendipity_authenticate_author($username = '', $password = '', $is_md5
WHERE WHERE
username = '" . serendipity_db_escape_string($username) . "' username = '" . serendipity_db_escape_string($username) . "'
AND password = '" . serendipity_db_escape_string($password) . "'"; AND password = '" . serendipity_db_escape_string($password) . "'";
$row = serendipity_db_query($query, true, 'assoc'); $row =& serendipity_db_query($query, true, 'assoc');
if (is_array($row)) { if (is_array($row)) {
serendipity_setCookie('old_session', session_id()); serendipity_setCookie('old_session', session_id());
@@ -844,7 +844,7 @@ function &serendipity_getPermissions($authorid) {
global $serendipity; global $serendipity;
// Get group information // Get group information
$groups = serendipity_db_query("SELECT ag.groupid, g.name, gc.property, gc.value $groups =& serendipity_db_query("SELECT ag.groupid, g.name, gc.property, gc.value
FROM {$serendipity['dbPrefix']}authorgroups AS ag FROM {$serendipity['dbPrefix']}authorgroups AS ag
LEFT OUTER JOIN {$serendipity['dbPrefix']}groups AS g LEFT OUTER JOIN {$serendipity['dbPrefix']}groups AS g
ON ag.groupid = g.id ON ag.groupid = g.id
@@ -1109,8 +1109,11 @@ function &serendipity_fetchGroup($groupid) {
LEFT OUTER JOIN {$serendipity['dbPrefix']}groupconfig AS gc LEFT OUTER JOIN {$serendipity['dbPrefix']}groupconfig AS gc
ON g.id = gc.id ON g.id = gc.id
WHERE g.id = " . (int)$groupid, false, 'assoc'); WHERE g.id = " . (int)$groupid, false, 'assoc');
foreach($groups AS $group) {
$conf[$group['property']] = $group['value']; if (is_array($groups)) {
foreach($groups AS $group) {
$conf[$group['property']] = $group['value'];
}
} }
// The following are unique // The following are unique
@@ -1133,7 +1136,7 @@ function &serendipity_fetchGroup($groupid) {
function &serendipity_getGroups($authorid, $sequence = false) { function &serendipity_getGroups($authorid, $sequence = false) {
global $serendipity; global $serendipity;
$groups =& serendipity_db_query("SELECT g.id AS confkey, $_groups =& serendipity_db_query("SELECT g.id AS confkey,
g.name AS confvalue, g.name AS confvalue,
g.id AS id, g.id AS id,
g.name AS name g.name AS name
@@ -1141,8 +1144,10 @@ function &serendipity_getGroups($authorid, $sequence = false) {
LEFT OUTER JOIN {$serendipity['dbPrefix']}groups AS g LEFT OUTER JOIN {$serendipity['dbPrefix']}groups AS g
ON g.id = ag.groupid ON g.id = ag.groupid
WHERE ag.authorid = " . (int)$authorid, false, 'assoc'); WHERE ag.authorid = " . (int)$authorid, false, 'assoc');
if (!is_array($groups)) { if (!is_array($_groups)) {
$groups = array(); $groups = array();
} else {
$groups =& $_groups;
} }
if ($sequence) { if ($sequence) {
@@ -1495,7 +1500,7 @@ function serendipity_ACLGet($artifact_id, $artifact_type, $artifact_mode, $artif
AND artifact_id = '" . (int)$artifact_id . "' AND artifact_id = '" . (int)$artifact_id . "'
AND artifact_mode = '" . serendipity_db_escape_string($artifact_mode) . "' AND artifact_mode = '" . serendipity_db_escape_string($artifact_mode) . "'
AND artifact_index = '" . serendipity_db_escape_string($artifact_index) . "'"; AND artifact_index = '" . serendipity_db_escape_string($artifact_index) . "'";
$rows = serendipity_db_query($sql, false, 'assoc'); $rows =& serendipity_db_query($sql, false, 'assoc');
if (!is_array($rows)) { if (!is_array($rows)) {
return false; return false;
@@ -1556,7 +1561,7 @@ function serendipity_ACLCheck($authorid, $artifact_id, $artifact_type, $artifact
AND ( {$artifact_sql['where']} ) AND ( {$artifact_sql['where']} )
GROUP BY result"; GROUP BY result";
$res = serendipity_db_query($sql, true, 'assoc'); $res =& serendipity_db_query($sql, true, 'assoc');
if (is_array($res) && !empty($res['result'])) { if (is_array($res) && !empty($res['result'])) {
return true; return true;
} }
@@ -1803,11 +1808,14 @@ function serendipity_setFormToken($type = 'form') {
function &serendipity_loadThemeOptions(&$template_config) { function &serendipity_loadThemeOptions(&$template_config) {
global $serendipity; global $serendipity;
$template_vars =& serendipity_db_query("SELECT name, value FROM {$serendipity['dbPrefix']}options $_template_vars =& serendipity_db_query("SELECT name, value FROM {$serendipity['dbPrefix']}options
WHERE okey = 't_" . serendipity_db_escape_string($serendipity['template']) . "'", false, 'assoc', false, 'name', 'value'); WHERE okey = 't_" . serendipity_db_escape_string($serendipity['template']) . "'", false, 'assoc', false, 'name', 'value');
if (!is_array($template_vars)) { if (!is_array($_template_vars)) {
$template_vars = array(); $template_vars = array();
} else {
$template_vars =& $_template_vars;
} }
foreach($template_config AS $key => $item) { foreach($template_config AS $key => $item) {
if (!isset($template_vars[$item['var']])) { if (!isset($template_vars[$item['var']])) {
$template_vars[$item['var']] = $item['default']; $template_vars[$item['var']] = $item['default'];
include/functions_entries.inc.php
+27 -24
View File
@@ -37,7 +37,7 @@ function serendipity_deleteCategory($category_range, $admin_category) {
function serendipity_fetchCategoryRange($categoryid) { function serendipity_fetchCategoryRange($categoryid) {
global $serendipity; global $serendipity;
$res = serendipity_db_query("SELECT category_left, category_right FROM {$serendipity['dbPrefix']}category WHERE categoryid='". (int)$categoryid ."'"); $res =& serendipity_db_query("SELECT category_left, category_right FROM {$serendipity['dbPrefix']}category WHERE categoryid='". (int)$categoryid ."'");
if (!is_array($res) || !isset($res[0]['category_left']) || !isset($res[0]['category_right'])) { if (!is_array($res) || !isset($res[0]['category_left']) || !isset($res[0]['category_right'])) {
$res = array(array('category_left' => 0, 'category_right' => 0)); $res = array(array('category_left' => 0, 'category_right' => 0));
} }
@@ -94,7 +94,7 @@ function serendipity_fetchCategoryInfo($categoryid, $categoryname = '') {
FROM {$serendipity['dbPrefix']}category AS c FROM {$serendipity['dbPrefix']}category AS c
WHERE category_name = '" . serendipity_db_escape_string($categoryname) . "'"; WHERE category_name = '" . serendipity_db_escape_string($categoryname) . "'";
$ret = serendipity_db_query($query); $ret =& serendipity_db_query($query);
return $ret[0]; return $ret[0];
} else { } else {
$query = "SELECT $query = "SELECT
@@ -107,7 +107,7 @@ function serendipity_fetchCategoryInfo($categoryid, $categoryname = '') {
FROM {$serendipity['dbPrefix']}category AS c FROM {$serendipity['dbPrefix']}category AS c
WHERE categoryid = " . (int)$categoryid; WHERE categoryid = " . (int)$categoryid;
$ret = serendipity_db_query($query); $ret =& serendipity_db_query($query);
return $ret[0]; return $ret[0];
} }
} }
@@ -119,7 +119,7 @@ function serendipity_fetchCategoryInfo($categoryid, $categoryname = '') {
* @param int The ID of the entry * @param int The ID of the entry
* @return array The array of associated categories to that entry * @return array The array of associated categories to that entry
*/ */
function serendipity_fetchEntryCategories($entryid) { function &serendipity_fetchEntryCategories($entryid) {
global $serendipity; global $serendipity;
if (is_numeric($entryid)) { if (is_numeric($entryid)) {
@@ -134,9 +134,10 @@ function serendipity_fetchEntryCategories($entryid) {
ON ec.categoryid = c.categoryid ON ec.categoryid = c.categoryid
WHERE ec.entryid = {$entryid}"; WHERE ec.entryid = {$entryid}";
$cat = serendipity_db_query($query); $cat =& serendipity_db_query($query);
if (!is_array($cat)) { if (!is_array($cat)) {
return array(); $arr = array();
return $arr;
} else { } else {
return $cat; return $cat;
} }
@@ -189,7 +190,7 @@ function serendipity_fetchEntryCategories($entryid) {
* @param string If set to "array", the array of entries will be returned. "flat-array" will only return the articles without their entryproperties. "single" will only return a 1-dimensional array. "query" will only return the used SQL. * @param string If set to "array", the array of entries will be returned. "flat-array" will only return the articles without their entryproperties. "single" will only return a 1-dimensional array. "query" will only return the used SQL.
* @return array Holds the super-array of all entries with all additional information * @return array Holds the super-array of all entries with all additional information
*/ */
function serendipity_fetchEntries($range = null, $full = true, $limit = '', $fetchDrafts = false, $modified_since = false, $orderby = 'timestamp DESC', $filter_sql = '', $noCache = false, $noSticky = false, $select_key = null, $group_by = null, $returncode = 'array') { function &serendipity_fetchEntries($range = null, $full = true, $limit = '', $fetchDrafts = false, $modified_since = false, $orderby = 'timestamp DESC', $filter_sql = '', $noCache = false, $noSticky = false, $select_key = null, $group_by = null, $returncode = 'array') {
global $serendipity; global $serendipity;
$cond = array(); $cond = array();
@@ -382,7 +383,7 @@ function serendipity_fetchEntries($range = null, $full = true, $limit = '', $fet
return $query; return $query;
} }
$ret = serendipity_db_query($query, $fetch_single, 'assoc'); $ret =& serendipity_db_query($query, $fetch_single, 'assoc');
if (is_string($ret)) { if (is_string($ret)) {
die("Query failed: $ret"); die("Query failed: $ret");
@@ -438,7 +439,7 @@ function serendipity_fetchEntryData(&$ret) {
ON ec.categoryid = c.categoryid ON ec.categoryid = c.categoryid
WHERE " . serendipity_db_in_sql('ec.entryid', $search_ids); WHERE " . serendipity_db_in_sql('ec.entryid', $search_ids);
$search_ret = serendipity_db_query($query, false, 'assoc'); $search_ret =& serendipity_db_query($query, false, 'assoc');
if (is_array($search_ret)) { if (is_array($search_ret)) {
foreach($search_ret AS $i => $entry) { foreach($search_ret AS $i => $entry) {
@@ -457,7 +458,7 @@ function serendipity_fetchEntryData(&$ret) {
* @param string Indicates whether drafts should be fetched * @param string Indicates whether drafts should be fetched
* @return * @return
*/ */
function serendipity_fetchEntry($key, $val, $full = true, $fetchDrafts = 'false') { function &serendipity_fetchEntry($key, $val, $full = true, $fetchDrafts = 'false') {
global $serendipity; global $serendipity;
$cond = array(); $cond = array();
@@ -501,11 +502,11 @@ function serendipity_fetchEntry($key, $val, $full = true, $fetchDrafts = 'false'
{$cond['and']} {$cond['and']}
LIMIT 1"; LIMIT 1";
$ret = serendipity_db_query($querystring, true, 'assoc'); $ret =& serendipity_db_query($querystring, true, 'assoc');
if (is_array($ret)) { if (is_array($ret)) {
$ret['categories'] = serendipity_fetchEntryCategories($ret['id']); $ret['categories'] =& serendipity_fetchEntryCategories($ret['id']);
$ret['properties'] = serendipity_fetchEntryProperties($ret['id']); $ret['properties'] =& serendipity_fetchEntryProperties($ret['id']);
} }
return $ret; return $ret;
@@ -518,20 +519,22 @@ function serendipity_fetchEntry($key, $val, $full = true, $fetchDrafts = 'false'
* @param int The ID of the entry to fetch additonal data for * @param int The ID of the entry to fetch additonal data for
* @return array The array of given properties to an entry * @return array The array of given properties to an entry
*/ */
function serendipity_fetchEntryProperties($id) { function &serendipity_fetchEntryProperties($id) {
global $serendipity; global $serendipity;
$parts = array(); $parts = array();
serendipity_plugin_api::hook_event('frontend_entryproperties_query', $parts); serendipity_plugin_api::hook_event('frontend_entryproperties_query', $parts);
$properties = serendipity_db_query("SELECT property, value FROM {$serendipity['dbPrefix']}entryproperties WHERE entryid = " . (int)$id . " " . $parts['and']); $_properties =& serendipity_db_query("SELECT property, value FROM {$serendipity['dbPrefix']}entryproperties WHERE entryid = " . (int)$id . " " . $parts['and']);
if (!is_array($properties)) { if (!is_array($_properties)) {
$properties = array(); $properties = array();
} else {
$properties =& $_properties;
} }
$property = array(); $property = array();
foreach($properties AS $idx => $row) { foreach($properties AS $idx => $row) {
$property[$row['property']] = $row['value']; $property[$row['property']] =& $row['value'];
} }
return $property; return $property;
@@ -547,7 +550,7 @@ function serendipity_fetchEntryProperties($id) {
* @param string The ACL artifact condition. If set to "write" only categories will be shown that the author can write to. If set to "read", only categories will be show that the author can read or write to. * @param string The ACL artifact condition. If set to "write" only categories will be shown that the author can write to. If set to "read", only categories will be show that the author can read or write to.
* @return array Returns the array of categories * @return array Returns the array of categories
*/ */
function serendipity_fetchCategories($authorid = null, $name = null, $order = null, $artifact_mode = 'write') { function &serendipity_fetchCategories($authorid = null, $name = null, $order = null, $artifact_mode = 'write') {
global $serendipity; global $serendipity;
if ($name === null) { if ($name === null) {
@@ -631,7 +634,7 @@ function serendipity_fetchCategories($authorid = null, $name = null, $order = nu
$querystring .= "\n ORDER BY $order"; $querystring .= "\n ORDER BY $order";
} }
$ret = serendipity_db_query($querystring); $ret =& serendipity_db_query($querystring);
if (is_string($ret)) { if (is_string($ret)) {
echo "Query failed: $ret"; echo "Query failed: $ret";
} }
@@ -673,7 +676,7 @@ function serendipity_rebuildCategoryTree($parent = 0, $left = 0) {
* @param int Restrict the number of results [also uses $serendipity['GET']['page'] for pagination] * @param int Restrict the number of results [also uses $serendipity['GET']['page'] for pagination]
* @return array Returns the superarray of entries found * @return array Returns the superarray of entries found
*/ */
function serendipity_searchEntries($term, $limit = '') { function &serendipity_searchEntries($term, $limit = '') {
global $serendipity; global $serendipity;
if ($limit == '') { if ($limit == '') {
@@ -746,7 +749,7 @@ function serendipity_searchEntries($term, $limit = '') {
ORDER BY timestamp DESC ORDER BY timestamp DESC
$limit"; $limit";
$search = serendipity_db_query($querystring); $search =& serendipity_db_query($querystring);
if (is_array($search)) { if (is_array($search)) {
serendipity_fetchEntryData($search); serendipity_fetchEntryData($search);
@@ -823,7 +826,7 @@ function serendipity_getTotalEntries() {
$querystring = "SELECT count(distinct e.id) {$serendipity['fullCountQuery']}"; $querystring = "SELECT count(distinct e.id) {$serendipity['fullCountQuery']}";
} }
$query = serendipity_db_query($querystring); $query =& serendipity_db_query($querystring);
if (is_array($query) && isset($query[0])) { if (is_array($query) && isset($query[0])) {
if ($serendipity['dbType'] == 'sqlite') { if ($serendipity['dbType'] == 'sqlite') {
@@ -873,6 +876,7 @@ function serendipity_printEntries($entries, $extended = 0, $preview = false, $sm
} }
} }
// We shouldn't return here, because we want Smarty to handle the output // We shouldn't return here, because we want Smarty to handle the output
if (!is_array($entries) || $entries[0] == false || !isset($entries[0]['timestamp'])) { if (!is_array($entries) || $entries[0] == false || !isset($entries[0]['timestamp'])) {
$entries = array(); $entries = array();
@@ -1013,7 +1017,6 @@ function serendipity_printEntries($entries, $extended = 0, $preview = false, $sm
); );
$serendipity['smarty']->assign($comment_add_data); $serendipity['smarty']->assign($comment_add_data);
serendipity_displayCommentForm( serendipity_displayCommentForm(
$entry['id'], $entry['id'],
$serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] . '?url=' . $entry['commURL'], $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] . '?url=' . $entry['commURL'],
@@ -1434,7 +1437,7 @@ function serendipity_printArchives() {
break; break;
} }
$entries = serendipity_db_query("SELECT count(id) $entries =& serendipity_db_query("SELECT count(id)
FROM {$serendipity['dbPrefix']}entries e FROM {$serendipity['dbPrefix']}entries e
LEFT JOIN {$serendipity['dbPrefix']}entrycat ec LEFT JOIN {$serendipity['dbPrefix']}entrycat ec
ON e.id = ec.entryid ON e.id = ec.entryid