Copy name and city into page keywords

[infodrom.org/www.zeitungsliste.de] / lib / functions.inc

diff --git a/lib/functions.inc b/lib/functions.inc
index c007edf..7c07bc7 100644 (file)
--- a/lib/functions.inc
+++ b/lib/functions.inc
@@ -116,7 +116,7 @@ function tagcloud_min()
   if ($sth === false)
     return 1;
 
-  if (pg_NumRows($sth) === 0)
+  if (pg_num_rows($sth) === 0)
     return 1;
 
   $row = pg_fetch_array($sth, 0);
@@ -132,7 +132,7 @@ function tagcloud_max()
   if ($sth === false)
     return 10;
 
-  if (pg_NumRows($sth) === 0)
+  if (pg_num_rows($sth) === 0)
     return 10;
 
   $row = pg_fetch_array($sth, 0);
@@ -239,14 +239,15 @@ function format_newspaper($id)
 
   $sth = db_query($query) or carp("format_newspaper");
 
-  if (pg_NumRows ($sth) == 0)
+  if (pg_num_rows ($sth) == 0)
     return false;
 
   $row = pg_fetch_array ($sth, 0);
 
   $ret = '<div class="newspaper">';
-  $ret .= sprintf('<h3>%s</h3>', htmlspecialchars($row['name']));
-  $zlist['newspaper'] = htmlspecialchars($row['name']);
+  $ret .= sprintf('<h3>%s</h3>', $row['name']);
+  $zlist['newspaper'] = $row['name'];
+  $zlist['city'] = $row['city'];
 
   $ret .= sprintf('<p>%s<br>Ort: %s<br>URL: <a href="%s"><code>%s</code></a></p>',
                  $row['description'], $row['city'],
@@ -273,12 +274,12 @@ function format_topten($uid)
 
   $sth = db_query($query) or carp("format_topten");
 
-  if (pg_NumRows ($sth) == 0)
+  if (pg_num_rows ($sth) == 0)
     return;
 
   $ret = '<h3>Top 10</h3>';
   $ret .= '<p><ul>';
-  for ($n=0; $n < pg_NumRows ($sth); $n++) {
+  for ($n=0; $n < pg_num_rows ($sth); $n++) {
     $row = pg_fetch_array ($sth, $n);
     $ret .= sprintf('<li><a href="%szeitung/%d.html">%s</a></li>',
                    $cfg['basepath'], $row['zeitung'], $row['name']);
@@ -300,7 +301,7 @@ function format_topic($topic)
   if (($sth = db_query($query)) === false)
     return warning('Es ist ein Datenbankfehler aufgetreten.');
 
-  if (pg_NumRows ($sth) == 0)
+  if (pg_num_rows ($sth) == 0)
     return warning('Keine passende Diskussion gefunden.');
 
   if (($info = pg_fetch_array ($sth, 0)) == false)
@@ -313,7 +314,7 @@ function format_topic($topic)
 
   if (($sth2 = db_query($query)) === false) return false;
 
-  if (pg_NumRows ($sth2) > 0) {
+  if (pg_num_rows ($sth2) > 0) {
     $ret .= '<div class="topic">';
     $ret .= sprintf ('<h3>%s</h3>', htmlspecialchars($info['topic']));
     $col = 0;
@@ -321,7 +322,7 @@ function format_topic($topic)
     $zlist['topic'] = $info['topic'];
     $zlist['archived'] = $info['archived'] == 't';
 
-    for ($j=0; $j < pg_NumRows ($sth2); $j++) {
+    for ($j=0; $j < pg_num_rows ($sth2); $j++) {
       $row = pg_fetch_array ($sth2, $j);
 
       $ret .= sprintf('<div class="art%d">', $col);
@@ -368,20 +369,20 @@ function format_board($zid, $archived=false)
 
   if (($sth = db_query($query)) === false) return false;
 
-  if (pg_NumRows ($sth) == 0 && !$archived) {
+  if (pg_num_rows ($sth) == 0 && !$archived) {
     $zlist['notopic'] = true;
 
     return $ret;
   }
 
-  if (pg_NumRows ($sth) > 0) {
+  if (pg_num_rows ($sth) > 0) {
     if ($archived)
       $ret = '<h3>Abgeschlossene Diskussionen</h3>';
     else
       $ret = '<h3>Diskussion</h3>';
   }
 
-  for ($i=0; $i < pg_NumRows ($sth); $i++) {
+  for ($i=0; $i < pg_num_rows ($sth); $i++) {
     $row = pg_fetch_array ($sth, $i);
 
     $ret .= format_topic($row['id']);
@@ -409,6 +410,9 @@ function fix_url($url) {
 }
 
 function is_valid_url($url) {
+  if (strpos($url, '.') === false)
+    return false;
+
   $parts = parse_url($url);
 
   if (empty($parts['host']) || empty($parts['scheme']) || empty($parts['path']))
@@ -495,7 +499,7 @@ function hits_inc($zeitung)
 
   $sth = db_query($query);
 
-  if (pg_NumRows ($sth) == 0)
+  if (pg_num_rows ($sth) == 0)
     $query = sprintf("INSERT INTO hits (zeitung,uid,counter) " .
                     "VALUES (%d,%d,1)", $zeitung, $uid);
   else