Changeset 2566:9bf417837888 for inc/core/class.dc.log.php

Timestamp:

11/17/13 20:25:53 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

2.6

Children:

2567:6c11245cbf04, 2568:61c67a7d17fa

Message:

Add some people in CREDITS, remove trailing spaces and tabs.

File:

• inc/core/class.dc.log.php (modified) (14 diffs)

inc/core/class.dc.log.php

@@ -16 +16 @@
      protected $core;
      protected $prefix;
-     
+
      /**
      Object constructor.
-     
+
      @param    core      <b>dcCore</b>  dcCore instance
      */
@@ -27 +27 @@
           $this->prefix = $core->prefix;
      }
-     
+
      /**
      Retrieves logs. <b>$params</b> is an array taking the following
      optionnal parameters:
-     
+
      - blog_id: Get logs belonging to given blog ID
      - user_id: Get logs belonging to given user ID
@@ -38 +38 @@
      - order: Order of results (default "ORDER BY log_dt DESC")
      - limit: Limit parameter
-     
+
      @param    params         <b>array</b>        Parameters
      @param    count_only     <b>boolean</b>      Only counts results
@@ -54 +54 @@
                'U.user_firstname, U.user_displayname, U.user_url';
           }
-          
+
           $strReq = 'SELECT '.$f.' FROM '.$this->prefix.'log L ';
-          
+
           if (!$count_only) {
                $strReq .=
@@ -62 +62 @@
                'ON U.user_id = L.user_id ';
           }
-          
+
           if (!empty($params['blog_id'])) {
                if ($params['blog_id'] === 'all') {
@@ -74 +74 @@
                $strReq .= "WHERE L.blog_id = '".$this->core->blog->id."' ";
           }
-          
+
           if (!empty($params['user_id'])) {
                $strReq .= 'AND L.user_id'.$this->core->con->in($params['user_id']);
@@ -84 +84 @@
                $strReq .= 'AND log_table'.$this->core->con->in($params['log_table']);
           }
-          
+
           if (!$count_only)
           {
@@ -93 +93 @@
                }
           }
-          
+
           if (!empty($params['limit'])) {
                $strReq .= $this->core->con->limit($params['limit']);
           }
-          
+
           $rs = $this->core->con->select($strReq);
           $rs->extend('rsExtLog');
-          
+
           return $rs;
      }
-     
+
      /**
      Creates a new log. Takes a cursor as input and returns the new log
      ID.
-     
+
      @param    cur       <b>cursor</b>       Log cursor
      @return   <b>integer</b>      New log ID
@@ -114 +114 @@
      {
           $this->core->con->writeLock($this->prefix.'log');
-          
+
           try
           {
@@ -120 +120 @@
                $rs = $this->core->con->select(
                     'SELECT MAX(log_id) '.
-                    'FROM '.$this->prefix.'log ' 
+                    'FROM '.$this->prefix.'log '
                );
-               
+
                $cur->log_id = (integer) $rs->f(0) + 1;
                $cur->blog_id = (string) $this->core->blog->id;
                $cur->log_dt = date('Y-m-d H:i:s');
-               
+
                $this->getLogCursor($cur,$cur->log_id);
-               
+
                # --BEHAVIOR-- coreBeforeLogCreate
                $this->core->callBehavior('coreBeforeLogCreate',$this,$cur);
-               
+
                $cur->insert();
                $this->core->con->unlock();
@@ -140 +140 @@
                throw $e;
           }
-          
+
           # --BEHAVIOR-- coreAfterLogCreate
           $this->core->callBehavior('coreAfterLogCreate',$this,$cur);
-          
+
           return $cur->log_id;
      }
-     
+
      /**
      Deletes a log.
-     
+
      @param    id        <b>integer</b>      Log ID
      */
@@ -157 +157 @@
           'TRUNCATE TABLE '.$this->prefix.'log' :
           'DELETE FROM '.$this->prefix.'log WHERE log_id'.$this->core->con->in($id);
-          
+
           $this->core->con->execute($strReq);
      }
-     
+
      private function getLogCursor($cur,$log_id = null)
      {
@@ -166 +166 @@
                throw new Exception(__('No log message'));
           }
-          
+
           if ($cur->log_table === null) {
                $cur->log_table = 'none';
           }
-          
+
           if ($cur->user_id === null) {
                $cur->user_id = 'unknown';
           }
-          
+
           if ($cur->log_dt === '' || $cur->log_dt === null) {
                $cur->log_dt = date('Y-m-d H:i:s');
           }
-          
+
           if ($cur->log_ip === null) {
                $cur->log_ip = http::realIP();
           }
-          
+
           $log_id = is_int($log_id) ? $log_id : $cur->log_id;
      }
@@ -193 +193 @@
           $user = dcUtils::getUserCN($rs->user_id, $rs->user_name,
           $rs->user_firstname, $rs->user_displayname);
-          
+
           if ($user === 'unknown') {
                $user = __('unknown');
           }
-          
+
           return $user;
      }
 }
-
-?>