Changes to AgileBill
This commit is contained in:
@@ -1,189 +1,67 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* AgileBill - Open Billing Software
|
||||
*
|
||||
* This body of work is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the Open AgileBill License
|
||||
* License as published at http://www.agileco.com/agilebill/license1-4.txt
|
||||
*
|
||||
* For questions, help, comments, discussion, etc., please join the
|
||||
* Agileco community forums at http://forum.agileco.com/
|
||||
*
|
||||
* Originally authored by Tony Landis, AgileBill LLC
|
||||
*
|
||||
* Recent modifications by Deon George
|
||||
*
|
||||
* @author Deon George <deonATleenooksDOTnet>
|
||||
* @copyright 2009 Deon George
|
||||
* @link http://osb.leenooks.net
|
||||
*
|
||||
* @link http://www.agileco.com/
|
||||
* @copyright 2004-2008 Agileco, LLC.
|
||||
* @license http://www.agileco.com/agilebill/license1-4.txt
|
||||
* @author Tony Landis <tony@agileco.com>
|
||||
* @author Tony Landis <tony@agileco.com>
|
||||
* @package AgileBill
|
||||
* @version 1.4.93
|
||||
* @subpackage Module:EmailQueue
|
||||
*/
|
||||
|
||||
class email_queue
|
||||
{
|
||||
|
||||
# Open the constructor for this mod
|
||||
function email_queue()
|
||||
{
|
||||
# name of this module:
|
||||
$this->module = "email_queue";
|
||||
/**
|
||||
* The main AgileBill Email Queue Class
|
||||
*
|
||||
* @package AgileBill
|
||||
* @subpackage Module:EmailQueue
|
||||
*/
|
||||
class email_queue extends OSB_module {
|
||||
/**
|
||||
* Send mails in the queue
|
||||
*/
|
||||
public function send($VAR) {
|
||||
$db = &DB();
|
||||
$rs = $db->Execute(sqlSelect($db,'email_queue','*',array('status'=>0)));
|
||||
|
||||
# location of the construct XML file:
|
||||
$this->xml_construct = PATH_MODULES . "" . $this->module . "/" . $this->module . "_construct.xml";
|
||||
if ($rs && $rs->RecordCount()) {
|
||||
require_once(PATH_MODULES.'email_template/email_template.inc.php');
|
||||
|
||||
# open the construct file for parsing
|
||||
$C_xml = new CORE_xml;
|
||||
$construct = $C_xml->xml_to_array($this->xml_construct);
|
||||
while (! $rs->EOF) {
|
||||
# Get values
|
||||
$sql = array();
|
||||
$sql[1] = $rs->fields['sql1'];
|
||||
$sql[2] = $rs->fields['sql2'];
|
||||
$sql[3] = $rs->fields['sql3'];
|
||||
|
||||
$this->method = $construct["construct"]["method"];
|
||||
$this->trigger = $construct["construct"]["trigger"];
|
||||
$this->field = $construct["construct"]["field"];
|
||||
$this->table = $construct["construct"]["table"];
|
||||
$this->module = $construct["construct"]["module"];
|
||||
$this->cache = $construct["construct"]["cache"];
|
||||
$this->order_by = $construct["construct"]["order_by"];
|
||||
$this->limit = $construct["construct"]["limit"];
|
||||
}
|
||||
|
||||
##############################
|
||||
## SEND E-MAILS IN QUEUE ##
|
||||
##############################
|
||||
function send($VAR)
|
||||
{
|
||||
$VAR_ORIG = $VAR;
|
||||
|
||||
$db = &DB();
|
||||
$dbm = new CORE_database;
|
||||
$sql = $dbm->sql_select("email_queue", "*", "status = 0", "", $db);
|
||||
$rs = $db->Execute($sql);
|
||||
|
||||
if($rs != false && $rs->RecordCount() > 0)
|
||||
{
|
||||
require_once ( PATH_MODULES . 'email_template/email_template.inc.php' );
|
||||
while(!$rs->EOF)
|
||||
{
|
||||
# Get values
|
||||
global $VAR;
|
||||
$VAR = unserialize($rs->fields['var']);
|
||||
|
||||
$sql1 = $rs->fields['sql1'];
|
||||
$sql2 = $rs->fields['sql2'];
|
||||
$sql3 = $rs->fields['sql3'];
|
||||
|
||||
if(!empty($sql1)) {
|
||||
if(ereg("^a:", $sql1) && is_array(unserialize($sql1))) $sql1 = unserialize($sql1);
|
||||
} else {
|
||||
$sql1 = false;
|
||||
}
|
||||
|
||||
if(!empty($sql2)) {
|
||||
if(ereg("^a:", $sql2) && is_array(unserialize($sql2))) $sql2 = unserialize($sql2);
|
||||
} else {
|
||||
$sql2 = false;
|
||||
}
|
||||
|
||||
if(!empty($sql3)) {
|
||||
if(ereg("^a:", $sql3) && is_array(unserialize($sql3))) $sql3 = unserialize($sql3);
|
||||
} else {
|
||||
$sql3 = false;
|
||||
}
|
||||
# Unserialize the SQL data if required.
|
||||
foreach ($sql as $i)
|
||||
if (preg_match('/^a:/',$sql[$i]) && is_array($a = unserialize($sql[$a])))
|
||||
$sql[$i] = $a;
|
||||
|
||||
# Send email
|
||||
$mail = new email_template;
|
||||
$result = $mail->send($rs->fields['email_template'], $rs->fields['account_id'], $sql1, $sql2, $sql3, false);
|
||||
$result = $mail->send($rs->fields['email_template'],$rs->fields['account_id'],$sql[1],$sql[2],$sql[3],false);
|
||||
|
||||
# Update to sent status
|
||||
if($result)
|
||||
{
|
||||
$sql = "UPDATE ".AGILE_DB_PREFIX."email_queue SET
|
||||
status = 1
|
||||
WHERE
|
||||
id = {$rs->fields['id']}
|
||||
AND
|
||||
site_id = ".DEFAULT_SITE;
|
||||
$db->Execute($sql);
|
||||
}
|
||||
if ($result)
|
||||
$db->Execute(sqlUpdate($db,'email_queue',array('status'=>1),array('id'=>$rs->fields['id'])));
|
||||
|
||||
$rs->MoveNext();
|
||||
}
|
||||
}
|
||||
|
||||
$VAR = $VAR_ORIG;
|
||||
}
|
||||
|
||||
|
||||
##############################
|
||||
## ADD ##
|
||||
##############################
|
||||
function add($VAR)
|
||||
{
|
||||
$type = "add";
|
||||
$this->method["$type"] = explode(",", $this->method["$type"]);
|
||||
$db = new CORE_database;
|
||||
$db->add($VAR, $this, $type);
|
||||
}
|
||||
|
||||
##############################
|
||||
## VIEW ##
|
||||
##############################
|
||||
function view($VAR)
|
||||
{
|
||||
$type = "view";
|
||||
$this->method["$type"] = explode(",", $this->method["$type"]);
|
||||
$db = new CORE_database;
|
||||
$db->view($VAR, $this, $type);
|
||||
}
|
||||
|
||||
##############################
|
||||
## UPDATE ##
|
||||
##############################
|
||||
function update($VAR)
|
||||
{
|
||||
$type = "update";
|
||||
$this->method["$type"] = explode(",", $this->method["$type"]);
|
||||
$db = new CORE_database;
|
||||
$db->update($VAR, $this, $type);
|
||||
}
|
||||
|
||||
##############################
|
||||
## DELETE ##
|
||||
##############################
|
||||
function delete($VAR)
|
||||
{
|
||||
$db = new CORE_database;
|
||||
$db->mass_delete($VAR, $this, "");
|
||||
}
|
||||
|
||||
##############################
|
||||
## SEARCH FORM ##
|
||||
##############################
|
||||
function search_form($VAR)
|
||||
{
|
||||
$type = "search";
|
||||
$this->method["$type"] = explode(",", $this->method["$type"]);
|
||||
$db = new CORE_database;
|
||||
$db->search_form($VAR, $this, $type);
|
||||
}
|
||||
|
||||
##############################
|
||||
## SEARCH ##
|
||||
##############################
|
||||
function search($VAR)
|
||||
{
|
||||
$type = "search";
|
||||
$this->method["$type"] = explode(",", $this->method["$type"]);
|
||||
$db = new CORE_database;
|
||||
$db->search($VAR, $this, $type);
|
||||
}
|
||||
|
||||
##############################
|
||||
## SEARCH SHOW ##
|
||||
##############################
|
||||
|
||||
function search_show($VAR)
|
||||
{
|
||||
$type = "search";
|
||||
$this->method["$type"] = explode(",", $this->method["$type"]);
|
||||
$db = new CORE_database;
|
||||
$db->search_show($VAR, $this, $type);
|
||||
}
|
||||
}
|
||||
?>
|
||||
?>
|
||||
|
@@ -1,78 +1,126 @@
|
||||
<?xml version="1.0" encoding="ISO-8859-1" ?>
|
||||
<construct>
|
||||
<!-- Module name -->
|
||||
<module>email_queue</module>
|
||||
<!-- Module supporting database table -->
|
||||
<table>email_queue</table>
|
||||
<!-- Module dependancy(s) (module wont install if these modules are not yet installed) -->
|
||||
<dependancy></dependancy>
|
||||
<!-- DB cache in seconds -->
|
||||
<cache>0</cache>
|
||||
<!-- Default order_by field for SQL queries -->
|
||||
<order_by>id</order_by>
|
||||
<!-- Default SQL limit for SQL queries -->
|
||||
<limit>25</limit>
|
||||
<!-- Schema version (used to determine if the schema has change during upgrades) -->
|
||||
<version>0</version>
|
||||
|
||||
<!-- define the module name -->
|
||||
<module>email_queue</module>
|
||||
<!-- Database indexes -->
|
||||
<index>
|
||||
</index>
|
||||
|
||||
<!-- define the module table name -->
|
||||
<table>email_queue</table>
|
||||
<!-- Database fields -->
|
||||
<field>
|
||||
<!-- Record ID -->
|
||||
<id>
|
||||
<index>1</index>
|
||||
<type>I8</type>
|
||||
<unique>1</unique>
|
||||
</id>
|
||||
<!-- Site ID -->
|
||||
<site_id>
|
||||
<index>1</index>
|
||||
<type>I4</type>
|
||||
</site_id>
|
||||
<!-- Date record created -->
|
||||
<date_orig>
|
||||
<convert>date-now</convert>
|
||||
<display>Date Created</display>
|
||||
<type>I8</type>
|
||||
</date_orig>
|
||||
<!-- Date record updated -->
|
||||
<date_last>
|
||||
<convert>date-now</convert>
|
||||
<display>Date Updated</display>
|
||||
<type>I8</type>
|
||||
</date_last>
|
||||
<!-- Record active (BOOL)-->
|
||||
<status>
|
||||
<display>Processed</display>
|
||||
<type>L</type>
|
||||
</status>
|
||||
<account_id>
|
||||
<display>Account</display>
|
||||
<type>C(128)</type>
|
||||
</account_id>
|
||||
<email_template>
|
||||
<display>Email Template</display>
|
||||
<type>C(128)</type>
|
||||
</email_template>
|
||||
<sql1>
|
||||
<display>Data Field 1</display>
|
||||
<type>C(128)</type>
|
||||
</sql1>
|
||||
<sql2>
|
||||
<display>Data Field 2</display>
|
||||
<type>C(128)</type>
|
||||
</sql2>
|
||||
<sql3>
|
||||
<display>Data Field 3</display>
|
||||
<type>C(128)</type>
|
||||
</sql3>
|
||||
<sql4>
|
||||
<display>Data Field 4</display>
|
||||
<type>C(128)</type>
|
||||
</sql4>
|
||||
<sql5>
|
||||
<display>Data Field 5</display>
|
||||
<type>C(128)</type>
|
||||
</sql5>
|
||||
<var>
|
||||
<display>Data Variables</display>
|
||||
<type>X2</type>
|
||||
</var>
|
||||
</field>
|
||||
|
||||
<!-- define the module dependancy(s) -->
|
||||
<dependancy></dependancy>
|
||||
<!-- Methods for this class, and the fields they have access to, if applicable -->
|
||||
<method>
|
||||
<add>id,site_id,date_orig,date_last,status,account_id,email_template,sql1,sql2,sql3,sql4,sql5,var</add>
|
||||
<delete>id,site_id,date_orig,date_last,status,account_id,email_template,sql1,sql2,sql3,sql4,sql5,var</delete>
|
||||
<search>id,site_id,date_orig,date_last,status,account_id,email_template,sql1,sql2,sql3,sql4,sql5,var</search>
|
||||
<update>id,site_id,date_orig,date_last,status,account_id,email_template,sql1,sql2,sql3,sql4,sql5,var</update>
|
||||
<view>id,site_id,date_orig,date_last,status,account_id,email_template,sql1,sql2,sql3,sql4,sql5,var</view>
|
||||
</method>
|
||||
|
||||
<!-- define the DB cache in seconds -->
|
||||
<cache>0</cache>
|
||||
<!-- Method triggers -->
|
||||
<trigger></trigger>
|
||||
|
||||
<!-- define the default order_by field for SQL queries -->
|
||||
<order_by>id</order_by>
|
||||
<!-- Template page display titles -->
|
||||
<title>
|
||||
</title>
|
||||
|
||||
<!-- define the methods -->
|
||||
<limit>35</limit>
|
||||
|
||||
<!-- define the fields -->
|
||||
<field>
|
||||
<id>
|
||||
<type>I8</type>
|
||||
</id>
|
||||
<site_id>
|
||||
<type>I4</type>
|
||||
</site_id>
|
||||
<date_orig>
|
||||
<type>I8</type>
|
||||
<convert>time</convert>
|
||||
</date_orig>
|
||||
<date_last>
|
||||
<type>I8</type>
|
||||
<convert>date-now</convert>
|
||||
</date_last>
|
||||
<status>
|
||||
<type>L</type>
|
||||
</status>
|
||||
<account_id>
|
||||
<type>C(128)</type>
|
||||
</account_id>
|
||||
<email_template>
|
||||
<type>C(128)</type>
|
||||
</email_template>
|
||||
<sql1>
|
||||
<type>C(128)</type>
|
||||
</sql1>
|
||||
<sql2>
|
||||
<type>C(128)</type>
|
||||
</sql2>
|
||||
<sql3>
|
||||
<type>C(128)</type>
|
||||
</sql3>
|
||||
<sql4>
|
||||
<type>C(128)</type>
|
||||
</sql4>
|
||||
<sql5>
|
||||
<type>C(128)</type>
|
||||
</sql5>
|
||||
<var>
|
||||
<type>X2</type>
|
||||
</var>
|
||||
</field>
|
||||
|
||||
<!-- define all the methods for this class, and the fields they have access to, if applicable. -->
|
||||
<method>
|
||||
<add>id,site_id,date_orig,date_last,status,account_id,email_template,sql1,sql2,sql3,sql4,sql5,var</add>
|
||||
<update>id,site_id,date_orig,date_last,status,account_id,email_template,sql1,sql2,sql3,sql4,sql5,var</update>
|
||||
<delete>id,site_id,date_orig,date_last,status,account_id,email_template,sql1,sql2,sql3,sql4,sql5,var</delete>
|
||||
<view>id,site_id,date_orig,date_last,status,account_id,email_template,sql1,sql2,sql3,sql4,sql5,var</view>
|
||||
<search>id,site_id,date_orig,date_last,status,account_id,email_template,sql1,sql2,sql3,sql4,sql5,var</search>
|
||||
</method>
|
||||
|
||||
<!-- define the method triggers -->
|
||||
<trigger>0</trigger>
|
||||
</construct>
|
||||
<!-- Template helpers -->
|
||||
<tpl>
|
||||
<search_show>
|
||||
<checkbox>
|
||||
<field>id</field>
|
||||
<type>checkbox</type>
|
||||
<width>25px</width>
|
||||
</checkbox>
|
||||
<date_orig>
|
||||
<field>date_orig</field>
|
||||
<type>date</type>
|
||||
</date_orig>
|
||||
<account_id>
|
||||
<field>account_id</field>
|
||||
</account_id>
|
||||
<email_template>
|
||||
<field>email_template</field>
|
||||
</email_template>
|
||||
<status>
|
||||
<field>status</field>
|
||||
<type>bool</type>
|
||||
</status>
|
||||
</search_show>
|
||||
</tpl>
|
||||
</construct>
|
||||
|
@@ -1,22 +1,29 @@
|
||||
<?xml version="1.0" encoding="ISO-8859-1" ?>
|
||||
<install>
|
||||
<!-- Tree Menu Module Properties -->
|
||||
<module_properties>
|
||||
<!-- MODULE Dependancy, this module wont be installed if the dependant modules dont exist -->
|
||||
<dependancy></dependancy>
|
||||
<!-- Translated display to use on the tree -->
|
||||
<display></display>
|
||||
<!-- Display a module in the menu tree -->
|
||||
<menu_display>0</menu_display>
|
||||
<!-- MODULE Name -->
|
||||
<name>email_queue</name>
|
||||
<!-- MODULE Notes, these notes show up in the modules table, as a description of the module -->
|
||||
<notes><![CDATA[Stores the email queue for future mailing]]></notes>
|
||||
<!-- MODULE Parent, the parent node in the tree -->
|
||||
<parent>email_queue</parent>
|
||||
<!-- SUB Modules to install with this one -->
|
||||
<sub_modules></sub_modules>
|
||||
<!-- MODULE Type (core|base), core modules cannot be deleted, unrecognised types are ignored. -->
|
||||
<type>base</type>
|
||||
</module_properties>
|
||||
|
||||
<!-- Define the main module properties -->
|
||||
<module_properties>
|
||||
<name>email_queue</name>
|
||||
<parent>account_admin</parent>
|
||||
<notes>Stores the email queue for future mailing</notes>
|
||||
<menu_display></menu_display>
|
||||
<dependancy></dependancy>
|
||||
<sub_modules></sub_modules>
|
||||
</module_properties>
|
||||
|
||||
<!-- Define any SQL inserts for this module -->
|
||||
<sql_inserts>
|
||||
<module_method>
|
||||
<send>
|
||||
<send>add</send>
|
||||
</send>
|
||||
</module_method>
|
||||
</sql_inserts>
|
||||
</install>
|
||||
<!-- Tree Menu & Module Methods to load, they will be assigned the group permissions on install time, as selected by the user. -->
|
||||
<module_method>
|
||||
<send>
|
||||
<send>add</send>
|
||||
</send>
|
||||
</module_method>
|
||||
</install>
|
||||
|
Reference in New Issue
Block a user