merge r1216 from branch-1_6 into trunk

bug 340: ini_set disabled to Club Internet ISP + 1 error text message fix: display issue with IE6 on admin rating (table from 100% to 99%) git-svn-id: http://piwigo.org/svn/trunk@1217 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Apr 20, 2006 · ee37f7d · ee37f7d
1 parent 9c47c50
commit ee37f7d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/include/functions_session.inc.php b/include/functions_session.inc.php
@@ -65,11 +65,17 @@ function generate_key($size)
     'pwg_session_destroy',
     'pwg_session_gc'
   );
-  ini_set('session.use_cookies', $conf['session_use_cookies']);
-  ini_set('session.use_only_cookies', $conf['session_use_only_cookies']);
-  ini_set('session.use_trans_sid', intval($conf['session_use_trans_sid']));
-  ini_set('session.name', $conf['session_name']);
-  ini_set('session.cookie_path', cookie_path() );
+  if ( function_exists('ini_set') )
+  {
+    ini_set('session.use_cookies', $conf['session_use_cookies']);
+    ini_set('session.use_only_cookies', $conf['session_use_only_cookies']);
+    ini_set('session.use_trans_sid', intval($conf['session_use_trans_sid']));
+  }
+  session_name( $conf['session_name'] );
+  session_set_cookie_params(
+      ini_get('session.cookie_lifetime'),
+      cookie_path()
+    );
 }
 
 // cookie_path returns the path to use for the PhpWebGallery cookie.
@@ -166,15 +172,15 @@ function pwg_session_write($session_id, $data)
 ;';
   pwg_query($query);
   if ( mysql_affected_rows()>0 )
-  { 
+  {
     return true;
   }
   $query = '
 INSERT INTO '.SESSIONS_TABLE.'
   (id,data,expiration)
   VALUES(\''.$session_id.'\',\''.$data.'\',now())
 ;';
-  pwg_query($query);
+  mysql_query($query);
   return true;
 }
 

diff --git a/template/yoga/admin/rating.tpl b/template/yoga/admin/rating.tpl
@@ -33,7 +33,7 @@
 </form>
 
 <div class="navigationBar">{NAVBAR}</div>
-<table width="100%">
+<table width="99%">
 <tr class="throw">
   <td>{lang:File}</td>
   <td>{lang:Number of rates}</td>