cl_nl: recodings for new pluginmanager

Dieser Commit ist enthalten in:
Oldperl 2018-12-10 17:31:49 +00:00
Ursprung 3490184008
Commit 3bf883e336
30 geänderte Dateien mit 304 neuen und 381 gelöschten Zeilen

Datei anzeigen

@ -0,0 +1,82 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<plugin>
<general active="1">
<plugin_name>ConLite Newsletter</plugin_name>
<plugin_foldername>cl_newsletter</plugin_foldername>
<uuid>45D7F1F3-41E9-57BC-8987-C0550B3B07B8</uuid>
<description>ConLite Newsletter System</description>
<author>ConLite Team</author>
<copyright>ConLite Team</copyright>
<mail>cl_newsletter@conlite.org</mail>
<website>https://conlite.org</website>
<version>1.0.0</version>
</general>
<requirements php="5.6">
<conlite minversion="2.1.0" />
</requirements>
<conlite>
<areas>
<area menuless="0">news</area>
<area parent="news" menuless="0">news_edit</area>
<area parent="news" menuless="0">news_edittpl</area>
<area parent="news" menuless="0">news_editcontent</area>
<area parent="news" menuless="0">news_jobs</area>
<area menuless="0">recipients</area>
<area parent="recipients" menuless="0">recipients_import</area>
<area menuless="0">recipientgroups</area>
</areas>
<actions>
<action area="news">news_save</action>
<action area="news">news_create</action>
<action area="news">news_delete</action>
<action area="news">news_duplicate</action>
<action area="news">news_add_job</action>
<action area="news">news_send_test</action>
<action area="news_jobs">news_job_delete</action>
<action area="news_jobs">news_job_details</action>
<action area="news_jobs">news_job_detail_delete</action>
<action area="news">news_html_settings</action>
<action area="news_jobs">news_job_run</action>
<action area="recipients">recipients_save</action>
<action area="recipients">recipients_create</action>
<action area="recipients">recipients_delete</action>
<action area="recipientgroups">recipientgroup_delete</action>
<action area="recipientgroups">recipientgroup_create</action>
<action area="recipientgroups">recipientgroup_recipient_delete</action>
<action area="recipientgroups">recipientgroup_save_group</action>
<action area="recipients">recipients_purge</action>
<action area="recipients_import">recipients_import</action>
<action area="recipients_import">recipients_import_exec</action>
</actions>
<frames>
<frame area="news" filetype="main" name="cl_newsletter/includes/include.newsletter_edit.php" frameId="4" />
<frame area="news" filetype="main" name="cl_newsletter/includes/include.newsletter_left_top.php" frameId="1" />
<frame area="news" filetype="main" name="cl_newsletter/includes/include.newsletter_menu.php" frameId="2" />
<frame area="news" filetype="main" name="cl_newsletter/includes/include.newsletter_subnav.php" frameId="3" />
<frame area="news" filetype="inc" name="functions.forms.php" frameId="4" />
<frame area="news_edit" filetype="main" name="cl_newsletter/includes/include.newsletter_edit_message.php" frameId="4" />
<frame area="recipients" filetype="main" name="cl_newsletter/includes/include.recipients_edit.php" frameId="4" />
<frame area="recipients" filetype="main" name="cl_newsletter/includes/include.recipients_menu.php" frameId="2" />
<frame area="recipients" filetype="main" name="cl_newsletter/includes/include.recipients_left_top.php" frameId="1" />
<frame area="recipients" filetype="inc" name="functions.forms.php" frameId="4" />
<frame area="recipients" filetype="main" name="include.subnav_blank.php" frameId="3" />
<frame area="recipientgroups" filetype="main" name="cl_newsletter/includes/include.recipients.group.subnav.php" frameId="3" />
<frame area="recipientgroups" filetype="main" name="cl_newsletter/includes/include.recipients.group_edit.php" frameId="4" />
<frame area="recipientgroups" filetype="main" name="cl_newsletter/includes/include.recipients.group_menu.php" frameId="2" />
<frame area="news_jobs" filetype="main" name="cl_newsletter/includes/include.newsletter_jobs_details.php" frameId="4" />
<frame area="news_jobs" filetype="main" name="cl_newsletter/includes/include.newsletter_jobs_menu.php" frameId="2" />
<frame area="news_jobs" filetype="main" name="cl_newsletter/includes/include.newsletter_jobs_subnav.php" frameId="3" />
<frame area="recipients_import" filetype="main" name="cl_newsletter/includes/include.recipients_import.php" frameId="4" />
</frames>
<nav_sub>
<nav area="news" level="0" navm="extra">newsletter/xml/;navigation/extra/newsletter</nav>
<nav area="recipients" level="1" navm="extra">newsletter/xml/;navigation/extra/recipients</nav>
<nav area="recipientgroups" level="1" navm="extra">newsletter/xml/;navigation/extra/recipientgroups</nav>
</nav_sub>
</conlite>
</plugin>

Datei anzeigen

@ -48,12 +48,6 @@ class RecipientGroupCollection extends ItemCollection {
$this->_setItemClass("RecipientGroup");
}
/** @deprecated [2011-03-15] Old constructor function for downwards compatibility */
public function RecipientGroupCollection() {
cWarning(__FILE__, __LINE__, "Deprecated method call, use __construct()");
$this->__construct();
}
/**
* Creates a new group
* @param $groupname string Specifies the groupname
@ -126,12 +120,6 @@ class RecipientGroup extends Item {
}
}
/** @deprecated [2011-03-15] Old constructor function for downwards compatibility */
public function RecipientGroup($mId = false) {
cWarning(__FILE__, __LINE__, "Deprecated method call, use __construct()");
$this->__construct($mId);
}
/**
* Overriden store() method to ensure, that there is only one default group
* */
@ -176,12 +164,6 @@ class RecipientGroupMemberCollection extends ItemCollection {
$this->_setItemClass("RecipientGroupMember");
}
/** @deprecated [2011-03-15] Old constructor function for downwards compatibility */
public function RecipientGroupMemberCollection() {
cWarning(__FILE__, __LINE__, "Deprecated method call, use __construct()");
$this->__construct();
}
/**
* Creates a new association
* @param $idrecipientgroup int specifies the newsletter group
@ -303,12 +285,4 @@ class RecipientGroupMember extends Item {
}
}
/** @deprecated [2011-03-15] Old constructor function for downwards compatibility */
public function RecipientGroupMember($mId = false) {
cWarning(__FILE__, __LINE__, "Deprecated method call, use __construct()");
$this->__construct($mId);
}
}
?>

Datei anzeigen

@ -48,12 +48,6 @@ class cNewsletterJobCollection extends ItemCollection {
$this->_setItemClass("cNewsletterJob");
}
/** @deprecated [2011-03-15] Old constructor function for downwards compatibility */
public function cNewsletterJobCollection() {
cWarning(__FILE__, __LINE__, "Deprecated method call, use __construct()");
$this->__construct();
}
/**
* Creates a newsletter job
* @param $name string Specifies the name of the newsletter, the same name may be used more than once
@ -252,12 +246,6 @@ class cNewsletterJob extends Item {
}
}
/** @deprecated [2011-03-15] Old constructor function for downwards compatibility */
public function cNewsletterJob($mId = false) {
cWarning(__FILE__, __LINE__, "Deprecated method call, use __construct()");
$this->__construct($mId);
}
public function runJob() {
global $cfg, $recipient;

Datei anzeigen

@ -48,12 +48,6 @@ class cNewsletterLogCollection extends ItemCollection {
$this->_setItemClass("cNewsletterLog");
}
/** @deprecated [2011-03-15] Old constructor function for downwards compatibility */
public function cNewsletterLogCollection() {
cWarning(__FILE__, __LINE__, "Deprecated method call, use __construct()");
$this->__construct();
}
/**
* Creates a single new log item
* @param $idnewsjob integer ID of corresponding newsletter send job
@ -246,12 +240,4 @@ class cNewsletterLog extends Item {
}
}
/** @deprecated [2011-03-15] Old constructor function for downwards compatibility */
public function cNewsletterLog($mId = false) {
cWarning(__FILE__, __LINE__, "Deprecated method call, use __construct()");
$this->__construct($mId);
}
}
?>

Datei anzeigen

@ -1,4 +1,5 @@
<?php
/**
* Project:
* Contenido Content Management System
@ -28,41 +29,30 @@
* }}
*
*/
if (!defined('CON_FRAMEWORK')) {
die('Illegal call');
}
/**
* Newsletter management class
*/
class NewsletterCollection extends ItemCollection
{
class NewsletterCollection extends ItemCollection {
/**
* Constructor Function
* @param none
*/
public function __construct()
{
public function __construct() {
global $cfg;
parent::__construct($cfg["tab"]["news"], "idnews");
$this->_setItemClass("Newsletter");
}
/** @deprecated [2011-03-15] Old constructor function for downwards compatibility */
public function NewsletterCollection()
{
cWarning(__FILE__, __LINE__, "Deprecated method call, use __construct()");
$this->__construct();
}
/**
* Creates a new newsletter
* @param $name string specifies the newsletter name
*/
public function create($sName)
{
public function create($sName) {
global $client, $lang, $auth;
$sName = Contenido_Security::escapeDB($sName, null);
@ -96,8 +86,7 @@ class NewsletterCollection extends ItemCollection
* Duplicates the newsletter specified by $itemID
* @param $itemID integer specifies the newsletter id
*/
public function duplicate($iItemID)
{
public function duplicate($iItemID) {
global $client, $lang, $auth;
$client = Contenido_Security::toInteger($client);
@ -160,13 +149,14 @@ class NewsletterCollection extends ItemCollection
return $oItem;
}
}
/**
* Single Newsletter Item
*/
class Newsletter extends Item
{
class Newsletter extends Item {
/**
* @var string Error storage
* @access private
@ -177,8 +167,7 @@ class Newsletter extends Item
* Constructor Function
* @param mixed $mId Specifies the ID of item to load
*/
public function __construct($mId = false)
{
public function __construct($mId = false) {
global $cfg;
parent::__construct($cfg["tab"]["news"], "idnews");
$this->_sError = "";
@ -187,19 +176,11 @@ class Newsletter extends Item
}
}
/** @deprecated [2011-03-15] Old constructor function for downwards compatibility */
public function Newsletter($mId = false)
{
cWarning(__FILE__, __LINE__, "Deprecated method call, use __construct()");
$this->__construct($mId);
}
/**
* Overriden store()-Method to set modified and modifiedby data and
* to ensure, that there is only one welcome newsletter
*/
public function store()
{
public function store() {
global $client, $lang, $auth;
$client = Contenido_Security::toInteger($client);
@ -236,8 +217,7 @@ class Newsletter extends Item
* @param string sData Data
* @access private
*/
public function _replaceTag(&$sCode, $bIsHTML, $sField, $sData)
{
public function _replaceTag(&$sCode, $bIsHTML, $sField, $sData) {
if ($sCode && !$bIsHTML) {
$sCode = str_replace("MAIL_" . strtoupper($sField), $sData, $sCode);
} else if ($sCode) {
@ -345,8 +325,8 @@ class Newsletter extends Item
}
/* TODO: HerrB: Remove or insert some functionality */
protected function _getNewsletterTagData($sHTML, $sTag)
{
protected function _getNewsletterTagData($sHTML, $sTag) {
//$sRegExp = "/<newsletter[^>](.*?)>.*?<\/newsletter>/i";
//$sRegExp = "/\[mail[^\]](.*?)>.*?\[\/mail\]/i";
#\[mail[^\]]((name="(?P<name>.*?)")|(type="(?P<type>.*?)"))\](?P<content>.*?)\[\/mail\]
@ -392,11 +372,9 @@ class Newsletter extends Item
#print_r ($aMatch);
}
protected function _deChunkHTTPBody($sHeader, $sBody, $sEOL = "\r\n")
{
protected function _deChunkHTTPBody($sHeader, $sBody, $sEOL = "\r\n") {
// Based on code from jbr at ya-right dot com, posted on http://www.php.net
// as user comment on fsockopen documentation (2007-05-01)
// Analyze header
$aParts = preg_split("/\r?\n/", $sHeader, -1, PREG_SPLIT_NO_EMPTY);
@ -443,7 +421,6 @@ class Newsletter extends Item
$sBody = substr($sBody, ($iPos + $iDataLen + $iEOLLen));
$sRemaining = trim($sBody);
} while (!empty($sRemaining));
} else if (isset($aHeader['content-encoding'])) {
$sBuffer = gzinflate(substr($sBody, 10));
@ -601,8 +578,7 @@ class Newsletter extends Item
* Checks, if html newsletter article still exists
* @return bool
*/
public function htmlArticleExists()
{
public function htmlArticleExists() {
if ($this->get("idart") > 0) {
$oArticles = new cApiArticleLanguageCollection();
$oArticles->setWhere("idlang", $this->get("idlang"));
@ -632,8 +608,7 @@ class Newsletter extends Item
* and simulate values from plugins
* @param string $sEncoding Message (and header) encoding, e.g. iso-8859-1
*/
public function sendEMail($iIDCatArt, $sEMail, $sName = "", $bSimulatePlugins = true, $sEncoding = "iso-8859-1")
{
public function sendEMail($iIDCatArt, $sEMail, $sName = "", $bSimulatePlugins = true, $sEncoding = "iso-8859-1") {
global $lang, $client, $cfg, $cfgClient, $contenido;
// Initialization
@ -791,8 +766,7 @@ class Newsletter extends Item
* @param array $aSendRcps As reference: Filled with a list of succesfull recipients
* @param string $sEncoding Message (and header) encoding, e.g. iso-8859-1
*/
public function sendDirect($iIDCatArt, $iIDNewsRcp = false, $iIDNewsGroup = false, &$aSendRcps, $sEncoding = "iso-8859-1")
{
public function sendDirect($iIDCatArt, $iIDNewsRcp = false, $iIDNewsGroup = false, &$aSendRcps, $sEncoding = "iso-8859-1") {
global $lang, $client, $cfg, $cfgClient, $contenido, $recipient;
// Initialization
@ -1013,14 +987,12 @@ class Newsletter extends Item
* @param $iChunk integer specifies current chunk number when sending in chunks
* result array array of recipient names/e-mails
*/
public function send($idcatart, $destination = "other", $to = "", $iChunkSize = 0, $iChunk = 0, $sEncoding = "iso-8859-1")
{
public function send($idcatart, $destination = "other", $to = "", $iChunkSize = 0, $iChunk = 0, $sEncoding = "iso-8859-1") {
// What should we do with this deprecated method?
$aResult = array();
$aResult[] = 0;
$aResult[] = "Newsletter->send() not supported anymore (class.newsletter.php)";
return $aResult;
}
}
?>
}

Datei anzeigen

@ -48,12 +48,6 @@ class RecipientCollection extends ItemCollection {
$this->_setItemClass("Recipient");
}
/** @deprecated [2011-03-15] Old constructor function for downwards compatibility */
public function RecipientCollection() {
cWarning(__FILE__, __LINE__, "Deprecated method call, use __construct()");
$this->__construct();
}
/**
* Creates a new recipient
* @param string $sEMail Specifies the e-mail adress
@ -223,26 +217,6 @@ class Recipient extends Item {
}
}
/** @deprecated [2011-03-15] Old constructor function for downwards compatibility */
public function Recipient($mId = false) {
cWarning(__FILE__, __LINE__, "Deprecated method call, use __construct()");
$this->__construct($mId);
}
/**
* Checks if the given md5 matches the md5(email) in the database
* @param $md5email string md5 of E-Mail to check
* @return boolean True if the hash matches, false otherwise
* @deprecated 4.6.15 - 10.08.2006
*/
public function checkMD5Email($md5email) {
if ($md5email == md5($this->get("email"))) {
return true;
} else {
return false;
}
}
public function store() {
global $auth;
@ -272,5 +246,3 @@ class Recipient extends Item {
}
}
?>

Datei anzeigen

@ -1,20 +1,5 @@
<?php
/**
* File:
* config.autoloader.php
*
* @package Plugins
* @subpackage Newsletter
* @version $Rev: 283 $
* @since 2.0
* @author Ortwin Pinke <o.pinke@conlite.org>
* @copyright 2012 CL-Team
* @link http://www.conlite.org
*
* $Id: config.autoloader.php 283 2014-01-09 14:48:38Z oldperl $
*/
$sAutoloadClassPath = 'conlite/plugins/newsletter/classes/';
$sAutoloadClassPath = strstr(dirname(dirname(__FILE__)), "conlite/plugins")."/classes/";
return array(
'RecipientGroupCollection' => $sAutoloadClassPath.'class.newsletter.groups.php',
'RecipientGroup' => $sAutoloadClassPath.'class.newsletter.groups.php',
@ -27,6 +12,6 @@ return array(
'NewsletterCollection' => $sAutoloadClassPath.'class.newsletter.php',
'Newsletter' => $sAutoloadClassPath.'class.newsletter.php',
'RecipientCollection' => $sAutoloadClassPath.'class.newsletter.recipients.php',
'Recipient' => $sAutoloadClassPath.'class.newsletter.recipients.php',
'Recipient' => $sAutoloadClassPath.'class.newsletter.recipients.php'
);
?>

Datei anzeigen

@ -17,4 +17,11 @@
// security check
defined('CON_FRAMEWORK') or die('Illegal call');
?>
class nlHandler extends pluginHandlerAbstract {
}
/*
plugin_include(nlHandler::getName(), "includes/functions/demo1.php");
plugin_include(nlHandler::getName(), "includes/functions/demo2.php");
*/

Datei anzeigen

@ -35,10 +35,10 @@ if (!defined('CON_FRAMEWORK')) {
// Initialization
$oPage = new cPage;
$oRcpGroups = new RecipientGroupCollection;
$oPage = new cPage();
$oRcpGroups = new RecipientGroupCollection();
$oClientLang = new cApiClientLanguage(false, $client, $lang);
$oNewsletters = new NewsletterCollection;
$oNewsletters = new NewsletterCollection();
// Include plugins
if (is_array($cfg['plugins']['newsletters'])) {

Datei anzeigen

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<language>
<navigation>
<extra>
<newsletter>Newsletter</newsletter>
<recipients>Empfänger</recipients>
<recipientgroups>Empfängergruppe</recipientgroups>
</extra>
</navigation>
</language>

Datei anzeigen

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<language>
<navigation>
<extra>
<newsletter>Newsletter</newsletter>
<recipients>Empfänger</recipients>
<recipientgroups>Empfängergruppe</recipientgroups>
</extra>
</navigation>
</language>

Datei anzeigen

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<language>
<navigation>
<extra>
<newsletter>Newsletter</newsletter>
<recipients>Empfänger</recipients>
<recipientgroups>Empfängergruppe</recipientgroups>
</extra>
</navigation>
</language>

Datei anzeigen

@ -1,73 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<plugin>
<general active="1">
<plugin_name>Newsletter</plugin_name>
<plugin_foldername>newsletter</plugin_foldername>
<uuid>88783B7D-9C64-A284-9A70-721F09BF7FE4</uuid>
<description>Newsletter System for CONTENIDO</description>
<author>Bjoern Behrens</author>
<copyright>four for business AG</copyright>
<mail>info@4fb.de</mail>
<website>http://www.4fb.de</website>
<version>0.1.0</version>
</general>
<requirements php="5.2.3">
<conlite minversion="2.0.0" />
</requirements>
<contenido>
<areas>
<area menuless="0">news</area>
<area parent="news" menuless="0">news_edit</area>
<area menuless="0">recipients</area>
<area menuless="0">recipientgroups</area>
<area parent="news" menuless="0">news_jobs</area>
<area parent="recipients" menuless="0">recipients_import</area>
</areas>
<actions>
<action area="news">news_save</action>
<action area="news">news_create</action>
<action area="news">news_delete</action>
<action area="news">news_duplicate</action>
<action area="news">news_add_job</action>
<action area="news">news_send_test</action>
<action area="news_jobs">news_job_delete</action>
<action area="news_jobs">news_job_details</action>
<action area="news_jobs">news_job_detail_delete</action>
<action area="news">news_html_settings</action>
<action area="news_jobs">news_job_run</action>
<action area="recipients">recipients_save</action>
<action area="recipients">recipients_create</action>
<action area="recipients">recipients_delete</action>
<action area="recipientgroups">recipientgroup_delete</action>
<action area="recipientgroups">recipientgroup_create</action>
<action area="recipientgroups">recipientgroup_recipient_delete</action>
<action area="recipientgroups">recipientgroup_save_group</action>
<action area="recipients">recipients_purge</action>
<action area="recipients_import">recipients_import</action>
<action area="recipients_import">recipients_import_exec</action>
</actions>
<frames>
<frame area="news" filetype="main" name="newsletter/includes/include.newsletter_left_top.php" frameId="1" />
<frame area="news" filetype="main" name="newsletter/includes/include.newsletter_menu.php" frameId="2" />
<frame area="news" filetype="main" name="newsletter/includes/include.newsletter_edit.php" frameId="4" />
<frame area="recipients" filetype="main" name="newsletter/includes/include.recipients_left_top.php" frameId="1" />
<frame area="recipients" filetype="main" name="newsletter/includes/include.recipients_menu.php" frameId="2" />
<frame area="recipients" filetype="main" name="include.subnav_blank.php" frameId="3" />
<frame area="recipients" filetype="main" name="newsletter/includes/include.recipients_edit.php" frameId="4" />
<frame area="news" filetype="main" name="newsletter/includes/include.newsletter_subnav.php" frameId="3" />
<frame area="recipientgroups" filetype="main" name="newsletter/includes/include.recipients.group_menu.php" frameId="2" />
<frame area="recipientgroups" filetype="main" name="newsletter/includes/include.recipients.group.subnav.php" frameId="3" />
<frame area="recipientgroups" filetype="main" name="newsletter/includes/include.recipients.group_edit.php" frameId="4" />
<frame area="news_jobs" filetype="main" name="newsletter/includes/include.newsletter_jobs_menu.php" frameId="2" />
<frame area="news_jobs" filetype="main" name="newsletter/includes/include.newsletter_jobs_details.php" frameId="4" />
<frame area="news_jobs" filetype="main" name="newsletter/includes/include.newsletter_jobs_subnav.php" frameId="3" />
<frame area="news_edit" filetype="main" name="newsletter/includes/include.newsletter_edit_message.php" frameId="4" />
<frame area="recipients_import" filetype="main" name="newsletter/includes/include.recipients_import.php" frameId="4" />
</frames>
<nav_sub>
<nav area="news" level="0" navm="3">newsletter/xml/;navigation/extra/newsletter</nav>
<nav area="recipients" level="1" navm="3">newsletter/xml/;navigation/extra/recipients</nav>
<nav area="recipientgroups" level="1" navm="3">newsletter/xml/;navigation/extra/recipientgroups</nav>
</nav_sub>
</contenido>
</plugin>