aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2006-04-14 22:14:53 +0000
committerrvelices <rv-github@modusoptimus.com>2006-04-14 22:14:53 +0000
commit5971c5c995849798fe3d1e75da5daab31349e945 (patch)
tree56808da8b81f47f92d1998962e696b816901d6a7
parentafa5ab27a5e81ba32e797d7025fbb25a862bcfbe (diff)
fix: sessions
css 3px image border goes from both clear and dark to image.css git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1175 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/functions_session.inc.php15
-rw-r--r--template/yoga/image.css7
-rw-r--r--template/yoga/theme/clear/theme.css4
-rw-r--r--template/yoga/theme/dark/theme.css4
4 files changed, 23 insertions, 7 deletions
diff --git a/include/functions_session.inc.php b/include/functions_session.inc.php
index 482c76376..96508a923 100644
--- a/include/functions_session.inc.php
+++ b/include/functions_session.inc.php
@@ -166,13 +166,24 @@ UPDATE '.SESSIONS_TABLE.'
;';
pwg_query($query);
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;
}
diff --git a/template/yoga/image.css b/template/yoga/image.css
index a7c8dfa83..0d242a1bd 100644
--- a/template/yoga/image.css
+++ b/template/yoga/image.css
@@ -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 {
diff --git a/template/yoga/theme/clear/theme.css b/template/yoga/theme/clear/theme.css
index 31e88d90d..1260ce776 100644
--- a/template/yoga/theme/clear/theme.css
+++ b/template/yoga/theme/clear/theme.css
@@ -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 {
diff --git a/template/yoga/theme/dark/theme.css b/template/yoga/theme/dark/theme.css
index 2bbe9533b..409b3773f 100644
--- a/template/yoga/theme/dark/theme.css
+++ b/template/yoga/theme/dark/theme.css
@@ -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 {