pieforms-commit Mailing List for Pieforms
Status: Alpha
Brought to you by:
oracleshinoda
Menu
▾
▴
pieforms-commit — Commit messages for Pieforms
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(73) |
Dec
(83) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(16) |
Feb
(19) |
Mar
(12) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
(14) |
Sep
(2) |
Oct
(1) |
Nov
(2) |
Dec
(45) |
| 2008 |
Jan
(20) |
Feb
(3) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
(1) |
Nov
(1) |
Dec
(1) |
| 2009 |
Jan
(2) |
Feb
(2) |
Mar
|
Apr
(2) |
May
(1) |
Jun
(5) |
Jul
(1) |
Aug
(2) |
Sep
(1) |
Oct
|
Nov
(7) |
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ora...@us...> - 2010-05-24 00:09:40
|
Revision: 323
http://pieforms.svn.sourceforge.net/pieforms/?rev=323&view=rev
Author: oracleshinoda
Date: 2010-05-24 00:09:33 +0000 (Mon, 24 May 2010)
Log Message:
-----------
Merged changes from Mahara's copy of pieforms - antispam and XSS prevention mostly
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform/elements/bytes.php
pieforms-php5/trunk/src/pieform/elements/date.php
pieforms-php5/trunk/src/pieform/elements/expiry.php
pieforms-php5/trunk/src/pieform/elements/fieldset.php
pieforms-php5/trunk/src/pieform/elements/radio.php
pieforms-php5/trunk/src/pieform/elements/select.php
pieforms-php5/trunk/src/pieform/renderers/div.php
pieforms-php5/trunk/src/pieform/renderers/multicolumntable.php
pieforms-php5/trunk/src/pieform/renderers/oneline.php
pieforms-php5/trunk/src/pieform.php
pieforms-php5/trunk/src/static/core/pieforms.js
pieforms-php5/trunk/src/static/jscalendar/calendar.js
pieforms-php5/trunk/src/static/jscalendar/calendar_stripped.js
pieforms-php5/trunk/src/static/jscalendar/img.gif
pieforms-php5/trunk/src/static/jscalendar/menuarrow.gif
pieforms-php5/trunk/src/static/jscalendar/menuarrow2.gif
pieforms-php5/trunk/src/static/jscalendar/skins/aqua/active-bg.gif
pieforms-php5/trunk/src/static/jscalendar/skins/aqua/dark-bg.gif
pieforms-php5/trunk/src/static/jscalendar/skins/aqua/hover-bg.gif
pieforms-php5/trunk/src/static/jscalendar/skins/aqua/menuarrow.gif
pieforms-php5/trunk/src/static/jscalendar/skins/aqua/normal-bg.gif
pieforms-php5/trunk/src/static/jscalendar/skins/aqua/rowhover-bg.gif
pieforms-php5/trunk/src/static/jscalendar/skins/aqua/status-bg.gif
pieforms-php5/trunk/src/static/jscalendar/skins/aqua/title-bg.gif
pieforms-php5/trunk/src/static/jscalendar/skins/aqua/today-bg.gif
Modified: pieforms-php5/trunk/src/pieform/elements/bytes.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/bytes.php 2009-11-27 02:11:04 UTC (rev 322)
+++ pieforms-php5/trunk/src/pieform/elements/bytes.php 2010-05-24 00:09:33 UTC (rev 323)
@@ -35,7 +35,7 @@
function pieform_element_bytes(Pieform $form, $element) {/*{{{*/
$formname = $form->get_name();
$result = '';
- $name = $element['name'];
+ $name = Pieform::hsc($element['name']);
if (!isset($element['defaultvalue'])) {
$element['defaultvalue'] = null;
}
@@ -67,11 +67,11 @@
// Same with the select. And do the events using mochikit signal instead of dom events
$numberinput = '<input';
$numberinput .= ' type="text" size="6" name="' . $name . '"';
- $numberinput .= ' id="' . $formname . '_' . $name . '" value="' . $values['number'] . '" tabindex="' . $element['tabindex'] . '"';
+ $numberinput .= ' id="' . $formname . '_' . $name . '" value="' . Pieform::hsc($values['number']) . '" tabindex="' . Pieform::hsc($element['tabindex']) . '"';
$numberinput .= (isset($element['error']) ? ' class="error"' : '') . ">\n";
$uselect = '<select onchange="' . $name . '_change()" ';
- $uselect .= 'name="' . $name . '_units" id="' . $formname . '_' . $name . '_units"' . ' tabindex="' . $element['tabindex'] . "\">\n";
+ $uselect .= 'name="' . $name . '_units" id="' . $formname . '_' . $name . '_units"' . ' tabindex="' . Pieform::hsc($element['tabindex']) . "\">\n";
foreach (pieform_element_bytes_get_bytes_units() as $u) {
$uselect .= "\t<option value=\"$u\"" . (($values['units'] == $u) ? ' selected="selected"' : '') . '>'
. $form->i18n('element', 'bytes', $u, $element) . "</option>\n";
Modified: pieforms-php5/trunk/src/pieform/elements/date.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/date.php 2009-11-27 02:11:04 UTC (rev 322)
+++ pieforms-php5/trunk/src/pieform/elements/date.php 2010-05-24 00:09:33 UTC (rev 323)
@@ -33,7 +33,7 @@
*/
function pieform_element_date(Pieform $form, $element) {/*{{{*/
$result = '';
- $name = $element['name'];
+ $name = Pieform::hsc($element['name']);
$element['minyear'] = (isset($element['minyear'])) ? intval($element['minyear']) : 1950;
$element['maxyear'] = (isset($element['maxyear'])) ? intval($element['maxyear']) : 2050;
$required = (!empty($element['rules']['required']));
@@ -45,7 +45,7 @@
$value = pieform_element_date_get_timeperiod_value('year', $element['minyear'], $element['maxyear'], $element, $form);
$year = '<select name="' . $name . '_year" id="' . $name . '_year"'
. (!$required && !isset($element['defaultvalue']) ? ' disabled="disabled"' : '')
- . ' tabindex="' . $element['tabindex'] . "\">\n";
+ . ' tabindex="' . Pieform::hsc($element['tabindex']) . "\">\n";
for ($i = $element['minyear']; $i <= $element['maxyear']; $i++) {
$year .= "\t<option value=\"$i\"" . (($value == $i) ? ' selected="selected"' : '') . ">$i</option>\n";
}
@@ -55,9 +55,10 @@
$value = pieform_element_date_get_timeperiod_value('month', 1, 12, $element, $form);
$month = '<select name="' . $name . '_month" id="' . $name . '_month"'
. (!$required && !isset($element['defaultvalue']) ? ' disabled="disabled"' : '')
- . ' tabindex="' . $element['tabindex'] . "\">\n";
+ . ' tabindex="' . Pieform::hsc($element['tabindex']) . "\">\n";
+ $monthnames = explode(',', $form->i18n('element', 'date', 'monthnames', $element));
for ($i = 1; $i <= 12; $i++) {
- $month .= "\t<option value=\"$i\"" . (($value == $i) ? ' selected="selected"' : '') . '>' . date('M', strtotime("2000-$i-01")) . "</option>\n";
+ $month .= "\t<option value=\"$i\"" . (($value == $i) ? ' selected="selected"' : '') . '>' . $monthnames[$i-1] . "</option>\n";
}
$month .= "</select>\n";
@@ -65,7 +66,7 @@
$value = pieform_element_date_get_timeperiod_value('day', 1, 31, $element, $form);
$day = '<select name="' . $name . '_day" id="' . $name . '_day"'
. (!$required && !isset($element['defaultvalue']) ? ' disabled="disabled"' : '')
- . ' tabindex="' . $element['tabindex'] . "\">\n";
+ . ' tabindex="' . Pieform::hsc($element['tabindex']) . "\">\n";
for ($i = 1; $i <= 31; $i++) {
$day .= "\t<option value=\"$i\"" . (($value == $i) ? ' selected="selected"' : '') . ">$i</option>\n";
}
@@ -97,7 +98,7 @@
$optional .= ' ' . $form->i18n('element', 'date', 'or', $element) . ' <input type="checkbox" '
. (isset($element['defaultvalue']) ? '' : 'checked="checked" ')
. 'name="' . $name . '_optional" id="' . $name . '_optional" onchange="' . $name . '_toggle(this)" '
- . 'tabindex="' . $element['tabindex'] . '">';
+ . 'tabindex="' . Pieform::hsc($element['tabindex']) . '">';
$optional .= ' <label for="' . $name . '_optional">' . $form->i18n('element', 'date', 'notspecified', $element);
$result .= $optional;
@@ -131,34 +132,44 @@
return array(
'en.utf8' => array(
'or' => 'or',
+ 'monthnames' => 'January,February,March,April,May,June,July,August,September,October,November,December',
'notspecified' => 'Not specified'
),
'de.utf8' => array(
'or' => 'oder',
+ 'monthnames' => 'Januar,Februar,März,April,Mai,Juni,Juli,August,September,Oktober,November,Dezember',
'notspecified' => 'Nicht festgelegt'
),
'fr.utf8' => array(
'or' => 'ou',
+ 'monthnames' => 'janvier,février,mars,avril,mai,juin,juillet,août,septembre,octobre,novembre,décembre',
'notspecified' => 'Non indiqué'
),
'ja.utf8' => array(
'or' => 'or',
+ 'monthnames' => '一月,二月,三月,四月,五月,六月,七月,八月,九月,十月,十一月,十二月',
'notspecified' => '指定なし'
),
'es.utf8' => array(
'or' => 'o',
+ 'monthnames' => 'enero,febrero,marzo,abril,mayo,junio,julio,agosto,septiembre,octubre,noviembre,diciembre',
'notspecified' => 'Sin valor'
),
'sl.utf8' => array(
'or' => 'ali',
+ 'monthnames' => 'januar,febuar,marec,april,maj,junij,julij,avgust,september,oktober,november,december',
+ // standardized set of archaic Slovenian month names
+ //'monthnames' => 'prosinec,svečan,sušec,mali traven,veliki traven,rožnik,mali srpan,veliki srpan,kimovec,vinotok,listopad,gruden',
'notspecified' => 'Ni določeno'
),
'nl.utf8' => array(
'or' => 'or',
+ 'monthnames' => 'januari,februari,mart,april,mei,juni,juli,augustus,september,october,november,december',
'notspecified' => 'Niet gespecifiëerd'
),
'cs.utf8' => array(
'or' => 'nebo',
+ 'monthnames' => 'leden,únor,březen,duben,květen,červen,červenec,srpen,září,říjen,listopad,prosinec',
'notspecified' => 'Neurčeno'
),
'zh_tw.utf8' => array(
Modified: pieforms-php5/trunk/src/pieform/elements/expiry.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/expiry.php 2009-11-27 02:11:04 UTC (rev 322)
+++ pieforms-php5/trunk/src/pieform/elements/expiry.php 2010-05-24 00:09:33 UTC (rev 323)
@@ -35,7 +35,7 @@
function pieform_element_expiry(Pieform $form, $element) {/*{{{*/
$formname = $form->get_name();
$result = '';
- $name = $element['name'];
+ $name = Pieform::hsc($element['name']);
if (!isset($element['defaultvalue'])) {
$element['defaultvalue'] = null;
}
@@ -68,11 +68,11 @@
$numberinput = '<input';
$numberinput .= ($values['units'] == 'noenddate' && empty($element['rules']['required'])) ? ' disabled="disabled"' : '';
$numberinput .= ' type="text" size="4" name="' . $name . '"';
- $numberinput .= ' id="' . $formname . '_' . $name . '" value="' . $values['number'] . '" tabindex="' . $element['tabindex'] . '"';
+ $numberinput .= ' id="' . $formname . '_' . $name . '" value="' . Pieform::hsc($values['number']) . '" tabindex="' . Pieform::hsc($element['tabindex']) . '"';
$numberinput .= (isset($element['error']) ? ' class="error"' : '') . ">\n";
$uselect = '<select onchange="' . $name . '_change()" ';
- $uselect .= 'name="' . $name . '_units" id="' . $formname . '_' . $name . '_units"' . ' tabindex="' . $element['tabindex'] . "\">\n";
+ $uselect .= 'name="' . $name . '_units" id="' . $formname . '_' . $name . '_units"' . ' tabindex="' . Pieform::hsc($element['tabindex']) . "\">\n";
foreach (pieform_element_expire_get_expiry_units() as $u) {
// Don't allow 'no end date' if the element is required
if ($u == 'noenddate' && !empty($element['rules']['required'])) {
Modified: pieforms-php5/trunk/src/pieform/elements/fieldset.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/fieldset.php 2009-11-27 02:11:04 UTC (rev 322)
+++ pieforms-php5/trunk/src/pieform/elements/fieldset.php 2010-05-24 00:09:33 UTC (rev 323)
@@ -51,7 +51,7 @@
$classes[] = 'collapsed';
}
if (!empty($element['class'])) {
- $classes[] = $element['class'];
+ $classes[] = Pieform::hsc($element['class']);
}
$result .= ' class="' . implode(' ', $classes) . '"';
}
@@ -69,6 +69,16 @@
else {
$result .= '>' . Pieform::hsc($element['legend']);
}
+ // Help icon
+ if (!empty($element['help'])) {
+ $function = $form->get_property('helpcallback');
+ if (function_exists($function)) {
+ $result .= $function($form, $element);
+ }
+ else {
+ $result .= '<span class="help"><a href="" title="' . Pieform::hsc($element['help']) . '" onclick="return false;">?</a></span>';
+ }
+ }
$result .= "</legend>\n";
}
Modified: pieforms-php5/trunk/src/pieform/elements/radio.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/radio.php 2009-11-27 02:11:04 UTC (rev 322)
+++ pieforms-php5/trunk/src/pieform/elements/radio.php 2010-05-24 00:09:33 UTC (rev 323)
@@ -61,7 +61,7 @@
. ' value="' . Pieform::hsc($value) . '"'
. (($form_value == $value) ? ' checked="checked"' : '')
. '> <label for="' . $form->get_name() . '_' . $uid . '">' . Pieform::hsc($text) . "</label>"
- . ($description != '' ? '<div class="radio-description">' . $description . '</div>' : '')
+ . ($description != '' ? '<div class="radio-description">' . Pieform::hsc($description) . '</div>' : '')
. $separator;
}
$result = substr($result, 0, -strlen($separator));
Modified: pieforms-php5/trunk/src/pieform/elements/select.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/select.php 2009-11-27 02:11:04 UTC (rev 322)
+++ pieforms-php5/trunk/src/pieform/elements/select.php 2010-05-24 00:09:33 UTC (rev 323)
@@ -51,7 +51,7 @@
if (is_array($value)) {
$value = $value['value'];
}
- $result = $value . '<input type="hidden" name="' . $element['name'] . '" value="' . $key . '">';
+ $result = $value . '<input type="hidden" name="' . Pieform::hsc($element['name']) . '" value="' . Pieform::hsc($key) . '">';
}
return $result;
}
Modified: pieforms-php5/trunk/src/pieform/renderers/div.php
===================================================================
--- pieforms-php5/trunk/src/pieform/renderers/div.php 2009-11-27 02:11:04 UTC (rev 322)
+++ pieforms-php5/trunk/src/pieform/renderers/div.php 2010-05-24 00:09:33 UTC (rev 323)
@@ -36,10 +36,10 @@
// Set the class of the enclosing <div> to match that of the element
$result = '<div';
if (isset($element['name'])) {
- $result .= ' id="' . $formname . '_' . $element['name'] . '_container"';
+ $result .= ' id="' . $formname . '_' . Pieform::hsc($element['name']) . '_container"';
}
if (!empty($element['class'])) {
- $result .= ' class="' . $element['class'] . '"';
+ $result .= ' class="' . Pieform::hsc($element['class']) . '"';
}
$result .= '>';
@@ -57,11 +57,11 @@
// Description - optional description of the element, or other note that should be visible
// on the form itself (without the user having to hover over contextual help
if ((!$form->has_errors() || $form->get_property('showdescriptiononerror')) && !empty($element['description'])) {
- $result .= '<div class="description"> ' . Pieform::hsc($element['description']) . "</div>";
+ $result .= '<div class="description"> ' . $element['description'] . "</div>";
}
if (!empty($element['error'])) {
- $result .= '<div class="errmsg">' . Pieform::hsc($element['error']) . '</div>';
+ $result .= '<div class="errmsg">' . $element['error'] . '</div>';
}
$result .= "</div>\n";
Modified: pieforms-php5/trunk/src/pieform/renderers/multicolumntable.php
===================================================================
--- pieforms-php5/trunk/src/pieform/renderers/multicolumntable.php 2009-11-27 02:11:04 UTC (rev 322)
+++ pieforms-php5/trunk/src/pieform/renderers/multicolumntable.php 2010-05-24 00:09:33 UTC (rev 323)
@@ -91,7 +91,7 @@
$result .= "\t<tr";
// Set the class of the enclosing <tr> to match that of the element
if ($data['settings']['class']) {
- $result .= ' class="' . $data['settings']['class'] . '"';
+ $result .= ' class="' . Pieform::hsc($data['settings']['class']) . '"';
}
$result .= ">\n\t\t";
@@ -108,10 +108,10 @@
$rawelement = $data['rawelements'][$k];
$result .= "\t<td";
if (isset($rawelement['name'])) {
- $result .= " id=\"" . $this->form->get_name() . '_' . $rawelement['name'] . '_container"';
+ $result .= " id=\"" . $this->form->get_name() . '_' . Pieform::hsc($rawelement['name']) . '_container"';
}
if ($rawelement['class']) {
- $result .= ' class="' . $rawelement['class'] . '"';
+ $result .= ' class="' . Pieform::hsc($rawelement['class']) . '"';
}
$result .= '>';
Modified: pieforms-php5/trunk/src/pieform/renderers/oneline.php
===================================================================
--- pieforms-php5/trunk/src/pieform/renderers/oneline.php 2009-11-27 02:11:04 UTC (rev 322)
+++ pieforms-php5/trunk/src/pieform/renderers/oneline.php 2010-05-24 00:09:33 UTC (rev 323)
@@ -44,10 +44,10 @@
// Set the class of the enclosing <div> to match that of the element
$result = '<span';
if (isset($element['name'])) {
- $result .= ' id="' . $formname . '_' . $element['name'] . '_container"';
+ $result .= ' id="' . $formname . '_' . Pieform::hsc($element['name']) . '_container"';
}
if (!empty($element['class'])) {
- $result .= ' class="' . $element['class'] . '"';
+ $result .= ' class="' . Pieform::hsc($element['class']) . '"';
}
$result .= '>';
Modified: pieforms-php5/trunk/src/pieform.php
===================================================================
--- pieforms-php5/trunk/src/pieform.php 2009-11-27 02:11:04 UTC (rev 322)
+++ pieforms-php5/trunk/src/pieform.php 2010-05-24 00:09:33 UTC (rev 323)
@@ -239,6 +239,90 @@
throw new PieformException('Forms must have a list of elements');
}
+ if (isset($this->data['spam'])) {
+ // Enable form tricks to make it harder for bots to fill in the form.
+ // This was moved from lib/antispam.php, see:
+ // http://wiki.mahara.org/Developer_Area/Specifications_in_Development/Anti-spam#section_7
+ //
+ // Use the spam_error() method in your _validate function to check whether a submitted form
+ // has failed any of these checks.
+ //
+ // Available options:
+ // - hash: An array of element names to be hashed. Currently ids of input elements
+ // are also hashed, so you need to be careful if you include 'elementname' in
+ // the hash array, and make sure you rewrite any css or js so it doesn't rely on
+ // an id like 'formname_elementname'.
+ // - secret: String used to hash the fields.
+ // - mintime: Minimum number of seconds that must pass between page load & form submission.
+ // - maxtime: Maximum number of seconds that must pass between page load & form submission.
+ // - reorder: Array of element names to be reordered at random.
+ if (empty($this->data['spam']['secret']) || !isset($this->data['elements']['submit'])) {
+ // @todo don't rely on submit element
+ throw new PieformException('Forms with spam config must have a secret and submit element');
+ }
+ $this->time = isset($_POST['__timestamp']) ? $_POST['__timestamp'] : time();
+ $spamelements1 = array(
+ '__invisiblefield' => array(
+ 'type' => 'text',
+ 'title' => get_string('spamtrap'),
+ 'defaultvalue' => '',
+ 'class' => 'dontshow',
+ ),
+ );
+ $spamelements2 = array(
+ '__timestamp' => array(
+ 'type' => 'hidden',
+ 'value' => $this->time,
+ ),
+ '__invisiblesubmit' => array(
+ 'type' => 'submit',
+ 'value' => get_string('spamtrap'),
+ 'class' => 'dontshow',
+ ),
+ );
+ $insert = rand(0, count($this->data['elements']));
+ $this->data['elements'] = array_merge(
+ array_slice($this->data['elements'], 0, $insert, true),
+ $spamelements1,
+ array_slice($this->data['elements'], $insert, count($this->data['elements']) - $insert, true),
+ $spamelements2
+ );
+
+ // Min & max number of seconds between page load & submission
+ if (!isset($this->data['spam']['mintime'])) {
+ $this->data['spam']['mintime'] = 0.01;
+ }
+ if (!isset($this->data['spam']['maxtime'])) {
+ $this->data['spam']['maxtime'] = 86400;
+ }
+
+ if (empty($this->data['spam']['hash'])) {
+ $this->data['spam']['hash'] = array();
+ }
+ $this->data['spam']['hash'][] = '__invisiblefield';
+ $this->data['spam']['hash'][] = '__invisiblesubmit';
+ $this->hash_fieldnames();
+
+ if (isset($this->data['spam']['reorder'])) {
+ // Reorder form fields randomly
+ $order = $this->data['spam']['reorder'];
+ shuffle($order);
+ $order = array_combine($this->data['spam']['reorder'], $order);
+ $temp = array();
+ foreach (array_keys($this->data['elements']) as $k) {
+ if (isset($order[$k])) {
+ $temp[$order[$k]] = $this->data['elements'][$order[$k]];
+ }
+ else {
+ $temp[$k] = $this->data['elements'][$k];
+ }
+ }
+ $this->data['elements'] = $temp;
+ }
+
+ $this->spamerror = false;
+ }
+
// Get references to all the elements in the form, excluding fieldsets
foreach ($this->data['elements'] as $name => &$element) {
// The name can be in the element itself. This is compatibility for
@@ -267,7 +351,7 @@
$this->elementrefs[$name] = &$element;
}
- $element['name'] = $name;
+ $element['name'] = isset($this->hashedfields[$name]) ? $this->hashedfields[$name] : $name;
}
unset($element);
@@ -360,6 +444,11 @@
$element['autofocus'] = true;
}
+ if (!empty($element['autofocus']) && $element['type'] == 'text' && !empty($this->data['autoselect'])
+ && $name == $this->data['autoselect']) {
+ $element['autoselect'] = true;
+ }
+
// All elements inherit the form tabindex
$element['tabindex'] = $this->data['tabindex'];
}
@@ -412,9 +501,9 @@
// Submit the form if things went OK
if ($this->data['submit'] && !$this->has_errors()) {
$submitted = false;
- foreach ($this->elementrefs as $element) {
+ foreach ($this->elementrefs as $name => $element) {
if (!empty($element['submitelement']) && isset($global[$element['name']])) {
- $function = "{$this->data['successcallback']}_{$element['name']}";
+ $function = "{$this->data['successcallback']}_{$name}";
if (function_exists($function)) {
$function($this, $values);
$submitted = true;
@@ -530,17 +619,20 @@
$result .= ' error';
}
if (isset($this->data['class'])) {
- $result .= ' ' . $this->data['class'];
+ $result .= ' ' . self::hsc($this->data['class']);
}
$result .= '"';
foreach (array('name', 'method', 'action') as $attribute) {
- $result .= ' ' . $attribute . '="' . $this->data[$attribute] . '"';
+ $result .= ' ' . $attribute . '="' . self::hsc($this->data[$attribute]) . '"';
}
$result .= ' id="' . $this->name . '"';
if ($this->fileupload) {
$result .= ' enctype="multipart/form-data"';
}
$result .= '>';
+ if (!empty($this->error)) {
+ $result .= '<div class="error">' . $this->error . '</div>';
+ }
return $result;
}/*}}}*/
@@ -814,6 +906,9 @@
else if (is_string($replacehtml)) {
$data['replaceHTML'] = $replacehtml;
}
+ if (isset($this->hashedfields)) {
+ $data['fieldnames'] = $this->hashedfields;
+ }
$result = json_encode($data);
@@ -857,7 +952,11 @@
* @throws PieformException If the element could not be found
*/
public function set_error($name, $message) {/*{{{*/
- foreach ($this->data['elements'] as &$element) {
+ if (is_null($name) && !empty($message)) {
+ $this->error = $message;
+ return;
+ }
+ foreach ($this->data['elements'] as $key => &$element) {
if ($element['type'] == 'fieldset') {
foreach ($element['elements'] as &$subelement) {
if ($subelement['name'] == $name) {
@@ -867,7 +966,7 @@
}
}
else {
- if ($element['name'] == $name) {
+ if ($key == $name) {
$element['error'] = $message;
return;
}
@@ -887,7 +986,7 @@
return true;
}
}
- return false;
+ return isset($this->error);
}/*}}}*/
/**
@@ -943,7 +1042,7 @@
public function make_class($element) {/*{{{*/
$classes = array();
if (isset($element['class'])) {
- $classes[] = $element['class'];
+ $classes[] = self::hsc($element['class']);
}
if (!empty($element['rules']['required'])) {
$classes[] = 'required';
@@ -954,6 +1053,9 @@
if ($this->data['elementclasses']) {
$classes[] = $element['type'];
}
+ if (!empty($element['autoselect'])) {
+ $classes[] = 'autoselect';
+ }
// Please make sure that 'autofocus' is the last class added in this
// method. Otherwise, improve the logic for removing 'autofocus' from
// the element class string in pieform_render_element
@@ -1028,6 +1130,10 @@
throw new PieformException("The type \"$type\" is not allowed for an include plugin");
}
+ if (!isset($name) || !preg_match('/^[a-z_][a-z0-9_]*$/', $name)) {
+ throw new PieformException("The name \"$name\" is not valid (validity test: could you give a PHP function the name?)");
+ }
+
// Check the configured include paths if they are specified
foreach ($this->data['configdirs'] as $directory) {
$file = "$directory/{$type}s/$name.php";
@@ -1065,6 +1171,14 @@
throw new PieformException("Invalid plugin name '$plugin'");
}
+ if (!isset($pluginname) || !preg_match('/^[a-z_][a-z0-9_]*$/', $pluginname)) {
+ throw new PieformException("The pluginname \"$pluginname\" is not valid (validity test: could you give a PHP function the name?)");
+ }
+
+ if (!isset($key) || !preg_match('/^[a-z_][a-z0-9_]*$/', $key)) {
+ throw new PieformException("The key \"$key\" is not valid (validity test: could you give a PHP function the name?)");
+ }
+
// Check the element itself for the language string
if ($plugin == 'rule' && isset($element['rulei18n'][$key])) {
return $element['rulei18n'][$key];
@@ -1143,7 +1257,7 @@
private function get_submitted_values() {/*{{{*/
$result = array();
$global = ($this->data['method'] == 'get') ? $_GET : $_POST;
- foreach ($this->elementrefs as $element) {
+ foreach ($this->elementrefs as $name => $element) {
if ($element['type'] != 'markup') {
if (
(empty($element['submitelement']) && empty($element['cancelelement'])) ||
@@ -1152,7 +1266,7 @@
&& isset($global[$element['name']])
)
) {
- $result[$element['name']] = $this->get_value($element);
+ $result[$name] = $this->get_value($element);
}
}
}
@@ -1179,10 +1293,10 @@
}
// Perform rule validation
- foreach ($this->elementrefs as $element) {
+ foreach ($this->elementrefs as $name => $element) {
if (isset($element['rules']) && is_array($element['rules'])) {
foreach ($element['rules'] as $rule => $data) {
- if (!$this->get_error($element['name'])) {
+ if (!$this->get_error($name)) {
// See if this element has a function that describes
// how this rule should apply to it
$function = 'pieform_element_' . $element['type'] . '_rule_' . $rule;
@@ -1196,14 +1310,30 @@
}
}
}
- if ($error = $function($this, $values[$element['name']], $element, $data)) {
- $this->set_error($element['name'], $error);
+ if ($error = $function($this, $values[$name], $element, $data)) {
+ $this->set_error($name, $error);
}
}
}
}
}
+ if (isset($this->data['spam'])) {
+ // make sure the user waited long enough but not too long before submitting the form
+ $elapsed = time() - $values['__timestamp'];
+ if ($elapsed < $this->data['spam']['mintime'] || $elapsed > $this->data['spam']['maxtime']) {
+ $this->spamerror = true;
+ }
+ // make sure the real submit button was used. If it wasn't, it won't exist.
+ else if (!isset($values['submit']) || isset($values['__invisiblesubmit'])) {
+ $this->spamerror = true;
+ }
+ // make sure the invisible field is empty
+ else if (!isset($values['__invisiblefield']) || $values['__invisiblefield'] != '') {
+ $this->spamerror = true;
+ }
+ }
+
// Then user specific validation if a function is available for that
$function = $this->data['validatecallback'];
if (is_callable($function)) {
@@ -1424,6 +1554,31 @@
);
}/*}}}*/
+ private function hash_fieldnames() {/*{{{*/
+ // Mess with field names to make it harder for bots to fill in the form
+ $ip = self::get_ip();
+ $secret = $this->data['spam']['secret'];
+ $this->hashedfields = array();
+ foreach ($this->data['spam']['hash'] as $name) {
+ // prefix the hash with an underscore to ensure it is always a valid pieforms element name
+ $this->hashedfields[$name] = '_' . sha1($name . $this->time . $ip . $secret);
+ }
+ }/*}}}*/
+
+ private static function get_ip() {/*{{{*/
+ if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
+ return $_SERVER['HTTP_CLIENT_IP'];
+ }
+ if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+ return $_SERVER['HTTP_X_FORWARDED_FOR'];
+ }
+ return $_SERVER['REMOTE_ADDR'];
+ }/*}}}*/
+
+ public function spam_error() {/*{{{*/
+ return $this->spamerror;
+ }/*}}}*/
+
}/*}}}*/
Modified: pieforms-php5/trunk/src/static/core/pieforms.js
===================================================================
--- pieforms-php5/trunk/src/static/core/pieforms.js 2009-11-27 02:11:04 UTC (rev 322)
+++ pieforms-php5/trunk/src/static/core/pieforms.js 2010-05-24 00:09:33 UTC (rev 323)
@@ -49,8 +49,12 @@
}
forEach(check, function(form) {
var element = getFirstElementByTagAndClassName(null, 'autofocus', form);
- if (element && typeof(element.focus) == 'function') {
+ if (element && (typeof(element.focus) == 'function' || (element.focus && element.focus.call))) {
element.focus();
+ if (hasElementClass(element, 'autoselect')
+ && (typeof(element.select) == 'function' || (element.focus && element.select.call))) {
+ element.select();
+ }
throw MochiKit.Iter.StopIteration;
}
});
Modified: pieforms-php5/trunk/src/static/jscalendar/calendar.js
===================================================================
--- pieforms-php5/trunk/src/static/jscalendar/calendar.js 2009-11-27 02:11:04 UTC (rev 322)
+++ pieforms-php5/trunk/src/static/jscalendar/calendar.js 2010-05-24 00:09:33 UTC (rev 323)
@@ -1790,14 +1790,16 @@
return str;
};
-Date.prototype.__msh_oldSetFullYear = Date.prototype.setFullYear;
-Date.prototype.setFullYear = function(y) {
- var d = new Date(this);
- d.__msh_oldSetFullYear(y);
- if (d.getMonth() != this.getMonth())
- this.setDate(28);
- this.__msh_oldSetFullYear(y);
-};
+if (!Date.prototype.__msh_oldSetFullYear) {
+ Date.prototype.__msh_oldSetFullYear = Date.prototype.setFullYear;
+ Date.prototype.setFullYear = function(y) {
+ var d = new Date(this);
+ d.__msh_oldSetFullYear(y);
+ if (d.getMonth() != this.getMonth())
+ this.setDate(28);
+ this.__msh_oldSetFullYear(y);
+ };
+}
// END: DATE OBJECT PATCHES
Modified: pieforms-php5/trunk/src/static/jscalendar/calendar_stripped.js
===================================================================
--- pieforms-php5/trunk/src/static/jscalendar/calendar_stripped.js 2009-11-27 02:11:04 UTC (rev 322)
+++ pieforms-php5/trunk/src/static/jscalendar/calendar_stripped.js 2010-05-24 00:09:33 UTC (rev 323)
@@ -11,4 +11,4 @@
* This script is distributed under the GNU Lesser General Public License.
* Read the entire license text here: http://www.gnu.org/licenses/lgpl.html
*/
- Calendar=function(firstDayOfWeek,dateStr,onSelected,onClose){this.activeDiv=null;this.currentDateEl=null;this.getDateStatus=null;this.getDateToolTip=null;this.getDateText=null;this.timeout=null;this.onSelected=onSelected||null;this.onClose=onClose||null;this.dragging=false;this.hidden=false;this.minYear=1970;this.maxYear=2050;this.dateFormat=Calendar._TT["DEF_DATE_FORMAT"];this.ttDateFormat=Calendar._TT["TT_DATE_FORMAT"];this.isPopup=true;this.weekNumbers=true;this.firstDayOfWeek=typeof firstDayOfWeek=="number"?firstDayOfWeek:Calendar._FD;this.showsOtherMonths=false;this.dateStr=dateStr;this.ar_days=null;this.showsTime=false;this.time24=true;this.yearStep=2;this.hiliteToday=true;this.multiple=null;this.table=null;this.element=null;this.tbody=null;this.firstdayname=null;this.monthsCombo=null;this.yearsCombo=null;this.hilitedMonth=null;this.activeMonth=null;this.hilitedYear=null;this.activeYear=null;this.dateClicked=false;if(typeof Calendar._SDN=="undefined"){if(typeof Calendar._SDN_len=="undefined")Calendar._SDN_len=3;var ar=new Array();for(var i=8;i>0;){ar[--i]=Calendar._DN[i].substr(0,Calendar._SDN_len);}Calendar._SDN=ar;if(typeof Calendar._SMN_len=="undefined")Calendar._SMN_len=3;ar=new Array();for(var i=12;i>0;){ar[--i]=Calendar._MN[i].substr(0,Calendar._SMN_len);}Calendar._SMN=ar;}};Calendar._C=null;Calendar.is_ie=(/msie/i.test(navigator.userAgent)&&!/opera/i.test(navigator.userAgent));Calendar.is_ie5=(Calendar.is_ie&&/msie 5\.0/i.test(navigator.userAgent));Calendar.is_opera=/opera/i.test(navigator.userAgent);Calendar.is_khtml=/Konqueror|Safari|KHTML/i.test(navigator.userAgent);Calendar.getAbsolutePos=function(el){var SL=0,ST=0;var is_div=/^div$/i.test(el.tagName);if(is_div&&el.scrollLeft)SL=el.scrollLeft;if(is_div&&el.scrollTop)ST=el.scrollTop;var r={x:el.offsetLeft-SL,y:el.offsetTop-ST};if(el.offsetParent){var tmp=this.getAbsolutePos(el.offsetParent);r.x+=tmp.x;r.y+=tmp.y;}return r;};Calendar.isRelated=function(el,evt){var related=evt.relatedTarget;if(!related){var type=evt.type;if(type=="mouseover"){related=evt.fromElement;}else if(type=="mouseout"){related=evt.toElement;}}while(related){if(related==el){return true;}related=related.parentNode;}return false;};Calendar.removeClass=function(el,className){if(!(el&&el.className)){return;}var cls=el.className.split(" ");var ar=new Array();for(var i=cls.length;i>0;){if(cls[--i]!=className){ar[ar.length]=cls[i];}}el.className=ar.join(" ");};Calendar.addClass=function(el,className){Calendar.removeClass(el,className);el.className+=" "+className;};Calendar.getElement=function(ev){var f=Calendar.is_ie?window.event.srcElement:ev.currentTarget;while(f.nodeType!=1||/^div$/i.test(f.tagName))f=f.parentNode;return f;};Calendar.getTargetElement=function(ev){var f=Calendar.is_ie?window.event.srcElement:ev.target;while(f.nodeType!=1)f=f.parentNode;return f;};Calendar.stopEvent=function(ev){ev||(ev=window.event);if(Calendar.is_ie){ev.cancelBubble=true;ev.returnValue=false;}else{ev.preventDefault();ev.stopPropagation();}return false;};Calendar.addEvent=function(el,evname,func){if(el.attachEvent){el.attachEvent("on"+evname,func);}else if(el.addEventListener){el.addEventListener(evname,func,true);}else{el["on"+evname]=func;}};Calendar.removeEvent=function(el,evname,func){if(el.detachEvent){el.detachEvent("on"+evname,func);}else if(el.removeEventListener){el.removeEventListener(evname,func,true);}else{el["on"+evname]=null;}};Calendar.createElement=function(type,parent){var el=null;if(document.createElementNS){el=document.createElementNS("http://www.w3.org/1999/xhtml",type);}else{el=document.createElement(type);}if(typeof parent!="undefined"){parent.appendChild(el);}return el;};Calendar._add_evs=function(el){with(Calendar){addEvent(el,"mouseover",dayMouseOver);addEvent(el,"mousedown",dayMouseDown);addEvent(el,"mouseout",dayMouseOut);if(is_ie){addEvent(el,"dblclick",dayMouseDblClick);el.setAttribute("unselectable",true);}}};Calendar.findMonth=function(el){if(typeof el.month!="undefined"){return el;}else if(typeof el.parentNode.month!="undefined"){return el.parentNode;}return null;};Calendar.findYear=function(el){if(typeof el.year!="undefined"){return el;}else if(typeof el.parentNode.year!="undefined"){return el.parentNode;}return null;};Calendar.showMonthsCombo=function(){var cal=Calendar._C;if(!cal){return false;}var cal=cal;var cd=cal.activeDiv;var mc=cal.monthsCombo;if(cal.hilitedMonth){Calendar.removeClass(cal.hilitedMonth,"hilite");}if(cal.activeMonth){Calendar.removeClass(cal.activeMonth,"active");}var mon=cal.monthsCombo.getElementsByTagName("div")[cal.date.getMonth()];Calendar.addClass(mon,"active");cal.activeMonth=mon;var s=mc.style;s.display="block";if(cd.navtype<0)s.left=cd.offsetLeft+"px";else{var mcw=mc.offsetWidth;if(typeof mcw=="undefined")mcw=50;s.left=(cd.offsetLeft+cd.offsetWidth-mcw)+"px";}s.top=(cd.offsetTop+cd.offsetHeight)+"px";};Calendar.showYearsCombo=function(fwd){var cal=Calendar._C;if(!cal){return false;}var cal=cal;var cd=cal.activeDiv;var yc=cal.yearsCombo;if(cal.hilitedYear){Calendar.removeClass(cal.hilitedYear,"hilite");}if(cal.activeYear){Calendar.removeClass(cal.activeYear,"active");}cal.activeYear=null;var Y=cal.date.getFullYear()+(fwd?1:-1);var yr=yc.firstChild;var show=false;for(var i=12;i>0;--i){if(Y>=cal.minYear&&Y<=cal.maxYear){yr.innerHTML=Y;yr.year=Y;yr.style.display="block";show=true;}else{yr.style.display="none";}yr=yr.nextSibling;Y+=fwd?cal.yearStep:-cal.yearStep;}if(show){var s=yc.style;s.display="block";if(cd.navtype<0)s.left=cd.offsetLeft+"px";else{var ycw=yc.offsetWidth;if(typeof ycw=="undefined")ycw=50;s.left=(cd.offsetLeft+cd.offsetWidth-ycw)+"px";}s.top=(cd.offsetTop+cd.offsetHeight)+"px";}};Calendar.tableMouseUp=function(ev){var cal=Calendar._C;if(!cal){return false;}if(cal.timeout){clearTimeout(cal.timeout);}var el=cal.activeDiv;if(!el){return false;}var target=Calendar.getTargetElement(ev);ev||(ev=window.event);Calendar.removeClass(el,"active");if(target==el||target.parentNode==el){Calendar.cellClick(el,ev);}var mon=Calendar.findMonth(target);var date=null;if(mon){date=new Date(cal.date);if(mon.month!=date.getMonth()){date.setMonth(mon.month);cal.setDate(date);cal.dateClicked=false;cal.callHandler();}}else{var year=Calendar.findYear(target);if(year){date=new Date(cal.date);if(year.year!=date.getFullYear()){date.setFullYear(year.year);cal.setDate(date);cal.dateClicked=false;cal.callHandler();}}}with(Calendar){removeEvent(document,"mouseup",tableMouseUp);removeEvent(document,"mouseover",tableMouseOver);removeEvent(document,"mousemove",tableMouseOver);cal._hideCombos();_C=null;return stopEvent(ev);}};Calendar.tableMouseOver=function(ev){var cal=Calendar._C;if(!cal){return;}var el=cal.activeDiv;var target=Calendar.getTargetElement(ev);if(target==el||target.parentNode==el){Calendar.addClass(el,"hilite active");Calendar.addClass(el.parentNode,"rowhilite");}else{if(typeof el.navtype=="undefined"||(el.navtype!=50&&(el.navtype==0||Math.abs(el.navtype)>2)))Calendar.removeClass(el,"active");Calendar.removeClass(el,"hilite");Calendar.removeClass(el.parentNode,"rowhilite");}ev||(ev=window.event);if(el.navtype==50&&target!=el){var pos=Calendar.getAbsolutePos(el);var w=el.offsetWidth;var x=ev.clientX;var dx;var decrease=true;if(x>pos.x+w){dx=x-pos.x-w;decrease=false;}else dx=pos.x-x;if(dx<0)dx=0;var range=el._range;var current=el._current;var count=Math.floor(dx/10)%range.length;for(var i=range.length;--i>=0;)if(range[i]==current)break;while(count-->0)if(decrease){if(--i<0)i=range.length-1;}else if(++i>=range.length)i=0;var newval=range[i];el.innerHTML=newval;cal.onUpdateTime();}var mon=Calendar.findMonth(target);if(mon){if(mon.month!=cal.date.getMonth()){if(cal.hilitedMonth){Calendar.removeClass(cal.hilitedMonth,"hilite");}Calendar.addClass(mon,"hilite");cal.hilitedMonth=mon;}else if(cal.hilitedMonth){Calendar.removeClass(cal.hilitedMonth,"hilite");}}else{if(cal.hilitedMonth){Calendar.removeClass(cal.hilitedMonth,"hilite");}var year=Calendar.findYear(target);if(year){if(year.year!=cal.date.getFullYear()){if(cal.hilitedYear){Calendar.removeClass(cal.hilitedYear,"hilite");}Calendar.addClass(year,"hilite");cal.hilitedYear=year;}else if(cal.hilitedYear){Calendar.removeClass(cal.hilitedYear,"hilite");}}else if(cal.hilitedYear){Calendar.removeClass(cal.hilitedYear,"hilite");}}return Calendar.stopEvent(ev);};Calendar.tableMouseDown=function(ev){if(Calendar.getTargetElement(ev)==Calendar.getElement(ev)){return Calendar.stopEvent(ev);}};Calendar.calDragIt=function(ev){var cal=Calendar._C;if(!(cal&&cal.dragging)){return false;}var posX;var posY;if(Calendar.is_ie){posY=window.event.clientY+document.body.scrollTop;posX=window.event.clientX+document.body.scrollLeft;}else{posX=ev.pageX;posY=ev.pageY;}cal.hideShowCovered();var st=cal.element.style;st.left=(posX-cal.xOffs)+"px";st.top=(posY-cal.yOffs)+"px";return Calendar.stopEvent(ev);};Calendar.calDragEnd=function(ev){var cal=Calendar._C;if(!cal){return false;}cal.dragging=false;with(Calendar){removeEvent(document,"mousemove",calDragIt);removeEvent(document,"mouseup",calDragEnd);tableMouseUp(ev);}cal.hideShowCovered();};Calendar.dayMouseDown=function(ev){var el=Calendar.getElement(ev);if(el.disabled){return false;}var cal=el.calendar;cal.activeDiv=el;Calendar._C=cal;if(el.navtype!=300)with(Calendar){if(el.navtype==50){el._current=el.innerHTML;addEvent(document,"mousemove",tableMouseOver);}else addEvent(document,Calendar.is_ie5?"mousemove":"mouseover",tableMouseOver);addClass(el,"hilite active");addEvent(document,"mouseup",tableMouseUp);}else if(cal.isPopup){cal._dragStart(ev);}if(el.navtype==-1||el.navtype==1){if(cal.timeout)clearTimeout(cal.timeout);cal.timeout=setTimeout("Calendar.showMonthsCombo()",250);}else if(el.navtype==-2||el.navtype==2){if(cal.timeout)clearTimeout(cal.timeout);cal.timeout=setTimeout((el.navtype>0)?"Calendar.showYearsCombo(true)":"Calendar.showYearsCombo(false)",250);}else{cal.timeout=null;}return Calendar.stopEvent(ev);};Calendar.dayMouseDblClick=function(ev){Calendar.cellClick(Calendar.getElement(ev),ev||window.event);if(Calendar.is_ie){document.selection.empty();}};Calendar.dayMouseOver=function(ev){var el=Calendar.getElement(ev);if(Calendar.isRelated(el,ev)||Calendar._C||el.disabled){return false;}if(el.ttip){if(el.ttip.substr(0,1)=="_"){el.ttip=el.caldate.print(el.calendar.ttDateFormat)+el.ttip.substr(1);}el.calendar.tooltips.innerHTML=el.ttip;}if(el.navtype!=300){Calendar.addClass(el,"hilite");if(el.caldate){Calendar.addClass(el.parentNode,"rowhilite");}}return Calendar.stopEvent(ev);};Calendar.dayMouseOut=function(ev){with(Calendar){var el=getElement(ev);if(isRelated(el,ev)||_C||el.disabled)return false;removeClass(el,"hilite");if(el.caldate)removeClass(el.parentNode,"rowhilite");if(el.calendar)el.calendar.tooltips.innerHTML=_TT["SEL_DATE"];return stopEvent(ev);}};Calendar.cellClick=function(el,ev){var cal=el.calendar;var closing=false;var newdate=false;var date=null;if(typeof el.navtype=="undefined"){if(cal.currentDateEl){Calendar.removeClass(cal.currentDateEl,"selected");Calendar.addClass(el,"selected");closing=(cal.currentDateEl==el);if(!closing){cal.currentDateEl=el;}}cal.date.setDateOnly(el.caldate);date=cal.date;var other_month=!(cal.dateClicked=!el.otherMonth);if(!other_month&&!cal.currentDateEl)cal._toggleMultipleDate(new Date(date));else newdate=!el.disabled;if(other_month)cal._init(cal.firstDayOfWeek,date);}else{if(el.navtype==200){Calendar.removeClass(el,"hilite");cal.callCloseHandler();return;}date=new Date(cal.date);if(el.navtype==0)date.setDateOnly(new Date());cal.dateClicked=false;var year=date.getFullYear();var mon=date.getMonth();function setMonth(m){var day=date.getDate();var max=date.getMonthDays(m);if(day>max){date.setDate(max);}date.setMonth(m);};switch(el.navtype){case 400:Calendar.removeClass(el,"hilite");var text=Calendar._TT["ABOUT"];if(typeof text!="undefined"){text+=cal.showsTime?Calendar._TT["ABOUT_TIME"]:"";}else{text="Help and about box text is not translated into this language.\n"+"If you know this language and you feel generous please update\n"+"the corresponding file in \"lang\" subdir to match calendar-en.js\n"+"and send it back to <mih...@ya...> to get it into the distribution ;-)\n\n"+"Thank you!\n"+"http://dynarch.com/mishoo/calendar.epl\n";}alert(text);return;case-2:if(year>cal.minYear){date.setFullYear(year-1);}break;case-1:if(mon>0){setMonth(mon-1);}else if(year-->cal.minYear){date.setFullYear(year);setMonth(11);}break;case 1:if(mon<11){setMonth(mon+1);}else if(year<cal.maxYear){date.setFullYear(year+1);setMonth(0);}break;case 2:if(year<cal.maxYear){date.setFullYear(year+1);}break;case 100:cal.setFirstDayOfWeek(el.fdow);return;case 50:var range=el._range;var current=el.innerHTML;for(var i=range.length;--i>=0;)if(range[i]==current)break;if(ev&&ev.shiftKey){if(--i<0)i=range.length-1;}else if(++i>=range.length)i=0;var newval=range[i];el.innerHTML=newval;cal.onUpdateTime();return;case 0:if((typeof cal.getDateStatus=="function")&&cal.getDateStatus(date,date.getFullYear(),date.getMonth(),date.getDate())){return false;}break;}if(!date.equalsTo(cal.date)){cal.setDate(date);newdate=true;}else if(el.navtype==0)newdate=closing=true;}if(newdate){ev&&cal.callHandler();}if(closing){Calendar.removeClass(el,"hilite");ev&&cal.callCloseHandler();}};Calendar.prototype.create=function(_par){var parent=null;if(!_par){parent=document.getElementsByTagName("body")[0];this.isPopup=true;}else{parent=_par;this.isPopup=false;}this.date=this.dateStr?new Date(this.dateStr):new Date();var table=Calendar.createElement("table");this.table=table;table.cellSpacing=0;table.cellPadding=0;table.calendar=this;Calendar.addEvent(table,"mousedown",Calendar.tableMouseDown);var div=Calendar.createElement("div");this.element=div;div.className="calendar";if(this.isPopup){div.style.position="absolute";div.style.display="none";}div.appendChild(table);var thead=Calendar.createElement("thead",table);var cell=null;var row=null;var cal=this;var hh=function(text,cs,navtype){cell=Calendar.createElement("td",row);cell.colSpan=cs;cell.className="button";if(navtype!=0&&Math.abs(navtype)<=2)cell.className+=" nav";Calendar._add_evs(cell);cell.calendar=cal;cell.navtype=navtype;cell.innerHTML="<div unselectable='on'>"+text+"</div>";return cell;};row=Calendar.createElement("tr",thead);var title_length=6;(this.isPopup)&&--title_length;(this.weekNumbers)&&++title_length;hh("?",1,400).ttip=Calendar._TT["INFO"];this.title=hh("",title_length,300);this.title.className="title";if(this.isPopup){this.title.ttip=Calendar._TT["DRAG_TO_MOVE"];this.title.style.cursor="move";hh("×",1,200).ttip=Calendar._TT["CLOSE"];}row=Calendar.createElement("tr",thead);row.className="headrow";this._nav_py=hh("«",1,-2);this._nav_py.ttip=Calendar._TT["PREV_YEAR"];this._nav_pm=hh("‹",1,-1);this._nav_pm.ttip=Calendar._TT["PREV_MONTH"];this._nav_now=hh(Calendar._TT["TODAY"],this.weekNumbers?4:3,0);this._nav_now.ttip=Calendar._TT["GO_TODAY"];this._nav_nm=hh("›",1,1);this._nav_nm.ttip=Calendar._TT["NEXT_MONTH"];this._nav_ny=hh("»",1,2);this._nav_ny.ttip=Calendar._TT["NEXT_YEAR"];row=Calendar.createElement("tr",thead);row.className="daynames";if(this.weekNumbers){cell=Calendar.createElement("td",row);cell.className="name wn";cell.innerHTML=Calendar._TT["WK"];}for(var i=7;i>0;--i){cell=Calendar.createElement("td",row);if(!i){cell.navtype=100;cell.calendar=this;Calendar._add_evs(cell);}}this.firstdayname=(this.weekNumbers)?row.firstChild.nextSibling:row.firstChild;this._displayWeekdays();var tbody=Calendar.createElement("tbody",table);this.tbody=tbody;for(i=6;i>0;--i){row=Calendar.createElement("tr",tbody);if(this.weekNumbers){cell=Calendar.createElement("td",row);}for(var j=7;j>0;--j){cell=Calendar.createElement("td",row);cell.calendar=this;Calendar._add_evs(cell);}}if(this.showsTime){row=Calendar.createElement("tr",tbody);row.className="time";cell=Calendar.createElement("td",row);cell.className="time";cell.colSpan=2;cell.innerHTML=Calendar._TT["TIME"]||" ";cell=Calendar.createElement("td",row);cell.className="time";cell.colSpan=this.weekNumbers?4:3;(function(){function makeTimePart(className,init,range_start,range_end){var part=Calendar.createElement("span",cell);part.className=className;part.innerHTML=init;part.calendar=cal;part.ttip=Calendar._TT["TIME_PART"];part.navtype=50;part._range=[];if(typeof range_start!="number")part._range=range_start;else{for(var i=range_start;i<=range_end;++i){var txt;if(i<10&&range_end>=10)txt='0'+i;else txt=''+i;part._range[part._range.length]=txt;}}Calendar._add_evs(part);return part;};var hrs=cal.date.getHours();var mins=cal.date.getMinutes();var t12=!cal.time24;var pm=(hrs>12);if(t12&&pm)hrs-=12;var H=makeTimePart("hour",hrs,t12?1:0,t12?12:23);var span=Calendar.createElement("span",cell);span.innerHTML=":";span.className="colon";var M=makeTimePart("minute",mins,0,59);var AP=null;cell=Calendar.createElement("td",row);cell.className="time";cell.colSpan=2;if(t12)AP=makeTimePart("ampm",pm?"pm":"am",["am","pm"]);else cell.innerHTML=" ";cal.onSetTime=function(){var pm,hrs=this.date.getHours(),mins=this.date.getMinutes();if(t12){pm=(hrs>=12);if(pm)hrs-=12;if(hrs==0)hrs=12;AP.innerHTML=pm?"pm":"am";}H.innerHTML=(hrs<10)?("0"+hrs):hrs;M.innerHTML=(mins<10)?("0"+mins):mins;};cal.onUpdateTime=function(){var date=this.date;var h=parseInt(H.innerHTML,10);if(t12){if(/pm/i.test(AP.innerHTML)&&h<12)h+=12;else if(/am/i.test(AP.innerHTML)&&h==12)h=0;}var d=date.getDate();var m=date.getMonth();var y=date.getFullYear();date.setHours(h);date.setMinutes(parseInt(M.innerHTML,10));date.setFullYear(y);date.setMonth(m);date.setDate(d);this.dateClicked=false;this.callHandler();};})();}else{this.onSetTime=this.onUpdateTime=function(){};}var tfoot=Calendar.createElement("tfoot",table);row=Calendar.createElement("tr",tfoot);row.className="footrow";cell=hh(Calendar._TT["SEL_DATE"],this.weekNumbers?8:7,300);cell.className="ttip";if(this.isPopup){cell.ttip=Calendar._TT["DRAG_TO_MOVE"];cell.style.cursor="move";}this.tooltips=cell;div=Calendar.createElement("div",this.element);this.monthsCombo=div;div.className="combo";for(i=0;i<Calendar._MN.length;++i){var mn=Calendar.createElement("div");mn.className=Calendar.is_ie?"label-IEfix":"label";mn.month=i;mn.innerHTML=Calendar._SMN[i];div.appendChild(mn);}div=Calendar.createElement("div",this.element);this.yearsCombo=div;div.className="combo";for(i=12;i>0;--i){var yr=Calendar.createElement("div");yr.className=Calendar.is_ie?"label-IEfix":"label";div.appendChild(yr);}this._init(this.firstDayOfWeek,this.date);parent.appendChild(this.element);};Calendar._keyEvent=function(ev){var cal=window._dynarch_popupCalendar;if(!cal||cal.multiple)return false;(Calendar.is_ie)&&(ev=window.event);var act=(Calendar.is_ie||ev.type=="keypress"),K=ev.keyCode;if(ev.ctrlKey){switch(K){case 37:act&&Calendar.cellClick(cal._nav_pm);break;case 38:act&&Calendar.cellClick(cal._nav_py);break;case 39:act&&Calendar.cellClick(cal._nav_nm);break;case 40:act&&Calendar.cellClick(cal._nav_ny);break;default:return false;}}else switch(K){case 32:Calendar.cellClick(cal._nav_now);break;case 27:act&&cal.callCloseHandler();break;case 37:case 38:case 39:case 40:if(act){var prev,x,y,ne,el,step;prev=K==37||K==38;step=(K==37||K==39)?1:7;function setVars(){el=cal.currentDateEl;var p=el.pos;x=p&15;y=p>>4;ne=cal.ar_days[y][x];};setVars();function prevMonth(){var date=new Date(cal.date);date.setDate(date.getDate()-step);cal.setDate(date);};function nextMonth(){var date=new Date(cal.date);date.setDate(date.getDate()+step);cal.setDate(date);};while(1){switch(K){case 37:if(--x>=0)ne=cal.ar_days[y][x];else{x=6;K=38;continue;}break;case 38:if(--y>=0)ne=cal.ar_days[y][x];else{prevMonth();setVars();}break;case 39:if(++x<7)ne=cal.ar_days[y][x];else{x=0;K=40;continue;}break;case 40:if(++y<cal.ar_days.length)ne=cal.ar_days[y][x];else{nextMonth();setVars();}break;}break;}if(ne){if(!ne.disabled)Calendar.cellClick(ne);else if(prev)prevMonth();else nextMonth();}}break;case 13:if(act)Calendar.cellClick(cal.currentDateEl,ev);break;default:return false;}return Calendar.stopEvent(ev);};Calendar.prototype._init=function(firstDayOfWeek,date){var today=new Date(),TY=today.getFullYear(),TM=today.getMonth(),TD=today.getDate();this.table.style.visibility="hidden";var year=date.getFullYear();if(year<this.minYear){year=this.minYear;date.setFullYear(year);}else if(year>this.maxYear){year=this.maxYear;date.setFullYear(year);}this.firstDayOfWeek=firstDayOfWeek;this.date=new Date(date);var month=date.getMonth();var mday=date.getDate();var no_days=date.getMonthDays();date.setDate(1);var day1=(date.getDay()-this.firstDayOfWeek)%7;if(day1<0)day1+=7;date.setDate(-day1);date.setDate(date.getDate()+1);var row=this.tbody.firstChild;var MN=Calendar._SMN[month];var ar_days=this.ar_days=new Array();var weekend=Calendar._TT["WEEKEND"];var dates=this.multiple?(this.datesCells={}):null;for(var i=0;i<6;++i,row=row.nextSibling){var cell=row.firstChild;if(this.weekNumbers){cell.className="day wn";cell.innerHTML=date.getWeekNumber();cell=cell.nextSibling;}row.className="daysrow";var hasdays=false,iday,dpos=ar_days[i]=[];for(var j=0;j<7;++j,cell=cell.nextSibling,date.setDate(iday+1)){iday=date.getDate();var wday=date.getDay();cell.className="day";cell.pos=i<<4|j;dpos[j]=cell;var current_month=(date.getMonth()==month);if(!current_month){if(this.showsOtherMonths){cell.className+=" othermonth";cell.otherMonth=true;}else{cell.className="emptycell";cell.innerHTML=" ";cell.disabled=true;continue;}}else{cell.otherMonth=false;hasdays=true;}cell.disabled=false;cell.innerHTML=this.getDateText?this.getDateText(date,iday):iday;if(dates)dates[date.print("%Y%m%d")]=cell;if(this.getDateStatus){var status=this.getDateStatus(date,year,month,iday);if(this.getDateToolTip){var toolTip=this.getDateToolTip(date,year,month,iday);if(toolTip)cell.title=toolTip;}if(status===true){cell.className+=" disabled";cell.disabled=true;}else{if(/disabled/i.test(status))cell.disabled=true;cell.className+=" "+status;}}if(!cell.disabled){cell.caldate=new Date(date);cell.ttip="_";if(!this.multiple&¤t_month&&iday==mday&&this.hiliteToday){cell.className+=" selected";this.currentDateEl=cell;}if(date.getFullYear()==TY&&date.getMonth()==TM&&iday==TD){cell.className+=" today";cell.ttip+=Calendar._TT["PART_TODAY"];}if(weekend.indexOf(wday.toString())!=-1)cell.className+=cell.otherMonth?" oweekend":" weekend";}}if(!(hasdays||this.showsOtherMonths))row.className="emptyrow";}this.title.innerHTML=Calendar._MN[month]+", "+year;this.onSetTime();this.table.style.visibility="visible";this._initMultipleDates();};Calendar.prototype._initMultipleDates=function(){if(this.multiple){for(var i in this.multiple){var cell=this.datesCells[i];var d=this.multiple[i];if(!d)continue;if(cell)cell.className+=" selected";}}};Calendar.prototype._toggleMultipleDate=function(date){if(this.multiple){var ds=date.print("%Y%m%d");var cell=this.datesCells[ds];if(cell){var d=this.multiple[ds];if(!d){Calendar.addClass(cell,"selected");this.multiple[ds]=date;}else{Calendar.removeClass(cell,"selected");delete this.multiple[ds];}}}};Calendar.prototype.setDateToolTipHandler=function(unaryFunction){this.getDateToolTip=unaryFunction;};Calendar.prototype.setDate=function(date){if(!date.equalsTo(this.date)){this._init(this.firstDayOfWeek,date);}};Calendar.prototype.refresh=function(){this._init(this.firstDayOfWeek,this.date);};Calendar.prototype.setFirstDayOfWeek=function(firstDayOfWeek){this._init(firstDayOfWeek,this.date);this._displayWeekdays();};Calendar.prototype.setDateStatusHandler=Calendar.prototype.setDisabledHandler=function(unaryFunction){this.getDateStatus=unaryFunction;};Calendar.prototype.setRange=function(a,z){this.minYear=a;this.maxYear=z;};Calendar.prototype.callHandler=function(){if(this.onSelected){this.onSelected(this,this.date.print(this.dateFormat));}};Calendar.prototype.callCloseHandler=function(){if(this.onClose){this.onClose(this);}this.hideShowCovered();};Calendar.prototype.destroy=function(){var el=this.element.parentNode;el.removeChild(this.element);Calendar._C=null;window._dynarch_popupCalendar=null;};Calendar.prototype.reparent=function(new_parent){var el=this.element;el.parentNode.removeChild(el);new_parent.appendChild(el);};Calendar._checkCalendar=function(ev){var calendar=window._dynarch_popupCalendar;if(!calendar){return false;}var el=Calendar.is_ie?Calendar.getElement(ev):Calendar.getTargetElement(ev);for(;el!=null&&el!=calendar.element;el=el.parentNode);if(el==null){window._dynarch_popupCalendar.callCloseHandler();return Calendar.stopEvent(ev);}};Calendar.prototype.show=function(){var rows=this.table.getElementsByTagName("tr");for(var i=rows.length;i>0;){var row=rows[--i];Calendar.removeClass(row,"rowhilite");var cells=row.getElementsByTagName("td");for(var j=cells.length;j>0;){var cell=cells[--j];Calendar.removeClass(cell,"hilite");Calendar.removeClass(cell,"active");}}this.element.style.display="block";this.hidden=false;if(this.isPopup){window._dynarch_popupCalendar=this;Calendar.addEvent(document,"keydown",Calendar._keyEvent);Calendar.addEvent(document,"keypress",Calendar._keyEvent);Calendar.addEvent(document,"mousedown",Calendar._checkCalendar);}this.hideShowCovered();};Calendar.prototype.hide=function(){if(this.isPopup){Calendar.removeEvent(document,"keydown",Calendar._keyEvent);Calendar.removeEvent(document,"keypress",Calendar._keyEvent);Calendar.removeEvent(document,"mousedown",Calendar._checkCalendar);}this.element.style.display="none";this.hidden=true;this.hideShowCovered();};Calendar.prototype.showAt=function(x,y){var s=this.element.style;s.left=x+"px";s.top=y+"px";this.show();};Calendar.prototype.showAtElement=function(el,opts){var self=this;var p=Calendar.getAbsolutePos(el);if(!opts||typeof opts!="string"){this.showAt(p.x,p.y+el.offsetHeight);return true;}function fixPosition(box){if(box.x<0)box.x=0;if(box.y<0)box.y=0;var cp=document.createElement("div");var s=cp.style;s.position="absolute";s.right=s.bottom=s.width=s.height="0px";document.body.appendChild(cp);var br=Calendar.getAbsolutePos(cp);document.body.removeChild(cp);if(Calendar.is_ie){br.y+=document.body.scrollTop;br.x+=document.body.scrollLeft;}else{br.y+=window...
[truncated message content] |
|
From: <ora...@us...> - 2009-11-27 02:11:14
|
Revision: 322
http://pieforms.svn.sourceforge.net/pieforms/?rev=322&view=rev
Author: oracleshinoda
Date: 2009-11-27 02:11:04 +0000 (Fri, 27 Nov 2009)
Log Message:
-----------
Make $element optional in i18n() calls
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform.php
Modified: pieforms-php5/trunk/src/pieform.php
===================================================================
--- pieforms-php5/trunk/src/pieform.php 2009-11-10 03:32:43 UTC (rev 321)
+++ pieforms-php5/trunk/src/pieform.php 2009-11-27 02:11:04 UTC (rev 322)
@@ -1060,7 +1060,7 @@
* can specify there own i18n strings for rules
* @return string The internationalised string
*/
- public function i18n($plugin, $pluginname, $key, $element) {/*{{{*/
+ public function i18n($plugin, $pluginname, $key, $element=null) {/*{{{*/
if (!in_array($plugin, array('element', 'renderer', 'rule'))) {
throw new PieformException("Invalid plugin name '$plugin'");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ora...@us...> - 2009-11-10 03:32:54
|
Revision: 321
http://pieforms.svn.sourceforge.net/pieforms/?rev=321&view=rev
Author: oracleshinoda
Date: 2009-11-10 03:32:43 +0000 (Tue, 10 Nov 2009)
Log Message:
-----------
Allow + in e-mail addresses.
Signed-off-by: Nigel McNie <ni...@ca...>
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform/rules/email.php
Modified: pieforms-php5/trunk/src/pieform/rules/email.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/email.php 2009-11-10 03:31:47 UTC (rev 320)
+++ pieforms-php5/trunk/src/pieform/rules/email.php 2009-11-10 03:32:43 UTC (rev 321)
@@ -37,7 +37,7 @@
* the address.
*/
function pieform_rule_email(Pieform $form, $value, $element) {/*{{{*/
- if (!preg_match('/^[A-Za-z0-9\._%-]+@(?:[A-Za-z0-9-]+\.)+[a-z]{2,4}$/', $value)) {
+ if (!preg_match('/^[A-Za-z0-9+\._%-]+@(?:[A-Za-z0-9-]+\.)+[a-z]{2,4}$/', $value)) {
return $form->i18n('rule', 'email', 'email', $element);
}
}/*}}}*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ora...@us...> - 2009-11-10 03:32:02
|
Revision: 320
http://pieforms.svn.sourceforge.net/pieforms/?rev=320&view=rev
Author: oracleshinoda
Date: 2009-11-10 03:31:47 +0000 (Tue, 10 Nov 2009)
Log Message:
-----------
Make the bytes element support "gigabytes".
I even had a go at doing the translations for all the languages.
Also, fix a bug where specifying a value that was exactly 1GB ended up
showing up as 1024MB. This happens at the other unit boundaries too.
Signed-off-by: Nigel McNie <ni...@ca...>
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform/elements/bytes.php
Modified: pieforms-php5/trunk/src/pieform/elements/bytes.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/bytes.php 2009-11-10 03:29:47 UTC (rev 319)
+++ pieforms-php5/trunk/src/pieform/elements/bytes.php 2009-11-10 03:31:47 UTC (rev 320)
@@ -26,7 +26,7 @@
/**
* Provides a size chooser, with a text box for a number and a
- * select box to choose the units, in bytes, kilobytes, or megabytes
+ * select box to choose the units, in bytes, kilobytes, megabytes or gigabytes
*
* @param Pieform $form The form to render the element for
* @param array $element The element to render
@@ -108,6 +108,9 @@
function pieform_element_bytes_in($units) {/*{{{*/
switch ($units) {
+ case 'gigabytes':
+ return 1073741824;
+ break;
case 'megabytes':
return 1048576;
break;
@@ -126,48 +129,56 @@
'bytes' => 'Bytes',
'kilobytes' => 'Kilobytes',
'megabytes' => 'Megabytes',
+ 'gigabytes' => 'Gigabytes',
'invalidvalue' => 'Value must be a number',
),
'de.utf8' => array(
'bytes' => 'Bytes',
'kilobytes' => 'Kilobytes',
'megabytes' => 'Megabytes',
+ 'gigabytes' => 'Gigabytes',
'invalidvalue' => 'Wert muss eine Zahl sein',
),
'fr.utf8' => array(
'bytes' => 'Octets',
'kilobytes' => 'Kilooctets',
'megabytes' => 'Mégaoctets',
+ 'gigabytes' => 'Gigaoctets',
'invalidvalue' => 'Valeur doit être un nombre',
),
'ja.utf8' => array(
'bytes' => 'B',
'kilobytes' => 'KB',
'megabytes' => 'MB',
+ 'gigabytes' => 'GB',
'invalidvalue' => '値は数値にしてください',
),
'es.utf8' => array(
'bytes' => 'Bytes',
'kilobytes' => 'Kilobytes',
'megabytes' => 'Megabytes',
+ 'gigabytes' => 'Gigabytes',
'invalidvalue' => 'El valor debe ser un número',
),
'sl.utf8' => array(
'bytes' => 'B',
'kilobytes' => 'kB',
'megabytes' => 'MB',
+ 'gigabytes' => 'GB',
'invalidvalue' => 'Vrednost mora biti število',
),
'nl.utf8' => array(
'bytes' => 'Bytes',
'kilobytes' => 'Kilobytes',
'megabytes' => 'Megabytes',
+ 'gigabytes' => 'Gigabytes',
'invalidvalue' => 'Waarde moet een getal zijn',
),
'cs.utf8' => array(
'bytes' => 'B',
'kilobytes' => 'kB',
'megabytes' => 'MB',
+ 'gigabytes' => 'GB',
'invalidvalue' => 'Hodnota musí být číselná',
),
'zh_tw.utf8' => array(
@@ -181,7 +192,7 @@
}/*}}}*/
function pieform_element_bytes_get_bytes_units() {/*{{{*/
- return array('bytes', 'kilobytes', 'megabytes');
+ return array('bytes', 'kilobytes', 'megabytes', 'gigabytes');
}/*}}}*/
function pieform_element_bytes_get_bytes_from_bytes($bytes) {/*{{{*/
@@ -189,8 +200,8 @@
return array('number' => '0', 'units' => 'bytes');
}
- foreach (array('megabytes', 'kilobytes') as $units) {
- if ( $bytes > pieform_element_bytes_in($units) ) {
+ foreach (array('gigabytes', 'megabytes', 'kilobytes') as $units) {
+ if ( $bytes >= pieform_element_bytes_in($units) ) {
return array('number' => $bytes / pieform_element_bytes_in($units) , 'units' => $units);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ora...@us...> - 2009-11-10 03:29:58
|
Revision: 319
http://pieforms.svn.sourceforge.net/pieforms/?rev=319&view=rev
Author: oracleshinoda
Date: 2009-11-10 03:29:47 +0000 (Tue, 10 Nov 2009)
Log Message:
-----------
Support "elementtitle" so you can set a hover title on most elements.
At the suggestion of Andrew McMillan.
Signed-off-by: Nigel McNie <ni...@ca...>
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform.php
Modified: pieforms-php5/trunk/src/pieform.php
===================================================================
--- pieforms-php5/trunk/src/pieform.php 2009-11-10 03:26:54 UTC (rev 318)
+++ pieforms-php5/trunk/src/pieform.php 2009-11-10 03:29:47 UTC (rev 319)
@@ -999,6 +999,10 @@
}
}
+ if (isset($element['elementtitle'])) {
+ $result .= ' title="' . self::hsc($element['elementtitle']) . '"';
+ }
+
if (!in_array('maxlength', $exclude) && isset($element['rules']['maxlength'])) {
$result .= ' maxlength="' . intval($element['rules']['maxlength']) . '"';
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ora...@us...> - 2009-11-10 03:27:00
|
Revision: 318
http://pieforms.svn.sourceforge.net/pieforms/?rev=318&view=rev
Author: oracleshinoda
Date: 2009-11-10 03:26:54 +0000 (Tue, 10 Nov 2009)
Log Message:
-----------
Better check for integers that doesn't fail on 32bit systems.
Now at least "integer" means "the largest integer a float can handle",
which is a much higher limit.
Signed-off-by: Nigel McNie <ni...@ca...>
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform/rules/integer.php
Modified: pieforms-php5/trunk/src/pieform/rules/integer.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/integer.php 2009-11-10 03:25:17 UTC (rev 317)
+++ pieforms-php5/trunk/src/pieform/rules/integer.php 2009-11-10 03:26:54 UTC (rev 318)
@@ -34,7 +34,7 @@
* the address.
*/
function pieform_rule_integer(Pieform $form, $value, $element) {/*{{{*/
- if (!is_numeric($value) || $value != (int)$value) {
+ if (!is_numeric($value) || floor($value) != $value) {
return $form->i18n('rule', 'integer', 'integer', $element);
}
}/*}}}*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ora...@us...> - 2009-11-10 03:25:25
|
Revision: 317
http://pieforms.svn.sourceforge.net/pieforms/?rev=317&view=rev
Author: oracleshinoda
Date: 2009-11-10 03:25:17 +0000 (Tue, 10 Nov 2009)
Log Message:
-----------
Allow minvalue and maxvalue to work with much larger numbers.
intval() will fail horribly on 32 bit systems with numbers over 2GB :(
Signed-off-by: Nigel McNie <ni...@ca...>
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform/rules/maxvalue.php
pieforms-php5/trunk/src/pieform/rules/minvalue.php
Modified: pieforms-php5/trunk/src/pieform/rules/maxvalue.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/maxvalue.php 2009-11-10 03:23:05 UTC (rev 316)
+++ pieforms-php5/trunk/src/pieform/rules/maxvalue.php 2009-11-10 03:25:17 UTC (rev 317)
@@ -34,7 +34,7 @@
* @return string The error message, if the value is invalid.
*/
function pieform_rule_maxvalue(Pieform $form, $value, $element, $maxvalue) {/*{{{*/
- if ($value != '' && intval($value) > $maxvalue) {
+ if ($value != '' && doubleval($value) > $maxvalue) {
return sprintf($form->i18n('rule', 'maxvalue', 'maxvalue', $element), $maxvalue);
}
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/minvalue.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/minvalue.php 2009-11-10 03:23:05 UTC (rev 316)
+++ pieforms-php5/trunk/src/pieform/rules/minvalue.php 2009-11-10 03:25:17 UTC (rev 317)
@@ -34,7 +34,7 @@
* @return string The error message, if the value is invalid.
*/
function pieform_rule_minvalue(Pieform $form, $value, $element, $minvalue) {/*{{{*/
- if ($value != '' && intval($value) < $minvalue) {
+ if ($value != '' && doubleval($value) < $minvalue) {
return sprintf($form->i18n('rule', 'minvalue', 'minvalue', $element), $minvalue);
}
}/*}}}*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ora...@us...> - 2009-11-10 03:23:30
|
Revision: 316
http://pieforms.svn.sourceforge.net/pieforms/?rev=316&view=rev
Author: oracleshinoda
Date: 2009-11-10 03:23:05 +0000 (Tue, 10 Nov 2009)
Log Message:
-----------
Make the input box for the bytes element a little shorter.
It doesn't need to be 8 characters long. I guess people who want to give
someone a billion terabytes of storage might complain, but it's only a
cosmetic thing anyway.
Signed-off-by: Nigel McNie <ni...@ca...>
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform/elements/bytes.php
Modified: pieforms-php5/trunk/src/pieform/elements/bytes.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/bytes.php 2009-09-20 23:46:49 UTC (rev 315)
+++ pieforms-php5/trunk/src/pieform/elements/bytes.php 2009-11-10 03:23:05 UTC (rev 316)
@@ -66,7 +66,7 @@
// @todo probably create with an actual input element, as tabindex doesn't work here for one thing
// Same with the select. And do the events using mochikit signal instead of dom events
$numberinput = '<input';
- $numberinput .= ' type="text" size="8" name="' . $name . '"';
+ $numberinput .= ' type="text" size="6" name="' . $name . '"';
$numberinput .= ' id="' . $formname . '_' . $name . '" value="' . $values['number'] . '" tabindex="' . $element['tabindex'] . '"';
$numberinput .= (isset($element['error']) ? ' class="error"' : '') . ">\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ora...@us...> - 2009-09-20 23:46:56
|
Revision: 315
http://pieforms.svn.sourceforge.net/pieforms/?rev=315&view=rev
Author: oracleshinoda
Date: 2009-09-20 23:46:49 +0000 (Sun, 20 Sep 2009)
Log Message:
-----------
Chinese translation thanks to Andy Chan and Murphy Wong of HKU
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform/elements/bytes.php
pieforms-php5/trunk/src/pieform/elements/calendar.php
pieforms-php5/trunk/src/pieform/elements/date.php
pieforms-php5/trunk/src/pieform/elements/expiry.php
pieforms-php5/trunk/src/pieform/rules/before.php
pieforms-php5/trunk/src/pieform/rules/email.php
pieforms-php5/trunk/src/pieform/rules/integer.php
pieforms-php5/trunk/src/pieform/rules/maxlength.php
pieforms-php5/trunk/src/pieform/rules/maxvalue.php
pieforms-php5/trunk/src/pieform/rules/minlength.php
pieforms-php5/trunk/src/pieform/rules/minvalue.php
pieforms-php5/trunk/src/pieform/rules/regex.php
pieforms-php5/trunk/src/pieform/rules/required.php
pieforms-php5/trunk/src/pieform/rules/validateoptions.php
Modified: pieforms-php5/trunk/src/pieform/elements/bytes.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/bytes.php 2009-08-22 13:45:46 UTC (rev 314)
+++ pieforms-php5/trunk/src/pieform/elements/bytes.php 2009-09-20 23:46:49 UTC (rev 315)
@@ -170,6 +170,12 @@
'megabytes' => 'MB',
'invalidvalue' => 'Hodnota musí být číselná',
),
+ 'zh_tw.utf8' => array(
+ 'bytes' => 'B',
+ 'kilobytes' => 'kB',
+ 'megabytes' => 'MB',
+ 'invalidvalue' => '值必需是數字',
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/elements/calendar.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/calendar.php 2009-08-22 13:45:46 UTC (rev 314)
+++ pieforms-php5/trunk/src/pieform/elements/calendar.php 2009-09-20 23:46:49 UTC (rev 315)
@@ -176,6 +176,9 @@
'cs.utf8' => array(
'invalidvalue' => 'Neplatný datum/čas'
),
+ 'zh_tw.utf8' => array(
+ 'invalidvalue' => '指定了無效的日期/時間'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/elements/date.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/date.php 2009-08-22 13:45:46 UTC (rev 314)
+++ pieforms-php5/trunk/src/pieform/elements/date.php 2009-09-20 23:46:49 UTC (rev 315)
@@ -161,6 +161,10 @@
'or' => 'nebo',
'notspecified' => 'Neurčeno'
),
+ 'zh_tw.utf8' => array(
+ 'or' => '或',
+ 'notspecified' => '未指定'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/elements/expiry.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/expiry.php 2009-08-22 13:45:46 UTC (rev 314)
+++ pieforms-php5/trunk/src/pieform/elements/expiry.php 2009-09-20 23:46:49 UTC (rev 315)
@@ -181,6 +181,13 @@
'years' => 'roků',
'noenddate' => 'nikdy'
),
+ 'zh_tw.utf8' => array(
+ 'days' => '日',
+ 'weeks' => '週',
+ 'months' => '月',
+ 'years' => '年',
+ 'noenddate' => '沒有完結日期'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/before.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/before.php 2009-08-22 13:45:46 UTC (rev 314)
+++ pieforms-php5/trunk/src/pieform/rules/before.php 2009-09-20 23:46:49 UTC (rev 315)
@@ -69,6 +69,9 @@
'cs.utf8' => array(
'before' => 'Zadaná hodnota nemůže být větší než v poli "%s"'
),
+ 'zh_tw.utf8' => array(
+ 'before' => '這個不能在欄位「 %s 」之後'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/email.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/email.php 2009-08-22 13:45:46 UTC (rev 314)
+++ pieforms-php5/trunk/src/pieform/rules/email.php 2009-09-20 23:46:49 UTC (rev 315)
@@ -68,6 +68,9 @@
'cs.utf8' => array(
'email' => 'Neplatná e-mailová adresa'
),
+ 'zh_tw.utf8' => array(
+ 'email' => '電郵地址不正確'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/integer.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/integer.php 2009-08-22 13:45:46 UTC (rev 314)
+++ pieforms-php5/trunk/src/pieform/rules/integer.php 2009-09-20 23:46:49 UTC (rev 315)
@@ -65,6 +65,9 @@
'cs.utf8' => array(
'integer' => 'Musíte zadat celé číslo'
),
+ 'zh_tw.utf8' => array(
+ 'integer' => '欄位必需是整數'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/maxlength.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/maxlength.php 2009-08-22 13:45:46 UTC (rev 314)
+++ pieforms-php5/trunk/src/pieform/rules/maxlength.php 2009-09-20 23:46:49 UTC (rev 315)
@@ -65,6 +65,9 @@
'cs.utf8' => array(
'maxlength' => 'Můžete zadat nejvýše %d znaků'
),
+ 'zh_tw.utf8' => array(
+ 'maxlength' => '這個欄位最長只能是 %d 個字元'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/maxvalue.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/maxvalue.php 2009-08-22 13:45:46 UTC (rev 314)
+++ pieforms-php5/trunk/src/pieform/rules/maxvalue.php 2009-09-20 23:46:49 UTC (rev 315)
@@ -65,6 +65,9 @@
'cs.utf8' => array(
'maxvalue' => 'Hodnota nemůže být větší než %d'
),
+ 'zh_tw.utf8' => array(
+ 'maxvalue' => '這個數值不能大於 %d'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/minlength.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/minlength.php 2009-08-22 13:45:46 UTC (rev 314)
+++ pieforms-php5/trunk/src/pieform/rules/minlength.php 2009-09-20 23:46:49 UTC (rev 315)
@@ -62,6 +62,9 @@
'cs.utf8' => array(
'minlength' => 'Musíte zadat nejméně %d znaků',
),
+ 'zh_tw.utf8' => array(
+ 'minlength' => '這個欄位最少需要有 %d 個字元',
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/minvalue.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/minvalue.php 2009-08-22 13:45:46 UTC (rev 314)
+++ pieforms-php5/trunk/src/pieform/rules/minvalue.php 2009-09-20 23:46:49 UTC (rev 315)
@@ -65,6 +65,9 @@
'cs.utf8' => array(
'minvalue' => 'Nemůžete zadat hodnotu menší než %d'
),
+ 'zh_tw.utf8' => array(
+ 'minvalue' => '這個數值不能在 %d 以下'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/regex.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/regex.php 2009-08-22 13:45:46 UTC (rev 314)
+++ pieforms-php5/trunk/src/pieform/rules/regex.php 2009-09-20 23:46:49 UTC (rev 315)
@@ -66,6 +66,9 @@
'cs.utf8' => array(
'regex' => 'Neplatný formát'
),
+ 'zh_tw.utf8' => array(
+ 'regex' => '這個欄位的樣式不正確'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/required.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/required.php 2009-08-22 13:45:46 UTC (rev 314)
+++ pieforms-php5/trunk/src/pieform/rules/required.php 2009-09-20 23:46:49 UTC (rev 315)
@@ -65,6 +65,9 @@
'cs.utf8' => array(
'required' => 'Povinné pole'
),
+ 'zh_tw.utf8' => array(
+ 'required' => '這個欄位必須填寫'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/validateoptions.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/validateoptions.php 2009-08-22 13:45:46 UTC (rev 314)
+++ pieforms-php5/trunk/src/pieform/rules/validateoptions.php 2009-09-20 23:46:49 UTC (rev 315)
@@ -73,6 +73,9 @@
'cs.utf8' => array(
'validateoptions' => 'Neplatný výběr "%s"'
),
+ 'zh_tw.utf8' => array(
+ 'validateoptions' => '選項「 %s 」不正確'
+ ),
);
}/*}}}*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ora...@us...> - 2009-08-22 13:46:00
|
Revision: 314
http://pieforms.svn.sourceforge.net/pieforms/?rev=314&view=rev
Author: oracleshinoda
Date: 2009-08-22 13:45:46 +0000 (Sat, 22 Aug 2009)
Log Message:
-----------
Make height of hidden iframes 0
Modified Paths:
--------------
pieforms-php5/trunk/src/static/core/pieforms.js
Modified: pieforms-php5/trunk/src/static/core/pieforms.js
===================================================================
--- pieforms-php5/trunk/src/static/core/pieforms.js 2009-08-06 00:00:47 UTC (rev 313)
+++ pieforms-php5/trunk/src/static/core/pieforms.js 2009-08-22 13:45:46 UTC (rev 314)
@@ -247,7 +247,7 @@
self.iframe = createDOM('iframe', {
'name': iframeName,
'id' : iframeName,
- 'style': 'position: absolute; visibility: hidden;'
+ 'style': 'position: absolute; visibility: hidden; height: 0;'
});
insertSiblingNodesAfter(self.data.name, self.iframe);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ora...@us...> - 2009-08-06 00:01:04
|
Revision: 313
http://pieforms.svn.sourceforge.net/pieforms/?rev=313&view=rev
Author: oracleshinoda
Date: 2009-08-06 00:00:47 +0000 (Thu, 06 Aug 2009)
Log Message:
-----------
Only access $global if the form has been submitted. Thanks to Ben Bradshaw
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform/elements/bytes.php
pieforms-php5/trunk/src/pieform/elements/checkbox.php
pieforms-php5/trunk/src/pieform/elements/expiry.php
Modified: pieforms-php5/trunk/src/pieform/elements/bytes.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/bytes.php 2009-07-12 22:00:42 UTC (rev 312)
+++ pieforms-php5/trunk/src/pieform/elements/bytes.php 2009-08-06 00:00:47 UTC (rev 313)
@@ -47,7 +47,8 @@
$bytes = $element['value'];
$values = pieform_element_bytes_get_bytes_from_bytes($element['value']);
}
- else if (isset($global[$element['name']])
+ else if ($form->is_submitted()
+ && isset($global[$element['name']])
&& isset($global[$element['name'] . '_units'])) {
$values = array('number' => $global[$element['name']],
'units' => $global[$element['name'] . '_units']);
Modified: pieforms-php5/trunk/src/pieform/elements/checkbox.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/checkbox.php 2009-07-12 22:00:42 UTC (rev 312)
+++ pieforms-php5/trunk/src/pieform/elements/checkbox.php 2009-08-06 00:00:47 UTC (rev 313)
@@ -37,7 +37,7 @@
$checked = true;
}
$global = ($form->get_property('method') == 'get') ? $_GET : $_POST;
- if (isset($global[$element['name']])) {
+ if ($form->is_submitted() && isset($global[$element['name']])) {
$checked = true;
}
else if (!$form->is_submitted() && !empty($element['defaultvalue'])) {
Modified: pieforms-php5/trunk/src/pieform/elements/expiry.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/expiry.php 2009-07-12 22:00:42 UTC (rev 312)
+++ pieforms-php5/trunk/src/pieform/elements/expiry.php 2009-08-06 00:00:47 UTC (rev 313)
@@ -47,7 +47,8 @@
$seconds = $element['value'];
$values = pieform_element_expiry_get_expiry_from_seconds($element['value']);
}
- else if (isset($global[$element['name']])
+ else if ($form->is_submitted()
+ && isset($global[$element['name']])
&& isset($global[$element['name'] . '_units'])) {
$values = array('number' => $global[$element['name']],
'units' => $global[$element['name'] . '_units']);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ora...@us...> - 2009-07-12 22:00:45
|
Revision: 312
http://pieforms.svn.sourceforge.net/pieforms/?rev=312&view=rev
Author: oracleshinoda
Date: 2009-07-12 22:00:42 +0000 (Sun, 12 Jul 2009)
Log Message:
-----------
Make sure the plugin is loaded before looking for its i18n function.
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform.php
Modified: pieforms-php5/trunk/src/pieform.php
===================================================================
--- pieforms-php5/trunk/src/pieform.php 2009-06-27 09:34:25 UTC (rev 311)
+++ pieforms-php5/trunk/src/pieform.php 2009-07-12 22:00:42 UTC (rev 312)
@@ -1072,6 +1072,7 @@
}
// Fall back to the default string
+ $this->include_plugin($plugin, $pluginname);
$function = 'pieform_' . $plugin . '_' . $pluginname . '_i18n';
if (function_exists($function)) {
$strings = $function();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ora...@us...> - 2009-06-27 09:34:29
|
Revision: 311
http://pieforms.svn.sourceforge.net/pieforms/?rev=311&view=rev
Author: oracleshinoda
Date: 2009-06-27 09:34:25 +0000 (Sat, 27 Jun 2009)
Log Message:
-----------
Allow forms to say the title isn't escaped, so HTML can be used in the labels. Suggested by Gregor Anzelj.
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform.php
Modified: pieforms-php5/trunk/src/pieform.php
===================================================================
--- pieforms-php5/trunk/src/pieform.php 2009-06-27 09:32:08 UTC (rev 310)
+++ pieforms-php5/trunk/src/pieform.php 2009-06-27 09:34:25 UTC (rev 311)
@@ -1260,12 +1260,13 @@
// Element title
if (isset($element['title']) && $element['title'] !== '') {
+ $title = (!empty($element['labelescaped'])) ? $element['title'] : self::hsc($element['title']);
if (!empty($element['nolabel'])) {
// Don't bother with a label for the element
- $element['labelhtml'] = self::hsc($element['title']);
+ $element['labelhtml'] = $title;
}
else {
- $element['labelhtml'] = '<label for="' . $this->name . '_' . $element['id'] . '">' . Pieform::hsc($element['title']) . '</label>';
+ $element['labelhtml'] = '<label for="' . $this->name . '_' . $element['id'] . '">' . $title . '</label>';
}
if ($this->get_property('requiredmarker') && !empty($element['rules']['required'])) {
$element['labelhtml'] .= ' <span class="requiredmarker">*</span>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ora...@us...> - 2009-06-27 09:32:10
|
Revision: 310
http://pieforms.svn.sourceforge.net/pieforms/?rev=310&view=rev
Author: oracleshinoda
Date: 2009-06-27 09:32:08 +0000 (Sat, 27 Jun 2009)
Log Message:
-----------
Allow form tag to have user-defined classes set on it.
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform.php
Modified: pieforms-php5/trunk/src/pieform.php
===================================================================
--- pieforms-php5/trunk/src/pieform.php 2009-06-13 06:54:06 UTC (rev 309)
+++ pieforms-php5/trunk/src/pieform.php 2009-06-27 09:32:08 UTC (rev 310)
@@ -529,6 +529,9 @@
if ($this->has_errors()) {
$result .= ' error';
}
+ if (isset($this->data['class'])) {
+ $result .= ' ' . $this->data['class'];
+ }
$result .= '"';
foreach (array('name', 'method', 'action') as $attribute) {
$result .= ' ' . $attribute . '="' . $this->data[$attribute] . '"';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ora...@us...> - 2009-06-13 06:54:08
|
Revision: 309
http://pieforms.svn.sourceforge.net/pieforms/?rev=309&view=rev
Author: oracleshinoda
Date: 2009-06-13 06:54:06 +0000 (Sat, 13 Jun 2009)
Log Message:
-----------
Czech strings for Pieforms, thanks to David Mudrak
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform/elements/bytes.php
pieforms-php5/trunk/src/pieform/elements/calendar.php
pieforms-php5/trunk/src/pieform/elements/date.php
pieforms-php5/trunk/src/pieform/elements/expiry.php
pieforms-php5/trunk/src/pieform/rules/before.php
pieforms-php5/trunk/src/pieform/rules/email.php
pieforms-php5/trunk/src/pieform/rules/integer.php
pieforms-php5/trunk/src/pieform/rules/maxlength.php
pieforms-php5/trunk/src/pieform/rules/maxvalue.php
pieforms-php5/trunk/src/pieform/rules/minlength.php
pieforms-php5/trunk/src/pieform/rules/minvalue.php
pieforms-php5/trunk/src/pieform/rules/regex.php
pieforms-php5/trunk/src/pieform/rules/required.php
pieforms-php5/trunk/src/pieform/rules/validateoptions.php
Modified: pieforms-php5/trunk/src/pieform/elements/bytes.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/bytes.php 2009-06-02 07:03:30 UTC (rev 308)
+++ pieforms-php5/trunk/src/pieform/elements/bytes.php 2009-06-13 06:54:06 UTC (rev 309)
@@ -163,6 +163,12 @@
'megabytes' => 'Megabytes',
'invalidvalue' => 'Waarde moet een getal zijn',
),
+ 'cs.utf8' => array(
+ 'bytes' => 'B',
+ 'kilobytes' => 'kB',
+ 'megabytes' => 'MB',
+ 'invalidvalue' => 'Hodnota musí být číselná',
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/elements/calendar.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/calendar.php 2009-06-02 07:03:30 UTC (rev 308)
+++ pieforms-php5/trunk/src/pieform/elements/calendar.php 2009-06-13 06:54:06 UTC (rev 309)
@@ -173,6 +173,9 @@
'nl.utf8' => array(
'invalidvalue' => 'Ongeldige tijd/datum opgegeven'
),
+ 'cs.utf8' => array(
+ 'invalidvalue' => 'Neplatný datum/čas'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/elements/date.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/date.php 2009-06-02 07:03:30 UTC (rev 308)
+++ pieforms-php5/trunk/src/pieform/elements/date.php 2009-06-13 06:54:06 UTC (rev 309)
@@ -157,6 +157,10 @@
'or' => 'or',
'notspecified' => 'Niet gespecifiëerd'
),
+ 'cs.utf8' => array(
+ 'or' => 'nebo',
+ 'notspecified' => 'Neurčeno'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/elements/expiry.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/expiry.php 2009-06-02 07:03:30 UTC (rev 308)
+++ pieforms-php5/trunk/src/pieform/elements/expiry.php 2009-06-13 06:54:06 UTC (rev 309)
@@ -173,6 +173,13 @@
'years' => 'Jaren',
'noenddate' => 'Geen einddatum'
),
+ 'cs.utf8' => array(
+ 'days' => 'dnů',
+ 'weeks' => 'týdnů',
+ 'months' => 'měsíců',
+ 'years' => 'roků',
+ 'noenddate' => 'nikdy'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/before.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/before.php 2009-06-02 07:03:30 UTC (rev 308)
+++ pieforms-php5/trunk/src/pieform/rules/before.php 2009-06-13 06:54:06 UTC (rev 309)
@@ -66,6 +66,9 @@
'nl.utf8' => array(
'before' => 'Dit kan niet na het veld "%s" zijn'
),
+ 'cs.utf8' => array(
+ 'before' => 'Zadaná hodnota nemůže být větší než v poli "%s"'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/email.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/email.php 2009-06-02 07:03:30 UTC (rev 308)
+++ pieforms-php5/trunk/src/pieform/rules/email.php 2009-06-13 06:54:06 UTC (rev 309)
@@ -65,6 +65,9 @@
'nl.utf8' => array(
'email' => 'E-mailadres is ongeldig'
),
+ 'cs.utf8' => array(
+ 'email' => 'Neplatná e-mailová adresa'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/integer.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/integer.php 2009-06-02 07:03:30 UTC (rev 308)
+++ pieforms-php5/trunk/src/pieform/rules/integer.php 2009-06-13 06:54:06 UTC (rev 309)
@@ -62,6 +62,9 @@
'nl.utf8' => array(
'integer' => 'Dit veld moet een geheel getal (integer) zijn'
),
+ 'cs.utf8' => array(
+ 'integer' => 'Musíte zadat celé číslo'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/maxlength.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/maxlength.php 2009-06-02 07:03:30 UTC (rev 308)
+++ pieforms-php5/trunk/src/pieform/rules/maxlength.php 2009-06-13 06:54:06 UTC (rev 309)
@@ -62,6 +62,9 @@
'nl.utf8' => array(
'maxlength' => 'Dit veld moet minstens %d tekens lang zijn'
),
+ 'cs.utf8' => array(
+ 'maxlength' => 'Můžete zadat nejvýše %d znaků'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/maxvalue.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/maxvalue.php 2009-06-02 07:03:30 UTC (rev 308)
+++ pieforms-php5/trunk/src/pieform/rules/maxvalue.php 2009-06-13 06:54:06 UTC (rev 309)
@@ -62,6 +62,9 @@
'nl.utf8' => array(
'maxvalue' => 'Deze waarde kan niet groter zijn dan %d'
),
+ 'cs.utf8' => array(
+ 'maxvalue' => 'Hodnota nemůže být větší než %d'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/minlength.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/minlength.php 2009-06-02 07:03:30 UTC (rev 308)
+++ pieforms-php5/trunk/src/pieform/rules/minlength.php 2009-06-13 06:54:06 UTC (rev 309)
@@ -59,6 +59,9 @@
'nl.utf8' => array(
'minlength' => 'Dit veld moet minstens %d tekens lang zijn',
),
+ 'cs.utf8' => array(
+ 'minlength' => 'Musíte zadat nejméně %d znaků',
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/minvalue.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/minvalue.php 2009-06-02 07:03:30 UTC (rev 308)
+++ pieforms-php5/trunk/src/pieform/rules/minvalue.php 2009-06-13 06:54:06 UTC (rev 309)
@@ -62,6 +62,9 @@
'nl.utf8' => array(
'minvalue' => 'Deze waarde kan niet kleiner zijn dan %d'
),
+ 'cs.utf8' => array(
+ 'minvalue' => 'Nemůžete zadat hodnotu menší než %d'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/regex.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/regex.php 2009-06-02 07:03:30 UTC (rev 308)
+++ pieforms-php5/trunk/src/pieform/rules/regex.php 2009-06-13 06:54:06 UTC (rev 309)
@@ -63,6 +63,9 @@
'nl.utf8' => array(
'regex' => 'Dit veld is niet in een geldige vorm'
),
+ 'cs.utf8' => array(
+ 'regex' => 'Neplatný formát'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/required.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/required.php 2009-06-02 07:03:30 UTC (rev 308)
+++ pieforms-php5/trunk/src/pieform/rules/required.php 2009-06-13 06:54:06 UTC (rev 309)
@@ -62,6 +62,9 @@
'nl.utf8' => array(
'required' => 'Dit veld is vereist'
),
+ 'cs.utf8' => array(
+ 'required' => 'Povinné pole'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/validateoptions.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/validateoptions.php 2009-06-02 07:03:30 UTC (rev 308)
+++ pieforms-php5/trunk/src/pieform/rules/validateoptions.php 2009-06-13 06:54:06 UTC (rev 309)
@@ -70,6 +70,9 @@
'nl.utf8' => array(
'validateoptions' => 'De optie "%s" is niet geldig'
),
+ 'cs.utf8' => array(
+ 'validateoptions' => 'Neplatný výběr "%s"'
+ ),
);
}/*}}}*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ora...@us...> - 2009-06-02 07:03:36
|
Revision: 308
http://pieforms.svn.sourceforge.net/pieforms/?rev=308&view=rev
Author: oracleshinoda
Date: 2009-06-02 07:03:30 +0000 (Tue, 02 Jun 2009)
Log Message:
-----------
Dutch translation of Pieforms, thanks to Koen Roggermans.
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform/elements/bytes.php
pieforms-php5/trunk/src/pieform/elements/calendar.php
pieforms-php5/trunk/src/pieform/elements/date.php
pieforms-php5/trunk/src/pieform/elements/expiry.php
pieforms-php5/trunk/src/pieform/rules/before.php
pieforms-php5/trunk/src/pieform/rules/email.php
pieforms-php5/trunk/src/pieform/rules/integer.php
pieforms-php5/trunk/src/pieform/rules/maxlength.php
pieforms-php5/trunk/src/pieform/rules/maxvalue.php
pieforms-php5/trunk/src/pieform/rules/minlength.php
pieforms-php5/trunk/src/pieform/rules/minvalue.php
pieforms-php5/trunk/src/pieform/rules/regex.php
pieforms-php5/trunk/src/pieform/rules/required.php
pieforms-php5/trunk/src/pieform/rules/validateoptions.php
Modified: pieforms-php5/trunk/src/pieform/elements/bytes.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/bytes.php 2009-06-02 06:57:09 UTC (rev 307)
+++ pieforms-php5/trunk/src/pieform/elements/bytes.php 2009-06-02 07:03:30 UTC (rev 308)
@@ -157,6 +157,12 @@
'megabytes' => 'MB',
'invalidvalue' => 'Vrednost mora biti število',
),
+ 'nl.utf8' => array(
+ 'bytes' => 'Bytes',
+ 'kilobytes' => 'Kilobytes',
+ 'megabytes' => 'Megabytes',
+ 'invalidvalue' => 'Waarde moet een getal zijn',
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/elements/calendar.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/calendar.php 2009-06-02 06:57:09 UTC (rev 307)
+++ pieforms-php5/trunk/src/pieform/elements/calendar.php 2009-06-02 07:03:30 UTC (rev 308)
@@ -170,6 +170,9 @@
'sl.utf8' => array(
'invalidvalue' => 'Datum/čas ni določen pravilno'
),
+ 'nl.utf8' => array(
+ 'invalidvalue' => 'Ongeldige tijd/datum opgegeven'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/elements/date.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/date.php 2009-06-02 06:57:09 UTC (rev 307)
+++ pieforms-php5/trunk/src/pieform/elements/date.php 2009-06-02 07:03:30 UTC (rev 308)
@@ -153,6 +153,10 @@
'or' => 'ali',
'notspecified' => 'Ni določeno'
),
+ 'nl.utf8' => array(
+ 'or' => 'or',
+ 'notspecified' => 'Niet gespecifiëerd'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/elements/expiry.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/expiry.php 2009-06-02 06:57:09 UTC (rev 307)
+++ pieforms-php5/trunk/src/pieform/elements/expiry.php 2009-06-02 07:03:30 UTC (rev 308)
@@ -166,6 +166,13 @@
'years' => 'let',
'noenddate' => 'ni zaključnega datuma'
),
+ 'nl.utf8' => array(
+ 'days' => 'Dagen',
+ 'weeks' => 'Weken',
+ 'months' => 'Maanden',
+ 'years' => 'Jaren',
+ 'noenddate' => 'Geen einddatum'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/before.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/before.php 2009-06-02 06:57:09 UTC (rev 307)
+++ pieforms-php5/trunk/src/pieform/rules/before.php 2009-06-02 07:03:30 UTC (rev 308)
@@ -63,6 +63,9 @@
'sl.utf8' => array(
'before' => 'To ne sme biti za poljem "%s"'
),
+ 'nl.utf8' => array(
+ 'before' => 'Dit kan niet na het veld "%s" zijn'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/email.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/email.php 2009-06-02 06:57:09 UTC (rev 307)
+++ pieforms-php5/trunk/src/pieform/rules/email.php 2009-06-02 07:03:30 UTC (rev 308)
@@ -62,6 +62,9 @@
'sl.utf8' => array(
'email' => 'Epoštni naslov je neveljaven'
),
+ 'nl.utf8' => array(
+ 'email' => 'E-mailadres is ongeldig'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/integer.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/integer.php 2009-06-02 06:57:09 UTC (rev 307)
+++ pieforms-php5/trunk/src/pieform/rules/integer.php 2009-06-02 07:03:30 UTC (rev 308)
@@ -59,6 +59,9 @@
'sl.utf8' => array(
'integer' => 'Vrednost polja mora biti število'
),
+ 'nl.utf8' => array(
+ 'integer' => 'Dit veld moet een geheel getal (integer) zijn'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/maxlength.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/maxlength.php 2009-06-02 06:57:09 UTC (rev 307)
+++ pieforms-php5/trunk/src/pieform/rules/maxlength.php 2009-06-02 07:03:30 UTC (rev 308)
@@ -59,6 +59,9 @@
'sl.utf8' => array(
'maxlength' => 'To polje mora biti dolgo največ %d znakov'
),
+ 'nl.utf8' => array(
+ 'maxlength' => 'Dit veld moet minstens %d tekens lang zijn'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/maxvalue.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/maxvalue.php 2009-06-02 06:57:09 UTC (rev 307)
+++ pieforms-php5/trunk/src/pieform/rules/maxvalue.php 2009-06-02 07:03:30 UTC (rev 308)
@@ -59,6 +59,9 @@
'sl.utf8' => array(
'maxvalue' => 'Ta vrednost ne sme biti večja od %d'
),
+ 'nl.utf8' => array(
+ 'maxvalue' => 'Deze waarde kan niet groter zijn dan %d'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/minlength.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/minlength.php 2009-06-02 06:57:09 UTC (rev 307)
+++ pieforms-php5/trunk/src/pieform/rules/minlength.php 2009-06-02 07:03:30 UTC (rev 308)
@@ -56,6 +56,9 @@
'sl.utf8' => array(
'minlength' => 'To polje mora biti dolgo vsaj %d znakov',
),
+ 'nl.utf8' => array(
+ 'minlength' => 'Dit veld moet minstens %d tekens lang zijn',
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/minvalue.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/minvalue.php 2009-06-02 06:57:09 UTC (rev 307)
+++ pieforms-php5/trunk/src/pieform/rules/minvalue.php 2009-06-02 07:03:30 UTC (rev 308)
@@ -59,6 +59,9 @@
'sl.utf8' => array(
'minvalue' => 'Ta vrednost ne sme biti manjša od %d'
),
+ 'nl.utf8' => array(
+ 'minvalue' => 'Deze waarde kan niet kleiner zijn dan %d'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/regex.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/regex.php 2009-06-02 06:57:09 UTC (rev 307)
+++ pieforms-php5/trunk/src/pieform/rules/regex.php 2009-06-02 07:03:30 UTC (rev 308)
@@ -60,6 +60,9 @@
'sl.utf8' => array(
'regex' => 'To polje ni v veljavni obliki'
),
+ 'nl.utf8' => array(
+ 'regex' => 'Dit veld is niet in een geldige vorm'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/required.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/required.php 2009-06-02 06:57:09 UTC (rev 307)
+++ pieforms-php5/trunk/src/pieform/rules/required.php 2009-06-02 07:03:30 UTC (rev 308)
@@ -59,6 +59,9 @@
'sl.utf8' => array(
'required' => 'To polje je zahtevano'
),
+ 'nl.utf8' => array(
+ 'required' => 'Dit veld is vereist'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/validateoptions.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/validateoptions.php 2009-06-02 06:57:09 UTC (rev 307)
+++ pieforms-php5/trunk/src/pieform/rules/validateoptions.php 2009-06-02 07:03:30 UTC (rev 308)
@@ -67,6 +67,9 @@
'sl.utf8' => array(
'validateoptions' => 'Možnost "%s" je neveljavna'
),
+ 'nl.utf8' => array(
+ 'validateoptions' => 'De optie "%s" is niet geldig'
+ ),
);
}/*}}}*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ora...@us...> - 2009-06-02 06:57:34
|
Revision: 307
http://pieforms.svn.sourceforge.net/pieforms/?rev=307&view=rev
Author: oracleshinoda
Date: 2009-06-02 06:57:09 +0000 (Tue, 02 Jun 2009)
Log Message:
-----------
Fix whitespace fail in translation
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform/rules/before.php
Modified: pieforms-php5/trunk/src/pieform/rules/before.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/before.php 2009-05-13 01:16:32 UTC (rev 306)
+++ pieforms-php5/trunk/src/pieform/rules/before.php 2009-06-02 06:57:09 UTC (rev 307)
@@ -57,7 +57,7 @@
'ja.utf8' => array(
'before' => 'フィールド「 %s 」の後に設定することはできません'
),
- 'es.utf8' => array(
+ 'es.utf8' => array(
'before' => 'No puede ser posterior al campo "%s"'
),
'sl.utf8' => array(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ora...@us...> - 2009-05-13 01:16:40
|
Revision: 306
http://pieforms.svn.sourceforge.net/pieforms/?rev=306&view=rev
Author: oracleshinoda
Date: 2009-05-13 01:16:32 +0000 (Wed, 13 May 2009)
Log Message:
-----------
Added Slovenian pieforms translation, thanks to Gregor Anzelj.
Also fixed some errant tabs that had crept into one file.
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform/elements/bytes.php
pieforms-php5/trunk/src/pieform/elements/calendar.php
pieforms-php5/trunk/src/pieform/elements/date.php
pieforms-php5/trunk/src/pieform/elements/expiry.php
pieforms-php5/trunk/src/pieform/rules/before.php
pieforms-php5/trunk/src/pieform/rules/email.php
pieforms-php5/trunk/src/pieform/rules/integer.php
pieforms-php5/trunk/src/pieform/rules/maxlength.php
pieforms-php5/trunk/src/pieform/rules/maxvalue.php
pieforms-php5/trunk/src/pieform/rules/minlength.php
pieforms-php5/trunk/src/pieform/rules/minvalue.php
pieforms-php5/trunk/src/pieform/rules/regex.php
pieforms-php5/trunk/src/pieform/rules/required.php
pieforms-php5/trunk/src/pieform/rules/validateoptions.php
Modified: pieforms-php5/trunk/src/pieform/elements/bytes.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/bytes.php 2009-04-27 08:05:10 UTC (rev 305)
+++ pieforms-php5/trunk/src/pieform/elements/bytes.php 2009-05-13 01:16:32 UTC (rev 306)
@@ -151,6 +151,12 @@
'megabytes' => 'Megabytes',
'invalidvalue' => 'El valor debe ser un número',
),
+ 'sl.utf8' => array(
+ 'bytes' => 'B',
+ 'kilobytes' => 'kB',
+ 'megabytes' => 'MB',
+ 'invalidvalue' => 'Vrednost mora biti število',
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/elements/calendar.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/calendar.php 2009-04-27 08:05:10 UTC (rev 305)
+++ pieforms-php5/trunk/src/pieform/elements/calendar.php 2009-05-13 01:16:32 UTC (rev 306)
@@ -167,6 +167,9 @@
'es.utf8' => array(
'invalidvalue' => 'Fecha/hora indicada inválida'
),
+ 'sl.utf8' => array(
+ 'invalidvalue' => 'Datum/čas ni določen pravilno'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/elements/date.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/date.php 2009-04-27 08:05:10 UTC (rev 305)
+++ pieforms-php5/trunk/src/pieform/elements/date.php 2009-05-13 01:16:32 UTC (rev 306)
@@ -149,6 +149,10 @@
'or' => 'o',
'notspecified' => 'Sin valor'
),
+ 'sl.utf8' => array(
+ 'or' => 'ali',
+ 'notspecified' => 'Ni določeno'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/elements/expiry.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/expiry.php 2009-04-27 08:05:10 UTC (rev 305)
+++ pieforms-php5/trunk/src/pieform/elements/expiry.php 2009-05-13 01:16:32 UTC (rev 306)
@@ -159,6 +159,13 @@
'years' => 'Años',
'noenddate' => 'Sin fecha de finalización'
),
+ 'sl.utf8' => array(
+ 'days' => 'dni',
+ 'weeks' => 'tednov',
+ 'months' => 'mesecev',
+ 'years' => 'let',
+ 'noenddate' => 'ni zaključnega datuma'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/before.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/before.php 2009-04-27 08:05:10 UTC (rev 305)
+++ pieforms-php5/trunk/src/pieform/rules/before.php 2009-05-13 01:16:32 UTC (rev 306)
@@ -60,6 +60,10 @@
'es.utf8' => array(
'before' => 'No puede ser posterior al campo "%s"'
),
+ 'sl.utf8' => array(
+ 'before' => 'To ne sme biti za poljem "%s"'
+ ),
+
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/email.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/email.php 2009-04-27 08:05:10 UTC (rev 305)
+++ pieforms-php5/trunk/src/pieform/rules/email.php 2009-05-13 01:16:32 UTC (rev 306)
@@ -59,6 +59,9 @@
'es.utf8' => array(
'email' => 'Dirección de correo errónea'
),
+ 'sl.utf8' => array(
+ 'email' => 'Epoštni naslov je neveljaven'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/integer.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/integer.php 2009-04-27 08:05:10 UTC (rev 305)
+++ pieforms-php5/trunk/src/pieform/rules/integer.php 2009-05-13 01:16:32 UTC (rev 306)
@@ -56,6 +56,9 @@
'es.utf8' => array(
'integer' => 'Este campo debe ser un número entero'
),
+ 'sl.utf8' => array(
+ 'integer' => 'Vrednost polja mora biti število'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/maxlength.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/maxlength.php 2009-04-27 08:05:10 UTC (rev 305)
+++ pieforms-php5/trunk/src/pieform/rules/maxlength.php 2009-05-13 01:16:32 UTC (rev 306)
@@ -56,6 +56,9 @@
'es.utf8' => array(
'maxlength' => 'Este campo tiene que tener como máximo %d caracteres'
),
+ 'sl.utf8' => array(
+ 'maxlength' => 'To polje mora biti dolgo največ %d znakov'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/maxvalue.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/maxvalue.php 2009-04-27 08:05:10 UTC (rev 305)
+++ pieforms-php5/trunk/src/pieform/rules/maxvalue.php 2009-05-13 01:16:32 UTC (rev 306)
@@ -56,6 +56,9 @@
'es.utf8' => array(
'maxvalue' => 'Este valor no puede ser superior a %d'
),
+ 'sl.utf8' => array(
+ 'maxvalue' => 'Ta vrednost ne sme biti večja od %d'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/minlength.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/minlength.php 2009-04-27 08:05:10 UTC (rev 305)
+++ pieforms-php5/trunk/src/pieform/rules/minlength.php 2009-05-13 01:16:32 UTC (rev 306)
@@ -53,6 +53,9 @@
'es.utf8' => array(
'minlength' => 'Este campo debe tener como mínimo %d caracteres',
),
+ 'sl.utf8' => array(
+ 'minlength' => 'To polje mora biti dolgo vsaj %d znakov',
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/minvalue.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/minvalue.php 2009-04-27 08:05:10 UTC (rev 305)
+++ pieforms-php5/trunk/src/pieform/rules/minvalue.php 2009-05-13 01:16:32 UTC (rev 306)
@@ -56,6 +56,9 @@
'es.utf8' => array(
'minvalue' => 'Este valor no puede ser inferior a %d'
),
+ 'sl.utf8' => array(
+ 'minvalue' => 'Ta vrednost ne sme biti manjša od %d'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/regex.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/regex.php 2009-04-27 08:05:10 UTC (rev 305)
+++ pieforms-php5/trunk/src/pieform/rules/regex.php 2009-05-13 01:16:32 UTC (rev 306)
@@ -57,6 +57,9 @@
'es.utf8' => array(
'regex' => 'Este campo no tiene un formato válido'
),
+ 'sl.utf8' => array(
+ 'regex' => 'To polje ni v veljavni obliki'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/required.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/required.php 2009-04-27 08:05:10 UTC (rev 305)
+++ pieforms-php5/trunk/src/pieform/rules/required.php 2009-05-13 01:16:32 UTC (rev 306)
@@ -53,9 +53,13 @@
'ja.utf8' => array(
'required' => 'このフィールドは、必須入力フィールドです。'
),
- 'es.utf8' => array(
- 'required' => 'Este campo es obligatorio'
- ),
+ 'es.utf8' => array(
+ 'required' => 'Este campo es obligatorio'
+ ),
+ 'sl.utf8' => array(
+ 'required' => 'To polje je zahtevano'
+ ),
+
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/validateoptions.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/validateoptions.php 2009-04-27 08:05:10 UTC (rev 305)
+++ pieforms-php5/trunk/src/pieform/rules/validateoptions.php 2009-05-13 01:16:32 UTC (rev 306)
@@ -64,6 +64,9 @@
'es.utf8' => array(
'validateoptions' => 'La opción "%s" no es válida'
),
+ 'sl.utf8' => array(
+ 'validateoptions' => 'Možnost "%s" je neveljavna'
+ ),
);
}/*}}}*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ora...@us...> - 2009-04-27 08:05:13
|
Revision: 305
http://pieforms.svn.sourceforge.net/pieforms/?rev=305&view=rev
Author: oracleshinoda
Date: 2009-04-27 08:05:10 +0000 (Mon, 27 Apr 2009)
Log Message:
-----------
Allow radio buttons to each have a 'description' - text in a div that sits next to them that isn't the label
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform/elements/radio.php
Modified: pieforms-php5/trunk/src/pieform/elements/radio.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/radio.php 2009-04-14 00:22:36 UTC (rev 304)
+++ pieforms-php5/trunk/src/pieform/elements/radio.php 2009-04-27 08:05:10 UTC (rev 305)
@@ -45,14 +45,24 @@
$separator = $element['separator'] . $separator;
}
- foreach ($element['options'] as $value => $text) {
+ foreach ($element['options'] as $value => $data) {
$uid = $id . substr(md5(microtime()), 0, 4);
$element['id'] = $uid;
+ if (is_array($data)) {
+ $text = $data['text'];
+ $description = (isset($data['description'])) ? $data['description'] : '';
+ }
+ else {
+ $text = $data;
+ $description = '';
+ }
$result .= '<input type="radio"'
. $form->element_attributes($element)
. ' value="' . Pieform::hsc($value) . '"'
. (($form_value == $value) ? ' checked="checked"' : '')
- . '> <label for="' . $form->get_name() . '_' . $uid . '">' . Pieform::hsc($text) . "</label>$separator";
+ . '> <label for="' . $form->get_name() . '_' . $uid . '">' . Pieform::hsc($text) . "</label>"
+ . ($description != '' ? '<div class="radio-description">' . $description . '</div>' : '')
+ . $separator;
}
$result = substr($result, 0, -strlen($separator));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ora...@us...> - 2009-04-14 00:22:37
|
Revision: 304
http://pieforms.svn.sourceforge.net/pieforms/?rev=304&view=rev
Author: oracleshinoda
Date: 2009-04-14 00:22:36 +0000 (Tue, 14 Apr 2009)
Log Message:
-----------
Remove reloadformonreply setting (richardm)
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform.php
pieforms-php5/trunk/src/static/core/pieforms.js
Modified: pieforms-php5/trunk/src/pieform.php
===================================================================
--- pieforms-php5/trunk/src/pieform.php 2009-02-27 04:27:47 UTC (rev 303)
+++ pieforms-php5/trunk/src/pieform.php 2009-04-14 00:22:36 UTC (rev 304)
@@ -692,7 +692,6 @@
'globalJsErrorCallback' => $this->data['globaljserrorcallback'],
'postSubmitCallback' => $this->data['postsubmitcallback'],
'newIframeOnSubmit' => $this->data['newiframeonsubmit'],
- 'reloadFormOnReply' => $this->data['reloadformonreply'],
));
$result .= "<script type=\"text/javascript\">new Pieform($data);</script>\n";
}
@@ -1344,11 +1343,6 @@
// submitted.
'newiframeonsubmit' => false,
- // Whether the contents of the form should be reloaded on the page when
- // a reply is received from the server. If false, error messages will
- // not automatically be displayed inside the form.
- 'reloadformonreply' => true,
-
// The URL where pieforms.js and other related pieforms javascript
// files can be accessed. Best specified as an absolute path in
// pieform_configure()
Modified: pieforms-php5/trunk/src/static/core/pieforms.js
===================================================================
--- pieforms-php5/trunk/src/static/core/pieforms.js 2009-02-27 04:27:47 UTC (rev 303)
+++ pieforms-php5/trunk/src/static/core/pieforms.js 2009-04-14 00:22:36 UTC (rev 304)
@@ -168,9 +168,9 @@
return;
}
- PieformManager.signal('onreply', self.data.name);
+ if (typeof(data.replaceHTML) == 'string') {
+ PieformManager.signal('onreply', self.data.name);
- if (self.data.reloadFormOnReply) {
var tmp = DIV();
tmp.innerHTML = data.replaceHTML;
@@ -189,6 +189,7 @@
replaceChildNodes($(self.data.name), tmp.childNodes[0].childNodes);
self.connectSubmitButtons();
+ self.clickedButton = null;
PieformManager.signal('onload', self.data.name);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ora...@us...> - 2009-02-27 04:27:52
|
Revision: 303
http://pieforms.svn.sourceforge.net/pieforms/?rev=303&view=rev
Author: oracleshinoda
Date: 2009-02-27 04:27:47 +0000 (Fri, 27 Feb 2009)
Log Message:
-----------
Generalise the code to detect file elements, so any custom element can declare it needs the form to POST. Thanks to Richard Mansfield
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform/elements/file.php
pieforms-php5/trunk/src/pieform.php
Modified: pieforms-php5/trunk/src/pieform/elements/file.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/file.php 2009-02-23 05:17:03 UTC (rev 302)
+++ pieforms-php5/trunk/src/pieform/elements/file.php 2009-02-27 04:27:47 UTC (rev 303)
@@ -45,4 +45,9 @@
}
}/*}}}*/
+function pieform_element_file_set_attributes($element) {/*{{{*/
+ $element['needsmultipart'] = true;
+ return $element;
+}/*}}}*/
+
?>
Modified: pieforms-php5/trunk/src/pieform.php
===================================================================
--- pieforms-php5/trunk/src/pieform.php 2009-02-23 05:17:03 UTC (rev 302)
+++ pieforms-php5/trunk/src/pieform.php 2009-02-27 04:27:47 UTC (rev 303)
@@ -322,15 +322,6 @@
$element['title'] = '';
}
- // Force the form method to post if there is a file to upload
- if ($element['type'] == 'file') {
- $this->fileupload = true;
- if ($this->data['method'] == 'get') {
- $this->data['method'] = 'post';
- self::info("Your form '$this->name' had the method 'get' and also a file element - it has been converted to 'post'");
- }
- }
-
// This function can be defined by the application using Pieforms,
// and applies to all elements of this type
$function = 'pieform_element_' . $element['type'] . '_configure';
@@ -350,6 +341,15 @@
$element = $function($element);
}
+ // Force the form method to post if there is a file to upload
+ if (!empty($element['needsmultipart'])) {
+ $this->fileupload = true;
+ if ($this->data['method'] == 'get') {
+ $this->data['method'] = 'post';
+ self::info("Your form '$this->name' had the method 'get' and also a file element - it has been converted to 'post'");
+ }
+ }
+
// Add the autofocus flag to the element if required
if (!$autofocusadded && $this->data['autofocus'] === true && empty($element['nofocus'])) {
$element['autofocus'] = true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ora...@us...> - 2009-02-23 05:17:09
|
Revision: 302
http://pieforms.svn.sourceforge.net/pieforms/?rev=302&view=rev
Author: oracleshinoda
Date: 2009-02-23 05:17:03 +0000 (Mon, 23 Feb 2009)
Log Message:
-----------
Allow recreation of iframe for async submission every time a form is submitted (needed for multiple file uploads)
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform.php
pieforms-php5/trunk/src/static/core/pieforms.js
Modified: pieforms-php5/trunk/src/pieform.php
===================================================================
--- pieforms-php5/trunk/src/pieform.php 2009-01-16 02:18:28 UTC (rev 301)
+++ pieforms-php5/trunk/src/pieform.php 2009-02-23 05:17:03 UTC (rev 302)
@@ -691,6 +691,8 @@
'jsErrorCallback' => $this->data['jserrorcallback'],
'globalJsErrorCallback' => $this->data['globaljserrorcallback'],
'postSubmitCallback' => $this->data['postsubmitcallback'],
+ 'newIframeOnSubmit' => $this->data['newiframeonsubmit'],
+ 'reloadFormOnReply' => $this->data['reloadformonreply'],
));
$result .= "<script type=\"text/javascript\">new Pieform($data);</script>\n";
}
@@ -1338,6 +1340,15 @@
// supported in less browsers. Most modern browsers should be fine)
'jsform' => false,
+ // Whether the form will target a new hidden iframe every time it's
+ // submitted.
+ 'newiframeonsubmit' => false,
+
+ // Whether the contents of the form should be reloaded on the page when
+ // a reply is received from the server. If false, error messages will
+ // not automatically be displayed inside the form.
+ 'reloadformonreply' => true,
+
// The URL where pieforms.js and other related pieforms javascript
// files can be accessed. Best specified as an absolute path in
// pieform_configure()
Modified: pieforms-php5/trunk/src/static/core/pieforms.js
===================================================================
--- pieforms-php5/trunk/src/static/core/pieforms.js 2009-01-16 02:18:28 UTC (rev 301)
+++ pieforms-php5/trunk/src/static/core/pieforms.js 2009-02-23 05:17:03 UTC (rev 302)
@@ -149,8 +149,9 @@
}
// Ensure the iframe exists and make sure the form targets it
- self.setupIframe();
- $(self.data.name).target = self.data.name + '_iframe';
+ // self.data.newIframes = true;
+ var iframeName = self.setupIframe();
+ $(self.data.name).target = iframeName;
appendChildNodes(self.data.name,
INPUT({
@@ -169,26 +170,28 @@
PieformManager.signal('onreply', self.data.name);
- var tmp = DIV();
- tmp.innerHTML = data.replaceHTML;
+ if (self.data.reloadFormOnReply) {
+ var tmp = DIV();
+ tmp.innerHTML = data.replaceHTML;
- // Work out whether the new form tag has the error class on it, for
- // updating the form in the document
- if (hasElementClass(tmp.childNodes[0], 'error')) {
- addElementClass(self.data.name, 'error');
+ // Work out whether the new form tag has the error class on it, for
+ // updating the form in the document
+ if (hasElementClass(tmp.childNodes[0], 'error')) {
+ addElementClass(self.data.name, 'error');
+ }
+ else {
+ removeElementClass(self.data.name, 'error');
+ }
+
+ // The first child node is the form tag. We replace the children of
+ // the current form tag with the new children. This prevents
+ // javascript references being lost
+ replaceChildNodes($(self.data.name), tmp.childNodes[0].childNodes);
+
+ self.connectSubmitButtons();
+ PieformManager.signal('onload', self.data.name);
}
- else {
- removeElementClass(self.data.name, 'error');
- }
- // The first child node is the form tag. We replace the children of
- // the current form tag with the new children. This prevents
- // javascript references being lost
- replaceChildNodes($(self.data.name), tmp.childNodes[0].childNodes);
-
- self.connectSubmitButtons();
- PieformManager.signal('onload', self.data.name);
-
if (data.returnCode == 0) {
// Call the defined success callback, if there is one
if (typeof(self.data.jsSuccessCallback) == 'string'
@@ -229,6 +232,13 @@
this.setupIframe = function() {//{{{
var iframeName = self.data.name + '_iframe';
+ if (self.data.newIframeOnSubmit) {
+ if (!self.data.nextIframe) {
+ self.data.nextIframe = 0;
+ }
+ iframeName += '_' + self.data.nextIframe;
+ self.data.nextIframe++;
+ }
if ($(iframeName)) {
self.iframe = $(iframeName);
}
@@ -240,6 +250,7 @@
});
insertSiblingNodesAfter(self.data.name, self.iframe);
}
+ return iframeName;
}//}}}
this.connectSubmitButtons = function() {//{{{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ora...@us...> - 2009-01-16 02:38:52
|
Revision: 301
http://pieforms.svn.sourceforge.net/pieforms/?rev=301&view=rev
Author: oracleshinoda
Date: 2009-01-16 02:18:28 +0000 (Fri, 16 Jan 2009)
Log Message:
-----------
Check for the 'value' of the password field before looking at the submitted value
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform/elements/password.php
Modified: pieforms-php5/trunk/src/pieform/elements/password.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/password.php 2009-01-13 01:24:20 UTC (rev 300)
+++ pieforms-php5/trunk/src/pieform/elements/password.php 2009-01-16 02:18:28 UTC (rev 301)
@@ -38,13 +38,13 @@
}/*}}}*/
function pieform_element_password_get_value(Pieform $form, $element) {/*{{{*/
+ if (isset($element['value'])) {
+ return $element['value'];
+ }
$global = ($form->get_property('method') == 'get') ? $_GET : $_POST;
if ($form->is_submitted() && isset($global[$element['name']])) {
return $global[$element['name']];
}
- if (isset($element['value'])) {
- return $element['value'];
- }
return null;
}/*}}}*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ora...@us...> - 2009-01-13 01:24:26
|
Revision: 300
http://pieforms.svn.sourceforge.net/pieforms/?rev=300&view=rev
Author: oracleshinoda
Date: 2009-01-13 01:24:20 +0000 (Tue, 13 Jan 2009)
Log Message:
-----------
Added Spanish translation, thanks to Jos?\195?\169 Mar?\195?\173a P?\195?\169rez.
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform/elements/bytes.php
pieforms-php5/trunk/src/pieform/elements/calendar.php
pieforms-php5/trunk/src/pieform/elements/date.php
pieforms-php5/trunk/src/pieform/elements/expiry.php
pieforms-php5/trunk/src/pieform/rules/before.php
pieforms-php5/trunk/src/pieform/rules/email.php
pieforms-php5/trunk/src/pieform/rules/integer.php
pieforms-php5/trunk/src/pieform/rules/maxlength.php
pieforms-php5/trunk/src/pieform/rules/maxvalue.php
pieforms-php5/trunk/src/pieform/rules/minlength.php
pieforms-php5/trunk/src/pieform/rules/minvalue.php
pieforms-php5/trunk/src/pieform/rules/regex.php
pieforms-php5/trunk/src/pieform/rules/required.php
pieforms-php5/trunk/src/pieform/rules/validateoptions.php
Modified: pieforms-php5/trunk/src/pieform/elements/bytes.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/bytes.php 2008-12-28 23:03:13 UTC (rev 299)
+++ pieforms-php5/trunk/src/pieform/elements/bytes.php 2009-01-13 01:24:20 UTC (rev 300)
@@ -145,6 +145,13 @@
'megabytes' => 'MB',
'invalidvalue' => '値は数値にしてください',
),
+ 'es.utf8' => array(
+ 'bytes' => 'Bytes',
+ 'kilobytes' => 'Kilobytes',
+ 'megabytes' => 'Megabytes',
+ 'invalidvalue' => 'El valor debe ser un número',
+ ),
+
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/elements/calendar.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/calendar.php 2008-12-28 23:03:13 UTC (rev 299)
+++ pieforms-php5/trunk/src/pieform/elements/calendar.php 2009-01-13 01:24:20 UTC (rev 300)
@@ -164,6 +164,10 @@
'ja.utf8' => array(
'invalidvalue' => '無効な日付/時間が指定されました'
),
+ 'es.utf8' => array(
+ 'invalidvalue' => 'Fecha/hora indicada inválida'
+ ),
+
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/elements/date.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/date.php 2008-12-28 23:03:13 UTC (rev 299)
+++ pieforms-php5/trunk/src/pieform/elements/date.php 2009-01-13 01:24:20 UTC (rev 300)
@@ -145,6 +145,11 @@
'or' => 'or',
'notspecified' => '指定なし'
),
+ 'es.utf8' => array(
+ 'or' => 'o',
+ 'notspecified' => 'Sin valor'
+ ),
+
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/elements/expiry.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/expiry.php 2008-12-28 23:03:13 UTC (rev 299)
+++ pieforms-php5/trunk/src/pieform/elements/expiry.php 2009-01-13 01:24:20 UTC (rev 300)
@@ -152,6 +152,14 @@
'years' => '年',
'noenddate' => '終了日なし'
),
+ 'es.utf8' => array(
+ 'days' => 'Días',
+ 'weeks' => 'Semanas',
+ 'months' => 'Meses',
+ 'years' => 'Años',
+ 'noenddate' => 'Sin fecha de finalización'
+ ),
+
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/before.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/before.php 2008-12-28 23:03:13 UTC (rev 299)
+++ pieforms-php5/trunk/src/pieform/rules/before.php 2009-01-13 01:24:20 UTC (rev 300)
@@ -57,6 +57,9 @@
'ja.utf8' => array(
'before' => 'フィールド「 %s 」の後に設定することはできません'
),
+ 'es.utf8' => array(
+ 'before' => 'No puede ser posterior al campo "%s"'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/email.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/email.php 2008-12-28 23:03:13 UTC (rev 299)
+++ pieforms-php5/trunk/src/pieform/rules/email.php 2009-01-13 01:24:20 UTC (rev 300)
@@ -56,6 +56,10 @@
'ja.utf8' => array(
'email' => 'メールアドレスが有効ではありません'
),
+ 'es.utf8' => array(
+ 'email' => 'Dirección de correo errónea'
+ ),
+
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/integer.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/integer.php 2008-12-28 23:03:13 UTC (rev 299)
+++ pieforms-php5/trunk/src/pieform/rules/integer.php 2009-01-13 01:24:20 UTC (rev 300)
@@ -53,6 +53,10 @@
'ja.utf8' => array(
'integer' => 'フィールドは整数にしてください'
),
+ 'es.utf8' => array(
+ 'integer' => 'Este campo debe ser un número entero'
+ ),
+
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/maxlength.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/maxlength.php 2008-12-28 23:03:13 UTC (rev 299)
+++ pieforms-php5/trunk/src/pieform/rules/maxlength.php 2009-01-13 01:24:20 UTC (rev 300)
@@ -53,6 +53,10 @@
'ja.utf8' => array(
'maxlength' => 'このフィールドは、最大半角 %d 文字にしてください'
),
+ 'es.utf8' => array(
+ 'maxlength' => 'Este campo tiene que tener como máximo %d caracteres'
+ ),
+
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/maxvalue.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/maxvalue.php 2008-12-28 23:03:13 UTC (rev 299)
+++ pieforms-php5/trunk/src/pieform/rules/maxvalue.php 2009-01-13 01:24:20 UTC (rev 300)
@@ -53,6 +53,10 @@
'ja.utf8' => array(
'maxvalue' => 'この値は %d 以下にしてください'
),
+ 'es.utf8' => array(
+ 'maxvalue' => 'Este valor no puede ser superior a %d'
+ ),
+
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/minlength.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/minlength.php 2008-12-28 23:03:13 UTC (rev 299)
+++ pieforms-php5/trunk/src/pieform/rules/minlength.php 2009-01-13 01:24:20 UTC (rev 300)
@@ -50,6 +50,10 @@
'fr.utf8' => array(
'minlength' => 'Ce champ doit contenir au moins %d caractères',
),
+ 'es.utf8' => array(
+ 'minlength' => 'Este campo debe tener como mínimo %d caracteres',
+ ),
+
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/minvalue.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/minvalue.php 2008-12-28 23:03:13 UTC (rev 299)
+++ pieforms-php5/trunk/src/pieform/rules/minvalue.php 2009-01-13 01:24:20 UTC (rev 300)
@@ -53,6 +53,10 @@
'ja.utf8' => array(
'minvalue' => 'この値は %d 以下にすることはできません'
),
+ 'es.utf8' => array(
+ 'minvalue' => 'Este valor no puede ser inferior a %d'
+ ),
+
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/regex.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/regex.php 2008-12-28 23:03:13 UTC (rev 299)
+++ pieforms-php5/trunk/src/pieform/rules/regex.php 2009-01-13 01:24:20 UTC (rev 300)
@@ -54,6 +54,10 @@
'ja.utf8' => array(
'regex' => 'このフィールドは正しい形式ではありません'
),
+ 'es.utf8' => array(
+ 'regex' => 'Este campo no tiene un formato válido'
+ ),
+
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/required.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/required.php 2008-12-28 23:03:13 UTC (rev 299)
+++ pieforms-php5/trunk/src/pieform/rules/required.php 2009-01-13 01:24:20 UTC (rev 300)
@@ -53,6 +53,9 @@
'ja.utf8' => array(
'required' => 'このフィールドは、必須入力フィールドです。'
),
+ 'es.utf8' => array(
+ 'required' => 'Este campo es obligatorio'
+ ),
);
}/*}}}*/
Modified: pieforms-php5/trunk/src/pieform/rules/validateoptions.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/validateoptions.php 2008-12-28 23:03:13 UTC (rev 299)
+++ pieforms-php5/trunk/src/pieform/rules/validateoptions.php 2009-01-13 01:24:20 UTC (rev 300)
@@ -61,6 +61,10 @@
'ja.utf8' => array(
'validateoptions' => 'オプション「 %s 」が正しくありません'
),
+ 'es.utf8' => array(
+ 'validateoptions' => 'La opción "%s" no es válida'
+ ),
+
);
}/*}}}*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ora...@us...> - 2008-12-28 23:03:15
|
Revision: 299
http://pieforms.svn.sourceforge.net/pieforms/?rev=299&view=rev
Author: oracleshinoda
Date: 2008-12-28 23:03:13 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
Allow hidden elements to have the value 'null' assigned to them. Thanks to Ray Merrill.
Modified Paths:
--------------
pieforms-php5/trunk/src/pieform/elements/hidden.php
Modified: pieforms-php5/trunk/src/pieform/elements/hidden.php
===================================================================
--- pieforms-php5/trunk/src/pieform/elements/hidden.php 2008-11-15 23:37:18 UTC (rev 298)
+++ pieforms-php5/trunk/src/pieform/elements/hidden.php 2008-12-28 23:03:13 UTC (rev 299)
@@ -32,7 +32,7 @@
* @return string The HTML for the element
*/
function pieform_element_hidden(Pieform $form, $element) {/*{{{*/
- if (!isset($element['value'])) {
+ if (!array_key_exists('value', $element)) {
throw new PieformException('The hidden element "' . $element['name'] . '" must have a value set');
}
$value = $form->get_value($element);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
