Update to v0.2.21

- Adjust SEO Error reporting for some Content Types. - Fix missing padding on page seetings tab. - Make changes to elFinder to allow upload WebP and AV1F images. - Adjust SQL selection and metaRobots of page and content items appearance in Sitemaps. - Fix thumbnail src image reference. - Update robots.txt to exclude .php files within media/ folder. - Fix Stock Status JSON+LD values not parsing correctly. - Fix sameAs JSON+LD Organization Schema. - Create new SQL table & sales cell in content table to record monthly sales. - Add Sales statistics graph to dashboard. - Fix border style for total display on orders.
DennisSuitters · Jan 7, 2023 · 8a358df · 8a358df
1 parent 545fc73
commit 8a358df
Show file tree

Hide file tree

Showing 27 changed files with 825 additions and 157 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,17 @@
-### v0.2.20
+### v0.2.21
+- Adjust SEO Error reporting for some Content Types.
+- Fix missing padding on page seetings tab.
+- Make changes to elFinder to allow upload WebP and AV1F images.
+- Adjust SQL selection and metaRobots of page and content items appearance in Sitemaps.
+- Fix thumbnail src image reference.
+- Update robots.txt to exclude .php files within media/ folder.
+- Fix Stock Status JSON+LD values not parsing correctly.
+- Fix sameAs JSON+LD Organization Schema.
+- Create new SQL table & sales cell in content table to record monthly sales.
+- Add Sales statistics graph to dashboard.
+- Fix border style for total display on orders.
+
+#### v0.2.20
 - Fix Canonical URL for pages.
 - Adjust page parser to include elements encoded with entities.
 - Fix Product Schema missing comma and priceValidUntil.

diff --git a/README.md b/README.md
@@ -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.20
+Current version is v0.2.21
 
 ### Features
 - AuroraCMS is a Quasi-MVC, Front End is completely MVC, with some AJAX Functions for Form Processing.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v0.2.20
+v0.2.21
diff --git a/core/css/stylesheet-aurora.css b/core/css/stylesheet-aurora.css
diff --git a/core/css/stylesheet-forms.css b/core/css/stylesheet-forms.css
diff --git a/core/js/aurora.min.js b/core/js/aurora.min.js
diff --git a/core/js/chartjs/chart.umd.min.js b/core/js/chartjs/chart.umd.min.js
diff --git a/core/layout/adverts.php b/core/layout/adverts.php
@@ -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.20
+ * @version    0.2.21
  * @link       https://github.com/DiemenDesign/AuroraCMS
  * @notes      This PHP Script is designed to be executed using PHP 7+
  */
@@ -98,7 +98,8 @@
               </div>
               <div class="card-footer">
                 <span class="code hidewhenempty"><?=$r['code'];?></span>
-                <?=$r['views']>0?'<button class="btn views" data-tooltip="tooltip" aria-label="'.$r['views'].' impressions. Click to Clear" onclick="$(`[data-views=\''.$r['id'].'\'`).text(`0`);updateButtons(`'.$r['id'].'`,`content`,`views`,`0`);"><span data-views="'.$r['id'].'">'.$r['views'].'</span>'.($r['quantity']>0?' of '.$r['quantity']:'').' <i class="i">view</i></button>':'';?>
+                <?=($r['views']>0?'<button class="btn views" data-tooltip="tooltip" aria-label="'.$r['views'].' impressions. Click to Clear" onclick="$(`[data-views=\''.$r['id'].'\'`).text(`0`);updateButtons(`'.$r['id'].'`,`content`,`views`,`0`);"><span data-views="'.$r['id'].'">'.$r['views'].'</span>'.($r['quantity']>0?' of '.$r['quantity']:'').' <i class="i">view</i></button>':'');?>
+                <span class="btn" data-tooltip="tooltip" aria-label="<?=$r['lti'];?> Clicks"><?=$r['lti'];?> <i class="i">opennew</i></span>
                 <div id="controls_<?=$r['id'];?>">
                   <div class="btn-toolbar float-right" role="toolbar">
                     <div class="btn-group" role="group">

diff --git a/core/layout/content.php b/core/layout/content.php
@@ -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.20
+ * @version    0.2.21
  * @link       https://github.com/DiemenDesign/AuroraCMS
  * @notes      This PHP Script is designed to be executed using PHP 7+
  */
@@ -276,25 +276,27 @@
                 $sccc=$scc->rowCount();
               }
               $seoerrors=0;
-              if(strlen($r['seoTitle'])<50){
-                $seoerrors++;
-              }elseif(strlen($r['seoTitle'])>70){
-                $seoerrors++;
-              }
-              if(strlen($r['seoDescription'])<1){
-                $seoerrors++;
-              }elseif(strlen($r['seoDescription'])>70){
-                $seoerrors++;
-              }
-              if($r['file']!=''&&strlen($r['fileALT'])<1){
-                $seoerrors++;
-              }
-              if(strlen(strip_tags($r['notes']))<100){
-                $seoerrors++;
-              }
-              preg_match('~<h1>([^{]*)</h1>~i',$r['notes'],$h1);
-              if(isset($h1[1])){
-                $seoerrors++;
+              if($r['contentType']!='testimonials'){
+                if(strlen($r['seoTitle'])<50){
+                  $seoerrors++;
+                }elseif(strlen($r['seoTitle'])>70){
+                  $seoerrors++;
+                }
+                if(strlen($r['seoDescription'])<1){
+                  $seoerrors++;
+                }elseif(strlen($r['seoDescription'])>70){
+                  $seoerrors++;
+                }
+                if($r['file']!=''&&strlen($r['fileALT'])<1){
+                  $seoerrors++;
+                }
+                if(strlen(strip_tags($r['notes']))<100){
+                  $seoerrors++;
+                }
+                preg_match('~<h1>([^{]*)</h1>~i',$r['notes'],$h1);
+                if(isset($h1[1])){
+                  $seoerrors++;
+                }
               }
               ?>
               <article class="card mx-2 mt-3 mb-0 overflow-visible card-list" data-content="<?=$r['contentType'].' '.$r['title'];?>" id="l_<?=$r['id'];?>">
@@ -335,10 +337,20 @@
                   <div class="image-toolbar">
                     <?php echo !isset($args[1])?'<a class="badger badge-success small text-white" href="'.URL.$settings['system']['admin'].'/content/type/'.$r['contentType'].'">'.ucfirst($r['contentType']).'</a><br>':'';
                     echo($r['pin']==1?'<a class="badger badge-primary small text-white" href="'.URL.$settings['system']['admin'].'/content/edit/'.$r['id'].'#pin">Pinned</a><br>':'');
-                    echo$r['views']>0?'<button class="views badger badge-danger trash" data-tooltip="tooltip" aria-label="Content Viewed '.$r['views'].' times, click to Clear" onclick="$(`[data-views=\''.$r['id'].'\']`).text(`0`);updateButtons(`'.$r['id'].'`,`content`,`views`,`0`);"><span data-views="'.$r['id'].'">'.$r['views'].'</span> <i class="i">view</i></button><br>':'';
-                    echo(isset($cnt['cnt'])&&$cnt['cnt']>0?'<a class="comments badger badge-'.($sccc>0?'success':'default').'" href="'.URL.$settings['system']['admin'].'/content/edit/'.$r['id'].'#tab1-5" role="button" data-tooltip="tooltip" aria-label="'.$sccc.' New Comments">'.$cnt['cnt'].' <i class="i">comments</i></a><br>':'');
-                    echo$rr['num']>0?'<a class="badger badge-success add" href="'.URL.$settings['system']['admin'].'/content/edit/'.$r['id'].'#tab1-6" role="button" data-tooltip="tooltip" aria-label="'.$rr['num'].' New Reviews">'.$rr['num'].' <i class="i">review</i></a><br>':'';?>
-                    <button class="badger badger-primary <?=($r['status']=='published'?'':' d-none');?>" data-social-share="<?= URL.$r['contentType'].'/'.$r['urlSlug'];?>" data-social-desc="<?=$r['seoDescription']?$r['seoDescription']:$r['title'];?>" id="share<?=$r['id'];?>" data-tooltip="tooltip" aria-label="Share on Social Media"><i class="i">share</i></button>
+                    echo$r['views']>0?'<button class="views badger" data-tooltip="tooltip" aria-label="Content Viewed '.$r['views'].' times, click to Clear" onclick="$(`[data-views=\''.$r['id'].'\']`).text(`0`);updateButtons(`'.$r['id'].'`,`content`,`views`,`0`);"><span data-views="'.$r['id'].'">'.$r['views'].'</span> <i class="i">view</i></button><br>':'';
+                    $sss=$db->prepare("SELECT SUM(`sales`) AS `cnt` FROM `".$prefix."contentStats` WHERE `rid`=:rid AND `ti`>:ti");
+                    $currentMonthStart=mktime(0, 0, 0, date("n"), 1);
+                    $sss->execute([
+                      ':rid'=>$r['id'],
+                      ':ti'=>$currentMonthStart -1
+                    ]);
+                    if($sss->rowCount()>0){
+                      $rss=$sss->fetch(PDO::FETCH_ASSOC);
+                      echo$rss['cnt']>0?'<button class="badger" data-tooltip="tooltip" aria-label="'.$rss['cnt'].' Sales this Month">'.$rss['cnt'].' <i class="i">shipping</i></button><br>':'';
+                    }
+                    echo(isset($cnt['cnt'])&&$cnt['cnt']>0?'<a class="comments badger" href="'.URL.$settings['system']['admin'].'/content/edit/'.$r['id'].'#tab1-5" role="button" data-tooltip="tooltip" aria-label="'.$sccc.' New Comments">'.$cnt['cnt'].' <i class="i">comments</i></a><br>':'');
+                    echo$rr['num']>0?'<a class="badger" href="'.URL.$settings['system']['admin'].'/content/edit/'.$r['id'].'#tab1-6" role="button" data-tooltip="tooltip" aria-label="'.$rr['num'].' New Reviews">'.$rr['num'].' <i class="i">review</i></a><br>':'';?>
+                    <button class="badger <?=($r['status']=='published'?'':' d-none');?>" data-social-share="<?= URL.$r['contentType'].'/'.$r['urlSlug'];?>" data-social-desc="<?=$r['seoDescription']?$r['seoDescription']:$r['title'];?>" id="share<?=$r['id'];?>" data-tooltip="tooltip" aria-label="Share on Social Media"><i class="i">share</i></button>
                   </div>
                 </div>
                 <div class="card-header overflow-visible mt-0 pt-0 line-clamp">
@@ -354,13 +366,14 @@
                     <?php }
                   }
                   echo$seoerrors>0?'<div class="alert alert-warning m-2 p-1 small text-black">There are '.$seoerrors.' things that could affect the SEO of this content!!!</div>':'';?>
-                  <?='<small class="text-muted" id="rank'.$r['id'].'">Available to '.($r['rank']==0?'Everyone':'<span class="badge badge-'.rank($r['rank']).' p-0 px-1 text-white">'.ucwords(str_replace('-',' ',rank($r['rank']))).'</span> and above').'</small>';?>
+                  <?='<small class="text-muted d-block" id="rank'.$r['id'].'">Available to '.($r['rank']==0?'Everyone':'<span class="badge badge-'.rank($r['rank']).' p-0 px-1 text-white">'.ucwords(str_replace('-',' ',rank($r['rank']))).'</span> and above').'</small>';?>
                 </div>
                 <div class="card-footer">
                   <span class="code hidewhenempty"><?=$r['code'];?></span>
                   <span class="reviews hidewhenempty"><?php echo$rr['num']>0?'<a class="btn" href="'.URL.$settings['system']['admin'].'/content/edit/'.$r['id'].'#tab1-6" role="button" data-tooltip="tooltip" aria-label="'.$rr['num'].' New Reviews">'.$rr['num'].' <i class="i">review</i></a>':'';?></span>
                   <span class="comments hidewhenempty"><?=(isset($cnt['cnt'])&&$cnt['cnt']>0?'<a class="btn'.($sccc>0?' add':'').'" href="'.URL.$settings['system']['admin'].'/content/edit/'.$r['id'].'#tab1-5" role="button" data-tooltip="tooltip" aria-label="'.$sccc.' New Comments">'.$cnt['cnt'].' <i class="i">comments</i></a>':'');?></span>
-                  <?=$r['views']>0?'<button class="btn views" data-tooltip="tooltip" aria-label="Content Viewed '.$r['views'].' times. Click to Clear" onclick="$(`[data-views=\''.$r['id'].'\'`).text(`0`);updateButtons(`'.$r['id'].'`,`content`,`views`,`0`);"><span data-views="'.$r['id'].'">'.$r['views'].'</span> <i class="i">view</i></button>':'';?>
+                  <?=$r['views']>0?'<button class="btn views" data-tooltip="tooltip" aria-label="Content Viewed '.$r['views'].' times. Click to Clear" onclick="$(`[data-views=\''.$r['id'].'\'`).text(`0`);updateButtons(`'.$r['id'].'`,`content`,`views`,`0`);"><span data-views="'.$r['id'].'">'.$r['views'].'</span> <i class="i">view</i></button>':'';
+                  echo$rss['cnt']>0?'<button class="btn" data-tooltip="tooltip" aria-label="'.$rss['cnt'].' Sales this Month">'.$rss['cnt'].' <i class="i">shipping</i></button>':'';?>
                   <div id="controls_<?=$r['id'];?>">
                     <div class="btn-toolbar float-right" role="toolbar">
                       <div class="btn-group" role="group">

diff --git a/core/layout/dashboard.php b/core/layout/dashboard.php
@@ -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.20
+ * @version    0.2.21
  * @link       https://github.com/DiemenDesign/AuroraCMS
  * @notes      This PHP Script is designed to be executed using PHP 7+
  */
@@ -60,19 +60,19 @@
   }
 }
 
-$sseo=$db->prepare("SELECT COUNT(`id`) AS `cnt` FROM `".$prefix."content` WHERE `file`!='' AND `fileALT`=''");
+$sseo=$db->prepare("SELECT COUNT(`id`) AS `cnt` FROM `".$prefix."content` WHERE `file`!='' AND `fileALT`='' AND `contentType` NOT LIKE 'testimonial%'");
 $sseo->execute();
 $rseo=$sseo->fetch(PDO::FETCH_ASSOC);
 $contenterrors=$contenterrors+$rseo['cnt'];
-$sseo=$db->prepare("SELECT COUNT(`id`) AS `cnt` FROM `".$prefix."content` WHERE CHAR_LENGTH(`seoTitle`) < 50 OR CHAR_LENGTH(`seoTitle`) > 70");
+$sseo=$db->prepare("SELECT COUNT(`id`) AS `cnt` FROM `".$prefix."content` WHERE CHAR_LENGTH(`seoTitle`) < 50 OR CHAR_LENGTH(`seoTitle`) > 70 AND `contentType` NOT LIKE 'testimonial%'");
 $sseo->execute();
 $rseo=$sseo->fetch(PDO::FETCH_ASSOC);
 $contenterrors=$contenterrors+$rseo['cnt'];
-$sseo=$db->prepare("SELECT COUNT(`id`) AS `cnt` FROM `".$prefix."content` WHERE CHAR_LENGTH(`seoDescription`) < 50 OR CHAR_LENGTH(`seoDescription`) > 160");
+$sseo=$db->prepare("SELECT COUNT(`id`) AS `cnt` FROM `".$prefix."content` WHERE CHAR_LENGTH(`seoDescription`) < 50 OR CHAR_LENGTH(`seoDescription`) > 160 AND `contentType` NOT LIKE 'testimonial%'");
 $sseo->execute();
 $rseo=$sseo->fetch(PDO::FETCH_ASSOC);
 $contenterrors=$contenterrors+$rseo['cnt'];
-$sseo=$db->prepare("SELECT `notes` FROM `".$prefix."content` WHERE `notes`!=''");
+$sseo=$db->prepare("SELECT `notes` FROM `".$prefix."content` WHERE `notes`!='' AND `contentType` NOT LIKE 'testimonial%'");
 $sseo->execute();
 while($rseo=$sseo->fetch(PDO::FETCH_ASSOC)){
   if(strlen(strip_tags($rseo['notes']))<100)$contenterrors++;