Skip to content

Commit

Permalink
Update to v0.2.25
Browse files Browse the repository at this point in the history
- Fix itemCount settings for Testimonials where '0' to disable count & show all was failing.
- Fix quotes display with List text for Fancybox.
- Fix thumbnail not displaying in media, wasn't being added to the `thumb` field.
- Fix Tracker Flag Icon and Referrer Icon displays.
- Add version checker, installed version against github repository version, with info alert on Dashboard if behind.
- Add Unread options to Messages.
- Fix error of compose messages not redirecting back to main messages page when sending.
- Improve Messages view/compose/ interface.
- Add View more button to Dashboard Widgets.
- Add EOFY (End Of Financial Year) sales period, with selection of less popular products suggested.
- Fix Sales Periods not being calculated on dates correctly.
- Reduce Weather and Sales period images by converting them to AVIF.
- Improve Installer interface.
- Fix Installer not always importing database.
- Update elFinder to v2.1.62
  • Loading branch information
Dennis Suitters committed Jun 15, 2023
1 parent 4a84617 commit 5229d48
Show file tree
Hide file tree
Showing 136 changed files with 610 additions and 376 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
![AuroraCMS](core/images/readmelogo.webp)
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.24
Current version is v0.2.25

### Features
- AuroraCMS is a Quasi-MVC, Front End is completely MVC, with some AJAX Functions for Form Processing.
Expand Down
5 changes: 2 additions & 3 deletions TODO.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ This is a quick list of things what need to be fixed or worked on to help those

- Add Instructional [Videos to the AuroraCMS YouTube Channel](https://www.youtube.com/channel/UC9vFbrBKmnSgf8TNUBvDX2Q)
- Add Content to the Wiki Pages on how to use AuroraCMS and how to create Templates.
- Address itemCount config setting not display all items if set to '0'.
- Administration
- Determine the possibility of displaying Google Search Console information, either on Dashboard (even if summarised) with links to be taken to GSC, or to a page showing more details.
- Explore adding AVIF Image Compression to elFinder when uploading files.
Expand All @@ -10,10 +11,8 @@ This is a quick list of things what need to be fixed or worked on to help those
- Fix update core system
- Inventory
- 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.
- Improve options selection to include other associated inventory, or add options exclusive to views inventory.
- Orders
- Mobile Display Formatting.
- Newsletters
- Improve editing for Newsletter Email Layout, including being able to add Content, either manually or auto-generated by new content, or filterable by Tags for the Newsletter to associate relevant Content.
- Visitor Tracker
- Fix Browser display not showing correct icon.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.2.24
v0.2.25
10 changes: 7 additions & 3 deletions core/add_media.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.24
* @version 0.2.25
* @link https://github.com/DiemenDesign/AuroraCMS
* @notes This PHP Script is designed to be executed using PHP 7+
*/
Expand All @@ -32,8 +32,12 @@
if(stristr($file,'youtu')){
preg_match("#(?<=v=)[a-zA-Z0-9-]+(?=&)|(?<=v\/)[^&\n]+(?=\?)|(?<=v=)[^&\n]+|(?<=youtu.be/)[^&\n]+#",$file,$vidMatch);
$thumb='https://i.ytimg.com/vi/'.$vidMatch[0].'/maxresdefault.jpg';
}else
$thumb='';
}else{
if(stristr($file,URL))
$thumb=URL.'media/thumbs/'.basename($file);
else
$thumb=$file;
}
$q=$db->prepare("INSERT IGNORE INTO `".$prefix."media` (`rid`,`pid`,`file`,`thumb`,`ti`) VALUES (:rid,:pid,:file,:thumb,:ti)");
$q->execute([
':rid'=>$rid,
Expand Down
60 changes: 34 additions & 26 deletions core/aurora.sql

Large diffs are not rendered by default.

53 changes: 28 additions & 25 deletions core/core.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.24
* @version 0.2.25
* @link https://github.com/DiemenDesign/AuroraCMS
* @notes This PHP Script is designed to be executed using PHP 7+
*/
Expand Down Expand Up @@ -294,30 +294,33 @@ function getSaleTime(){
];
$year=date('Y',$chkti);
$month=strtotime("1 month");
$vatis=strtotime("2/14/$year"); // Valentine's Day
$vatie=$vatis - $month;
$eatis=strtotime("last sunday of march $year"); // Easter
$eatie=$eatis - $month;
$mdtis=strtotime("5/8/$year"); // Mother's Day
$mdtie=$mdtis - $month;
$fdtis=strtotime("9/4/$year"); // Father's Day
$fdtie=$fdtis - $month;
$bftis=strtotime("last friday of october $year"); // Black Friday
$bftie=$bftis - $month;
$hwtis=strtotime("10/31/$year"); // Halloween
$hwtie=$hwtis - $month;
$sbtis=strtotime("last saturday of november $year"); // Small Business Day
$sbtie=$sbtis - $month;
$cdtis=strtotime("12/25/$year"); // Christmas Day
$cdtie=$cdtis - $month;
if($chkti>$vatis&&$chkti<$vatie)$sale=['tis'=>$vatis,'tie'=>$vatie,'sale'=>'valentine','class'=>'valentine','title'=>'Checkout our products in our Valentine\'s Day Sale!'];
if($chkti>$eatis&&$chkti<$eatie)$sale=['tis'=>$eatis,'tie'=>$eatie,'sale'=>'easter','class'=>'easter','title'=>'Checkout our products in our Easter Sale!'];
if($chkti>$mdtis&&$chkti<$mdtie)$sale=['tis'=>$mdtis,'tie'=>$mdtie,'sale'=>'mothersday','class'=>'mothersday','title'=>'Spoil your Mother with something from our Mother\'s Day Sale!'];
if($chkti>$fdtis&&$chkti<$fdtie)$sale=['tis'=>$fdtis,'tie'=>$fdtie,'sale'=>'fathersday','class'=>'fathersday','title'=>'Spoil your Father with something from our Father\'s Day Sale!'];
if($chkti>$bftis&&$chkti<$bftie)$sale=['tis'=>$bftis,'tie'=>$bftie,'sale'=>'blackfriday','class'=>'blackfriday','title'=>'Get something from our Black Friday Sale!'];
if($chkti>$hwtis&&$chkti<$hwtie)$sale=['tis'=>$hwtis,'tie'=>$hwtie,'sale'=>'halloween','class'=>'halloween','title'=>'Get something spooky from our Halloween Sale!'];
if($chkti>$sbtis&&$chkti<$sbtie)$sale=['tis'=>$sbtis,'tie'=>$sbtie,'sale'=>'smallbusinessday','class'=>'smallbusinessday','title'=>'Support our business by getting something from our Small Business Day Sale!'];
if($chkti>$cdtis&&$chkti<$cdtie)$sale=['tis'=>$cdtis,'tie'=>$cdtie,'sale'=>'christmas','class'=>'christmas','title'=>'Get something Jolly from a Christmas Sale!'];
$vatie=strtotime("2/14/$year"); // Valentine's Day
$vatis=$vatie - $month;
if($chkti>$vatis&&$chkti<$vatie)$sale=['tis'=>$vatis,'tie'=>$vatie,'sale'=>'valentine','class'=>'valentine','title'=>'Checkout our products in our Valentine\'s Day Sale!'];
$eatie=strtotime("last sunday of march $year"); // Easter
$eatis=$eatie - $month;
if($chkti>$eatis&&$chkti<$eatie)$sale=['tis'=>$eatis,'tie'=>$eatie,'sale'=>'easter','class'=>'easter','title'=>'Checkout our products in our Easter Sale!'];
$mdtie=strtotime("5/8/$year"); // Mother's Day
$mdtis=$mdtie - $month;
if($chkti>$mdtis&&$chkti<$mdtie)$sale=['tis'=>$mdtis,'tie'=>$mdtie,'sale'=>'mothersday','class'=>'mothersday','title'=>'Spoil your Mother with something from our Mother\'s Day Sale!'];
$fdtie=strtotime("9/4/$year"); // Father's Day
$fdtis=$fdtie - $month;
if($chkti>$fdtis&&$chkti<$fdtie)$sale=['tis'=>$fdtis,'tie'=>$fdtie,'sale'=>'fathersday','class'=>'fathersday','title'=>'Spoil your Father with something from our Father\'s Day Sale!'];
$bftie=strtotime("last friday of october $year"); // Black Friday
$bftis=$bftie - $month;
if($chkti>$bftis&&$chkti<$bftie)$sale=['tis'=>$bftis,'tie'=>$bftie,'sale'=>'blackfriday','class'=>'blackfriday','title'=>'Get something from our Black Friday Sale!'];
$hwtie=strtotime("10/31/$year"); // Halloween
$hwtis=$hwtie - $month;
if($chkti>$hwtis&&$chkti<$hwtie)$sale=['tis'=>$hwtis,'tie'=>$hwtie,'sale'=>'halloween','class'=>'halloween','title'=>'Get something spooky from our Halloween Sale!'];
$sbtie=strtotime("last saturday of november $year"); // Small Business Day
$sbtis=$sbtie - $month;
if($chkti>$sbtis&&$chkti<$sbtie)$sale=['tis'=>$sbtis,'tie'=>$sbtie,'sale'=>'smallbusinessday','class'=>'smallbusinessday','title'=>'Support our business by getting something from our Small Business Day Sale!'];
$cdtie=strtotime("12/25/$year"); // Christmas Day
$cdtis=$cdtie - $month;
if($chkti>$cdtis&&$chkti<$cdtie)$sale=['tis'=>$cdtis,'tie'=>$cdtie,'sale'=>'christmas','class'=>'christmas','title'=>'Get something Jolly from a Christmas Sale!'];
$eofytie=strtotime("7/30/$year"); // End Of Financial Year
$eofytis=$eofytie - $month;
if($chkti>$eofytis&&$chkti<$eofytie)$sale=['tis'=>$eofytis,'tie'=>$eofytie,'sale'=>'eofy','class'=>'eofy','title'=>'Get a great deal with our recommended End Of Financial Year selected products!'];
return$sale;
}
function size_format($B,$D=2){
Expand Down
1 change: 1 addition & 0 deletions core/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ header.aurora{
transform-style:preserve-3d }

.plane.main{
z-index:2000!important;
position:absolute;
top:0;
right:0;
Expand Down
4 changes: 4 additions & 0 deletions core/css/stylesheet-helpers.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
.page-block{
z-index:2000;
position:fixed;
top:0;
right:0;
bottom:0;
left:0;
display:block;
background-color:var(--dialog-backdrop-color);
height:100vh;
Expand Down
Loading

0 comments on commit 5229d48

Please sign in to comment.