Skip to content

Commit

Permalink
Merge pull request #627 from ahmedkaludi/1.7.33-development
Browse files Browse the repository at this point in the history 
1.7.33 development
  • Loading branch information
@ajeetku
ajeetku authored Jun 25, 2021
2 parents 1094112 + 2e24fd5 commit ed95273
Show file tree
Hide file tree
Showing 14 changed files with 242 additions and 70 deletions.
12 changes: 12 additions & 0 deletions admin/class-pwaforwp-plugin-usage-tracker.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,12 @@ public function set_admin_email( $email=null, $plugin=null ) {
* @since 1.0.0
*/
public function optin_notice() {
global $pagenow, $pwaforwp_globe_admin_notice;
if($pwaforwp_globe_admin_notice!=false){ return; }
$pwaforwp_globe_admin_notice = true;
if($pagenow!='admin.php' || !isset($_GET['page']) || (isset($_GET['page']) && $_GET['page']!='pwaforwp') ) {
return false;
}
// Check for plugin args
if( isset( $_GET['plugin'] ) && isset( $_GET['plugin_action'] ) ) {
$plugin = sanitize_text_field( $_GET['plugin'] );
Expand Down Expand Up @@ -719,6 +725,12 @@ public function optin_notice() {
* @since 1.0.0
*/
public function marketing_notice() {
global $pagenow,$pwaforwp_globe_admin_notice;
if($pwaforwp_globe_admin_notice!=false){ return;}
$pwaforwp_globe_admin_notice = true;
if($pagenow=='admin.php' && isset($_GET['page']) && $_GET['page']!='pwaforwp'){
return ;
}
// Check if user has opted in to marketing
if( isset( $_GET['marketing_optin'] ) ) {
// Set marketing optin
Expand Down
2 changes: 1 addition & 1 deletion admin/common-function.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ function pwaforwp_manifest_json_url($is_amp=false){
$fileCheck = file_exists($wppath .'pwa-amp-manifest'.$multisite_postfix.'.json');
}
}
if($fileCheck){
if($fileCheck && !$multisite_postfix){
$restApiEnabled = 400;
}else{
$restApiEnabled = get_transient( 'pwaforwp_restapi_check' );
Expand Down
89 changes: 86 additions & 3 deletions admin/settings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -702,6 +702,28 @@ function pwaforwp_list_addons(){
'p-desc' => 'Buddypress extension to send push notification while core notification will work ex: A member mentions you in an update / A member replies to an update or comments your post',
'p-tab' => false
),
'qafp' => array(
'p-slug' => 'quick-action-for-pwa/quick-action-for-pwa.php',
'p-name' => 'Quick Action for PWA',
'p-short-prefix'=> 'QAFP',
'p-title' => 'Quick Action for PWA',
'p-url' => 'https://pwa-for-wp.com/extensions/quick-action-for-pwa/',
'p-icon-img' => PWAFORWP_PLUGIN_URL.'images/quick-action-for-pwa.png',
'p-background-color'=> '#bbcff0',
'p-desc' => esc_html__('Quick action help users give shortcut link, common or recommended pages with in your web app', 'pwa-for-wp'),
'p-tab' => false
),
'nbfp' => array(
'p-slug' => 'navigation-bar-for-pwa/navigation-bar-for-pwa.php',
'p-name' => 'Navigation Bar for PWA',
'p-short-prefix'=> 'NBFP',
'p-title' => 'Navigation Bar for PWA',
'p-url' => 'https://pwa-for-wp.com/extensions/navigation-bar-for-pwa/',
'p-icon-img' => PWAFORWP_PLUGIN_URL.'images/navigation-bar-for-pwa.png',
'p-background-color'=> '#3872a2',
'p-desc' => esc_html__('Top-level pages that need to be accessible from anywhere in the app', 'pwa-for-wp'),
'p-tab' => false
),
);
return $add_on_list;
}
Expand Down Expand Up @@ -2517,6 +2539,30 @@ function pwaforwp_features_settings(){
'tooltip_option'=> 'Support buddypress push notification with PWA and push notification',
'tooltip_link' => 'https://pwa-for-wp.com/docs/article/how-to-use-buddypress-for-pwaforwp/'
),
'quickaction' => array(
'enable_field' => 'quick_action',
'section_name' => 'pwaforwp_quick_action_setting_section',
'setting_title' => esc_html__('Quick Action', 'pwa-for-wp'),
'is_premium' => true,
'pro_link' => $addonLists['qafp']['p-url'],
'pro_active' => (is_plugin_active($addonLists['qafp']['p-slug'])? 1: 0),
'pro_deactive' => (!is_plugin_active($addonLists['qafp']['p-slug']) && file_exists(PWAFORWP_PLUGIN_DIR."/../".$addonLists['qafp']['p-slug'])? 1: 0),
'slug' => 'qafp',
'tooltip_option' => esc_html__('Quick action help users give shortcut link, common or recommended pages with in your web app', 'pwa-for-wp'),
'tooltip_link' => 'https://pwa-for-wp.com/docs/article/how-to-use-quick-action-for-pwa-for-wp/'
),
'navigationbar' => array(
'enable_field' => 'navigation_bar',
'section_name' => 'pwaforwp_navigation_bar_setting_section',
'setting_title' => esc_html__('Navigation Bar', 'pwa-for-wp'),
'is_premium' => true,
'pro_link' => $addonLists['nbfp']['p-url'],
'pro_active' => (is_plugin_active($addonLists['nbfp']['p-slug'])? 1: 0),
'pro_deactive' => (!is_plugin_active($addonLists['nbfp']['p-slug']) && file_exists(PWAFORWP_PLUGIN_DIR."/../".$addonLists['nbfp']['p-slug'])? 1: 0),
'slug' => 'nbfp',
'tooltip_option' => esc_html__('Top-level pages that need to be accessible from anywhere in the app', 'pwa-for-wp'),
'tooltip_link' => 'https://pwa-for-wp.com/docs/article/how-to-use-navigation-bar-for-pwa-addon/'
),
);

$featuresHtml = '';
Expand Down Expand Up @@ -2639,6 +2685,10 @@ function pwaforwp_update_features_options(){
echo json_encode(array('status'=> 502, 'message'=> 'Feature settings not have any fields.'));
die;
}
if ( ! current_user_can( 'manage_options' ) ) {
echo json_encode(array('status'=> 501, 'message'=> 'Unauthorized access, permission not allowed'));
die;
}
$allFields = $_POST['fields_data'];
$actualFields = array();
if(is_array($allFields)){
Expand All @@ -2647,7 +2697,12 @@ function pwaforwp_update_features_options(){
$variable = str_replace(array('pwaforwp_settings[', ']'), array('',''), $field['var_name']);
if(strpos($variable, '[')!==false){
$varArray = explode("[", $variable);
$actualFields[$varArray[0]][$varArray[1]] = preg_replace('/\\\\/', '', sanitize_textarea_field($field['var_value']));
$newArr = preg_replace('/\\\\/', '', sanitize_textarea_field($field['var_value']));
foreach (array_reverse($varArray) as $key) {
$newArr = [$key => $newArr];
}
$actualFields = pwaforwp_merge_recursive_ex($actualFields, $newArr);
//$actualFields[$varArray[0]][$varArray[1]] = preg_replace('/\\\\/', '', sanitize_textarea_field($field['var_value']));
}else{
$actualFields[$variable] = preg_replace('/\\\\/', '', sanitize_textarea_field($field['var_value']));
}
Expand Down Expand Up @@ -2816,18 +2871,23 @@ function pwaforwp_subscribe_newsletter(){

function pwaforwp_splashscreen_uploader(){
if ( ! isset( $_GET['pwaforwp_security_nonce'] ) ){
echo json_encode(array("status"=>500, "message"=> "Splash screen uploaded successfully"));
echo json_encode(array("status"=>500, "message"=> "Failed! Security check not active"));
die;
}
if ( !wp_verify_nonce( $_GET['pwaforwp_security_nonce'], 'pwaforwp_ajax_check_nonce' ) ){
echo json_encode(array("status"=>500, "message"=> "Splash screen uploaded successfully"));
echo json_encode(array("status"=>500, "message"=> "Failed! Security check"));
die;
}
if( !current_user_can('manage_options') ){
echo json_encode(array("status"=>401, "message"=> "Failed! you are not autherized to save"));
die;
}
$pwaforwp_settings = pwaforwp_defaultSettings();

$upload = wp_upload_dir();
$path = $upload['basedir']."/pwa-splash-screen/";
wp_mkdir_p($path);
file_put_contents($path.'/index.html','');
$zipfilename = $path."file.zip";
$input = fopen('php://input', 'rb');
$file = fopen($zipfilename, 'wb');
Expand Down Expand Up @@ -2921,4 +2981,27 @@ function pwaforwp_loading_icon_styles(){
@-webkit-keyframes spin {0% { -webkit-transform: rotate(0deg); }100% { -webkit-transform: rotate(360deg); }}
@keyframes spin {0% { transform: rotate(0deg); }100% { transform: rotate(360deg); }}
</style>';
}

/**
* pwaforwp_merge_recursive_ex merge any multidimensional Array
* @param Array1(array) Array2(array)
*/
function pwaforwp_merge_recursive_ex(array $array1, array $array2)
{
$merged = $array1;

foreach ($array2 as $key => & $value) {
if (is_array($value) && isset($merged[$key]) && is_array($merged[$key])) {
$merged[$key] = pwaforwp_merge_recursive_ex($merged[$key], $value);
} else if (is_numeric($key)) {
if (!in_array($value, $merged)) {
$merged[] = $value;
}
} else {
$merged[$key] = $value;
}
}

return $merged;
}
22 changes: 15 additions & 7 deletions assets/css/main-css.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ select {
display: inline!important;
margin-left: 0;
color: #d8d8d8!important;
cursor:pointer;
cursor: pointer;
}

.pwaforwp-wrap .pwafw-tooltip:hover {
Expand Down Expand Up @@ -528,7 +528,7 @@ select {
padding: 0;
top: -1px;
position: relative;
cursor:pointer
cursor: pointer;
}

.pwaforwp-tlt-sw .card-action-settings span {
Expand Down Expand Up @@ -741,14 +741,14 @@ input:checked+.slider:before {
left: 0;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.7);
background-color: rgba(0, 0, 0, .7);
display: table;
transition: opacity .3s ease;
transition: opacity .3s ease
}

.pwawp-modal-wrapper {
display: table-cell;
vertical-align: middle;
vertical-align: middle
}

.pwawp-modal-header {
Expand All @@ -757,7 +757,7 @@ input:checked+.slider:before {
z-index: 100;
border-bottom: 1px solid #d8d8d8;
position: relative;
padding-left: 20px;
padding-left: 20px
}

.pwawp-modal-container {
Expand All @@ -784,7 +784,7 @@ input:checked+.slider:before {
margin-bottom: 0;
font-weight: 600;
position: relative;
left: 15px;
left: 15px
}

.pwawp-modal-mask .pwawp-modal-body {
Expand Down Expand Up @@ -953,4 +953,12 @@ input:checked+.slider:before {

.ios-splash-images .active:after {
content: "\2796";
}

.pwaforwp-feedback-notice p {
display: inline-block;
}

.pwaforwp-feedback-notice .dashicons-thumbs-up {
padding-right: 5px;
}
22 changes: 15 additions & 7 deletions assets/css/main-css.min-rtl.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ select {
display: inline!important;
margin-right: 0;
color: #d8d8d8!important;
cursor:pointer;
cursor: pointer;
}

.pwaforwp-wrap .pwafw-tooltip:hover {
Expand Down Expand Up @@ -527,7 +527,7 @@ select {
padding: 0;
top: -1px;
position: relative;
cursor:pointer
cursor: pointer;
}

.pwaforwp-tlt-sw .card-action-settings span {
Expand Down Expand Up @@ -740,14 +740,14 @@ input:checked+.slider:before {
right: 0;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.7);
background-color: rgba(0, 0, 0, .7);
display: table;
transition: opacity .3s ease;
transition: opacity .3s ease
}

.pwawp-modal-wrapper {
display: table-cell;
vertical-align: middle;
vertical-align: middle
}

.pwawp-modal-header {
Expand All @@ -756,7 +756,7 @@ input:checked+.slider:before {
z-index: 100;
border-bottom: 1px solid #d8d8d8;
position: relative;
padding-right: 20px;
padding-right: 20px
}

.pwawp-modal-container {
Expand All @@ -783,7 +783,7 @@ input:checked+.slider:before {
margin-bottom: 0;
font-weight: 600;
position: relative;
right: 15px;
right: 15px
}

.pwawp-modal-mask .pwawp-modal-body {
Expand Down Expand Up @@ -952,4 +952,12 @@ input:checked+.slider:before {

.ios-splash-images .active:after {
content: "\2796";
}

.pwaforwp-feedback-notice p {
display: inline-block;
}

.pwaforwp-feedback-notice .dashicons-thumbs-up {
padding-left: 5px;
}
Loading

0 comments on commit ed95273

Please sign in to comment.