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

Add the last (before 1.8) tabsheet on administration menu (Waiting elements).

Browse Source 
Small change way mail function.

git-svn-id: http://piwigo.org/svn/trunk@1915 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub
2007-03-16 18:49:19 +00:00
parent 8371389182
commit 1a3660405a
12 changed files with 93 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
admin.php
View File

@@ -92,8 +92,7 @@ $template->assign_vars(
'U_MOVE'=> $link_start.'cat_move',
'U_CAT_OPTIONS'=> $link_start.'cat_options',
'U_CAT_UPDATE'=> $link_start.'site_update&site=1',
'U_WAITING'=> $link_start.'waiting',
'U_COMMENTS'=> $link_start.'comments',
'U_WAITING'=> $link_start.'comments',
'U_RATING'=> $link_start.'rating',
'U_CADDIE'=> $link_start.'element_set&cat=caddie',
'U_TAGS'=> $link_start.'tags',

1
admin/cat_modify.php
View File

@@ -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
(

9
admin/comments.php
View File

@@ -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'

54
admin/include/functions_waiting.inc.php Normal file
View File

@@ -0,0 +1,54 @@
<?php
// +-----------------------------------------------------------------------+
// | PhpWebGallery - a PHP based picture gallery |
// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
// +-----------------------------------------------------------------------+
// | file : $Id$
// | last update : $Date$
// | last modifier : $Author$
// | revision : $Revision$
// +-----------------------------------------------------------------------+
// | This program is free software; you can redistribute it and/or modify |
// | it under the terms of the GNU General Public License as published by |
// | the Free Software Foundation |
// | |
// | This program is distributed in the hope that it will be useful, but |
// | WITHOUT ANY WARRANTY; without even the implied warranty of |
// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
// | General Public License for more details. |
// | |
// | You should have received a copy of the GNU General Public License |
// | along with this program; if not, write to the Free Software |
// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
// | USA. |
// +-----------------------------------------------------------------------+
include_once(PHPWG_ROOT_PATH.'admin/include/functions_tabsheet.inc.php');
function waiting_tabsheet()
{
global $page, $link_start;
// TabSheet initialization
$page['tabsheet'] = array
(
'comments' => 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();
}
?>

10
admin/waiting.php → admin/upload.php
View File

@@ -23,12 +23,14 @@
// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
// | USA. |
// +-----------------------------------------------------------------------+
if( !defined("PHPWG_ROOT_PATH") )
{
die ("Hacking attempt!");
}
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 |
@@ -136,7 +138,11 @@ DELETE
}
//----------------------------------------------------- template initialization
$template->set_filenames(array('waiting'=>'admin/waiting.tpl'));
$template->set_filenames(array('upload'=>'admin/upload.tpl'));
// TabSheet initialization
waiting_tabsheet();
$template->assign_vars(array(
'F_ACTION'=>str_replace( '&', '&amp;', $_SERVER['REQUEST_URI'])
));
@@ -214,5 +220,5 @@ $template->assign_vars(
);
//----------------------------------------------------------- sending html code
$template->assign_var_from_handle('ADMIN_CONTENT', 'waiting');
$template->assign_var_from_handle('ADMIN_CONTENT', 'upload');
?>

8
include/functions_mail.inc.php
View File

@@ -327,7 +327,8 @@ order by
* - group_id: mail are sent to group with this Id
* - email_format: mail format
* - keyargs_subject: mail subject on l10n_args format
* - tpl_shortname: short template name without extension
* - dirname: short name of directory including template
* - tpl_shortname: short template name without extension
* - assign_vars: array used to assign_vars to mail template
* - language_selected: send mail only to user with this selected language
*
@@ -335,7 +336,8 @@ order by
*/
function pwg_mail_group(
$group_id, $email_format, $keyargs_subject,
$tpl_shortname, $assign_vars = array(), $language_selected = '')
$dirname, $tpl_shortname,
$assign_vars = array(), $language_selected = '')
{
global $conf;
$return = true;
@@ -407,7 +409,7 @@ WHERE
$mail_template = get_mail_template($email_format, $elem);
$mail_template->set_filename($tpl_shortname,
(IN_ADMIN ? 'admin/' : '').$tpl_shortname.'.tpl');
(empty($dirname) ? '' : $dirname.'/').$tpl_shortname.'.tpl');
$mail_template->assign_vars($assign_vars);
$return = pwg_mail

3
language/en_UK.iso-8859-1/admin.lang.php
View File

@@ -425,7 +425,7 @@ $lang['title_liste_users'] = 'Users list';
$lang['title_picmod'] = 'Modify informations about a picture';
$lang['title_thumbnails'] = 'Thumbnail creation';
$lang['title_update'] = 'Database synchronization with files';
$lang['title_waiting'] = 'Pictures waiting for validation';
$lang['title_upload'] = 'Pictures waiting for validation';
$lang['tn_all'] = 'all';
$lang['tn_alone_title'] = 'pictures without thumbnail (jpeg and png only)';
$lang['tn_dirs_alone'] = 'pictures without thumbnail';
@@ -492,6 +492,7 @@ $lang['update_used_metadata'] = 'Used metadata';
$lang['update_wrong_dirname_info'] = 'The name of directories and files must be composed of letters, figures, "-", "_" or "."';
$lang['update_wrong_dirname_short'] = 'wrong filename';
$lang['upload'] = 'Upload';
$lang['upload_pictures'] = 'Pictures';
$lang['user "%s" added'] = 'user "%s" added';
$lang['user_status'] = 'User status';
$lang['user_status_admin'] = 'Administrator';

3
language/fr_FR.iso-8859-1/admin.lang.php
View File

@@ -425,7 +425,7 @@ $lang['title_liste_users'] = 'Liste des utilisateurs';
$lang['title_picmod'] = 'Modifier les informations d\'une image';
$lang['title_thumbnails'] = 'Création des miniatures';
$lang['title_update'] = 'Synchronisation de la base de données à partir des fichiers';
$lang['title_waiting'] = 'Images en attente de validation';
$lang['title_upload'] = 'Images en attente de validation';
$lang['tn_all'] = 'tout';
$lang['tn_alone_title'] = 'image sans miniature (jpeg et png uniquement)';
$lang['tn_dirs_alone'] = 'images sans miniature';
@@ -492,6 +492,7 @@ $lang['update_used_metadata'] = 'M
$lang['update_wrong_dirname_info'] = 'Le nom des répertoires et des fichiers ne doit être constitué que de lettres, de chiffres, de "-", "_" et "."';
$lang['update_wrong_dirname_short'] = 'nom de fichier erroné';
$lang['upload'] = 'Ajout';
$lang['upload_pictures'] = 'Images';
$lang['user "%s" added'] = 'utilisateur "%s" ajouté';
$lang['user_status'] = 'Statut de l\'utilisateur';
$lang['user_status_admin'] = 'Administrateur';

1
template/yoga/admin.tpl
View File

@@ -38,7 +38,6 @@
<ul>
<li><a href="{U_WAITING}">{lang:waiting}</a></li>
<li><a href="{U_THUMBNAILS}">{lang:thumbnails}</a></li>
<li><a href="{U_COMMENTS}">{lang:comments}</a></li>
<li><a href="{U_RATING}">{lang:Rating}</a></li>
<li><a href="{U_TAGS}">{lang:Tags}</a></li>
<li><a href="{U_CADDIE}">{lang:Caddie}</a></li>

8
template/yoga/admin/comments.tpl
View File

@@ -1,4 +1,10 @@
<h2>{lang:User comments validation}</h2>
<!-- $Id$ -->
<div class="titrePage">
<h2>{lang:waiting} {TABSHEET_TITLE}</h2>
{TABSHEET}
</div>
<h3>{lang:User comments validation}</h3>
<form method="post" action="{F_ACTION}">
<!-- BEGIN comment -->

7
template/yoga/admin/waiting.tpl → template/yoga/admin/upload.tpl
View File

@@ -1,5 +1,10 @@
<!-- $Id$ -->
<h2>{lang:title_waiting}</h2>
<div class="titrePage">
<h2>{lang:waiting} {TABSHEET_TITLE}</h2>
{TABSHEET}
</div>
<h3>{lang:title_upload}</h3>
<form action="{F_ACTION}" method="post" id="waiting">
<table style="width:100%;" >

2
upload.php
View File

@@ -227,7 +227,7 @@ if ( isset( $_POST['submit'] ) and !isset( $_GET['waiting_id'] ) )
{
include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
$waiting_url = get_absolute_root_url().'admin.php?page=waiting';
$waiting_url = get_absolute_root_url().'admin.php?page=upload';
$keyargs_content = array
(