WordPress.org
Get WordPress

Plugin Directory

Changeset 1729199


Ignore:
Timestamp:
09/13/2017 10:16:38 AM (9 years ago)
Author:
Device Push
Message:

Resolve bugs curl query via php

Location:
device-push/trunk
Files:
3 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • device-push/trunk/index.php

    r1728023 r1729199  
    55Author: Device Push
    66Author URI: https://www.devicepush.com
    7 Version: 1.9
     7Version: 2.0
    88*/
    99
    … …  
    1616//This class creates ,removes or returns a cookie depending on the first parameter you give it.
    1717class devicePush{
    18     function setCookies($key){
     18    function getCookies($key){
    1919        if(!isset($_COOKIE[$key])) {
    20         echo "";
     20        return "";
    2121    } else {
    22         echo $_COOKIE[$key];
     22        return $_COOKIE[$key];
    2323    }
    2424    }
    25     function getCookies($key, $value){
     25    function setCookies($key, $value){
    2626        if ($value != null || $value != '') {
    2727        setcookie($key, $value, time() + 86400000);
    … …  
    178178
    179179if (
    180     get_option('devicepush_key') != FALSE                   ||
    181     get_option('devicepush_app_name') != FALSE          ||
    182     get_option('devicepush_key') != ''                          ||
    183     get_option('devicepush_app_name') != ''
     180    get_option('devicepush_key') != FALSE                   &&
     181    get_option('devicepush_key') != ''
    184182){
    185183    add_action('wp_enqueue_scripts', 'include_manifest');
    … …  
    541539    register_setting('dp-popup-group', 'dp_option_text_active_popup');
    542540    register_setting('dp-popup-group', 'dp_option_background_active_popup');
    543 
    544     if(
    545         esc_attr( get_option('dp_option_iduser') )              &&
    546         esc_attr( get_option('dp_option_idaplication') )
    547     ){
    548     $context = stream_context_create(array(
    549       'http' => array( 'method' => 'GET', 'header' => 'token: '.get_option('dp_option_iduser'), 'timeout' => 10 ),
    550         'ssl' => array( 'verify_peer' => false )
    551         ));
    552     $url = 'https://apiweb.devicepush.com:8081/1.0/'.get_option('dp_option_idaplication');
    553     $result = file_get_contents($url, false, $context);
    554     if($result){
    555       $json = json_decode($result, true);
    556       delete_option('devicepush_app_name');
    557       delete_option('devicepush_fcm');
    558       delete_option('devicepush_key');
    559       delete_option('devicepush_websitepushid');
    560       delete_option('devicepush_websiteurl');
    561       if($json['name'] != undefined){
    562         if(get_option('devicepush_app_name')){ update_option( 'devicepush_app_name', $json['name']); }else{ add_option( 'devicepush_app_name', $json['name']); }
    563       }
    564       if($json['fcmsenderid'] != undefined){
    565         if(get_option('devicepush_fcm')){ update_option( 'devicepush_fcm', $json['fcmsenderid']); }else{ add_option( 'devicepush_fcm', $json['fcmsenderid']); }
    566       }
    567       if($json['key'] != undefined){
    568         if(get_option('devicepush_key')){update_option( 'devicepush_key', $json['key']);} else{ add_option( 'devicepush_key', $json['key']); }
    569       }
    570       if($json['websitepushid'] != undefined){
    571         if(get_option('devicepush_websitepushid')){ update_option( 'devicepush_websitepushid', $json['websitepushid']); }else{ add_option( 'devicepush_websitepushid', $json['websitepushid']); }
    572       }
    573       if($json['websiteurl'] != undefined){
    574         if(get_option('devicepush_websiteurl')){ update_option( 'devicepush_websiteurl', $json['websiteurl']); }else{ add_option( 'devicepush_websiteurl', $json['websiteurl']); }
    575       }
    576     }
    577   }
     541    delete_option('devicepush_app_name');
     542  delete_option('devicepush_fcm');
     543  delete_option('devicepush_key');
     544  delete_option('devicepush_websitepushid');
     545  delete_option('devicepush_websiteurl');
     546    $devicePush = new devicePush();
     547    if($devicePush->getCookies('devicepush_app_name')){
     548        if(get_option('devicepush_app_name')){ update_option( 'devicepush_app_name', $devicePush->getCookies('devicepush_app_name')); }else{ add_option( 'devicepush_app_name', $devicePush->getCookies('devicepush_app_name')); }
     549        $devicePush->removeCookies('devicepush_app_name');
     550    }
     551    if($devicePush->getCookies('devicepush_fcm')){
     552        if(get_option('devicepush_fcm')){ update_option( 'devicepush_fcm', $devicePush->getCookies('devicepush_fcm')); }else{ add_option( 'devicepush_fcm', $devicePush->getCookies('devicepush_fcm')); }
     553        $devicePush->removeCookies('devicepush_fcm');
     554    }
     555    if($devicePush->getCookies('devicepush_key')){
     556        if(get_option('devicepush_key')){ update_option( 'devicepush_key', $devicePush->getCookies('devicepush_key')); }else{ add_option( 'devicepush_key', $devicePush->getCookies('devicepush_key')); }
     557        $devicePush->removeCookies('devicepush_key');
     558    }
     559    if($devicePush->getCookies('devicepush_websitepushid')){
     560        if(get_option('devicepush_websitepushid')){ update_option( 'devicepush_websitepushid', $devicePush->getCookies('devicepush_websitepushid')); }else{ add_option( 'devicepush_websitepushid', $devicePush->getCookies('devicepush_websitepushid')); }
     561        $devicePush->removeCookies('devicepush_websitepushid');
     562    }
     563    if($devicePush->getCookies('devicepush_websiteurl')){
     564        if(get_option('devicepush_websiteurl')){ update_option( 'devicepush_websiteurl', $devicePush->getCookies('devicepush_websiteurl')); }else{ add_option( 'devicepush_websiteurl', $devicePush->getCookies('devicepush_websiteurl')); }
     565        $devicePush->removeCookies('devicepush_websiteurl');
     566    }
    578567}
    579568add_action('admin_init', 'register_devicepush');

  • device-push/trunk/js/settings.js

    r1728023 r1729199  
    11var numberMaxCaracters = 200;
    22var iframes = '';
     3
     4var devicePush = {
     5    getCookies: function(key){
     6        var cookieSplit = document.cookie.split(';');
     7        for(var i = 0; i < cookieSplit.length; i ++ ){
     8                if(cookieSplit[i].split('=')[0].trim() === key ){
     9                        return cookieSplit[i].split('=')[1].trim();
     10                }
     11        }
     12        return '';
     13    },
     14    setCookies: function(key, value){
     15            var date = new Date();
     16            date.setTime(date.getTime() + (10000*24*60*60*1000));
     17            document.cookie = key + '=' + value + ';expires=' + date.toUTCString() + ';path=/';
     18            return 'changed';
     19    },
     20    removeCookies: function(key){
     21            var value = devicePush.getCookies(key);
     22            if(value !== ''){
     23                    document.cookie = key + '=' + value + ';expires=Thu, 01 Jan 1970 00:00:00 UTC;path=/';
     24                    return 'removed';
     25            }
     26    }
     27}
     28
    329function showTab(tab){
    430    document.getElementById('tab_configure').classList.remove('active');
    … …  
    129155            resultCheckDataUser.innerHTML = 'Your User ID or your App/Web ID are incorrect.';
    130156        }else if(JSON.parse(xmlhttpReg.responseText).key){
     157                    var result = JSON.parse(xmlhttpReg.responseText);
     158                    if(result.name){ devicePush.setCookies('devicepush_app_name', result.name); }
     159                    if(result.fcmsenderid){ devicePush.setCookies('devicepush_fcm', result.fcmsenderid); }
     160                    if(result.key){ devicePush.setCookies('devicepush_key', result.key); }
     161                    if(result.websitepushid){ devicePush.setCookies('devicepush_websitepushid', result.websitepushid); }
     162                    if(result.websiteurl){ devicePush.setCookies('devicepush_websiteurl', result.websiteurl); }
    131163            resultCheckDataUser.classList.remove('red');
    132164            resultCheckDataUser.classList.add('green');

  • device-push/trunk/readme.txt

    r1728023 r1729199  
    33Tags: device push, devicepush, notification, push, chrome, safari, firefox, opera, cordova, phonegap, ios, android, notification, marketing
    44Requires at least: 3.0.1
    5 Stable tag: 1.9
     5Stable tag: 2.0
    66License: GPLv2 or later
    77License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    5555== Changelog ==
    5656
     57= 2.0 =
     58* Migrate to cookies.
     59
     60= 1.9 =
     61* Resolve bugs.
     62
    5763= 1.8 =
    5864* Resolve bugs.
Note: See TracChangeset for help on using the changeset viewer.