diff options
| author | spiderr <spiderr@bitweaver.org> | 2021-02-04 12:02:22 -0500 |
|---|---|---|
| committer | spiderr <spiderr@bitweaver.org> | 2021-02-04 12:02:22 -0500 |
| commit | 7c21e90b0a8b347248cccede865fd8ff1f93c21b (patch) | |
| tree | 34ef3b451a35dc743b33b85899f23a610396848b | |
| parent | b83a41245d23566c2b8bfdfc46247f0bd31b6844 (diff) | |
| download | wiki-7c21e90b0a8b347248cccede865fd8ff1f93c21b.tar.gz wiki-7c21e90b0a8b347248cccede865fd8ff1f93c21b.tar.bz2 wiki-7c21e90b0a8b347248cccede865fd8ff1f93c21b.zip | |
move _inc and _lib to includes/ and use PKG_INCLUDE_PATH constants; remove ancient imagegals and s5 features
| -rw-r--r-- | admin/admin_external_wikis.php | 2 | ||||
| -rw-r--r-- | edit.php | 5 | ||||
| -rw-r--r-- | includes/classes/BitPage.php | 2 | ||||
| -rw-r--r-- | includes/display_bitpage_inc.php | 6 | ||||
| -rw-r--r-- | page_loader.php | 2 |
5 files changed, 3 insertions, 14 deletions
diff --git a/admin/admin_external_wikis.php b/admin/admin_external_wikis.php index cefa711..636fd87 100644 --- a/admin/admin_external_wikis.php +++ b/admin/admin_external_wikis.php @@ -4,7 +4,7 @@ // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See http://www.gnu.org/copyleft/lesser.html for details. // Initialization require_once( '../../kernel/includes/setup_inc.php' ); -include_once( KERNEL_PKG_PATH.'admin_lib.php' ); +include_once( KERNEL_PKG_INCLUDE_PATH.'admin_lib.php' ); if (!$gBitUser->isAdmin()) { $gBitSmarty->assign('msg', tra("You dont have permission to use this feature")); $gBitSystem->display( 'error.tpl' , NULL, array( 'display_mode' => 'admin' )); @@ -148,11 +148,6 @@ if( isset( $_REQUEST["fCancel"] ) ) { $copyrightAuthors = $_REQUEST['copyrightAuthors']; $copyrightslib->add_copyright( $gContent->mPageId, $copyrightTitle, $copyrightYear, $copyrightAuthors, $gBitUser->mUserId ); } - // Parse $edit and eliminate image references to external URIs( make them internal ) - if( $gBitSystem->isPackageActive( 'imagegals' ) ) { - include_once( IMAGEGALS_PKG_PATH.'imagegal_lib.php' ); - $edit = $imagegallib->capture_images( $edit ); - } if( $gContent->mPageId ) { if( isset( $_REQUEST['isminor'] ) && $_REQUEST['isminor']=='on' ) { diff --git a/includes/classes/BitPage.php b/includes/classes/BitPage.php index 9b2b03a..92c0776 100644 --- a/includes/classes/BitPage.php +++ b/includes/classes/BitPage.php @@ -239,7 +239,7 @@ class BitPage extends LibertyMime implements BitCacheable { if( isset( $mailEvents ) ) { global $notificationlib, $gBitUser, $gBitSystem, $gBitSmarty; - include_once( KERNEL_PKG_PATH.'notification_lib.php' ); + include_once( KERNEL_PKG_INCLUDE_PATH.'notification_lib.php' ); $notificationlib->post_content_event($this->mContentId, $this->mInfo['content_type_guid'], 'wiki', $this->mInfo['title'], $this->mInfo['modifier_user'], $this->mInfo['edit_comment'], $this->mInfo['data']); if( $gBitSystem->isFeatureActive( 'users_watches') ) { diff --git a/includes/display_bitpage_inc.php b/includes/display_bitpage_inc.php index 9c29c7e..e129e73 100644 --- a/includes/display_bitpage_inc.php +++ b/includes/display_bitpage_inc.php @@ -160,10 +160,4 @@ $pageInfo['title'] = $gContent->getTitle(); // Display the Index Template $gBitSmarty->assignByRef( 'pageInfo', $pageInfo ); -// S5 slideshows -if( isset( $_REQUEST['s5'] )) { - include_once( WIKI_PKG_PATH.'s5.php'); -} - $gBitSystem->display( 'bitpackage:wiki/show_page.tpl', $pageInfo['title'], array( 'display_mode' => 'display' )); -?> diff --git a/page_loader.php b/page_loader.php index 06ed9bf..bcc9b33 100644 --- a/page_loader.php +++ b/page_loader.php @@ -14,7 +14,7 @@ * required setup */ include_once( '../../kernel/includes/setup_inc.php' ); -include_once (HTML_PKG_PATH.'htmlpages_lib.php'); +include_once (HTML_PKG_INCLUDE_PATH.'htmlpages_lib.php'); $refresh = 1000 * $_REQUEST["refresh"]; ?> <html> |