merge -c2884 from trunk to branch 2.0.

- Replace some mysql_query by pwg_query function.
- Add home button after upgrade.php.
- Add utf8 charset for access denied message.
- Replace some #content by .content in css files.
- Fix menubar blocks borders with IE.

git-svn-id: http://piwigo.org/svn/branches/2.0@2885 68402e56-0260-453c-a942-63ccdbb3a9ee

12 files changed, 21 insertions, 13 deletions

diff --git a/admin/include/functions_upgrade.php b/admin/include/functions_upgrade.php
index c80a01848..65b0a21ed 100644
--- a/admin/include/functions_upgrade.php
+++ b/admin/include/functions_upgrade.php
@@ -124,10 +124,10 @@ UPDATE '.PREFIX_TABLE.'plugins
 SET state="inactive"
 WHERE id IN ("' . implode('","', $plugins) . '")
 ;';
-    mysql_query($query);
+    pwg_query($query);
 
     array_push($page['infos'],
-      l10n('deactivated plugins').'<br /><br /><i>'.implode(', ', $plugins).'</i><br />');
+      l10n('deactivated plugins').'<p><i>'.implode(', ', $plugins).'</i></p>');
   }
 }
 
@@ -159,7 +159,7 @@ ON u.'.$conf['user_fields']['id'].'=ui.user_id
 WHERE '.$conf['user_fields']['username'].'="'.$username.'"
 ;';
   }
-  $row = mysql_fetch_assoc(mysql_query($query));
+  $row = mysql_fetch_assoc(pwg_query($query));
 
   if (!isset($conf['pass_convert']))
   {
diff --git a/admin/template/goto/upgrade.tpl b/admin/template/goto/upgrade.tpl
index 6e2e0730b..c217b738c 100644
--- a/admin/template/goto/upgrade.tpl
+++ b/admin/template/goto/upgrade.tpl
@@ -104,6 +104,10 @@ textarea { margin-left: 20px; }
   <li>{$info}</li>
   {/foreach}
 </ul>
+
+<form action="index.php" method="post">
+<p><input type="submit" name="submit" value="{'home'|@translate}"/></p>
+</form>
 {/if}
 
 </div> {* content *}
diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index cb530749a..07676efc5 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -588,6 +588,7 @@ function access_denied()
   set_status_header(401);
   if ( isset($user) and !is_a_guest() )
   {
+    echo '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">';
     echo '<div style="text-align:center;">'.l10n('access_forbiden').'<br />';
     echo '<a href="'.get_root_url().'identification.php">'.l10n('identification').'</a>&nbsp;';
     echo '<a href="'.make_index_url().'">'.l10n('home').'</a></div>';
diff --git a/include/functions_session.inc.php b/include/functions_session.inc.php
index ed026a175..728fc8fba 100644
--- a/include/functions_session.inc.php
+++ b/include/functions_session.inc.php
@@ -146,7 +146,7 @@ INSERT INTO '.SESSIONS_TABLE.'
   (id,data,expiration)
   VALUES(\''.get_remote_addr_session_hash().$session_id.'\',\''.$data.'\',now())
 ;';
-  mysql_query($query);
+  pwg_query($query);
   return true;
 }
 
diff --git a/install.php b/install.php
index ac8577943..068c64a01 100644
--- a/install.php
+++ b/install.php
@@ -71,7 +71,7 @@ function execute_sqlfile($filepath, $replaced, $replacing)
             $query = $matches[1].' '.$install_charset_collate.';';
           }
         }
-        mysql_query($query);
+        pwg_query($query);
       }
       $query = '';
     }
diff --git a/install/upgrade_1.3.1.php b/install/upgrade_1.3.1.php
index fa7708f6a..1b84b9232 100644
--- a/install/upgrade_1.3.1.php
+++ b/install/upgrade_1.3.1.php
@@ -42,7 +42,7 @@ $query = '
 SELECT prefix_thumbnail, mail_webmaster
   FROM '.PREFIX_TABLE.'config
 ;';
-$save = mysql_fetch_array(mysql_query($query));
+$save = mysql_fetch_array(pwg_query($query));
 
 $queries = array(
   "
diff --git a/install/upgrade_1.4.0.php b/install/upgrade_1.4.0.php
index f49e2f9f2..b1b576f27 100644
--- a/install/upgrade_1.4.0.php
+++ b/install/upgrade_1.4.0.php
@@ -64,7 +64,7 @@ DELETE
    \'authorize_remembering\'
    )
 ;';
-mysql_query($query);
+pwg_query($query);
 
 $queries = array(
 
diff --git a/plugins/admin_advices/admin_advices.php b/plugins/admin_advices/admin_advices.php
index ee2a3e797..0071f5f92 100644
--- a/plugins/admin_advices/admin_advices.php
+++ b/plugins/admin_advices/admin_advices.php
@@ -157,7 +157,7 @@ LIMIT 0, 1
 SELECT * FROM '.IMAGE_TAG_TABLE.'
 WHERE image_id =  ' . $row['id'] .'
 ;';
-      $tag_count = mysql_num_rows(mysql_query($query));
+      $tag_count = mysql_num_rows(pwg_query($query));
       $template->assign('thumbnail',
          array(
            'IMAGE'              => get_thumbnail_url($row),
diff --git a/template/yoga/default-layout.css b/template/yoga/default-layout.css
index 55cd09e57..69c17c902 100644
--- a/template/yoga/default-layout.css
+++ b/template/yoga/default-layout.css
@@ -268,7 +268,7 @@ TABLE.tagLetterContent {
 
 #theNotificationPage DL,
 #thePopuphelpPage DL { margin: 0 25px 25px; }
-#content #comments UL.thumbnailCategories LI { width:99%; }
+.content #comments UL.thumbnailCategories LI { width:99%; }
 /* jQuery datepicker */
 IMG.ui-datepicker-trigger {
 	cursor : pointer;
diff --git a/template/yoga/theme/Sylvia/images/transparent.gif b/template/yoga/theme/Sylvia/images/transparent.gif
new file mode 100644
index 000000000..2fb4189a1
--- /dev/null
+++ b/template/yoga/theme/Sylvia/images/transparent.gif
diff --git a/template/yoga/theme/Sylvia/theme.css b/template/yoga/theme/Sylvia/theme.css
index 63b05e741..6377259e3 100644
--- a/template/yoga/theme/Sylvia/theme.css
+++ b/template/yoga/theme/Sylvia/theme.css
@@ -109,6 +109,9 @@ BODY {
 #menubar LI { 
 	padding-left: 12px; 
 }
+#menubar LI UL {
+  background: transparent url(images/transparent.gif);
+}
 #menubar A, .menuInfoCat { 
 	font-size: 13px; 
 }
@@ -128,7 +131,7 @@ BODY {
 #menubar #mbIdentification form { 
 	background:transparent url(images/menuId_sides.gif) repeat-y scroll left bottom; 
 }
-#menubar #mbIdentification  .actions, #menubar li ul, #menubar #mbIdentification form  p { 
+#menubar #mbIdentification  .actions, #menubar #mbIdentification form  p { 
 	background:transparent none repeat-y scroll left bottom; 
 }
 #menubar #mbIdentification p { 
@@ -161,7 +164,7 @@ BODY {
 	padding: 0 8px 0 16px; 
 }
 
-#content { 
+.content { 
 	background:#222 url(images/fillet.gif) repeat-x scroll left top; 
 	min-height:466px; 
 }
diff --git a/upgrade.php b/upgrade.php
index 073030592..20ab360da 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -80,7 +80,7 @@ function get_tables()
   $query = '
 SHOW TABLES
 ;';
-  $result = mysql_query($query);
+  $result = pwg_query($query);
 
   while ($row = mysql_fetch_row($result))
   {
@@ -107,7 +107,7 @@ function get_columns_of($tables)
     $query = '
 DESC '.$table.'
 ;';
-    $result = mysql_query($query);
+    $result = pwg_query($query);
 
     $columns_of[$table] = array();