Changeset 1845

Timestamp:

Feb 21, 2007, 1:20:02 AM (17 years ago)

Author:

rvelices

Message:

revert revision 1842 on default-colors.css (it messes with where backgrounds are transparent and/or inherited - see picture page for clear and dark theme!)
web services correction:

• urls were not sent for method images.getInfo
• uniformization: all element urls (tn_url, element_url, high_url) are xml attributes for all methods

Location:

trunk

Files:

• include/ws_functions.inc.php (modified) (10 diffs)
• template/yoga/default-colors.css (modified) (1 diff)

trunk/include/ws_functions.inc.php

@@ -4 +4 @@
 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
 // | file          : $Id$
 // | last update   : $Date$
@@ -244 +243 @@
 }
 
+/**
+ * returns an array of image attributes that are to be encoded as xml attributes
+ * instead of xml elements
+ */
+function ws_std_get_image_xml_attributes()
+{
+  return array(
+    'id','tn_url','element_url','high_url', 'file','width','height','hit'
+    );
+}
 
 /**
@@ -395 +404 @@
           ),
        WS_XML_CONTENT => new PwgNamedArray($images, 'image',
-          array('id', 'tn_url', 'element_url', 'file','width','height','hit') )
+          ws_std_get_image_xml_attributes() )
       )
     );
@@ -439 +448 @@
   $query = '
 SELECT id, name, uppercats, global_rank,
-    max_date_last, count_images AS nb_images, count_categories AS nb_categories
+    nb_images, count_images AS total_nb_images,
+    date_last, max_date_last, count_categories AS nb_categories
   FROM '.CATEGORIES_TABLE.'
    INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.' ON id=cat_id
@@ -458 +468 @@
           )
       );
-    foreach( array('id','nb_images','nb_categories') as $key)
+    foreach( array('id','nb_images','total_nb_images','nb_categories') as $key)
     {
       $row[$key] = (int)$row[$key];
@@ -468 +478 @@
       'categories' =>
           new PwgNamedArray($cats,'category',
-            array('id','url','nb_images','nb_categories','max_date_last')
+            array('id','url','nb_images','total_nb_images','nb_categories','date_last','max_date_last')
           )
     );
@@ -502 +512 @@
     return new PwgError(999, "image_id not found");
   }
-  array_merge( $image_row, ws_std_get_urls($image_row) );
+  $image_row = array_merge( $image_row, ws_std_get_urls($image_row) );
 
   //-------------------------------------------------------- related categories
@@ -601 +611 @@
   unset($ret['path']);
   unset($ret['storage_category_id']);
+
   return new PwgNamedStruct('image',$ret, null, array('name','comment') );
 }
@@ -712 +723 @@
           ),
        WS_XML_CONTENT => new PwgNamedArray($images, 'image',
-          array('id', 'tn_url', 'element_url', 'file','width','height','hit') )
+          ws_std_get_image_xml_attributes() )
       )
     );
@@ -946 +957 @@
           ),
        WS_XML_CONTENT => new PwgNamedArray($images, 'image',
-          array('id', 'tn_url', 'element_url', 'file','width','height','hit') )
+          ws_std_get_image_xml_attributes() )
       )
     );

trunk/template/yoga/default-colors.css

@@ -1 +1 @@
 /* $Id$ */
-#content, #menubar, #thePicturePage #the_page { background-color: #eef; }
+
 /* others */
 .pleaseNote {