Menu
▾
▴
[Gemstracker-svn] SF.net SVN: gemstracker:[516] trunk/library/classes/MUtil/Html
|
From: <gem...@li...> - 2012-02-28 16:37:05
|
Revision: 516
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=516&view=rev
Author: matijsdejong
Date: 2012-02-28 16:36:56 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
Solved encoding problem in url's
Added IFrame element
Modified Paths:
--------------
trunk/library/classes/MUtil/Html/AElement.php
trunk/library/classes/MUtil/Html/Creator.php
trunk/library/classes/MUtil/Html/UrlArrayAttribute.php
Added Paths:
-----------
trunk/library/classes/MUtil/Html/IFrame.php
Modified: trunk/library/classes/MUtil/Html/AElement.php
===================================================================
--- trunk/library/classes/MUtil/Html/AElement.php 2012-02-23 15:40:31 UTC (rev 515)
+++ trunk/library/classes/MUtil/Html/AElement.php 2012-02-28 16:36:56 UTC (rev 516)
@@ -36,7 +36,7 @@
*/
/**
- * Class for A/link element. Assumes first passed argument is the href attribute,
+ * Class for A link element. Assumes first passed argument is the href attribute,
* unless specified otherwise.
*
* @package MUtil
@@ -45,7 +45,6 @@
* @license New BSD License
* @since Class available since version 1.0
*/
-
class MUtil_Html_AElement extends MUtil_Html_HtmlElement
{
public $renderWithoutContent = true;
Modified: trunk/library/classes/MUtil/Html/Creator.php
===================================================================
--- trunk/library/classes/MUtil/Html/Creator.php 2012-02-23 15:40:31 UTC (rev 515)
+++ trunk/library/classes/MUtil/Html/Creator.php 2012-02-28 16:36:56 UTC (rev 516)
@@ -91,6 +91,7 @@
'if' => 'MUtil_Lazy::iff',
'iflink' => 'MUtil_Html_AElement::iflink',
'ifmail' => 'MUtil_Html_AElement::ifmail',
+ 'iframe' => 'MUtil_Html_IFrameElement::iFrame',
'img' => 'MUtil_Html_ImgElement::img',
'image' => 'MUtil_Html_ImgElement::img',
'input' => 'MUtil_Html_InputRenderer::input',
Added: trunk/library/classes/MUtil/Html/IFrame.php
===================================================================
--- trunk/library/classes/MUtil/Html/IFrame.php (rev 0)
+++ trunk/library/classes/MUtil/Html/IFrame.php 2012-02-28 16:36:56 UTC (rev 516)
@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * Copyright (c) 2011, Erasmus MC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Erasmus MC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * @package MUtil
+ * @subpackage Html
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id: AElement.php 515 2012-02-23 15:40:31Z matijsdejong $
+ */
+
+/**
+ * Class for IFRAME element. Assumes first passed argument is the src attribute,
+ * unless specified otherwise. Always specifies closing tag.
+ *
+ * @package MUtil
+ * @subpackage Html
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.5.2
+ */
+class MUtil_Html_IFrame extends MUtil_Html_HtmlElement
+{
+ /**
+ * Some elements, e.g. iframe elements, must always be rendered with a closing
+ * tag because otherwise some poor browsers get confused.
+ *
+ * Overrules $renderWithoutContent: the element is always rendered when
+ * $renderClosingTag is true.
+ *
+ * @see $renderWithoutContent
+ *
+ * @var boolean The element is always rendered with a closing tag.
+ */
+ public $renderClosingTag = true;
+
+ /**
+ * An iframe element.
+ *
+ * Any extra parameters are added as either content, attributes or handled
+ * as special types, if defined as such for this element.
+ *
+ * @param mixed $src We assume the first element is src, unless a later element is explicitly specified as such
+ * @param mixed $arg_array MUtil_Ra::args arguments
+ */
+ public function __construct($src, $arg_array = null)
+ {
+ $args = MUtil_Ra::args(func_get_args(), array('src' => 'MUtil_Html_SrcArrayAttribute'));
+
+ if (isset($args['src']) && (! $args['src'] instanceof MUtil_Html_AttributeInterface)) {
+ $args['src'] = new MUtil_Html_SrcArrayAttribute($args['src']);
+ }
+
+ parent::__construct('iframe', $args);
+ }
+
+ /**
+ * Static helper function to create an iframe element.
+ *
+ * Any extra parameters are added as either content, attributes or handled
+ * as special types, if defined as such for this element.
+ *
+ * @param mixed $src We assume the first element is src, unless a later element is explicitly specified as such
+ * @param mixed $arg_array MUtil_Ra::args arguments
+ */
+ public static function iFrame($src, $arg_array = null)
+ {
+ $args = MUtil_Ra::args(func_get_args(), array('src' => 'MUtil_Html_SrcArrayAttribute'));
+ return new self($args);
+ }
+}
Modified: trunk/library/classes/MUtil/Html/UrlArrayAttribute.php
===================================================================
--- trunk/library/classes/MUtil/Html/UrlArrayAttribute.php 2012-02-23 15:40:31 UTC (rev 515)
+++ trunk/library/classes/MUtil/Html/UrlArrayAttribute.php 2012-02-28 16:36:56 UTC (rev 516)
@@ -1,34 +1,34 @@
<?php
-
-/**
- * Copyright (c) 2011, Erasmus MC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Erasmus MC nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
+
/**
+ * Copyright (c) 2011, Erasmus MC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Erasmus MC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
* @author Matijs de Jong
* @since 1.0
* @version 1.1
@@ -62,7 +62,9 @@
if (is_numeric($key)) {
$url_string .= $value;
} else {
- $url_parameters[$key] = $value;
+ // Prevent double escaping by using rawurlencode() instead
+ // of urlencode() that is used by Zend_Controller_Router_Route
+ $url_parameters[$key] = rawurlencode($value);
}
}
@@ -83,7 +85,7 @@
// Make sure controllor, action, module are specified
$url_parameters = self::rerouteUrl($this->getRequest(), $url_parameters);
- return $this->getView()->url($url_parameters, null, $this->getRouteReset());
+ return $this->getView()->url($url_parameters, null, $this->getRouteReset(), false);
}
return null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
