From aabe049c09c46dd25511ac7efd2e5e03a59fc9ee Mon Sep 17 00:00:00 2001 From: modela bitweaver Date: Sun, 31 Jan 2021 16:26:54 -0500 Subject: PHP7 clean up dual static + object use of parseData, and create ->getParsedData & ::filterDataHash --- BitBoard.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BitBoard.php b/BitBoard.php index 91f8352..b39f7d3 100644 --- a/BitBoard.php +++ b/BitBoard.php @@ -264,7 +264,7 @@ class BitBoard extends LibertyMime { if( isset( $pParamHash["edit"] ) ) { $this->mInfo["data"] = $pParamHash["edit"]; - $this->mInfo['parsed_data'] = $this->parseData(); + $this->parseData(); } } -- cgit v1.3 From 11fc46af401d3856f36af185c4edeb76c1b4aaa0 Mon Sep 17 00:00:00 2001 From: modela bitweaver Date: Tue, 2 Feb 2021 16:19:55 -0500 Subject: PHP7 static only ::lookupByMigrateBoard --- includes/classes/BitBoard.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/classes/BitBoard.php b/includes/classes/BitBoard.php index f21b8d5..88adf8b 100644 --- a/includes/classes/BitBoard.php +++ b/includes/classes/BitBoard.php @@ -97,7 +97,7 @@ class BitBoard extends LibertyMime { return( count( $this->mInfo ) ); } - function lookupByMigrateBoard( $pMigrateBoardId ) { + public static function lookupByMigrateBoard( $pMigrateBoardId ) { global $gBitDb; $ret = NULL; if( BitBase::verifyId( $pMigrateBoardId ) ) { -- cgit v1.3 From 06f45f002a12e8aa3eae5107b5ee0381cb5672f4 Mon Sep 17 00:00:00 2001 From: modela bitweaver Date: Wed, 3 Feb 2021 15:55:05 -0500 Subject: move kernel/includes/setup_inc.php --- admin/boardsync_cron.php | 2 +- admin/phpbb_migrate.php | 2 +- admin/update_lists.php | 2 +- admin/upgrade_inc.php | 2 +- ajax.php | 2 +- assign.php | 2 +- boards_rss.php | 2 +- edit.php | 2 +- edit_topic.php | 2 +- includes/list_boards_inc.php | 2 +- includes/view_board_inc.php | 2 +- includes/view_topic_inc.php | 2 +- index.php | 2 +- mailing_list.php | 2 +- rss.php | 2 +- topic_move.php | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/admin/boardsync_cron.php b/admin/boardsync_cron.php index f3672cc..9ea170c 100644 --- a/admin/boardsync_cron.php +++ b/admin/boardsync_cron.php @@ -4,7 +4,7 @@ chdir( dirname( __FILE__ ) ); $gShellScript = TRUE; //$gDebug = TRUE; -require_once( '../../kernel/setup_inc.php' ); +require_once( '../../kernel/includes/setup_inc.php' ); require_once( BOARDS_PKG_INCLUDE_PATH.'admin/boardsync_inc.php'); diff --git a/admin/phpbb_migrate.php b/admin/phpbb_migrate.php index 229fb59..f88270c 100644 --- a/admin/phpbb_migrate.php +++ b/admin/phpbb_migrate.php @@ -14,7 +14,7 @@ ALTER SEQUENCE boards_board_id_seq RESTART WITH 6; INSERT INTO boards_map (board_content_id, topic_content_id) (SELECT content_id, content_id FROM phpbb.forums INNER JOIN liberty_content ON (content_type_guid='bitboard' AND forum_name=title) ); */ -require_once( '../../kernel/setup_inc.php' ); +require_once( '../../kernel/includes/setup_inc.php' ); $gBitSystem->verifyPermission( 'p_admin' ); diff --git a/admin/update_lists.php b/admin/update_lists.php index 669f2d0..195fcc7 100644 --- a/admin/update_lists.php +++ b/admin/update_lists.php @@ -11,7 +11,7 @@ * default moderation setting in mailman.cfg */ -require_once( '../../kernel/setup_inc.php' ); +require_once( '../../kernel/includes/setup_inc.php' ); require_once( UTIL_PKG_INCLUDE_PATH.'mailman_lib.php' ); // Is package installed and enabled diff --git a/admin/upgrade_inc.php b/admin/upgrade_inc.php index e7df3c6..b7f3914 100644 --- a/admin/upgrade_inc.php +++ b/admin/upgrade_inc.php @@ -15,7 +15,7 @@ INSERT INTO boards_map (board_content_id, topic_content_id) (SELECT content_id, */ /* -require_once( '../../kernel/setup_inc.php' ); +require_once( '../../kernel/includes/setup_inc.php' ); require_once( BOARDS_PKG_PATH.'admin/phpbb_migrate.php' ); migrate_phpbb(); diff --git a/ajax.php b/ajax.php index 8da05f7..486d933 100644 --- a/ajax.php +++ b/ajax.php @@ -13,7 +13,7 @@ /** * required setup */ -require_once( '../kernel/setup_inc.php' ); +require_once( '../kernel/includes/setup_inc.php' ); // Is package installed and enabled $gBitSystem->verifyPackage( 'boards' ); diff --git a/assign.php b/assign.php index d112b49..274e9bc 100644 --- a/assign.php +++ b/assign.php @@ -11,7 +11,7 @@ /** * required setup */ -require_once( '../kernel/setup_inc.php' ); +require_once( '../kernel/includes/setup_inc.php' ); // Is package installed and enabled $gBitSystem->verifyPackage( 'boards' ); diff --git a/boards_rss.php b/boards_rss.php index 9494a6f..68a352c 100644 --- a/boards_rss.php +++ b/boards_rss.php @@ -8,7 +8,7 @@ /** * Initialization */ -require_once( "../kernel/setup_inc.php" ); +require_once( "../kernel/includes/setup_inc.php" ); $gBitSystem->verifyPackage( 'boards' ); $gBitSystem->verifyPackage( 'rss' ); diff --git a/edit.php b/edit.php index f2a6936..2d35079 100644 --- a/edit.php +++ b/edit.php @@ -11,7 +11,7 @@ /** * required setup */ -require_once( '../kernel/setup_inc.php' ); +require_once( '../kernel/includes/setup_inc.php' ); // Is package installed and enabled $gBitSystem->verifyPackage( 'boards' ); diff --git a/edit_topic.php b/edit_topic.php index 381879e..38c31b0 100644 --- a/edit_topic.php +++ b/edit_topic.php @@ -11,7 +11,7 @@ /** * required setup */ -require_once( '../kernel/setup_inc.php' ); +require_once( '../kernel/includes/setup_inc.php' ); // Is package installed and enabled $gBitSystem->verifyPackage( 'boards' ); diff --git a/includes/list_boards_inc.php b/includes/list_boards_inc.php index cce8a67..6e735fc 100644 --- a/includes/list_boards_inc.php +++ b/includes/list_boards_inc.php @@ -11,7 +11,7 @@ /** * required setup */ -require_once("../kernel/setup_inc.php"); +require_once("../kernel/includes/setup_inc.php"); require_once( BOARDS_PKG_CLASS_PATH.'BitBoardTopic.php' ); require_once( BOARDS_PKG_CLASS_PATH.'BitBoardPost.php' ); require_once( BOARDS_PKG_CLASS_PATH.'BitBoard.php' ); diff --git a/includes/view_board_inc.php b/includes/view_board_inc.php index 51cfb76..98a26a0 100644 --- a/includes/view_board_inc.php +++ b/includes/view_board_inc.php @@ -11,7 +11,7 @@ /** * required setup */ -require_once( '../kernel/setup_inc.php' ); +require_once( '../kernel/includes/setup_inc.php' ); // Is package installed and enabled $gBitSystem->verifyPackage( 'boards' ); diff --git a/includes/view_topic_inc.php b/includes/view_topic_inc.php index f279123..efee35e 100644 --- a/includes/view_topic_inc.php +++ b/includes/view_topic_inc.php @@ -7,7 +7,7 @@ /** * required setup */ -require_once( '../kernel/setup_inc.php' ); +require_once( '../kernel/includes/setup_inc.php' ); // we need all three require_once( BOARDS_PKG_CLASS_PATH.'BitBoard.php' ); diff --git a/index.php b/index.php index 0059cd5..0783f2e 100644 --- a/index.php +++ b/index.php @@ -4,7 +4,7 @@ // All Rights Reserved. See below for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See http://www.gnu.org/copyleft/lesser.html for details. // Initialization -require_once( '../kernel/setup_inc.php' ); +require_once( '../kernel/includes/setup_inc.php' ); $gBitSystem->verifyPackage( 'boards' ); if( !empty( $_REQUEST['t'] ) || !empty( $_REQUEST['migrate_topic_id'] ) || !empty( $_REQUEST['migrate_post_id'] ) ) { diff --git a/mailing_list.php b/mailing_list.php index 90a1389..d6c5ee0 100644 --- a/mailing_list.php +++ b/mailing_list.php @@ -12,7 +12,7 @@ /** * required setup */ -require_once( '../kernel/setup_inc.php' ); +require_once( '../kernel/includes/setup_inc.php' ); require_once( BOARDS_PKG_CLASS_PATH.'BitBoardTopic.php' ); require_once( BOARDS_PKG_CLASS_PATH.'BitBoardPost.php' ); require_once( BOARDS_PKG_CLASS_PATH.'BitBoard.php' ); diff --git a/rss.php b/rss.php index b04b478..ca6b13e 100644 --- a/rss.php +++ b/rss.php @@ -9,7 +9,7 @@ /** * required setup */ -require_once( '../kernel/setup_inc.php' ); +require_once( '../kernel/includes/setup_inc.php' ); $gBitSystem->verifyPackage( 'boards' ); $gBitSystem->verifyPackage( 'rss' ); diff --git a/topic_move.php b/topic_move.php index 0dc6aed..4c4fefd 100644 --- a/topic_move.php +++ b/topic_move.php @@ -7,7 +7,7 @@ /** * required setup */ -require_once( '../kernel/setup_inc.php' ); +require_once( '../kernel/includes/setup_inc.php' ); // Is package installed and enabled $gBitSystem->verifyPackage( 'boards' ); -- cgit v1.3