Changeset 968

Timestamp:

11/03/2007 05:11:03 AM (13 months ago)

Author:

Geert

Message:

Various updates:

• directory setting in Pagination library allows you to set the path to the view folder that contains your pagination templates, defaults to 'pagination'
  
• finished log.threshold functionality
  
• other code clean ups
  

Location:

trunk/system

Files:

• config/log.php (modified) (2 diffs)
• config/pagination.php (modified) (1 diff)
• core/Log.php (modified) (3 diffs)
• libraries/Auth.php (modified) (1 diff)
• libraries/Pagination.php (modified) (5 diffs)
• libraries/drivers/Database_Mysql.php (modified) (1 diff)
• libraries/drivers/Database_Pgsql.php (modified) (1 diff)

trunk/system/config/log.php

@@ -14 +14 @@
  *  2 - Debug Messages
  *  3 - Informational Messages
- *  4 - All Messages
  *
  * Options:
- * threshold  - Message threshold
+ * threshold  - Cascading message threshold
  * directory  - Log file directory, relative to application/, or absolute
  * format     - PHP date format for timestamps, see: http://php.net/date
@@ -27 +26 @@
 $config = array
 (
-        'threshold' => 4,
+        'threshold' => 1,
         'directory' => 'logs',
         'format'    => 'Y-m-d H:i:s'

trunk/system/config/pagination.php

@@ -4 +4 @@
  *
  * Options:
- *  style          - Style name
+ *  directory      - Views folder in which your pagination style templates reside
+ *  style          - Style name (matches template filename)
+ *  uri_segment    - URI segment (or 'label') in which the current page number can be found
  *  items_per_page - Number of items in a page of results
  */
 $config = array
 (
+        'directory'      => 'pagination',
         'style'          => 'classic',
+        'uri_segment'    => 3,
         'items_per_page' => 20
 );

trunk/system/core/Log.php

@@ -11 +11 @@
 final class Log {
 
+        private static $types = array(1 => 'error', 2 => 'debug', 3 => 'info');
         private static $messages = array();
 
@@ -23 +24 @@
         public static function add($type, $message)
         {
-                self::$messages[$type][] = array
+                self::$messages[strtolower($type)][] = array
                 (
                         date(Config::item('log.format')),
@@ -63 +64 @@
                 foreach(self::$messages as $type => $data)
                 {
+                        if (array_search($type, self::$types) > $threshold)
+                                continue;
+
                         foreach($data as $date => $text)
                         {
                                 list($date, $message) = $text;
-                                $messages .= $date.' --- '.$type.': '.$message."\r\n";
+                                $messages .= $date.' -- '.$type.': '.$message."\r\n";
                         }
                 }

trunk/system/libraries/Auth.php

@@ -44 +44 @@
                                 'username' => $username,
                                 'password' => sha1($password),
-                                'level >=' => $level
+                                'level >=' => (int) $level
                         ))
                         ->limit(1)
                         ->get();
 
-                if (count($result) === 1)
-                {
-                        // Get the first result
-                        $result = $result->offsetGet(0);
+                if (count($result) !== 1)
+                        return FALSE;
 
-                        // Update the number of logins
-                        $this->db
-                                ->set('logins', ($result->logins + 1))
-                                ->where('id', $result->id)
-                                ->update($this->users_table);
-
-                        // Store session data
-                        $this->session->set(array
-                        (
-                                'user_id'  => $result->id,
-                                'username' => $username,
-                                'level'    => $result->level
-                        ));
-
-                        return TRUE;
-                }
-
-                return FALSE;
+                // Get the first result
+                $result = $result->offsetGet(0);
+        
+                // Update the number of logins
+                $this->db
+                        ->set('logins', ($result->logins + 1))
+                        ->where('id', (int) $result->id)
+                        ->update($this->users_table);
+        
+                // Store session data
+                $this->session->set(array
+                (
+                        'user_id'  => (int) $result->id,
+                        'username' => $username,
+                        'level'    => (int) $result->level
+                ));
+        
+                return TRUE;
         }
 

trunk/system/libraries/Pagination.php

@@ -10 +10 @@
 class Pagination_Core {
         
-        public $base_url           = '';
-        public $style              = 'classic';
-        public $uri_segment        = 3;
-        public $items_per_page     = 10;
+        public $base_url       = '';
+        public $directory      = 'pagination';
+        public $style          = 'classic';
+        public $uri_segment    = 3;
+        public $items_per_page = 10;
         
         public $current_page;
@@ -109 +110 @@
                 $style = (isset($style)) ? $style : $this->style;
                 
-                return (string) new View('pagination/'.$style, get_object_vars($this));
+                return (string) new View(trim($this->directory, '/').'/'.$style, get_object_vars($this));
         }
         
@@ -119 +120 @@
         /*
          * Method: url
-         *  Get the base_url with the specified page number.
+         *  Gets the base_url with the specified page number.
          *
          * Parameters:
@@ -136 +137 @@
         /*
          * Method: sql_offset
-         *  Get the SQL offset of the first row to return.
+         *  Gets the SQL offset of the first row to return.
          *
          * Returns:
@@ -148 +149 @@
         /*
          * Method: url
-         *  Generate the complete SQL LIMIT clause.
+         *  Generates the complete SQL LIMIT clause.
          *
          * Returns:

trunk/system/libraries/drivers/Database_Mysql.php

@@ -161 +161 @@
         public function escape_column($column)
         {
-                if (strtolower($column) == 'count(*)' or $column == '*')
+                if (strtolower($column) == 'count(*)' OR $column == '*')
                         return $column;
 

trunk/system/libraries/drivers/Database_Pgsql.php

@@ -120 +120 @@
                 {
 
-                        $prefix = (($num_wheres > 0) or ($count++ > 1)) ? $type : '';
+                        $prefix = (($num_wheres > 0) OR ($count++ > 1)) ? $type : '';
 
                         if ($quote === -1)