Changeset 610

Timestamp:

09/28/2007 07:39:20 PM (14 months ago)

Author:

Demio

Message:

Ported User-agent library. Fixed permissions in FTP library.

Location:

trunk

Files:

• application/controllers/welcome.php (modified) (2 diffs)
• system/libraries/Ftp.php (modified) (7 diffs)
• system/libraries/User_agent.php (copied) (copied from trunk/ported_libs/User_agent.php) (14 diffs)

trunk/application/controllers/welcome.php

@@ -5 +5 @@
         function index()
         {
-                print_r(date::hours(1, TRUE)); die;
-                
+                //print_r(date::hours(1, TRUE)); die
                 
                 foreach(get_class_methods(__CLASS__) as $method)
                 {
                         if ( ! preg_match('/_example$/', $method)) continue;
-
-                        echo html::anchor('welcome/'.$method, $method)."<br/>\n";
+                                echo html::anchor('welcome/'.$method, $method)."<br/>\n";
                 }
         }
@@ -105 +103 @@
                 echo "done in {execution_time} seconds";
         }
+        function user_agent_example() {
+                $this->load->library('user_agent');
+                echo $this->user_agent;         
+        }
 
 }

trunk/system/libraries/Ftp.php

@@ -34 +34 @@
 class FTP_Core {
 
-        protected $hostname     = '';
-        protected $username     = '';
-        protected $password     = '';
-        protected $port         = 21;
-        protected $passive      = TRUE;
-        protected $debug                = FALSE;
-        protected $conn_id      = FALSE;
+        private $hostname       = '';
+        private $username       = '';
+        private $password       = '';
+        private $port           = 21;
+        private $passive        = TRUE;
+        private $debug          = FALSE;
+        private $conn_id        = FALSE;
 
         /**
@@ -128 +128 @@
          * FTP Login
          *
-         * @access      protected
-         * @return      bool
-         */
-        protected function login()
+         * @access      private
+         * @return      bool
+         */
+        private function login()
         {
                 return @ftp_login($this->conn_id, $this->username, $this->password);
@@ -141 +141 @@
          * Validates the connection ID
          *
-         * @access      protected
-         * @return      bool
-         */
-        protected function is_conn()
+         * @access      private
+         * @return      bool
+         */
+        private function is_conn()
         {
                 if ( ! is_resource($this->conn_id))
@@ -540 +540 @@
          * Extract the file extension
          *
-         * @access      protected
+         * @access      private
          * @param       string
          * @return      string
          */
-        protected function get_extension($filename)
+        private function get_extension($filename)
         {
                 if (strpos($filename, '.') === FALSE)
@@ -561 +561 @@
          * Set the upload type
          *
-         * @access      protected
+         * @access      private
          * @param       string
          * @return      string
          */
-        protected function set_type($ext)
+        private function set_type($ext)
         {
                 $text_types = array(
@@ -613 +613 @@
          * Display error message
          *
-         * @access      protected
-         * @param       string
-         * @return      bool
-         */
-        protected function error($msg)
+         * @access      private
+         * @param       string
+         * @return      bool
+         */
+        private function error($msg)
         {
                 throw new Kohana_Exception('ftp.'.$msg);
@@ -623 +623 @@
 
 
-}
-// END FTP Class
-?>
+} // End FTP Class

trunk/system/libraries/User_agent.php

@@ -31 +31 @@
  * @subpackage  Libraries
  * @category    User Agent
- * @author              Rick Ellis
+ * @author              Rick Ellis, Kohana Team
  * @link                http://kohanaphp.com/user_guide/libraries/user_agent.html
  */
 class User_Agent_Core {
 
-        var $agent              = NULL;
-
-        var $is_browser = FALSE;
-        var $is_robot   = FALSE;
-        var $is_mobile  = FALSE;
-
-        var $languages  = array();
-        var $charsets   = array();
-
-        var $platforms  = array();
-        var $browsers   = array();
-        var $mobiles    = array();
-        var $robots             = array();
-
-        var $platform   = '';
-        var $browser    = '';
-        var $version    = '';
-        var $mobile             = '';
-        var $robot              = '';
+        private $agent          = NULL;
+
+        private $is_browser     = FALSE;
+        private $is_robot       = FALSE;
+        private $is_mobile      = FALSE;
+
+        private $languages      = array();
+        private $charsets       = array();
+
+        private $platforms      = array();
+        private $browsers       = array();
+        private $mobiles        = array();
+        private $robots         = array();
+
+        private $platform       = '';
+        private $browser        = '';
+        private $version        = '';
+        private $mobile         = '';
+        private $robot          = '';
+
 
         /**
@@ -73 +74 @@
                 if ( ! is_null($this->agent))
                 {
-                        if ($this->_load_agent_file())
+                        if ($this->load_agent_file())
                         {
-                                $this->_compile_data();
+                                $this->compile_data();
                         }
                 }
@@ -90 +91 @@
          * @return      bool
          */
-        private function _load_agent_file()
+        private function load_agent_file()
         {
                 $config = Config::item('user_agents');
@@ -139 +140 @@
          * @return      bool
          */
-        private function _compile_data()
-        {
-                $this->_set_platform();
-
-                foreach (array('_set_browser', '_set_robot', '_set_mobile') as $function)
+        private function compile_data()
+        {
+                $this->set_platform();
+
+                foreach (array('set_browser', 'set_robot', 'set_mobile') as $function)
                 {
                         if ($this->$function() === TRUE)
@@ -160 +161 @@
          * @return      mixed
          */
-        private function _set_platform()
+        private function set_platform()
         {
                 if (is_array($this->platforms) AND count($this->platforms) > 0)
@@ -184 +185 @@
          * @return      bool
          */
-        private function _set_browser()
+        private function set_browser()
         {
                 if (is_array($this->browsers) AND count($this->browsers) > 0)
@@ -195 +196 @@
                                         $this->version = $match[1];
                                         $this->browser = $val;
-                                        $this->_set_mobile();
+                                        $this->set_mobile();
                                         return TRUE;
                                 }
@@ -211 +212 @@
          * @return      bool
          */
-        private function _set_robot()
+        private function set_robot()
         {
                 if (is_array($this->robots) AND count($this->robots) > 0)
@@ -236 +237 @@
          * @return      bool
          */
-        private function _set_mobile()
+        private function set_mobile()
         {
                 if (is_array($this->mobiles) AND count($this->mobiles) > 0)
@@ -261 +262 @@
          * @return      void
          */
-        private function _set_languages()
+        private function set_languages()
         {
                 if ((count($this->languages) == 0) AND isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) AND $_SERVER['HTTP_ACCEPT_LANGUAGE'] != '')
@@ -284 +285 @@
          * @return      void
          */
-        private function _set_charsets()
+        private function set_charsets()
         {
                 if ((count($this->charsets) == 0) AND isset($_SERVER['HTTP_ACCEPT_CHARSET']) AND $_SERVER['HTTP_ACCEPT_CHARSET'] != '')
@@ -453 +454 @@
                 if (count($this->languages) == 0)
                 {
-                        $this->_set_languages();
+                        $this->set_languages();
                 }
 
@@ -471 +472 @@
                 if (count($this->charsets) == 0)
                 {
-                        $this->_set_charsets();
+                        $this->set_charsets();
                 }
 
@@ -502 +503 @@
                 return (in_array(strtolower($charset), $this->charsets(), TRUE)) ? TRUE : FALSE;
         }
-
-
-}
-
-?>
+        
+        // --------------------------------------------------------------------
+        
+        /**
+         * Returns the full user agent string when the object is turned into a string.
+         *
+         * @access public
+         * @return string
+         */
+        public function __toString() {
+                return $this->agent;
+        }
+        
+} //End User_agent class