Index: trunk/admin.php =================================================================== --- trunk/admin.php (revision 8392) +++ trunk/admin.php (revision 8394) @@ -130,4 +130,5 @@ 'U_CADDIE'=> $link_start.'element_set&cat=caddie', 'U_RECENT_SET'=> $link_start.'element_set&cat=recent', + 'U_BATCH'=> $link_start.'batch_manager', 'U_TAGS'=> $link_start.'tags', 'U_THUMBNAILS'=> $link_start.'thumbnail', Index: trunk/admin/batch_manager.php =================================================================== --- trunk/admin/batch_manager.php (revision 8394) +++ trunk/admin/batch_manager.php (revision 8394) @@ -0,0 +1,335 @@ +'; print_r($_POST); echo ''; + + $_SESSION['bulk_manager_filter'] = array(); + + if (isset($_POST['filter_prefilter_use'])) + { + $prefilters = array('caddie', 'last import', 'with no album', 'with no tag'); + if (in_array($_POST['filter_prefilter'], $prefilters)) + { + $_SESSION['bulk_manager_filter']['prefilter'] = $_POST['filter_prefilter']; + } + } + + if (isset($_POST['filter_category_use'])) + { + $_SESSION['bulk_manager_filter']['category'] = $_POST['filter_category']; + + if (isset($_POST['filter_category_recursive'])) + { + $_SESSION['bulk_manager_filter']['category_recursive'] = true; + } + } + + if (isset($_POST['filter_level_use'])) + { + if (in_array($_POST['filter_level'], $conf['available_permission_levels'])) + { + $_SESSION['bulk_manager_filter']['level'] = $_POST['filter_level']; + } + } +} + +if (isset($_GET['cat'])) +{ + if ('caddie' == $_GET['cat']) + { + $_SESSION['bulk_manager_filter'] = array( + 'prefilter' => 'caddie' + ); + } + + if (is_numeric($_GET['cat'])) + { + $_SESSION['bulk_manager_filter'] = array( + 'category' => $_GET['cat'] + ); + } +} + +if (!isset($_SESSION['bulk_manager_filter'])) +{ + $_SESSION['bulk_manager_filter'] = array( + 'prefilter' => 'caddie' + ); +} + +// echo '
'; print_r($_SESSION['bulk_manager_filter']); echo ''; + +// depending on the current filter (in session), we find the appropriate +// photos +$filter_sets = array(); +if (isset($_SESSION['bulk_manager_filter']['prefilter'])) +{ + if ('caddie' == $_SESSION['bulk_manager_filter']['prefilter']) + { + $query = ' +SELECT element_id + FROM '.CADDIE_TABLE.' + WHERE user_id = '.$user['id'].' +;'; + array_push( + $filter_sets, + array_from_query($query, 'element_id') + ); + } + + if ('last import'== $_SESSION['bulk_manager_filter']['prefilter']) + { + $query = ' +SELECT MAX(date_available) AS date + FROM '.IMAGES_TABLE.' +;'; + $row = pwg_db_fetch_assoc(pwg_query($query)); + if (!empty($row['date'])) + { + $query = ' +SELECT id + FROM '.IMAGES_TABLE.' + WHERE date_available BETWEEN '.pwg_db_get_recent_period_expression(1, $row['date']).' AND \''.$row['date'].'\' +;'; + array_push( + $filter_sets, + array_from_query($query, 'id') + ); + } + } +} + +if (isset($_SESSION['bulk_manager_filter']['category'])) +{ + $categories = array(); + + if (isset($_SESSION['bulk_manager_filter']['category_recursive'])) + { + $categories = get_subcat_ids(array($_SESSION['bulk_manager_filter']['category'])); + } + else + { + $categories = array($_SESSION['bulk_manager_filter']['category']); + } + + $query = ' + SELECT DISTINCT(image_id) + FROM '.IMAGE_CATEGORY_TABLE.' + WHERE category_id IN ('.implode(',', $categories).') + ;'; + array_push( + $filter_sets, + array_from_query($query, 'image_id') + ); +} + +if (isset($_SESSION['bulk_manager_filter']['level'])) +{ + $query = ' +SELECT id + FROM '.IMAGES_TABLE.' + WHERE level >= '.$_SESSION['bulk_manager_filter']['level'].' +;'; + array_push( + $filter_sets, + array_from_query($query, 'id') + ); +} + +$current_set = array_shift($filter_sets); +foreach ($filter_sets as $set) +{ + $current_set = array_intersect($current_set, $set); +} +$page['cat_elements_id'] = $current_set; + +// // To element_set_(global|unit).php, we must provide the elements id of the +// // managed category in $page['cat_elements_id'] array. +// $page['cat_elements_id'] = array(); +// if (is_numeric($_GET['cat'])) +// { +// $page['title'] = +// get_cat_display_name_from_id( +// $_GET['cat'], +// PHPWG_ROOT_PATH.'admin.php?page=cat_modify&cat_id=', +// false +// ); +// +// $query = ' +// SELECT image_id +// FROM '.IMAGE_CATEGORY_TABLE.' +// WHERE category_id = '.$_GET['cat'].' +// ;'; +// $page['cat_elements_id'] = array_from_query($query, 'image_id'); +// } +// else if ('caddie' == $_GET['cat']) +// { +// $page['title'] = l10n('caddie'); +// +// $query = ' +// SELECT element_id +// FROM '.CADDIE_TABLE.' +// WHERE user_id = '.$user['id'].' +// ;'; +// $page['cat_elements_id'] = array_from_query($query, 'element_id'); +// } +// else if ('not_linked' == $_GET['cat']) +// { +// $page['title'] = l10n('Not linked elements'); +// $template->assign(array('U_ACTIVE_MENU' => 5 )); +// +// // we are searching elements not linked to any virtual category +// $query = ' +// SELECT id +// FROM '.IMAGES_TABLE.' +// ;'; +// $all_elements = array_from_query($query, 'id'); +// +// $linked_to_virtual = array(); +// +// $query = ' +// SELECT id +// FROM '.CATEGORIES_TABLE.' +// WHERE dir IS NULL +// ;'; +// $virtual_categories = array_from_query($query, 'id'); +// if (!empty($virtual_categories)) +// { +// $query = ' +// SELECT DISTINCT(image_id) +// FROM '.IMAGE_CATEGORY_TABLE.' +// WHERE category_id IN ('.implode(',', $virtual_categories).') +// ;'; +// $linked_to_virtual = array_from_query($query, 'image_id'); +// } +// +// $page['cat_elements_id'] = array_diff($all_elements, $linked_to_virtual); +// } +// else if ('duplicates' == $_GET['cat']) +// { +// $page['title'] = l10n('Files with same name in more than one physical category'); +// $template->assign(array('U_ACTIVE_MENU' => 5 )); +// +// // we are searching related elements twice or more to physical categories +// // 1 - Retrieve Files +// $query = ' +// SELECT DISTINCT(file) +// FROM '.IMAGES_TABLE.' +// GROUP BY file +// HAVING COUNT(DISTINCT storage_category_id) > 1 +// ;'; +// +// $duplicate_files = array_from_query($query, 'file'); +// $duplicate_files[]='Nofiles'; +// // 2 - Retrives related picture ids +// $query = ' +// SELECT id, file +// FROM '.IMAGES_TABLE.' +// WHERE file IN (\''.implode("','", $duplicate_files).'\') +// ORDER BY file, id +// ;'; +// +// $page['cat_elements_id'] = array_from_query($query, 'id'); +// } +// elseif ('recent'== $_GET['cat']) +// { +// $page['title'] = l10n('Recent pictures'); +// $query = 'SELECT MAX(date_available) AS date +// FROM '.IMAGES_TABLE; +// $row = pwg_db_fetch_assoc(pwg_query($query)); +// if (!empty($row['date'])) +// { +// $query = 'SELECT id +// FROM '.IMAGES_TABLE.' +// WHERE date_available BETWEEN '.pwg_db_get_recent_period_expression(1, $row['date']).' AND \''.$row['date'].'\''; +// $page['cat_elements_id'] = array_from_query($query, 'id'); +// } +// } + +// +-----------------------------------------------------------------------+ +// | first element to display | +// +-----------------------------------------------------------------------+ + +// $page['start'] contains the number of the first element in its +// category. For exampe, $page['start'] = 12 means we must show elements #12 +// and $page['nb_images'] next elements + +if (!isset($_GET['start']) + or !is_numeric($_GET['start']) + or $_GET['start'] < 0 + or (isset($_GET['display']) and 'all' == $_GET['display'])) +{ + $page['start'] = 0; +} +else +{ + $page['start'] = $_GET['start']; +} + +// +-----------------------------------------------------------------------+ +// | open specific mode | +// +-----------------------------------------------------------------------+ + +$_GET['mode'] = !empty($_GET['mode']) ? $_GET['mode'] : 'global'; + +switch ($_GET['mode']) +{ + case 'global' : + { + include(dirname(__FILE__).'/batch_manager_global.php'); + break; + } + case 'unit' : + { + include(PHPWG_ROOT_PATH.'admin/element_set_unit.php'); + break; + } +} +?> Index: trunk/admin/batch_manager_global.php =================================================================== --- trunk/admin/batch_manager_global.php (revision 8394) +++ trunk/admin/batch_manager_global.php (revision 8394) @@ -0,0 +1,575 @@ + $image_id, + 'author' => $_POST['author'] + ) + ); + } + + mass_updates( + IMAGES_TABLE, + array('primary' => array('id'), 'update' => array('author')), + $datas + ); + } + + // name + if ('name' == $action) + { + $datas = array(); + foreach ($collection as $image_id) + { + array_push( + $datas, + array( + 'id' => $image_id, + 'name' => $_POST['name'] + ) + ); + } + + mass_updates( + IMAGES_TABLE, + array('primary' => array('id'), 'update' => array('name')), + $datas + ); + } + + // date_creation + if ('date_creation' == $action) + { + $date_creation = sprintf( + '%u-%u-%u', + $_POST['date_creation_year'], + $_POST['date_creation_month'], + $_POST['date_creation_day'] + ); + + $datas = array(); + foreach ($collection as $image_id) + { + array_push( + $datas, + array( + 'id' => $image_id, + 'date_creation' => $date_creation + ) + ); + } + + mass_updates( + IMAGES_TABLE, + array('primary' => array('id'), 'update' => array('date_creation')), + $datas + ); + } + + // privacy_level + if ('level' == $action) + { + $datas = array(); + foreach ($collection as $image_id) + { + array_push( + $datas, + array( + 'id' => $image_id, + 'level' => $_POST['level'] + ) + ); + } + + mass_updates( + IMAGES_TABLE, + array('primary' => array('id'), 'update' => array('level')), + $datas + ); + } + + // add_to_caddie + if ('add_to_caddie' == $action) + { + fill_caddie($collection); + } + + // delete + if ('delete' == $action) + { + if (isset($_POST['confirm_deletion']) and 1 == $_POST['confirm_deletion']) + { + // filter selection on photos that have no storage_category_id (ie + // that were added via pLoader) + $query = ' +SELECT id + FROM '.IMAGES_TABLE.' + WHERE id IN ('.implode(',', $collection).') + AND storage_category_id IS NULL +;'; + $deletables = array_from_query($query, 'id'); + + if (count($deletables) > 0) + { + $physical_deletion = true; + delete_elements($deletables, $physical_deletion); + + array_push( + $page['infos'], + sprintf( + l10n_dec( + '%d photo was deleted', + '%d photos were deleted', + count($deletables) + ), + count($deletables) + ) + ); + + // we have to remove the deleted photos from the current set + $page['cat_elements_id'] = array_diff($page['cat_elements_id'], $deletables); + } + else + { + array_push($page['errors'], l10n('No photo can be deleted')); + } + } + else + { + array_push($page['errors'], l10n('You need to confirm deletion')); + } + } +} + +// +-----------------------------------------------------------------------+ +// | template init | +// +-----------------------------------------------------------------------+ +$template->set_filenames(array('batch_manager_global' => 'batch_manager_global.tpl')); + +$base_url = get_root_url().'admin.php'; + +$template->assign( + array( + 'filter' => $_SESSION['bulk_manager_filter'], + + 'selection' => $collection, + + 'U_DISPLAY'=>$base_url.get_query_string_diff(array('display')), + + 'U_UNIT_MODE' + => + $base_url + .get_query_string_diff(array('mode','display')) + .'&mode=unit', + + 'F_ACTION'=>$base_url.get_query_string_diff(array('cat')), + ) + ); + +// +-----------------------------------------------------------------------+ +// | caddie options | +// +-----------------------------------------------------------------------+ + +$in_caddie = false; +if (isset($_SESSION['bulk_manager_filter']['prefilter']) + and 'caddie' == $_SESSION['bulk_manager_filter']['prefilter']) +{ + $in_caddie = true; +} +$template->assign('IN_CADDIE', $in_caddie); + +// +-----------------------------------------------------------------------+ +// | deletion form | +// +-----------------------------------------------------------------------+ + +// we can only remove photos that have no storage_category_id, in other +// word, it currently (Butterfly) means that the photo was added with +// pLoader +if (count($page['cat_elements_id']) > 0) +{ + $query = ' +SELECT + COUNT(*) + FROM '.IMAGES_TABLE.' + WHERE id IN ('.implode(',', $page['cat_elements_id']).') + AND storage_category_id IS NULL +;'; + list($counter) = pwg_db_fetch_row(pwg_query($query)); + + if ($counter > 0) + { + $template->assign('show_delete_form', true); + } +} + +// +-----------------------------------------------------------------------+ +// | global mode form | +// +-----------------------------------------------------------------------+ + +// privacy level +$template->assign( + array( + 'filter_level_options'=> get_privacy_level_options(), + 'filter_level_options_selected' => isset($_SESSION['bulk_manager_filter']['level']) + ? $_SESSION['bulk_manager_filter']['level'] + : 0, + ) + ); + +// Virtualy associate a picture to a category +$query = ' +SELECT id,name,uppercats,global_rank + FROM '.CATEGORIES_TABLE.' +;'; +display_select_cat_wrapper($query, array(), 'associate_options', true); + +// in the filter box, which category to select by default +$selected_category = array(); + +if (isset($_SESSION['bulk_manager_filter']['category'])) +{ + $selected_category = array($_SESSION['bulk_manager_filter']['category']); +} +else +{ + // we need to know the category in which the last photo was added + $selected_category = array(); + + $query = ' +SELECT + category_id, + id_uppercat + FROM '.IMAGES_TABLE.' AS i + JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON image_id = i.id + JOIN '.CATEGORIES_TABLE.' AS c ON category_id = c.id + ORDER BY i.id DESC + LIMIT 1 +;'; + $result = pwg_query($query); + if (pwg_db_num_rows($result) > 0) + { + $row = pwg_db_fetch_assoc($result); + + $selected_category = array($row['category_id']); + } +} + +$query = ' +SELECT id,name,uppercats,global_rank + FROM '.CATEGORIES_TABLE.' +;'; +display_select_cat_wrapper($query, $selected_category, 'filter_category_options', true); + +// Dissociate from a category : categories listed for dissociation can +// only represent virtual links. Links to physical categories can't be +// broken +if (count($page['cat_elements_id']) > 0) +{ + $query = ' +SELECT + DISTINCT(category_id) AS id, + c.name, + c.uppercats, + c.global_rank + FROM '.IMAGE_CATEGORY_TABLE.' AS ic + JOIN '.CATEGORIES_TABLE.' AS c ON c.id = ic.category_id + JOIN '.IMAGES_TABLE.' AS i ON i.id = ic.image_id + WHERE ic.image_id IN ('.implode(',', $page['cat_elements_id']).') + AND ( + ic.category_id != i.storage_category_id + OR i.storage_category_id IS NULL + ) +;'; + display_select_cat_wrapper($query, array(), 'dissociate_options', true); +} + +if (count($page['cat_elements_id']) > 0) +{ + // remove tags + $tags = get_common_tags($page['cat_elements_id'], -1); + + $template->assign( + array( + 'DEL_TAG_SELECTION' => get_html_tag_selection($tags, 'del_tags'), + ) + ); +} + +// creation date +$day = +empty($_POST['date_creation_day']) ? date('j') : $_POST['date_creation_day']; + +$month = +empty($_POST['date_creation_month']) ? date('n') : $_POST['date_creation_month']; + +$year = +empty($_POST['date_creation_year']) ? date('Y') : $_POST['date_creation_year']; + +$month_list = $lang['month']; +$month_list[0]='------------'; +ksort($month_list); +$template->assign( array( + 'month_list' => $month_list, + 'DATE_CREATION_DAY' => (int)$day, + 'DATE_CREATION_MONTH'=> (int)$month, + 'DATE_CREATION_YEAR' => (int)$year, + ) + ); + +// image level options +$template->assign( + array( + 'level_options'=> get_privacy_level_options(), + 'level_options_selected' => 0, + ) + ); + +// +-----------------------------------------------------------------------+ +// | global mode thumbnails | +// +-----------------------------------------------------------------------+ + +// how many items to display on this page +if (!empty($_GET['display'])) +{ + if ('all' == $_GET['display']) + { + $page['nb_images'] = count($page['cat_elements_id']); + } + else + { + $page['nb_images'] = intval($_GET['display']); + } +} +else +{ + $page['nb_images'] = 20; +} + +$nb_thumbs_page = 0; + +if (count($page['cat_elements_id']) > 0) +{ + $nav_bar = create_navigation_bar( + $base_url.get_query_string_diff(array('start')), + count($page['cat_elements_id']), + $page['start'], + $page['nb_images'] + ); + $template->assign('navbar', $nav_bar); + + $query = ' +SELECT id,path,tn_ext,file,filesize,level,name + FROM '.IMAGES_TABLE.' + WHERE id IN ('.implode(',', $page['cat_elements_id']).') + '.$conf['order_by'].' + LIMIT '.$page['nb_images'].' OFFSET '.$page['start'].' +;'; + $result = pwg_query($query); + + // template thumbnail initialization + while ($row = pwg_db_fetch_assoc($result)) + { + $nb_thumbs_page++; + $src = get_thumbnail_url($row); + + $title = $row['name']; + if (empty($title)) + { + $title = get_name_from_file($row['file']); + } + + $template->append( + 'thumbnails', + array( + 'ID' => $row['id'], + 'TN_SRC' => $src, + 'FILE' => $row['file'], + 'TITLE' => $title, + 'LEVEL' => $row['level'] + ) + ); + } +} + +$template->assign( + array( + 'nb_thumbs_page' => $nb_thumbs_page, + 'nb_thumbs_set' => count($page['cat_elements_id']), + ) + ); + +trigger_action('loc_end_element_set_global'); + +//----------------------------------------------------------- sending html code +$template->assign_var_from_handle('ADMIN_CONTENT', 'batch_manager_global'); +?> Index: trunk/admin/themes/default/template/admin.tpl =================================================================== --- trunk/admin/themes/default/template/admin.tpl (revision 8392) +++ trunk/admin/themes/default/template/admin.tpl (revision 8394) @@ -26,4 +26,5 @@