Plugin Directory

Changeset 2693994


Ignore:
Timestamp:
03/15/2022 03:26:54 AM (4 years ago)
Author:
magicoli69
Message:

version 2.3.1 fix fatal error

Location:
w4os-opensimulator-web-interface
Files:
224 added
3 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • w4os-opensimulator-web-interface/trunk/admin/admin-init.php

    r2693962 r2693994  
    3333        'w4os_settings_page' // function
    3434    );
    35   add_submenu_page(
    36     'w4os', // parent
    37     __('OpenSimulator Helpers', "w4os"), // page title
    38     __('Helpers'), // menu title
    39     'manage_options', // capability
    40     'w4os_helpers', // menu slug
    41     'w4os_helpers_page' // function
    42   );
     35  if(function_exists('xmlrpc_encode_request')) {
     36    add_submenu_page(
     37      'w4os', // parent
     38      __('OpenSimulator Helpers', "w4os"), // page title
     39      __('Helpers'), // menu title
     40      'manage_options', // capability
     41      'w4os_helpers', // menu slug
     42      'w4os_helpers_page' // function
     43    );
     44  }
    4345}
    4446add_action('admin_menu', 'w4os_register_options_pages');
  • w4os-opensimulator-web-interface/trunk/admin/status-page.php

    r2654551 r2693994  
    99    <h1><?php echo esc_html(get_admin_page_title()); ?></h1>
    1010    <p><?php echo W4OS_PLUGIN_NAME . " " . W4OS_VERSION ?></p>
    11 
     11    <?php
     12    if(!function_exists('xmlrpc_encode_request')) {
     13        printf(
     14            '<div class="warning error notice notice-error"><p>%s</p></div>',
     15            __('PHP xml-rpc is required but is not installed.', 'w4os'),
     16        );
     17    }
     18    ?>
    1219    <div class=content>
    1320        <div class=shortcodes>
  • w4os-opensimulator-web-interface/trunk/blocks/popular-places.php

    r2693962 r2693994  
    9393
    9494function w4os_popular_places($atts = []) {
     95    if(!function_exists('xmlrpc_encode_request')) return [];
    9596    $searchURL = get_option('w4os_search_url');
    9697    if(empty($searchURL)) return [];
     
    100101    $req['flags'] = pow(2,12);  // has_picture
    101102
    102     if($atts['rating']=='pg') $req['flags'] += pow(2,24); // PG Only
    103     else    if($atts['rating']!='adult') $req['flags'] += pow(2,24) + pow(2,25);
    104     // 24 PG; 25 Mature; 26 Adult; default PG & Mature
     103    if(isset($atts['rating'])) {
     104        if($atts['rating']=='pg') $req['flags'] += pow(2,24); // PG Only
     105        else    if($atts['rating']!='adult') $req['flags'] += pow(2,24) + pow(2,25);
     106        // 24 PG; 25 Mature; 26 Adult; default PG & Mature
     107    }
    105108
    106109    $req['gatekeeper_url'] = W4OS_GRID_LOGIN_URI;
    107110    $req['sim_name'] = '';
    108111    $request = xmlrpc_encode_request('dir_popular_query', $req );
    109     $debug .= "request " . '<pre>' . print_r($request, true) . '</pre>';
    110112
    111113    $post_data = array('xml' => $request);
     
    117119    $response = xmlrpc_decode(file_get_contents($searchURL, false, $context));
    118120
    119     if (is_array($response) &! xmlrpc_is_fault($response) &! empty($response))
     121    if (is_array($response) &! xmlrpc_is_fault($response) &! empty($response) && isset($response['data']))
    120122    return $response['data'];
    121123    else return [];
     
    129131    $places=w4os_popular_places($atts);
    130132    if(empty($places)) {
    131         if($_REQUEST['context'] == 'edit')
     133        if(isset($_REQUEST['context']) && $_REQUEST['context'] == 'edit')
    132134        return  $content.__("No result", 'w4os');
    133135        else return;
  • w4os-opensimulator-web-interface/trunk/includes/init.php

    r2693962 r2693994  
    8888require_once __DIR__ . '/profile.php';
    8989require_once __DIR__ . '/cron.php';
    90 require_once dirname(__DIR__) . '/helpers/wp-load.php';
     90if(!function_exists('xmlrpc_encode_request')) {
     91  require_once dirname(__DIR__) . '/helpers/wp-load.php';
     92}
    9193require_once dirname(__DIR__) . '/blocks/blocks.php';
    9294
  • w4os-opensimulator-web-interface/trunk/readme.txt

    r2693962 r2693994  
    66Requires PHP: 5.6
    77Tested up to: 5.9
    8 Stable tag: 2.3
     8Stable tag: 2.3.1
    99License: AGPLv3
    1010License URI: https://www.gnu.org/licenses/agpl-3.0.txt
     
    154154== Changelog ==
    155155
     156= 2.3.1 =
     157* fix fatal error and warnings with popular-places shortcode
     158* avoid fatal error if php xml-rpc is not installed, show error notice instead
     159
    156160= 2.3 =
    157161* new search helper
  • w4os-opensimulator-web-interface/trunk/w4os.php

    r2693962 r2693994  
    33 * Plugin Name:       w4os - OpenSimulator Web Interface
    44 * Description:       WordPress interface for OpenSimulator (w4os).
    5  * Version:           2.3
     5 * Version:           2.3.1
    66 * Author:            Speculoos World
    77 * Author URI:        https://speculoos.world
Note: See TracChangeset for help on using the changeset viewer.