adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-21 00:53:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Issue 0000639: Force selected page on index.php

Browse Source 
Continue the Radu idea, restrict more use of random list

Issue 0000598: NBM: Add new informations
Add css on mail
Use user template for mail (on next commit, best control)

Comment mass_inserts because don't with MySQL 4.1.9


git-svn-id: http://piwigo.org/svn/trunk@1792 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub
2007-02-08 22:04:36 +00:00
parent 1f53608976
commit 5b038de717
8 changed files with 84 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions_mail.inc.php
+20 -19
View File
@@ -103,12 +103,10 @@ function format_email($name, $email)
*/
function get_mail_template($email_format)
{
global $conf;
global $user;
// for mail, default template are used
list($tmpl, $thm) = explode('/', $conf['default_template']);
$mail_template = new Template(PHPWG_ROOT_PATH.'template/'.$tmpl, $thm);
$mail_template->set_rootdir(PHPWG_ROOT_PATH.'template/'.$tmpl.'/mail/'.$email_format);
$mail_template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template'], $user['theme']);
$mail_template->set_rootdir(PHPWG_ROOT_PATH.'template/'.$user['template'].'/mail/'.$email_format);
return $mail_template;
}
@@ -128,7 +126,7 @@ function get_str_email_format($is_html)
*/
function pwg_mail($to, $from = '', $subject = 'PhpWebGallery', $infos = '', $format_infos = 'text/plain', $email_format = null)
{
global $conf, $conf_mail, $lang_info, $page;
global $conf, $conf_mail, $lang_info, $page, $user;
$cvt7b_subject = str_translate_to_ascii7bits($subject);
@@ -177,7 +175,7 @@ function pwg_mail($to, $from = '', $subject = 'PhpWebGallery', $infos = '', $for
$content = '';
if (!isset($conf_mail[$email_format][$lang_info['charset']]))
if (!isset($conf_mail[$email_format][$lang_info['charset']][$user['template']][$user['theme']]))
{
if (!isset($mail_template))
{
@@ -190,10 +188,6 @@ function pwg_mail($to, $from = '', $subject = 'PhpWebGallery', $infos = '', $for
$mail_template->assign_vars(
array(
//Header
'BODY_ID' =>
isset($page['body_id']) ?
$page['body_id'] : '',
'CONTENT_ENCODING' => $lang_info['charset'],
'LANG' => $lang_info['code'],
'DIR' => $lang_info['direction'],
@@ -213,15 +207,21 @@ function pwg_mail($to, $from = '', $subject = 'PhpWebGallery', $infos = '', $for
));
// what are displayed on the header of each mail ?
$conf_mail[$email_format][$lang_info['charset']]['header'] =
$mail_template->parse('mail_header', true);
$conf_mail[$email_format]
[$lang_info['charset']]
[$user['template']][$user['theme']]['header'] =
$mail_template->parse('mail_header', true);
// what are displayed on the footer of each mail ?
$conf_mail[$email_format][$lang_info['charset']]['footer'] =
$mail_template->parse('mail_footer', true);
$conf_mail[$email_format]
[$lang_info['charset']]
[$user['template']][$user['theme']]['footer'] =
$mail_template->parse('mail_footer', true);
}
$content.= $conf_mail[$email_format][$lang_info['charset']]['header'];
$content.= $conf_mail[$email_format]
[$lang_info['charset']]
[$user['template']][$user['theme']]['header'];
if (($format_infos == 'text/plain') and ($email_format == 'text/html'))
{
@@ -232,7 +232,9 @@ function pwg_mail($to, $from = '', $subject = 'PhpWebGallery', $infos = '', $for
$content.= $infos;
}
$content.= $conf_mail[$email_format][$lang_info['charset']]['footer'];
$content.= $conf_mail[$email_format]
[$lang_info['charset']]
[$user['template']][$user['theme']]['footer'];
// Undo Compute root_path in order have complete path
if ($email_format == 'text/html')
@@ -257,8 +259,7 @@ function pwg_mail($to, $from = '', $subject = 'PhpWebGallery', $infos = '', $for
fwrite($file, $content);
fclose($file);
return true;
}
*/
}*/
if ($conf_mail['mail_options'])
{
include/section_init.inc.php
+24 -13
View File
@@ -269,23 +269,34 @@ else if ('list' == @$tokens[$next_token])
else
{
$page['section'] = 'categories';
if (script_basename() == 'picture')
{//access a picture only by id, file or id-file without given section
$page['flat_cat'] = true;
}
elseif (!empty($conf['random_index_redirect']) and empty($tokens[$next_token]) )
switch (script_basename())
{
$random_index_redirect = array();
foreach ($conf['random_index_redirect'] as $random_url => $random_url_condition)
case 'picture':
{
if (empty($random_url_condition) or eval($random_url_condition))
{
$random_index_redirect[] = $random_url;
}
//access a picture only by id, file or id-file without given section
$page['flat_cat'] = true;
break;
}
if (!empty($random_index_redirect))
case 'index':
{
redirect($random_index_redirect[mt_rand(0, count($random_index_redirect)-1)]);
// No section defined, go to selected url
if (!empty($conf['random_index_redirect']) and empty($tokens[$next_token]) )
{
$random_index_redirect = array();
foreach ($conf['random_index_redirect'] as $random_url => $random_url_condition)
{
if (empty($random_url_condition) or eval($random_url_condition))
{
$random_index_redirect[] = $random_url;
}
}
if (!empty($random_index_redirect))
{
redirect($random_index_redirect[mt_rand(0, count($random_index_redirect)-1)]);
}
}
break;
}
}
}