From 368059d5353209ddad495081bc9d5d9218a9de23 Mon Sep 17 00:00:00 2001 From: rvelices Date: Sat, 14 Feb 2009 02:28:21 +0000 Subject: merge 3145-3146 from trunk Last (I hope) paranoic optims ... - move get_uysername and get_groupname from public to admin/functions.inc.php - optim in index.php - tags.tpl does not need smarty modifier included - move func get_comment_post_key from functions_comment to functions (avoid extra inclusion every time on picture page) git-svn-id: http://piwigo.org/svn/branches/2.0@3147 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/include/functions.php | 61 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 58 insertions(+), 3 deletions(-) (limited to 'admin') diff --git a/admin/include/functions.php b/admin/include/functions.php index 86d274687..5fdee9684 100644 --- a/admin/include/functions.php +++ b/admin/include/functions.php @@ -143,7 +143,7 @@ function delete_elements($ids, $physical_deletion=false) if ($physical_deletion) { include_once(PHPWG_ROOT_PATH.'include/functions_picture.inc.php'); - + // we can currently delete physically only photo with no // storage_category_id (added via pLoader) // @@ -1864,7 +1864,7 @@ function get_extents($start='') { $extents = array_merge($extents, get_extents($path)); } - elseif ( !is_link($path) and file_exists($path) + elseif ( !is_link($path) and file_exists($path) and get_extension($path) == 'tpl' ) { $extents[] = substr($path, 21); @@ -2009,7 +2009,7 @@ function fetchRemote($src, &$dest, $user_agent='Piwigo', $step=0) $host = $src['host']; $path = isset($src['path']) ? $src['path'] : '/'; $path .= isset($src['query']) ? '?'.$src['query'] : ''; - + if (($s = @fsockopen($host,80,$errno,$errstr,5)) === false) { return false; @@ -2066,4 +2066,59 @@ function fetchRemote($src, &$dest, $user_agent='Piwigo', $step=0) return true; } + +/** + * returns the groupname corresponding to the given group identifier if + * exists + * + * @param int group_id + * @return mixed + */ +function get_groupname($group_id) +{ + $query = ' +SELECT name + FROM '.GROUPS_TABLE.' + WHERE id = '.intval($group_id).' +;'; + $result = pwg_query($query); + if (mysql_num_rows($result) > 0) + { + list($groupname) = mysql_fetch_row($result); + } + else + { + return false; + } + + return $groupname; +} + +/** + * returns the username corresponding to the given user identifier if exists + * + * @param int user_id + * @return mixed + */ +function get_username($user_id) +{ + global $conf; + + $query = ' +SELECT '.$conf['user_fields']['username'].' + FROM '.USERS_TABLE.' + WHERE '.$conf['user_fields']['id'].' = '.intval($user_id).' +;'; + $result = pwg_query($query); + if (mysql_num_rows($result) > 0) + { + list($username) = mysql_fetch_row($result); + } + else + { + return false; + } + + return $username; +} ?> \ No newline at end of file -- cgit v1.2.3