Skip to content
Permalink
Browse files

v115

  • Loading branch information...
Jon Belelieu Jon Belelieu
Jon Belelieu authored and Jon Belelieu committed May 18, 2017
1 parent 860ad29 commit 17480ea561f4acd99bd523532d00303a0faf7127
Showing with 2,125 additions and 244 deletions.
  1. +22 −0 .htaccess
  2. +36 −0 admin/cp-classes/OptionsContract.class.php
  3. +1 −1 admin/cp-classes/admin.class.php
  4. +86 −8 admin/cp-classes/adminFields.class.php
  5. +1 −1 admin/cp-classes/cart.class.php
  6. +1 −1 admin/cp-classes/criteria.class.php
  7. +220 −0 admin/cp-classes/criteriaActions.class.php
  8. +1 −1 admin/cp-classes/db.class.php
  9. +1 −1 admin/cp-classes/delete.class.php
  10. +1 −1 admin/cp-classes/email.class.php
  11. +1 −1 admin/cp-classes/event.class.php
  12. +1 −1 admin/cp-classes/field.class.php
  13. +1 −1 admin/cp-classes/fielder.class.php
  14. +1 −1 admin/cp-classes/form.class.php
  15. +1 −1 admin/cp-classes/invoice.class.php
  16. +1 −1 admin/cp-classes/session.class.php
  17. +1 −1 admin/cp-classes/sms.class.php
  18. +1 −1 admin/cp-classes/table.class.php
  19. +1 −1 admin/cp-classes/universal.class.php
  20. +1 −1 admin/cp-classes/user.class.php
  21. +1 −1 admin/cp-classes/widget.class.php
  22. +56 −30 admin/cp-cron/campaigns.php
  23. +100 −46 admin/cp-cron/index.php
  24. +1 −1 admin/cp-cron/invoice_reminders.php
  25. +1 −1 admin/cp-functions/criteria-add.php
  26. +1 −0 admin/cp-functions/criteria_action_run.php
  27. +1 −1 admin/cp-functions/field-add.php
  28. +1 −1 admin/cp-functions/field-edit.php
  29. +40 −0 admin/cp-functions/field_rules/Capitalize.php
  30. +40 −0 admin/cp-functions/field_rules/DashesUnderscoresOnly.php
  31. +58 −0 admin/cp-functions/field_rules/FieldRules.php
  32. +42 −0 admin/cp-functions/field_rules/FieldRulesContract.php
  33. +40 −0 admin/cp-functions/field_rules/FormatDate.php
  34. +43 −0 admin/cp-functions/field_rules/FormatPhone.php
  35. +40 −0 admin/cp-functions/field_rules/Lowercase.php
  36. +40 −0 admin/cp-functions/field_rules/NoSymbols.php
  37. +40 −0 admin/cp-functions/field_rules/NumbersOnly.php
  38. +40 −0 admin/cp-functions/field_rules/Uppercase.php
  39. +1 −1 admin/cp-functions/fieldset-add.php
  40. +1 −1 admin/cp-functions/invoice-add.php
  41. +1 −1 admin/cp-functions/menu-add.php
  42. +39 −0 admin/cp-functions/options/additional_search_contacts.php
  43. +40 −0 admin/cp-functions/options/additional_search_members.php
  44. +1 −1 admin/cp-functions/package-add.php
  45. +1 −1 admin/cp-functions/product-add.php
  46. +1 −1 admin/cp-functions/search-ajax.php
  47. +1 −1 admin/cp-functions/template_email-add.php
  48. +1 −1 admin/cp-includes/contacts.php
  49. +1 −1 admin/cp-includes/footer.php
  50. +1 −1 admin/cp-includes/get_list.php
  51. +1 −1 admin/cp-includes/home.php
  52. +1 −1 admin/cp-includes/logins.php
  53. +1 −1 admin/cp-includes/members.php
  54. +58 −53 admin/cp-includes/menu.php
  55. +20 −0 admin/cp-includes/pages/invoice-view.php
  56. +1 −1 admin/cp-includes/pages/invoice.php
  57. +1 −1 admin/cp-includes/pages/member-view.php
  58. +1 −1 admin/cp-includes/pages/member.php
  59. +1 −1 admin/cp-includes/pages/subscription-view-history.php
  60. +1 −1 admin/cp-includes/popups/announcement-add.php
  61. +1 −1 admin/cp-includes/popups/build_criteria.php
  62. +31 −0 admin/cp-includes/popups/create_fields.php
  63. +1 −0 admin/cp-includes/popups/criteria_action.php
  64. +6 −0 admin/cp-includes/popups/criteria_actions/member/member_type_update/action.php
  65. +15 −0 admin/cp-includes/popups/criteria_actions/member/member_type_update/info.json
  66. +6 −0 admin/cp-includes/popups/criteria_actions/member/owner_update/action.php
  67. +15 −0 admin/cp-includes/popups/criteria_actions/member/owner_update/info.json
  68. +32 −0 admin/cp-includes/popups/criteria_actions/member/password_issue_new/action.php
  69. +12 −0 admin/cp-includes/popups/criteria_actions/member/password_issue_new/email_template.html
  70. +23 −0 admin/cp-includes/popups/criteria_actions/member/password_issue_new/info.json
  71. +7 −0 admin/cp-includes/popups/criteria_actions/member/password_reset_request/action.php
  72. +15 −0 admin/cp-includes/popups/criteria_actions/member/password_reset_request/info.json
  73. +8 −0 admin/cp-includes/popups/criteria_actions/member/source_update/action.php
  74. +15 −0 admin/cp-includes/popups/criteria_actions/member/source_update/info.json
  75. +41 −0 admin/cp-includes/popups/criteria_actions/member/subscription_create/action.php
  76. +33 −0 admin/cp-includes/popups/criteria_actions/member/subscription_create/info.json
  77. +6 −0 admin/cp-includes/popups/criteria_actions/member/unlock/action.php
  78. +6 −0 admin/cp-includes/popups/criteria_actions/member/unlock/info.json
  79. +6 −0 admin/cp-includes/popups/criteria_actions/member/update_status/action.php
  80. +39 −0 admin/cp-includes/popups/criteria_actions/member/update_status/info.json
  81. +1 −1 admin/cp-includes/popups/event-edit.php
  82. +1 −1 admin/cp-includes/popups/form_codes.php
  83. +1 −1 admin/cp-includes/popups/forms-edit.php
  84. +1 −1 admin/cp-includes/popups/invoice-add.php
  85. +1 −1 admin/cp-includes/popups/menu-add.php
  86. +1 −1 admin/cp-includes/popups/package.php
  87. +1 −1 admin/cp-includes/popups/subscription-add.php
  88. +1 −1 admin/cp-includes/reports.php
  89. +1 −1 admin/css/panel.css
  90. BIN admin/imgs/icon-new-window.png
  91. +12 −0 admin/js/admin.js
  92. +15 −1 admin/sd-system/loader.php
  93. +205 −0 custom/import.php
  94. +0 −3 custom/sub_up_down.php
  95. +0 −3 custom/test_contact_type_change.php
  96. +9 −2 custom/updates/updater.php
  97. +9 −3 event.php
  98. +31 −10 login.php
  99. +20 −2 pp-cart/gateways/authnet_cim.class.php
  100. +1 −0 pp-cart/gateways/stripe.class.php
  101. +20 −1 pp-cart/invoice.php
  102. +2 −4 pp-cart/invoice_pay.php
  103. +8 −1 pp-cart/invoice_print.php
  104. +2 −2 pp-functions/activation-code.php
  105. +3 −2 pp-functions/form_process.php
  106. +19 −2 pp-functions/login.php
  107. +5 −1 pp-functions/lost_password.php
  108. +60 −0 pp-functions/process_contact.php
  109. +2 −0 pp-templates/email/threefiveten/reset_password_directions.html
  110. +5 −1 pp-templates/html/zoid/css/primary.css
  111. +1 −2 pp-templates/html/zoid/en/cart_add_card.php
  112. +2 −0 pp-templates/html/zoid/en/event.php
  113. +19 −6 pp-templates/html/zoid/en/event_register_guests.php
  114. +1 −1 pp-templates/html/zoid/en/header.php
  115. +25 −3 pp-templates/html/zoid/en/homepage.php
  116. +17 −2 pp-templates/html/zoid/en/invoice_pay.php
  117. +69 −0 pp-templates/html/zoid/en/invoice_print_quote.php
  118. +88 −0 pp-templates/html/zoid/en/invoice_quote.php
  119. +1 −1 pp-templates/html/zoid/en/login.php
  120. +1 −1 pp-templates/html/zoid/en/reg_complete.php
  121. BIN pp-templates/html/zoid/imgs/icon-menu-black.png
  122. +1 −1 register.php
  123. +5 −3 setup/mysql/create.php
@@ -53,6 +53,28 @@ RewriteRule ^(.*)$ login.php [F,L]
# ---------------------------------------------------------
# Main rewrites

# Clean links for standard pages
RewriteRule ^cart/?$ cart.php [NC,QSA,L]
RewriteRule ^login/?$ login.php [NC,QSA,L]
RewriteRule ^logout/?$ logout.php [NC,QSA,L]
RewriteRule ^events/view/(.*)/(.*)/?$ event.php?id=$2 [NC,QSA,L]
RewriteRule ^events/(.*)/(.*)/?$ calendar.php?id=$2 [NC,QSA,L]
RewriteRule ^manage/billing?$ manage/billing_history.php [NC,QSA,L]
RewriteRule ^manage/credit_cards?$ manage/credit_cards.php [NC,QSA,L]
RewriteRule ^manage/events_attended?$ manage/events.php [NC,QSA,L]
RewriteRule ^manage/files?$ manage/uploads.php [NC,QSA,L]
RewriteRule ^manage/invoices?$ manage/invoices.php [NC,QSA,L]
RewriteRule ^manage/member_news?$ manage/announcements.php [NC,QSA,L]
RewriteRule ^manage/subscriptions?$ manage/subscriptions.php [NC,QSA,L]
RewriteRule ^manage/update?$ manage/update_account.php [NC,QSA,L]
RewriteRule ^news/(.*)/(.*)/?$ news.php?id=$2 [NC,QSA,L]
RewriteRule ^register/(.*)/(.*)/?$ register.php?id=$2&action=reset [NC,QSA,L]
RewriteRule ^register/?$ register.php?action=reset [NC,QSA,L]
RewriteRule ^shop/view/(.*)/(.*)/?$ catalog.php?id=$2 [NC,QSA,L]
RewriteRule ^shop/(.*)/(.*)/?$ catalog.php?category=$2 [NC,QSA,L]


# All Others
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^(.*)$ index.php?in=$1 [L,QSA]
@@ -0,0 +1,36 @@
<?php
/**
*
*
* Zenbership Membership Software
* Copyright (C) 2013-2016 Castlamp, LLC
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @author Castlamp
* @link http://www.castlamp.com/
* @link http://www.zenbership.com/
* @copyright (c) 2013-2016 Castlamp
* @license http://www.gnu.org/licenses/gpl-3.0.en.html
* @project Zenbership Membership Software
*/
interface OptionsContract {
public function processValue($key);
public function processGet($key);
}

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -32,10 +32,13 @@ class adminFields {
private $richtexts = 0;
private $label = '';
private $leftText = '';
private $filterType = '';
private $rightText = '';
private $description = '';
private $typeOverride = '';
private $selectOptions = array();
private $id;
private $min, $max, $maxlength;
private $placeholder;
@@ -58,6 +61,13 @@ public function setMax($max)
return $this;
}
public function setSelectOptions(array $options)
{
$this->selectOptions = $options;
return $this;
}
public function setAutocomplete($auto)
{
$this->autocomplete = $auto;
@@ -125,6 +135,22 @@ public function setSpecialType($type)
return $this;
}
public function setFilter($filter)
{
$this->filterType = $filter;
return $this;
}
public function setLabel($name)
{
$this->label = $name;
return $this;
}
public function setRightText($text)
{
$this->rightText = $text;
@@ -159,6 +185,10 @@ public function sendBack($string)
$send = '';
if (! empty($this->label)) {
$send .= '<label>' . $this->label . '</label>';
}
if ($this->fieldBox && ! empty($this->description)) {
$send .= '<div class="fieldBox">';
}
@@ -222,6 +252,10 @@ public function sendBack($string)
*/
public function wrap($field, $displayName = '', $description = '')
{
if (! empty($this->label)) {
$displayName = $this->label;
}
$return = '<div class="field">
<label class="top">' . $displayName . '</label>
<div class="field_entry_top">' . $field . '</div>';
@@ -274,6 +308,10 @@ public function select($fieldName, $val = '', $options = array(), $style = '')
{
$id = $this->getId();
if (! empty($this->selectOptions)) {
$options = $this->selectOptions;
}
$return = '<select id="' . $id . '" name="' . $fieldName . '"';
if (! empty($style)) {
$return .= ' style="' . $style . '"';
@@ -628,7 +666,7 @@ public function formList($fieldName, $val = '', $class = '')
$this->rightText = "<a href=\"null.php\" onclick=\"return get_list('forms','" . $id . "_id','" . $id . "');\"><img
src=\"imgs/icon-list.png\" alt=\"Select from list\" title=\"Select from list\" /></a>";
return $this->sendBack("<input placeholder=\"Begin typing the form's name or click the list icon to the right...\" type=\"text\" value=\"" . $name . "\" name=\"product_dud\" id=\"" . $id . "\"
return $this->sendBack("<input placeholder=\"Begin typing the form's name or click the list icon to the right...\" type=\"text\" value=\"" . $name . "\" name=\"form_dud\" id=\"" . $id . "\"
autocomplete=\"off\" onkeyup=\"return autocom(this.id,'id','name','ppSD_forms','name','forms');\"
style=\"\" class=\"" . $class . "\" /><input type=\"hidden\" name=\"$fieldName\" id=\"" . $id . "_id\"
value=\"" . $val . "\" />");
@@ -656,7 +694,7 @@ public function contentList($fieldName, $val = '', $class = '')
$this->rightText = "<a href=\"null.php\" onclick=\"return get_list('content','" . $id . "_id','" . $id . "');\"><img
src=\"imgs/icon-list.png\" alt=\"Select from list\" title=\"Select from list\" /></a>";
return $this->sendBack("<input placeholder=\"Begin typing the content's name or click the list icon to the right...\" type=\"text\" value=\"" . $name . "\" name=\"product_dud\" id=\"" . $id . "\"
return $this->sendBack("<input placeholder=\"Begin typing the content's name or click the list icon to the right...\" type=\"text\" value=\"" . $name . "\" name=\"content_dud\" id=\"" . $id . "\"
autocomplete=\"off\" onkeyup=\"return autocom(this.id,'id','name','ppSD_content','name','content');\"
style=\"\" class=\"" . $class . "\" /><input type=\"hidden\" name=\"$fieldName\" id=\"" . $id . "_id\"
value=\"" . $val . "\" />");
@@ -685,7 +723,7 @@ public function memberTypeList($fieldName, $val = '', $class = '')
$this->rightText = "<a href=\"null.php\" onclick=\"return get_list('member_types','" . $id . "_id','" . $id . "');\"><img
src=\"imgs/icon-list.png\" class=\"icon\" width=16 height=16 alt=\"Select from list\" title=\"Select from list\" /></a>";
return $this->sendBack("<input placeholder=\"Begin typing a member type or click the list icon to the right...\" type=\"text\" value=\"" . $name . "\" name=\"product_dud\" id=\"" . $id . "\"
return $this->sendBack("<input placeholder=\"Begin typing a member type or click the list icon to the right...\" type=\"text\" value=\"" . $name . "\" name=\"member_type_dud\" id=\"" . $id . "\"
autocomplete=\"off\" onkeyup=\"return autocom(this.id,'id','name','ppSD_member_types','name','member_types');\"
style=\"\" class=\"" . $class . "\" /><input type=\"hidden\" name=\"$fieldName\" id=\"" . $id . "_id\"
value=\"" . $val . "\" />");
@@ -714,12 +752,39 @@ public function staffList($fieldName, $val = '', $class = '')
$this->rightText = "<a href=\"null.php\" onclick=\"return get_list('staff','" . $id . "_id','" . $id . "');\"><img
src=\"imgs/icon-list.png\" alt=\"Select from list\" title=\"Select from list\" /></a>";
return $this->sendBack("<input placeholder=\"Begin typing an employee's name or click the list icon to the right...\" type=\"text\" value=\"" . $name . "\" name=\"product_dud\" id=\"" . $id . "\"
return $this->sendBack("<input placeholder=\"Begin typing an employee's name or click the list icon to the right...\" type=\"text\" value=\"" . $name . "\" name=\"staff_dud\" id=\"" . $id . "\"
autocomplete=\"off\" onkeyup=\"return autocom(this.id,'id','username','ppSD_staff','username,first_name,last_name','staff');\"
style=\"\" class=\"" . $class . "\" /><input type=\"hidden\" name=\"$fieldName\" id=\"" . $id . "_id\"
value=\"" . $val . "\" />");
}
/**
* @param $fieldName
* @param string $val
* @param string $class
*
* @return string
*/
public function fieldList($fieldName, $val = '', $class = '')
{
$id = $this->getId();
if (! empty($val)) {
$field = new field;
$get = $field->get_field_name($val);
} else {
$name = '';
}
$this->rightText = "<a href=\"null.php\" onclick=\"return get_list('fields','" . $id . "_id','" . $id . "');\"><img
src=\"imgs/icon-list.png\" alt=\"Select from list\" title=\"Select from list\" /></a>";
return $this->sendBack("<input placeholder=\"Begin typing a field name or click the list icon to the right...\" type=\"text\" value=\"" . $name . "\" name=\"staff_dud\" id=\"" . $id . "\"
autocomplete=\"off\" onkeyup=\"return autocom(this.id,'id','display_name','ppSD_fields','display_name','fields');\"
style=\"\" class=\"" . $class . "\" /><input type=\"hidden\" name=\"$fieldName\" id=\"" . $id . "_id\"
value=\"" . $val . "\" />");
}
public function sourceList($fieldName, $val = '', $class = '', $addButton = true)
@@ -742,17 +807,29 @@ public function sourceList($fieldName, $val = '', $class = '', $addButton = true
<img src=\"imgs/icon-quickadd.png\" alt=\"Add\" title=\"Add\" /></a>";
}
return $this->sendBack("<input placeholder=\"Begin typing a source or click the list icon to the right...\" type=\"text\" value=\"" . $name . "\" name=\"product_dud\" id=\"" . $id . "\"
return $this->sendBack("<input placeholder=\"Begin typing a source or click the list icon to the right...\" type=\"text\" value=\"" . $name . "\" name=\"source_dud\" id=\"" . $id . "\"
autocomplete=\"off\" onkeyup=\"return autocom(this.id,'id','source','ppSD_sources','source','sources');\"
style=\"\" class=\"" . $class . "\" /><input type=\"hidden\" name=\"$fieldName\" id=\"" . $id . "_id\"
value=\"" . $val . "\" />");
}
/**
* @param $fieldName
* @param string $val
* @param string $class
* @param string $filter
*
* @return string
*/
public function productList($fieldName, $val = '', $class = '', $filter = '')
{
$id = $this->getId();
if (! empty($this->filterType)) {
$filter = $this->filterType;
}
if (! empty($val)) {
$product = new product;
$name = $product->get_name($val);
@@ -781,6 +858,7 @@ public function productList($fieldName, $val = '', $class = '', $filter = '')
public function couponList($fieldName, $val = '', $class = '')
{
$id = $this->getId();
@@ -814,7 +892,7 @@ public function accountList($fieldName, $val = '', $class = '')
src=\"imgs/icon-list.png\" alt=\"Select from list\" title=\"Select from list\" /></a><a href=\"null.php\" onclick=\"return popup('account-add','');\">
<img src=\"imgs/icon-quickadd.png\" alt=\"Add\" title=\"Add\" /></a>";
return $this->sendBack("<input placeholder=\"Begin typing the account's name or click the list icon to the right...\" type=\"text\" value=\"" . $name . "\" name=\"product_dud\" id=\"" . $id . "\"
return $this->sendBack("<input placeholder=\"Begin typing the account's name or click the list icon to the right...\" type=\"text\" value=\"" . $name . "\" name=\"account_dud\" id=\"" . $id . "\"
autocomplete=\"off\" onkeyup=\"return autocom(this.id,'id','name','ppSD_accounts','name','accounts');\"
style=\"\" class=\"" . $class . "\" /><input type=\"hidden\" name=\"$fieldName\" id=\"" . $id . "_id\"
value=\"" . $val . "\" />");
@@ -841,7 +919,7 @@ public function labelList($fieldName, $val = '', $class = '')
$this->rightText = "<a href=\"null.php\" onclick=\"return get_list('labels','" . $id . "_id','" . $id . "');\"><img
src=\"imgs/icon-list.png\" alt=\"Select from list\" title=\"Select from list\" /></a>";
return $this->sendBack("<input placeholder=\"Begin typing the label or click the list icon to the right...\" type=\"text\" value=\"" . $name . "\" name=\"product_dud\" id=\"" . $id . "\"
return $this->sendBack("<input placeholder=\"Begin typing the label or click the list icon to the right...\" type=\"text\" value=\"" . $name . "\" name=\"upload_dud\" id=\"" . $id . "\"
autocomplete=\"off\" onkeyup=\"return autocom(this.id,'label','label','ppSD_uploads','label','uploads');\"
style=\"\" class=\"" . $class . "\" /><input type=\"hidden\" name=\"$fieldName\" id=\"" . $id . "_id\"
value=\"" . $val . "\" />");
@@ -867,7 +945,7 @@ public function transactionList($fieldName, $val = '', $class = '')
// $this->rightText = "<a href=\"null.php\" onclick=\"return get_list('labels','" . $id . "_id','" . $id . "');\"><img src=\"imgs/icon-list.png\" alt=\"Select from list\" title=\"Select from list\" /></a>";
return $this->sendBack("<input placeholder=\"Begin typing a transaction ID to select...\" type=\"text\" value=\"" . $name . "\" name=\"product_dud\" id=\"" . $id . "\"
return $this->sendBack("<input placeholder=\"Begin typing a transaction ID to select...\" type=\"text\" value=\"" . $name . "\" name=\"order_dud\" id=\"" . $id . "\"
autocomplete=\"off\" onkeyup=\"return autocom(this.id,'id','id','ppSD_cart_sessions','id','transactions');\"
style=\"\" class=\"" . $class . "\" /><input type=\"hidden\" name=\"$fieldName\" id=\"" . $id . "_id\"
value=\"" . $val . "\" />");

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 17480ea

Please sign in to comment.
You can’t perform that action at this time.