Changeset 97858 in spip-zone

Timestamp:

May 18, 2016, 4:50:02 PM (4 years ago)

Author:

cyp@…

Message:

Bug sur la sauvegarde des clics

File:

• _plugins_/shortcut_url/trunk/shortcut_url_fonctions.php (modified) (3 diffs)

_plugins_/shortcut_url/trunk/shortcut_url_fonctions.php

@@ -11 +11 @@
  */
 
-if (!defined("_ECRIRE_INC_VERSION")) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+        return;
+}
 
 /**
@@ -60 +62 @@
                 );
         
-        $ip_address = $_SERVER['SERVER_ADDR'];
-        
+        $ip_address = $GLOBALS['ip'];
         if(_IS_BOT) {
-                $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 < ' . sql_quote(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 < ' . sql_quote(date('Y-m-d H:i:s',strtotime('-30 seconds'))));
+                $appele = sql_getfetsel('id_shortcut_urls_bot', 'spip_shortcut_urls_bots', 'ip_address = ' . sql_quote($ip_address) . ' AND id_shortcut_url = ' .intval($id_shortcut_url) . ' AND date_modif > ' . sql_quote(date('Y-m-d H:i:s',strtotime('-30 seconds'))));
+        } else {
+                $appele = sql_getfetsel('id_shortcut_urls_log', 'spip_shortcut_urls_logs', 'ip_address = ' . sql_quote($ip_address) . ' AND id_shortcut_url = ' .intval($id_shortcut_url) . ' AND date_modif > ' . sql_quote(date('Y-m-d H:i:s',strtotime('-30 seconds'))));
         }
         if(!$appele){
+                $date = sql_getfetsel('date_modif', 'spip_shortcut_urls_logs', 'ip_address = ' . sql_quote($ip_address) . ' AND id_shortcut_url = ' .intval($id_shortcut_url) . ' AND date_modif < ' . sql_quote(date('Y-m-d H:i:s',strtotime('-30 seconds'))),'','date_modif DESC');
                 $shorturl = sql_fetsel('url, click', 'spip_shortcut_urls', 'id_shortcut_url=' . intval($id_shortcut_url));
         
-                $date_modif = date('Y-m-d H:m:i');
+                $date_modif = date('Y-m-d H:i:s');
                 $referrer = $_SERVER['REMOTE_ADDR'];
                 $user_agent = get_user_agent();
@@ -80 +82 @@
                 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));
+                        $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));
+                        $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));
                 }
         }