Update to v0.0.24

- Fix style variables that were missing, and make improvements. - Improve visibilty and functionality of quiededit/quickview content dropdowns. - Improve Gallery & Content Media items, can now view thumbnails via click replacement of main image, or use modal viewer. - Add Jumpbar for content lists to quickly find content alphabetically. - Fix the content category navigation menu not display all categories. - Fix Banners not being displayed if Heading is empty. - Adjust content type display for content and dropdown content selection in Administration. - Add ability to add listed items to Articles. - Quickview on front end for cyclying through list. - Fix display and responsivness for quickview products. - Fix display layout of Messages in Administration. - Add feature to add login background images. - Update jQuery for Administration. - Adjust Administration styling for better visuals. - Update Summernote-Cleaner. - Improve Livechat Administration interface, add a filter field for finding chats.
DennisSuitters · Jun 6, 2023 · 4a84617 · 4a84617
1 parent d40a10e
commit 4a84617
Show file tree

Hide file tree

Showing 350 changed files with 1,796 additions and 1,319 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,11 @@
   - Quickview on front end for cyclying through list.
 - Fix display and responsivness for quickview products.
 - Fix display layout of Messages in Administration.
+- Add feature to add login background images.
+- Update jQuery for Administration.
+- Adjust Administration styling for better visuals.
+- Update Summernote-Cleaner.
+- Improve Livechat Administration interface, add a filter field for finding chats.
 
 #### v0.2.23
 - Update Summernote, fix Summernote plugins.

diff --git a/README.md b/README.md
@@ -153,6 +153,11 @@ Current version is v0.2.24
   - Count Impressions of times Advertisement has been displayed.
   - Count Clicks.
   - Date restriction for start displaying advertisements, and end date.
+- Agronomy for managing Farms.
+  - Area map plotting for managing pasture/paddock areas.
+  - Livestock management, incl. selecting which area they are currently in.
+  - Cropping for crop management, incl. whole paddock area cropping as well as small plots.
+  - Logging for area, livestock and crop history. (WIP)
 - Multiple Custom Summernote (WYSIWYG Editor) Addons, created by Diemen Design.
   - [summernote-audio](https://github.com/DiemenDesign/summernote-audio)
   - [summernote-checkbox](https://github.com/DiemenDesign/summernote-checkbox)
@@ -224,7 +229,6 @@ By downloading AuroraCMS you hereby agree not to hold Diemen Design liable for a
 - [BizzyKnits](https://bizzyknits.biz/)
 - [Corner Life Coach](https://corner.net.au/)
 - [Cradle Mountain Fishery and Camping](https://cradlemountainfisheryandcamping.com.au/)
-- [Cradle Mountain Message](https://cradlemountainmassage.com.au/)
 - [Diemen Design](https://diemen.design/)
 - [EntertainMe](https://entertainme.net.au/)
 - [Fast Track Business Club](https://www.fasttrackbusinessclub.com.au/)

diff --git a/TODO.md b/TODO.md
@@ -10,6 +10,7 @@ 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. 
   - Orders
     - Mobile Display Formatting.
   - Newsletters

diff --git a/core/add_loginimages.php b/core/add_loginimages.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * AuroraCMS - Copyright (C) Diemen Design 2019
+ *
+ * @category   Administration - Core - Add Login Images
+ * @package    core/add_loginimages.php
+ * @author     Dennis Suitters <dennis@diemen.design>
+ * @copyright  2014-2019 Diemen Design
+ * @license    http://opensource.org/licenses/MIT  MIT License
+ * @version    0.2.24
+ * @link       https://github.com/DiemenDesign/AuroraCMS
+ * @notes      This PHP Script is designed to be executed using PHP 7+
+ */
+if(session_status()==PHP_SESSION_NONE)session_start();
+require'db.php';
+$lit=filter_input(INPUT_POST,'lit',FILTER_UNSAFE_RAW); // Image Title
+$li=filter_input(INPUT_POST,'li',FILTER_UNSAFE_RAW); // Image URL
+$lia=filter_input(INPUT_POST,'lia',FILTER_UNSAFE_RAW); // Author Name
+$liau=filter_input(INPUT_POST,'liau',FILTER_UNSAFE_RAW); // Author URL
+$lis=filter_input(INPUT_POST,'lis',FILTER_UNSAFE_RAW); // Service
+$lisu=filter_input(INPUT_POST,'lisu',FILTER_UNSAFE_RAW); // Service URL
+if($li=='')echo'<script>window.top.window.toastr["error"]("The Image field must contain data!");</script>';
+else{
+  $layout=($liau!=''?'Photo by&nbsp;<a href="'.$liau.'">'.$lia.'</a>&nbsp;on&nbsp;<a href="'.$lisu.'">'.$lis.'</a>':'');
+	$q=$db->prepare("INSERT IGNORE INTO `".$prefix."widgets` (`ref`,`title`,`file`,`layout`) VALUES ('loginimage',:title,:file,:layout)");
+	$q->execute([
+    ':title'=>$lit,
+		':file'=>$li,
+    ':layout'=>$layout
+	]);
+	$id=$db->lastInsertId();
+	$e=$db->errorInfo();
+	if(is_null($e[2])){
+		$s=$db->prepare("UPDATE `".$prefix."widgets` SET `ord`=:id WHERE `id`=:id");
+		$s->execute([':id'=>$id]);
+    echo'<script>'.
+			'window.top.window.$("#loginimages").append(`<div id="li_'.$id.'" class="card stats gallery col-12 col-sm-3 m-0 border-0">'.
+        '<a data-fancybox="loginimage" href="'.$li.'"><img src="'.$li.'" alt="'.$lit.'"></a>'.
+        '<div class="btn-group tools">'.
+          '<form class="d-inline" target="sp" action="core/purge.php">'.
+            '<input name="id" type="hidden" value="'.$id.'">'.
+            '<input name="t" type="hidden" value="widgets">'.
+            '<button class="trash" data-tooltip="right" aria-label="Delete"><i class="i">trash</i></button>'.
+          '</form>'.
+          '<div class="btn handle" data-tooltip="left" aria-label="Drag to Reorder"><i class="i">drag</i></div>'.
+        '</div>'.
+			'</div>`);'.
+		'</script>';
+	}else echo'<script>window.top.window.toastr["error"]("There was an issue adding the Data!");</script>';
+}
diff --git a/core/aurora.sql b/core/aurora.sql
diff --git a/core/browse_unsplash.php b/core/browse_unsplash.php
@@ -7,7 +7,7 @@
  * @author     Dennis Suitters <dennis@diemen.design>
  * @copyright  2014-2019 Diemen Design
  * @license    http://opensource.org/licenses/MIT  MIT License
- * @version    0.2.23
+ * @version    0.2.24
  * @link       https://github.com/DiemenDesign/AuroraCMS
  * @notes      This PHP Script is designed to be executed using PHP 7+
  */
@@ -16,7 +16,6 @@
 $col=isset($_GET['c'])?filter_input(INPUT_GET,'c',FILTER_SANITIZE_STRING):'';
 require'db.php';
 $config=$db->query("SELECT mediaOptions,mediaMaxWidth,mediaMaxWidthThumb,unsplash_appname,unsplash_publickey,unsplash_secretkey FROM `".$prefix."config` WHERE `id`=1")->fetch(PDO::FETCH_ASSOC);
-if($id!=0){
   if($config['mediaOptions'][0]==1||$config['unsplash_publickey']!=''){?>
     <div class="container p-5">
       <form class="unsplash-form">
@@ -182,57 +181,67 @@ function displayResults(json){
       };
       function addUnsplash(iid,id,t,c,da,dt){
         da=da.substring(0,da.indexOf('?'));
-        if(c=='thumb'){
-          da=da+'?w=<?=$config['mediaMaxWidthThumb'];?>&utm_source=<?=$config['unsplash_appname'];?>&utm_medium=referral';
+        if(t=='loginimage'){
+          da=da+'?w=1900&utm_source=<?=$config['unsplash_appname'];?>&utm_medium=referral';
+          $('#limage').val(da);
+          $('#lit').val($('#unsplash_'+iid).data('alt'));
+          $('#lia').val($('#unsplash_'+iid).data('name'));
+          $('#liau').val($('#unsplash_'+iid).data('url'));
+          $('#lisu').val($('#unsplash_'+iid).data('url'));
+          $('#lis').val('Unsplash');
         }else{
-          var da2=da+'?w=<?=$config['mediaMaxWidthThumb'];?>&utm_source=<?=$config['unsplash_appname'];?>&utm_medium=referral';
-          da=da+'?w=<?=$config['mediaMaxWidth'];?>&utm_source=<?=$config['unsplash_appname'];?>&utm_medium=referral';
-        }
-        $('#'+c).val(da);
-        $('#'+c+'image').attr('src',da);
-        $('[data-fancybox="'+c+'"]').attr('href',da);
-        $('[data-imageeditor="edit'+c+'"]').data('image',da);
-        $('[data-imageeditor="edit'+c+'"]').data('name',$('#unsplash_'+iid).data('name'));
-        $('#save'+c).addClass('btn-danger');
-        $('#'+c).addClass('unsaved');
-        if(c=='file'){
+          if(c=='thumb'){
+            da=da+'?w=<?=$config['mediaMaxWidthThumb'];?>&utm_source=<?=$config['unsplash_appname'];?>&utm_medium=referral';
+          }else{
+            var da2=da+'?w=<?=$config['mediaMaxWidthThumb'];?>&utm_source=<?=$config['unsplash_appname'];?>&utm_medium=referral';
+            da=da+'?w=<?=$config['mediaMaxWidth'];?>&utm_source=<?=$config['unsplash_appname'];?>&utm_medium=referral';
+          }
           $('#'+c).val(da);
           $('#'+c+'image').attr('src',da);
-          <?php if($config['mediaOptions'][1]==1){?>
-            if($('#thumb').length>0){
-              $('#thumb').val(da2);
-              $('#thumbimage').attr('src',da2);
-              $('[data-fancybox="thumb"]').attr('href',da2);
-              $('[data-imageeditor="editthumb"]').data('image',da2);
-              $('#savethumb').addClass('btn-danger');
-              $('#thumb').addClass('unsaved');
+          $('[data-fancybox="'+c+'"]').attr('href',da);
+          $('[data-imageeditor="edit'+c+'"]').data('image',da);
+          $('[data-imageeditor="edit'+c+'"]').data('name',$('#unsplash_'+iid).data('name'));
+          $('#save'+c).addClass('btn-danger');
+          $('#'+c).addClass('unsaved');
+          if(c=='file'){
+            $('#'+c).val(da);
+            $('#'+c+'image').attr('src',da);
+            <?php if($config['mediaOptions'][1]==1){?>
+              if($('#thumb').length>0){
+                $('#thumb').val(da2);
+                $('#thumbimage').attr('src',da2);
+                $('[data-fancybox="thumb"]').attr('href',da2);
+                $('[data-imageeditor="editthumb"]').data('image',da2);
+                $('#savethumb').addClass('btn-danger');
+                $('#thumb').addClass('unsaved');
+              }
+            <?php }?>
+          }
+          if(c!='thumb'){
+            $('[data-el="fileALT"]').text($('#unsplash_'+iid).data('alt'));
+            $('#fileALT').val($('#unsplash_'+iid).data('alt'));
+            $('#savefileALT').addClass('btn-danger');
+            $('#fileALT').addClass('unsaved');
+            $('#attributionImageTitle').val($('#unsplash_'+iid).data('alt'));
+            $('#saveattributionImageTitle').addClass('btn-danger');
+            $('#attributionImageTitle').addClass('unsaved');
+            $('#attributionImageName').val($('#unsplash_'+iid).data('name'));
+            $('#saveattributionImageName').addClass('btn-danger');
+            $('#attributionImageName').addClass('unsaved');
+            $('#attributionImageURL').val($('#unsplash_'+iid).data('url'));
+            $('#saveattributionImageURL').addClass('btn-danger');
+            $('#attributionImageURL').addClass('unsaved');
+          }
+          $.ajax({
+            type:"GET",
+            url:dt,
+            data:{
+              client_id:'<?=$config['unsplash_publickey'];?>'
             }
-          <?php }?>
-        }
-        if(c!='thumb'){
-          $('[data-el="fileALT"]').text($('#unsplash_'+iid).data('alt'));
-          $('#fileALT').val($('#unsplash_'+iid).data('alt'));
-          $('#savefileALT').addClass('btn-danger');
-          $('#fileALT').addClass('unsaved');
-          $('#attributionImageTitle').val($('#unsplash_'+iid).data('alt'));
-          $('#saveattributionImageTitle').addClass('btn-danger');
-          $('#attributionImageTitle').addClass('unsaved');
-          $('#attributionImageName').val($('#unsplash_'+iid).data('name'));
-          $('#saveattributionImageName').addClass('btn-danger');
-          $('#attributionImageName').addClass('unsaved');
-          $('#attributionImageURL').val($('#unsplash_'+iid).data('url'));
-          $('#saveattributionImageURL').addClass('btn-danger');
-          $('#attributionImageURL').addClass('unsaved');
+          }).done(function(){});
+          $('.saveall').addClass('btn-danger');
+          unsaved=true;
         }
-        $.ajax({
-          type:"GET",
-          url:dt,
-          data:{
-            client_id:'<?=$config['unsplash_publickey'];?>'
-          }
-        }).done(function(){});
-        $('.saveall').addClass('btn-danger');
-        unsaved=true;
         parent.jQuery.fancybox.close();
       }
     </script>
@@ -242,4 +251,3 @@ function addUnsplash(iid,id,t,c,da,dt){
       ($config['unsplash_publickey']==''?'<div class="alert alert-info">The Unsplash API Public Key is not set.</div>':'').
     '</div>';
   }
-}
diff --git a/core/chatlist.php b/core/chatlist.php
@@ -7,7 +7,7 @@
  * @author     Dennis Suitters <dennis@diemen.design>
  * @copyright  2014-2019 Diemen Design
  * @license    http://opensource.org/licenses/MIT  MIT License
- * @version    0.2.23
+ * @version    0.2.24
  * @link       https://github.com/DiemenDesign/AuroraCMS
  * @notes      This PHP Script is designed to be executed using PHP 7+
  */
@@ -18,7 +18,7 @@
 $s->execute();
 if($s->rowCount()>0){
   while($r=$s->fetch(PDO::FETCH_ASSOC)){
-    echo'<span class="chatListItem list-group-item list-group-item-action border-top-0 border-right-0 border-left-0 border-bottom" id="l_'.$r['id'].'" data-sid="'.$r['sid'].'" data-chatname="'.$r['name'].'" data-chatemail="'.$r['email'].'"><span class="btn-group float-right">';
+    echo'<span class="chatListItem list-group-item list-group-item-action border-top-0 border-right-0 border-left-0 border-bottom" id="l_'.$r['id'].'" data-sid="'.$r['sid'].'" data-chatname="'.$r['name'].'" data-chatemail="'.$r['email'].'" data-content="'.$r['name'].' '.$r['email'].'"><span class="btn-group float-right">';
 		$scc=$db->prepare("SELECT `ip` FROM `".$prefix."iplist` WHERE `ip`=:ip");
 		$scc->execute([':ip'=>$r['ip']]);
 		if($scc->rowCount()<1)echo'<form id="blacklist'.$r['id'].'" target="sp" method="post" action="core/add_blacklist.php"><input name="id" type="hidden" value="'.$r['id'].'"><input name="t" type="hidden" value="livechat"><input name="r" type="hidden" value="Added Manually via Live Chat"><button data-tooltip="tooltip" aria-label="Add to Blacklist"><i class="i">security</i></button></form>';
@@ -36,4 +36,5 @@
   	'$(this).addClass("active");'.
   	'updateChat("seen");'.
 	'});'.
+  'filterTextInput2();'.
 '</script>';
diff --git a/core/core.php b/core/core.php
@@ -167,11 +167,14 @@ function rank($txt){
 	if($txt==1000)return'developer';
 }
 function svg($svg,$class=null,$size=null){
-	$svg=file_get_contents('core/images/icons/'.$svg.'.svg');
-	echo$svg;
+	$svg=str_replace(' ','-',$svg);
+	if(file_exists('core/images/icons/'.$svg.'.svg'))
+		return'<i class="a'.($size!=null?' a-'.$size:'').($class!=null?' '.$class:'').'">'.file_get_contents('core/images/icons/'.$svg.'.svg').'</i>';
+	else
+		return'<i class="i'.($size!=null?' i-'.$size:'').($class!=null?' '.$class:'').'">blank</i>';
 }
 function svg2($svg,$class=null,$size=null){
-	return'<i class="i'.($size!=null?' i-'.$size:'').($class!=null?' '.$class:'').'">'.$svg.'</i>';
+	echo'<i class="i'.($size!=null?' i-'.$size:'').($class!=null?' '.$class:'').'">'.file_get_contents($svg.'.svg').'</i>';
 }
 function frontsvg($svg){
 	if(file_exists(THEME.'/svg/'.$svg.'.svg'))
@@ -322,6 +325,13 @@ function size_format($B,$D=2){
   $F=floor((strlen($B) - 1) / 3);
   return @sprintf("%.{$D}f",$B / pow(1024, $F)).' '.@$S[$F-1].'B';
 }
+function short_number($num){
+  $units=['','K','M','B','T'];
+  for ($i=0;$num>=1000;$i++){
+    $num /= 1000;
+  }
+  return round($num,1).$units[$i];
+}
 function tomoment($f){
   $r=['d'=>'DD','D'=>'ddd','j'=>'D','l'=>'dddd','N'=>'E','S'=>'o','w'=>'e','z'=>'DDD','W'=>'W','F'=>'MMMM','m'=>'MM','M'=>'MMM','n'=>'M','t'=>'','L'=>'','o'=>'YYYY','Y'=>'YYYY','y'=>'YY','a'=>'a','A'=>'A','B'=>'','g'=>'h','G'=>'H','h'=>'hh','H'=>'HH','i'=>'mm','s'=>'ss','u'=>'SSS','e'=>'zz','I'=>'','O'=>'','P'=>'','T'=>'','Z'=>'','c'=>'','r'=>'','U'=>'X'];
   return strtr($f,$r);