Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[13071] XoopsModules/TDMCreate/branches/timgno/1.91a2 /tdmcreate
|
From: <txm...@us...> - 2015-05-27 10:06:26
|
Revision: 13071
http://sourceforge.net/p/xoops/svn/13071
Author: txmodxoops
Date: 2015-05-27 10:06:24 +0000 (Wed, 27 May 2015)
Log Message:
-----------
Fix missing value type sql/SqlFile.php
XML Rss
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/sql/SqlFile.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/user/TemplatesUserRss.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserRss.php
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/fields.php 2015-05-26 09:35:26 UTC (rev 13070)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/fields.php 2015-05-27 10:06:24 UTC (rev 13071)
@@ -238,25 +238,25 @@
$fieldsObj = $tdmcreate->getHandler('fields')->get( $fieldId );
$form = $fieldsObj->getFormEdit($fieldMid, $fieldTid);
$GLOBALS['xoopsTpl']->assign('form', $form->render());
- break;
-
- case 'order':
- // Initialize fields handler
+ break;
+
+ case 'order':
+ // Initialize fields handler
$fieldsObj = $tdmcreate->getHandler('fields');
- if ( isset($_POST['forder'] ) ) {
+ if (isset($_POST['forder'])) {
$i = 0;
- foreach($_POST['forder'] as $order) {
- if( $order > 0 ) {
+ foreach ($_POST['forder'] as $order) {
+ if ($order > 0) {
$fieldOrder = $fieldsObj->get($order);
$fieldOrder->setVar('field_order', $i);
if (!$fieldsObj->insert($fieldOrder)) {
- $error=true;
+ $error = true;
}
- $i++;
+ ++$i;
}
}
- redirect_header('fields.php', 5, _AM_TDMCREATE_FIELD_ORDER_ERROR);
- unset($i);
+ redirect_header('fields.php', 5, _AM_TDMCREATE_FIELD_ORDER_ERROR);
+ unset($i);
}
exit;
break;
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php 2015-05-26 09:35:26 UTC (rev 13070)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php 2015-05-27 10:06:24 UTC (rev 13071)
@@ -493,7 +493,7 @@
$ret[] = $userRss->render();
// User Templates Rss File
$userTemplatesRss = TemplatesUserRss::getInstance();
- $userTemplatesRss->write($module, $table);
+ $userTemplatesRss->write($module);
$ret[] = $userTemplatesRss->renderFile($moduleDirname . '_rss.tpl');
}
// User Single File
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/sql/SqlFile.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/sql/SqlFile.php 2015-05-26 09:35:26 UTC (rev 13070)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/sql/SqlFile.php 2015-05-27 10:06:24 UTC (rev 13071)
@@ -194,7 +194,7 @@
case 3:
case 4:
case 5:
- $type = $fieldTypeName;
+ $type = $fieldTypeName . '(' . $fieldValue . ')';
if(empty($fieldDefault)) {
$default = "DEFAULT '0'";
} else {
@@ -204,7 +204,7 @@
case 6:
case 7:
case 8:
- $type = $fieldTypeName;
+ $type = $fieldTypeName . '(' . $fieldValue . ')';
if(empty($fieldDefault)) {
$default = "DEFAULT '0.00'"; // From MySQL 5.7 Manual
} else {
@@ -216,7 +216,7 @@
$type = $fieldTypeName;
break;
case 11:
- $type = $fieldTypeName;
+ $type = $fieldTypeName . '(' . $fieldValue . ')';
if(empty($fieldDefault)) {
$default = "DEFAULT 'my...@em...'";
} else {
@@ -224,7 +224,7 @@
}
break;
case 12:
- $type = $fieldTypeName;
+ $type = $fieldTypeName . '(' . $fieldValue . ')';
if(empty($fieldDefault)) {
$default = "DEFAULT 'http:\\'";
} else {
@@ -233,8 +233,8 @@
break;
case 13:
case 14:
- $type = $fieldTypeName;
- $default = "DEFAULT ''";
+ $type = $fieldTypeName . '(' . $fieldValue . ')';
+ $default = "DEFAULT '{$fieldDefault}'";
break;
case 15:
case 16:
@@ -247,12 +247,8 @@
case 20:
case 21:
case 22:
- $type = $fieldTypeName;
- /*if(empty($fieldDefault)) {
- $default = "DEFAULT '0'";
- } else {*/
- $default = "DEFAULT '{$fieldDefault}'";
- //}
+ $type = $fieldTypeName . '(' . $fieldValue . ')';
+ $default = "DEFAULT '{$fieldDefault}'";
break;
case 23:
$type = $fieldTypeName;
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/user/TemplatesUserRss.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/user/TemplatesUserRss.php 2015-05-26 09:35:26 UTC (rev 13070)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/user/TemplatesUserRss.php 2015-05-27 10:06:24 UTC (rev 13071)
@@ -65,14 +65,13 @@
* @param $module
* @param $table
*/
- public function write($module, $table)
+ public function write($module)
{
$this->setModule($module);
- $this->setTable($table);
}
-
+
/*
- * @private function getTemplatesUserRssHeader
+ * @private function getTemplatesUserRssXml
* @param string $moduleDirname
* @param string $table
* @param string $language
@@ -83,158 +82,42 @@
* @param $language
* @return string
*/
- private function getTemplatesUserRssHeader($moduleDirname, $table, $language)
+ private function getTemplatesUserRssXml()
{
- $ret = <<<EOT
-<{include file="db:{$moduleDirname}_header.tpl"}>
-<table class="{$moduleDirname}">
- <thead class="outer">
- <tr class="head">\n
-EOT;
- $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'));
- foreach (array_keys($fields) as $f) {
- $fieldName = $fields[$f]->getVar('field_name');
- $langStuFieldName = $language . strtoupper($fieldName);
- if ((1 == $table->getVar('table_autoincrement')) || (1 == $fields[$f]->getVar('field_user'))) {
- $ret .= <<<EOT
- <th class="center"><{\$smarty.const.{$langStuFieldName}}></th>\n
-EOT;
- }
- }
- $ret .= <<<EOT
- </tr>
- </thead>\n
-EOT;
-
- return $ret;
- }
-
- /*
- * @private function getTemplatesUserRssBody
- * @param string $moduleDirname
- * @param string $table
- * @param string $language
- */
- /**
- * @param $moduleDirname
- * @param $table
- * @param $language
- * @return string
- */
- private function getTemplatesUserRssBody($moduleDirname, $table, $language)
- {
- $tableName = $table->getVar('table_name');
- $ret = <<<EOT
- <tbody>
- <{foreach item=list from=\${$tableName}}>
- <tr class="<{cycle values='odd, even'}>">\n
-EOT;
- $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'));
- foreach (array_keys($fields) as $f) {
- $fieldName = $fields[$f]->getVar('field_name');
- $fieldElement = $fields[$f]->getVar('field_element');
- $rpFieldName = $this->tdmcfile->getRightString($fieldName);
- if ((1 == $table->getVar('table_autoincrement')) || (1 == $fields[$f]->getVar('field_user'))) {
- switch ($fieldElement) {
- case 9:
- $ret .= <<<EOT
- <td class="center"><span style="background-color: #<{\$list.{$rpFieldName}}>;">\t\t</span></td>\n
-EOT;
- break;
- case 10:
- $ret .= <<<EOT
- <td class="center"><img src="<{xoModuleIcons32}><{\$list.{$rpFieldName}}>" alt="{$tableName}"></td>\n
-EOT;
- break;
- case 13:
- $ret .= <<<EOT
- <td class="center"><img src="<{\${$moduleDirname}_upload_url}>/images/{$tableName}/<{\$list.{$rpFieldName}}>" alt="{$tableName}"></td>\n
-EOT;
- break;
- default:
- $ret .= <<<EOT
- <td class="center"><{\$list.{$rpFieldName}}></td>\n
-EOT;
- break;
- }
- }
- }
- $ret .= <<<EOT
- </tr>
- <{/foreach}>
- </tbody>
-</table>\n
-EOT;
-
- return $ret;
- }
-
- /*
- * @private function getTemplatesUserRssBodyFieldnameEmpty
- * @param string $moduleDirname
- * @param string $table
- * @param string $language
- */
- /**
- * @param $moduleDirname
- * @param $table
- * @param $language
- * @return string
- */
- private function getTemplatesUserRssBodyFieldnameEmpty($moduleDirname, $table, $language)
- {
- $tableName = $table->getVar('table_name');
- $ret = <<<EOT
- <tbody>
- <{foreach item=list from=\${$tableName}}>
- <tr class="<{cycle values='odd, even'}>">\n
-EOT;
- $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'));
- foreach (array_keys($fields) as $f) {
- $fieldName = $fields[$f]->getVar('field_name');
- $fieldElement = $fields[$f]->getVar('field_element');
- if ((1 == $table->getVar('table_autoincrement')) || (1 == $fields[$f]->getVar('field_user'))) {
- switch ($fieldElement) {
- case 9:
- $ret .= <<<EOT
- <td class="center"><span style="background-color: #<{\$list.{$fieldName}}>;"></span></td>\n
-EOT;
- break;
- case 13:
- $ret .= <<<EOT
- <td class="center"><img src="<{\${$moduleDirname}_upload_url}>/images/{$tableName}/<{\$list.{$fieldName}}>" alt="{$tableName}"></td>\n
-EOT;
- break;
- default:
- $ret .= <<<EOT
- <td class="center"><{\$list.{$fieldName}}></td>\n
-EOT;
- break;
- }
- }
- }
- $ret .= <<<EOT
- </tr>
- <{/foreach}>
- </tbody>
-</table>\n
-EOT;
-
- return $ret;
- }
-
- /*
- * @private function getTemplatesUserRssFooter
- * @param string $moduleDirname
- */
- /**
- * @param $moduleDirname
- * @return string
- */
- private function getTemplatesUserRssFooter($moduleDirname)
- {
$ret = <<<EOT
-<{include file="db:{$moduleDirname}_footer.tpl"}>
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0">
+ <channel>
+ <title><{\$channel_title}></title>
+ <link><{\$channel_link}></link>
+ <description><{\$channel_desc}></description>
+ <lastBuildDate><{\$channel_lastbuild}></lastBuildDate>
+ <docs>http://backend.userland.com/rss/</docs>
+ <generator><{\$channel_generator}></generator>
+ <category><{\$channel_category}></category>
+ <managingEditor><{\$channel_editor}></managingEditor>
+ <webMaster><{\$channel_webmaster}></webMaster>
+ <language><{\$channel_language}></language>
+ <{if \$image_url != ""}>
+ <image>
+ <title><{\$channel_title}></title>
+ <url><{\$image_url}></url>
+ <link><{\$channel_link}></link>
+ <width><{\$image_width}></width>
+ <height><{\$image_height}></height>
+ </image>
+ <{/if}>
+ <{foreach item=item from=\$items}>
+ <item>
+ <title><{\$item.title}></title>
+ <link><{\$item.link}></link>
+ <description><{\$item.description}></description>
+ <pubDate><{\$item.pubdate}></pubDate>
+ <guid><{\$item.guid}></guid>
+ </item>
+ <{/foreach}>
+ </channel>
+</rss>\n
EOT;
return $ret;
@@ -251,18 +134,9 @@
public function renderFile($filename)
{
$module = $this->getModule();
- $table = $this->getTable();
$moduleDirname = $module->getVar('mod_dirname');
- $tableFieldname = $table->getVar('table_fieldname');
$language = $this->getLanguage($moduleDirname, 'MA');
- $content = $this->getTemplatesUserRssHeader($moduleDirname, $table, $language);
- // Verify if table_fieldname is not empty
- if (!empty($tableFieldname)) {
- $content .= $this->getTemplatesUserRssBody($moduleDirname, $table, $language);
- } else {
- $content .= $this->getTemplatesUserRssBodyFieldnameEmpty($moduleDirname, $table, $language);
- }
- $content .= $this->getTemplatesUserRssFooter($moduleDirname);
+ $content = $this->getTemplatesUserRssXml();
//
$this->tdmcfile->create($moduleDirname, 'templates', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserRss.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserRss.php 2015-05-26 09:35:26 UTC (rev 13070)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserRss.php 2015-05-27 10:06:24 UTC (rev 13071)
@@ -107,7 +107,9 @@
}
if (1 == $fields[$f]->getVar('field_parent')) {
$fieldParent = $fieldName;
- }
+ } else {
+ $fieldParent = 'cid';
+ }
}
$ret = <<<EOT
@@ -140,7 +142,7 @@
\${$tableName}Arr = \${$tableName}Handler->getAll(\$criteria);
unset(\$criteria);
-if (!\$tpl->is_cached('db:rss.tpl', \${$fieldParent})) {
+if (!\$tpl->is_cached('db:{$moduleDirname}_rss.tpl', \${$fieldParent})) {
\$tpl->assign('channel_title', htmlspecialchars(\$title, ENT_QUOTES));
\$tpl->assign('channel_link', XOOPS_URL.'/');
\$tpl->assign('channel_desc', htmlspecialchars(\$xoopsConfig['slogan'], ENT_QUOTES));
@@ -185,7 +187,7 @@
}
}
header("Content-Type:text/xml; charset=" . _CHARSET);
-\$tpl->display('db:rss.tpl', \${$fieldParent});
+\$tpl->display('db:{$moduleDirname}_rss.tpl', \${$fieldParent});
EOT;
return $ret;
|
