iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

- plugin administration: small fix during activation phase

Browse Source 
- plugins: added 3 actions in category_cats.inc.php and 1 event that allow a plugin to decide if insertion to #history occurs
- added a warning in section_init if script_basename() is not index or picture (I think we'll have issues on some servers with this function)
- web service methods categories.getImages, tags.getImages and images.search return now the image comment

git-svn-id: http://piwigo.org/svn/trunk@1880 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2007-03-08 01:55:49 +00:00
parent 246106e83f
commit eab3d5e20e
5 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin/plugins.php
View File

@@ -89,10 +89,12 @@ INSERT INTO '.PLUGINS_TABLE.' (id,version) VALUES ("'
if ( !isset($crt_db_plugin) )
{
array_push($errors, 'CANNOT '. $_GET['action'] .' - NOT INSTALLED');
break;
}
if ($crt_db_plugin['state']!='inactive')
{
array_push($errors, 'invalid current state '.$crt_db_plugin['state']);
break;
}
if ( file_exists($file_to_include) )
{

13
include/category_cats.inc.php
View File

@@ -177,7 +177,7 @@ if (count($categories) > 0)
{
update_cats_with_filtered_data($categories);
}
trigger_action('loc_begin_index_categories');
trigger_action('loc_begin_index_category_thumbnails', $categories);
if ($conf['subcatify'])
{
$template->set_filename('mainpage_categories', 'mainpage_categories.tpl');
@@ -221,6 +221,10 @@ if (count($categories) > 0)
'NAME' => $name,
)
);
//plugins need to add/modify sth in this loop ?
trigger_action('loc_index_category_thumbnail',
$category, 'categories.category' );
}
$template->assign_var_from_handle('CATEGORIES', 'mainpage_categories');
@@ -252,7 +256,7 @@ if (count($categories) > 0)
$category['count_images'],
$category['count_categories'],
true,
'<BR>'
'; '
),
'U_IMG_LINK' => make_index_url(
@@ -284,6 +288,10 @@ if (count($categories) > 0)
)
);
//plugins need to add/modify sth in this loop ?
trigger_action('loc_index_category_thumbnail',
$category, 'thumbnails.line.thumbnail' );
// create a new line ?
if (++$row_number == $user['nb_image_line'])
{
@@ -300,5 +308,6 @@ if (count($categories) > 0)
$template->assign_var_from_handle('CATEGORIES', 'thumbnails');
unset( $template->_tpldata['thumbnails.'] );//maybe write a func for that
}
trigger_action('loc_end_index_category_thumbnails', $categories);
}
?>

14
include/functions.inc.php
View File

@@ -413,17 +413,23 @@ function pwg_log($image_id = null, $image_type = null)
{
global $conf, $user, $page;
$do_log = true;
if (!$conf['log'])
{
return false;
$do_log = false;
}
if (is_admin() and !$conf['history_admin'])
{
return false;
$do_log = false;
}
if ($user['is_the_guest'] and !$conf['history_guest'])
{
$do_log = false;
}
if ($user['is_the_guest'] and !$conf['history_guest'])
$do_log = trigger_event('pwg_log_allowed', $do_log, $image_id, $image_type);
if (!$do_log)
{
return false;
}

3
include/section_init.inc.php
View File

@@ -298,6 +298,9 @@ else
}
break;
}
default:
trigger_error('script_basename "'.script_basename().'" unknown',
E_USER_WARNING);
}
}

6
include/ws_functions.inc.php
View File

@@ -375,7 +375,7 @@ LIMIT '.$params['per_page']*$params['page'].','.$params['per_page'];
$image[$k] = (int)$row[$k];
}
}
foreach ( array('name', 'file') as $k )
foreach ( array('file', 'name', 'comment') as $k )
{
$image[$k] = $row[$k];
}
@@ -829,7 +829,7 @@ SELECT * FROM '.IMAGES_TABLE.'
$image[$k] = (int)$row[$k];
}
}
foreach ( array('name', 'file') as $k )
foreach ( array('file', 'name', 'comment') as $k )
{
$image[$k] = $row[$k];
}
@@ -1035,7 +1035,7 @@ LIMIT '.$params['per_page']*$params['page'].','.$params['per_page'];
$image[$k] = (int)$row[$k];
}
}
foreach ( array('name', 'file') as $k )
foreach ( array('file', 'name', 'comment') as $k )
{
$image[$k] = $row[$k];
}