php-blog-cvs — Serendipity commit list

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.34,1.35

[<gsc...@us...>]

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv15475

Modified Files:
	jBlog_functions.inc.php 
Log Message:
logix fix for tb/pb auto-discovery


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- jBlog_functions.inc.php	7 Mar 2003 19:36:34 -0000	1.34
+++ jBlog_functions.inc.php	7 Mar 2003 19:48:35 -0000	1.35
@@ -561,7 +561,7 @@
  * validate trackback response
  */
 function
-jBlog_trackback_is_success($resp, $data, $final=0)
+jBlog_trackback_is_success($resp)
 {
     if (preg_match('@<error>(\d)+</error>@', $resp, $matches)) {
         if ((int) $matches[1]) {
@@ -575,11 +575,6 @@
             }
         }
     }
-    else if($final == 0) {
-        if(preg_match('@trackback:ping(\s*rdf:resource)?\s*=\s*"(http:[^"]+)"@', $resp, $matches)) {
-            return jBlog_trackback_is_success(_jBlog_send($matches[2], $data), 1);
-        }
-    }
     return 1;
 }
 
@@ -644,16 +639,27 @@
 }
 
 function
-jBlog_trackback_send($loc, $url, $author, $title, $text)
+jBlog_trackback_autodiscover($res, $url, $author, $title, $text)
 {
+    if(!preg_match('@trackback:ping(\s*rdf:resource)?\s*=\s*"(http:[^"]+)"@', $res, $matches)) {
+        return;
+    }
     $data = "url=".rawurlencode($url)."&title=".rawurlencode($title).
             "&blog_name=".rawurlencode($author)."&excerpt=".rawurlencode($text);
-    $res = _jBlog_send($loc, $data);
-    $response = jBlog_trackback_is_success($res, $data);
-    jBlog_pingback_autodiscover($loc, $res);
+    $response = jBlog_trackback_is_success(_jBlog_send($matches[2], $data));
     return $response;
 }
 
+function jBlog_reference_autodiscover($loc, $url, $author, $title, $text) {
+    $fp = fopen($loc, "r");
+    while(!feof($fp)) {
+        $res .= fgets($fp, 1024);
+    }
+    fclose($fp);
+    jBlog_trackback_autodiscover($res, $url, $author, $title, $text);
+    jBlog_pingback_autodiscover($loc, $res);
+}
+
 /**
  *
  */
@@ -733,8 +739,7 @@
         if ($row[0] > 0) {
             continue;
         }
-
-        jBlog_trackback_send($locations[$i], $url, $author, $title, jBlog_trackback_excerpt($text));
+        jBlog_reference_autodiscover($locations[$i], $url, $author, $title, jBlog_trackback_excerpt($text));
     }
     mysql_db_query($jBlog['dbName'], "DELETE FROM {$jBlog['dbPrefix']}references WHERE entry_id='$tmpid'");
 

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.33,1.34

[<ste...@us...>]

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv9782

Modified Files:
	jBlog_functions.inc.php 
Log Message:
remove extraeneous var_dump()


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- jBlog_functions.inc.php	7 Mar 2003 19:32:43 -0000	1.33
+++ jBlog_functions.inc.php	7 Mar 2003 19:36:34 -0000	1.34
@@ -397,7 +397,6 @@
               WHERE e.id  = '$id'
               AND e.authorid = a.authorid";
     $cursor = mysql_db_query($jBlog['dbName'], $query);
-    var_dump(mysql_error());
     $row = mysql_fetch_assoc($cursor);
     if($row['mail_comments']) {
         jBlog_sendComment($row['email'], $name, $email, $url, $id, 

[php-blog-cvs] jBlog comment.php,1.6,1.7 jBlog_functions.inc.php,1.32,1.33

[<ste...@us...>]

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv7979

Modified Files:
	comment.php jBlog_functions.inc.php 
Log Message:
fix autodiscovery in the comments


Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/comment.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- comment.php	7 Mar 2003 04:07:37 -0000	1.6
+++ comment.php	7 Mar 2003 19:32:43 -0000	1.7
@@ -8,7 +8,9 @@
 
 if ($type == 'trackback') {
     $uri = $_SERVER['REQUEST_URI'];
-    if (preg_match('@\/(\d+)$@', $uri, $matches)) {
+    if (isset($_GET['entry_id'])) {
+        $id = $_GET['entry_id'];
+    } else if (preg_match('@\/(\d+)$@', $uri, $matches)) {
         $id = $matches[1];
     }
 

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- jBlog_functions.inc.php	7 Mar 2003 18:54:30 -0000	1.32
+++ jBlog_functions.inc.php	7 Mar 2003 19:32:43 -0000	1.33
@@ -389,14 +389,15 @@
 
     mysql_db_query($jBlog['dbName'], $query);
 
-    $query = "UPDATE {$jBlog['dbPrefix']}entries SET comments=comments+1 WHERE id=$id";
+    $query = "UPDATE {$jBlog['dbPrefix']}entries SET comments=comments+1 WHERE id='$id'";
     mysql_db_query($jBlog['dbName'], $query);
 
     $query = "SELECT email, title, mail_comments 
               FROM {$jBlog['dbPrefix']}entries e, {$jBlog['dbPrefix']}authors a
-              WHERE e.id  = $id
+              WHERE e.id  = '$id'
               AND e.authorid = a.authorid";
     $cursor = mysql_db_query($jBlog['dbName'], $query);
+    var_dump(mysql_error());
     $row = mysql_fetch_assoc($cursor);
     if($row['mail_comments']) {
         jBlog_sendComment($row['email'], $name, $email, $url, $id, 

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.31,1.32

[<gsc...@us...>]

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv22477

Modified Files:
	jBlog_functions.inc.php 
Log Message:
referrer tracking fix


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- jBlog_functions.inc.php	7 Mar 2003 05:11:21 -0000	1.31
+++ jBlog_functions.inc.php	7 Mar 2003 18:54:30 -0000	1.32
@@ -1224,7 +1224,8 @@
               (url, day, count)
               VALUES ('$_SERVER[HTTP_REFERER]', now(), 1)";
     $rs = mysql_db_query($jBlog['dbName'], $suppressq);
-    if(mysql_affected_rows() > 0) {
+    $count = mysql_fetch_row($rs);
+    if($count[0] > 0) {
         mysql_db_query($jBlog['dbName'], $suppressu);
         return;
     } 

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.30,1.31

[<gsc...@us...>]

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv20472

Modified Files:
	jBlog_functions.inc.php 
Log Message:
trackback auto-discovery fixes


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- jBlog_functions.inc.php	7 Mar 2003 04:44:29 -0000	1.30
+++ jBlog_functions.inc.php	7 Mar 2003 05:11:21 -0000	1.31
@@ -561,7 +561,7 @@
  * validate trackback response
  */
 function
-jBlog_trackback_is_success($resp, $final=0)
+jBlog_trackback_is_success($resp, $data, $final=0)
 {
     if (preg_match('@<error>(\d)+</error>@', $resp, $matches)) {
         if ((int) $matches[1]) {
@@ -575,7 +575,7 @@
             }
         }
     }
-    else if($final) {
+    else if($final == 0) {
         if(preg_match('@trackback:ping(\s*rdf:resource)?\s*=\s*"(http:[^"]+)"@', $resp, $matches)) {
             return jBlog_trackback_is_success(_jBlog_send($matches[2], $data), 1);
         }
@@ -591,8 +591,10 @@
         $pingback = $matches[1]; 
     }
     else {  
+        return;
+    }
         // xml-rpc hack
-        $query = "
+    $query = "
 <?xml version=\"1.0\"?>
 <methodCall>
   <methodName>pingback.ping</methodName>
@@ -608,8 +610,6 @@
 </methodCall>";
         _jBlog_send($pingback, $query);
         return;
-    }
-    
 }    
 
 /**
@@ -648,7 +648,6 @@
 {
     $data = "url=".rawurlencode($url)."&title=".rawurlencode($title).
             "&blog_name=".rawurlencode($author)."&excerpt=".rawurlencode($text);
-
     $res = _jBlog_send($loc, $data);
     $response = jBlog_trackback_is_success($res, $data);
     jBlog_pingback_autodiscover($loc, $res);
@@ -711,7 +710,6 @@
 jBlog_handle_references($id, $author, $title, $text)
 {
     global $jBlog;
-
     if (!preg_match_all('@<a[^>]+?href\s*=\s*["\']?([^\'" >]+?)[ \'"]?>([^<]*)</a>@i', $text, $matches)) {
         return;
     }
@@ -752,7 +750,7 @@
     preg_match_all('@<cite[^>]*>([^<]+)</cite>@i', $text, $matches);
 
     foreach ($matches[1] as $citation) {
-        $query = "INSERT INTO {$jBlog['dbPrefix']}references (entry_id, name) VALUES(";
+        $query = "INSERT INTO {$jBlog['dbPrefix']}references (en)try_id, name) VALUES(";
         $query .= "'$tmpid', '" . mysql_escape_string($citation) . "')";
 
         mysql_db_query($jBlog['dbName'], $query);
@@ -789,8 +787,12 @@
         $newEntry = 1;
         $entry['id'] = mysql_insert_id();
     }
-
-    jBlog_handle_references($entry['id'], $jBlog['blogTitle'], $entry['title'], $entry['extended'], $newEntry);
+    if($exflag) {
+        jBlog_handle_references($entry['id'], $jBlog['blogTitle'], $entry['title'], $entry['extended'], $newEntry);
+    }
+    else {
+        jBlog_handle_references($entry['id'], $jBlog['blogTitle'], $entry['title'], $entry['body'], $newEntry);
+    }
 
     jBlog_purgeEntry($entry['id'], $entry['timestamp']);
     

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.29,1.30

[<gsc...@us...>]

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv12723

Modified Files:
	jBlog_functions.inc.php 
Log Message:
pingback auto-detection

highly highly beta



Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- jBlog_functions.inc.php	7 Mar 2003 04:07:37 -0000	1.29
+++ jBlog_functions.inc.php	7 Mar 2003 04:44:29 -0000	1.30
@@ -577,19 +577,57 @@
     }
     else if($final) {
         if(preg_match('@trackback:ping(\s*rdf:resource)?\s*=\s*"(http:[^"]+)"@', $resp, $matches)) {
-            return jBlog_trackback_is_success(_jBlog_send(parse_url($matches[2], $data)), 1);
+            return jBlog_trackback_is_success(_jBlog_send($matches[2], $data), 1);
         }
     }
     return 1;
 }
 
-
+function jBlog_pingback_autodiscover($loc, $body) {
+    if($_SERVER['X-PINGBACK']) {
+        $pingback = $_SERVER['X-PINGBACK'];
+    }
+    else if(preg_match('@<link rel="pingback" href="([^"]+)" ?/?>@', $body, $matches)) {
+        $pingback = $matches[1]; 
+    }
+    else {  
+        // xml-rpc hack
+        $query = "
+<?xml version=\"1.0\"?>
+<methodCall>
+  <methodName>pingback.ping</methodName>
+  <params>
+    <param>
+      <name>sourceURI</name>
+      <value><string>http://{$_SERVER['HTTP_HOST']}{$jBlog['baseURL']}</string></value>
+    </param>
+      <name>targetURI</name>
+      <value><string>$loc</string></value>
+    </param>
+  </params>
+</methodCall>";
+        _jBlog_send($pingback, $query);
+        return;
+    }
+    
+}    
 
 /**
  * Send a trackback ping
  */
 
-function _jBlog_send($target, $data) {
+function _jBlog_send($loc, $data) {
+    $target = parse_url($loc);
+    if ($target['query'] != "") {
+        $target['query'] = '?' . $target['query'];
+    }
+    if (!is_numeric($target['port'])) {
+       $target['port'] = 80;
+    }
+    $sock = fsockopen($target['host'], $target['port']);
+    if (!is_resource($sock)) {
+        return "Couldn't connect to $loc";
+    }
     fwrite($sock, "POST {$target['path']}{$target['query']} HTTP/1.1\r\n");
     fwrite($sock, "Host: {$target['host']}\r\n");
     fwrite($sock, "Content-type: application/x-www-form-urlencoded\r\n");
@@ -601,35 +639,20 @@
     while (!feof($sock)) {
         $res .= fgets($sock, 1024);
     }
+    fclose($sock);
     return $res;
 }
 
 function
 jBlog_trackback_send($loc, $url, $author, $title, $text)
 {
-    $target = parse_url($loc);
-
-    if ($target['query'] != "") {
-        $target['query'] = '?' . $target['query'];
-    }
-
-    if (!is_numeric($target['port'])) {
-        $target['port'] = 80;
-    }
-
-    $sock = fsockopen($target['host'], $target['port']);
-    if (!is_resource($sock)) {
-        return "Couldn't connect to $loc";
-    }
-
     $data = "url=".rawurlencode($url)."&title=".rawurlencode($title).
             "&blog_name=".rawurlencode($author)."&excerpt=".rawurlencode($text);
 
-    $res = _jBlog_send($target, $data);
-    $res = jBlog_trackback_is_success($res, $data);
-    fclose($sock);
-
-    return $res;
+    $res = _jBlog_send($loc, $data);
+    $response = jBlog_trackback_is_success($res, $data);
+    jBlog_pingback_autodiscover($loc, $res);
+    return $response;
 }
 
 /**

[php-blog-cvs] jBlog comment.php,1.5,1.6 jBlog_functions.inc.php,1.28,1.29

[<gsc...@us...>]

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv604

Modified Files:
	comment.php jBlog_functions.inc.php 
Log Message:
improved trackback autodiscovery



Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/comment.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- comment.php	6 Mar 2003 17:07:15 -0000	1.5
+++ comment.php	7 Mar 2003 04:07:37 -0000	1.6
@@ -6,44 +6,6 @@
     $type = 'normal';
 }
 
-function 
-add_trackback ($id, $title, $url, $name, $excerpt)
-{
-    global $jBlog;
-
-    $comment['title'] = $title;
-    $comment['url'] = $url;
-    $comment['name'] = $name;
-    $comment['comment'] = $excerpt;
-
-    jBlog_saveComment($id, $comment, 'TRACKBACK');
-
-    return 1;
-}
-
-function
-report_trackback_success ()
-{
-print <<<SUCCESS
-<?xml version="1.0" encoding="iso-8859-1"?>
-<response>
-<error>0</error>
-</response>
-SUCCESS;
-}
-
-function
-report_trackback_failure ()
-{
-print <<<FAILURE
-<?xml version="1.0" encoding="iso-8859-1"?>
-<response>
-<error>1</error>
-<message>Danger Will Robinson, trackback failed.</message>
-</response>
-FAILURE;
-}
-
 if ($type == 'trackback') {
     $uri = $_SERVER['REQUEST_URI'];
     if (preg_match('@\/(\d+)$@', $uri, $matches)) {

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- jBlog_functions.inc.php	6 Mar 2003 21:11:39 -0000	1.28
+++ jBlog_functions.inc.php	7 Mar 2003 04:07:37 -0000	1.29
@@ -561,7 +561,7 @@
  * validate trackback response
  */
 function
-jBlog_trackback_is_success($resp)
+jBlog_trackback_is_success($resp, $final=0)
 {
     if (preg_match('@<error>(\d)+</error>@', $resp, $matches)) {
         if ((int) $matches[1]) {
@@ -575,7 +575,11 @@
             }
         }
     }
-
+    else if($final) {
+        if(preg_match('@trackback:ping(\s*rdf:resource)?\s*=\s*"(http:[^"]+)"@', $resp, $matches)) {
+            return jBlog_trackback_is_success(_jBlog_send(parse_url($matches[2], $data)), 1);
+        }
+    }
     return 1;
 }
 
@@ -584,6 +588,22 @@
 /**
  * Send a trackback ping
  */
+
+function _jBlog_send($target, $data) {
+    fwrite($sock, "POST {$target['path']}{$target['query']} HTTP/1.1\r\n");
+    fwrite($sock, "Host: {$target['host']}\r\n");
+    fwrite($sock, "Content-type: application/x-www-form-urlencoded\r\n");
+    fwrite($sock, "Content-length: " . strlen($data) . "\r\n");
+    fwrite($sock, "Connection: close\r\n\r\n");
+    fwrite($sock, $data);
+
+
+    while (!feof($sock)) {
+        $res .= fgets($sock, 1024);
+    }
+    return $res;
+}
+
 function
 jBlog_trackback_send($loc, $url, $author, $title, $text)
 {
@@ -605,31 +625,59 @@
     $data = "url=".rawurlencode($url)."&title=".rawurlencode($title).
             "&blog_name=".rawurlencode($author)."&excerpt=".rawurlencode($text);
 
-    fwrite($sock, "POST {$target['path']}{$target['query']} HTTP/1.1\r\n");
-    fwrite($sock, "Host: {$target['host']}\r\n");
-    fwrite($sock, "Content-type: application/x-www-form-urlencoded\r\n");
-    fwrite($sock, "Content-length: " . strlen($data) . "\r\n");
-    fwrite($sock, "Connection: close\r\n\r\n");
-    fwrite($sock, $data);
-
-
-    while (!feof($sock)) {
-        $res .= fgets($sock, 1024);
-    }
-
-    $res = jBlog_trackback_is_success($res);
+    $res = _jBlog_send($target, $data);
+    $res = jBlog_trackback_is_success($res, $data);
     fclose($sock);
 
     return $res;
 }
 
 /**
+ *
+ */
+function
+add_trackback ($id, $title, $url, $name, $excerpt)
+{   
+    global $jBlog;
+
+    $comment['title'] = $title;
+    $comment['url'] = $url;
+    $comment['name'] = $name;
+    $comment['comment'] = $excerpt;
+
+    jBlog_saveComment($id, $comment, 'TRACKBACK');
+    
+    return 1;
+} 
+
+/**
  * Cut text
  */
 function
 jBlog_trackback_excerpt($text) 
 {
     return substr($text, 0, 255);
+}
+
+function report_trackback_success ()
+{
+print <<<SUCCESS
+<?xml version="1.0" encoding="iso-8859-1"?>
+<response>
+<error>0</error>
+</response>
+SUCCESS;
+}
+
+function report_trackback_failure ()
+{
+print <<<FAILURE
+<?xml version="1.0" encoding="iso-8859-1"?>
+<response>
+<error>1</error>
+<message>Danger Will Robinson, trackback failed.</message>
+</response>
+FAILURE;
 }
 
 

[php-blog-cvs] jBlog index.php,1.5,1.6 jBlog.css.php,1.4,1.5

[<ste...@us...>]

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv23821

Modified Files:
	index.php jBlog.css.php 
Log Message:
add a pregenerate config variable


Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/index.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- index.php	5 Mar 2003 01:10:17 -0000	1.5
+++ index.php	7 Mar 2003 03:40:11 -0000	1.6
@@ -22,10 +22,12 @@
         $data = ob_get_contents();
         ob_end_clean();
 
-        $fp = fopen("./archives/{$matches[1]}", "w");
-        fwrite($fp, $data);
-        fclose($fp);
-
+        if ($jBlog['pregenerate']) {
+            $fp = fopen("./archives/{$matches[1]}", "w");
+            fwrite($fp, $data);
+            fclose($fp);
+        }
+        
         print $data;
     } else if (preg_match('@/(e_(\d+)\.html)$@', $uri, $matches)) {
         $id = $matches[2];
@@ -46,9 +48,11 @@
         $data = ob_get_contents();
         ob_end_clean();
 
-        $fp = fopen("./archives/{$matches[1]}", "w");
-        fwrite($fp, $data);
-        fclose($fp);
+        if ($jBlog['pregenerate']) {
+            $fp = fopen("./archives/{$matches[1]}", "w");
+            fwrite($fp, $data);
+            fclose($fp);
+        }
 
         print $data;
     }
@@ -70,10 +74,12 @@
 
         $data = ltrim($data);
 
-        $fp = fopen("./feeds/index.{$matches[1]}", "w");
-        fwrite($fp, $data);
-        fclose($fp);
-
+        if ($jBlog['pregenerate']) {
+            $fp = fopen("./feeds/index.{$matches[1]}", "w");
+            fwrite($fp, $data);
+            fclose($fp);
+        }
+        
         print $data;
     }
 } else if (preg_match('@/(index\.(php|html))?@', $uri)) {
@@ -82,9 +88,11 @@
         include_once("jBlog_genpage.php");
         $data = ob_get_contents();
         ob_end_clean();
-        $fp = fopen('./index.html', 'w');
-        fwrite($fp, $data);
-        fclose($fp);
+        if ($jBlog['pregenerate']) {
+            $fp = fopen('./index.html', 'w');
+            fwrite($fp, $data);
+            fclose($fp);
+        }
         print $data;
     } else {
         if (isset($jBlog['GET']['calendarZoom'])) {

Index: jBlog.css.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog.css.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- jBlog.css.php	6 Mar 2003 03:05:29 -0000	1.4
+++ jBlog.css.php	7 Mar 2003 03:40:11 -0000	1.5
@@ -3,5 +3,4 @@
 include_once("jBlog_config.inc.php");
 $css = jBlog_getCSS($_REQUEST['style']);
 echo $css['data'];
-
 ?>

[php-blog-cvs] jBlog jBlog_admin_images.inc.php,1.1.1.1,1.2 jBlog_functions.inc.php,1.27,1.28

[<we...@us...>]

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv7406

Modified Files:
	jBlog_admin_images.inc.php jBlog_functions.inc.php 
Log Message:
Enable support for image manipulation using gd extension, where available.


Index: jBlog_admin_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_images.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- jBlog_admin_images.inc.php	27 Feb 2003 16:55:35 -0000	1.1.1.1
+++ jBlog_admin_images.inc.php	6 Mar 2003 21:11:38 -0000	1.2
@@ -46,9 +46,9 @@
         $i = getimagesize($jBlog["jBlogPath"].$jBlog["uploadPath"]."/".$files[$x]);
 
         // Display a thumbnail?
-        if ($jBlog["magick"]===true) {
+        if (file_exists($jBlog["jBlogPath"] . $jBlog["uploadPath"] . $f[0] . "." . $jBlog["thumbSuffix"] . "." . $f[1])) {
         	echo "<td height='".$jBlog["thumbSize"]."' align='center' valign='middle'>";
-			echo "<img src='".$jBlog["uploadHTTPPath"].$f[0].".".$jBlog["thumbSuffix"].".".$f[1]."' hspace='15'>";
+			echo "<img src='".$jBlog['jBlogHTTPPath'] . $jBlog["uploadHTTPPath"].$f[0].".".$jBlog["thumbSuffix"].".".$f[1]."' hspace='15'>";
         	echo "</td>";
         }
 
@@ -58,10 +58,10 @@
         echo $i[0]."x".$i[1]."<br>";
 
         // Display tools
-        echo "<img alt='Fullsize' src='".$jBlog["jBlogHTTPPath"]."pixel/zoom.png' border='0' onClick=\"F1 = window.open(".
+        echo "<img class='jBlogImageButton' alt='Fullsize' src='".$jBlog["jBlogHTTPPath"]."pixel/zoom.png' border='0' onClick=\"F1 = window.open(".
              "'".$jBlog["jBlogHTTPPath"].$jBlog["uploadHTTPPath"].$files[$x]."','Zoom','height=".($i[1]+20).",width=".($i[0]+20)."');\">";
-        echo "<img alt='Rename this image' src='".$jBlog["jBlogHTTPPath"]."pixel/rename.png' onClick='rename(\"".addslashes($files[$x])."\")' border='0'>";
-        echo "<img alt='Resize this image' src='".$jBlog["jBlogHTTPPath"]."pixel/scale.png' border='0' onClick='location.href=\"?jBlog[adminModule]=images&jBlog[adminAction]=scaleSelect&jBlog[fname]=".rawurlencode($files[$x])."\";'>";
+        echo "<img class='jBlogImageButton' alt='Rename this image' src='".$jBlog["jBlogHTTPPath"]."pixel/rename.png' onClick='rename(\"".addslashes($files[$x])."\")' border='0'>";
+        echo "<img class='jBlogImageButton' alt='Resize this image' src='".$jBlog["jBlogHTTPPath"]."pixel/scale.png' border='0' onClick='location.href=\"?jBlog[adminModule]=images&jBlog[adminAction]=scaleSelect&jBlog[fname]=".rawurlencode($files[$x])."\";'>";
         echo "</td>";
 
         // Linebreak?

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- jBlog_functions.inc.php	6 Mar 2003 20:16:31 -0000	1.27
+++ jBlog_functions.inc.php	6 Mar 2003 21:11:39 -0000	1.28
@@ -802,25 +802,72 @@
     return array($f, $suf);
 }
 
+function jBlog_resize_image_gd($infilename, $outfilename, $newwidth, $newheight)
+{
+	if (!function_exists("imagecopyresampled")) {
+		return false;
+	}
+
+	$inf = pathinfo(strtolower($infilename));
+	switch ($inf['extension']) {
+		case 'gif':
+			$loadfn = "imagecreatefromgif";
+			$savefn = "imagegif";
+			break;
+			
+		case 'jpeg':
+		case 'jpg':
+		case 'jfif':
+			$loadfn = "imagecreatefromjpeg";
+			$savefn = "imagejpeg";
+			break;
+			
+		case 'png':
+			$loadfn = "imagecreatefrompng";
+			$savefn = "imagepng";
+			break;
+			
+		default:
+			return false;
+	}
+
+	if (!function_exists($loadfn) && !function_exists($savefn)) {
+		return false;
+	}
+
+	$in = $loadfn($infilename);
+	$out = imagecreatetruecolor($newwidth, $newheight);
+	imagecopyresampled($out, $in, 0, 0, 0, 0, $newwidth, $newheight, imagesx($in), imagesy($in));
+	$savefn($out, $outfilename);
+	$out = null;
+	$in = null;
+	return "OK!";
+}
+
 /**
 * Generate a thumbnail
 **/
 function jBlog_makeThumbnail($file, $size=false) {
 	global $jBlog;
 
-    if ($jBlog["magick"] !== true) return false;
 	if ($size===false) $size = $jBlog["thumbSize"];
 
     // Calculate name of thumbnail
 	$t = jBlog_parseFileName($file);
     $f = $t[0];
     $suf = $t[1];
+   
+	$infile = $jBlog["jBlogPath"] . $jBlog["uploadPath"] . $file;
+	$outfile = $jBlog["jBlogPath"] . $jBlog["uploadPath"] . $f . "." . $jBlog["thumbSuffix"] . "." . $suf;
+   
+	if ($jBlog["magick"] !== true) {
+		return jBlog_resize_image_gd($infile, $outfile, $size, $size);
+	}
 
 	/*if ($jBlog["dim"] == "height") $newSize = "*x".$jBlog["thumbSize"];
     else $newSize = $jBlog["thumbSize"]."x*"; */
     $newSize = $size."x$size";
-    $cmd = $jBlog["convert"]." ".$jBlog["jBlogPath"].$jBlog["uploadPath"].$file." -sample $newSize -antialias ".
-    	   $jBlog["jBlogPath"].$jBlog["uploadPath"].$f.".".$jBlog["thumbSuffix"].".$suf  2>&1";
+    $cmd = $jBlog["convert"]." ".$infile." -sample $newSize -antialias $outfile  2>&1";
     $res = `$cmd`;
 	return $res;
 }
@@ -831,9 +878,13 @@
 function jBlog_scaleImg($file, $width, $height) {
 	global $jBlog;
 
-    if($jBlog["magick"] !== true) return false;
-	$cmd = $jBlog["convert"]." -scale ".$width."x$height ".$jBlog["jBlogPath"].$jBlog["uploadPath"]."$file ".
-    	   $jBlog["jBlogPath"].$jBlog["uploadPath"]."$file";
+	$infile = $outfile = $jBlog["jBlogPath"] . $jBlog["uploadPath"] . $file;
+
+    if($jBlog["magick"] !== true) {
+		return jBlog_resize_image_gd($infile, $outfile, $width, $height);
+	}
+	
+	$cmd = $jBlog["convert"]." -scale ".$width."x$height $infile $outfile";
     $res = `$cmd`;
     return $res;
 }

[php-blog-cvs] jBlog db.sql,1.10,1.11 jBlog_functions.inc.php,1.26,1.27

[<gsc...@us...>]

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv11701

Modified Files:
	db.sql jBlog_functions.inc.php 
Log Message:
lazy sql != good sql, even with garbage collection



Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/jBlog/db.sql,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- db.sql	6 Mar 2003 20:08:09 -0000	1.10
+++ db.sql	6 Mar 2003 20:16:30 -0000	1.11
@@ -91,7 +91,8 @@
 CREATE TABLE {PREFIX}suppress (
   url varchar(128) default NULL,
   ip varchar(15) default NULL,
-  last timestamp(14) NOT NULL
+  last timestamp(14) NOT NULL,
+  unique key (url, ip)
 ) TYPE=MyISAM;
 
 

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- jBlog_functions.inc.php	6 Mar 2003 20:08:08 -0000	1.26
+++ jBlog_functions.inc.php	6 Mar 2003 20:16:31 -0000	1.27
@@ -1089,7 +1089,7 @@
                   WHERE ip = '$_SERVER[REMOTE_ADDR]'
                   AND url = '$_SERVER[HTTP_REFERER]'
                   AND last > now() - 900";
-    $suppressu = "INSERT INTO $jBlog[dbPrefix]suppress
+    $suppressu = "REPLACE INTO $jBlog[dbPrefix]suppress
                   (url, ip, last) 
                   VALUES ('$_SERVER[HTTP_REFERER]', '$_SERVER[REMOTE_ADDR]', now())";
     $update = "UPDATE $jBlog[dbPrefix]referrers

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.25,1.26 db.sql,1.9,1.10

[<gsc...@us...>]

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv7547

Modified Files:
	jBlog_functions.inc.php db.sql 
Log Message:
referrer suppression support.

Be sure to add {PREFIX}suppress to your schema 


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- jBlog_functions.inc.php	6 Mar 2003 17:55:16 -0000	1.25
+++ jBlog_functions.inc.php	6 Mar 2003 20:08:08 -0000	1.26
@@ -1081,6 +1081,17 @@
     {
         return;
     }
+    if(rand(0,100) < 1) {
+        jBlog_track_referrer_gc();
+    } 
+    $suppressq = "SELECT count(1) 
+                  FROM $jBlog[dbPrefix]suppress
+                  WHERE ip = '$_SERVER[REMOTE_ADDR]'
+                  AND url = '$_SERVER[HTTP_REFERER]'
+                  AND last > now() - 900";
+    $suppressu = "INSERT INTO $jBlog[dbPrefix]suppress
+                  (url, ip, last) 
+                  VALUES ('$_SERVER[HTTP_REFERER]', '$_SERVER[REMOTE_ADDR]', now())";
     $update = "UPDATE $jBlog[dbPrefix]referrers
                SET count = count + 1 
                WHERE url = '$_SERVER[HTTP_REFERER]' 
@@ -1088,11 +1099,24 @@
     $insert = "INSERT into $jBlog[dbPrefix]referrers
               (url, day, count)
               VALUES ('$_SERVER[HTTP_REFERER]', now(), 1)";
+    $rs = mysql_db_query($jBlog['dbName'], $suppressq);
+    if(mysql_affected_rows() > 0) {
+        mysql_db_query($jBlog['dbName'], $suppressu);
+        return;
+    } 
+    mysql_db_query($jBlog['dbName'], $suppressu);
     $rs = mysql_db_query($jBlog['dbName'], $update);
     if(mysql_affected_rows() == 0) {
         mysql_db_query($jBlog['dbName'], $insert);
     }
 }    
+
+function jBlog_track_referrer_gc() {
+    global $jBlog;
+    
+    $gc = "DELETE FROM $jBlog[dbPrefix]suppress where last < now() - 900";
+    mysql_db_query($jBlog['dbName'], $gc);
+}
 
 function jBlog_displayTopReferrers() {
     global $jBlog;

Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/jBlog/db.sql,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- db.sql	6 Mar 2003 05:41:42 -0000	1.9
+++ db.sql	6 Mar 2003 20:08:09 -0000	1.10
@@ -87,3 +87,11 @@
 	name varchar(64) not null primary key,
 	value varchar(255) not null
 );
+
+CREATE TABLE {PREFIX}suppress (
+  url varchar(128) default NULL,
+  ip varchar(15) default NULL,
+  last timestamp(14) NOT NULL
+) TYPE=MyISAM;
+
+

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.24,1.25

[<we...@us...>]

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv10097

Modified Files:
	jBlog_functions.inc.php 
Log Message:
span -> div


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- jBlog_functions.inc.php	6 Mar 2003 17:28:19 -0000	1.24
+++ jBlog_functions.inc.php	6 Mar 2003 17:55:16 -0000	1.25
@@ -255,9 +255,9 @@
 		echo "<div class='jBlog_date'>$date</div>";
 
 		foreach ($ents as $x => $entry) {
-			echo "<span class='jBlog_title'>";
+			echo "<div class='jBlog_title'>";
 			echo htmlentities($entry['title']);
-			echo "</span>";
+			echo "</div>";
 			
 			echo "<div class='jBlog_entry'>";
 			if ($extended && strlen($entry['extended'])) {

[php-blog-cvs] jBlog jBlog_layout.php,1.8,1.9

[<we...@us...>]

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv1589

Modified Files:
	jBlog_layout.php 
Log Message:
Fix div


Index: jBlog_layout.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_layout.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- jBlog_layout.php	6 Mar 2003 17:09:36 -0000	1.8
+++ jBlog_layout.php	6 Mar 2003 17:38:48 -0000	1.9
@@ -90,6 +90,7 @@
                                    substr($jBlog["GET"]["calendarZoom"], 0,4));
             ?><br />
 			</div>
+			</div>
 			
             <div class="jBlogSideBarTitle">Quicksearch:</div>
             <div class="jBlogSideBarContent">

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.23,1.24

[<we...@us...>]

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv29282

Modified Files:
	jBlog_functions.inc.php 
Log Message:
Make links work.


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- jBlog_functions.inc.php	6 Mar 2003 17:09:36 -0000	1.23
+++ jBlog_functions.inc.php	6 Mar 2003 17:28:19 -0000	1.24
@@ -913,7 +913,7 @@
                     <input type="button" value=" I " onClick="jBlog_insBasic(document.forms['jBlogEntry']['jBlog[body]'], 'i')">
 					<input type="button" value="<img>" onClick="jBlog_insImage(document.forms['jBlogEntry']['jBlog[body]'])">
                     <input type="button" value="Image" onClick="window.open('jBlog_admin_imageSelector.php', 'ImageSel', 'width=800,height=600,toolbar=no');">
-                    <input type="button" value="Link" onClick="jBlog_insLink(document.forms['entry']['jBlog[body]'])">
+                    <input type="button" value="Link" onClick="jBlog_insLink(document.forms['jBlogEntry']['jBlog[body]'])">
                 </td>
     		</tr>
             <tr>

[php-blog-cvs] jBlog xml.gif,NONE,1.1 jBlog_admin_css.inc.php,1.2,1.3 jBlog_functions.inc.php,1.22,1.23 jBlog_layout.php,1.7,1.8

[<gsc...@us...>]

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv20144

Modified Files:
	jBlog_admin_css.inc.php jBlog_functions.inc.php 
	jBlog_layout.php 
Added Files:
	xml.gif 
Log Message:
two votes == concensus??

rss feeds in
unified style for rh-nav entries


--- NEW FILE: xml.gif ---
(This appears to be a binary file; contents omitted.)

Index: jBlog_admin_css.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_css.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- jBlog_admin_css.inc.php	6 Mar 2003 01:10:54 -0000	1.2
+++ jBlog_admin_css.inc.php	6 Mar 2003 17:09:34 -0000	1.3
@@ -20,10 +20,9 @@
                                       "data" =>$jBlog["POST"]["data"]);
         $res = jBlog_updateCSS($entry);
         if ($res != "")
-            jBlog_printCSSForm("?", "edit", array("jBlog[action]" => "admin", "jBlog[adminModule]" => "css",
-                                 "jBlog[adminAction]" => "save"), $entry, "Error: <b>$res</b>");
+            jBlog_printCSSForm("?", "edit", array("jBlog[action]" => "admin", "jBlog[adminModule]" => "css", "jBlog[adminAction]" => "save"), $entry, "Error: <b>$res</b>");
         else
-            echo "Entry saved.";
+            jBlog_printCSSForm("?", "edit", array("jBlog[action]" => "admin", "jBlog[adminModule]" => "css", "jBlog[adminAction]" => "save"), $entry);
     break;
 
     case "edit":

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- jBlog_functions.inc.php	6 Mar 2003 15:42:19 -0000	1.22
+++ jBlog_functions.inc.php	6 Mar 2003 17:09:36 -0000	1.23
@@ -1102,7 +1102,6 @@
               ORDER BY total";
     $cursor = mysql_db_query($jBlog['dbName'], $query);
     if($num_rows = mysql_num_rows($cursor)) {
-        echo "<b>Top Referrers</b><br />";
         while($row = mysql_fetch_assoc($cursor)) {
             preg_match("#//([^/]+)#", $row[url], $matches);
 			$row['url'] = htmlentities($row['url']);

Index: jBlog_layout.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_layout.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- jBlog_layout.php	6 Mar 2003 12:12:01 -0000	1.7
+++ jBlog_layout.php	6 Mar 2003 17:09:36 -0000	1.8
@@ -73,8 +73,9 @@
             ?>
         </td>
         <td class="jBlogRightBox" valign="top">
+            <div class="jBlogSideBarItem">
+        	<div class="jBlogSideBarTitle">Quickjump:</div>
 			<div class="jBlogQuickJump">
-        	<b>Quickjump:</b><br>
 			<?php
 				// Draw the calendar
                 if (!$jBlog["GET"]["calendarZoom"]) {
@@ -90,16 +91,18 @@
             ?><br />
 			</div>
 			
-			<div class="jBlogQuickSearch">
-            <b>Quicksearch:</b>
+            <div class="jBlogSideBarTitle">Quicksearch:</div>
+            <div class="jBlogSideBarContent">
             <form action="<?=$jBlog['jBlogHTTPPath'] ?>search.php" METHOD="GET">
             	<input type="hidden" name="jBlog[action]" value="search">
 				<INPUT TYPE="TEXT" name="jBlog[searchTerm]" ONFOCUS="value='';">
             </form>
 			</div>
+			</div>
 			
-			<div class="jBlogArchives">
-            <b>Archives:</b><br />
+            <div class="jBlogSideBarItem">
+            <div class="jBlogSideBarTitle">Archives:</div>
+            <div class="jBlogSideBarContent">
 			<?php
             	$ts = mktime(0,0,0,(date("m")+1), 1, date("Y"));
 				for($x=0; $x<3; $x++) {
@@ -114,13 +117,34 @@
             ?>
             <a href='?jBlog[action]=archives'>Older...</a>
 			</div>
-			
+			</div>
+
+            <div class="jBlogSideBarItem">    
+			<div class="jBlogSideBarTitle">Top Referrers</div>
+            <div class="jBlogSideBarContent">
             <?= jBlog_displayTopReferrers() ?>
-			<div class="jBlogSuperUser">
-            <b>Superuser:</b><br />
+            </div>
+            </div>
+
+            <div class="jBlogSideBarItem">    
+			<div class="jBlogSideBarTitle">Syndicate This Blog</div>
+            <div class="jBlogSide">
+            <a href='<?= $jBlog['jBlogHTTPPath'] ?>rss.php'><img src="xml.gif" border=0></a> 
+            <a href='<?= $jBlog['jBlogHTTPPath'] ?>rss.php'>RSS 0.91 feed</a> 
+            <br/>
+            <a href='<?= $jBlog['jBlogHTTPPath'] ?>rss.php?version=2.0'><img src="xml.gif" border=0></a> 
+            <a href='<?= $jBlog['jBlogHTTPPath'] ?>rss.php?version=2.0'>RSS 2.0 feed</a> 
+            <br/>
+            </div>
+            </div>
+
+            <div class="jBlogSideBarItem">
+			<div class="jBlogSideBarTitle">Superuser:</div>
+            <div class="jBlogSideBarContent">
             <a href="<?=$jBlog['jBlogHTTPPath']?>jBlog_admin.php">$ su -</a>
 			<br />
 			<br />
+			</div>
 			</div>
 
 			<div class="jBlogPlug">

[php-blog-cvs] jBlog comment.php,1.4,1.5

[<we...@us...>]

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv18923

Modified Files:
	comment.php 
Log Message:
Fix comment stylesheet path


Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/comment.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- comment.php	5 Mar 2003 21:09:39 -0000	1.4
+++ comment.php	6 Mar 2003 17:07:15 -0000	1.5
@@ -63,7 +63,7 @@
 <html>
 <head>
 <title>Comments</title>
-<link rel="stylesheet" type="text/css" href="<?=$jBlog['jBlogHTTPPath'] . '/'?>jBlog.css.php?mode=comments">
+<link rel="stylesheet" type="text/css" href="<?=$jBlog['jBlogHTTPPath']?>jBlog.css.php?mode=comments">
 </head>
 <body>
 <?php

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.21,1.22

[<gsc...@us...>]

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv7876

Modified Files:
	jBlog_functions.inc.php 
Log Message:
whitespcae messes up mozillas xml support



Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- jBlog_functions.inc.php	6 Mar 2003 12:12:01 -0000	1.21
+++ jBlog_functions.inc.php	6 Mar 2003 15:42:19 -0000	1.22
@@ -763,7 +763,6 @@
                     '".mysql_escape_string($css["name"])."',
 					'".mysql_escape_string($css["data"])."')";
     $query = mysql_db_query($jBlog["dbName"], $querystring);
-    //print "$querystring";
     if ($css['cssid'] == "NULL") {
         $newEntry = 1;
         $css['cssid'] = mysql_insert_id();
@@ -1162,4 +1161,3 @@
 
 define("JBLOG_FUNCTIONS_LOADED", true);
 ?>
-

[php-blog-cvs] jBlog rss.php,1.1.1.1,1.2

[<gsc...@us...>]

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv2828

Modified Files:
	rss.php 
Log Message:
small changes to make it work.  :)


Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/rss.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- rss.php	27 Feb 2003 16:55:35 -0000	1.1.1.1
+++ rss.php	6 Mar 2003 15:31:01 -0000	1.2
@@ -1,9 +1,12 @@
 <?php
+
+header("Content-Type: text/xml");
+session_start();
+include_once("jBlog_config.inc.php");
 $version = $_GET['version'];
 if (empty($version)) {
     $version = '0.91';
 }
-
 echo '<?xml version="1.0" encoding="iso-8859-1" ?>';
 echo "\n";
 switch ($version) {

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.20,1.21 jBlog_genpage.php,1.3,1.4 jBlog_layout.php,1.6,1.7

[<we...@us...>]

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv15838

Modified Files:
	jBlog_functions.inc.php jBlog_genpage.php jBlog_layout.php 
Log Message:
Tidy up the html, so that it is almost valid HTML 4.01 transitional


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- jBlog_functions.inc.php	6 Mar 2003 05:44:09 -0000	1.20
+++ jBlog_functions.inc.php	6 Mar 2003 12:12:01 -0000	1.21
@@ -90,7 +90,7 @@
 ?>
 <TABLE CLASS='jBlog_calendar' CELLSPACING=0>
 <TR>
-<TD ALIGN='left'><A HREF='<?= $jBlog['jBlogHTTPPath'] ?>index.php?jBlog[calendarZoom]=<?= $previousYear.sprintf("%02d",$previousMonth)?>'><IMG SRC='<?= $jBlog["jBlogHTTPPath"] ?>pixel/back.png' BORDER='0'></A></TD>
+<TD ALIGN='left'><A HREF='<?= $jBlog['jBlogHTTPPath'] ?>index.php?jBlog[calendarZoom]=<?= $previousYear.sprintf("%02d",$previousMonth)?>'><IMG ALT="Back" SRC='<?= $jBlog["jBlogHTTPPath"] ?>pixel/back.png' BORDER='0'></A></TD>
 <TD COLSPAN='5' ALIGN='center' VALIGN='bottom' CLASS='calendarHeader'><B><nobr>
 <?php
 		if ($jBlog["rewrite"]==true) {
@@ -104,7 +104,7 @@
 </nobr></B></TD>
 <TD ALIGN='right'>
     <A HREF='<?= $jBlog['jBlogHTTPPath'] ?>index.php?jBlog[calendarZoom]=<?= $nextYear.sprintf("%02d",$nextMonth) ?>'>
-        <IMG SRC='<?= $jBlog["jBlogHTTPPath"] ?>pixel/forward.png' BORDER='0'>
+        <IMG ALT="Forward" SRC='<?= $jBlog["jBlogHTTPPath"] ?>pixel/forward.png' BORDER='0'>
     </A>
 </TD>
 </TR>
@@ -240,7 +240,7 @@
 	$bydate = array();
 	
 	if (!is_array($entries)) {
-  		echo "jBlog error: entries to print invalid";
+  		echo "<br />No entries to print.";
 		return;
 	}
 
@@ -256,7 +256,7 @@
 
 		foreach ($ents as $x => $entry) {
 			echo "<span class='jBlog_title'>";
-			echo $entry['title'];
+			echo htmlentities($entry['title']);
 			echo "</span>";
 			
 			echo "<div class='jBlog_entry'>";
@@ -279,7 +279,7 @@
 				. "archives/e_"
 				. $entry['id']
 				. ".html\">Posted by "
-				. $entry['author']
+				. htmlentities($entry['author'])
 				. " at "
 				. date("H:i", $entry['timestamp'])
 				. "</a>";
@@ -1103,10 +1103,11 @@
               ORDER BY total";
     $cursor = mysql_db_query($jBlog['dbName'], $query);
     if($num_rows = mysql_num_rows($cursor)) {
-        echo "<b>Top Referrers<b><br>";
+        echo "<b>Top Referrers</b><br />";
         while($row = mysql_fetch_assoc($cursor)) {
             preg_match("#//([^/]+)#", $row[url], $matches);
-            echo "<a href=\"$row[url]\">$matches[1] ($row[total])</a><br>";
+			$row['url'] = htmlentities($row['url']);
+            echo "<a href=\"$row[url]\">$matches[1] ($row[total])</a><br/>";
         }     
     }
 }

Index: jBlog_genpage.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_genpage.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- jBlog_genpage.php	5 Mar 2003 21:09:41 -0000	1.3
+++ jBlog_genpage.php	6 Mar 2003 12:12:01 -0000	1.4
@@ -1,13 +1,12 @@
 <?php
 
-?><html><head><title><?=$jBlog['blogTitle']?></title>
-<link rel="stylesheet" type="text/css" href="<?=$jBlog['jBlogHTTPPath']?>jBlog.css.php">
-<link rel="alternate" type="application/rss+xml" title="RSS" href="<?=$jBlog['baseURL']?>feeds/index.rss" />
+?><html><head><title><?=htmlentities($jBlog['blogTitle'])?></title>
+<link rel="stylesheet" type="text/css" href="<?=$jBlog['jBlogHTTPPath']?>jBlog.css.php" >
+<link rel="alternate" type="application/rss+xml" title="RSS" href="<?=$jBlog['baseURL']?>feeds/index.rss" >
+</head>
 <body>
 <?php
 include ("jBlog_layout.php");
 ?>
-
-</pre>
 </body>
 </html>

Index: jBlog_layout.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_layout.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- jBlog_layout.php	5 Mar 2003 21:09:41 -0000	1.6
+++ jBlog_layout.php	6 Mar 2003 12:12:01 -0000	1.7
@@ -87,7 +87,7 @@
                 }
 				jBlog_drawCalendar(substr($jBlog["GET"]["calendarZoom"], 4, 2),
                                    substr($jBlog["GET"]["calendarZoom"], 0,4));
-            ?><br>
+            ?><br />
 			</div>
 			
 			<div class="jBlogQuickSearch">
@@ -99,7 +99,7 @@
 			</div>
 			
 			<div class="jBlogArchives">
-            <b>Archives:</b><br>
+            <b>Archives:</b><br />
 			<?php
             	$ts = mktime(0,0,0,(date("m")+1), 1, date("Y"));
 				for($x=0; $x<3; $x++) {
@@ -108,16 +108,16 @@
                     	$link = $jBlog["jBlogHTTPPath"]."archives/d_".date("Ym", $ts).".html";
                     else
                     	$link = "fixme";
-					echo "<a href='$link'>".$jBlog["months"][date("n", $ts)]." ".date("Y", $ts)."</a><br>";
+					echo "<a href='$link'>".$jBlog["months"][date("n", $ts)]." ".date("Y", $ts)."</a><br />";
                     $ts = mktime(0,0,0,date("m", $ts), 1, date("Y", $ts));
                 }
             ?>
             <a href='?jBlog[action]=archives'>Older...</a>
 			</div>
 			
-            <?= jBlog_displayTopReferrers() ?><p>
+            <?= jBlog_displayTopReferrers() ?>
 			<div class="jBlogSuperUser">
-            <b>Superuser:</b><br>
+            <b>Superuser:</b><br />
             <a href="<?=$jBlog['jBlogHTTPPath']?>jBlog_admin.php">$ su -</a>
 			<br />
 			<br />

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.19,1.20

[<ste...@us...>]

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv6760

Modified Files:
	jBlog_functions.inc.php 
Log Message:
show the author


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- jBlog_functions.inc.php	6 Mar 2003 05:42:11 -0000	1.19
+++ jBlog_functions.inc.php	6 Mar 2003 05:44:09 -0000	1.20
@@ -220,7 +220,7 @@
 function jBlog_searchEntries($term) {
 	global $jBlog;
 
-    $querystring = "SELECT id, timestamp, comments, title, body, extended FROM ".$jBlog["dbPrefix"]."entries
+    $querystring = "SELECT id, author, timestamp, comments, title, body, extended FROM ".$jBlog["dbPrefix"]."entries
                     WHERE MATCH (title, extended, body) AGAINST ('".addslashes($term)."') ORDER BY timestamp DESC";
     $query       = mysql_db_query($jBlog["dbName"], $querystring);
     while($row = mysql_fetch_assoc($query)) {

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.18,1.19

[<ste...@us...>]

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv6262

Modified Files:
	jBlog_functions.inc.php 
Log Message:
remove this entirely


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- jBlog_functions.inc.php	6 Mar 2003 05:41:42 -0000	1.18
+++ jBlog_functions.inc.php	6 Mar 2003 05:42:11 -0000	1.19
@@ -220,10 +220,6 @@
 function jBlog_searchEntries($term) {
 	global $jBlog;
 
-	/* if (strlen($term) < 4) {
-    	return false;
-    } */
-
     $querystring = "SELECT id, timestamp, comments, title, body, extended FROM ".$jBlog["dbPrefix"]."entries
                     WHERE MATCH (title, extended, body) AGAINST ('".addslashes($term)."') ORDER BY timestamp DESC";
     $query       = mysql_db_query($jBlog["dbName"], $querystring);

[php-blog-cvs] jBlog db.sql,1.8,1.9 jBlog_functions.inc.php,1.17,1.18

[<ste...@us...>]

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv6019

Modified Files:
	db.sql jBlog_functions.inc.php 
Log Message:
fix entry searching.  you need to drop the fulltext index "title" and recreate
it, adding the extended entry.



Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/jBlog/db.sql,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- db.sql	6 Mar 2003 01:10:54 -0000	1.8
+++ db.sql	6 Mar 2003 05:41:42 -0000	1.9
@@ -46,7 +46,7 @@
   author varchar(20) default null,
   authorid int(11) default null,
   primary key  (id),
-  fulltext key title (title,body)
+  fulltext key title (title,body,extended)
 ) type=myisam;
 
 #

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- jBlog_functions.inc.php	6 Mar 2003 04:32:45 -0000	1.17
+++ jBlog_functions.inc.php	6 Mar 2003 05:41:42 -0000	1.18
@@ -220,24 +220,16 @@
 function jBlog_searchEntries($term) {
 	global $jBlog;
 
-	if (strlen($term)<4)
+	/* if (strlen($term) < 4) {
     	return false;
+    } */
 
     $querystring = "SELECT id, timestamp, comments, title, body, extended FROM ".$jBlog["dbPrefix"]."entries
-                    WHERE MATCH (title, extended) AGAINST ('".addslashes($term)."') ORDER BY timestamp DESC";
+                    WHERE MATCH (title, extended, body) AGAINST ('".addslashes($term)."') ORDER BY timestamp DESC";
     $query       = mysql_db_query($jBlog["dbName"], $querystring);
     while($row = mysql_fetch_assoc($query)) {
 		$ret[] = $row;
-/*
-                 array("id"        => $row[0],
-        			   "timestamp" => $row[1],
-                       "comments"  => $row[2],
-                       "title"     => $row[3],
-                       "body"      => $row[4],
-                       "extended"  => $row[5]);
-*/
     }
-
     return $ret;
 }
 

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.16,1.17

[<we...@us...>]

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv19229

Modified Files:
	jBlog_functions.inc.php 
Log Message:
More CSS/Layout fixes.


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- jBlog_functions.inc.php	6 Mar 2003 03:05:29 -0000	1.16
+++ jBlog_functions.inc.php	6 Mar 2003 04:32:45 -0000	1.17
@@ -373,11 +373,12 @@
 ?>
     <tr>
     <td class="jBlog_comment">
-    <a name="comment<?=$comment['id']?>">
+    <a name="comment<?=$comment['id']?>"></a>
     <?=nl2br($comment['body'])?><br />
-    <i><?=$type?> <?=($link ? "<a href=\"$link\">$name</a>" : $name)?> on 
-    <font size="-1"><a href="<?=$PHP_SELF?>#comment<?=$comment['id']?>"><?=date("M d, h:i", $comment['timestamp'])?></a></font>
-    </i></a>
+	<div class="jBlog_comment_source">
+    <?=$type?> <?=($link ? "<a href=\"$link\">$name</a>" : $name)?> on 
+    <a href="<?=$PHP_SELF?>#comment<?=$comment['id']?>"><?=date("M d, h:i", $comment['timestamp'])?></a>
+	</div>
     </td>
     </tr>
 <?php

[php-blog-cvs] jBlog jBlog.css.php,1.3,1.4 jBlog_functions.inc.php,1.15,1.16

[<we...@us...>]

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv21777

Modified Files:
	jBlog.css.php jBlog_functions.inc.php 
Log Message:
Couple more CSS related tweaks.


Index: jBlog.css.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog.css.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- jBlog.css.php	6 Mar 2003 01:10:54 -0000	1.3
+++ jBlog.css.php	6 Mar 2003 03:05:29 -0000	1.4
@@ -4,31 +4,4 @@
 $css = jBlog_getCSS($_REQUEST['style']);
 echo $css['data'];
 
-/* This could be tidied up by using the comment style rules recently added */
-
-if ($_REQUEST['mode'] == "comments") {
-	?>
-<style type="text/css">
-<!--
-.body {
-    font-family: Tahoma, Verdana, Arial;
-}
-
-.td {
-    font-family: Tahoma, Verdana, Arial;
-    }
-
-.input {
-    width:100px;
-    font-size:12px;
-    font-family: Tahoma, Verdana, Arial;
-    background: #cdcdcd;
-
-
-}
-//-->
-</style>
-<?php
-}
-
 ?>

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- jBlog_functions.inc.php	6 Mar 2003 01:10:54 -0000	1.15
+++ jBlog_functions.inc.php	6 Mar 2003 03:05:29 -0000	1.16
@@ -774,7 +774,7 @@
                     '".mysql_escape_string($css["name"])."',
 					'".mysql_escape_string($css["data"])."')";
     $query = mysql_db_query($jBlog["dbName"], $querystring);
-    print "$querystring";
+    //print "$querystring";
     if ($css['cssid'] == "NULL") {
         $newEntry = 1;
         $css['cssid'] = mysql_insert_id();
@@ -975,11 +975,13 @@
 		$avail_options = "";
 		foreach ($avail as $cssid => $cssname) {
 			$avail_options .= "<option value=\"$cssid\"";
-			if ($cssid == $css['cssid']) {
+			if ($cssname == $default_css) {
 				$avail_options .= " selected";
+				$marker = "* ";
+			} else {
+				$marker = "";
 			}
 
-			$marker = ($cssname == $default_css) ? "* " : "";
 			
 			$avail_options .= ">$marker" . htmlentities($cssname) . "</option>";
 		}

[php-blog-cvs] jBlog jBlog_admin_installer.inc.php,1.7,1.8

[<we...@us...>]

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv25100

Modified Files:
	jBlog_admin_installer.inc.php 
Log Message:
Fix parse error...


Index: jBlog_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_installer.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- jBlog_admin_installer.inc.php	6 Mar 2003 01:18:32 -0000	1.7
+++ jBlog_admin_installer.inc.php	6 Mar 2003 01:25:59 -0000	1.8
@@ -253,7 +253,9 @@
 
                     $text = mysql_escape_string(file_get_contents('./jBlog.css'));
                     $query = "INSERT into $_POST[dbPrefix]css values(NULL, 'default', '$text')";
-                    mysql_query($query) or echo mysql_error();
+                    if (!mysql_query($query)) {
+						echo mysql_error();
+					}
 					
 
                     echo "<p>Welcome to jBlog!</b><p>";