Changeset 2799

Timestamp:

11/12/08 00:55:30 (2 months ago)

Author:

sean

Message:

make installer work with new String/SuperGlobals classes

Location:

branches/sginput/htdocs/system/classes

Files:

• actionhandler.php (modified) (2 diffs)
• installhandler.php (modified) (5 diffs)
• string.php (modified) (2 diffs)

branches/sginput/htdocs/system/classes/actionhandler.php

@@ -20 +20 @@
      * Internal array of handler variables (state info)
      * 
-     * @var array
+     * @var SuperGlobal
      */
-    public $handler_vars = array();
+    public $handler_vars;
+    
+    /**
+     * Constructor
+     *
+     * Initializes handler_vars
+     */
+    public function __construct() {
+        $this->handler_vars = new SuperGlobal(array());
+    }
 
     /**
@@ -76 +85 @@
      */
     public function __call($function, $args) {
-        $this->handler_vars = array_merge($this->handler_vars, $args);
+        $this->handler_vars = $this->handler_vars->merge($args);
         return $this->act($function);
     }

branches/sginput/htdocs/system/classes/installhandler.php

@@ -14 +14 @@
     public function act_begin_install()
     {
-        // Revert magic quotes, normally Controller calls this.
-        Utils::revert_magic_quotes_gpc();
-
         // Create a new theme to handle the display of the installer
         $this->theme = Themes::create('installer', 'RawPHPEngine', HABARI_PATH . '/system/installer/');
@@ -119 +116 @@
         // now merge in any HTTP POST values that might have been sent
         // these will override the defaults and the config.php values
-        $this->handler_vars = array_merge($this->handler_vars, $_POST);
+        $this->handler_vars = $this->handler_vars->merge($_POST);
 
         // we need details for the admin user to install
@@ -142 +139 @@
 
         // make sure the admin password is correct
-        if ( $this->handler_vars['admin_pass1'] !== $this->handler_vars['admin_pass2'] ) {
+        if ( (string)$this->handler_vars['admin_pass1'] !== (string)$this->handler_vars['admin_pass2'] ) {
             $this->theme->assign( 'form_errors', array('password_mismatch'=>_t('Password mis-match.')) );
             $this->display('db_setup');
@@ -518 +515 @@
         $admin_pass = $this->handler_vars['admin_pass1'];
 
-        if ($admin_pass{0} == '{') {
+        if ($admin_pass[0] == '{') {
             // looks like we might have a crypted password
             $password = $admin_pass;
@@ -677 +674 @@
             return false;
         }
-        $vars = array_map('addslashes', $this->handler_vars);
+        
+        $vars = array();
+        foreach ($this->handler_vars as $k => $v) {
+            $vars[$k] = addslashes($v);
+        }
+        $keys = array();
+        foreach (array_keys($vars) as $v) {
+            $keys[] = Utils::map_array($v);
+        }
         $file_contents = str_replace(
-            array_map(array('Utils', 'map_array'), array_keys($vars)),
+            $keys,
             $vars,
             $file_contents

branches/sginput/htdocs/system/classes/string.php

@@ -8 +8 @@
  */
 
-class String
+class String implements ArrayAccess
 {
     protected $string;
@@ -91 +91 @@
         return new String(call_user_func_array(array('Plugins', $filter), $args));
     }
+    
+    // ArrayAccess Implementation for (e.g.) $string[0]
+    
+    public function offsetExists($offset) {
+        return $offset >= 0 && $offset < strlen($this->string);
+    }
+    public function offsetGet($offset) {
+        return $this->string[$offset];
+    }
+    public function offsetSet($offset, $value) {
+        $this->string[$offset] = $value[0];
+    }
+    public function offsetUnset ($offset) {
+        throw new Exception('Cannot unset String offsets');
+    }
 }