OMGF | GDPR/DSVGO Compliant, Faster Google Fonts. Easy.

Version Description

| September 30th, 2020 = * OMGF now runs fully automatic to replace/remove Google Fonts from your pages using OMGF's new Download API. No initial configuration required! * This means that if you use different fonts on different pages, all of them will be cached and served locally. * HUGE performance increase in OMGF's automatic replacing/removing methods. * Major overhaul of Settings Page: * Removed Extensions Tab * Some settings were moved to a new tab: Basic Settings. * Improved Welcome and Documentation tab. * Clarified option descriptions. * Removed 'Generate Stylesheet' tab, which'll be released in a separate (free) add-on plugin soon. * Removed 'Use Web Font Loader?' option, because it causes Cumulative Layout Shift and will not work with OMGF's new Auto Replace feature. * Removed 'Remove Version Parameter' option, because it has become obsolete. The new detection method uses the initial script's version, if set. * Font Preloading is temporarily removed and will be re-introduced (in a different form, along with new features) in a later release.

Download this release

Release Info

Developer	DaanvandenBergh
Plugin	OMGF \| GDPR/DSVGO Compliant, Faster Google Fonts. Easy.
Version	4.0.0
Comparing to
See all releases

Code changes from version 3.8.2 to 4.0.0

Files changed (31) hide show

assets/css/omgf-admin.css +30 -94
assets/css/omgf-admin.css.map +1 -1
assets/css/omgf-admin.less +37 -121
assets/css/omgf-admin.min.css +1 -1
assets/js/libraries/webfont.js +0 -33
assets/js/omgf-admin.js +1 -371
ffwp-autoload.php +76 -0
host-webfonts-local.php +32 -36
includes/admin/class-auto-detect.php +0 -227
includes/admin/class-notice.php +56 -58
includes/admin/class-settings.php +270 -290
includes/admin/settings/class-advanced.php +165 -214
includes/admin/settings/class-basic.php +133 -0
includes/admin/settings/class-builder.php +136 -114
includes/admin/settings/class-extensions.php +0 -119
includes/ajax/class-download.php +0 -147
includes/ajax/class-generate.php +0 -162
includes/api/class-download.php +293 -0
includes/class-admin.php +95 -305
includes/class-ajax.php +51 -182
includes/class-api.php +0 -99
includes/class-db.php +0 -104
includes/class-omgf.php +19 -128
includes/class-setup.php +0 -102
includes/frontend/class-functions.php +110 -203
readme.md +31 -6
readme.txt +57 -40
templates/admin/block-generate-stylesheet.phtml +0 -160
templates/admin/block-welcome.phtml +46 -10
templates/frontend-web-font-loader.phtml +0 -76
woosh-autoload.php +0 -74

assets/css/omgf-admin.css CHANGED Viewed

@@ -12,6 +12,25 @@
              * @copyright: (c) 2020 Daan van den Bergh
              * @url      : https://daan.dev
              * * * * * * * * * * * * * * * * * * * */
             /**
              * Navigation
              */
@@ -42,107 +61,24 @@
             #omgf-welcome-panel {
               padding: 20px 10px 5px;
+            }
-            -
            #omgf-welcome-panel h3 > .dashicons {
-            -
              line-height: 1.4;
+            }
-            -
            /**
-            -
             * Generate Stylesheet-form
-            -
             */
-            -
            .omgf-generate-stylesheet table {
-            -
              margin-top: 0.66em;
-            -
            }
-            -
            .omgf-generate-stylesheet .omgf-search-section {
-            -
              max-width: 666px;
-            -
              margin-top: 1em;
-            -
            }
-            -
            .omgf-generate-stylesheet .omgf-search-section a.omgf-apply.button {
-            -
              width: 85px;
-            -
            }
-            -
            .omgf-generate-stylesheet .omgf-search-section a.omgf-apply span:before {
               line-height: 1.4;
-            -
              width: 16px;
-            -
            }
-            -
            .omgf-generate-stylesheet .omgf-search-section caption {
-            -
              text-align: left;
-            -
              font-size: 1.2em;
-            -
              font-weight: 600;
-            -
              margin: 0.66em 0 0.33em;
+            }
-            -
            .omgf-generate-stylesheet .omgf-search-section span.omgf-apply.font-styles-search {
-            -
              width: 75%;
+            }
-            -
            .omgf-generate-stylesheet .omgf-search-section #omgf-search {
-            -
              line-height: 38px;
-            -
              width: 360px;
-            -
              padding: 3px 10px;
+            }
-            -
            .omgf-generate-stylesheet .omgf-search-section #omgf-font-styles .omgf-font-remove,
-            -
            .omgf-generate-stylesheet .omgf-search-section #omgf-font-styles .omgf-font-no-remove {
-            -
              cursor: pointer;
-            -
              padding: 0 0 0 20px;
-            -
              position: relative;
-            -
              display: inline-block;
-            -
            }
-            -
            .omgf-generate-stylesheet .omgf-search-section #omgf-font-styles .omgf-font-remove:before,
-            -
            .omgf-generate-stylesheet .omgf-search-section #omgf-font-styles .omgf-font-no-remove:before {
-            -
              position: absolute;
-            -
              left: 0;
-            -
            }
-            -
            .omgf-generate-stylesheet .omgf-search-section #omgf-font-styles #font-styles-nav.sticky {
-            -
              background: #f1f1f1;
-            -
              box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
-            -
              width: 565px;
-            -
            }
-            -
            .omgf-generate-stylesheet #omgf-control-panel {
-            -
              margin-top: 1em;
-            -
            }
-            -
            .omgf-generate-stylesheet #omgf-control-panel .button-cancel {
-            -
              color: #a00;
-            -
              text-decoration: none;
-            -
              border-color: transparent;
-            -
              box-shadow: none;
-            -
              background: 0 0;
-            -
              border-radius: 3px;
-            -
              white-space: nowrap;
-            -
              padding: 1px 10px !important;
-            -
            }
-            -
            .omgf-generate-stylesheet #omgf-control-panel .button-cancel:hover {
-            -
              cursor: pointer;
-            -
              background: #d54e21;
-            -
              color: #fff;
-            -
              border-color: #d54e21;
-            -
            }
-            -
            /**
-            -
             * Loader
-            -
             */
-            -
            .omgf-loading {
-            -
              position: absolute;
-            -
              width: 100%;
-            -
              height: 100%;
-            -
              left: 0;
-            -
              right: 0;
-            -
              top: 0;
               text-align: center;
+            }
-            -
            .omgf-loading .spinner {
-            -
              top: 50%;
-            -
              left: 50%;
-            -
              position: absolute;
-            -
              -ms-transform: translate(0, -70%);
-            -
              transform: translate(0, -70%);
-            -
            }
-            -
            /**
-            -
             * Sticky elements.
-            -
             */
-            -
            .sticky {
-            -
              position: -webkit-sticky;
-            -
              position: sticky;
-            -
            }
-            -
            .sticky.top {
-            -
              top: 25px;
-            -
            }
-            -
            .sticky.bottom {
-            -
              bottom: 0;
+            }
             /**
              * Responsiveness

              * @copyright: (c) 2020 Daan van den Bergh
              * @url      : https://daan.dev
              * * * * * * * * * * * * * * * * * * * */
+            +
            /**
+            +
             * General
+            +
             */
+            +
            .omgf .button-cancel {
+            +
              color: #a00;
+            +
              text-decoration: none;
+            +
              border-color: transparent;
+            +
              box-shadow: none;
+            +
              background: 0 0;
+            +
              border-radius: 3px;
+            +
              white-space: nowrap;
+            +
              padding: 1px 10px !important;
+            +
            }
+            +
            .omgf .button-cancel:hover {
+            +
              cursor: pointer;
+            +
              background: #d54e21;
+            +
              color: #fff;
+            +
              border-color: #d54e21;
+            +
            }
             /**
              * Navigation
              */
             #omgf-welcome-panel {
               padding: 20px 10px 5px;
+            }
+            +
            #omgf-welcome-panel .welcome-panel-content {
+            +
              margin-left: 0;
+            +
              padding: 0 15px;
+            }
+            +
            #omgf-welcome-panel h3 > .dashicons {
               line-height: 1.4;
+            }
+            +
            #omgf-welcome-panel .dashicons.ffwp-heart:before {
+            +
              color: #FF4136;
+            }
+            +
            #omgf-welcome-panel .welcome-icon:before {
+            +
              padding: 0;
+            }
+            +
            #omgf-welcome-panel .signature {
               text-align: center;
+            }
+            +
            #omgf-welcome-panel .signature-image {
+            +
              max-width: 90%;
+            }
             /**
              * Responsiveness

assets/css/omgf-admin.css.map CHANGED Viewed

@@ -1 +1 @@

- {"version":3,"sources":["omgf-admin.less"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAkBA~~;EACE~~,~~oBAAA;;AADF,SAGE~~;EACE,~~eAAA;;AAJJ,SAOE,kBAAiB~~;~~EACf,oBAAA;~~EACA,~~mBAAA;;;;;AAQF,gBAAC~~;~~EACC,WAAA;~~EACA,~~UAAA;;AAGF,gBAAC~~;~~EACC,YAAA;~~EACA,~~aAAA;;;;;AAOJ;EACE,sBAAA;;AADF,mBAGE,GAAG;EACD,~~gBAAA~~;;;;;AAOJ,yBACE~~;~~EACE,kBAAA;;AAFJ,yBAKE;EACE,gBAAA;~~EACA,eAAA~~;;AAII,yBANN,qBAIE,EACG,WACE~~;~~EACC,WAAA;;AAFJ,yBALJ,qBAIE,EACG,WAKC,KAAI;EACF,gBAAA;~~EACA,~~WAAA;;AAjBV,yBAKE,qBAiBE~~;~~EACE,gBAAA;~~EACA,~~gBAAA~~;EACA,~~gBAAA;EACA,uBAAA~~;;~~AAKE~~,~~yBA1BN~~,~~qBAwBE,KACG,WACE~~;EACC,~~UAAA;;AAhCV,yBAKE,qBAgCE;EACE,iBAAA;EACA,YAAA;EACA,iBAAA;;AAxCN,yBAKE,qBAsCE,kBACE;AA5CN,yBAKE,qBAsCE,kBAEE;EACE,~~eAAA;EACA,mBAAA;EACA,~~kBAAA~~;EACA,qBAAA~~;;AAEA,yBA9CN,qBAsCE,kBACE,kBAOG~~;~~AAAD~~,~~yBA9CN,qBAsCE,kBAEE,qBAMG;EACC,kBAAA;EACA,OAAA~~;;~~AAKF~~,~~yBArDN,qBAsCE,kBAcE,iBACG~~;~~EACC,mBAAA;EACA,yCAAA;EACA,YAAA;;AA7DV,yBAmEE;~~EACE,eAAA;;~~AApEJ~~,~~yBAmEE~~,~~oBAGE~~;~~EACE~~,~~WAAA~~;EACA,~~qBAAA;EACA~~,~~yBAAA~~;~~EACA~~,~~gBAAA~~;EACA,~~eAAA;EACA,kBAAA;EACA,mBAAA;EACA,4BAAA~~;;~~AAEA~~,~~yBAbJ,oBAGE,eAUG~~;EACC,~~eAAA~~;EACA,~~mBAAA;EACA,WAAA;EACA,qBAAA~~;;;;;~~AASR~~;EACE,~~kBAAA;EACA~~,~~WAAA~~;~~EACA~~,~~YAAA~~;EACA,~~OAAA;EACA~~,~~QAAA;EACA~~,~~MAAA~~;~~EACA~~,~~kBAAA~~;;~~AAPF~~,~~aASE;EACE~~,~~QAAA;EACA~~,~~SAAA~~;~~EACA~~,~~kBAAA;EACA~~,~~eAAe~~,~~kBAAf~~;~~EACA~~,~~WAAW~~,~~kBAAX;;;;;AAOJ~~;EACE,~~wBAAA;EACA,gBAAA~~;;~~AAEA~~,~~OAAC~~;~~EACC~~,~~SAAA;;AAGF,OAAC;EACC,SAAA~~;;;;;AAOJ,wBAA2C;EACzC;IACE,cAAA;IACA,WAAA;;EAEA,gBAAC;EACD,gBAAC;IACC,WAAA","file":"omgf-admin.css"}

+ {"version":3,"sources":["omgf-admin.less"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAkBA,KACE;EACE,WAAA;EACA,qBAAA;EACA,yBAAA;EACA,gBAAA;EACA,eAAA;EACA,kBAAA;EACA,mBAAA;EACA,4BAAA;;AAEA,KAVF,eAUG;EACC,eAAA;EACA,mBAAA;EACA,WAAA;EACA,qBAAA;;;;;AAQN;EACE,oBAAA;;AADF,SAGE;EACE,eAAA;;AAJJ,SAOE,kBAAiB;EACf,oBAAA;EACA,mBAAA;;;;;AAQF,gBAAC;EACC,WAAA;EACA,UAAA;;AAGF,gBAAC;EACC,YAAA;EACA,aAAA;;;;;AAOJ;EACE,sBAAA;;AADF,mBAGE;EACE,cAAA;EACA,eAAA;;AALJ,mBAQE,GAAG;EACD,gBAAA;;AAIA,mBADF,WACG,WAAW;EACV,cAAA;;AAdN,mBAkBE,cAAa;EACX,UAAA;;AAnBJ,mBAsBE;EACE,kBAAA;;AAvBJ,mBA0BE;EACE,cAAA;;;;;AAOJ,wBAA2C;EACzC;IACE,cAAA;IACA,WAAA;;EAEA,gBAAC;EACD,gBAAC;IACC,WAAA","file":"omgf-admin.css"}

assets/css/omgf-admin.less CHANGED Viewed

@@ -13,6 +13,29 @@
              * @url      : https://daan.dev
              * * * * * * * * * * * * * * * * * * * */
             /**
              * Navigation
              */
@@ -50,138 +73,31 @@
             #omgf-welcome-panel {
               padding: 20px 10px 5px;
-            -
              h3 > .dashicons {
-            -
                line-height: 1.4;
-            -
              }
-            -
            }
-            -
-            -
            /**
-            -
             * Generate Stylesheet-form
-            -
             */
-            -
            .omgf-generate-stylesheet {
-            -
              table {
-            -
                margin-top: .66em;
+              }
-            -
              .omgf-search-section {
-            -
                max-width: 666px;
-            -
                margin-top: 1em;
-            -
-            -
                a {
-            -
                  &.omgf-apply {
-            -
                    &.button {
-            -
                      width: 85px;
-            -
                    }
-            -
-            -
                    span:before {
-            -
                      line-height: 1.4;
-            -
                      width: 16px;
-            -
                    }
-            -
                  }
-            -
                }
-            -
-            -
                caption {
-            -
                  text-align: left;
-            -
                  font-size: 1.2em;
-            -
                  font-weight: 600;
-            -
                  margin: 0.66em 0 0.33em;
-            -
                }
-            -
-            -
                span {
-            -
                  &.omgf-apply {
-            -
                    &.font-styles-search {
-            -
                      width: 75%;
-            -
                    }
-            -
                  }
-            -
                }
-            -
-            -
                #omgf-search {
-            -
                  line-height: 38px;
-            -
                  width: 360px;
-            -
                  padding: 3px 10px;
-            -
                }
-            -
-            -
                #omgf-font-styles {
-            -
                  .omgf-font-remove,
-            -
                  .omgf-font-no-remove {
-            -
                    cursor: pointer;
-            -
                    padding: 0 0 0 20px;
-            -
                    position: relative;
-            -
                    display: inline-block;
-            -
-            -
                    &:before {
-            -
                      position: absolute;
-            -
                      left: 0;
-            -
                    }
-            -
                  }
-            -
-            -
                  #font-styles-nav {
-            -
                    &.sticky {
-            -
                      background: #f1f1f1;
-            -
                      box-shadow: 0 1px 1px rgba(0,0,0,0.04);
-            -
                      width: 565px;
-            -
                    }
-            -
                  }
-            -
                }
+              }
-            -
              #omgf-control-panel {
-            -
                margin-top: 1em;
-            -
-            -
                .button-cancel {
-            -
                  color: #a00;
-            -
                  text-decoration: none;
-            -
                  border-color: transparent;
-            -
                  box-shadow: none;
-            -
                  background: 0 0;
-            -
                  border-radius: 3px;
-            -
                  white-space: nowrap;
-            -
                  padding: 1px 10px !important;
-            -
-            -
                  &:hover {
-            -
                    cursor: pointer;
-            -
                    background: #d54e21;
-            -
                    color: #fff;
-            -
                    border-color: #d54e21;
-            -
                  }
+                }
+              }
-            -
            }
-            -
            /**
-            -
             * Loader
-            -
             */
-            -
            .omgf-loading {
-            -
              position: absolute;
-            -
              width: 100%;
-            -
              height: 100%;
-            -
              left: 0;
-            -
              right: 0;
-            -
              top: 0;
-            -
              text-align: center;
-            -
-            -
              .spinner {
-            -
                top: 50%;
-            -
                left: 50%;
-            -
                position: absolute;
-            -
                -ms-transform: translate(0, -70%);
-            -
                transform: translate(0, -70%);
+              }
-            -
            }
-            -
-            -
            /**
-            -
             * Sticky elements.
-            -
             */
-            -
            .sticky {
-            -
              position: -webkit-sticky;
-            -
              position: sticky;
-            -
              &.top {
-            -
                top: 25px;
+              }
-            -
              &.bottom {
-            -
                bottom: 0;
+              }
+            }

              * @url      : https://daan.dev
              * * * * * * * * * * * * * * * * * * * */
+            +
            /**
+            +
             * General
+            +
             */
+            +
            .omgf {
+            +
              .button-cancel {
+            +
                color: #a00;
+            +
                text-decoration: none;
+            +
                border-color: transparent;
+            +
                box-shadow: none;
+            +
                background: 0 0;
+            +
                border-radius: 3px;
+            +
                white-space: nowrap;
+            +
                padding: 1px 10px !important;
+            +
+            +
                &:hover {
+            +
                  cursor: pointer;
+            +
                  background: #d54e21;
+            +
                  color: #fff;
+            +
                  border-color: #d54e21;
+            +
                }
+            +
              }
+            +
            }
+            +
             /**
              * Navigation
              */
             #omgf-welcome-panel {
               padding: 20px 10px 5px;
+            +
              .welcome-panel-content {
+            +
                margin-left: 0;
+            +
                padding: 0 15px;
+              }
+            +
              h3 > .dashicons {
+            +
                line-height: 1.4;
+              }
+            +
              .dashicons {
+            +
                &.ffwp-heart:before {
+            +
                  color: #FF4136;
+                }
+              }
+            +
              .welcome-icon:before {
+            +
                padding: 0;
+              }
+            +
              .signature {
+            +
                text-align: center;
+              }
+            +
              .signature-image {
+            +
                max-width: 90%;
+              }
+            }

assets/css/omgf-admin.min.css CHANGED Viewed

@@ -1 +1 @@

- .omgf-nav{padding:1em 0 1.5em}.omgf-nav a{cursor:pointer}.omgf-nav .dashicons-before:before{margin-right:.25em;line-height:1.15em}.settings-column.left{float:left;width:66%}.settings-column.right{float:right;width:21.75%}#omgf-welcome-panel{padding:20px 10px 5px}#omgf-welcome-panel ~~h3>.dashicons{line-height:1~~.~~4}.omgf~~-~~generate~~-~~stylesheet table~~{margin-~~top:.66em}.omgf-generate-stylesheet .omgf-search-section{max-width~~:~~666px~~;~~margin-top~~:~~1em}.omgf-generate-stylesheet~~ ~~.omgf-search-section a.omgf-apply.button{width:85px~~}.omgf-~~generate~~-~~stylesheet~~ ~~.omgf-search-section a.omgf-apply span:before~~{line-height:1.4~~;width:16px~~}.omgf-~~generate~~-~~stylesheet~~ .~~omgf-search-section caption{text-align:left;font-size:1~~.~~2em;font~~-~~weight~~:~~600;margin:.66em 0 .33em}.omgf-generate-stylesheet .omgf-search-section span.omgf-apply.font-styles-search~~{~~width:75%~~}~~.omgf-generate-stylesheet .omgf-search-section~~ #omgf-~~search{line~~-~~height:38px;width:360px;padding:3px~~ ~~10px}~~.~~omgf~~-~~generate-stylesheet .omgf-search-section #omgf-font-styles .omgf-font-remove,.omgf-generate-stylesheet .omgf-search-section #omgf-font-styles .omgf-font-no-remove{cursor~~:~~pointer;padding:0 0 0 20px;position:relative;display:inline-block}.omgf-generate-stylesheet .omgf-search-section #omgf-font-styles .omgf-font-remove:~~before~~,.omgf-generate-stylesheet .omgf-search-section #omgf-font-styles .omgf-font-no-remove:before~~{~~position~~:~~absolute;left:~~0}~~.omgf-generate-stylesheet .omgf-search-section~~ #omgf-~~font~~-~~styles #font-styles-nav.sticky{background:#f1f1f1;box-shadow:0 1px 1px rgba(0,0,0,0.04);width:565px}.omgf-generate-stylesheet #omgf-control-~~panel~~{margin-top:1em}.omgf-generate-stylesheet~~ ~~#omgf-control-panel~~ .~~button-cancel~~{~~color:#a00;~~text-~~decoration~~:~~none;border-color:transparent;box-shadow:none;background:0;border-radius:3px;white-space:nowrap;padding:1px 10px !important~~}~~.omgf-generate-stylesheet~~ #omgf-~~control~~-panel .~~button~~-~~cancel:hover~~{~~cursor:pointer;background:#d54e21;color:#fff;border~~-~~color:#d54e21}.omgf-loading{position:absolute;~~width:~~100%;height:100%;left:0;right:0;top:0;text-align:center}.omgf-loading .spinner{top:50%;left:50%;position:absolute;-ms-transform:translate(0,-70~~%~~);transform:translate(0,-70%)~~}~~.sticky{position:-webkit-sticky;position:sticky}.sticky.top{top:25px}.sticky.bottom{bottom:0}~~@media only screen and (max-width:1024px){.settings-column{display:block;float:none}.settings-column.left,.settings-column.right{width:100%}}

+ .omgf .button-cancel{color:#a00;text-decoration:none;border-color:transparent;box-shadow:none;background:0 0;border-radius:3px;white-space:nowrap;padding:1px 10px!important}.omgf .button-cancel:hover{cursor:pointer;background:#d54e21;color:#fff;border-color:#d54e21}.omgf-nav{padding:1em 0 1.5em}.omgf-nav a{cursor:pointer}.omgf-nav .dashicons-before:before{margin-right:.25em;line-height:1.15em}.settings-column.left{float:left;width:66%}.settings-column.right{float:right;width:21.75%}#omgf-welcome-panel{padding:20px 10px 5px}#omgf-welcome-panel .welcome-panel-content{margin-left:0;padding:0 15px}#omgf-welcome-panel h3>.dashicons{line-height:1.4}#omgf-welcome-panel .dashicons.ffwp-heart:before{color:#ff4136}#omgf-welcome-panel .welcome-icon:before{padding:0}#omgf-welcome-panel .signature{text-align:center}#omgf-welcome-panel .signature-image{max-width:90%}@media only screen and (max-width:1024px){.settings-column{display:block;float:none}.settings-column.left,.settings-column.right{width:100%}}

assets/js/libraries/webfont.js DELETED Viewed

@@ -1,33 +0,0 @@
-            -
            /*
-            -
             * Copyright 2016 Small Batch, Inc.
-            -
             *
-            -
             * Licensed under the Apache License, Version 2.0 (the "License"); you may not
-            -
             * use this file except in compliance with the License. You may obtain a copy of
-            -
             * the License at
-            -
             *
-            -
             * http://www.apache.org/licenses/LICENSE-2.0
-            -
             *
-            -
             * Unless required by applicable law or agreed to in writing, software
-            -
             * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-            -
             * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-            -
             * License for the specific language governing permissions and limitations under
-            -
             * the License.
-            -
             */
-            -
            /* Web Font Loader v1.6.26 - (c) Adobe Systems, Google. License: Apache 2.0 */(function(){function aa(a,b,c){return a.call.apply(a.bind,arguments)}function ba(a,b,c){if(!a)throw Error();if(2<arguments.length){var d=Array.prototype.slice.call(arguments,2);return function(){var c=Array.prototype.slice.call(arguments);Array.prototype.unshift.apply(c,d);return a.apply(b,c)}}return function(){return a.apply(b,arguments)}}function p(a,b,c){p=Function.prototype.bind&&-1!=Function.prototype.bind.toString().indexOf("native code")?aa:ba;return p.apply(null,arguments)}var q=Date.now||function(){return+new Date};function ca(a,b){this.a=a;this.m=b||a;this.c=this.m.document}var da=!!window.FontFace;function t(a,b,c,d){b=a.c.createElement(b);if(c)for(var e in c)c.hasOwnProperty(e)&&("style"==e?b.style.cssText=c[e]:b.setAttribute(e,c[e]));d&&b.appendChild(a.c.createTextNode(d));return b}function u(a,b,c){a=a.c.getElementsByTagName(b)[0];a||(a=document.documentElement);a.insertBefore(c,a.lastChild)}function v(a){a.parentNode&&a.parentNode.removeChild(a)}
-            -
                function w(a,b,c){b=b||[];c=c||[];for(var d=a.className.split(/\s+/),e=0;e<b.length;e+=1){for(var f=!1,g=0;g<d.length;g+=1)if(b[e]===d[g]){f=!0;break}f||d.push(b[e])}b=[];for(e=0;e<d.length;e+=1){f=!1;for(g=0;g<c.length;g+=1)if(d[e]===c[g]){f=!0;break}f||b.push(d[e])}a.className=b.join(" ").replace(/\s+/g," ").replace(/^\s+|\s+$/,"")}function y(a,b){for(var c=a.className.split(/\s+/),d=0,e=c.length;d<e;d++)if(c[d]==b)return!0;return!1}
-            -
                function z(a){if("string"===typeof a.f)return a.f;var b=a.m.location.protocol;"about:"==b&&(b=a.a.location.protocol);return"https:"==b?"https:":"http:"}function ea(a){return a.m.location.hostname||a.a.location.hostname}
-            -
                function A(a,b,c){function d(){k&&e&&f&&(k(g),k=null)}b=t(a,"link",{rel:"stylesheet",href:b,media:"all"});var e=!1,f=!0,g=null,k=c||null;da?(b.onload=function(){e=!0;d()},b.onerror=function(){e=!0;g=Error("Stylesheet failed to load");d()}):setTimeout(function(){e=!0;d()},0);u(a,"head",b)}
-            -
                function B(a,b,c,d){var e=a.c.getElementsByTagName("head")[0];if(e){var f=t(a,"script",{src:b}),g=!1;f.onload=f.onreadystatechange=function(){g||this.readyState&&"loaded"!=this.readyState&&"complete"!=this.readyState||(g=!0,c&&c(null),f.onload=f.onreadystatechange=null,"HEAD"==f.parentNode.tagName&&e.removeChild(f))};e.appendChild(f);setTimeout(function(){g||(g=!0,c&&c(Error("Script load timeout")))},d||5E3);return f}return null};function C(){this.a=0;this.c=null}function D(a){a.a++;return function(){a.a--;E(a)}}function F(a,b){a.c=b;E(a)}function E(a){0==a.a&&a.c&&(a.c(),a.c=null)};function G(a){this.a=a||"-"}G.prototype.c=function(a){for(var b=[],c=0;c<arguments.length;c++)b.push(arguments[c].replace(/[\W_]+/g,"").toLowerCase());return b.join(this.a)};function H(a,b){this.c=a;this.f=4;this.a="n";var c=(b||"n4").match(/^([nio])([1-9])$/i);c&&(this.a=c[1],this.f=parseInt(c[2],10))}function fa(a){return I(a)+" "+(a.f+"00")+" 300px "+J(a.c)}function J(a){var b=[];a=a.split(/,\s*/);for(var c=0;c<a.length;c++){var d=a[c].replace(/['"]/g,"");-1!=d.indexOf(" ")||/^\d/.test(d)?b.push("'"+d+"'"):b.push(d)}return b.join(",")}function K(a){return a.a+a.f}function I(a){var b="normal";"o"===a.a?b="oblique":"i"===a.a&&(b="italic");return b}
-            -
                function ga(a){var b=4,c="n",d=null;a&&((d=a.match(/(normal|oblique|italic)/i))&&d[1]&&(c=d[1].substr(0,1).toLowerCase()),(d=a.match(/([1-9]00|normal|bold)/i))&&d[1]&&(/bold/i.test(d[1])?b=7:/[1-9]00/.test(d[1])&&(b=parseInt(d[1].substr(0,1),10))));return c+b};function ha(a,b){this.c=a;this.f=a.m.document.documentElement;this.h=b;this.a=new G("-");this.j=!1!==b.events;this.g=!1!==b.classes}function ia(a){a.g&&w(a.f,[a.a.c("wf","loading")]);L(a,"loading")}function M(a){if(a.g){var b=y(a.f,a.a.c("wf","active")),c=[],d=[a.a.c("wf","loading")];b||c.push(a.a.c("wf","inactive"));w(a.f,c,d)}L(a,"inactive")}function L(a,b,c){if(a.j&&a.h[b])if(c)a.h[b](c.c,K(c));else a.h[b]()};function ja(){this.c={}}function ka(a,b,c){var d=[],e;for(e in b)if(b.hasOwnProperty(e)){var f=a.c[e];f&&d.push(f(b[e],c))}return d};function N(a,b){this.c=a;this.f=b;this.a=t(this.c,"span",{"aria-hidden":"true"},this.f)}function O(a){u(a.c,"body",a.a)}function P(a){return"display:block;position:absolute;top:-9999px;left:-9999px;font-size:300px;width:auto;height:auto;line-height:normal;margin:0;padding:0;font-variant:normal;white-space:nowrap;font-family:"+J(a.c)+";"+("font-style:"+I(a)+";font-weight:"+(a.f+"00")+";")};function Q(a,b,c,d,e,f){this.g=a;this.j=b;this.a=d;this.c=c;this.f=e||3E3;this.h=f||void 0}Q.prototype.start=function(){var a=this.c.m.document,b=this,c=q(),d=new Promise(function(d,e){function k(){q()-c>=b.f?e():a.fonts.load(fa(b.a),b.h).then(function(a){1<=a.length?d():setTimeout(k,25)},function(){e()})}k()}),e=new Promise(function(a,d){setTimeout(d,b.f)});Promise.race([e,d]).then(function(){b.g(b.a)},function(){b.j(b.a)})};function R(a,b,c,d,e,f,g){this.v=a;this.B=b;this.c=c;this.a=d;this.s=g||"BESbswy";this.f={};this.w=e||3E3;this.u=f||null;this.o=this.j=this.h=this.g=null;this.g=new N(this.c,this.s);this.h=new N(this.c,this.s);this.j=new N(this.c,this.s);this.o=new N(this.c,this.s);a=new H(this.a.c+",serif",K(this.a));a=P(a);this.g.a.style.cssText=a;a=new H(this.a.c+",sans-serif",K(this.a));a=P(a);this.h.a.style.cssText=a;a=new H("serif",K(this.a));a=P(a);this.j.a.style.cssText=a;a=new H("sans-serif",K(this.a));a=
-            -
                    P(a);this.o.a.style.cssText=a;O(this.g);O(this.h);O(this.j);O(this.o)}var S={D:"serif",C:"sans-serif"},T=null;function U(){if(null===T){var a=/AppleWebKit\/([0-9]+)(?:\.([0-9]+))/.exec(window.navigator.userAgent);T=!!a&&(536>parseInt(a[1],10)||536===parseInt(a[1],10)&&11>=parseInt(a[2],10))}return T}R.prototype.start=function(){this.f.serif=this.j.a.offsetWidth;this.f["sans-serif"]=this.o.a.offsetWidth;this.A=q();la(this)};
-            -
                function ma(a,b,c){for(var d in S)if(S.hasOwnProperty(d)&&b===a.f[S[d]]&&c===a.f[S[d]])return!0;return!1}function la(a){var b=a.g.a.offsetWidth,c=a.h.a.offsetWidth,d;(d=b===a.f.serif&&c===a.f["sans-serif"])||(d=U()&&ma(a,b,c));d?q()-a.A>=a.w?U()&&ma(a,b,c)&&(null===a.u||a.u.hasOwnProperty(a.a.c))?V(a,a.v):V(a,a.B):na(a):V(a,a.v)}function na(a){setTimeout(p(function(){la(this)},a),50)}function V(a,b){setTimeout(p(function(){v(this.g.a);v(this.h.a);v(this.j.a);v(this.o.a);b(this.a)},a),0)};function W(a,b,c){this.c=a;this.a=b;this.f=0;this.o=this.j=!1;this.s=c}var X=null;W.prototype.g=function(a){var b=this.a;b.g&&w(b.f,[b.a.c("wf",a.c,K(a).toString(),"active")],[b.a.c("wf",a.c,K(a).toString(),"loading"),b.a.c("wf",a.c,K(a).toString(),"inactive")]);L(b,"fontactive",a);this.o=!0;oa(this)};
-            -
                W.prototype.h=function(a){var b=this.a;if(b.g){var c=y(b.f,b.a.c("wf",a.c,K(a).toString(),"active")),d=[],e=[b.a.c("wf",a.c,K(a).toString(),"loading")];c||d.push(b.a.c("wf",a.c,K(a).toString(),"inactive"));w(b.f,d,e)}L(b,"fontinactive",a);oa(this)};function oa(a){0==--a.f&&a.j&&(a.o?(a=a.a,a.g&&w(a.f,[a.a.c("wf","active")],[a.a.c("wf","loading"),a.a.c("wf","inactive")]),L(a,"active")):M(a.a))};function pa(a){this.j=a;this.a=new ja;this.h=0;this.f=this.g=!0}pa.prototype.load=function(a){this.c=new ca(this.j,a.context||this.j);this.g=!1!==a.events;this.f=!1!==a.classes;qa(this,new ha(this.c,a),a)};
-            -
                function ra(a,b,c,d,e){var f=0==--a.h;(a.f||a.g)&&setTimeout(function(){var a=e||null,k=d||null||{};if(0===c.length&&f)M(b.a);else{b.f+=c.length;f&&(b.j=f);var h,m=[];for(h=0;h<c.length;h++){var l=c[h],n=k[l.c],r=b.a,x=l;r.g&&w(r.f,[r.a.c("wf",x.c,K(x).toString(),"loading")]);L(r,"fontloading",x);r=null;null===X&&(X=window.FontFace?(x=/Gecko.*Firefox\/(\d+)/.exec(window.navigator.userAgent))?42<parseInt(x[1],10):!0:!1);X?r=new Q(p(b.g,b),p(b.h,b),b.c,l,b.s,n):r=new R(p(b.g,b),p(b.h,b),b.c,l,b.s,a,
-            -
                    n);m.push(r)}for(h=0;h<m.length;h++)m[h].start()}},0)}function qa(a,b,c){var d=[],e=c.timeout;ia(b);var d=ka(a.a,c,a.c),f=new W(a.c,b,e);a.h=d.length;b=0;for(c=d.length;b<c;b++)d[b].load(function(b,d,c){ra(a,f,b,d,c)})};function sa(a,b){this.c=a;this.a=b}function ta(a,b,c){var d=z(a.c);a=(a.a.api||"fast.fonts.net/jsapi").replace(/^.*http(s?):(\/\/)?/,"");return d+"//"+a+"/"+b+".js"+(c?"?v="+c:"")}
-            -
                sa.prototype.load=function(a){function b(){if(f["__mti_fntLst"+d]){var c=f["__mti_fntLst"+d](),e=[],h;if(c)for(var m=0;m<c.length;m++){var l=c[m].fontfamily;void 0!=c[m].fontStyle&&void 0!=c[m].fontWeight?(h=c[m].fontStyle+c[m].fontWeight,e.push(new H(l,h))):e.push(new H(l))}a(e)}else setTimeout(function(){b()},50)}var c=this,d=c.a.projectId,e=c.a.version;if(d){var f=c.c.m;B(this.c,ta(c,d,e),function(e){e?a([]):(f["__MonotypeConfiguration__"+d]=function(){return c.a},b())}).id="__MonotypeAPIScript__"+
-            -
                    d}else a([])};function ua(a,b){this.c=a;this.a=b}ua.prototype.load=function(a){var b,c,d=this.a.urls||[],e=this.a.families||[],f=this.a.testStrings||{},g=new C;b=0;for(c=d.length;b<c;b++)A(this.c,d[b],D(g));var k=[];b=0;for(c=e.length;b<c;b++)if(d=e[b].split(":"),d[1])for(var h=d[1].split(","),m=0;m<h.length;m+=1)k.push(new H(d[0],h[m]));else k.push(new H(d[0]));F(g,function(){a(k,f)})};function va(a,b,c){a?this.c=a:this.c=b+wa;this.a=[];this.f=[];this.g=c||""}var wa="//fonts.googleapis.com/css";function xa(a,b){for(var c=b.length,d=0;d<c;d++){var e=b[d].split(":");3==e.length&&a.f.push(e.pop());var f="";2==e.length&&""!=e[1]&&(f=":");a.a.push(e.join(f))}}
-            -
                function ya(a){if(0==a.a.length)throw Error("No fonts to load!");if(-1!=a.c.indexOf("kit="))return a.c;for(var b=a.a.length,c=[],d=0;d<b;d++)c.push(a.a[d].replace(/ /g,"+"));b=a.c+"?family="+c.join("%7C");0<a.f.length&&(b+="&subset="+a.f.join(","));0<a.g.length&&(b+="&text="+encodeURIComponent(a.g));return b};function za(a){this.f=a;this.a=[];this.c={}}
-            -
                var Aa={latin:"BESbswy","latin-ext":"\u00e7\u00f6\u00fc\u011f\u015f",cyrillic:"\u0439\u044f\u0416",greek:"\u03b1\u03b2\u03a3",khmer:"\u1780\u1781\u1782",Hanuman:"\u1780\u1781\u1782"},Ba={thin:"1",extralight:"2","extra-light":"2",ultralight:"2","ultra-light":"2",light:"3",regular:"4",book:"4",medium:"5","semi-bold":"6",semibold:"6","demi-bold":"6",demibold:"6",bold:"7","extra-bold":"8",extrabold:"8","ultra-bold":"8",ultrabold:"8",black:"9",heavy:"9",l:"3",r:"4",b:"7"},Ca={i:"i",italic:"i",n:"n",normal:"n"},
-            -
                    Da=/^(thin|(?:(?:extra|ultra)-?)?light|regular|book|medium|(?:(?:semi|demi|extra|ultra)-?)?bold|black|heavy|l|r|b|[1-9]00)?(n|i|normal|italic)?$/;
-            -
                function Ea(a){for(var b=a.f.length,c=0;c<b;c++){var d=a.f[c].split(":"),e=d[0].replace(/\+/g," "),f=["n4"];if(2<=d.length){var g;var k=d[1];g=[];if(k)for(var k=k.split(","),h=k.length,m=0;m<h;m++){var l;l=k[m];if(l.match(/^[\w-]+$/)){var n=Da.exec(l.toLowerCase());if(null==n)l="";else{l=n[2];l=null==l||""==l?"n":Ca[l];n=n[1];if(null==n||""==n)n="4";else var r=Ba[n],n=r?r:isNaN(n)?"4":n.substr(0,1);l=[l,n].join("")}}else l="";l&&g.push(l)}0<g.length&&(f=g);3==d.length&&(d=d[2],g=[],d=d?d.split(","):
-            -
                    g,0<d.length&&(d=Aa[d[0]])&&(a.c[e]=d))}a.c[e]||(d=Aa[e])&&(a.c[e]=d);for(d=0;d<f.length;d+=1)a.a.push(new H(e,f[d]))}};function Fa(a,b){this.c=a;this.a=b}var Ga={Arimo:!0,Cousine:!0,Tinos:!0};Fa.prototype.load=function(a){var b=new C,c=this.c,d=new va(this.a.api,z(c),this.a.text),e=this.a.families;xa(d,e);var f=new za(e);Ea(f);A(c,ya(d),D(b));F(b,function(){a(f.a,f.c,Ga)})};function Ha(a,b){this.c=a;this.a=b}Ha.prototype.load=function(a){var b=this.a.id,c=this.c.m;b?B(this.c,(this.a.api||"https://use.typekit.net")+"/"+b+".js",function(b){if(b)a([]);else if(c.Typekit&&c.Typekit.config&&c.Typekit.config.fn){b=c.Typekit.config.fn;for(var e=[],f=0;f<b.length;f+=2)for(var g=b[f],k=b[f+1],h=0;h<k.length;h++)e.push(new H(g,k[h]));try{c.Typekit.load({events:!1,classes:!1,async:!0})}catch(m){}a(e)}},2E3):a([])};function Ia(a,b){this.c=a;this.f=b;this.a=[]}Ia.prototype.load=function(a){var b=this.f.id,c=this.c.m,d=this;b?(c.__webfontfontdeckmodule__||(c.__webfontfontdeckmodule__={}),c.__webfontfontdeckmodule__[b]=function(b,c){for(var g=0,k=c.fonts.length;g<k;++g){var h=c.fonts[g];d.a.push(new H(h.name,ga("font-weight:"+h.weight+";font-style:"+h.style)))}a(d.a)},B(this.c,z(this.c)+(this.f.api||"//f.fontdeck.com/s/css/js/")+ea(this.c)+"/"+b+".js",function(b){b&&a([])})):a([])};var Y=new pa(window);Y.a.c.custom=function(a,b){return new ua(b,a)};Y.a.c.fontdeck=function(a,b){return new Ia(b,a)};Y.a.c.monotype=function(a,b){return new sa(b,a)};Y.a.c.typekit=function(a,b){return new Ha(b,a)};Y.a.c.google=function(a,b){return new Fa(b,a)};var Z={load:p(Y.load,Y)};"function"===typeof define&&define.amd?define(function(){return Z}):"undefined"!==typeof module&&module.exports?module.exports=Z:(window.WebFont=Z,window.WebFontConfig&&Y.load(window.WebFontConfig));}());

assets/js/omgf-admin.js CHANGED Viewed

@@ -15,352 +15,14 @@
             jQuery(document).ready(function ($) {
                 var omgf_admin = {
-            -
                    // XHR
-            -
                    search_fonts_xhr: false,
-            -
                    process_font_styles_xhr: false,
-            -
                    download_fonts_xhr: false,
-            -
                    generate_stylesheet_xhr: false,
                     empty_cache_directory_xhr: false,
-            -
                    // Saved State
-            -
                    subsets_state: 0,
-            -
                    preload_state: 0,
-            -
                    font_style_state: 0,
-            -
-            -
                    // Data
-            -
                    font_families: [],
-            -
                    preload_font_styles: [],
-            -
                    font_style_list: [],
-            -
-            -
                    // Selectors
-            -
                    $search_box: $('#omgf-search'),
-            -
                    $search_button: $('#omgf-search-subsets'),
-            -
                    $loader: $('.omgf-loading'),
-            -
                    $font_families: $('.omgf-subset-font-family'),
-            -
                    $subsets: $('.omgf-subset'),
-            -
                    $manage_font_styles: $('.omgf-font-preload, .omgf-font-remove'),
-            -
                     /**
                      * Initialize all on click events.
                      */
                     init: function () {
-            -
                        // Current queue states
-            -
                        this.subsets_state    = $('.omgf-subset:checked').length;
-            -
                        this.preload_state    = $('.omgf-font-preload:checked').length;
-            -
                        this.font_style_state = $('.omgf-font-style').length;
-            -
-            -
                        // Manage queues
-            -
                        this.$subsets.on('click', this.manage_subset_queue);
-            -
                        this.$manage_font_styles.on('click', this.manage_font_styles_queues);
-            -
-            -
                        // Pressing enter in the search box redirects to WordPress' General Options? Let's NOT.
-            -
                        this.$search_box.on('keyup, keydown', function(event) {
-            -
                            if (event.keyCode === 13) {
-            -
                                event.preventDefault();
-            -
                                omgf_admin.$search_button.click();
-            -
                            }
-            -
                        });
-            -
                         // Buttons
-            -
                        $('#omgf-search-subsets').on('click', this.click_search);
-            -
                        $('#omgf-auto-detect, .help.auto-detect').on('click', this.enable_auto_detect);
-            -
                        $('.omgf-apply.font-styles-search').on('click', this.search_google_fonts);
-            -
                        $('.omgf-apply.font-styles').on('click', this.process_font_styles_queue);
-            -
                        $('#omgf-download, .help.download-fonts').on('click', this.download_fonts);
-            -
                        $('#omgf-generate, .help.generate-stylesheet').on('click', this.generate_stylesheet);
-            -
                        $('#omgf-empty').on('click', this.empty_cache_directory);
-            -
                    },
-            -
-            -
                    /**
-            -
                     * Show apply button, if any changes are made to the list of subsets.
-            -
                     */
-            -
                    manage_subset_queue: function () {
-            -
                        section = $('#omgf-subsets');
-            -
                        colspan = section.find("tr:first td").length - 1;
-            -
                        $('.omgf-subsets-search').attr('colspan', colspan);
-            -
                        subset_length = $('.omgf-subset:checked').length;
-            -
-            -
                        if (subset_length !== omgf_admin.subsets_state) {
-            -
                            omgf_admin.show_button($('.omgf-apply.font-styles-search'), section);
-            -
                        } else {
-            -
                            omgf_admin.hide_button($('.omgf-apply.font-styles-search'), section);
-            -
                        }
-            -
                    },
-            -
-            -
                    /**
-            -
                     * Trigger the appropriate queue manager.
-            -
                     */
-            -
                    manage_font_styles_queues: function () {
-            -
                        if (this.classList.contains('omgf-font-preload')) {
-            -
                            omgf_admin.manage_preload_queue();
-            -
                        } else {
-            -
                            omgf_admin.manage_removal_queue(this);
-            -
                        }
-            -
                    },
-            -
-            -
                    /**
-            -
                     * If any changes are made to the preload queue, display apply button.
-            -
                     */
-            -
                    manage_preload_queue: function () {
-            -
                        omgf_admin.toggle_font_styles_apply_button();
-            -
                    },
-            -
-            -
                    /**
-            -
                     * Enqueue for removal or undo removal of current item.
-            -
                     */
-            -
                    manage_removal_queue: function (element) {
-            -
                        if (element.classList.contains('omgf-font-remove')) {
-            -
                            omgf_admin.enqueue_for_removal(element);
-            -
                        } else {
-            -
                            omgf_admin.undo_removal(element);
-            -
                        }
-            -
                    },
-            -
-            -
                    /**
-            -
                     * Add current item to removal queue.
-            -
                     *
-            -
                     * @param item
-            -
                     */
-            -
                    enqueue_for_removal: function (item) {
-            -
                        row = '#' + $(item).data('row');
-            -
-            -
                        $(row).css({
-            -
                            'opacity': '0.5'
-            -
                        });
-            -
-            -
                        $(item).addClass('omgf-font-no-remove dashicons-before dashicons-undo');
-            -
                        $(item).removeClass('omgf-font-remove notice-dismiss');
-            -
                        $(row).removeClass('omgf-font-style');
-            -
-            -
                        omgf_admin.toggle_font_styles_apply_button();
-            -
                    },
-            -
-            -
                    /**
-            -
                     * Remove current item from removal queue.
-            -
                     *
-            -
                     * @param item
-            -
                     */
-            -
                    undo_removal: function (item) {
-            -
                        row = '#' + $(item).data('row');
-            -
-            -
                        $(row).css({
-            -
                            'opacity': '1'
-            -
                        });
-            -
-            -
                        $(item).removeClass('omgf-font-no-remove dashicons-before dashicons-undo');
-            -
                        $(item).addClass('omgf-font-remove notice-dismiss');
-            -
                        $(row).addClass('omgf-font-style');
-            -
-            -
                        omgf_admin.toggle_font_styles_apply_button();
-            -
                    },
-            -
-            -
                    /**
-            -
                     *
-            -
                     */
-            -
                    toggle_font_styles_apply_button: function () {
-            -
                        font_style_length = $('.omgf-font-style').length;
-            -
                        preload_length    = $('.omgf-font-preload:checked').length;
-            -
-            -
                        if (font_style_length !== omgf_admin.font_style_state || preload_length !== omgf_admin.preload_state) {
-            -
                            omgf_admin.show_button($('.omgf-apply.button.font-styles'), $('#omgf-font-styles-list'));
-            -
                        } else {
-            -
                            omgf_admin.hide_button($('.omgf-apply.button.font-styles'), $('#omgf-font-styles-list'));
-            -
                        }
-            -
                    },
-            -
-            -
                    /**
-            -
                     * @param button
-            -
                     * @param section
-            -
                     */
-            -
                    show_button: function(button, section) {
-            -
                        help_text = section.find('.omgf-apply.help');
-            -
-            -
                        button.show();
-            -
                        help_text.show();
-            -
                    },
-            -
-            -
                    /**
-            -
                     * @param button
-            -
                     * @param section
-            -
                     */
-            -
                    hide_button: function(button, section) {
-            -
                        help_text = section.find('.omgf-apply.help');
-            -
-            -
                        button.hide();
-            -
                        help_text.hide();
-            -
                    },
-            -
-            -
                    /**
-            -
                     * Triggered when Search is clicked.
-            -
                     */
-            -
                    click_search: function () {
-            -
                        searchQuery = $('#omgf-search').val();
-            -
                        omgf_admin.search_subsets(searchQuery);
-            -
                    },
-            -
-            -
                    /**
-            -
                     * Triggered by Click Search
-            -
                     *
-            -
                     * @param query
-            -
                     */
-            -
                    search_subsets: function (query) {
-            -
                        jQuery.ajax({
-            -
                            type: 'POST',
-            -
                            url: ajaxurl,
-            -
                            data: {
-            -
                                action: 'omgf_ajax_search_font_subsets',
-            -
                                search_query: query
-            -
                            },
-            -
                            dataType: 'json',
-            -
                            beforeSend: function () {
-            -
                                omgf_admin.show_loader('.omgf-search-box');
-            -
                            },
-            -
                            complete: function() {
-            -
                                location.reload();
-            -
                            }
-            -
                        });
-            -
                    },
-            -
-            -
                    /**
-            -
                     * Enable Auto Detect.
-            -
                     */
-            -
                    enable_auto_detect: function () {
-            -
                        $.ajax({
-            -
                            type: 'POST',
-            -
                            url: ajaxurl,
-            -
                            data: {
-            -
                                action: 'omgf_ajax_enable_auto_detect'
-            -
                            },
-            -
                            dataType: 'json',
-            -
                            beforeSend: function () {
-            -
                                omgf_admin.show_loader('.omgf-search-box');
-            -
                            },
-            -
                            complete: function () {
-            -
                                location.reload();
-            -
                            }
-            -
                        });
-            -
                    },
-            -
-            -
                    /**
-            -
                     * Triggered on Search
-            -
                     * TODO: Refactor to more sensible names.
-            -
                     */
-            -
                    search_google_fonts: function () {
-            -
                        if (omgf_admin.search_fonts_xhr) {
-            -
                            omgf_admin.search_fonts_xhr.abort();
-            -
                        }
-            -
-            -
                        omgf_admin.font_families = omgf_admin.$font_families.map(function () {
-            -
                            return $(this).data('font-family');
-            -
                        }).get();
-            -
-            -
                        omgf_admin.font_families.forEach(function(font, index) {
-            -
                            omgf_admin.font_families[index] = {};
-            -
                            omgf_admin.font_families[index].selected_subsets = [];
-            -
-            -
                            $('input[data-subset-font-family="' + font + '"]:checked').each(function(i) {
-            -
                                omgf_admin.font_families[index].subset_font = font;
-            -
                                omgf_admin.font_families[index].selected_subsets[i] = this.value;
-            -
                            });
-            -
                        });
-            -
-            -
                        omgf_admin.search_fonts_xhr = $.ajax({
-            -
                            type: 'POST',
-            -
                            url: ajaxurl,
-            -
                            data: {
-            -
                                action: 'omgf_ajax_search_google_fonts',
-            -
                                search_google_fonts: omgf_admin.font_families,
-            -
                            },
-            -
                            dataType: 'json',
-            -
                            beforeSend: function() {
-            -
                                omgf_admin.show_loader('#omgf-font-styles-list');
-            -
                            },
-            -
                            complete: function () {
-            -
                                location.reload();
-            -
                            }
-            -
                        });
-            -
                    },
-            -
-            -
                    /**
-            -
                     *
-            -
                     */
-            -
                    process_font_styles_queue: function () {
-            -
                        if (omgf_admin.process_font_styles_xhr) {
-            -
                            omgf_admin.process_font_styles_xhr.abort();
-            -
                        }
-            -
-            -
                        omgf_admin.font_style_list = $('.omgf-font-style').map(function () {
-            -
                            return $(this).data('font-id');
-            -
                        }).get();
-            -
-            -
                        omgf_admin.preload_font_styles = $('.omgf-font-preload:checked').map(function () {
-            -
                            return this.value;
-            -
                        }).get();
-            -
-            -
                        omgf_admin.process_font_styles_xhr = $.ajax({
-            -
                            type: 'POST',
-            -
                            url: ajaxurl,
-            -
                            data: {
-            -
                                action: 'omgf_ajax_process_font_styles_queue',
-            -
                                font_styles: omgf_admin.font_style_list,
-            -
                                preload_font_styles: omgf_admin.preload_font_styles
-            -
                            },
-            -
                            dataType: 'json',
-            -
                            beforeSend: function() {
-            -
                                omgf_admin.show_loader('#omgf-font-styles-list');
-            -
                            },
-            -
                            success: function() {
-            -
                                location.reload();
-            -
                            }
-            -
                        });
-            -
                    },
-            -
-            -
                    /**
-            -
                     * Download fonts and refresh window.
-            -
                     */
-            -
                    download_fonts: function () {
-            -
                        if (omgf_admin.download_fonts_xhr) {
-            -
                            omgf_admin.download_fonts_xhr.abort();
-            -
                        }
-            -
-            -
                        omgf_admin.download_fonts_xhr = $.ajax({
-            -
                            type: 'POST',
-            -
                            url: ajaxurl,
-            -
                            data: {
-            -
                                action: 'omgf_ajax_download_fonts'
-            -
                            },
-            -
                            beforeSend: function() {
-            -
                                $('#omgf-download').attr('disabled', true);
-            -
                                omgf_admin.show_loader('.omgf-search-section');
-            -
                            },
-            -
                            complete: function() {
-            -
                                location.reload();
-            -
                            }
-            -
                        });
-            -
                    },
-            -
-            -
                    /**
-            -
                     * Generate stylesheet and refresh window.
-            -
                     */
-            -
                    generate_stylesheet: function () {
-            -
                        if (omgf_admin.generate_stylesheet_xhr) {
-            -
                            omgf_admin.generate_stylesheet_xhr.abort();
-            -
                        }
-            -
-            -
                        omgf_admin.generate_stylesheet_xhr = $.ajax({
-            -
                            type: 'POST',
-            -
                            url: ajaxurl,
-            -
                            data: {
-            -
                                action: 'omgf_ajax_generate_styles',
-            -
                            },
-            -
                            beforeSend: function() {
-            -
                                $('#omgf-generate').attr('disabled', true);
-            -
                                omgf_admin.show_loader('.omgf-search-section');
-            -
                            },
-            -
                            complete: function() {
-            -
                                location.reload();
-            -
                            }
-            -
                        });
                     },
                     /**
@@ -377,47 +39,15 @@ jQuery(document).ready(function ($) {
                             data: {
                                 action: 'omgf_ajax_empty_dir'
                             },
-            -
                            beforeSend: function() {
-            -
                                omgf_admin.show_loader('.omgf-search-section');
-            -
                            },
                             complete: function() {
                                 location.reload();
+                            }
                         });
                     },
-            -
-            -
                    /**
-            -
                     * Show loader on element
-            -
                     *
-            -
                     * @param element
-            -
                     */
-            -
                    show_loader: function (element) {
-            -
                        var clone = omgf_admin.$loader.clone();
-            -
-            -
                        $(element).append(clone).css({
-            -
                            'position': 'relative',
-            -
                            'opacity': '0.5'
-            -
                        });
-            -
-            -
                        clone.show();
-            -
                    },
                 };
                 omgf_admin.init();
-            -
                /**
-            -
                 * Toggle different options that aren't compatible with each other.
-            -
                 */
-            -
                $('#omgf_web_font_loader, #omgf_preload').click(function () {
-            -
                    if (this.className === 'omgf_web_font_loader' && this.checked === true) {
-            -
                        $('#omgf_preload').attr('checked', false);
-            -
                    }
-            -
-            -
                    if (this.className === 'omgf_preload' && this.checked === true) {
-            -
                        $('#omgf_web_font_loader').attr('checked', false);
-            -
                    }
-            -
                });
-            -
                 $('#omgf_relative_url').click(function () {
                     if (this.checked === true) {
                         $('#omgf_cdn_url').prop('disabled', true);

             jQuery(document).ready(function ($) {
                 var omgf_admin = {
                     empty_cache_directory_xhr: false,
                     /**
                      * Initialize all on click events.
                      */
                     init: function () {
                         // Buttons
+            +
                        $('.omgf-empty').on('click', this.empty_cache_directory);
                     },
                     /**
                             data: {
                                 action: 'omgf_ajax_empty_dir'
                             },
                             complete: function() {
                                 location.reload();
+                            }
                         });
                     },
                 };
                 omgf_admin.init();
                 $('#omgf_relative_url').click(function () {
                     if (this.checked === true) {
                         $('#omgf_cdn_url').prop('disabled', true);

ffwp-autoload.php ADDED Viewed

	@@ -0,0 +1,76 @@


1	+ <?php
2	+ /* * * * * * * * * * * * * * * * * * * * * *
3	+ * @author : Daan van den Bergh
4	+ * @url : https://ffwp.dev/wordpress-plugins/
5	+ * @copyright: (c) 2020 Daan van den Bergh
6	+ * @license : GPL2v2 or later
7	+ * * * * * * * * * * * * * * * * * * * * * */
8	+
9	+ class FFWP_Autoloader
10	+ {
11	+ /** @var string $class */
12	+ private $class;
13	+
14	+ /** @var string $file */
15	+ private $file;
16	+
17	+ /**
18	+ * FFWP_Autoloader constructor.
19	+ *
20	+ * @param $class
21	+ */
22	+ public function __construct(
23	+ $class
24	+ ) {
25	+ $this->class = $class;
26	+ }
27	+
28	+ /**
29	+ * Build filepath for requested class.
30	+ */
31	+ public function load()
32	+ {
33	+ $path = explode('_', $this->class);
34	+ $this->file = '';
35	+ $i = 0;
36	+
37	+ if (count($path) > 1) {
38	+ array_shift($path);
39	+ }
40	+ end($path);
41	+
42	+ /**
43	+ * Build directory path.
44	+ */
45	+ while ($i < key($path)) {
46	+ $this->build($path[$i], '', '/');
47	+
48	+ $i++;
49	+ }
50	+
51	+ /**
52	+ * Build filename.
53	+ */
54	+ $this->build($path[$i], 'class', '.php');
55	+
56	+ return $this->file;
57	+ }
58	+
59	+ /**
60	+ * Checks if $path is written uppercase entirely, otherwise it'll split $path up and build a string glued with
61	+ * dashes.
62	+ *
63	+ * @param $path
64	+ * @param string $prefix
65	+ * @param string $suffix
66	+ */
67	+ private function build($path, $prefix = '', $suffix = '/')
68	+ {
69	+ if (ctype_upper($path)) {
70	+ $this->file .= ($prefix ? $prefix . '-' : '') . strtolower($path) . $suffix;
71	+ } else {
72	+ $parts = preg_split('/(?=[A-Z])/', lcfirst($path));
73	+ $this->file .= ($prefix ? $prefix . '-' : '') . strtolower(implode('-', $parts)) . $suffix;
74	+ }
75	+ }
76	+ }

host-webfonts-local.php CHANGED Viewed

	@@ -3,25 +3,23 @@
3	* @formatter:off
4	* Plugin Name: OMGF
5	* Plugin URI: https://daan.dev/wordpress-plugins/host-google-fonts-locally
6	- * Description: Minimize DNS requests and leverage browser cache by ~~easily~~ saving Google Fonts to your server and removing the external Google Fonts.
7	- * Version: 3.8.2
8	- * Author: Daan ~~van~~ ~~den~~ ~~Bergh~~
9	- * Author URI: https://~~daan~~.dev
10	* License: GPL2v2 or later
11	* Text Domain: host-webfonts-local
12	* @formatter:on
13	*/
14
15	- defined('ABSPATH') \|\| exit;
16
17	/**
18	* Define constants.
19	*/
20	- define('OMGF_PLUGIN_DIR', plugin_dir_path(__FILE__));
21	- define('OMGF_PLUGIN_FILE', __FILE__);
22	- define('~~OMGF_DB_VERSION~~', '3.0.0'); ~~// Legacy~~
23	- define('OMGF_STATIC_VERSION', '3.4.0');
24	- define('OMGF_WEB_FONT_LOADER_VERSION', '1.6.26');
25
26	/**
27	* Takes care of loading classes on demand.
	@@ -30,39 +28,37 @@ define('OMGF_WEB_FONT_LOADER_VERSION', '1.6.26');
30	*
31	* @return mixed\|void
32	*/
33	- function omgf_autoload($class)
34	- {
35	- ~~$path = explode('_', $class);~~
36	-
37	- ~~if ($path[0] != 'OMGF') {~~
38	- ~~return;~~
39	- }
40	-
41	- if ~~(!class_exists(~~'~~Woosh_Autoloader~~')~~) {~~
42	- ~~require_once(OMGF_PLUGIN_DIR . 'woosh-autoload.php');~~
43	- }
44	-
45	- ~~$autoload = new Woosh_Autoloader($class);~~
46	-
47	- return include OMGF_PLUGIN_DIR . 'includes/' . $autoload->load();
48	}
49
50	- spl_autoload_register('omgf_autoload');
51
52	/**
53	* All systems GO!!!
54	*
55	* @return OMGF
56	*/
57	- function omgf_init()
58	- {
59	- ~~static $omgf = null;~~
60	-
61	- ~~if (~~$omgf ~~===~~ ~~null~~) {
62	- ~~$omgf = new OMGF();~~
63	- }
64	-
65	- return $omgf;
66	}
67
68	- omgf_init();


3	* @formatter:off
4	* Plugin Name: OMGF
5	* Plugin URI: https://daan.dev/wordpress-plugins/host-google-fonts-locally
6	+ * Description: Minimize DNS requests and leverage browser cache by automatically saving Google Fonts to your server and removing the external Google Fonts.
7	+ * Version: 4.0.0
8	+ * Author: Daan (from Fast FW Press)
9	+ * Author URI: https://ffwp.dev
10	* License: GPL2v2 or later
11	* Text Domain: host-webfonts-local
12	* @formatter:on
13	*/
14
15	+ defined( 'ABSPATH' ) \|\| exit;
16
17	/**
18	* Define constants.
19	*/
20	+ define( 'OMGF_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
21	+ define( 'OMGF_PLUGIN_FILE', __FILE__ );
22	+ define( 'OMGF_STATIC_VERSION', '3.4.0' );


23
24	/**
25	* Takes care of loading classes on demand.

28	*
29	* @return mixed\|void
30	*/
31	+ function omgf_autoload ( $class ) {
32	+ $path = explode( '_', $class );
33	+
34	+ if ( $path[0] != 'OMGF' ) {
35	+ return;
36	+ }
37	+
38	+ if ( ! class_exists( 'FFWP_Autoloader' ) ) {
39	+ require_once( OMGF_PLUGIN_DIR . 'ffwp-autoload.php' );
40	+ }
41	+
42	+ $autoload = new FFWP_Autoloader( $class );
43	+
44	+ return include OMGF_PLUGIN_DIR . 'includes/' . $autoload->load();

45	}
46
47	+ spl_autoload_register( 'omgf_autoload' );
48
49	/**
50	* All systems GO!!!
51	*
52	* @return OMGF
53	*/
54	+ function omgf_init () {
55	+ static $omgf = null;
56	+
57	+ if ( $omgf === null ) {
58	+ $omgf = new OMGF();
59	+ }
60	+
61	+ return $omgf;

62	}
63
64	+ add_action( 'plugins_loaded', 'omgf_init', 50 );

includes/admin/class-auto-detect.php DELETED Viewed

@@ -1,227 +0,0 @@
-            -
            <?php
-            -
            /* * * * * * * * * * * * * * * * * * * * *
-            -
             *
-            -
             *  ██████╗ ███╗   ███╗ ██████╗ ███████╗
-            -
             * ██╔═══██╗████╗ ████║██╔════╝ ██╔════╝
-            -
             * ██║   ██║██╔████╔██║██║  ███╗█████╗
-            -
             * ██║   ██║██║╚██╔╝██║██║   ██║██╔══╝
-            -
             * ╚██████╔╝██║ ╚═╝ ██║╚██████╔╝██║
-            -
             *  ╚═════╝ ╚═╝     ╚═╝ ╚═════╝ ╚═╝
-            -
             *
-            -
             * @package  : OMGF
-            -
             * @author   : Daan van den Bergh
-            -
             * @copyright: (c) 2020 Daan van den Bergh
-            -
             * @url      : https://daan.dev
-            -
             * * * * * * * * * * * * * * * * * * * */
-            -
-            -
            defined('ABSPATH') || exit;
-            -
-            -
            class OMGF_Admin_AutoDetect
-            -
            {
-            -
                /** @var array $detected_fonts */
-            -
                private $detected_fonts = [];
-            -
-            -
                /** @var OMGF_API $api */
-            -
                private $api;
-            -
-            -
                /**
-            -
                 * OMGF_Admin_AutoDetect constructor.
-            -
                 *
-            -
                 * @param $detected_fonts
-            -
                 */
-            -
                public function __construct(
-            -
                    $detected_fonts
-            -
                ) {
-            -
                    $this->detected_fonts = $detected_fonts;
-            -
                    $this->api = new OMGF_API();
-            -
-            -
                    $this->init();
-            -
                }
-            -
-            -
                /**
-            -
                 * Run Auto Detect.
-            -
                 */
-            -
                private function init()
-            -
                {
-            -
                    $font_properties = $this->extract_font_properties($this->detected_fonts);
-            -
-            -
                    $subsets = $this->build_subsets_array($font_properties);
-            -
-            -
                    foreach ($subsets as $index => &$font) {
-            -
                        if (!is_numeric($index)) {
-            -
                            continue;
-            -
                        }
-            -
-            -
                        $font_styles[$font['subset_font']] = $this->api->get_font_styles($font['subset_font'], implode(',', $font['selected_subsets']));
-            -
-            -
                        // If subset was already detected, replace styles instead of overwriting them.
-            -
                        if (isset($subsets[$font['subset_font']])) {
-            -
                            $subsets[$font['subset_font']] = array_replace_recursive($subsets[$font['subset_font']], $font);
-            -
                        } else {
-            -
                            $subsets[$font['subset_font']] = $font;
-            -
                        }
-            -
-            -
                        unset($subsets[$index]);
-            -
                    }
-            -
-            -
                    update_option(OMGF_Admin_Settings::OMGF_SETTING_SUBSETS, $subsets);
-            -
-            -
                    // Match used styles with available styles.
-            -
                    foreach ($subsets as $subset) {
-            -
                        $used_styles[] = $this->process_used_styles($subset['used_styles'], $font_styles[$subset['subset_font']]);
-            -
                    }
-            -
-            -
                    if (isset($used_styles)) {
-            -
                        $detected_font_styles = array_merge(...$used_styles);
-            -
-            -
                        update_option(OMGF_Admin_Settings::OMGF_SETTING_FONTS, $detected_font_styles);
-            -
                    }
-            -
-            -
                    /** It only needs to run once. */
-            -
                    delete_option(OMGF_Admin_Settings::OMGF_SETTING_AUTO_DETECTION_ENABLED);
-            -
                    delete_option(OMGF_Admin_Settings::OMGF_SETTING_DETECTED_FONTS);
-            -
-            -
                    if (empty($subsets)) {
-            -
                        OMGF_Admin_Notice::set_notice(__('Auto Detect completed successfully, but no Google Fonts were found.', 'host-webfonts-local'), false, 'warning');
-            -
-            -
                        OMGF_Admin_Notice::set_notice(sprintf(__('Your theme and/or plugins are using unconventional methods (or Web Font Loader) to load Google Fonts. <strong>Upgrade to OMGF Pro</strong> (<em>starting at € 29, -</em>) to automatically detect and replace Google Fonts for your theme and plugins. <a href="%s" target="_blank">Purchase OMGF Pro</a>.', 'host-webfonts-local'), OMGF_Admin_Settings_Builder::WOOSH_WORDPRESS_PLUGINS_HOST_GOOGLE_FONTS_PRO), false, 'info');
-            -
                    } else {
-            -
                        $count_fonts   = count($subsets);
-            -
                        $count_subsets = 0;
-            -
                        foreach ($subsets as $subset) {
-            -
                            $count_subsets += count($subset['available_subsets']);
-            -
                        }
-            -
                        $count_font_styles = count($detected_font_styles);
-            -
-            -
                        OMGF_Admin_Notice::set_notice(__("Auto Detect found $count_fonts fonts in $count_subsets different subsets and $count_font_styles font styles. Please check the results and proceed to download the fonts and generate the stylesheet.", 'host-webfonts-local'), false);
-            -
                    }
-            -
                }
-            -
-            -
                /**
-            -
                 * @param $fontSource
-            -
                 *
-            -
                 * @return array
-            -
                 */
-            -
                private function extract_font_properties($fontSource)
-            -
                {
-            -
                    $font_properties = array();
-            -
-            -
                    $i = 0;
-            -
-            -
                    foreach ($fontSource as $source) {
-            -
                        $parts = parse_url($source);
-            -
-            -
                        /**
-            -
                         * Skip over default Admin WordPress fonts; Noto Serif and Open Sans, which are always detected first (as far as I know.)
-            -
                         * We check on iteration value, to make sure these fonts are still returned if they are also used in the theme.
-            -
                         */
-            -
                        if (($i == 0 && strpos($parts['query'], 'Open+Sans') !== false) || ($i == 1 && strpos($parts['query'], 'Noto+Serif') !== false)) {
-            -
                            $i++;
-            -
                            continue;
-            -
                        }
-            -
-            -
                        parse_str($parts['query'], $font_properties[$i]);
-            -
-            -
                        /**
-            -
                         * Some themes (like Twenty Sixteen) do chained requests using a pipe (|).
-            -
                         * This function explodes these requests and adds them to the query.
-            -
                         */
-            -
                        if (strpos($font_properties[$i]['family'], '|') !== false) {
-            -
                            $parts_parts = explode('|', $font_properties[$i]['family']);
-            -
                            $font_property_subset = isset($font_properties[$i]['subset']) ? $font_properties[$i]['subset'] : 'latin';
-            -
-            -
                            foreach ($parts_parts as $part) {
-            -
                                $font_properties[$i]['family'] = $part;
-            -
                                $font_properties[$i]['subset'] = $font_property_subset;
-            -
                                $i++;
-            -
                            }
-            -
                        }
-            -
-            -
                        $i++;
-            -
                    }
-            -
-            -
                    return $font_properties;
-            -
                }
-            -
-            -
                /**
-            -
                 * @param $font_properties
-            -
                 *
-            -
                 * @return array
-            -
                 */
-            -
                private function build_subsets_array($font_properties)
-            -
                {
-            -
                    foreach ($font_properties as $properties) {
-            -
                        $parts   = explode(':', $properties['family']);
-            -
                        $subsets = isset($properties['subset']) ? explode(',', $properties['subset']) : null;
-            -
-            -
                        if (!empty($parts)) {
-            -
                            $font_family = $parts[0];
-            -
                            $styles      = explode(',', $parts[1]);
-            -
                        }
-            -
-            -
                        $fonts[] = [
-            -
                            'subset_family'     => $font_family,
-            -
                            'subset_font'       => str_replace(' ', '-', strtolower($font_family)),
-            -
                            'available_subsets' => $subsets ?? [ 'latin' ],
-            -
                            'selected_subsets'  => $subsets ?? [ 'latin' ],
-            -
                            'used_styles'       => $styles
-            -
                        ];
-            -
                    }
-            -
-            -
                    return $fonts;
-            -
                }
-            -
-            -
                /**
-            -
                 * @param $used_styles
-            -
                 * @param $available_styles
-            -
                 *
-            -
                 * @return array
-            -
                 */
-            -
                private function process_used_styles($used_styles, $available_styles)
-            -
                {
-            -
                    foreach ($used_styles as &$style) {
-            -
                        if (empty($style)) {
-            -
                            $used_styles = $this->process_available_styles($available_styles);
-            -
-            -
                            break;
-            -
                        }
-            -
-            -
                        $fontWeight = preg_replace('/[^0-9]/', '', $style);
-            -
                        $fontStyle  = preg_replace('/[^a-zA-Z]/', '', $style);
-            -
-            -
                        if ($fontStyle == 'i') {
-            -
                            $fontStyle = 'italic';
-            -
                        }
-            -
-            -
                        $style = $fontWeight . $fontStyle;
-            -
                    }
-            -
-            -
                    return array_filter(
-            -
                        $available_styles,
-            -
                        function ($style) use ($used_styles) {
-            -
                            $fontStyle = $style['font_weight'] . ($style['font_style'] !== 'normal' ? $style['font_style'] : '');
-            -
-            -
                            return in_array($fontStyle, $used_styles);
-            -
                        }
-            -
                    );
-            -
                }
-            -
-            -
                /**
-            -
                 * Some themes requests font families without specifying font styles. While this is inadvisable, OMGF should be able
-            -
                 * to deal with this. That's why, when no font styles are detected, all available font styles are returned.
-            -
                 *
-            -
                 * @param array $styles
-            -
                 *
-            -
                 * @return array
-            -
                 */
-            -
                private function process_available_styles(array $styles)
-            -
                {
-            -
                    foreach ($styles as $style) {
-            -
                        $font_style = $style['font_style'] !== 'normal' ? $style['font_style'] : '';
-            -
-            -
                        $used_styles[] = $style['font_weight'] . $font_style;
-            -
                    }
-            -
-            -
                    return $used_styles;
-            -
                }
-            -
            }

includes/admin/class-notice.php CHANGED Viewed

@@ -14,68 +14,66 @@
              * @url      : https://daan.dev
              * * * * * * * * * * * * * * * * * * * */
-            -
            defined('ABSPATH') || exit;
             class OMGF_Admin_Notice
+            {
-            -
                const OMGF_ADMIN_NOTICE_TRANSIENT  = 'omgf_admin_notice';
-            -
                const OMGF_ADMIN_NOTICE_EXPIRATION = 30;
-            -
-            -
                /** @var array $notices */
-            -
                public static $notices = [];
-            -
-            -
                /**
-            -
                 * @param        $message
-            -
                 * @param string $type (info|warning|error|success)
-            -
                 * @param string $screen_id
-            -
                 * @param bool   $json
-            -
                 * @param int    $code
-            -
                 */
-            -
                public static function set_notice($message, $die = true, $type = 'success', $code = 200, $screen_id = 'all')
-            -
                {
-            -
                    self::$notices                      = get_transient(self::OMGF_ADMIN_NOTICE_TRANSIENT);
-            -
                    self::$notices[$screen_id][$type][] = $message;
-            -
-            -
                    set_transient(self::OMGF_ADMIN_NOTICE_TRANSIENT, self::$notices, self::OMGF_ADMIN_NOTICE_EXPIRATION);
-            -
-            -
                    if ($die) {
-            -
                        switch ($type) {
-            -
                            case 'error':
-            -
                                wp_send_json_error($message, $code);
-            -
                                break;
-            -
                            default:
-            -
                                wp_send_json_success($message, $code);
-            -
                        }
-            -
                    }
-            -
                }
-            -
-            -
                /**
-            -
                 * Prints notice (if any) grouped by type.
-            -
                 */
-            -
                public static function print_notice()
-            -
                {
-            -
                    $admin_notices = get_transient(self::OMGF_ADMIN_NOTICE_TRANSIENT);
-            -
-            -
                    if (is_array($admin_notices)) {
-            -
                        $current_screen = get_current_screen();
-            -
-            -
                        foreach ($admin_notices as $screen => $notice) {
-            -
                            if ($current_screen->id != $screen && $screen != 'all') {
-            -
                                continue;
-            -
                            }
-            -
-            -
                            foreach ($notice as $type => $message) {
-            -
                                ?>
                                 <div id="message" class="notice notice-<?php echo $type; ?> is-dismissible">
-            -
                                    <?php foreach ($message as $line): ?>
                                         <p><?= $line; ?></p>
-            -
                                    <?php endforeach; ?>
                                 </div>
-            -
                                <?php
-            -
                            }
-            -
                        }
-            -
                    }
-            -
-            -
                    delete_transient(self::OMGF_ADMIN_NOTICE_TRANSIENT);
-            -
                }
+            }


14	* @url : https://daan.dev
15	* * * * * * * * * * * * * * * * * * * */
16
17	+ defined( 'ABSPATH' ) \|\| exit;
18
19	class OMGF_Admin_Notice
20	{
21	+ const OMGF_ADMIN_NOTICE_TRANSIENT = 'omgf_admin_notice';
22	+ const OMGF_ADMIN_NOTICE_EXPIRATION = 30;
23	+
24	+ /** @var array $notices */
25	+ public static $notices = [];
26	+
27	+ /**
28	+ * @param $message
29	+ * @param string $type (info\|warning\|error\|success)
30	+ * @param string $screen_id
31	+ * @param bool $json
32	+ * @param int $code
33	+ */
34	+ public static function set_notice ( $message, $die = true, $type = 'success', $code = 200, $screen_id = 'all' ) {
35	+ self::$notices = get_transient( self::OMGF_ADMIN_NOTICE_TRANSIENT );
36	+ self::$notices[ $screen_id ][ $type ][] = $message;
37	+
38	+ set_transient( self::OMGF_ADMIN_NOTICE_TRANSIENT, self::$notices, self::OMGF_ADMIN_NOTICE_EXPIRATION );
39	+
40	+ if ( $die ) {
41	+ switch ( $type ) {
42	+ case 'error':
43	+ wp_send_json_error( $message, $code );
44	+ break;
45	+ default:
46	+ wp_send_json_success( $message, $code );
47	+ }
48	+ }
49	+ }
50	+
51	+ /**
52	+ * Prints notice (if any) grouped by type.
53	+ */
54	+ public static function print_notices () {
55	+ $admin_notices = get_transient( self::OMGF_ADMIN_NOTICE_TRANSIENT );
56	+
57	+ if ( is_array( $admin_notices ) ) {
58	+ $current_screen = get_current_screen();
59	+
60	+ foreach ( $admin_notices as $screen => $notice ) {
61	+ if ( $current_screen->id != $screen && $screen != 'all' ) {
62	+ continue;
63	+ }
64	+
65	+ foreach ( $notice as $type => $message ) {
66	+ ?>


67	<div id="message" class="notice notice-<?php echo $type; ?> is-dismissible">
68	+ <?php foreach ( $message as $line ): ?>
69	<p><?= $line; ?></p>
70	+ <?php endforeach; ?>
71	</div>
72	+ <?php
73	+ }
74	+ }
75	+ }
76	+
77	+ delete_transient( self::OMGF_ADMIN_NOTICE_TRANSIENT );
78	+ }
79	}

includes/admin/class-settings.php CHANGED Viewed

@@ -14,313 +14,293 @@
              * @url      : https://daan.dev
              * * * * * * * * * * * * * * * * * * * */
-            -
            defined('ABSPATH') || exit;
             class OMGF_Admin_Settings extends OMGF_Admin
+            {
-            -
                /**
-            -
                 * Settings Fields
-            -
                 */
-            -
                const OMGF_SETTINGS_FIELD_GENERATE_STYLESHEET = 'omgf-generate-stylesheet';
-            -
                const OMGF_SETTINGS_FIELD_ADVANCED            = 'omgf-advanced-settings';
-            -
                const OMGF_SETTINGS_FIELD_EXTENSIONS          = 'omgf-extensions-settings';
-            -
-            -
                /**
-            -
                 * Option Values
-            -
                 */
-            -
                const OMGF_FONT_DISPLAY_OPTIONS           = [
-            -
                    'swap'     => 'Swap (recommended)',
-            -
                    'auto'     => 'Auto',
-            -
                    'block'    => 'Block',
-            -
                    'fallback' => 'Fallback',
-            -
                    'optional' => 'Optional'
-            -
                ];
-            -
-            -
                /**
-            -
                 * Generate Stylesheet
-            -
                 */
-            -
                const OMGF_SETTING_DB_VERSION              = 'omgf_db_version';
-            -
                const OMGF_SETTING_AUTO_DETECTION_ENABLED  = 'omgf_auto_detection_enabled';
-            -
                const OMGF_SETTING_DETECTED_FONTS          = 'omgf_detected_fonts';
-            -
                const OMGF_SETTING_SUBSETS                 = 'omgf_subsets';
-            -
                const OMGF_SETTING_FONTS                   = 'omgf_fonts';
-            -
-            -
                /**
-            -
                 * Advanced Settings
-            -
                 */
-            -
                const OMGF_ADV_SETTING_CACHE_PATH          = 'omgf_cache_dir';
-            -
                const OMGF_ADV_SETTING_CACHE_URI           = 'omgf_cache_uri';
-            -
                const OMGF_ADV_SETTING_CDN_URL             = 'omgf_cdn_url';
-            -
                const OMGF_ADV_SETTING_WEB_FONT_LOADER     = 'omgf_web_font_loader';
-            -
                const OMGF_ADV_SETTING_REMOVE_VERSION      = 'omgf_remove_version';
-            -
                const OMGF_ADV_SETTING_DISPLAY_OPTION      = 'omgf_display_option';
-            -
                const OMGF_ADV_SETTING_REMOVE_GOOGLE_FONTS = 'omgf_remove_gfonts';
-            -
                const OMGF_ADV_SETTING_OPTIMIZE_EDIT_ROLES = 'omgf_optimize_edit_roles';
-            -
                const OMGF_ADV_SETTING_UNINSTALL           = 'omgf_uninstall';
-            -
                const OMGF_ADV_SETTING_ENQUEUE_ORDER       = 'omgf_enqueue_order';
-            -
                const OMGF_ADV_SETTING_FORCE_SSL           = 'omgf_force_ssl';
-            -
                const OMGF_ADV_SETTING_RELATIVE_URL        = 'omgf_relative_url';
-            -
-            -
                /** @var string $active_tab */
-            -
                private $active_tab;
-            -
-            -
                /** @var string $page */
-            -
                private $page;
-            -
-            -
                /** @var string $plugin_text_domain */
-            -
                private $plugin_text_domain = 'host-webfonts-local';
-            -
-            -
                /**
-            -
                 * OMGF_Admin_Settings constructor.
-            -
                 */
-            -
                public function __construct()
-            -
                {
-            -
                    parent::__construct();
-            -
-            -
                    $this->active_tab = isset($_GET['tab']) ? $_GET['tab'] : self::OMGF_SETTINGS_FIELD_GENERATE_STYLESHEET;
-            -
                    $this->page       = isset($_GET['page']) ? $_GET['page'] : '';
-            -
-            -
                    // @formatter:off
-            -
                    add_action('admin_menu', [$this, 'create_menu']);
-            -
                    add_filter('plugin_action_links_' . plugin_basename(OMGF_PLUGIN_FILE), [$this, 'create_settings_link']);
-            -
-            -
                    if ($this->page !== 'optimize-webfonts') {
-            -
                        return;
-            -
                    }
-            -
-            -
                    // Tabs
-            -
                    add_action('omgf_settings_tab', [$this, 'generate_stylesheet_tab'], 1);
-            -
                    add_action('omgf_settings_tab', [$this, 'advanced_settings_tab'], 2);
-            -
                    add_action('omgf_settings_tab', [$this, 'extensions_settings_tab'], 3);
-            -
-            -
                    // Content
-            -
                    add_action('omgf_settings_content', [$this, 'generate_stylesheet_content'], 1);
-            -
                    add_action('omgf_settings_content', [$this, 'advanced_settings_content'], 2);
-            -
                    add_action('omgf_settings_content', [$this, 'extensions_settings_content'], 3);
-            -
                    // @formatter:on
-            -
                }
-            -
-            -
                /**
-            -
                 * Creates the menu item.
-            -
                 */
-            -
                public function create_menu()
-            -
                {
-            -
                    add_options_page(
-            -
                        'OMGF',
-            -
                        'Optimize Google Fonts',
-            -
                        'manage_options',
-            -
                        'optimize-webfonts',
-            -
                        [$this, 'create_settings_page']
-            -
                    );
-            -
-            -
                    // @formatter:off
-            -
                    add_action('admin_init', array($this, 'register_settings'));
-            -
                    // @formatter:on
-            -
                }
-            -
-            -
                /**
-            -
                 * Display the settings page.
-            -
                 */
-            -
                public function create_settings_page()
-            -
                {
-            -
                    if (!current_user_can('manage_options')) {
-            -
                        wp_die(__("You're not cool enough to access this page.", $this->plugin_text_domain));
-            -
                    }
-            -
                    ?>
-            -
                    <div class="wrap">
-            -
                        <h1><?= apply_filters('omgf_settings_page_title', __('OMGF | Optimize My Google Fonts', $this->plugin_text_domain)); ?></h1>
                         <p>
-            -
                            <?= get_plugin_data(OMGF_PLUGIN_FILE)['Description']; ?>
                         </p>
                         <div class="settings-column left">
                             <h2 class="omgf-nav nav-tab-wrapper">
-            -
                                <?php do_action('omgf_settings_tab'); ?>
                             </h2>
-            -
-            -
                            <?php do_action('omgf_settings_content'); ?>
                         </div>
                         <div class="settings-column right">
                             <div id="omgf-welcome-panel" class="welcome-panel">
-            -
                                <?php $this->get_template('welcome'); ?>
                             </div>
                         </div>
                     </div>
-            -
                    <?php
-            -
                }
-            -
-            -
                /**
-            -
                 * Register all settings.
-            -
                 *
-            -
                 * @throws ReflectionException
-            -
                 */
-            -
                public function register_settings()
-            -
                {
-            -
                    if ($this->active_tab !== self::OMGF_SETTINGS_FIELD_GENERATE_STYLESHEET
-            -
                        && $this->active_tab !== self::OMGF_SETTINGS_FIELD_ADVANCED
-            -
                        && $this->active_tab !== self::OMGF_SETTINGS_FIELD_EXTENSIONS) {
-            -
                        $this->active_tab = self::OMGF_SETTINGS_FIELD_GENERATE_STYLESHEET;
-            -
                    }
-            -
-            -
                    foreach ($this->get_settings() as $constant => $value)
-            -
                    {
-            -
                        register_setting(
-            -
                            $this->active_tab,
-            -
                            $value
-            -
                        );
-            -
                    }
-            -
                }
-            -
-            -
                /**
-            -
                 * Get all settings using the constants in this class.
-            -
                 *
-            -
                 * @return array
-            -
                 * @throws ReflectionException
-            -
                 */
-            -
                public function get_settings()
-            -
                {
-            -
                    if ($this->active_tab == self::OMGF_SETTINGS_FIELD_GENERATE_STYLESHEET) {
-            -
                        return [];
-            -
                    }
-            -
-            -
                    $reflection = new ReflectionClass($this);
-            -
                    $constants  = apply_filters('omgf_settings_constants', $reflection->getConstants());
-            -
                    $needle     = 'OMGF_ADV_SETTING';
-            -
-            -
                    if ($this->active_tab == self::OMGF_SETTINGS_FIELD_EXTENSIONS) {
-            -
                        $needle = 'OMGF_EXT_SETTING';
-            -
                    }
-            -
-            -
                    return array_filter(
-            -
                        $constants,
-            -
                        function ($key) use ($needle) {
-            -
                            return strpos($key, $needle) !== false;
-            -
                        },
-            -
                        ARRAY_FILTER_USE_KEY
-            -
                    );
-            -
                }
-            -
-            -
                /**
-            -
                 * Add Generate Stylesheet Tab to Settings Screen.
-            -
                 */
-            -
                public function generate_stylesheet_tab()
-            -
                {
-            -
                    $this->generate_tab(self::OMGF_SETTINGS_FIELD_GENERATE_STYLESHEET, 'dashicons-admin-appearance', __('Generate Stylesheet', $this->plugin_text_domain));
-            -
                }
-            -
-            -
                /**
-            -
                 * Add Advanced Settings Tab to Settings Screen.
-            -
                 */
-            -
                public function advanced_settings_tab()
-            -
                {
-            -
                    $this->generate_tab(self::OMGF_SETTINGS_FIELD_ADVANCED, 'dashicons-admin-settings', __('Advanced Settings', $this->plugin_text_domain));
-            -
                }
-            -
-            -
                /**
-            -
                 * Add Extensions tab to Settings Screen.
-            -
                 */
-            -
                public function extensions_settings_tab()
-            -
                {
-            -
                    $this->generate_tab(self::OMGF_SETTINGS_FIELD_EXTENSIONS, 'dashicons-admin-plugins', __('Extensions', $this->plugin_text_domain));
-            -
                }
-            -
-            -
                /**
-            -
                 * @param      $id
-            -
                 * @param null $icon
-            -
                 * @param null $label
-            -
                 */
-            -
                private function generate_tab($id, $icon = null, $label = null)
-            -
                {
-            -
                    ?>
-            -
                    <a class="nav-tab dashicons-before <?= $icon; ?> <?= $this->active_tab == $id ? 'nav-tab-active' : ''; ?>" href="<?= $this->generate_tab_link($id);?>">
-            -
                        <?= $label; ?>
                     </a>
-            -
                    <?php
-            -
                }
-            -
-            -
                /**
-            -
                 * @param $tab
-            -
                 *
-            -
                 * @return string
-            -
                 */
-            -
                private function generate_tab_link($tab)
-            -
                {
-            -
                    return admin_url("options-general.php?page=optimize-webfonts&tab=$tab");
-            -
                }
-            -
-            -
                /**
-            -
                 * Render Generate Stylesheet
-            -
                 */
-            -
                public function generate_stylesheet_content()
-            -
                {
-            -
                    if ($this->active_tab != self::OMGF_SETTINGS_FIELD_GENERATE_STYLESHEET) {
-            -
                        return;
-            -
                    }
-            -
                    ?>
-            -
                    <form id="omgf-generate-stylesheet-form" name="omgf-generate-stylesheet-form">
-            -
                        <?php
-            -
                        $this->get_template('generate-stylesheet');
-            -
                        ?>
                     </form>
-            -
                    <?php
-            -
                }
-            -
-            -
                /**
-            -
                 * Render Advanced Settings content
-            -
                 */
-            -
                public function advanced_settings_content()
-            -
                {
-            -
                    $this->do_settings_content(self::OMGF_SETTINGS_FIELD_ADVANCED);
-            -
                }
-            -
-            -
                /**
-            -
                 * Render Extensions content
-            -
                 */
-            -
                public function extensions_settings_content()
-            -
                {
-            -
                    $this->do_settings_content(self::OMGF_SETTINGS_FIELD_EXTENSIONS);
-            -
                }
-            -
-            -
                /**
-            -
                 * @param $id
-            -
                 * @param $field
-            -
                 */
-            -
                private function do_settings_content($field)
-            -
                {
-            -
                    if ($this->active_tab != $field) {
-            -
                        return;
-            -
                    }
-            -
                    ?>
-            -
                    <form id="<?= $field; ?>-form" name="omgf-settings-form" method="post" action="options.php?tab=<?= $this->active_tab; ?>">
-            -
                        <?php
-            -
                        settings_fields($field);
-            -
                        do_settings_sections($field);
-            -
-            -
                        do_action('omgf_before_settings_form_settings');
-            -
-            -
                        echo apply_filters(str_replace('-', '_', $field) . '_content', '');
-            -
-            -
                        do_action('omgf_after_settings_form_settings');
-            -
-            -
                        submit_button();
-            -
                        ?>
-            -
                    </form>
-            -
                    <?php
-            -
                }
-            -
-            -
                /**
-            -
                 * Adds the 'settings' link to the Plugin overview.
-            -
                 *
-            -
                 * @return mixed
-            -
                 */
-            -
                public function create_settings_link($links)
-            -
                {
-            -
                    $adminUrl     = admin_url() . 'options-general.php?page=optimize-webfonts';
-            -
                    $settingsLink = "<a href='$adminUrl'>" . __('Settings') . "</a>";
-            -
                    array_push($links, $settingsLink);
-            -
-            -
                    return $links;
-            -
                }
+            }


14	* @url : https://daan.dev
15	* * * * * * * * * * * * * * * * * * * */
16
17	+ defined( 'ABSPATH' ) \|\| exit;
18
19	class OMGF_Admin_Settings extends OMGF_Admin
20	{
21	+ /**
22	+ * Settings Fields
23	+ */
24	+ const OMGF_SETTINGS_FIELD_BASIC = 'omgf-basic-settings';
25	+ const OMGF_SETTINGS_FIELD_ADVANCED = 'omgf-advanced-settings';
26	+
27	+ /**
28	+ * Option Values
29	+ */
30	+ const OMGF_FONT_PROCESSING_OPTIONS = [
31	+ 'replace' => 'Replace (default)',
32	+ 'remove' => 'Remove only'
33	+ ];
34	+ const OMGF_FONT_DISPLAY_OPTIONS = [
35	+ 'swap' => 'Swap (recommended)',
36	+ 'auto' => 'Auto',
37	+ 'block' => 'Block',
38	+ 'fallback' => 'Fallback',
39	+ 'optional' => 'Optional'
40	+ ];
41	+ const OMGF_FORCE_SUBSETS_OPTIONS = [
42	+ 'arabic' => 'Arabic',
43	+ 'bengali' => 'Bengali',
44	+ 'chinese-hongkong' => 'Chinese (Hong Kong)',
45	+ 'chinese-simplified' => 'Chinese (Simplified)',
46	+ 'chinese-traditional' => 'Chinese (Traditional)',
47	+ 'cyrillic' => 'Cyrillic',
48	+ 'cyrillic-ext' => 'Cyrillic Extended',
49	+ 'devanagari' => 'Devanagari',
50	+ 'greek' => 'Greek',
51	+ 'greek-ext' => 'Greek Extended',
52	+ 'gujarati' => 'Gujarati',
53	+ 'gurmukhi' => 'Gurmukhi',
54	+ 'hebrew' => 'Hebrew',
55	+ 'japanese' => 'Japanese',
56	+ 'kannada' => 'Kannada',
57	+ 'khmer' => 'Khmer',
58	+ 'korean' => 'Korean',
59	+ 'latin' => 'Latin',
60	+ 'latin-ext' => 'Latin Extended',
61	+ 'malayalam' => 'Malayalam',
62	+ 'myanmar' => 'Myanmar',
63	+ 'oriya' => 'Oriya',
64	+ 'sinhala' => 'Sinhala',
65	+ 'tamil' => 'Tamil',
66	+ 'telugu' => 'Telugu',
67	+ 'thai' => 'Thai',
68	+ 'tibetan' => 'Tibetan',
69	+ 'vietnamese' => 'Vietnamese'
70	+ ];
71	+
72	+ /**
73	+ * Basic Settings
74	+ */
75	+ const OMGF_BASIC_SETTING_FONT_PROCESSING = 'omgf_font_processing';
76	+ const OMGF_BASIC_SETTING_DISPLAY_OPTION = 'omgf_display_option';
77	+ const OMGF_BASIC_SETTING_CACHE_PATH = 'omgf_cache_dir';
78	+ const OMGF_BASIC_SETTING_OPTIMIZE_EDIT_ROLES = 'omgf_optimize_edit_roles';
79	+
80	+ /**
81	+ * Advanced Settings
82	+ */
83	+ const OMGF_ADV_SETTING_CACHE_URI = 'omgf_cache_uri';
84	+ const OMGF_ADV_SETTING_CDN_URL = 'omgf_cdn_url';
85	+ const OMGF_ADV_SETTING_UNINSTALL = 'omgf_uninstall';
86	+ const OMGF_ADV_SETTING_RELATIVE_URL = 'omgf_relative_url';
87	+
88	+ /** @var string $active_tab */
89	+ private $active_tab;
90	+
91	+ /** @var string $page */
92	+ private $page;
93	+
94	+ /** @var string $plugin_text_domain */
95	+ private $plugin_text_domain = 'host-webfonts-local';
96	+
97	+ /**
98	+ * OMGF_Admin_Settings constructor.
99	+ */
100	+ public function __construct () {
101	+ parent::__construct();
102	+
103	+ $this->active_tab = isset( $_GET['tab'] ) ? $_GET['tab'] : self::OMGF_SETTINGS_FIELD_BASIC;
104	+ $this->page = isset( $_GET['page'] ) ? $_GET['page'] : '';
105	+
106	+ add_action( 'admin_menu', [ $this, 'create_menu' ] );
107	+ add_filter( 'plugin_action_links_' . plugin_basename( OMGF_PLUGIN_FILE ), [ $this, 'create_settings_link' ] );
108	+
109	+ if ( $this->page !== 'optimize-webfonts' ) {
110	+ return;
111	+ }
112	+
113	+ // Tabs
114	+ add_action( 'omgf_settings_tab', [ $this, 'basic_settings_tab' ], 0 );
115	+ add_action( 'omgf_settings_tab', [ $this, 'advanced_settings_tab' ], 1 );
116	+
117	+ // Content
118	+ add_action( 'omgf_settings_content', [ $this, 'basic_settings_content' ], 0 );
119	+ add_action( 'omgf_settings_content', [ $this, 'advanced_settings_content' ], 1 );
120	+ }
121	+
122	+ /**
123	+ * Creates the menu item.
124	+ */
125	+ public function create_menu () {
126	+ add_options_page(
127	+ 'OMGF',
128	+ 'Optimize Google Fonts',
129	+ 'manage_options',
130	+ 'optimize-webfonts',
131	+ [ $this, 'create_settings_page' ]
132	+ );
133	+
134	+ // @formatter:off
135	+ add_action( 'admin_init', [ $this, 'register_settings' ] );
136	+ // @formatter:on
137	+ }
138	+
139	+ /**
140	+ * Display the settings page.
141	+ */
142	+ public function create_settings_page () {
143	+ if ( ! current_user_can( 'manage_options' ) ) {
144	+ wp_die( __( "You're not cool enough to access this page.", $this->plugin_text_domain ) );
145	+ }
146	+ ?>
147	+ <div class="wrap omgf">
148	+ <h1><?= apply_filters( 'omgf_settings_page_title', __( 'OMGF \| Optimize My Google Fonts', $this->plugin_text_domain ) ); ?></h1>
149
150	<p>
151	+ <?= get_plugin_data( OMGF_PLUGIN_FILE )['Description']; ?>
152	</p>
153
154	<div class="settings-column left">
155	<h2 class="omgf-nav nav-tab-wrapper">
156	+ <?php do_action( 'omgf_settings_tab' ); ?>
157	</h2>
158	+
159	+ <?php do_action( 'omgf_settings_content' ); ?>
160	</div>
161
162	<div class="settings-column right">
163	<div id="omgf-welcome-panel" class="welcome-panel">
164	+ <?php $this->get_template( 'welcome' ); ?>
165	</div>
166	</div>
167	</div>
168	+ <?php
169	+ }
170	+
171	+ /**
172	+ * Register all settings.
173	+ *
174	+ * @throws ReflectionException
175	+ */
176	+ public function register_settings () {
177	+ if ( $this->active_tab !== self::OMGF_SETTINGS_FIELD_BASIC
178	+ && $this->active_tab !== self::OMGF_SETTINGS_FIELD_ADVANCED ) {
179	+ $this->active_tab = self::OMGF_SETTINGS_FIELD_BASIC;
180	+ }
181	+
182	+ foreach ( $this->get_settings() as $constant => $value ) {
183	+ register_setting(
184	+ $this->active_tab,
185	+ $value
186	+ );
187	+ }
188	+ }
189	+
190	+ /**
191	+ * Get all settings using the constants in this class.
192	+ *
193	+ * @return array
194	+ * @throws ReflectionException
195	+ */
196	+ public function get_settings () {
197	+ $reflection = new ReflectionClass( $this );
198	+ $constants = apply_filters( 'omgf_settings_constants', $reflection->getConstants() );
199	+
200	+ switch ( $this->active_tab ) {
201	+ case ( self::OMGF_SETTINGS_FIELD_BASIC ):
202	+ $needle = 'OMGF_BASIC_SETTING_';
203	+ break;
204	+ default:
205	+ $needle = 'OMGF_ADV_SETTING';
206	+ }
207	+
208	+ return array_filter(
209	+ $constants,
210	+ function ( $key ) use ( $needle ) {
211	+ return strpos( $key, $needle ) !== false;
212	+ },
213	+ ARRAY_FILTER_USE_KEY
214	+ );
215	+ }
216	+
217	+ /**
218	+ * Add Basic Settings Tab to Settings Screen.
219	+ */
220	+ public function basic_settings_tab () {
221	+ $this->generate_tab( self::OMGF_SETTINGS_FIELD_BASIC, 'dashicons-analytics', __( 'Basic Settings', $this->plugin_text_domain ) );
222	+ }
223	+
224	+ /**
225	+ * Add Advanced Settings Tab to Settings Screen.
226	+ */
227	+ public function advanced_settings_tab () {
228	+ $this->generate_tab( self::OMGF_SETTINGS_FIELD_ADVANCED, 'dashicons-admin-settings', __( 'Advanced Settings', $this->plugin_text_domain ) );
229	+ }
230	+
231	+ /**
232	+ * @param $id
233	+ * @param null $icon
234	+ * @param null $label
235	+ */
236	+ private function generate_tab ( $id, $icon = null, $label = null ) {
237	+ ?>
238	+ <a class="nav-tab dashicons-before <?= $icon; ?> <?= $this->active_tab == $id ? 'nav-tab-active' : ''; ?>"
239	+ href="<?= $this->generate_tab_link( $id ); ?>">
240	+ <?= $label; ?>















241	</a>
242	+ <?php
243	+ }
244	+
245	+ /**
246	+ * @param $tab
247	+ *
248	+ * @return string
249	+ */
250	+ private function generate_tab_link ( $tab ) {
251	+ return admin_url( "options-general.php?page=optimize-webfonts&tab=$tab" );
252	+ }
253	+
254	+ /**
255	+ * Render Basic Settings content
256	+ */
257	+ public function basic_settings_content () {
258	+ $this->do_settings_content( self::OMGF_SETTINGS_FIELD_BASIC );
259	+ }
260	+
261	+ /**
262	+ * Render Advanced Settings content
263	+ */
264	+ public function advanced_settings_content () {
265	+ $this->do_settings_content( self::OMGF_SETTINGS_FIELD_ADVANCED );
266	+ }
267	+
268	+ /**
269	+ * @param $field
270	+ */
271	+ private function do_settings_content ( $field ) {
272	+ if ( $this->active_tab != $field ) {
273	+ return;
274	+ }
275	+ ?>
276	+ <form id="<?= $field; ?>-form" name="omgf-settings-form" method="post" action="<?= admin_url('options.php?tab=' . $this->active_tab); ?>">
277	+ <?php
278	+ settings_fields( $field );
279	+ do_settings_sections( $field );
280	+
281	+ do_action( 'omgf_before_settings_form_settings' );
282	+
283	+ echo apply_filters( str_replace( '-', '_', $field ) . '_content', '' );
284	+
285	+ do_action( 'omgf_after_settings_form_settings' );
286	+
287	+ submit_button(__('Save Changes', $this->plugin_text_domain), 'primary', 'submit', false);
288	+ ?>
289	+ <a id="omgf-empty" class="omgf-empty button-cancel"><?php _e('Empty Cache Directory', $this->plugin_text_domain); ?></a>
290	</form>
291	+ <?php
292	+ }
293	+
294	+ /**
295	+ * @param $links
296	+ *
297	+ * @return mixed
298	+ */
299	+ public function create_settings_link ( $links ) {
300	+ $adminUrl = admin_url() . 'options-general.php?page=optimize-webfonts';
301	+ $settingsLink = "<a href='$adminUrl'>" . __( 'Settings' ) . "</a>";
302	+ array_push( $links, $settingsLink );
303	+
304	+ return $links;
305	+ }












































306	}

includes/admin/settings/class-advanced.php CHANGED Viewed

@@ -14,223 +14,174 @@
              * @url      : https://daan.dev
              * * * * * * * * * * * * * * * * * * * */
-            -
            defined('ABSPATH') || exit;
             class OMGF_Admin_Settings_Advanced extends OMGF_Admin_Settings_Builder
+            {
-            -
                /** @var string $utmTags */
-            -
                private $utmTags = '?utm_source=omgf&utm_medium=plugin&utm_campaign=settings';
-            -
-            -
                /**
-            -
                 * OMGF_Admin_Settings_Advanced constructor.
-            -
                 */
-            -
                public function __construct()
-            -
                {
-            -
                    $this->title = __('Advanced Settings', $this->plugin_text_domain);
-            -
-            -
                    // Open
-            -
                    // @formatter:off
-            -
                    add_filter('omgf_advanced_settings_content', [$this, 'do_title'], 10);
-            -
                    add_filter('omgf_advanced_settings_content', [$this, 'do_description'], 15);
-            -
                    add_filter('omgf_advanced_settings_content', [$this, 'do_before'], 20);
-            -
-            -
                    // Settings
-            -
                    add_filter('omgf_advanced_settings_content', [$this, 'do_remove_google_fonts'], 25);
-            -
                    add_filter('omgf_advanced_settings_content', [$this, 'do_display_option'], 30);
-            -
                    add_filter('omgf_advanced_settings_content', [$this, 'do_cache_dir'], 35);
-            -
                    add_filter('omgf_advanced_settings_content', [$this, 'do_cache_uri'], 40);
-            -
                    add_filter('omgf_advanced_settings_content', [$this, 'do_force_ssl'], 45);
-            -
                    add_filter('omgf_advanced_settings_content', [$this, 'do_relative_url'], 50);
-            -
                    add_filter('omgf_advanced_settings_content', [$this, 'do_cdn_url'], 55);
-            -
                    add_filter('omgf_advanced_settings_content', [$this, 'do_webfont_loader'], 60);
-            -
                    add_filter('omgf_advanced_settings_content', [$this, 'do_remove_version'], 65);
-            -
                    add_filter('omgf_advanced_settings_content', [$this, 'do_enqueue_order'], 70);
-            -
                    add_filter('omgf_advanced_settings_content', [$this, 'do_optimize_edit_roles'], 75);
-            -
                    add_filter('omgf_advanced_settings_content', [$this, 'do_uninstall'], 80);
-            -
-            -
                    // Close
-            -
                    add_filter('omgf_advanced_settings_content', [$this, 'do_after'], 100);
-            -
                    // @formatter:on
-            -
                }
-            -
-            -
                /**
-            -
                 * Description
-            -
                 */
-            -
                public function do_description()
-            -
                {
-            -
                    ?>
                     <p>
-            -
                        <?php _e('* <strong>Generate stylesheet</strong> after changing this setting.', $this->plugin_text_domain); ?>
-            -
                        <br/>
-            -
                        <?php _e('** <strong>Download Fonts</strong> and <strong>Generate Stylesheet</strong> after changing this setting.', $this->plugin_text_domain); ?>
                     </p>
-            -
                    <?php
-            -
                }
-            -
-            -
                /**
-            -
                 *
-            -
                 */
-            -
                public function do_remove_google_fonts()
-            -
                {
-            -
                    $this->do_checkbox(
-            -
                        __('Auto Remove', $this->plugin_text_domain),
-            -
                        OMGF_Admin_Settings::OMGF_ADV_SETTING_REMOVE_GOOGLE_FONTS,
-            -
                        OMGF_REMOVE_GFONTS,
-            -
                        sprintf(__('Remove any requests to externally hosted Google Fonts-stylesheets from your WordPress-blog. If it doesn\'t work, your theme and/or plugin(s) are using unconventional methods or Web Font Loader to load Google Fonts. <a href="%s" target="_blank">Upgrade to OMGF Pro</a> to automatically remove Google Fonts incl. resource hints (e.g. <code>dns-prefetch</code>, <code>preconnect</code> and <code>preload</code>).', $this->plugin_text_domain), self::WOOSH_WORDPRESS_PLUGINS_HOST_GOOGLE_FONTS_PRO . $this->utmTags)
-            -
                    );
-            -
                }
-            -
-            -
                /**
-            -
                 *
-            -
                 */
-            -
                public function do_display_option()
-            -
                {
-            -
                    $this->do_select(
-            -
                        __('Font-display option', $this->plugin_text_domain),
-            -
                        OMGF_Admin_Settings::OMGF_ADV_SETTING_DISPLAY_OPTION,
-            -
                        OMGF_Admin_Settings::OMGF_FONT_DISPLAY_OPTIONS,
-            -
                        OMGF_DISPLAY_OPTION,
-            -
                        __('Select which font-display strategy to use. Defaults to Swap (recommended).', $this->plugin_text_domain),
-            -
                        '*'
-            -
                    );
-            -
                }
-            -
-            -
                /**
-            -
                 *
-            -
                 */
-            -
                public function do_cache_dir()
-            -
                {
-            -
                    $this->do_text(
-            -
                        __('Save font files to...', $this->plugin_text_domain),
-            -
                        OMGF_Admin_Settings::OMGF_ADV_SETTING_CACHE_PATH,
-            -
                        __('e.g. /uploads/omgf', $this->plugin_text_domain),
-            -
                        OMGF_CACHE_PATH,
-            -
                        __("The folder (inside <code>wp-content</code>) where font files should be stored. Give each site a unique value if you're using Multisite. Defaults to <code>/uploads/omgf</code>. After changing this setting, the folder will be created if it doesn't exist and existing files will be moved automatically.", $this->plugin_text_domain),
-            -
                        '**'
-            -
                    );
-            -
                }
-            -
-            -
                /**
-            -
                 *
-            -
                 */
-            -
                public function do_cache_uri()
-            -
                {
-            -
                    $this->do_text(
-            -
                        __('Serve font files from...', $this->plugin_text_domain),
-            -
                        OMGF_Admin_Settings::OMGF_ADV_SETTING_CACHE_URI,
-            -
                        __('e.g. /app/uploads/omgf', $this->plugin_text_domain),
-            -
                        OMGF_CACHE_URI,
-            -
                        __('The relative path to serve font files from. Useful for when you\'re using security through obscurity plugins, such as WP Hide. If left empty, the cache directory specified above will be used.', $this->plugin_text_domain),
-            -
                        '**'
-            -
                    );
-            -
                }
-            -
-            -
                /**
-            -
                 *
-            -
                 */
-            -
                public function do_force_ssl()
-            -
                {
-            -
                    $this->do_checkbox(
-            -
                        __('Force SSL?', $this->plugin_text_domain),
-            -
                        OMGF_Admin_Settings::OMGF_ADV_SETTING_FORCE_SSL,
-            -
                        OMGF_FORCE_SSL,
-            -
                        __('Some plugins mess up WordPress\' URL structure, which can cause OMGF to generate incorrect URLs in the stylesheet. If OMGF is generating non-SSL (<code>http://...</code>) URLs in the stylesheet, and you have the <strong>Site</strong> and <strong>WordPress Address</strong> (in <strong>Settings</strong> > <strong>General</strong>) set to SSL (<code>https://</code>), then enable this option.', $this->plugin_text_domain),
-            -
                        '**'
-            -
                    );
-            -
                }
-            -
-            -
                /**
-            -
                 *
-            -
                 */
-            -
                public function do_relative_url()
-            -
                {
-            -
                    $this->do_checkbox(
-            -
                        __('Use Relative URLs?', $this->plugin_text_domain),
-            -
                        OMGF_Admin_Settings::OMGF_ADV_SETTING_RELATIVE_URL,
-            -
                        OMGF_RELATIVE_URL,
-            -
                        __('Use relative instead of absolute (full) URLs to generate the stylesheet. <strong>Warning!</strong> This disables the CDN URL!', $this->plugin_text_domain),
-            -
                        '**'
-            -
                    );
-            -
                }
-            -
-            -
                /**
-            -
                 *
-            -
                 */
-            -
                public function do_cdn_url()
-            -
                {
-            -
                    $this->do_text(
-            -
                        __('Serve fonts from CDN', $this->plugin_text_domain),
-            -
                        OMGF_Admin_Settings::OMGF_ADV_SETTING_CDN_URL,
-            -
                        __('e.g. cdn.mydomain.com', $this->plugin_text_domain),
-            -
                        OMGF_CDN_URL,
-            -
                        __("Are you using a CDN? Then enter the URL here. Leave empty when using CloudFlare.", $this->plugin_text_domain),
-            -
                        '**'
-            -
                    );
-            -
                }
-            -
-            -
                /**
-            -
                 *
-            -
                 */
-            -
                public function do_webfont_loader()
-            -
                {
-            -
                    $this->do_checkbox(
-            -
                        __('Use Web Font Loader?', $this->plugin_text_domain),
-            -
                        OMGF_Admin_Settings::OMGF_ADV_SETTING_WEB_FONT_LOADER,
-            -
                        OMGF_WEB_FONT_LOADER,
-            -
                        __('Use Typekit\'s Web Font Loader to load fonts asynchronously. <strong>Caution:</strong> while this might raise your Pagespeed Score, it could temporarily cause fonts to be displayed unstyled.', $this->plugin_text_domain)
-            -
                    );
-            -
                }
-            -
-            -
                /**
-            -
                 *
-            -
                 */
-            -
                public function do_remove_version()
-            -
                {
-            -
                    $this->do_checkbox(
-            -
                        __('Remove version parameter?', $this->plugin_text_domain),
-            -
                        OMGF_Admin_Settings::OMGF_ADV_SETTING_REMOVE_VERSION,
-            -
                        OMGF_REMOVE_VERSION,
-            -
                        __('This removes the <code>?ver=x.x.x</code> parameter from the Stylesheet\'s (<code>fonts.css</code>) request. ', $this->plugin_text_domain)
-            -
                    );
-            -
                }
-            -
-            -
                /**
-            -
                 *
-            -
                 */
-            -
                public function do_enqueue_order()
-            -
                {
-            -
                    $this->do_number(
-            -
                        __('Change enqueue order of stylesheet? (experimental)', $this->plugin_text_domain),
-            -
                        OMGF_Admin_Settings::OMGF_ADV_SETTING_ENQUEUE_ORDER,
-            -
                        OMGF_ENQUEUE_ORDER,
-            -
                        __('Lower this value if the generated stylesheet (<code>fonts.css</code>) is not captured by your CSS minification/combining plugin. Doesn\'t work with Web Font Loader enabled.', $this->plugin_text_domain),
-            -
                        0
-            -
                    );
-            -
                }
-            -
-            -
                /**
-            -
                 *
-            -
                 */
-            -
                public function do_optimize_edit_roles()
-            -
                {
-            -
                    $this->do_checkbox(
-            -
                        __('Optimize fonts for logged in editors/administrators?', $this->plugin_text_domain),
-            -
                        OMGF_Admin_Settings::OMGF_ADV_SETTING_OPTIMIZE_EDIT_ROLES,
-            -
                        OMGF_OPTIMIZE_EDIT_ROLES,
-            -
                        __('Should only be used for debugging/testing purposes. Leave disabled when e.g. using a page builder or switching themes.', $this->plugin_text_domain)
-            -
                    );
-            -
                }
-            -
-            -
                /**
-            -
                 *
-            -
                 */
-            -
                public function do_uninstall()
-            -
                {
-            -
                    $this->do_checkbox(
-            -
                        __('Remove settings and files at uninstall?', $this->plugin_text_domain),
-            -
                        OMGF_Admin_Settings::OMGF_ADV_SETTING_UNINSTALL,
-            -
                        OMGF_UNINSTALL,
-            -
                        __('Warning! This will remove all settings and cached fonts upon plugin deletion.', $this->plugin_text_domain)
-            -
                    );
-            -
                }
+            }


14	* @url : https://daan.dev
15	* * * * * * * * * * * * * * * * * * * */
16
17	+ defined( 'ABSPATH' ) \|\| exit;
18
19	class OMGF_Admin_Settings_Advanced extends OMGF_Admin_Settings_Builder
20	{
21	+ /**
22	+ * OMGF_Admin_Settings_Advanced constructor.
23	+ */
24	+ public function __construct () {
25	+ parent::__construct();
26	+
27	+ $this->title = __( 'Advanced Settings', $this->plugin_text_domain );
28	+
29	+ // Open
30	+ add_filter( 'omgf_advanced_settings_content', [ $this, 'do_title' ], 10 );
31	+ add_filter( 'omgf_advanced_settings_content', [ $this, 'do_description' ], 15 );
32	+ add_filter( 'omgf_advanced_settings_content', [ $this, 'do_before' ], 20 );
33	+
34	+ // Settings
35	+ add_filter( 'omgf_advanced_settings_content', [ $this, 'do_promo_fonts_processing' ], 50 );
36	+ add_filter( 'omgf_advanced_settings_content', [ $this, 'do_promo_process_resource_hints' ], 60 );
37	+ add_filter( 'omgf_advanced_settings_content', [ $this, 'do_promo_force_subsets' ], 70 );
38	+ add_filter( 'omgf_advanced_settings_content', [ $this, 'do_cdn_url' ], 80 );
39	+ add_filter( 'omgf_advanced_settings_content', [ $this, 'do_cache_uri' ], 90 );
40	+ add_filter( 'omgf_advanced_settings_content', [ $this, 'do_relative_url' ], 100 );
41	+ add_filter( 'omgf_advanced_settings_content', [ $this, 'do_uninstall' ], 110 );
42	+
43	+ // Close
44	+ add_filter( 'omgf_advanced_settings_content', [ $this, 'do_after' ], 200 );
45	+ }
46	+
47	+ /**
48	+ * Description
49	+ */
50	+ public function do_description () {
51	+ ?>










52	<p>



53	</p>
54	+ <?php
55	+ }
56	+
57	+ /**
58	+ *
59	+ */
60	+ public function do_promo_fonts_processing () {
61	+ ?>
62	+ <tr>
63	+ <th scope="row"><?= __( 'Google Fonts Processing (Pro)', $this->plugin_text_domain ); ?></th>
64	+ <td>
65	+ <fieldset id="" class="scheme-list">
66	+ <?php foreach ( $this->fonts_processing_pro_options() as $name => $data ): ?>
67	+ <?php
68	+ $checked = defined( strtoupper( $name ) ) ? constant( strtoupper( $name ) ) : false;
69	+ $disabled = apply_filters( $name . '_setting_disabled', true ) ? 'disabled' : '';
70	+ ?>
71	+ <label for="<?= $name; ?>">
72	+ <input type="checkbox" name="<?= $name; ?>" <?= $checked ? 'checked="checked"' : ''; ?> <?= $disabled; ?> /><?= $data['label']; ?>
73	+
74	+ </label>
75	+ <?php endforeach; ?>
76	+ </fieldset>
77	+ <p class="description">
78	+ <?= $this->promo; ?>
79	+ <ul>
80	+ <?php foreach ( $this->fonts_processing_pro_options() as $name => $data ): ?>
81	+ <li><strong><?= $data['label']; ?></strong>: <?= $data['description']; ?></li>
82	+ <?php endforeach; ?>
83	+ </ul>
84	+ </p>
85	+ </td>
86	+ </tr>
87	+ <?php
88	+ }
89	+
90	+ /**
91	+ * @return array
92	+ */
93	+ private function fonts_processing_pro_options () {
94	+ return [
95	+ 'omgf_pro_process_stylesheets' => [
96	+ 'label' => __( 'Process Stylesheets', $this->plugin_text_domain ),
97	+ 'description' => __( 'Process stylesheets loaded from <code>fonts.googleapis.com</code> or <code>fonts.gstatic.com</code>.', $this->plugin_text_domain )
98	+ ],
99	+ 'omgf_pro_process_inline_styles' => [
100	+ 'label' => __( 'Process Inline Styles', $this->plugin_text_domain ),
101	+ 'description' => __( 'Process all <code>@font-face</code> and <code>@import</code> rules loading Google Fonts.', $this->plugin_text_domain )
102	+ ],
103	+ 'omgf_pro_process_webfont_loader' => [
104	+ 'label' => __( 'Process Webfont Loader', $this->plugin_text_domain ),
105	+ 'description' => __( 'Process <code>webfont.js</code> libraries and the corresponding configuration defining which Google Fonts to load.', $this->plugin_text_domain )
106	+ ]
107	+ ];
108	+ }
109	+
110	+ /**
111	+ *
112	+ */
113	+ public function do_promo_process_resource_hints () {
114	+ $this->do_checkbox(
115	+ __( 'Remove Resource Hints (Pro)', $this->plugin_text_domain ),
116	+ 'omgf_pro_process_resource_hints',
117	+ defined( 'OMGF_PRO_PROCESS_RESOURCE_HINTS' ) ? OMGF_PRO_PROCESS_RESOURCE_HINTS : false,
118	+ __( 'Remove all <code>link</code> elements with a <code>rel</code> attribute value of <code>dns-prefetch</code>, <code>preload</code> or <code>preconnect</code> pointing to <code>fonts.googleapis.com</code> or <code>fonts.gstatic.com</code>.', $this->plugin_text_domain ) . ' ' . $this->promo,
119	+ true
120	+ );
121	+ }
122	+
123	+ /**
124	+ *
125	+ */
126	+ public function do_promo_force_subsets () {
127	+ $this->do_select(
128	+ __( 'Force Subsets (Pro)', $this->plugin_text_domain ),
129	+ 'omgf_pro_force_subsets',
130	+ OMGF_Admin_Settings::OMGF_FORCE_SUBSETS_OPTIONS,
131	+ defined( 'OMGF_PRO_FORCE_SUBSETS' ) ? OMGF_PRO_FORCE_SUBSETS : [],
132	+ __( 'If a theme or plugin loads subsets you don\'t need, use this option to force all Google Fonts to be loaded in the selected subsets.', $this->plugin_text_domain ) . ' ' . $this->promo,
133	+ true,
134	+ true
135	+ );
136	+ }
137	+
138	+ /**
139	+ *
140	+ */
141	+ public function do_cache_uri () {
142	+ $this->do_text(
143	+ __( 'Serve font files from...', $this->plugin_text_domain ),
144	+ OMGF_Admin_Settings::OMGF_ADV_SETTING_CACHE_URI,
145	+ __( 'e.g. /app/uploads/omgf', $this->plugin_text_domain ),
146	+ OMGF_CACHE_URI,
147	+ __( 'The relative path to serve font files from. Useful for when you\'re using security through obscurity plugins, such as WP Hide. If left empty, the cache directory specified under Basic Settings will be used.', $this->plugin_text_domain )
148	+ );
149	+ }
150	+
151	+ /**
152	+ *
153	+ */
154	+ public function do_relative_url () {
155	+ $this->do_checkbox(
156	+ __( 'Use Relative URLs?', $this->plugin_text_domain ),
157	+ OMGF_Admin_Settings::OMGF_ADV_SETTING_RELATIVE_URL,
158	+ OMGF_RELATIVE_URL,
159	+ __( 'Use relative instead of absolute (full) URLs to generate the stylesheet.', $this->plugin_text_domain )
160	+ );
161	+ }
162	+
163	+ /**
164	+ *
165	+ */
166	+ public function do_cdn_url () {
167	+ $this->do_text(
168	+ __( 'Serve fonts from CDN', $this->plugin_text_domain ),
169	+ OMGF_Admin_Settings::OMGF_ADV_SETTING_CDN_URL,
170	+ __( 'e.g. https://cdn.mydomain.com', $this->plugin_text_domain ),
171	+ OMGF_CDN_URL,
172	+ __( "If you're using a CDN, enter the URL here incl. protocol (e.g. <code>https://</code>.) Leave empty when using CloudFlare.", $this->plugin_text_domain )
173	+ );
174	+ }
175	+
176	+ /**
177	+ *
178	+ */
179	+ public function do_uninstall () {
180	+ $this->do_checkbox(
181	+ __( 'Remove settings and files at uninstall?', $this->plugin_text_domain ),
182	+ OMGF_Admin_Settings::OMGF_ADV_SETTING_UNINSTALL,
183	+ OMGF_UNINSTALL,
184	+ __( 'Warning! This will remove all settings and cached fonts upon plugin deletion.', $this->plugin_text_domain )
185	+ );
186	+ }




































187	}

includes/admin/settings/class-basic.php ADDED Viewed

	@@ -0,0 +1,133 @@


1	+ <?php
2	+ /* * * * * * * * * * * * * * * * * * * * *
3	+ *
4	+ * ██████╗ ███╗ ███╗ ██████╗ ███████╗
5	+ * ██╔═══██╗████╗ ████║██╔════╝ ██╔════╝
6	+ * ██║ ██║██╔████╔██║██║ ███╗█████╗
7	+ * ██║ ██║██║╚██╔╝██║██║ ██║██╔══╝
8	+ * ╚██████╔╝██║ ╚═╝ ██║╚██████╔╝██║
9	+ * ╚═════╝ ╚═╝ ╚═╝ ╚═════╝ ╚═╝
10	+ *
11	+ * @package : OMGF
12	+ * @author : Daan van den Bergh
13	+ * @copyright: (c) 2020 Daan van den Bergh
14	+ * @url : https://daan.dev
15	+ * * * * * * * * * * * * * * * * * * * */
16	+
17	+ defined( 'ABSPATH' ) \|\| exit;
18	+
19	+ class OMGF_Admin_Settings_Basic extends OMGF_Admin_Settings_Builder
20	+ {
21	+ public function __construct () {
22	+ parent::__construct();
23	+
24	+ $this->title = __( 'Basic Settings', $this->plugin_text_domain );
25	+
26	+ // Open
27	+ add_filter( 'omgf_basic_settings_content', [ $this, 'do_title' ], 10 );
28	+ add_filter( 'omgf_basic_settings_content', [ $this, 'do_description' ], 15 );
29	+ add_filter( 'omgf_basic_settings_content', [ $this, 'do_before' ], 20 );
30	+
31	+ // Settings
32	+ add_filter( 'omgf_basic_settings_content', [ $this, 'do_process_google_fonts' ], 30 );
33	+ add_filter( 'omgf_basic_settings_content', [ $this, 'do_promo_advanced_processing' ], 40 );
34	+ add_filter( 'omgf_basic_settings_content', [ $this, 'do_display_option' ], 50 );
35	+ add_filter( 'omgf_basic_settings_content', [ $this, 'do_promo_combine_requests' ], 60 );
36	+ add_filter( 'omgf_basic_settings_content', [ $this, 'do_cache_dir' ], 70 );
37	+ add_filter( 'omgf_basic_settings_content', [ $this, 'do_optimize_edit_roles' ], 80 );
38	+
39	+ // Close
40	+ add_filter( 'omgf_basic_settings_content', [ $this, 'do_after' ], 100 );
41	+ }
42	+
43	+ /**
44	+ * Description
45	+ */
46	+ public function do_description () {
47	+ ?>
48	+ <p>
49	+ * <?= __( 'If you\'re looking to replace your Google Fonts for locally hosted copies, then the default settings will suffice. OMGF will run silently in the background and download any Google Fonts while you and/or your visitors are browsing your site.', $this->plugin_text_domain ); ?>
50	+ </p>
51	+ <p>
52	+ <?= __( 'If <strong>Google Fonts Processing</strong> is set to Replace, loading the locally hosted stylesheet for the first time (or after emptying OMGF\'s cache directory) might take a few seconds. This depends on your server\'s capacity and the size of the stylesheet. This is because OMGF\'s Download API captures the request and automatically downloads the fonts, before serving the local copy. Once the stylesheet and fonts are downloaded, every consecutive request will be fast again.', $this->plugin_text_domain ); ?>
53	+ </p>
54	+ <?php
55	+ }
56	+
57	+ /**
58	+ *
59	+ */
60	+ public function do_process_google_fonts () {
61	+ $this->do_select(
62	+ __( 'Google Fonts Processing', $this->plugin_text_domain ),
63	+ OMGF_Admin_Settings::OMGF_BASIC_SETTING_FONT_PROCESSING,
64	+ OMGF_Admin_Settings::OMGF_FONT_PROCESSING_OPTIONS,
65	+ OMGF_FONT_PROCESSING,
66	+ sprintf( __( "Choose whether OMGF should (find, download and) <strong>replace</strong> all Google Fonts, or just <strong>remove</strong> them. Choosing Remove will force WordPress to fallback to system fonts or install your own.", $this->plugin_text_domain ), self::FFWP_WORDPRESS_PLUGINS_OMGF_PRO )
67	+ );
68	+ }
69	+
70	+ /**
71	+ *
72	+ */
73	+ public function do_promo_advanced_processing () {
74	+ $this->do_checkbox(
75	+ __( 'Advanced Processing (Pro)', $this->plugin_text_domain ),
76	+ 'omgf_pro_advanced_processing',
77	+ defined( 'OMGF_PRO_ADVANCED_PROCESSING' ) ? true : false,
78	+ __( 'By default, OMGF scans for Google Fonts which are registered/enqueued in the <code>wp_enqueue_scripts()</code> action in WordPress\' header (<code>wp_head()</code>). Advanced Processing will process all Google Fonts throughout the entire document. This setting can be tweaked further under Advanced Settings.', $this->plugin_text_domain ) . ' ' . $this->promo,
79	+ true
80	+ );
81	+ }
82	+
83	+ /**
84	+ *
85	+ */
86	+ public function do_display_option () {
87	+ $this->do_select(
88	+ __( 'Font-display option', $this->plugin_text_domain ),
89	+ OMGF_Admin_Settings::OMGF_BASIC_SETTING_DISPLAY_OPTION,
90	+ OMGF_Admin_Settings::OMGF_FONT_DISPLAY_OPTIONS,
91	+ OMGF_DISPLAY_OPTION,
92	+ __( 'Select which font-display strategy to use. Defaults to Swap (recommended).', $this->plugin_text_domain )
93	+ );
94	+ }
95	+
96	+ /**
97	+ *
98	+ */
99	+ public function do_promo_combine_requests () {
100	+ $this->do_checkbox(
101	+ __( 'Combine & Dedupe Google Fonts (Pro)', $this->plugin_text_domain ),
102	+ 'omgf_pro_combine_requests',
103	+ defined( 'OMGF_PRO_COMBINE_REQUESTS' ) ? true : false,
104	+ __( 'Combine and deduplicate multiple font requests into one request. This feature is always on in OMGF Pro and can\'t be disabled.', $this->plugin_text_domain ) . ' ' . $this->promo,
105	+ true
106	+ );
107	+ }
108	+
109	+ /**
110	+ *
111	+ */
112	+ public function do_cache_dir () {
113	+ $this->do_text(
114	+ __( 'Save font files to...', $this->plugin_text_domain ),
115	+ OMGF_Admin_Settings::OMGF_BASIC_SETTING_CACHE_PATH,
116	+ __( 'e.g. /uploads/omgf', $this->plugin_text_domain ),
117	+ OMGF_CACHE_PATH,
118	+ __( "The folder (inside <code>wp-content</code>) where font files should be stored. Give each site a unique value if you're using Multisite. Defaults to <code>/uploads/omgf</code>. After changing this setting, the folder will be created if it doesn't exist and existing files will be moved automatically.", $this->plugin_text_domain )
119	+ );
120	+ }
121	+
122	+ /**
123	+ *
124	+ */
125	+ public function do_optimize_edit_roles () {
126	+ $this->do_checkbox(
127	+ __( 'Optimize fonts for logged in editors/administrators?', $this->plugin_text_domain ),
128	+ OMGF_Admin_Settings::OMGF_BASIC_SETTING_OPTIMIZE_EDIT_ROLES,
129	+ OMGF_OPTIMIZE_EDIT_ROLES,
130	+ __( 'Should only be disabled while debugging/testing, e.g. using a page builder or switching themes.', $this->plugin_text_domain )
131	+ );
132	+ }
133	+ }

includes/admin/settings/class-builder.php CHANGED Viewed

@@ -14,151 +14,173 @@
              * @url      : https://daan.dev
              * * * * * * * * * * * * * * * * * * * */
-            -
            defined('ABSPATH') || exit;
             class OMGF_Admin_Settings_Builder
+            {
-            -
                const WOOSH_WORDPRESS_PLUGINS_HOST_GOOGLE_FONTS_PRO = 'https://woosh.dev/wordpress-plugins/host-google-fonts-pro/#get-omgf-pro';
-            -
-            -
                /** @var string $plugin_text_domain */
-            -
                protected $plugin_text_domain = 'host-webfonts-local';
-            -
-            -
                /** @var $title */
-            -
                protected $title;
-            -
-            -
                /**
+                 *
-            -
                 */
-            -
                public function do_before()
-            -
                {
-            -
                    ?>
-            -
                    <table class="form-table">
-            -
                    <?php
+                }
-            -
-            -
                /**
-            -
                 *
-            -
                 */
-            -
                public function do_after()
-            -
                {
-            -
                    ?>
-            -
                    </table>
-            -
                    <?php
+                }
-            -
-            -
                /**
-            -
                 *
-            -
                 */
-            -
                public function do_title()
-            -
                {
-            -
                    ?>
                     <h3><?= $this->title ?></h3>
-            -
                    <?php
-            -
                }
-            -
-            -
                /**
-            -
                 * Generate select setting
-            -
                 *
-            -
                 * @param      $label
-            -
                 * @param      $select
-            -
                 * @param      $options
-            -
                 * @param      $selected
-            -
                 * @param      $description
-            -
                 * @param bool $update_required
-            -
                 */
-            -
                public function do_select($label, $select, $options, $selected, $description, $update_required = false)
-            -
                {
-            -
                    ?>
                     <tr>
                         <th scope="row">
-            -
                            <?= apply_filters($select . '_setting_label', $label); ?> <?= $update_required ?: ''; ?>
                         </th>
                         <td>
-            -
                            <select name="<?= $select; ?>" class="<?= str_replace('_', '-', $select); ?>">
                                 <?php
-            -
                                $options = apply_filters($select . '_setting_options', $options);
                                 ?>
-            -
                                <?php foreach ($options as $option => $option_label): ?>
-            -
                                    <option value="<?= $option; ?>" <?= ($selected == $option) ? 'selected' : ''; ?>><?= $option_label; ?></option>
-            -
                                <?php endforeach; ?>
                             </select>
                             <p class="description">
-            -
                                <?= apply_filters($select . '_setting_description', $description); ?>
                             </p>
                         </td>
                     </tr>
-            -
                    <?php
-            -
                }
-            -
-            -
                /**
-            -
                 * Generate number setting.
-            -
                 *
-            -
                 * @param $label
-            -
                 * @param $name
-            -
                 * @param $value
-            -
                 * @param $description
-            -
                 */
-            -
                public function do_number($label, $name, $value, $description, $min = 0)
-            -
                {
-            -
                    ?>
                     <tr valign="top">
-            -
                        <th scope="row"><?= apply_filters($name . '_setting_label', $label); ?></th>
                         <td>
-            -
                            <input class="<?= str_replace('_', '-', $name); ?>" type="number" name="<?= $name; ?>" min="<?= $min; ?>" value="<?= $value; ?>"/>
                             <p class="description">
-            -
                                <?= apply_filters($name . '_setting_description', $description); ?>
                             </p>
                         </td>
                     </tr>
-            -
                    <?php
-            -
                }
-            -
-            -
                /**
-            -
                 * Generate text setting.
-            -
                 *
-            -
                 * @param        $label
-            -
                 * @param        $name
-            -
                 * @param        $placeholder
-            -
                 * @param        $value
-            -
                 * @param string $description
-            -
                 * @param bool   $update_required
-            -
                 */
-            -
                public function do_text($label, $name, $placeholder, $value, $description = '', $update_required = false, $visible = true)
-            -
                {
-            -
                    ?>
-            -
                    <tr class="<?= str_replace('_', '-', $name); ?>-row" <?= $visible ? '' : 'style="display: none;"'; ?>>
-            -
                        <th scope="row"><?= apply_filters($name . '_setting_label', $label); ?> <?= $update_required ?: ''; ?></th>
                         <td>
-            -
                            <input class="<?= str_replace('_', '-', $name); ?>" type="text" name="<?= $name; ?>" placeholder="<?= $placeholder; ?>" value="<?= $value; ?>"/>
                             <p class="description">
-            -
                                <?= apply_filters($name . 'setting_description', $description); ?>
                             </p>
                         </td>
                     </tr>
-            -
                    <?php
-            -
                }
-            -
-            -
                /**
-            -
                 * Generate checkbox setting.
-            -
                 *
-            -
                 * @param $label
-            -
                 * @param $name
-            -
                 * @param $checked
-            -
                 * @param $description
-            -
                 */
-            -
                public function do_checkbox($label, $name, $checked, $description, $update_required = false, $disabled = false)
-            -
                {
-            -
                    ?>
                     <tr>
-            -
                        <th scope="row"><?= apply_filters($name . '_setting_label', $label); ?> <?= $update_required ?: ''; ?></th>
                         <td>
-            -
                            <input type="checkbox" <?= apply_filters($name . '_setting_disabled', $disabled) ? 'disabled' : ''; ?> class="<?= str_replace('_' , '-' , $name); ?>" name="<?= $name; ?>"
-            -
                                <?= $checked == "on" ? 'checked = "checked"' : ''; ?> />
-            -
                            <p class="description">
-            -
                                <?= apply_filters($name . '_setting_description', $description); ?>
-            -
                            </p>
                         </td>
                     </tr>
-            -
                    <?php
-            -
                }
+            }


14	* @url : https://daan.dev
15	* * * * * * * * * * * * * * * * * * * */
16
17	+ defined( 'ABSPATH' ) \|\| exit;
18
19	class OMGF_Admin_Settings_Builder
20	{
21	+ const FFWP_WORDPRESS_PLUGINS_OMGF_PRO = 'https://ffwp.dev/wordpress/omgf-pro/';
22	+
23	+ /** @var string $plugin_text_domain */
24	+ protected $plugin_text_domain = 'host-webfonts-local';
25	+
26	+ /** @var $title */
27	+ protected $title;
28	+
29	+ /** @var $promo string */
30	+ protected $promo;
31	+
32	+ /**
33	+ * Only sets the promo string on settings load.
34	*
35	+ * OMGF_Admin_Settings_Builder constructor.
36	+ */
37	+ public function __construct () {
38	+ add_filter('omgf_basic_settings_content', [ $this, 'do_promo' ]);
39	+ add_filter('omgf_advanced_settings_content', [ $this, 'do_promo' ]);

40	}
41	+
42	+ /**
43	+ *
44	+ */
45	+ public function do_promo () {
46	+ if (apply_filters('apply_omgf_pro_promo', true)) {
47	+ $this->promo = apply_filters('omgf_pro_promo', sprintf(__('<a href="%s" target="_blank">Upgrade to Pro</a> to enable this option.', $this->plugin_text_domain), self::FFWP_WORDPRESS_PLUGINS_OMGF_PRO));
48	+ }

49	}
50	+
51	+ /**
52	+ *
53	+ */
54	+ public function do_before () {
55	+ ?>
56	+ <table class="form-table">
57	+ <?php
58	+ }
59	+
60	+ /**
61	+ *
62	+ */
63	+ public function do_after () {
64	+ ?>
65	+ </table>
66	+ <?php
67	+ }
68	+
69	+ /**
70	+ *
71	+ */
72	+ public function do_title () {
73	+ ?>
74	<h3><?= $this->title ?></h3>
75	+ <?php
76	+ }
77	+
78	+ /**
79	+ * Generate select setting
80	+ *
81	+ * @param $label
82	+ * @param $name
83	+ * @param $options
84	+ * @param $selected
85	+ * @param $description
86	+ * @param bool $update_required
87	+ */
88	+ public function do_select ( $label, $name, $options, $selected, $description, $is_multiselect = false, $disabled = false ) {
89	+ ?>

90	<tr>
91	<th scope="row">
92	+ <?= apply_filters( $name . '_setting_label', $label ); ?>
93	</th>
94	<td>
95	+ <select name="<?= $name; ?><?= $is_multiselect ? '[]' : ''; ?>" class="<?= str_replace( '_', '-', $name ); ?>" <?= $is_multiselect ? 'size="10" multiple="multiple"' : ''; ?> <?= apply_filters( $name . '_setting_disabled', $disabled ) ? 'disabled' : ''; ?>>
96	+ <?php
97	+ $options = apply_filters( $name . '_setting_options', $options );
98	+ ?>
99	+ <?php foreach ( $options as $option => $option_label ): ?>
100	<?php
101	+ if (is_array($selected)) {
102	+ $is_selected = in_array($option, $selected);
103	+ } else {
104	+ $is_selected = $selected == $option;
105	+ }
106	?>
107	+ <option value="<?= $option; ?>" <?= $is_selected ? 'selected="selected"' : ''; ?>><?= $option_label; ?></option>
108	+ <?php endforeach; ?>

109	</select>
110	<p class="description">
111	+ <?= apply_filters( $name . '_setting_description', $description ); ?>
112	</p>
113	</td>
114	</tr>
115	+ <?php
116	+ }
117	+
118	+ /**
119	+ * Generate number setting.
120	+ *
121	+ * @param $label
122	+ * @param $name
123	+ * @param $value
124	+ * @param $description
125	+ */
126	+ public function do_number ( $label, $name, $value, $description, $min = 0 ) {
127	+ ?>

128	<tr valign="top">
129	+ <th scope="row"><?= apply_filters( $name . '_setting_label', $label ); ?></th>
130	<td>
131	+ <input class="<?= str_replace( '_', '-', $name ); ?>" type="number" name="<?= $name; ?>" min="<?= $min; ?>" value="<?= $value; ?>"/>
132	<p class="description">
133	+ <?= apply_filters( $name . '_setting_description', $description ); ?>
134	</p>
135	</td>
136	</tr>
137	+ <?php
138	+ }
139	+
140	+ /**
141	+ * Generate text setting.
142	+ *
143	+ * @param $label
144	+ * @param $name
145	+ * @param $placeholder
146	+ * @param $value
147	+ * @param string $description
148	+ * @param bool $update_required
149	+ */
150	+ public function do_text ( $label, $name, $placeholder, $value, $description = '', $update_required = false, $visible = true ) {
151	+ ?>
152	+ <tr class="<?= str_replace( '_', '-', $name ); ?>-row" <?= $visible ? '' : 'style="display: none;"'; ?>>
153	+ <th scope="row"><?= apply_filters( $name . '_setting_label', $label ); ?> <?= $update_required ?: ''; ?></th>

154	<td>
155	+ <input class="<?= str_replace( '_', '-', $name ); ?>" type="text" name="<?= $name; ?>" placeholder="<?= $placeholder; ?>"
156	+ value="<?= $value; ?>"/>
157	<p class="description">
158	+ <?= apply_filters( $name . 'setting_description', $description ); ?>
159	</p>
160	</td>
161	</tr>
162	+ <?php
163	+ }
164	+
165	+ /**
166	+ * Generate checkbox setting.
167	+ *
168	+ * @param $label
169	+ * @param $name
170	+ * @param $checked
171	+ * @param $description
172	+ */
173	+ public function do_checkbox ( $label, $name, $checked, $description, $disabled = false ) {
174	+ ?>

175	<tr>
176	+ <th scope="row"><?= apply_filters( $name . '_setting_label', $label ); ?></th>
177	<td>
178	+ <label for="<?= $name; ?>">
179	+ <input id="<?= $name; ?>" type="checkbox" <?= apply_filters( $name . '_setting_disabled', $disabled ) ? 'disabled' : ''; ?> class="<?= str_replace( '_', '-', $name ); ?>" name="<?= $name; ?>" <?= $checked == "on" ? 'checked = "checked"' : ''; ?> />
180	+ <?= apply_filters( $name . '_setting_description', $description ); ?>
181	+ </label>

182	</td>
183	</tr>
184	+ <?php
185	+ }
186	}

includes/admin/settings/class-extensions.php DELETED Viewed

@@ -1,119 +0,0 @@
-            -
            <?php
-            -
            /* * * * * * * * * * * * * * * * * * * * *
-            -
             *
-            -
             *  ██████╗ ███╗   ███╗ ██████╗ ███████╗
-            -
             * ██╔═══██╗████╗ ████║██╔════╝ ██╔════╝
-            -
             * ██║   ██║██╔████╔██║██║  ███╗█████╗
-            -
             * ██║   ██║██║╚██╔╝██║██║   ██║██╔══╝
-            -
             * ╚██████╔╝██║ ╚═╝ ██║╚██████╔╝██║
-            -
             *  ╚═════╝ ╚═╝     ╚═╝ ╚═════╝ ╚═╝
-            -
             *
-            -
             * @package  : OMGF
-            -
             * @author   : Daan van den Bergh
-            -
             * @copyright: (c) 2020 Daan van den Bergh
-            -
             * @url      : https://daan.dev
-            -
             * * * * * * * * * * * * * * * * * * * */
-            -
-            -
            defined('ABSPATH') || exit;
-            -
-            -
            class OMGF_Admin_Settings_Extensions extends OMGF_Admin_Settings_Builder
-            -
            {
-            -
                /**
-            -
                 * OMGF_Admin_Settings_Advanced constructor.
-            -
                 */
-            -
                public function __construct()
-            -
                {
-            -
                    $this->title = __('Extensions', $this->plugin_text_domain);
-            -
-            -
                    // Open
-            -
                    // @formatter:off
-            -
                    add_filter('omgf_extensions_settings_content', [$this, 'do_title'], 10);
-            -
                    add_filter('omgf_extensions_settings_content', [$this, 'do_description'], 15);
-            -
                    add_filter('omgf_extensions_settings_content', [$this, 'do_before'], 20);
-            -
-            -
                    // Settings
-            -
                    add_filter('omgf_extensions_settings_content', [$this, 'do_promo_remove_stylesheets'], 30);
-            -
                    add_filter('omgf_extensions_settings_content', [$this, 'do_promo_remove_inline_styles'], 40);
-            -
                    add_filter('omgf_extensions_settings_content', [$this, 'do_promo_remove_webfont_loader'], 50);
-            -
                    add_filter('omgf_extensions_settings_content', [$this, 'do_promo_remove_resource_hints'], 60);
-            -
-            -
                    // Close
-            -
                    add_filter('omgf_extensions_settings_content', [$this, 'do_after'], 100);
-            -
                    // @formatter:on
-            -
                }
-            -
-            -
                /**
-            -
                 * Description
-            -
                 */
-            -
                public function do_description()
-            -
                {
-            -
                    ?>
-            -
                    <p>
-            -
                        <?= __('Fine tune and enhance the functionality of OMGF using extensions.', $this->plugin_text_domain); ?>
-            -
                    </p>
-            -
                    <p>
-            -
                        <?= sprintf(__('For a list of available plugins, click <a target="_blank" href="%s">here</a>.', $this->plugin_text_domain), 'https://woosh.dev/wordpress-plugins/'); ?>
-            -
                    </p>
-            -
                    <?php
-            -
                }
-            -
-            -
                /**
-            -
                 * Add (overridable) promo options for Remove Stylesheets Pro.
-            -
                 */
-            -
                public function do_promo_remove_stylesheets()
-            -
                {
-            -
                    $this->do_checkbox(
-            -
                            __('Remove Stylesheets (Pro)', $this->plugin_text_domain),
-            -
                            'omgf_pro_remove_stylesheets',
-            -
                            defined('OMGF_PRO_REMOVE_STYLESHEETS') ? OMGF_PRO_REMOVE_STYLESHEETS : false,
-            -
                            sprintf(__('Remove all stylesheets loaded from <code>fonts.googleapis.com</code> or <code>fonts.gstatic.com</code>. <a href="%s" target="_blank">Purchase OMGF Pro</a> to enable this option.', $this->plugin_text_domain), OMGF_Admin_Settings_Builder::WOOSH_WORDPRESS_PLUGINS_HOST_GOOGLE_FONTS_PRO),
-            -
                            false,
-            -
                            true
-            -
                    );
-            -
                }
-            -
-            -
                /**
-            -
                 *
-            -
                 */
-            -
                public function do_promo_remove_inline_styles()
-            -
                {
-            -
                    $this->do_checkbox(
-            -
                        __('Remove Inline Styles (Pro)', $this->plugin_text_domain),
-            -
                        'omgf_pro_remove_inline_styles',
-            -
                        defined('OMGF_PRO_REMOVE_INLINE_STYLES') ? OMGF_PRO_REMOVE_INLINE_STYLES : false,
-            -
                        sprintf(__('Remove all <code>@font-face</code> and <code>@import</code> rules loading Google Fonts. <a href="%s" target="_blank">Purchase OMGF Pro</a> to enable this option.', $this->plugin_text_domain), OMGF_Admin_Settings_Builder::WOOSH_WORDPRESS_PLUGINS_HOST_GOOGLE_FONTS_PRO),
-            -
                        false,
-            -
                        true
-            -
                    );
-            -
                }
-            -
-            -
                /**
-            -
                 *
-            -
                 */
-            -
                public function do_promo_remove_webfont_loader()
-            -
                {
-            -
                    $this->do_checkbox(
-            -
                        __('Remove WebFont Loader (Pro)', $this->plugin_text_domain),
-            -
                        'omgf_pro_remove_webfont_loader',
-            -
                        defined('OMGF_PRO_REMOVE_WEBFONT_LOADER') ? OMGF_PRO_REMOVE_WEBFONT_LOADER : false,
-            -
                        sprintf(__('Remove any WebFont Loader (<code>webfont.js</code>) libraries and the corresponding configuration defining which Google Fonts to load (WebFont Config). <a href="%s" target="_blank">Purchase OMGF Pro</a> to enable this option.', $this->plugin_text_domain), OMGF_Admin_Settings_Builder::WOOSH_WORDPRESS_PLUGINS_HOST_GOOGLE_FONTS_PRO),
-            -
                        false,
-            -
                        true
-            -
                    );
-            -
                }
-            -
-            -
                /**
-            -
                 *
-            -
                 */
-            -
                public function do_promo_remove_resource_hints()
-            -
                {
-            -
                    $this->do_checkbox(
-            -
                        __('Remove Resource Hints (Pro)', $this->plugin_text_domain),
-            -
                        'omgf_pro_remove_resource_hints',
-            -
                        defined('OMGF_PRO_REMOVE_RESOURCE_HINTS') ? OMGF_PRO_REMOVE_RESOURCE_HINTS : false,
-            -
                        sprintf(__('Remove all <code>link</code> elements with a <code>rel</code> attribute value of <code>dns-prefetch</code>, <code>preload</code> or <code>preconnect</code>. <a href="%s" target="_blank">Purchase OMGF Pro</a> to enable this option.', $this->plugin_text_domain), OMGF_Admin_Settings_Builder::WOOSH_WORDPRESS_PLUGINS_HOST_GOOGLE_FONTS_PRO),
-            -
                        false,
-            -
                        true
-            -
                    );
-            -
                }
-            -
            }

includes/ajax/class-download.php DELETED Viewed

@@ -1,147 +0,0 @@
-            -
            <?php
-            -
            /* * * * * * * * * * * * * * * * * * * * *
-            -
             *
-            -
             *  ██████╗ ███╗   ███╗ ██████╗ ███████╗
-            -
             * ██╔═══██╗████╗ ████║██╔════╝ ██╔════╝
-            -
             * ██║   ██║██╔████╔██║██║  ███╗█████╗
-            -
             * ██║   ██║██║╚██╔╝██║██║   ██║██╔══╝
-            -
             * ╚██████╔╝██║ ╚═╝ ██║╚██████╔╝██║
-            -
             *  ╚═════╝ ╚═╝     ╚═╝ ╚═════╝ ╚═╝
-            -
             *
-            -
             * @package  : OMGF
-            -
             * @author   : Daan van den Bergh
-            -
             * @copyright: (c) 2020 Daan van den Bergh
-            -
             * @url      : https://daan.dev
-            -
             * * * * * * * * * * * * * * * * * * * */
-            -
-            -
            defined('ABSPATH') || exit;
-            -
-            -
            class OMGF_AJAX_Download extends OMGF_AJAX
-            -
            {
-            -
                /** @var QM_DB $wpdb */
-            -
                private $wpdb;
-            -
-            -
                /** @var OMGF_DB $db */
-            -
                protected $db;
-            -
-            -
                /**
-            -
                 * OMGF_Download_Fonts constructor.
-            -
                 */
-            -
                public function __construct()
-            -
                {
-            -
                    global $wpdb;
-            -
-            -
                    $this->wpdb = $wpdb;
-            -
-            -
                    parent::__construct();
-            -
-            -
                    $this->init();
-            -
                }
-            -
-            -
                /**
-            -
                 * Initialize the download process.
-            -
                 */
-            -
                private function init()
-            -
                {
-            -
                    $this->create_dir_recursive();
-            -
-            -
                    $this->download();
-            -
                }
-            -
-            -
                /**
-            -
                 * If cache directory doesn't exist, we should create it.
-            -
                 */
-            -
                private function create_dir_recursive()
-            -
                {
-            -
                    $uploadDir = OMGF_FONTS_DIR;
-            -
                    if (!file_exists($uploadDir)) {
-            -
                        wp_mkdir_p($uploadDir);
-            -
                    }
-            -
                }
-            -
-            -
                /**
-            -
                 * Download the fonts and write them to the database.
-            -
                 */
-            -
                private function download()
-            -
                {
-            -
                    $selectedFonts = $this->db->get_total_fonts();
-            -
-            -
                    if (empty($selectedFonts)) {
-            -
                        OMGF_Admin_Notice::set_notice(__('Hmmm... Seems like there\'s nothing to do here. Have you tried using <strong>search</strong> or <strong>auto detect</strong>?', 'host-webfonts-local'), true, 'error');
-            -
                    }
-            -
-            -
                    foreach ($selectedFonts as $id => &$font) {
-            -
                        $urls['url_ttf']   = $font['url_ttf'];
-            -
                        $urls['url_woff']  = $font['url_woff'];
-            -
                        $urls['url_woff2'] = $font['url_woff2'];
-            -
                        $urls['url_eot']   = $font['url_eot'];
-            -
-            -
                        foreach ($urls as $type => $url) {
-            -
                            if (!$url) {
-            -
                                continue;
-            -
                            }
-            -
-            -
                            $remoteFile = esc_url_raw($url);
-            -
-            -
                            /**
-            -
                             * We rewrite the local filename for easier debugging in the waterfall.
-            -
                             */
-            -
                            $filename  = sanitize_title_with_dashes($font['font_family']) . '-' . $font['font_weight'] . '-' . $font['font_style'] . '-' . substr(basename($remoteFile), -10);
-            -
                            $localFile = OMGF_FONTS_DIR . '/' . $filename;
-            -
-            -
                            try {
-            -
                                $this->download_file($localFile, $remoteFile);
-            -
                                $font['downloaded'] = 1;
-            -
                            } catch (Exception $e) {
-            -
                                OMGF_Admin_Notice::set_notice(__("File ($remoteFile) could not be downloaded: ", 'host-webfonts-local') . $e->getMessage(), false, 'error', $e->getCode());
-            -
                            }
-            -
-            -
                            clearstatcache();
-            -
-            -
                            $font[$type . '_local'] = OMGF_FONTS_URL . '/' . $filename;
-            -
                        }
-            -
                    }
-            -
-            -
                    update_option(OMGF_Admin_Settings::OMGF_SETTING_FONTS, $selectedFonts);
-            -
-            -
                    OMGF_Admin_Notice::set_notice(count($selectedFonts) . ' ' . __('fonts downloaded. You can now proceed to generate the stylesheet.', 'host-webfonts-local'));
-            -
                }
-            -
-            -
                /**
-            -
                 * Download $remoteFile and write to $localFile
-            -
                 *
-            -
                 * @param $localFile
-            -
                 * @param $remoteFile
-            -
                 */
-            -
                private function download_file($localFile, $remoteFile)
-            -
                {
-            -
                    $file = wp_remote_get($remoteFile);
-            -
-            -
                    if (is_wp_error($file)) {
-            -
                        OMGF_Admin_Notice::set_notice($file->get_error_message(), true, 'error', $file->get_error_code());
-            -
                    }
-            -
-            -
                    $this->filesystem()->put_contents($localFile, $file['body']);
-            -
-            -
                    if (file_exists($localFile)) {
-            -
                        return;
-            -
                    }
-            -
                }
-            -
-            -
                /**
-            -
                 * Helper to return WordPress filesystem subclass.
-            -
                 *
-            -
                 * @return WP_Filesystem_Base $wp_filesystem
-            -
                 */
-            -
                private function filesystem()
-            -
                {
-            -
                    global $wp_filesystem;
-            -
-            -
                    if ( is_null( $wp_filesystem ) ) {
-            -
                        require_once ABSPATH . '/wp-admin/includes/file.php';
-            -
                        WP_Filesystem();
-            -
                    }
-            -
-            -
                    return $wp_filesystem;
-            -
                }
-            -
            }

includes/ajax/class-generate.php DELETED Viewed

@@ -1,162 +0,0 @@
-            -
            <?php
-            -
            /* * * * * * * * * * * * * * * * * * * * *
-            -
             *
-            -
             *  ██████╗ ███╗   ███╗ ██████╗ ███████╗
-            -
             * ██╔═══██╗████╗ ████║██╔════╝ ██╔════╝
-            -
             * ██║   ██║██╔████╔██║██║  ███╗█████╗
-            -
             * ██║   ██║██║╚██╔╝██║██║   ██║██╔══╝
-            -
             * ╚██████╔╝██║ ╚═╝ ██║╚██████╔╝██║
-            -
             *  ╚═════╝ ╚═╝     ╚═╝ ╚═════╝ ╚═╝
-            -
             *
-            -
             * @package  : OMGF
-            -
             * @author   : Daan van den Bergh
-            -
             * @copyright: (c) 2020 Daan van den Bergh
-            -
             * @url      : https://daan.dev
-            -
             * * * * * * * * * * * * * * * * * * * */
-            -
-            -
            defined('ABSPATH') || exit;
-            -
-            -
            class OMGF_AJAX_Generate extends OMGF_AJAX
-            -
            {
-            -
                /** @var array $fonts */
-            -
                private $fonts = [];
-            -
-            -
                /**
-            -
                 * OMGF_AJAX_Generate_Styles constructor.
-            -
                 */
-            -
                public function __construct()
-            -
                {
-            -
                    parent::__construct();
-            -
-            -
                    $this->init();
-            -
                }
-            -
-            -
                /**
-            -
                 * Generate the Stylesheet
-            -
                 */
-            -
                private function init()
-            -
                {
-            -
                    header("Content-type: text/css");
-            -
-            -
                    $this->insert_promo();
-            -
-            -
                    $selectedFonts = $this->db->get_total_fonts();
-            -
-            -
                    if (empty($selectedFonts)) {
-            -
                        OMGF_Admin_Notice::set_notice(__('Hmmm... Seems like there\'s nothing to do here. Have you tried using <strong>search</strong> or <strong>auto detect</strong>?', 'host-webfonts-local'), true, 'error');
-            -
                    }
-            -
-            -
                    $this->process_fonts($selectedFonts);
-            -
-            -
                    $fonts = implode("\n", $this->fonts);
-            -
                    $file  = OMGF_FONTS_DIR . '/' . OMGF_FILENAME;
-            -
-            -
                    /**
-            -
                     * If the file can be created and written. Let's try to write it.
-            -
                     */
-            -
                    try {
-            -
                        $stylesheet = fopen($file, 'w') or OMGF_Admin_Notice::set_notice(__("Cannot create file {$file}", 'host-webfonts-local', true, 'error', 400));
-            -
                        fwrite($stylesheet, $fonts);
-            -
                        fclose($stylesheet);
-            -
-            -
                        OMGF_Admin_Notice::set_notice(__('Congratulations! Your stylesheet was generated successfully and added to your theme\'s header.', 'host-webfonts-local'), false);
-            -
-            -
                        $count  = count($selectedFonts);
-            -
                        $review = apply_filters('omgf_generate_stylesheet_review_link', 'https://wordpress.org/support/plugin/host-webfonts-local/reviews/?rate=5#new-post');
-            -
                        $tweet  = apply_filters('omgf_generate_stylesheet_tweet_link', "https://twitter.com/intent/tweet?text=I+just+optimized+$count+Google+Fonts+with+OMGF+for+@WordPress!+Try+it+for+yourself:&via=Dan0sz&hashtags=GoogleFonts,WordPress,Pagespeed,Insights&url=https://wordpress.org/plugins/host-webfonts-local/", $count);
-            -
-            -
                        OMGF_Admin_Notice::set_notice(sprintf(__('OMGF has optimized %s fonts. Enjoy your performance boost! Would you like to <a href="%s" target="_blank">write a review</a> or <a href="%s" target="_blank">tweet about it</a>?', 'host-webfonts-local'), $count, $review, $tweet), true, 'info');
-            -
                    } catch (Exception $e) {
-            -
                        OMGF_Admin_Notice::set_notice(__("Stylesheet could not be generated:", 'host-webfonts-local') . " $e", true, 'error', $e->getCode());
-            -
                    }
-            -
                }
-            -
-            -
                /**
-            -
                 * Insert promo material :)
-            -
                 *
-            -
                 * The alignment is crooked, so it'll look nice in the stylesheet.
-            -
                 */
-            -
                private function insert_promo()
-            -
                {
-            -
                    $this->fonts[] = "/**
-            -
             * This file is automagically generated by OMGF
-            -
             *
-            -
             * @author: Daan van den Bergh
-            -
             * @copyright: (c) 2020 Daan van den Bergh
-            -
             * @url: " . OMGF_SITE_URL . "
-            -
             */";
-            -
                }
-            -
-            -
                /**
-            -
                 * Prepare fonts for generation.
-            -
                 */
-            -
                private function process_fonts($fonts)
-            -
                {
-            -
                    $fontDisplay = OMGF_DISPLAY_OPTION;
-            -
-            -
                    $i = 1;
-            -
-            -
                    foreach ($fonts as $font) {
-            -
                        $fontUrlEot  = isset($font['url_eot_local']) ? array(0 => esc_url_raw($font['url_eot_local'])) : array();
-            -
                        $fontSources = isset($font['url_woff2_local']) ? array('woff2' => esc_url_raw($font['url_woff2_local'])) : array();
-            -
                        $fontSources = $fontSources + (isset($font['url_woff_local']) ? array('woff' => esc_url_raw($font['url_woff_local'])) : array());
-            -
                        $fontSources = $fontSources + (isset($font['url_ttf_local']) ? array('truetype' => esc_url_raw($font['url_ttf_local'])) : array());
-            -
                        $locals      = explode(',', sanitize_text_field($font['local']));
-            -
-            -
                        if (empty($fontSources)) {
-            -
                            OMGF_Admin_Notice::set_notice(__('<strong>Download Fonts</strong> before generating the stylesheet.', 'host-webfonts-local'), true, 'error');
-            -
                        }
-            -
-            -
                        $this->fonts[$i] = "@font-face { \n";
-            -
                        $this->fonts[$i] .= $this->build_property('font-family', $font['font_family']);
-            -
                        $this->fonts[$i] .= $this->build_property('font-display', $fontDisplay);
-            -
                        $this->fonts[$i] .= $this->build_property('font-style', $font['font_style']);
-            -
                        $this->fonts[$i] .= $this->build_property('font-weight', $font['font_weight']);
-            -
                        $this->fonts[$i] .= isset($fontUrlEot) ? "  src: " . $this->build_source_string($fontUrlEot) : '';
-            -
                        $this->fonts[$i] .= "  src: " . $this->build_source_string($locals, 'local', false);
-            -
                        // There'll always be at least one font available, so no need to check here if $fontSources is set.
-            -
                        $this->fonts[$i] .= $this->build_source_string($fontSources);
-            -
                        $this->fonts[$i] .= "}";
-            -
-            -
                        $i++;
-            -
                    }
-            -
                }
-            -
-            -
                /**
-            -
                 * @param $property
-            -
                 * @param $value
-            -
                 *
-            -
                 * @return string
-            -
                 */
-            -
                private function build_property($property, $value)
-            -
                {
-            -
                    $value = sanitize_text_field($value);
-            -
-            -
                    return "  $property: $value;\n";
-            -
                }
-            -
-            -
                /**
-            -
                 * @param        $sources
-            -
                 * @param string $type
-            -
                 * @param bool   $endSemiColon
-            -
                 *
-            -
                 * @return string
-            -
                 */
-            -
                private function build_source_string($sources, $type = 'url', $endSemiColon = true)
-            -
                {
-            -
                    $lastSrc = end($sources);
-            -
                    $source  = '';
-            -
-            -
                    foreach ($sources as $format => $url) {
-            -
                        $source .= "  $type('$url')" . (!is_numeric($format) ? " format('$format')" : '');
-            -
-            -
                        if ($url === $lastSrc && $endSemiColon) {
-            -
                            $source .= ";\n";
-            -
                        } else {
-            -
                            $source .= ",\n";
-            -
                        }
-            -
                    }
-            -
-            -
                    return $source;
-            -
                }
-            -
            }

includes/api/class-download.php ADDED Viewed

	@@ -0,0 +1,293 @@


1	+ <?php
2	+ /* * * * * * * * * * * * * * * * * * * * *
3	+ *
4	+ * ██████╗ ███╗ ███╗ ██████╗ ███████╗
5	+ * ██╔═══██╗████╗ ████║██╔════╝ ██╔════╝
6	+ * ██║ ██║██╔████╔██║██║ ███╗█████╗
7	+ * ██║ ██║██║╚██╔╝██║██║ ██║██╔══╝
8	+ * ╚██████╔╝██║ ╚═╝ ██║╚██████╔╝██║
9	+ * ╚═════╝ ╚═╝ ╚═╝ ╚═════╝ ╚═╝
10	+ *
11	+ * @package : OMGF
12	+ * @author : Daan van den Bergh
13	+ * @copyright: (c) 2020 Daan van den Bergh
14	+ * @url : https://daan.dev
15	+ * * * * * * * * * * * * * * * * * * * */
16	+
17	+ defined( 'ABSPATH' ) \|\| exit;
18	+
19	+ class OMGF_API_Download extends WP_REST_Controller
20	+ {
21	+ const OMGF_GOOGLE_FONTS_API_URL = 'https://google-webfonts-helper.herokuapp.com';
22	+
23	+ /** @var array $endpoints */
24	+ private $endpoints = [ 'css' ];
25	+
26	+ /** @var string $namespace */
27	+ protected $namespace = 'omgf/v1';
28	+
29	+ /** @var string $rest_base */
30	+ protected $rest_base = '/download/';
31	+
32	+ /** @var string $handle */
33	+ private $handle = '';
34	+
35	+ /** @var string $path */
36	+ private $path = '';
37	+
38	+ public function __construct () {
39	+ add_filter( 'content_url', [ $this, 'rewrite_url' ], 10, 2 );
40	+ }
41	+
42	+ /**
43	+ *
44	+ */
45	+ public function register_routes () {
46	+ foreach ( $this->endpoints as $endpoint ) {
47	+ register_rest_route(
48	+ $this->namespace,
49	+ '/' . $this->rest_base . $endpoint,
50	+ [
51	+ [
52	+ 'methods' => 'GET',
53	+ 'callback' => [ $this, 'process' ],
54	+ 'permission_callback' => [ $this, 'permissions_check' ]
55	+ ],
56	+ 'schema' => null,
57	+ ]
58	+ );
59	+ }
60	+ }
61	+
62	+ /**
63	+ * @return bool
64	+ */
65	+ public function permissions_check () {
66	+ return true;
67	+ }
68	+
69	+ /**
70	+ * @param $request
71	+ */
72	+ public function process ( $request ) {
73	+ $params = $request->get_params();
74	+ $this->handle = $params['handle'] ?? '';
75	+
76	+ if ( ! $this->handle ) {
77	+ wp_send_json_error( 'Handle not provided.', 406 );
78	+ }
79	+
80	+ $this->path = WP_CONTENT_DIR . OMGF_CACHE_PATH . '/' . $this->handle;
81	+
82	+ $url = self::OMGF_GOOGLE_FONTS_API_URL . '/api/fonts/%s';
83	+ $font_families = explode( '\|', $params['family'] );
84	+
85	+ foreach ( $font_families as $font_family ) {
86	+ list( $family, $variants ) = explode( ':', $font_family );
87	+ $family = str_replace( ' ', '-', strtolower( $family ) );
88	+
89	+ if ( defined( 'OMGF_PRO_FORCE_SUBSETS' ) && ! empty( OMGF_PRO_FORCE_SUBSETS ) ) {
90	+ $query['subsets'] = implode( ',', OMGF_PRO_FORCE_SUBSETS );
91	+ } else {
92	+ $query['subsets'] = $params['subset'] ?? 'latin,latin-ext';
93	+ }
94	+
95	+ $response = wp_remote_get(
96	+ sprintf( $url, $family ) . '?' . http_build_query( $query )
97	+ );
98	+
99	+ if ( ! is_wp_error( $response ) && wp_remote_retrieve_response_code( $response ) == 200 ) {
100	+ $fonts[] = json_decode( wp_remote_retrieve_body( $response ) );
101	+ }
102	+ }
103	+
104	+ foreach ( $fonts as &$font ) {
105	+ $font_request = array_filter(
106	+ $font_families,
107	+ function ( $value ) use ( $font ) {
108	+ return strpos( $value, $font->family ) !== false;
109	+ }
110	+ );
111	+ $font->variants = $this->filter_variants( $font->variants, reset( $font_request ) );
112	+ }
113	+
114	+ foreach ( $fonts as &$font ) {
115	+ foreach ( $font->variants as &$variant ) {
116	+ $font_family = trim($variant->fontFamily, '\'"');
117	+ $filename = strtolower( $font_family . '-' . $variant->fontStyle . '-' . $variant->fontWeight );
118	+ $variant->woff = $this->download( $variant->woff, $filename );
119	+ $variant->woff2 = $this->download( $variant->woff2, $filename );
120	+ $variant->eot = $this->download( $variant->eot, $filename );
121	+ $variant->ttf = $this->download( $variant->ttf, $filename );
122	+ }
123	+ }
124	+
125	+ $stylesheet = $this->generate_stylesheet( $fonts );
126	+
127	+ $local_file = $this->path . '/' . $this->handle . '.css';
128	+
129	+ file_put_contents( $local_file, $stylesheet );
130	+
131	+ // After downloading it, serve it.
132	+ header( 'Content-Type: text/css' );
133	+ header( "Content-Transfer-Encoding: Binary" );
134	+ header( 'Content-Length: ' . filesize( $local_file ) );
135	+ flush();
136	+ readfile( $local_file );
137	+ die();
138	+ }
139	+
140	+ /**
141	+ * @param $available_variants
142	+ * @param $wanted
143	+ *
144	+ * @return array
145	+ */
146	+ private function filter_variants ( $available_variants, $wanted ) {
147	+ list ( $family, $variants ) = explode( ':', $wanted );
148	+
149	+ if ( ! $variants ) {
150	+ return $available_variants;
151	+ }
152	+
153	+ $variants = explode( ',', $variants );
154	+
155	+ return array_filter(
156	+ $available_variants,
157	+ function ( $font ) use ( $variants ) {
158	+ $id = $font->id;
159	+
160	+ if ( $id == 'regular' \|\| $id == 'italic' ) {
161	+ $id = '400';
162	+ }
163	+
164	+ return in_array( $id, $variants );
165	+ }
166	+ );
167	+ }
168	+
169	+ /**
170	+ * @param $urls
171	+ *
172	+ * @return bool
173	+ */
174	+ private function download ( $url, $filename ) {
175	+ if ( ! function_exists( 'download_url' ) ) {
176	+ require_once ABSPATH . 'wp-admin/includes/file.php';
177	+ }
178	+
179	+ wp_mkdir_p( $this->path );
180	+
181	+ $file = $this->path . '/' . $filename . '.' . pathinfo($url, PATHINFO_EXTENSION);
182	+ $file_uri = str_replace( WP_CONTENT_DIR, '', $file );
183	+
184	+ if ( file_exists( $file ) ) {
185	+ return content_url( $file_uri );
186	+ }
187	+
188	+ $tmp = download_url( $url );
189	+ copy( $tmp, $file );
190	+ @unlink( $tmp );
191	+
192	+ return content_url( $file_uri );
193	+ }
194	+
195	+ /**
196	+ * @param $url
197	+ * @param $path
198	+ *
199	+ * @return mixed
200	+ */
201	+ public function rewrite_url ( $url, $path ) {
202	+ /**
203	+ * Exit early if this isn't requested by OMGF.
204	+ */
205	+ if ( strpos( $url, OMGF_CACHE_PATH ) === false ) {
206	+ return $url;
207	+ }
208	+
209	+ /**
210	+ * If Relative URLs is enabled, overwrite URL with Path and continue execution.
211	+ */
212	+ if ( OMGF_RELATIVE_URL ) {
213	+ $content_dir = str_replace( site_url(), '', content_url() );
214	+
215	+ $url = $content_dir . $path;
216	+ }
217	+
218	+ if ( OMGF_CDN_URL ) {
219	+ $url = str_replace( site_url(), OMGF_CDN_URL, $url );
220	+ }
221	+
222	+ if ( OMGF_CACHE_URI ) {
223	+ $url = str_replace( OMGF_CACHE_PATH, OMGF_CACHE_URI, $url );
224	+ }
225	+
226	+ return $url;
227	+ }
228	+
229	+ /**
230	+ * @param $fonts
231	+ *
232	+ * @return string
233	+ */
234	+ private function generate_stylesheet ( $fonts ) {
235	+ $stylesheet = "/*\n Auto Generated by OMGF\n * @author: Daan van den Bergh\n * @url: https://ffwp.dev\n */\n\n";
236	+ $font_display = OMGF_DISPLAY_OPTION;
237	+
238	+ foreach ( $fonts as $font ) {
239	+ foreach ( $font->variants as $variant ) {
240	+ $font_family = $variant->fontFamily;
241	+ $font_style = $variant->fontStyle;
242	+ $font_weight = $variant->fontWeight;
243	+ $stylesheet .= "@font-face {\n";
244	+ $stylesheet .= " font-family: $font_family;\n";
245	+ $stylesheet .= " font-style: $font_style;\n";
246	+ $stylesheet .= " font-weight: $font_weight;\n";
247	+ $stylesheet .= " font-display: $font_display;\n";
248	+ $stylesheet .= " src: url('" . $variant->eot . "');\n";
249	+
250	+ $local_src = '';
251	+
252	+ foreach ( $variant->local as $local ) {
253	+ $local_src .= "local('$local'), ";
254	+ }
255	+
256	+ $stylesheet .= " src: $local_src\n";
257	+
258	+ $font_src_url = isset( $variant->woff2 ) ? [ 'woff2' => $variant->woff2 ] : [];
259	+ $font_src_url = $font_src_url + ( isset( $variant->woff ) ? [ 'woff' => $variant->woff ] : [] );
260	+ $font_src_url = $font_src_url + ( isset( $variant->ttf ) ? [ 'ttf' => $variant->ttf ] : [] );
261	+
262	+ $stylesheet .= $this->build_source_string( $font_src_url );
263	+ $stylesheet .= "}\n";
264	+ }
265	+ }
266	+
267	+ return $stylesheet;
268	+ }
269	+
270	+ /**
271	+ * @param $sources
272	+ * @param string $type
273	+ * @param bool $endSemiColon
274	+ *
275	+ * @return string
276	+ */
277	+ private function build_source_string ( $sources, $type = 'url', $end_semi_colon = true ) {
278	+ $lastSrc = end( $sources );
279	+ $source = '';
280	+
281	+ foreach ( $sources as $format => $url ) {
282	+ $source .= " $type('$url')" . ( ! is_numeric( $format ) ? " format('$format')" : '' );
283	+
284	+ if ( $url === $lastSrc && $end_semi_colon ) {
285	+ $source .= ";\n";
286	+ } else {
287	+ $source .= ",\n";
288	+ }
289	+ }
290	+
291	+ return $source;
292	+ }
293	+ }

includes/class-admin.php CHANGED Viewed

@@ -14,312 +14,102 @@
              * @url      : https://daan.dev
              * * * * * * * * * * * * * * * * * * * */
-            -
            defined('ABSPATH') || exit;
             class OMGF_Admin
+            {
-            -
                const OMGF_ADMIN_JS_HANDLE  = 'omgf-admin-js';
-            -
                const OMGF_ADMIN_CSS_HANDLE = 'omgf-admin-css';
-            -
-            -
                /** @var OMGF_DB */
-            -
                private $db;
-            -
-            -
                /**
-            -
                 * OMGF_Admin constructor.
-            -
                 */
-            -
                public function __construct()
-            -
                {
-            -
                    $this->db = new OMGF_DB();
-            -
-            -
                    // @formatter:off
-            -
                    add_action('admin_enqueue_scripts', [$this, 'enqueue_admin_scripts']);
-            -
                    add_action('admin_notices', [$this, 'add_notice']);
-            -
-            -
                    $this->do_advanced_settings();
-            -
                    $this->do_extensions_settings();
-            -
-            -
                    add_filter('pre_update_option_omgf_cache_dir', [$this, 'cache_dir_changed'], 10, 2);
-            -
                    add_filter('pre_update_option_omgf_cache_uri', [$this, 'serve_uri_changed'], 10, 2);
-            -
                    add_filter('pre_update_option_omgf_relative_url', [$this, 'relative_url_changed'], 10, 2);
-            -
                    add_filter('pre_update_option_omgf_cdn_url', [$this, 'cdn_url_changed'], 10, 2);
-            -
                    // @formatter:on
-            -
                }
-            -
-            -
                /**
-            -
                 * Enqueues the necessary JS and CSS and passes options as a JS object.
-            -
                 *
-            -
                 * @param $hook
-            -
                 */
-            -
                public function enqueue_admin_scripts($hook)
-            -
                {
-            -
                    if ($hook == 'settings_page_optimize-webfonts') {
-            -
                        wp_enqueue_script(self::OMGF_ADMIN_JS_HANDLE, plugin_dir_url(OMGF_PLUGIN_FILE) . 'assets/js/omgf-admin.js', array('jquery'), OMGF_STATIC_VERSION, true);
-            -
                        wp_enqueue_style(self::OMGF_ADMIN_CSS_HANDLE, plugin_dir_url(OMGF_PLUGIN_FILE) . 'assets/css/omgf-admin.css', array(), OMGF_STATIC_VERSION);
-            -
-            -
                        $options = array(
-            -
                            'auto_detect_enabled' => OMGF_AUTO_DETECT_ENABLED,
-            -
                            'detected_fonts'      => get_option('omgf_detected_fonts')
-            -
                        );
-            -
-            -
                        wp_localize_script(self::OMGF_ADMIN_JS_HANDLE, 'omgf', $options);
-            -
                    }
-            -
                }
-            -
-            -
                /**
-            -
                 * @param $name
-            -
                 *
-            -
                 * @return mixed
-            -
                 */
-            -
                protected function get_template($name)
-            -
                {
-            -
                    return include OMGF_PLUGIN_DIR . 'templates/admin/block-' . $name . '.phtml';
-            -
                }
-            -
-            -
                /**
-            -
                 * Add notice to admin screen.
-            -
                 */
-            -
                public function add_notice()
-            -
                {
-            -
                    OMGF_Admin_Notice::print_notice();
-            -
                }
-            -
-            -
                /**
-            -
                 * @return OMGF_Admin_Settings_Advanced
-            -
                 */
-            -
                private function do_advanced_settings()
-            -
                {
-            -
                    return new OMGF_Admin_Settings_Advanced();
-            -
                }
-            -
-            -
                /**
-            -
                 * @return OMGF_Admin_Settings_Extensions
-            -
                 */
-            -
                private function do_extensions_settings()
-            -
                {
-            -
                    return new OMGF_Admin_Settings_Extensions();
-            -
                }
-            -
-            -
                /**
-            -
                 * When the cache path is changed, OMGF moves the entire fonts folder to its new destination and throws a notice to
-            -
                 * regenerate the stylesheet.
-            -
                 *
-            -
                 * @param $new_cache_dir
-            -
                 * @param $old_cache_dir
-            -
                 *
-            -
                 * @return mixed
-            -
                 */
-            -
                public function cache_dir_changed($new_cache_dir, $old_cache_dir)
-            -
                {
-            -
                    if ($new_cache_dir !== $old_cache_dir && !empty($new_cache_dir)) {
-            -
                        $font_styles = $this->db->get_downloaded_fonts();
-            -
-            -
                        if (empty($font_styles)) {
-            -
                            return $new_cache_dir;
-            -
                        }
-            -
-            -
                        $files = array_diff(scandir(OMGF_FONTS_DIR), ['.', '..']);
-            -
-            -
                        $this->move_files($files, $new_cache_dir);
-            -
-            -
                        if (!OMGF_CACHE_URI) {
-            -
                            $font_styles = $this->rewrite_urls($font_styles, $old_cache_dir, $new_cache_dir);
-            -
-            -
                            OMGF_Admin_Notice::set_notice(__("You've changed OMGF's storage folder to <strong>$new_cache_dir</strong>. Regenerate the stylesheet to implement this change.", 'host-webfonts-local'), false, 'info');
-            -
                        } else {
-            -
                            OMGF_Admin_Notice::set_notice(__("You've changed OMGF's storage folder to <strong>$new_cache_dir</strong>. Make sure the setting <em>Serve font files from...</em> reflects your changes and regenerate the stylesheet.", 'host-webfonts-local'), false);
-            -
                        }
-            -
-            -
                        update_option(OMGF_Admin_Settings::OMGF_SETTING_FONTS, $font_styles);
-            -
                    }
-            -
-            -
                    return $new_cache_dir;
-            -
                }
-            -
-            -
                /**
-            -
                 * @param $new_uri
-            -
                 * @param $old_uri
-            -
                 *
-            -
                 * @return mixed
-            -
                 */
-            -
                public function serve_uri_changed($new_uri, $old_uri)
-            -
                {
-            -
                    if ($new_uri !== $old_uri && !empty($new_uri)) {
-            -
                        $font_styles = $this->db->get_downloaded_fonts();
-            -
-            -
                        if (empty($font_styles)) {
-            -
                            return $new_uri;
-            -
                        }
-            -
-            -
                        preg_match('/[^\/]+$/u', WP_CONTENT_DIR, $match);
-            -
-            -
                        $font_styles = $this->rewrite_urls($font_styles, $old_uri, $new_uri);
-            -
-            -
                        update_option(OMGF_Admin_Settings::OMGF_SETTING_FONTS, $font_styles);
-            -
-            -
                        OMGF_Admin_Notice::set_notice(__("Fonts updated successfully. Regenerate the stylesheet to <em>serve font files from</em> $new_uri.", 'host-webfonts-local'), false, 'info');
-            -
                    }
-            -
-            -
                    return $new_uri;
-            -
                }
-            -
-            -
                /**
-            -
                 * @param $new_value
-            -
                 * @param $old_value
-            -
                 *
-            -
                 * @return mixed
-            -
                 */
-            -
                public function relative_url_changed($new_value, $old_value)
-            -
                {
-            -
                    if ($new_value != $old_value) {
-            -
                        $font_styles = $this->db->get_downloaded_fonts();
-            -
-            -
                        if (empty($font_styles)) {
-            -
                            return $new_value;
-            -
                        }
-            -
-            -
                        $result = $this->unset_downloaded_value($font_styles);
-            -
-            -
                        if ($new_value == 'on') {
-            -
                            $status = 'enabled';
-            -
                        } elseif (!$new_value) {
-            -
                            $status = 'disabled';
-            -
                        }
-            -
-            -
                        if ($result) {
-            -
                            OMGF_Admin_Notice::set_notice(sprintf(__('You\'ve %s using <em>relative URLs</em>. <strong>Download</strong> the <strong>fonts</strong> again and (re-)<strong>generate</strong> the <strong>stylesheet</strong> to implement this change.', 'host-webfonts-local'), $status), false, 'info');
-            -
-            -
                            return $new_value;
-            -
                        }
-            -
-            -
                        OMGF_Admin_Notice::set_notice(__('You\'ve %s using <em>relative URLs</em>. Something went wrong while updating the fonts. <strong>Empty</strong> the <strong>cache directory</strong>, <strong>download</strong> the <strong>fonts</strong> and <strong>generate</strong> the <strong>stylesheet</strong> to implement this change.', 'host-webfonts-local'), false, 'error');
-            -
                    }
-            -
-            -
                    return $new_value;
-            -
                }
-            -
-            -
                public function cdn_url_changed($new_url, $old_url)
-            -
                {
-            -
                    if ($new_url != $old_url) {
-            -
                        $font_styles = $this->db->get_downloaded_fonts();
-            -
-            -
                        if (empty($font_styles)) {
-            -
                            return $new_url;
-            -
                        }
-            -
-            -
                        $result = $this->unset_downloaded_value($font_styles);
-            -
-            -
                        if ($result) {
-            -
                            OMGF_Admin_Notice::set_notice(__('Fonts updated successfully. <strong>Download</strong> the <strong>fonts</strong> and (re-)<strong>generate</strong> the <strong>stylesheet</strong> to <em>serve fonts from CDN</em>.', 'host-webfonts-local'), false, 'info');
-            -
                        } else {
-            -
                            OMGF_Admin_Notice::set_notice(__('Something went wrong while updating your settings. <strong>Empty</strong> the <strong>Cache Directory</strong>, <strong>download</strong> the <strong>fonts</strong> and <strong>generate</strong> the <strong>stylesheet</strong> to <em>serve fonts from CDN</em>.', 'host-webfonts-local'), false, 'error');
-            -
                        }
-            -
                    }
-            -
-            -
                    return $new_url;
-            -
                }
-            -
-            -
                /**
-            -
                 * @param $files
-            -
                 * @param $destination
-            -
                 *
-            -
                 * @return bool
-            -
                 */
-            -
                private function move_files($files, $destination)
-            -
                {
-            -
                    $this->create_dir_recursive($destination);
-            -
-            -
                    foreach($files as $filename) {
-            -
                        $old_path = OMGF_FONTS_DIR . "/$filename";
-            -
                        $new_path = WP_CONTENT_DIR . $destination . "/$filename";
-            -
                        $move     = rename($old_path, $new_path);
-            -
-            -
                        if ($move == false) {
-            -
                            $errors[] = $filename;
-            -
                        }
-            -
                    }
-            -
-            -
                    if (!empty($errors)) {
-            -
                        $errored_files = ucfirst(implode(', ', $errors));
-            -
-            -
                        OMGF_Admin_Notice::set_notice($errored_files . __('could not be moved. Do it manually and then regenerate the stylesheet.', 'host-webfonts-local'), false, 'error');
-            -
-            -
                        return false;
-            -
                    }
-            -
-            -
                    $message    = sprintf(__('Moved %s files', 'host-webfonts-local'), count($files));
-            -
                    $remove_dir = rmdir(OMGF_FONTS_DIR);
-            -
-            -
                    if ($remove_dir) {
-            -
                        $message .= ' ' . __('and succesfully removed the previously set storage folder.', 'host-webfonts-local');
-            -
                    } else {
-            -
                        $message .= '.';
-            -
                    }
-            -
-            -
                    OMGF_Admin_Notice::set_notice($message, false);
-            -
-            -
                    return true;
-            -
                }
-            -
-            -
                /**
-            -
                 * @param $font_styles
-            -
                 * @param $old_path
-            -
                 * @param $new_path
-            -
                 *
-            -
                 * @return mixed
-            -
                 */
-            -
                private function rewrite_urls($font_styles, $old_path, $new_path)
-            -
                {
-            -
                    foreach ($font_styles as &$font) {
-            -
                        $urls = array_filter($font, function($key) {
-            -
                            return strpos($key, 'url') !== false;
-            -
                        }, ARRAY_FILTER_USE_KEY);
-            -
-            -
                        foreach ($urls as &$url) {
-            -
                            $url = str_replace($old_path, $new_path, $url);
-            -
                        }
-            -
-            -
                        $font = array_replace($font, $urls);
-            -
                    }
-            -
-            -
                    return $font_styles;
-            -
                }
-            -
-            -
                /**
-            -
                 * @param $fonts
-            -
                 *
-            -
                 * @return bool
-            -
                 */
-            -
                private function unset_downloaded_value($fonts)
-            -
                {
-            -
                    foreach ($fonts as &$font_style) {
-            -
                        $font_style['downloaded'] = 0;
-            -
                    }
-            -
-            -
                    $updated = update_option(OMGF_Admin_Settings::OMGF_SETTING_FONTS, $fonts);
-            -
-            -
                    if ($updated) {
-            -
                        return true;
-            -
                    }
-            -
-            -
                    return false;
-            -
                }
-            -
-            -
                /**
-            -
                 * @param $dir
-            -
                 */
-            -
                private function create_dir_recursive($dir)
-            -
                {
-            -
                    $uploadDir = WP_CONTENT_DIR . $dir;
-            -
                    if (!file_exists($uploadDir)) {
-            -
                        wp_mkdir_p($uploadDir);
-            -
                    }
-            -
                }
-            -
-            -
                /**
-            -
                 * @param $path
-            -
                 */
-            -
                private function remove_dir_recursive($path)
-            -
                {
-            -
                    $dirs = explode('/', $path);
-            -
                }
+            }

              * @url      : https://daan.dev
              * * * * * * * * * * * * * * * * * * * */
+            +
            defined( 'ABSPATH' ) || exit;
             class OMGF_Admin
+            {
+            +
            	const OMGF_ADMIN_JS_HANDLE  = 'omgf-admin-js';
+            +
            	const OMGF_ADMIN_CSS_HANDLE = 'omgf-admin-css';
+            +
+            +
            	/** @var array $show_notice */
+            +
            	private $show_notice = [];
+            +
+            +
            	/** @var string $plugin_text_domain */
+            +
            	private $plugin_text_domain = 'host-webfonts-local';
+            +
+            +
            	/**
+            +
            	 * OMGF_Admin constructor.
+            +
            	 */
+            +
            	public function __construct () {
+            +
            		/**
+            +
            		 * Filterable list of options that require the cache to be emptied.
+            +
            		 */
+            +
            		$this->show_notice = apply_filters('omgf_admin_options_show_notice', [
+            +
            			OMGF_Admin_Settings::OMGF_BASIC_SETTING_CACHE_PATH,
+            +
            			OMGF_Admin_Settings::OMGF_ADV_SETTING_CACHE_URI,
+            +
            			OMGF_Admin_Settings::OMGF_ADV_SETTING_RELATIVE_URL,
+            +
            			OMGF_Admin_Settings::OMGF_ADV_SETTING_CDN_URL
+            +
            		]);
+            +
+            +
            		add_action( 'admin_enqueue_scripts', [ $this, 'enqueue_admin_scripts' ] );
+            +
            		add_action( 'admin_notices', [ $this, 'print_notices' ] );
+            +
+            +
            		$this->do_basic_settings();
+            +
            		$this->do_advanced_settings();
+            +
+            +
            		add_filter( 'pre_update_option', [ $this, 'settings_changed' ], 10, 3 );
+            +
            	}
+            +
+            +
            	/**
+            +
            	 * Enqueues the necessary JS and CSS and passes options as a JS object.
+            +
            	 *
+            +
            	 * @param $hook
+            +
            	 */
+            +
            	public function enqueue_admin_scripts ( $hook ) {
+            +
            		if ( $hook == 'settings_page_optimize-webfonts' ) {
+            +
            			wp_enqueue_script( self::OMGF_ADMIN_JS_HANDLE, plugin_dir_url( OMGF_PLUGIN_FILE ) . 'assets/js/omgf-admin.js', [ 'jquery' ], OMGF_STATIC_VERSION, true );
+            +
            			wp_enqueue_style( self::OMGF_ADMIN_CSS_HANDLE, plugin_dir_url( OMGF_PLUGIN_FILE ) . 'assets/css/omgf-admin.css', [], OMGF_STATIC_VERSION );
+            +
            		}
+            +
            	}
+            +
+            +
            	/**
+            +
            	 * @param $name
+            +
            	 *
+            +
            	 * @return mixed
+            +
            	 */
+            +
            	protected function get_template ( $name ) {
+            +
            		return include OMGF_PLUGIN_DIR . 'templates/admin/block-' . $name . '.phtml';
+            +
            	}
+            +
+            +
            	/**
+            +
            	 * Add notice to admin screen.
+            +
            	 */
+            +
            	public function print_notices () {
+            +
            		OMGF_Admin_Notice::print_notices();
+            +
            	}
+            +
+            +
            	/**
+            +
            	 * @return OMGF_Admin_Settings_Basic
+            +
            	 */
+            +
            	private function do_basic_settings () {
+            +
            		return new OMGF_Admin_Settings_Basic();
+            +
            	}
+            +
+            +
            	/**
+            +
            	 * @return OMGF_Admin_Settings_Advanced
+            +
            	 */
+            +
            	private function do_advanced_settings () {
+            +
            		return new OMGF_Admin_Settings_Advanced();
+            +
            	}
+            +
+            +
            	/**
+            +
            	 * @param $new_value
+            +
            	 * @param $old_settings
+            +
            	 *
+            +
            	 * @return mixed
+            +
            	 */
+            +
            	public function settings_changed ( $value, $option_name, $old_value ) {
+            +
            		if (!in_array($option_name, $this->show_notice)) {
+            +
            			return $value;
+            +
            		}
+            +
+            +
            		if ( $value != $old_value ) {
+            +
            			OMGF_Admin_Notice::set_notice(
+            +
            				__('Settings changed. <a href="#" class="omgf-empty">Click here</a> to flush OMGF\'s cache.', $this->plugin_text_domain),
+            +
            				false
+            +
            			);
+            +
            		}
+            +
+            +
            		return $value;
+            +
            	}
+            }

includes/class-ajax.php CHANGED Viewed

@@ -14,189 +14,58 @@
              * @url      : https://daan.dev
              * * * * * * * * * * * * * * * * * * * */
-            -
            defined('ABSPATH') || exit;
             class OMGF_AJAX
+            {
-            -
                /** @var OMGF_DB $db */
-            -
                protected $db;
-            -
-            -
                /** @var string $plugin_text_domain */
-            -
                private $plugin_text_domain = 'host-webfonts-local';
-            -
-            -
                /**
-            -
                 * OMGF_AJAX constructor.
-            -
                 */
-            -
                public function __construct()
-            -
                {
-            -
                    $this->db = new OMGF_DB();
-            -
-            -
                    // @formatter:off
-            -
                    add_action('wp_ajax_omgf_ajax_search_font_subsets', array($this, 'search_font_subsets'));
-            -
                    add_action('wp_ajax_omgf_ajax_enable_auto_detect', [$this, 'enable_auto_detect']);
-            -
                    add_action('wp_ajax_omgf_ajax_search_google_fonts', array($this, 'search_fonts'));
-            -
                    add_action('wp_ajax_omgf_ajax_process_font_styles_queue', [$this, 'process_font_styles_queue']);
-            -
                    add_action('wp_ajax_omgf_ajax_download_fonts', array($this, 'download_fonts'));
-            -
                    add_action('wp_ajax_omgf_ajax_generate_styles', array($this, 'generate_styles'));
-            -
                    add_action('wp_ajax_omgf_ajax_empty_dir', array($this, 'empty_directory'));
-            -
                    // @formatter:on
-            -
                }
-            -
-            -
                /**
-            -
                 * Search the API for the requested fonts and return the available subsets.
-            -
                 */
-            -
                public function search_font_subsets()
-            -
                {
-            -
                    $option_subsets = get_option(OMGF_Admin_Settings::OMGF_SETTING_SUBSETS) ?: [];
-            -
-            -
                    delete_option(OMGF_Admin_Settings::OMGF_SETTING_SUBSETS);
-            -
-            -
-            -
                    if (!($query = $_POST['search_query'])) {
-            -
                        OMGF_Admin_Notice::set_notice(__('Search query not found.', $this->plugin_text_domain), true, 'warning');
-            -
                    }
-            -
-            -
                    $query         = strtolower(str_replace(', ', ',', $query));
-            -
                    $query         = str_replace(' ', '-', $query);
-            -
                    $searchQueries = explode(',', sanitize_text_field($query));
-            -
-            -
                    foreach ($searchQueries as $searchQuery) {
-            -
                        $api = new OMGF_API();
-            -
-            -
                        $subsets = $api->get_subsets($searchQuery);
-            -
-            -
                        // If subset search comes back empty. Add a notice and skip to the next one.
-            -
                        if (empty($subsets)) {
-            -
                            OMGF_Admin_Notice::set_notice(sprintf(__('Font %s not found. Are you sure it\'s a Google Font?', $this->plugin_text_domain), $searchQuery), false, 'error');
-            -
-            -
                            continue;
-            -
                        }
-            -
-            -
                        $response[$subsets['subset_font']] = $subsets;
-            -
                    }
-            -
-            -
                    $option_subsets = array_merge($option_subsets, $response);
-            -
-            -
                    update_option(OMGF_Admin_Settings::OMGF_SETTING_SUBSETS, $option_subsets);
-            -
-            -
                    OMGF_Admin_Notice::set_notice(__('Subset search complete. Select subsets to generate a list of available font styles.', $this->plugin_text_domain));
-            -
                }
-            -
-            -
                /**
-            -
                 * Enable Auto Detect
-            -
                 */
-            -
                public function enable_auto_detect()
-            -
                {
-            -
                    update_option(OMGF_Admin_Settings::OMGF_SETTING_AUTO_DETECTION_ENABLED, true);
-            -
-            -
                    $url = get_permalink(get_posts()[0]->ID);
-            -
-            -
                    OMGF_Admin_Notice::set_notice(__("Auto Detect enabled. Open any page on your frontend (e.g. your <a href='$url' target='_blank'>latest post</a>). After the page is fully loaded, return here and <a href='javascript:location.reload()'>click here</a> to refresh this page.", $this->plugin_text_domain));
-            -
                }
-            -
-            -
                /**
-            -
                 * Return the available fonts for the selected subset(s) from the API.
-            -
                 */
-            -
                public function search_fonts()
-            -
                {
-            -
                    if (!isset($_POST['search_google_fonts'])) {
-            -
                        delete_option(OMGF_Admin_Settings::OMGF_SETTING_FONTS);
-            -
-            -
                        OMGF_Admin_Notice::set_notice(__('Search query not found. Did you select any subsets? If so, try again.'), true, 'warning');
-            -
                    }
-            -
-            -
                    $search_google_fonts = $_POST['search_google_fonts'];
-            -
-            -
                    foreach ($search_google_fonts as $index => $google_font) {
-            -
                        $search_google_fonts[$google_font['subset_font']] = $google_font;
-            -
                        unset($search_google_fonts[$index]);
-            -
                    }
-            -
-            -
                    $subsets = get_option(OMGF_Admin_Settings::OMGF_SETTING_SUBSETS);
-            -
-            -
                    // Unset subsets which were checked before, but aren't now.
-            -
                    foreach ($subsets as $index => &$font) {
-            -
                        if (!in_array($index, array_keys($search_google_fonts))) {
-            -
                            $font['selected_subsets'] = [];
-            -
                        }
-            -
                    }
-            -
-            -
                    // Overwrite current selected subsets in settings with new values.
-            -
                    $subsets = array_replace_recursive($subsets, $search_google_fonts);
-            -
-            -
                    update_option(OMGF_Admin_Settings::OMGF_SETTING_SUBSETS, $subsets);
-            -
-            -
                    // Retrieve available font styles.
-            -
                    foreach ($search_google_fonts as $font) {
-            -
                        $selected_subsets = implode(',', $font['selected_subsets']);
-            -
                        $api              = new OMGF_API();
-            -
                        $fonts[]          = $api->get_font_styles($font['subset_font'], $selected_subsets);
-            -
                    }
-            -
-            -
                    // Create font styles list.
-            -
                    $fonts = array_merge(...$fonts);
-            -
-            -
                    update_option(OMGF_Admin_Settings::OMGF_SETTING_FONTS, $fonts);
-            -
-            -
                    OMGF_Admin_Notice::set_notice(count($fonts) . ' ' . __('font styles found. Trim the list to your needs and click <strong>Download Fonts</strong>.', $this->plugin_text_domain));
-            -
                }
-            -
-            -
                /**
-            -
                 * Update options with font styles selected for preloading.
-            -
                 */
-            -
                public function process_font_styles_queue()
-            -
                {
-            -
                    $current_fonts   = get_option(OMGF_Admin_Settings::OMGF_SETTING_FONTS);
-            -
                    $selected_fonts  = $_POST['font_styles'];
-            -
                    $to_be_preloaded = $_POST['preload_font_styles'];
-            -
-            -
                    $selected_fonts = array_filter($current_fonts, function ($font_style) use ($selected_fonts) {
-            -
                        return in_array($font_style['font_id'], $selected_fonts);
-            -
                    });
-            -
-            -
                    foreach ($selected_fonts as &$font) {
-            -
                        if (in_array($font['font_id'], $to_be_preloaded)) {
-            -
                            $font['preload'] = 1;
-            -
                        } else {
-            -
                            $font['preload'] = 0;
-            -
                        }
-            -
                    }
-            -
-            -
                    update_option(OMGF_Admin_Settings::OMGF_SETTING_FONTS, $selected_fonts);
-            -
-            -
                    OMGF_Admin_Notice::set_notice(count($current_fonts) - count($selected_fonts) . ' ' . __('fonts removed from list and', $this->plugin_text_domain) . ' ' . count($to_be_preloaded) . ' ' . __('fonts set to preload. If you haven\'t already, you can now <strong>download</strong> the <strong>fonts</strong>. Otherwise, just (re-)<strong>generate</strong> the <strong>stylesheet</strong>.', $this->plugin_text_domain), false);
-            -
                }
-            -
-            -
                /**
-            -
                 * @return OMGF_AJAX_Download
-            -
                 */
-            -
                public function download_fonts()
-            -
                {
-            -
                    return new OMGF_AJAX_Download();
-            -
                }
-            -
-            -
                /**
-            -
                 * @return OMGF_AJAX_Generate
-            -
                 */
-            -
                public function generate_styles()
-            -
                {
-            -
                    return new OMGF_AJAX_Generate();
-            -
                }
-            -
-            -
                /**
-            -
                 * Empty cache directory.
-            -
                 */
-            -
                public function empty_directory()
-            -
                {
-            -
                    try {
-            -
                        delete_option(OMGF_Admin_Settings::OMGF_SETTING_SUBSETS);
-            -
                        delete_option(OMGF_Admin_Settings::OMGF_SETTING_FONTS);
-            -
-            -
                        array_map('unlink', array_filter((array) glob(OMGF_FONTS_DIR . '/*')));
-            -
-            -
                        OMGF_Admin_Notice::set_notice(__('Cache directory successfully emptied.', $this->plugin_text_domain));
-            -
                    } catch (\Exception $e) {
-            -
                        OMGF_Admin_Notice::set_notice(__('Something went wrong while emptying the cache directory: ', $this->plugin_text_domain) . $e->getMessage(), true, 'error', $e->getCode());
-            -
                    }
-            -
                }
+            }

              * @url      : https://daan.dev
              * * * * * * * * * * * * * * * * * * * */
+            +
            defined( 'ABSPATH' ) || exit;
             class OMGF_AJAX
+            {
+            +
            	/** @var string $plugin_text_domain */
+            +
            	private $plugin_text_domain = 'host-webfonts-local';
+            +
+            +
            	/**
+            +
            	 * OMGF_AJAX constructor.
+            +
            	 */
+            +
            	public function __construct () {
+            +
            		add_action( 'wp_ajax_omgf_ajax_empty_dir', [ $this, 'empty_directory' ] );
+            +
            	}
+            +
+            +
            	/**
+            +
            	 * Empty cache directory.
+            +
            	 */
+            +
            	public function empty_directory () {
+            +
            		try {
+            +
            			$entries = array_filter( (array) glob( OMGF_FONTS_DIR . '/*' ) );
+            +
+            +
            			foreach ( $entries as $entry ) {
+            +
            				$this->delete( $entry );
+            +
            			}
+            +
+            +
            			OMGF_Admin_Notice::set_notice( __( 'Cache directory successfully emptied.', $this->plugin_text_domain ) );
+            +
            		} catch ( \Exception $e ) {
+            +
            			OMGF_Admin_Notice::set_notice(
+            +
            				__( 'Something went wrong while emptying the cache directory: ', $this->plugin_text_domain ) . $e->getMessage(),
+            +
            				true,
+            +
            				'error',
+            +
            				$e->getCode()
+            +
            			);
+            +
            		}
+            +
            	}
+            +
+            +
            	/**
+            +
            	 * @param $entry
+            +
            	 */
+            +
            	public function delete ( $entry ) {
+            +
            		if ( is_dir( $entry ) ) {
+            +
            			$file = new \FilesystemIterator( $entry );
+            +
+            +
            			// If dir is empty, valid() returns false.
+            +
            			while ( $file->valid() ) {
+            +
            				$this->delete( $file->getPathName() );
+            +
            				$file->next();
+            +
            			}
+            +
+            +
            			rmdir( $entry );
+            +
            		} else {
+            +
            			unlink( $entry );
+            +
            		}
+            +
            	}
+            }

includes/class-api.php DELETED Viewed

@@ -1,99 +0,0 @@
-            -
            <?php
-            -
            /* * * * * * * * * * * * * * * * * * * * *
-            -
             *
-            -
             *  ██████╗ ███╗   ███╗ ██████╗ ███████╗
-            -
             * ██╔═══██╗████╗ ████║██╔════╝ ██╔════╝
-            -
             * ██║   ██║██╔████╔██║██║  ███╗█████╗
-            -
             * ██║   ██║██║╚██╔╝██║██║   ██║██╔══╝
-            -
             * ╚██████╔╝██║ ╚═╝ ██║╚██████╔╝██║
-            -
             *  ╚═════╝ ╚═╝     ╚═╝ ╚═════╝ ╚═╝
-            -
             *
-            -
             * @package  : OMGF
-            -
             * @author   : Daan van den Bergh
-            -
             * @copyright: (c) 2020 Daan van den Bergh
-            -
             * @url      : https://daan.dev
-            -
             * * * * * * * * * * * * * * * * * * * */
-            -
-            -
            defined('ABSPATH') || exit;
-            -
-            -
            class OMGF_API
-            -
            {
-            -
                /**
-            -
                 * @param $query
-            -
                 *
-            -
                 * @return array
-            -
                 */
-            -
                public function get_subsets($query)
-            -
                {
-            -
                    $response = wp_remote_get(OMGF_HELPER_URL . $query);
-            -
-            -
                    if (wp_remote_retrieve_response_code($response) != 200) {
-            -
                        $this->throw_error($response, $query);
-            -
-            -
                        return [];
-            -
                    }
-            -
-            -
                    $result = json_decode(wp_remote_retrieve_body($response));
-            -
-            -
                    return [
-            -
                        'subset_family'     => $result->family,
-            -
                        'subset_font'       => $result->id,
-            -
                        'available_subsets' => $result->subsets,
-            -
                        'selected_subsets'  => []
-            -
                    ];
-            -
                }
-            -
-            -
                /**
-            -
                 * @param $font_family
-            -
                 * @param $selected_subsets
-            -
                 *
-            -
                 * @return array
-            -
                 */
-            -
                public function get_font_styles($font_family, $selected_subsets)
-            -
                {
-            -
                    if (empty($font_family)) {
-            -
                        return [];
-            -
                    }
-            -
-            -
                    $response = wp_remote_get(OMGF_HELPER_URL . $font_family . '?subsets=' . $selected_subsets);
-            -
-            -
                    if (wp_remote_retrieve_response_code($response) != 200) {
-            -
                        $this->throw_error($response, $font_family);
-            -
-            -
                        return [];
-            -
                    }
-            -
-            -
                    $result = json_decode(wp_remote_retrieve_body($response));
-            -
-            -
                    foreach ($result->variants as $variant) {
-            -
                        $fonts[] = [
-            -
                            'font_id'     => $result->id . '-' . $variant->id,
-            -
                            'font_family' => $variant->fontFamily,
-            -
                            'font_weight' => $variant->fontWeight,
-            -
                            'font_style'  => $variant->fontStyle,
-            -
                            'local'       => implode(',', $variant->local ?? []),
-            -
                            'preload'     => 0,
-            -
                            'downloaded'  => 0,
-            -
                            'url_ttf'     => $variant->ttf,
-            -
                            'url_woff'    => $variant->woff,
-            -
                            'url_woff2'   => $variant->woff2,
-            -
                            'url_eot'     => $variant->eot
-            -
                        ];
-            -
                    }
-            -
-            -
                    return $fonts;
-            -
                }
-            -
-            -
                /**
-            -
                 * Throw error based on response
-            -
                 *
-            -
                 * @param $response
-            -
                 * @param $query
-            -
                 */
-            -
                private function throw_error($response, $query)
-            -
                {
-            -
                    $message = wp_remote_retrieve_response_message($response);
-            -
                    $code    = wp_remote_retrieve_response_code($response);
-            -
                    OMGF_Admin_Notice::set_notice(sprintf(__('An error occurred while searching for %s: %s', 'host-webfonts-local'), $query, $message), false, 'error', $code);
-            -
                }
-            -
            }

includes/class-db.php DELETED Viewed

@@ -1,104 +0,0 @@
-            -
            <?php
-            -
            /* * * * * * * * * * * * * * * * * * * * *
-            -
             *
-            -
             *  ██████╗ ███╗   ███╗ ██████╗ ███████╗
-            -
             * ██╔═══██╗████╗ ████║██╔════╝ ██╔════╝
-            -
             * ██║   ██║██╔████╔██║██║  ███╗█████╗
-            -
             * ██║   ██║██║╚██╔╝██║██║   ██║██╔══╝
-            -
             * ╚██████╔╝██║ ╚═╝ ██║╚██████╔╝██║
-            -
             *  ╚═════╝ ╚═╝     ╚═╝ ╚═════╝ ╚═╝
-            -
             *
-            -
             * @package  : OMGF
-            -
             * @author   : Daan van den Bergh
-            -
             * @copyright: (c) 2020 Daan van den Bergh
-            -
             * @url      : https://daan.dev
-            -
             * * * * * * * * * * * * * * * * * * * */
-            -
-            -
            defined('ABSPATH') || exit;
-            -
-            -
            class OMGF_DB
-            -
            {
-            -
                /** @var QM_DB $wpdb */
-            -
                private $wpdb;
-            -
-            -
                /**
-            -
                 * OMGF_DB constructor.
-            -
                 */
-            -
                public function __construct()
-            -
                {
-            -
                    global $wpdb;
-            -
-            -
                    $this->wpdb = $wpdb;
-            -
                }
-            -
-            -
                /**
-            -
                 * @param bool $clean
-            -
                 *
-            -
                 * @return array|Exception
-            -
                 */
-            -
                public function get_downloaded_fonts($clean = false)
-            -
                {
-            -
                    try {
-            -
                        $fonts = $this->get_total_fonts();
-            -
-            -
                        $downloaded = array_filter($fonts, function($font) {
-            -
                            return $font['downloaded'] == 1;
-            -
                        });
-            -
-            -
                        if ($clean) {
-            -
                            foreach ($downloaded as &$download) {
-            -
                                $download['font_family'] = str_replace('\'', '', $download['font_family']);
-            -
                            }
-            -
                        }
-            -
-            -
                        return $downloaded;
-            -
                    } catch (\Exception $e) {
-            -
                        return $e;
-            -
                    }
-            -
                }
-            -
-            -
                /**
-            -
                 * @return array|Exception
-            -
                 */
-            -
                public function get_preload_fonts()
-            -
                {
-            -
                    try {
-            -
                        $fonts = $this->get_total_fonts();
-            -
-            -
                        $preload = array_filter($fonts, function($font) {
-            -
                            return $font['preload'] == 1;
-            -
                        });
-            -
-            -
                        return $preload;
-            -
                    } catch(\Exception $e) {
-            -
                        return $e;
-            -
                    }
-            -
                }
-            -
-            -
                /**
-            -
                 * @return array
-            -
                 */
-            -
                public function get_total_fonts()
-            -
                {
-            -
                    return get_option(OMGF_Admin_Settings::OMGF_SETTING_FONTS) ?: [];
-            -
                }
-            -
-            -
                /**
-            -
                 * @return array
-            -
                 */
-            -
                public function get_subsets()
-            -
                {
-            -
                    return get_option(OMGF_Admin_Settings::OMGF_SETTING_SUBSETS) ?: [];
-            -
                }
-            -
-            -
                /**
-            -
                 * @return bool
-            -
                 */
-            -
                public function clean_queue()
-            -
                {
-            -
                    delete_option(OMGF_Admin_Settings::OMGF_SETTING_FONTS);
-            -
                    delete_option(OMGF_Admin_Settings::OMGF_SETTING_SUBSETS);
-            -
-            -
                    return true;
-            -
                }
-            -
            }

includes/class-omgf.php CHANGED Viewed

@@ -18,46 +18,23 @@ defined('ABSPATH') || exit;
             class OMGF
+            {
-            -
                /**
-            -
                 * @var array These cache plugins empty the entire cache-folder, instead of just removing
-            -
                 *            its own files.
-            -
                 */
-            -
                const OMGF_EVIL_PLUGINS = [
-            -
                    'WP Super Cache' => 'wp-super-cache/wp-cache.php',
-            -
                    'WP Rocket'      => 'wp-rocket/wp-rocket.php'
-            -
                ];
-            -
-            -
                /** @var string */
-            -
                private $page = '';
-            -
                 /**
                  * OMGF constructor.
                  */
                 public function __construct()
+                {
                     $this->define_constants();
-            -
                    $this->page = isset($_GET['page']) ?: '';
                     if (is_admin()) {
                         $this->do_settings();
                         $this->add_ajax_hooks();
-            -
-            -
                        /**
-            -
                         * If auto detect can't finish properly, due to e.g. an invalid API response, OMGF's settings page crashes.
-            -
                         * This will prevent it from crashing the entire admin area.
-            -
                         */
-            -
                        if ($this->page == 'optimize-webfonts') {
-            -
                            $this->do_auto_detect();
-            -
                        }
-            -
-            -
                        add_action('plugin_loaded', array($this, 'do_setup'));
+                    }
                     if (!is_admin()) {
                         add_action('plugins_loaded', [$this, 'do_frontend']);
+                    }
-            -
-            -
                    register_activation_hook(OMGF_PLUGIN_FILE, [$this, 'check_cache_plugins']);
+                }
                 /**
@@ -65,28 +42,15 @@ class OMGF
                  */
                 public function define_constants()
+                {
-            -
                    global $wpdb;
-            -
                     define('OMGF_SITE_URL', 'https://daan.dev');
-            -
                    define('OMGF_DB_TABLENAME', $wpdb->prefix . 'omgf_fonts'); // legacy
-            -
                    define('OMGF_DB_CHARSET', $wpdb->get_charset_collate());
-            -
                    define('OMGF_HELPER_URL', 'https://google-webfonts-helper.herokuapp.com/api/fonts/');
-            -
                    define('OMGF_FILENAME', 'fonts.css');
-            -
                    define('OMGF_AUTO_DETECT_ENABLED', esc_attr(get_option(OMGF_Admin_Settings::OMGF_SETTING_AUTO_DETECTION_ENABLED, false)));
-            -
                    define('OMGF_CACHE_PATH', esc_attr(get_option(OMGF_Admin_Settings::OMGF_ADV_SETTING_CACHE_PATH)) ?: '/uploads/omgf');
-            -
                    define('OMGF_CACHE_URI', esc_attr(get_option(OMGF_Admin_Settings::OMGF_ADV_SETTING_CACHE_URI)) ?: '');
-            -
                    define('OMGF_FORCE_SSL', esc_attr(get_option(OMGF_Admin_Settings::OMGF_ADV_SETTING_FORCE_SSL)));
-            -
                    define('OMGF_RELATIVE_URL', esc_attr(get_option(OMGF_Admin_Settings::OMGF_ADV_SETTING_RELATIVE_URL)));
-            -
                    define('OMGF_CDN_URL', esc_attr(get_option(OMGF_Admin_Settings::OMGF_ADV_SETTING_CDN_URL)));
-            -
                    define('OMGF_WEB_FONT_LOADER', esc_attr(get_option(OMGF_Admin_Settings::OMGF_ADV_SETTING_WEB_FONT_LOADER)));
-            -
                    define('OMGF_REMOVE_VERSION', esc_attr(get_option(OMGF_Admin_Settings::OMGF_ADV_SETTING_REMOVE_VERSION)));
-            -
                    define('OMGF_CURRENT_BLOG_ID', get_current_blog_id());
-            -
                    define('OMGF_FONTS_DIR', WP_CONTENT_DIR . OMGF_CACHE_PATH);
-            -
                    define('OMGF_FONTS_URL', $this->get_fonts_url());
-            -
                    define('OMGF_DISPLAY_OPTION', esc_attr(get_option(OMGF_Admin_Settings::OMGF_ADV_SETTING_DISPLAY_OPTION, 'swap')) ?: 'swap');
-            -
                    define('OMGF_REMOVE_GFONTS', esc_attr(get_option(OMGF_Admin_Settings::OMGF_ADV_SETTING_REMOVE_GOOGLE_FONTS)));
-            -
                    define('OMGF_ENQUEUE_ORDER', esc_attr(get_option(OMGF_Admin_Settings::OMGF_ADV_SETTING_ENQUEUE_ORDER, 10)));
-            -
                    define('OMGF_OPTIMIZE_EDIT_ROLES', esc_attr(get_option(OMGF_Admin_Settings::OMGF_ADV_SETTING_OPTIMIZE_EDIT_ROLES, 'on')));
                     define('OMGF_UNINSTALL', esc_attr(get_option(OMGF_Admin_Settings::OMGF_ADV_SETTING_UNINSTALL)));
+                }
@@ -106,28 +70,6 @@ class OMGF
                     return new OMGF_AJAX();
+                }
-            -
                /**
-            -
                 * @return OMGF_Admin_AutoDetect|void
-            -
                 */
-            -
                public function do_auto_detect()
-            -
                {
-            -
                    $fonts = json_decode(get_option(OMGF_Admin_Settings::OMGF_SETTING_DETECTED_FONTS));
-            -
-            -
                    if (OMGF_AUTO_DETECT_ENABLED && $fonts) {
-            -
                        return new OMGF_Admin_AutoDetect($fonts);
-            -
                    }
-            -
                }
-            -
-            -
                /**
-            -
                 * @return OMGF_Setup
-            -
                 */
-            -
                public function do_setup()
-            -
                {
-            -
                    register_uninstall_hook(OMGF_PLUGIN_FILE, 'OMGF::do_uninstall');
-            -
-            -
                    return new OMGF_Setup();
-            -
                }
-            -
                 /**
                  * @return OMGF_Frontend_Functions
                  */
@@ -135,66 +77,15 @@ class OMGF
+                {
                     return new OMGF_Frontend_Functions();
+                }
-            -
-            -
                /**
-            -
                 * Throw a warning if any of the Evil Cache Plugins are used.
-            -
                 */
-            -
                public function check_cache_plugins()
-            -
                {
-            -
                    if (strpos(OMGF_CACHE_PATH, '/cache/') === false) {
-            -
                        return;
-            -
                    }
-            -
-            -
                    $cache_path = OMGF_CACHE_PATH;
-            -
                    $admin_url  = admin_url('options-general.php?page=optimize-webfonts&tab=advanced-settings');
-            -
-            -
                    foreach (self::OMGF_EVIL_PLUGINS as $name => $basename) {
-            -
                        if (is_plugin_active($basename)) {
-            -
                            OMGF_Admin_Notice::set_notice(sprintf(__("It looks like <strong>you're using %s</strong>. This plugin empties the entire <code>wp-content/cache</code> folder after a cache flush. To prevent this, <strong>move OMGF's fonts</strong> by changing the <em>Save font files to...</em> option under OMGF's <a href='%s'>Advanced Settings</a> from <code>%s</code> to something else, e.g. <code>/omgf-cache</code>.", 'host-webfonts-local'), $name, $admin_url, $cache_path), false, 'warning');
-            -
                        }
-            -
                    }
-            -
                }
-            -
-            -
                /**
-            -
                 * Returns the configured name of WordPress' content directory.
-            -
                 *
-            -
                 * @return mixed
-            -
                 */
-            -
                private function get_content_dir()
-            -
                {
-            -
                    if (OMGF_CACHE_URI) {
-            -
                        $match = array_filter(explode('/', OMGF_CACHE_URI));
-            -
                        $match = array_values($match);
-            -
                    } else {
-            -
                        preg_match('/[^\/]+$/u', WP_CONTENT_DIR, $match);
-            -
                    }
-            -
-            -
                    return $match[0];
-            -
                }
-            -
-            -
                /**
-            -
                 * @return string
-            -
                 */
-            -
                public function get_fonts_url()
-            -
                {
-            -
                    if (OMGF_RELATIVE_URL) {
-            -
                        return '/' . $this->get_content_dir() . OMGF_CACHE_PATH;
-            -
                    }
-            -
-            -
                    if (OMGF_CDN_URL) {
-            -
                        $uploadUrl = '//' . OMGF_CDN_URL . '/' . $this->get_content_dir() . OMGF_CACHE_PATH;
-            -
                    } elseif (OMGF_CACHE_URI) {
-            -
                        $uploadUrl = get_site_url(OMGF_CURRENT_BLOG_ID, OMGF_CACHE_URI);
-            -
                    } else {
-            -
                        $uploadUrl = get_site_url(OMGF_CURRENT_BLOG_ID, $this->get_content_dir() . OMGF_CACHE_PATH);
-            -
                    }
-            -
-            -
                    if (OMGF_FORCE_SSL) {
-            -
                        $uploadUrl = str_replace('http://', 'https://', $uploadUrl);
-            -
                    }
-            -
-            -
                    return $uploadUrl;
-            -
                }
                 /**
                  * @return OMGF_Uninstall

             class OMGF
+            {
                 /**
                  * OMGF constructor.
                  */
                 public function __construct()
+                {
                     $this->define_constants();
                     if (is_admin()) {
                         $this->do_settings();
                         $this->add_ajax_hooks();
+                    }
                     if (!is_admin()) {
                         add_action('plugins_loaded', [$this, 'do_frontend']);
+                    }
+            +
+            +
            	    add_action('rest_api_init', [$this, 'register_routes']);
+                }
                 /**
                  */
                 public function define_constants()
+                {
                     define('OMGF_SITE_URL', 'https://daan.dev');
+            +
                    define('OMGF_FONT_PROCESSING', esc_attr(get_option(OMGF_Admin_Settings::OMGF_BASIC_SETTING_FONT_PROCESSING, 'replace')));
+            +
            	    define('OMGF_DISPLAY_OPTION', esc_attr(get_option( OMGF_Admin_Settings::OMGF_BASIC_SETTING_DISPLAY_OPTION, 'swap')) ?: 'swap');
+            +
            	    define('OMGF_OPTIMIZE_EDIT_ROLES', esc_attr(get_option( OMGF_Admin_Settings::OMGF_BASIC_SETTING_OPTIMIZE_EDIT_ROLES, 'on')));
+            +
            	    define('OMGF_CACHE_PATH', esc_attr(get_option(OMGF_Admin_Settings::OMGF_BASIC_SETTING_CACHE_PATH)) ?: '/uploads/omgf');
+            +
            	    define('OMGF_CACHE_URI', esc_attr(get_option(OMGF_Admin_Settings::OMGF_ADV_SETTING_CACHE_URI)) ?: '');
+            +
            	    define('OMGF_RELATIVE_URL', esc_attr(get_option(OMGF_Admin_Settings::OMGF_ADV_SETTING_RELATIVE_URL)));
+            +
            	    define('OMGF_CDN_URL', esc_attr(get_option(OMGF_Admin_Settings::OMGF_ADV_SETTING_CDN_URL)));
+            +
            	    define('OMGF_FONTS_DIR', WP_CONTENT_DIR . OMGF_CACHE_PATH);
                     define('OMGF_UNINSTALL', esc_attr(get_option(OMGF_Admin_Settings::OMGF_ADV_SETTING_UNINSTALL)));
+                }
                     return new OMGF_AJAX();
+                }
                 /**
                  * @return OMGF_Frontend_Functions
                  */
+                {
                     return new OMGF_Frontend_Functions();
+                }
+            +
+            +
            	/**
+            +
            	 *
+            +
            	 */
+            +
            	public function register_routes()
+            +
            	{
+            +
            		$proxy = new OMGF_API_Download();
+            +
            		$proxy->register_routes();
+            +
            	}
                 /**
                  * @return OMGF_Uninstall

includes/class-setup.php DELETED Viewed

@@ -1,102 +0,0 @@
-            -
            <?php
-            -
            /* * * * * * * * * * * * * * * * * * * * *
-            -
             *
-            -
             *  ██████╗ ███╗   ███╗ ██████╗ ███████╗
-            -
             * ██╔═══██╗████╗ ████║██╔════╝ ██╔════╝
-            -
             * ██║   ██║██╔████╔██║██║  ███╗█████╗
-            -
             * ██║   ██║██║╚██╔╝██║██║   ██║██╔══╝
-            -
             * ╚██████╔╝██║ ╚═╝ ██║╚██████╔╝██║
-            -
             *  ╚═════╝ ╚═╝     ╚═╝ ╚═════╝ ╚═╝
-            -
             *
-            -
             * @package  : OMGF
-            -
             * @author   : Daan van den Bergh
-            -
             * @copyright: (c) 2020 Daan van den Bergh
-            -
             * @url      : https://daan.dev
-            -
             * * * * * * * * * * * * * * * * * * * */
-            -
-            -
            defined('ABSPATH') || exit;
-            -
-            -
            class OMGF_Setup
-            -
            {
-            -
                /** @var QM_DB $wpdb */
-            -
                private $wpdb;
-            -
-            -
                /** @var string $version */
-            -
                private $version;
-            -
-            -
                /** @var string $table */
-            -
                private $table;
-            -
-            -
                /**
-            -
                 * OMGF_Admin_Setup constructor.
-            -
                 */
-            -
                public function __construct()
-            -
                {
-            -
                    global $wpdb;
-            -
-            -
                    $this->wpdb    = $wpdb;
-            -
                    $this->version = get_option(OMGF_Admin_Settings::OMGF_SETTING_DB_VERSION);
-            -
                    $this->table   = OMGF_DB_TABLENAME;
-            -
-            -
                    if (version_compare($this->version, OMGF_DB_VERSION) < 0) {
-            -
                        $this->run_db_updates();
-            -
                    }
-            -
                }
-            -
-            -
                /**
-            -
                 * Run initial database updates.
-            -
                 */
-            -
                public function run_db_updates()
-            -
                {
-            -
                    $table_exists = $this->wpdb->query("SHOW TABLES LIKE '" . OMGF_DB_TABLENAME . "'");
-            -
-            -
                    if ($table_exists) {
-            -
                        $this->migrate_db();
-            -
                    }
-            -
-            -
                    $this->drop_tables();
-            -
                }
-            -
-            -
                /**
-            -
                 *
-            -
                 */
-            -
                private function migrate_db()
-            -
                {
-            -
                    $current_fonts = $this->wpdb->get_results("SELECT * FROM " . OMGF_DB_TABLENAME);
-            -
                    $fonts_array = json_decode(json_encode($current_fonts), true);
-            -
-            -
                    update_option(OMGF_Admin_Settings::OMGF_SETTING_FONTS, $fonts_array);
-            -
-            -
                    $current_subsets = $this->wpdb->get_results("SELECT * FROM " . OMGF_DB_TABLENAME . '_subsets');
-            -
                    $subsets_array        = json_decode(json_encode($current_subsets), true);
-            -
-            -
                    foreach ($subsets_array as &$subset) {
-            -
                        $available = $subset['available_subsets'];
-            -
                        $selected  = $subset['selected_subsets'];
-            -
                        $subset['available_subsets'] = strpos($available, ',') !== false ? explode(',', $available) : [ $available ];
-            -
                        $subset['selected_subsets']  = strpos($selected, ',') !== false ? explode(',', $selected) : [ $selected ];
-            -
                    }
-            -
-            -
                    update_option(OMGF_Admin_Settings::OMGF_SETTING_SUBSETS, $subsets_array);
-            -
                }
-            -
-            -
                /**
-            -
                 * Drop all tables associated with OMGF.
-            -
                 */
-            -
                private function drop_tables()
-            -
                {
-            -
                    $this->wpdb->query(
-            -
                        'DROP TABLE IF EXISTS ' . $this->table . ', ' . $this->table . '_subsets;'
-            -
                    );
-            -
-            -
                    $this->set_db_version(OMGF_DB_VERSION);
-            -
                }
-            -
-            -
                /**
-            -
                 * @param $value
-            -
                 */
-            -
                private function set_db_version($value)
-            -
                {
-            -
                    update_option(OMGF_Admin_Settings::OMGF_SETTING_DB_VERSION, $value);
-            -
                }
-            -
            }

includes/frontend/class-functions.php CHANGED Viewed

@@ -14,210 +14,117 @@
              * @url      : https://daan.dev
              * * * * * * * * * * * * * * * * * * * */
-            -
            defined('ABSPATH') || exit;
             class OMGF_Frontend_Functions
+            {
-            -
                const OMGF_STYLE_HANDLE = 'omgf-fonts';
-            -
-            -
                /** @var OMGF_DB */
-            -
                private $db;
-            -
-            -
                /** @var string */
-            -
                private $stylesheet_file;
-            -
-            -
                /** @var string */
-            -
                private $stylesheet_url;
-            -
-            -
                /** @var bool $do_optimize */
-            -
                private $do_optimize;
-            -
-            -
                /**
-            -
                 * OMGF_Frontend_Functions constructor.
-            -
                 */
-            -
                public function __construct()
-            -
                {
-            -
                    $this->stylesheet_file = OMGF_FONTS_DIR . '/' . OMGF_FILENAME;
-            -
                    $this->stylesheet_url  = OMGF_FONTS_URL . '/' . OMGF_FILENAME;
-            -
                    $this->do_optimize     = $this->maybe_optimize_fonts();
-            -
-            -
                    // @formatter:off
-            -
                    add_action('wp_print_styles', [$this, 'is_remove_google_fonts_enabled'], PHP_INT_MAX - 1000);
-            -
-            -
                    if (file_exists($this->stylesheet_file)) {
-            -
                        add_action('wp_enqueue_scripts', [$this, 'enqueue_stylesheet'], OMGF_ENQUEUE_ORDER);
-            -
                    }
-            -
-            -
                    if (OMGF_AUTO_DETECT_ENABLED) {
-            -
                        add_action('wp_print_styles', [$this, 'auto_detect_fonts'], PHP_INT_MAX - 10000);
-            -
                    }
-            -
-            -
                    $this->db = new OMGF_DB();
-            -
                    // Needs to be loaded before stylesheet.
-            -
                    add_action('wp_head', [$this, 'preload_fonts'], 1);
-            -
                    // @formatter:on
-            -
                }
-            -
-            -
                /**
-            -
                 * Check if the Remove Google Fonts option is enabled.
-            -
                 */
-            -
                public function is_remove_google_fonts_enabled()
-            -
                {
-            -
                    if (!$this->do_optimize) {
-            -
                        return;
-            -
                    }
-            -
-            -
                    if (OMGF_REMOVE_GFONTS == 'on' && !is_admin()) {
-            -
                        // @formatter:off
-            -
                        add_action('wp_print_styles', [$this, 'remove_google_fonts'], PHP_INT_MAX - 500);
-            -
                        // Theme: Enfold
-            -
                        add_filter('avf_output_google_webfonts_script', function() { return false; });
-            -
                        // @formatter:on
-            -
                    }
-            -
                }
-            -
-            -
                /**
-            -
                 * Should we optimize for logged in editors/administrators?
-            -
                 *
-            -
                 * @return bool
-            -
                 */
-            -
                private function maybe_optimize_fonts()
-            -
                {
-            -
                    if (!OMGF_OPTIMIZE_EDIT_ROLES && current_user_can('edit_pages')) {
-            -
                        return false;
-            -
                    }
-            -
-            -
                    return true;
-            -
                }
-            -
-            -
                /**
-            -
                 * Automatically dequeues any stylesheets loaded from fonts.gstatic.com or
-            -
                 * fonts.googleapis.com. Also checks for stylesheets dependant on Google Fonts and
-            -
                 * re-enqueues and registers them.
-            -
                 */
-            -
                public function remove_google_fonts()
-            -
                {
-            -
                    if (apply_filters('omgf_pro_auto_remove_enabled', false)) {
-            -
                        return;
-            -
                    }
-            -
-            -
                    global $wp_styles;
-            -
-            -
                    $registered   = $wp_styles->registered;
-            -
                    $fonts        = $this->detect_registered_google_fonts($registered);
-            -
                    $dependencies = array_filter(
-            -
                        $registered, function ($contents) use ($fonts) {
-            -
                        return !empty(array_intersect(array_keys($fonts), $contents->deps))
-            -
                               && $contents->handle !== 'wp-block-editor';
-            -
                    }
-            -
                    );
-            -
-            -
                    foreach ($fonts as $font) {
-            -
                        wp_deregister_style($font->handle);
-            -
                        wp_dequeue_style($font->handle);
-            -
                    }
-            -
-            -
                    foreach ($dependencies as $dependency) {
-            -
                        /**
-            -
                         * If Remove Google Fonts is enabled, but no stylesheet is generated, there's no need to add OMGF's stylesheet
-            -
                         * as a dependency.
-            -
                         */
-            -
                        $deps = array_diff($dependency->deps, array_keys($fonts)) + (isset($registered['omgf-fonts']) ? ['omgf-fonts'] : []);
-            -
                        wp_deregister_style($dependency->handle);
-            -
                        wp_dequeue_style($dependency->handle);
-            -
-            -
                        wp_register_style($dependency->handle, $dependency->src, $deps);
-            -
                        wp_enqueue_style($dependency->handle, $dependency->src, $deps);
-            -
                    }
-            -
                }
-            -
-            -
                /**
-            -
                 * @param $registered_styles
-            -
                 *
-            -
                 * @return array
-            -
                 */
-            -
                private function detect_registered_google_fonts($registered_styles)
-            -
                {
-            -
                    return array_filter(
-            -
                        $registered_styles,
-            -
                        function ($contents) {
-            -
                            return strpos($contents->src, 'fonts.googleapis.com/css') !== false
-            -
                                   || strpos($contents->src, 'fonts.gstatic.com') !== false;
-            -
                        }
-            -
                    );
-            -
                }
-            -
-            -
                /**
-            -
                 * Once the stylesheet is generated. We can enqueue it.
-            -
                 */
-            -
                public function enqueue_stylesheet()
-            -
                {
-            -
                    if (!$this->do_optimize) {
-            -
                        return;
-            -
                    }
-            -
-            -
                    if (OMGF_WEB_FONT_LOADER) {
-            -
                        $this->get_template('web-font-loader');
-            -
                    } else {
-            -
                        wp_enqueue_style(self::OMGF_STYLE_HANDLE, OMGF_FONTS_URL . '/' . OMGF_FILENAME, array(), (OMGF_REMOVE_VERSION ? null : OMGF_STATIC_VERSION));
-            -
                    }
-            -
                }
-            -
-            -
                /**
-            -
                 * @param $name
-            -
                 */
-            -
                public function get_template($name)
-            -
                {
-            -
                    include OMGF_PLUGIN_DIR . 'templates/frontend-' . $name . '.phtml';
-            -
                }
-            -
-            -
                /**
-            -
                 * Saves the used Google Fonts in the database, so it can be used by auto-detection.
-            -
                 */
-            -
                public function auto_detect_fonts()
-            -
                {
-            -
                    if (apply_filters('omgf_pro_auto_detect_enabled', false)) {
-            -
                        return;
-            -
                    }
-            -
-            -
                    global $wp_styles;
-            -
-            -
                    $registered = $wp_styles->registered;
-            -
-            -
                    $fonts = $this->detect_registered_google_fonts($registered);
-            -
-            -
                    foreach ($fonts as $font) {
-            -
                        $google_fonts_src[] = $font->src;
-            -
                    }
-            -
-            -
                    update_option(OMGF_Admin_Settings::OMGF_SETTING_DETECTED_FONTS, json_encode($google_fonts_src));
-            -
                }
-            -
-            -
                /**
-            -
                 * Collect and render preload fonts in wp_head().
-            -
                 */
-            -
                public function preload_fonts()
-            -
                {
-            -
                    if (!$this->do_optimize) {
-            -
                        return;
-            -
                    }
-            -
-            -
                    $preload_fonts = $this->db->get_preload_fonts();
-            -
-            -
                    if (!$preload_fonts) {
-            -
                        return;
-            -
                    }
-            -
-            -
                    foreach ($preload_fonts as $font) {
-            -
                        $font_urls[] = array_values(array_filter((array) $font, function ($properties) {
-            -
                            return strpos($properties, 'woff2_local') !== false;
-            -
                        }, ARRAY_FILTER_USE_KEY));
-            -
                    }
-            -
-            -
                    $urls = array_reduce($font_urls, 'array_merge', []);
-            -
-            -
                    foreach ($urls as $url) {
-            -
                        echo "<link rel='preload' href='$url' as='font' type='font/" . pathinfo($url, PATHINFO_EXTENSION) . "' crossorigin />\n";
-            -
                    }
-            -
                }
+            }


14	* @url : https://daan.dev
15	* * * * * * * * * * * * * * * * * * * */
16
17	+ defined( 'ABSPATH' ) \|\| exit;
18
19	class OMGF_Frontend_Functions
20	{
21	+ const OMGF_STYLE_HANDLE = 'omgf-fonts';
22	+
23	+ /** @var bool $do_optimize */
24	+ private $do_optimize;
25	+
26	+ /**
27	+ * OMGF_Frontend_Functions constructor.
28	+ */
29	+ public function __construct () {
30	+ $this->do_optimize = $this->maybe_optimize_fonts();
31	+
32	+ add_action( 'wp_print_styles', [ $this, 'process_fonts' ], PHP_INT_MAX - 1000 );
33	+ }
34	+
35	+ /**
36	+ * Should we optimize for logged in editors/administrators?
37	+ *
38	+ * @return bool
39	+ */
40	+ private function maybe_optimize_fonts () {
41	+ if ( ! OMGF_OPTIMIZE_EDIT_ROLES && current_user_can( 'edit_pages' ) ) {
42	+ return false;
43	+ }
44	+
45	+ return true;
46	+ }
47	+
48	+ /**
49	+ * Check if the Remove Google Fonts option is enabled.
50	+ */
51	+ public function process_fonts () {
52	+ if ( ! $this->do_optimize ) {
53	+ return;
54	+ }
55	+
56	+ if ( apply_filters( 'omgf_pro_advanced_processing_enabled', false ) ) {
57	+ return;
58	+ }
59	+
60	+ if ( is_admin() ) {
61	+ return;
62	+ }
63	+
64	+ switch ( OMGF_FONT_PROCESSING ) {
65	+ case 'remove':
66	+ add_action( 'wp_print_styles', [ $this, 'remove_registered_fonts' ], PHP_INT_MAX - 500 );
67	+ break;
68	+ default:
69	+ add_action( 'wp_print_styles', [ $this, 'replace_registered_fonts' ], PHP_INT_MAX - 500 );
70	+ }
71	+ }
72	+
73	+ /**
74	+ * This function contains a nice little hack, to avoid messing with potential dependency issues. We simply set the source to an empty string!
75	+ */
76	+ public function remove_registered_fonts () {
77	+ global $wp_styles;
78	+
79	+ $registered = $wp_styles->registered;
80	+ $fonts = apply_filters( 'omgf_auto_remove', $this->detect_registered_google_fonts( $registered ) );
81	+
82	+ foreach ( $fonts as $handle => $font ) {
83	+ $wp_styles->registered [ $handle ]->src = '';
84	+ }
85	+ }
86	+
87	+ /**
88	+ * Retrieve stylesheets from Google Fonts' API and modify the stylesheet for local storage.
89	+ */
90	+ public function replace_registered_fonts () {
91	+ global $wp_styles;
92	+
93	+ $registered = $wp_styles->registered;
94	+ $fonts = apply_filters( 'omgf_auto_replace', $this->detect_registered_google_fonts( $registered ) );
95	+
96	+ foreach ( $fonts as $handle => $font ) {
97	+ $cached_file = OMGF_CACHE_PATH . '/' . $handle . "/$handle.css";
98	+
99	+ if ( file_exists( WP_CONTENT_DIR . $cached_file ) ) {
100	+ $wp_styles->registered[ $handle ]->src = content_url( $cached_file );
101	+
102	+ continue;
103	+ }
104	+
105	+ $wp_styles->registered[ $handle ]->src = str_replace( 'https://fonts.googleapis.com/', site_url( '/wp-json/omgf/v1/download/' ), $font->src ) . "&handle=$handle";
106	+ }
107	+ }
108	+
109	+ /**
110	+ * @param $registered_styles
111	+ *
112	+ * @return array
113	+ */
114	+ private function detect_registered_google_fonts ( $registered_styles ) {
115	+ return array_filter(
116	+ $registered_styles,
117	+ function ( $contents ) {
118	+ return strpos( $contents->src, 'fonts.googleapis.com/css' ) !== false
119	+ \|\| strpos( $contents->src, 'fonts.gstatic.com' ) !== false;
120	+ }
121	+ );
122	+ }
123	+
124	+ /**
125	+ * @param $name
126	+ */
127	+ public function get_template ( $name ) {
128	+ include OMGF_PLUGIN_DIR . 'templates/frontend-' . $name . '.phtml';
129	+ }





























































































130	}

readme.md CHANGED Viewed

@@ -1,14 +1,41 @@
             # OMGF | Host Google Fonts Locally
-            -
            With only 2 clicks of a button, OMGF automagically downloads your Google Fonts you want to WordPress' content-folder, generates a stylesheet for it and enqueues it in your theme's header.
             ## Description
-            -
            OMGF (Optimize My Google Fonts) is written with performance in mind. Other plugins make repeated requests to your Blog's database to replace/remove requests to external Webfonts source (e.g. Google Fonts) on-the-fly. This might be user-friendly, but it's a performance killer, because locally hosting your Google Webfonts should be a set-and-forget feature. The source of your webfonts should be replaced once and kept that way.
-            -
            That's why I kept OMGF small and useful. It uses the Google Fonts Helper API to automagically download the fonts you want to WordPress' contents folder and generate a stylesheet for it. The stylesheet is automatically included to your site's header and 100% compatible with plugins like Autoptimize or W3 Total Cache. After that, all you need to do is remove any mention of requests to external webfont sources (using e.g. a child theme) and you're done!
-            -
            This will *decrease your pageload times*, *leverage browser cache*, *minimize DNS requests* and effectively bring you a perfect score on *Pagespeed Insights* and *Pingdom*, without taking toll on the performance of your webserver.
             ## Installation
@@ -26,8 +53,6 @@ This will *decrease your pageload times*, *leverage browser cache*, *minimize DN
             ## Frequently Asked Questions
-            -
            **Can I buy you a beer?**
-            -
             Visit the [FAQ at Wordpress.org](https://wordpress.org/plugins/host-webfonts-local/#faq)
             ## Support


1	# OMGF \| Host Google Fonts Locally
2
3	+ OMGF automagically caches the Google Fonts used by your theme/plugins locally. No configuration (or brains) required!
4
5	## Description
6
7	+ > How could using fonts via Google's service possibly run afoul of GDPR? The fact of the matter is that, when a font is requested by the user's browser, their IP is logged by Google and used for analytics.
8	+ > — Lifehacker
9
10	+ Leverage Browser Cache, Minimize DNS requests and serve your Google Fonts in a 100% GDPR compliant way with OMGF!
11	+
12	+ OMGF is written with performance and user-friendliness in mind. It uses the Google Fonts Helper API to automatically cache the fonts your theme and plugins use to minimize DNS requests and speed up your WordPress website.
13	+
14	+ ### How Does It Work?
15	+
16	+ After installing the plugin, OMGF runs silently in the background and captures any requests made to fonts.googleapis.com or fonts.gstatic.com. When a webpage is first loaded, it reroutes these requests to its own Download API and copies the fonts over to your server. Then it generates a stylesheet for your fonts including EOT, TTF, WOFF and WOFF2 formats to guarantee maximum cross browser compatibility!
17	+
18	+ When the fonts are downloaded and the stylesheet is generated, it rewrites every URL pointing to fonts.googleapis.com or fonts.gstatic.com to the locally hosted variant.
19	+
20	+ Please keep in mind that, although I try to make the configuration of this plugin as easy as possible, the concept of locally hosting a file or optimizing Google Fonts for Pagespeed Insights or GT Metrix has proven to be confusing for some people. If you're not sure of what your doing, please consult a SEO expert or Webdeveloper to help you with the configuration of this plugin or [hire me to do it for you](https://ffwp.dev/wordpress/omgf-expert-configuration/).
21	+
22	+ ### Features
23	+ - Automatically replace registered/enqueued Google Fonts in `wp_head()` with local copies,
24	+ - Automatically remove registered/enqueued Google Fonts from `wp_head()`,
25	+ - Leverage the font-display (swap) option,
26	+ - Serve fonts from CDN,
27	+ - Use OMGF with security through obscurity plugins.
28	+
29	+ ### Features in the PRO version
30	+ Everything in the free version, plus:
31	+ - Automatically remove/replace all Google Fonts throughout the entire HTML document,
32	+ - Combine all Google Fonts (made by your theme and/or plugins) requests into one file,
33	+ - Deduplicate Google Fonts requests,
34	+ - Reduce loading time and page size, by forcing the used subset(s) for all Google Fonts requests,
35	+ - Remove Resource Hints (preload, preconnect, dns-prefetch) pointing to fonts.googleapis.com or fonts.gstatic.com.
36	+
37	+ Click [here](https://ffwp.dev/wordpress/omgf-pro/) for more information and to purchase OMGF Pro.
38

39
40	## Installation
41

53
54	## Frequently Asked Questions
55


56	Visit the [FAQ at Wordpress.org](https://wordpress.org/plugins/host-webfonts-local/#faq)
57
58	## Support

readme.txt CHANGED Viewed

	@@ -3,12 +3,12 @@ Contributors: DaanvandenBergh
3	Tags: google, fonts, gdpr, cache, speed, preload, font-display, webfonts, subsets, remove, minimize, external, requests
4	Requires at least: 4.6
5	Tested up to: 5.5
6	- Stable tag: 3.8.2
7	Requires PHP: 7.0
8	License: GPLv2 or later
9	License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
11	- ~~With only 2 clicks of a button,~~ OMGF automagically ~~downloads~~ ~~your~~ Google Fonts ~~you~~ ~~want~~ to ~~WordPress'~~ ~~content-folder,~~ ~~generates~~ a ~~stylesheet~~ ~~for~~ ~~it and enqueues it in your theme's header.~~
12
13	== Description ==
14
	@@ -17,25 +17,32 @@ With only 2 clicks of a button, OMGF automagically downloads your Google Fonts y
17
18	Leverage Browser Cache, Minimize DNS requests and serve your Google Fonts in a 100% GDPR compliant way with OMGF!
19
20	- OMGF is written with performance and user-friendliness in mind. It uses the Google Fonts Helper API to ~~automagically~~ ~~download~~ the fonts ~~you want to WordPress' contents folder and generate a stylesheet for it. The stylesheet is automatically included to~~ your ~~site's~~ ~~header~~ and ~~100% compatible with CSS and JS optimizing/minification~~ plugins ~~like~~ ~~Autoptimize~~ or W3 ~~Total Cache. OMGF can efficiently remove any~~ requests to ~~external~~ ~~Google~~ ~~Fonts~~ ~~(loaded~~ ~~from fonts~~.~~gstatic.com or fonts.googleapis.com).~~
21
22	- ~~That's~~ ~~it.~~ ~~You're~~ ~~done!~~
23
24	- ~~This~~ ~~will~~ decrease ~~your~~ ~~pageload~~ ~~times,~~ leverage ~~browser~~ ~~cache,~~ minimize ~~DNS~~ requests ~~and~~ ~~effectively~~ ~~bring~~ ~~you~~ a ~~perfect~~ ~~score~~ on Pagespeed Insights ~~and~~ Pingdom, ~~without~~ ~~taking~~ ~~toll~~ on the ~~performance~~ of your ~~webserver~~.
25
26	- ~~Please~~ ~~keep~~ in ~~mind~~ ~~that,~~ ~~although~~ ~~I try to make~~ the ~~configuration~~ of ~~this plugin as easy as possible~~, ~~the~~ ~~concept~~ of ~~locally~~ ~~hosting~~ ~~a file or optimizing Google Fonts for Pagespeed Insights or GT Metrix has proven~~ to ~~be confusing for some people~~. ~~If you're not sure of what your doing, please consult a SEO expert~~ or ~~Webdeveloper~~ to ~~help you with~~ the ~~configuration~~ of ~~this plugin or [hire me to do it for you](https://woosh~~.~~dev/wordpress-services/omgf-expert-configuration/).~~
27
28	- == ~~Features~~ ==
29	- ~~- Automatically detect which Google Fonts your theme is using or,~~
30	- - ~~Easily~~ ~~find fonts in multiple subsets,~~
31	- - ~~Download~~ ~~them~~ ~~and~~ ~~generate~~ a ~~stylesheet,~~ ~~which~~ is ~~automatically~~ ~~added to your header using WordPress' wp_head()-function~~,
32	- - ~~Change~~ ~~the~~ ~~caching~~ ~~path~~ ~~(where~~ ~~the~~ ~~fonts and stylesheet are saved~~) ~~for increased compatibility with Multisite environments and Caching- and Security-plugins~~, ~~such as WP Super Cache, Autoptimize and WordFence,~~
33	- - ~~Serve~~ ~~your~~ ~~fonts~~ ~~from~~ ~~your CDN~~,
34	- - ~~Enable~~ ~~Typekit's [Web Font Loader](https://github.com/typekit/webfontloader) to load your~~ fonts ~~asynchronously~~ ~~and further increase your Pagespeed Insights score (!)~~,
35	- - ~~Preload~~ ~~the~~ ~~entire~~ ~~stylesheet~~ or ~~just~~ ~~fonts loaded above-the-fold,~~
36	- ~~- Control font performance by adding font-display property,~~
37	- - ~~Auto-generates~~ the ~~local~~ ~~source~~ ~~for webfonts,~~
38	- - ~~Automatically~~ ~~remove~~ ~~any~~ ~~fonts~~ ~~loaded from fonts.gstatic.com or fonts.googleapis.com.~~







39
40	== Installation ==
41
	@@ -47,13 +54,17 @@ For a more comprehensive guide for configuration, click [here](https://daan.dev/
47
48	== Frequently Asked Questions ==
49




50	= I don't know what I'm doing! Can you help? =
51
52	Of course :) But first calm down and read this [comprehensive guide on how to configure OMGF](https://daan.dev/wordpress/host-google-fonts-locally/). If you have any questions afterwards, visit the [Support Forum](https://wordpress.org/support/plugin/host-webfonts-local).
53
54	= I have another file I want to host locally. Could you make a plugin? =
55
56	- Maintaining three plugins besides my daily 9-to-5 job is a handful, so no. If you're looking for a way to host analytics.js locally; please install [CAOS](https://wordpress.org/plugins/host-analyticsjs-local/). ~~To host other 3rd party scripts and styles locally, try [HELL](https://wordpress.org/plugins/host-everything-local/).~~ For anything else, please follow the steps in [this how-to](https://daan.dev/how-to/host-js-locally-crontab/).
57
58	= How come my font isn't available in OMGF? =
59
	@@ -63,44 +74,33 @@ This could be for several reasons:
63
64	= Does this plugin remove resource hints, e.g. preconnect, preload or dns-prefetch? =
65
66	- No, to automatically remove resource hints pointing to fonts.googleapis.com or fonts.gstatic.com, [upgrade to OMGF Pro](https://~~woosh~~.dev/wordpress~~-plugins~~/~~host~~-~~google-fonts-~~pro/).
67
68	= Can I serve the fonts from my CDN? =
69
70	- Yes, you can. Enter the url of your CDN and ~~re-download~~ ~~and~~ ~~re-generate~~ ~~the stylesheet~~. ~~Then the fonts will be saved to and served from your CDN.~~
71
72	- = ~~How~~ ~~can~~ I ~~make~~ ~~sure~~ the fonts ~~load~~ ~~asynchronously~~ ~~AKA~~ ~~non-render~~ ~~blocking~~?
73
74	- ~~Enable~~ ~~Typekit~~'s ~~Web~~ ~~Font~~ ~~Loader~~ in the ~~settings~~ ~~and~~ OMGF ~~will~~ ~~take~~ ~~care~~ of it ~~for~~ ~~you!~~
75	-
76	- = I'm getting a 'Load resources from a consistent URL' after installing and configuring this plugin. What's going on? =
77	-
78	- This must be, because you're still loading the externally hosted Google Fonts, besides the fonts you downloaded using OMGF. Try checking the option 'Remove Google Fonts' and see if that helps. If it doesn't consider using a child theme to 'dequeue' any external requests. If you don't know how to do that, please [contact](https://daan.dev/contact/) me.
79	-
80	- = I have 'Remove Google Fonts' enabled, but the fonts from fonts.gstatic.com\|fonts.googleapis.com are still loaded. What's going on? =
81	-
82	- The option in OMGF removes any fonts that are loaded in the conventional way. However, if it doesn't work for you you're theme is either using an unconventional method or WebFont Loader to add Google Fonts. [Upgrade to OMGF Pro](https://woosh.dev/wordpress-plugins/host-google-fonts-pro/) to automatically replace these fonts with a locally hosted version.
83
84	= Does this plugin edit template files? =
85
86	- No, it does not. It creates a CSS Stylesheet which will be automatically added to your theme's header using a built-in ~~WordPress~~ queueing system.
87
88	= The stylesheet isn't loaded? What's going on? =
89
90	- OMGF enqueues the stylesheet into WordPress' head. If the stylesheet isn't loaded, this probably means your theme isn't implementing ~~the~~ wp_head() ~~function~~ correctly in ~~its~~ ~~header~~ ~~section~~.
91
92	= Does this plugin support Multi Site? I'm getting CORS errors! =
93
94	Yes, it does. When using subdomains, however, you might run into CORS related issues. To get around this, you should configure each site separately. Do the following:
95
96	- Go to the site's own dashboard,
97	- - Change OMGF's cache directory (Save ~~webfonts~~ to...) to something unique, e.g. `/uploads/site1/omgf`,
98	- - Click 'Save Changes',
99	- - If you haven't already, find the fonts you want to use,
100	- - Click 'Download Fonts' and wait for the process to finish,
101	- - Click 'Generate stylesheet'.
102
103	- Repeat this for every site you want to use with OMGF. A new stylesheet, using the corresponding site's Home-URL and cache directory for each font, ~~has~~ ~~been~~ generated. Bypassing any Cross-Origin Resource Sharing (CORS) issues you might run into.
104
105	= Is this plugin compatible with WPML? =
106
	@@ -112,6 +112,23 @@ N/A
112
113	== Changelog ==
114

















115	= 3.8.2 =
116	* Fixed notice: invalid operand type.
117
	@@ -124,7 +141,7 @@ N/A
124	* Improved re-enqueueing of stylesheets, if a stylesheet depends on the removed Google Font stylesheet.
125	* Pressing Enter in the Search Bar triggers search now.
126	* Developers can now easily add functionalities to OMGF's brand new Extensions tab, using several new filters and actions.
127	- * If OMGF is used along with other ~~WoOSH!~~ plugins (e.g. CAOS, OMGF Pro, etc.) the same class loader is used, significantly increasing performance.
128	* Added dates to changelog :)
129
130	= 3.7.0 \| June 10th, 2020 =
	@@ -246,7 +263,7 @@ N/A
246	* WordPress' default admin fonts no longer show up as results.
247
248	= 2.5.0 \| January 30st, 2020 =
249	- Updated Welcome-panel with ~~WoOSH!-~~services.
250	Preload can now be used for certain fonts only (also combined with Web Font Loader).
251
252	= 2.4.1 =


3	Tags: google, fonts, gdpr, cache, speed, preload, font-display, webfonts, subsets, remove, minimize, external, requests
4	Requires at least: 4.6
5	Tested up to: 5.5
6	+ Stable tag: 4.0.0
7	Requires PHP: 7.0
8	License: GPLv2 or later
9	License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
11	+ OMGF automagically caches the Google Fonts used by your theme/plugins locally. No configuration (or brains) required!
12
13	== Description ==
14

17
18	Leverage Browser Cache, Minimize DNS requests and serve your Google Fonts in a 100% GDPR compliant way with OMGF!
19
20	+ OMGF is written with performance and user-friendliness in mind. It uses the Google Fonts Helper API to automatically cache the fonts your theme and plugins use to minimize DNS requests and speed up your WordPress website.
21
22	+ = How Does It Work? =
23
24	+ After installing the plugin, OMGF runs silently in the background and captures any requests made to fonts.googleapis.com or fonts.gstatic.com. When a webpage is first loaded, it reroutes these requests to its own Download API and copies the fonts over to your server. Then it generates a stylesheet for your fonts including EOT, TTF, WOFF and WOFF2 formats to guarantee maximum cross browser compatibility!
25
26	+ When the fonts are downloaded and the stylesheet is generated, it rewrites every URL pointing to fonts.googleapis.com or fonts.gstatic.com to the locally hosted variant.
27
28	+ Please keep in mind that, although I try to make the configuration of this plugin as easy as possible, the concept of locally hosting a file or optimizing Google Fonts for Pagespeed Insights or GT Metrix has proven to be confusing for some people. If you're not sure of what your doing, please consult a SEO expert or Webdeveloper to help you with the configuration of this plugin or [hire me to do it for you](https://ffwp.dev/wordpress/omgf-expert-configuration/).
29	+
30	+ = Features =
31	+ - Automatically replace registered/enqueued Google Fonts in wp_head() with local copies,
32	+ - Automatically remove registered/enqueued Google Fonts from wp_head(),
33	+ - Leverage the font-display (swap) option,
34	+ - Serve fonts from CDN,
35	+ - Use OMGF with security through obscurity plugins.
36	+
37	+ = Features in the PRO version =
38	+ Everything in the free version, plus:
39	+ - Automatically remove/replace all Google Fonts throughout the entire document/page,
40	+ - Combine all Google Fonts (made by your theme and/or plugins) requests into one file,
41	+ - Deduplicate Google Fonts requests,
42	+ - Reduce loading time and page size, by forcing the used subset(s) for all Google Fonts requests,
43	+ - Remove Resource Hints (preload, preconnect, dns-prefetch) pointing to fonts.googleapis.com or fonts.gstatic.com.
44	+
45	+ Click [here](https://ffwp.dev/wordpress/omgf-pro/) for more information and to purchase OMGF Pro.
46
47	== Installation ==
48

54
55	== Frequently Asked Questions ==
56
57	+ = Why do my fonts load slow the first time? =
58	+
59	+ That's because OMGF's download API is capturing the request and immediately downloading all the fonts. After the fonts are downloaded and the stylesheet is generated, the stylesheet will load just as fast as any other file request.
60	+
61	= I don't know what I'm doing! Can you help? =
62
63	Of course :) But first calm down and read this [comprehensive guide on how to configure OMGF](https://daan.dev/wordpress/host-google-fonts-locally/). If you have any questions afterwards, visit the [Support Forum](https://wordpress.org/support/plugin/host-webfonts-local).
64
65	= I have another file I want to host locally. Could you make a plugin? =
66
67	+ Maintaining three plugins besides my daily 9-to-5 job is a handful, so no. If you're looking for a way to host analytics.js locally; please install [CAOS](https://wordpress.org/plugins/host-analyticsjs-local/). For anything else, please follow the steps in [this how-to](https://daan.dev/how-to/host-js-locally-crontab/).
68
69	= How come my font isn't available in OMGF? =
70

74
75	= Does this plugin remove resource hints, e.g. preconnect, preload or dns-prefetch? =
76
77	+ No, to automatically remove resource hints pointing to fonts.googleapis.com or fonts.gstatic.com, [upgrade to OMGF Pro](https://ffwp.dev/wordpress/omgf-pro/).
78
79	= Can I serve the fonts from my CDN? =
80
81	+ Yes, you can. Enter the url of your CDN and empty OMGF's cache directory.
82
83	+ = I have Google Fonts Processing set to Replace/Remove but the fonts from fonts.gstatic.com\|fonts.googleapis.com are still loaded. What's going on? =
84
85	+ The free version of OMGF removes any fonts that are loaded in the conventional way: wp_enqueue_scripts(). If it doesn't work for you, you're theme or plugins using other methods to load Google Fonts, e.g. in the footer, WebFont Loader, etc. [Upgrade to OMGF Pro](https://ffwp.dev/wordpress/omgf-pro/) to automatically replace these fonts with a locally hosted version.








86
87	= Does this plugin edit template files? =
88
89	+ No, it does not. It creates a CSS Stylesheet which will be automatically added to your theme's header using WordPress built-in queueing system.
90
91	= The stylesheet isn't loaded? What's going on? =
92
93	+ The free version of OMGF enqueues the stylesheet into WordPress' head using wp_enqueue_scripts(). If the stylesheet isn't loaded, this probably means your theme isn't implementing wp_head() correctly. [Upgrade to OMGF Pro](https://ffwp.dev/wordpress/omgf-pro/) to automatically add the stylesheet into WordPress' head.
94
95	= Does this plugin support Multi Site? I'm getting CORS errors! =
96
97	Yes, it does. When using subdomains, however, you might run into CORS related issues. To get around this, you should configure each site separately. Do the following:
98
99	- Go to the site's own dashboard,
100	+ - Change OMGF's cache directory (Save font files to...) to something unique, e.g. `/uploads/site1/omgf`,
101	+ - Click 'Save Changes'.



102
103	+ Repeat this for every site you want to use with OMGF. A new stylesheet, using the corresponding site's Home-URL and cache directory for each font, will be generated. Bypassing any Cross-Origin Resource Sharing (CORS) issues you might run into.
104
105	= Is this plugin compatible with WPML? =
106

112
113	== Changelog ==
114
115	+ = 4.0.0 \| September 30th, 2020 =
116	+ * OMGF now runs fully automatic to replace/remove Google Fonts from your pages using OMGF's new Download API. No initial configuration required!
117	+ * This means that if you use different fonts on different pages, all of them will be cached and served locally.
118	+ * HUGE performance increase in OMGF's automatic replacing/removing methods.
119	+ * Major overhaul of Settings Page:
120	+ * Removed Extensions Tab
121	+ * Some settings were moved to a new tab: Basic Settings.
122	+ * Improved Welcome and Documentation tab.
123	+ * Clarified option descriptions.
124	+ * Removed 'Generate Stylesheet' tab, which'll be released in a separate (free) add-on plugin soon.
125	+ * Removed 'Use Web Font Loader?' option, because it causes Cumulative Layout Shift and will not work with OMGF's new Auto Replace feature.
126	+ * Removed 'Remove Version Parameter' option, because it has become obsolete. The new detection method uses the initial script's version, if set.
127	+ * Font Preloading is temporarily removed and will be re-introduced (in a different form, along with new features) in a later release.
128	+
129	+ = 3.8.3 \| September 15th, 2020 =
130	+ * Performance improvements for Class autoloader.
131	+
132	= 3.8.2 =
133	* Fixed notice: invalid operand type.
134

141	* Improved re-enqueueing of stylesheets, if a stylesheet depends on the removed Google Font stylesheet.
142	* Pressing Enter in the Search Bar triggers search now.
143	* Developers can now easily add functionalities to OMGF's brand new Extensions tab, using several new filters and actions.
144	+ * If OMGF is used along with other Fast FW Press plugins (e.g. CAOS, OMGF Pro, etc.) the same class loader is used, significantly increasing performance.
145	* Added dates to changelog :)
146
147	= 3.7.0 \| June 10th, 2020 =

263	* WordPress' default admin fonts no longer show up as results.
264
265	= 2.5.0 \| January 30st, 2020 =
266	+ Updated Welcome-panel with Fast FW Press-services.
267	Preload can now be used for certain fonts only (also combined with Web Font Loader).
268
269	= 2.4.1 =

templates/admin/block-generate-stylesheet.phtml DELETED Viewed

@@ -1,160 +0,0 @@
-            -
            <?php
-            -
            /* * * * * * * * * * * * * * * * * * * * *
-            -
             *
-            -
             *  ██████╗ ███╗   ███╗ ██████╗ ███████╗
-            -
             * ██╔═══██╗████╗ ████║██╔════╝ ██╔════╝
-            -
             * ██║   ██║██╔████╔██║██║  ███╗█████╗
-            -
             * ██║   ██║██║╚██╔╝██║██║   ██║██╔══╝
-            -
             * ╚██████╔╝██║ ╚═╝ ██║╚██████╔╝██║
-            -
             *  ╚═════╝ ╚═╝     ╚═╝ ╚═════╝ ╚═╝
-            -
             *
-            -
             * @package  : OMGF
-            -
             * @author   : Daan van den Bergh
-            -
             * @copyright: (c) 2020 Daan van den Bergh
-            -
             * @url      : https://daan.dev
-            -
             * * * * * * * * * * * * * * * * * * * */
-            -
-            -
            defined('ABSPATH') || exit;
-            -
-            -
            $db      = new OMGF_DB();
-            -
            $utmTags = '?utm_source=omgf&utm_medium=plugin&utm_campaign=settings';
-            -
            ?>
-            -
            <div class="omgf-generate-stylesheet">
-            -
                <h3><?= __('Generate Stylesheet', 'host-webfonts-local'); ?></h3>
-            -
                <p>
-            -
                    <?= __('<strong>Search</strong> returns all available subsets and font styles for each font family. <strong>Auto Detect</strong> only returns subsets and font styles that\'re used by your installed theme and plugins.', 'host-webfonts-local'); ?>
-            -
                </p>
-            -
                <p>
-            -
                    <?= __('You can <strong>Search</strong> by either using a comma separated list (e.g. Open Sans, Poppins, Roboto) or by searching for each font family one by one.', 'host-webfonts-local'); ?>
-            -
                </p>
-            -
                <div class="omgf-search-section">
-            -
                    <div class="omgf-search-box">
-            -
                        <input type="text" id="omgf-search" class="form-input-tip ui-autocomplete-input" placeholder="<?php _e('Search... [e.g. Roboto, Open Sans, Poppins]', 'host-webfonts-local'); ?>" />
-            -
                        <input type="button" id="omgf-search-subsets" class="button button-secondary button-hero" value="<?php _e('Search', 'host-webfonts-local'); ?>"/>
-            -
                        <input type="button" id="omgf-auto-detect" class="button button-primary button-hero" value="<?= apply_filters('omgf_generate_stylesheet_auto_detect_title', __('Auto Detect', 'host-webfonts-local')); ?>" />
-            -
                    </div>
-            -
                    <table>
-            -
                        <caption><?php _e('Available subsets', 'host-webfonts-local'); ?></caption>
-            -
                        <tbody id="omgf-subsets">
-            -
                        <?php
-            -
                        $subsetFonts = $db->get_subsets();
-            -
                        ?>
-            -
                        <?php if ($subsetFonts): ?>
-            -
                            <?php foreach ($subsetFonts as $subsetFont): ?>
-            -
                                <tr valign="top" id="<?= $subsetFont['subset_font']; ?>">
-            -
                                    <td>
-            -
                                        <label>
-            -
                                            <input readonly type="text" class="omgf-subset-font-family" data-font-family="<?= $subsetFont['subset_font']; ?>" value="<?= $subsetFont['subset_family']; ?>" />
-            -
                                        </label>
-            -
                                    </td>
-            -
                                    <?php foreach ($subsetFont['available_subsets'] as $availableSubset): ?>
-            -
                                        <td>
-            -
                                            <label>
-            -
                                                <?php $checked = in_array($availableSubset, $subsetFont['selected_subsets']) ? 'checked' : ''; ?>
-            -
                                                <input class="omgf-subset" data-subset-font-family="<?= $subsetFont['subset_font']; ?>" autocomplete="off" value="<?= $availableSubset; ?>" type="checkbox" <?= $checked; ?> />
-            -
                                                <?= $availableSubset; ?>
-            -
                                            </label>
-            -
                                        </td>
-            -
                                    <?php endforeach; ?>
-            -
                                </tr>
-            -
                            <?php endforeach; ?>
-            -
                        <tr align="center">
-            -
                            <td class="omgf-subsets-search" align="right"><span class="omgf-apply help" style="display: none;"><strong><?= __('Search Font Styles', 'host-webfonts-local'); ?></strong></span></td>
-            -
                            <td><a class="button-primary omgf-apply button font-styles-search" href="#" style="display: none;"><span class="dashicons-before dashicons-search">&nbsp;</span></a></td>
-            -
                        </tr>
-            -
                        <?php else: ?>
-            -
                            <tr colspan="3">
-            -
                                <td>
-            -
                                    <em><?php _e('No subsets found. Use <strong>Search</strong> or <strong>Auto Detect</strong> start.', 'host-webfonts-local'); ?></em>
-            -
                                </td>
-            -
                            </tr>
-            -
                        <?php endif; ?>
-            -
                        </tbody>
-            -
                    </table>
-            -
                    <table id="omgf-font-styles-list">
-            -
                        <caption><?php _e('Available font styles', 'host-webfonts-local'); ?></caption>
-            -
                        <?php
-            -
                        $savedFonts = $db->get_total_fonts();
-            -
                        ?>
-            -
                        <?php if ($savedFonts && $subsetFonts): ?>
-            -
                            <thead align="center">
-            -
                            <th></th>
-            -
                            <th>
-            -
                                <?= __('Font Family', 'host-webfonts-local'); ?>
-            -
                            </th>
-            -
                            <th>
-            -
                                <?= __('Font Style', 'host-webfonts-local'); ?>
-            -
                            </th>
-            -
                            <th>
-            -
                                <?= __('Font Weight', 'host-webfonts-local'); ?>
-            -
                            </th>
-            -
                            <th>
-            -
                                <?= __('Preload? *', 'host-webfonts-local'); ?>
-            -
                            </th>
-            -
                            <th></th>
-            -
                            </thead>
-            -
                            <tbody id="omgf-font-styles">
-            -
                            <?php foreach ($savedFonts as $font):
-            -
                                $fontId = $font['font_id'];
-            -
                                ?>
-            -
                                <tr class="omgf-font-style" data-font-id="<?= $fontId; ?>" id="row-<?= $fontId; ?>">
-            -
                                    <td align="center" style="width: 20px;">
-            -
                                        <span class="omgf-font-downloaded dashicons-before <?= isset($font['downloaded']) && $font['downloaded'] == 1 ? 'dashicons-yes' : ''; ?>"></span>
-            -
                                    </td>
-            -
                                    <td style="width: 195px;">
-            -
                                        <input readonly type="text" value="<?= $font['font_family']; ?>" />
-            -
                                    </td>
-            -
                                    <td style="width: 150px;">
-            -
                                        <input style="width: 150px;" readonly type="text" value="<?= $font['font_style']; ?>" />
-            -
                                    </td>
-            -
                                    <td style="width: 100px;">
-            -
                                        <input style="width: 100px;" readonly type="text" value="<?= $font['font_weight']; ?>" />
-            -
                                    </td>
-            -
                                    <td align="center" style="width: 45px;">
-            -
                                        <input type="checkbox" class="omgf-font-preload" autocomplete="off" value="<?= $fontId; ?>" <?= $font['preload'] == 1 ? 'checked' : ''; ?> />
-            -
                                    </td>
-            -
                                    <td style="width: 45px;">
-            -
                                        <input type="hidden" value="<?= $fontId; ?>" />
-            -
                                        <input type="hidden" value="<?= $font['local']; ?>" />
-            -
                                        <input type="hidden" value="<?= $font['url_ttf']; ?>" />
-            -
                                        <input type="hidden" value="<?= $font['url_woff']; ?>" />
-            -
                                        <input type="hidden" value="<?= $font['url_woff2']; ?>" />
-            -
                                        <input type="hidden" value="<?= $font['url_eot']; ?>" />
-            -
                                        <span data-row="row-<?= $fontId; ?>" class="omgf-font-remove notice-dismiss">&nbsp;</span>
-            -
                                    </td>
-            -
                                </tr>
-            -
                            <?php endforeach; ?>
-            -
                                <!-- The navbar at the bottom of the table. -->
-            -
                                <tr id="font-styles-nav" class="sticky bottom">
-            -
                                    <td colspan="4" align="right">
-            -
                                        <span class="omgf-apply help font-styles" style="display: none;"><strong><?= __('Apply Changes', 'host-webfonts-local'); ?></strong></span>
-            -
                                    </td>
-            -
                                    <td colspan="2" style="width: 100px">
-            -
                                        <a class="button-primary omgf-apply button font-styles" href="#" style="display: none;"><span class="dashicons-before dashicons-yes"></span> <?= __('Apply', 'host-webfonts-local'); ?></a>
-            -
                                    </td>
-            -
                                </tr>
-            -
                                <tr>
-            -
                                    <td colspan="5">
-            -
                                        <span class="description">* <?= __('Only the <strong>woff2</strong> format is preloaded, since this format is widely supported by Modern Browsers which support preload.', 'host-webfonts-local'); ?></span>
-            -
                                    </td>
-            -
                                </tr>
-            -
                            </tbody>
-            -
                        <?php else: ?>
-            -
                            <tr>
-            -
                                <td>
-            -
                                    <em><?php _e('No fonts found. Choose <strong>subsets</strong> to start searching for fonts.', 'host-webfonts-local'); ?></em>
-            -
                                </td>
-            -
                            </tr>
-            -
                        <?php endif; ?>
-            -
                    </table>
-            -
                </div>
-            -
-            -
                <div id="omgf-control-panel">
-            -
                    <input type="button" id="omgf-download" class="button-primary" value="<?php _e('Download Fonts', 'host-webfonts-local'); ?>" />
-            -
                    <input type="button" id="omgf-generate" class="button-secondary" value="<?php _e('Generate Stylesheet', 'host-webfonts-local'); ?>" />
-            -
                    <a id="omgf-empty" class="button-cancel"><?php _e('Empty Cache Directory', 'host-webfonts-local'); ?></a>
-            -
                </div>
-            -
            </div>
-            -
            <div class="omgf-loading" style="display: none;">
-            -
                <span class="spinner is-active"> </span>
-            -
            </div>

templates/admin/block-welcome.phtml CHANGED Viewed

@@ -22,27 +22,35 @@ $tweetUrl           = 'https://twitter.com/intent/tweet?text=I+just+optimized+my
             ?>
             <div class="welcome-panel-content">
                 <div class="welcome-panel-column-container">
                     <div class="welcome-panel-column" style="width: 100%; margin-right: 15px;">
-            -
                        <h2><?php _e('Quickstart', $plugin_text_domain); ?></h2>
                         <ul>
-            -
                            <li class="welcome-icon dashicons-before dashicons-admin-settings">
-            -
                                <?= sprintf(__('Click %sAuto-detect%s and wait for the on-screen instructions', $plugin_text_domain), '<a class="help auto-detect" href="#">', '</a>'); ?>
                             </li>
-            -
                            <li class="welcome-icon dashicons-before dashicons-update">
-            -
                                <?= sprintf(__('Click %sDownload Fonts%s and wait for the download to complete', $plugin_text_domain), '<a class="help download-fonts" href="#">', '</a>'); ?>
                             </li>
-            -
                            <li class="welcome-icon dashicons-before dashicons-art">
-            -
                                <?= sprintf(__('Click %sGenerate Stylesheet%s and wait for the process to complete', $plugin_text_domain), '<a class="help generate-stylesheet" href="#">', '</a>'); ?>
                             </li>
-            -
                            <li class="welcome-icon dashicons-before dashicons-editor-removeformatting"><?= sprintf(__('Check <em>Auto Remove</em> in <a href="%s">Advanced Settings</a> and save your changes', $plugin_text_domain), admin_url('options-general.php?page=optimize-webfonts&tab=omgf-advanced-settings')); ?></li>
-            -
                            <li class="welcome-icon dashicons-before dashicons-smiley"><?php _e('Done!', $plugin_text_domain); ?></li>
                         </ul>
                         <p>
-            -
                            <?= sprintf(__('%sClick here%s for a more comprehensive guide.', $plugin_text_domain), '<a target="_blank" href="' . OMGF_SITE_URL . '/wordpress/host-google-fonts-locally/' . $utmTags . '">', '</a>'); ?>
                         </p>
                         <hr/>
                     </div>
                     <div class="welcome-panel-column welcome-panel-last" style="width: 100%;">
                         <h3>
                             <?php _e('Support OMGF by Spreading the Word!', $plugin_text_domain); ?>
                         </h3>
@@ -56,13 +64,41 @@ $tweetUrl           = 'https://twitter.com/intent/tweet?text=I+just+optimized+my
                             <a target="_blank" class="button button-secondary button-hero" href="https://wordpress.org/support/plugin/host-webfonts-local/reviews/?rate=5#new-post"><span class="dashicons-before dashicons-star-filled"> <?php _e('Review', $plugin_text_domain); ?></span></a>
                             <a target="_blank" class="button button-secondary button-hero" href="<?= $tweetUrl; ?>"><span class="dashicons-before dashicons-twitter"> <?php _e('Tweet', $plugin_text_domain); ?></span></a>
                         </p>
                         <hr/>
                         <h3>
                             <?php _e('Need Help?', $plugin_text_domain); ?>
                         </h3>
                         <p>
                             <?= sprintf(__('Visit the %sFAQ%s and %sSupport Forum%s to see if your question has already been answered. If not, ask a question on the Support Forum.', $plugin_text_domain), '<a href="https://wordpress.org/plugins/host-webfonts-local/#description" target="_blank">', '</a>', '<a href="https://wordpress.org/support/plugin/host-webfonts-local">', '</a>'); ?>
                         </p>
                     </div>
                 </div>
             </div>


22	?>
23	<div class="welcome-panel-content">
24	<div class="welcome-panel-column-container">
25	+ <?php if (apply_filters('apply_omgf_pro_promo', true)): ?>
26	<div class="welcome-panel-column" style="width: 100%; margin-right: 15px;">
27	+ <h2><?php _e('Why upgrade to OMGF Pro?', $plugin_text_domain); ?></h2>
28	<ul>
29	+ <li class="welcome-icon dashicons-before dashicons-yes">
30	+ <?= __('Automatically Replace/Remove Google Fonts throughout the entire document.', $plugin_text_domain); ?>
31	</li>
32	+ <li class="welcome-icon dashicons-before dashicons-yes">
33	+ <?= __('Combine and de-duplicate Google Fonts into one request.', $plugin_text_domain); ?>
34	</li>
35	+ <li class="welcome-icon dashicons-before dashicons-yes">
36	+ <?= __('Performance Fine Tuning', $plugin_text_domain); ?>
37	+ </li>
38	+ <li class="welcome-icon dashicons-before dashicons-yes">
39	+ <?= __('Automatically remove Resource Hints pointing to Google\'s Servers.', $plugin_text_domain); ?>
40	+ </li>
41	+ <li class="welcome-icon dashicons-before dashicons-yes">
42	+ <?= __('Reduce Page Size and Load Time using Subset Forcing.', $plugin_text_domain); ?>
43	</li>


44	</ul>
45	<p>
46	+ <a class="button button-hero button-primary" href="https://ffwp.dev/wordpress/omgf-pro"><span class="dashicons-before dashicons-cart"> <?= __('Buy now'); ?></span></a>
47	+ <span><?= __('Starting at € 29,-', $plugin_text_domain); ?></span>
48	</p>
49	<hr/>
50	</div>
51	+ <?php endif; ?>
52	<div class="welcome-panel-column welcome-panel-last" style="width: 100%;">
53	+ <?php if (apply_filters('apply_omgf_pro_promo', true)): ?>
54	<h3>
55	<?php _e('Support OMGF by Spreading the Word!', $plugin_text_domain); ?>
56	</h3>

64	<a target="_blank" class="button button-secondary button-hero" href="https://wordpress.org/support/plugin/host-webfonts-local/reviews/?rate=5#new-post"><span class="dashicons-before dashicons-star-filled"> <?php _e('Review', $plugin_text_domain); ?></span></a>
65	<a target="_blank" class="button button-secondary button-hero" href="<?= $tweetUrl; ?>"><span class="dashicons-before dashicons-twitter"> <?php _e('Tweet', $plugin_text_domain); ?></span></a>
66	</p>
67	+ <?php else:; ?>
68	+ <h2>
69	+ <?= __('Do you <span class="dashicons dashicons-heart ffwp-heart"></span> OMGF Pro?', $plugin_text_domain) ;?>
70	+ </h2>
71	+ <p>
72	+ <?= __('Click the button below and receive a unique discount code for 10% off your next purchase!'); ?>
73	+ </p>
74	+ <p>
75	+ <a target="_blank" class="button button-primary button-hero" href="<?= OMGF_Admin_Settings_Builder::FFWP_WORDPRESS_PLUGINS_OMGF_PRO . '#edd-reviews-title'; ?>"><span class="dashicons-before dashicons-star-filled"> <?php _e('Review', $plugin_text_domain); ?></span></a>
76	+ <span><?= __('(login required)', $plugin_text_domain); ?></span>
77	+ </p>
78	+ <?php endif; ?>
79	<hr/>
80	<h3>
81	<?php _e('Need Help?', $plugin_text_domain); ?>
82	</h3>
83	+ <?php if (apply_filters('apply_omgf_pro_promo', true)): ?>
84	+ <p>
85	+ <?= sprintf(__('%sClick here%s for a comprehensive guide.', $plugin_text_domain), '<a target="_blank" href="' . OMGF_SITE_URL . '/wordpress/host-google-fonts-locally/' . $utmTags . '">', '</a>'); ?>
86	+ </p>
87	<p>
88	<?= sprintf(__('Visit the %sFAQ%s and %sSupport Forum%s to see if your question has already been answered. If not, ask a question on the Support Forum.', $plugin_text_domain), '<a href="https://wordpress.org/plugins/host-webfonts-local/#description" target="_blank">', '</a>', '<a href="https://wordpress.org/support/plugin/host-webfonts-local">', '</a>'); ?>
89	</p>
90	+ <?php else: ?>
91	+ <ul>
92	+ <li><a target="_blank" href="https://ffwp.dev/docs/omgf-pro/quick-start/"><?= __('Quick Start Guide', $plugin_text_domain); ?></a></li>
93	+ <li><a target="_blank" href="https://ffwp.dev/docs/omgf-pro/faq/"><?= __('FAQ', $plugin_text_domain); ?></a></li>
94	+ <li><a target="_blank" href="https://ffwp.dev/contact/"><?= __('Contact', $plugin_text_domain); ?></a></li>
95	+ </ul>
96	+ <?php endif; ?>
97	+ <hr />
98	+ <h4 class="signature"><?= sprintf(__('Coded with %s in The Netherlands.', $plugin_text_domain), '<span class="dashicons dashicons-heart ffwp-heart"></span>'); ?></h4>
99	+ <p class="signature">
100	+ <a target="_blank" title="<?= __('Visit FFWP.dev', $plugin_text_domain); ?>" href="https://ffwp.dev/wordpress-plugins/"><img class="signature-image" alt="<?= __('Visit FFWP.dev', $plugin_text_domain); ?>" src="https://ffwp.dev/wp-content/uploads/2020/09/logo-color-full@05x.png" /></a>
101	+ </p>
102	</div>
103	</div>
104	</div>

templates/frontend-web-font-loader.phtml DELETED Viewed

@@ -1,76 +0,0 @@
-            -
            <?php
-            -
            /* * * * * * * * * * * * * * * * * * * * *
-            -
             *
-            -
             *  ██████╗ ███╗   ███╗ ██████╗ ███████╗
-            -
             * ██╔═══██╗████╗ ████║██╔════╝ ██╔════╝
-            -
             * ██║   ██║██╔████╔██║██║  ███╗█████╗
-            -
             * ██║   ██║██║╚██╔╝██║██║   ██║██╔══╝
-            -
             * ╚██████╔╝██║ ╚═╝ ██║╚██████╔╝██║
-            -
             *  ╚═════╝ ╚═╝     ╚═╝ ╚═════╝ ╚═╝
-            -
             *
-            -
             * @package  : OMGF
-            -
             * @author   : Daan van den Bergh
-            -
             * @copyright: (c) 2020 Daan van den Bergh
-            -
             * @url      : https://daan.dev
-            -
             * * * * * * * * * * * * * * * * * * * */
-            -
-            -
            defined('ABSPATH') || exit;
-            -
-            -
            $db                = new OMGF_DB();
-            -
            $fonts             = $db->get_downloaded_fonts(true);
-            -
            $families          = array_unique(
-            -
                array_map(
-            -
                    function ($i) {
-            -
                        return $i['font_family'];
-            -
                    },
-            -
                    $fonts
-            -
                )
-            -
            );
-            -
            $omgfStaticVersion = '?ver=' . OMGF_STATIC_VERSION;
-            -
            $omgfSrcUrl        = OMGF_FONTS_URL . '/' . OMGF_FILENAME . (OMGF_REMOVE_VERSION ? null : $omgfStaticVersion);
-            -
            $wflVersion        = '?ver=' . OMGF_WEB_FONT_LOADER_VERSION;
-            -
            $wflSrcUrl         = plugin_dir_url(OMGF_PLUGIN_FILE) . 'assets/js/libraries/webfont.js' . (OMGF_REMOVE_VERSION ? null : $wflVersion);
-            -
-            -
            if ($fonts && $families): ?>
-            -
                <script type="text/javascript">
-            -
                    /**
-            -
                     * Using Typekit's Web Font Loader to load OMGF's fonts asynchronously.
-            -
                     *
-            -
                     * @type {{custom: {urls: string[], families: string[]}}}
-            -
                     */
-            -
                    WebFontConfig = {
-            -
                        custom: {
-            -
                            families: [
-            -
                                <?php foreach ($families as $family): ?>
-            -
                                <?php
-            -
                                    $fvds = [];
-            -
                                    foreach ($fonts as $font) {
-            -
                                        if ($font['font_family'] != $family) {
-            -
                                            continue;
-            -
                                        }
-            -
                                        $fvds[] = mb_substr($font['font_style'], 0, 1) . mb_substr($font['font_weight'], 0, 1);
-            -
                                    }
-            -
                                ?>
-            -
                                '<?= $family; ?>:<?= implode(',', $fvds); ?>',
-            -
                                <?php endforeach; ?>
-            -
                            ],
-            -
                            urls: [
-            -
                                '<?= $omgfSrcUrl; ?>'
-            -
                            ]
-            -
                        }
-            -
                    };
-            -
-            -
                    (function (d) {
-            -
                        var wf = d.createElement(
-            -
                            'script'),
-            -
                            s = d.scripts[0];
-            -
                        wf.src = '<?= $wflSrcUrl; ?>';
-            -
                        wf.async = true;
-            -
                        wf.text = 'text/javascript';
-            -
                        s.parentNode.insertBefore(
-            -
                            wf,
-            -
                            s
-            -
                        );
-            -
                    })(document);
-            -
                </script>
-            -
            <?php endif; ?>

woosh-autoload.php DELETED Viewed

@@ -1,74 +0,0 @@
-            -
            <?php
-            -
            /* * * * * * * * * * * * * * * * * * * * * *
-            -
             *   _       __      ____  _____ __  ____
-            -
             *  | |     / /___  / __ \/ ___// / / / /
-            -
             *  | | /| / / __ \/ / / /\__ \/ /_/ / /
-            -
             *  | |/ |/ / /_/ / /_/ /___/ / __  /_/
-            -
             *  |__/|__/\____/\____//____/_/ /_(_)
-            -
             *
-            -
             * @author   : Daan van den Bergh
-            -
             * @url      : https://woosh.dev/wordpress-plugins/
-            -
             * @copyright: (c) 2020 Daan van den Bergh
-            -
             * @license  : GPL2v2 or later
-            -
             * * * * * * * * * * * * * * * * * * * * * */
-            -
-            -
            class Woosh_Autoloader
-            -
            {
-            -
                /** @var string $class */
-            -
                private $class;
-            -
-            -
                /** @var string $file */
-            -
                private $file;
-            -
-            -
                /**
-            -
                 * Woosh_Autoloader constructor.
-            -
                 *
-            -
                 * @param $class
-            -
                 */
-            -
                public function __construct(
-            -
                    $class
-            -
                ) {
-            -
                    $this->class = $class;
-            -
-            -
                    $this->load();
-            -
                }
-            -
-            -
                /**
-            -
                 * Build filepath for requested class.
-            -
                 */
-            -
                public function load()
-            -
                {
-            -
                    $path = explode('_', $this->class);
-            -
                    $this->file = '';
-            -
-            -
                    if (count($path) == 1) {
-            -
                        if (ctype_upper($path[0])) {
-            -
                            $this->file = 'class-' . strtolower(str_replace('_', '-', $this->class)) . '.php';
-            -
                        } else {
-            -
                            $parts = preg_split('/(?=[A-Z])/', lcfirst($path[0]));
-            -
                            $this->file = 'class-' . strtolower(implode('-', $parts)) . '.php';
-            -
                        }
-            -
                    } else {
-            -
                        array_shift($path);
-            -
                        end($path);
-            -
                        $i = 0;
-            -
-            -
                        while ($i < key($path)) {
-            -
                            $this->file .= strtolower($path[$i]) . '/';
-            -
                            $i++;
-            -
                        }
-            -
-            -
                        // If entire part of path is written uppercase, we don't want to split.
-            -
                        if (ctype_upper($path[$i])) {
-            -
                            $pieces[] = $path[$i];
-            -
                            // Words like OmgfPro or SuperStealth should be split up.
-            -
                        } else {
-            -
                            $pieces = preg_split('/(?=[A-Z])/', lcfirst($path[$i]));
-            -
                        }
-            -
-            -
                        $this->file .= 'class-' . strtolower(implode('-', $pieces)) . '.php';
-            -
                    }
-            -
-            -
                    return $this->file;
-            -
                }
-            -
            }

OMGF | GDPR/DSVGO Compliant, Faster Google Fonts. Easy. - Version 4.0.0

Version Description

Release Info

Code changes from version 3.8.2 to 4.0.0