Multi Device Switcher - Version 1.6.1

Version Description

  • add test cases
  • add add_header_vary filter
  • improve cookie settings via wp_headers hook
  • change readme.md file name to upper case
  • add LICENSE file
Download this release

Release Info

Developer thingsym
Plugin Icon wp plugin Multi Device Switcher
Version 1.6.1
Comparing to
See all releases

Code changes from version 1.6.0 to 1.6.1

Files changed (5) hide show
  1. LICENSE +281 -0
  2. readme.md → README.md +28 -11
  3. multi-device-switcher.php +41 -17
  4. pc-switcher-widget.php +1 -1
  5. readme.txt +9 -2
LICENSE ADDED
@@ -0,0 +1,281 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ GNU GENERAL PUBLIC LICENSE
2
+ Version 2, June 1991
3
+
4
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
5
+ 51 Franklin St, Fifth Floor, Boston, MA 02110, USA
6
+
7
+ Everyone is permitted to copy and distribute verbatim copies
8
+ of this license document, but changing it is not allowed.
9
+
10
+ Preamble
11
+
12
+ The licenses for most software are designed to take away your
13
+ freedom to share and change it. By contrast, the GNU General Public
14
+ License is intended to guarantee your freedom to share and change free
15
+ software--to make sure the software is free for all its users. This
16
+ General Public License applies to most of the Free Software
17
+ Foundation's software and to any other program whose authors commit to
18
+ using it. (Some other Free Software Foundation software is covered by
19
+ the GNU Library General Public License instead.) You can apply it to
20
+ your programs, too.
21
+
22
+ When we speak of free software, we are referring to freedom, not
23
+ price. Our General Public Licenses are designed to make sure that you
24
+ have the freedom to distribute copies of free software (and charge for
25
+ this service if you wish), that you receive source code or can get it
26
+ if you want it, that you can change the software or use pieces of it
27
+ in new free programs; and that you know you can do these things.
28
+
29
+ To protect your rights, we need to make restrictions that forbid
30
+ anyone to deny you these rights or to ask you to surrender the rights.
31
+ These restrictions translate to certain responsibilities for you if you
32
+ distribute copies of the software, or if you modify it.
33
+
34
+ For example, if you distribute copies of such a program, whether
35
+ gratis or for a fee, you must give the recipients all the rights that
36
+ you have. You must make sure that they, too, receive or can get the
37
+ source code. And you must show them these terms so they know their
38
+ rights.
39
+
40
+ We protect your rights with two steps: (1) copyright the software, and
41
+ (2) offer you this license which gives you legal permission to copy,
42
+ distribute and/or modify the software.
43
+
44
+ Also, for each author's protection and ours, we want to make certain
45
+ that everyone understands that there is no warranty for this free
46
+ software. If the software is modified by someone else and passed on, we
47
+ want its recipients to know that what they have is not the original, so
48
+ that any problems introduced by others will not reflect on the original
49
+ authors' reputations.
50
+
51
+ Finally, any free program is threatened constantly by software
52
+ patents. We wish to avoid the danger that redistributors of a free
53
+ program will individually obtain patent licenses, in effect making the
54
+ program proprietary. To prevent this, we have made it clear that any
55
+ patent must be licensed for everyone's free use or not licensed at all.
56
+
57
+ The precise terms and conditions for copying, distribution and
58
+ modification follow.
59
+
60
+ GNU GENERAL PUBLIC LICENSE
61
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
62
+
63
+ 0. This License applies to any program or other work which contains
64
+ a notice placed by the copyright holder saying it may be distributed
65
+ under the terms of this General Public License. The "Program", below,
66
+ refers to any such program or work, and a "work based on the Program"
67
+ means either the Program or any derivative work under copyright law:
68
+ that is to say, a work containing the Program or a portion of it,
69
+ either verbatim or with modifications and/or translated into another
70
+ language. (Hereinafter, translation is included without limitation in
71
+ the term "modification".) Each licensee is addressed as "you".
72
+
73
+ Activities other than copying, distribution and modification are not
74
+ covered by this License; they are outside its scope. The act of
75
+ running the Program is not restricted, and the output from the Program
76
+ is covered only if its contents constitute a work based on the
77
+ Program (independent of having been made by running the Program).
78
+ Whether that is true depends on what the Program does.
79
+
80
+ 1. You may copy and distribute verbatim copies of the Program's
81
+ source code as you receive it, in any medium, provided that you
82
+ conspicuously and appropriately publish on each copy an appropriate
83
+ copyright notice and disclaimer of warranty; keep intact all the
84
+ notices that refer to this License and to the absence of any warranty;
85
+ and give any other recipients of the Program a copy of this License
86
+ along with the Program.
87
+
88
+ You may charge a fee for the physical act of transferring a copy, and
89
+ you may at your option offer warranty protection in exchange for a fee.
90
+
91
+ 2. You may modify your copy or copies of the Program or any portion
92
+ of it, thus forming a work based on the Program, and copy and
93
+ distribute such modifications or work under the terms of Section 1
94
+ above, provided that you also meet all of these conditions:
95
+
96
+ a) You must cause the modified files to carry prominent notices
97
+ stating that you changed the files and the date of any change.
98
+
99
+ b) You must cause any work that you distribute or publish, that in
100
+ whole or in part contains or is derived from the Program or any
101
+ part thereof, to be licensed as a whole at no charge to all third
102
+ parties under the terms of this License.
103
+
104
+ c) If the modified program normally reads commands interactively
105
+ when run, you must cause it, when started running for such
106
+ interactive use in the most ordinary way, to print or display an
107
+ announcement including an appropriate copyright notice and a
108
+ notice that there is no warranty (or else, saying that you provide
109
+ a warranty) and that users may redistribute the program under
110
+ these conditions, and telling the user how to view a copy of this
111
+ License. (Exception: if the Program itself is interactive but
112
+ does not normally print such an announcement, your work based on
113
+ the Program is not required to print an announcement.)
114
+
115
+ These requirements apply to the modified work as a whole. If
116
+ identifiable sections of that work are not derived from the Program,
117
+ and can be reasonably considered independent and separate works in
118
+ themselves, then this License, and its terms, do not apply to those
119
+ sections when you distribute them as separate works. But when you
120
+ distribute the same sections as part of a whole which is a work based
121
+ on the Program, the distribution of the whole must be on the terms of
122
+ this License, whose permissions for other licensees extend to the
123
+ entire whole, and thus to each and every part regardless of who wrote it.
124
+ Thus, it is not the intent of this section to claim rights or contest
125
+ your rights to work written entirely by you; rather, the intent is to
126
+ exercise the right to control the distribution of derivative or
127
+ collective works based on the Program.
128
+
129
+ In addition, mere aggregation of another work not based on the Program
130
+ with the Program (or with a work based on the Program) on a volume of
131
+ a storage or distribution medium does not bring the other work under
132
+ the scope of this License.
133
+
134
+ 3. You may copy and distribute the Program (or a work based on it,
135
+ under Section 2) in object code or executable form under the terms of
136
+ Sections 1 and 2 above provided that you also do one of the following:
137
+
138
+ a) Accompany it with the complete corresponding machine-readable
139
+ source code, which must be distributed under the terms of Sections
140
+ 1 and 2 above on a medium customarily used for software interchange; or,
141
+
142
+ b) Accompany it with a written offer, valid for at least three
143
+ years, to give any third party, for a charge no more than your
144
+ cost of physically performing source distribution, a complete
145
+ machine-readable copy of the corresponding source code, to be
146
+ distributed under the terms of Sections 1 and 2 above on a medium
147
+ customarily used for software interchange; or,
148
+
149
+ c) Accompany it with the information you received as to the offer
150
+ to distribute corresponding source code. (This alternative is
151
+ allowed only for noncommercial distribution and only if you
152
+ received the program in object code or executable form with such
153
+ an offer, in accord with Subsection b above.)
154
+
155
+ The source code for a work means the preferred form of the work for
156
+ making modifications to it. For an executable work, complete source
157
+ code means all the source code for all modules it contains, plus any
158
+ associated interface definition files, plus the scripts used to
159
+ control compilation and installation of the executable. However, as a
160
+ special exception, the source code distributed need not include
161
+ anything that is normally distributed (in either source or binary
162
+ form) with the major components (compiler, kernel, and so on) of the
163
+ operating system on which the executable runs, unless that component
164
+ itself accompanies the executable.
165
+
166
+ If distribution of executable or object code is made by offering
167
+ access to copy from a designated place, then offering equivalent
168
+ access to copy the source code from the same place counts as
169
+ distribution of the source code, even though third parties are not
170
+ compelled to copy the source along with the object code.
171
+
172
+ 4. You may not copy, modify, sublicense, or distribute the Program
173
+ except as expressly provided under this License. Any attempt
174
+ otherwise to copy, modify, sublicense or distribute the Program is
175
+ void, and will automatically terminate your rights under this License.
176
+ However, parties who have received copies, or rights, from you under
177
+ this License will not have their licenses terminated so long as such
178
+ parties remain in full compliance.
179
+
180
+ 5. You are not required to accept this License, since you have not
181
+ signed it. However, nothing else grants you permission to modify or
182
+ distribute the Program or its derivative works. These actions are
183
+ prohibited by law if you do not accept this License. Therefore, by
184
+ modifying or distributing the Program (or any work based on the
185
+ Program), you indicate your acceptance of this License to do so, and
186
+ all its terms and conditions for copying, distributing or modifying
187
+ the Program or works based on it.
188
+
189
+ 6. Each time you redistribute the Program (or any work based on the
190
+ Program), the recipient automatically receives a license from the
191
+ original licensor to copy, distribute or modify the Program subject to
192
+ these terms and conditions. You may not impose any further
193
+ restrictions on the recipients' exercise of the rights granted herein.
194
+ You are not responsible for enforcing compliance by third parties to
195
+ this License.
196
+
197
+ 7. If, as a consequence of a court judgment or allegation of patent
198
+ infringement or for any other reason (not limited to patent issues),
199
+ conditions are imposed on you (whether by court order, agreement or
200
+ otherwise) that contradict the conditions of this License, they do not
201
+ excuse you from the conditions of this License. If you cannot
202
+ distribute so as to satisfy simultaneously your obligations under this
203
+ License and any other pertinent obligations, then as a consequence you
204
+ may not distribute the Program at all. For example, if a patent
205
+ license would not permit royalty-free redistribution of the Program by
206
+ all those who receive copies directly or indirectly through you, then
207
+ the only way you could satisfy both it and this License would be to
208
+ refrain entirely from distribution of the Program.
209
+
210
+ If any portion of this section is held invalid or unenforceable under
211
+ any particular circumstance, the balance of the section is intended to
212
+ apply and the section as a whole is intended to apply in other
213
+ circumstances.
214
+
215
+ It is not the purpose of this section to induce you to infringe any
216
+ patents or other property right claims or to contest validity of any
217
+ such claims; this section has the sole purpose of protecting the
218
+ integrity of the free software distribution system, which is
219
+ implemented by public license practices. Many people have made
220
+ generous contributions to the wide range of software distributed
221
+ through that system in reliance on consistent application of that
222
+ system; it is up to the author/donor to decide if he or she is willing
223
+ to distribute software through any other system and a licensee cannot
224
+ impose that choice.
225
+
226
+ This section is intended to make thoroughly clear what is believed to
227
+ be a consequence of the rest of this License.
228
+
229
+ 8. If the distribution and/or use of the Program is restricted in
230
+ certain countries either by patents or by copyrighted interfaces, the
231
+ original copyright holder who places the Program under this License
232
+ may add an explicit geographical distribution limitation excluding
233
+ those countries, so that distribution is permitted only in or among
234
+ countries not thus excluded. In such case, this License incorporates
235
+ the limitation as if written in the body of this License.
236
+
237
+ 9. The Free Software Foundation may publish revised and/or new versions
238
+ of the General Public License from time to time. Such new versions will
239
+ be similar in spirit to the present version, but may differ in detail to
240
+ address new problems or concerns.
241
+
242
+ Each version is given a distinguishing version number. If the Program
243
+ specifies a version number of this License which applies to it and "any
244
+ later version", you have the option of following the terms and conditions
245
+ either of that version or of any later version published by the Free
246
+ Software Foundation. If the Program does not specify a version number of
247
+ this License, you may choose any version ever published by the Free Software
248
+ Foundation.
249
+
250
+ 10. If you wish to incorporate parts of the Program into other free
251
+ programs whose distribution conditions are different, write to the author
252
+ to ask for permission. For software which is copyrighted by the Free
253
+ Software Foundation, write to the Free Software Foundation; we sometimes
254
+ make exceptions for this. Our decision will be guided by the two goals
255
+ of preserving the free status of all derivatives of our free software and
256
+ of promoting the sharing and reuse of software generally.
257
+
258
+ NO WARRANTY
259
+
260
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
261
+ FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
262
+ OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
263
+ PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
264
+ OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
265
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
266
+ TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
267
+ PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
268
+ REPAIR OR CORRECTION.
269
+
270
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
271
+ WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
272
+ REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
273
+ INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
274
+ OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
275
+ TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
276
+ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
277
+ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
278
+ POSSIBILITY OF SUCH DAMAGES.
279
+
280
+ END OF TERMS AND CONDITIONS
281
+
readme.md → README.md RENAMED
@@ -2,8 +2,6 @@
2
 
3
  [![Build Status](https://travis-ci.org/thingsym/multi-device-switcher.svg?branch=master)](https://travis-ci.org/thingsym/multi-device-switcher)
4
 
5
- [![WordPress](https://img.shields.io/wordpress/v/multi-device-switcher.svg)](https://wordpress.org/plugins/multi-device-switcher/)
6
-
7
  This WordPress plugin allows you to set a separate theme for device (Smart Phone, Tablet PC, Mobile Phone, Game and custom).
8
  This plugin detects if your site is being viewed by UserAgent, and switches to selected theme. The Custom Switcher can add every device.
9
 
@@ -370,32 +368,47 @@ turn on default CSS
370
 
371
  wp multi-device css on
372
 
 
 
 
 
 
 
 
 
 
 
373
  ## Test Matrix
374
 
375
  For operation compatibility between PHP version and WordPress version, see below [Travis CI](https://travis-ci.org/thingsym/multi-device-switcher).
376
 
377
  ## Contribution
378
 
379
- Small patches and bug reports can be submitted a issue tracker in Github. Forking on Github is another good way. You can send a pull request.
380
-
381
- Translating a plugin takes a lot of time, effort, and patience. I really appreciate the hard work from these contributors.
382
 
383
- If you have created or updated your own language pack, you can send gettext PO and MO files to author. I can bundle it into Multi Device Switcher.
384
 
385
- * [multi-device-switcher - GitHub](https://github.com/thingsym/multi-device-switcher)
386
- * [Multi Device Switcher - WordPress Plugin](https://wordpress.org/plugins/multi-device-switcher/)
387
- * [Translate Multi Device Switcher into your language.](https://translate.wordpress.org/projects/wp-plugins/multi-device-switcher)
388
- * [Developer Blog (Japanese) - http://blog.thingslabo.com/ ](https://blog.thingslabo.com/archives/category/multi_device_switcher)
 
389
 
390
  ## Changelog
391
 
 
 
 
 
 
 
392
  * Version 1.6.0
393
  * change Requires at least version 3.7
394
  * remove cache with PC Switcher widget
395
  * add init function
396
  * change hook destination from plugin_action_links to plugin_action_links_{$plugin_file}
397
  * add load_textdomain function
398
- * add define variable __MULTI_DEVICE_SWITCHER_FILE__
399
  * check class Multi_Device_Switcher
400
  * check ABSPATH
401
  * add isset to conditional statement
@@ -485,3 +498,7 @@ If you have created or updated your own language pack, you can send gettext PO a
485
  * Requires at least version 3.7 of the WordPress
486
  * Version 1.1.2
487
  * Requires at least version 3.4 of the WordPress
 
 
 
 
2
 
3
  [![Build Status](https://travis-ci.org/thingsym/multi-device-switcher.svg?branch=master)](https://travis-ci.org/thingsym/multi-device-switcher)
4
 
 
 
5
  This WordPress plugin allows you to set a separate theme for device (Smart Phone, Tablet PC, Mobile Phone, Game and custom).
6
  This plugin detects if your site is being viewed by UserAgent, and switches to selected theme. The Custom Switcher can add every device.
7
 
368
 
369
  wp multi-device css on
370
 
371
+ ## Resources
372
+
373
+ * [Developer Blog (Japanese) - http://blog.thingslabo.com/ ](https://blog.thingslabo.com/archives/category/multi_device_switcher)
374
+
375
+ ## WordPress Plugin Directory
376
+
377
+ Multi Device Switcher is hosted on the WordPress Plugin Directory.
378
+
379
+ [https://wordpress.org/plugins/multi-device-switcher/](https://wordpress.org/plugins/multi-device-switcher/)
380
+
381
  ## Test Matrix
382
 
383
  For operation compatibility between PHP version and WordPress version, see below [Travis CI](https://travis-ci.org/thingsym/multi-device-switcher).
384
 
385
  ## Contribution
386
 
387
+ ### Patches and Bug Fixes
 
 
388
 
389
+ Small patches and bug reports can be submitted a issue tracker in Github. Forking on Github is another good way. You can send a pull request.
390
 
391
+ 1. Fork [Multi Device Switcher](https://github.com/thingsym/multi-device-switcher) from GitHub repository
392
+ 2. Create a feature branch: git checkout -b my-new-feature
393
+ 3. Commit your changes: git commit -am 'Add some feature'
394
+ 4. Push to the branch: git push origin my-new-feature
395
+ 5. Create new Pull Request
396
 
397
  ## Changelog
398
 
399
+ * Version 1.6.1
400
+ * add test cases
401
+ * add add_header_vary filter
402
+ * improve cookie settings via wp_headers hook
403
+ * change readme.md file name to upper case
404
+ * add LICENSE file
405
  * Version 1.6.0
406
  * change Requires at least version 3.7
407
  * remove cache with PC Switcher widget
408
  * add init function
409
  * change hook destination from plugin_action_links to plugin_action_links_{$plugin_file}
410
  * add load_textdomain function
411
+ * add define variable \_\_MULTI_DEVICE_SWITCHER_FILE\_\_
412
  * check class Multi_Device_Switcher
413
  * check ABSPATH
414
  * add isset to conditional statement
498
  * Requires at least version 3.7 of the WordPress
499
  * Version 1.1.2
500
  * Requires at least version 3.4 of the WordPress
501
+
502
+ ## License
503
+
504
+ Licensed under [GPLv2](https://www.gnu.org/licenses/gpl-2.0.html).
multi-device-switcher.php CHANGED
@@ -3,7 +3,7 @@
3
  * Plugin Name: Multi Device Switcher
4
  * Plugin URI: https://github.com/thingsym/multi-device-switcher
5
  * Description: This WordPress plugin allows you to set a separate theme for device (Smart Phone, Tablet PC, Mobile Phone, Game and custom).
6
- * Version: 1.6.0
7
  * Author: thingsym
8
  * Author URI: http://www.thingslabo.com/
9
  * License: GPL2
@@ -54,15 +54,13 @@ class Multi_Device_Switcher {
54
  add_action( 'init', array( $this, 'load_textdomain' ) );
55
  add_action( 'init', array( $this, 'init' ) );
56
 
57
- if ( is_admin() ) {
58
- add_action( 'admin_init', array( $this, 'admin_init' ) );
59
- add_action( 'admin_menu', array( $this, 'add_option_page' ) );
60
- }
61
- else {
62
  add_filter( 'wp_headers', array( $this, 'add_header_vary' ) );
63
  add_action( 'plugins_loaded', array( $this, 'switch_theme' ) );
64
  }
65
 
 
 
66
  add_action( 'customize_register', array( $this, 'customize_register' ) );
67
  add_action( 'plugins_loaded', array( $this, 'load_file' ) );
68
  }
@@ -84,14 +82,17 @@ class Multi_Device_Switcher {
84
  }
85
 
86
  public function switch_theme() {
87
-
88
  if ( isset( $_COOKIE[ $this->cookie_name_disable_switcher ] ) ) {
89
- setcookie( $this->cookie_name_disable_switcher, null, time() - 3600, '/', '', is_ssl(), false );
 
 
90
  }
91
 
92
  if ( $this->is_disable_switcher() ) {
93
- setcookie( $this->cookie_name_multi_device_switcher, null, time() - 3600, '/', '', is_ssl(), false );
94
- setcookie( $this->cookie_name_disable_switcher, 1, null, '/', '', is_ssl(), false );
 
 
95
  return;
96
  }
97
 
@@ -130,10 +131,14 @@ class Multi_Device_Switcher {
130
  add_filter( 'template', array( $this, 'get_template' ) );
131
  add_action( 'wp_footer', array( $this, 'add_pc_switcher' ) );
132
 
133
- setcookie( $this->cookie_name_multi_device_switcher, preg_replace( '/^custom_switcher_/', '', $this->device ), null, '/', '', is_ssl(), false );
 
 
134
  }
135
  else {
136
- setcookie( $this->cookie_name_multi_device_switcher, null, time() - 3600, '/', '', is_ssl(), false );
 
 
137
  }
138
 
139
  if ( isset( $_COOKIE[ $this->cookie_name_pc_switcher ] ) ) {
@@ -272,7 +277,12 @@ class Multi_Device_Switcher {
272
 
273
  if ( $pc_switcher && $name && 'None' !== $name ) {
274
  if ( $options['default_css'] ) {
275
- wp_enqueue_style( 'pc-switcher-options', plugins_url() . '/multi-device-switcher/pc-switcher.css', false, '2013-03-20' );
 
 
 
 
 
276
  }
277
 
278
  $uri = is_ssl() ? 'https://' : 'http://';
@@ -352,7 +362,7 @@ class Multi_Device_Switcher {
352
  *
353
  */
354
  public function add_header_vary( $headers ) {
355
- $headers['Vary'] = 'User-Agent';
356
  return $headers;
357
  }
358
 
@@ -365,7 +375,12 @@ class Multi_Device_Switcher {
365
  *
366
  */
367
  public function admin_enqueue_scripts( $hook_suffix ) {
368
- wp_enqueue_script( 'multi-device-switcher-options', plugins_url() . '/multi-device-switcher/multi-device-switcher.js', array( 'jquery', 'jquery-ui-tabs' ), '2011-08-22' );
 
 
 
 
 
369
  }
370
 
371
  /**
@@ -377,7 +392,12 @@ class Multi_Device_Switcher {
377
  *
378
  */
379
  public function admin_enqueue_styles( $hook_suffix ) {
380
- wp_enqueue_style( 'multi-device-switcher-options', plugins_url() . '/multi-device-switcher/multi-device-switcher.css', false, '2011-08-22' );
 
 
 
 
 
381
  }
382
 
383
  /**
@@ -566,7 +586,11 @@ class Multi_Device_Switcher {
566
  * @since 1.6.0
567
  */
568
  public function load_textdomain() {
569
- load_plugin_textdomain( 'multi-device-switcher', false, dirname( plugin_basename( __MULTI_DEVICE_SWITCHER_FILE__ ) ) . '/languages/' );
 
 
 
 
570
  }
571
 
572
  /**
3
  * Plugin Name: Multi Device Switcher
4
  * Plugin URI: https://github.com/thingsym/multi-device-switcher
5
  * Description: This WordPress plugin allows you to set a separate theme for device (Smart Phone, Tablet PC, Mobile Phone, Game and custom).
6
+ * Version: 1.6.1
7
  * Author: thingsym
8
  * Author URI: http://www.thingslabo.com/
9
  * License: GPL2
54
  add_action( 'init', array( $this, 'load_textdomain' ) );
55
  add_action( 'init', array( $this, 'init' ) );
56
 
57
+ if ( ! is_admin() ) {
 
 
 
 
58
  add_filter( 'wp_headers', array( $this, 'add_header_vary' ) );
59
  add_action( 'plugins_loaded', array( $this, 'switch_theme' ) );
60
  }
61
 
62
+ add_action( 'admin_init', array( $this, 'admin_init' ) );
63
+ add_action( 'admin_menu', array( $this, 'add_option_page' ) );
64
  add_action( 'customize_register', array( $this, 'customize_register' ) );
65
  add_action( 'plugins_loaded', array( $this, 'load_file' ) );
66
  }
82
  }
83
 
84
  public function switch_theme() {
 
85
  if ( isset( $_COOKIE[ $this->cookie_name_disable_switcher ] ) ) {
86
+ add_action( 'wp_headers', function () {
87
+ setcookie( $this->cookie_name_disable_switcher, null, time() - 3600, '/', '', is_ssl(), false );
88
+ } );
89
  }
90
 
91
  if ( $this->is_disable_switcher() ) {
92
+ add_action( 'wp_headers', function () {
93
+ setcookie( $this->cookie_name_multi_device_switcher, null, time() - 3600, '/', '', is_ssl(), false );
94
+ setcookie( $this->cookie_name_disable_switcher, 1, null, '/', '', is_ssl(), false );
95
+ } );
96
  return;
97
  }
98
 
131
  add_filter( 'template', array( $this, 'get_template' ) );
132
  add_action( 'wp_footer', array( $this, 'add_pc_switcher' ) );
133
 
134
+ add_action( 'wp_headers', function () {
135
+ setcookie( $this->cookie_name_multi_device_switcher, preg_replace( '/^custom_switcher_/', '', $this->device ), null, '/', '', is_ssl(), false );
136
+ } );
137
  }
138
  else {
139
+ add_action( 'wp_headers', function () {
140
+ setcookie( $this->cookie_name_multi_device_switcher, null, time() - 3600, '/', '', is_ssl(), false );
141
+ } );
142
  }
143
 
144
  if ( isset( $_COOKIE[ $this->cookie_name_pc_switcher ] ) ) {
277
 
278
  if ( $pc_switcher && $name && 'None' !== $name ) {
279
  if ( $options['default_css'] ) {
280
+ wp_enqueue_style(
281
+ 'pc-switcher-options',
282
+ plugins_url() . '/multi-device-switcher/pc-switcher.css',
283
+ false,
284
+ '2013-03-20'
285
+ );
286
  }
287
 
288
  $uri = is_ssl() ? 'https://' : 'http://';
362
  *
363
  */
364
  public function add_header_vary( $headers ) {
365
+ $headers['Vary'] = apply_filters( 'add_header_vary', 'User-Agent' );
366
  return $headers;
367
  }
368
 
375
  *
376
  */
377
  public function admin_enqueue_scripts( $hook_suffix ) {
378
+ wp_enqueue_script(
379
+ 'multi-device-switcher-options',
380
+ plugins_url() . '/multi-device-switcher/multi-device-switcher.js',
381
+ array( 'jquery', 'jquery-ui-tabs' ),
382
+ '2011-08-22'
383
+ );
384
  }
385
 
386
  /**
392
  *
393
  */
394
  public function admin_enqueue_styles( $hook_suffix ) {
395
+ wp_enqueue_style(
396
+ 'multi-device-switcher-options',
397
+ plugins_url() . '/multi-device-switcher/multi-device-switcher.css',
398
+ false,
399
+ '2011-08-22'
400
+ );
401
  }
402
 
403
  /**
586
  * @since 1.6.0
587
  */
588
  public function load_textdomain() {
589
+ load_plugin_textdomain(
590
+ 'multi-device-switcher',
591
+ false,
592
+ dirname( plugin_basename( __MULTI_DEVICE_SWITCHER_FILE__ ) ) . '/languages/'
593
+ );
594
  }
595
 
596
  /**
pc-switcher-widget.php CHANGED
@@ -3,7 +3,7 @@
3
  * Widget Name: PC Switcher Widget
4
  * Plugin URI: https://github.com/thingsym/multi-device-switcher
5
  * Description: PC Switcher Widget add-on for the Multi Device Switcher. Use this widget to add the PC Switcher to a widget.
6
- * Version: 1.6.0
7
  * Author: thingsym
8
  * Author URI: http://www.thingslabo.com/
9
  * License: GPL2
3
  * Widget Name: PC Switcher Widget
4
  * Plugin URI: https://github.com/thingsym/multi-device-switcher
5
  * Description: PC Switcher Widget add-on for the Multi Device Switcher. Use this widget to add the PC Switcher to a widget.
6
+ * Version: 1.6.1
7
  * Author: thingsym
8
  * Author URI: http://www.thingslabo.com/
9
  * License: GPL2
readme.txt CHANGED
@@ -7,7 +7,7 @@ Tags: switcher, theme, ipad, iphone, android, tablet, mobile, game
7
  Requires at least: 3.7
8
  Requires PHP: 5.4
9
  Tested up to: 4.9
10
- Stable tag: 1.6.0
11
  License: GPL2 or later
12
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
13
 
@@ -356,13 +356,20 @@ For more information about the Multi Device Switcher Command, see `wp help multi
356
 
357
  == Changelog ==
358
 
 
 
 
 
 
 
 
359
  = 1.6.0 =
360
  * change Requires at least version 3.7
361
  * remove cache with PC Switcher widget
362
  * add init function
363
  * change hook destination from plugin_action_links to plugin_action_links_{$plugin_file}
364
  * add load_textdomain function
365
- * add define variable __MULTI_DEVICE_SWITCHER_FILE__
366
  * check class Multi_Device_Switcher
367
  * check ABSPATH
368
  * add isset to conditional statement
7
  Requires at least: 3.7
8
  Requires PHP: 5.4
9
  Tested up to: 4.9
10
+ Stable tag: 1.6.1
11
  License: GPL2 or later
12
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
13
 
356
 
357
  == Changelog ==
358
 
359
+ = 1.6.1 =
360
+ * add test cases
361
+ * add add_header_vary filter
362
+ * improve cookie settings via wp_headers hook
363
+ * change readme.md file name to upper case
364
+ * add LICENSE file
365
+
366
  = 1.6.0 =
367
  * change Requires at least version 3.7
368
  * remove cache with PC Switcher widget
369
  * add init function
370
  * change hook destination from plugin_action_links to plugin_action_links_{$plugin_file}
371
  * add load_textdomain function
372
+ * add define variable \_\_MULTI_DEVICE_SWITCHER_FILE\_\_
373
  * check class Multi_Device_Switcher
374
  * check ABSPATH
375
  * add isset to conditional statement