Changeset 1178131

Timestamp:

06/10/2015 10:51:50 AM (11 years ago)

Author:

baseapp

Message:

Added email send as option.

Location:

wpbase-cache/trunk/trunk

Files:

• wpbase-cache-admin.php (modified) (7 diffs)
• wpbase-cache.php (modified) (5 diffs)

wpbase-cache/trunk/trunk/wpbase-cache-admin.php

@@ -1 +1 @@
 <?php
+
 class WPBase_Cache_Admin {
 
-    public function __construct(){
+    public function __construct() {
         add_action('admin_menu', array($this, 'add_wpbase_cache_page'));
         add_action('admin_init', array($this, 'wpbase_cache_page_init'));
@@ -16 +17 @@
 
     public function create_wpbase_cache_page() {
-        if( ! current_user_can('manage_options') ) {
-            wp_die( __('You do not have sufficient permissions to access this page.') );
+        if (!current_user_can('manage_options')) {
+            wp_die(__('You do not have sufficient permissions to access this page.'));
         }
         ?>
         <div class="wrap">
-            <?php screen_icon(); ?>
+        <?php screen_icon(); ?>
             <h2>WPBase Cache</h2>
             <form method="post" action="options.php">
                 <?php
-                    settings_fields('wpbase_cache_options');
-                    do_settings_sections('wpbasecache');
+                settings_fields('wpbase_cache_options');
+                do_settings_sections('wpbasecache');
                 ?>
-                <?php submit_button(); ?>
+        <?php submit_button(); ?>
                 <a class="button" id="wpbase_cache_flush_all">Empty All Caches</a>
             </form>
@@ -39 +40 @@
 
         add_settings_section(
-            'wpbase_cache_section',
-            'WPBase Cache Settings',
-            array($this, 'wpbase_cache_section_desc'),
-            'wpbasecache'
+                'wpbase_cache_section', 'WPBase Cache Settings', array($this, 'wpbase_cache_section_desc'), 'wpbasecache'
         );
 
-      
+
 
         add_settings_field(
-            'wpbase_cache_options_varnish_cache',
-            'Enable Varnish Cache',
-            array($this, 'varnish_cache_input'),
-            'wpbasecache',
-            'wpbase_cache_section'
+                'wpbase_cache_options_varnish_cache', 'Enable Varnish Cache', array($this, 'varnish_cache_input'), 'wpbasecache', 'wpbase_cache_section'
         );
 
+        add_settings_field(
+                'wpbase_cache_options_send_as', 'Send Mail As', array($this, 'send_as_input'), 'wpbasecache', 'wpbase_cache_section'
+        );
     }
 
@@ -61 +58 @@
     }
 
-   
     public function varnish_cache_input() {
         $options = get_option('wpbase_cache_options');
 
         $checked = checked(1, $options['varnish_cache'], FALSE);
-        if(!(defined('WPBASE_CACHE_SANDBOX') && WPBASE_CACHE_SANDBOX)) {
+        if (!(defined('WPBASE_CACHE_SANDBOX') && WPBASE_CACHE_SANDBOX)) {
             echo "<input id='wpbase_cache_varnish_cache' name='wpbase_cache_options[varnish_cache]' type='checkbox' value='1' $checked />";
         } else {
             echo "<input id='wpbase_cache_varnish_cache' disabled='disabled' name='wpbase_cache_options[varnish_cache]' type='checkbox' value='1' $checked />";
+        }
+    }
+
+    public function send_as_input() {
+        $options = get_option('wpbase_cache_options');
+
+        if($options['send_as']!=''){
+            $send_as= $options['send_as'];
+        }
+        if (!(defined('WPBASE_CACHE_SANDBOX') && WPBASE_CACHE_SANDBOX)) {
+            echo "<input id='wpbase_cache_send_as' name='wpbase_cache_options[send_as]' type='text' value='$send_as' />@yourdomain.com <br /><font color='gray'> Leave field empty to disable this feature.</font>";
+        } else {
+            echo "<input id='wpbase_cache_send_as' disabled='disabled' name='wpbase_cache_options[send_as]' type='checkbox' value='1' />";
         }
     }
@@ -77 +86 @@
         ?>
         <script type="text/javascript" >
-        jQuery(document).ready(function($) {
+            jQuery(document).ready(function($) {
 
-            $('#wpbase_cache_flush_all').click(function(){
-                var element = $(this);
-                var data = {
-                    action: 'wpbase_cache_flush_all',
-                    _ajax_nonce: '<?php echo $nonce; ?>'
-                };
+                $('#wpbase_cache_flush_all').click(function() {
+                    var element = $(this);
+                    var data = {
+                        action: 'wpbase_cache_flush_all',
+                        _ajax_nonce: '<?php echo $nonce; ?>'
+                    };
 
-                $.post(ajaxurl, data, function(response) {
-                    if(response == 1) {
-                        message = 'Sucessfully flushed all caches';
-                    } else if(response == -1) {
-                        message = 'Unauthorised request';
-                    } else {
-                        message = response;
-                    }
-                    element.replaceWith(message);
+                    $.post(ajaxurl, data, function(response) {
+                        if (response == 1) {
+                            message = 'Sucessfully flushed all caches';
+                        } else if (response == -1) {
+                            message = 'Unauthorised request';
+                        } else {
+                            message = response;
+                        }
+                        element.replaceWith(message);
+                    });
                 });
             });
-        });
         </script>
         <?php
@@ -105 +114 @@
         check_ajax_referer('wpbase_cache_flush_all');
 
-        if(!current_user_can('manage_options')) {
-            wp_die( __('You do not have sufficient permissions to perform this action.') );
+        if (!current_user_can('manage_options')) {
+            wp_die(__('You do not have sufficient permissions to perform this action.'));
         }
 
@@ -118 +127 @@
 
     public function update_options($oldvalue, $newvalue) {
-      
+        
     }
 

wpbase-cache/trunk/trunk/wpbase-cache.php

@@ -4 +4 @@
 Plugin URI: https://github.com/baseapp/wpbase-cache
 Description: A wordpress plugin for using all caches on varnish, nginx, php-fpm stack with php-apc. This plugin includes db-cache-reloaded-fix for dbcache.
-Version: 1.0.7
+Version: 2.0
 Author: Vikrant Datta
 Author URI: http://blog.wpoven.com
@@ -30 +30 @@
 //$path = dirname(dirname(dirname(__FILE__)));
 //if(is_file($path.'/db.php')){
-  //  rename($path.'/db.php',$path.'/db_old.php');
+ //   rename($path.'/db.php',$path.'/db_old.php');
 //}
 function upon_activation(){
@@ -62 +62 @@
             'db_cache' => '0',
             'varnish_cache' => '1',
+            'send_as' => 'noreply'
             //'reject_url' => '',
             //'reject_cookie' => '',
@@ -77 +78 @@
             'db_cache' => '0',
             'varnish_cache' => '0',
+             'send_as' =>'0'
             //'reject_url' => '',
             //'reject_cookie' => '',
@@ -183 +185 @@
     }
 }
+
+add_filter('wp_mail_from', 'mail_from');
+add_filter('wp_mail_from_name', 'mail_from_name');
+function mail_from($email){
+    
+    $options = get_option('wpbase_cache_options');
+    $send_as = $options['send_as'];
+    if($send_as != ''){
+        $sitename = strtolower($_SERVER['SERVER_NAME']);
+        $sitename = str_replace('www.','',$sitename);
+        if($_SERVER['SERVER_PORT'] == '8080'){
+            $dom = explode('/',$_SERVER['REQUEST_URI']);
+            return $send_as.'@'.$dom[1];
+        }
+        else{
+            return $send_as.'@'.$sitename;
+        }
+            
+    //$sitename = substr($sitename,0,4)=='www.' ? substr($sitename, 4) : $sitename;
+    }
+    
+}
+function mail_from_name($name){
+    $options = get_option('wpbase_cache_options');
+    $send_as = $options['send_as'];
+    if($send_as != ''){
+        return $send_as;
+    }
+    
+}