Plugin Directory

Changeset 771715


Ignore:
Timestamp:
09/13/2013 03:49:54 PM (13 years ago)
Author:
LRHGuy
Message:

Maintenance and new features.

Location:
omt-on-air/trunk
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • omt-on-air/trunk/readme.txt

    r561890 r771715  
    44Tags: lrh omt onair imediatouch
    55Requires at least: 3.0.0
    6 Tested up to: 3.4
     6Tested up to: 3.6.1
    77Stable tag: 1.2.0
    88License: GPLv2 or later
     
    2626
    2727The output can be generated as an unnumbered list or plain.
     28
     29Additionally, you may specify an optional footer to output below the on air data.
     30Commonly used to include a request line phone number.
    2831
    2932== Installation ==
     
    56592. Widget in 8-some theme sidebar.
    57603. Widget in Easel theme sidebar.
     614. Widget in custom theme sidebar, with footer line.
    5862
    5963== Changelog ==
     64
     65= 1.2.3 =
     66
     67* Maintenance.
     68* Addition of footer line.
    6069
    6170= 1.2.0 =
     
    7483== Upgrade Notice ==
    7584
    76 = 1.2.0 =
    77 * Maintenance update.
     85= 1.2.3 =
     86* Maintenance.
     87* Addition of footer line.
    7888
  • omt-on-air/trunk/wp.widget_lrhomtonair.php

    r561890 r771715  
    22/*
    33Plugin Name: LRH/OMT OnAir
    4 Plugin URI: http://lrh.net/wp_blog_lrh
     4Plugin URI: http://lrh.net/wpblog_lrh
    55Description: Retrieves the OMT/iMediaTouch OnAir xml file and displays the active cut.
    66Author: Larry Houbre, Jr.
    7 Version: 1.2.0
     7Version: 1.2.3
    88*/
    99
     
    2626define('cwidgetoption_lrhomtonair_ajaxload','lrhomtonair_al');
    2727define('cwidgetoption_lrhomtonair_ajaxload_value',__('Loading...',cwidgetbaseid_lrhomtonair));
     28define('cwidgetoption_lrhomtonair_foot','lrhomtonair_ft');
    2829
    2930define('cwidgetajax_lrhomtonair_request','lrhomtonair_ar');
     
    6162                        ,__('Output as non-list:',cwidgetbaseid_lrhomtonair)
    6263                        ,'0','yesnoselect');
     64        $this->RegisterOptionField(cwidgetoption_lrhomtonair_foot
     65                        ,__('Footer text:',cwidgetbaseid_lrhomtonair)
     66                        ,'','text');
    6367
    6468        $this->RegisterFieldHelp(cwidgetoption_lrhomtonair_defaultprogram
     
    9397        $useajax=('1'==$instance[cwidgetoption_lrhomtonair_useajax]);
    9498        $defpgm=$instance[cwidgetoption_lrhomtonair_defaultprogram];
     99        $footer=$instance[cwidgetoption_lrhomtonair_foot];
    95100        $usediv=('1'==$instance[cwidgetoption_lrhomtonair_usediv]);
    96101        if ($useajax) {
    97           $jurl=admin_url('admin-ajax.php');
     102            $jurl=admin_url('admin-ajax.php');
    98103            $nonce=wp_create_nonce(cwidgetbaseid_lrhomtonair);
    99104            $show=(empty($instance[cwidgetoption_lrhomtonair_ajaxload]))?cwidgetoption_lrhomtonair_ajaxload_value:$instance[cwidgetoption_lrhomtonair_ajaxload];
     
    131136
    132137        } else {
    133             $show=lrh_GetDisplayText($URL,$defpgm);
     138            $show=lrhomtonair_GetDisplayText($URL,$defpgm);
    134139            $script='';
    135140        }
     
    142147        else         echo '<ul><li';
    143148        echo " id='{$widget_id}_onair'>$show</";
    144       if ($usediv) echo 'div>';
     149        if ($usediv) echo 'div>';
    145150        else         echo 'li></ul>';
     151        if ($footer) {
     152            echo (($usediv)?"<div":"<p")
     153                ." class='".cwidgetbaseid_lrhomtonair."_footer'>"
     154                .$footer.(($usediv)?'</div>':'</p>');
     155        }
    146156        echo $after_widget;
    147157        print $script;
     
    161171
    162172// To support the AJAX calls, these need to be OUTSIDE of the widget class
    163 function lrh_GetOnAirData($aUrl) {
     173function lrhomtonair_GetOnAirData($aUrl) {
    164174    if ('file://'==substr($aUrl,0,7)) {
    165175        $aUrl=substr($aUrl,7);
    166176        if (file_exists($aUrl)) {
    167177            $content=file_get_contents($aUrl);
    168             if ($content=='') return lrh_DataError('File:no content'); //nothing
     178            if ($content=='') return lrhomtonair_DataError('File:no content'); //nothing
    169179        } else {
    170             return lrh_DataError('File:not found'); //nothing
     180            return lrhomtonair_DataError('File:not found'); //nothing
    171181        }
    172182    } else {
     
    174184        if ('http://'!=substr($aUrl,0,7)) $aUrl='http://'.$aUrl;
    175185        $content=wp_remote_retrieve_body(wp_remote_get($aUrl));
    176         if ($content=='') return lrh_DataError('Http:no content'); //nothing
     186        if ($content=='') return lrhomtonair_DataError('Http:no content'); //nothing
    177187    }
    178188    //convert xml to data array
     
    180190        @$x=new SimpleXMLElement($content);
    181191    } catch (Exception $e) {
    182         return lrh_DataError('XML error:'.$e->getMessage(),$content); //trouble
     192        return lrhomtonair_DataError('XML error:'.$e->getMessage(),$content); //trouble
    183193    }
    184194
     
    203213}
    204214
    205 function lrh_DataError($aMsg,$aMsg2='') {
     215function lrhomtonair_DataError($aMsg,$aMsg2='') {
    206216//for debugging
    207217//  return array('now'=>array('Title'=>$aMsg,'Artist'=>$aMsg2));
     
    209219}
    210220
    211 function lrh_GetDisplayText($aUrl,$aDefaultProgram) {
    212     $ONAIR=lrh_GetOnAirData($aUrl);
     221function lrhomtonair_GetDisplayText($aUrl,$aDefaultProgram) {
     222    $ONAIR=lrhomtonair_GetOnAirData($aUrl);
    213223    $data=$ONAIR['now'];
    214224    if (null==$data) {
     
    221231}
    222232
    223 function lrh_ajaxhandler_omtonair() {
     233function lrhomtonair_ajaxhandler() {
    224234    if (!empty($_POST[cwidgetajax_lrhomtonair_request])) {
    225235        //check_ajax_referer does not return if check fails
     
    229239            $URL=strip_tags($_POST[cwidgetajax_lrhomtonair_url]);
    230240            $DEFPGM=strip_tags($_POST[cwidgetajax_lrhomtonair_defpgm]);
    231             echo lrh_GetDisplayText($URL,$DEFPGM);
     241            echo lrhomtonair_GetDisplayText($URL,$DEFPGM);
    232242            die();
    233243        }
     
    236246}
    237247
    238 
    239248add_action('widgets_init'
    240           ,create_function('','return register_widget("lrh_widget_omtonair");')
    241           );
    242 add_action('wp_ajax_'.cwidgetajax_lrhomtonair_request,'lrh_ajaxhandler_omtonair');
    243 add_action('wp_ajax_nopriv_'.cwidgetajax_lrhomtonair_request,'lrh_ajaxhandler_omtonair');
     249    ,create_function('','return register_widget("lrh_widget_omtonair");')
     250    );
     251add_action('wp_ajax_'.cwidgetajax_lrhomtonair_request,'lrhomtonair_ajaxhandler');
     252add_action('wp_ajax_nopriv_'.cwidgetajax_lrhomtonair_request,'lrhomtonair_ajaxhandler');
    244253
    245254?>
Note: See TracChangeset for help on using the changeset viewer.