From ca99260af5783d2d12b3f79fbd43a1aadbef15ff Mon Sep 17 00:00:00 2001 From: lsces Date: Thu, 28 Aug 2025 17:12:45 +0100 Subject: General code updated to PHP8.4 and namespace --- .htaccess | 0 blogs_rss.php | 34 ++++++++++++--------------- crosspost.php | 31 +++++++++++++------------ edit.php | 22 +++++++++--------- index.php | 16 +++++++------ list_blogs.php | 24 +++++++++---------- post.php | 56 +++++++++++++++++++++++++-------------------- print_blog_post.php | 24 ++++++++----------- rankings.php | 66 ++++++++++++++++++++++++++--------------------------- recent_posts.php | 18 ++++++++------- send_post.php | 18 +++++---------- view.php | 5 ++-- view_post.php | 24 +++++++++---------- view_post_image.php | 11 ++++----- 14 files changed, 169 insertions(+), 180 deletions(-) mode change 100644 => 100755 .htaccess mode change 100644 => 100755 blogs_rss.php mode change 100644 => 100755 crosspost.php mode change 100644 => 100755 edit.php mode change 100644 => 100755 index.php mode change 100644 => 100755 list_blogs.php mode change 100644 => 100755 post.php mode change 100644 => 100755 print_blog_post.php mode change 100644 => 100755 rankings.php mode change 100644 => 100755 recent_posts.php mode change 100644 => 100755 send_post.php mode change 100644 => 100755 view.php mode change 100644 => 100755 view_post.php mode change 100644 => 100755 view_post_image.php diff --git a/.htaccess b/.htaccess old mode 100644 new mode 100755 diff --git a/blogs_rss.php b/blogs_rss.php old mode 100644 new mode 100755 index 00fe4dc..f60093e --- a/blogs_rss.php +++ b/blogs_rss.php @@ -9,13 +9,14 @@ * Initialization */ require_once( "../kernel/includes/setup_inc.php" ); +use Bitweaver\Blogs\BitBlogPost; +use Bitweaver\Users\RolePermUser; $gBitSystem->verifyPackage( 'rss' ); $gBitSystem->verifyPackage( 'blogs' ); $gBitSystem->verifyFeature( 'blogs_rss' ); -require_once( BLOGS_PKG_CLASS_PATH.'BitBlogPost.php' ); -require_once( RSS_PKG_INCLUDE_PATH.'rss_inc.php' ); +require_once RSS_PKG_INCLUDE_PATH.'rss_inc.php'; // default feed info $rss->title = $gBitSystem->getConfig( 'blogs_rss_title', $gBitSystem->getConfig( 'site_title' ).' - '.tra( 'Blog Posts' ) ); @@ -23,7 +24,7 @@ $rss->description = $gBitSystem->getConfig( 'blogs_rss_description', $gBitSystem // check permission to view wiki pages if( !$gBitUser->hasPermission( 'p_blogs_view' ) ) { - require_once( RSS_PKG_PATH."rss_error.php" ); + require_once RSS_PKG_PATH."rss_error.php"; } else { // check if we want to use the cache file $cacheFile = TEMP_PKG_PATH.RSS_PKG_NAME.'/'.BLOGS_PKG_NAME.( !empty( $_REQUEST['user_id'] ) ? "_".$_REQUEST['user_id'] : "" ).( !empty( $_REQUEST['group_id'] ) ? "_".$_REQUEST['group_id'] : "" ).( !empty( $_REQUEST['role_id'] ) ? "_".$_REQUEST['role_id'] : "" ).( !empty( $_REQUEST['blog_id'] ) ? "_".$_REQUEST['blog_id'] : "" ).'_'.$cacheFileTail; @@ -32,25 +33,21 @@ if( !$gBitUser->hasPermission( 'p_blogs_view' ) ) { $blogPost = new BitBlogPost(); $listHash['sort_mode'] = 'last_modified_desc'; $listHash['max_records'] = $gBitSystem->getConfig( 'blogs_rss_max_records', 10 ); - $listHash['parse_data'] = TRUE; - $listHash['full_data'] = TRUE; + $listHash['parse_data'] = true; + $listHash['full_data'] = true; if( !empty( $_REQUEST['user_id'] ) ) { - if ( $gBitSystem->getConfig( 'user_class', 'BitPermUser' ) == 'RolePermUser' ) { - require_once( USERS_PKG_PATH.'includes/RoleUser.php' ); - } else { - require_once( USERS_PKG_PATH.'includes/BitUser.php' ); + $blogUser = $gBitSystem->getConfig( 'user_class', 'BitPermUser' ) == 'RolePermUser' ? new RoleUser() : new BitUser(); } - $blogUser = new BitUser(); + $userData = $blogUser->getUserInfo( array('user_id' => $_REQUEST['user_id']) ); // dont try and fool me - if (!empty($userData)){ + if (!empty($userData)) { $userName = $userData['real_name']?$userData['real_name']:$userData['login']; $rss->title = $userName." at ".$gBitSystem->getConfig( 'site_title' ); $listHash['user_id'] = $_REQUEST['user_id']; - } } else if( !empty( $_REQUEST['group_id'] ) ) { - require_once( USERS_PKG_PATH . 'BitPermUser.php' ); - $permUser = new BitPermUser(); + require_once USERS_PKG_PATH . 'BitPermUser.php'; + $permUser = new RolePermUser(); $groupData = $permUser->getGroupInfo( $_REQUEST['group_id'] ); // dont try and fool me if (!empty($groupData)){ @@ -59,8 +56,7 @@ if( !$gBitUser->hasPermission( 'p_blogs_view' ) ) { $listHash['group_id'] = $_REQUEST['group_id']; } } else if( !empty( $_REQUEST['role_id'] ) ) { - require_once( USERS_PKG_PATH . 'RolePermUser.php' ); - $permUser = new BitPermUser(); + $permUser = new RolePermUser(); $roleData = $permUser->getRoleInfo( $_REQUEST['role_id'] ); // dont try and fool me if (!empty($roleData)){ @@ -91,15 +87,15 @@ if( !$gBitUser->hasPermission( 'p_blogs_view' ) ) { foreach( $feeds['data'] as $feed ) { $item = new FeedItem(); $item->title = BitBlogPost::getTitleFromHash( $feed ); - $item->link = BIT_BASE_URI.BitBlogPost::getDisplayUrlFromHash( NULL, $feed ); + $item->link = BIT_BASE_URI.BitBlogPost::getDisplayUrlFromHash( null, $feed ); $item->description = $feed['parsed']; $item->date = ( int )$feed['last_modified']; $item->source = 'http://'.$_SERVER['HTTP_HOST'].BIT_ROOT_URL; - $item->author = $gBitUser->getDisplayName( FALSE, $feed ); + $item->author = $gBitUser->getDisplayName( false, $feed ); $item->descriptionTruncSize = $gBitSystem->getConfig( 'rssfeed_truncate', 50000 ); - $item->descriptionHtmlSyndicated = TRUE; + $item->descriptionHtmlSyndicated = true; // pass the item on to the rss feed creator $rss->addItem( $item ); diff --git a/crosspost.php b/crosspost.php old mode 100644 new mode 100755 index 1d6c722..bf34fad --- a/crosspost.php +++ b/crosspost.php @@ -12,23 +12,25 @@ /** * required setup */ -require_once( '../kernel/includes/setup_inc.php' ); +namespace Bitweaver\Blogs; +require_once '../kernel/includes/setup_inc.php'; +use Bitweaver\KernelTools; $gBitSystem->verifyPackage( 'blogs' ); -$gBitSystem->verifyPermission( 'p_blogs_admin' ); +$gBitSystem->verifyPermission( 'p_blogs_admin' ); + +require_once BLOGS_PKG_INCLUDE_PATH.'lookup_post_inc.php'; -require_once( BLOGS_PKG_INCLUDE_PATH.'lookup_post_inc.php' ); -require_once( BLOGS_PKG_CLASS_PATH.'BitBlog.php'); $gBlog = new BitBlog(); $gBitUser->verifyTicket(); //if crosspost save store it and send us to the post's page if( isset( $_REQUEST['crosspost_post']) || isset($_REQUEST['save_post_exit'] ) ) { - $crosspost_note = isset( $_REQUEST['crosspost_note'] )? $_REQUEST['crosspost_note']:NULL; + $crosspost_note = isset( $_REQUEST['crosspost_note'] )? $_REQUEST['crosspost_note']:null; if( $gContent->isValid() && $gContent->storePostMap( $gContent->mInfo, $_REQUEST['blog_content_id'], $crosspost_note ) ) { $gContent->load(); - bit_redirect( $gContent->getDisplayUrl() ); + KernelTools::bit_redirect( $gContent->getDisplayUrl() ); } } @@ -43,16 +45,16 @@ if( !empty( $_REQUEST['action']) && ($_REQUEST['action'] == 'remove') && $gConte $feedback['error'] = $gContent->mErrors; } }else{ - $gBitSystem->setBrowserTitle( tra('Confirm removal of') . ' ' . $gContent->getTitle()); // crossposting from Blog \''.'addblognamehere'.'\'' ); - $formHash['remove'] = TRUE; + $gBitSystem->setBrowserTitle( KernelTools::tra('Confirm removal of') . ' ' . $gContent->getTitle()); // crossposting from Blog \''.'addblognamehere'.'\'' ); + $formHash['remove'] = true; $formHash['action'] = 'remove'; $formHash['post_id'] = $_REQUEST['post_id']; $formHash['blog_content_id'] = $_REQUEST['blog_content_id']; $msgHash = array( 'label' => 'Remove Crossposting of Blog Post:', 'confirm_item' => $gContent->getTitle(), - 'warning' => tra('This will remove the crossposting of the above blog post.'), // from the blog \''.'addblognamehere'.'\'), - 'error' => tra('This cannot be undone!'), + 'warning' => KernelTools::tra('This will remove the crossposting of the above blog post.'), // from the blog \''.'addblognamehere'.'\'), + 'error' => KernelTools::tra('This cannot be undone!'), ); $gBitSystem->confirmDialog( $formHash, $msgHash ); } @@ -70,7 +72,7 @@ $gBitSmarty->assign('parsed_data', $parsed_data); $gBitSmarty->assign('post_info', $gContent->mInfo ); // Get List of available blogs -$listHash = array(); +$listHash = []; $listHash['sort_mode'] = 'title_desc'; if( !$gBitUser->hasPermission( 'p_blogs_admin' )) { $blogs = $gBlog->getList( $listHash ); @@ -78,13 +80,12 @@ if( !$gBitUser->hasPermission( 'p_blogs_admin' )) { $listHash['content_perm_name'] = 'p_blogs_post'; } $blogs = $gBlog->getList( $listHash ); -$availableBlogs = array(); +$availableBlogs = []; foreach( array_keys( $blogs ) as $blogContentId ) { $availableBlogs[$blogContentId] = $blogs[$blogContentId]['title']; } $gBitSmarty->assign( 'availableBlogs', $availableBlogs ); -$gBitSmarty->assignByRef('blogs', $blogs['data']); +$gBitSmarty->assign('blogs', $blogs['data']); -$gBitSystem->display( 'bitpackage:blogs/crosspost.tpl', tra("Crosspost Blog Post") , array( 'display_mode' => 'display' )); -?> +$gBitSystem->display( 'bitpackage:blogs/crosspost.tpl', KernelTools::tra("Crosspost Blog Post") , array( 'display_mode' => 'display' )); diff --git a/edit.php b/edit.php old mode 100644 new mode 100755 index ba590da..4e90651 --- a/edit.php +++ b/edit.php @@ -12,12 +12,14 @@ /** * required setup */ -require_once( '../kernel/includes/setup_inc.php' ); -include_once( BLOGS_PKG_CLASS_PATH.'BitBlog.php' ); +namespace Bitweaver\Blogs; +require_once '../kernel/includes/setup_inc.php'; +use Bitweaver\KernelTools; +use Bitweaver\Liberty\LibertyContent; $gBitSystem->verifyPackage( 'blogs' ); -require_once( BLOGS_PKG_INCLUDE_PATH.'lookup_blog_inc.php'); +require_once BLOGS_PKG_INCLUDE_PATH.'lookup_blog_inc.php'; // Now check permissions to access this page if( $gContent->isValid() ) { @@ -31,7 +33,7 @@ if (isset($_REQUEST['preview'])) { $gBitSmarty->assign('title', $_REQUEST["title"]); $gBitSmarty->assign('edit', $_REQUEST["edit"]); $_REQUEST['data'] = $_REQUEST['edit']; // needed for parseDataHash - $gBitSmarty->assign('parsed', LibertyContent::parseDataHash( $_REQUEST ); + $gBitSmarty->assign('parsed', LibertyContent::parseDataHash( $_REQUEST )); $gBitSmarty->assign('user_name', $gBitUser->getDisplayName()); $gBitSmarty->assign('created', $gBitSystem->getUTCTime()); $gBitSmarty->assign('use_find', isset($_REQUEST["use_find"]) ? 'y' : 'n'); @@ -46,17 +48,15 @@ if (isset($_REQUEST['preview'])) { if (isset($_REQUEST['save_blog'])) { if( $gContent->store( $_REQUEST ) ) { - bit_redirect( $gContent->getDisplayUrl() ); + KernelTools::bit_redirect( $gContent->getDisplayUrl() ); } else { - $gBitSmarty->assignByRef( 'errors', $gContent->mErrors ); + $gBitSmarty->assign( 'errors', $gContent->mErrors ); } } -$gBitSystem->setBrowserTitle( tra( 'Edit Blog' ).' - '.$gContent->getTitle() ); +$gBitSystem->setBrowserTitle( KernelTools::tra( 'Edit Blog' ).' - '.$gContent->getTitle() ); $gBitSmarty->assign( 'textarea_label', 'Blog Description' ); -$gBitSmarty->assignByRef('gContent', $gContent); -$gBitSystem->display( 'bitpackage:blogs/edit_blog.tpl', NULL, array( 'display_mode' => 'edit' )); - -?> +$gBitSmarty->assign('gContent', $gContent); +$gBitSystem->display( 'bitpackage:blogs/edit_blog.tpl', null, array( 'display_mode' => 'edit' )); diff --git a/index.php b/index.php old mode 100644 new mode 100755 index 4eca793..d4e42b3 --- a/index.php +++ b/index.php @@ -6,16 +6,18 @@ /** * required setup */ -require_once( '../kernel/includes/setup_inc.php' ); +namespace Bitweaver\Blogs; +use Bitweaver\BitBase; -if( !@BitBase::verifyId( $_REQUEST['blog_id'] ) && $gBitSystem->isFeatureActive( 'blog_home' )) { +require_once '../kernel/includes/setup_inc.php'; + +if( !BitBase::verifyId( $_REQUEST['blog_id'] ?? 0 ) && $gBitSystem->isFeatureActive( 'blog_home' )) { $_REQUEST['blog_id'] = $gBitSystem->getConfig( 'blog_home' ); } // if we have a blog_id, we display the correct blog - otherwise we simply display recent posts -if( @BitBase::verifyId( $_REQUEST['blog_id'] )) { - include_once( BLOGS_PKG_INCLUDE_PATH.'display_bitblog_inc.php' ); +if( BitBase::verifyId( $_REQUEST['blog_id'] ?? 0 )) { + include_once BLOGS_PKG_INCLUDE_PATH.'display_bitblog_inc.php'; } else { - include_once( BLOGS_PKG_PATH.'recent_posts.php' ); -} -?> + include_once BLOGS_PKG_PATH.'recent_posts.php'; +} \ No newline at end of file diff --git a/list_blogs.php b/list_blogs.php old mode 100644 new mode 100755 index 2a67e24..d5753dc --- a/list_blogs.php +++ b/list_blogs.php @@ -12,19 +12,19 @@ /** * required setup */ -require_once( '../kernel/includes/setup_inc.php' ); -require_once( BLOGS_PKG_INCLUDE_PATH.'lookup_blog_inc.php'); - -include_once( BLOGS_PKG_CLASS_PATH.'BitBlog.php' ); +require_once '../kernel/includes/setup_inc.php'; +use Bitweaver\KernelTools; $gBitSystem->verifyPackage( 'blogs' ); +require_once BLOGS_PKG_INCLUDE_PATH.'lookup_blog_inc.php'; + $gBitSystem->verifyPermission( 'p_blogs_view' ); -$gBitSystem->setBrowserTitle(tra("View All Blogs")); +$gBitSystem->setBrowserTitle(KernelTools::tra("View All Blogs")); if( $gContent->isValid() && isset($_REQUEST["remove"])) { - $gBitSystem->setBrowserTitle(tra("Delete Blog")); + $gBitSystem->setBrowserTitle(KernelTools::tra("Delete Blog")); // Check if has edit perm of this blog $gContent->verifyUpdatePermission(); @@ -35,8 +35,8 @@ if( $gContent->isValid() && isset($_REQUEST["remove"])) { $formHash['blog_id'] = $gContent->mBlogId; $gBitSystem->confirmDialog( $formHash, array( - 'warning' => tra('Are you sure you want to delete this blog?') . ' ' . $gContent->getTitle(), - 'error' => tra('This cannot be undone!'), + 'warning' => KernelTools::tra('Are you sure you want to delete this blog?') . ' ' . $gContent->getTitle(), + 'error' => KernelTools::tra('This cannot be undone!'), ) ); } else { @@ -47,12 +47,10 @@ if( $gContent->isValid() && isset($_REQUEST["remove"])) { // Get a list of last changes to the Wiki database $blogsList = $gContent->getList( $_REQUEST ); $gBitSmarty->assign( 'listInfo', $_REQUEST['listInfo'] ); -$gBitSmarty->assignByRef( 'blogsList', $blogsList ); +$gBitSmarty->assign( 'blogsList', $blogsList ); if( defined(ROLE_MODEL) ) { - $gBitSmarty->assign( 'role_model', TRUE ); + $gBitSmarty->assign( 'role_model', true ); } // Display the template -$gBitSystem->display( 'bitpackage:blogs/list_blogs.tpl', NULL, array( 'display_mode' => 'list' )); - -?> +$gBitSystem->display( 'bitpackage:blogs/list_blogs.tpl', null, array( 'display_mode' => 'list' )); diff --git a/post.php b/post.php old mode 100644 new mode 100755 index df23156..b0e938b --- a/post.php +++ b/post.php @@ -13,21 +13,28 @@ /** * required setup */ -require_once( '../kernel/includes/setup_inc.php' ); +namespace Bitweaver; +require_once '../kernel/includes/setup_inc.php'; +use Bitweaver\Blogs\BitBlog; +use Bitweaver\KernelTools; $gBitSystem->verifyPackage( 'blogs' ); -require_once( BLOGS_PKG_INCLUDE_PATH.'lookup_post_inc.php' ); -require_once( BLOGS_PKG_CLASS_PATH.'BitBlog.php'); +require_once BLOGS_PKG_INCLUDE_PATH.'lookup_post_inc.php'; -if ( isset( $_REQUEST["blog_id"] ) ) { + +if ( isset( $_REQUEST["blog_id"] ) && $_REQUEST["blog_id"] > 0 ) { #setup so we know what the default target blog is in the template $gBlog = new BitBlog($_REQUEST["blog_id"]); $gBlog->load(); $gBitSmarty->assign('default_target_blog_content_id',$gBlog->mContentId ); -}else { +} elseif ( !empty( $gContent->mInfo['blogs'] ) ) { + $gBlog = new BitBlog($gContent->mInfo['blogs']); + $_REQUEST["blog_id"] = 0; +} else { $gBlog = new BitBlog(); + $_REQUEST["blog_id"] = 0; } //must be owner or admin to edit an existing post @@ -45,21 +52,21 @@ if( !empty( $_REQUEST['action'] ) ) { $gBitUser->verifyTicket(); $redirect = !empty( $gContent->mInfo['blogs'] ) ? BLOGS_PKG_URL.'view.php?content_id='.key( $gContent->mInfo['blogs'] ) : BLOGS_PKG_URL; if( $gContent->expunge() ) { - bit_redirect( $redirect ); + KernelTools::bit_redirect( $redirect ); } else { $feedback['error'] = $gContent->mErrors; } } $gBitSystem->setBrowserTitle( 'Confirm removal of '.$gContent->getTitle() ); - $formHash['remove'] = TRUE; + $formHash['remove'] = true; $formHash['action'] = 'remove'; $formHash['post_id'] = $_REQUEST['post_id']; - $msgHash = array( - 'label' => tra('Remove Blog Post'), + $msgHash = [ + 'label' => KernelTools::tra('Remove Blog Post'), 'confirm_item' => $gContent->getTitle(), - 'warning' => tra( 'This will remove the above blog post.' ), - 'error' => tra( 'This cannot be undone!' ), - ); + 'warning' => KernelTools::tra( 'This will remove the above blog post.' ), + 'error' => KernelTools::tra( 'This cannot be undone!' ), + ]; $gBitSystem->confirmDialog( $formHash, $msgHash ); } } @@ -74,9 +81,9 @@ if( isset( $_REQUEST['format_guid'] ) && !isset( $gContent->mInfo['format_guid'] if (isset($_REQUEST["preview"])) { $post = $gContent->preparePreview( $_REQUEST ); - $gBitSmarty->assign( 'preview', TRUE ); + $gBitSmarty->assign( 'preview', true ); $gContent->invokeServices( 'content_preview_function' ); - $gBitSmarty->assignByRef( 'post_info', $post ); + $gBitSmarty->assign( 'post_info', $post ); /* minor hack to accomodate the view_blog_post.tpl * this can eventually be removed with a change to the tpl to use post_info['parsed_data'] * but requires clean up in a few places. @@ -84,7 +91,7 @@ if (isset($_REQUEST["preview"])) { $gBitSmarty->assign('parsed_data', $post['parsed_data']); } elseif (isset($_REQUEST['save_post']) || isset($_REQUEST['save_post_exit'])) { // Editing page needs general ticket verification - $gBitUser->verifyTicket(); +// $gBitUser->verifyTicket(); // preserve a copy of the request data because if store fails we need to reprocess $requestCopy = $_REQUEST; @@ -100,13 +107,13 @@ if (isset($_REQUEST["preview"])) { $parsed_data = $gContent->getParsedData(); - $gBitSmarty->assign( 'title', $gContent->getTitle('title') ); + $gBitSmarty->assign( 'title', $gContent->getTitle() ); $gBitSmarty->assign( 'trackbacks_to', explode(',', $gContent->getField('trackbacks_to')) ); $gBitSmarty->assign( 'parsed_data', $parsed_data ); } else { $post = $gContent->preparePreview( $requestCopy ); $gContent->invokeServices( 'content_preview_function' ); - $gBitSmarty->assignByRef( 'post_info', $post ); + $gBitSmarty->assign( 'post_info', $post ); $gBitSmarty->assign('parsed_data', $post['parsed_data']); } } elseif( !empty( $_REQUEST['edit'] ) ) { @@ -119,11 +126,11 @@ if (isset($_REQUEST["preview"])) { */ $gContent->mInfo['publish_date'] = $gBitSystem->getUTCTime(); } - $gBitSmarty->assignByRef('post_info', $gContent->mInfo); + $gBitSmarty->assign('post_info', $gContent->mInfo); } // Get List of available blogs -$listHash = array(); +$listHash = []; $listHash['sort_mode'] = 'title_asc'; $listHash['max_records'] = BIT_MAX_RECORDS; if( !$gBitUser->hasPermission( 'p_blogs_admin' )) { @@ -131,21 +138,20 @@ if( !$gBitUser->hasPermission( 'p_blogs_admin' )) { $listHash['content_perm_name'] = 'p_blogs_post'; } $blogs = $gBlog->getList( $listHash ); -$availableBlogs = array(); +$availableBlogs = []; foreach( array_keys( $blogs ) as $blogContentId ) { $availableBlogs[$blogContentId] = $blogs[$blogContentId]['title']; } $gBitSmarty->assign( 'availableBlogs', $availableBlogs ); -$gBitSmarty->assignByRef('blogs', $blogs['data']); +$gBitSmarty->assign('blogs', $blogs); if (isset($_REQUEST['blog_content_id'])) { $gBitSmarty->assign('blog_content_id', $_REQUEST['blog_content_id'] ); } -$gBitSmarty->assignByRef( 'errors', $gContent->mErrors ); +$gBitSmarty->assign( 'errors', $gContent->mErrors ); -$gBitSmarty->assign( 'textarea_label', tra('Post Content') ); +$gBitSmarty->assign( 'textarea_label', KernelTools::tra('Post Content') ); // tweak title displayed for better usuability in browser history -$gBitSystem->display( 'bitpackage:blogs/blog_post.tpl', $gContent->isValid() ? tra( "Edit Blog Post" ).": ".$gContent->getTitle() : tra( "Create Blog Post" ) , array( 'display_mode' => 'edit' )); -?> +$gBitSystem->display( 'bitpackage:blogs/blog_post.tpl', $gContent->isValid() ? KernelTools::tra( "Edit Blog Post" ).": ".$gContent->getTitle() : KernelTools::tra( "Create Blog Post" ) , [ 'display_mode' => 'edit' ] ); diff --git a/print_blog_post.php b/print_blog_post.php old mode 100644 new mode 100755 index a6ff5e3..d50406c --- a/print_blog_post.php +++ b/print_blog_post.php @@ -1,4 +1,6 @@ verifyPackage( 'blogs' ); if (!isset($_REQUEST["post_id"])) { - $gBitSystem->fatalError( tra( 'No post indicated' )); + $gBitSystem->fatalError( KernelTools::tra( 'No post indicated' )); } -include_once( BLOGS_PKG_INCLUDE_PATH.'lookup_post_inc.php' ); +include_once BLOGS_PKG_INCLUDE_PATH.'lookup_post_inc.php'; $gBitSmarty->assign('post_info', $gContent->mInfo ); //Build absolute URI for this $parts = parse_url($_SERVER['REQUEST_URI']); -/*OLD with blog_id - might later want to reincorporate blog_id but will have to start in the view_blog_post.tpl -wjames5 -$uri = httpPrefix(). $parts['path'] . '?blog_id=' . $gContent->mInfo['blog_id'] . '&post_id=' . $gContent->mInfo['post_id']; -$uri2 = httpPrefix(). $parts['path'] . '/' . $gContent->mInfo['blog_id'] . '/' . $gContent->mInfo['post_id']; -*/ -$uri = httpPrefix(). $parts['path'] . '?post_id=' . $gContent->mInfo['post_id']; -$uri2 = httpPrefix(). $parts['path'] . '/' . $gContent->mInfo['post_id']; +$uri = KernelTools::httpPrefix(). $parts['path'] . '?post_id=' . $gContent->mInfo['post_id']; +$uri2 = KernelTools::httpPrefix(). $parts['path'] . '/' . $gContent->mInfo['post_id']; $gBitSmarty->assign('uri', $uri); $gBitSmarty->assign('uri2', $uri2); @@ -60,12 +58,10 @@ $gBitSystem->verifyPermission( 'p_blogs_view' ); if ($gBitSystem->isFeatureActive( 'blog_posts_comments' )) { $comments_return_url = $_SERVER['SCRIPT_NAME']."?post_id=".$gContent->getField( 'post_id' ); $commentsParentId = $gContent->mContentId; - include_once ( LIBERTY_PKG_INCLUDE_PATH.'comments_inc.php' ); + include_once LIBERTY_PKG_INCLUDE_PATH.'comments_inc.php'; } $gBitSystem->setBrowserTitle( $gContent->mInfo['title'] ); // Display the template -$gBitSmarty->display("bitpackage:blogs/print_blog_post.tpl"); - -?> +$gBitSmarty->display("bitpackage:blogs/print_blog_post.tpl"); \ No newline at end of file diff --git a/rankings.php b/rankings.php old mode 100644 new mode 100755 index d5ad640..a129df0 --- a/rankings.php +++ b/rankings.php @@ -13,53 +13,52 @@ /** * required setup */ -require_once( '../kernel/includes/setup_inc.php' ); - -include_once( LIBERTY_PKG_PATH . 'LibertyContent.php' ); -require_once( BLOGS_PKG_PATH . 'BitBlog.php' ); -require_once( BLOGS_PKG_PATH . 'BitBlogPost.php' ); +namespace Bitweaver\Blogs; +require_once '../kernel/includes/setup_inc.php'; +use Bitweaver\KernelTools; +use BitWeaver\Liberty\LibertyContent; $gBitSystem->verifyPackage( 'blogs' ); $gBitSystem->verifyFeature( 'blog_rankings' ); $gBitSystem->verifyPermission( 'p_blogs_view' ); -$rankingOptions = array( - array( - 'output' => tra( 'Most Often Viewed' ), +$rankingOptions = [ + [ + 'output' => KernelTools::tra( 'Most Often Viewed' ), 'value' => 'hits_desc' - ), - array( - 'output' => tra( 'Most Recently Modified' ), + ], + [ + 'output' => KernelTools::tra( 'Most Recently Modified' ), 'value' => 'last_modified_desc' - ), - array( - 'output' => tra( 'Most Active Authors' ), + ], + [ + 'output' => KernelTools::tra( 'Most Active Authors' ), 'value' => 'top_authors' - ), -); + ], +]; $gBitSmarty->assign( 'rankingOptions', $rankingOptions ); if( !empty( $_REQUEST['sort_mode'] ) ) { switch( $_REQUEST['sort_mode'] ) { case 'last_modified_desc': $gBitSmarty->assign( 'attribute', 'last_modified' ); - $_REQUEST['attribute'] = tra( 'Date of last modification' ); + $_REQUEST['attribute'] = KernelTools::tra( 'Date of last modification' ); break; case 'top_authors': $gBitSmarty->assign( 'attribute', 'ag_hits' ); - $_REQUEST['attribute'] = tra( 'Hits to items by this Author' ); + $_REQUEST['attribute'] = KernelTools::tra( 'Hits to items by this Author' ); break; default: $gBitSmarty->assign( 'attribute', 'hits' ); - $_REQUEST['attribute'] = tra( 'Hits' ); + $_REQUEST['attribute'] = KernelTools::tra( 'Hits' ); break; } } else { $gBitSmarty->assign( 'attribute', 'hits' ); - $_REQUEST['attribute'] = tra( 'Hits' ); + $_REQUEST['attribute'] = KernelTools::tra( 'Hits' ); } -$_REQUEST['title'] = tra( 'Blog Post Rankings' ); +$_REQUEST['title'] = KernelTools::tra( 'Blog Post Rankings' ); $_REQUEST['content_type_guid'] = BITBLOGPOST_CONTENT_TYPE_GUID; $_REQUEST['max_records'] = !empty( $_REQUEST['max_records'] ) ? $_REQUEST['max_records'] : 10; @@ -69,7 +68,7 @@ if( empty( $gContent ) ) { $rankList = $gContent->getContentRanking( $_REQUEST ); $gBitSmarty->assign( 'rankList', $rankList ); -$gBitSystem->display( 'bitpackage:liberty/rankings.tpl', tra( "Blog Post Rankings" ) , array( 'display_mode' => 'display' )); +$gBitSystem->display( 'bitpackage:liberty/rankings.tpl', KernelTools::tra( "Blog Post Rankings" ) , array( 'display_mode' => 'display' )); @@ -77,7 +76,7 @@ $gBitSystem->display( 'bitpackage:liberty/rankings.tpl', tra( "Blog Post Ranking /* ---- below is what blog rankings was - might want to canabalize some of it eventually ---- */ /* -require_once( '../kernel/includes/setup_inc.php' ); +require_once '../kernel/includes/setup_inc.php'; $gBitSystem->verifyPackage( 'blogs' ); @@ -91,17 +90,17 @@ require_once( BLOGS_PKG_PATH . 'BitBlogPost.php' ); $allrankings = array( array( - 'name' => tra('Most visited blogs'), + 'name' => KernelTools::tra('Most visited blogs'), 'value' => 'blog_ranking_top_blogs' ), array( - 'name' => tra('Last posts'), + 'name' => KernelTools::tra('Last posts'), 'value' => 'blog_ranking_last_posts' ), /** * @todo reenable once we have activity implemented array( - 'name' => tra('Most active blogs'), + 'name' => KernelTools::tra('Most active blogs'), 'value' => 'blog_ranking_top_active_blogs' ) **/ @@ -125,21 +124,21 @@ if (!isset($_REQUEST["limit"])) { $limit = $_REQUEST["limit"]; } -$gBitSmarty->assignByRef('limit', $limit); +$gBitSmarty->assign('limit', $limit); // Rankings: // Top Pages // Last pages // Top Authors -- Would be nice. -$rankings = array(); +$rankings = []; $rankings = $which($limit); -$gBitSmarty->assignByRef('rankings', $rankings); +$gBitSmarty->assign('rankings', $rankings); $gBitSmarty->assign('rpage', 'rankings.php'); // Display the template -$gBitSystem->display( 'bitpackage:blogs/ranking.tpl', tra($rankings['title']), array( 'display_mode' => 'display' )); +$gBitSystem->display( 'bitpackage:blogs/ranking.tpl', KernelTools::tra($rankings['title']), array( 'display_mode' => 'display' )); // =============================== some ranking functions - as soon as blogs are part of LibertyContent, we can use LibertyContent::getContentRanking() function blog_ranking_top_blogs($limit) { @@ -157,7 +156,7 @@ function blog_ranking_top_blogs($limit) { $list['data'][$key]['post_array'][] = $ret; } } - $list['title'] = tra("Most Visited Blogs"); + $list['title'] = KernelTools::tra("Most Visited Blogs"); return $list; } @@ -179,7 +178,7 @@ function blog_ranking_top_active_blogs($limit) { $list['data'][$key]['post_array'][] = $ret; } } - $list['title'] = tra("Most Visited Blogs"); + $list['title'] = KernelTools::tra("Most Visited Blogs"); return $list; } @@ -199,7 +198,7 @@ function blog_ranking_last_posts($limit) { $blog_hash['sort_mode'] = 'lch.hits_desc'; $blog_hash['find'] = $blog_ids; $blogs = $b->getList($blog_hash); - $list['data'] = array(); + $list['data'] = []; // Reorganize blogs by id foreach($blogs['data'] as $key => $blog) { $list['data'][$blog['blog_id']] = $blog; @@ -214,4 +213,3 @@ function blog_ranking_last_posts($limit) { return $list; } */ -?> diff --git a/recent_posts.php b/recent_posts.php old mode 100644 new mode 100755 index 29225c8..3fea3c4 --- a/recent_posts.php +++ b/recent_posts.php @@ -9,24 +9,26 @@ /** * Initial Setup */ -require_once( '../kernel/includes/setup_inc.php' ); +namespace Bitweaver\Blogs; + +require_once '../kernel/includes/setup_inc.php'; + +// Load blog list +require_once BLOGS_PKG_INCLUDE_PATH.'lookup_blog_inc.php'; // Is package installed and enabled $gBitSystem->verifyPackage( 'blogs' ); -require_once( BLOGS_PKG_INCLUDE_PATH.'lookup_blog_inc.php'); - // Now check permissions to access this page $gContent->verifyViewPermission(); if ( $gBitSystem->isFeatureActive( 'blog_ajax_more' ) && $gBitThemes->isJavascriptEnabled() ){ - $gBitSmarty->assign('ajax_more', TRUE); - $gBitThemes->loadAjax( 'mochikit', array( 'Iter.js', 'DOM.js', 'Style.js', 'Color.js', 'Position.js', 'Visual.js' ) ); + $gBitSmarty->assign('ajax_more', true); + $gBitThemes->loadAjax( 'mochikit', [ 'Iter.js', 'DOM.js', 'Style.js', 'Color.js', 'Position.js', 'Visual.js' ] ); } // Display the template $gDefaultCenter = 'bitpackage:blogs/center_list_blog_posts.tpl'; -$gBitSmarty->assignByRef( 'gDefaultCenter', $gDefaultCenter ); +$gBitSmarty->assign( 'gDefaultCenter', $gDefaultCenter ); -$gBitSystem->display( 'bitpackage:kernel/dynamic.tpl', 'List Blog Posts' , array( 'display_mode' => 'display' )); -?> +$gBitSystem->display( 'bitpackage:kernel/dynamic.tpl', 'List Blog Posts' , [ 'display_mode' => 'display' ]); diff --git a/send_post.php b/send_post.php old mode 100644 new mode 100755 index 3537740..8b64c24 --- a/send_post.php +++ b/send_post.php @@ -11,14 +11,14 @@ // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See http://www.gnu.org/copyleft/lesser.html for details. // Make sure all defines get created as fully qualified URI's -$_REQUEST['uri_mode'] = TRUE; +$_REQUEST['uri_mode'] = true; /** * required setup */ -require_once( '../kernel/includes/setup_inc.php' ); +require_once '../kernel/includes/setup_inc.php'; -include_once( BLOGS_PKG_CLASS_PATH.'BitBlogPost.php' ); +include_once BLOGS_PKG_CLASS_PATH.'BitBlogPost.php'; $gBitSystem->verifyPermission( 'p_blogs_send_post' ); @@ -26,7 +26,7 @@ if (!isset($_REQUEST["post_id"])) { $gBitSystem->fatalError( tra( 'No post indicated' )); } -include_once( BLOGS_PKG_INCLUDE_PATH.'lookup_post_inc.php' ); +include_once BLOGS_PKG_INCLUDE_PATH.'lookup_post_inc.php'; // make sure this user can see the post to avoid emailing post to self to circumvent the perm $gContent->verifyViewPermission(); @@ -34,10 +34,6 @@ $gBitSmarty->assign('post_info', $gContent->mInfo ); //Build absolute URI for this $parts = parse_url($_SERVER['REQUEST_URI']); -/*OLD with blog_id - might later want to reincorporate blog_id but will have to start in the view_blog_post.tpl -wjames5 -$uri = httpPrefix(). $parts['path'] . '?blog_id=' . $gContent->mInfo['blog_id'] . '&post_id=' . $gContent->mInfo['post_id']; -$uri2 = httpPrefix(). $parts['path'] . '/' . $gContent->mInfo['blog_id'] . '/' . $gContent->mInfo['post_id']; -*/ $uri = httpPrefix(). $parts['path'] . '?post_id=' . $gContent->mInfo['post_id']; $uri2 = httpPrefix(). $parts['path'] . '/' . $gContent->mInfo['post_id']; $gBitSmarty->assign('uri', $uri); @@ -57,7 +53,7 @@ if ($gBitSystem->isFeatureActive( 'blog_posts_comments' )) { $commentsParentId = $gContent->mContentId; $comments_prefix_var = 'post:'; $comments_object_var = 'post_id'; - include_once ( LIBERTY_PKG_INCLUDE_PATH.'comments_inc.php' ); + include_once LIBERTY_PKG_INCLUDE_PATH.'comments_inc.php'; } if (!isset($_REQUEST['addresses'])) { @@ -89,6 +85,4 @@ if (isset($_REQUEST['send'])) { $gBitSystem->setBrowserTitle("Send Blog Post: ".$gContent->mInfo['title']); // Display the template -$gBitSystem->display( 'bitpackage:blogs/send_blog_post.tpl', NULL, array( 'display_mode' => 'display' )); - -?> +$gBitSystem->display( 'bitpackage:blogs/send_blog_post.tpl', null, array( 'display_mode' => 'display' )); \ No newline at end of file diff --git a/view.php b/view.php old mode 100644 new mode 100755 index 2064f2e..8e85848 --- a/view.php +++ b/view.php @@ -13,7 +13,6 @@ /** * required setup */ -require_once( '../kernel/includes/setup_inc.php' ); +require_once '../kernel/includes/setup_inc.php'; -include_once( BLOGS_PKG_INCLUDE_PATH.'display_bitblog_inc.php' ); -?> +include_once BLOGS_PKG_INCLUDE_PATH.'display_bitblog_inc.php'; diff --git a/view_post.php b/view_post.php old mode 100644 new mode 100755 index f1323dc..63bc730 --- a/view_post.php +++ b/view_post.php @@ -13,13 +13,12 @@ /** * required setup */ -require_once( '../kernel/includes/setup_inc.php' ); +require_once '../kernel/includes/setup_inc.php'; +use Bitweaver\Blogs\BitBlogPost; $gBitSystem->verifyPackage( 'blogs' ); -require_once( BLOGS_PKG_CLASS_PATH.'BitBlogPost.php' ); - -include_once( BLOGS_PKG_INCLUDE_PATH.'lookup_post_inc.php' ); +include_once BLOGS_PKG_INCLUDE_PATH.'lookup_post_inc.php'; if( !$gContent->isValid() ) { $gBitSystem->setHttpStatus( 404 ); @@ -29,22 +28,22 @@ if( !$gContent->isValid() ) { $gContent->verifyViewPermission(); $now = $gBitSystem->getUTCTime(); -$view = FALSE; +$view = false; if ( $gContent->hasAdminPermission() || ( $gContent->hasUserPermission( 'p_blog_posts_read_future' ) && $gContent->hasUserPermission( 'p_blog_posts_read_expired' ) ) ){ - $view = TRUE; + $view = true; }elseif ( $gContent->mInfo['publish_date'] == $gContent->mInfo['expire_date'] ) { - $view = TRUE; + $view = true; }elseif ( $gContent->mInfo['publish_date'] > $now && $gContent->hasUserPermission( 'p_blog_posts_read_future' ) ){ - $view = TRUE; + $view = true; }elseif ( $gContent->mInfo['expire_date'] < $now && $gContent->hasUserPermission( 'p_blog_posts_read_expired' ) ){ - $view = TRUE; + $view = true; }elseif ( ( $gContent->mInfo['publish_date'] <= $now ) && ( $gContent->mInfo['expire_date'] > $now || $gContent->mInfo['expire_date'] <= $gContent->mInfo['publish_date'] ) ){ - $view = TRUE; + $view = true; } -if ($view == TRUE){ - include_once( BLOGS_PKG_INCLUDE_PATH.'display_bitblogpost_inc.php' ); +if ($view == true){ + include_once BLOGS_PKG_INCLUDE_PATH.'display_bitblogpost_inc.php'; }else{ $gBitSystem->setHttpStatus( 404 ); $gBitSystem->fatalError( "The blog post you requested could not be found." ); @@ -53,4 +52,3 @@ if ($view == TRUE){ if( $gContent->isValid() ) { $gContent->addHit(); } -?> diff --git a/view_post_image.php b/view_post_image.php old mode 100644 new mode 100755 index d7dff02..b1f70e9 --- a/view_post_image.php +++ b/view_post_image.php @@ -13,17 +13,16 @@ /** * required setup */ -require_once( '../kernel/includes/setup_inc.php' ); +require_once '../kernel/includes/setup_inc.php'; -include_once( BLOGS_PKG_CLASS_PATH.'BitBlog.php' ); +include_once BLOGS_PKG_CLASS_PATH.'BitBlog.php'; if (!isset($_REQUEST["image_id"])) { $gBitSmarty->assign('msg', tra("No image id given")); - $gBitSystem->display( 'error.tpl' , NULL, array( 'display_mode' => 'display' )); + $gBitSystem->display( 'error.tpl' , null, array( 'display_mode' => 'display' )); die; } -$imageInfo = $gBlog->getStorageFileInfo($_REQUEST["image_id"]); +$imageInfo = $gBlog->getStoreFileInfo($_REQUEST["image_id"]); $gBitSmarty->assign( 'imageInfo' , $imageInfo ); -$gBitSystem->display( 'bitpackage:blogs/view_post_image.tpl' , NULL, array( 'display_mode' => 'display' )); -?> +$gBitSystem->display( 'bitpackage:blogs/view_post_image.tpl' , null, array( 'display_mode' => 'display' )); \ No newline at end of file -- cgit v1.3