aboutsummaryrefslogtreecommitdiffstats
path: root/picture.php
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2005-09-03 16:36:05 +0000
committerplegall <plg@piwigo.org>2005-09-03 16:36:05 +0000
commit7eae7595909a49d4355453c73638151097a53f20 (patch)
treeec20fce221086be1ece0f292a953264d90ec5360 /picture.php
parent857eec2218afe027b9d87f91aa7de144fc4e3111 (diff)
- modification : less configuration parameters in administration
screen. These parameters are move to include/config_default.inc.php. - new : ability to add a single picture to caddie from picture.php - new : contextual help, only a few pages are available. - new : ability to delete users from admin/user_list - modification : reorganization of configuration file - new : configuration parameter use_exif_mapping - improvement : MOD hidemail added to standard git-svn-id: http://piwigo.org/svn/trunk@858 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--picture.php30
1 files changed, 29 insertions, 1 deletions
diff --git a/picture.php b/picture.php
index b6995a3ca..c3b9df112 100644
--- a/picture.php
+++ b/picture.php
@@ -90,6 +90,20 @@ UPDATE '.CATEGORIES_TABLE.'
.get_query_string_diff(array('representative'));
redirect($url);
}
+
+//-------------------------------------------------------------- caddie filling
+
+if (isset($_GET['caddie']))
+{
+ fill_caddie(array($_GET['image_id']));
+
+ $url =
+ PHPWG_ROOT_PATH
+ .'picture.php'
+ .get_query_string_diff(array('caddie'));
+ redirect($url);
+}
+
//---------------------------------------------------------- related categories
$query = '
SELECT category_id,uppercats,commentable,global_rank
@@ -244,6 +258,7 @@ $url_admin.= '&amp;image_id='.$_GET['image_id'];
$url_slide = $picture['current']['url'];
$url_slide.= '&amp;slideshow='.$conf['slideshow_period'];
+
//----------------------------------------------------------- rate registration
if (isset($_GET['rate'])
and $conf['rate']
@@ -555,6 +570,20 @@ if ('admin' == $user['status'] and is_numeric($page['cat']))
)
);
}
+
+if ('admin' == $user['status'])
+{
+ $template->assign_block_vars(
+ 'caddie',
+ array(
+ 'URL' =>
+ add_session_id(
+ PHPWG_ROOT_PATH.'picture.php'
+ .get_query_string_diff(array('caddie')).'&amp;caddie=1')
+ )
+ );
+}
+
//------------------------------------------------------- favorite manipulation
if ( !$user['is_the_guest'] )
{
@@ -1034,7 +1063,6 @@ if ($page['show_comments'])
}
//------------------------------------------------------------ log informations
pwg_log( 'picture', $title_img, $picture['current']['file'] );
-mysql_close();
$template->parse('picture');
include(PHPWG_ROOT_PATH.'include/page_tail.php');