Changeset 1176

Timestamp:

Apr 15, 2006, 12:15:24 AM (18 years ago)

Author:

rvelices

Message:

merge r1175 from branch-1_6 into trunk

fix: sessions

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

Location:

trunk

Files:

• include/functions_session.inc.php (modified) (1 diff)
• template/yoga/image.css (modified) (2 diffs)
• template/yoga/theme/clear/theme.css (modified) (2 diffs)
• template/yoga/theme/dark/theme.css (modified) (2 diffs)

trunk/include/functions_session.inc.php

@@ -166 +166 @@
 ;';
   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;

trunk/template/yoga/image.css

@@ -66 +66 @@
 }
 
+#theImage IMG {
+  border-width: 3px;
+  border-style: solid;
+}
+
 .navThumb {
     margin-top: 2px;
@@ -97 +102 @@
     font-weight: bold;
     text-align: right;
-    padding-right: 0.5em; 
+    padding-right: 0.5em;
 }
 

trunk/template/yoga/theme/clear/theme.css

@@ -20 +20 @@
 
 /* borders */
-#menubar DL, #content, #imageToolBar, #theImage IMG,
+#menubar DL, #content, #imageToolBar,
 #comments DIV.comment BLOCKQUOTE {
   border: 1px solid #d3d3d3;
@@ -26 +26 @@
 
 #theImage IMG {
-  border-width: 3px;
+  border-color: #d3d3d3;
 }
 

trunk/template/yoga/theme/dark/theme.css

@@ -47 +47 @@
 
 /* borders */
-#menubar DL, #content, #imageToolBar, #theImage IMG,
+#menubar DL, #content, #imageToolBar,
 #comments DIV.comment BLOCKQUOTE {
   border: 1px solid #000000;
@@ -53 +53 @@
 
 #theImage IMG {
-  border-width: 3px;
+  border-color: #000000;
 }