syweb: adapt for php 7, from Steven Shockley

This commit is contained in:
sthen 2020-12-30 12:47:55 +00:00
parent a0fa4a9485
commit b7a0183951
9 changed files with 138 additions and 2 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.29 2020/03/20 16:44:28 naddy Exp $
# $OpenBSD: Makefile,v 1.30 2020/12/30 12:47:55 sthen Exp $
COMMENT= web frontend to symon
DISTNAME= syweb-0.65
REVISION= 9
REVISION= 10
CATEGORIES= www sysutils
HOMEPAGE= http://www.xs4all.nl/~wpd/symon

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-htdocs_syweb_class_cache_inc,v 1.1 2020/12/30 12:47:56 sthen Exp $
Index: htdocs/syweb/class_cache.inc
--- htdocs/syweb/class_cache.inc.orig
+++ htdocs/syweb/class_cache.inc
@@ -54,7 +54,7 @@ class Cache {
var $db;
var $timestamp;
- function Cache() {
+ function __construct() {
global $symon;
if (!isset($symon["cache_duration"])) {
@@ -240,4 +240,4 @@ class Cache {
if (!isset($cache)) {
$cache = new Cache();
}

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-htdocs_syweb_class_graph_inc,v 1.4 2020/12/30 12:47:56 sthen Exp $
Index: htdocs/syweb/class_graph.inc
--- htdocs/syweb/class_graph.inc.orig
+++ htdocs/syweb/class_graph.inc
@@ -49,7 +49,7 @@ class Graph {
var $definition;
var $url;
- function Graph(&$group_vars) {
+ function __construct(&$group_vars) {
$this->group_vars = $group_vars;
}

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-htdocs_syweb_class_layout_inc,v 1.1 2020/12/30 12:47:56 sthen Exp $
Index: htdocs/syweb/class_layout.inc
--- htdocs/syweb/class_layout.inc.orig
+++ htdocs/syweb/class_layout.inc
@@ -47,7 +47,7 @@ class Layout {
var $groups;
var $groupvars;
- function Layout() {
+ function __construct() {
global $symon;
global $session;

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-htdocs_syweb_class_lexer_inc,v 1.1 2020/12/30 12:47:56 sthen Exp $
Index: htdocs/syweb/class_lexer.inc
--- htdocs/syweb/class_lexer.inc.orig
+++ htdocs/syweb/class_lexer.inc
@@ -43,7 +43,7 @@ class Lexer {
var $unget;
var $keywordchrs;
- function Lexer() {
+ function __construct() {
$this->filename = '';
$this->lineno = 0;
$this->buffer = array();
@@ -249,4 +249,4 @@ class Lexer {
}
}
}

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-htdocs_syweb_class_rrdtool_inc,v 1.1 2020/12/30 12:47:56 sthen Exp $
Index: htdocs/syweb/class_rrdtool.inc
--- htdocs/syweb/class_rrdtool.inc.orig
+++ htdocs/syweb/class_rrdtool.inc
@@ -40,7 +40,7 @@ class RRDTool {
var $error;
var $output;
- function RRDTool() {
+ function __construct() {
global $symon;
$this->method = '';
@@ -149,4 +149,4 @@ class RRDTool {
return 1;
}
}

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-htdocs_syweb_class_session_inc,v 1.1 2020/12/30 12:47:56 sthen Exp $
Index: htdocs/syweb/class_session.inc
--- htdocs/syweb/class_session.inc.orig
+++ htdocs/syweb/class_session.inc
@@ -46,7 +46,7 @@ require_once("tools.inc");
class Session {
var $vars;
- function Session() {
+ function __construct() {
$this->vars = new Vars();
}
@@ -200,4 +200,4 @@ class Session {
if (!isset($session)) {
$session = new Session();
}

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-htdocs_syweb_class_text_inc,v 1.1 2020/12/30 12:47:56 sthen Exp $
Index: htdocs/syweb/class_text.inc
--- htdocs/syweb/class_text.inc.orig
+++ htdocs/syweb/class_text.inc
@@ -40,7 +40,7 @@ require_once('class_lexer.inc');
class Text {
var $text;
- function Text($text='') {
+ function __construct($text='') {
$this->text = $text;
}
@@ -63,4 +63,4 @@ class Text {
$this->_display();
}
}

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-htdocs_syweb_class_vars_inc,v 1.1 2020/12/30 12:47:56 sthen Exp $
Index: htdocs/syweb/class_vars.inc
--- htdocs/syweb/class_vars.inc.orig
+++ htdocs/syweb/class_vars.inc
@@ -49,7 +49,7 @@ $html2chr = array_flip($chr2html);
class Vars {
var $vars;
- function Vars($frozen="") {
+ function __construct($frozen="") {
unset($this->vars);
if ($frozen != "") {
$this->inject($frozen);
@@ -144,4 +144,4 @@ class Vars {
}
}
}