Changeset 96959 in spip-zone

Timestamp:

May 2, 2016, 1:30:25 PM (4 years ago)

Author:

cyp@…

Message:

Quelques améliorations + fix bug graph bots

Location:

_plugins_/shortcut_url/trunk

Files:

• README.md (modified) (1 diff)
• paquet.xml (modified) (1 diff)
• shortcut_url_fonctions.php (modified) (2 diffs)

_plugins_/shortcut_url/trunk/README.md

@@ -13 +13 @@
 
 ## Changelog
+
+### Version 1.1.4 (02/05/2016)
+
+- Content-type sur les fichiers json
+- Fix un bug sur les graphs des bots
+- i18n pour les dates sur les graphs
 
 ### Version 1.1.3 (30/04/2016)

_plugins_/shortcut_url/trunk/paquet.xml

@@ -2 +2 @@
         prefix="shortcut_url"
         categorie="edition"
-        version="1.1.3"
+        version="1.1.4"
         etat="stable"
         compatibilite="[3.0.0;3.1.*]"

_plugins_/shortcut_url/trunk/shortcut_url_fonctions.php

@@ -47 +47 @@
  */
 function shortcut_compteur($id_shortcut_url){
-        
-        $shorturl = sql_fetsel('url,click', 'spip_shortcut_urls', 'id_shortcut_url='.intval($id_shortcut_url));
-
-        $date_modif = date('Y-m-d H:m:i');
-        $referrer = $_SERVER['REMOTE_ADDR'];
-        $user_agent = get_user_agent();
-        $ip_address = $_SERVER['SERVER_ADDR'];
-        $country_code = get_geoip($referrer);
-        $click = $shorturl['click']+1;
-
         if (!defined('_IS_BOT'))
                 define('_IS_BOT',
@@ -70 +60 @@
                 );
         
+        $ip_address = $_SERVER['SERVER_ADDR'];
+        
         if(_IS_BOT) {
-                $humain = 'bot';
-                $insert_bot = sql_insertq('spip_shortcut_urls_bots', array('id_shortcut_url' => $id_shortcut_url,'date_modif' => $date_modif,'referrer' => $referrer,'user_agent' => $user_agent,'ip_address' => $ip_address));
+                $appele = sql_getfetsel('id_shortcut_url','spip_shortcut_urls_bots','ip_address = ' . sql_quote($ip_address) . ' AND id_shortcut_url = ' .intval($id_shortcut_url) . ' AND date_modif < ' . date('Y-m-d H:i:s',strtotime('-30 seconds')));
+        }else{
+                $appele = sql_getfetsel('id_shortcut_url','spip_shortcut_urls_logs','ip_address = ' . sql_quote($ip_address) . ' AND id_shortcut_url = ' .intval($id_shortcut_url) . ' AND date_modif < ' . date('Y-m-d H:i:s',strtotime('-30 seconds')));
+        }
+        if(!$appele){
+                $shorturl = sql_fetsel('url, click', 'spip_shortcut_urls', 'id_shortcut_url=' . intval($id_shortcut_url));
+        
+                $date_modif = date('Y-m-d H:m:i');
+                $referrer = $_SERVER['REMOTE_ADDR'];
+                $user_agent = get_user_agent();
+                
+                $country_code = get_geoip($referrer);
+                $click = $shorturl['click']+1;
                 $insert_click = sql_updateq('spip_shortcut_urls', array('click' => $click), 'id_shortcut_url=' . intval($id_shortcut_url));
-        } else {
-                $humain = 'oui';
-                $insert = sql_insertq('spip_shortcut_urls_logs', array('id_shortcut_url' => $id_shortcut_url,'date_modif' => $date_modif,'shorturl' => $shorturl['url'],'referrer' => $referrer,'user_agent' => $user_agent,'ip_address' => $ip_address,'country_code' => $country_code,'humain' => $humain));
-                $insert_click = sql_updateq('spip_shortcut_urls', array('click' => $click), 'id_shortcut_url=' . intval($id_shortcut_url));
+                
+                if(_IS_BOT) {
+                        $humain = 'bot';
+                        $insert_bot = sql_insertq('spip_shortcut_urls_bots', array('id_shortcut_url' => $id_shortcut_url,'date_modif' => $date_modif,'referrer' => $referrer,'user_agent' => $user_agent,'ip_address' => $ip_address));
+                } else {
+                        $humain = 'oui';
+                        $insert = sql_insertq('spip_shortcut_urls_logs', array('id_shortcut_url' => $id_shortcut_url,'date_modif' => $date_modif,'shorturl' => $shorturl['url'],'referrer' => $referrer,'user_agent' => $user_agent,'ip_address' => $ip_address,'country_code' => $country_code,'humain' => $humain));
+                }
         }
-
         return false;
 }