Skip to content
This repository has been archived by the owner on Jan 8, 2020. It is now read-only.

Commit

Permalink
Merge branch 'feature/form-upload-progress' into develop
Browse files Browse the repository at this point in the history
Close #3058
  • Loading branch information
weierophinney committed Dec 10, 2012
2 parents c2a89e4 + 0d89b4f commit 33dc18a
Show file tree
Hide file tree
Showing 14 changed files with 313 additions and 329 deletions.
42 changes: 0 additions & 42 deletions library/Zend/Form/Element/File/ApcProgress.php

This file was deleted.

42 changes: 0 additions & 42 deletions library/Zend/Form/Element/File/SessionProgress.php

This file was deleted.

68 changes: 0 additions & 68 deletions library/Zend/Form/Element/File/UploadProgress.php

This file was deleted.

30 changes: 30 additions & 0 deletions library/Zend/Form/View/Helper/File/FormFileApcProgress.php
@@ -0,0 +1,30 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Form
*/

namespace Zend\Form\View\Helper\File;

/**
* A view helper to render the hidden input with a Session progress id
* for file uploads progress tracking.
*
* @category Zend
* @package Zend_Form
* @subpackage View
*/
class FormFileApcProgress extends FormFileUploadProgress
{
/**
* @return string
*/
protected function getName()
{
return ini_get('apc.rfc1867_name');
}
}
30 changes: 30 additions & 0 deletions library/Zend/Form/View/Helper/File/FormFileSessionProgress.php
@@ -0,0 +1,30 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Form
*/

namespace Zend\Form\View\Helper\File;

/**
* A view helper to render the hidden input with a Session progress id
* for file uploads progress tracking.
*
* @category Zend
* @package Zend_Form
* @subpackage View
*/
class FormFileSessionProgress extends FormFileUploadProgress
{
/**
* @return string
*/
protected function getName()
{
return ini_get('session.upload_progress.name');
}
}
74 changes: 74 additions & 0 deletions library/Zend/Form/View/Helper/File/FormFileUploadProgress.php
@@ -0,0 +1,74 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Form
*/

namespace Zend\Form\View\Helper\File;

use Zend\Form\ElementInterface;
use Zend\Form\View\Helper\FormInput;

/**
* A view helper to render the hidden input with a UploadProgress id
* for file uploads progress tracking.
*
* @category Zend
* @package Zend_Form
* @subpackage View
*/
class FormFileUploadProgress extends FormInput
{
/**
* Invoke helper as functor
*
* Proxies to {@link render()}.
*
* @param ElementInterface|null $element
* @return string
*/
public function __invoke(ElementInterface $element = null)
{
return $this->renderHiddenId();
}

/**
* Render a hidden form <input> element with the progress id
*
* @return string
*/
public function renderHiddenId()
{
$attributes = array();
$attributes['id'] = 'progress_key';
$attributes['name'] = $this->getName();
$attributes['type'] = 'hidden';
$attributes['value'] = $this->getValue();

return sprintf(
'<input %s%s',
$this->createAttributesString($attributes),
$this->getInlineClosingBracket()
);
}

/**
* @return string
*/
protected function getName()
{
return 'UPLOAD_IDENTIFIER';
}

/**
* @return string
*/
protected function getValue()
{
return uniqid();
}
}
97 changes: 50 additions & 47 deletions library/Zend/Form/View/HelperConfig.php
Expand Up @@ -26,53 +26,56 @@ class HelperConfig implements ConfigInterface
* @var array Pre-aliased view helpers
*/
protected $invokables = array(
'form' => 'Zend\Form\View\Helper\Form',
'formbutton' => 'Zend\Form\View\Helper\FormButton',
'formcaptcha' => 'Zend\Form\View\Helper\FormCaptcha',
'captchadumb' => 'Zend\Form\View\Helper\Captcha\Dumb',
'formcaptchadumb' => 'Zend\Form\View\Helper\Captcha\Dumb',
'captchafiglet' => 'Zend\Form\View\Helper\Captcha\Figlet',
'formcaptchafiglet' => 'Zend\Form\View\Helper\Captcha\Figlet',
'captchaimage' => 'Zend\Form\View\Helper\Captcha\Image',
'formcaptchaimage' => 'Zend\Form\View\Helper\Captcha\Image',
'captcharecaptcha' => 'Zend\Form\View\Helper\Captcha\ReCaptcha',
'formcaptcharecaptcha' => 'Zend\Form\View\Helper\Captcha\ReCaptcha',
'formcheckbox' => 'Zend\Form\View\Helper\FormCheckbox',
'formcollection' => 'Zend\Form\View\Helper\FormCollection',
'formcolor' => 'Zend\Form\View\Helper\FormColor',
'formdate' => 'Zend\Form\View\Helper\FormDate',
'formdatetime' => 'Zend\Form\View\Helper\FormDateTime',
'formdatetimelocal' => 'Zend\Form\View\Helper\FormDateTimeLocal',
'formdatetimeselect' => 'Zend\Form\View\Helper\FormDateTimeSelect',
'formdateselect' => 'Zend\Form\View\Helper\FormDateSelect',
'formelement' => 'Zend\Form\View\Helper\FormElement',
'formelementerrors' => 'Zend\Form\View\Helper\FormElementErrors',
'formemail' => 'Zend\Form\View\Helper\FormEmail',
'formfile' => 'Zend\Form\View\Helper\FormFile',
'formhidden' => 'Zend\Form\View\Helper\FormHidden',
'formimage' => 'Zend\Form\View\Helper\FormImage',
'forminput' => 'Zend\Form\View\Helper\FormInput',
'formlabel' => 'Zend\Form\View\Helper\FormLabel',
'formmonth' => 'Zend\Form\View\Helper\FormMonth',
'formmonthselect' => 'Zend\Form\View\Helper\FormMonthSelect',
'formmulticheckbox' => 'Zend\Form\View\Helper\FormMultiCheckbox',
'formnumber' => 'Zend\Form\View\Helper\FormNumber',
'formpassword' => 'Zend\Form\View\Helper\FormPassword',
'formradio' => 'Zend\Form\View\Helper\FormRadio',
'formrange' => 'Zend\Form\View\Helper\FormRange',
'formreset' => 'Zend\Form\View\Helper\FormReset',
'form_reset' => 'Zend\Form\View\Helper\FormReset',
'formrow' => 'Zend\Form\View\Helper\FormRow',
'form_row' => 'Zend\Form\View\Helper\FormRow',
'formsearch' => 'Zend\Form\View\Helper\FormSearch',
'formselect' => 'Zend\Form\View\Helper\FormSelect',
'formsubmit' => 'Zend\Form\View\Helper\FormSubmit',
'formtel' => 'Zend\Form\View\Helper\FormTel',
'formtext' => 'Zend\Form\View\Helper\FormText',
'formtextarea' => 'Zend\Form\View\Helper\FormTextarea',
'formtime' => 'Zend\Form\View\Helper\FormTime',
'formurl' => 'Zend\Form\View\Helper\FormUrl',
'formweek' => 'Zend\Form\View\Helper\FormWeek',
'form' => 'Zend\Form\View\Helper\Form',
'formbutton' => 'Zend\Form\View\Helper\FormButton',
'formcaptcha' => 'Zend\Form\View\Helper\FormCaptcha',
'captchadumb' => 'Zend\Form\View\Helper\Captcha\Dumb',
'formcaptchadumb' => 'Zend\Form\View\Helper\Captcha\Dumb',
'captchafiglet' => 'Zend\Form\View\Helper\Captcha\Figlet',
'formcaptchafiglet' => 'Zend\Form\View\Helper\Captcha\Figlet',
'captchaimage' => 'Zend\Form\View\Helper\Captcha\Image',
'formcaptchaimage' => 'Zend\Form\View\Helper\Captcha\Image',
'captcharecaptcha' => 'Zend\Form\View\Helper\Captcha\ReCaptcha',
'formcaptcharecaptcha' => 'Zend\Form\View\Helper\Captcha\ReCaptcha',
'formcheckbox' => 'Zend\Form\View\Helper\FormCheckbox',
'formcollection' => 'Zend\Form\View\Helper\FormCollection',
'formcolor' => 'Zend\Form\View\Helper\FormColor',
'formdate' => 'Zend\Form\View\Helper\FormDate',
'formdatetime' => 'Zend\Form\View\Helper\FormDateTime',
'formdatetimelocal' => 'Zend\Form\View\Helper\FormDateTimeLocal',
'formdatetimeselect' => 'Zend\Form\View\Helper\FormDateTimeSelect',
'formdateselect' => 'Zend\Form\View\Helper\FormDateSelect',
'formelement' => 'Zend\Form\View\Helper\FormElement',
'formelementerrors' => 'Zend\Form\View\Helper\FormElementErrors',
'formemail' => 'Zend\Form\View\Helper\FormEmail',
'formfile' => 'Zend\Form\View\Helper\FormFile',
'formfileapcprogress' => 'Zend\Form\View\Helper\File\FormFileApcProgress',
'formfilesessionprogress' => 'Zend\Form\View\Helper\File\FormFileSessionProgress',
'formfileuploadprogress' => 'Zend\Form\View\Helper\File\FormFileUploadProgress',
'formhidden' => 'Zend\Form\View\Helper\FormHidden',
'formimage' => 'Zend\Form\View\Helper\FormImage',
'forminput' => 'Zend\Form\View\Helper\FormInput',
'formlabel' => 'Zend\Form\View\Helper\FormLabel',
'formmonth' => 'Zend\Form\View\Helper\FormMonth',
'formmonthselect' => 'Zend\Form\View\Helper\FormMonthSelect',
'formmulticheckbox' => 'Zend\Form\View\Helper\FormMultiCheckbox',
'formnumber' => 'Zend\Form\View\Helper\FormNumber',
'formpassword' => 'Zend\Form\View\Helper\FormPassword',
'formradio' => 'Zend\Form\View\Helper\FormRadio',
'formrange' => 'Zend\Form\View\Helper\FormRange',
'formreset' => 'Zend\Form\View\Helper\FormReset',
'form_reset' => 'Zend\Form\View\Helper\FormReset',
'formrow' => 'Zend\Form\View\Helper\FormRow',
'form_row' => 'Zend\Form\View\Helper\FormRow',
'formsearch' => 'Zend\Form\View\Helper\FormSearch',
'formselect' => 'Zend\Form\View\Helper\FormSelect',
'formsubmit' => 'Zend\Form\View\Helper\FormSubmit',
'formtel' => 'Zend\Form\View\Helper\FormTel',
'formtext' => 'Zend\Form\View\Helper\FormText',
'formtextarea' => 'Zend\Form\View\Helper\FormTextarea',
'formtime' => 'Zend\Form\View\Helper\FormTime',
'formurl' => 'Zend\Form\View\Helper\FormUrl',
'formweek' => 'Zend\Form\View\Helper\FormWeek',
);

/**
Expand Down

0 comments on commit 33dc18a

Please sign in to comment.