Add configuration to display data protection statement

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

diff --git a/lib/functions.inc b/lib/functions.inc
index f887333..19c83c8 100644 (file)
--- a/lib/functions.inc
+++ b/lib/functions.inc
@@ -27,6 +27,7 @@ $pages = array('logout.html' => array('lib' => 'login.inc',
                                   'func' => 'process_new'),
               'bookmark.html' => array('lib' => 'bookmarks.inc',
                                        'func' => 'process_bookmark'),
+              'datenschutz.html' => array('func' => 'show_datenschutz'),
               'contact.html' => array('func' => 'process_contact'),
               'sitemap.html' => array('lib' => 'layout.inc',
                                       'func' => 'layout_sitemap'),
@@ -36,6 +37,8 @@ $dirs = array('zeitung' => array('func' => 'layout_showpaper'),
              'archiv' => array('func' => 'layout_archive'),
              'tag' => array('func' => 'layout_showtag'),
              'topic' => array('func' => 'layout_topic'),
+             'admin' => array('lib' => 'admin.inc',
+                              'func' => 'layout_admin'),
              );
 
 
@@ -52,8 +55,6 @@ function carp($msg)
 
 function userstatus()
 {
-  global $_SESSION;
-
   if (isset($_SESSION['uid']))
     $info = array($_SESSION['online'], $_SESSION['users'], $_SESSION['zeitungen'],
                  $_SESSION['ztags'], $_SESSION['tags']);
@@ -67,10 +68,6 @@ function userstatus()
 function dispatch()
 {
   global $cfg;
-  global $_SERVER;
-  global $_SESSION;
-  global $_GET;
-  global $_POST;
   global $zlist;
   global $pages;
   global $dirs;
@@ -107,6 +104,13 @@ function dispatch()
   return layout_page($body);
 }
 
+function show_datenschutz()
+{
+  $body = load_template('datenschutz.html');
+
+  return $body;
+}
+
 function tagcloud_min()
 {
   $query = 'SELECT count(uid) AS count FROM zeitung_tags GROUP BY zeitung,tag ORDER BY count ASC LIMIT 1';
@@ -116,7 +120,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 +136,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);
@@ -141,8 +145,6 @@ function tagcloud_max()
 
 function tag_class($count)
 {
-  global $_SESSION;
-
   if (isset($_SESSION['uid'])) {
     if (!isset($_SESSION['tagcloud_lastupdate']) ||
        $_SESSION["tagcloud_lastupdate"] < time() - 60*60*12) {
@@ -239,18 +241,23 @@ 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'],
                  $row['url'], $row['url']);
+
+  $ret .= sprintf('<div class="link"><a href="%s">Zur Homepage</a></div>',
+                 $row['url']);
+
   $ret .= '</div>';
 
   return $ret;
@@ -273,12 +280,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']);
@@ -292,7 +299,6 @@ function format_topic($topic)
 {
   global $cfg;
   global $zlist;
-  global $_SERVER;
 
   $query = sprintf("SELECT topic,archived,zeitung FROM topics WHERE id = %d",
                   $topic);
@@ -300,7 +306,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 +319,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 +327,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 +374,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']);
@@ -434,8 +440,6 @@ function is_valid_url($url) {
 
 function ajax_check_url()
 {
-  global $POST;
-
   if (!empty($_POST['url']) && is_valid_url($_POST['url']))
     return true;
 
@@ -473,8 +477,6 @@ function sendmail($to, $name, $subject, $body, $header=array())
 
 function logbook($table,$refid,$column,$old,$new)
 {
-  global $_SESSION;
-
   $query = sprintf("INSERT INTO logbook (uid,tab,refid,col,oldval,newval,modified) " .
                   "VALUES (%d,'%s',%d,'%s','%s','%s',now())",
                   $_SESSION['uid'], $table,$refid,$column,
@@ -487,7 +489,6 @@ function logbook($table,$refid,$column,$old,$new)
 function hits_inc($zeitung)
 {
   global $cfg;
-  global $_SESSION;
 
   if (is_spider())
     return;
@@ -498,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
@@ -507,5 +508,3 @@ function hits_inc($zeitung)
 
   db_query($query);
 }
-
-?>