WordPress.org
Get WordPress

Plugin Directory

Changeset 1108929


Ignore:
Timestamp:
03/09/2015 05:53:51 PM (11 years ago)
Author:
peterkodermac
Message:

Stefan Mayer updates, bugfixes

Location:
raspberry-weather/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • raspberry-weather/trunk/functions.php

    r1056360 r1108929  
    5252    //use global variables
    5353    global $graph_ids;
    54    
     54    global $wpdb;
     55        //setup of table name
     56        $tablename        = "temperatures";
     57        //make it convertable for blog switching
     58        $wpdb->tables[]   = $tablename;
     59        //prepare it for use in actual blog
     60        $wpdb->$tablename = $tablename; //$wpdb->get_blog_prefix() . $tablename;
    5561    $options = shortcode_atts(array(
    5662        'width' => "400px",
    … …  
    8389   
    8490    //Create the graph
    85     $options[day]           = mysql_real_escape_string($options[day]);
    86     $dateChosen             = date('Y-m-d', mysql_real_escape_string(strtotime($options[day]))); //what day needs to be displayed?
    87     $temperatureMeasurement = mysql_real_escape_string($options[temperatureMeasurement]); //celsius or fahrenheit?
    88     $display                = mysql_real_escape_string($options[display]); //do we show only temp, only humidity or both?
    89     $displayMeasurement     = mysql_real_escape_string($options[scale]);
     91    $options[day]           = esc_sql($options[day]);
     92    $dateChosen             = date('Y-m-d', esc_sql(strtotime($options[day]))); //what day needs to be displayed?
     93    $temperatureMeasurement = esc_sql($options[temperatureMeasurement]); //celsius or fahrenheit?
     94    $display                = esc_sql($options[display]); //do we show only temp, only humidity or both?
     95    $displayMeasurement     = esc_sql($options[scale]);
    9096   
    9197    //check for all types of temperature
    … …  
    105111        $displayMeasurement = "F";
    106112   
    107     $resultSet = mysql_query("SELECT " . $display . " FROM temperatures WHERE dateMeasured='" . $dateChosen . "'");
     113    $resultSet = $wpdb->get_results("SELECT " . $display . " FROM temperatures WHERE dateMeasured='" . $dateChosen . "'", ARRAY_A);
    108114   
    109115   
    110116    $graph_draw_js .= 'var graph = new google.visualization.LineChart(document.getElementById(\'' . $options['id'] . '\'));';
    111117   
    112     if (mysql_num_rows($resultSet) == 0) //nothing in table
     118    if (($wpdb->num_rows) == 0) //nothing in table
    113119        {
    114120        $content = "['Sample Time','Sample Temperature [" . $displayMeasurement . "]','Sample Humidity [%]'],"; //tell the user he has empty table
    … …  
    186192    }
    187193   
    188     while ($row = mysql_fetch_assoc($resultSet)) {
     194    foreach ($resultSet as $row) {
    189195        $hourMeasured = $row['hourMeasured'];
    190196        if (strcmp($displayMeasurement, "C") == 0)
    … …  
    224230    if (!empty($options['v_title']))
    225231    {
    226         $resultSet = mysql_query("SELECT temperature FROM temperatures WHERE dateMeasured='" . $dateChosen . "' ORDER BY temmperature ASC LIMIT 1");//get lowest temperature  for chosen date
     232        $resultSet =$wpdb->get_results("SELECT temperature FROM temperatures WHERE dateMeasured='" . $dateChosen . "' ORDER BY temmperature ASC LIMIT 1");//get lowest temperature  for chosen date
    227233        $graph_draw_js .= 'vAxis: {title: "' . $options['v_title'] . '", viewWindow: {min:".$resultSet."}}';
    228234   

  • raspberry-weather/trunk/readme.txt

    r1056360 r1108929  
    5353== Changelog ==
    5454
     55= 1.2 =
     56Thanks to Stefan Mayer for removing deprecated functions and adding some improvements! Graph now works on newest PHP versions!
     57
    5558= 1.1 =
    5659Fixed bug for negative values, thank you Simon P.
Note: See TracChangeset for help on using the changeset viewer.