";
//curl_setopt($ch, CURLOPT_CAINFO, plugin_dir_path ( __FILE__ ) . "DST_Root_CA.cer"); //seems to work.. ???
//curl_setopt($ch, CURLOPT_CAINFO, plugin_dir_path ( __FILE__ ) . "DST_Root_CA.pem");
-
+
}
else{
$ch = curl_init ( "http://query.bibleget.io/index.php?" . $finalquery . "&return=html&appid=wordpress&domain=" . urlencode ( site_url () ) . "&pluginversion=" . BIBLEGETPLUGINVERSION );
}
-
+
curl_setopt ( $ch, CURLOPT_RETURNTRANSFER, TRUE );
-
+
if (ini_get ( 'safe_mode' ) || ini_get ( 'open_basedir' )) {
// safe mode is on, we can't use some settings
} else {
@@ -301,13 +301,13 @@ function bibleGetQueryServer($finalquery) {
// remove style and title tags from the output if they are present(should not be present with more recent BibleGet engine
$output = substr ( $output, 0, strpos ( $output, "', $output, - 1, $count1 );
$output = preg_replace ( '/<\/(sm|pof|po|pol|pos|poif|poi|poil|po3|po3l|speaker)>/', '', $output, - 1, $count2 );
// $output .= "
Effettuate ".$count1." e ".$count2." sostituzioni.";
-
+
$matches = null;
if (preg_match_all ( "/
.*?<\/div>/s", $output, $matches )) {
// capture table of error messages, and turn it into notices for backend
@@ -328,9 +328,9 @@ function bibleGetQueryServer($finalquery) {
$output = false;
}
curl_close ( $ch );
-
+
update_option ( 'bibleget_error_admin_notices', $errs );
-
+
return $output;
}
@@ -345,7 +345,7 @@ function bibleGetQueryServer($finalquery) {
function bibleGetProcessQueries($queries, $versions) {
$goodqueries = array ();
-
+
$thisbook = null;
if (get_option ( "bibleget_" . $versions [0] . "IDX" ) === false) {
bibleGetSetOptions ();
@@ -382,9 +382,9 @@ function bibleGetProcessQueries($queries, $versions) {
}
// bibleGetWriteLog("indexes array should now be populated:");
// bibleGetWriteLog($indexes);
-
+
$notices = get_option ( 'bibleget_error_admin_notices', array () );
-
+
foreach ( $queries as $key => $value ) {
$thisquery = bibleGetToProperCase ( $value ); // shouldn't be necessary because already array_mapped, but better safe than sorry
if ($key === 0) {
@@ -400,8 +400,8 @@ function bibleGetProcessQueries($queries, $versions) {
//TODO: why are we returning $thisbook if we don't even use it here?
array_push ( $goodqueries, $thisquery );
} else {
- return $thisbook;
- //TODO: double check if this really needs to return false here?
+ return $thisbook;
+ //TODO: double check if this really needs to return false here?
//Does this prevent it from continuing integrity checks with the rest of the queries?
//Shouldn't it just be "continue;"?
}
@@ -415,7 +415,7 @@ function bibleGetProcessQueries($queries, $versions) {
* @param unknown $thisquery
* @param unknown $indexes
* @param string $thisbook
- *
+ *
* Performs complex integrity checks on the queries
* Gives feedback on the malformed queries to help the user get their query right
* Returns false if the query is not healthy enough to send to the BibleGet Server
@@ -441,10 +441,10 @@ function bibleGetCheckQuery($thisquery, $indexes, $thisbook = "") {
/* translators: the expressions %1$d, %2$d, and %3$s must be left as is, they will be substituted dynamically by values in the script. See http://php.net/sprintf. */
$errorMessages [9] = __ ( 'The values concatenated by the dot must be consecutive, instead %1$d >= %2$d in the expression <%3$s>', "bibleget-io" );
$errorMessages [10] = __ ( "A query that doesn't start with a book indicator must however start with a valid chapter indicator!", "bibleget-io" );
-
+
$errs = get_option ( 'bibleget_error_admin_notices', array () );
$dummy = array (); // to avoid error messages on systems with PHP < 5.4 which required third parameter in preg_match_all
-
+
if (preg_match ( "/^([1-3]{0,1}((\p{L}\p{M}*)+))/", $thisquery, $res )) {
$thisbook = $res [0];
if (! preg_match ( "/^[1-3]{0,1}((\p{L}\p{M}*)+)[1-9][0-9]{0,2}/", $thisquery ) || preg_match_all ( "/^[1-3]{0,1}((\p{L}\p{M}*)+)/", $thisquery, $dummy ) != preg_match_all ( "/^[1-3]{0,1}((\p{L}\p{M}*)+)[1-9][0-9]{0,2}/", $thisquery, $dummy )) {
@@ -452,11 +452,11 @@ function bibleGetCheckQuery($thisquery, $indexes, $thisbook = "") {
update_option ( 'bibleget_error_admin_notices', $errs );
return false;
}
-
+
$validBookIndex = ( int ) bibleGetIsValidBook ( $thisbook );
if ($validBookIndex != - 1) {
$thisquery = str_replace ( $thisbook, "", $thisquery );
-
+
if (strpos ( $thisquery, "." )) {
if (! strpos ( $thisquery, "," ) || strpos ( $thisquery, "," ) > strpos ( $thisquery, "." )) {
// error message: You cannot use a dot without first using a comma. A dot is a liason between verses, which are separated from the chapter by a comma.
@@ -469,7 +469,7 @@ function bibleGetCheckQuery($thisquery, $indexes, $thisbook = "") {
update_option ( 'bibleget_error_admin_notices', $errs );
return false;
}
-
+
// if(preg_match_all("/(?=[1-9][0-9]{0,2}\.[1-9][0-9]{0,2})/",$query) != substr_count($query,".") ){
// if(preg_match_all("/(?=([1-9][0-9]{0,2}\.[1-9][0-9]{0,2}))/",$query) < substr_count($query,".") ){
if (preg_match_all ( "/(? 1) {
@@ -566,7 +566,7 @@ function bibleGetCheckQuery($thisquery, $indexes, $thisbook = "") {
if (preg_match_all ( "/[,\.][1-9][0-9]{0,2}\-([1-9][0-9]{0,2})/", $thisquery, $matches )) {
if (! is_array ( $matches [1] )) {
$matches [1] = array (
- $matches [1]
+ $matches [1]
);
}
$highverse = intval ( array_pop ( $matches [1] ) );
@@ -604,11 +604,11 @@ function bibleGetCheckQuery($thisquery, $indexes, $thisbook = "") {
}
}
}
-
+
if (preg_match_all ( "/\.([1-9][0-9]{0,2})$/", $thisquery, $matches )) {
if (! is_array ( $matches [1] )) {
$matches [1] = array (
- $matches [1]
+ $matches [1]
);
}
$highverse = array_pop ( $matches [1] );
@@ -645,7 +645,7 @@ function bibleGetCheckQuery($thisquery, $indexes, $thisbook = "") {
}
}
}
-
+
if (strpos ( $thisquery, "-" )) {
if (preg_match_all ( "/[1-9][0-9]{0,2}\-[1-9][0-9]{0,2}/", $thisquery, $dummy ) != substr_count ( $thisquery, "-" )) {
// error message: A dash must be preceded and followed by 1 to 3 digits etc.
@@ -667,7 +667,7 @@ function bibleGetCheckQuery($thisquery, $indexes, $thisbook = "") {
update_option ( 'bibleget_error_admin_notices', $errs );
return false;
}
-
+
// if there's a comma before
if (preg_match ( "/([1-9][0-9]{0,2}\,[1-9][0-9]{0,2}\-[1-9][0-9]{0,2})/", $thisquery, $matchA )) {
// if there's a comma after, we're dealing with chapter,verse to chapter,verse
@@ -735,8 +735,8 @@ function bibleGetCheckQuery($thisquery, $indexes, $thisbook = "") {
/**
* BibleGet To ProperCase
* @param unknown $txt
- *
- * Helper function that modifies the query so that it is in a correct Proper Case,
+ *
+ * Helper function that modifies the query so that it is in a correct Proper Case,
* taking into account numbers at the beginning of the string
* Can handle any kind of Unicode string in any language
*/
@@ -760,7 +760,7 @@ function bibleGetToProperCase($txt) {
* BibleGet IndexOf Function
* @param unknown $needle
* @param unknown $haystack
- *
+ *
* Helper function that will return the index of a bible book from a two-dimensional index array
*/
function bibleGetIdxOf($needle, $haystack) {
@@ -804,10 +804,10 @@ function bibleGetIsValidBook($book) {
function bibleGetGetMetaData($request) {
// request can be for building the biblebooks variable, or for building version indexes, or for requesting current validversions
$notices = get_option ( 'bibleget_error_admin_notices', array () );
-
- $version = curl_version();
- $ssl_version = str_replace('OpenSSL/','',$version['ssl_version']);
- if( version_compare( $version['version'], '7.34.0', '>=') && version_compare( $ssl_version, '1.0.1', '>=' ) ){
+
+ $curl_version = curl_version();
+ $ssl_version = str_replace('OpenSSL/','',$curl_version['ssl_version']);
+ if( version_compare( $curl_version['version'], '7.34.0', '>=') && version_compare( $ssl_version, '1.0.1', '>=' ) ){
//we should be good to go for secure SSL communication supporting TLSv1_2
$url = "https://query.bibleget.io/metadata.php?query=" . $request . "&return=json";
$ch = curl_init ( $url );
@@ -817,22 +817,22 @@ function bibleGetGetMetaData($request) {
//echo "
', {'class': 'font-select-prefetch'});
+ this.$results_prefetch = this.$results.clone();
+ this.$fontsAsHtml_prefetch = this.$fontsAsHtml.clone();
+ this.$prefetch.append(this.$results_prefetch.append(this.$fontsAsHtml_prefetch));
+ jQuery('body').append(this.$prefetch);
+ //console.log('setupHtml END');
};
Fontselect.prototype.fontsAsHtml = function(){
@@ -516,11 +525,18 @@
Fontselect.prototype.addFontLink = function(font){
- var link = this.options.api + font + '&text=' + encodeURIComponent(this.toReadable(font).replace(/\s+/g, ''));
-
- if ($("link[href*='" + font + "']").length === 0){
- $('link:last').after('');
- }
+ //var link = this.options.api + font + '&text=' + encodeURIComponent(this.toReadable(font).replace(/\s+/g, ''));
+ /*
+ var fontfilename = encodeURIComponent(this.toReadable(font).replace(/\s+/g, ''));
+ var link = '/css/gfonts_preview/' + fontfilename + '.css';
+ if(typeof FontSelect_Control !== 'undefined'){
+ if(FontSelect_Control.hasOwnProperty('pluginUrl') && FontSelect_Control.pluginUrl != ''){
+ if ($("link[href='" + FontSelect_Control.pluginUrl + link + "']").length === 0){
+ $('link:last').after('');
+ }
+ }
+ }
+ */
};
return Fontselect;
@@ -530,7 +546,36 @@
if (options) {
$.extend( settings, options );
}
- return new Fontselect(this, settings, $.fontselect.google_fonts);
+ if(typeof FontSelect_Control !== 'undefined'){
+ if(FontSelect_Control.hasOwnProperty('bibleget_settings') && FontSelect_Control.bibleget_settings.hasOwnProperty('googlefontsapi_key') && FontSelect_Control.bibleget_settings.googlefontsapi_key != ''){
+ settings.api = 'https://fonts.googleapis.com/css2?key='+FontSelect_Control.bibleget_settings.googlefontsapi_key+'&family=';
+ var $ths = this;
+ jQuery.ajax({
+ url: 'https://www.googleapis.com/webfonts/v1/webfonts',
+ data: {'key':FontSelect_Control.bibleget_settings.googlefontsapi_key},
+ dataType: 'json',
+ type: 'get',
+ success: function(data){
+ //console.log(data);
+ var webfontList = data.items;
+ $.fontselect.google_fonts = [];
+ for(var it = 0; it < webfontList.length; it++){
+ $.fontselect.google_fonts[it] = webfontList[it].family.replace(/ /g, "+");
+ }
+ //console.log('new fontselect.google_fonts:');
+ //console.log($.fontselect.google_fonts);
+ return new Fontselect($ths, settings, $.fontselect.google_fonts);
+ },
+ error: function(jqXHR, textStatus, errorThrown){
+ console.log('error retrieving google fonts list :: '+textStatus+': '+errorThrown);
+ }
+ });
+ }
+ //console.log(bibleget_settings);
+ }
+ else {
+ return new Fontselect(this, settings, $.fontselect.google_fonts);
+ }
});
};
diff --git a/js/shortcode.js b/js/shortcode.js
index 55e2c9f..41f4da8 100644
--- a/js/shortcode.js
+++ b/js/shortcode.js
@@ -8,7 +8,11 @@
autoOpen: false,
width: ($(window).width() * 0.8),
maxHeight: ($(window).height() * 0.8),
- title: $(this).text()
+ title: $(this).text(),
+ create: function () {
+ // style fix for WordPress admin
+ $('.ui-dialog-titlebar-close').addClass('ui-button');
+ }
});
$(this).click(function(){
diff --git a/js/theme-customizer.js b/js/theme-customizer.js
index 30c4f7d..32b5026 100644
--- a/js/theme-customizer.js
+++ b/js/theme-customizer.js
@@ -11,6 +11,7 @@
wp.customize( 'bibleget_fontfamily', function( value ) {
value.bind( function( newval ) {
+ var fontType = parent.jQuery('#bibleget-googlefonts').attr('data-fonttype');
//alert(newval);
//console.log('wp.customize bibleget_fontfamily BEGIN');
//console.log(newval);
@@ -18,13 +19,15 @@
font = font.split(':');
//console.log(font);
//console.log('wp.customize bibleget_fontfamily END');
- var link = 'https://fonts.googleapis.com/css?family=' + newval;
- if ($("link[href*='" + font + "']").length > 0){
- $("link[href*='" + font + "']").attr('href',link)
- }
- else{
- $('link:last').after('');
- }
+ if(fontType == 'googlefont'){
+ var link = 'https://fonts.googleapis.com/css?family=' + newval;
+ if ($("link[href*='" + font + "']").length > 0){
+ $("link[href*='" + font + "']").attr('href',link)
+ }
+ else{
+ $('link:last').after('');
+ }
+ }
$('div.results').css('font-family', font[0] );
} );
} );
diff --git a/options.php b/options.php
index 3090638..30c2d1c 100644
--- a/options.php
+++ b/options.php
@@ -1,4 +1,6 @@
versionsbylang = array();
$this->versionlangs = array();
$this->countversionsbylang = 0;
$this->countversionlangs = 0;
$this->biblebookslangs = array();
-
+ $this->gfonts_weblist = new stdClass();
+ $this->gfonts_dir = "";
+ $this->options = get_option( 'bibleget_settings' );
+ $this->gfontsAPIkey = "";
+ $this->gfontsAPIkeyCheckResult = false;
+ $this->gfontsAPIresponseJSON = new stdClass();
+ $this->gfontsAPI_errors = array();
+ add_action( 'admin_menu', array( $this, 'add_plugin_page' ) );
+ add_action( 'admin_init', array( $this, 'register_settings' ) );
+
+ //if I understand correctly, ajax function callbacks need to be registered even before enqueue_scripts
+ //so let't pull it out of admin_print_scripts and place it here even before enqueue_scripts is called
+ //this will change the transient set, it cannot happen in gfontsAPIkeyCheck which is called on any admin interface
+ //we will have to leave the transient set to admin_print_scripts
+ switch($this->gfontsAPIkeyCheck()){ //can either check directly the return value of the script as we are doing here, or check the value as stored in the class private variable $this->gfontsAPIkeyCheckResult
+ case false:
+ //the gfontsAPIkey is not set, so let's just not do anything, ok
+ break;
+ case "SUCCESS":
+ //the gfontsAPIkey is set, and transient has been set and successful curl call made to the google fonts API
+ //error_log('CURRENT VALUE OF $this->gfontsAPIresponseJSON:');
+ //error_log(print_r($this->gfontsAPIresponseJSON,true));
+ //error_log('AJAX ACTION NOW BEING ADDED WITH THESE VALUES');
+ add_action( "wp_ajax_store_gfonts_preview", array( $this, 'store_gfonts_preview' ) );
+ //enqueue and localize will be done in enqueue_scripts
+
+ // Include CSS minifier by matthiasmullie
+ $minifierpath = WP_PLUGIN_DIR."/bibleget-io/minifier";
+ require_once $minifierpath . '/minify/src/Minify.php';
+ require_once $minifierpath . '/minify/src/CSS.php';
+ require_once $minifierpath . '/minify/src/JS.php';
+ require_once $minifierpath . '/minify/src/Exception.php';
+ require_once $minifierpath . '/minify/src/Exceptions/BasicException.php';
+ require_once $minifierpath . '/minify/src/Exceptions/FileImportException.php';
+ require_once $minifierpath . '/minify/src/Exceptions/IOException.php';
+ require_once $minifierpath . '/path-converter/src/ConverterInterface.php';
+ require_once $minifierpath . '/path-converter/src/Converter.php';
+ break;
+ case "CURL_ERROR":
+ break;
+ case "JSON_ERROR":
+ break;
+ case "REQUEST_NOT_SENT":
+ break;
+ }
+
+ add_action('admin_enqueue_scripts', array( $this, 'admin_print_styles') );
+ add_action('admin_enqueue_scripts', array( $this, 'admin_print_scripts') );
+ add_action('load-'.$this->options_page_hook, array( $this, 'bibleget_plugin_settings_save') );
+
}
/**
@@ -33,7 +88,7 @@ public function __construct()
*/
public function add_plugin_page()
{
- // This page will be under "Settings"
+ // This page will be under "Settings"
$this->options_page_hook = add_options_page(
__('BibleGet I/O Settings',"bibleget-io"), // $page_title
'BibleGet I/O', // $menu_title
@@ -41,13 +96,120 @@ public function add_plugin_page()
'bibleget-settings-admin', // $menu_slug (Page ID)
array( $this, 'create_admin_page' ) // Callback Function
);
-
- add_action('admin_enqueue_scripts', array( $this, 'admin_print_styles') );
- add_action('admin_enqueue_scripts', array( $this, 'admin_print_scripts') );
- add_action('load-'.$this->options_page_hook, array( $this, 'do_on_my_plugin_settings_save') );
-
- //start populating as soon as possible
- $this->getVersionsByLang();
+ }
+
+ /**
+ * Register and add settings
+ */
+ public function register_settings()
+ {
+
+ register_setting(
+ 'bibleget_settings_options', // Option group
+ 'bibleget_settings', // Option name
+ array( $this, 'sanitize' ) // Sanitize
+ );
+
+ add_settings_section(
+ 'bibleget_settings_section2', // ID
+ __('Preferences Settings',"bibleget-io"), // Title
+ array( $this, 'print_section_info2' ), // Callback
+ 'bibleget-settings-admin' // Page
+ );
+
+ add_settings_field(
+ 'favorite_version',
+ __('Preferred version or versions (when not indicated in shortcode)',"bibleget-io"),
+ array( $this, 'favorite_version_callback' ),
+ 'bibleget-settings-admin',
+ 'bibleget_settings_section2'
+ );
+
+ add_settings_field(
+ 'googlefontsapi_key',
+ __('Google Fonts API key (for updated font list)',"bibleget-io"),
+ array( $this, 'googlefontsapikey_callback' ),
+ 'bibleget-settings-admin',
+ 'bibleget_settings_section2'
+ );
+
+ }
+
+ public function admin_print_styles($hook)
+ {
+ if($hook == 'settings_page_bibleget-settings-admin'){
+ wp_enqueue_style( 'admin-css', plugins_url('css/admin.css', __FILE__) );
+ }
+ }
+
+ public function admin_print_scripts($hook)
+ {
+ //echo "
$hook
";
+ if($hook != 'settings_page_bibleget-settings-admin'){
+ return;
+ }
+
+ wp_register_script( 'admin-js', plugins_url('js/admin.js', __FILE__), array('jquery') );
+ $thisoptions = get_option( 'bibleget_settings' );
+ $myoptions = array();
+ if($thisoptions){
+ foreach($thisoptions as $key => $option){
+ $myoptions[$key] = esc_attr($option);
+ }
+ }
+ $obj = array("options" => $myoptions,'ajax_url' => admin_url( 'admin-ajax.php' ),'ajax_nonce' => wp_create_nonce( "bibleget-data" ));
+ wp_localize_script( 'admin-js', 'bibleGetOptionsFromServer', $obj );
+ wp_enqueue_script( 'admin-js' );
+
+ if($this->gfontsAPIkeyCheckResult == "SUCCESS"){
+ //We only want the transient to be set from the bibleget settings page, so we wait until now
+ // instead of doing it in the gfontsAPIkeyCheck (which is called on any admin interface)
+ set_transient ( md5 ( $this->options['googlefontsapi_key'] ), $this->gfontsAPIkeyCheckResult, 90 * 24 * HOUR_IN_SECONDS ); // 90 giorni
+
+ $this->gfonts_dir = WP_PLUGIN_DIR."/bibleget-io/gfonts_preview/";
+
+ $access_type = get_filesystem_method();
+ $plugin_path = "";
+ if($access_type === 'direct'){
+ $creds = request_filesystem_credentials(site_url() . '/wp-admin/', '', false, false, array());
+ /* initialize the API */
+ if ( WP_Filesystem($creds) ) {
+ global $wp_filesystem;
+ $plugin_path = str_replace(ABSPATH, $wp_filesystem->abspath(), plugin_dir_path( __FILE__ ));
+ if(!$wp_filesystem->is_dir($plugin_path . 'gfonts_preview/')){
+ /* directory didn't exist, so let's create it */
+ $wp_filesystem->mkdir($plugin_path . 'gfonts_preview/');
+ }
+ if(!$wp_filesystem->is_dir($plugin_path . 'css/gfonts_preview/')){
+ /* directory didn't exist, so let's create it */
+ $wp_filesystem->mkdir($plugin_path . 'css/gfonts_preview/');
+ }
+
+ //let's also cache the results from the Google Fonts API in a local file so we don't have to keep calling
+ $wp_filesystem->put_contents(
+ $plugin_path . 'gfonts_preview/gfontsWeblist.json',
+ json_encode($this->gfonts_weblist),
+ FS_CHMOD_FILE // predefined mode settings for WP files
+ );
+
+ }
+ else{
+ $this->gfontsAPI_errors[] = "Could not initialize wordpress filesystem with these credentials";
+ }
+ }
+ else{
+ $this->gfontsAPI_errors[] = "You do not have direct access permissions to the wordpress filesystem";
+ }
+
+ wp_enqueue_script( 'jquery-ui-progressbar' );
+ if(!wp_style_is('jquery-ui-css','registered') || !wp_style_is('jquery-ui-css','enqueued')){
+ wp_enqueue_style('jquery-ui-css',
+ '//ajax.googleapis.com/ajax/libs/jqueryui/' . wp_scripts()->registered['jquery-ui-core']->ver . '/themes/smoothness/jquery-ui.css');
+ }
+ $storeGfontsArr = array("job" => array( "gfontsPreviewJob" => (bool) true, "gfontsNonce" => wp_create_nonce("store_gfonts_preview_nonce"),'ajax_url' => admin_url( 'admin-ajax.php' ), 'gfontsWeblist' => $this->gfonts_weblist));
+ wp_localize_script( 'admin-js', 'gfontsBatch', $storeGfontsArr);
+ }
+
}
/**
@@ -55,32 +217,34 @@ public function add_plugin_page()
*/
public function create_admin_page()
{
+
+ //start populating as soon as possible
+ $this->getVersionsByLang();
+
//write_log("creating admin page\n");
// Set class property
- $this->options = get_option( 'bibleget_settings' );
-
+
?>
-
-
+
-
+
-
+
-
countversionsbylang<1 || $this->countversionlangs<1){
echo "Seems like the version info was not yet initialized. Now attempting to initialize...";
$this->getVersionsByLang();
@@ -100,14 +264,14 @@ public function create_admin_page()
foreach($this->versionsbylang[$lang] as $abbr => $value){
echo '
biblebookslangs).$b2;
/* translators: please do not change the placeholders %s, they will be substituted dynamically by values in the script. See http://php.net/printf. */
- printf(__("The BibleGet I/O engine currently recognizes the names of the books of the Bible in %s different languages:","bibleget-io"),$string3);
+ printf(__("The BibleGet I/O engine currently recognizes the names of the books of the Bible in %s different languages:","bibleget-io"),$string3);
echo " ";
echo "
".implode(", ",$this->biblebookslangs)."
";
?>
@@ -119,17 +283,17 @@ public function create_admin_page()
- =')) {
$locale_lang = explode("_",$locale)[0]; //variable dereferencing available only since PHP 5.4
}
else{
list($locale_lang,$locale_country) = explode("_",$locale); //lower than PHP 5.4
}
-
+
}
else { $locale_lang = $locale; }
if(file_exists(plugins_url( 'images/btn_donateCC_LG'.($locale_lang ? '-'.$locale_lang : '').'.gif', __FILE__ )) ){
@@ -137,43 +301,14 @@ public function create_admin_page()
}
else $donate_img = plugins_url( 'images/btn_donateCC_LG.gif', __FILE__ );
?>
-
biblebookslangs,$lang);
}
-
+
//write_log($this->biblebookslangs);
-
+
if(extension_loaded('intl') === true){
collator_asort(collator_create('root'), $this->biblebookslangs);
}else{
array_multisort(array_map('bibleGetSortify', $this->biblebookslangs), $this->biblebookslangs);
}
- //write_log($this->biblebookslangs);
-
+ //write_log($this->biblebookslangs);
+
$versions = get_option("bibleget_versions",array()); //theoretically should be an array
$versionsbylang = array();
$langs = array();
@@ -261,7 +398,7 @@ public function getVersionsByLang()
}
}
$this->versionsbylang = $versionsbylang;
-
+
//count total languages and total versions
$this->countversionlangs = count($versionsbylang);
$counter = 0;
@@ -270,7 +407,7 @@ public function getVersionsByLang()
$counter+=count($versionsbylang[$lang]);
}
$this->countversionsbylang = $counter;
-
+
if(extension_loaded('intl') === true){
collator_asort(collator_create('root'), $langs);
}else{
@@ -278,28 +415,28 @@ public function getVersionsByLang()
}
$this->versionlangs = $langs;
-
+
}
-
+
public function favorite_version_callback()
{
//double check to see if the values have been set
if($this->countversionsbylang<1 || $this->countversionlangs<1){
$this->getVersionsByLang();
}
-
+
$counter = ($this->countversionsbylang + $this->countversionlangs);
-
+
$selected = array();
if(isset( $this->options['favorite_version'] ) && $this->options['favorite_version']){
$selected = explode(",",$this->options['favorite_version']);
}
$size = $counter<10 ? $counter : 10;
echo '';
echo '';
}
-
- public function admin_print_styles($hook)
- {
- if($hook == 'settings_page_bibleget-settings-admin'){
- wp_enqueue_style( 'admin-css', plugins_url('css/admin.css', __FILE__) );
+
+ public function googlefontsapikey_callback(){
+
+ echo '';
+ if($this->gfontsAPIkeyCheckResult){
+ switch ($this->gfontsAPIkeyCheckResult){
+ case "SUCCESS":
+ echo 'SUCCESS';
+ break;
+ case "CURL_ERROR":
+ echo 'CURL ERROR WHEN SENDING REQUEST';
+ foreach($this->gfontsAPI_errors as $er){
+ echo ' ' . $er . '';
+ }
+ break;
+ case "JSON_ERROR":
+ echo 'NO VALID JSON RESPONSE';
+ break;
+ case "REQUEST_NOT_SENT":
+ echo 'SERVER UNABLE TO MAKE REQUESTS';
+ break;
+ }
}
+ echo ' ' . __("If you would like to use a Google Font that is not already included in the list of available fonts, you should use a Google Fonts API key.' .
+ ' If you do not yet have a Google Fonts API Key, you can get one here", "bibleget-io") . ': https://developers.google.com/fonts/docs/developer_api' .
+ ' If you choose to apply restrictions to your api key, choose "IP Addresses (web servers, cron jobs etc)" and if you restrict to specific IP addresses be sure to include any and all interface network addresses that your server may use;' .
+ ' specifically the ip address found in the $_SERVER['SERVER_ADDR'] variable (it may take a few minutes to be effective).' .
+ ' A successful key will be cached and retested every 3 months. Please note that this may have a little bit of an impact on the loading performance of your Wordpress Customizer. If you notice that it becomes too sluggish, you had best leave this field empty.';
}
- public function admin_print_scripts($hook)
- {
- //echo "
$hook
";
- if($hook != 'settings_page_bibleget-settings-admin'){
- return;
- }
-
- wp_register_script( 'admin-js', plugins_url('js/admin.js', __FILE__), array('jquery') );
- $thisoptions = get_option( 'bibleget_settings' );
- $myoptions = array();
- if($thisoptions){
- foreach($thisoptions as $key => $option){
- $myoptions[$key] = esc_attr($option);
- }
+ public function gfontsAPIkeyCheck(){
+ $result = false;
+ $this->gfontsAPI_errors = array(); //we want to start with a clean slate
+
+ if(isset( $this->options['googlefontsapi_key'] ) && $this->options['googlefontsapi_key'] != ""){
+ $this->gfontsAPIkey = $this->options['googlefontsapi_key'];
+ //has this key been tested in the past 3 months at least?
+ if(false === ($result = get_transient ( md5 ( $this->options['googlefontsapi_key'] ) )) ){
+
+ //We will make a secure connection to the Google Fonts API endpoint
+ $curl_version = curl_version();
+ $ssl_version = str_replace('OpenSSL/','',$curl_version['ssl_version']);
+ if( version_compare( $curl_version['version'], '7.34.0', '>=') && version_compare( $ssl_version, '1.0.1', '>=' ) ){
+ //we should be good to go for secure SSL communication supporting TLSv1_2
+ $ch = curl_init ( "https://www.googleapis.com/webfonts/v1/webfonts?key=" . $this->options['googlefontsapi_key']);
+ curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, TRUE);
+ curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
+ curl_setopt($ch, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1_2 );
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE );
+ curl_setopt($ch, CURLOPT_INTERFACE, $_SERVER['SERVER_ADDR']);
+ if (ini_get ( 'safe_mode' ) || ini_get ( 'open_basedir' )) {
+ // safe mode is on, we can't use some settings
+ } else {
+ curl_setopt($ch, CURLOPT_FOLLOWLOCATION, TRUE );
+ curl_setopt($ch, CURLOPT_AUTOREFERER, TRUE );
+ }
+ $response = curl_exec ( $ch );
+ $status = (int) curl_getinfo($ch, CURLINFO_HTTP_CODE);
+ if ($response && ! curl_errno ( $ch ) && $status == 200) {
+ //let's see what was returned, and if it's what we're looking for
+ $json_response = json_decode($response);
+ if ($json_response !== null && json_last_error() === JSON_ERROR_NONE) {
+ //So far so good, let's keep these results for other functions to access
+ $this->gfontsAPIresponseJSON = $json_response;
+
+ if(property_exists($json_response,"kind") && $json_response->kind == "webfonts#webfontList" && property_exists($json_response,"items") ){
+ $this->gfonts_weblist = $json_response;
+ $result = "SUCCESS";
+ }
+ }
+ else{
+ $result = "JSON_ERROR";
+ }
+ } else {
+ if(!$response){
+ $this->gfontsAPI_errors[] = "Response from curl request is false";
+ }
+ if(curl_errno($ch)){
+ $this->gfontsAPI_errors[] = curl_error($ch);
+ }
+ if($status != 200){
+ $this->gfontsAPI_errors[] = "Status = " . $status;
+ }
+ $result = "CURL_ERROR";
+ }
+ curl_close ( $ch );
+ }
+ else{
+ //we're not going anywhere here, can't make a secure connection to the google fonts api
+ $result = "REQUEST_NOT_SENT";
+ }
+
+
+ }
+ else{
+ //we have a previously saved api key which has been tested
+ //$result is not false
+ }
}
- $obj = array("options" => $myoptions,'ajax_url' => admin_url( 'admin-ajax.php' ),'ajax_nonce' => wp_create_nonce( "bibleget-data" ));
- wp_localize_script( 'admin-js', 'obj', $obj );
- wp_enqueue_script( 'admin-js' );
+ else{
+ //we don't have a previously saved api key, but really who cares
+ }
+
+ $this->gfontsAPIkeyCheckResult = $result;
+ return $result;
+ }
+
+ public function store_gfonts_preview(){
+ check_ajax_referer( 'store_gfonts_preview_nonce', 'security', TRUE ); //no need for an "if", it will die if not valid
+ //$this->gfonts_weblist contains $json_response, no need to retrieve from the javascript ajax data!
+ $returnInfo = new stdClass();
+ $thisfamily = "";
+ $familyurlname = "";
+ $familyfilename = "";
+ $errorinfo = array();
+ $gfontsDir = WP_PLUGIN_DIR."/bibleget-io/gfonts_preview/";
+ $gfontsWeblist = new stdClass();
+
+ if(file_exists($gfontsDir."gfontsWeblist.json")){
+ $gfontsWeblistFile = file_get_contents($gfontsDir."gfontsWeblist.json");
+ $gfontsWeblist = json_decode($gfontsWeblistFile);
+ }
+ if(isset($_POST["gfontsCount"],$_POST["batchLimit"],$_POST["startIdx"],$_POST["lastBatchLimit"],$_POST["numRuns"],$_POST["currentRun"]) && property_exists($gfontsWeblist,"items") ){
+ $gfontsCount = intval($_POST["gfontsCount"]);
+ $batchLimit = intval($_POST["batchLimit"]);
+ $startIdx = intval($_POST["startIdx"]);
+ $lastBatchLimit = intval($_POST["lastBatchLimit"]);
+ $numRuns = intval($_POST["numRuns"]);
+ $currentRun = intval($_POST["currentRun"]);
+ //$errorinfo[] = "POST data received: ".print_r($_POST,true);
+ //$gfontsWeblist = (is_object($_POST["gfontsWeblist"])) ? $_POST["gfontsWeblist"] : ( is_array($_POST["gfontsWeblist"]) ? (object)$_POST["gfontsWeblist"] : ( is_string($_POST["gfontsWeblist"]) ? json_decode($_POST["gfontsWeblist"]) : false ) );
+ //$errorinfo[] = "gfontsWeblist = ".print_r($gfontsWeblist,true);
+ //$errorinfo[] = "gfontsWeblist->items = ".print_r($gfontsWeblist->items,true);
+ $totalFonts = (count($gfontsWeblist->items) > 0) ? count($gfontsWeblist->items) : false;
+ $errorinfo[] = "totalFonts according to the server script = ".$totalFonts;
+ }
+ else{
+ $errorinfo[] = "We do not seem to have received all the necessary data... Request received: ".print_r($_POST,true);
+ echo json_encode($errorinfo);
+ wp_die();
+
+ }
+
+ $access_type = get_filesystem_method();
+ $plugin_path = "";
+ if($access_type === 'direct'){
+ $creds = request_filesystem_credentials(site_url() . '/wp-admin/', '', false, false, array());
+ /* initialize the API */
+ if ( WP_Filesystem($creds) ) {
+ global $wp_filesystem;
+ $plugin_path = str_replace(ABSPATH, $wp_filesystem->abspath(), plugin_dir_path( __FILE__ ));
+
+ foreach($gfontsWeblist->items as $idx => $googlefont){
+ if($idx >= $startIdx && $idx < ($startIdx + $batchLimit)){
+ $thisfamily = $googlefont->family;
+ $familyurlname = preg_replace('/\s+/', '+', $thisfamily);
+ $familyfilename = preg_replace('/\s+/', '', $thisfamily);
+ $errorinfo[] = "Now dealing with font-family " . $thisfamily;
+ $fnttype = 'ttf'; //'woff', 'woff2', 'ttf'
+
+ if(!file_exists($gfontsDir."{$familyfilename}.{$fnttype}") ){ //$idx < $idxlimit &&
+ $ch2 = curl_init("https://fonts.googleapis.com/css2?family={$familyurlname}&text={$familyfilename}");
+ curl_setopt($ch2, CURLOPT_SSL_VERIFYPEER, TRUE);
+ curl_setopt($ch2, CURLOPT_SSL_VERIFYHOST, 2);
+ curl_setopt($ch2, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1_2 );
+ curl_setopt($ch2, CURLOPT_RETURNTRANSFER, TRUE );
+ curl_setopt($ch2, CURLOPT_INTERFACE, $_SERVER['SERVER_ADDR']);
+ if (ini_get ( 'safe_mode' ) || ini_get ( 'open_basedir' )) {
+ // safe mode is on, we can't use some settings
+ } else {
+ curl_setopt($ch2, CURLOPT_FOLLOWLOCATION, TRUE );
+ curl_setopt($ch2, CURLOPT_AUTOREFERER, TRUE );
+ }
+ $response2 = curl_exec ( $ch2 );
+ $status2 = (int) curl_getinfo($ch2, CURLINFO_HTTP_CODE);
+ if ($response2 && ! curl_errno ( $ch2 ) && $status2 == 200) {
+ if (preg_match('/url\((.*?)\)/', $response2, $match) == 1) {
+ $thisfonturl = $match[1];
+ $errorinfo[] = "font retrieval url for {$thisfamily} = {$thisfonturl}";
+
+ // $ch3_headers = [];
+ $ch3 = curl_init($thisfonturl);
+ curl_setopt($ch3, CURLOPT_SSL_VERIFYPEER, TRUE);
+ curl_setopt($ch3, CURLOPT_SSL_VERIFYHOST, 2);
+ curl_setopt($ch3, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1_2 );
+ curl_setopt($ch3, CURLOPT_RETURNTRANSFER, TRUE );
+ curl_setopt($ch3, CURLOPT_INTERFACE, $_SERVER['SERVER_ADDR']);
+ //declaring acceptance of woff2 will make it possible to download the compressed version of the font with only the requested characters
+ //however it seems that the actual returned font will still be in ttf format, even though it is reduced to the requested characters
+ curl_setopt($ch3, CURLOPT_HTTPHEADER, array("Accept: font/woff2","Content-type: font/ttf"));
+ // curl_setopt($ch3, CURLOPT_HEADERFUNCTION, function($curl, $header) use (&$ch3_headers){
+ // $len = strlen($header);
+ // $header = explode(':', $header, 2);
+ // if (count($header) < 2) // ignore invalid headers
+ // return $len;
+ // $ch3_headers[strtolower(trim($header[0]))][] = trim($header[1]);
+ // return $len;
+ // }
+ // );
+ if (ini_get ( 'safe_mode' ) || ini_get ( 'open_basedir' )) {
+ // safe mode is on, we can't use some settings
+ } else {
+ curl_setopt($ch3, CURLOPT_FOLLOWLOCATION, TRUE );
+ curl_setopt($ch3, CURLOPT_AUTOREFERER, TRUE );
+ }
+ $response3 = curl_exec ( $ch3 );
+ // $errorinfo[] = print_r($ch3_headers,TRUE);
+ $status3 = (int) curl_getinfo($ch3, CURLINFO_HTTP_CODE);
+ if ($response3 && ! curl_errno ( $ch3 ) && $status3 == 200) {
+ if($wp_filesystem){
+ // if(!file_exists($plugin_path . "gfonts_preview/{$familyfilename}.{$fnttype}") ){
+ if(!$wp_filesystem->put_contents(
+ $gfontsDir."{$familyfilename}.{$fnttype}",
+ $response3,
+ FS_CHMOD_FILE
+ )){
+ $errorinfo[] = "Cannot write file ".$plugin_path . "gfonts_preview/{$familyfilename}.{$fnttype} with wordpress filesystem api, sorry";
+ }
+ else{
+ $gfont_stylesheet = preg_replace('/url\((.*?)\)/','url('.esc_url(plugins_url( "gfonts_preview/{$familyfilename}.{$fnttype}", __FILE__ )).')', $response2);
+ if(!file_exists($plugin_path . "css/gfonts_preview/{$familyfilename}.css") ){
+ if(!$wp_filesystem->put_contents(
+ $plugin_path . "css/gfonts_preview/{$familyfilename}.css",
+ $gfont_stylesheet,
+ FS_CHMOD_FILE
+ )){
+ $errorinfo[] = "Cannot write file ".$plugin_path . "css/gfonts_preview/{$familyfilename}.css with wordpress filesystem api, sorry";
+ }
+ }
+
+ }
+ // }
+ // else{
+ // $errorinfo[] = "File " . $plugin_path . "gfonts_preview/{$familyfilename}.{$fnttype} already exists, skipping...";
+ // }
+ }
+ }
+ else{
+ if(!$response3){
+ $errorinfo[] = "Response from curl request 3 is false for font-family {$thisfamily}";
+ }
+ if(curl_errno($ch3)){
+ $errorinfo[] = "Error on curl request 3 for font-family {$thisfamily}: " . curl_error($ch);
+ }
+ if($status3 != 200){
+ $errorinfo[] = "Status on curl request 3 for font-family {$thisfamily}: " . $status;
+ }
+ }
+
+ }
+ }
+ else{
+ if(!$response2){
+ $errorinfo[] = "Response from curl request 2 is false for font-family {$thisfamily}";
+ }
+ if(curl_errno($ch2)){
+ $errorinfo[] = "Error on curl request 2 for font-family {$thisfamily}: " . curl_error($ch);
+ }
+ if($status2 != 200){
+ $errorinfo[] = "Status on curl request 2 for font-family {$thisfamily}: " . $status;
+ }
+ }
+ }
+ else{
+ // if($idx >= $idxlimit){
+ // $errorinfo[] = "You have reached the established index limit";
+ // break;
+ // }
+ // else {
+ $errorinfo[] = "File ".$familyfilename.".{$fnttype} already exists";
+ // }
+ }
+ }
+
+ }
+
+
+ }
+ else{
+ $errorinfo[] = "Could not initialize wordpress filesystem with these credentials";
+ }
+ }
+ else{
+ $errorinfo[] = "You do not have direct access permissions to the wordpress filesystem";
+ }
+
+
+// echo print_r($errorinfo);
+ if(($startIdx + ($batchLimit-1)) < ($totalFonts-1) ){
+ $returnInfo->state = "RUN_PROCESSED";
+ $returnInfo->run = $currentRun;
+ }
+ else{
+ $returnInfo->state = "COMPLETE";
+
+ //LAST STEP IS TO MINIFY ALL OF THE CSS FILES INTO ONE SINGLE FILE
+ $cssdirectory = WP_PLUGIN_DIR."/bibleget-io/css/gfonts_preview";
+ if(!file_exists($cssdirectory."/gfonts_preview.css")){
+ $cssfiles = array_diff(scandir($cssdirectory), array('..', '.'));
+
+ $minifier = new MatthiasMullie\Minify\CSS($cssdirectory."/".(array_shift($cssfiles)));
+ while(count($cssfiles) > 0){
+ $minifier->add($cssdirectory."/".(array_shift($cssfiles)));
+ }
+ $minifier->minify($cssdirectory."/gfonts_preview.css");
+ }
+ }
+
+ if(count( $errorinfo) > 0){
+ $returnInfo->errorinfo = array();
+ $returnInfo->errorinfo = $errorinfo;
+ }
+ else{
+ $returnInfo->errorinfo = false;
+ }
+
+ echo json_encode($returnInfo);
+ wp_die();
}
-
- public function do_on_my_plugin_settings_save()
+
+
+ public function bibleget_plugin_settings_save()
{
//print("\n Page with hook ".$this->options_page_hook." was loaded and load hook was called.");
//exit;
@@ -350,7 +780,7 @@ public function do_on_my_plugin_settings_save()
if($this->options === false ){
// let's set some default options
}
-
+
}
}
@@ -367,9 +797,9 @@ class BibleGet_Customize {
public static $bibleget_style_settings;
private static $websafe_fonts;
-
+
public static function init(){
-
+
/* Define object that will contain all the information for all settings and controls */
self::$bibleget_style_settings = new stdClass();
@@ -377,17 +807,17 @@ public static function init(){
self::$bibleget_style_settings->bibleget_fontfamily = new stdClass();
self::$bibleget_style_settings->bibleget_fontfamily->dfault = 'Palatino Linotype';
self::$bibleget_style_settings->bibleget_fontfamily->title = __('Font Family for Biblical Quotes',"bibleget-io");
- self::$bibleget_style_settings->bibleget_fontfamily->type = 'fontselect';
+ self::$bibleget_style_settings->bibleget_fontfamily->type = 'fontselect';
self::$bibleget_style_settings->bibleget_fontfamily->section = 'bibleget_paragraph_style_options';
/* Define bibleget_borderwidth setting and control */
self::$bibleget_style_settings->bibleget_borderwidth = new stdClass();
- self::$bibleget_style_settings->bibleget_borderwidth->dfault = '2';
+ self::$bibleget_style_settings->bibleget_borderwidth->dfault = '2';
/* translators: "px" refers to pixels as used in CSS rules, do not translate */
self::$bibleget_style_settings->bibleget_borderwidth->title = __('Border-width for Biblical Quotes (in px)',"bibleget-io");
self::$bibleget_style_settings->bibleget_borderwidth->type = 'number';
self::$bibleget_style_settings->bibleget_borderwidth->section = 'bibleget_paragraph_style_options';
-
+
/* Define bibleget_borderstyle setting and control */
self::$bibleget_style_settings->bibleget_borderstyle = new stdClass();
self::$bibleget_style_settings->bibleget_borderstyle->dfault = 'solid';
@@ -408,23 +838,23 @@ public static function init(){
"inherit" => "inherit"
);
self::$bibleget_style_settings->bibleget_borderstyle->section = 'bibleget_paragraph_style_options';
-
-
+
+
/* Define bibleget_bordercolor setting and control */
self::$bibleget_style_settings->bibleget_bordercolor = new stdClass();
self::$bibleget_style_settings->bibleget_bordercolor->dfault = '#d3d3d3';
self::$bibleget_style_settings->bibleget_bordercolor->title = __('Border-color for Biblical Quotes',"bibleget-io");
self::$bibleget_style_settings->bibleget_bordercolor->type = 'color';
self::$bibleget_style_settings->bibleget_bordercolor->section = 'bibleget_paragraph_style_options';
-
-
+
+
/* Define bibleget_bgcolor setting and control */
self::$bibleget_style_settings->bibleget_bgcolor = new stdClass();
self::$bibleget_style_settings->bibleget_bgcolor->dfault = '#ffffff';
self::$bibleget_style_settings->bibleget_bgcolor->title = __('Background color for Biblical Quotes',"bibleget-io");
self::$bibleget_style_settings->bibleget_bgcolor->type = 'color';
self::$bibleget_style_settings->bibleget_bgcolor->section = 'bibleget_paragraph_style_options';
-
+
/* Define bibleget_borderradius setting and control */
self::$bibleget_style_settings->bibleget_borderradius = new stdClass();
@@ -433,8 +863,8 @@ public static function init(){
self::$bibleget_style_settings->bibleget_borderradius->title = __('Border-radius for Biblical Quotes (in px)',"bibleget-io");
self::$bibleget_style_settings->bibleget_borderradius->type = 'number';
self::$bibleget_style_settings->bibleget_borderradius->section = 'bibleget_paragraph_style_options';
-
-
+
+
$margin_padding_vals = array(
"auto" => "auto",
0 => "0",
@@ -452,10 +882,10 @@ public static function init(){
14 => "14",
16 => "16",
18 => "18",
- 20 => "20"
+ 20 => "20"
);
-
+
/* Define bibleget_margintopbottom setting and control */
self::$bibleget_style_settings->bibleget_margintopbottom = new stdClass();
self::$bibleget_style_settings->bibleget_margintopbottom->dfault = 12;
@@ -464,8 +894,8 @@ public static function init(){
self::$bibleget_style_settings->bibleget_margintopbottom->type = 'select';
self::$bibleget_style_settings->bibleget_margintopbottom->choices = $margin_padding_vals;
self::$bibleget_style_settings->bibleget_margintopbottom->section = 'bibleget_paragraph_style_options';
-
-
+
+
/* Define bibleget_marginleftright setting and control */
self::$bibleget_style_settings->bibleget_marginleftright = new stdClass();
self::$bibleget_style_settings->bibleget_marginleftright->dfault = 'auto';
@@ -475,7 +905,7 @@ public static function init(){
self::$bibleget_style_settings->bibleget_marginleftright->choices = $margin_padding_vals;
self::$bibleget_style_settings->bibleget_marginleftright->section = 'bibleget_paragraph_style_options';
-
+
/* Define bibleget_paddingtopbottom setting and control */
self::$bibleget_style_settings->bibleget_paddingtopbottom = new stdClass();
self::$bibleget_style_settings->bibleget_paddingtopbottom->dfault = 12;
@@ -485,7 +915,7 @@ public static function init(){
self::$bibleget_style_settings->bibleget_paddingtopbottom->choices = $margin_padding_vals;
self::$bibleget_style_settings->bibleget_paddingtopbottom->section = 'bibleget_paragraph_style_options';
-
+
/* Define bibleget_paddingleftright setting and control */
self::$bibleget_style_settings->bibleget_paddingleftright = new stdClass();
self::$bibleget_style_settings->bibleget_paddingleftright->dfault = 12;
@@ -494,7 +924,7 @@ public static function init(){
self::$bibleget_style_settings->bibleget_paddingleftright->type = 'select';
self::$bibleget_style_settings->bibleget_paddingleftright->choices = $margin_padding_vals;
self::$bibleget_style_settings->bibleget_paddingleftright->section = 'bibleget_paragraph_style_options';
-
+
/* Define bibleget_width setting and control */
self::$bibleget_style_settings->bibleget_width = new stdClass();
@@ -502,9 +932,9 @@ public static function init(){
/* translators: "%" refers to percentage as used in CSS rules (width: 100%), do not translate */
self::$bibleget_style_settings->bibleget_width->title = __('Width for Biblical Quotes (in %)',"bibleget-io");
self::$bibleget_style_settings->bibleget_width->type = 'number';
- self::$bibleget_style_settings->bibleget_width->section = 'bibleget_paragraph_style_options';
-
-
+ self::$bibleget_style_settings->bibleget_width->section = 'bibleget_paragraph_style_options';
+
+
/* Define bibleget_textalign setting and control */
self::$bibleget_style_settings->bibleget_textalign = new stdClass();
self::$bibleget_style_settings->bibleget_textalign->dfault = 'justify';
@@ -512,23 +942,23 @@ public static function init(){
self::$bibleget_style_settings->bibleget_textalign->type = 'select';
self::$bibleget_style_settings->bibleget_textalign->choices = array('left' => 'left','right'=>'right','center'=>'center','justify'=>'justify','inherit'=>'inherit','start'=>'start','end'=>'end');
self::$bibleget_style_settings->bibleget_textalign->section = 'bibleget_paragraph_style_options';
-
-
-
+
+
+
$bibleget_styles_general = new stdClass();
$bibleget_styles_general->font_size = new stdClass();
$bibleget_styles_general->font_style = new stdClass();
$bibleget_styles_general->font_color = new stdClass();
-
+
/* translators: "pt" refers to points as used in CSS rules, do not translate */
$bibleget_styles_general->font_size->title = __("Font Size (in pt)","bibleget-io");
$bibleget_styles_general->font_style->title = __("Font Style","bibleget-io");
$bibleget_styles_general->font_color->title = __("Font Color","bibleget-io");
-
+
$bibleget_styles_general->font_size->type = 'select';
$bibleget_styles_general->font_style->type = 'style';
$bibleget_styles_general->font_color->type = 'color';
-
+
$bibleget_style_sizes_arr = array(4=>'4',5=>'5',6=>'6',7=>'7',8=>'8',9=>'9',10=>'10',11=>'11',12=>'12',14=>'14',16=>'16',18=>'18',20=>'20',22=>'22',24=>'24',26=>'26',28=>'28');
$bibleget_style_choices_arr = array(
'bold' => __("B","bibleget-io"),
@@ -538,7 +968,7 @@ public static function init(){
'superscript' => __("SUP","bibleget-io"),
'subscript' => __("SUB","bibleget-io")
);
-
+
foreach($bibleget_styles_general as $i => $styleobj){
$o = str_replace("_","",$i);
@@ -553,7 +983,7 @@ public static function init(){
elseif($styleobj->type == 'style'){
self::$bibleget_style_settings->{'version_'.$o}->choices = $bibleget_style_choices_arr;
}
-
+
self::$bibleget_style_settings->{'bookchapter_'.$o} = new stdClass();
self::$bibleget_style_settings->{'bookchapter_'.$o}->section = 'bibleget_bookchapter_style_options';
/* translators: in reference to Font Size, Style and Color */
@@ -565,7 +995,7 @@ public static function init(){
elseif($styleobj->type == 'style'){
self::$bibleget_style_settings->{'bookchapter_'.$o}->choices = $bibleget_style_choices_arr;
}
-
+
self::$bibleget_style_settings->{'versenumber_'.$o} = new stdClass();
self::$bibleget_style_settings->{'versenumber_'.$o}->section = 'bibleget_versenumber_style_options';
/* translators: in reference to Font Size, Style and Color */
@@ -577,7 +1007,7 @@ public static function init(){
elseif($styleobj->type == 'style'){
self::$bibleget_style_settings->{'versenumber_'.$o}->choices = $bibleget_style_choices_arr;
}
-
+
self::$bibleget_style_settings->{'versetext_'.$o} = new stdClass();
self::$bibleget_style_settings->{'versetext_'.$o}->section = 'bibleget_versetext_style_options';
/* translators: in reference to Font Size, Style and Color */
@@ -598,22 +1028,22 @@ public static function init(){
self::$bibleget_style_settings->bookchapter_fontsize->dfault = 14;
self::$bibleget_style_settings->bookchapter_fontstyle->dfault = 'bold';
self::$bibleget_style_settings->bookchapter_fontcolor->dfault = '#284f29';
-
+
self::$bibleget_style_settings->versenumber_fontsize->dfault = 7;
self::$bibleget_style_settings->versenumber_fontstyle->dfault = 'superscript';
self::$bibleget_style_settings->versenumber_fontcolor->dfault = '#c10005';
-
+
self::$bibleget_style_settings->versetext_fontsize->dfault = 10;
self::$bibleget_style_settings->versetext_fontstyle->dfault = '';
self::$bibleget_style_settings->versetext_fontcolor->dfault = '#646d73';
-
+
self::$bibleget_style_settings->linespacing_verses = new stdClass();
self::$bibleget_style_settings->linespacing_verses->dfault = 150;
self::$bibleget_style_settings->linespacing_verses->title = __('Line-spacing for Verses Paragraphs',"bibleget-io");
self::$bibleget_style_settings->linespacing_verses->type = 'select';
self::$bibleget_style_settings->linespacing_verses->choices = array(100 => 'single',150 => '1½',200 => 'double');
self::$bibleget_style_settings->linespacing_verses->section = 'bibleget_paragraph_style_options';
-
+
self::$websafe_fonts = array(
array("font-family" => "Arial", "fallback" => "Helvetica", "generic-family" => "sans-serif"),
array("font-family" => "Arial Black", "fallback" => "Gadget", "generic-family" => "sans-serif"),
@@ -651,12 +1081,12 @@ public static function get_font_index($fontfamily){
* @since BibleGet I/O 3.6
*/
public static function register ( $wp_customize ) {
-
+
self::init();
-
+
require_once 'custom_controls.php';
-
- $wp_customize->add_panel('bibleget_style_options',
+
+ $wp_customize->add_panel('bibleget_style_options',
array(
'priority' => 35,
'capability' => 'edit_theme_options',
@@ -665,7 +1095,7 @@ public static function register ( $wp_customize ) {
'description' => __( 'Custom styles that apply to the text formatting of the biblical quotes', 'bibleget-io' )
)
);
-
+
$wp_customize->add_section( 'bibleget_paragraph_style_options',
array(
'priority' => 10, //Determines what order this appears in
@@ -676,7 +1106,7 @@ public static function register ( $wp_customize ) {
'panel' => 'bibleget_style_options'
)
);
-
+
$wp_customize->add_section( 'bibleget_bibleversion_style_options',
array(
'priority' => 20, //Determines what order this appears in
@@ -687,7 +1117,7 @@ public static function register ( $wp_customize ) {
'panel' => 'bibleget_style_options'
)
);
-
+
$wp_customize->add_section( 'bibleget_bookchapter_style_options',
array(
'priority' => 30, //Determines what order this appears in
@@ -709,7 +1139,7 @@ public static function register ( $wp_customize ) {
'panel' => 'bibleget_style_options'
)
);
-
+
$wp_customize->add_section( 'bibleget_versetext_style_options',
array(
'priority' => 50, //Determines what order this appears in
@@ -720,10 +1150,10 @@ public static function register ( $wp_customize ) {
'panel' => 'bibleget_style_options'
)
);
-
+
$bibleget_style_settings_cc = 0;
foreach(self::$bibleget_style_settings as $style_setting => $style_setting_obj){
-
+
//2. Register new settings to the WP database...
$wp_customize->add_setting( $style_setting, //No need to use a SERIALIZED name, as `theme_mod` settings already live under one db record
array(
@@ -732,8 +1162,8 @@ public static function register ( $wp_customize ) {
'capability' => 'edit_theme_options', //Optional. Special permissions for accessing this setting.
'transport' => 'postMessage' //What triggers a refresh of the setting? 'refresh' or 'postMessage' (instant)?
)
- );
-
+ );
+
//3. Finally, we define the control itself (which links a setting to a section and renders the HTML controls)...
if($style_setting_obj->type == 'color'){
$wp_customize->add_control( new WP_Customize_Color_Control( //Instantiate the color control class
@@ -746,7 +1176,7 @@ public static function register ( $wp_customize ) {
'section' => $style_setting_obj->section //ID of the section this control should render in (can be one of yours, or a WordPress default section)
)
)
- );
+ );
}
elseif($style_setting_obj->type == 'select'){
$wp_customize->add_control($style_setting . '_ctl',
@@ -795,14 +1225,14 @@ public static function register ( $wp_customize ) {
'settings' => $style_setting,
'priority' => $bibleget_style_settings_cc++,
'section' => $style_setting_obj->section,
- 'type' => 'number'
+ 'type' => 'number'
)
);
}
}
-
-
+
+
}
@@ -817,10 +1247,11 @@ public static function register ( $wp_customize ) {
public static function header_output() {
self::init();
?>
-
+
bibleget_fontfamily->dfault);
- if( ! empty( $mod ) ) {
+ //echo '';
+ if( ! empty( $mod ) ) {
//let's check if it's a websafe font or a google font
if(self::get_font_index($mod) === false){
//not a websafe font, so most probably a google font...
@@ -828,11 +1259,11 @@ public static function header_output() {
$is_googlefont = true;
echo '';
}
-
+
}
?>
+
'postMessage' instead of the default 'transport'
* => 'refresh'
- *
+ *
* Used by hook: 'customize_preview_init'
- *
+ *
* @see add_action('customize_preview_init',$func)
* @since BibleGet I/O 3.6
*/
public static function live_preview() {
- wp_enqueue_script(
+ wp_enqueue_script(
'bibleget-pluginstylecustomizer', // Give the script a unique ID
plugins_url( 'js/theme-customizer.js', __FILE__ ), // Define the path to the JS file
array( 'jquery', 'customize-preview' ), // Define dependencies
- '', // Define a version (optional)
+ '', // Define a version (optional)
true // Specify whether to put in footer (leave this true)
);
}
@@ -1048,7 +1479,7 @@ public static function live_preview() {
/**
* This will generate a line of CSS for use in header output. If the setting
* ($mod_name) has no defined value, the CSS will not be output.
- *
+ *
* @uses get_theme_mod()
* @param string $selector CSS selector
* @param string $style The name of the CSS *property* to modify
diff --git a/readme.txt b/readme.txt
index 27b786a..014f4dc 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,8 +3,8 @@ Contributors: Lwangaman
Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=HDS7XQKGFHJ58
Tags: bible,shortcode,quote,citation,verses
Requires at least: 3.3
-Tested up to: 4.9
-Stable tag: 4.9
+Tested up to: 5.3.2
+Stable tag: 5.0
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -71,6 +71,33 @@ At least the first query (of a series of queries chained by a semi-colon) must i
When a query following a semi-colon does not indicate the book name, it is intended that the request be made upon the same book as the previous query.
So “Gen1:7-9;4:4-5;Ex3:19” means “Genesis chapter 1, verses 7 to 9; then again Genesis chapter 4, verses 4 to 5; then Exodus chapter 3, verse 19”.
+= What happens if I add a Google Fonts API key? =
+[ENGLISH]
+If you add a Google Fonts API key, the BibleGet plugin will immediately test it's validity.
+If valid, it will remember that you have a key and that it's valid for 3 months.
+Every three months starting from this moment the BibleGet plugin will talk with the Google Fonts API
+to get the latest list of available Google Fonts, and will download to the plugin folders a local compressed
+copy of each of those fonts for the purpose of previewing them in the customizer interface.
+You will need to be a bit patient the first time as it will take a couple minutes to complete the download process.
+A progress bar will let you know how the download is progressing. If you have a slow connection,
+the progress might stall for a few seconds every now an then (around 25%, 50%, and 75%),
+just be patient and it should continue to progress to the end. In the future, whenever the plugin
+talks with the Google Fonts API, the process should go a lot faster as it will only need to download new fonts.
+It will also generate a css file that will load the preview of the fonts when you open the customizer interface.
+This does have a bit of a performance impact, and especially the first time you open the customizer it might take a minute to load.
+After this it should go a little faster as the fonts previews should be cached by the browser.
+If you are not happy with the performance impact, I would suggest to delete the Google Fonts API key.
+
+= I have added the Google Fonts API key but the list of available fonts isn't updated =
+[ENGLISH]
+The BibleGet plugin will remember that your key is valid for 3 months.
+This means that it will not fetch the list of fonts from the Google Fonts API until the relative transient expires.
+If a new font has come out that you would like to see and use in the customizer interface for the BibleGet plugin,
+and you don't want to have to wait until the transient expires in that 3 month time slot, then you could use a transient manager
+to look for a transient which has a value of "SUCCESS" and a long key of seemingly random characters;
+this is most probably the one you need to delete. Once the transient is deleted, go back to the admin interface for the BibleGet plugin
+and it will automatically start talking with the Google Fonts API again. The newer fonts previews should be downloaded locally
+and become available in the customizer interface for the BibleGet plugin.
== Screenshots ==
@@ -81,6 +108,10 @@ At least the first query (of a series of queries chained by a semi-colon) must i
== Changelog ==
+= 5.0 =
+* verified compatibility with Wordpress 5.3.2
+* added option for Google Fonts API key
+
= 4.9 =
* Bugfix: corrected evaluation of shortcode parameters for correct implementation of versions and popup functionality
* verified compatibility with Wordpress 4.9
@@ -223,8 +254,11 @@ At least the first query (of a series of queries chained by a semi-colon) must i
== Upgrade Notice ==
+= 5.0 =
+Versions prior to 3.6 must be updated. v5.0 verifies compatibility with Wordpress 5.3.2 and adds Google Fonts API option
+
= 4.9 =
-Versions prior to 3.6 must be updated. v4.9 corrects evaluation of shortcode paramters for correct implementation of "popup" parameter functionality
+Versions prior to 3.6 must be updated. v4.9 corrects evaluation of shortcode parameters for correct implementation of "popup" parameter functionality
= 4.8 =
Versions prior to 3.6 must be updated. v4.8 adds a parameter "popup" to the [bibleget] shortcode, to allow hiding the contents of the bible quote and show it only on click in a popup