merge r1175 from branch-1_6 into trunk

fix: sessions

css 3px image border goes from both clear and dark to image.css

git-svn-id: http://piwigo.org/svn/trunk@1176 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2006-04-14 22:15:24 +00:00
parent e1c0fd7f4c
commit 18570279ef
4 changed files with 24 additions and 8 deletions

View File

@@ -165,14 +165,25 @@ UPDATE '.SESSIONS_TABLE.'
WHERE id = \''.$session_id.'\'
;';
pwg_query($query);
if ( mysql_affected_rows()==-1 )
{
if ( mysql_affected_rows()==0 )
{ // 2 possible cases:
//- the user has just login so we need to insert
//- the user went through 2 pages very fast (in the same second), so
// data and expiration are the same as before
$query = '
SELECT id FROM '.SESSIONS_TABLE.'
WHERE id = \''.$session_id.'\'
;';
$id = array_from_query( $query, array('id') );
if ( empty($id) )
{
$query = '
INSERT INTO '.SESSIONS_TABLE.'
(id,data,expiration)
VALUES(\''.$session_id.'\',\''.$data.'\',now())
;';
pwg_query($query);
pwg_query($query);
}
}
return true;
}

View File

@@ -65,6 +65,11 @@ de l'image...
margin: 0 auto;
}
#theImage IMG {
border-width: 3px;
border-style: solid;
}
.navThumb {
margin-top: 2px;
}
@@ -96,7 +101,7 @@ TABLE.infoTable .value {
TABLE.infoTable .label {
font-weight: bold;
text-align: right;
padding-right: 0.5em;
padding-right: 0.5em;
}
TABLE.infoTable TD.value UL {

View File

@@ -19,13 +19,13 @@ H2, #menubar DT, #imageHeaderBar, #imageToolBar A:hover {
}
/* borders */
#menubar DL, #content, #imageToolBar, #theImage IMG,
#menubar DL, #content, #imageToolBar,
#comments DIV.comment BLOCKQUOTE {
border: 1px solid #d3d3d3;
}
#theImage IMG {
border-width: 3px;
border-color: #d3d3d3;
}
#content UL.thumbnail IMG {

View File

@@ -46,13 +46,13 @@ H2, #menubar DT, .throw {
}
/* borders */
#menubar DL, #content, #imageToolBar, #theImage IMG,
#menubar DL, #content, #imageToolBar,
#comments DIV.comment BLOCKQUOTE {
border: 1px solid #000000;
}
#theImage IMG {
border-width: 3px;
border-color: #000000;
}
#content UL.thumbnail IMG {