Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

fixed issue with namespace AND fixed issue #649

Browse Source
This commit is contained in:
Jonathan Labreuille
2016-10-06 12:53:18 +02:00
parent b9745b555a
commit 4402f826c3
22 changed files with 44 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/API/API.php
View File

@ -1,10 +1,8 @@
<?php <?php
if(!defined('ABSPATH')) exit;
namespace MailPoet\API; namespace MailPoet\API;
use \MailPoet\Util\Security; use \MailPoet\Util\Security;
if(!defined('ABSPATH')) exit;
class API { class API {
function init() { function init() {

4
lib/API/Error.php
View File

@ -1,8 +1,8 @@
<?php <?php
if(!defined('ABSPATH')) exit;
namespace MailPoet\API; namespace MailPoet\API;
if(!defined('ABSPATH')) exit;
final class Error { final class Error {
const UNKNOWN = 'unknown'; const UNKNOWN = 'unknown';
const BAD_REQUEST = 'bad_request'; const BAD_REQUEST = 'bad_request';

4
lib/Cron/Daemon.php
View File

@ -1,11 +1,9 @@
<?php <?php
if(!defined('ABSPATH')) exit;
namespace MailPoet\Cron; namespace MailPoet\Cron;
use MailPoet\Cron\Workers\Scheduler as SchedulerWorker; use MailPoet\Cron\Workers\Scheduler as SchedulerWorker;
use MailPoet\Cron\Workers\SendingQueue\SendingQueue as SendingQueueWorker; use MailPoet\Cron\Workers\SendingQueue\SendingQueue as SendingQueueWorker;
if(!defined('ABSPATH')) exit;
require_once(ABSPATH . 'wp-includes/pluggable.php'); require_once(ABSPATH . 'wp-includes/pluggable.php');
class Daemon { class Daemon {

4
lib/Cron/Workers/Scheduler.php
View File

@ -1,6 +1,4 @@
<?php <?php
if(!defined('ABSPATH')) exit;
namespace MailPoet\Cron\Workers; namespace MailPoet\Cron\Workers;
use Carbon\Carbon; use Carbon\Carbon;
@ -12,9 +10,9 @@ use MailPoet\Models\SubscriberSegment;
use MailPoet\Util\Helpers; use MailPoet\Util\Helpers;
use MailPoet\Newsletter\Scheduler\Scheduler as NewsletterScheduler; use MailPoet\Newsletter\Scheduler\Scheduler as NewsletterScheduler;
if(!defined('ABSPATH')) exit;
require_once(ABSPATH . 'wp-includes/pluggable.php'); require_once(ABSPATH . 'wp-includes/pluggable.php');
class Scheduler { class Scheduler {
public $timer; public $timer;
const UNCONFIRMED_SUBSCRIBER_RESCHEDULE_TIMEOUT = 5; const UNCONFIRMED_SUBSCRIBER_RESCHEDULE_TIMEOUT = 5;

4
lib/Form/Block/Checkbox.php
View File

@ -1,8 +1,8 @@
<?php <?php
if(!defined('ABSPATH')) exit;
namespace MailPoet\Form\Block; namespace MailPoet\Form\Block;
if(!defined('ABSPATH')) exit;
class Checkbox extends Base { class Checkbox extends Base {
static function render($block) { static function render($block) {

4
lib/Form/Block/Date.php
View File

@ -1,8 +1,8 @@
<?php <?php
if(!defined('ABSPATH')) exit;
namespace MailPoet\Form\Block; namespace MailPoet\Form\Block;
if(!defined('ABSPATH')) exit;
use Carbon\Carbon; use Carbon\Carbon;
class Date extends Base { class Date extends Base {

4
lib/Form/Block/Radio.php
View File

@ -1,8 +1,8 @@
<?php <?php
if(!defined('ABSPATH')) exit;
namespace MailPoet\Form\Block; namespace MailPoet\Form\Block;
if(!defined('ABSPATH')) exit;
class Radio extends Base { class Radio extends Base {
static function render($block) { static function render($block) {

4
lib/Form/Block/Segment.php
View File

@ -1,8 +1,8 @@
<?php <?php
if(!defined('ABSPATH')) exit;
namespace MailPoet\Form\Block; namespace MailPoet\Form\Block;
if(!defined('ABSPATH')) exit;
class Segment extends Base { class Segment extends Base {
static function render($block) { static function render($block) {

4
lib/Form/Block/Select.php
View File

@ -1,8 +1,8 @@
<?php <?php
if(!defined('ABSPATH')) exit;
namespace MailPoet\Form\Block; namespace MailPoet\Form\Block;
if(!defined('ABSPATH')) exit;
class Select extends Base { class Select extends Base {
static function render($block) { static function render($block) {

4
lib/Form/Block/Submit.php
View File

@ -1,8 +1,8 @@
<?php <?php
if(!defined('ABSPATH')) exit;
namespace MailPoet\Form\Block; namespace MailPoet\Form\Block;
if(!defined('ABSPATH')) exit;
class Submit extends Base { class Submit extends Base {
static function render($block) { static function render($block) {

4
lib/Form/Block/Text.php
View File

@ -1,8 +1,8 @@
<?php <?php
if(!defined('ABSPATH')) exit;
namespace MailPoet\Form\Block; namespace MailPoet\Form\Block;
if(!defined('ABSPATH')) exit;
class Text extends Base { class Text extends Base {
static function render($block) { static function render($block) {

4
lib/Form/Block/Textarea.php
View File

@ -1,8 +1,8 @@
<?php <?php
if(!defined('ABSPATH')) exit;
namespace MailPoet\Form\Block; namespace MailPoet\Form\Block;
if(!defined('ABSPATH')) exit;
class Textarea extends Base { class Textarea extends Base {
static function render($block) { static function render($block) {
$html = ''; $html = '';

7
lib/Mailer/Mailer.php
View File

@ -1,11 +1,10 @@
<?php <?php
if(!defined('ABSPATH')) exit;
require_once(ABSPATH . 'wp-includes/pluggable.php');
namespace MailPoet\Mailer; namespace MailPoet\Mailer;
use MailPoet\Models\Setting; use MailPoet\Models\Setting;
if(!defined('ABSPATH')) exit;
require_once(ABSPATH . 'wp-includes/pluggable.php');
class Mailer { class Mailer {
public $mailer_config; public $mailer_config;
public $sender; public $sender;

2
lib/Models/Subscriber.php
View File

@ -150,7 +150,7 @@ class Subscriber extends Model {
} }
static function verifyToken($email, $token) { static function verifyToken($email, $token) {
return (self::generateToken($email) === $token); return hash_equals(self::generateToken($email), $token);
} }
static function subscribe($subscriber_data = array(), $segment_ids = array()) { static function subscribe($subscriber_data = array(), $segment_ids = array()) {

7
lib/Newsletter/Shortcodes/Categories/Newsletter.php
View File

@ -1,12 +1,11 @@
<?php <?php
if(!defined('ABSPATH')) exit;
require_once( ABSPATH . "wp-includes/pluggable.php" );
namespace MailPoet\Newsletter\Shortcodes\Categories; namespace MailPoet\Newsletter\Shortcodes\Categories;
use MailPoet\Models\SendingQueue; use MailPoet\Models\SendingQueue;
use MailPoet\Newsletter\Shortcodes\ShortcodesHelper; use MailPoet\Newsletter\Shortcodes\ShortcodesHelper;
if(!defined('ABSPATH')) exit;
require_once( ABSPATH . "wp-includes/pluggable.php" );
class Newsletter { class Newsletter {
static function process($action, static function process($action,
$default_value = false, $default_value = false,

7
lib/Newsletter/Shortcodes/Categories/Subscriber.php
View File

@ -1,12 +1,11 @@
<?php <?php
if(!defined('ABSPATH')) exit;
require_once(ABSPATH . 'wp-includes/pluggable.php');
namespace MailPoet\Newsletter\Shortcodes\Categories; namespace MailPoet\Newsletter\Shortcodes\Categories;
use MailPoet\Models\Subscriber as SubscriberModel; use MailPoet\Models\Subscriber as SubscriberModel;
use MailPoet\Models\SubscriberCustomField; use MailPoet\Models\SubscriberCustomField;
if(!defined('ABSPATH')) exit;
require_once(ABSPATH . 'wp-includes/pluggable.php');
class Subscriber { class Subscriber {
static function process( static function process(
$action, $action,

4
lib/Twig/Assets.php
View File

@ -1,8 +1,8 @@
<?php <?php
if(!defined('ABSPATH')) exit;
namespace MailPoet\Twig; namespace MailPoet\Twig;
if(!defined('ABSPATH')) exit;
class Assets class Assets
extends \Twig_Extension extends \Twig_Extension
implements \Twig_Extension_GlobalsInterface implements \Twig_Extension_GlobalsInterface

4
lib/Twig/Functions.php
View File

@ -1,8 +1,8 @@
<?php <?php
if(!defined('ABSPATH')) exit;
namespace MailPoet\Twig; namespace MailPoet\Twig;
if(!defined('ABSPATH')) exit;
class Functions extends \Twig_Extension { class Functions extends \Twig_Extension {
function getName() { function getName() {

4
lib/Twig/Handlebars.php
View File

@ -1,8 +1,8 @@
<?php <?php
if(!defined('ABSPATH')) exit;
namespace MailPoet\Twig; namespace MailPoet\Twig;
if(!defined('ABSPATH')) exit;
class Handlebars extends \Twig_Extension { class Handlebars extends \Twig_Extension {
public function getName() { public function getName() {

4
lib/Twig/I18n.php
View File

@ -1,8 +1,8 @@
<?php <?php
if(!defined('ABSPATH')) exit;
namespace MailPoet\Twig; namespace MailPoet\Twig;
if(!defined('ABSPATH')) exit;
class I18n extends \Twig_Extension { class I18n extends \Twig_Extension {
private $_text_domain; private $_text_domain;

7
lib/Util/Security.php
View File

@ -1,10 +1,9 @@
<?php <?php
if(!defined('ABSPATH')) exit;
require_once(ABSPATH . 'wp-includes/pluggable.php');
namespace MailPoet\Util; namespace MailPoet\Util;
if(!defined('ABSPATH')) exit;
require_once(ABSPATH . 'wp-includes/pluggable.php');
class Security { class Security {
static function generateToken() { static function generateToken() {
return wp_create_nonce('mailpoet_token'); return wp_create_nonce('mailpoet_token');

4
lib/Util/Sudzy/ValidModel.php
View File

@ -1,8 +1,8 @@
<?php <?php
if(!defined('ABSPATH')) exit;
namespace Sudzy; namespace Sudzy;
if(!defined('ABSPATH')) exit;
abstract class ValidModel extends \Model { abstract class ValidModel extends \Model {
protected $_validator = null; // Reference to Sudzy validator object protected $_validator = null; // Reference to Sudzy validator object
protected $_validations = array(); // Array of validations protected $_validations = array(); // Array of validations