Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[10267] XoopsModules/xforms/branches/mamba/xforms
|
From: <be...@us...> - 2012-11-22 19:38:40
|
Revision: 10267
http://sourceforge.net/p/xoops/svn/10267
Author: beckmi
Date: 2012-11-22 19:38:36 +0000 (Thu, 22 Nov 2012)
Log Message:
-----------
Add Country and Date selection (Mariane)
Modified Paths:
--------------
XoopsModules/xforms/branches/mamba/xforms/admin/editelement.php
XoopsModules/xforms/branches/mamba/xforms/admin/elements.php
XoopsModules/xforms/branches/mamba/xforms/class/elementrenderer.php
XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt
XoopsModules/xforms/branches/mamba/xforms/docs/lang_diff.txt
XoopsModules/xforms/branches/mamba/xforms/include/form_execute.php
XoopsModules/xforms/branches/mamba/xforms/language/english/admin.php
XoopsModules/xforms/branches/mamba/xforms/language/english/modinfo.php
XoopsModules/xforms/branches/mamba/xforms/xoops_version.php
Added Paths:
-----------
XoopsModules/xforms/branches/mamba/xforms/admin/ele_date.php
XoopsModules/xforms/branches/mamba/xforms/admin/ele_select_ctry.php
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/editelement.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/editelement.php 2012-11-21 05:34:42 UTC (rev 10266)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/editelement.php 2012-11-22 19:38:36 UTC (rev 10267)
@@ -79,6 +79,12 @@
case 'select':
include 'ele_select.php';
break;
+ case 'select2':
+ include 'ele_select_ctry.php';
+ break;
+ case 'date':
+ include 'ele_date.php';
+ break;
case 'checkbox':
include 'ele_check.php';
break;
@@ -204,6 +210,36 @@
}
$value[2] = $v2;
break;
+ case 'select2':
+ $value[0] = $ele_value[0]>1 ? intval($ele_value[0]) : 1;
+ $value[1] = !empty($ele_value[1]) ? 1 : 0;
+ $value[2] = !empty($ele_value[2]) ? $ele_value[2] : 'LB';
+ /*
+ $v2 = array();
+ $multi_flag = 1;
+ while( $v = each($ele_value[2]) ){
+ if( !empty($v['value']) ){
+ if( $value[1] == 1 || $multi_flag ){
+ if( $checked[$v['key']] == 1 ){
+ $check = 1;
+ $multi_flag = 0;
+ }else{
+ $check = 0;
+ }
+ }else{
+ $check = 0;
+ }
+ $v2[$v['value']] = $check;
+ }
+ }
+ $value[2] = $v2;
+ */
+ break;
+ case 'date':
+ $value = array();
+ $value[] = $ele_value;
+
+ break;
case 'checkbox':
while( $v = each($ele_value) ){
if( !empty($v['value']) ){
@@ -267,6 +303,8 @@
<li><a href='"._THIS_PAGE."?op=edit&ele_type=text'>"._AM_ELE_TEXT."</a></li>
<li><a href='"._THIS_PAGE."?op=edit&ele_type=textarea'>"._AM_ELE_TAREA."</a></li>
<li><a href='"._THIS_PAGE."?op=edit&ele_type=select'>"._AM_ELE_SELECT."</a></li>
+ <li><a href='"._THIS_PAGE."?op=edit&ele_type=select2'>"._AM_ELE_SELECT_CTRY."</a></li>
+ <li><a href='"._THIS_PAGE."?op=edit&ele_type=date'>"._AM_ELE_DATE."</a></li>
<li><a href='"._THIS_PAGE."?op=edit&ele_type=checkbox'>"._AM_ELE_CHECK."</a></li>
<li><a href='"._THIS_PAGE."?op=edit&ele_type=radio'>"._AM_ELE_RADIO."</a></li>
<li><a href='"._THIS_PAGE."?op=edit&ele_type=yn'>"._AM_ELE_YN."</a></li>
Added: XoopsModules/xforms/branches/mamba/xforms/admin/ele_date.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/ele_date.php (rev 0)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/ele_date.php 2012-11-22 19:38:36 UTC (rev 10267)
@@ -0,0 +1,16 @@
+<?php
+###############################################################################
+## See license.txt ##
+###############################################################################
+
+if( !defined('xforms_ROOT_PATH') ){ exit(); }
+
+ if($value[0] != "Y-m-d" AND $value[0] != "") {
+ $date_value = strtotime($value[0]);
+ } else {
+ $date_value = "";
+ }
+ $date = new XoopsFormTextDateSelect (_AM_ELE_DATE, 'ele_value', $size = 15, $date_value);
+ $output->addElement($date);
+
+?>
Added: XoopsModules/xforms/branches/mamba/xforms/admin/ele_select_ctry.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/ele_select_ctry.php (rev 0)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/ele_select_ctry.php 2012-11-22 19:38:36 UTC (rev 10267)
@@ -0,0 +1,25 @@
+<?php
+###############################################################################
+## See license.txt ##
+###############################################################################
+if (!defined('xforms_ROOT_PATH')) {
+ exit();
+}
+
+if (empty($addopt) && !empty($ele_id)) {
+ $ele_value = $element->getVar('ele_value');
+}
+$ele_size = !empty($ele_value[0]) ? $ele_value[0] : 1;
+$size = new XoopsFormText(_AM_ELE_SIZE, 'ele_value[0]', 3, 2, $ele_size);
+$allow_multi = empty($ele_value[1]) ? 0 : 1;
+$multiple = new XoopsFormRadioYN(_AM_ELE_MULTIPLE, 'ele_value[1]', $allow_multi);
+$country = xoops_getModuleOption('mycountry', 'xforms');
+$countries = !empty($ele_value[2]) ? $ele_value[2] : $country;
+$reg_form = new XoopsFormSelectCountry(_AM_ELE_SELECT_CTRY, 'ele_value[2]', $countries);
+//
+$output->addElement($size, 1);
+$output->addElement($multiple);
+//$output->addElement($opt_tray);
+$output->addElement($reg_form);
+
+?>
\ No newline at end of file
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/elements.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/elements.php 2012-11-21 05:34:42 UTC (rev 10266)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/elements.php 2012-11-22 19:38:36 UTC (rev 10267)
@@ -23,6 +23,8 @@
$jump[0]->addOptionArray(array('text' => _AM_ELE_TEXT,
'textarea' => _AM_ELE_TAREA,
'select' => _AM_ELE_SELECT,
+ 'select2' => _AM_ELE_SELECT_CTRY,
+ 'date' => _AM_ELE_DATE,
'checkbox' => _AM_ELE_CHECK,
'radio' => _AM_ELE_RADIO,
'yn' => _AM_ELE_YN,
@@ -127,6 +129,13 @@
case 'html':
$value[0] = $ele_value[$id];
break;
+ case 'date':
+ $value = array();
+ $value[] = $ele_value[$id];
+ break;
+ case 'select2':
+ $value[2] = !empty($ele_value[$id]) ? $ele_value[$id] : 'LB';
+ break;
case 'select':
$new_vars = array();
$opt_count = 1;
Modified: XoopsModules/xforms/branches/mamba/xforms/class/elementrenderer.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/class/elementrenderer.php 2012-11-21 05:34:42 UTC (rev 10266)
+++ XoopsModules/xforms/branches/mamba/xforms/class/elementrenderer.php 2012-11-22 19:38:36 UTC (rev 10267)
@@ -64,7 +64,31 @@
$check_req->setExtra('disabled="disabled"');
}
break;
-
+ case 'date':
+ if ($post_val) {
+ $ele_value = $post_val;
+ }
+ $form_ele = new XoopsFormTextDateSelect(
+ $ele_caption,
+ $form_ele_id,
+ 15,
+ strtotime($ele_value[0])
+ );
+
+
+
+ break;
+
+ case 'select2':
+ if ($post_val) {
+ $ele_value = $post_val;
+ }
+ $form_ele = new XoopsFormSelectCountry(
+ $ele_caption,
+ $form_ele_id,
+ $myts->htmlspecialchars($myts->stripSlashesGPC($ele_value[2])) // default value
+ );
+ break;
case 'select':
$selected = array();
$options = array();
Modified: XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt 2012-11-21 05:34:42 UTC (rev 10266)
+++ XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt 2012-11-22 19:38:36 UTC (rev 10267)
@@ -1,3 +1,7 @@
+1.22 Mariane (2012-11-20)
+=================================
+- add Country and Date selection (Mariane)
+
1.21 Mamba (2012-06-26)
=================================
- fixing some bugs: (black_beard)
Modified: XoopsModules/xforms/branches/mamba/xforms/docs/lang_diff.txt
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/docs/lang_diff.txt 2012-11-21 05:34:42 UTC (rev 10266)
+++ XoopsModules/xforms/branches/mamba/xforms/docs/lang_diff.txt 2012-11-22 19:38:36 UTC (rev 10267)
@@ -53,4 +53,13 @@
// index.php
define("_MI_XPARTNERS_MENU_01", "Home");
define("_PARTNERS_ADMIN_ABOUT", "About");
-define("_PARTNERS_ADMIN_HELP", "Help");
\ No newline at end of file
+define("_PARTNERS_ADMIN_HELP", "Help");
+
+Version 1.11
+----------------
+
+admin.php
+-----------
+define("_AM_ELE_DATE","Date Selection");
+define("_AM_ELE_SELECT_CTRY","Country Selection");
+define("_AM_ELE_SELECT_CTRY_DEFAULT","Select Default Country");
\ No newline at end of file
Modified: XoopsModules/xforms/branches/mamba/xforms/include/form_execute.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/include/form_execute.php 2012-11-21 05:34:42 UTC (rev 10266)
+++ XoopsModules/xforms/branches/mamba/xforms/include/form_execute.php 2012-11-22 19:38:36 UTC (rev 10267)
@@ -45,6 +45,8 @@
if( $ele_caption != '' ){
$msg[$ele_id] = "\n".$myts->stripSlashesGPC($ele_caption)."\n";
}
+ include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
+ $countries = XoopsLists::getCountryList();
switch($ele_type){
case 'upload':
case 'uploadimg':
@@ -106,6 +108,37 @@
$opt_count++;
}
break;
+ case 'select2':
+ $ele[$ele_id] = trim($ele[$ele_id]);
+ if( preg_match('/\{EMAIL\}/', $ele_value[2]) ){
+ if( !checkEmail($ele[$ele_id]) ){
+ $err[] = _LIAISE_ERR_INVALIDMAIL;
+ }else{
+ $reply_mail = $ele[$ele_id];
+ }
+ }
+ if( preg_match('/\{UNAME\}/', $ele_value[2]) ){
+ $reply_name = $ele[$ele_id];
+ }
+ // $msg[$ele_id] .= $myts->stripSlashesGPC($ele[$ele_id]);
+
+ $msg[$ele_id] .= $countries[$myts->stripSlashesGPC($ele[$ele_id])];
+
+ break;
+ case 'date':
+ $ele[$ele_id] = trim($ele[$ele_id]);
+ if( preg_match('/\{EMAIL\}/', $ele_value) ){
+ if( !checkEmail($ele[$ele_id]) ){
+ $err[] = _LIAISE_ERR_INVALIDMAIL;
+ }else{
+ $reply_mail = $ele[$ele_id];
+ }
+ }
+ if( preg_match('/\{UNAME\}/', $ele_value) ){
+ $reply_name = $ele[$ele_id];
+ }
+ $msg[$ele_id] .= $myts->stripSlashesGPC($ele[$ele_id]);
+ break;
case 'yn':
$v = ($ele[$ele_id]==2) ? _NO : _YES;
$msg[$ele_id] .= $myts->stripSlashesGPC($v);
Modified: XoopsModules/xforms/branches/mamba/xforms/language/english/admin.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/language/english/admin.php 2012-11-21 05:34:42 UTC (rev 10266)
+++ XoopsModules/xforms/branches/mamba/xforms/language/english/admin.php 2012-11-22 19:38:36 UTC (rev 10267)
@@ -116,3 +116,8 @@
define("_AM_ELE_YOUR_NAME",'Your Name');
define("_AM_ELE_YOUR_EMAIL",'Email address');
define("_AM_ELE_YOUR_COMMENTS",'Your comments');
+
+//1.22
+
+define("_AM_ELE_DATE","Date Selection");
+define("_AM_ELE_SELECT_CTRY","Country Selection");
\ No newline at end of file
Modified: XoopsModules/xforms/branches/mamba/xforms/language/english/modinfo.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/language/english/modinfo.php 2012-11-21 05:34:42 UTC (rev 10266)
+++ XoopsModules/xforms/branches/mamba/xforms/language/english/modinfo.php 2012-11-22 19:38:36 UTC (rev 10267)
@@ -63,4 +63,6 @@
define("_MI_xforms_NOFORM_DEFAULT","Sorry, there are currently no forms (visible for you).");
define("_MI_xforms_ADMENU0","Home");
-?>
\ No newline at end of file
+
+//1.22
+define("_MI_ELE_SELECT_CTRY_DEFAULT","Select Default Country");
\ No newline at end of file
Modified: XoopsModules/xforms/branches/mamba/xforms/xoops_version.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/xoops_version.php 2012-11-21 05:34:42 UTC (rev 10266)
+++ XoopsModules/xforms/branches/mamba/xforms/xoops_version.php 2012-11-22 19:38:36 UTC (rev 10267)
@@ -4,7 +4,7 @@
###################################
$modversion['name'] = _MI_xforms_NAME;
-$modversion['version'] = '1.21';
+$modversion['version'] = '1.22';
$modversion['description'] = _MI_xforms_DESC;
$modversion['author'] = "XD Soft";
$modversion['credits'] = "Creator of xforms Dylian Melgert and special thanks to Brandycoke Productions (http://www.brandycoke.com/) for creating liaise (The base of this module)";
@@ -19,10 +19,10 @@
$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//about
-$modversion['release_date'] = '2012/06/25';
+$modversion['release_date'] = '2012/11/20';
$modversion["module_website_url"] = "www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "Final";
+$modversion["module_status"] = "Beta 1";
$modversion['min_php']='5.2';
$modversion['min_xoops']="2.5";
$modversion['min_admin']='1.1';
@@ -101,6 +101,17 @@
$modversion['config'][$i]['default'] = array('user', 'ip', 'agent');
$modversion['config'][$i]['options'] = array(_MI_xforms_MOREINFO_USER => 'user', _MI_xforms_MOREINFO_IP => 'ip', _MI_xforms_MOREINFO_AGENT => 'agent', _MI_xforms_MOREINFO_FORM => 'form');
$i++;
+
+// Select Default Country
+$modversion['config'][$i]['name'] = "mycountry";
+$modversion['config'][$i]['title'] = '_MI_ELE_SELECT_CTRY_DEFAULT';
+$modversion['config'][$i]['description'] = '';
+$modversion['config'][$i]['formtype'] = 'select';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = '-----';
+xoops_load('XoopsLists');
+$modversion['config'][$i]['options'] = array_flip(XoopsLists::getCountryList());
+$i++;
// $xoopsModuleConfig['mail_charset']
$modversion['config'][$i]['name'] = 'mail_charset';
$modversion['config'][$i]['title'] = '_MI_xforms_MAIL_CHARSET';
|
