Issue 0000639: Force selected page on index.php

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

8 files changed, 84 insertions, 39 deletions

diff --git a/admin/include/functions.php b/admin/include/functions.php
index 7bc9cf5e6..81b3cde8e 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -525,10 +525,13 @@ function mass_inserts($table_name, $dbfields, $datas)
   {
     $first = true;
      
-    $query = 'SHOW VARIABLES where variable_name = \'max_allowed_packet\';';
+    /*$query = 'SHOW VARIABLES where variable_name = \'max_allowed_packet\';';
     list(, $packet_size) = mysql_fetch_row(pwg_query($query));
-    $packet_size = $packet_size - 2000; // The last list of values MUST not exceed 2000 character
-    
+    $packet_size = $packet_size - 2000; // The last list of values MUST not exceed 2000 character*/
+    /* DON T WORK WITH MySQL 4.1.9 */
+    $packet_size = 1000000;
+    $query = '';
+
     foreach ($datas as $insert)
     {
       if (strlen($query) >= $packet_size)
diff --git a/admin/include/functions_notification_by_mail.inc.php b/admin/include/functions_notification_by_mail.inc.php
index 89a69206c..44f1afdb9 100644
--- a/admin/include/functions_notification_by_mail.inc.php
+++ b/admin/include/functions_notification_by_mail.inc.php
@@ -265,6 +265,8 @@ function set_user_on_env_nbm($user_id, $is_action_send)
   $user['id'] = $user_id;

   $user = array_merge($user, getuserdata($user['id'], true));

 

+  list($user['template'], $user['theme']) = explode('/', $user['template']);

+

   if ($env_nbm['last_language'] != $user['language'])

   {

     $env_nbm['last_language'] = $user['language'];

diff --git a/include/functions_mail.inc.php b/include/functions_mail.inc.php
index 07be28b50..b44697078 100644
--- a/include/functions_mail.inc.php
+++ b/include/functions_mail.inc.php
@@ -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'])
   {
diff --git a/include/section_init.inc.php b/include/section_init.inc.php
index 378fd539b..869bb34b8 100644
--- a/include/section_init.inc.php
+++ b/include/section_init.inc.php
@@ -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;
     }
   }
 }
diff --git a/template/yoga/mail/text/html/admin/notification_by_mail.tpl b/template/yoga/mail/text/html/admin/notification_by_mail.tpl
index 9af59551d..d3c6cc796 100644
--- a/template/yoga/mail/text/html/admin/notification_by_mail.tpl
+++ b/template/yoga/mail/text/html/admin/notification_by_mail.tpl
@@ -1,4 +1,5 @@
 <div id="nbm_mail_content">

+<h2>{lang:Notification}</h2>

 <p>{lang:nbm_content_hello_1}{USERNAME}{lang:nbm_content_hello_2}</p>

 

 <!-- BEGIN subscribe_by_admin -->

@@ -42,11 +43,13 @@
 <hr><br/>

 </p>

 <!-- BEGIN recent_post -->

-<p>

+</div>

+</div>

+<div id="content">

+<div id="nbm_mail_recent_post">

   <!-- BEGIN recent_post_block -->

   <h2>{recent_post.recent_post_block.TITLE}</h2>

   {recent_post.recent_post_block.HTML_DATA}

   <!-- END recent_post_block -->

-</p>

 <!-- END recent_post -->

 </div>

diff --git a/template/yoga/mail/text/html/default-layout.css b/template/yoga/mail/text/html/default-layout.css
new file mode 100644
index 000000000..d415a371f
--- /dev/null
+++ b/template/yoga/mail/text/html/default-layout.css
@@ -0,0 +1,8 @@
+/* $Id$ */

+

+BODY#theMailPage #content

+{

+  margin: 2em;

+  text-align: left;

+}

+

diff --git a/template/yoga/mail/text/html/footer.tpl b/template/yoga/mail/text/html/footer.tpl
index ac0d2784f..1e85a6a5d 100644
--- a/template/yoga/mail/text/html/footer.tpl
+++ b/template/yoga/mail/text/html/footer.tpl
@@ -1,3 +1,4 @@
+</div> <!-- content -->

 <div id="copyright">

 <HR>

  <!-- Please, do not remove this copyright. If you really want to,

diff --git a/template/yoga/mail/text/html/header.tpl b/template/yoga/mail/text/html/header.tpl
index fee4d441c..0d96da406 100644
--- a/template/yoga/mail/text/html/header.tpl
+++ b/template/yoga/mail/text/html/header.tpl
@@ -5,6 +5,22 @@
 <meta http-equiv="Content-Type" content="text/html; charset={CONTENT_ENCODING}">

 </head>

 

-<body id="{BODY_ID}">

-<div id="the_mail">

+<link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/layout.css">

+<link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/mail/text/html/default-layout.css">

+<!-- the next css is used to fix khtml (Konqueror/Safari) issue

+the "text/nonsense" prevents gecko based browsers to load it -->

+<link rel="stylesheet" type="text/nonsense" href="{pwg_root}template/{themeconf:template}/fix-khtml.css">

+<!--[if lt IE 7]>

+  <link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/fix-ie5-ie6.css">

+<![endif]-->

+<!--[if gt IE 6]>

+  <link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/fix-ie7.css">

+<![endif]-->

+<link rel="stylesheet" type="text/css" media="print" href="{pwg_root}template/{themeconf:template}/print.css">

+<link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/default-colors.css">

+<link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/theme/{themeconf:theme}/theme.css">

+

+<body id="theMailPage">

+<div id="the_page">

+<div id="content">