Skip to content

Commit b171522

Browse files
author
Marius
committed
Deals 6.1.9 release
Deals 6.1.9 release: * Fixed compatibility style routing bug * Refactored time(UTC) * HTTP changed to HTTPS * Refactored CSSFile to CSS_File * Improved CSS
1 parent 9e39ddf commit b171522

File tree

16 files changed

+94
-78
lines changed

16 files changed

+94
-78
lines changed

‎Controllers/Front/AssetController.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ public function enqueueMandatoryStyles()
8181
$objStyle->setSitewideStyles();
8282
// Set compatibility styles
8383
$objStyle->setCompatibilityStyles();
84-
$parentThemeCompatibilityCSSFileURL = $objStyle->getParentThemeCompatibilityCSSURL();
85-
$currentThemeCompatibilityCSSFileURL = $objStyle->getCurrentThemeCompatibilityCSSURL();
86-
$sitewideCSSFileURL = $objStyle->getSitewideCSSURL();
84+
$parentThemeCompatibilityCSS_FileURL = $objStyle->getParentThemeCompatibilityCSS_URL();
85+
$currentThemeCompatibilityCSS_FileURL = $objStyle->getCurrentThemeCompatibilityCSS_URL();
86+
$sitewideCSS_FileURL = $objStyle->getSitewideCSS_URL();
8787

8888
if($this->lang->isRTL())
8989
{
@@ -94,19 +94,19 @@ public function enqueueMandatoryStyles()
9494
}
9595

9696
// Register compatibility styles for further use
97-
if($parentThemeCompatibilityCSSFileURL != '')
97+
if($parentThemeCompatibilityCSS_FileURL != '')
9898
{
99-
wp_register_style($this->conf->getPluginURL_Prefix().'parent-theme-front-compatibility', $parentThemeCompatibilityCSSFileURL);
99+
wp_register_style($this->conf->getPluginURL_Prefix().'parent-theme-front-compatibility', $parentThemeCompatibilityCSS_FileURL);
100100
}
101-
if($currentThemeCompatibilityCSSFileURL != '')
101+
if($currentThemeCompatibilityCSS_FileURL != '')
102102
{
103-
wp_register_style($this->conf->getPluginURL_Prefix().'current-theme-front-compatibility', $currentThemeCompatibilityCSSFileURL);
103+
wp_register_style($this->conf->getPluginURL_Prefix().'current-theme-front-compatibility', $currentThemeCompatibilityCSS_FileURL);
104104
}
105105

106106
// Register plugin sitewide style for further use
107-
if($sitewideCSSFileURL != '')
107+
if($sitewideCSS_FileURL != '')
108108
{
109-
wp_register_style($this->conf->getPluginURL_Prefix().'front-sitewide', $sitewideCSSFileURL);
109+
wp_register_style($this->conf->getPluginURL_Prefix().'front-sitewide', $sitewideCSS_FileURL);
110110
}
111111

112112
// As these styles are mandatory, enqueue them here
@@ -154,10 +154,10 @@ public function registerStyles()
154154
wp_register_style('slick-theme', $this->conf->getRouting()->get3rdPartyAssetsURL('slick/slick-theme.css'));
155155

156156
// Register plugin local style for further use
157-
$localCSSFileURL = $objStyle->getLocalCSSURL();
158-
if($localCSSFileURL != '')
157+
$localCSS_FileURL = $objStyle->getLocalCSS_URL();
158+
if($localCSS_FileURL != '')
159159
{
160-
wp_register_style($this->conf->getPluginHandlePrefix().'main', $localCSSFileURL);
160+
wp_register_style($this->conf->getPluginHandlePrefix().'main', $localCSS_FileURL);
161161
}
162162
}
163163
}

‎Deals.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Plugin Name: Deals
44
* Plugin URI: https://wordpress.org/plugins/deals/
55
* Description: It’s a high quality, native and responsive WordPress plugin to create and view slider-based deals
6-
* Version: 6.1.8
6+
* Version: 6.1.9
77
* Author: KestutisIT
88
* Author URI: https://profiles.wordpress.org/KestutisIT
99
* Text Domain: deals
@@ -43,7 +43,7 @@ final class Deals
4343
const REQUIRED_PHP_VERSION = '5.6.0';
4444
const REQUIRED_WP_VERSION = 4.6;
4545
const OLDEST_COMPATIBLE_PLUGIN_SEMVER = '6.0.0';
46-
const PLUGIN_SEMVER = '6.1.8';
46+
const PLUGIN_SEMVER = '6.1.9';
4747

4848
// Settings
4949
/**

‎LICENSE‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎Models/Configuration/Configuration.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ public function __construct(
221221
// esc_url replaces ' and & chars with ' and & - but because we know that exact path,
222222
// we know it does not contains them, so we don't need to have two versions esc_url and esc_url_raw
223223
// Demo examples (__FILE__ = $this->pluginFolderAndFile):
224-
// 1. plugin_dir_url(__FILE__) => http://nativerental.com/wp-content/plugins/Deals/
224+
// 1. plugin_dir_url(__FILE__) => https://nativerental.com/wp-content/plugins/Deals/
225225
$this->pluginURL = esc_url(plugin_dir_url($this->pluginPathWithFilename));
226226

227227

‎Models/Deal/Deal.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public function save(array $params)
207207
$validUploadedImageFileName = '';
208208
if($_FILES['deal_image']['tmp_name'] != '')
209209
{
210-
$uploadedImageFileName = StaticFile::uploadImageFile($_FILES['deal_image'], $this->conf->getGlobalGalleryPathWithoutEndSlash(), "location_");
210+
$uploadedImageFileName = StaticFile::uploadImageFile($_FILES['deal_image'], $this->conf->getGlobalGalleryPathWithoutEndSlash(), "deal_");
211211
StaticFile::makeThumbnail($this->conf->getGlobalGalleryPath(), $uploadedImageFileName, $this->thumbWidth, $this->thumbHeight, "thumb_");
212212
$validUploadedImageFileName = esc_sql(sanitize_file_name($uploadedImageFileName)); // for sql query only
213213
}
@@ -258,7 +258,7 @@ public function save(array $params)
258258
$validUploadedImageFileName = '';
259259
if($_FILES['deal_image']['tmp_name'] != '')
260260
{
261-
$uploadedImageFileName = StaticFile::uploadImageFile($_FILES['deal_image'], $this->conf->getGlobalGalleryPathWithoutEndSlash(), "location_");
261+
$uploadedImageFileName = StaticFile::uploadImageFile($_FILES['deal_image'], $this->conf->getGlobalGalleryPathWithoutEndSlash(), "deal_");
262262
StaticFile::makeThumbnail($this->conf->getGlobalGalleryPath(), $uploadedImageFileName, $this->thumbWidth, $this->thumbHeight, "thumb_");
263263
$validUploadedImageFileName = esc_sql(sanitize_file_name($uploadedImageFileName)); // for sql query only
264264
}

‎Models/Routing/UI_Routing.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ public function getFrontLocalDevCSS_URL($paramRelativeURL_AndFile = '', $paramRe
387387

388388
public function getFrontSitewideCSS_URL($paramRelativeURL_AndFile = '', $paramReturnWithFileName = TRUE)
389389
{
390-
$folderURL = $this->getURL('Assets/Front/CSS/Compatibility/'.$paramRelativeURL_AndFile, FALSE).'Assets/Front/CSS/Compatibility/';
390+
$folderURL = $this->getURL('Assets/Front/CSS/Sitewide/'.$paramRelativeURL_AndFile, FALSE).'Assets/Front/CSS/Sitewide/';
391391

392392
return $folderURL.($paramReturnWithFileName === TRUE ? $paramRelativeURL_AndFile : '');
393393
}

‎Models/Style/Style.php‎

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ final class Style implements StyleInterface
1616
{
1717
private $conf = NULL;
1818
private $lang = NULL;
19-
private $debugMode = 0;
19+
private $debugMode = 0; // 0 - disabled, 1 - regular debug, 2+ - deep debug
2020
private $styleName = "";
2121
private $sitewideStyles = array();
2222
private $compatibilityStyles = array();
@@ -52,10 +52,12 @@ public function setSitewideStyles()
5252

5353
if($this->debugMode >= 2)
5454
{
55-
echo "<br />CSS FILES:<br />".var_export($cssFiles, TRUE);
56-
echo "<br />COMPATIBILITY STYLES: ".nl2br(print_r($this->compatibilityStyles, TRUE));
57-
echo "<br /><br />GLOBAL STYLES: ".nl2br(print_r($this->sitewideStyles, TRUE));
58-
55+
echo "<br /><br />---------------------------------------------------------------------------------";
56+
echo "<br /><strong>[setSitewideStyles()]</strong> \$cssFolderPath: {$cssFolderPath}</strong>";
57+
echo "<br /><strong>[setSitewideStyles()]</strong> \$cssFolderURL: {$cssFolderURL}</strong>";
58+
echo "<br /><strong>[setSitewideStyles()]</strong> CSS FILES:<br />".var_export($cssFiles, TRUE);
59+
echo "<br /><br /><strong>[setSitewideStyles()]</strong> SITEWIDE STYLES: ".nl2br(print_r($this->sitewideStyles, TRUE));
60+
echo "<br />---------------------------------------------------------------------------------";
5961
}
6062
}
6163

@@ -79,10 +81,12 @@ public function setCompatibilityStyles()
7981

8082
if($this->debugMode >= 2)
8183
{
82-
echo "<br />CSS FILES:<br />".var_export($cssFiles, TRUE);
83-
echo "<br />COMPATIBILITY STYLES: ".nl2br(print_r($this->compatibilityStyles, TRUE));
84-
echo "<br /><br />GLOBAL STYLES: ".nl2br(print_r($this->sitewideStyles, TRUE));
85-
84+
echo "<br /><br />---------------------------------------------------------------------------------";
85+
echo "<br /><strong>[setCompatibilityStyles()]</strong> \$cssFolderPath: {$cssFolderPath}</strong>";
86+
echo "<br /><strong>[setCompatibilityStyles()]</strong> \$cssFolderURL: {$cssFolderURL}</strong>";
87+
echo "<br /><strong>[setCompatibilityStyles()]</strong> CSS FILES:<br />".var_export($cssFiles, TRUE);
88+
echo "<br /><strong>[setCompatibilityStyles()]</strong> COMPATIBILITY STYLES: ".nl2br(print_r($this->compatibilityStyles, TRUE));
89+
echo "<br />---------------------------------------------------------------------------------";
8690
}
8791
}
8892

@@ -107,9 +111,12 @@ public function setLocalStyles()
107111

108112
if($this->debugMode >= 2)
109113
{
110-
echo "<br />CSS FILES:<br />".var_export($cssFiles, TRUE);
111-
echo "<br /><br />SYSTEM STYLES: ".nl2br(print_r($this->localStyles, TRUE));
112-
114+
echo "<br /><br />---------------------------------------------------------------------------------";
115+
echo "<br /><strong>[setLocalStyles()]</strong> \$cssFolderPath: {$cssFolderPath}</strong>";
116+
echo "<br /><strong>[setLocalStyles()]</strong> \$cssFolderURL: {$cssFolderURL}</strong>";
117+
echo "<br /><strong>[setLocalStyles()]</strong> CSS FILES:<br />".var_export($cssFiles, TRUE);
118+
echo "<br /><br /><strong>[setLocalStyles()]</strong> LOCAL STYLES: ".nl2br(print_r($this->localStyles, TRUE));
119+
echo "<br />---------------------------------------------------------------------------------";
113120
}
114121
}
115122

@@ -118,7 +125,7 @@ public function inDebug()
118125
return ($this->debugMode >= 1 ? TRUE : FALSE);
119126
}
120127

121-
public function getParentThemeCompatibilityCSSURL()
128+
public function getParentThemeCompatibilityCSS_URL()
122129
{
123130
// Get parent theme name
124131
$parentThemeName = "";
@@ -148,7 +155,7 @@ public function getParentThemeCompatibilityCSSURL()
148155
return $compatibilityFileURL;
149156
}
150157

151-
public function getCurrentThemeCompatibilityCSSURL()
158+
public function getCurrentThemeCompatibilityCSS_URL()
152159
{
153160
// Get current theme name
154161
$currentThemeName = "";
@@ -177,7 +184,7 @@ public function getCurrentThemeCompatibilityCSSURL()
177184
return $compatibilityFileURL;
178185
}
179186

180-
public function getSitewideCSSURL()
187+
public function getSitewideCSS_URL()
181188
{
182189
// Get the stylesheet file and it's path
183190
$selectedFileURL = '';
@@ -207,7 +214,7 @@ public function getSitewideCSSURL()
207214
return $fileURL;
208215
}
209216

210-
public function getLocalCSSURL()
217+
public function getLocalCSS_URL()
211218
{
212219
// Get the stylesheet file and it's path
213220
$selectedFileURL = '';

‎Models/Style/StyleInterface.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ public function setLocalStyles();
2626
public function inDebug();
2727

2828
// Getters
29-
public function getParentThemeCompatibilityCSSURL();
30-
public function getCurrentThemeCompatibilityCSSURL();
31-
public function getSitewideCSSURL();
32-
public function getLocalCSSURL();
29+
public function getParentThemeCompatibilityCSS_URL();
30+
public function getCurrentThemeCompatibilityCSS_URL();
31+
public function getSitewideCSS_URL();
32+
public function getLocalCSS_URL();
3333
}

‎Models/Update/Patches61Z.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ final class Patches61Z extends AbstractDatabase implements StackInterface, Datab
1717
{
1818
const CURRENT_MAJOR = 6; // Positive integer [X]
1919
const CURRENT_MINOR = 1; // Positive integer [Y]
20-
const LATEST_PATCH = 8; // Positive integer [Z]
20+
const LATEST_PATCH = 9; // Positive integer [Z]
2121
const LATEST_RELEASE = ''; // String
2222
const LATEST_BUILD_METADATA = ''; // String
2323
const PLUGIN_PREFIX = "deals_";

‎Models/Validation/StaticValidator.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@ public static function getUTC_ISO_DateByTimestamp($paramTimestamp)
675675
return $utcISO_Date;
676676
}
677677

678-
public static function getUTCTimestampFromLocalISODateTime($paramDate, $paramTime)
678+
public static function getUTC_TimestampFromLocalISO_DateTime($paramDate, $paramTime)
679679
{
680680
$UTCTimestamp = 0;
681681
$validISODate = static::getValidISO_Date($paramDate, 'Y-m-d');
@@ -695,9 +695,9 @@ public static function getUTCTimestampFromLocalISODateTime($paramDate, $paramTim
695695
/*
696696
* Appears that this function is useless in the NS and nowhere used
697697
* While my brains still think that I want to add timezone offset, appears that correct way is to subtract it
698-
* via getUTCTimestampFromLocalISODateTime($paramDate, $paramTime)
698+
* via getUTC_TimestampFromLocalISO_DateTime($paramDate, $paramTime)
699699
*/
700-
public static function getLocalTimestampFromUTC_ISODateTime($paramDate, $paramTime)
700+
public static function getLocalTimestampFromUTC_ISO_DateTime($paramDate, $paramTime)
701701
{
702702
$localTimestamp = 0;
703703
$validISODate = static::getValidISO_Date($paramDate, 'Y-m-d');

0 commit comments

Comments
 (0)