Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[12814] XoopsModules/xforms/branches/mamba/xforms
|
From: <be...@us...> - 2014-10-08 15:01:24
|
Revision: 12814
http://sourceforge.net/p/xoops/svn/12814
Author: beckmi
Date: 2014-10-08 15:01:21 +0000 (Wed, 08 Oct 2014)
Log Message:
-----------
code clean-up for consistency
Modified Paths:
--------------
XoopsModules/xforms/branches/mamba/xforms/admin/ele_date.php
XoopsModules/xforms/branches/mamba/xforms/admin/ele_select_ctry.php
XoopsModules/xforms/branches/mamba/xforms/admin/file.php
XoopsModules/xforms/branches/mamba/xforms/admin/upgrade.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/assets/images/logo.png
XoopsModules/xforms/branches/mamba/xforms/language/english/mail_template/xforms_copy.tpl
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/ele_date.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/ele_date.php 2014-10-08 14:58:09 UTC (rev 12813)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/ele_date.php 2014-10-08 15:01:21 UTC (rev 12814)
@@ -1,16 +1,29 @@
-<?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);
-
-?>
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * xForms module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package xforms
+ * @since 1.30
+ * @author Xoops Development Team
+ */
+
+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_XFORMS_ELE_DATE, 'ele_value', $size = 15, $date_value);
+ $output->addElement($date);
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/ele_select_ctry.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/ele_select_ctry.php 2014-10-08 14:58:09 UTC (rev 12813)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/ele_select_ctry.php 2014-10-08 15:01:21 UTC (rev 12814)
@@ -1,25 +1,39 @@
-<?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
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * xForms module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package xforms
+ * @since 1.30
+ * @author Xoops Development Team
+ */
+
+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_XFORMS_ELE_SIZE, 'ele_value[0]', 3, 2, $ele_size);
+$allow_multi = empty($ele_value[1]) ? 0 : 1;
+$multiple = new XoopsFormRadioYN(_AM_XFORMS_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_XFORMS_ELE_SELECT_CTRY, 'ele_value[2]', $countries);
+//
+$output->addElement($size, 1);
+$output->addElement($multiple);
+//$output->addElement($opt_tray);
+$output->addElement($reg_form);
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/file.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/file.php 2014-10-08 14:58:09 UTC (rev 12813)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/file.php 2014-10-08 15:01:21 UTC (rev 12814)
@@ -1,12 +1,28 @@
<?php
-###############################################################################
-## See license.txt ##
-###############################################################################
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * xForms module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package xforms
+ * @since 1.30
+ * @author Xoops Development Team
+ */
+
include 'admin_header.php';
$file = isset($_GET['f']) ? trim($_GET['f']) : '';
-$path = xforms_UPLOAD_PATH.$file;
-if( !$file || !preg_match('/^[0-9]+_{1}[0-9a-z]+\.[0-9a-z]+$/', $file) || !file_exists($path) ){
- redirect_header(XOOPS_URL, 0, _AM_NOTHING_SELECTED);
+$path = XFORMS_UPLOAD_PATH.$file;
+if ( !$file || !preg_match('/^[0-9]+_{1}[0-9a-z]+\.[0-9a-z]+$/', $file) || !file_exists($path) ) {
+ redirect_header(XOOPS_URL, 0, _AM_XFORMS_NOTHING_SELECTED);
}
header("Content-Type: application/octet-stream");
@@ -17,4 +33,3 @@
header("Content-Length: ".filesize($path));
readfile($path);
-?>
\ No newline at end of file
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/upgrade.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/upgrade.php 2014-10-08 14:58:09 UTC (rev 12813)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/upgrade.php 2014-10-08 15:01:21 UTC (rev 12814)
@@ -1,33 +1,49 @@
<?php
-###############################################################################
-## See license.txt ##
-###############################################################################
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * xForms module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package xforms
+ * @since 1.30
+ * @author Xoops Development Team
+ */
+
include 'admin_header.php';
$version = number_format($xoopsModule->getVar('version')/100, 2);
$count = $xforms_form_mgr->getCount();
-if( $version >= 1.2 || $count > 0 ){
- xoops_cp_header();
- echo 'I guess this module has been upgraded already. Why don\'t you delete this file?';
-}elseif( $_POST['goupgrade'] == 1){
- $sql = $msgs = $ret = array();
- $error = false;
-
- $msgs[] = 'Rename form elements table...';
- $sql[] = 'ALTER TABLE `'.$xoopsDB->prefix('xforms').'` RENAME `'.$xoopsDB->prefix('xforms_formelements').'`';
-
- $msgs[] = 'Add form_id to elements table...';
- $sql[] = 'ALTER TABLE `'.$xoopsDB->prefix('xforms_formelements')."` ADD `form_id` SMALLINT( 5 ) DEFAULT '1' NOT NULL AFTER `ele_id`";
-
- $msgs[] = 'Change default value of form_id in elements table...';
- $sql[] = 'ALTER TABLE `'.$xoopsDB->prefix('xforms_formelements')."` CHANGE `form_id` `form_id` SMALLINT( 5 ) DEFAULT '0' NOT NULL";
-
- $method = $xoopsModuleConfig['method'];
- $method = $xoopsModuleConfig['method'] == 'pm' ? 'p' : 'e';
- $sendto = !empty($xoopsModuleConfig['admin_only']) ? 0 : $xoopsModuleConfig['group'];
- $delimiter = $xoopsModuleConfig['delimeter'] == 'br' ? 'b' : 's';
- $msgs[] = 'Create forms table...';
- $sql[] =
- "CREATE TABLE `".$xoopsDB->prefix('xforms_forms')."` (
+if ($version >= 1.2 || $count > 0) {
+ xoops_cp_header();
+ echo 'I guess this module has been upgraded already. Why don\'t you delete this file?';
+} elseif ($_POST['goupgrade'] == 1) {
+ $sql = $msgs = $ret = array();
+ $error = false;
+
+ $msgs[] = 'Rename form elements table...';
+ $sql[] = 'ALTER TABLE `'.$xoopsDB->prefix('xforms').'` RENAME `'.$xoopsDB->prefix('xforms_formelements').'`';
+
+ $msgs[] = 'Add form_id to elements table...';
+ $sql[] = 'ALTER TABLE `'.$xoopsDB->prefix('xforms_formelements')."` ADD `form_id` SMALLINT( 5 ) DEFAULT '1' NOT NULL AFTER `ele_id`";
+
+ $msgs[] = 'Change default value of form_id in elements table...';
+ $sql[] = 'ALTER TABLE `'.$xoopsDB->prefix('xforms_formelements')."` CHANGE `form_id` `form_id` SMALLINT( 5 ) DEFAULT '0' NOT NULL";
+
+ $method = $xoopsModuleConfig['method'];
+ $method = $xoopsModuleConfig['method'] == 'pm' ? 'p' : 'e';
+ $sendto = !empty($xoopsModuleConfig['admin_only']) ? 0 : $xoopsModuleConfig['group'];
+ $delimiter = $xoopsModuleConfig['delimeter'] == 'br' ? 'b' : 's';
+ $msgs[] = 'Create forms table...';
+ $sql[] =
+ "CREATE TABLE `".$xoopsDB->prefix('xforms_forms')."` (
`form_id` smallint(5) NOT NULL auto_increment,
`form_send_method` char(1) NOT NULL default 'e',
`form_send_to_group` smallint(3) NOT NULL default '0',
@@ -41,55 +57,54 @@
PRIMARY KEY (`form_id`),
KEY `form_order` (`form_order`)
) ENGINE=MyISAM;";
-
- $msgs[] = 'Insert default data into forms table...';
- $sql[] =
- "INSERT INTO `".$xoopsDB->prefix('xforms_forms')."` VALUES (1, '".$method."', ".intval($sendto).", 1, '".$delimiter."', 'Contact Us', '"._SUBMIT."', 'Tell us about your comments for this site.', 'Contact us by filling out this form.', '');";
-
- for( $i=0; $i<count($sql); $i++ ){
- if( false != $xoopsDB->query($sql[$i]) ){
- $ret[] = $msgs[$i].'done.';
- }else{
- $ret[] = $msgs[$i].'failed.';
- $ret[] = ' '.$xoopsDB->error().' ('.$xoopsDB->errno().')';
- $error = true;
- }
- }
-
- if( $error == false ){
- $ret[] = 'Setting up default permissions...';
- $m = ' Grant permission of form id 1 to group id %u...%s';
- for( $i=1; $i<4; $i++ ){
- $perm = $moduleperm_handler->create();
- $perm->setVar('gperm_name', $xforms_form_mgr->perm_name);
- $perm->setVar('gperm_itemid', 1);
- $perm->setVar('gperm_groupid', $i);
- $perm->setVar('gperm_modid', $xoopsModule->getVar('mid'));
- if( !$moduleperm_handler->insert($perm) ){
- $ret[] = sprintf($m, $i, 'failed.');
- $error = true;
- }else{
- $ret[] = sprintf($m, $i, 'done.');
- }
- }
- }
-
- xoops_cp_header();
- $output = '';
- foreach( $ret as $r ){
- $output .= $r.'<br />';
- }
- echo '<pre><code>'.$output.'</code></pre>';
-
- if( false != $error ){
- echo '<b>Oh No! Upgrade seems failed... I honestly hope that you have a backup...</b>';
- }else{
- echo 'Upgrade successed. Now go <a href="'.XOOPS_URL.'/modules/system/admin.php?fct=modulesadmin&op=update&module=xforms">update this module</a>.';
- }
-}else{
- xoops_cp_header();
- xoops_confirm(array('goupgrade' => 1), xforms_URL.'admin/upgrade.php', 'Make sure you have your files and database backuped. Are you really ready to upgrade the module now?', 'Cut the crap and do it');
+
+ $msgs[] = 'Insert default data into forms table...';
+ $sql[] =
+ "INSERT INTO `".$xoopsDB->prefix('xforms_forms')."` VALUES (1, '".$method."', ".intval($sendto).", 1, '".$delimiter."', 'Contact Us', '"._SUBMIT."', 'Tell us about your comments for this site.', 'Contact us by filling out this form.', '');";
+
+ for ( $i=0; $i<count($sql); $i++ ) {
+ if ( false != $xoopsDB->query($sql[$i]) ) {
+ $ret[] = $msgs[$i].'done.';
+ } else {
+ $ret[] = $msgs[$i].'failed.';
+ $ret[] = ' '.$xoopsDB->error().' ('.$xoopsDB->errno().')';
+ $error = true;
+ }
+ }
+
+ if ($error == false) {
+ $ret[] = 'Setting up default permissions...';
+ $m = ' Grant permission of form id 1 to group id %u...%s';
+ for ($i=1; $i<4; $i++) {
+ $perm = $moduleperm_handler->create();
+ $perm->setVar('gperm_name', $xforms_form_mgr->perm_name);
+ $perm->setVar('gperm_itemid', 1);
+ $perm->setVar('gperm_groupid', $i);
+ $perm->setVar('gperm_modid', $xoopsModule->getVar('mid'));
+ if ( !$moduleperm_handler->insert($perm) ) {
+ $ret[] = sprintf($m, $i, 'failed.');
+ $error = true;
+ } else {
+ $ret[] = sprintf($m, $i, 'done.');
+ }
+ }
+ }
+
+ xoops_cp_header();
+ $output = '';
+ foreach ($ret as $r) {
+ $output .= $r.'<br />';
+ }
+ echo '<pre><code>'.$output.'</code></pre>';
+
+ if (false != $error) {
+ echo '<b>Oh No! Upgrade seems failed... I honestly hope that you have a backup...</b>';
+ } else {
+ echo 'Upgrade successed. Now go <a href="'.XOOPS_URL.'/modules/system/admin.php?fct=modulesadmin&op=update&module=xforms">update this module</a>.';
+ }
+} else {
+ xoops_cp_header();
+ xoops_confirm(array('goupgrade' => 1), XFORMS_URL.'admin/upgrade.php', 'Make sure you have your files and database backuped. Are you really ready to upgrade the module now?', 'Cut the crap and do it');
}
xoops_cp_footer();
-?>
\ No newline at end of file
Added: XoopsModules/xforms/branches/mamba/xforms/assets/images/logo.png
===================================================================
(Binary files differ)
Index: XoopsModules/xforms/branches/mamba/xforms/assets/images/logo.png
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/assets/images/logo.png 2014-10-08 14:58:09 UTC (rev 12813)
+++ XoopsModules/xforms/branches/mamba/xforms/assets/images/logo.png 2014-10-08 15:01:21 UTC (rev 12814)
Property changes on: XoopsModules/xforms/branches/mamba/xforms/assets/images/logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/xforms/branches/mamba/xforms/language/english/mail_template/xforms_copy.tpl
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/language/english/mail_template/xforms_copy.tpl (rev 0)
+++ XoopsModules/xforms/branches/mamba/xforms/language/english/mail_template/xforms_copy.tpl 2014-10-08 15:01:21 UTC (rev 12814)
@@ -0,0 +1,5 @@
+{EHEADER}<br/>
+
+{MSG}<br/><br/>
+
+{EFOOTER}<br/>
Modified: XoopsModules/xforms/branches/mamba/xforms/language/english/modinfo.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/language/english/modinfo.php 2014-10-08 14:58:09 UTC (rev 12813)
+++ XoopsModules/xforms/branches/mamba/xforms/language/english/modinfo.php 2014-10-08 15:01:21 UTC (rev 12814)
@@ -51,4 +51,4 @@
define("_MI_xforms_ADMENU0","Home");
//1.22
-define("_MI_XFORMS_ELE_SELECT_CTRY_DEFAULT","Select Default Country");
\ No newline at end of file
+define("_MI_XFORMS_ELE_SELECT_CTRY_DEFAULT","Select Default Country");
Modified: XoopsModules/xforms/branches/mamba/xforms/xoops_version.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/xoops_version.php 2014-10-08 14:58:09 UTC (rev 12813)
+++ XoopsModules/xforms/branches/mamba/xforms/xoops_version.php 2014-10-08 15:01:21 UTC (rev 12814)
@@ -27,7 +27,7 @@
$modversion['license'] = 'GNU GPL 2.0 or later';
$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html";
$modversion['official'] = 0;
-$modversion['image'] = "assets/images/xforms2.png";
+$modversion['image'] = "assets/images/logo.png";
$modversion['dirname'] = $myDirName;
$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin';
$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
|
