adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-21 00:53:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

- removed admin never used function cat_admin_access

Browse Source 
- removed obsolete known_script template block
- added a warning on usage of is_adviser function

git-svn-id: http://piwigo.org/svn/trunk@11753 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2011-07-15 18:56:20 +00:00
parent 62ce6788e5
commit 5869dada4c
3 changed files with 2 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/include/functions.php
-21
View File
@@ -1782,27 +1782,6 @@ SELECT id
}
}
/**
* Is the category accessible to the (Admin) user ?
*
* Note : if the user is not authorized to see this category, category jump
* will be replaced by admin cat_modify page
*
* @param int category id to verify
* @return bool
*/
function cat_admin_access($category_id)
{
global $user;
// $filter['visible_categories'] and $filter['visible_images']
// are not used because it's not necessary (filter <> restriction)
if (in_array($category_id, explode(',', $user['forbidden_categories'])))
{
return false;
}
return true;
}
/**
* Retrieve data from external URL
include/functions_user.inc.php
+1
View File
@@ -1312,6 +1312,7 @@ function check_status($access_type, $user_status = '')
*/
function is_adviser()
{
trigger_error('call to obsolete function is_adviser', E_USER_WARNING);
return false;
}
include/template.class.php
+1 -39
View File
@@ -115,7 +115,6 @@ class Template {
$this->smarty->register_function('combine_css', array(&$this, 'func_combine_css') );
$this->smarty->register_compiler_function('get_combined_css', array(&$this, 'func_get_combined_css') );
$this->smarty->register_block('footer_script', array(&$this, 'block_footer_script') );
$this->smarty->register_function('known_script', array(&$this, 'func_known_script') );
$this->smarty->register_prefilter( array('Template', 'prefilter_white_space') );
if ( $conf['compiled_template_cache_language'] )
{
@@ -531,44 +530,7 @@ class Template {
}
}
/**
* This smarty "known_script" functions allows to insert well known java scripts
* such as prototype, jquery, etc... only once. Examples:
* {known_script id="jquery" src="{$ROOT_URL}template-common/lib/jquery.packed.js"}
*/
function func_known_script($params, &$smarty )
{
if (!isset($params['id']))
{
$smarty->trigger_error("known_script: missing 'id' parameter");
return;
}
$id = $params['id'];
trigger_error("known_script is deprecated $id ".@$params['src'], E_USER_WARNING);
if ('jquery'==$id)
{
$this->scriptLoader->add($id, 0, array(), null);
return;
}
if (! isset( $this->known_scripts[$id] ) )
{
if (!isset($params['src']))
{
$smarty->trigger_error("known_script: missing 'src' parameter");
return;
}
$this->known_scripts[$id] = $params['src'];
$content = '<script type="text/javascript" src="'.$params['src'].'"></script>';
if (isset($params['now']) and $params['now'] and empty($this->output) )
{
return $content;
}
$repeat = false;
$this->block_html_head(null, $content, $smarty, $repeat);
}
}
/**
/**
* combine_script smarty function allows inclusion of a javascript file in the current page.
* The engine will combine several js files into a single one in order to reduce the number of
* required http requests.