Changeset 10004

Timestamp:

06/30/08 04:38:04 (5 years ago)

Author:

dwhittle

Message:

dwhittle: merged changes to branch

Files:

• branches/dwhittle/1.0/CHANGELOG (modified) (1 diff)
• branches/dwhittle/1.0/lib/VERSION (modified) (1 diff)
• branches/dwhittle/1.0/lib/config/sfViewConfigHandler.class.php (modified) (1 diff)
• branches/dwhittle/1.0/lib/controller/sfWebController.class.php (modified) (1 diff)
• branches/dwhittle/1.0/lib/request/sfWebRequest.class.php (modified) (2 diffs)
• branches/dwhittle/1.0/lib/response/sfWebResponse.class.php (modified) (1 diff)
• branches/dwhittle/1.0/lib/util/sfToolkit.class.php (modified) (2 diffs)
• branches/dwhittle/1.0/test/unit/controller/sfWebControllerTest.php (modified) (2 diffs)
• branches/dwhittle/1.0/test/unit/response/sfWebResponseTest.php (modified) (2 diffs)
• branches/dwhittle/1.1/CHANGELOG (modified) (1 diff)
• branches/dwhittle/1.1/lib/autoload/sfCoreAutoload.class.php (modified) (1 diff)
• branches/dwhittle/1.1/lib/controller/sfWebController.class.php (modified) (1 diff)
• branches/dwhittle/1.1/lib/helper/FormHelper.php (modified) (4 diffs)
• branches/dwhittle/1.1/lib/helper/JavascriptHelper.php (modified) (2 diffs)
• branches/dwhittle/1.1/lib/helper/TagHelper.php (modified) (1 diff)
• branches/dwhittle/1.1/lib/request/sfWebRequest.class.php (modified) (2 diffs)
• branches/dwhittle/1.1/test/unit/controller/sfWebControllerTest.php (modified) (2 diffs)
• branches/dwhittle/1.1/test/unit/response/sfWebResponseTest.php (modified) (2 diffs)
• branches/dwhittle/trunk (deleted)

branches/dwhittle/1.0/CHANGELOG

@@ -1 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-Version 1.0.16
--------------

branches/dwhittle/1.0/lib/VERSION

@@ -1 @@
-7
+8

branches/dwhittle/1.0/lib/config/sfViewConfigHandler.class.php

@@ -227 +227 @@
-    foreach ($this->mergeConfigValue('metas', $viewName) as $name => $content)
-    {
-entitie
+specialchar
-    }
-

branches/dwhittle/1.0/lib/controller/sfWebController.class.php

@@ -188 +188 @@
-      foreach ($matches as $match)
-      {
-$match[1][0]] = $match[2][0]
+urldecode($match[1][0])] = urldecode($match[2][0])
-      }
-

branches/dwhittle/1.0/lib/request/sfWebRequest.class.php

@@ -790 +790 @@
-    $pathArray = $this->getPathInfoArray();
-
-tripslashes
+fToolkit::stripslashesDeep
-  }
-
@@ -804 +804 @@
-    if (isset($_COOKIE[$name]))
-    {
-tripslashes
+fToolkit::stripslashesDeep
-    }
-

branches/dwhittle/1.0/lib/response/sfWebResponse.class.php

@@ -472 +472 @@
-    if ($escape)
-    {
-entitie
+specialchar
-    }
-

branches/dwhittle/1.0/lib/util/sfToolkit.class.php

@@ -447 +447 @@
-  }
-
-
+ByRef
-  {
-    if (false !== ($offset = strpos($name, '[')))
@@ -468 +468 @@
-          }
-          $array = &$array[substr($name, $pos + 1, $end - $pos - 1)];
+          $offset = $end;
+        }
+
+        return $array;
+      }
+    }
+
+    return $default;
+  }
+
+  public static function getArrayValueForPath($values, $name, $default = null)
+  {
+    if (false !== ($offset = strpos($name, '[')))
+    {
+      if (isset($values[substr($name, 0, $offset)]))
+      {
+        $array = $values[substr($name, 0, $offset)];
+
+        while ($pos = strpos($name, '[', $offset))
+        {
+          $end = strpos($name, ']', $pos);
+          if ($end == $pos + 1)
+          {
+            // reached a []
+            break;
+          }
+          else if (!isset($array[substr($name, $pos + 1, $end - $pos - 1)]))
+          {
+            return $default;
+          }
+          $array = $array[substr($name, $pos + 1, $end - $pos - 1)];
-          $offset = $end;
-        }

branches/dwhittle/1.0/test/unit/controller/sfWebControllerTest.php

@@ -12 +12 @@
-require_once($_test_dir.'/unit/sfContextMock.class.php');
-
-7
+8
-
-sfConfig::set('sf_max_forwards', 10);
@@ -125 +125 @@
-    ),
-  ),
+  '@test?id=foo%26bar&foo=bar%3Dfoo' => array(
+    'test',
+    array(
+      'id' => 'foo&bar',
+      'foo' => 'bar=foo',
+    ),
+  ),
-);
-

branches/dwhittle/1.0/test/unit/response/sfWebResponseTest.php

@@ -12 +12 @@
-require_once($_test_dir.'/unit/sfContextMock.class.php');
-
-5
+6
-
-class myWebResponse extends sfWebResponse
@@ -129 +129 @@
-$response->setTitle('my title');
-$t->is($response->getTitle(), 'my title', '->setTitle() sets the title');
+$response->setTitle('fööbäär');
+$t->is($response->getTitle(), 'fööbäär', '->setTitle() will leave encoding intact');
-
-// ->addHttpMeta()

branches/dwhittle/1.1/CHANGELOG

@@ +1 @@
+Version 1.1.0
+-------------
+
+* Fixed gpc_magic_qutes and array in cookie
+* Fixed convertUrlStringToParameters breaks urlencoded parameter
+* Fixed 404 page when raised by a non existant route
+* Fixed sfForm::toString() silence exceptions
+* Added sfSession::regenerate and added calls on authentication/credential change to protect against session fixation attacks
+* Fixed addSortCriteria case sensitive problem
+* Added the widget when calling the formatter for the sfWidgetDormSelectRadio widget
+* Added debug output from Phing when using -t
+* Fixed genurl() with relative_url_root parameter set
+* Fixed m2m propel data loading
+* Added a min and a max option for sfValidatorDate
+* Fixed PHPMailer issue with UTF-8 subject being wrapped in middle of utf-8 char
+* Fixed locking issues with the cache:clear, project:disable, project:enable, and log:rotate tasks
+* Fixed Propel behavior registration when using functional tests or built-in tasks
+* Added a retry mechanism to sfMessageSource_XLIFF->save() that will recreate incorrect xml files
+* Renamed sfForm::getFormField() to sfForm::getFormFieldSchema()
+* Fixed getColumnFilterTag() component type
+* Fixed identifier name length check for Propel Generator
+* Fixed CRUD templates when using the --with-show option 
+* Fixed generated admin returning to first page regardless on which page the edit was started
+* Fixed I18N timestamp handling
+* Added generation of a .zip file when creating a sandbox
+* Added sfValidatorTime
+* sfWebRequest->isSecure now recognizes HTTP_SSL_HTTPS
+* Fixed issue with incorrect calculation of uri prefix
+* Fixed i18n XLIFF do not handle entities correctly
+* Fixed sfMemcacheCache ignores multi-memcache-server configuration and defaults to localhost
+* Fixed symfony 1.1 task argument value of 0
+* Fixed error reporting value for the test environment and added a migration task
+* Re-added getCurrentRouteName to sfPatternRouting class
+* Fixed autoload paths on windows
+* Added extension depedencies to pear package
+* Disabled the autoloadAgain feature
+* Removed noXSD attribute from Propel
+* Fixed I18N-Bug in form_error() helper
+* Fixed custom schema for plugins are not found in Win32 environments
+* Added a throw_global_error to sfPropelValidatorUnique
+* Fixed session database storage classes
+* Fixed sfValidatorDate
+* Fixed propel:build-forms when using behaviors
+
-Version 1.1.0 RC2
-------------------

branches/dwhittle/1.1/lib/autoload/sfCoreAutoload.class.php

@@ -12 +12 @@
- * The current symfony version.
- */
-0
+1
-
-/**

branches/dwhittle/1.1/lib/controller/sfWebController.class.php

@@ -168 +168 @@
-      foreach ($matches as $match)
-      {
-$match[1][0]] = $match[2][0]
+urldecode($match[1][0])] = urldecode($match[2][0])
-      }
-

branches/dwhittle/1.1/lib/helper/FormHelper.php

@@ -298 +298 @@
- * Returns a <select> tag populated with all the currencies in the world (or almost).
- *
- 
- 
- 
- 
+
+
+
+
- * countries and cultures throughout the world. Here's an example of an <option> tag generated by the select_currency_tag:
- *
@@ -316 +316 @@
- * </code>
- *
- 
+
- * @param  string $selected  selected field value (threecharacter currency code)
- * @param  array  $options   additional HTML compliant <select> tag parameters
@@ -330 +330 @@
-  $currency_option = _get_option($options, 'currencies');
-  $display_option = _get_option($options, 'display');
-
+
-  foreach ($currencies as $key => $value)
-  {
@@ -961 +961 @@
-}
-
-/**
- * Returns a formatted ID based on the <i>$name</i> parameter and optionally the <i>$value</i> parameter.
- *
- * This function determines the proper form field ID name based on the parameters. If a form field has an
- * array value as a name we need to convert them to proper and unique IDs like so:
- * <samp>
- *  name[] => name (if value == null)
- *  name[] => name_value (if value != null)
- *  name[bob] => name_bob
- *  name[item][total] => name_item_total
- * </samp>
- *
- * <b>Examples:</b>
- * <code>
- *  echo get_id_from_name('status[]', '1');
- * </code>
- *
- * @param  string $name   field name
- * @param  string $value  field value
- *
- * @return string <select> tag populated with all the languages in the world.
- */
-function get_id_from_name($name, $value = null)
-{
-  // check to see if we have an array variable for a field name
-  if (strstr($name, '['))
-  {
-    $name = str_replace(array('[]', '][', '[', ']'), array((($value != null) ? '_'.$value : ''), '_', '_', ''), $name);
-  }
-
-  return $name;
-}
-
-
-/**
- * Converts specific <i>$options</i> to their correct HTML format
- *
- * @param  array $options
- * @return array returns properly formatted options
- */
-function _convert_options($options)
-{
-  $options = _parse_attributes($options);
-
-  foreach (array('disabled', 'readonly', 'multiple') as $attribute)
-  {
-    if (array_key_exists($attribute, $options))
-    {
-      if ($options[$attribute])
-      {
-        $options[$attribute] = $attribute;
-      }
-      else
-      {
-        unset($options[$attribute]);
-      }
-    }
-  }
-
-  return $options;
-}
-
-function _convert_include_custom_for_select($options, &$select_options)
-{

branches/dwhittle/1.1/lib/helper/JavascriptHelper.php

@@ -800 +800 @@
-}
-
-
-/**
- * wrapper for script.aculo.us/prototype Ajax.Autocompleter.
@@ -830 +829 @@
-  $tag_options['id'] = get_id_from_name(isset($tag_options['id']) ? $tag_options['id'] : $name);
-
-input_tag($name, $value, $tag_options
+tag('input', array_merge(array('type' => 'text', 'name' => $name, 'value' => $value), _convert_options($tag_options))
-  $javascript .= content_tag('div', '' , array('id' => $tag_options['id'].'_auto_complete', 'class' => 'auto_complete'));
-  $javascript .= _auto_complete_field($tag_options['id'], $url, $comp_options);

branches/dwhittle/1.1/lib/helper/TagHelper.php

@@ -124 +124 @@
-  return $value;
-}
+
+/**
+ * Returns a formatted ID based on the <i>$name</i> parameter and optionally the <i>$value</i> parameter.
+ *
+ * This function determines the proper form field ID name based on the parameters. If a form field has an
+ * array value as a name we need to convert them to proper and unique IDs like so:
+ * <samp>
+ *  name[] => name (if value == null)
+ *  name[] => name_value (if value != null)
+ *  name[bob] => name_bob
+ *  name[item][total] => name_item_total
+ * </samp>
+ *
+ * <b>Examples:</b>
+ * <code>
+ *  echo get_id_from_name('status[]', '1');
+ * </code>
+ *
+ * @param  string $name   field name 
+ * @param  string $value  field value
+ *
+ * @return string <select> tag populated with all the languages in the world.
+ */
+function get_id_from_name($name, $value = null)
+{
+  // check to see if we have an array variable for a field name
+  if (strstr($name, '['))
+  {
+    $name = str_replace(array('[]', '][', '[', ']'), array((($value != null) ? '_'.$value : ''), '_', '_', ''), $name);
+  }
+
+  return $name;
+}
+
+/**
+ * Converts specific <i>$options</i> to their correct HTML format
+ *
+ * @param  array $options
+ * @return array returns properly formatted options 
+ */
+function _convert_options($options)
+{
+  $options = _parse_attributes($options);
+
+  foreach (array('disabled', 'readonly', 'multiple') as $attribute)
+  {
+    if (array_key_exists($attribute, $options))
+    {
+      if ($options[$attribute])
+      {
+        $options[$attribute] = $attribute;
+      }
+      else
+      {
+        unset($options[$attribute]);
+      }
+    }
+  }
+
+  return $options;
+}

branches/dwhittle/1.1/lib/request/sfWebRequest.class.php

@@ -801 +801 @@
-    $pathArray = $this->getPathInfoArray();
-
-tripslashes
+fToolkit::stripslashesDeep
-  }
-
@@ -818 +818 @@
-    if (isset($_COOKIE[$name]))
-    {
-tripslashes
+fToolkit::stripslashesDeep
-    }
-

branches/dwhittle/1.1/test/unit/controller/sfWebControllerTest.php

@@ -12 +12 @@
-require_once($_test_dir.'/unit/sfContextMock.class.php');
-
-5
+6
-
-$_SERVER['HTTP_HOST'] = 'localhost';
@@ -132 +132 @@
-    ),
-  ),
+  '@test?id=foo%26bar&foo=bar%3Dfoo' => array(
+    'test',
+    array(
+      'id' => 'foo&bar',
+      'foo' => 'bar=foo',
+    ),
+  ),
-);
-

branches/dwhittle/1.1/test/unit/response/sfWebResponseTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-2
+3
-
-class myWebResponse extends sfWebResponse
@@ -134 +134 @@
-$response->setTitle('my title');
-$t->is($response->getTitle(), 'my title', '->setTitle() sets the title');
+$response->setTitle('fööbäär');
+$t->is($response->getTitle(), 'fööbäär', '->setTitle() will leave encoding intact');
-
-// ->addHttpMeta()