Skip to content

proper call to static methods #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WordpressReady wants to merge 1 commit into
base: master
Choose a base branch
from
Open

proper call to static methods #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 31 additions & 28 deletions inc/class.npu_uploader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
class UploaderNggAdmin extends nggAdmin {

// Public Variables
public $arrImageIds = array();
public $arrImageNames = array();
public $arrThumbReturn = array();
static public $arrImageIds = array();
static public $arrImageNames = array();
static public $arrThumbReturn = array();
static public $strGalleryPath = '';
public $arrEXIF = array();
public $arrErrorMsg = array();
public $arrErrorMsg_widg = array();
public $strFileName = '';
public $strGalleryPath = '';
public $blnRedirectPage = false;

function upload_images() {
static function upload_images() {
global $wpdb;
// Image Array
$imageslist = array();
Expand All @@ -41,7 +41,8 @@ function upload_images() {
return;
}
// Read Image List
$dirlist = $this->scandir( WINABSPATH . $gallerypath );
$dirlist = UploaderNggAdmin::scandir(WINABSPATH . $gallerypath);

foreach( $_FILES as $key => $value ) {
if ( $_FILES[$key]['error'] == 0 ) {
$entropy = '';
Expand Down Expand Up @@ -75,10 +76,10 @@ function upload_images() {
// Save Temporary File
if ( !@move_uploaded_file( $_FILES[$key]['tmp_name'], $dest_file ) ) {
self::show_error( __( 'Error, the file could not moved to: ', 'nextgen-public-uploader' ) . $dest_file );
$this->check_safemode( WINABSPATH.$gallerypath );
self::check_safemode( WINABSPATH.$gallerypath );
continue;
}
if ( ! $this->chmod( $dest_file ) ) {
if ( ! self::chmod( $dest_file ) ) {
self::show_error( __( 'Error, the file permissions could not set.', 'nextgen-public-uploader' ) );
continue;
}
Expand All @@ -94,22 +95,24 @@ function upload_images() {
$npu_exclude_id = 1;
}
// Add Images to Database
$image_ids = $this->add_Images( $galleryID, $imageslist );
$this->arrThumbReturn = array();
$image_ids = self::add_Images( $galleryID, $imageslist );

self::$arrThumbReturn = array();

foreach ( $image_ids as $pid ) {
$wpdb->query( "UPDATE $wpdb->nggpictures SET exclude = '$npu_exclude_id' WHERE pid = '$pid'" );
$this->arrThumbReturn[] = $this->create_thumbnail( $pid );
self::$arrThumbReturn[] = self::create_thumbnail( $pid );
}
$this->arrImageIds = array();
$this->arrImageIds = $image_ids;
$this->arrImageNames = array();
$this->arrImageNames = $imageslist;
$this->strGalleryPath = $gallerypath;
self::$arrImageIds = array();
self::$arrImageIds = $image_ids;
self::$arrImageNames = array();
self::$arrImageNames = $imageslist;
self::$strGalleryPath = $gallerypath;
}
return;
} // End Function

function upload_images_widget() {
static function upload_images_widget() {
global $wpdb;
// Image Array
$imageslist = array();
Expand All @@ -130,7 +133,7 @@ function upload_images_widget() {
return;
}
// Read Image List
$dirlist = $this->scandir( WINABSPATH . $gallerypath );
$dirlist = self::scandir( WINABSPATH . $gallerypath );
foreach( $_FILES as $key => $value ) {
if ( $_FILES[$key]['error'] == 0 ) {
$temp_file = $_FILES[$key]['tmp_name'];
Expand Down Expand Up @@ -159,10 +162,10 @@ function upload_images_widget() {
// Save Temporary File
if ( ! @move_uploaded_file( $_FILES[$key]['tmp_name'], $dest_file ) ) {
self::show_error( __( 'Error, the file could not moved to: ', 'nextgen-public-uploader' ) . $dest_file );
$this->check_safemode( WINABSPATH . $gallerypath );
self::check_safemode( WINABSPATH . $gallerypath );
continue;
}
if ( ! $this->chmod( $dest_file ) ) {
if ( ! self::chmod( $dest_file ) ) {
self::show_error( __( 'Error, the file permissions could not set.', 'nextgen-public-uploader' ) );
continue;
}
Expand All @@ -178,19 +181,19 @@ function upload_images_widget() {
$npu_exclude_id = 1;
}
// Add Images to Database
$image_ids = $this->add_Images( $galleryID, $imageslist );
$this->arrThumbReturn = array();
$image_ids = self::add_Images( $galleryID, $imageslist );
self::$arrThumbReturn = array();

foreach ( $image_ids as $pid ) { //TODO: prepare
$wpdb->query( "UPDATE $wpdb->nggpictures SET exclude = '$npu_exclude_id' WHERE pid = '$pid'" );
$this->arrThumbReturn[] = $this->create_thumbnail( $pid );
self::$arrThumbReturn[] = self::create_thumbnail($pid);
}

$this->arrImageIds = array();
$this->arrImageIds = $image_ids;
$this->arrImageNames = array();
$this->arrImageNames = $imageslist;
$this->strGalleryPath = $gallerypath;
self::$arrImageIds = array();
self::$arrImageIds = $image_ids;
self::$arrImageNames = array();
self::$arrImageNames = $imageslist;
self::$strGalleryPath = $gallerypath;
}
return;
} // End Function
Expand Down
31 changes: 17 additions & 14 deletions inc/npu-upload.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,9 @@ public function display_uploader( $gal_id, $strDetailsPage = false, $blnShowAltT
}
if ( !is_user_logged_in() && get_option( 'npu_user_role_select' ) != 99 ) {
$strOutput .= '<div class="need_login">';
if( !empty( get_option( 'npu_notlogged' ) ) ) {
$strOutput .= get_option( 'npu_notlogged' );
$notlogged = get_option( 'npu_notlogged' );
if( !empty( $notlogged ) ) {
$strOutput .= $notlogged;
} else {
$strOutput .= __( 'You must be registered and logged in to upload images.', 'nextgen-public-uploader' );
}
Expand Down Expand Up @@ -173,12 +174,12 @@ public function handleUpload() {
check_admin_referer( 'ngg_addgallery' );
if ( !isset( $_FILES['MF__F_0_0']['error'] ) || $_FILES['MF__F_0_0']['error'] == 0 ) {
$objUploaderNggAdmin = new UploaderNggAdmin();
$messagetext = $objUploaderNggAdmin->upload_images();
$this->arrImageIds = $objUploaderNggAdmin->arrImageIds;
$this->strGalleryPath = $objUploaderNggAdmin->strGalleryPath;
$this->arrImageNames = $objUploaderNggAdmin->arrImageNames;
if ( is_array( $objUploaderNggAdmin->arrThumbReturn ) && count( $objUploaderNggAdmin->arrThumbReturn ) > 0 ) {
foreach ( $objUploaderNggAdmin->arrThumbReturn as $strReturnMsg ) {
UploaderNggAdmin::upload_images();
$this->arrImageIds = UploaderNggAdmin::$arrImageIds;
$this->strGalleryPath = UploaderNggAdmin::$strGalleryPath;
$this->arrImageNames = UploaderNggAdmin::$arrImageNames;
if ( is_array( UploaderNggAdmin::$arrThumbReturn ) && count( UploaderNggAdmin::$arrThumbReturn ) > 0 ) {
foreach ( UploaderNggAdmin::$arrThumbReturn as $strReturnMsg ) {
if ( $strReturnMsg != '1' ) {
$this->arrErrorMsg[] = $strReturnMsg;
}
Expand Down Expand Up @@ -400,13 +401,15 @@ public function handleUpload_widget() {
if ( ! isset( $_FILES['MF__F_0_0']['error'] ) || $_FILES['MF__F_0_0']['error'] == 0 ) {

$objUploaderNggAdmin = new UploaderNggAdmin();
$messagetext = $objUploaderNggAdmin->upload_images_widget();
$this->arrImageIds = $objUploaderNggAdmin->arrImageIds;
$this->strGalleryPath = $objUploaderNggAdmin->strGalleryPath;
$this->arrImageNames = $objUploaderNggAdmin->arrImageNames;

if ( is_array( $objUploaderNggAdmin->arrThumbReturn ) && count( $objUploaderNggAdmin->arrThumbReturn ) > 0 ) {
foreach ( $objUploaderNggAdmin->arrThumbReturn as $strReturnMsg ) {
UploaderNggAdmin::upload_images_widget();
$this->arrImageIds = UploaderNggAdmin::$arrImageIds;
$this->strGalleryPath = UploaderNggAdmin::$strGalleryPath;
$this->arrImageNames = UploaderNggAdmin::$arrImageNames;


if ( is_array( UploaderNggAdmin::$arrThumbReturn ) && count( UploaderNggAdmin::$arrThumbReturn ) > 0 ) {
foreach ( UploaderNggAdmin::$arrThumbReturn as $strReturnMsg ) {
if ( $strReturnMsg != '1' ) {
$this->arrErrorMsg_widg[] = $strReturnMsg;
}
Expand Down
5 changes: 3 additions & 2 deletions nextgen-public-uploader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Plugin Name: NextGEN Public Uploader
Plugin URI: http://webdevstudios.com/plugin/nextgen-public-uploader/
Description: NextGEN Public Uploader is an extension to NextGEN Gallery which allows frontend image uploads for your users.
Version: 1.8
Version: 1.8.2
Author: WebDevStudios
Author URI: http://webdevstudios.com
Text Domain: nextgen-public-uploader
Expand Down Expand Up @@ -90,7 +90,8 @@ function npu_plugin_activation() {
include_once( dirname (__FILE__) . '/tinymce/tinymce.php' );

// Output NextGEN Public Uploader Link Love in footer
if ( !empty( get_option( 'npu_image_link_love' ) ) ) {
$linklove = get_option( 'npu_image_link_love' );
if ( !empty( $linklove ) ) {
add_action('wp_footer', 'npu_link_love');
}
function npu_link_love() {
Expand Down
12 changes: 10 additions & 2 deletions readme.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Contributors: WDS-Scott, williamsba1, rzen, webdevstudios, tw2113, JustinSainton
Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3084056
Tags: nextgen public uploader,nextgen uploader,nextgen gallery,nextgen,gallery,image,upload,photo,picture,visitor,public,uploader
Requires at least: 3.4
Tested up to: 3.7
Stable tag: 1.8
Tested up to: 3.8
Stable tag: 1.8.2

NextGEN Public Uploader is an extension to NextGEN Gallery which allows frontend image uploads for your users.

Expand Down Expand Up @@ -71,6 +71,14 @@ If you have installed NextGEN Gallery, please make sure that it is activated.

== Changelog ==

= V1.8.2 - 01.10.2014 =
* Running fine on PHP strict mode
* Fixed: method called as static an vice-versa improved
* Plugin works ok with NextCellent plugin

= V1.8.1 - 11.14.2013 =
* Fix old php version bug with empty()

= V1.8 - 11.14.2013 =
* Converted widget to proper widget class extension.
* Better translation support, including changed textdomain to match WP3.7 translation changes.
Expand Down