More v0.1.2 Fixes and Added Features

Check CHANGELOG and release information for updates.
DennisSuitters · Jun 7, 2021 · 8a10c42 · 8a10c42
1 parent 458a47e
commit 8a10c42
Show file tree

Hide file tree

Showing 107 changed files with 2,378 additions and 11,271 deletions.
diff --git a/core/add_account.php b/core/add_account.php
@@ -75,7 +75,11 @@
         $not=['spammer'=>false,'target'=>'signupemail','element'=>'div','action'=>'after','class'=>'not mt-3 alert alert-info','text'=>'Email can NOT be blank','reason'=>''];
       if($not['spammer']==false){
         if(isset($_POST['terms'])&&$_POST['terms']=='yes'){
-          define('URL',PROTOCOL.$_SERVER['HTTP_HOST'].$settings['system']['url']);
+          if((!empty($_SERVER['HTTPS'])&&$_SERVER['HTTPS']!=='off')||$_SERVER['SERVER_PORT']==443){
+            if(!defined('PROTOCOL'))define('PROTOCOL','https://');
+          }else{
+            if(!defined('PROTOCOL'))define('PROTOCOL','http://');
+          }
           if($username!=''){
             $s=$db->prepare("SELECT `username` FROM `".$prefix."login` WHERE `username`=:username LIMIT 1");
             $s->execute([':username'=>$username]);

diff --git a/core/add_booking.php b/core/add_booking.php
@@ -18,6 +18,11 @@
  */
 require'db.php';
 $config=$db->query("SELECT * FROM `".$prefix."config` WHERE `id`=1")->fetch(PDO::FETCH_ASSOC);
+if((!empty($_SERVER['HTTPS'])&&$_SERVER['HTTPS']!=='off')||$_SERVER['SERVER_PORT']==443){
+  if(!defined('PROTOCOL'))define('PROTOCOL','https://');
+}else{
+  if(!defined('PROTOCOL'))define('PROTOCOL','http://');
+}
 require'projecthoneypot/class.projecthoneypot.php';
 require'spamfilter/class.spamfilter.php';
 define('URL',PROTOCOL.$_SERVER['HTTP_HOST'].$settings['system']['url'].'/');

diff --git a/core/add_category.php b/core/add_category.php
@@ -14,19 +14,18 @@
  */
 if(session_status()==PHP_SESSION_NONE)session_start();
 require'db.php';
-$config=$db->query("SELECT * FROM `".$prefix."config` WHERE `id`='1'")->fetch(PDO::FETCH_ASSOC);
 function svg2($svg,$class=null,$size=null){
 	return'<i class="i'.($size!=null?' i-'.$size:'').($class!=null?' '.$class:'').'">'.file_get_contents('images/i-'.$svg.'.svg').'</i>';
 }
-$cat=isset($_POST['cat'])?filter_input(INPUT_POST['cat'],FILTER_SANITIZE_STRING):'';
-$ct=isset($_POST['ct'])?filter_input(INPUT_POST,'ct',FILTER_SANITIZE_STRING):'';
-$icon=isset($_POST['icon'])?filter_input(INPUT_POST,'icon',FILTER_SANITIZE_STRING):'';
+$icon=filter_input(INPUT_POST,'icon',FILTER_SANITIZE_STRING);
+$ct=filter_input(INPUT_POST,'ct',FILTER_SANITIZE_STRING);
+$cat=filter_input(INPUT_POST,'cat',FILTER_SANITIZE_STRING);
 if($cat!=''){
-  $s=$db->prepare("INSERT IGNORE INTO `".$prefix."choices` (`contentType`,`icon`,`url`,`title`) VALUES ('category',:icon,:c,:t)");
+  $s=$db->prepare("INSERT IGNORE INTO `".$prefix."choices` (`contentType`,`icon`,`url`,`title`) VALUES ('category',:icon,:url,:title)");
   $s->execute([
-		':c'=>$ct,
 		':icon'=>$icon,
-		':t'=>$cat
+		':url'=>$ct,
+		':title'=>$cat
 	]);
   $id=$db->lastInsertId();
 	echo'<script>'.
@@ -46,7 +45,7 @@ function svg2($svg,$class=null,$size=null){
 							($icon!=''?
 								'<a data-fancybox="lightbox" href="'.$icon.'"><img src="'.$icon.'" alt="Thumbnail"></a>'
 							:
-								'<img src="core/images/noimage-sm.jpg" alt="No Image">'.
+								'<img src="core/images/noimage-sm.jpg" alt="No Image">'
 							).
 							'<form target="sp" action="core/purge.php">'.
 								'<input name="id" type="hidden" value="'.$id.'">'.

diff --git a/core/add_data.php b/core/add_data.php
@@ -14,6 +14,11 @@
  */
 require'db.php';
 $config=$db->query("SELECT * FROM `".$prefix."config` WHERE `id`=1")->fetch(PDO::FETCH_ASSOC);
+if((!empty($_SERVER['HTTPS'])&&$_SERVER['HTTPS']!=='off')||$_SERVER['SERVER_PORT']==443){
+  if(!defined('PROTOCOL'))define('PROTOCOL','https://');
+}else{
+  if(!defined('PROTOCOL'))define('PROTOCOL','http://');
+}
 echo'<script>';
 require'zebraimage/zebra_image.php';
 require'sanitise.php';

diff --git a/core/aurora.sql b/core/aurora.sql
diff --git a/core/change_adminaccess.php b/core/change_adminaccess.php
@@ -13,6 +13,11 @@
  */
 require'db.php';
 $config=$db->query("SELECT * FROM `".$prefix."config` WHERE `id`=1")->fetch(PDO::FETCH_ASSOC);
+if((!empty($_SERVER['HTTPS'])&&$_SERVER['HTTPS']!=='off')||$_SERVER['SERVER_PORT']==443){
+  if(!defined('PROTOCOL'))define('PROTOCOL','https://');
+}else{
+  if(!defined('PROTOCOL'))define('PROTOCOL','http://');
+}
 define('URL',PROTOCOL.$_SERVER['HTTP_HOST'].$settings['system']['url'].'/');
 $adminfolder=isset($_POST['adminfolder'])?filter_input(INPUT_POST,'adminfolder',FILTER_SANITIZE_STRING):'';
 if($adminfolder==''){

diff --git a/core/change_orderClient.php b/core/change_orderClient.php
@@ -40,7 +40,7 @@
   $q->execute([':id'=>$id]);
   $client=$q->fetch(PDO::FETCH_ASSOC);
 }
-echo'<script'.
+echo'<script>'.
       'window.top.window.$("#to").html(`<strong>'.$client['username'].($client['name']!=''?' ['.$client['name'].']':'').'<br>'.
         ($client['business']!=''?' -> '.$client['business'].'<br>':'').'</strong>'.
         '<small>'.

diff --git a/core/css/seohelper.css b/core/css/seohelper.css
@@ -558,7 +558,8 @@ nav.account-menu ul li a {
   font-size: 16px !important;
   font-weight: 700 !important ;
   color: #aaa !important;
-  text-transform: none !important; }
+  text-transform: none !important;
+  text-shadow: none !important; }
 
 nav.account-menu ul li a:hover {
   color: #ddd !important;

diff --git a/core/css/style.css b/core/css/style.css
@@ -1,22 +1,30 @@
 @charset "UTF-8";
 
 @import url('stylesheet-vars.css');
-@import url('stylesheet.css');
+@import url('stylesheet-base.css');
 @import url('stylesheet-typography.css');
 @import url('stylesheet-helpers.css');
 @import url('stylesheet-grid.css');
 @import url('stylesheet-forms.css');
-@import url('stylesheet-xtras.css');
+@import url('stylesheet-xtras-admin.css');
 @import url('stylesheet-icons.css');
 @import url('../js/summernote/summernote.min.css');
 @import url('../js/fancybox/fancybox.css');
 @import url('../js/fullcalendar/fullcalendar.min.css');
+@import url('stylesheet-aurora.css');
+@import url('stylesheet-print.css');
 
 .tasmanian {
   width: 50px;
   height: auto;
 }
 
+.logo {
+  color: #fff !important;
+  fill: currentColor !important;
+  width: 100%;
+}
+
 .aurora {
   background-color: transparent;
   background-image: url(../images/aurora.svg);

diff --git a/layout/default/css/stylesheet-aurora.css → core/css/stylesheet-aurora.css b/layout/default/css/stylesheet-aurora.css → core/css/stylesheet-aurora.css
@@ -1,10 +1,34 @@
 /* stylesheet v0.9 - Aurora - https://github.com/DiemenDesign/stylesheet */
 /* This additional Stylesheet contains CSS specific to the extra for AuroraCMS */
 
+[for="fullname"],
+[for="resetfullname"],
+[for="signupfullname"] {
+  border:0 !important;
+  clip:rect(0 0 0 0) !important;
+  height: 1px !important;
+  margin: -1px !important;
+  overflow: hidden !important;
+  padding: 0 !important;
+  position: absolute !important;
+  width: 1px !important;
+  outline: none !important; }
+
+#fullname,
+#resetfullname,
+#signupfullname {
+  display: none; }
+
 .g-recaptcha {
   display: table;
   margin: 0 auto; }
 
+.orderstheme {
+  background-color: #fff !important;
+  color: #000 !important;
+  font-family: Arial !important;
+  font-size: 1em !important; }
+
 .cart {
   display: inline-block;
   position: absolute;
@@ -88,7 +112,7 @@
   list-style: none;
   overflow: hidden;
   width: 100%;
-  height: 325px !important;
+  height: var(--slider-height) !important;
   padding: 0;
   margin: 0;
   background-color: #000; }
@@ -98,19 +122,19 @@
   position: absolute;
   display: none;
   width: 100%;
-  left: 0;
-  top: 0; }
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%); }
 
 .slider li:first-child {
   position: relative;
   display: block;
   float: left; }
 
 .slider img {
-  display: block;
-  height: auto;
-  float: left;
+  display: flex !important;
   width: 100%;
+  height: auto !important;
   border: 0; }
 
 .slider-caption {
@@ -148,7 +172,7 @@
   text-decoration: none;
   height: 61px;
   width: 38px;
-  background: transparent url("../images/themes.gif") no-repeat left top; }
+  background: transparent url("data:image/gif;base64,R0lGODlhTAA9AMQAABAQEDAwMO/v78/Pz7+/v39/f6+vr1BQUCAgIGBgYJ+fn0BAQN/f33BwcI+Pj////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAABMAD0AAAXkICSOZGmeaKqubOu+cCzPdG3feK7vfO//wKBwSCwaj8ikcslsOp/QqHRKrVqv2Fog4NsiAYTHY8ALPwiAImAgFi90gfY4PVTIyTuzWDEsyAUIPAACcgVBCXIPbz1xcgk/AYRthj8Nf1yCkmIGQnZtAnQ6eg8MoT9rcgQ7jW2YQqxirjeDcg5Efp+mNweJj0G8cgc9uGICsjyRhT+eYqU+qG2cp2zRPsxzQbSTPJafga+aD984CImLQ4itOuVtvkULBgTCOwcGBvNZ+fr7/P3+/wADChxIsKDBgwgTKlzIsKFDKSEAADs=") no-repeat left top; }
 
 .slider-btns_nav:hover,
 .slider-btns_nav:active {
@@ -829,185 +853,6 @@ svg.leaflet-image-layer.leaflet-interactive path {
   margin: 0;
   text-align: center; }
 
-/* Panorama */
-.panorama {
-  left: 0;
-  margin-bottom: 1.5rem;
-  width: 100%;
-  height: 500px;
-  overflow-x: scroll;
-  overflow-y: hidden; }
-
-.panorama img {
-  height: 100%; }
-
-.paver--initialized {
-  position: relative; }
-
-.paver--ready {
-  overflow: hidden; }
-
-.paver--ready .paver__meta {
-  display: flex;
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  opacity: 0;
-  z-index: 3;
-  transition: opacity .125s ease-in-out;
-  background-color: rgba(0, 0, 0, .6);
-  padding: .5rem;
-  pointer-events: none;
-  color: #eee;
-  text-shadow: 1px 1px 5px rgba(0, 0, 0, .125); }
-
-.paver--ready .paver__meta span {
-  padding: 0 10%; }
-
-.paver--ready .paver__meta span.paver__title {
-  margin-bottom: .25em;
-  font-weight: 700;
-  font-size: 2em;
-  line-height: 1.5em; }
-
-.paver--ready .paver__meta span.paver__title:after {
-  display: block;
-  margin: 0 auto;
-  border-bottom: 1px solid #fff;
-  width: 33%;
-  content: " "; }
-
-.paver--ready.paver--metaActive div[class^=paver__meta] {
-  opacity: 1; }
-
-.paver--ready.paver--metaActive:hover div[class^=paver__meta] {
-  opacity: 0; }
-
-.paver--ready div.paver__pano {
-  position: relative;
-  z-index: 1;
-  background-size: cover; }
-
-.paver--ready div.paver__scroller {
-  position: absolute;
-  right: 32px;
-  bottom: 16px;
-  left: 32px;
-  opacity: 0;
-  z-index: 2;
-  transition: opacity .25s ease-in-out;
-  border-radius: 2px;
-  background-color: hsla(0, 0%, 100%, .33);
-  height: 4px; }
-
-.paver--ready div.paver__scroller span {
-  display: block;
-  border-radius: 2px;
-  background-color: hsla(0, 0%, 100%, .75);
-  width: 12.5%;
-  height: 4px; }
-
-.paver--ready.paver--on:hover div.paver__scroller,
-.paver--ready.paver--tilting div.paver__scroller {
-  opacity: 1; }
-
-@media only screen and (max-width: 768px){
-  .paver--ready.paver--metaActive div.paver__meta,
-  .paver--ready.paver--on:hover div.paver__scroller {
-    opacity: 0; }
-}
-
-.paver__meta1 {
-  display: flex;
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  z-index: 3;
-  transition: opacity .125s ease-in-out;
-  background-color: rgba(0, 0, 0, .6);
-  padding: .5rem;
-  color: #eee;
-  text-shadow: 1px 1px 5px rgba(0, 0, 0, .125); }
-
-.paver__meta1 span {
-  padding: 0 10%; }
-
-.paver__meta1 span.paver__title {
-  margin-bottom: .25em;
-  font-weight: 700;
-  font-size: 2em;
-  line-height: 1.5em; }
-
-.paver__meta1 span.paver__title:after {
-  display: block;
-  margin: 0 auto;
-  border-bottom: 1px solid #fff;
-  width: 33%;
-  content: " "; }
-
-.paver__meta2 {
-  display: flex;
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  flex-direction: column;
-  justify-content: center;
-  z-index: 3;
-  transition: opacity .125s ease-in-out;
-  background-color: rgba(0,0,0,.6);
-  padding: .5rem;
-  pointer-events: none;
-  color: #eee;
-  text-shadow: 1px 1px 5px rgba(0, 0, 0, .125); }
-
-.paver__meta2 span {
-  padding: 0 10%;
-  width: 100%; }
-
-.paver__meta2 span.paver__title {
-  margin-bottom: .25em;
-  font-weight: 700;
-  font-size: 2em;
-  line-height: 1.5em; }
-
-.paver__meta3 {
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 3;
-  transition: opacity .125s ease-in-out;
-  background-color: rgba(0, 0, 0, .6);
-  padding: .5rem 16.667%;
-  pointer-events: none;
-  color: #eee;
-  text-shadow: 1px 1px 5px rgba(0, 0, 0, .125); }
-
-.paver__meta3 span {
-  display: inline; }
-
-.paver__meta3 span.paver__title {
-  font-weight: 700; }
-
-.paver__meta3 span.paver__title:after {
-  margin-right: .25em;
-  content: ":"; }
-
-.paver__meta3 span.paver__desc {
-  font-style: italic; }
-
 /* Quick view */
 .card-image {
   position: relative;

diff --git a/layout/default/css/stylesheet-base.css → core/css/stylesheet-base.css b/layout/default/css/stylesheet-base.css → core/css/stylesheet-base.css