WordPress.org
Get WordPress

Plugin Directory

Changeset 653071


Ignore:
Timestamp:
01/15/2013 05:03:21 PM (13 years ago)
Author:
GabSoftware
Message:

Fixed query issues

Location:
counterize/trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • counterize/trunk/counterize.php

    r652846 r653071  
    44 Plugin URI: http://www.gabsoftware.com/products/scripts/counterize/
    55 Description: Complete counter and statistics plugin for Wordpress with no external libs. See Readme for more details.
    6  Version: 3.1.4
     6 Version: 3.1.5
    77 Author: Gabriel Hautclocq
    88 Author URI: http://www.gabsoftware.com/
    … …  
    834834            {
    835835                $first = false;
    836                 $sql .= " m.`IP` {$comparator} '" . $wpdb->prepare( "%s", $filter ) ."' ";
     836                $sql .= " m.`IP` {$comparator} " . $wpdb->prepare( "%s", $filter ) ." ";
    837837            }
    838838            else
    … …  
    843843                    $logical = 'AND';
    844844                }
    845                 $sql .= " {$logical} m.`IP` {$comparator} '" . $wpdb->prepare( "%s", $filter ) ."' ";
     845                $sql .= " {$logical} m.`IP` {$comparator} " . $wpdb->prepare( "%s", $filter ) ." ";
    846846            }
    847847        }
    … …  
    872872            {
    873873                $first = false;
    874                 $sql .= " c.`code` {$comparator} '" . $wpdb->prepare( "%s", $filter ) ."' ";
     874                $sql .= " c.`code` {$comparator} " . $wpdb->prepare( "%s", $filter ) ." ";
    875875            }
    876876            else
    … …  
    881881                    $logical = 'AND';
    882882                }
    883                 $sql .= " {$logical} c.`code` {$comparator} '" . $wpdb->prepare( "%s", $filter ) ."' ";
     883                $sql .= " {$logical} c.`code` {$comparator} " . $wpdb->prepare( "%s", $filter ) ." ";
    884884            }
    885885        }
    … …  
    910910            {
    911911                $first = false;
    912                 $sql .= " p.`url` {$comparator} '" . $wpdb->prepare( "%s", $filter ) ."' ";
     912                $sql .= " p.`url` {$comparator} " . $wpdb->prepare( "%s", $filter ) ." ";
    913913            }
    914914            else
    … …  
    919919                    $logical = 'AND';
    920920                }
    921                 $sql .= " {$logical} p.`url` {$comparator} '" . $wpdb->prepare( "%s", $filter ) . "' ";
     921                $sql .= " {$logical} p.`url` {$comparator} " . $wpdb->prepare( "%s", $filter ) . " ";
    922922            }
    923923        }
    … …  
    948948            {
    949949                $first = false;
    950                 $sql .= " r.`name` {$comparator} '" . $wpdb->prepare( "%s", $filter ) ."' ";
     950                $sql .= " r.`name` {$comparator} " . $wpdb->prepare( "%s", $filter ) ." ";
    951951            }
    952952            else
    … …  
    957957                    $logical = 'AND';
    958958                }
    959                 $sql .= " {$logical} r.`name` {$comparator} '" . $wpdb->prepare( "%s", $filter ) . "' ";
     959                $sql .= " {$logical} r.`name` {$comparator} " . $wpdb->prepare( "%s", $filter ) . " ";
    960960            }
    961961        }
    … …  
    986986            {
    987987                $first = false;
    988                 $sql .= " ua.`name` {$comparator} '" . $wpdb->prepare( "%s", $filter ) ."' ";
     988                $sql .= " ua.`name` {$comparator} " . $wpdb->prepare( "%s", $filter ) ." ";
    989989            }
    990990            else
    … …  
    995995                    $logical = 'AND';
    996996                }
    997                 $sql .= " {$logical} ua.`name` {$comparator} '" . $wpdb->prepare( "%s", $filter ) . "' ";
     997                $sql .= " {$logical} ua.`name` {$comparator} " . $wpdb->prepare( "%s", $filter ) . " ";
    998998            }
    999999        }
    … …  
    10241024            {
    10251025                $first = false;
    1026                 $sql .= " k.`keyword` {$comparator} '" . $wpdb->prepare( "%s", $filter ) ."' ";
     1026                $sql .= " k.`keyword` {$comparator} " . $wpdb->prepare( "%s", $filter ) ." ";
    10271027            }
    10281028            else
    … …  
    10331033                    $logical = 'AND';
    10341034                }
    1035                 $sql .= " {$logical} k.`keyword` {$comparator} '" . $wpdb->prepare( "%s", $filter ) . "' ";
     1035                $sql .= " {$logical} k.`keyword` {$comparator} " . $wpdb->prepare( "%s", $filter ) . " ";
    10361036            }
    10371037        }
    … …  
    10551055        $where = TRUE;
    10561056        $sql .= $clause;
    1057         $sql .= " m.`timestamp` BETWEEN '" . $wpdb->prepare( "%s", $datefilter1 ) . "' AND '" . $wpdb->prepare( "%s", $datefilter2 ) . "' ) \n";
     1057        $sql .= " m.`timestamp` BETWEEN " . $wpdb->prepare( "%s", $datefilter1 ) . " AND " . $wpdb->prepare( "%s", $datefilter2 ) . " ) \n";
    10581058    }
    10591059
    … …  
    10631063        $clause = $where === FALSE ? 'WHERE' : 'AND';
    10641064        $where = TRUE;
    1065         $sql .= "{$clause} m.`id` = '" . $wpdb->prepare( "%s", $entryID ) . "' \n";
     1065        $sql .= "{$clause} m.`id` = " . $wpdb->prepare( "%s", $entryID ) . " \n";
    10661066    }
    10671067

  • counterize/trunk/counterize_admin.php

    r652694 r653071  
    10531053                    {
    10541054                        //retrieve the pageID to decount
    1055                         $pageid = $wpdb->get_var( 'SELECT `pageID` FROM `' . counterize_pageTable() . "` WHERE `url`='" . $wpdb->prepare( "%s", $page ) . "' LIMIT 1" );
     1055                        $pageid = $wpdb->get_var( 'SELECT `pageID` FROM `' . counterize_pageTable() . "` WHERE `url`=" . $wpdb->prepare( "%s", $page ) . " LIMIT 1" );
    10561056                    }
    10571057
    10581058                    //retrieve the refererID to decount
    1059                     $refererid = $wpdb->get_var( 'SELECT `refererID` FROM `' . counterize_refererTable() . "` WHERE `name`='" . $wpdb->prepare( "%s", $referer ) . "' LIMIT 1" );
     1059                    $refererid = $wpdb->get_var( 'SELECT `refererID` FROM `' . counterize_refererTable() . "` WHERE `name`=" . $wpdb->prepare( "%s", $referer ) . " LIMIT 1" );
    10601060
    10611061                    //get the number of records to decount from page and referer tables
    … …  
    14621462
    14631463                $sql_pages_1_1 .= $wpdb->prepare( "%s", $id );
    1464                 $sql_pages_1_2 .= '"' . $wpdb->prepare( "%s", $agent['page'] ). '"';
    1465                 $sql_pages_1_3 .= '"' . $wpdb->prepare( "%s", $agent['referer'] ). '"';
     1464                $sql_pages_1_2 .= $wpdb->prepare( "%s", $agent['page'] );
     1465                $sql_pages_1_3 .= $wpdb->prepare( "%s", $agent['referer'] );
    14661466
    14671467                $sql_logtable_1_1 .= $wpdb->prepare( "%s", $id );
    1468                 $sql_logtable_1_2 .= '"' . $wpdb->prepare( "%s", $agent['page'] ). '"';
    1469                 $sql_logtable_1_3 .= '"' . $wpdb->prepare( "%s", $agent['referer'] ). '"';
     1468                $sql_logtable_1_2 .= $wpdb->prepare( "%s", $agent['page'] );
     1469                $sql_logtable_1_3 .= $wpdb->prepare( "%s", $agent['referer'] );
    14701470            }
    14711471            else
    … …  
    14831483
    14841484                $sql_pages_2_1 .= $wpdb->prepare( "%s", $id );
    1485                 $sql_pages_2_2 .= '"' . $wpdb->prepare( "%s", $agent['referer'] ). '"';
     1485                $sql_pages_2_2 .= $wpdb->prepare( "%s", $agent['referer'] );
    14861486
    14871487                $sql_logtable_2_1 .= $wpdb->prepare( "%s", $id );
    1488                 $sql_logtable_2_2 .= '"' . $wpdb->prepare( "%s", $agent['referer'] ). '"';
     1488                $sql_logtable_2_2 .= $wpdb->prepare( "%s", $agent['referer'] );
    14891489            }
    14901490        }

  • counterize/trunk/counterize_deprecated.php

    r652694 r653071  
    223223        . " FROM `" . counterize_refererTable() . "`"
    224224        . " WHERE `name` <> 'unknown' "
    225         . " AND `name` NOT LIKE '" . $wpdb->prepare( "%s", get_option( "home" ) ) . "%%' "
    226         . " AND `name` NOT LIKE '" . $wpdb->prepare( "%s", get_option( "siteurl" ) ) . "%%' "
     225        . " AND `name` NOT LIKE " . $wpdb->prepare( "%s", get_option( "home" ) . "%%" ) . " "
     226        . " AND `name` NOT LIKE " . $wpdb->prepare( "%s", get_option( "siteurl" ) . "%%" ) . " "
    227227        . " ORDER BY amount DESC "
    228228        . " LIMIT {$number}";
    … …  
    242242        . " WHERE m.refererID = r.refererID "
    243243        . " AND r.name <> 'unknown' "
    244         . " AND r.name NOT LIKE '" . $wpdb->prepare( "%s", get_option( "home" ) ) . "%%' "
    245         . " AND r.name NOT LIKE '" . $wpdb->prepare( "%s", get_option( "siteurl" ) ) . "%%' "
     244        . " AND r.name NOT LIKE '" . $wpdb->prepare( "%s", get_option( "home" ) . "%%" ) . " "
     245        . " AND r.name NOT LIKE '" . $wpdb->prepare( "%s", get_option( "siteurl" ) . "%%" ) . " "
    246246        . " AND m.timestamp >= '{$onedayago}'"
    247247        . " GROUP BY r.name "
    … …  
    265265    $geoip = $wpdb->prepare( "%s", counterize_get_option( 'geoip' ) );
    266266    $number = $wpdb->prepare( "%d", $number );
    267     $sql = "SELECT COUNT(`IP`) AS amount, `IP` AS label, `IP` AS label2, CONCAT('{$geoip}', `IP`) AS url "
     267    $sql = "SELECT COUNT(`IP`) AS amount, `IP` AS label, `IP` AS label2, CONCAT({$geoip}, `IP`) AS url "
    268268        . " FROM `" . counterize_logTable() . "`"
    269269        . " WHERE `IP` <> 'unavailable' "
    … …  
    286286    $number = $wpdb->prepare( "%d", $number );
    287287    $geoip = $wpdb->prepare( "%s", counterize_get_option( 'geoip' ) );
    288     $sql = "SELECT COUNT(`IP`) AS amount, `IP` AS label, `IP` AS label2, CONCAT('{$geoip}', `IP`) AS url "
     288    $sql = "SELECT COUNT(`IP`) AS amount, `IP` AS label, `IP` AS label2, CONCAT({$geoip}, `IP`) AS url "
    289289        . " FROM `" . counterize_logTable() . "`"
    290290        . " WHERE `IP` <> 'unavailable' "

  • counterize/trunk/counterize_install.php

    r652694 r653071  
    516516                $sql = "UPDATE IGNORE `" . counterize_logTable() . "` "
    517517                    . " SET `countryID` = %d "
    518                     . " WHERE `IP` = '%s';";
     518                    . " WHERE `IP` = %s;";
    519519                $wpdb->query( $wpdb->prepare( $sql, $country_id, 'unavailable' ) );
    520520                unset( $sql, $country_id );
    … …  
    882882            }
    883883
    884             if( $Revision < 4 )
    885             {
    886                 $Revision = 4;
    887             }
    888             // Here we have Counterize 3.1.4
     884            if( $Revision < 5 )
     885            {
     886                $Revision = 5;
     887            }
     888            // Here we have Counterize 3.1.5
    889889        }
    890890    }

  • counterize/trunk/counterize_plugin_browsers.php

    r652694 r653071  
    44 Plugin URI: http://www.gabsoftware.com/products/scripts/counterize/plugins/browsers
    55 Description: Display some information about the browsers used by your visitors, for the Counterize plugin
    6  Version: 3.1.4
     6 Version: 3.1.5
    77 Author: Gabriel Hautclocq
    88 Author URI: http://www.gabsoftware.com/

  • counterize/trunk/counterize_plugin_countries.php

    r652694 r653071  
    44 Plugin URI: http://www.gabsoftware.com/products/scripts/counterize/plugins/countries
    55 Description: Display some information about the countries for the Counterize plugin
    6  Version: 3.1.4
     6 Version: 3.1.5
    77 Author: Gabriel Hautclocq
    88 Author URI: http://www.gabsoftware.com/

  • counterize/trunk/counterize_plugin_ip.php

    r652694 r653071  
    44 Plugin URI: http://www.gabsoftware.com/products/scripts/counterize/plugins/ip
    55 Description: Display some information about the IP addresses of your visitors for the Counterize plugin
    6  Version: 3.1.4
     6 Version: 3.1.5
    77 Author: Gabriel Hautclocq
    88 Author URI: http://www.gabsoftware.com/

  • counterize/trunk/counterize_plugin_keywords.php

    r652694 r653071  
    44 Plugin URI: http://www.gabsoftware.com/products/scripts/counterize/plugins/keywords
    55 Description: Display some information about the keywords written by your visitors to access your website for the Counterize plugin
    6  Version: 3.1.4
     6 Version: 3.1.5
    77 Author: Gabriel Hautclocq
    88 Author URI: http://www.gabsoftware.com/

  • counterize/trunk/counterize_plugin_os.php

    r652694 r653071  
    44 Plugin URI: http://www.gabsoftware.com/products/scripts/counterize/plugins/os
    55 Description: Display some information about the operating systems used by your visitors, for the Counterize plugin
    6  Version: 3.1.4
     6 Version: 3.1.5
    77 Author: Gabriel Hautclocq
    88 Author URI: http://www.gabsoftware.com/

  • counterize/trunk/counterize_plugin_outlinks.php

    r652694 r653071  
    44 Plugin URI: http://www.gabsoftware.com/products/scripts/counterize/plugins/outlinks
    55 Description: Display some information about the outlinks for the Counterize plugin
    6  Version: 3.1.4
     6 Version: 3.1.5
    77 Author: Gabriel Hautclocq
    88 Author URI: http://www.gabsoftware.com/

  • counterize/trunk/counterize_plugin_pages.php

    r652694 r653071  
    44 Plugin URI: http://www.gabsoftware.com/products/scripts/counterize/plugins/pages
    55 Description: Display some information about popular pages and posts, and the most requested URLs, for the Counterize plugin
    6  Version: 3.1.4
     6 Version: 3.1.5
    77 Author: Gabriel Hautclocq
    88 Author URI: http://www.gabsoftware.com/

  • counterize/trunk/counterize_plugin_referers.php

    r652694 r653071  
    44 Plugin URI: http://www.gabsoftware.com/products/scripts/counterize/plugins/referers
    55 Description: Display some information about the referers for the Counterize plugin
    6  Version: 3.1.4
     6 Version: 3.1.5
    77 Author: Gabriel Hautclocq
    88 Author URI: http://www.gabsoftware.com/

  • counterize/trunk/counterize_plugin_traffic.php

    r652694 r653071  
    44 Plugin URI: http://www.gabsoftware.com/products/scripts/counterize/plugins/traffic
    55 Description: Display some information about the traffic for the Counterize plugin
    6  Version: 3.1.4
     6 Version: 3.1.5
    77 Author: Gabriel Hautclocq
    88 Author URI: http://www.gabsoftware.com/

  • counterize/trunk/readme.txt

    r652859 r653071  
    55Requires at least: 3.3.0
    66Tested up to: 3.5.0
    7 Stable tag: 3.1.4
     7Stable tag: 3.1.5
    88
    99Counter and statistics plugin for WordPress.
    … …  
    586586== Changelog ==
    587587
     588= 3.1.5 =
     589* Fixed some issues with wrong queries
     590* History now fully functionnal again
     591
    588592= 3.1.4 =
    589593* This is a maintenance release for WP 3.5 compatibility. Nothing new has been added.
Note: See TracChangeset for help on using the changeset viewer.