Skip to content

Commit

Permalink
Update to v0.2.26-6
Browse files Browse the repository at this point in the history
- Update logo and background image.
- Update Favicons.
- Add option check for Sales to stop Widget appearing in Dashboard if disabled.
- Remove resize facility from the Sales widget.
- Improve Inventory Options to allow descriptions, images, and selection.
- Fix Cart view not showing correct calculation total of multiple individual items.
- Update Stripe library to v10.16.0
- Improve size display indicator when Development mode is active.
- Remove "Content" link from Pages breadcrumbs.
- Improve QuickView modal to include Product Options, and styling.
- Add icon to represent "recalculate expenses".
- Add Expenses editable field.
- Improve Administration Theme selector, now includes System option.
- Improve Sales Period styling.
- Adjust Account Recovery to only find accounts that are active.
- Add Account Deactivation section to User Account Settings.
- Added Toast Notification when list item added.
- Add Pricing page, along with editable list, highlighting items and highlight message.
- Add Recent Sale FOMO notification, with added Australian State restriction.
- Tidy up some code.
- Fix timeago function not reporting times correctly.
- Update jQuery for Administration to 3.7.1
- Remove AuroraCMS Branding from Login and Installation pages.
- Change AuroraCMS Branding in Administration to help with top bar layout on smaller devices.
- Fix Weather Administration Widget check for valid Open Weather API Key.
  • Loading branch information
Dennis Suitters committed Sep 15, 2023
1 parent 0613472 commit fda41ea
Show file tree
Hide file tree
Showing 103 changed files with 7,768 additions and 7,909 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### v0.2.26-5
### v0.2.26-6
- Update logo and background image.
- Update Favicons.
- Add option check for Sales to stop Widget appearing in Dashboard if disabled.
Expand All @@ -17,6 +17,13 @@
- Add Account Deactivation section to User Account Settings.
- Added Toast Notification when list item added.
- Add Pricing page, along with editable list, highlighting items and highlight message.
- Add Recent Sale FOMO notification, with added Australian State restriction.
- Tidy up some code.
- Fix timeago function not reporting times correctly.
- Update jQuery for Administration to 3.7.1
- Remove AuroraCMS Branding from Login and Installation pages.
- Change AuroraCMS Branding in Administration to help with top bar layout on smaller devices.
- Fix Weather Administration Widget check for valid Open Weather API Key.

#### v0.2.25
- Fix itemCount settings for Testimonials where '0' to disable count & show all was failing.
Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
![AuroraCMS](core/images/auroracms-color.webp)
# AuroraCMS - The Free Australian Content Management System

AuroraCMS the **Free** Australian Open Source [MIT](https://github.com/DiemenDesign/AuroraCMS/blob/master/LICENSE) licensed Content Management System, built primarily for Australian Businesses, built utilising [PHP](http://php.net/), PDO, [jQuery](http://jquery.com/) and [iCONS](https://github.com/DiemenDesign/iCONS). Built to take advantage of HTML5 and CSS3, with necessary SEO attributes that fit in with Google's recommendations, Micro-formats, JSON-LD, ARIA (A11Y), and general SEO Markup.

Current version is v0.2.26-5
Current version is v0.2.26-6

### Features
- AuroraCMS is a Quasi-MVC, Front End is completely MVC, with some AJAX Functions for Form Processing.
Expand All @@ -21,6 +21,8 @@ Current version is v0.2.26-5
- Business Hours Editor.
- Content Scheduler with Auto Content Publishing.
- Related Content, either Chosen or Category matched.
- Recent Sale FOMO Notifications.
- Limit to Australian State area.
- Custom Pages.
- Content Types with pages, and individual item pages.
- Activities
Expand Down Expand Up @@ -205,12 +207,12 @@ You can get themes from our Themes GitHub Repository @ [AuroraCMS-Themes](https:
- [FileRobot Image Editor](https://github.com/scaleflex/filerobot-image-editor)

### Tested on:
- CentOS Linux 7.2.1511 with Webmin 1.791
- Ubuntu Linux 14.04 + Apache v2.4.7 + PHP v5.6-7.3 + MySQL v5.5.37
- Linux Mint Ubuntu Edition Apache 2.4.7 + PHP v5.6-7+ & MySQL v5.5.37
- Linux Mint Debian Edition Apache 2.4.7 + PHP v5.6-7+ & MySQL v5.5.37
- Debian 7 + nGinx + PHP 5.5-7.3 + MySQL
- Windows 7 + WAMP + PHP 5.5 + MySQL
- CentOS Linux 8.2 with Webmin 2.101
- Ubuntu Linux 14.04 + Apache v2.4.57 + PHP v8.1 + MySQL v8.1.23
- Linux Mint Ubuntu Edition Apache 2.4.57 + PHP v8.1+ & MySQL v8.1.23
- Linux Mint Debian Edition Apache 2.4.57 + PHP v8.1+ & MySQL v8.1.23
- Debian 7 + nGinx + PHP 8.1 + MySQL v8.1.23
- Windows 7 + WAMP + PHP 8 + MySQL

### TODO:
Consult the everchanging [TODO](https://github.com/DiemenDesign/AuroraCMS/blob/master/TODO.md) file.
Expand All @@ -226,16 +228,14 @@ By downloading AuroraCMS you hereby agree not to hold Diemen Design liable for a

### AuroraCMS Live Sites by Diemen Design:
- [AAAEarthworx](https://aaaearthworx.com.au/)
- [Anime Excess](https://animeexcess.com.au/)
- [BizzyKnits](https://bizzyknits.biz/)
- [Corner Life Coach](https://corner.net.au/)
- [Cradle Mountain Fishery and Camping](https://cradlemountainfisheryandcamping.com.au/)
- [Diemen Design](https://diemen.design/)
- [EntertainMe](https://entertainme.net.au/)
- [Fast Track Business Club](https://www.fasttrackbusinessclub.com.au/)
- [Happy Valley Goat Farm](https://happyvalleygoat.farm/)
- [Happy Valley Free Rang Farm](https://happyvalleyfarm.com.au/)
- [Hays Technologies](https://haystechnologies.com.au/)
- [K9FineDining](https://k9finedining.com/)
- [Live Lightly Centre](https://livelightlycentre.com.au/)
- [Lone Wolf Anime](https://lonewolfanime.com.au/)
- [Raycraft Computer Services](https://www.raycraft.com.au/)
13 changes: 10 additions & 3 deletions TODO.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,26 @@
This is a quick list of things what need to be fixed or worked on to help those contributing to know what features or bugs are needing to be worked on.

- Fix missing Alt attribute on some items in Article Lists.
- Fix List items images being too large, explore converting to webp/avif when uploading images.
- Address itemCount config setting not display all items if set to '0'.
- Update Checkout Layout for Themes.
- Explore adding Notification or Sale/Enquiries of Products/Services.
- Explore adding Shipping Activity to Orders.
- Update Settings Layout for users.
- Explore adding Referral Codes on SignUp forms, and code generation by allowed users.
- Account Holders can generate referrals for services, products & courses.
- Track referrals being used to account that generated referral to apply discount to.
- Count number of referrals to number of items or orders to apply discounts to.
- Explore allowing user to set price/tip/buy me a coffee.
- Administration.
- Add instructional walkthrough on pages explaining what fields do, step by step.
- SEO
- Add AHref's site verification for those that don't use Google's services.
- Config database, add how to adjust total costs for items, by percentage, fixed value, or multiplying value.
- Explore update Livechat Layout.
- Improve KanBan Item Layout.
- Explore including Shipping Activity to Orders.
- Contact Preferences.
- Add active field to entries to allow enabling/disabling display for changing hours.
- Dashboard.
- Add Notification type Popup to indicate active LiveChats.
- Layout selections, CRM, eCommerce, Learning, Analytics.
Expand All @@ -23,7 +30,6 @@ This is a quick list of things what need to be fixed or worked on to help those
- Popular Courses.
- Courses Complete.
- Accounts.
- Explore Theme switching, add system default.
- Explore adding recent device activity.
- Explore processing Referral Codes.
- Add wage value to accounts for calculating hours costs.
Expand All @@ -35,7 +41,8 @@ This is a quick list of things what need to be fixed or worked on to help those
- Using @supports in CSS isn't fully supported in Safari yet either.
- Fix update core system.
- Inventory.
- Add cost of Purchase Cost Expense (eCost) value for calculating profit made on sold items. (new DB Table "materials").
- Add cost of Purchase Cost Expense (eCost) value for calculating profit made on sold items. (new DB Table "materials"). WIP
- hCost (Holding Cost/Deposit), available to code holders and restricted to states.
- Customer/Contact List, more of a selection Widget for emails and orders.
- Improve options selection to include other associated inventory, or add options exclusive to views inventory.
- Explore adding a Materials List with item cost.
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.2.26-5
v0.2.26-6
2 changes: 1 addition & 1 deletion core/add_comment.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
$mail->AltBody=strip_tags(preg_replace('/<br(\s+)?\/?>/i',"\n",$msg));
if($mail->Send())$not=['spammer'=>false,'target'=>'comment','element'=>'div','action'=>'replace','class'=>'not alert alert-success','text'=>'Comment will be Appear once Approved.','reason'=>''];
else$not=['spammer'=>false,'target'=>'comment','element'=>'div','action'=>'replace','class'=>'not alert alert-danger','text'=>'There was an Issue adding your Comment.','reason'=>''];
}
}else$not=['spammer'=>false,'target'=>'comment','element'=>'div','action'=>'replace','class'=>'not alert alert-success','text'=>'Comment will be Appear once Approved.','reason'=>''];
}else$not=['spammer'=>false,'target'=>'comment','element'=>'div','action'=>'replace','class'=>'not alert alert-danger','text'=>'There was an Issue adding your Comment.','reason'=>''];
}
}
Expand Down
38 changes: 20 additions & 18 deletions core/add_data.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @author Dennis Suitters <[email protected]>
* @copyright 2014-2019 Diemen Design
* @license http://opensource.org/licenses/MIT MIT License
* @version 0.2.23
* @version 0.2.26-6
* @link https://github.com/DiemenDesign/AuroraCMS
* @notes This PHP Script is designed to be executed using PHP 7+
*/
Expand Down Expand Up @@ -82,23 +82,25 @@
if(stristr($c['gravatar'],'@'))$avatar='http://gravatar.com/avatar/'.md5($c['gravatar']);
elseif(stristr($c['gravatar'],'gravatar.com/avatar/'))$avatar=$c['gravatar'];
}
echo'window.top.window.$("#comments").append(`<div id="l_'.$id.'" class="row p-2 mt-1 swing-in-top-fwd">'.
'<div class="col-1">'.
'<img style="max-width:64px;height:64px;" alt="User" src="'.$avatar.'">'.
'</div>'.
'<div class="col-9">'.
'<h6 class="media-heading">'.$name.'</h6>'.
'<time><small>'.date($config['dateFormat'],$ti).'</small></time><br>'.
$da.
'</div>'.
'<div class="col-2 text-right align-top" id="controls-'.$id.'">'.
'<form target="sp" method="post" action="core/purge.php">'.
'<input name="id" type="hidden" value="'.$id.'">'.
'<input name="t" type="hidden" value="comments">'.
'<button class="trash" data-tooltip="tooltip" aria-label="Delete"><i class="i">trash</i></button>'.
'</form>'.
'</div>'.
'</div>`);';
echo'window.top.window.$("#comments").append(`'.
'<div id="l_'.$id.'" class="row swing-in-top-fwd">'.
'<article class="card zebra mt-2 mb-0 p-0 overflow-visible card-list shadow">'.
'<div class="row">'.
'<div class="col-12 col-md-2 pl-2 py-2 align-top small">'.$name.'</div>'.
'<div class="col-12 col-md-4 py-2 align-top small">'.$da.'</div>'.
'<div class="col-12 col-md-2 py-2 text-center small">'.date($config['dateFormat'],$ti).'</div>'.
'<div class="col-12 col-md py-2 pr-2 text-right">'.
'<div class="btn-group" id="controls-'.$id.'" role="group">'.
'<form target="sp" method="post" action="core/purge.php">'.
'<input name="id" type="hidden" value="'.$id.'">'.
'<input name="t" type="hidden" value="comments">'.
'<button class="trash" data-tooltip="tooltip" aria-label="Delete"><i class="i">trash</i></button>'.
'</form>'.
'</div>'.
'</div>'.
'</article>'.
'</div>'.
'</div>`);';
}else echo'window.top.window.toastr["error"]("There was an issue adding the Data!");';
}else echo'window.top.window.toastr["error"]("The Email enter is not valid!");';
break;
Expand Down
61 changes: 61 additions & 0 deletions core/add_expense.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<?php
/**
* AuroraCMS - Copyright (C) Diemen Design 2019
*
* @category Administration - Core - Add Expense
* @package core/add_expense.php
* @author Dennis Suitters <[email protected]>
* @copyright 2014-2019 Diemen Design
* @license http://opensource.org/licenses/MIT MIT License
* @version 0.2.26-6
* @link https://github.com/DiemenDesign/AuroraCMS
* @notes This PHP Script is designed to be executed using PHP 7+
*/
require'db.php';
$rid=filter_input(INPUT_POST,'rid',FILTER_SANITIZE_NUMBER_INT);
$code=isset($_POST['c'])?filter_input(INPUT_POST,'c',FILTER_SANITIZE_STRING):'';
$brand=isset($_POST['b'])?filter_input(INPUT_POST,'b',FILTER_SANITIZE_STRING):'';
$title=isset($_POST['t'])?filter_input(INPUT_POST,'t',FILTER_SANITIZE_STRING):'';
$cost=isset($_POST['cost'])?filter_input(INPUT_POST,'cost',FILTER_SANITIZE_STRING):0;
if($cost==''){
echo'<script>window.top.window.toastr["error"](`A Cost is required!`);</script>';
}
if($title==''){
echo'<script>window.top.window.toastr["error"](`A Title is required!`);</script>';
}
if($title!=''&&$cost!=''){
$q=$db->prepare("INSERT IGNORE INTO `".$prefix."choices` (`rid`,`contentType`,`type`,`category`,`title`,`cost`,`ti`) VALUES (:rid,'expense',:code,:brand,:title,:cost,:ti)");
$q->execute([
':rid'=>$rid,
':code'=>$code,
':brand'=>$brand,
':title'=>$title,
':cost'=>$cost,
':ti'=>time()
]);
$iid=$db->lastInsertId();
echo'<script>'.
'window.top.window.$("#expenses").append(`<div class="row m-0 p-0" id="l_'.$iid.'" data-cost="'.$cost.'">'.
'<div class="col-12 col-md-2">'.
'<div class="input-text">'.$code.'&nbsp;</div>'.
'</div>'.
'<div class="col-12 col-md-2">'.
'<div class="input-text">'.$brand.'</div>'.
'</div>'.
'<div class="col-12 col-md">'.
'<div class="input-text">'.$title.'</div>'.
'</div>'.
'<div class="col-12 col-md-2">'.
'<div class="form-row">'.
'<div class="input-text col-12">'.$cost.'</div>'.
'<form target="sp" action="core/purge.php">'.
'<input name="id" type="hidden" value="'.$iid.'">'.
'<input name="t" type="hidden" value="choices">'.
'<button class="trash" data-tooltip="tooltip" aria-label="Delete"><i class="i">trash</i></button>'.
'</form>'.
'</div>'.
'</div>'.
'</div>`);'.
'window.top.window.toastr["success"](`'.$title.' Added!`);'.
'</script>';
}
4 changes: 2 additions & 2 deletions core/add_faq.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @author Dennis Suitters <[email protected]>
* @copyright 2014-2019 Diemen Design
* @license http://opensource.org/licenses/MIT MIT License
* @version 0.2.23
* @version 0.2.26-6
* @link https://github.com/DiemenDesign/AuroraCMS
* @notes This PHP Script is designed to be executed using PHP 7+
*/
Expand Down Expand Up @@ -42,7 +42,7 @@
'<form class="float-right" target="sp" action="core/purge.php">'.
'<input name="id" type="hidden" value="'.$id.'">'.
'<input name="t" type="hidden" value="content">'.
'<button class="btn-danger" data-tooltip="tooltip" type="submit" aria-label="Delete"><i class="i"><svg role="img" focusable="false" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 14 14"><path d="m 5.4999377,5.7501979 v 4.5001871 q 0,0.109505 -0.070503,0.179508 -0.070503,0.07 -0.1795074,0.0705 H 4.7499064 q -0.1095045,0 -0.1795075,-0.0705 -0.070003,-0.0705 -0.070503,-0.179508 V 5.7501979 q 0,-0.1095045 0.070503,-0.1795075 0.070503,-0.070003 0.1795075,-0.070503 h 0.5000209 q 0.1095045,0 0.1795074,0.070503 0.070003,0.070503 0.070503,0.1795075 z m 2.0000833,0 v 4.5001871 q 0,0.109505 -0.070503,0.179508 -0.070503,0.07 -0.1795075,0.0705 H 6.7499898 q -0.1095046,0 -0.1795075,-0.0705 -0.070003,-0.0705 -0.070503,-0.179508 V 5.7501979 q 0,-0.1095045 0.070503,-0.1795075 0.070503,-0.070003 0.1795075,-0.070503 h 0.5000208 q 0.1095046,0 0.1795075,0.070503 0.070003,0.070503 0.070503,0.1795075 z m 2.0000833,0 v 4.5001871 q 0,0.109505 -0.070503,0.179508 -0.070503,0.07 -0.1795075,0.0705 H 8.7500731 q -0.1095046,0 -0.1795075,-0.0705 -0.070003,-0.0705 -0.070503,-0.179508 V 5.7501979 q 0,-0.1095045 0.070503,-0.1795075 0.070503,-0.070003 0.1795075,-0.070503 H 9.250094 q 0.1095046,0 0.1795075,0.070503 0.070003,0.070503 0.070503,0.1795075 z M 10.500146,11.406934 V 4.000625 H 3.4998543 v 7.406309 q 0,0.172007 0.054502,0.316513 0.054502,0.144506 0.1135047,0.211009 0.059003,0.0665 0.082004,0.0665 h 6.500271 q 0.0235,0 0.082,-0.0665 0.0585,-0.0665 0.113504,-0.211009 0.055,-0.144506 0.0545,-0.316513 z M 5.2499273,3.0000833 H 8.7500731 L 8.3750575,2.0860453 Q 8.3205552,2.0155423 8.2420519,2.0000417 H 5.7654487 q -0.078003,0.015501 -0.1330055,0.086004 z m 7.2503017,0.2500105 v 0.5000208 q 0,0.1095046 -0.0705,0.1795075 -0.0705,0.070003 -0.179507,0.070503 h -0.750031 v 7.4063089 q 0,0.648527 -0.367016,1.121046 Q 10.766157,13 10.250136,13 H 3.7498648 Q 3.2343433,13 2.866828,12.542981 2.4993126,12.085962 2.4998127,11.437435 V 3.999625 H 1.7497814 q -0.1095046,0 -0.1795075,-0.070503 Q 1.500271,3.8586191 1.499771,3.7496146 V 3.2495937 q 0,-0.1095045 0.070503,-0.1795074 0.070503,-0.070003 0.1795075,-0.070503 H 4.163882 L 4.7109048,1.695029 Q 4.8279097,1.4060169 5.1329224,1.2030085 5.4379351,1 5.7499481,1 H 8.2500523 Q 8.5625653,1 8.867078,1.2030085 9.1715907,1.4060169 9.2890956,1.695029 l 0.5470227,1.3045543 h 2.4141007 q 0.109504,0 0.179507,0.070503 0.07,0.070503 0.0705,0.1795074 z"/></svg></i></button>'.
'<button class="trash" data-tooltip="tooltip" type="submit" aria-label="Delete"><i class="i">trash</i></button>'.
'</form>'.
'</summary>'.
'<p>'.$da.'</p>'.
Expand Down
3 changes: 1 addition & 2 deletions core/add_list.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
}
define('URL',PROTOCOL.$_SERVER['HTTP_HOST'].$settings['system']['url'].'/');
$rid=filter_input(INPUT_POST,'rid',FILTER_UNSAFE_RAW);
$lid=filter_input(INPUT_POST,'lid',FILTER_UNSAFE_RAW);
$lh=filter_input(INPUT_POST,'lh',FILTER_UNSAFE_RAW);
$li1=filter_input(INPUT_POST,'li',FILTER_UNSAFE_RAW);
$li2=filter_input(INPUT_POST,'li2',FILTER_UNSAFE_RAW);
Expand All @@ -32,7 +31,7 @@
$ti=time();
if($lda=='')echo'<script>window.top.window.toastr["error"]("The Notes field must contain data!");</script>';
else{
$q=$db->prepare("INSERT IGNORE INTO `".$prefix."content` (`rid`,`code`,`contentType`,`title`,`urlSlug`,`notes`,`ti`) VALUES (:rid,:lid,'list',:title,:url,:notes,:ti)");
$q=$db->prepare("INSERT IGNORE INTO `".$prefix."content` (`rid`,`contentType`,`title`,`urlSlug`,`notes`,`ti`) VALUES (:rid,'list',:title,:url,:notes,:ti)");
$q->execute([
':rid'=>$rid,
':lid'=>$lid,
Expand Down
Loading

0 comments on commit fda41ea

Please sign in to comment.