WordPress.org
Get WordPress

Plugin Directory

Changeset 575927


Ignore:
Timestamp:
07/23/2012 09:02:09 AM (14 years ago)
Author:
oshingler
Message:
 
Location:
olimometer
Files:
64 added
1 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • olimometer/trunk/olimometer-class.php

    r574116 r575927  
    3333    public $olimometer_paypal_extra_value = 0.00;
    3434    public $olimometer_number_format = 0;
    35    
     35    public $olimometer_link = "";
     36   
     37    private $olimometer_default_link = "http://www.olivershingler.co.uk/oliblog/olimometer/";
    3638    private $olimometer_table_name = "olimometer_olimometers";
     39   
    3740   
    3841   
    … …  
    6770        $this->olimometer_paypal_extra_value = $query_results['olimometer_paypal_extra_value'];
    6871        $this->olimometer_number_format = $query_results['olimometer_number_format'];
     72       
     73        if($query_results['olimometer_link'] == "" || $query_results['olimometer_link'] == null) {
     74            $this->olimometer_link = $this->olimometer_default_link;
     75        }
     76        else {
     77            $this->olimometer_link = $query_results['olimometer_link'];
     78        }
    6979
    7080    }
    … …  
    8797        global $wpdb;
    8898        $table_name = $wpdb->prefix . $this->olimometer_table_name;
     99       
     100        // Sanitize data
     101        if($this->olimometer_paypal_extra_value == '') {
     102            $olimometer_paypal_extra_value = 0.00;
     103        }
     104        else {
     105            $olimometer_paypal_extra_value = $this->olimometer_paypal_extra_value;
     106        }
     107       
     108        if($this->olimometer_progress_value == '') {
     109            $olimometer_progress_value = 0.00;
     110        }
     111        else {
     112            $olimometer_progress_value = $this->olimometer_progress_value;
     113        }
    89114           
    90115        // Is this an existing olimometer or a new one to be saved?
    … …  
    93118            // This is a new one
    94119            $rows_affected = $wpdb->insert( $table_name, array( 'olimometer_description' => $this->olimometer_description,
    95                                                                 'olimometer_progress_value' => $this->olimometer_progress_value,
     120                                                                'olimometer_progress_value' => $olimometer_progress_value,
    96121                                                                'olimometer_total_value' => $this->olimometer_total_value,
    97122                                                                'olimometer_currency' => $this->olimometer_currency,
    … …  
    110135                                                                'olimometer_paypal_password' => $this->olimometer_paypal_password,
    111136                                                                'olimometer_paypal_signature' => $this->olimometer_paypal_signature,
    112                                                                 'olimometer_paypal_extra_value' => $this->olimometer_paypal_extra_value,
    113                                                                 'olimometer_number_format' => $this->olimometer_number_format
     137                                                                'olimometer_paypal_extra_value' => $olimometer_paypal_extra_value,
     138                                                                'olimometer_number_format' => $this->olimometer_number_format,
     139                                                                'olimometer_link' => $this->olimometer_link
    114140                                                                 ) );
    115141           
    … …  
    122148            $wpdb->update($table_name,
    123149                        array(  'olimometer_description' => $this->olimometer_description,
    124                                 'olimometer_progress_value' => $this->olimometer_progress_value,
     150                                'olimometer_progress_value' => $olimometer_progress_value,
    125151                                'olimometer_total_value' => $this->olimometer_total_value,
    126152                                'olimometer_currency' => $this->olimometer_currency,
    … …  
    139165                                'olimometer_paypal_password' => $this->olimometer_paypal_password,
    140166                                'olimometer_paypal_signature' => $this->olimometer_paypal_signature,
    141                                 'olimometer_paypal_extra_value' => $this->olimometer_paypal_extra_value,
    142                                 'olimometer_number_format' => $this->olimometer_number_format
     167                                'olimometer_paypal_extra_value' => $olimometer_paypal_extra_value,
     168                                'olimometer_number_format' => $this->olimometer_number_format,
     169                                'olimometer_link' => $this->olimometer_link
    143170                        ),
    144171                        array( 'olimometer_id' => $this->olimometer_id )
    … …  
    176203       
    177204       
    178         $the_olimometer_text = "<a href='http://www.olivershingler.co.uk/oliblog/olimometer/' target=_blank><img src='".$image_location."?olimometer_id=".$this->olimometer_id."' border=0";
     205        $the_olimometer_text = "<a href='".$this->olimometer_link."' target=_blank><img src='".$image_location."?olimometer_id=".$this->olimometer_id."' border=0";
    179206        if(strlen($css_class) > 0) {
    180207            $the_olimometer_text = $the_olimometer_text." class='".$css_class."'";
    181208        }
    182         $the_olimometer_text = $the_olimometer_text." alt='Olimometer 2.34'></a>";
     209        $the_olimometer_text = $the_olimometer_text." alt='Olimometer 2.35'></a>";
    183210       
    184211        return $the_olimometer_text;

  • olimometer/trunk/olimometer.php

    r574116 r575927  
    66Author: Oliver Shingler
    77Author URI: http://www.olivershingler.co.uk
    8 Version: 2.34
     8Version: 2.35
    99*/
    1010
    … …  
    151151    $an_olimometer->olimometer_paypal_extra_value = $_REQUEST['olimometer_paypal_extra_value'];
    152152    $an_olimometer->olimometer_number_format = $_REQUEST['olimometer_number_format'];
     153    $an_olimometer->olimometer_link = $_REQUEST['olimometer_link'];
    153154   
    154155    // Save it
    … …  
    671672            ?>" size="40" aria-required="false" />
    672673            <p><span class="description">(Optional) The text string to display before the Progress Value. Default = "Raised so far:"</span></p></td>
     674        </tr>
     675       
     676        <tr class="form-field">
     677            <th scope="row" valign="top"><label for="name">Olimometer Hyperlink URL</label></th>
     678            <td><input name="olimometer_link" id="olimometer_link" type="text" value="<?php
     679                echo $current_olimometer->olimometer_link;
     680            ?>" size="40" aria-required="false" />
     681            <p><span class="description">(Optional) The URL users are directed to when clicking on an Olimometer image.</span></p></td>
    673682        </tr>
    674683       
    … …  
    9981007************************/
    9991008global $olimometer_db_version;
    1000 $olimometer_db_version = "2.32";
     1009$olimometer_db_version = "2.35";
    10011010
    10021011function olimometer_install() {
    … …  
    10291038  olimometer_paypal_signature VARCHAR(255),
    10301039  olimometer_number_format tinyint,
     1040  olimometer_link VARCHAR(255),
    10311041  UNIQUE KEY olimometer_id (olimometer_id)
    10321042    );";
    … …  
    10551065        // Yes it has!
    10561066        // If currently installed database version is less than current version required for this plugin, then we need to upgrade
    1057         $required_db_version = 2.32;
     1067        $required_db_version = 2.35;
    10581068        $installed_db_version = get_option("olimometer_db_version");
    10591069        if($installed_db_version < $required_db_version) {

  • olimometer/trunk/readme.txt

    r574128 r575927  
    105105== Changelog ==
    106106
     107= 2.35 =
     108* You can now customise the image's hyperlink
     109* Fixed saving issue when trying to blank out certain values
     110* Fixed bug preventing image display when upgrading to a version using currency formatting.
     111
    107112= 2.34 =
    108113* Fixed GD image output issue on some web servers (header and flush requirements)
    … …  
    215220== Upgrade Notice ==
    216221
     222= 2.35 =
     223* You can now customise the image's hyperlink
     224* Fixed saving issue when trying to blank out certain values
     225* Fixed bug preventing image display when upgrading to a version using currency formatting.
     226
    217227= 2.34 =
    218228* Fixed GD image output issue on some web servers (header and flush requirements)

  • olimometer/trunk/thermometer.php

    r574116 r575927  
    6565    $font_height = $olimometer_to_display->olimometer_font_height;
    6666    $suffix = $olimometer_to_display->olimometer_suffix;
     67   
     68    if($olimometer_to_display->olimometer_number_format == null) {
     69        $olimometer_number_format = 0;
     70    }
     71    else {
     72        $olimometer_number_format = $olimometer_to_display->olimometer_number_format;
     73    }
     74   
    6775   
    6876    // Value layout array:
    … …  
    107115       
    108116    // Display converted values:
    109     $olimometer_display_dp = $olimometer_display_array[$olimometer_to_display->olimometer_number_format][0];
    110     $olimometer_display_thousands = $olimometer_display_array[$olimometer_to_display->olimometer_number_format][1];
    111     $olimometer_display_decimal = $olimometer_display_array[$olimometer_to_display->olimometer_number_format][2];
     117    $olimometer_display_dp = $olimometer_display_array[$olimometer_number_format][0];
     118    $olimometer_display_thousands = $olimometer_display_array[$olimometer_number_format][1];
     119    $olimometer_display_decimal = $olimometer_display_array[$olimometer_number_format][2];
    112120    //$olimometer_display_dp = 2;
    113121    //$olimometer_display_thousands = ',';
Note: See TracChangeset for help on using the changeset viewer.