mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-05-08 01:05:50 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

- replacement of PREFIX_TABLE constant in delete_user function

Browse source 
- deletion of $isadmin variable, replaced by constant IN_ADMIN

- small refactoring

- in include/common.inc.php, deletion of useless part "Obtain and encode
  users IP" and corresponding functions encode_ip and decode_ip

- definition of $conf['default_language'] deleted from
  include/config.inc.php : it is already present in database table config

- function init_userprefs deleted (useless), all its content moved to
  include/user.inc.php

- admin.lang.php and faq.lang.php are loaded only if current user is in
  administrative section


git-svn-id: http://piwigo.org/svn/trunk@650 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2004-12-20 19:26:43 +00:00
parent 1d46ea86e9
commit c19f01d77c
6 changed files with 62 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

50
include/functions_user.inc.php
View file

@ -171,44 +171,6 @@ function check_login_authorization($guest_allowed = true)
}
}
//
// Initialise user settings on page load
function init_userprefs($userdata)
{
global $conf, $template, $lang, $lang_info;
$language = (!empty($userdata['language']) && !$userdata['is_the_guest'] )?$userdata['language']:$conf['default_language'];
if (!empty($userdata['template']) and !$userdata['is_the_guest'])
{
$template = $userdata['template'];
}
else
{
$template = $conf['default_template'];
}
if ( !file_exists(@realpath(PHPWG_ROOT_PATH . 'language/' . $language . '/common.lang.php')) )
{
$language = $conf['default_language'];
}
include_once(PHPWG_ROOT_PATH . 'language/' . $language . '/common.lang.php');
if ($userdata['status'] == 'admin')
{
if ( !file_exists(@realpath(PHPWG_ROOT_PATH . 'language/' . $language. '/admin.lang.php')) )
{
$language = $conf['default_language'];
}
include_once(PHPWG_ROOT_PATH . 'language/' . $language . '/admin.lang.php');
include_once(PHPWG_ROOT_PATH . 'language/' . $language . '/faq.lang.php');
}
$template = setup_style($template);
return;
}
function setup_style($style)
{
$template_path = 'template/' ;
@ -217,18 +179,6 @@ function setup_style($style)
return $template;
}
function encode_ip($dotquad_ip)
{
$ip_sep = explode('.', $dotquad_ip);
return sprintf('%02x%02x%02x%02x', $ip_sep[0], $ip_sep[1], $ip_sep[2], $ip_sep[3]);
}
function decode_ip($int_ip)
{
$hexipbang = explode('.', chunk_split($int_ip, 2, '.'));
return hexdec($hexipbang[0]). '.' . hexdec($hexipbang[1]) . '.' . hexdec($hexipbang[2]) . '.' . hexdec($hexipbang[3]);
}
function getuserdata($user)
{
$sql = "SELECT * FROM " . USERS_TABLE;