Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[10173] XoopsCore/branches/2.6.x/2.6.0/htdocs
|
From: <ma...@us...> - 2012-09-12 18:46:17
|
Revision: 10173
http://xoops.svn.sourceforge.net/xoops/?rev=10173&view=rev
Author: mageg
Date: 2012-09-12 18:46:05 +0000 (Wed, 12 Sep 2012)
Log Message:
-----------
update forms
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formdhtmltextarea.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtext.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtextarea.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtextdateselect.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/admin/avatar_system.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/class/form/avatar.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/language/english/admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/templates/admin/avatars_system.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/form/banner.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/form/bannerclient.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/category.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/field.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/regstep.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/forms.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/language/english/admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/class/form/smilies.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/block.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/group.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/user.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/class/form/ranks.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/language/english/admin.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formdhtmltextarea.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formdhtmltextarea.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formdhtmltextarea.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -168,7 +168,7 @@
$xoops = Xoops::getInstance();
$xoops->loadLanguage('formdhtmltextarea');
if ($this->getCols() > $this->getMaxcols()) {
- $maxcols = $this->getMaxcols();
+ $maxcols = 5;
} else {
$maxcols = $this->getCols();
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtext.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtext.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtext.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -115,7 +115,7 @@
{
$name = $this->getName();
if ($this->getSize() > $this->getMaxcols()) {
- $maxcols = $this->getMaxcols();
+ $maxcols = 5;
} else {
$maxcols = $this->getSize();
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtextarea.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtextarea.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtextarea.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -63,7 +63,7 @@
* @param int $cols number of columns
* @param string $placeholder placeholder for this element.
*/
- public function __construct($caption, $name, $value = "", $rows = 5, $cols = 6, $placeholder = '')
+ public function __construct($caption, $name, $value = "", $rows = 5, $cols = 5, $placeholder = '')
{
$this->setCaption($caption);
$this->setName($name);
@@ -116,7 +116,7 @@
$name = $this->getName();
$class = ($this->getClass() != '' ? " class='" . $this->getClass() . "'" : '');
if ($this->getCols() > $this->getMaxcols()) {
- $maxcols = $this->getMaxcols();
+ $maxcols = 5;
} else {
$maxcols = $this->getCols();
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtextdateselect.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtextdateselect.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtextdateselect.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -145,7 +145,7 @@
');
}
if ($this->getSize() > $this->getMaxcols()) {
- $maxcols = $this->getMaxcols();
+ $maxcols = 4;
} else {
$maxcols = $this->getSize();
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/admin/avatar_system.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/admin/avatar_system.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/admin/avatar_system.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -92,7 +92,8 @@
$obj = $avatar_Handler->create();
$form = $xoops->getModuleForm($obj, 'avatar');
// Assign form
- $xoops->tpl->assign('form', $form->render());
+ $form->render();
+ $xoops->tpl->assign('form', true);
break;
// Edit
@@ -106,7 +107,8 @@
$obj = $avatar_Handler->get($system->cleanVars($_REQUEST, 'avatar_id', 0, 'int'));
$form = $xoops->getModuleForm($obj, 'avatar');
// Assign form
- $xoops->tpl->assign('form', $form->render());
+ $form->render();
+ $xoops->tpl->assign('form', true);
break;
// Save
@@ -144,7 +146,8 @@
}
$xoops->error($obj->getHtmlErrors());
$form = $xoops->getModuleForm($obj, 'avatar');
- $xoops->tpl->assign('form', $form->render());
+ $form->render();
+ $xoops->tpl->assign('form', true);
break;
//Delete
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/class/form/avatar.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/class/form/avatar.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/class/form/avatar.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -39,7 +39,7 @@
parent::__construct($title , 'avatar_form', $action, "post", true);
$this->setExtra('enctype="multipart/form-data"');
// Name
- $this->addElement(new XoopsFormText(_AM_AVATARS_NAME, 'avatar_name', 50, 255, $obj->getVar('avatar_name', 'e')), true);
+ $this->addElement(new XoopsFormText(_AM_AVATARS_NAME, 'avatar_name', 5, 255, $obj->getVar('avatar_name', 'e')), true);
// Upload part
$imgtray_img = new XoopsFormElementTray(_AM_AVATARS_FILE, '<br />');
$imageselect_img = new XoopsFormSelect(sprintf(_AM_AVATARS_IMAGE_PATH, XOOPS_UPLOAD_PATH . '/avatars/'), 'avatar_file', $blank_img);
@@ -56,7 +56,9 @@
$imgtray_img->addElement($fileseltray_img);
$this->addElement($imgtray_img);
// Weight
- $this->addElement(new XoopsFormText(_AM_AVATARS_WEIGHT, 'avatar_weight', 3, 4, $obj->getVar('avatar_weight', 'e')));
+ $weight = new XoopsFormText(_AM_AVATARS_WEIGHT, 'avatar_weight', 1, 4, $obj->getVar('avatar_weight', 'e'), '');
+ $weight->setPattern('^\d+$', _AM_AVATARS_ERROR_WEIGHT);
+ $this->addElement($weight, true);
// Display
$this->addElement(new XoopsFormRadioYN(_AM_AVATARS_DISPLAY, 'avatar_display', $obj->getVar('avatar_display', 'e'), _YES, _NO));
// Hidden
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/language/english/admin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/language/english/admin.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/language/english/admin.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -41,6 +41,7 @@
define("_AM_AVATARS_WEIGHT","Display order in avatar manager:");
define("_AM_AVATARS_UPLOADS","Upload");
define("_AM_AVATARS_USERS","Users using this avatar");
+define("_AM_AVATARS_ERROR_WEIGHT","You need a positive integer");
// Tips
define("_AM_AVATARS_SYSTEM_TIPS","<ul><li>Add, update or delete system avatars</li></ul>");
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/templates/admin/avatars_system.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/templates/admin/avatars_system.html 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/templates/admin/avatars_system.html 2012-09-12 18:46:05 UTC (rev 10173)
@@ -45,5 +45,5 @@
<{/if}>
<!-- Display Avatar form (add,edit) -->
<{if $form}>
-<div class="spacer"><{$form}></div>
+<{includeq file="module:system|system_form.html"}>
<{/if}>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/form/banner.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/form/banner.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/form/banner.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -58,12 +58,12 @@
$client_select->addOptionArray($client_Handler->getList());
$this->addElement($client_select, true);
- $imptotal = new XoopsFormText( _AM_BANNERS_BANNERS_IMPRESSIONSP, 'imptotal', 20, 255, $obj->getVar('imptotal') );
+ $imptotal = new XoopsFormText( _AM_BANNERS_BANNERS_IMPRESSIONSP, 'imptotal', 1, 255, $obj->getVar('imptotal') );
$imptotal->setPattern('^[0-9]*[0-9]+$|^[0-9]+[0-9]*$', _AM_BANNERS_BANNERS_IMPRESSIONSP_PATTERN);
$this->addElement($imptotal, true );
$imgtray_img = new XoopsFormElementTray( _AM_BANNERS_BANNERS_IMAGE, '<br /><br />' );
- $imgtray_img->addElement(new XoopsFormText( _AM_BANNERS_BANNERS_IMGURL, 'imageurl', 80, 255, $obj->getVar('imageurl')));
+ $imgtray_img->addElement(new XoopsFormText( _AM_BANNERS_BANNERS_IMGURL, 'imageurl', 5, 255, $obj->getVar('imageurl')));
$imgpath_img = sprintf( _AM_BANNERS_BANNERS_IMAGE_PATH, XOOPS_UPLOAD_PATH . '/banners/' );
$imageselect_img = new XoopsFormSelect( $imgpath_img, 'banners_imageurl', $blank_img );
$image_array_img = XoopsLists::getImgListAsArray( XOOPS_UPLOAD_PATH . '/banners' );
@@ -80,11 +80,11 @@
$imgtray_img->addElement($fileseltray_img);
$this->addElement($imgtray_img);
- $this->addElement(new XoopsFormText( _AM_BANNERS_BANNERS_CLICKURL, 'clickurl', 80, 255, $obj->getVar('clickurl') ), false );
+ $this->addElement(new XoopsFormText( _AM_BANNERS_BANNERS_CLICKURL, 'clickurl', 5, 255, $obj->getVar('clickurl') ), false );
$this->addElement(new XoopsFormRadioYN( _AM_BANNERS_BANNERS_USEHTML, 'htmlbanner', $html_banner, _YES, _NO) );
- $this->addElement(new xoopsFormTextArea( _AM_BANNERS_BANNERS_CODEHTML, 'htmlcode', $obj->getVar('htmlcode'), 5, 50), false );
+ $this->addElement(new xoopsFormTextArea( _AM_BANNERS_BANNERS_CODEHTML, 'htmlcode', $obj->getVar('htmlcode'), 5, 5), false );
if (!$obj->isNew()) {
$this->addElement(new XoopsFormHidden( 'bid', $obj->getVar('bid') ) );
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/form/bannerclient.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/form/bannerclient.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/form/bannerclient.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -33,7 +33,7 @@
parent::__construct($title, 'form', 'clients.php', 'post', true);
- $this->addElement(new XoopsFormText( _AM_BANNERS_CLIENTS_NAME, 'name', 50, 255, $obj->getVar('name') ), true );
+ $this->addElement(new XoopsFormText( _AM_BANNERS_CLIENTS_NAME, 'name', 5, 255, $obj->getVar('name') ), true );
// date
if ($obj->isNew()) {
$user = 'N';
@@ -51,7 +51,7 @@
$uname->addElement($type);
$uname->addElement(new XoopsFormSelectUser('', 'uid', false, $obj->getVar('uid'), 1, false));
$this->addElement($uname);
- $this->addElement(new xoopsFormTextArea( _AM_BANNERS_CLIENTS_EXTRAINFO, 'extrainfo', $obj->getVar('extrainfo'), 5, 50 ), false );
+ $this->addElement(new xoopsFormTextArea( _AM_BANNERS_CLIENTS_EXTRAINFO, 'extrainfo', $obj->getVar('extrainfo'), 5, 5 ), false );
if (!$obj->isNew()) {
$this->addElement(new XoopsFormHidden( 'cid', $obj->getVar('cid') ) );
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/category.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/category.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/category.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -28,13 +28,15 @@
$title = $obj->isNew() ? sprintf(_PROFILE_AM_ADD, _PROFILE_AM_CATEGORY) : sprintf(_PROFILE_AM_EDIT, _PROFILE_AM_CATEGORY);
parent::__construct($title, 'form', false, 'post', true);
- $this->addElement(new XoopsFormText(_PROFILE_AM_TITLE, 'cat_title', 35, 255, $obj->getVar('cat_title')));
+ $this->addElement(new XoopsFormText(_PROFILE_AM_TITLE, 'cat_title', 5, 255, $obj->getVar('cat_title')), true);
if (!$obj->isNew()) {
//Load groups
$this->addElement(new XoopsFormHidden('id', $obj->getVar('cat_id')));
}
- $this->addElement(new XoopsFormTextArea(_PROFILE_AM_DESCRIPTION, 'cat_description', $obj->getVar('cat_description', 'e')));
- $this->addElement(new XoopsFormText(_PROFILE_AM_WEIGHT, 'cat_weight', 35, 35, $obj->getVar('cat_weight', 'e')));
+ $this->addElement(new XoopsFormTextArea(_PROFILE_AM_DESCRIPTION, 'cat_description', $obj->getVar('cat_description', 'e'), 5, 5));
+ $weight = new XoopsFormText(_PROFILE_AM_WEIGHT, 'cat_weight', 1, 5, $obj->getVar('cat_weight', 'e'), '');
+ $weight->setPattern('^\d+$', _PROFILE_AM_ERROR_WEIGHT);
+ $this->addElement($weight, true);
$this->addElement(new XoopsFormHidden('op', 'save') );
$this->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit', 'btn primary formButton'));
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/field.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/field.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/field.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -30,8 +30,8 @@
parent::__construct($title, 'form', '', 'post', true);
- $this->addElement(new XoopsFormText(_PROFILE_AM_TITLE, 'field_title', 35, 255, $obj->getVar('field_title', 'e')));
- $this->addElement(new XoopsFormTextArea(_PROFILE_AM_DESCRIPTION, 'field_description', $obj->getVar('field_description', 'e')));
+ $this->addElement(new XoopsFormText(_PROFILE_AM_TITLE, 'field_title', 5, 255, $obj->getVar('field_title', 'e')), true);
+ $this->addElement(new XoopsFormTextArea(_PROFILE_AM_DESCRIPTION, 'field_description', $obj->getVar('field_description', 'e'), 5, 5));
if (!$obj->isNew()) {
$fieldcat_id = $obj->getVar('cat_id');
@@ -43,13 +43,15 @@
$cat_select->addOption(0, _PROFILE_AM_DEFAULT);
$cat_select->addOptionArray($category_handler->getList());
$this->addElement($cat_select);
- $this->addElement(new XoopsFormText(_PROFILE_AM_WEIGHT, 'field_weight', 10, 10, $obj->getVar('field_weight', 'e')));
+ $weight = new XoopsFormText(_PROFILE_AM_WEIGHT, 'field_weight', 1, 10, $obj->getVar('field_weight', 'e'), '');
+ $weight->setPattern('^\d+$', _PROFILE_AM_ERROR_WEIGHT);
+ $this->addElement($weight, true);
if ($obj->getVar('field_config') || $obj->isNew()) {
if (!$obj->isNew()) {
$this->addElement(new XoopsFormLabel(_PROFILE_AM_NAME, $obj->getVar('field_name')));
$this->addElement(new XoopsFormHidden('id', $obj->getVar('field_id')));
} else {
- $this->addElement(new XoopsFormText(_PROFILE_AM_NAME, 'field_name', 35, 255, $obj->getVar('field_name', 'e')));
+ $this->addElement(new XoopsFormText(_PROFILE_AM_NAME, 'field_name', 5, 255, $obj->getVar('field_name', 'e')), true);
}
//autotext and theme left out of this one as fields of that type should never be changed (valid assumption, I think)
@@ -77,7 +79,7 @@
XOBJ_DTYPE_OTHER => _PROFILE_AM_OTHER
);
- $type_select = new XoopsFormSelect(_PROFILE_AM_VALUETYPE, 'field_valuetype', $obj->getVar('field_valuetype', 'e'));
+ $type_select = new XoopsFormSelect(_PROFILE_AM_VALUETYPE, 'field_valuetype', $obj->getVar('field_valuetype', 'e'), 5, 5);
$type_select->addOptionArray($valuetypes);
$this->addElement($type_select);
break;
@@ -128,7 +130,7 @@
case "textbox":
case "textarea":
case "dhtml":
- $this->addElement(new XoopsFormText(_PROFILE_AM_MAXLENGTH, 'field_maxlength', 35, 35, $obj->getVar('field_maxlength', 'e')));
+ $this->addElement(new XoopsFormText(_PROFILE_AM_MAXLENGTH, 'field_maxlength', 5, 5, $obj->getVar('field_maxlength', 'e')));
$this->addElement(new XoopsFormTextArea(_PROFILE_AM_DEFAULT, 'field_default', $obj->getVar('field_default', 'e')));
break;
@@ -162,15 +164,15 @@
break;
case "date":
- $this->addElement(new XoopsFormTextDateSelect(_PROFILE_AM_DEFAULT, 'field_default', 15, $obj->getVar('field_default', 'e')));
+ $this->addElement(new XoopsFormTextDateSelect(_PROFILE_AM_DEFAULT, 'field_default', 2, $obj->getVar('field_default', 'e')));
break;
case "longdate":
- $this->addElement(new XoopsFormTextDateSelect(_PROFILE_AM_DEFAULT, 'field_default', 15, strtotime($obj->getVar('field_default', 'e'))));
+ $this->addElement(new XoopsFormTextDateSelect(_PROFILE_AM_DEFAULT, 'field_default', 2, strtotime($obj->getVar('field_default', 'e'))));
break;
case "datetime":
- $this->addElement(new XoopsFormDateTime(_PROFILE_AM_DEFAULT, 'field_default', 15, $obj->getVar('field_default', 'e')));
+ $this->addElement(new XoopsFormDateTime(_PROFILE_AM_DEFAULT, 'field_default', 2, $obj->getVar('field_default', 'e')));
break;
case "yesno":
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/regstep.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/regstep.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/regstep.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -28,9 +28,12 @@
$this->addElement(new XoopsFormHidden('id', $obj->getVar('step_id')));
}
$this->addElement(new XoopsFormHidden('op', 'save'));
- $this->addElement(new XoopsFormText(_PROFILE_AM_STEPNAME, 'step_name', 25, 255, $obj->getVar('step_name', 'e')));
- $this->addElement(new XoopsFormText(_PROFILE_AM_STEPINTRO, 'step_desc', 25, 255, $obj->getVar('step_desc', 'e')));
- $this->addElement(new XoopsFormText(_PROFILE_AM_STEPORDER, 'step_order', 10, 10, $obj->getVar('step_order', 'e')));
+ $this->addElement(new XoopsFormText(_PROFILE_AM_STEPNAME, 'step_name', 5, 255, $obj->getVar('step_name', 'e')), true);
+ $this->addElement(new XoopsFormText(_PROFILE_AM_STEPINTRO, 'step_desc', 5, 255, $obj->getVar('step_desc', 'e')));
+ $order = new XoopsFormText(_PROFILE_AM_STEPORDER, 'step_order', 1, 10, $obj->getVar('step_order', 'e'), '');
+ $order->setPattern('^\d+$', _PROFILE_AM_ERROR_WEIGHT);
+ $this->addElement($order, true);
+
$this->addElement(new XoopsFormRadioYN(_PROFILE_AM_STEPSAVE, 'step_save', $obj->getVar('step_save', 'e')));
$this->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit', 'btn primary formButton'));
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/forms.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/forms.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/forms.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -48,22 +48,22 @@
//$uname_size = $GLOBALS['xoopsConfigUser']['maxuname'] < 35 ? $GLOBALS['xoopsConfigUser']['maxuname'] : 35;
$elements[0][] = array(
- 'element' => new XoopsFormText(_US_NICKNAME, 'uname', 35, $xoops->getConfig('maxuname'), $user->getVar('uname', 'e')),
+ 'element' => new XoopsFormText(_US_NICKNAME, 'uname', 5, $xoops->getConfig('maxuname'), $user->getVar('uname', 'e')),
'required' => true
);
$weights[0][] = 0;
$elements[0][] = array(
- 'element' => new XoopsFormText(_US_EMAIL, 'email', 35, 255, $user->getVar('email', 'e')), 'required' => true
+ 'element' => new XoopsFormText(_US_EMAIL, 'email', 5, 255, $user->getVar('email', 'e')), 'required' => true
);
$weights[0][] = 0;
$elements[0][] =
- array('element' => new XoopsFormPassword(_US_PASSWORD, 'pass', 35, 32, ''), 'required' => true);
+ array('element' => new XoopsFormPassword(_US_PASSWORD, 'pass', 5, 32, ''), 'required' => true);
$weights[0][] = 0;
$elements[0][] =
- array('element' => new XoopsFormPassword(_US_VERIFYPASS, 'vpass', 35, 32, ''), 'required' => true);
+ array('element' => new XoopsFormPassword(_US_VERIFYPASS, 'vpass', 5, 32, ''), 'required' => true);
$weights[0][] = 0;
}
@@ -153,10 +153,10 @@
if ($user->isNew() || $xoops->user->isAdmin()) {
$elements[0][] = array(
- 'element' => new XoopsFormText(_US_NICKNAME, 'uname', 25, $xoops->user->isAdmin() ? 60
+ 'element' => new XoopsFormText(_US_NICKNAME, 'uname', 3, $xoops->user->isAdmin() ? 60
: $GLOBALS['xoopsConfigUser']['maxuname'], $user->getVar('uname', 'e')), 'required' => 1
);
- $email_text = new XoopsFormText('', 'email', 30, 60, $user->getVar('email'));
+ $email_text = new XoopsFormText('', 'email', 4, 60, $user->getVar('email'));
} else {
$elements[0][] = array('element' => new XoopsFormLabel(_US_NICKNAME, $user->getVar('uname')), 'required' => 0);
$email_text = new XoopsFormLabel('', $user->getVar('email'));
@@ -169,8 +169,8 @@
if ($xoops->user->isAdmin() && $user->getVar('uid') != $xoops->user->getVar('uid')) {
//If the user is an admin and is editing someone else
- $pwd_text = new XoopsFormPassword('', 'password', 10, 32);
- $pwd_text2 = new XoopsFormPassword('', 'vpass', 10, 32);
+ $pwd_text = new XoopsFormPassword('', 'password', 3, 32);
+ $pwd_text2 = new XoopsFormPassword('', 'vpass', 3, 32);
$pwd_tray = new XoopsFormElementTray(_US_PASSWORD . '<br />' . _US_TYPEPASSTWICE);
$pwd_tray->addElement($pwd_text);
$pwd_tray->addElement($pwd_text2);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/language/english/admin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/language/english/admin.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/language/english/admin.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -118,4 +118,5 @@
define("_PROFILE_AM_CANNOTDEACTIVATEWEBMASTERS", "Deactivating an administrator account is not allowed");
define("_PROFILE_AM_CATEGORY_LIST", "List of categories");
define("_PROFILE_AM_STEP_LIST", "List of registration step");
-define("_PROFILE_AM_FIELD_LIST", "List of fields");
\ No newline at end of file
+define("_PROFILE_AM_FIELD_LIST", "List of fields");
+define("_PROFILE_AM_ERROR_WEIGHT","You need a positive integer");
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/class/form/smilies.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/class/form/smilies.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/class/form/smilies.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -40,8 +40,8 @@
parent::__construct($title, 'form', 'smilies.php', 'post', true);
$this->setExtra('enctype="multipart/form-data"');
- $this->addElement(new XoopsFormText(_AM_SMILIES_CODE, 'code', 26, 25, $obj->getVar('code'), '', '^Code(.*)$', 'Code', true), true);
- $this->addElement(new XoopsFormText(_AM_SMILIES_DESCRIPTION, 'emotion', 50, 50, $obj->getVar('emotion'), '', '', '', true), true);
+ $this->addElement(new XoopsFormText(_AM_SMILIES_CODE, 'code', 2, 25, $obj->getVar('code'), '', '^Code(.*)$', 'Code', true), true);
+ $this->addElement(new XoopsFormText(_AM_SMILIES_DESCRIPTION, 'emotion', 4, 50, $obj->getVar('emotion'), '', '', '', true), true);
$imgtray_img = new XoopsFormElementTray( _AM_SMILIES_FILE, '<br />' );
$imgpath_img = sprintf( _AM_SMILIES_IMAGE_PATH, XOOPS_UPLOAD_PATH . '/smilies/' );
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/block.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/block.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/block.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -94,7 +94,9 @@
));
$this->addElement($side_select);
// Order
- $this->addElement(new XoopsFormText(_AM_SYSTEM_BLOCKS_WEIGHT, 'weight', 2, 5, $this->_obj->getVar('weight')));
+ $weight = new XoopsFormText(_AM_SYSTEM_BLOCKS_WEIGHT, 'weight', 1, 5, $this->_obj->getVar('weight'), '');
+ $weight->setPattern('^\d+$', _AM_SYSTEM_ERROR_WEIGHT);
+ $this->addElement($weight, true);
// Display
$this->addElement(new XoopsFormRadioYN(_AM_SYSTEM_BLOCKS_VISIBLE, 'visible', $this->_obj->getVar('visible')));
// Visible In
@@ -108,15 +110,13 @@
$mod_select->addOptionArray($module_list);
$this->addElement($mod_select);
// Title
- $this->addElement(new XoopsFormText(_AM_SYSTEM_BLOCKS_TITLE, 'title', 50, 255, $this->_obj->getVar('title')), false);
+ $this->addElement(new XoopsFormText(_AM_SYSTEM_BLOCKS_TITLE, 'title', 5, 255, $this->_obj->getVar('title')), false);
if ($this->_obj->isNew() || $this->_obj->isCustom()) {
$editor_configs = array();
$editor_configs["name"] = "content_block";
$editor_configs["value"] = $this->_obj->getVar('content', 'e');
- $editor_configs["rows"] = 20;
- $editor_configs["cols"] = 100;
- $editor_configs["width"] = "100%";
- $editor_configs["height"] = "400px";
+ $editor_configs["rows"] = 15;
+ $editor_configs["cols"] = 6;
$editor_configs["editor"] = $xoops->getModuleConfig('blocks_editor', 'system');
$this->addElement(new XoopsFormEditor(_AM_SYSTEM_BLOCKS_CONTENT, "content_block", $editor_configs), true);
if (in_array($editor_configs["editor"], array('dhtmltextarea', 'textarea'))) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/group.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/group.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/group.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -53,7 +53,7 @@
parent::__construct($title, "groupform", 'admin.php', "post", true);
$this->setExtra('enctype="multipart/form-data"');
- $name_text = new XoopsFormText(_AM_SYSTEM_GROUPS_NAME, "name", 30, 50, $obj->getVar('name'));
+ $name_text = new XoopsFormText(_AM_SYSTEM_GROUPS_NAME, "name", 4, 50, $obj->getVar('name'));
$desc_text = new XoopsFormTextArea(_AM_SYSTEM_GROUPS_DESCRIPTION, "desc", $obj->getVar('description'));
$system_catids = new XoopsFormElementTray( _AM_SYSTEM_GROUPS_SYSTEMRIGHTS, '' );
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -201,7 +201,7 @@
case 'password':
$myts = MyTextSanitizer::getInstance();
- $ele = new XoopsFormPassword($title, $config[$i]->getVar('conf_name'), 50, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
+ $ele = new XoopsFormPassword($title, $config[$i]->getVar('conf_name'), 5, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
break;
case 'color':
@@ -272,10 +272,10 @@
if ($obj[$i]->getVar('conf_valuetype') == 'array') {
// this is exceptional.. only when value type is arrayneed a smarter way for this
$ele = ($obj[$i]->getVar('conf_value') != '')
- ? new XoopsFormTextArea($title, $obj[$i]->getVar('conf_name'), $myts->htmlspecialchars(implode('|', $obj[$i]->getConfValueForOutput())), 5, 50)
- : new XoopsFormTextArea($title, $obj[$i]->getVar('conf_name'), '', 5, 50);
+ ? new XoopsFormTextArea($title, $obj[$i]->getVar('conf_name'), $myts->htmlspecialchars(implode('|', $obj[$i]->getConfValueForOutput())), 5, 5)
+ : new XoopsFormTextArea($title, $obj[$i]->getVar('conf_name'), '', 5, 5);
} else {
- $ele = new XoopsFormTextArea($title, $obj[$i]->getVar('conf_name'), $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()), 5, 50);
+ $ele = new XoopsFormTextArea($title, $obj[$i]->getVar('conf_name'), $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()), 5, 5);
}
break;
@@ -328,7 +328,7 @@
case 'password':
$myts = MyTextSanitizer::getInstance();
- $ele = new XoopsFormPassword($title, $obj[$i]->getVar('conf_name'), 50, 255, $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()));
+ $ele = new XoopsFormPassword($title, $obj[$i]->getVar('conf_name'), 5, 255, $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()));
break;
case 'color':
@@ -349,7 +349,7 @@
case 'textbox':
default:
$myts = MyTextSanitizer::getInstance();
- $ele = new XoopsFormText($title, $obj[$i]->getVar('conf_name'), 50, 255, $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()));
+ $ele = new XoopsFormText($title, $obj[$i]->getVar('conf_name'), 5, 255, $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()));
break;
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/user.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/user.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/user.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -98,26 +98,26 @@
//Affichage du formulaire
parent::__construct($form_title, "form_user", "admin.php", "post", true);
- $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_NICKNAME, "username", 25, 25, $uname_value), true);
- $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_NAME, "name", 30, 60, $name_value));
+ $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_NICKNAME, "username", 4, 25, $uname_value), true);
+ $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_NAME, "name", 5, 60, $name_value));
$email_tray = new XoopsFormElementTray(_AM_SYSTEM_USERS_EMAIL, "<br />");
- $email_text = new XoopsFormText("", "email", 30, 60, $email_value);
+ $email_text = new XoopsFormText("", "email", 5, 60, $email_value);
$email_tray->addElement($email_text, true);
$email_cbox = new XoopsFormCheckBox("", "user_viewemail", $email_cbox_value);
$email_cbox->addOption(1, _AM_SYSTEM_USERS_AOUTVTEAD);
$email_tray->addElement($email_cbox);
$this->addElement($email_tray, true);
- $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_URL, "url", 30, 100, $url_value));
+ $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_URL, "url", 5, 100, $url_value));
$this->addElement(new XoopsFormSelectTimezone(_AM_SYSTEM_USERS_TIMEZONE, "timezone_offset", $timezone_value));
- $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_ICQ, "user_icq", 15, 15, $icq_value));
- $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_AIM, "user_aim", 18, 18, $aim_value));
- $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_YIM, "user_yim", 25, 25, $yim_value));
- $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_MSNM, "user_msnm", 30, 100, $msnm_value));
- $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_LOCATION, "user_from", 30, 100, $location_value));
- $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_OCCUPATION, "user_occ", 30, 100, $occ_value));
- $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_INTEREST, "user_intrest", 30, 150, $interest_value));
+ $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_ICQ, "user_icq", 3, 15, $icq_value));
+ $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_AIM, "user_aim", 3, 18, $aim_value));
+ $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_YIM, "user_yim", 3, 25, $yim_value));
+ $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_MSNM, "user_msnm", 3, 100, $msnm_value));
+ $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_LOCATION, "user_from", 5, 100, $location_value));
+ $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_OCCUPATION, "user_occ", 5, 100, $occ_value));
+ $this->addElement(new XoopsFormText(_AM_SYSTEM_USERS_INTEREST, "user_intrest", 5, 150, $interest_value));
$sig_tray = new XoopsFormElementTray(_AM_SYSTEM_USERS_SIGNATURE, "<br />");
- $sig_tarea = new XoopsFormTextArea("", "user_sig", $sig_value);
+ $sig_tarea = new XoopsFormTextArea("", "user_sig", $sig_value, 5, 5);
$sig_tray->addElement($sig_tarea);
$sig_cbox = new XoopsFormCheckBox("", "attachsig", $sig_cbox_value);
$sig_cbox->addOption(1, _AM_SYSTEM_USERS_SHOWSIG);
@@ -143,7 +143,7 @@
XOOPS_NOTIFICATION_MODE_SENDONCETHENWAIT => _NOT_MODE_SENDONCEPERLOGIN
));
$this->addElement($notify_mode_select);
- $this->addElement(new XoopsFormTextArea(_AM_SYSTEM_USERS_EXTRAINFO, "bio", $bio_value));
+ $this->addElement(new XoopsFormTextArea(_AM_SYSTEM_USERS_EXTRAINFO, "bio", $bio_value, 5, 5));
$rank_select = new XoopsFormSelect(_AM_SYSTEM_USERS_RANK, "rank", $rank_value);
$ranklist = XoopsLists::getUserRankList();
$rank_select->addOption(0, "--------------");
@@ -153,11 +153,11 @@
$this->addElement($rank_select);
// adding a new user requires password fields
if (!$form_isedit) {
- $this->addElement(new XoopsFormPassword(_AM_SYSTEM_USERS_PASSWORD, "password", 10, 32), true);
- $this->addElement(new XoopsFormPassword(_AM_SYSTEM_USERS_RETYPEPD, "pass2", 10, 32), true);
+ $this->addElement(new XoopsFormPassword(_AM_SYSTEM_USERS_PASSWORD, "password", 3, 32), true);
+ $this->addElement(new XoopsFormPassword(_AM_SYSTEM_USERS_RETYPEPD, "pass2", 3, 32), true);
} else {
- $this->addElement(new XoopsFormPassword(_AM_SYSTEM_USERS_PASSWORD, "password", 10, 32));
- $this->addElement(new XoopsFormPassword(_AM_SYSTEM_USERS_RETYPEPD, "pass2", 10, 32));
+ $this->addElement(new XoopsFormPassword(_AM_SYSTEM_USERS_PASSWORD, "password", 3, 32));
+ $this->addElement(new XoopsFormPassword(_AM_SYSTEM_USERS_RETYPEPD, "pass2", 3, 32));
}
$this->addElement(new XoopsFormRadioYN(_AM_SYSTEM_USERS_MAILOK, 'user_mailok', $mailok_value));
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -68,11 +68,10 @@
define("_AM_SYSTEM_DBUPDATED","Database Updated Successfully!");
define("_AM_SYSTEM_DBERROR","Database was not updated due to some error!");
define("_AM_SYSTEM_NOTACTIVE","This section is not active!");
+define("_AM_SYSTEM_ERROR_WEIGHT","You need a positive integer");
// Group permission phrases
define("_MD_AM_PERMADDNG","Could not add %s permission to %s for group %s");
define("_MD_AM_PERMADDOK","Added %s permission to %s for group %s");
define("_MD_AM_PERMRESETNG","Could not reset group permission for module %s");
-define("_MD_AM_PERMADDNGP","All parent items must be selected.");
-
-?>
\ No newline at end of file
+define("_MD_AM_PERMADDNGP","All parent items must be selected.");
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/class/form/ranks.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/class/form/ranks.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/class/form/ranks.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -40,9 +40,13 @@
parent::__construct($title, 'form', 'userrank.php', 'post', true);
$this->setExtra('enctype="multipart/form-data"');
- $this->addElement( new XoopsFormText( _AM_USERRANK_TITLE, 'rank_title', 50, 50, $obj->getVar('rank_title'), true ) );
- $this->addElement( new XoopsFormText( _AM_USERRANK_MINPOST, 'rank_min', 10, 10, $obj->getVar('rank_min') ) );
- $this->addElement( new XoopsFormText( _AM_USERRANK_MAXPOST, 'rank_max', 10, 10, $obj->getVar('rank_max') ) );
+ $this->addElement( new XoopsFormText( _AM_USERRANK_TITLE, 'rank_title', 4, 50, $obj->getVar('rank_title')), true );
+ $min = new XoopsFormText( _AM_USERRANK_MINPOST, 'rank_min', 1, 10, $obj->getVar('rank_min'));
+ $min->setPattern('^\d+$',_AM_USERRANK_ERROR_POST);
+ $this->addElement($min);
+ $max = new XoopsFormText( _AM_USERRANK_MAXPOST, 'rank_max', 1, 10, $obj->getVar('rank_max'));
+ $max->setPattern('^\d+$',_AM_USERRANK_ERROR_POST);
+ $this->addElement($max);
$imgtray_img = new XoopsFormElementTray( _AM_USERRANK_IMAGE, '<br />' );
$imgpath_img = sprintf( _AM_USERRANK_IMAGE_PATH, XOOPS_UPLOAD_PATH . '/ranks/' );
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/language/english/admin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/language/english/admin.php 2012-09-12 16:51:55 UTC (rev 10172)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/language/english/admin.php 2012-09-12 18:46:05 UTC (rev 10173)
@@ -36,6 +36,7 @@
define("_AM_USERRANK_SUREDEL","Are you sure you want to delete this ranking?");
define("_AM_USERRANK_TITLE","Title");
define("_AM_USERRANK_UPLOAD","Upload");
+define("_AM_USERRANK_ERROR_POST","You need a positive integer");
// Info
define("_AM_USERRANK_NBTOTAL","There are %s ranks in our database");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|