php-blog-cvs

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9459/include

Modified Files:
	functions_config.inc.php functions_entries.inc.php 
	genpage.inc.php 
Log Message:
* Better detect height of iframe (use mainpane element, add its margin)
* Notify user of search failures instead of "returning 1 result", and
  guide them where they should look at.



Index: functions_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_config.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- functions_config.inc.php	10 Dec 2004 10:59:05 -0000	1.8
+++ functions_config.inc.php	11 Dec 2004 14:39:43 -0000	1.9
@@ -261,8 +261,11 @@
 ?>
         <script type="text/javascript">
            window.onload = function() {
-             parent.document.getElementById('serendipity_iframe').style.height = document.body.offsetHeight + 'px';
-             parent.document.getElementById('serendipity_iframe').scrolling = 'no';
+             parent.document.getElementById('serendipity_iframe').style.height = document.getElementById('mainpane').offsetHeight
+                                                                               + parseInt(document.getElementById('mainpane').style.marginTop)
+                                                                               + parseInt(document.getElementById('mainpane').style.marginBottom)
+                                                                               + 'px';
+             parent.document.getElementById('serendipity_iframe').scrolling    = 'no';
              parent.document.getElementById('serendipity_iframe').style.border = 0;
            }
         </script>

Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- functions_entries.inc.php	10 Dec 2004 19:58:01 -0000	1.21
+++ functions_entries.inc.php	11 Dec 2004 14:39:43 -0000	1.22
@@ -446,7 +446,8 @@
                   ORDER BY  timestamp DESC";
 
     $serendipity['hidefooter'] = true;
-    return serendipity_db_query($querystring);
+    $search = serendipity_db_query($querystring);
+    return $search;
 }
 
 /** Print a footer below the list of entries

Index: genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/genpage.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- genpage.inc.php	1 Dec 2004 14:57:26 -0000	1.8
+++ genpage.inc.php	11 Dec 2004 14:39:43 -0000	1.9
@@ -38,7 +38,10 @@
                 break;
             }
 
-            if ($r === true) {
+            if (is_string($r) && $r !== true) {
+                $serendipity['smarty']->assign('content_message', sprintf(SEARCH_ERROR, $serendipity['dbPrefix'], $r));
+                break;
+            } elseif ($r === true) {
                 $serendipity['smarty']->assign('content_message', sprintf(NO_ENTRIES_BLAHBLAH, $serendipity['GET']['searchTerm']));
                 break;
             }