From: Joey Schulze <joey@infodrom.org>
Date: Thu, 28 Jun 2018 08:59:23 +0000 (+0200)
Subject: No need to declare superglobals global
X-Git-Url: https://git.infodrom.org/?p=infodrom.org%2Fwww.zeitungsliste.de;a=commitdiff_plain;h=5d84cdc65598ca8a1d1672b451630d441ca112a5

No need to declare superglobals global
---

diff --git a/lib/admin.inc b/lib/admin.inc
index ad94a89..ed4c42a 100644
--- a/lib/admin.inc
+++ b/lib/admin.inc
@@ -74,5 +74,3 @@ function layout_admin()
   $ret .= admin_hitlist();
   return $ret;
 }
-
-?>
\ No newline at end of file
diff --git a/lib/ajax.inc b/lib/ajax.inc
index c918970..586dd3f 100644
--- a/lib/ajax.inc
+++ b/lib/ajax.inc
@@ -30,9 +30,6 @@ $functions = array('search_check' => array('lib' => 'search.inc',
 
 function dumpinfo()
 {
-  global $_SERVER;
-  global $_POST;
-  global $_GET;
 
   $info = "\$_SERVER = " . var_export($_SERVER, true);
   $info .= "\n\$_POST = " . var_export($_POST, true);
@@ -46,7 +43,6 @@ function dumpinfo()
 function ajax_process()
 {
   global $functions;
-  global $_POST;
 
   dumpinfo();
 
@@ -63,5 +59,3 @@ function ajax_process()
 
   return false;
 }
-
-?>
\ No newline at end of file
diff --git a/lib/board.inc b/lib/board.inc
index 61b70fb..c5465e0 100644
--- a/lib/board.inc
+++ b/lib/board.inc
@@ -3,9 +3,6 @@
 // Precondition: $body is already sanitised
 function article_add($topic, $body)
 {
-  global $_SESSION;
-  global $_SERVER;
-
   $query = sprintf("INSERT INTO article (topic,uid,status,body,created,remote_addr) ".
 		   "VALUES (%d,%d,%d,'%s',now(),'%s')",
 		   $topic,  $_SESSION['uid'], 1, pg_escape_string($body),
@@ -52,8 +49,6 @@ function process_topic()
 {
   global $cfg;
   global $zlist;
-  global $_POST;
-  global $_GET;
 
   if (isset($_GET['zeitung']) && is_numeric($_GET['zeitung']))
     $zid = $_GET['zeitung'];
@@ -106,8 +101,6 @@ function process_reply()
 {
   global $cfg;
   global $zlist;
-  global $_GET;
-  global $_POST;
 
   if (isset($_GET['topic']) && is_numeric($_GET['topic']))
     $topic = $_GET['topic'];
@@ -145,5 +138,3 @@ function process_reply()
 
   return $ret;
 }
-
-?>
\ No newline at end of file
diff --git a/lib/bookmarks.inc b/lib/bookmarks.inc
index f788245..d96692f 100644
--- a/lib/bookmarks.inc
+++ b/lib/bookmarks.inc
@@ -41,8 +41,6 @@ function bookmark_down($zid, $uid)
 
 function format_bookmarks()
 {
-  global $_SESSION;
-
   if (!isset($_SESSION['uid']))
     return;
 
@@ -94,8 +92,6 @@ $rowf = '<tr>
 
 function bookmarks_manage()
 {
-  global $_SESSION;
-
   if (!isset($_SESSION['uid']))
     return notfound();
 
@@ -111,9 +107,6 @@ function bookmarks_manage()
 
 function process_bookmark()
 {
-  global $_SESSION;
-  global $_SERVER;
-  global $_GET;
   global $zlist;
   global $cfg;
 
@@ -149,9 +142,6 @@ function process_bookmark()
 
 function ajax_bookmark_check()
 {
-  global $_POST;
-  global $_SESSION;
-
   if (!isset($_POST['zeitung']) || !is_numeric($_POST['zeitung']) ||
       !isset($_SESSION['uid']))
     return false;
@@ -161,9 +151,6 @@ function ajax_bookmark_check()
 
 function ajax_bookmark_up()
 {
-  global $_POST;
-  global $_SESSION;
-
   if (!ajax_bookmark_check())
     return false;
 
@@ -174,9 +161,6 @@ function ajax_bookmark_up()
 
 function ajax_bookmark_down()
 {
-  global $_POST;
-  global $_SESSION;
-
   if (!ajax_bookmark_check())
     return false;
 
@@ -187,9 +171,6 @@ function ajax_bookmark_down()
 
 function ajax_bookmark_del()
 {
-  global $_POST;
-  global $_SESSION;
-
   if (!ajax_bookmark_check())
     return false;
 
@@ -200,9 +181,6 @@ function ajax_bookmark_del()
 
 function ajax_bookmark_add()
 {
-  global $_POST;
-  global $_SESSION;
-
   if (!ajax_bookmark_check())
     return false;
 
@@ -210,6 +188,3 @@ function ajax_bookmark_add()
 
   return format_info_bookmarks();
 }
-
-
-?>
\ No newline at end of file
diff --git a/lib/core.inc b/lib/core.inc
index b802c39..8026a71 100644
--- a/lib/core.inc
+++ b/lib/core.inc
@@ -72,7 +72,6 @@ function string_sanitise($text)
 function basepath()
 {
   global $cfg;
-  global $_SERVER;
 
   $pos = strpos(strtolower($cfg['home']), strtolower($_SERVER['SERVER_NAME']));
   $base = substr($cfg['home'], $pos+strlen($_SERVER['SERVER_NAME']));
@@ -95,15 +94,11 @@ function basepath()
 
 function logged_in()
 {
-  global $_SESSION;
-
   return isset($_SESSION['uid']);
 }
 
 function javascript_ok()
 {
-  global $_SESSION;
-
   if (!logged_in())
     return true;
 
@@ -115,9 +110,6 @@ function javascript_ok()
 
 function is_spider()
 {
-  global $_SERVER;
-  global $_SESSION;
-
   if (isset($_SESSION['uid']))
     if (isset($_SESSION['robot']))
       return $_SESSION['robot'];
@@ -243,7 +235,7 @@ function is_spider()
 
 function is_admin()
 {
-  global $_SESSION;
+  if (is_null($_SESSION)) return false;
 
   if (!array_key_exists('nickname', $_SESSION))
     return false;
@@ -254,7 +246,6 @@ function is_admin()
 
 function format_info_bookmarks()
 {
-  global $_SESSION;
   global $cfg;
 
   if (!isset($_SESSION['uid']))
@@ -281,5 +272,3 @@ function format_info_bookmarks()
 
   return $ret;
 }
-
-?>
diff --git a/lib/functions.inc b/lib/functions.inc
index 6f6badc..5fd453c 100644
--- a/lib/functions.inc
+++ b/lib/functions.inc
@@ -54,8 +54,6 @@ function carp($msg)
 
 function userstatus()
 {
-  global $_SESSION;
-
   if (isset($_SESSION['uid']))
     $info = array($_SESSION['online'], $_SESSION['users'], $_SESSION['zeitungen'],
 		  $_SESSION['ztags'], $_SESSION['tags']);
@@ -69,10 +67,6 @@ function userstatus()
 function dispatch()
 {
   global $cfg;
-  global $_SERVER;
-  global $_SESSION;
-  global $_GET;
-  global $_POST;
   global $zlist;
   global $pages;
   global $dirs;
@@ -143,8 +137,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) {
@@ -295,7 +287,6 @@ function format_topic($topic)
 {
   global $cfg;
   global $zlist;
-  global $_SERVER;
 
   $query = sprintf("SELECT topic,archived,zeitung FROM topics WHERE id = %d",
 		   $topic);
@@ -437,8 +428,6 @@ function is_valid_url($url) {
 
 function ajax_check_url()
 {
-  global $POST;
-
   if (!empty($_POST['url']) && is_valid_url($_POST['url']))
     return true;
 
@@ -476,8 +465,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,
@@ -490,7 +477,6 @@ function logbook($table,$refid,$column,$old,$new)
 function hits_inc($zeitung)
 {
   global $cfg;
-  global $_SESSION;
 
   if (is_spider())
     return;
@@ -510,5 +496,3 @@ function hits_inc($zeitung)
 
   db_query($query);
 }
-
-?>
diff --git a/lib/info.inc b/lib/info.inc
index 5cfcaf4..071d908 100644
--- a/lib/info.inc
+++ b/lib/info.inc
@@ -71,7 +71,6 @@ function info_topten()
 function info_hitlist()
 {
   global $cfg;
-  global $_SESSION;
 
   if (!isset($_SESSION['uid']))
     return info_topten();
@@ -135,7 +134,6 @@ function info_tagcloud()
 {
   global $cfg;
   global $zlist;
-  global $_SESSION;
 
   if (!isset($zlist['zid']))
     return;
@@ -192,7 +190,6 @@ function info_actions()
 {
   global $cfg;
   global $zlist;
-  global $_SESSION;
 
   $title = array('edit' => 'Stammdaten dieser Zeitung bearbeiten',
 		 'tags' => 'Persönliche Tags zur Zeitung hinzufügen oder löschen',
@@ -306,7 +303,6 @@ function info_actions()
 function info_bookmarks()
 {
   global $cfg;
-  global $_SESSION;
 
   if (!isset($_SESSION['uid']))
     return;
@@ -326,6 +322,3 @@ function info_bookmarks()
 
   return $ret;
 }
-
-
-?>
\ No newline at end of file
diff --git a/lib/layout.inc b/lib/layout.inc
index da85a1d..a2e5ae1 100644
--- a/lib/layout.inc
+++ b/lib/layout.inc
@@ -24,8 +24,6 @@ function pageheader()
 {
   global $cfg;
   global $zlist;
-  global $_POST;
-  global $_SERVER;
 
   $ret .= '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">';
   $ret .= '<html lang="de">';
@@ -229,8 +227,6 @@ function layout_bookmarks($rel, $title)
  */
 function layout_sitemap()
 {
-  global $_SESSION;
-  global $_SERVER;
   global $cfg;
 
   if (!is_spider())
@@ -294,7 +290,6 @@ function layout_sitemap()
 
 function layout_showpaper($archived=false)
 {
-  global $_GET;
   global $zlist;
 
   if (!isset($_GET['zeitung']) || !is_numeric($_GET['zeitung']))
@@ -323,7 +318,6 @@ function layout_showpaper($archived=false)
 function layout_archive()
 {
   global $zlist;
-  global $_GET;
   global $cfg;
 
   if (!isset($_GET['archiv']) || !is_numeric($_GET['archiv']))
@@ -364,7 +358,6 @@ function layout_showtag()
 {
   global $cfg;
   global $zlist;
-  global $_GET;
 
   if (!isset($_GET['tag']))
     $ret = warning('Keine derartiges Merkmal gefunden.');
@@ -416,7 +409,6 @@ function layout_showtag()
 function layout_topic()
 {
   global $zlist;
-  global $_GET;
 
   if  (!isset($_GET['topic']) || !is_numeric($_GET['topic']))
     $ret = warning('Keine passende Diskussion gefunden.');
@@ -449,8 +441,6 @@ function notfound()
 function contact_send($topic, $email, $body)
 {
   global $cfg;
-  global $_SESSION;
-  global $_SERVER;
 
   $header = array();
   if (!empty($email)) {
@@ -476,9 +466,6 @@ function contact_send($topic, $email, $body)
 
 function process_contact()
 {
-  global $_SERVER;
-  global $_POST;
-
   if ($_SERVER['REQUEST_METHOD'] == 'POST') {
     if (empty($_POST['topic']))
       $ret = warning('Sie haben keinen Titel für die Nachricht angegeben!');
@@ -506,5 +493,3 @@ function process_contact()
 
   return load_javascript('contact.js') . load_template('contact.html', $replace);
 }
-
-?>
\ No newline at end of file
diff --git a/lib/login.inc b/lib/login.inc
index 3c96839..80f1c1c 100644
--- a/lib/login.inc
+++ b/lib/login.inc
@@ -5,7 +5,6 @@ include_once('extern/rfc822.php');
 function account_exists($login)
 {
   global $cfg;
-  global $_SESSION;
 
   $query = sprintf("SELECT id FROM users WHERE lower(nickname) = lower('%s')",
 		   pg_escape_string($login));
@@ -65,7 +64,6 @@ function is_valid_realname($name)
 
 function check_account_data()
 {
-  global $_POST;
   global $zlist;
 
   $zlist['replace'] = array('nickname' => $_POST['nickname'],
@@ -97,8 +95,6 @@ function check_account_data()
 
 function check_passwd()
 {
-  global $_POST;
-
   if (!strlen($_POST['passwd']) || !strlen($_POST['pwcopy']))
     return 'Sie müssen alle Pflichtfelder ausfüllen! Siehe Beschreibung unten.';
 
@@ -178,7 +174,6 @@ function account_activate($code)
 function send_activation($email, $user, $code)
 {
   global $cfg;
-  global $_SERVER;
 
   $url = sprintf('%sactivate.html?code=%s', $cfg['home'], urlencode($code));
   $subject = 'Aktivierung Account Zeitungsliste';
@@ -202,8 +197,6 @@ Ihren Browser ein:
 
 function process_activate()
 {
-  global $_GET;
-
   if (($try = account_activate($_GET['code'])) !== true) {
     $ret = warning($try);
     } else {
@@ -219,7 +212,6 @@ function process_activate()
 function process_account_new()
 {
   global $cfg;
-  global $_POST;
 
   if (($try = check_account_data()) !== true)
     return $try;
@@ -274,8 +266,6 @@ function process_account_new()
 
 function update_account()
 {
-  global $_POST;
-  global $_SESSION;
   global $zlist;
 
   $query = sprintf("UPDATE users SET nickname='%s',realname='%s',email='%s',url='%s' ".
@@ -299,9 +289,6 @@ function update_account()
 
 function update_passwd()
 {
-  global $_POST;
-  global $_SESSION;
-
   $hash = passwd($_SESSION['nickname'], $_POST['passwd']);
 
   $query = sprintf("UPDATE users SET passwd='%s' WHERE id = %d",
@@ -342,9 +329,6 @@ function checkpass($nickname, $passwd)
 function login_user($nickname, $passwd)
 {
   global $cfg;
-  global $_SERVER;
-  global $_POST;
-  global $_SESSION;
 
   $query = sprintf("SELECT id,nickname,realname,email,url,passwd FROM users " .
 		   "WHERE lower(nickname) = lower('%s') AND status = 1",
@@ -458,8 +442,6 @@ Bitte ändern Sie es beim nächsten Einloggen.
 
 function process_login_request()
 {
-  global $_POST;
-
   if (isset($_POST['new'])) {
     $try = process_account_new();
     if ($try === true)
@@ -507,7 +489,6 @@ function process_login_request()
 function last_activity()
 {
   global $cfg;
-  global $_SESSION;
 
   $query = sprintf("SELECT DISTINCT topics.id,topics.topic FROM article " .
 		   "JOIN topics ON article.topic=topics.id " .
@@ -536,10 +517,6 @@ function last_activity()
 
 function process_login()
 {
-  global $_GET;
-  global $_SERVER;
-  global $_SESSION;
-
   if (isset($_GET['from'])) {
     if ($_GET['from'] == 'article')
       $ret .= warning('Um an einer Diskussion teilzunehmen, müssen Sie angemeldet sein.');
@@ -576,8 +553,6 @@ function process_login()
 
 function process_passwd()
 {
-  global $_SESSION;
-  global $_SERVER;
   global $zlist;
   global $cfg;
 
@@ -609,9 +584,6 @@ function logout()
 
 function process_options()
 {
-  global $_SESSION;
-  global $_SERVER;
-  global $_POST;
   global $zlist;
   global $cfg;
 
@@ -654,16 +626,10 @@ function process_options()
 
 function ajax_passwd_check()
 {
-  global $_POST;
-
   return checkpass($_POST['nickname'], $_POST['passwd']);
 }
 
 function ajax_nickname_check()
 {
-  global $_POST;
-
   return account_exists($_POST['nickname']);
 }
-
-?>
diff --git a/lib/misc.inc b/lib/misc.inc
index 55cf877..dedf635 100644
--- a/lib/misc.inc
+++ b/lib/misc.inc
@@ -1,9 +1,7 @@
-<?
+<?php
 
 function ajax_check_email()
 {
-  global $POST;
-
   include_once('extern/rfc822.php');
 
   if (!empty($_POST['email']) && is_valid_email_address($_POST['email']))
@@ -11,5 +9,3 @@ function ajax_check_email()
 
   return false;
 }
-
-?>
\ No newline at end of file
diff --git a/lib/search.inc b/lib/search.inc
index 2ae85c1..374a2c1 100644
--- a/lib/search.inc
+++ b/lib/search.inc
@@ -77,7 +77,6 @@ function search_topics($keyword)
 
 function process_search()
 {
-  global $_POST;
   global $zlist;
 
   if (!strlen($_POST['keyword']))
@@ -104,8 +103,6 @@ function process_search()
 
 function ajax_search_check()
 {
-  global $_POST;
-
   $keyword = $_POST['keyword'];
 
   $query = sprintf("SELECT count(*) FROM zeitungen WHERE deleted IS false AND " .
@@ -142,5 +139,3 @@ function ajax_search_check()
 
   return false;
 }
-
-?>
\ No newline at end of file
diff --git a/lib/session.inc b/lib/session.inc
index 27a8cda..3d9b350 100644
--- a/lib/session.inc
+++ b/lib/session.inc
@@ -3,7 +3,6 @@
 function session_invalidate($dest='')
 {
   global $cfg;
-  global $_SESSION;
 
   db_query(sprintf('DELETE FROM online WHERE uid = %d', $_SESSION['uid']));
 
@@ -73,7 +72,6 @@ function userstatus_info()
 function session_update()
 {
   global $cfg;
-  global $_SESSION;
 
   $info = userstatus_info();
 
@@ -87,9 +85,6 @@ function session_update()
 function session_init()
 {
   global $cfg;
-  global $_COOKIE;
-  global $_SERVER;
-  global $_SESSION;
 
   if (isset($_COOKIE[$cfg['session']])) {
     session_name($cfg["session"]);
@@ -112,5 +107,3 @@ function session_init()
     }
   }
 }
-
-?>
\ No newline at end of file
diff --git a/lib/tags.inc b/lib/tags.inc
index 1a470fa..211a728 100644
--- a/lib/tags.inc
+++ b/lib/tags.inc
@@ -3,7 +3,6 @@
 function format_tags($zid)
 {
   global $cfg;
-  global $_SESSION;
 
   $query = 'SELECT id,tagname FROM tags ORDER BY lower(tagname)';
   if (($sth = db_query($query)) === false) return;
@@ -98,9 +97,6 @@ function process_tags()
 {
   global $cfg;
   global $zlist;
-  global $_SESSION;
-  global $_GET;
-  global $_POST;
 
   if (isset($_GET['zeitung']) && is_numeric($_GET['zeitung']))
     $zid = $_GET['zeitung'];
@@ -151,9 +147,6 @@ function process_tags()
 
 function ajax_tag_check()
 {
-  global $_POST;
-  global $_SESSION;
-
   if (!isset($_POST['zeitung']) || !is_numeric($_POST['zeitung']) ||
       !isset($_POST['tag']) || !is_numeric($_POST['tag']) ||
       !isset($_SESSION['uid']))
@@ -164,9 +157,6 @@ function ajax_tag_check()
 
 function ajax_tag_add()
 {
-  global $_POST;
-  global $_SESSION;
-
   if (!ajax_tag_check())
     return false;
 
@@ -177,9 +167,6 @@ function ajax_tag_add()
 
 function ajax_tag_del()
 {
-  global $_POST;
-  global $_SESSION;
-
   if (!ajax_tag_check())
     return false;
 
@@ -190,9 +177,6 @@ function ajax_tag_del()
 
 function ajax_tag_new()
 {
-  global $_POST;
-  global $_SESSION;
-
   if (!isset($_POST['zeitung']) || !is_numeric($_POST['zeitung']) ||
       !isset($_POST['tag']) ||
       !isset($_SESSION['uid']))
@@ -205,8 +189,6 @@ function ajax_tag_new()
 
 function ajax_tag_exists()
 {
-  global $_POST;
-
   if (!isset($_POST['tag']))
     return true; // eigentlich false, aber da true=exists einen Fehler liefert...
 
@@ -223,5 +205,3 @@ function ajax_tag_exists()
 
   return true;
 }
-
-?>
\ No newline at end of file
diff --git a/lib/zeitung.inc b/lib/zeitung.inc
index 751963b..4ba112d 100644
--- a/lib/zeitung.inc
+++ b/lib/zeitung.inc
@@ -40,8 +40,6 @@ function zeitung_check_url($url, $zid=false)
 
 function zeitung_check_data()
 {
-  global $_POST;
-
   if (empty($_POST['name']) ||
       empty($_POST['city']) ||
       empty($_POST['url']) ||
@@ -67,9 +65,6 @@ function zeitung_check_data()
 
 function zeitung_reportnew($id)
 {
-  global $_SESSION;
-  global $_SERVER;
-  global $_POST;
   global $cfg;
 
   $url = sprintf('%szeitung/%d.html', $cfg['home'], $id);
@@ -97,8 +92,6 @@ function zeitung_reportnew($id)
 
 function zeitung_update($zid)
 {
-  global $_POST;
-
   $query = sprintf("UPDATE zeitungen SET name='%s',city='%s',url='%s',description='%s' " .
 		   'WHERE id = %d',
 		   pg_escape_string(htmlspecialchars(trim($_POST['name']))),
@@ -121,8 +114,6 @@ function zeitung_update($zid)
 
 function zeitung_insert()
 {
-  global $_POST;
-
   // Bei Problemen das Feld 'deleted' wieder rausnehmen und manuell approven
   $query = sprintf("INSERT INTO zeitungen (name,city,url,description,deleted,changed) " .
 		   "VALUES ('%s','%s','%s','%s',false,now())",
@@ -144,10 +135,6 @@ function zeitung_insert()
 
 function process_edit()
 {
-  global $_SESSION;
-  global $_SERVER;
-  global $_POST;
-  global $_GET;
   global $zlist;
 
   if (isset($_GET['zeitung']) && is_numeric($_GET['zeitung']))
@@ -200,10 +187,6 @@ function process_edit()
 
 function process_new()
 {
-  global $_SESSION;
-  global $_SERVER;
-  global $_POST;
-  global $_GET;
   global $zlist;
 
   $ok = false;
@@ -240,11 +223,7 @@ function process_new()
 
 function ajax_zeitung_check_url()
 {
-  global $_POST;
-
   if (empty($_POST['url'])) return false;
 
   return zeitung_check_url($_POST['url']);
 }
-
-?>
\ No newline at end of file