From 1a3660405a6856bca55932900e18edd5b5e6d20b Mon Sep 17 00:00:00 2001 From: rub Date: Fri, 16 Mar 2007 18:49:19 +0000 Subject: Add the last (before 1.8) tabsheet on administration menu (Waiting elements). Small change way mail function. git-svn-id: http://piwigo.org/svn/trunk@1915 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/cat_modify.php | 1 + admin/comments.php | 9 +- admin/include/functions_waiting.inc.php | 54 ++++++++ admin/upload.php | 224 ++++++++++++++++++++++++++++++++ admin/waiting.php | 218 ------------------------------- 5 files changed, 285 insertions(+), 221 deletions(-) create mode 100644 admin/include/functions_waiting.inc.php create mode 100644 admin/upload.php delete mode 100644 admin/waiting.php (limited to 'admin') diff --git a/admin/cat_modify.php b/admin/cat_modify.php index 52521995d..6eccb305d 100644 --- a/admin/cat_modify.php +++ b/admin/cat_modify.php @@ -566,6 +566,7 @@ SELECT id, file, path, tn_ext $_POST['group'], get_str_email_format(true), /* TODO add a checkbox in order to choose format*/ get_l10n_args('Come to visit %s', $category['name']), + 'admin', 'cat_group_info', array ( diff --git a/admin/comments.php b/admin/comments.php index 1ca8fc617..70642065d 100644 --- a/admin/comments.php +++ b/admin/comments.php @@ -2,10 +2,9 @@ // +-----------------------------------------------------------------------+ // | PhpWebGallery - a PHP based picture gallery | // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net | -// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net | +// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net | // +-----------------------------------------------------------------------+ -// | branch : BSF (Best So Far) -// | file : $RCSfile$ +// | file : $Id$ // | last update : $Date$ // | last modifier : $Author$ // | revision : $Revision$ @@ -31,6 +30,7 @@ if (!defined('PHPWG_ROOT_PATH')) } include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); +include_once(PHPWG_ROOT_PATH.'admin/include/functions_waiting.inc.php'); // +-----------------------------------------------------------------------+ // | Check Access and exit when user status is not ok | @@ -121,6 +121,9 @@ DELETE $template->set_filenames(array('comments'=>'admin/comments.tpl')); +// TabSheet initialization +waiting_tabsheet(); + $template->assign_vars( array( 'F_ACTION' => PHPWG_ROOT_PATH.'admin.php?page=comments' diff --git a/admin/include/functions_waiting.inc.php b/admin/include/functions_waiting.inc.php new file mode 100644 index 000000000..640991c00 --- /dev/null +++ b/admin/include/functions_waiting.inc.php @@ -0,0 +1,54 @@ + array + ( + 'caption' => l10n('comments'), + 'url' => $link_start.'comments' + ), + 'upload' => array + ( + 'caption' => l10n('upload_pictures'), + 'url' => $link_start.'upload' + ) + ); + + $page['tabsheet'][$page['page']]['selected'] = true; + + // Assign tabsheet to template + template_assign_tabsheet(); +} + +?> diff --git a/admin/upload.php b/admin/upload.php new file mode 100644 index 000000000..9bc0f5067 --- /dev/null +++ b/admin/upload.php @@ -0,0 +1,224 @@ + 0) + { + $query = ' +UPDATE '.WAITING_TABLE.' + SET validated = \'true\' + WHERE id IN ('.implode(',', $to_validate).') +;'; + pwg_query($query); + + array_push( + $page['infos'], + sprintf( + l10n('%d waiting pictures validated'), + count($to_validate) + ) + ); + } + + if (count($to_reject) > 0) + { + // The uploaded element was refused, we have to delete its reference in + // the database and to delete the element as well. + $query = ' +SELECT id, storage_category_id, file, tn_ext + FROM '.WAITING_TABLE.' + WHERE id IN ('.implode(',', $to_reject).') +;'; + $result = pwg_query($query); + while($row = mysql_fetch_array($result)) + { + $dir = get_complete_dir($row['storage_category_id']); + unlink($dir.$row['file']); + $element_info = array( + 'path' => $dir.$row['file'], + 'tn_ext' => + (isset($row['tn_ext']) and $row['tn_ext']!='') ? $row['tn_ext']:'jpg' + ); + $tn_path = get_thumbnail_path( $element_info ); + + if ( @is_file($tn_path) ) + { + unlink( $tn_path ); + } + } + + $query = ' +DELETE + FROM '.WAITING_TABLE.' + WHERE id IN ('.implode(',', $to_reject).') +;'; + pwg_query($query); + + array_push( + $page['infos'], + sprintf( + l10n('%d waiting pictures rejected'), + count($to_reject) + ) + ); + } +} + +//----------------------------------------------------- template initialization +$template->set_filenames(array('upload'=>'admin/upload.tpl')); + +// TabSheet initialization +waiting_tabsheet(); + +$template->assign_vars(array( + 'F_ACTION'=>str_replace( '&', '&', $_SERVER['REQUEST_URI']) + )); + +//---------------------------------------------------------------- form display +$cat_names = array(); +$list = array(); + +$query = 'SELECT * FROM '.WAITING_TABLE; +$query.= " WHERE validated = 'false'"; +$query.= ' ORDER BY storage_category_id'; +$query.= ';'; +$result = pwg_query( $query ); +$i = 0; +while ( $row = mysql_fetch_array( $result ) ) +{ + if ( !isset( $cat_names[$row['storage_category_id']] ) ) + { + $cat = get_cat_info( $row['storage_category_id'] ); + $cat_names[$row['storage_category_id']] = array(); + $cat_names[$row['storage_category_id']]['dir'] = + PHPWG_ROOT_PATH.get_complete_dir( $row['storage_category_id'] ); + $cat_names[$row['storage_category_id']]['display_name'] = + get_cat_display_name($cat['upper_names']); + } + $preview_url = PHPWG_ROOT_PATH.$cat_names[$row['storage_category_id']]['dir'].$row['file']; + $class='row1'; + if ( $i++ % 2== 0 ) $class='row2'; + + $template->assign_block_vars( + 'picture', + array( + 'WAITING_CLASS'=>$class, + 'CATEGORY_IMG'=>$cat_names[$row['storage_category_id']]['display_name'], + 'ID_IMG'=>$row['id'], + 'DATE_IMG' => date('Y-m-d H:i:s', $row['date']), + 'FILE_TITLE'=>$row['file'], + 'FILE_IMG' => + (strlen($row['file']) > 10) ? + (substr($row['file'], 0, 10)).'...' : $row['file'], + 'PREVIEW_URL_IMG'=>$preview_url, + 'UPLOAD_EMAIL'=>get_email_address_as_display_text($row['mail_address']), + 'UPLOAD_USERNAME'=>$row['username'] + ) + ); + + // is there an existing associated thumnail ? + if ( !empty( $row['tn_ext'] )) + { + $thumbnail = $conf['prefix_thumbnail']; + $thumbnail.= get_filename_wo_extension( $row['file'] ); + $thumbnail.= '.'.$row['tn_ext']; + $url = $cat_names[$row['storage_category_id']]['dir']; + $url.= 'thumbnail/'.$thumbnail; + + $template->assign_block_vars( + 'picture.thumbnail', + array( + 'PREVIEW_URL_TN_IMG' => $url, + 'FILE_TN_IMG' => + (strlen($thumbnail) > 10) ? + (substr($thumbnail, 0, 10)).'...' : $thumbnail, + 'FILE_TN_TITLE' => $thumbnail + ) + ); + } + + array_push($list, $row['id']); +} + +$template->assign_vars( + array( + 'LIST' => implode(',', $list) + ) + ); + +//----------------------------------------------------------- sending html code +$template->assign_var_from_handle('ADMIN_CONTENT', 'upload'); +?> diff --git a/admin/waiting.php b/admin/waiting.php deleted file mode 100644 index 30bd6f37c..000000000 --- a/admin/waiting.php +++ /dev/null @@ -1,218 +0,0 @@ - 0) - { - $query = ' -UPDATE '.WAITING_TABLE.' - SET validated = \'true\' - WHERE id IN ('.implode(',', $to_validate).') -;'; - pwg_query($query); - - array_push( - $page['infos'], - sprintf( - l10n('%d waiting pictures validated'), - count($to_validate) - ) - ); - } - - if (count($to_reject) > 0) - { - // The uploaded element was refused, we have to delete its reference in - // the database and to delete the element as well. - $query = ' -SELECT id, storage_category_id, file, tn_ext - FROM '.WAITING_TABLE.' - WHERE id IN ('.implode(',', $to_reject).') -;'; - $result = pwg_query($query); - while($row = mysql_fetch_array($result)) - { - $dir = get_complete_dir($row['storage_category_id']); - unlink($dir.$row['file']); - $element_info = array( - 'path' => $dir.$row['file'], - 'tn_ext' => - (isset($row['tn_ext']) and $row['tn_ext']!='') ? $row['tn_ext']:'jpg' - ); - $tn_path = get_thumbnail_path( $element_info ); - - if ( @is_file($tn_path) ) - { - unlink( $tn_path ); - } - } - - $query = ' -DELETE - FROM '.WAITING_TABLE.' - WHERE id IN ('.implode(',', $to_reject).') -;'; - pwg_query($query); - - array_push( - $page['infos'], - sprintf( - l10n('%d waiting pictures rejected'), - count($to_reject) - ) - ); - } -} - -//----------------------------------------------------- template initialization -$template->set_filenames(array('waiting'=>'admin/waiting.tpl')); -$template->assign_vars(array( - 'F_ACTION'=>str_replace( '&', '&', $_SERVER['REQUEST_URI']) - )); - -//---------------------------------------------------------------- form display -$cat_names = array(); -$list = array(); - -$query = 'SELECT * FROM '.WAITING_TABLE; -$query.= " WHERE validated = 'false'"; -$query.= ' ORDER BY storage_category_id'; -$query.= ';'; -$result = pwg_query( $query ); -$i = 0; -while ( $row = mysql_fetch_array( $result ) ) -{ - if ( !isset( $cat_names[$row['storage_category_id']] ) ) - { - $cat = get_cat_info( $row['storage_category_id'] ); - $cat_names[$row['storage_category_id']] = array(); - $cat_names[$row['storage_category_id']]['dir'] = - PHPWG_ROOT_PATH.get_complete_dir( $row['storage_category_id'] ); - $cat_names[$row['storage_category_id']]['display_name'] = - get_cat_display_name($cat['upper_names']); - } - $preview_url = PHPWG_ROOT_PATH.$cat_names[$row['storage_category_id']]['dir'].$row['file']; - $class='row1'; - if ( $i++ % 2== 0 ) $class='row2'; - - $template->assign_block_vars( - 'picture', - array( - 'WAITING_CLASS'=>$class, - 'CATEGORY_IMG'=>$cat_names[$row['storage_category_id']]['display_name'], - 'ID_IMG'=>$row['id'], - 'DATE_IMG' => date('Y-m-d H:i:s', $row['date']), - 'FILE_TITLE'=>$row['file'], - 'FILE_IMG' => - (strlen($row['file']) > 10) ? - (substr($row['file'], 0, 10)).'...' : $row['file'], - 'PREVIEW_URL_IMG'=>$preview_url, - 'UPLOAD_EMAIL'=>get_email_address_as_display_text($row['mail_address']), - 'UPLOAD_USERNAME'=>$row['username'] - ) - ); - - // is there an existing associated thumnail ? - if ( !empty( $row['tn_ext'] )) - { - $thumbnail = $conf['prefix_thumbnail']; - $thumbnail.= get_filename_wo_extension( $row['file'] ); - $thumbnail.= '.'.$row['tn_ext']; - $url = $cat_names[$row['storage_category_id']]['dir']; - $url.= 'thumbnail/'.$thumbnail; - - $template->assign_block_vars( - 'picture.thumbnail', - array( - 'PREVIEW_URL_TN_IMG' => $url, - 'FILE_TN_IMG' => - (strlen($thumbnail) > 10) ? - (substr($thumbnail, 0, 10)).'...' : $thumbnail, - 'FILE_TN_TITLE' => $thumbnail - ) - ); - } - - array_push($list, $row['id']); -} - -$template->assign_vars( - array( - 'LIST' => implode(',', $list) - ) - ); - -//----------------------------------------------------------- sending html code -$template->assign_var_from_handle('ADMIN_CONTENT', 'waiting'); -?> -- cgit v1.2.3