WordPress.org
Get WordPress

Plugin Directory

Changeset 2444600


Ignore:
Timestamp:
12/22/2020 09:05:06 PM (5 years ago)
Author:
ownerrez
Message:

Fix bug when hosted under a folder named /ownerrez

Location:
ownerrez/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • ownerrez/trunk/admin/class-ownerrez-admin.php

    r2439293 r2444600  
    6363    public function enqueue_styles()
    6464    {
    65         wp_enqueue_style($this->ownerrez, plugin_dir_url(__FILE__) . 'css/ownerrez-admin.css', array(), $this->version, 'all');
     65        wp_enqueue_style($this->ownerrez, plugins_url('/ownerrez/admin/css/ownerrez-admin.css'), array(), $this->version, 'all');
    6666    }
    6767
    … …  
    7373    public function enqueue_scripts()
    7474    {
    75         wp_enqueue_script($this->ownerrez, plugin_dir_url(__FILE__) . 'js/ownerrez-admin.js', array('jquery'), $this->version, false);
     75        wp_enqueue_script($this->ownerrez, plugins_url('/ownerrez/admin/js/ownerrez-admin.js'), array('jquery'), $this->version, false);
    7676    }
    7777

  • ownerrez/trunk/admin/partials/ownerrez-admin-display.php

    r2439293 r2444600  
    4646                <tr>
    4747                    <th scope="row">
    48                         <label for="ownerrez_apiRoot"><?php _e("API Root Url:", "ownerrez"); ?></label>
    49                     </th>
    50                     <td>
    51                         <input id="ownerrez_apiRoot" class="regular-text" type="text" name="ownerrez_apiRoot" value="<?php echo $apiRoot; ?>" />
    52                     </td>
    53                 </tr>
    54                 <tr>
    55                     <th scope="row">
    5648                        <label for="ownerrez_username"><?php _e("OwnerRez Username (email):", "ownerrez"); ?></label>
    5749                    </th>
    5850                    <td>
    5951                        <input id="ownerrez_username" class="regular-text" type="text" name="ownerrez_username" value="<?php echo $username; ?>" />
     52                        <p class="description"><?php _e("This is the email address of the primary account holder.", "ownerrez"); ?></p>
    6053                    </td>
    6154                </tr>
    … …  
    6659                    <td>
    6760                        <input id="ownerrez_token" class="regular-text" type="password" name="ownerrez_token" value="<?php echo $token; ?>" />
    68                         <p class="description"><?php _e("You can generate an access token in OwnerRez under Settings -> External Websites.", "ownerrez"); ?></p>
     61                        <p class="description"><?php _e("You can generate an access token in OwnerRez under Settings -> WordPress Plugin.", "ownerrez"); ?></p>
    6962                    </td>
    7063                </tr>
    … …  
    7972                    </tr>
    8073                <?php } ?>
     74                <tr>
     75                    <th scope="row">
     76                        <label for="ownerrez_apiRoot"><?php _e("API Root Url:", "ownerrez"); ?></label>
     77                    </th>
     78                    <td>
     79                        <input id="ownerrez_apiRoot" class="regular-text" type="text" name="ownerrez_apiRoot" value="<?php echo $apiRoot; ?>" />
     80                        <p class="description"><?php _e("This is for advanced usage. You should not need to change this option.", "ownerrez"); ?></p>
     81
     82                    </td>
     83                </tr>
    8184            </table>
    8285

  • ownerrez/trunk/ownerrez.php

    r2439293 r2444600  
    1717 * Plugin URI:        https://www.ownerreservations.com/support/wordpress
    1818 * Description:       Integrate your OwnerRez account with your wordpress site.
    19  * Version:           1.0.4
     19 * Version:           1.0.5
    2020 * Author:            OwnerRez, Inc.
    2121 * Author URI:        https://www.ownerreservations.com/
    … …  
    3636 * Rename this for your plugin and update it as you release new versions.
    3737 */
    38 define('OWNERREZ_VERSION', '1.0.4');
     38define('OWNERREZ_VERSION', '1.0.5');
    3939
    4040/**

  • ownerrez/trunk/public/class-ownerrez-public.php

    r2439293 r2444600  
    100100    }
    101101
    102     public function webhook() {
     102    public function webhook() {
    103103        if(substr($_SERVER["REQUEST_URI"], 0, strlen('/ownerrez/')) === '/ownerrez/') {
     104            $webhook = trim(preg_split("/ownerrez/", $_SERVER["REQUEST_URI"])[1], " \t\r\n/");
    104105
    105             $result = new stdClass();
    106             $result->authorized = false;
    107             $result->succeeded = false;
     106            if ($webhook === "clear-transients") {
     107                $result = new stdClass();
     108                $result->authorized = false;
     109                $result->succeeded = false;
    108110
    109             $token = $_SERVER['PHP_AUTH_PW'];
    110             $expected = get_option('ownerrez_webhookToken', null);
     111                $token = $_SERVER['PHP_AUTH_PW'];
     112                $expected = get_option('ownerrez_webhookToken', null);
    111113
    112             // verify username and token
    113             if (!isset($_SERVER['PHP_AUTH_PW']) || !hash_equals($expected, $token)) {
    114                 header('WWW-Authenticate: Basic');
    115                 header('HTTP/1.0 401 Unauthorized');
    116             }
    117             else {
    118                 $result->authorized = true;
     114                // verify username and token
     115                if (!isset($_SERVER['PHP_AUTH_PW']) || !hash_equals($expected, $token)) {
     116                    header('WWW-Authenticate: Basic');
     117                    header('HTTP/1.0 401 Unauthorized');
     118                }
     119                else {
     120                    $result->authorized = true;
    119121
    120                 $webhook = trim(preg_split("/ownerrez/", $_SERVER["REQUEST_URI"])[1], " \t\r\n/");
    121 
    122                 try {
    123                     if ($webhook === "clear-transients") {
     122                    try {
    124123                        $this->clear_transients();
    125124                        $result->succeeded = true;
    126125                    }
    127                     else {
    128                         $result->exception = "Unrecognized webhook name: " . $webhook;
     126                    catch (Exception $ex) {
     127                        $result->exception = $ex->getMessage();
    129128                    }
    130129                }
    131                 catch (Exception $ex) {
    132                     $result->exception = $ex->getMessage();
    133                 }
     130
     131                echo json_encode($result);
     132                exit();
    134133            }
    135 
    136             echo json_encode($result);
    137             exit();
    138134        }
    139135    }

  • ownerrez/trunk/readme.txt

    r2439352 r2444600  
    44Requires at least: 5.4
    55Tested up to: 5.6
    6 Stable tag: 1.0.4
     6Stable tag: 1.0.5
    77License: MIT
    88License URI: https://github.com/ownerrez/orez-wp/blob/master/LICENSE
    … …  
    4040== Changelog ==
    4141
    42 = 1.0.3 =
     42= 1.0.5 =
    4343
    44 Added default widget styling
     44Fixed a bug that occurred when Wordpress was hosted in a subfolder named /ownerrez
    4545
    4646== Upgrade Notice ==
Note: See TracChangeset for help on using the changeset viewer.