Skip to content

GitLab

V
vivio-swift
Commit 3aa1bbdf authored by Jordan Michaels's avatar Jordan Michaels
Browse files
Options

release 2020032401

parent 9a1400d7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 786 additions and 241 deletions
CHANGELOG.md
View file @ 3aa1bbdf
......@@ -2,11 +2,15 @@
Versions are recorded in YYYYMMDDnn format. Please include latest versions at the top.
## 2017112801
* Initial Release.
## 2020032401
* [UPGRADE] Added proper images for Vivio Swift Icons and Header images
* [FIX] A few minor layout issues have been corrected
* [NEW] Added Browser Caching feature using the Cache-Control header (requires Apache mod_header) - Issue 5
## 2018011901
* Initial alpha release for internal testing of caching system.
## 2018021901
* [UPGRADE] The Vivio Swift Preload Cache is now a non-blocking event, and runs quietly in the background - Issue 9
* [FIX] The Preload Cache process should now actually run on plugin activation - Issue 8
* [NEW] Vivio Swift now offers a Browser Cache option, which currently gives you control over the cache-control max-age HTTP Header.
## 2018021301
* [NEW] Update Vivio-Swift HTML footer message to state if page was not cached due to exclude rule - Issue 1
......@@ -14,6 +18,8 @@ Versions are recorded in YYYYMMDDnn format. Please include latest versions at th
* [NEW] Refresh Events now re-create preload cache if preload caching is enabled - Issue 7
* [NEW] The Preload Cache process should now run on plugin activation - Issue 8
## 2018021901
* [UPGRADE] The Vivio Swift Preload Cache is now a non-blocking event, and runs quietly in the background - Issue 9
* [FIX] The Preload Cache process should now actually run on plugin activation - Issue 8
## 2018011901
* Initial alpha release for internal testing of caching system.
## 2017112801
* Initial Release.
\ No newline at end of file
vivio-swift/admin/vivio-swift-admin-links.php 0 → 100644
View file @ 3aa1bbdf
<?php
class Vivio_Swift_Admin_Links
{
var $arr_links = array(
"help_mod_headers" => "https://kb.viviotech.net/display/KB/How+to+Install+mod_headers",
);
function get_link($name='')
{
return $this->arr_links[$name];
}
}
\ No newline at end of file
vivio-swift/admin/vivio-swift-admin.php
View file @ 3aa1bbdf
......@@ -42,7 +42,7 @@ class Vivio_Swift_Admin {
function create_admin_menus()
{
$vivio_swift_icon = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+PHN2ZyAgIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIiAgIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyIgICB4bWxuczpzdmc9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgICB4bWxuczpzb2RpcG9kaT0iaHR0cDovL3NvZGlwb2RpLnNvdXJjZWZvcmdlLm5ldC9EVEQvc29kaXBvZGktMC5kdGQiICAgeG1sbnM6aW5rc2NhcGU9Imh0dHA6Ly93d3cuaW5rc2NhcGUub3JnL25hbWVzcGFjZXMvaW5rc2NhcGUiICAgd2lkdGg9IjMwMG1tIiAgIGhlaWdodD0iMzAwbW0iICAgdmlld0JveD0iMCAwIDMwMCAzMDAiICAgdmVyc2lvbj0iMS4xIiAgIGlkPSJzdmc0ODQ0IiAgIGlua3NjYXBlOnZlcnNpb249IjAuOTIuMSByMTUzNzEiICAgc29kaXBvZGk6ZG9jbmFtZT0icGx1Z2luLWljb24uc3ZnIj4gIDxkZWZzICAgICBpZD0iZGVmczQ4MzgiIC8+ICA8c29kaXBvZGk6bmFtZWR2aWV3ICAgICBpZD0iYmFzZSIgICAgIHBhZ2Vjb2xvcj0iIzAwMDAwMCIgICAgIGJvcmRlcmNvbG9yPSIjNjY2NjY2IiAgICAgYm9yZGVyb3BhY2l0eT0iMS4wIiAgICAgaW5rc2NhcGU6cGFnZW9wYWNpdHk9IjAiICAgICBpbmtzY2FwZTpwYWdlc2hhZG93PSIyIiAgICAgaW5rc2NhcGU6em9vbT0iMC4yNDc0ODczNyIgICAgIGlua3NjYXBlOmN4PSIzMzQuOTU0OTQiICAgICBpbmtzY2FwZTpjeT0iNTYwIiAgICAgaW5rc2NhcGU6ZG9jdW1lbnQtdW5pdHM9Im1tIiAgICAgaW5rc2NhcGU6Y3VycmVudC1sYXllcj0ibGF5ZXIxIiAgICAgc2hvd2dyaWQ9ImZhbHNlIiAgICAgaW5rc2NhcGU6cGFnZWNoZWNrZXJib2FyZD0iZmFsc2UiICAgICBzaG93Ym9yZGVyPSJ0cnVlIiAgICAgYm9yZGVybGF5ZXI9InRydWUiICAgICBpbmtzY2FwZTpzaG93cGFnZXNoYWRvdz0iZmFsc2UiICAgICBpbmtzY2FwZTp3aW5kb3ctd2lkdGg9IjE4NTUiICAgICBpbmtzY2FwZTp3aW5kb3ctaGVpZ2h0PSIxMDU2IiAgICAgaW5rc2NhcGU6d2luZG93LXg9IjE5ODUiICAgICBpbmtzY2FwZTp3aW5kb3cteT0iMjQiICAgICBpbmtzY2FwZTp3aW5kb3ctbWF4aW1pemVkPSIxIiAvPiAgPG1ldGFkYXRhICAgICBpZD0ibWV0YWRhdGE0ODQxIj4gICAgPHJkZjpSREY+ICAgICAgPGNjOldvcmsgICAgICAgICByZGY6YWJvdXQ9IiI+ICAgICAgICA8ZGM6Zm9ybWF0PmltYWdlL3N2Zyt4bWw8L2RjOmZvcm1hdD4gICAgICAgIDxkYzp0eXBlICAgICAgICAgICByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIiAvPiAgICAgICAgPGRjOnRpdGxlPjwvZGM6dGl0bGU+ICAgICAgPC9jYzpXb3JrPiAgICA8L3JkZjpSREY+ICA8L21ldGFkYXRhPiAgPGcgICAgIGlua3NjYXBlOmxhYmVsPSJMYXllciAxIiAgICAgaW5rc2NhcGU6Z3JvdXBtb2RlPSJsYXllciIgICAgIGlkPSJsYXllcjEiICAgICB0cmFuc2Zvcm09InRyYW5zbGF0ZSgwLDMpIj4gICAgPGcgICAgICAgaWQ9Imc1NDIzIiAgICAgICB0cmFuc2Zvcm09Im1hdHJpeCgzLjYzNzc5MzYsMCwwLDMuNjM3NzkzNiwtMjM3Ljg5NzM4LC0zNTYuMzg3MDgpIj4gICAgICA8ZyAgICAgICAgIHN0eWxlPSJmaWxsOiNlZWVlZWU7ZmlsbC1vcGFjaXR5OjEiICAgICAgICAgdHJhbnNmb3JtPSJtYXRyaXgoMC4zMzA3MjkxNywwLDAsLTAuMzMwNzI5MTcsNDUuNjcxNDgzLDI0Ny4wNDE2NSkiICAgICAgICAgaWQ9ImcyOTk1Ij4gICAgICAgIDxnICAgICAgICAgICBzdHlsZT0iZmlsbDojZWVlZWVlO2ZpbGwtb3BhY2l0eToxIiAgICAgICAgICAgaWQ9ImcyOTk3Ij4gICAgICAgICAgPGcgICAgICAgICAgICAgc3R5bGU9ImZpbGw6I2VlZWVlZTtmaWxsLW9wYWNpdHk6MSIgICAgICAgICAgICAgaWQ9ImczMDAzIj4gICAgICAgICAgICA8ZyAgICAgICAgICAgICAgIHN0eWxlPSJmaWxsOiNlZWVlZWU7ZmlsbC1vcGFjaXR5OjEiICAgICAgICAgICAgICAgaWQ9ImczMDA1Ij4gICAgICAgICAgICAgIDxwYXRoICAgICAgICAgICAgICAgICBpZD0icGF0aDMwMTMiICAgICAgICAgICAgICAgICB0cmFuc2Zvcm09Im1hdHJpeCgwLjgsMCwwLC0wLjgsNDgsNjEyLjAwMDEzKSIgICAgICAgICAgICAgICAgIGQ9Im0gMTU0LjY0NDUzLDIwMi41NDg4MyBjIC00NS44MjI1LDAgLTg2Ljg5NjQwMSwyMC4zMjk4OCAtMTE0LjY5NTMxMSw1Mi40NjA5NCAzLjY0NjM0NiwxNC4xMzQyOCA3LjQ0NzkyMywzNy42MzMyIDcuOTY2Nzk3LDc0Ljk5MDIzIDguMTEsLTM4LjA1NjI1IDE5LjEyODQzNywtODEuMjgxODggOTQuNjE3MTg0LC0xMjUuNTc4MTIgNzQuNTUsNDEuODI3NDkgODEuMjE2OCwxMTQuMzI4MTIgNTEuMjE2OCwxNzkuMzI4MTIgMjEuODM1LC0zOC42Nzg3NSA4MCwtNDAuODMzOTggODAsLTQwLjgzMzk4IDcuMzM4MDcsNzkuOTA0MjEgLTUzLjEzNjkzLDE2My43Nzk2MyAtMTQ3Ljk3NjU2LDE2MC4wNzgxMiA5LjM0NzMxLDEuODAyMzggMTguOTk3NTYsMi43NTc4MSAyOC44NzEwOSwyLjc1NzgxIDgzLjcyNzUsMCAxNTEuNjAxNTYsLTY3Ljg3MjExIDE1MS42MDE1NiwtMTUxLjU5OTYxIDAsLTgzLjcyNzUgLTY3Ljg3NDA2LC0xNTEuNjAzNTEgLTE1MS42MDE1NiwtMTUxLjYwMzUxIHoiICAgICAgICAgICAgICAgICBzdHlsZT0iZmlsbDojZWVlZWVlO2ZpbGwtb3BhY2l0eToxO3N0cm9rZTpub25lO3N0cm9rZS13aWR0aDoxLjI1IiAgICAgICAgICAgICAgICAgaW5rc2NhcGU6Y29ubmVjdG9yLWN1cnZhdHVyZT0iMCIgLz4gICAgICAgICAgICA8L2c+ICAgICAgICAgIDwvZz4gICAgICAgIDwvZz4gICAgICA8L2c+ICAgICAgPGcgICAgICAgICBzdHlsZT0iZmlsbDojZWVlZWVlO2ZpbGwtb3BhY2l0eToxIiAgICAgICAgIHRyYW5zZm9ybT0ibWF0cml4KDAuMzMwNzI5MTcsMCwwLC0wLjMzMDcyOTE3LDQ1LjY3MTQ4MywyNDcuMDQxNjUpIiAgICAgICAgIGlkPSJnMzAzMSI+ICAgICAgICA8ZyAgICAgICAgICAgc3R5bGU9ImZpbGw6I2VlZWVlZTtmaWxsLW9wYWNpdHk6MSIgICAgICAgICAgIGlkPSJnMzAzMyI+ICAgICAgICAgIDxnICAgICAgICAgICAgIHN0eWxlPSJmaWxsOiNlZWVlZWU7ZmlsbC1vcGFjaXR5OjEiICAgICAgICAgICAgIGlkPSJnMzAzOSI+ICAgICAgICAgICAgPGcgICAgICAgICAgICAgICBzdHlsZT0iZmlsbDojZWVlZWVlO2ZpbGwtb3BhY2l0eToxIiAgICAgICAgICAgICAgIGlkPSJnMzA0MSI+ICAgICAgICAgICAgICA8cGF0aCAgICAgICAgICAgICAgICAgc29kaXBvZGk6bm9kZXR5cGVzPSJjY2NjY2NjY2NjY2NjIiAgICAgICAgICAgICAgICAgaW5rc2NhcGU6Y29ubmVjdG9yLWN1cnZhdHVyZT0iMCIgICAgICAgICAgICAgICAgIGlkPSJwYXRoMzA0OSIgICAgICAgICAgICAgICAgIHN0eWxlPSJmaWxsOiNlZWVlZWU7ZmlsbC1vcGFjaXR5OjE7c3Ryb2tlOm5vbmUiICAgICAgICAgICAgICAgICBkPSJNIDE2Mi43MDMyNiw0NDMuNzI1NDggWiBNIDEyNS4zMzMsMTY1LjgzMyB2IDAgQyAxMzAuNTE0LDE1Ny45MTggMTM0LDE0OC41IDEzNCwxNDguNSB2IDAgbCA3LjA2OSw4LjU3NCBjIDAsMCAtNTcuNDYxLDU5LjEzMyA1LjI2NSwxNDIuOTI2IHYgMCBjIDQ4LjQ5OSw2NC43ODggMjQuMDI5MjYsMTI3Ljk5ODQ4IDE2LjM2OTI2LDE0My43MjU0OCB2IDAgQyAxNjUuMzQyMjYsNDM3LjQwOTQ4IDE5My4xMywzNjguNzc0IDE0My4wNjQsMzA0LjAwNyA4OS4zMzQsMjM0LjUgMTE5LjMzMywxNzUuMDAxIDEyNS4zMzMsMTY1LjgzMyBaIiAvPiAgICAgICAgICAgIDwvZz4gICAgICAgICAgPC9nPiAgICAgICAgPC9nPiAgICAgIDwvZz4gICAgPC9nPiAgPC9nPjwvc3ZnPg==';
$vivio_swift_icon = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAOxAAADsQBlSsOGwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAFcSURBVDiNjZPPSlVRGMV/31URJBFNsSuikIo0CEMEBzUIctQgcJgKPkMvEL6AQ0eizhrYMATBWVOf4Oo1JALDQQimIdn9NbjnyOm0D7gmm/19a6299r8gAbUDeAk8BbqABvA5Ii5S/CTUQXVF3VVv1Wt1Q+2vEkyr0xW9Z2rTNprqZJkwrH5TW+q++jxhMqpeZiYnal+xueP/WE+YzKtv1Lfqu7w4pP5OGKjWK7b0JEvci7qcELbUtQrxQ/U0473uBCZKnF/AakR8TBkAP4CvwDjwuAa0Cs0G8CIXq93qnBo5ISIEPmXTWg04Bf4A68AscKQuqbvAOXAIvC+l+HI3qnX1g7qgbheuqogr9UHhHBbzWmdEnKk3wEHFngF6gDpwnM1ngJ2I+Jk7PlK/V1xljqlCgk114J8lbD/Xs3sajCRzZuexZfvzlDGa0kSqmMV7BYxlpSawFxG3Ze5fNDWhFVEs0JAAAAAASUVORK5CYII=';
$this->main_menu_page = add_menu_page(__('Vivio Swift', 'vivio-swift'), __('Vivio Swift', 'vivio-swift'), VIVIO_SWIFT_CAPABILITY, VIVIO_SWIFT_MAIN_MENU_SLUG , array(&$this, 'handle_dashboard_menu_rendering'), $vivio_swift_icon);
add_submenu_page(VIVIO_SWIFT_MAIN_MENU_SLUG, __('Dashboard', 'vivio-swift'), __('Dashboard', 'vivio-swift') , VIVIO_SWIFT_CAPABILITY, VIVIO_SWIFT_MAIN_MENU_SLUG, array(&$this, 'handle_dashboard_menu_rendering'));
add_submenu_page(VIVIO_SWIFT_MAIN_MENU_SLUG, __('Cache', 'vivio-swift'), __('Cache', 'vivio-swift') , VIVIO_SWIFT_CAPABILITY, VIVIO_SWIFT_CACHE_MENU_SLUG, array(&$this, 'handle_cache_menu_rendering'));
......
vivio-swift/admin/vivio-swift-dashboard-menu.php
View file @ 3aa1bbdf
......@@ -3,9 +3,7 @@
class Vivio_Swift_Dashboard_Menu extends Vivio_Swift_Admin_Messages
{
var $dashboard_menu_page_slug = VIVIO_SWIFT_MAIN_MENU_SLUG;
var $menu_tabs;
var $menu_tabs_handler = array(
'tab1' => 'render_tab1',
'tab2' => 'render_tab2',
......@@ -17,6 +15,8 @@ class Vivio_Swift_Dashboard_Menu extends Vivio_Swift_Admin_Messages
function __construct()
{
require_once('vivio-swift-admin-links.php');
$this->links = new Vivio_Swift_Admin_Links;
$this->render_menu_page();
}
......@@ -54,6 +54,13 @@ class Vivio_Swift_Dashboard_Menu extends Vivio_Swift_Admin_Messages
echo '</h2>';
}
function render_notifications()
{
global $vivio_swift_global;
// TODO check for global messages and post them here.
}
/*
* The menu rendering goes here
*/
......@@ -78,7 +85,7 @@ class Vivio_Swift_Dashboard_Menu extends Vivio_Swift_Admin_Messages
function render_tab1()
{
echo '<div class="message_standard">';
echo '<div class="message_success">';
echo '<p>' . __('Thank you for trying Vivio Swift (beta). Please report bugs or issues <a href="https://viviotech.net/contactus.html" target="_blank">HERE</a>.', 'vivio-swift') . '</p>';
echo '<p><a href="https://twitter.com/viviotech/" target="_blank">' . __('Follow us on Twitter', 'vivio-swift') . '</a> ' . __('to stay up to date on new and improved features of this plugin.', 'vivio-swift') . '</p>';
echo '</div>';
......@@ -135,6 +142,7 @@ class Vivio_Swift_Dashboard_Menu extends Vivio_Swift_Admin_Messages
// set and save submitted settings
$vivio_swift_global->configs->set_value('vivio_swift_cache_enabled',isset($_POST["vivio_swift_cache_enabled"])?'1':'');
$vivio_swift_global->configs->set_value('vivio_swift_preload_cache_enabled',isset($_POST["vivio_swift_preload_cache_enabled"])?'1':'');
$vivio_swift_global->configs->set_value('vivio_swift_cache_control_headers_enable',isset($_POST["vivio_swift_cache_control_headers_enable"])?'1':'');
$vivio_swift_global->configs->save_config();
$this->show_msg_settings_updated();
......@@ -145,7 +153,7 @@ class Vivio_Swift_Dashboard_Menu extends Vivio_Swift_Admin_Messages
<div class="dashboard_box_small">
<div class="postbox">
<h3 class="hndle">
<label for="title"><?php _e('Quick Cache', 'vivio-swift');?></label>
<label for="title"><?php _e('Quick Settings', 'vivio-swift');?></label>
</h3>
<div class="inside">
......@@ -174,6 +182,17 @@ class Vivio_Swift_Dashboard_Menu extends Vivio_Swift_Admin_Messages
</label>
</td>
</tr>
<tr valign="top">
<th scope="row"><?php _e('Browser Cache', 'vivio-swift')?>:</th>
<td>
<label class="switch">
<input name="vivio_swift_cache_control_headers_enable"
id="vivio_swift_cache_control_headers_enable"
type="checkbox"<?php if($vivio_swift_global->configs->get_value('vivio_swift_cache_control_headers_enable')=='1') echo ' checked="checked"'; ?> value="1"/>
<span class="slider round"></span>
</label>
</td>
</tr>
</table>
<input type="submit" name="vivio_swift_cache_dashboard_submit" id="vivio_swift_cache_dashboard_submit" value="<?php _e('Save Settings', 'vivio-swift')?>" class="pure-button" />
</form>
......@@ -248,8 +267,8 @@ class Vivio_Swift_Dashboard_Menu extends Vivio_Swift_Admin_Messages
<div class="inside">
<p><?php _e('Has this plugin helped you? Let others know!', 'vivio-swift');?></p>
<p><a href="https://www.facebook.com/viviotech" target="_blank">Like us on Facebook</a></p>
<p><a href="http://twitter.com/intent/tweet?url=https://viviotech.net/&text=Using the Vivio Swift Wordpress plugin from @viviotech has really helped speed up my site! Check it out!" target="_blank">Post to Twitter</a></p>
<p><a href="#" target="_blank">Give a Good Rating on Wordpress</a></p>
<p><a href="https://twitter.com/intent/tweet?url=https://viviotech.net/&text=Using the Vivio Swift Wordpress plugin from @viviotech has really helped speed up my site! Check it out!" target="_blank">Post to Twitter</a></p>
<p><a href="https://wordpress.org/support/plugin/vivio-swift" target="_blank">Give a Good Rating on Wordpress</a></p>
</div>
</div>
</div>
......@@ -273,7 +292,6 @@ class Vivio_Swift_Dashboard_Menu extends Vivio_Swift_Admin_Messages
<?php
}
function render_tab2()
{
......@@ -305,7 +323,26 @@ class Vivio_Swift_Dashboard_Menu extends Vivio_Swift_Admin_Messages
: </strong><code><?php echo VIVIO_SWIFT_CACHE_BOT_NAME; ?></code><br/>
</div>
</div><!-- End of Site Info -->
</div>
<div class="postbox">
<h3 class="hndle">
<label for="title"><?php _e('Apache Environment', 'vivio-swift');?></label>
</h3>
<div class="inside">
<strong><?php _e('VERSION', 'vivio-swift');?>
: </strong><code><?php echo ($vivio_swift_global->util_apache->apache_version()) ? $vivio_swift_global->util_apache->apache_version() : "Unknown"; ?></code>
<?php if(!$vivio_swift_global->util_apache->apache_version()){echo '<font color="red">WARNING</font>';} ?><br/>
<strong><?php _e('mod_rewrite', 'vivio-swift');?>
: </strong><code><?php echo ($vivio_swift_global->util_apache->test_mod_rewrite()) ? "Yes" : "Unknown"; ?></code>
<?php if(!$vivio_swift_global->util_apache->test_mod_rewrite()){echo '<font color="red">WARNING</font>';} ?><br/>
<strong><?php _e('mod_headers', 'vivio-swift');?>
: </strong><code><?php echo ($vivio_swift_global->util_apache->test_mod_headers()) ? "Yes" : "Unknown"; ?></code>
<?php if(!$vivio_swift_global->util_apache->test_mod_headers()){echo '<font color="red">WARNING</font> <a href="'.$this->links->get_link("help_mod_headers").'" target="_blank" style="text-decoration: none;"><span class="dashicons dashicons-editor-help"></span></a>';} ?><br/>
</div>
</div>
<div class="postbox">
<h3 class="hndle">
......@@ -333,14 +370,14 @@ class Vivio_Swift_Dashboard_Menu extends Vivio_Swift_Admin_Messages
<strong>CURL <?php _e('Library Present', 'vivio-swift');?>
: </strong><code><?php echo (function_exists('curl_init')) ? "Yes" : "No"; ?></code><br/>
<strong><?php _e('Debug File Write Permissions', 'vivio-swift');?>
: </strong><code><?php echo (is_writable(VIVIO_SWIFT_PATH)) ? "Writable" : "Not Writable"; ?></code><br/>
: </strong><code><?php echo (is_writable(VIVIO_SWIFT_PATH."/logs/".VIVIO_SWIFT_LOG_FILE)) ? "Writable</code>" : "Not Writable</code> "."<font color='red'>WARNING</font>" ?><br/>
</div>
</div><!-- End of Site Info -->
</div>
<div class="postbox">
<h3 class="hndle">
<label for="title"><?php _e('PHP Info', 'vivio-swift');?></label>
<label for="title"><?php _e('PHP Environment', 'vivio-swift');?></label>
</h3>
<div class="inside">
......@@ -726,6 +763,8 @@ class Vivio_Swift_Dashboard_Menu extends Vivio_Swift_Admin_Messages
</form>
</div>
</div>
<?php
}
......@@ -791,11 +830,10 @@ class Vivio_Swift_Dashboard_Menu extends Vivio_Swift_Admin_Messages
$vivio_swift_global->debug_logger->reset_log_file('1');
//$vivio_swift_global->debug_logger->reset_log_file('2');//cron
$preload_enabled = ($this->configs->get_value('vivio_swift_preload_cache_enabled')=='1')?true:false;
$preload_enabled = ($vivio_swift_global->configs->get_value('vivio_swift_preload_cache_enabled')=='1')?true:false;
if ($preload_enabled){wp_schedule_single_event(time(), 'vivio_swift_schedule_preload_cache');}
$this->show_msg_settings_updated();
}
?>
<div class="postbox">
......
vivio-swift/admin/vivio-swift-exclusions-menu.php
View file @ 3aa1bbdf
......@@ -377,6 +377,45 @@ class Vivio_Swift_Exclusions_Menu extends Vivio_Swift_Admin_Messages
</form>
</div>
</div>
<div class="postbox closed">
<h3 class="hndle">
<label for="title"><?php _e('Cookie Viewer', 'vivio-swift');?></label><small style="margin-left: 20px;"><?php _e('[Show/Hide]', 'vivio-swift');?></small>
</h3>
<div class="inside">
<form action="" method="POST">
<?php wp_nonce_field('vivio_swift_cookie_viewer_nonce'); ?>
<table class="widefat">
<thead>
<tr>
<th><?php _e('Cookie Name (sanitized)', 'vivio-swift') ?></th>
<!-- <th><?php _e('Delete', 'vivio-swift') ?></th> -->
</tr>
</thead>
<tbody>
<?php
foreach ((array)$_COOKIE as $cookie_key => $cookie_value){
echo '<tr>';
echo '<td class="pattern_cell">' . sanitize_text_field($cookie_key) . "</td>";
//echo '<td class="action_cell"><button name="vivio_swift_delete_cookie" class="pure-button button-error" type="submit"';
//echo 'value="'.sanitize_text_field($cookie_key).'"';
//echo '>';
//echo '<span class="dashicons dashicons-no"></span></button></td>';
echo '</tr>';
}
?>
</tbody>
<tfoot>
<tr>
<th><?php _e('Cookie Name (sanitized)', 'vivio-swift') ?></th>
<!-- <th><?php _e('Delete', 'vivio-swift') ?></th> -->
</tr>
</tfoot>
</table>
</form>
</div>
</div>
</div>
<?php
}
......@@ -646,7 +685,7 @@ class Vivio_Swift_Exclusions_Menu extends Vivio_Swift_Admin_Messages
id="vivio_swift_path_is_value"
name="vivio_swift_path_is_value"
value=""
/>/
/>
<button type="submit" name="vivio_swift_add_path_is">Add</button>
<span class="description"><?php _e('A URL whos path is this value will not use cache.', 'vivio-swift'); ?></span>
</td>
......@@ -813,6 +852,7 @@ class Vivio_Swift_Exclusions_Menu extends Vivio_Swift_Admin_Messages
<tr valign="top">
<th scope="row"><?php _e('Add New', 'vivio-swift')?>:</th>
<td>
<?php echo get_bloginfo('wpurl').'/*filename' ?>
<input type="text" size="10"
id="vivio_swift_path_ends_with_value"
name="vivio_swift_path_ends_with_value"
......@@ -822,7 +862,6 @@ class Vivio_Swift_Exclusions_Menu extends Vivio_Swift_Admin_Messages
<span class="description"><?php _e('A URL whos path is this value will not use cache.', 'vivio-swift'); ?></span>
</td>
</tr>
</table>
<table class="widefat">
<thead>
......
vivio-swift/classes/vivio-swift-cache-preload.php
View file @ 3aa1bbdf
......@@ -3,7 +3,7 @@ class Vivio_Swift_Cache_Preload
{
function __construct()
{
add_action('vivio_swift_schedule_preload_cache', array(&$this, 'schedule_create_preload_cache'));
//add_action('vivio_swift_schedule_preload_cache', array(&$this, 'schedule_create_preload_cache'));
}
function enable()
......@@ -196,12 +196,14 @@ class Vivio_Swift_Cache_Preload
// scheduled task for Vivio_Swift_Cron()
function schedule_create_preload_cache()
{
/*
global $vivio_swift_global;
$vivio_swift_global->debug_logger->log_debug("Vivio_Swift_Cache_Preload::schedule_create_preload_cache() - running scheduled preload cache...", 2);
$preload_enabled = ($vivio_swift_global->configs->get_value('vivio_swift_preload_cache_enabled')=='1')?true:false;
if ($preload_enabled){
$vivio_swift_global->cache_obj->create_preload_cache(1);
}
*/
}
}
\ No newline at end of file
vivio-swift/classes/vivio-swift-config-settings.php
View file @ 3aa1bbdf
......@@ -29,7 +29,7 @@ class Vivio_Swift_Config_Settings
$vivio_swift_global->configs->add_value('vivio_swift_preload_last_run_date','');
// htaccess rules
$vivio_swift_global->configs->add_value('vivio_swift_place_custom_rules_at_top','');//Checkbox
$vivio_swift_global->configs->add_value('vivio_swift_cache_custom_rules_at_top','');//Checkbox
$vivio_swift_global->configs->add_value('vivio_swift_cache_exclude_posts','1');//Checkbox
$vivio_swift_global->configs->add_value('vivio_swift_cache_exclude_query_strings','1');//Checkbox
$vivio_swift_global->configs->add_value('vivio_swift_cache_exclude_cookie_contains','1');//Checkbox
......@@ -39,18 +39,23 @@ class Vivio_Swift_Config_Settings
$vivio_swift_global->configs->add_value('vivio_swift_cache_exclude_path_is','');//Checkbox
$vivio_swift_global->configs->add_value('vivio_swift_cache_exclude_path_is_values',array());//array list
$vivio_swift_global->configs->add_value('vivio_swift_cache_exclude_path_ends_with','');//Checkbox
$vivio_swift_global->configs->add_value('vivio_swift_cache_exclude_path_ends_with_values',array('.html','.png','.jpg','.jpeg','.gif','.xml','.json'));//array list
$vivio_swift_global->configs->add_value('vivio_swift_cache_exclude_path_ends_with_values',array('.html','.png','.jpg','.jpeg','.gif','.ico','.svg','.xml','.json'));//array list
$vivio_swift_global->configs->add_value('vivio_swift_cache_exclude_path_contains','');//Checkbox
$vivio_swift_global->configs->add_value('vivio_swift_cache_exclude_path_contains_values',array());//array list
$vivio_swift_global->configs->add_value('vivio_swift_cache_enable_custom_rules','');//Checkbox
$vivio_swift_global->configs->add_value('vivio_swift_cache_custom_rules_values',array());//array list
// htaccess cache-control
$vivio_swift_global->configs->add_value('vivio_swift_cache_control_headers_enable','0');//Checkbox
$vivio_swift_global->configs->add_value('vivio_swift_cache_control_headers_values',Vivio_Swift_Config_Settings::default_cache_control_groups());
// Compression options
$vivio_swift_global->configs->add_value('vivio_swift_minify_css','');//Checkbox
$vivio_swift_global->configs->add_value('vivio_swift_minify_js','');//Checkbox
$vivio_swift_global->configs->add_value('vivio_swift_minify_html','');//Checkbox
$vivio_swift_global->configs->add_value('vivio_swift_combine_css','1');//Checkbox
$vivio_swift_global->configs->add_value('vivio_swift_combine_js','1');//Checkbox
$vivio_swift_global->configs->add_value('vivio_swift_compress_minify_css','');//Checkbox
$vivio_swift_global->configs->add_value('vivio_swift_compress_minify_js','');//Checkbox
$vivio_swift_global->configs->add_value('vivio_swift_compress_minify_html','');//Checkbox
$vivio_swift_global->configs->add_value('vivio_swift_compress_combine_css','1');//Checkbox
$vivio_swift_global->configs->add_value('vivio_swift_compress_combine_js','1');//Checkbox
// refresh events
$vivio_swift_global->configs->add_value('vivio_swift_refresh_on_post_new','1');//Checkbox
......@@ -87,7 +92,7 @@ class Vivio_Swift_Config_Settings
$vivio_swift_global->configs->set_value('vivio_swift_preload_last_run_date','');
//htaccess rules
$vivio_swift_global->configs->set_value('vivio_swift_place_custom_rules_at_top','');//Checkbox
$vivio_swift_global->configs->set_value('vivio_swift_cache_custom_rules_at_top','');//Checkbox
$vivio_swift_global->configs->set_value('vivio_swift_cache_exclude_posts','1');//Checkbox
$vivio_swift_global->configs->set_value('vivio_swift_cache_exclude_query_strings','1');//Checkbox
$vivio_swift_global->configs->set_value('vivio_swift_cache_exclude_cookie_contains','1');//Checkbox
......@@ -97,18 +102,22 @@ class Vivio_Swift_Config_Settings
$vivio_swift_global->configs->set_value('vivio_swift_cache_exclude_path_is','');//Checkbox
$vivio_swift_global->configs->set_value('vivio_swift_cache_exclude_path_is_values',array());//array list
$vivio_swift_global->configs->set_value('vivio_swift_cache_exclude_path_ends_with','');//Checkbox
$vivio_swift_global->configs->set_value('vivio_swift_cache_exclude_path_ends_with_values',array('.html','.png','.jpg','.jpeg','.gif','.xml','.json'));//array list
$vivio_swift_global->configs->set_value('vivio_swift_cache_exclude_path_ends_with_values',array('.html','.png','.jpg','.jpeg','.gif','.ico','.svg','.xml','.json'));//array list
$vivio_swift_global->configs->set_value('vivio_swift_cache_exclude_path_contains','');//Checkbox
$vivio_swift_global->configs->set_value('vivio_swift_cache_exclude_path_contains_values',array());//array list
$vivio_swift_global->configs->set_value('vivio_swift_cache_enable_custom_rules','');//Checkbox
$vivio_swift_global->configs->set_value('vivio_swift_cache_custom_rules_values',array());//array list
// htaccess cache-control
$vivio_swift_global->configs->set_value('vivio_swift_cache_control_headers_enable','0');//Checkbox
$vivio_swift_global->configs->set_value('vivio_swift_cache_control_headers_values',Vivio_Swift_Config_Settings::default_cache_control_groups());
// Compression options
$vivio_swift_global->configs->set_value('vivio_swift_minify_css','');//Checkbox
$vivio_swift_global->configs->set_value('vivio_swift_minify_js','');//Checkbox
$vivio_swift_global->configs->set_value('vivio_swift_minify_html','');//Checkbox
$vivio_swift_global->configs->set_value('vivio_swift_combine_css','1');//Checkbox
$vivio_swift_global->configs->set_value('vivio_swift_combine_js','1');//Checkbox
$vivio_swift_global->configs->set_value('vivio_swift_compress_minify_css','');//Checkbox
$vivio_swift_global->configs->set_value('vivio_swift_compress_minify_js','');//Checkbox
$vivio_swift_global->configs->set_value('vivio_swift_compress_minify_html','');//Checkbox
$vivio_swift_global->configs->set_value('vivio_swift_compress_combine_css','1');//Checkbox
$vivio_swift_global->configs->set_value('vivio_swift_compress_combine_js','1');//Checkbox
// refresh events
$vivio_swift_global->configs->set_value('vivio_swift_refresh_on_post_new','1');//Checkbox
......@@ -120,4 +129,31 @@ class Vivio_Swift_Config_Settings
$vivio_swift_global->configs->save_config();
}
static function default_cache_control_groups()
{
$groups = array(
0 => [ 'name' => 'Image Files',
'max-age' => '2419200', // 1 month
'enable-cache' => '1',
'extensions' => array('png','jpg','jpeg','gif','ico','svg')
],
1 => [ 'name' => 'Static Files',
'max-age' => '604800', // 1 week
'enable-cache' => '1',
'extensions' => array('css','js','pdf','txt','csv')
],
2 => [ 'name' => 'HTML Files',
'max-age' => '86400', // 1 day
'enable-cache' => '1',
'extensions' => array('html','htm')
],
3 => [ 'name' => 'Dynamic Files',
'max-age' => '0', // no cache
'enable-cache' => '0',
'extensions' => array('php')
]
);
return $groups;
}
}
\ No newline at end of file
vivio-swift/classes/vivio-swift-logger.php
View file @ 3aa1bbdf
......@@ -73,9 +73,14 @@ class Vivio_Swift_Logger
{
if(empty($file_name))$file_name = $this->default_log_file;
$debug_log_file = $this->log_folder_path.'/'.$file_name;
$fp=fopen($debug_log_file,'a');
fwrite($fp, $content);
fclose($fp);
if (is_writeable($debug_log_file)){
$fp=fopen($debug_log_file,'a');
fwrite($fp, $content);
fclose($fp);
return true;
} else {
return false;
}
}
function reset_log_file($file_name='')
......@@ -85,9 +90,14 @@ class Vivio_Swift_Logger
if($file_name=='2')$file_name = $this->default_log_file_cron;
$debug_log_file = $this->log_folder_path.'/'.$file_name;
$content = $this->get_debug_timestamp().$this->log_reset_marker;
$fp=fopen($debug_log_file,'w');
fwrite($fp, $content);
fclose($fp);
if (is_writeable($debug_log_file)){
$fp=fopen($debug_log_file,'w');
fwrite($fp, $content);
fclose($fp);
return true;
} else {
return false;
}
}
function log_debug($message,$level=0,$section_break=false,$file_name='')
......
vivio-swift/classes/vivio-swift-utility-apache.php 0 → 100644
View file @ 3aa1bbdf
<?php
class Vivio_Swift_Utility_Apache {
function __construct()
{
}
function apache_version()
{
return apache_get_version();
}
function apache_module_exists($module)
{
return in_array($module, apache_get_modules());
}
function test_required_modules()
{
$has_mod_rewrite = $this->test_mod_rewrite();
$has_mod_headers = $this->test_mod_headers();
}
function test_mod_rewrite()
{
return $this->apache_module_exists('mod_rewrite');
}
function test_mod_headers()
{
return $this->apache_module_exists('mod_headers');
}
}
\ No newline at end of file
vivio-swift/classes/vivio-swift-utility-htaccess.php
View file @ 3aa1bbdf
......@@ -4,6 +4,9 @@ class Vivio_Swift_Utility_Htaccess
{
//The following variables hold the markers for each of features added to the .htacces file
//This enables us to locate blocks of code when a feature needs to be removed.
public static $vivio_swift_excludes_marker_start = '# BEGIN Excludes';
public static $vivio_swift_excludes_marker_end = '# END Excludes';
public static $vivio_swift_basics_marker_start = '# BEGIN Basics';
public static $vivio_swift_basics_marker_end = '# END Basics';
......@@ -31,6 +34,9 @@ class Vivio_Swift_Utility_Htaccess
public static $vivio_swift_custom_rules_start = '# BEGIN Custom Rules';
public static $vivio_swift_custom_rules_end = '# END Custom Rules';
public static $vivio_swift_cachecontrol_marker_start = '# BEGIN Cache-Control';
public static $vivio_swift_cachecontrol_marker_end = '# END Cache-Control';
function __construct()
{
......@@ -170,7 +176,41 @@ class Vivio_Swift_Utility_Htaccess
global $vivio_swift_global;
$rules = '';
$rules .= $vivio_swift_global->util_htaccess->getrules_basics();
$rules .= $vivio_swift_global->util_htaccess->getrules_excludes();
$rules .= $vivio_swift_global->util_htaccess->getrules_cachecontrol();
// Add opener and closer
if ($rules != '') {
$rules = $vivio_swift_global->util_htaccess->getrules_opener() . $rules . $vivio_swift_global->util_htaccess->getrules_closer();
}
return $rules;
}
static function getrules_opener()
{
$date = new DateTime();
$rules = '';
$rules .= "# BEGIN Vivio Swift [" . $date->format('Y-m-d H:i:s') . "]" . PHP_EOL;
return $rules;
}
static function getrules_closer()
{
$rules = '';
$rules .= "# END Vivio Swift" . PHP_EOL;
return $rules;
}
static function getrules_excludes()
{
global $vivio_swift_global;
$rules = '';
$rules .= $vivio_swift_global->util_htaccess->getrules_exclude_basics();
$rules .= $vivio_swift_global->util_htaccess->getrules_exclude_posts();
$rules .= $vivio_swift_global->util_htaccess->getrules_exclude_query_strings();
$rules .= $vivio_swift_global->util_htaccess->getrules_exclude_cookie_contains();
......@@ -178,43 +218,82 @@ class Vivio_Swift_Utility_Htaccess
$rules .= $vivio_swift_global->util_htaccess->getrules_exclude_path_is();
$rules .= $vivio_swift_global->util_htaccess->getrules_exclude_path_ends_with();
$rules .= $vivio_swift_global->util_htaccess->getrules_exclude_path_contains();
$custom_rules .= $vivio_swift_global->util_htaccess->getrules_custom_rules();
if($vivio_swift_global->configs->get_value('vivio_swift_place_custom_rules_at_top')=='1'){
$custom_rules .= $vivio_swift_global->util_htaccess->getrules_custom_rules();
if($vivio_swift_global->configs->get_value('vivio_swift_cache_custom_rules_at_top')=='1'){
$rules = $custom_rules . $rules;
}else{
$rules .= $custom_rules;
}
}
// Add opener and closer
if ($rules != '') {
$rules = $vivio_swift_global->util_htaccess->getrules_opener() . $rules . $vivio_swift_global->util_htaccess->getrules_closer();
$rules = $vivio_swift_global->util_htaccess->getrules_excludes_opener() . $rules . $vivio_swift_global->util_htaccess->getrules_excludes_closer();
}
return $rules;
}
static function getrules_opener()
static function getrules_cachecontrol()
{
global $vivio_swift_global;
$date = new DateTime();
$rules = '';
if($vivio_swift_global->configs->get_value('vivio_swift_cache_control_headers_enable')){
$cache_control_groups = $vivio_swift_global->configs->get_value('vivio_swift_cache_control_headers_values');
$str_rule = '';
foreach($cache_control_groups as $index=>$group){
// make sure this group is active
if(!$group['enable-cache']){continue;}
$arr_extensions = $group['extensions'];
// start building the FilesMatch rule string
$str_rule = '<FilesMatch "\.(';
// add the extensions for this group
foreach ($arr_extensions as $i=>$extension) {
$str_rule .= $extension;
if($i!=(count($arr_extensions)-1)){$str_rule .='|';}
}
// finish the string for the rule
$str_rule .= ')$">' . PHP_EOL;
// set the cache-control header
if(!$group['max-age']){
$str_rule .= ' Header unset Cache-Control' . PHP_EOL;
} else {
$str_rule .= ' Header set Cache-Control "max-age='.$group['max-age'].'"' . PHP_EOL;
}