Skip to content
Permalink
Browse files

v112 - news feed and bug fixes

  • Loading branch information...
Jon Belelieu Jon Belelieu
Jon Belelieu authored and Jon Belelieu committed Apr 20, 2017
1 parent 2187e3a commit e57a3143fee7deb31cf25a363aed64ea5952cf3f
Showing with 1,569 additions and 347 deletions.
  1. +82 −2 admin/cp-classes/adminFields.class.php
  2. +1 −1 admin/cp-classes/cart.class.php
  3. +1 −1 admin/cp-classes/db.class.php
  4. +1 −1 admin/cp-classes/event.class.php
  5. +1 −1 admin/cp-classes/field.class.php
  6. +1 −1 admin/cp-classes/form.class.php
  7. +65 −0 admin/cp-classes/formv2.class.php
  8. +526 −0 admin/cp-classes/news.class.php
  9. +1 −1 admin/cp-classes/qqFileUploader.class.php
  10. +1 −1 admin/cp-classes/sms.class.php
  11. +1 −1 admin/cp-classes/table.class.php
  12. +25 −7 admin/cp-classes/template.class.php
  13. +1 −1 admin/cp-classes/universal.class.php
  14. +1 −1 admin/cp-classes/user.class.php
  15. +1 −1 admin/cp-classes/verify_data.class.php
  16. +1 −1 admin/cp-functions/announcement-add.php
  17. +1 −1 admin/cp-functions/field-add.php
  18. +1 −0 admin/cp-functions/news_regions-add.php
  19. +1 −0 admin/cp-functions/post_media.php
  20. +1 −1 admin/cp-functions/template_email-add.php
  21. +1 −1 admin/cp-functions/upload.php
  22. +1 −1 admin/cp-includes/announcements.php
  23. +3 −2 admin/cp-includes/menu.php
  24. +1 −0 admin/cp-includes/news_regions.php
  25. +1 −1 admin/cp-includes/pages/contact-view.php
  26. +1 −1 admin/cp-includes/popups/announcement-add.php
  27. +1 −1 admin/cp-includes/popups/fieldset-add.php
  28. +1 −1 admin/cp-includes/popups/forms-add.php
  29. +1 −1 admin/cp-includes/popups/forms-edit.php
  30. +1 −0 admin/cp-includes/popups/news_regions.php
  31. +1 −1 admin/cp-includes/popups/pipeline.php
  32. +1 −1 admin/cp-includes/templates_email.php
  33. +1 −1 admin/cp-includes/templates_html.php
  34. +1 −1 admin/css/panel.css
  35. +1 −1 admin/css/reset.css
  36. +16 −1 admin/login.php
  37. +58 −0 admin/unlock.php
  38. +12 −0 catalog.php
  39. +2 −0 event.php
  40. +52 −0 news.php
  41. +23 −12 pp-js/form_functions.js
  42. +56 −2 pp-templates/html/zoid/css/media.css
  43. +201 −40 pp-templates/html/zoid/css/primary.css
  44. +13 −13 pp-templates/html/zoid/en/cart_billing.php
  45. +1 −1 pp-templates/html/zoid/en/cart_billing_preview.php
  46. +2 −2 pp-templates/html/zoid/en/cart_overview.php
  47. +1 −17 pp-templates/html/zoid/en/cart_product_entry.php
  48. +1 −1 pp-templates/html/zoid/en/catalog.php
  49. +1 −1 pp-templates/html/zoid/en/catalog_view_product.php
  50. +81 −70 pp-templates/html/zoid/en/event.php
  51. +1 −1 pp-templates/html/zoid/en/event_product_entry.php
  52. +10 −18 pp-templates/html/zoid/en/event_register.php
  53. +1 −1 pp-templates/html/zoid/en/event_register_confirm.php
  54. +1 −1 pp-templates/html/zoid/en/event_register_guests.php
  55. +1 −1 pp-templates/html/zoid/en/event_register_guests_info.php
  56. +3 −3 pp-templates/html/zoid/en/event_register_pricing.php
  57. +4 −5 pp-templates/html/zoid/en/header.php
  58. +8 −8 pp-templates/html/zoid/en/homepage.php
  59. +3 −3 pp-templates/html/zoid/en/login.php
  60. +2 −2 pp-templates/html/zoid/en/manage_update_account.php
  61. +18 −0 pp-templates/html/zoid/en/news.php
  62. +5 −0 pp-templates/html/zoid/en/news_entry_none.php
  63. +9 −0 pp-templates/html/zoid/en/news_entry_post.php
  64. +9 −0 pp-templates/html/zoid/en/news_entry_video.php
  65. +29 −0 pp-templates/html/zoid/en/news_post.php
  66. +27 −0 pp-templates/html/zoid/en/news_video.php
  67. +1 −1 pp-templates/html/zoid/en/reg_select_product.php
  68. +9 −14 pp-templates/html/zoid/en/register.php
  69. +6 −1 register.php
  70. +36 −8 setup/mysql/create.php
  71. +134 −82 setup/mysql/inserts.php
  72. +1 −1 setup/process.php
@@ -366,6 +366,45 @@ public function checkbox($fieldName, $options, $val = '')
}
/**
* @param $name
*/
public function upload($name)
{
$string = '<input type="file" name="' . $name . '" />';
return $this->sendBack($string);
}
/**
* @param array $options
* @param string $val
*
* @return string
*/
public function checkGroup($fieldname, array $options, array $selectedFeeds)
{
$return = '<div class="fieldCheckboxOption">';
foreach ((array)$options as $value => $name) {
$id = uniqid();
$return .= '<input type="checkbox" id="' . $id . '" name="' . $fieldname . '[]" value="' . $value . '"';
if (in_array($value, $selectedFeeds)) {
$return .= ' checked="checked"';
}
$return .= ' /><label for="' . $id . '" class="checking1">' . $value . '</label>';
}
$return .= '</div>';
return $this->sendBack($return);
}
/**
* @param $fieldName
* @param string $val
@@ -537,7 +576,7 @@ public function memberList($fieldName, $val = '', $class = '')
}
$this->rightText = "<a href=\"null.php\" onclick=\"return get_list('member','" . $id . "_id','" . $id . "');\"><img
src=\"imgs/icon-list.png\" alt=\"Select from list\" title=\"Select from list\" /></a>";
src=\"imgs/icon-list.png\" class=\"icon\" alt=\"Select from list\" title=\"Select from list\" /></a>";
return $this->sendBack("<input placeholder=\"Begin typing the member's username or click the list icon to the right...\" type=\"text\" value=\"" . $username . "\" name=\"username_dud\" id=\"" . $id . "\"
autocomplete=\"off\" onkeyup=\"return autocom(this.id,'id','username','ppSD_members','username','members');\"
@@ -596,7 +635,13 @@ public function formList($fieldName, $val = '', $class = '')
}
/**
* @param $fieldName
* @param string $val
* @param string $class
*
* @return string
*/
public function contentList($fieldName, $val = '', $class = '')
{
$id = $this->getId();
@@ -618,7 +663,42 @@ public function contentList($fieldName, $val = '', $class = '')
}
/**
* @param $fieldName
* @param string $val
* @param string $class
*
* @return string
*/
public function memberTypeList($fieldName, $val = '', $class = '')
{
$id = $this->getId();
if (! empty($val)) {
$user = new user;
$get = $user->get_member_type($val);
$name = $get['name'];
} else {
$name = '';
}
$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 . "\"
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 . "\" />");
}
/**
* @param $fieldName
* @param string $val
* @param string $class
*
* @return string
*/
public function staffList($fieldName, $val = '', $class = '')
{
$id = $this->getId();

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -0,0 +1,65 @@
<?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
*/
class formv2 extends db {
protected $form;
protected $formData = array();
public function setForm($id)
{
$this->formData = $this->getFormData($id);
if (! empty($this->formData['id'])) {
$this->form = $id;
}
return $this;
}
public function getFormData($id)
{
$this->formData = $this->get_array("
SELECT *
FROM ppSD_forms
WHERE `id`='" . $this->mysql_clean($id) . "'
");
return $this->formData;
}
public function getFormFields($id)
{
// Fieldsets
}
}
Oops, something went wrong.

0 comments on commit e57a314

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