-
-
-
-
- 
+
+
', $fb_content); //clean line break from dhtmltextarea + $your_name = Request::getString('your_name'); + $your_site = Request::getString('your_site'); + $your_mail = Request::getString('your_mail'); + $fb_type = Request::getString('fb_type'); + $fb_content = Request::getText('fb_content'); + $fb_content = \str_replace(["\r\n", "\n", "\r"], '
', $fb_content); //clean line break from dhtmltextarea - $title = constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SEND_FOR') . $GLOBALS['xoopsModule']->getVar('dirname'); - $body = constant('CO_' . $moduleDirNameUpper . '_' . 'FB_NAME') . ': ' . $your_name . '
'; - $body .= constant('CO_' . $moduleDirNameUpper . '_' . 'FB_MAIL') . ': ' . $your_mail . '
'; - $body .= constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SITE') . ': ' . $your_site . '
'; - $body .= constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE') . ': ' . $fb_type . '
'; - $body .= constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_CONTENT') . ':
'; + $title = \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SEND_FOR') . $GLOBALS['xoopsModule']->getVar('dirname'); + $body = \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_NAME') . ': ' . $your_name . '
'; + $body .= \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_MAIL') . ': ' . $your_mail . '
'; + $body .= \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SITE') . ': ' . $your_site . '
'; + $body .= \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE') . ': ' . $fb_type . '
'; + $body .= \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_CONTENT') . ':
'; $body .= $fb_content; $xoopsMailer = xoops_getMailer(); $xoopsMailer->useMail(); @@ -73,11 +73,11 @@ $xoopsMailer->setFromEmail($your_mail); $xoopsMailer->setFromName($your_name); $xoopsMailer->setSubject($title); - $xoopsMailer->multimailer->isHTML(true); + $xoopsMailer->multimailer->isHTML(); $xoopsMailer->setBody($body); $ret = $xoopsMailer->send(); if ($ret) { - redirect_header('index.php', 3, constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SEND_SUCCESS')); + \redirect_header('index.php', 3, \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SEND_SUCCESS')); } // show form with content again @@ -86,8 +86,8 @@ $feedback->site = $your_site; $feedback->type = $fb_type; $feedback->content = $fb_content; - echo '
-
+ */
use Xmf\Request;
-use XoopsModules\Tdmcreate;
+use XoopsModules\Modulebuilder;
require_once __DIR__ . '/header.php';
//xoops_cp_header();
-$adminObject->displayNavigation(basename(__FILE__));
+$adminObject->displayNavigation(\basename(__FILE__));
echo <<
-
+ *
+ *
+ * Example:
+ $customConfirm = new Common\Confirm(
+ ['ok' => 1, 'item_id' => $itemId, 'op' => 'delete'],
+ $_SERVER['REQUEST_URI'],
+ \sprintf(\_MA_MYMODULE_FORM_SURE_DELETE,
+ $itemsObj->getCaption()));
+ $form = $customConfirm->getFormConfirm();
+ $GLOBALS['xoopsTpl']->assign('form', $form->render());
+ */
+
+\defined('XOOPS_ROOT_PATH') || die('Restricted access');
+
+/**
+ * Class Object Confirm
+ */
+class Confirm
+{
+ private array $hiddens = [];
+ private string $action = '';
+ private string $title = '';
+ private string $label = '';
+ private string $object = '';
+
+ /**
+ * @public function constructor class
+ * @param array $hiddens
+ * @param string $action
+ * @param string $object
+ * @param string $title
+ * @param string $label
+ */
+ public function __construct(array $hiddens, string $action, string $object, string $title = '', string $label = '')
+ {
+ $this->hiddens = $hiddens;
+ $this->action = $action;
+ $this->object = $object;
+ $this->title = $title;
+ $this->label = $label;
+ }
+
+ /**
+ * @public function getFormConfirm
+ * @return \XoopsThemeForm
+ */
+ public function getFormConfirm(): \XoopsThemeForm
+ {
+ $moduleDirName = \basename(\dirname(__DIR__, 2));
+ $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+ //in order to be accessable from user and admin area this should be place in language common.php
+ if (!\defined('CO_' . $moduleDirNameUpper . '_DELETE_CONFIRM')) {
+ \define('CO_' . $moduleDirNameUpper . '_DELETE_CONFIRM', 'Confirm delete');
+ \define('CO_' . $moduleDirNameUpper . '_DELETE_LABEL', 'Do you really want to delete:');
+ }
+
+ // Get Theme Form
+ if ('' === $this->action) {
+ $this->action = \Xmf\Request::getString('REQUEST_URI', '', 'SERVER');
+ }
+ if ('' === $this->title) {
+ $this->title = \constant('CO_' . $moduleDirNameUpper . '_DELETE_CONFIRM');
+ }
+ if ('' === $this->label) {
+ $this->label = \constant('CO_' . $moduleDirNameUpper . '_DELETE_LABEL');
+ }
+
+ \xoops_load('XoopsFormLoader');
+ $form = new \XoopsThemeForm($this->title, 'formConfirm', $this->action, 'post', true);
+ $form->setExtra('enctype="multipart/form-data"');
+ $form->addElement(new \XoopsFormLabel($this->label, $this->object));
+ //hiddens
+ foreach ($this->hiddens as $key => $value) {
+ $form->addElement(new \XoopsFormHidden($key, $value));
+ }
+ $form->addElement(new \XoopsFormHidden('ok', 1));
+ $buttonTray = new \XoopsFormElementTray('');
+ $buttonTray->addElement(new \XoopsFormButton('', 'confirm_submit', \_YES, 'submit'));
+ $buttonBack = new \XoopsFormButton('', 'confirm_back', \_NO, 'button');
+ $buttonBack->setExtra('onclick="history.go(-1);return true;"');
+ $buttonTray->addElement($buttonBack);
+ $form->addElement($buttonTray);
+
+ return $form;
+ }
+}
diff --git a/class/Common/DirectoryChecker.php b/class/Common/DirectoryChecker.php
new file mode 100644
index 00000000..d8b7baae
--- /dev/null
+++ b/class/Common/DirectoryChecker.php
@@ -0,0 +1,160 @@
+";
+ $path_status .= "$path (" . \constant('CO_' . $moduleDirNameUpper . '_' . 'DC_NOTAVAILABLE') . ') ';
+ $path_status .= "';
+ } elseif (@\is_writable($path)) {
+ $path_status = "
";
+ $path_status .= "$path (" . \constant('CO_' . $moduleDirNameUpper . '_' . 'DC_AVAILABLE') . ') ';
+ $currentMode = \mb_substr(\decoct(\fileperms($path)), 2);
+ if ($currentMode != \decoct($mode)) {
+ $path_status = "
";
+ $path_status .= $path . \sprintf(\constant('CO_' . $moduleDirNameUpper . '_' . 'DC_NOTWRITABLE'), \decoct($mode), $currentMode);
+ $path_status .= "';
+ }
+ } else {
+ $currentMode = \mb_substr(\decoct(\fileperms($path)), 2);
+ $path_status = "";
+ $path_status .= $path . \sprintf(\constant('CO_' . $moduleDirNameUpper . '_' . 'DC_NOTWRITABLE'), \decoct($mode), $currentMode);
+ $path_status .= "';
+ }
+
+ return $path_status;
+ }
+
+ /**
+ * @param $target
+ * @param int $mode
+ *
+ * @return bool
+ */
+ public static function createDirectory($target, int $mode = 0777)
+ {
+ $target = \str_replace('..', '', $target);
+
+ // https://www.php.net/manual/en/function.mkdir.php
+ return \is_dir($target)
+ || (
+ self::createDirectory(\dirname($target), $mode)
+ && (\mkdir($target, $mode) || \is_dir($target))
+ );
+ }
+
+ /**
+ * @param $target
+ * @param int $mode
+ *
+ * @return bool
+ */
+ public static function setDirectoryPermissions($target, int $mode = 0777)
+ {
+ $target = \str_replace('..', '', $target);
+
+ return @\chmod($target, (int)$mode);
+ }
+
+ /**
+ * @param $dir_path
+ *
+ * @return bool
+ */
+ public static function dirExists($dir_path)
+ {
+ return \is_dir($dir_path);
+ }
+}
+
+$op = Request::getString('op', '', 'POST');
+switch ($op) {
+ case 'createdir':
+ if (!\Xmf\Request::hasVar('path', 'POST') || !\Xmf\Request::hasVar('redirect', 'POST')) {
+ break;
+ }
+ $path = \Xmf\Request::getString('path','', 'POST');
+ $redirect = \Xmf\Request::getString('redirect','', 'POST');
+ $msg = DirectoryChecker::createDirectory($path) ? \constant('CO_' . $moduleDirNameUpper . '_' . 'DC_DIRCREATED') : \constant('CO_' . $moduleDirNameUpper . '_' . 'DC_DIRNOTCREATED');
+ \redirect_header($redirect, 2, $msg . ': ' . $path);
+ break;
+ case 'setdirperm':
+ if (!\Xmf\Request::hasVar('path', 'POST') || !\Xmf\Request::hasVar('redirect', 'POST') || !\Xmf\Request::hasVar('mode', 'POST')) {
+ break;
+ }
+ $path = \Xmf\Request::getString('path','', 'POST');
+ $redirect = \Xmf\Request::getString('redirect','', 'POST');
+ $mode = \Xmf\Request::getInt('mode',0 , 'POST');
+ $msg = DirectoryChecker::setDirectoryPermissions($path, $mode) ? \constant('CO_' . $moduleDirNameUpper . '_' . 'DC_PERMSET') : \constant('CO_' . $moduleDirNameUpper . '_' . 'DC_PERMNOTSET');
+
+ \redirect_header($redirect, 2, $msg . ': ' . $path);
+ break;
+}
diff --git a/class/Common/FileChecker.php b/class/Common/FileChecker.php
new file mode 100644
index 00000000..8d0872d6
--- /dev/null
+++ b/class/Common/FileChecker.php
@@ -0,0 +1,159 @@
+";
+ $path_status .= "$file_path (" . \constant('CO_' . $moduleDirNameUpper . '_' . 'FC_AVAILABLE') . ') ';
+ } else {
+ $path_status = "";
+ $path_status .= "$file_path (" . \constant('CO_' . $moduleDirNameUpper . '_' . 'FC_NOTAVAILABLE') . ') ';
+ }
+ } else {
+ if (self::compareFiles($file_path, $original_file_path)) {
+ $path_status = "";
+ $path_status .= "$file_path (" . \constant('CO_' . $moduleDirNameUpper . '_' . 'FC_AVAILABLE') . ') ';
+ } else {
+ $path_status = "";
+ $path_status .= "$file_path (" . \constant('CO_' . $moduleDirNameUpper . '_' . 'FC_NOTAVAILABLE') . ') ';
+ $path_status .= "';
+ }
+ }
+
+ return $path_status;
+ }
+
+ /**
+ * @param $source_path
+ * @param $destination_path
+ *
+ * @return bool
+ */
+ public static function copyFile($source_path, $destination_path)
+ {
+ $source_path = \str_replace('..', '', $source_path);
+ $destination_path = \str_replace('..', '', $destination_path);
+
+ return @\copy($source_path, $destination_path);
+ }
+
+ /**
+ * @param $file1_path
+ * @param $file2_path
+ *
+ * @return bool
+ */
+ public static function compareFiles($file1_path, $file2_path)
+ {
+ if (!self::fileExists($file1_path) || !self::fileExists($file2_path)) {
+ return false;
+ }
+ if (\filetype($file1_path) !== \filetype($file2_path)) {
+ return false;
+ }
+ if (\filesize($file1_path) !== \filesize($file2_path)) {
+ return false;
+ }
+ $crc1 = \mb_strtoupper(\dechex(\crc32(\file_get_contents($file1_path))));
+ $crc2 = \mb_strtoupper(\dechex(\crc32(\file_get_contents($file2_path))));
+
+ return !($crc1 !== $crc2);
+ }
+
+ /**
+ * @param $file_path
+ *
+ * @return bool
+ */
+ public static function fileExists($file_path)
+ {
+ return \is_file($file_path);
+ }
+
+ /**
+ * @param $target
+ * @param int $mode
+ *
+ * @return bool
+ */
+ public static function setFilePermissions($target, int $mode = 0777)
+ {
+ $target = \str_replace('..', '', $target);
+
+ return @\chmod($target, (int)$mode);
+ }
+}
+
+$op = Request::getString('op', '', 'POST');
+if ($op == 'copyfile') {
+ if (!\Xmf\Request::hasVar('original_file_path', 'POST')
+ || !\Xmf\Request::hasVar('file_path', 'POST')
+ || !\Xmf\Request::hasVar('redirect', 'POST')) {
+ return;
+ }
+ $original_file_path = \Xmf\Request::getString('original_file_path');
+ $file_path = \Xmf\Request::getString('file_path');
+ $redirect =\Xmf\Request::getString('redirect');
+ $msg = FileChecker::copyFile($original_file_path, $file_path) ? \constant('CO_' . $moduleDirNameUpper . '_' . 'FC_FILECOPIED') : \constant('CO_' . $moduleDirNameUpper . '_' . 'FC_FILENOTCOPIED');
+ \redirect_header($redirect, 2, $msg . ': ' . $file_path);
+}
diff --git a/class/Common/FilesManagement.php b/class/Common/FilesManagement.php
index 549ef697..e9ca0196 100644
--- a/class/Common/FilesManagement.php
+++ b/class/Common/FilesManagement.php
@@ -1,6 +1,6 @@
-
*/
trait FilesManagement
{
/**
- * Function responsible for checking if a directory exists, we can also write in and create an index.html file
+ * Function responsible for checking if a directory exists, we can also write in and create an index.php file
*
* @param string $folder The full path of the directory to check
*
* @return void
* @throws \RuntimeException
*/
- public static function createFolder($folder)
+ public static function createFolder($folder): void
{
try {
- if (!file_exists($folder)) {
- if (!is_dir($folder) && !mkdir($folder) && !is_dir($folder)) {
- throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
+ if (!\file_exists($folder)) {
+ if (!\is_dir($folder) && !\mkdir($folder) && !\is_dir($folder)) {
+ throw new \RuntimeException(\sprintf('Unable to create the %s directory', $folder));
}
- file_put_contents($folder . '/index.html', '');
+ \file_put_contents($folder . '/index.php', "getMessage(), '
'; @@ -43,36 +43,36 @@ public static function createFolder($folder) } /** - * @param $file - * @param $folder + * @param string $file + * @param string $folder * @return bool */ - public static function copyFile($file, $folder) + public static function copyFile(string $file, string $folder): bool { - return copy($file, $folder); + return \copy($file, $folder); } /** * @param $src * @param $dst */ - public static function recurseCopy($src, $dst) + public static function recurseCopy($src, $dst): void { - $dir = opendir($src); - // @mkdir($dst); - if (!@mkdir($dst) && !is_dir($dst)) { + $dir = \opendir($src); + // @\mkdir($dst); + if (!@\mkdir($dst) && !\is_dir($dst)) { throw new \RuntimeException('The directory ' . $dst . ' could not be created.'); } - while (false !== ($file = readdir($dir))) { + while (false !== ($file = \readdir($dir))) { if (('.' !== $file) && ('..' !== $file)) { - if (is_dir($src . '/' . $file)) { + if (\is_dir($src . '/' . $file)) { self::recurseCopy($src . '/' . $file, $dst . '/' . $file); } else { - copy($src . '/' . $file, $dst . '/' . $file); + \copy($src . '/' . $file, $dst . '/' . $file); } } } - closedir($dir); + \closedir($dir); } /** @@ -82,30 +82,30 @@ public static function recurseCopy($src, $dst) * @return bool Returns true on success, false on failure * @author Aidan Lister
* @version 1.0.1
- * @link http://aidanlister.com/2004/04/recursively-copying-directories-in-php/
+ * @link https://aidanlister.com/2004/04/recursively-copying-directories-in-php/
*/
public static function xcopy($source, $dest)
{
// Check for symlinks
- if (is_link($source)) {
- return symlink(readlink($source), $dest);
+ if (\is_link($source)) {
+ return \symlink(\readlink($source), $dest);
}
// Simple copy for a file
- if (is_file($source)) {
- return copy($source, $dest);
+ if (\is_file($source)) {
+ return \copy($source, $dest);
}
// Make destination directory
- if (!is_dir($dest)) {
- if (!mkdir($dest) && !is_dir($dest)) {
- throw new \RuntimeException(sprintf('Directory "%s" was not created', $dest));
+ if (!\is_dir($dest)) {
+ if (!\mkdir($dest) && !\is_dir($dest)) {
+ throw new \RuntimeException(\sprintf('Directory "%s" was not created', $dest));
}
}
// Loop through the folder
- $dir = dir($source);
- if (@is_dir($dir)) {
+ $dir = \dir($source);
+ if (@\is_dir($dir)) {
while (false !== $entry = $dir->read()) {
// Skip pointers
if ('.' === $entry || '..' === $entry) {
@@ -143,7 +143,7 @@ public static function deleteDirectory($src)
$dirInfo = new \SplFileInfo($src);
// validate is a directory
if ($dirInfo->isDir()) {
- $fileList = array_diff(scandir($src, SCANDIR_SORT_NONE), ['..', '.']);
+ $fileList = \array_diff(\scandir($src, \SCANDIR_SORT_NONE), ['..', '.']);
foreach ($fileList as $k => $v) {
$fileInfo = new \SplFileInfo("{$src}/{$v}");
if ($fileInfo->isDir()) {
@@ -153,14 +153,14 @@ public static function deleteDirectory($src)
}
} else {
// delete the file
- if (!($success = unlink($fileInfo->getRealPath()))) {
+ if (!($success = \unlink($fileInfo->getRealPath()))) {
break;
}
}
}
// now delete this (sub)directory if all the files are gone
if ($success) {
- $success = rmdir($dirInfo->getRealPath());
+ $success = \rmdir($dirInfo->getRealPath());
}
} else {
// input is not a valid directory
@@ -187,7 +187,7 @@ public static function rrmdir($src)
}
// If source is not a directory stop processing
- if (!is_dir($src)) {
+ if (!\is_dir($src)) {
return false;
}
@@ -199,7 +199,7 @@ public static function rrmdir($src)
if ($fObj->isFile()) {
$filename = $fObj->getPathname();
$fObj = null; // clear this iterator object to close the file
- if (!unlink($filename)) {
+ if (!\unlink($filename)) {
return false; // couldn't delete the file
}
} elseif (!$fObj->isDot() && $fObj->isDir()) {
@@ -208,7 +208,8 @@ public static function rrmdir($src)
}
}
$iterator = null; // clear iterator Obj to close file/directory
- return rmdir($src); // remove the directory & return results
+
+ return \rmdir($src); // remove the directory & return results
}
/**
@@ -227,12 +228,12 @@ public static function rmove($src, $dest)
}
// If source is not a directory stop processing
- if (!is_dir($src)) {
+ if (!\is_dir($src)) {
return false;
}
// If the destination directory does not exist and could not be created stop processing
- if (!is_dir($dest) && !mkdir($dest) && !is_dir($dest)) {
+ if (!\is_dir($dest) && !\mkdir($dest) && !\is_dir($dest)) {
return false;
}
@@ -240,15 +241,16 @@ public static function rmove($src, $dest)
$iterator = new \DirectoryIterator($src);
foreach ($iterator as $fObj) {
if ($fObj->isFile()) {
- rename($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+ \rename($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
} elseif (!$fObj->isDot() && $fObj->isDir()) {
// Try recursively on directory
self::rmove($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
- // rmdir($fObj->getPath()); // now delete the directory
+ // \rmdir($fObj->getPath()); // now delete the directory
}
}
$iterator = null; // clear iterator Obj to close file/directory
- return rmdir($src); // remove the directory & return results
+
+ return \rmdir($src); // remove the directory & return results
}
/**
@@ -270,12 +272,12 @@ public static function rcopy($src, $dest)
}
// If source is not a directory stop processing
- if (!is_dir($src)) {
+ if (!\is_dir($src)) {
return false;
}
// If the destination directory does not exist and could not be created stop processing
- if (!is_dir($dest) && !mkdir($dest) && !is_dir($dest)) {
+ if (!\is_dir($dest) && !\mkdir($dest) && !\is_dir($dest)) {
return false;
}
@@ -283,7 +285,7 @@ public static function rcopy($src, $dest)
$iterator = new \DirectoryIterator($src);
foreach ($iterator as $fObj) {
if ($fObj->isFile()) {
- copy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+ \copy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
} elseif (!$fObj->isDot() && $fObj->isDir()) {
self::rcopy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
}
diff --git a/class/Common/Migrate.php b/class/Common/Migrate.php
index 9d0f495a..c570a58b 100644
--- a/class/Common/Migrate.php
+++ b/class/Common/Migrate.php
@@ -1,6 +1,6 @@
-
* @copyright 2016 XOOPS Project (https://xoops.org)
- * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @license GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
* @link https://xoops.org
*/
-
class Migrate extends \Xmf\Database\Migrate
{
private $renameTables;
/**
- * Migrate constructor.
- * @param Common\Configurator $configurator
- * @throws \RuntimeException
- * @throws \InvalidArgumentException
+ * @param \XoopsModules\Modulebuilder\Common\Configurator|null $configurator
*/
public function __construct(Common\Configurator $configurator = null)
{
if (null !== $configurator) {
$this->renameTables = $configurator->renameTables;
- $moduleDirName = basename(dirname(dirname(__DIR__)));
+ $moduleDirName = \basename(\dirname(__DIR__, 2));
parent::__construct($moduleDirName);
}
}
@@ -47,7 +43,7 @@ public function __construct(Common\Configurator $configurator = null)
/**
* change table prefix if needed
*/
- private function changePrefix()
+ private function changePrefix(): void
{
foreach ($this->renameTables as $oldName => $newName) {
if ($this->tableHandler->useTable($oldName) && !$this->tableHandler->useTable($newName)) {
@@ -62,12 +58,12 @@ private function changePrefix()
* @param string $tableName table to convert
* @param string $columnName column with IP address
*/
- private function convertIPAddresses($tableName, $columnName)
+ protected function convertIPAddresses(string $tableName, string $columnName): void
{
if ($this->tableHandler->useTable($tableName)) {
$attributes = $this->tableHandler->getColumnAttributes($tableName, $columnName);
- if (false !== mb_strpos($attributes, ' int(')) {
- if (false === mb_strpos($attributes, 'unsigned')) {
+ if (false !== \mb_strpos($attributes, ' int(')) {
+ if (false === \mb_strpos($attributes, 'unsigned')) {
$this->tableHandler->alterColumn($tableName, $columnName, " bigint(16) NOT NULL DEFAULT '0' ");
$this->tableHandler->update($tableName, [$columnName => "4294967296 + $columnName"], "WHERE $columnName < 0", false);
}
@@ -80,7 +76,7 @@ private function convertIPAddresses($tableName, $columnName)
/**
* Move do* columns from newbb_posts to newbb_posts_text table
*/
- private function moveDoColumns()
+ private function moveDoColumns(): void
{
$tableName = 'newbb_posts_text';
$srcTableName = 'newbb_posts';
@@ -104,7 +100,7 @@ private function moveDoColumns()
* table and column renames
* data conversions
*/
- protected function preSyncActions()
+ protected function preSyncActions(): void
{
/*
// change 'bb' table prefix to 'newbb'
diff --git a/class/Common/ModuleFeedback.php b/class/Common/ModuleFeedback.php
index be7ffeac..b756fa70 100644
--- a/class/Common/ModuleFeedback.php
+++ b/class/Common/ModuleFeedback.php
@@ -1,6 +1,6 @@
-
+ * @license GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
+ * @author Michael Beck
* @author Wedega - Email:
* @author Fernando Santos (topet05)
*/
-defined('XOOPS_ROOT_PATH') || die('Restricted access');
+\defined('XOOPS_ROOT_PATH') || die('Restricted access');
/**
* Class Object ModuleFeedback
@@ -36,8 +36,6 @@ class ModuleFeedback extends \XoopsObject
/**
* Constructor
- *
- * @param null
*/
public function __construct()
{
@@ -45,10 +43,8 @@ public function __construct()
/**
* @static function &getInstance
- *
- * @param null
*/
- public static function getInstance()
+ public static function getInstance(): void
{
static $instance = false;
if (!$instance) {
@@ -59,41 +55,39 @@ public static function getInstance()
/**
* @public function getFormFeedback:
* provide form for sending a feedback to module author
- * @param bool $action
* @return \XoopsThemeForm
*/
- public function getFormFeedback($action = false)
+ public function getFormFeedback()
{
- if (false === $action) {
- $action = \Xmf\Request::getString('REQUEST_URI', '', 'SERVER');
- }
- $moduleDirName = basename(dirname(dirname(__DIR__)));
- $moduleDirNameUpper = mb_strtoupper($moduleDirName);
+ $moduleDirName = \basename(\dirname(__DIR__, 2));
+ $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
// Get Theme Form
- xoops_load('XoopsFormLoader');
- $form = new \XoopsThemeForm(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_FORM_TITLE'), 'formfeedback', 'feedback.php', 'post', true);
+ \xoops_load('XoopsFormLoader');
+ $form = new \XoopsThemeForm(\constant('CO_' . $moduleDirNameUpper . '_' . 'FB_FORM_TITLE'), 'formfeedback', 'feedback.php', 'post', true);
$form->setExtra('enctype="multipart/form-data"');
- $recipient = new \XoopsFormText(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_RECIPIENT'), 'recipient', 50, 255, $GLOBALS['xoopsModule']->getInfo('author_mail'));
+ $xoopsModule = $GLOBALS['xoopsModule'] ?? null;
+ $authorMail = $xoopsModule ? (string)$xoopsModule->getInfo('author_mail') : '';
+ $recipient = new \XoopsFormText(\constant('CO_' . $moduleDirNameUpper . '_' . 'FB_RECIPIENT'), 'recipient', 50, 255, $authorMail);
$recipient->setExtra('disabled="disabled"');
$form->addElement($recipient);
- $your_name = new \XoopsFormText(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_NAME'), 'your_name', 50, 255, $this->name);
- $your_name->setExtra('placeholder="' . constant('CO_' . $moduleDirNameUpper . '_' . 'FB_NAME_PLACEHOLER') . '"');
+ $your_name = new \XoopsFormText(\constant('CO_' . $moduleDirNameUpper . '_' . 'FB_NAME'), 'your_name', 50, 255, $this->name);
+ $your_name->setExtra('placeholder="' . \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_NAME_PLACEHOLER') . '"');
$form->addElement($your_name);
- $your_site = new \XoopsFormText(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SITE'), 'your_site', 50, 255, $this->site);
- $your_site->setExtra('placeholder="' . constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SITE_PLACEHOLER') . '"');
+ $your_site = new \XoopsFormText(\constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SITE'), 'your_site', 50, 255, $this->site);
+ $your_site->setExtra('placeholder="' . \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SITE_PLACEHOLER') . '"');
$form->addElement($your_site);
- $your_mail = new \XoopsFormText(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_MAIL'), 'your_mail', 50, 255, $this->email);
- $your_mail->setExtra('placeholder="' . constant('CO_' . $moduleDirNameUpper . '_' . 'FB_MAIL_PLACEHOLER') . '"');
+ $your_mail = new \XoopsFormText(\constant('CO_' . $moduleDirNameUpper . '_' . 'FB_MAIL'), 'your_mail', 50, 255, $this->email);
+ $your_mail->setExtra('placeholder="' . \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_MAIL_PLACEHOLER') . '"');
$form->addElement($your_mail);
- $fbtypeSelect = new \XoopsFormSelect(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE'), 'fb_type', $this->type);
- $fbtypeSelect->addOption('', '');
- $fbtypeSelect->addOption(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_SUGGESTION'), constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_SUGGESTION'));
- $fbtypeSelect->addOption(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_BUGS'), constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_BUGS'));
- $fbtypeSelect->addOption(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_TESTIMONIAL'), constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_TESTIMONIAL'));
- $fbtypeSelect->addOption(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_FEATURES'), constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_FEATURES'));
- $fbtypeSelect->addOption(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_OTHERS'), constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_OTHERS'));
+ $fbtypeSelect = new \XoopsFormSelect(\constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE'), 'fb_type', $this->type);
+ $fbtypeSelect->addOption('');
+ $fbtypeSelect->addOption(\constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_SUGGESTION'), \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_SUGGESTION'));
+ $fbtypeSelect->addOption(\constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_BUGS'), \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_BUGS'));
+ $fbtypeSelect->addOption(\constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_TESTIMONIAL'), \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_TESTIMONIAL'));
+ $fbtypeSelect->addOption(\constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_FEATURES'), \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_FEATURES'));
+ $fbtypeSelect->addOption(\constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_OTHERS'), \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_OTHERS'));
$form->addElement($fbtypeSelect, true);
$editorConfigs = [];
@@ -103,16 +97,16 @@ public function getFormFeedback($action = false)
$editorConfigs['cols'] = 40;
$editorConfigs['width'] = '100%';
$editorConfigs['height'] = '400px';
- $moduleHandler = xoops_getHandler('module');
+ $moduleHandler = \xoops_getHandler('module');
$module = $moduleHandler->getByDirname('system');
- $configHandler = xoops_getHandler('config');
+ $configHandler = \xoops_getHandler('config');
$config = &$configHandler->getConfigsByCat(0, $module->getVar('mid'));
$editorConfigs['editor'] = $config['general_editor'];
- $editor = new \XoopsFormEditor(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_CONTENT'), 'fb_content', $editorConfigs);
+ $editor = new \XoopsFormEditor(\constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_CONTENT'), 'fb_content', $editorConfigs);
$form->addElement($editor, true);
$form->addElement(new \XoopsFormHidden('op', 'send'));
- $form->addElement(new \XoopsFormButtonTray('', _SUBMIT, 'submit', '', false));
+ $form->addElement(new \XoopsFormButtonTray('', \_SUBMIT, 'submit', '', false));
return $form;
}
diff --git a/class/Common/ModuleStats.php b/class/Common/ModuleStats.php
index 4e9ccda1..674b69c0 100644
--- a/class/Common/ModuleStats.php
+++ b/class/Common/ModuleStats.php
@@ -1,6 +1,6 @@
-
+ * @license GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
+ * @author Michael Beck
*/
trait ModuleStats
{
/**
- * @param \XoopsModules\Tdmcreate\Common\Configurator $configurator
- * @param array $moduleStats
+ * @param \XoopsModules\Modulebuilder\Common\Configurator $configurator
+ * @param array $moduleStats
* @return array
*/
- public static function getModuleStats($configurator, $moduleStats)
+ public static function getModuleStats(Configurator $configurator, array $moduleStats)
{
- if (count($configurator->moduleStats) > 0) {
- foreach (array_keys($configurator->moduleStats) as $i) {
+ if (\count($configurator->moduleStats) > 0) {
+ foreach (\array_keys($configurator->moduleStats) as $i) {
$moduleStats[$i] = $configurator->moduleStats[$i];
}
}
diff --git a/class/Common/Resizer.php b/class/Common/Resizer.php
index 3462d6a8..035193c5 100644
--- a/class/Common/Resizer.php
+++ b/class/Common/Resizer.php
@@ -1,6 +1,6 @@
- - Website:
+ * @author Goffy - Wedega - Email: - Website:
+ * @version $Id: 1.0 Resizer.php 1 Mon 2019-02-09 10:04:49Z XOOPS Project (www.xoops.org) $
*/
class Resizer
{
- public $sourceFile = '';
- public $endFile = '';
- public $maxWidth = 0;
- public $maxHeight = 0;
- public $imageMimetype = '';
- public $jpgQuality = 90;
- public $mergeType = 0;
- public $mergePos = 0;
+ public string $sourceFile = '';
+ public string $endFile = '';
+ public int $maxWidth = 0;
+ public int $maxHeight = 0;
+ public string $imageMimetype = '';
+ public int $jpgQuality = 90;
+ public int $mergeType = 0;
+ public int $mergePos = 0;
+ public int $degrees = 0;
+ public string $error = '';
/**
* resize image if size exceed given width/height
@@ -42,75 +44,85 @@ public function resizeImage()
// check file extension
switch ($this->imageMimetype) {
case 'image/png':
- $img = imagecreatefrompng($this->sourceFile);
+ $img = \imagecreatefrompng($this->sourceFile);
+ if (!$img) {
+ return false;
+ }
break;
case 'image/jpeg':
- $img = imagecreatefromjpeg($this->sourceFile);
+ $img = \imagecreatefromjpeg($this->sourceFile);
+ if (!$img) {
+ $img = \imagecreatefromstring(file_get_contents($this->sourceFile));
+ }
+ if (!$img) {
+ return false;
+ }
break;
case 'image/gif':
- $img = imagecreatefromgif($this->sourceFile);
+ $img = \imagecreatefromgif($this->sourceFile);
+ if (!$img) {
+ return false;
+ }
break;
default:
return 'Unsupported format';
}
- $width = imagesx($img);
- $height = imagesy($img);
- $new_width = 0;
- $new_height = 0;
+ $width = \imagesx($img);
+ $height = \imagesy($img);
if ($width > $this->maxWidth || $height > $this->maxHeight) {
// recalc image size based on this->maxWidth/this->maxHeight
+ $new_width = 0;
+ $new_height = 0;
if ($width > $height) {
if ($width < $this->maxWidth) {
$new_width = $width;
} else {
$new_width = $this->maxWidth;
$divisor = $width / $new_width;
- $new_height = floor($height / $divisor);
+ $new_height = \floor($height / $divisor);
}
} elseif ($height < $this->maxHeight) {
$new_height = $height;
} else {
$new_height = $this->maxHeight;
$divisor = $height / $new_height;
- $new_width = floor($width / $divisor);
+ $new_width = \floor($width / $divisor);
}
// Create a new temporary image.
- $tmpimg = imagecreatetruecolor($new_width, $new_height);
- imagealphablending($tmpimg, false);
- imagesavealpha($tmpimg, true);
+ $tmpimg = \imagecreatetruecolor((int)$new_width, (int)$new_height);
+ \imagealphablending($tmpimg, false);
+ \imagesavealpha($tmpimg, true);
// Copy and resize old image into new image.
- imagecopyresampled($tmpimg, $img, 0, 0, 0, 0, $new_width, $new_height, $width, $height);
+ \imagecopyresampled($tmpimg, $img, 0, 0, 0, 0, (int)$new_width, (int)$new_height, (int)$width, (int)$height);
- unlink($this->endFile);
+ \unlink($this->endFile);
//compressing the file
switch ($this->imageMimetype) {
case 'image/png':
- imagepng($tmpimg, $this->endFile, 0);
+ \imagepng($tmpimg, $this->endFile, 0);
break;
case 'image/jpeg':
- imagejpeg($tmpimg, $this->endFile, 100);
+ \imagejpeg($tmpimg, $this->endFile, 100);
break;
case 'image/gif':
- imagegif($tmpimg, $this->endFile);
+ \imagegif($tmpimg, $this->endFile);
break;
}
// release the memory
- imagedestroy($tmpimg);
+ \imagedestroy($tmpimg);
} else {
return 'copy';
}
- imagedestroy($img);
+ \imagedestroy($img);
return true;
}
- // public function resizeAndCrop($this->sourceFile, $this->imageMimetype, $this->endFile, $this->maxWidth, $this->maxHeight, $this->jpgQuality=90)
-
/**
* @return bool|string
*/
@@ -119,13 +131,13 @@ public function resizeAndCrop()
// check file extension
switch ($this->imageMimetype) {
case 'image/png':
- $original = imagecreatefrompng($this->sourceFile);
+ $original = \imagecreatefrompng($this->sourceFile);
break;
case 'image/jpeg':
- $original = imagecreatefromjpeg($this->sourceFile);
+ $original = \imagecreatefromjpeg($this->sourceFile);
break;
case 'image/gif':
- $original = imagecreatefromgif($this->sourceFile);
+ $original = \imagecreatefromgif($this->sourceFile);
break;
default:
return 'Unsupported format';
@@ -135,107 +147,186 @@ public function resizeAndCrop()
return false;
}
// GET ORIGINAL IMAGE DIMENSIONS
- list($original_w, $original_h) = getimagesize($this->sourceFile);
+ [$original_w, $original_h] = \getimagesize($this->sourceFile);
// RESIZE IMAGE AND PRESERVE PROPORTIONS
$max_width_resize = $this->maxWidth;
$max_height_resize = $this->maxHeight;
if ($original_w > $original_h) {
$max_height_ratio = $this->maxHeight / $original_h;
- $max_width_resize = (int)round($original_w * $max_height_ratio);
+ $max_width_resize = (int)\round($original_w * $max_height_ratio);
} else {
$max_width_ratio = $this->maxWidth / $original_w;
- $max_height_resize = (int)round($original_h * $max_width_ratio);
+ $max_height_resize = (int)\round($original_h * $max_width_ratio);
}
if ($max_width_resize < $this->maxWidth) {
$max_height_ratio = $this->maxWidth / $max_width_resize;
- $max_height_resize = (int)round($this->maxHeight * $max_height_ratio);
+ $max_height_resize = (int)\round($this->maxHeight * $max_height_ratio);
$max_width_resize = $this->maxWidth;
}
// CREATE THE PROPORTIONAL IMAGE RESOURCE
- $thumb = imagecreatetruecolor($max_width_resize, $max_height_resize);
- if (!imagecopyresampled($thumb, $original, 0, 0, 0, 0, $max_width_resize, $max_height_resize, $original_w, $original_h)) {
+ $thumb = \imagecreatetruecolor($max_width_resize, $max_height_resize);
+ if (!\imagecopyresampled($thumb, $original, 0, 0, 0, 0, $max_width_resize, $max_height_resize, $original_w, $original_h)) {
return false;
}
// CREATE THE CENTERED CROPPED IMAGE TO THE SPECIFIED DIMENSIONS
- $final = imagecreatetruecolor($this->maxWidth, $this->maxHeight);
+ $final = \imagecreatetruecolor($this->maxWidth, $this->maxHeight);
$max_width_offset = 0;
$max_height_offset = 0;
if ($this->maxWidth < $max_width_resize) {
- $max_width_offset = (int)round(($max_width_resize - $this->maxWidth) / 2);
+ $max_width_offset = (int)\round(($max_width_resize - $this->maxWidth) / 2);
} else {
- $max_height_offset = (int)round(($max_height_resize - $this->maxHeight) / 2);
+ $max_height_offset = (int)\round(($max_height_resize - $this->maxHeight) / 2);
}
- if (!imagecopy($final, $thumb, 0, 0, $max_width_offset, $max_height_offset, $max_width_resize, $max_height_resize)) {
+ if (!\imagecopy($final, $thumb, 0, 0, $max_width_offset, $max_height_offset, $max_width_resize, $max_height_resize)) {
return false;
}
// STORE THE FINAL IMAGE - WILL OVERWRITE $this->endFile
- if (!imagejpeg($final, $this->endFile, $this->jpgQuality)) {
+ if (!\imagejpeg($final, $this->endFile, $this->jpgQuality)) {
return false;
}
return true;
}
- // public function mergeImage($this->sourceFile, $this->endFile, $this->mergePos, $this->mergeType)
- public function mergeImage()
+ public function mergeImage(): void
{
- $dest = imagecreatefromjpeg($this->endFile);
- $src = imagecreatefromjpeg($this->sourceFile);
+ switch ($this->imageMimetype) {
+ case 'image/png':
+ $dest = \imagecreatefrompng($this->endFile);
+ $src = \imagecreatefrompng($this->sourceFile);
+ break;
+ case 'image/jpeg':
+ $dest = \imagecreatefromjpeg($this->endFile);
+ $src = \imagecreatefromjpeg($this->sourceFile);
+ break;
+ case 'image/gif':
+ $dest = \imagecreatefromgif($this->endFile);
+ $src = \imagecreatefromgif($this->sourceFile);
+ break;
+ default:
+ return;
+ }
+ if (!$dest || !$src) {
+ return;
+ }
if (4 == $this->mergeType) {
- $imgWidth = (int)round($this->maxWidth / 2 - 1);
- $imgHeight = (int)round($this->maxHeight / 2 - 1);
- $posCol2 = (int)round($this->maxWidth / 2 + 1);
- $posRow2 = (int)round($this->maxHeight / 2 + 1);
+ $imgWidth = (int)\round($this->maxWidth / 2 - 1);
+ $imgHeight = (int)\round($this->maxHeight / 2 - 1);
+ $posCol2 = (int)\round($this->maxWidth / 2 + 1);
+ $posRow2 = (int)\round($this->maxHeight / 2 + 1);
switch ($this->mergePos) {
case 1:
- imagecopy($dest, $src, 0, 0, 0, 0, $imgWidth, $imgHeight); //top left
+ \imagecopy($dest, $src, 0, 0, 0, 0, $imgWidth, $imgHeight); //top left
break;
case 2:
- imagecopy($dest, $src, $posCol2, 0, 0, 0, $imgWidth, $imgHeight); //top right
+ \imagecopy($dest, $src, $posCol2, 0, 0, 0, $imgWidth, $imgHeight); //top right
break;
case 3:
- imagecopy($dest, $src, 0, $posRow2, 0, 0, $imgWidth, $imgHeight); //bottom left
+ \imagecopy($dest, $src, 0, $posRow2, 0, 0, $imgWidth, $imgHeight); //bottom left
break;
case 4:
- imagecopy($dest, $src, $posCol2, $posRow2, 0, 0, $imgWidth, $imgHeight); //bottom right
+ \imagecopy($dest, $src, $posCol2, $posRow2, 0, 0, $imgWidth, $imgHeight); //bottom right
break;
}
}
if (6 == $this->mergeType) {
- $imgWidth = (int)round($this->maxWidth / 3 - 1);
- $imgHeight = (int)round($this->maxHeight / 2 - 1);
- $posCol2 = (int)round($this->maxWidth / 3 + 1);
- $posCol3 = $posCol2 + (int)round($this->maxWidth / 3 + 1);
- $posRow2 = (int)round($this->maxHeight / 2 + 1);
+ $imgWidth = (int)\round($this->maxWidth / 3 - 1);
+ $imgHeight = (int)\round($this->maxHeight / 2 - 1);
+ $posCol2 = (int)\round($this->maxWidth / 3 + 1);
+ $posCol3 = $posCol2 + (int)\round($this->maxWidth / 3 + 1);
+ $posRow2 = (int)\round($this->maxHeight / 2 + 1);
switch ($this->mergePos) {
case 1:
- imagecopy($dest, $src, 0, 0, 0, 0, $imgWidth, $imgHeight); //top left
+ \imagecopy($dest, $src, 0, 0, 0, 0, $imgWidth, $imgHeight); //top left
break;
case 2:
- imagecopy($dest, $src, $posCol2, 0, 0, 0, $imgWidth, $imgHeight); //top center
+ \imagecopy($dest, $src, $posCol2, 0, 0, 0, $imgWidth, $imgHeight); //top center
break;
case 3:
- imagecopy($dest, $src, $posCol3, 0, 0, 0, $imgWidth, $imgHeight); //top right
+ \imagecopy($dest, $src, $posCol3, 0, 0, 0, $imgWidth, $imgHeight); //top right
break;
case 4:
- imagecopy($dest, $src, 0, $posRow2, 0, 0, $imgWidth, $imgHeight); //bottom left
+ \imagecopy($dest, $src, 0, $posRow2, 0, 0, $imgWidth, $imgHeight); //bottom left
break;
case 5:
- imagecopy($dest, $src, $posCol2, $posRow2, 0, 0, $imgWidth, $imgHeight); //bottom center
+ \imagecopy($dest, $src, $posCol2, $posRow2, 0, 0, $imgWidth, $imgHeight); //bottom center
break;
case 6:
- imagecopy($dest, $src, $posCol3, $posRow2, 0, 0, $imgWidth, $imgHeight); //bottom right
+ \imagecopy($dest, $src, $posCol3, $posRow2, 0, 0, $imgWidth, $imgHeight); //bottom right
break;
}
}
- imagejpeg($dest, $this->endFile);
+ // image output
+ switch ($this->imageMimetype) {
+ case 'image/png':
+ \imagepng($dest, $this->endFile, 0);
+ break;
+ case 'image/jpeg':
+ \imagejpeg($dest, $this->endFile, $this->jpgQuality);
+ break;
+ case 'image/gif':
+ \imagegif($dest, $this->endFile);
+ break;
+ }
+
+ \imagedestroy($src);
+ \imagedestroy($dest);
+ }
+
+ /**
+ * @return bool|string
+ */
+ public function rotateImage()
+ {
+ // check file extension
+ switch ($this->imageMimetype) {
+ case 'image/png':
+ $original = \imagecreatefrompng($this->sourceFile);
+ break;
+ case 'image/jpeg':
+ $original = \imagecreatefromjpeg($this->sourceFile);
+ break;
+ case 'image/gif':
+ $original = \imagecreatefromgif($this->sourceFile);
+ break;
+ default:
+ return 'Unsupported format';
+ }
+
+ if (!$original) {
+ return false;
+ }
+ // Rotate
+ $tmpimg = \imagerotate($original, $this->degrees, 0);
- imagedestroy($src);
- imagedestroy($dest);
+ \unlink($this->endFile);
+ //compressing the file
+ switch ($this->imageMimetype) {
+ case 'image/png':
+ if (!\imagepng($tmpimg, $this->endFile, 0)) {
+ return false;
+ }
+ break;
+ case 'image/jpeg':
+ if (!\imagejpeg($tmpimg, $this->endFile, $this->jpgQuality)) {
+ return false;
+ }
+ break;
+ case 'image/gif':
+ if (!\imagegif($tmpimg, $this->endFile)) {
+ return false;
+ }
+ break;
+ }
+
+ // release the memory
+ \imagedestroy($tmpimg);
+
+ return true;
}
}
diff --git a/class/Common/ServerStats.php b/class/Common/ServerStats.php
index d574d2d9..7227cb9b 100644
--- a/class/Common/ServerStats.php
+++ b/class/Common/ServerStats.php
@@ -1,6 +1,6 @@
-
*/
trait ServerStats
@@ -26,9 +26,9 @@ trait ServerStats
*/
public static function getServerStats()
{
- $moduleDirName = basename(dirname(dirname(__DIR__)));
- $moduleDirNameUpper = mb_strtoupper($moduleDirName);
- xoops_loadLanguage('common', $moduleDirName);
+ $moduleDirName = \basename(\dirname(__DIR__, 2));
+ $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+ \xoops_loadLanguage('common', $moduleDirName);
$html = '';
// $sql = 'SELECT metavalue';
// $sql .= ' FROM ' . $GLOBALS['xoopsDB']->prefix('wfdownloads_meta');
@@ -36,40 +36,40 @@ public static function getServerStats()
// $query = $GLOBALS['xoopsDB']->query($sql);
// list($meta) = $GLOBALS['xoopsDB']->fetchRow($query);
$html .= '
'; diff --git a/class/Common/SysUtility.php b/class/Common/SysUtility.php new file mode 100644 index 00000000..48840524 --- /dev/null +++ b/class/Common/SysUtility.php @@ -0,0 +1,215 @@ + + * @author Mamba
+ */
+
+use XoopsModules\Modulebuilder\Helper;
+
+/**
+ * Class Utility
+ */
+class SysUtility
+{
+ use VersionChecks;
+
+ //checkVerXoops, checkVerPhp Traits
+
+ use ServerStats;
+
+ // getServerStats Trait
+
+ use FilesManagement;
+
+ // Files Management Trait
+
+ /**
+ * Access the only instance of this class
+ *
+ * @return object
+ */
+ public static function getInstance()
+ {
+ static $instance;
+ if (null === $instance) {
+ $instance = new static();
+ }
+
+ return $instance;
+ }
+
+ /**
+ * truncateHtml can truncate a string up to a number of characters while preserving whole words and HTML tags
+ * www.gsdesign.ro/blog/cut-html-string-without-breaking-the-tags
+ * www.cakephp.org
+ *
+ * @param string $text String to truncate.
+ * @param int $length Length of returned string, including ellipsis.
+ * @param string $ending Ending to be appended to the trimmed string.
+ * @param bool $exact If false, $text will not be cut mid-word
+ * @param bool $considerHtml If true, HTML tags would be handled correctly
+ *
+ * @return string Trimmed string.
+ */
+ public static function truncateHtml(string $text, int $length = 100, string $ending = '...', bool $exact = false, bool $considerHtml = true)
+ {
+ if ($considerHtml) {
+ // if the plain text is shorter than the maximum length, return the whole text
+ if (\mb_strlen(\preg_replace('/<.*?' . '>/', '', $text)) <= $length) {
+ return $text;
+ }
+ // splits all html-tags to scanable lines
+ \preg_match_all('/(<.+?' . '>)?([^<>]*)/s', $text, $lines, \PREG_SET_ORDER);
+ $total_length = \mb_strlen($ending);
+ $open_tags = [];
+ $truncate = '';
+ foreach ($lines as $line_matchings) {
+ // if there is any html-tag in this line, handle it and add it (uncounted) to the output
+ if (!empty($line_matchings[1])) {
+ // if it's an "empty element" with or without xhtml-conform closing slash
+ if (\preg_match('/^<(\s*.+?\/\s*|\s*(img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param)(\s.+?)?)>$/is', $line_matchings[1])) {
+ // do nothing
+ // if tag is a closing tag
+ } elseif (\preg_match('/^<\s*\/([^\s]+?)\s*>$/s', $line_matchings[1], $tag_matchings)) {
+ // delete tag from $open_tags list
+ $pos = \array_search($tag_matchings[1], $open_tags, true);
+ if (false !== $pos) {
+ unset($open_tags[$pos]);
+ }
+ // if tag is an opening tag
+ } elseif (\preg_match('/^<\s*([^\s>!]+).*?' . '>$/s', $line_matchings[1], $tag_matchings)) {
+ // add tag to the beginning of $open_tags list
+ \array_unshift($open_tags, \mb_strtolower($tag_matchings[1]));
+ }
+ // add html-tag to $truncate'd text
+ $truncate .= $line_matchings[1];
+ }
+ // calculate the length of the plain text part of the line; handle entities as one character
+ $content_length = \mb_strlen(\preg_replace('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|[0-9a-f]{1,6};/i', ' ', $line_matchings[2]));
+ if ($total_length + $content_length > $length) {
+ // the number of characters which are left
+ $left = $length - $total_length;
+ $entities_length = 0;
+ // search for html entities
+ if (\preg_match_all('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|[0-9a-f]{1,6};/i', $line_matchings[2], $entities, \PREG_OFFSET_CAPTURE)) {
+ // calculate the real length of all entities in the legal range
+ foreach ($entities[0] as $entity) {
+ if ($left >= $entity[1] + 1 - $entities_length) {
+ $left--;
+ $entities_length += \mb_strlen($entity[0]);
+ } else {
+ // no more characters left
+ break;
+ }
+ }
+ }
+ $truncate .= \mb_substr($line_matchings[2], 0, $left + $entities_length);
+ // maximum lenght is reached, so get off the loop
+ break;
+ }
+ $truncate .= $line_matchings[2];
+ $total_length += $content_length;
+
+ // if the maximum length is reached, get off the loop
+ if ($total_length >= $length) {
+ break;
+ }
+ }
+ } else {
+ if (\mb_strlen($text) <= $length) {
+ return $text;
+ }
+ $truncate = \mb_substr($text, 0, $length - mb_strlen($ending));
+ }
+ // if the words shouldn't be cut in the middle...
+ if (!$exact) {
+ // ...search the last occurance of a space...
+ $spacepos = \mb_strrpos($truncate, ' ');
+ if (isset($spacepos)) {
+ // ...and cut the text in this position
+ $truncate = \mb_substr($truncate, 0, $spacepos);
+ }
+ }
+ // add the defined ending to the text
+ $truncate .= $ending;
+ if ($considerHtml) {
+ // close all unclosed html-tags
+ foreach ($open_tags as $tag) {
+ $truncate .= '';
+ }
+ }
+
+ return $truncate;
+ }
+
+ /**
+ * @param \Xmf\Module\Helper|null $helper
+ * @param array|null $options
+ * @return \XoopsFormDhtmlTextArea|\XoopsFormEditor
+ */
+ public static function getEditor(\Xmf\Module\Helper $helper = null, array $options = null)
+ {
+ /** @var Helper $helper */
+ if (null === $options) {
+ $options = [];
+ $options['name'] = 'Editor';
+ $options['value'] = 'Editor';
+ $options['rows'] = 10;
+ $options['cols'] = '100%';
+ $options['width'] = '100%';
+ $options['height'] = '400px';
+ }
+
+ if (null === $helper) {
+ $helper = Helper::getInstance();
+ }
+
+ $isAdmin = $helper->isUserAdmin();
+
+ if (\class_exists('XoopsFormEditor')) {
+ if ($isAdmin) {
+ $descEditor = new \XoopsFormEditor(\ucfirst($options['name']), $helper->getConfig('editorAdmin'), $options, $nohtml = false, $onfailure = 'textarea');
+ } else {
+ $descEditor = new \XoopsFormEditor(\ucfirst($options['name']), $helper->getConfig('editorUser'), $options, $nohtml = false, $onfailure = 'textarea');
+ }
+ } else {
+ $descEditor = new \XoopsFormDhtmlTextArea(\ucfirst($options['name']), $options['name'], $options['value'], '100%', '100%');
+ }
+
+ // $form->addElement($descEditor);
+
+ return $descEditor;
+ }
+
+ /**
+ * @param $fieldname
+ * @param $table
+ *
+ * @return bool
+ */
+ public function fieldExists($fieldname, $table)
+ {
+ global $xoopsDB;
+ $result = $xoopsDB->queryF("SHOW COLUMNS FROM $table LIKE '$fieldname'");
+
+ return ($xoopsDB->getRowsNum($result) > 0);
+ }
+}
diff --git a/class/Common/TableChecker.php b/class/Common/TableChecker.php
new file mode 100644
index 00000000..70c85b25
--- /dev/null
+++ b/class/Common/TableChecker.php
@@ -0,0 +1,242 @@
+
+ * @copyright 2021 XOOPS Project (https://xoops.org)
+ * @license GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
+ * @link https://xoops.org
+ */
+class TableChecker extends \XoopsObject
+{
+ /**
+ * @var mixed
+ */
+ private $after = null;
+ /**
+ * @var mixed
+ */
+ private $mydirname = null;
+ /**
+ * @var mixed
+ */
+ private $result = [];
+ /**
+ * @var mixed
+ */
+ private $checktype = null;
+ public const CHECKTYPE_REPORT = 0; //report only
+ public const CHECKTYPE_UPDATE = 1; //update only
+ public const CHECKTYPE_UPDATE_REPORT = 2; //update and report
+
+ /**
+ * @param mixed $mydirname
+ * @param mixed $checktype
+ */
+ public function __construct($mydirname, $checktype = 0)
+ {
+ $this->mydirname = $mydirname;
+ $this->checktype = $checktype;
+ $this->result = [];
+ }
+
+ public function processSQL()
+ {
+ $tabledefs = $this->readSQLFile();
+
+ $this->result[] = 'Tables found in sql:' . \count($tabledefs);
+
+ foreach ($tabledefs as $tabledef) {
+ //echo '
' . $tabledef['name']; + //check whether table exist or not + $table = $tabledef['name']; + $check = $GLOBALS['xoopsDB']->queryF("SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='$table'"); + $numRows = $GLOBALS['xoopsDB']->getRowsNum($check); + if ($numRows) { + //table exist + $this->result[] = 'Table exist:' . $table; + $this->checkTableFields($table, $tabledef['fields']); + } else { + if ($this::CHECKTYPE_UPDATE == $this->checktype || $this::CHECKTYPE_UPDATE_REPORT == $this->checktype) { + // create new table + $sql = $tabledef['sql']; + if ($GLOBALS['xoopsDB']->queryF($sql)) { + $this->result[] = 'Table created:' . $table; + } else { + \xoops_error($GLOBALS['xoopsDB']->error() . '
' . $sql); + $this->result[] = 'Error creating table:' . $table; + } + } else { + $this->result[] = 'Table do not exist:' . $table . ' (creation not activated)'; + } + } + } + + if (self::CHECKTYPE_REPORT == $this->checktype || self::CHECKTYPE_UPDATE_REPORT == $this->checktype) { + return $this->result; + } + + return []; + } + + private function readSQLFile() + { + $tabledefs = []; + + $moduleHandler = \xoops_getHandler('module'); + $module = $moduleHandler->getByDirname($this->mydirname); + $module->loadInfoAsVar($this->mydirname); + $sqlfile = $module->getInfo('sqlfile'); + $sql_file_path = \XOOPS_ROOT_PATH . '/modules/' . $this->mydirname . '/' . $sqlfile[\XOOPS_DB_TYPE]; + + if (\file_exists($sql_file_path)) { + require_once \XOOPS_ROOT_PATH . '/class/database/sqlutility.php'; + $sqlutil = new \SqlUtility(); + $pieces = []; + $sql_query = \trim(file_get_contents($sql_file_path)); + $sqlutil::splitMySqlFile($pieces, $sql_query); + + $countTable = 0; + foreach ($pieces as $piece) { + $singleSql = $sqlutil::prefixQuery($piece, $GLOBALS['xoopsDB']->prefix()); + $lines = \preg_split('/\r\n|\n|\r/', $piece); + //var_dump($lines); + $needle1 = 'create table'; + if ($needle1 == \mb_strtolower($singleSql[1])) { + $countLine = 0; + $tabledefs[$countTable]['sql'] = $singleSql[0]; + $tabledefs[$countTable]['name'] = $GLOBALS['xoopsDB']->prefix() . '_' . $singleSql[4]; + $this->after = ''; + foreach($lines as $line) { + if ($countLine > 0) { + $needle2 = 'primary key'; + $needle3 = 'unique key'; + $needle4 = 'key'; + if (0 === \mb_stripos(\trim($line), $needle2)) { + $tabledefs[$countTable][$needle2] = $line; + } elseif (0 === \mb_stripos(\trim($line), $needle3)) { + $tabledefs[$countTable][$needle3] = $line; + } elseif (0 === \mb_stripos(\trim($line), $needle4)) { + $tabledefs[$countTable][$needle4] = $line; + } else { + if (\mb_strpos($line, '`') > 0) { + $tabledefs[$countTable]['fields'][] = $this->extractField($line); + } + } + } + $countLine++; + } + $countTable++; + } + } + //var_dump($tabledefs); + } else { + $this->result[] = 'File do not exist:' . $sql_file_path; + } + + return $tabledefs; + } + + private function extractKey($line) + { + //todo: split string into single keys + $needle = '('; + $key_text = \substr($line, \strpos($line, $needle) + 1); + $needle = ')'; + return \substr($key_text, 0, \strpos($key_text, $needle)); + } + + private function extractField($line) + { + //todo + $counter = 0; + $clean = mb_substr(\trim($line), 0, -1); + $params = \array_values(\array_filter(\explode(' ', $clean))); + $field['sql'] = $clean; + $field['name'] = \trim($params[$counter], '`'); + $counter++; + $field['type'] = $params[$counter]; + $counter++; + if ('unsigned' == \mb_strtolower($params[$counter])) { + $field['unsigned'] = $params[$counter]; + $counter++; + } + if ('not' == \mb_strtolower($params[$counter]) && 'null' == \mb_strtolower($params[$counter + 1])) { + $field['null'] = $params[$counter] . ' ' . $params[$counter + 1]; + $counter = $counter+2; + } + if (\count($params) > $counter) { + if ('auto_increment' == \mb_strtolower($params[$counter])) { + $field['auto_increment'] = $params[$counter]; + $counter++; + } + } + if (\count($params) > $counter) { + if ('default' == \mb_strtolower($params[$counter])) { + $field['default'] = $params[$counter] . ' ' . $params[$counter + 1]; + //$counter = $counter + 2; + } + } + + $field['after'] = $this->after; + $this->after = $field['name']; + + return $field; + } + + private function checkTableFields($table, $fields) + { + //to be created + foreach ($fields as $field) { + //check whether column exist or not + $fieldname = $field['name']; + $check = $GLOBALS['xoopsDB']->queryF("SHOW COLUMNS FROM `$table` LIKE '$fieldname'"); + $numRows = $GLOBALS['xoopsDB']->getRowsNum($check); + if ($numRows) { + //field exist + $this->checkField($field); + } else { + if (self::CHECKTYPE_UPDATE == $this->checktype || self::CHECKTYPE_UPDATE_REPORT == $this->checktype) { + // create new field + $sql = "ALTER TABLE `$table` ADD " . $field['sql']; + if ('' !== (string)$field['after']) { + $sql .= ' AFTER `' . $field['after'] . '`;'; + } + if ($GLOBALS['xoopsDB']->queryF($sql)) { + $this->result[] = 'Field added:' . $fieldname; + } else { + \xoops_error($GLOBALS['xoopsDB']->error() . '
' . $sql); + $this->result[] = "Error when adding '$fieldname' to table '$table'."; + } + } else { + $this->result[] = 'Field do not exist:' . $fieldname . ' (creation not activated)'; + } + } + } + + return true; + } + + private function checkField($field): void + { + //to be created + $this->result[] = 'Field exist:' . $field['name'] . ' - no changes'; + + } +} diff --git a/class/Common/TestdataButtons.php b/class/Common/TestdataButtons.php new file mode 100644 index 00000000..3c7791df --- /dev/null +++ b/class/Common/TestdataButtons.php @@ -0,0 +1,83 @@ + + * @copyright {@link https://xoops.org/ XOOPS Project} + * @license GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html) + */ + +use Xmf\Request; +use Xmf\Yaml; +use XoopsModules\Modulebuilder\Helper; + +/** @var Helper $helper */ + +/** + * Class SysUtility + */ +class TestdataButtons +{ + /** Button status constants */ + private const SHOW_BUTTONS = 1; + private const HIDE_BUTTONS = 0; + + /** + * Load the test button configuration + * + * @param \Xmf\Module\Admin $adminObject + * + * @return void + */ + public static function loadButtonConfig(\Xmf\Module\Admin $adminObject): void + { + $moduleDirName = \basename(\dirname(__DIR__, 2)); + $moduleDirNameUpper = \mb_strtoupper($moduleDirName); + $helper = Helper::getInstance(); + $yamlFile = $helper->path('/config/admin.yml'); + $config = Yaml::readWrapped($yamlFile); // work with phpmyadmin YAML dumps + $displaySampleButton = $config['displaySampleButton']; + + if (self::SHOW_BUTTONS == $displaySampleButton) { + \xoops_loadLanguage('admin/modulesadmin', 'system'); + $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA'), $helper->url('testdata/index.php?op=load')); + $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA'), $helper->url('testdata/index.php?op=save')); + $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA'), $helper->url('testdata/index.php?op=clear'), 'alert'); + // $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA'), $helper->url( 'testdata/index.php?op=exportschema'), 'add'); + $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'HIDE_SAMPLEDATA_BUTTONS'), '?op=hide_buttons', 'delete'); + } else { + $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLEDATA_BUTTONS'), '?op=show_buttons'); + // $displaySampleButton = $config['displaySampleButton']; + } + } + + public static function hideButtons(): void + { + $yamlFile = \dirname(__DIR__, 2) . '/config/admin.yml'; + $app = []; + $app['displaySampleButton'] = 0; + Yaml::save($app, $yamlFile); + \redirect_header('index.php', 0); + } + + public static function showButtons(): void + { + $yamlFile = \dirname(__DIR__, 2) . '/config/admin.yml'; + $app = []; + $app['displaySampleButton'] = 1; + Yaml::save($app, $yamlFile); + \redirect_header('index.php', 0); + } +} diff --git a/class/Common/VersionChecks.php b/class/Common/VersionChecks.php index 25c18881..a18c6f28 100644 --- a/class/Common/VersionChecks.php +++ b/class/Common/VersionChecks.php @@ -1,6 +1,6 @@ - */ trait VersionChecks @@ -29,24 +29,24 @@ trait VersionChecks */ public static function checkVerXoops(\XoopsModule $module = null, $requiredVer = null) { - $moduleDirName = basename(dirname(dirname(__DIR__))); - $moduleDirNameUpper = mb_strtoupper($moduleDirName); + $moduleDirName = \basename(\dirname(__DIR__, 2)); + $moduleDirNameUpper = \mb_strtoupper($moduleDirName); if (null === $module) { $module = \XoopsModule::getByDirname($moduleDirName); } - xoops_loadLanguage('admin', $moduleDirName); - xoops_loadLanguage('common', $moduleDirName); + \xoops_loadLanguage('admin', $moduleDirName); + \xoops_loadLanguage('common', $moduleDirName); //check for minimum XOOPS version - $currentVer = mb_substr(XOOPS_VERSION, 6); // get the numeric part of string + $currentVer = \mb_substr(\XOOPS_VERSION, 6); // get the numeric part of string if (null === $requiredVer) { $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string } $success = true; - if (version_compare($currentVer, $requiredVer, '<')) { + if ($module->versionCompare($currentVer, $requiredVer, '<')) { $success = false; - $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer)); + $module->setErrors(\sprintf(\constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer)); } return $success; @@ -61,21 +61,21 @@ public static function checkVerXoops(\XoopsModule $module = null, $requiredVer = */ public static function checkVerPhp(\XoopsModule $module = null) { - $moduleDirName = basename(dirname(dirname(__DIR__))); - $moduleDirNameUpper = mb_strtoupper($moduleDirName); + $moduleDirName = \basename(\dirname(__DIR__, 2)); + $moduleDirNameUpper = \mb_strtoupper($moduleDirName); if (null === $module) { $module = \XoopsModule::getByDirname($moduleDirName); } - xoops_loadLanguage('admin', $moduleDirName); + \xoops_loadLanguage('admin', $moduleDirName); // check for minimum PHP version $success = true; - $verNum = PHP_VERSION; + $verNum = \PHP_VERSION; $reqVer = &$module->getInfo('min_php'); if (false !== $reqVer && '' !== $reqVer) { - if (version_compare($verNum, $reqVer, '<')) { - $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum)); + if (\version_compare($verNum, $reqVer, '<')) { + $module->setErrors(\sprintf(\constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum)); $success = false; } } @@ -84,7 +84,7 @@ public static function checkVerPhp(\XoopsModule $module = null) } /** - * compares current module version with latest GitHub release + * compares current module version with the latest GitHub release * @static * @param \Xmf\Module\Helper $helper * @param string|null $source @@ -92,52 +92,52 @@ public static function checkVerPhp(\XoopsModule $module = null) * * @return string|array info about the latest module version, if newer */ - public static function checkVerModule($helper, $source = 'github', $default = 'master') + public static function checkVerModule(\Xmf\Module\Helper $helper, ?string $source = 'github', ?string $default = 'master'): ?array { - $moduleDirName = basename(dirname(dirname(__DIR__))); - $moduleDirNameUpper = mb_strtoupper($moduleDirName); + $moduleDirName = \basename(\dirname(__DIR__, 2)); + $moduleDirNameUpper = \mb_strtoupper($moduleDirName); $update = ''; $repository = 'XoopsModules25x/' . $moduleDirName; // $repository = 'XoopsModules25x/publisher'; //for testing only - $ret = ''; + $ret = null; $infoReleasesUrl = "https://api.github.com/repos/$repository/releases"; if ('github' === $source) { - if (function_exists('curl_init') && false !== ($curlHandle = curl_init())) { - curl_setopt($curlHandle, CURLOPT_URL, $infoReleasesUrl); - curl_setopt($curlHandle, CURLOPT_RETURNTRANSFER, true); - curl_setopt($curlHandle, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curlHandle, CURLOPT_HTTPHEADER, ["User-Agent:Publisher\r\n"]); - $curlReturn = curl_exec($curlHandle); + if (\function_exists('curl_init') && false !== ($curlHandle = \curl_init())) { + \curl_setopt($curlHandle, \CURLOPT_URL, $infoReleasesUrl); + \curl_setopt($curlHandle, \CURLOPT_RETURNTRANSFER, true); + \curl_setopt($curlHandle, \CURLOPT_SSL_VERIFYPEER, false); + \curl_setopt($curlHandle, \CURLOPT_HTTPHEADER, ["User-Agent:Publisher\r\n"]); + $curlReturn = \curl_exec($curlHandle); if (false === $curlReturn) { - trigger_error(curl_error($curlHandle)); + \trigger_error(\curl_error($curlHandle)); } elseif (mb_strpos($curlReturn, 'Not Found')) { - trigger_error('Repository Not Found: ' . $infoReleasesUrl); + \trigger_error('Repository Not Found: ' . $infoReleasesUrl); } else { - $file = json_decode($curlReturn, false); - $latestVersionLink = sprintf("https://github.com/$repository/archive/%s.zip", $file ? reset($file)->tag_name : $default); + $file = \json_decode($curlReturn, false); + $latestVersionLink = \sprintf("https://github.com/$repository/archive/%s.zip", $file ? \reset($file)->tag_name : $default); $latestVersion = $file[0]->tag_name; $prerelease = $file[0]->prerelease; if ('master' !== $latestVersionLink) { - $update = constant('CO_' . $moduleDirNameUpper . '_' . 'NEW_VERSION') . $latestVersion; + $update = \constant('CO_' . $moduleDirNameUpper . '_' . 'NEW_VERSION') . $latestVersion; } //"PHP-standardized" version - $latestVersion = mb_strtolower($latestVersion); + $latestVersion = \mb_strtolower($latestVersion); if (false !== mb_strpos($latestVersion, 'final')) { - $latestVersion = str_replace('_', '', mb_strtolower($latestVersion)); - $latestVersion = str_replace('final', '', mb_strtolower($latestVersion)); + $latestVersion = \str_replace('_', '', \mb_strtolower($latestVersion)); + $latestVersion = \str_replace('final', '', \mb_strtolower($latestVersion)); } $moduleVersion = ($helper->getModule()->getInfo('version') . '_' . $helper->getModule()->getInfo('module_status')); //"PHP-standardized" version - $moduleVersion = str_replace(' ', '', mb_strtolower($moduleVersion)); + $moduleVersion = \str_replace(' ', '', \mb_strtolower($moduleVersion)); // $moduleVersion = '1.0'; //for testing only // $moduleDirName = 'publisher'; //for testing only - if (!$prerelease && version_compare($moduleVersion, $latestVersion, '<')) { + if (!$prerelease && \version_compare($moduleVersion, $latestVersion, '<')) { $ret = []; $ret[] = $update; $ret[] = $latestVersionLink; } } - curl_close($curlHandle); + \curl_close($curlHandle); } } diff --git a/class/Common/index.html b/class/Common/index.html deleted file mode 100644 index 74b6f45c..00000000 --- a/class/Common/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/class/Common/index.php b/class/Common/index.php new file mode 100644 index 00000000..e5ee0725 --- /dev/null +++ b/class/Common/index.php @@ -0,0 +1,2 @@ + - Website:
+ */
+
+/**
+ * Interface Constants
+ */
+interface Constants
+{
+ // Constants for morefiles
+ public const MORE_FILES_TYPE_EMPTY = 1;
+ public const MORE_FILES_TYPE_COPY = 2;
+
+ // ------------------- Field elements ---------------------------------
+ // --------- The values MUST BE IDENTICAL to fieldelement_id ----------
+ public const FIELD_ELE_TEXT = 2;
+ public const FIELD_ELE_TEXTAREA = 3;
+ public const FIELD_ELE_DHTMLTEXTAREA = 4;
+ public const FIELD_ELE_CHECKBOX = 5;
+ public const FIELD_ELE_RADIOYN = 6;
+ public const FIELD_ELE_SELECTBOX = 7;
+ public const FIELD_ELE_SELECTUSER = 8;
+ public const FIELD_ELE_COLORPICKER = 9;
+ public const FIELD_ELE_IMAGELIST = 10;
+ public const FIELD_ELE_SELECTFILE = 11;
+ public const FIELD_ELE_URLFILE = 12;
+ public const FIELD_ELE_UPLOADIMAGE = 13;
+ public const FIELD_ELE_UPLOADFILE = 14;
+ public const FIELD_ELE_TEXTDATESELECT = 15;
+ public const FIELD_ELE_SELECTSTATUS = 16;
+ public const FIELD_ELE_PASSWORD = 17;
+ public const FIELD_ELE_SELECTCOUNTRY = 18;
+ public const FIELD_ELE_SELECTLANG = 19;
+ public const FIELD_ELE_RADIO = 20;
+ public const FIELD_ELE_DATETIME = 21;
+ public const FIELD_ELE_SELECTCOMBO = 22;
+ public const FIELD_ELE_TEXTUUID = 23;
+ public const FIELD_ELE_TEXTIP = 24;
+ public const FIELD_ELE_TEXTCOMMENTS = 25;
+ public const FIELD_ELE_TEXTRATINGS = 26;
+ public const FIELD_ELE_TEXTVOTES = 27;
+ public const FIELD_ELE_TEXTREADS = 28;
+ public const FIELD_ELE_TEXTINTEGER = 29;
+ public const FIELD_ELE_TEXTFLOAT = 30;
+ public const FIELD_ELE_RADIO_ONOFFLINE = 31;
+ // FIRST_FIELDELEMENT_TABLE must be +1 higher than the highest FIELD_ELE... constant
+ public const FIRST_FIELDELEMENT_TABLE = 32;
+
+}
diff --git a/class/Devtools.php b/class/Devtools.php
new file mode 100644
index 00000000..54b246cb
--- /dev/null
+++ b/class/Devtools.php
@@ -0,0 +1,619 @@
+
+ * @since
+ */
+
+use XoopsModules\Modulebuilder;
+
+/**
+ * Class Devtools
+ */
+class Devtools
+{
+
+ /* function to remove prefix from table field names */
+
+ /**
+ * @param $src_path
+ * @param $dst_path
+ * @param $moduleDirName
+ */
+ public static function function_removeprefix($src_path, $dst_path, $moduleDirName): void
+ {
+ $patKeys = [];
+ $patValues = [];
+
+ $helper = \XoopsModules\Modulebuilder\Helper::getInstance();
+ // get module id
+ $crModules = new \CriteriaCompo();
+ $crModules->add(new \Criteria('mod_dirname', $moduleDirName));
+ $modulesAll = $helper->getHandler('Modules')->getAll($crModules);
+ $modId = 0;
+ foreach (\array_keys($modulesAll) as $i) {
+ $modId = $modulesAll[$i]->getVar('mod_id');
+ }
+ if (0 === $modId) {
+ \redirect_header('devtools.php', 3, \_AM_MODULEBUILDER_DEVTOOLS_INVALID_MOD);
+ }
+ // get module tables
+ $crTables = new \CriteriaCompo();
+ $crTables->add(new \Criteria('table_mid', $modId));
+ $tablesAll = $helper->getHandler('Tables')->getAll($crTables);
+ $tablesArr = [];
+ foreach (\array_keys($tablesAll) as $j) {
+ $tablesArr[$j] = $tablesAll[$j]->getVar('table_name');
+ }
+
+ foreach ($tablesArr as $tid => $tablename) {
+ $crFields = new \CriteriaCompo();
+ $crFields->add(new \Criteria('field_tid', $tid));
+ $fieldsAll = $helper->getHandler('Fields')->getAll($crFields);
+ foreach (\array_keys($fieldsAll) as $k) {
+ $fieldName = $fieldsAll[$k]->getVar('field_name');
+ $rpFieldName = '';
+ if (\mb_strpos($fieldName, '_')) {
+ $str = \mb_strpos($fieldName, '_');
+ if (false !== $str) {
+ $rpFieldName = \mb_substr($fieldName, $str + 1, \mb_strlen($fieldName));
+ }
+ }
+ // for getVar, setVar, forms, ....
+ $patKeys[] = "'" . $fieldName . "'";
+ $patValues[] = "'" . $rpFieldName . "'";
+ $patKeys[] = 'showImgSelected(\"imglabel_' . $fieldName . '\",';
+ $patValues[] = 'showImgSelected(\"imglabel_' . $rpFieldName . '\",';
+ $patKeys[] = '\"' . $fieldName . '\",';
+ $patValues[] = '\"' . $rpFieldName . '\",';
+ $patKeys[] = "id='imglabel_" . $fieldName . "' alt=";
+ $patValues[] = "id='imglabel_" . $rpFieldName . "' alt=";
+ $patKeys[] = "sort = '" . $fieldName . ' ASC,';
+ $patValues[] = "sort = '" . $rpFieldName . ' ASC,';
+ $patKeys[] = 'ASC, ' . $fieldName . "', \$order";
+ $patValues[] = 'ASC, ' . $rpFieldName . "', \$order";
+ //clone feature
+ $patKeys[] = "'" . $fieldName . "_source'";
+ $patValues[] = "'" . $rpFieldName . "_source'";
+ // for tpl files
+ if ($rpFieldName === 'id') {
+ $patKeys[] = 'op=edit&' . $fieldName . '=';
+ $patValues[] = 'op=edit&' . $rpFieldName . '=';
+ $patKeys[] = 'op=show&' . $fieldName . '=';
+ $patValues[] = 'op=show&' . $rpFieldName . '=';
+ $patKeys[] = 'op=delete&' . $fieldName . '=';
+ $patValues[] = 'op=delete&' . $rpFieldName . '=';
+ $patKeys[] = 'op=broken&' . $fieldName . '=';
+ $patValues[] = 'op=broken&' . $rpFieldName . '=';
+ $patKeys[] = 'op=clone&' . $fieldName . '_source=';
+ $patValues[] = 'op=clone&' . $rpFieldName . '_source=';
+ }
+ //<{$article.art_id|default:false}>
+ $patKeys[] = '<{$' . $tablename . '.' . $fieldName . '|default:false}>';
+ $patValues[] = '<{$' . $tablename . '.' . $rpFieldName . '|default:false}>';
+ // for sql file
+ $patKeys[] = '`' . $fieldName . '`';
+ $patValues[] = '`' . $rpFieldName . '`';
+ }
+ }
+
+ $extensions = [];
+ $extensions[] = 'php';
+ $extensions[] = 'tpl';
+ $extensions[] = 'sql';
+ self::cloneFileFolder($src_path, $dst_path, $patKeys, $patValues, false, $extensions);
+ }
+
+ /* function to add function qualifier to module */
+
+ /**
+ * @param $src_path
+ * @param $dst_path
+ * @param $moduleDirName
+ */
+ public static function function_qualifier($src_path, $dst_path, $moduleDirName): void
+ {
+ $functions = [];
+ $constants = [];
+
+ //php functions
+ $functions[] = [
+ 'array_diff',
+ 'array_filter',
+ 'array_key_exists',
+ 'array_keys',
+ 'array_search',
+ 'array_slice',
+ 'array_unshift',
+ 'array_shift',
+ 'array_values',
+ 'array_flip',
+ 'assert',
+ 'basename',
+ 'boolval',
+ 'call_user_func',
+ 'call_user_func_array',
+ 'chr',
+ 'class_exists',
+ 'closedir',
+ 'constant',
+ 'copy',
+ 'count',
+ 'curl_close',
+ 'curl_error',
+ 'curl_exec',
+ 'curl_file_create',
+ 'curl_getinfo',
+ 'curl_init',
+ 'curl_setopt',
+ 'define',
+ 'defined',
+ 'dirname',
+ 'doubleval',
+ 'explode',
+ 'extension_loaded',
+ 'file_exists',
+ 'file_get_contents',
+ 'file_put_contents',
+ 'filemtime',
+ 'finfo_open',
+ 'floatval',
+ 'floor',
+ 'formatTimestamp',
+ 'func_get_args',
+ 'func_num_args',
+ 'function_exists',
+ 'get_called_class',
+ 'get_class',
+ 'getimagesize',
+ 'gettype',
+ 'http_build_query',
+ 'imagealphablending',
+ 'imagecopyresampled',
+ 'imagecreatefromgif',
+ 'imagecreatefromjpeg',
+ 'imagecreatefrompng',
+ 'imagecreatefromstring',
+ 'imagecreatetruecolor',
+ 'imagesavealpha',
+ 'imagedestroy',
+ 'imagegif',
+ 'imagejpeg',
+ 'imagepng',
+ 'imagerotate',
+ 'imagesx',
+ 'imagesy',
+ 'implode',
+ 'in_array',
+ 'ini_get',
+ 'intval',
+ 'include',
+ 'is_array',
+ 'is_bool',
+ 'is_callable',
+ 'is_dir',
+ 'is_double',
+ 'is_file',
+ 'is_float',
+ 'is_int',
+ 'is_integer',
+ 'is_link',
+ 'is_long',
+ 'is_null',
+ 'is_object',
+ 'is_real',
+ 'is_resource',
+ 'is_string',
+ 'json_decode',
+ 'json_encode',
+ 'libxml_get_errors',
+ 'libxml_clear_errors',
+ 'mime_content_type',
+ 'mkdir',
+ 'mktime',
+ 'opendir',
+ 'ord',
+ 'pathinfo',
+ 'preg_match',
+ 'preg_match_all',
+ 'preg_replace',
+ 'readdir',
+ 'readlink',
+ 'redirect_header',
+ 'rename',
+ 'require',
+ 'rmdir',
+ 'round',
+ 'scandir',
+ 'sprintf',
+ 'mb_strtoupper',
+ 'mb_strtolower',
+ 'mb_strpos',
+ 'mb_strlen',
+ 'mb_strrpos',
+ 'setcookie',
+ 'simplexml_load_string',
+ 'str_repeat',
+ 'str_replace',
+ 'stream_context_create',
+ 'strip_tags',
+ 'strlen',
+ 'strpos',
+ 'strtotime',
+ 'strval',
+ 'substr',
+ 'symlink',
+ 'time',
+ 'trigger_error',
+ 'trim',
+ 'ucfirst',
+ 'unlink',
+ 'version_compare',
+ ];
+
+ // xoops functions
+ $functions[] = [
+ 'xoops_getHandler',
+ 'xoops_load',
+ 'xoops_loadLanguage',
+ ];
+ // xoops const
+ $constants[] = [
+ 'XOBJ_DTYPE_',
+ 'XOOPS_URL',
+ 'XOOPS_ROOT_PATH',
+ 'XOOPS_GROUP_',
+ ];
+
+ $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+ // module language defines
+ $constants[] = [
+ '_AM_' . $moduleDirNameUpper .'_',
+ '_MI_' . $moduleDirNameUpper .'_',
+ '_MB_' . $moduleDirNameUpper .'_',
+ '_MA_' . $moduleDirNameUpper .'_',
+ $moduleDirNameUpper .'_',
+ ];
+
+ // xoops objects
+ $xobjects[] = [
+ 'XoopsThemeForm',
+ 'XoopsSimpleForm',
+ 'XoopsTableForm',
+ 'XoopsFormText', //XoopsFormTextArea, XoopsFormTextDateSelect
+ 'XoopsFormHidden',
+ 'XoopsFormButton', //XoopsFormButtonTray
+ 'XoopsFormEditor',
+ 'XoopsFormCheckBox',
+ 'XoopsFormRadio', //XoopsFormRadioYN
+ 'XoopsFormSelect', //XoopsFormSelectUser
+ 'XoopsFormColorPicker',
+ 'XoopsFormElementTray',
+ 'XoopsFormLabel',
+ 'XoopsFormFile',
+ 'XoopsFormPassword',
+ 'XoopsFormDateTime',
+ 'XoopsTpl',
+ 'XoopsPageNav',
+ 'XoopsUser',
+ 'XoopsLists',
+ 'XoopsDatabase',
+ 'XoopsMediaUploader',
+ 'XoopsModule',
+ 'XoopsPreloadItem',
+ ];
+
+ // misc corrections
+ $misc = [
+ 'new Criteria(' => 'new \Criteria(',
+ 'new CriteriaCompo(' => 'new \CriteriaCompo(',
+ "\define('\\" => "\define('",
+ ];
+
+ // repair known errors
+ $errors = [
+ 'substr_\count(' => 'substr_count(',
+ 'micro\time(' => '\microtime(',
+ 'mk\time(' => 'mktime(',
+ 'strto\time(' => 'strtotime(',
+ 'mb_\strlen(' => 'mb_strlen(',
+ 'mb_\substr(' => 'mb_substr(',
+ 'x\copy' => 'xcopy',
+ 'r\rmdir' => 'rrmdir',
+ 'r\copy' => 'rcopy',
+ 'r\trim' => '\rtrim',
+ 'l\trim' => '\ltrim',
+ '\dirname()' => 'dirname()',
+ 'assw\ord' => 'assword',
+ 'mb_\strpos' => 'mb_strpos',
+ 'image\copy(' => 'imagecopy(',
+ '<{if \count(' => '<{if count(',
+ 'define(\_' => 'define(_',
+ '\strr\chr(' => '\strrchr(',
+ 'strf\time(' => 'strftime(',
+ 'filem\time' => 'filemtime',
+ "_AM_\\" . $moduleDirNameUpper .'_' => "_AM_" . $moduleDirNameUpper .'_',
+ "_MI_\\" . $moduleDirNameUpper .'_' => "_MI_" . $moduleDirNameUpper .'_',
+ "_MB_\\" . $moduleDirNameUpper .'_' => "_MB_" . $moduleDirNameUpper .'_',
+ "_MA_\\" . $moduleDirNameUpper .'_' => "_MA_" . $moduleDirNameUpper .'_',
+ "CO_\\" . $moduleDirNameUpper .'_' => "CO_" . $moduleDirNameUpper .'_',
+ "'\\" . $moduleDirNameUpper .'_' => "'" . $moduleDirNameUpper .'_',
+ "'\_AM_\\" . $moduleDirNameUpper .'_' => "'_AM_" . $moduleDirNameUpper .'_',
+ "'\_MI_\\" . $moduleDirNameUpper .'_' => "'_MI_" . $moduleDirNameUpper .'_',
+ "'\_MB_\\" . $moduleDirNameUpper .'_' => "'_MB_" . $moduleDirNameUpper .'_',
+ "'\_MA_\\" . $moduleDirNameUpper .'_' => "'_MA_" . $moduleDirNameUpper .'_',
+ 'namespace \XoopsModules' => 'namespace XoopsModules',
+ 'use \Xoops' => 'use Xoops',
+ "'\XOOPS_" => "'XOOPS_",
+ "prefix = '\XoopsModules\\" => "prefix = 'XoopsModules\\",
+ '\XoopsModules25x' => 'XoopsModules25x',
+ '@link \XoopsModule' => '@link XoopsModule',
+ ];
+
+ $patterns = [];
+ foreach ($functions as $function) {
+ //reset existing in order to avoid double \\
+ foreach ($function as $item) {
+ $patterns['\\' . $item . '('] = $item . '(';
+ }
+ //apply now for all
+ foreach ($function as $item) {
+ $patterns[$item . '('] = '\\' . $item . '(';
+ }
+ }
+ foreach ($constants as $constant) {
+ //reset existing in order to avoid double \\
+ foreach ($constant as $item) {
+ $patterns['\\' . $item ] = $item;
+ }
+ //apply now for all
+ foreach ($constant as $item) {
+ $patterns[$item] = '\\' . $item;
+ }
+ }
+ foreach ($xobjects as $xobject) {
+ //reset existing in order to avoid double \\
+ foreach ($xobject as $item) {
+ $patterns['\\' . $item ] = $item;
+ }
+ //apply now for all
+ foreach ($xobject as $item) {
+ $patterns[$item] = '\\' . $item;
+ }
+ }
+
+ //add misc
+ foreach ($misc as $key => $value) {
+ $patterns[$key] = $value;
+ }
+ //add errors
+ foreach ($errors as $key => $value) {
+ $patterns[$key] = $value;
+ }
+
+ $patKeys = \array_keys($patterns);
+ $patValues = \array_values($patterns);
+ self::cloneFileFolder($src_path, $dst_path, $patKeys, $patValues);
+ }
+
+ /* function to add function qualifier to module */
+
+ /**
+ * @param $src_path
+ * @param $dst_path
+ */
+ public static function function_tabreplacer($src_path, $dst_path): void
+ {
+ $patKeys = [];
+ $patValues = [];
+ self::cloneFileFolder($src_path, $dst_path, $patKeys, $patValues, true);
+ }
+
+ // recursive cloning script
+
+ /**
+ * @param $src_path
+ * @param $dst_path
+ * @param array $patKeys
+ * @param array $patValues
+ * @param bool $replaceTabs
+ * @param string[] $extensions
+ */
+ public static function cloneFileFolder($src_path, $dst_path, array $patKeys = [], array $patValues = [], bool $replaceTabs = false, $extensions = ['php']): void
+ {
+ // open the source directory
+ $dir = \opendir($src_path);
+ // Make the destination directory if not exist
+ @\mkdir($dst_path);
+ // Loop through the files in source directory
+ while( $file = \readdir($dir) ) {
+ if (( $file != '.' ) && ( $file != '..' )) {
+ if ( \is_dir($src_path . '/' . $file) ) {
+ // Recursively calling custom copy function for sub directory
+ self::cloneFileFolder($src_path . '/' . $file, $dst_path . '/' . $file, $patKeys, $patValues, $replaceTabs, $extensions);
+ } else {
+ self::cloneFile($src_path . '/' . $file, $dst_path . '/' . $file, $patKeys, $patValues, $replaceTabs, $extensions);
+ }
+ }
+ }
+ \closedir($dir);
+ }
+
+ /**
+ * @param $src_file
+ * @param $dst_file
+ * @param array $patKeys
+ * @param array $patValues
+ * @param bool $replaceTabs
+ * @param $extensions
+ */
+ private static function cloneFile($src_file, $dst_file, array $patKeys, array $patValues, bool $replaceTabs, $extensions): void
+ {
+ $replace_code = false;
+ if (\in_array(\mb_strtolower(\pathinfo($src_file, PATHINFO_EXTENSION)), $extensions)) {
+ $replace_code = true;
+ }
+ if (\mb_strpos($dst_file, \basename(__FILE__)) > 0) {
+ //skip myself
+ $replace_code = false;
+ }
+ if ($replace_code) {
+ // file, read it and replace text
+ $content = \file_get_contents($src_file);
+ if ($replaceTabs) {
+ $content = \preg_replace("/[\t]+/", ' ', $content);
+ } else {
+ $content = \str_replace($patKeys, $patValues, $content);
+ }
+ //check file name whether it contains replace code
+ $path_parts = \pathinfo($dst_file);
+ $path = $path_parts['dirname'];
+ $file = $path_parts['basename'];
+ $dst_file = $path . '/' . \str_replace($patKeys, $patValues, $file);
+ \file_put_contents($dst_file, $content);
+ } else {
+ \copy($src_file, $dst_file);
+ }
+ }
+
+ /**
+ * get form with all existing modules
+ * @param string|false $action
+ * @return \XoopsSimpleForm
+ */
+ public static function getFormModulesFq(string|false $action = false)
+ {
+ if (!$action) {
+ $action = $_SERVER['REQUEST_URI'];
+ }
+ // Get Theme Form
+ \xoops_load('XoopsFormLoader');
+ $form = new \XoopsSimpleForm('', 'form', $action, 'post', true);
+ $form->setExtra('enctype="multipart/form-data"');
+ // Form Select Module
+ $modulesSelect = new \XoopsFormSelect(\_AM_MODULEBUILDER_DEVTOOLS_FQ_MODULE, 'fq_module', '');
+ $modulesArr = \XoopsLists::getModulesList();
+ $modulesSelect->addOption('', ' ');
+ foreach ($modulesArr as $mod) {
+ $modulesSelect->addOption($mod, $mod);
+ }
+ $form->addElement($modulesSelect, true);
+ // To Save
+ $form->addElement(new \XoopsFormHidden('op', 'fq'));
+ $form->addElement(new \XoopsFormButtonTray('', \_SUBMIT, 'submit', '', false));
+
+ return $form;
+ }
+
+ /**
+ * get form with all existing modules
+ * @param string|false $action
+ * @return \XoopsSimpleForm
+ */
+ public static function getFormModulesCl(string|false $action = false)
+ {
+ if (!$action) {
+ $action = $_SERVER['REQUEST_URI'];
+ }
+ // Get Theme Form
+ \xoops_load('XoopsFormLoader');
+ $form = new \XoopsSimpleForm('', 'form', $action, 'post', true);
+ $form->setExtra('enctype="multipart/form-data"');
+ // Form Select Module
+ $modulesSelect = new \XoopsFormSelect(\_AM_MODULEBUILDER_DEVTOOLS_CL_MODULE, 'cl_module', '');
+ $modulesArr = \XoopsLists::getModulesList();
+ $modulesSelect->addOption('', ' ');
+ foreach ($modulesArr as $mod) {
+ $modulesSelect->addOption($mod, $mod);
+ }
+ $form->addElement($modulesSelect, true);
+ // To Save
+ $form->addElement(new \XoopsFormHidden('op', 'check_lang'));
+ $form->addElement(new \XoopsFormButtonTray('', \_SUBMIT, 'submit', '', false));
+
+ return $form;
+ }
+
+ /**
+ * get form with all existing modules
+ * @param string|false $action
+ * @return \XoopsSimpleForm
+ */
+ public static function getFormModulesTab(string|false $action = false)
+ {
+ if (!$action) {
+ $action = $_SERVER['REQUEST_URI'];
+ }
+ // Get Theme Form
+ \xoops_load('XoopsFormLoader');
+ $form = new \XoopsSimpleForm('', 'form', $action, 'post', true);
+ $form->setExtra('enctype="multipart/form-data"');
+ // Form Select Module
+ $modulesSelect = new \XoopsFormSelect(\_AM_MODULEBUILDER_DEVTOOLS_TAB_MODULE, 'tab_module', '');
+ $modulesArr = \XoopsLists::getModulesList();
+ $modulesSelect->addOption('', ' ');
+ foreach ($modulesArr as $mod) {
+ $modulesSelect->addOption($mod, $mod);
+ }
+ $form->addElement($modulesSelect, true);
+ // To Save
+ $form->addElement(new \XoopsFormHidden('op', 'tab_replacer'));
+ $form->addElement(new \XoopsFormButtonTray('', \_SUBMIT, 'submit', '', false));
+
+ return $form;
+ }
+
+ /**
+ * get form with all existing modules
+ * @param string $dst_path
+ * @param string|false $action
+ * @return \XoopsSimpleForm
+ */
+ public static function getFormModulesRemovePrefix(string $dst_path, string|false $action = false)
+ {
+ if (!$action) {
+ $action = $_SERVER['REQUEST_URI'];
+ }
+ // Get Theme Form
+ \xoops_load('XoopsFormLoader');
+ $form = new \XoopsSimpleForm('', 'form', $action, 'post', true);
+ $form->setExtra('enctype="multipart/form-data"');
+ // Form Select Module
+ $modulesSelect = new \XoopsFormSelect(\_AM_MODULEBUILDER_DEVTOOLS_RP_MODULE, 'rp_module', '');
+ $modulesArr = \XoopsLists::getModulesList();
+ $modulesSelect->addOption('', ' ');
+ foreach ($modulesArr as $mod) {
+ $modulesSelect->addOption($mod, $mod);
+ }
+ $form->addElement($modulesSelect, true);
+ $destradioSelect = new \XoopsFormRadio(\_AM_MODULEBUILDER_DEVTOOLS_RP_DEST, 'rp_dest', 1);
+ $destradioSelect->addOption('1', \str_replace('%s', $dst_path, \_AM_MODULEBUILDER_DEVTOOLS_RP_DEST1));
+ $destradioSelect->addOption('2', \_AM_MODULEBUILDER_DEVTOOLS_RP_DEST2);
+ $form->addElement($destradioSelect);
+ // To Save
+ $form->addElement(new \XoopsFormHidden('op', 'remove_prefix'));
+ $form->addElement(new \XoopsFormButtonTray('', \_SUBMIT, 'submit', '', false));
+
+ return $form;
+ }
+}
diff --git a/class/Fieldattributes.php b/class/Fieldattributes.php
index 1bc23d22..0b292d5c 100644
--- a/class/Fieldattributes.php
+++ b/class/Fieldattributes.php
@@ -1,8 +1,8 @@
- - -
*/
/**
@@ -37,7 +36,6 @@ class Fieldattributes extends \XoopsObject
{
/**
* @public function constructor class
- * @param null
*/
public function __construct()
{
@@ -48,7 +46,7 @@ public function __construct()
/**
* @static function getInstance
- * @param null
+ *
* @return Fieldattributes
*/
public static function getInstance()
diff --git a/class/FieldattributesHandler.php b/class/FieldattributesHandler.php
index 2ceb8662..88290684 100644
--- a/class/FieldattributesHandler.php
+++ b/class/FieldattributesHandler.php
@@ -1,8 +1,8 @@
- - -
*/
/**
@@ -35,6 +34,6 @@ class FieldattributesHandler extends \XoopsPersistableObjectHandler
*/
public function __construct(\XoopsDatabase $db)
{
- parent::__construct($db, 'tdmcreate_fieldattributes', Fieldattributes::class, 'fieldattribute_id', 'fieldattribute_name');
+ parent::__construct($db, 'modulebuilder_fieldattributes', Fieldattributes::class, 'fieldattribute_id', 'fieldattribute_name');
}
}
diff --git a/class/FieldElements.php b/class/Fieldelements.php
similarity index 76%
rename from class/FieldElements.php
rename to class/Fieldelements.php
index 4afca4b8..4dec54eb 100644
--- a/class/FieldElements.php
+++ b/class/Fieldelements.php
@@ -1,8 +1,8 @@
-
- *
*/
/**
- * Class FieldElements.
+ * Class Fieldelements.
*/
-class FieldElements extends \XoopsObject
+class Fieldelements extends \XoopsObject
{
/**
* @public function constructor class
- * @param null
*/
public function __construct()
{
@@ -43,26 +41,27 @@ public function __construct()
$this->initVar('fieldelement_value', XOBJ_DTYPE_TXTBOX);
$this->initVar('fieldelement_sort', XOBJ_DTYPE_INT);
$this->initVar('fieldelement_deftype', XOBJ_DTYPE_TXTBOX);
- $this->initVar('fieldelement_defvalue', XOBJ_DTYPE_INT);
+ $this->initVar('fieldelement_defvalue', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('fieldelement_deffield', XOBJ_DTYPE_TXTBOX);
}
/**
* @param string $method
- * @param array $args
+ * @param array $args
*
* @return mixed
*/
- public function __call($method, $args)
+ public function __call(string $method, array $args)
{
- $arg = isset($args[0]) ? $args[0] : null;
+ $arg = $args[0] ?? null;
return $this->getVar($method, $arg);
}
/**
* @static function getInstance
- * @param null
- * @return FieldElements
+ *
+ * @return Fieldelements
*/
public static function getInstance()
{
@@ -81,7 +80,7 @@ public static function getInstance()
* @param null $maxDepth
* @return array
*/
- public function getValuesFieldElements($keys = null, $format = null, $maxDepth = null)
+ public function getValuesFieldelements($keys = null, $format = null, $maxDepth = null)
{
$ret = $this->getValues($keys, $format, $maxDepth);
// Values
@@ -93,6 +92,7 @@ public function getValuesFieldElements($keys = null, $format = null, $maxDepth =
$ret['sort'] = $this->getVar('fieldelement_sort');
$ret['deftype'] = $this->getVar('fieldelement_deftype');
$ret['defvalue'] = $this->getVar('fieldelement_defvalue');
+ $ret['deffield'] = $this->getVar('fieldelement_deffield');
return $ret;
}
diff --git a/class/FieldElementsHandler.php b/class/FieldelementsHandler.php
similarity index 55%
rename from class/FieldElementsHandler.php
rename to class/FieldelementsHandler.php
index 48c64f73..503491ef 100644
--- a/class/FieldElementsHandler.php
+++ b/class/FieldelementsHandler.php
@@ -1,8 +1,8 @@
-
- *
*/
/**
- * Class FieldElementsHandler.
+ * Class FieldelementsHandler.
*/
-class FieldElementsHandler extends \XoopsPersistableObjectHandler
+class FieldelementsHandler extends \XoopsPersistableObjectHandler
{
/**
* @public function constructor class
@@ -36,79 +35,77 @@ class FieldElementsHandler extends \XoopsPersistableObjectHandler
*/
public function __construct(\XoopsDatabase $db)
{
- parent::__construct($db, 'tdmcreate_fieldelements', FieldElements::class, 'fieldelement_id', 'fieldelement_name');
+ parent::__construct($db, 'modulebuilder_fieldelements', Fieldelements::class, 'fieldelement_id', 'fieldelement_name');
}
/**
* Get Count Fields.
- * @param int $start
- * @param int $limit
+ * @param int $start
+ * @param int $limit
* @param string $sort
* @param string $order
* @return int
*/
- public function getCountFieldElements($start = 0, $limit = 0, $sort = 'fieldelement_id ASC, fieldelement_name', $order = 'ASC')
+ public function getCountFieldelements(int $start = 0, int $limit = 0, string $sort = 'fieldelement_id ASC, fieldelement_name', string $order = 'ASC')
{
$crCountFieldElems = new \CriteriaCompo();
- $crCountFieldElems = $this->getFieldElementsCriteria($crCountFieldElems, $start, $limit, $sort, $order);
+ $crCountFieldElems = $this->getFieldelementsCriteria($crCountFieldElems, $start, $limit, $sort, $order);
return parent::getCount($crCountFieldElems);
}
/**
* Get Objects Fields.
- * @param int $start
- * @param int $limit
+ * @param int $start
+ * @param int $limit
* @param string $sort
* @param string $order
* @return array
*/
- public function getObjectsFieldElements($start = 0, $limit = 0, $sort = 'fieldelement_id ASC, fieldelement_name', $order = 'ASC')
+ public function getObjectsFieldelements(int $start = 0, int $limit = 0, string $sort = 'fieldelement_id ASC, fieldelement_name', string $order = 'ASC')
{
$crObjectsFieldElems = new \CriteriaCompo();
- $crObjectsFieldElems = $this->getFieldElementsCriteria($crObjectsFieldElems, $start, $limit, $sort, $order);
+ $crObjectsFieldElems = $this->getFieldelementsCriteria($crObjectsFieldElems, $start, $limit, $sort, $order);
return $this->getObjects($crObjectsFieldElems);
}
/**
* Get All Fields.
- * @param int $start
- * @param int $limit
+ * @param int $start
+ * @param int $limit
* @param string $sort
* @param string $order
* @return array
*/
- public function getAllFieldElements($start = 0, $limit = 0, $sort = 'fieldelement_id ASC, fieldelement_name', $order = 'ASC')
+ public function getAllFieldelements(int $start = 0, int $limit = 0, string $sort = 'fieldelement_id ASC, fieldelement_name', string $order = 'ASC')
{
$crAllFieldElems = new \CriteriaCompo();
- $crAllFieldElems = $this->getFieldElementsCriteria($crAllFieldElems, $start, $limit, $sort, $order);
+ $crAllFieldElems = $this->getFieldelementsCriteria($crAllFieldElems, $start, $limit, $sort, $order);
return $this->getAll($crAllFieldElems);
}
/**
* Get All Fields By Module & Table Id.
- * @param $modId
* @param $tabId
- * @param int $start
- * @param int $limit
+ * @param int $start
+ * @param int $limit
* @param string $sort
* @param string $order
* @return array
*/
- public function getAllFieldElementsByModuleAndTableId($modId, $tabId, $start = 0, $limit = 0, $sort = 'fieldelement_id ASC, fieldelement_name', $order = 'ASC')
+ public function getAllFieldelementsByTableId($tabId, int $start = 0, int $limit = 0, string $sort = 'fieldelement_id ASC, fieldelement_name', string $order = 'ASC')
{
$crAllFieldElemsByModule = new \CriteriaCompo();
- $crAllFieldElemsByModule->add(new \Criteria('fieldelement_mid', $modId));
$crAllFieldElemsByModule->add(new \Criteria('fieldelement_tid', $tabId));
- $crAllFieldElemsByModule = $this->getFieldElementsCriteria($crAllFieldElemsByModule, $start, $limit, $sort, $order);
+ $crAllFieldElemsByModule = $this->getFieldelementsCriteria($crAllFieldElemsByModule, $start, $limit, $sort, $order);
return $this->getAll($crAllFieldElemsByModule);
}
/**
- * Get FieldElements Criteria.
+ * Get Fieldelements Criteria.
* @param $crFieldElemsCriteria
* @param $start
* @param $limit
@@ -116,7 +113,7 @@ public function getAllFieldElementsByModuleAndTableId($modId, $tabId, $start = 0
* @param $order
* @return mixed
*/
- private function getFieldElementsCriteria($crFieldElemsCriteria, $start, $limit, $sort, $order)
+ private function getFieldelementsCriteria($crFieldElemsCriteria, $start, $limit, $sort, $order)
{
$crFieldElemsCriteria->setStart($start);
$crFieldElemsCriteria->setLimit($limit);
@@ -127,27 +124,28 @@ private function getFieldElementsCriteria($crFieldElemsCriteria, $start, $limit,
}
/**
- * Get FieldElements Criteria.
+ * Get Fieldelements Criteria.
* @param $crFieldElemsCriteria
- * @param $start
- * @param $limit
- * @param $sort
- * @param $order
- * @return mixed
+ * @param int $start
+ * @param int $limit
+ * @param string $sort
+ * @param string $order
+ * @return array
*/
- public function getFieldElementsList($crFieldElemsCriteria, $start = 0, $limit = 0, $sort = 'fieldelement_sort', $order = 'ASC')
+ public function getFieldelementsList($crFieldElemsCriteria, int $start = 0, int $limit = 0, string $sort = 'fieldelement_sort', string $order = 'ASC')
{
- $crFieldElems = $this->getFieldElementsCriteria($crFieldElemsCriteria, $start, $limit, $sort, $order);
+ $crFieldElems = $this->getFieldelementsCriteria($crFieldElemsCriteria, $start, $limit, $sort, $order);
$fieldeleArr = $this->getAll($crFieldElems);
$fieldele = [];
- foreach (array_keys($fieldeleArr) as $i) {
- $stuFeName = mb_strtoupper($fieldeleArr[$i]->getVar('fieldelement_name'));
+ foreach (\array_keys($fieldeleArr) as $i) {
+ $stuFeName = \mb_strtoupper($fieldeleArr[$i]->getVar('fieldelement_name'));
if (1 == $i) {
$fieldele[$i] = '...';
} else {
- $fieldele[$i] = constant ('_AM_TDMCREATE_FIELD_ELE_' . $stuFeName);
+ $fieldele[$i] = constant('\_AM_MODULEBUILDER_FIELD_ELE_' . $stuFeName);
}
}
+
return $fieldele;
}
}
diff --git a/class/Fieldkey.php b/class/Fieldkey.php
index a801043d..b9556d7f 100644
--- a/class/Fieldkey.php
+++ b/class/Fieldkey.php
@@ -1,8 +1,8 @@
-
- *
*/
/**
@@ -32,7 +31,6 @@ class Fieldkey extends \XoopsObject
{
/**
* @public function constructor class
- * @param null
*/
public function __construct()
{
@@ -43,7 +41,7 @@ public function __construct()
/**
* @static function getInstance
- * @param null
+ *
* @return Fieldkey
*/
public static function getInstance()
diff --git a/class/FieldkeyHandler.php b/class/FieldkeyHandler.php
index 2c798ec9..72e7c22f 100644
--- a/class/FieldkeyHandler.php
+++ b/class/FieldkeyHandler.php
@@ -1,8 +1,8 @@
-
- *
*/
/**
@@ -35,6 +34,6 @@ class FieldkeyHandler extends \XoopsPersistableObjectHandler
*/
public function __construct(\XoopsDatabase $db)
{
- parent::__construct($db, 'tdmcreate_fieldkey', Fieldkey::class, 'fieldkey_id', 'fieldkey_name');
+ parent::__construct($db, 'modulebuilder_fieldkey', Fieldkey::class, 'fieldkey_id', 'fieldkey_name');
}
}
diff --git a/class/Fieldnull.php b/class/Fieldnull.php
index ea555166..6bb16940 100644
--- a/class/Fieldnull.php
+++ b/class/Fieldnull.php
@@ -1,8 +1,8 @@
-
- *
*/
/**
@@ -32,7 +31,6 @@ class Fieldnull extends \XoopsObject
{
/**
* @public function constructor class
- * @param null
*/
public function __construct()
{
@@ -43,7 +41,7 @@ public function __construct()
/**
* @static function getInstance
- * @param null
+ *
* @return Fieldnull
*/
public static function getInstance()
diff --git a/class/FieldnullHandler.php b/class/FieldnullHandler.php
index 4e6dc798..727d2492 100644
--- a/class/FieldnullHandler.php
+++ b/class/FieldnullHandler.php
@@ -1,8 +1,8 @@
-
- *
*/
/**
@@ -35,6 +34,6 @@ class FieldnullHandler extends \XoopsPersistableObjectHandler
*/
public function __construct(\XoopsDatabase $db)
{
- parent::__construct($db, 'tdmcreate_fieldnull', Fieldnull::class, 'fieldnull_id', 'fieldnull_name');
+ parent::__construct($db, 'modulebuilder_fieldnull', Fieldnull::class, 'fieldnull_id', 'fieldnull_name');
}
}
diff --git a/class/Fields.php b/class/Fields.php
index ee54ada2..c857279c 100644
--- a/class/Fields.php
+++ b/class/Fields.php
@@ -1,8 +1,8 @@
- - -
*/
-//include __DIR__.'/autoload.php';
/**
* Class Fields.
@@ -34,8 +32,6 @@ class Fields extends \XoopsObject
{
/**
* @public function constructor class
- *
- * @param null
*/
public function __construct()
{
@@ -56,6 +52,9 @@ public function __construct()
$this->initVar('field_inlist', XOBJ_DTYPE_INT);
$this->initVar('field_inform', XOBJ_DTYPE_INT);
$this->initVar('field_user', XOBJ_DTYPE_INT);
+ $this->initVar('field_ihead', XOBJ_DTYPE_INT);
+ $this->initVar('field_ibody', XOBJ_DTYPE_INT);
+ $this->initVar('field_ifoot', XOBJ_DTYPE_INT);
$this->initVar('field_thead', XOBJ_DTYPE_INT);
$this->initVar('field_tbody', XOBJ_DTYPE_INT);
$this->initVar('field_tfoot', XOBJ_DTYPE_INT);
@@ -67,13 +66,13 @@ public function __construct()
/**
* @param string $method
- * @param array $args
+ * @param array $args
*
* @return mixed
*/
- public function __call($method, $args)
+ public function __call(string $method, array $args)
{
- $arg = isset($args[0]) ? $args[0] : null;
+ $arg = $args[0] ?? null;
return $this->getVar($method, $arg);
}
@@ -97,39 +96,39 @@ public static function getInstance()
* @private function getHeaderForm
*
* @param bool $action
- * @param $prefix
- * @return Tdmcreate\Form\ThemeForm
+ * @param $prefix
+ * @return Modulebuilder\Form\ThemeForm
*/
- private function getHeaderForm($prefix, $action = false)
+ private function getHeaderForm($prefix, bool $action = false)
{
if (false === $action) {
$action = \Xmf\Request::getString('REQUEST_URI', '', 'SERVER');
}
$isNew = $this->isNew();
- $title = $isNew ? sprintf(_AM_TDMCREATE_FIELDS_NEW) : sprintf(_AM_TDMCREATE_FIELDS_EDIT);
+ $title = $isNew ? \_AM_MODULEBUILDER_FIELDS_NEW : \_AM_MODULEBUILDER_FIELDS_EDIT;
- $form = new Tdmcreate\Form\ThemeForm(null, 'form', $action, 'post', true);
+ $form = new Modulebuilder\Form\ThemeForm(null, 'form', $action, 'post', true);
$form->setExtra('enctype="multipart/form-data"');
// New Object HtmlTable
- $form->addElement(new Tdmcreate\Html\FormLabel(str_replace('%s', $prefix, _AM_TDMCREATE_FIELD_RECOMMENDED)));
- $form->addElement(new Tdmcreate\Html\FormLabel(''));
- $form->addElement(new Tdmcreate\Html\FormLabel(''));
- $form->addElement(new Tdmcreate\Html\FormLabel(''));
+ $form->addElement(new Modulebuilder\Html\FormLabel(''));
+ $form->addElement(new Modulebuilder\Html\FormLabel('
'));
+ $formButton = new \XoopsFormButton('', 'submit', \_SUBMIT, 'submit');
+ $form->addElement(new Modulebuilder\Html\FormLabel('' . $formHidden->render() . ' '));
+ $form->addElement(new Modulebuilder\Html\FormLabel('' . $formButton->render() . ' '));
+ $form->addElement(new Modulebuilder\Html\FormLabel('
'));
return $form;
}
@@ -511,7 +541,7 @@ public function getValuesFields($keys = null, $format = null, $maxDepth = null)
$ret['mid'] = $this->getVar('field_mid');
$ret['tid'] = $this->getVar('field_tid');
$ret['order'] = $this->getVar('field_order');
- $ret['name'] = str_replace('_', ' ', ucfirst($this->getVar('field_name')));
+ $ret['name'] = \str_replace('_', ' ', \ucfirst($this->getVar('field_name')));
$ret['parent'] = $this->getVar('field_parent');
$ret['inlist'] = $this->getVar('field_inlist');
$ret['inform'] = $this->getVar('field_inform');
diff --git a/class/FieldsHandler.php b/class/FieldsHandler.php
index 38428df5..96074e00 100644
--- a/class/FieldsHandler.php
+++ b/class/FieldsHandler.php
@@ -1,6 +1,6 @@
- - -
*/
-//include __DIR__.'/autoload.php';
/**
* Class FieldsHandler.
@@ -37,7 +35,7 @@ class FieldsHandler extends \XoopsPersistableObjectHandler
*/
public function __construct(\XoopsDatabase $db)
{
- parent::__construct($db, 'tdmcreate_fields', Fields::class, 'field_id', 'field_name');
+ parent::__construct($db, 'modulebuilder_fields', Fields::class, 'field_id', 'field_name');
}
/**
@@ -53,22 +51,20 @@ public function create($isNew = true)
/**
* retrieve a field.
*
- * @param int $i field id
+ * @param int $id field id
* @param null $fields
*
- * @return mixed reference to the Fields object
+ * @return \XoopsObject|null reference to the Fields object
* object
*/
- public function get($i = null, $fields = null)
+ public function get($id = null, $fields = null)
{
- return parent::get($i, $fields);
+ return parent::get($id, $fields);
}
/**
* get inserted id.
*
- * @param null
- *
* @return int reference to the {@link Fields} object
*/
public function getInsertId()
@@ -78,13 +74,13 @@ public function getInsertId()
/**
* Get Count Fields.
- * @param int $start
- * @param int $limit
+ * @param int $start
+ * @param int $limit
* @param string $sort
* @param string $order
* @return int
*/
- public function getCountFields($start = 0, $limit = 0, $sort = 'field_id ASC, field_name', $order = 'ASC')
+ public function getCountFields(int $start = 0, int $limit = 0, string $sort = 'field_id ASC, field_name', string $order = 'ASC')
{
$crCountFields = new \CriteriaCompo();
$crCountFields = $this->getFieldsCriteria($crCountFields, $start, $limit, $sort, $order);
@@ -94,13 +90,13 @@ public function getCountFields($start = 0, $limit = 0, $sort = 'field_id ASC, fi
/**
* Get All Fields.
- * @param int $start
- * @param int $limit
+ * @param int $start
+ * @param int $limit
* @param string $sort
* @param string $order
* @return array
*/
- public function getAllFields($start = 0, $limit = 0, $sort = 'field_id ASC, field_name', $order = 'ASC')
+ public function getAllFields(int $start = 0, int $limit = 0, string $sort = 'field_id ASC, field_name', string $order = 'ASC')
{
$crAllFields = new \CriteriaCompo();
$crAllFields = $this->getFieldsCriteria($crAllFields, $start, $limit, $sort, $order);
@@ -110,18 +106,16 @@ public function getAllFields($start = 0, $limit = 0, $sort = 'field_id ASC, fiel
/**
* Get All Fields By Module & Table Id.
- * @param $modId
* @param $tabId
- * @param int $start
- * @param int $limit
+ * @param int $start
+ * @param int $limit
* @param string $sort
* @param string $order
* @return array
*/
- public function getAllFieldsByModuleAndTableId($modId, $tabId, $start = 0, $limit = 0, $sort = 'field_order ASC, field_id, field_name', $order = 'ASC')
+ public function getAllFieldsByTableId($tabId, int $start = 0, int $limit = 0, string $sort = 'field_order ASC, field_id, field_name', string $order = 'ASC')
{
$crAllFieldsByModule = new \CriteriaCompo();
- $crAllFieldsByModule->add(new \Criteria('field_mid', $modId));
$crAllFieldsByModule->add(new \Criteria('field_tid', $tabId));
$crAllFieldsByModule = $this->getFieldsCriteria($crAllFieldsByModule, $start, $limit, $sort, $order);
diff --git a/class/Fieldtype.php b/class/Fieldtype.php
index 6a625091..1b3d32dc 100644
--- a/class/Fieldtype.php
+++ b/class/Fieldtype.php
@@ -1,8 +1,8 @@
-
- *
*/
/**
@@ -32,7 +31,6 @@ class Fieldtype extends \XoopsObject
{
/**
* @public function constructor class
- * @param null
*/
public function __construct()
{
@@ -43,7 +41,7 @@ public function __construct()
/**
* @static function getInstance
- * @param null
+ *
* @return Fieldtype
*/
public static function getInstance()
diff --git a/class/FieldtypeHandler.php b/class/FieldtypeHandler.php
index 2eae7919..feab00c1 100644
--- a/class/FieldtypeHandler.php
+++ b/class/FieldtypeHandler.php
@@ -1,8 +1,8 @@
-
- *
*/
/**
@@ -35,6 +34,6 @@ class FieldtypeHandler extends \XoopsPersistableObjectHandler
*/
public function __construct(\XoopsDatabase $db)
{
- parent::__construct($db, 'tdmcreate_fieldtype', Fieldtype::class, 'fieldtype_id', 'fieldtype_name');
+ parent::__construct($db, 'modulebuilder_fieldtype', Fieldtype::class, 'fieldtype_id', 'fieldtype_name');
}
}
diff --git a/class/Files/Admin/AdminBroken.php b/class/Files/Admin/AdminBroken.php
new file mode 100644
index 00000000..0f615b6b
--- /dev/null
+++ b/class/Files/Admin/AdminBroken.php
@@ -0,0 +1,204 @@
+xc = Modulebuilder\Files\CreateXoopsCode::getInstance();
+ $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance();
+ $this->axc = Modulebuilder\Files\Admin\AdminXoopsCode::getInstance();
+ }
+
+ /**
+ * @static function getInstance
+
+ *
+ * @return AdminBroken
+ */
+ public static function getInstance()
+ {
+ static $instance = false;
+ if (!$instance) {
+ $instance = new self();
+ }
+
+ return $instance;
+ }
+
+ /**
+ * @public function write
+ * @param $module
+ * @param $tables
+ * @param $filename
+ */
+ public function write($module, $tables, $filename)
+ {
+ $this->setModule($module);
+ $this->setTables($tables);
+ $this->setFileName($filename);
+ }
+
+ /**
+ * @private function getAdminBrokenHeader
+ * @param $moduleDirname
+ * @return string
+ */
+ private function getAdminBrokenHeader($moduleDirname)
+ {
+ $tableName = 'broken';
+ $ret = $this->pc->getPhpCodeUseNamespace(['Xmf', 'Request'], '', '');
+ $ret .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', '');
+ $ret .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']);
+ $ret .= $this->getRequire();
+ $ret .= $this->pc->getPhpCodeBlankLine();
+ $ret .= $this->pc->getPhpCodeCommentLine('Define Stylesheet', '');
+ $ret .= $this->xc->getXcXoThemeAddStylesheet();
+ $ret .= $this->axc->getAdminTemplateMain($moduleDirname, $tableName);
+ $navigation = $this->axc->getAdminDisplayNavigation($tableName);
+ $ret .= $this->xc->getXcXoopsTplAssign('navigation', $navigation);
+
+ return $ret;
+ }
+
+ /**
+ * @private function getAdminBrokenList
+ * @param $tables
+ * @param string $language
+ * @return string
+ */
+ private function getAdminBrokenList($tables, string $language)
+ {
+ $ret = '';
+ foreach (\array_keys($tables) as $i) {
+ if (1 === (int)$tables[$i]->getVar('table_broken')) {
+ $tableName = $tables[$i]->getVar('table_name');
+ $tableSoleName = $tables[$i]->getVar('table_solename');
+ $ucfTableName = \ucfirst($tableName);
+ $ret .= $this->pc->getPhpCodeBlankLine();
+ $ret .= $this->pc->getPhpCodeCommentLine('Check table', $tableName, '');
+ $ret .= $this->xc->getXcXoopsRequest('start', 'start' . $ucfTableName, '', 'Int', '');
+ $adminpager = $this->xc->getXcGetConfig('adminpager');
+ $ret .= $this->xc->getXcXoopsRequest('limit', 'limit' . $ucfTableName, $adminpager, 'Int', '');
+ $critName = 'cr' . $ucfTableName;
+
+ $fields = $this->getTableFields($tables[$i]->getVar('table_mid'), $tables[$i]->getVar('table_id'));
+ $fieldId = '';
+ $fieldMain = '';
+ $fieldSatus = '';
+ foreach (\array_keys($fields) as $f) {
+ $fieldName = $fields[$f]->getVar('field_name');
+ if (0 == $f) {
+ $fieldId = $fieldName;
+ }
+ if (1 == $fields[$f]->getVar('field_main')) {
+ $fieldMain = $fieldName;
+ }
+ if (16 == $fields[$f]->getVar('field_element')) {
+ $fieldSatus = $fieldName;
+ }
+ }
+
+ $ret .= $this->xc->getXcCriteriaCompo($critName, '');
+ $constant = $this->xc->getXcGetConstants('STATUS_BROKEN');
+ $crit = $this->xc->getXcCriteria('', "'$fieldSatus'", $constant, '', true);
+ $ret .= $this->xc->getXcCriteriaAdd($critName, $crit, '');
+ $ret .= $this->xc->getXcHandlerCountClear($tableName . 'Count', $tableName, '$' . $critName, '');
+ $ret .= $this->xc->getXcXoopsTplAssign($tableName . '_count', "\${$tableName}Count", true, '');
+ $sprintf = $this->pc->getPhpCodeSprintf($language . 'BROKEN_RESULT', "'{$ucfTableName}'");
+ $ret .= $this->xc->getXcXoopsTplAssign($tableName . '_result', $sprintf, true, '');
+
+ $ret .= $this->xc->getXcCriteriaSetStart($critName, '$start', '');
+ $ret .= $this->xc->getXcCriteriaSetLimit($critName, '$limit', '');
+ $contIf = $this->xc->getXcHandlerAllClear("{$tableName}All", $tableName, "\${$critName}", '' . "\t");
+ $foreach = $this->xc->getXcEqualsOperator("\${$tableSoleName}['table']", "'{$ucfTableName}'", '', '' . "\t\t");
+ $foreach .= $this->xc->getXcEqualsOperator("\${$tableSoleName}['key']", "'{$fieldId}'", '', '' . "\t\t");
+ $foreach .= $this->xc->getXcGetVar("{$tableSoleName}['keyval']", "{$tableName}All[\$i]", "{$fieldId}", false, '' . "\t\t");
+ $foreach .= $this->xc->getXcGetVar("{$tableSoleName}['main']", "{$tableName}All[\$i]", "{$fieldMain}", false, '' . "\t\t");
+ $foreach .= $this->xc->getXcXoopsTplAppend("{$tableName}_list", "\${$tableSoleName}", '' . "\t\t");
+ $contIf .= $this->pc->getPhpCodeForeach("{$tableName}All", true, false, 'i', $foreach, '' . "\t");
+ $contIf .= $this->xc->getXcPageNav($tableName, '' . "\t", 'start' . $ucfTableName, "'op=list&limit{$ucfTableName}=' . \$limit", 'pagenav_' . $tableName);
+ $sprintf = $this->pc->getPhpCodeSprintf($language . 'BROKEN_NODATA', "'{$ucfTableName}'");
+ $contElse = $this->xc->getXcXoopsTplAssign('nodata' . $ucfTableName, $sprintf, true, '' . "\t");
+
+ $ret .= $this->pc->getPhpCodeConditions("\${$tableName}Count", ' > ', '0', $contIf, $contElse, '');
+ $ret .= $this->pc->getPhpCodeUnset($critName, '');
+ }
+ }
+
+ $ret .= $this->pc->getPhpCodeBlankLine();
+
+ return $ret;
+ }
+
+ /**
+ * @public function render
+
+ *
+ * @return string
+ */
+ public function render()
+ {
+ $tf = Modulebuilder\Files\CreateFile::getInstance();
+
+ $module = $this->getModule();
+ $tables = $this->getTables();
+ $filename = $this->getFileName();
+ $moduleDirname = $module->getVar('mod_dirname');
+ $language = $this->getLanguage($moduleDirname, 'AM');
+
+ $content = $this->getHeaderFilesComments($module);
+ $content .= $this->getAdminBrokenHeader($moduleDirname);
+ $content .= $this->getAdminBrokenList($tables, $language);
+ $content .= $this->getRequire('footer');
+
+ $tf->create($moduleDirname, 'admin', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
+
+ return $tf->renderFile();
+ }
+}
diff --git a/class/Files/Admin/AdminHeader.php b/class/Files/Admin/AdminHeader.php
index 0619de5f..4d2a438a 100644
--- a/class/Files/Admin/AdminHeader.php
+++ b/class/Files/Admin/AdminHeader.php
@@ -1,9 +1,9 @@
-xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $this->pc = Tdmcreate\Files\CreatePhpCode::getInstance();
+ $this->xc = Modulebuilder\Files\CreateXoopsCode::getInstance();
+ $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance();
}
/**
* @static function getInstance
- * @param null
+
* @return AdminHeader
*/
public static function getInstance()
@@ -68,12 +67,12 @@ public static function getInstance()
/**
* @public function write
- * @param string $module
+ * @param $module
* @param mixed $table
- * @param array $tables
+ * @param array $tables
* @param string $filename
*/
- public function write($module, $table, $tables, $filename)
+ public function write($module, $table, array $tables, string $filename): void
{
$this->setModule($module);
$this->setTable($table);
@@ -89,12 +88,12 @@ public function write($module, $table, $tables, $filename)
*/
private function getAdminHeader($moduleDirname)
{
- $ucfModuleDirname = ucfirst($moduleDirname);
- $stuModuleDirname = mb_strtoupper($moduleDirname);
+ $ucfModuleDirname = \ucfirst($moduleDirname);
+ $stuModuleDirname = \mb_strtoupper($moduleDirname);
$table = $this->getTable();
$tables = $this->getTables();
- $ret = $this->pc->getPhpCodeIncludeDir('dirname(dirname(dirname(__DIR__)))', 'include/cp_header');
- $ret .= $this->pc->getPhpCodeIncludeDir('dirname(__DIR__)', 'include/common', true);
+ $ret = $this->pc->getPhpCodeIncludeDir('\dirname(__DIR__, 3)', 'include/cp_header');
+ $ret .= $this->pc->getPhpCodeIncludeDir('\dirname(__DIR__)', 'include/common', true);
$ret .= $this->pc->getPhpCodeBlankLine();
$sysicons16 = $this->xc->getXcXoopsModuleGetInfo('', 'sysicons16', true);
$sysicons32 = $this->xc->getXcXoopsModuleGetInfo('', 'sysicons32', true);
@@ -104,34 +103,35 @@ private function getAdminHeader($moduleDirname)
$ret .= $this->xc->getXcEqualsOperator('$sysPathIcon16 ', "'../' . {$sysicons16}");
$ret .= $this->xc->getXcEqualsOperator('$sysPathIcon32 ', "'../' . {$sysicons32}");
$ret .= $this->xc->getXcEqualsOperator('$pathModuleAdmin', $dirmoduleadmin);
- $ret .= $this->xc->getXcEqualsOperator('$modPathIcon16 ', "{$stuModuleDirname}_URL . '/' . {$modicons16} . '/'");
- $ret .= $this->xc->getXcEqualsOperator('$modPathIcon32 ', "{$stuModuleDirname}_URL . '/' . {$modicons32} . '/'");
- if (is_object($table) && '' != $table->getVar('table_name')) {
+ $ret .= $this->xc->getXcEqualsOperator('$modPathIcon16 ', "\\{$stuModuleDirname}_URL . '/' . {$modicons16} . '/'");
+ $ret .= $this->xc->getXcEqualsOperator('$modPathIcon32 ', "\\{$stuModuleDirname}_URL . '/' . {$modicons32} . '/'");
+ if (\is_object($table) && '' != $table->getVar('table_name')) {
$ret .= $this->pc->getPhpCodeBlankLine();
$ret .= $this->pc->getPhpCodeCommentLine('Get instance of module');
- $ret .= $this->xc->getXcEqualsOperator("\$helper", "\XoopsModules\\{$ucfModuleDirname}\Helper::getInstance()");
+ $ret .= $this->xc->getXcEqualsOperator('$helper', "\XoopsModules\\{$ucfModuleDirname}\Helper::getInstance()");
}
- if (is_array($tables)) {
- foreach (array_keys($tables) as $i) {
+ if (\is_array($tables)) {
+ foreach (\array_keys($tables) as $i) {
$tableName = $tables[$i]->getVar('table_name');
$ret .= $this->xc->getXcHandlerLine($tableName);
}
}
$ret .= $this->xc->getXcEqualsOperator('$myts', 'MyTextSanitizer::getInstance()');
$ret .= $this->pc->getPhpCodeCommentLine();
- $template = $this->pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/template', true, false, 'include', "\t");
- $template .= $this->xc->getXcEqualsOperator('$xoopsTpl', 'new \XoopsTpl()', null,"\t");
- $ret .= $this->pc->getPhpCodeConditions('!isset($xoopsTpl)', ' || ', '!is_object($xoopsTpl)', $template, false);
+ $template = $this->pc->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH', 'class/template', true, false, 'require', "\t");
+ $template .= $this->xc->getXcEqualsOperator('$xoopsTpl', 'new \XoopsTpl()', null, "\t");
+ $ret .= $this->pc->getPhpCodeConditions('!isset($xoopsTpl)', ' || ', '!\is_object($xoopsTpl)', $template);
$ret .= $this->pc->getPhpCodeBlankLine();
$ret .= $this->pc->getPhpCodeCommentLine('Load languages');
- $ret .= $this->xc->getXcXoopsLoadLanguage('admin');
- $ret .= $this->xc->getXcXoopsLoadLanguage('modinfo');
+ $ret .= $this->xc->getXcXoopsLoadLanguage('admin', '', $moduleDirname);
+ $ret .= $this->xc->getXcXoopsLoadLanguage('modinfo', '', $moduleDirname);
+ $ret .= $this->pc->getPhpCodeCommentLine($this->xc->getXcXoopsLoadLanguage('main', '', $moduleDirname));
$ret .= $this->pc->getPhpCodeBlankLine();
$ret .= $this->pc->getPhpCodeCommentLine('Local admin menu class');
$xoopsPathCond = $this->xc->getXcXoopsPath('$pathModuleAdmin', 'moduleadmin', true);
$fileExists = $this->pc->getPhpCodeFileExists($xoopsPathCond);
- $moduleadmin = $this->pc->getPhpCodeIncludeDir($xoopsPathCond, '', true, true, 'include', "\t");
- $redirectHeader = $this->xc->getXcRedirectHeader("'../../../admin.php'", '', '5', '_AM_MODULEADMIN_MISSING', false, "\t");
+ $moduleadmin = $this->pc->getPhpCodeIncludeDir($xoopsPathCond, '', true, true, 'require', "\t");
+ $redirectHeader = $this->xc->getXcRedirectHeader("'../../../admin.php'", '', '5', '\_AM_MODULEADMIN_MISSING', false, "\t");
$ret .= $this->pc->getPhpCodeConditions($fileExists, '', '', $moduleadmin, $redirectHeader);
$ret .= $this->pc->getPhpCodeBlankLine();
$ret .= $this->xc->getXcXoopsCPHeader();
@@ -143,15 +143,16 @@ private function getAdminHeader($moduleDirname)
$ret .= $this->xc->getXcXoopsTplAssign('modPathIcon32', '$modPathIcon32');
$ret .= $this->pc->getPhpCodeBlankLine();
$ret .= $this->xc->getXcEqualsOperator('$adminObject', '\Xmf\Module\Admin::getInstance()');
- $ret .= $this->getSimpleString("\$style = {$stuModuleDirname}_URL . '/assets/css/admin/style.css';");
+ $ret .= $this->getSimpleString("\$style = \\{$stuModuleDirname}_URL . '/assets/css/admin/style.css';");
+ $ret .= $this->xc->getXcXoThemeAddStylesheet();
return $ret;
}
/**
* @public function render
- * @param null
- * @return bool|string
+
+ * @return string
*/
public function render()
{
@@ -159,9 +160,10 @@ public function render()
$filename = $this->getFileName();
$moduleDirname = $module->getVar('mod_dirname');
$content = $this->getHeaderFilesComments($module);
+ $content .= $this->getSimpleString('');
$content .= $this->getAdminHeader($moduleDirname);
- $this->create($moduleDirname, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->create($moduleDirname, 'admin', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $this->renderFile();
}
diff --git a/class/Files/Admin/AdminIndex.php b/class/Files/Admin/AdminIndex.php
index f94fe617..f2d8eeab 100644
--- a/class/Files/Admin/AdminIndex.php
+++ b/class/Files/Admin/AdminIndex.php
@@ -1,9 +1,9 @@
-xc = Modulebuilder\Files\CreateXoopsCode::getInstance();
+ $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance();
+ $this->axc = Modulebuilder\Files\Admin\AdminXoopsCode::getInstance();
}
/**
* @static function getInstance
- * @param null
+
* @return AdminIndex
*/
public static function getInstance()
@@ -57,11 +72,11 @@ public static function getInstance()
/**
* @public function write
- * @param string $module
+ * @param $module
* @param mixed $tables
* @param string $filename
*/
- public function write($module, $tables, $filename)
+ public function write($module, $tables, string $filename)
{
$this->setModule($module);
$this->setTables($tables);
@@ -76,83 +91,84 @@ public function write($module, $tables, $filename)
*/
private function getAdminIndex($module)
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $axc = Tdmcreate\Files\Admin\AdminXoopsCode::getInstance();
$moduleDirname = $module->getVar('mod_dirname');
$tables = $this->getTableTables($module->getVar('mod_id'), 'table_order');
$language = $this->getLanguage($moduleDirname, 'AM');
$languageThereAre = $this->getLanguage($moduleDirname, 'AM', 'THEREARE_');
- $ret = $this->getSimpleString('');
- $ret .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Common']);
- $ret .= $pc->getPhpCodeIncludeDir('dirname(__DIR__)', 'preloads/autoloader', true);
- $ret .= $this->getInclude();
- $ret .= $pc->getPhpCodeBlankLine();
- $ret .= $pc->getPhpCodeCommentLine('Template Index');
- $ret .= $axc->getAdminTemplateMain((string)$moduleDirname, 'index');
- $ret .= $pc->getPhpCodeBlankLine();
- $ret .= $pc->getPhpCodeCommentLine('Count elements');
+ $ret = $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Common']);
+ $ret .= $this->pc->getPhpCodeIncludeDir('\dirname(__DIR__)', 'preloads/autoloader', true);
+ $ret .= $this->getRequire();
+ $ret .= $this->pc->getPhpCodeBlankLine();
+ $ret .= $this->pc->getPhpCodeCommentLine('Template Index');
+ $ret .= $this->axc->getAdminTemplateMain((string)$moduleDirname, 'index');
+ $ret .= $this->pc->getPhpCodeBlankLine();
+ $ret .= $this->pc->getPhpCodeCommentLine('Count elements');
$tableName = null;
- foreach (array_keys($tables) as $i) {
+ foreach (\array_keys($tables) as $i) {
$tableName = $tables[$i]->getVar('table_name');
- $ucfTableName = ucfirst($tableName);
- $ret .= $xc->getXcEqualsOperator("\$count{$ucfTableName}", "\${$tableName}Handler->getCount()");
+ $ucfTableName = \ucfirst($tableName);
+ $ret .= $this->xc->getXcEqualsOperator("\$count{$ucfTableName}", "\${$tableName}Handler->getCount()");
}
- $ret .= $pc->getPhpCodeBlankLine();
- $ret .= $pc->getPhpCodeCommentLine('InfoBox Statistics');
- $ret .= $axc->getAxcAddInfoBox($language . 'STATISTICS');
- $ret .= $pc->getPhpCodeCommentLine('Info elements');
+ $ret .= $this->pc->getPhpCodeBlankLine();
+ $ret .= $this->pc->getPhpCodeCommentLine('InfoBox Statistics');
+ $ret .= $this->axc->getAxcAddInfoBox($language . 'STATISTICS');
+ $ret .= $this->pc->getPhpCodeCommentLine('Info elements');
$tableInstall = [];
- foreach (array_keys($tables) as $i) {
+ foreach (\array_keys($tables) as $i) {
$tableName = $tables[$i]->getVar('table_name');
$tableInstall[] = $tables[$i]->getVar('table_install');
- $stuTableName = $languageThereAre . mb_strtoupper($tableName);
- $ucfTableName = ucfirst($tableName);
- $ret .= $axc->getAxcAddInfoBoxLine($stuTableName, "\$count{$ucfTableName}");
+ $stuTableName = $languageThereAre . \mb_strtoupper($tableName);
+ $ucfTableName = \ucfirst($tableName);
+ $ret .= $this->axc->getAxcAddInfoBoxLine($stuTableName, "\$count{$ucfTableName}");
}
if (null === $tableName) {
- $ret .= $axc->getAxcAddInfoBoxLine('No statistics', '0');
+ $ret .= $this->axc->getAxcAddInfoBoxLine('No statistics', '0');
}
- if (is_array($tables) && in_array(1, $tableInstall)) {
- $ret .= $pc->getPhpCodeBlankLine();
- $ret .= $pc->getPhpCodeCommentLine('Upload Folders');
- $ret .= $xc->getXcEqualsOperator('$configurator', 'new Common\Configurator()');
- $cond = '$configurator->uploadFolders && is_array($configurator->uploadFolders)';
- $fe_action = $xc->getXcEqualsOperator('$folder[]', '$configurator->uploadFolders[$i]', '',"\t\t");
- $condIf = $pc->getPhpCodeForeach('configurator->uploadFolders', true, false, 'i', $fe_action, "\t");
- $ret .= $pc->getPhpCodeConditions($cond, '', '', $condIf, false);
-
- $ret .= $pc->getPhpCodeCommentLine('Uploads Folders Created');
- $boxLine = $axc->getAxcAddConfigBoxLine('$folder[$i]', 'folder', '', "\t");
- $boxLine .= $axc->getAxcAddConfigBoxLine("array(\$folder[\$i], '777')", 'chmod', '', "\t");
- $ret .= $pc->getPhpCodeForeach('folder', true, false, 'i', $boxLine, '') . PHP_EOL;
+ if (\is_array($tables) && \in_array(1, $tableInstall)) {
+ $ret .= $this->pc->getPhpCodeBlankLine();
+ $ret .= $this->pc->getPhpCodeCommentLine('Upload Folders');
+ $ret .= $this->pc->getPhpCodeArray('folder',null,false,'');
+ $ret .= $this->xc->getXcEqualsOperator('$configurator', 'new Common\Configurator()');
+ $cond = '$configurator->uploadFolders && \is_array($configurator->uploadFolders)';
+ $fe_action = $this->xc->getXcEqualsOperator('$folder[]', '$configurator->uploadFolders[$i]', '',"\t\t");
+ $condIf = $this->pc->getPhpCodeForeach('configurator->uploadFolders', true, false, 'i', $fe_action, "\t");
+ $ret .= $this->pc->getPhpCodeConditions($cond, '', '', $condIf);
+
+ $ret .= $this->pc->getPhpCodeCommentLine('Uploads Folders Created');
+ $boxLine = $this->axc->getAxcAddConfigBoxLine('$folder[$i]', 'folder', '', "\t\t");
+ $boxLine .= $this->axc->getAxcAddConfigBoxLine("[\$folder[\$i], '777']", 'chmod', '', "\t\t");
+ $cond = '$folder';
+ $condIf = $this->pc->getPhpCodeForeach('folder', true, false, 'i', $boxLine, "\t");
+ $ret .= $this->pc->getPhpCodeConditions($cond, '', '', $condIf);
+ $ret .= $this->pc->getPhpCodeBlankLine();
}
- $ret .= $pc->getPhpCodeCommentLine('Render Index');
- $ret .= $xc->getXcXoopsTplAssign('navigation', "\$adminObject->displayNavigation('index.php')");
- $ret .= $pc->getPhpCodeCommentLine('Test Data');
- $condIf = $xc->getXcXoopsLoadLanguage('admin/modulesadmin',"\t", 'system');
- $condIf .= $pc->getPhpCodeIncludeDir('dirname(__DIR__)', 'testdata/index', true, '','',"\t");
- $condIf .= $axc->getAdminItemButton("constant('CO_' . \$moduleDirNameUpper . '_ADD_SAMPLEDATA')", '', '', $op = '__DIR__ . /../../testdata/index.php?op=load', $type = 'samplebutton', $t = "\t");
- $condIf .= $axc->getAdminItemButton("constant('CO_' . \$moduleDirNameUpper . '_SAVE_SAMPLEDATA')", '', '', $op = '__DIR__ . /../../testdata/index.php?op=save', $type = 'samplebutton', $t = "\t");
- $condIf .= "//" . $axc->getAdminItemButton("constant('CO_' . \$moduleDirNameUpper . '_EXPORT_SCHEMA')", '', '', $op = '__DIR__ . /../../testdata/index.php?op=exportschema', $type = 'samplebutton', $t = "\t");
- $condIf .= $axc->getAdminDisplayButton('left', "\t");
- $cond = $xc->getXcGetConfig('displaySampleButton');
- $ret .= $pc->getPhpCodeConditions($cond, '', '', $condIf, false);
- $ret .= $xc->getXcXoopsTplAssign('index', '$adminObject->displayIndex()');
- $ret .= $pc->getPhpCodeCommentLine('End Test Data');
-
- $ret .= $this->getInclude('footer');
+
+ $ret .= $this->pc->getPhpCodeCommentLine('Render Index');
+ $ret .= $this->xc->getXcXoopsTplAssign('navigation', "\$adminObject->displayNavigation('index.php')");
+ $condIf = $this->xc->getXcXoopsLoadLanguage('admin/modulesadmin',"\t", 'system');
+ $condIf .= $this->pc->getPhpCodeIncludeDir('\dirname(__DIR__)', 'testdata/index', true, false,'',"\t");
+ $condIf .= $this->axc->getAdminItemButton("\constant('CO_' . \$moduleDirNameUpper . '_ADD_SAMPLEDATA')", '', '', '../testdata/index.php?op=load', 'samplebutton', "\t");
+ $condIf .= $this->axc->getAdminItemButton("\constant('CO_' . \$moduleDirNameUpper . '_SAVE_SAMPLEDATA')", '', '', '../testdata/index.php?op=save', 'samplebutton', "\t");
+ $condIf .= '//' . $this->axc->getAdminItemButton("\constant('CO_' . \$moduleDirNameUpper . '_EXPORT_SCHEMA')", '', '', '../testdata/index.php?op=exportschema', 'samplebutton', "\t");
+ $condIf .= $this->axc->getAdminDisplayButton('left', "\t");
+ $cond = $this->xc->getXcGetConfig('displaySampleButton');
+ $ret .= $this->pc->getPhpCodeConditions($cond, '', '', $condIf);
+ $ret .= $this->xc->getXcXoopsTplAssign('index', '$adminObject->displayIndex()');
+
+ $ret .= $this->pc->getPhpCodeBlankLine();
+
+ $ret .= $this->getRequire('footer');
return $ret;
}
/**
* @public function render
- * @param null
- * @return bool|string
+
+ * @return string
*/
public function render()
{
@@ -162,7 +178,7 @@ public function render()
$content = $this->getHeaderFilesComments($module);
$content .= $this->getAdminIndex($module);
- $this->create($moduleDirname, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->create($moduleDirname, 'admin', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $this->renderFile();
}
diff --git a/class/Files/Admin/AdminMenu.php b/class/Files/Admin/AdminMenu.php
index c2b27972..57ca4d9d 100644
--- a/class/Files/Admin/AdminMenu.php
+++ b/class/Files/Admin/AdminMenu.php
@@ -1,9 +1,9 @@
-xc = Modulebuilder\Files\CreateXoopsCode::getInstance();
}
/**
* @static function getInstance
- * @param null
+
* @return AdminMenu
*/
public static function getInstance()
@@ -57,10 +62,10 @@ public static function getInstance()
/**
* @public function write
- * @param string $module
+ * @param $module
* @param string $filename
*/
- public function write($module, $filename)
+ public function write($module, string $filename): void
{
$this->setModule($module);
$this->setFileName($filename);
@@ -72,19 +77,18 @@ public function write($module, $filename)
* @param bool $adminObject
* @return string
*/
- private function getAdminMenuArray($param = [], $adminObject = false)
+ private function getAdminMenuArray(array $param = [], bool $adminObject = false)
{
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
$ret = '';
if ($adminObject) {
- $ret .= $this->getSimpleString("\$adminmenu[] = [");
+ $ret .= $this->getSimpleString('$adminmenu[] = [');
foreach ($param as $key => $value) {
$ret .= $this->getSimpleString("\t'{$key}' => {$value},");
}
- $ret .= $this->getSimpleString("];");
+ $ret .= $this->getSimpleString('];');
} else {
foreach ($param as $key => $value) {
- $ret .= $xc->getXcEqualsOperator((string)$key, (string)$value);
+ $ret .= $this->xc->getXcEqualsOperator((string)$key, (string)$value);
}
}
@@ -93,17 +97,17 @@ private function getAdminMenuArray($param = [], $adminObject = false)
/**
* @private function getAdminMenuHeader
- * @param null
+
* @return string
*/
private function getAdminMenuHeader()
{
$ret = $this->getSimpleString('');
- $mod = [
- '$dirname ' => 'basename(dirname(__DIR__))',
- '$moduleHandler' => "xoops_getHandler('module')",
- '$xoopsModule ' => 'XoopsModule::getByDirname($dirname)',
- '$moduleInfo ' => "\$moduleHandler->get(\$xoopsModule->getVar('mid'))",
+ $mod = [
+ '$dirname ' => '\basename(\dirname(__DIR__))',
+ '$moduleHandler' => "\xoops_getHandler('module')",
+ '$xoopsModule ' => 'XoopsModule::getByDirname($dirname)',
+ '$moduleInfo ' => "\$moduleHandler->get(\$xoopsModule->getVar('mid'))",
'$sysPathIcon32' => "\$moduleInfo->getInfo('sysicons32')",
];
$ret .= $this->getAdminMenuArray($mod);
@@ -115,73 +119,54 @@ private function getAdminMenuHeader()
/**
* @private function getAdminMenuDashboard
* @param string $language
- * @param int $menu
+ * @param int $menu
*
* @return string
*/
- private function getAdminMenuDashboard($language, $menu)
+ private function getAdminMenuDashboard(string $language, int $menu)
{
$param = ['title' => "{$language}{$menu}", 'link' => "'admin/index.php'", 'icon' => "\$sysPathIcon32.'/dashboard.png'"];
- $ret = $this->getAdminMenuArray($param, true);
-
- return $ret;
- }
-
- /**
- * @private function getAdminMenuImagesPath
- * @param array $tables
- * @param int $t
- *
- * @return string
- */
- private function getAdminMenuImagesPath($tables, $t)
- {
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $ret = '';
- $fields = $this->getTableFields($tables[$t]->getVar('table_mid'), $tables[$t]->getVar('table_id'));
- foreach (array_keys($fields) as $f) {
- $fieldElement = $fields[$f]->getVar('field_element');
- switch ($fieldElement) {
- case 13:
- $ret = $xc->getXcEqualsOperator("\$adminmenu[\$i]['icon']", "'assets/icons/32/{$tables[$t]->getVar('table_image')}'");
- break;
- default:
- $ret = $xc->getXcEqualsOperator("\$adminmenu[\$i]['icon']", "\$sysPathIcon32.'/{$tables[$t]->getVar('table_image')}'");
- break;
- }
- }
-
- return $ret;
+ return $this->getAdminMenuArray($param, true);
}
/**
* @private function getAdminMenuList
- * @param string $module
+ * @param $module
* @param string $language
* @param string $langAbout
- * @param int $menu
+ * @param int $menu
*
* @return string
*/
- private function getAdminMenuList($module, $language, $langAbout, $menu)
+ private function getAdminMenuList($module, string $language, string $langAbout, int $menu)
{
- $ret = '';
- $tables = $this->getTableTables($module->getVar('mod_id'), 'table_order');
+ $ret = '';
+ $tables = $this->getTableTables($module->getVar('mod_id'), 'table_order');
$tablePermissions = [];
- foreach (array_keys($tables) as $t) {
+ $tableBroken = [];
+ foreach (\array_keys($tables) as $t) {
$tablePermissions[] = $tables[$t]->getVar('table_permissions');
+ $tableBroken[] = $tables[$t]->getVar('table_broken');
if (1 == $tables[$t]->getVar('table_admin')) {
++$menu;
$param1 = ['title' => "{$language}{$menu}", 'link' => "'admin/{$tables[$t]->getVar('table_name')}.php'", 'icon' => "'assets/icons/32/{$tables[$t]->getVar('table_image')}'"];
$ret .= $this->getAdminMenuArray($param1, true);
}
}
- if (in_array(1, $tablePermissions)) {
+ if (\in_array(1, $tableBroken)) {
+ ++$menu;
+ $param2 = ['title' => "{$language}{$menu}", 'link' => "'admin/broken.php'", 'icon' => "\$sysPathIcon32.'/brokenlink.png'"];
+ $ret .= $this->getAdminMenuArray($param2, true);
+ }
+ if (\in_array(1, $tablePermissions)) {
++$menu;
$param2 = ['title' => "{$language}{$menu}", 'link' => "'admin/permissions.php'", 'icon' => "\$sysPathIcon32.'/permissions.png'"];
$ret .= $this->getAdminMenuArray($param2, true);
}
++$menu;
+ $param3 = ['title' => "{$language}{$menu}", 'link' => "'admin/clone.php'", 'icon' => "\$sysPathIcon32.'/page_copy.png'"];
+ $ret .= $this->getAdminMenuArray($param3, true);
+ ++$menu;
$param3 = ['title' => "{$language}{$menu}", 'link' => "'admin/feedback.php'", 'icon' => "\$sysPathIcon32.'/mail_foward.png'"];
$ret .= $this->getAdminMenuArray($param3, true);
unset($menu);
@@ -193,8 +178,8 @@ private function getAdminMenuList($module, $language, $langAbout, $menu)
/**
* @public function render
- * @param null
- * @return bool|string
+
+ * @return string
*/
public function render()
{
@@ -209,7 +194,7 @@ public function render()
$content .= $this->getAdminMenuDashboard($language, $menu);
$content .= $this->getAdminMenuList($module, $language, $langAbout, $menu);
- $this->create($moduleDirname, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->create($moduleDirname, 'admin', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $this->renderFile();
}
diff --git a/class/Files/Admin/AdminPermissions.php b/class/Files/Admin/AdminPermissions.php
index 72c9b37f..ac41eb0f 100644
--- a/class/Files/Admin/AdminPermissions.php
+++ b/class/Files/Admin/AdminPermissions.php
@@ -1,9 +1,9 @@
-xc = Modulebuilder\Files\CreateXoopsCode::getInstance();
+ $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance();
+ $this->axc = Modulebuilder\Files\Admin\AdminXoopsCode::getInstance();
+ $this->cxc = Modulebuilder\Files\Classes\ClassXoopsCode::getInstance();
}
/**
* @static function getInstance
*
- * @param null
+
*
* @return AdminPermissions
*/
@@ -61,13 +80,13 @@ public static function getInstance()
/**
* @public function write
*
- * @param string $module
+ * @param $module
* @param mixed $tables
* @param string $filename
*
* @return null
*/
- public function write($module, $tables, $filename)
+ public function write($module, $tables, string $filename)
{
$this->setModule($module);
$this->setTables($tables);
@@ -85,41 +104,37 @@ public function write($module, $tables, $filename)
*/
private function getPermissionsHeader($module, $language)
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $cc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance();
- $axc = Tdmcreate\Files\Admin\AdminXoopsCode::getInstance();
$moduleDirname = $module->getVar('mod_dirname');
$tables = $this->getTableTables($module->getVar('mod_id'));
$tableNames = [];
- foreach (array_keys($tables) as $t) {
+ foreach (\array_keys($tables) as $t) {
if (1 == $tables[$t]->getVar('table_permissions')) {
$tableNames[] = $tables[$t]->getVar('table_name');
}
}
- $ret = $pc->getPhpCodeUseNamespace(['Xmf', 'Request'], '', '');
- $ret .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', '');
- $ret .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']);
- $ret .= $this->getInclude('header');
- $ret .= $pc->getPhpCodeBlankLine();
- $ret .= $pc->getPhpCodeCommentLine('Template Index');
- $ret .= $axc->getAdminTemplateMain($moduleDirname, 'permissions');
- $ret .= $xc->getXcXoopsTplAssign('navigation', "\$adminObject->displayNavigation('permissions.php')");
- $ret .= $pc->getPhpCodeBlankLine();
- $ret .= $xc->getXcXoopsRequest('op', 'op', 'global');
- $ret .= $pc->getPhpCodeBlankLine();
- $ret .= $pc->getPhpCodeCommentLine('Get Form');
- $ret .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/xoopsform/grouppermform', true);
- $ret .= $xc->getXcXoopsLoad('XoopsFormLoader');
+ $ret = $this->pc->getPhpCodeUseNamespace(['Xmf', 'Request'], '', '');
+ $ret .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', '');
+ $ret .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']);
+ $ret .= $this->getRequire();
+ $ret .= $this->pc->getPhpCodeBlankLine();
+ $ret .= $this->pc->getPhpCodeCommentLine('Template Index');
+ $ret .= $this->axc->getAdminTemplateMain($moduleDirname, 'permissions');
+ $ret .= $this->xc->getXcXoopsTplAssign('navigation', "\$adminObject->displayNavigation('permissions.php')");
+ $ret .= $this->pc->getPhpCodeBlankLine();
+ $ret .= $this->xc->getXcXoopsRequest('op', 'op', 'global', 'Cmd');
+ $ret .= $this->pc->getPhpCodeBlankLine();
+ $ret .= $this->pc->getPhpCodeCommentLine('Get Form');
+ $ret .= $this->pc->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH', 'class/xoopsform/grouppermform', true);
+ $ret .= $this->xc->getXcXoopsLoad('XoopsFormLoader');
$optionsSelect['global'] = "{$language}PERMISSIONS_GLOBAL";
foreach ($tableNames as $tableName) {
- $ucfTablename = ucfirst($tableName);
+ $ucfTablename = \ucfirst($tableName);
$optionsSelect["approve_{$tableName}"] = "{$language}PERMISSIONS_APPROVE . ' {$ucfTablename}'";
$optionsSelect["submit_{$tableName}"] = "{$language}PERMISSIONS_SUBMIT . ' {$ucfTablename}'";
$optionsSelect["view_{$tableName}"] = "{$language}PERMISSIONS_VIEW . ' {$ucfTablename}'";
}
- $formSelect = $xc->getXoopsFormSelectExtraOptions('formSelect', '\'\'', 'op', $optionsSelect, 'onchange="document.fselperm.submit()"');
- $ret .= $cc->getXoopsSimpleForm('permTableForm', 'formSelect', $formSelect, '\'\'', 'fselperm', 'permissions');
+ $formSelect = $this->xc->getXoopsFormSelectExtraOptions('formSelect', '\'\'', 'op', $optionsSelect, 'onchange="document.fselperm.submit()"');
+ $ret .= $this->cxc->getXoopsSimpleForm('permTableForm', 'formSelect', $formSelect, '\'\'', 'fselperm', 'permissions');
return $ret;
}
@@ -133,8 +148,6 @@ private function getPermissionsHeader($module, $language)
*/
private function getPermissionsSwitch($module, $language)
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
-
$moduleDirname = $module->getVar('mod_dirname');
$tables = $this->getTableTables($module->getVar('mod_id'));
$t = "\t\t";
@@ -143,12 +156,12 @@ private function getPermissionsSwitch($module, $language)
"{$t}\$formTitle = {$language}PERMISSIONS_GLOBAL;{$n}",
"{$t}\$permName = '{$moduleDirname}_ac';{$n}",
"{$t}\$permDesc = {$language}PERMISSIONS_GLOBAL_DESC;{$n}",
- "{$t}\$globalPerms = array( '4' => {$language}PERMISSIONS_GLOBAL_4, '8' => {$language}PERMISSIONS_GLOBAL_8, '16' => {$language}PERMISSIONS_GLOBAL_16 );{$n}",
+ "{$t}\$globalPerms = ['4' => {$language}PERMISSIONS_GLOBAL_4, '8' => {$language}PERMISSIONS_GLOBAL_8, '16' => {$language}PERMISSIONS_GLOBAL_16 ];{$n}",
];
- foreach (array_keys($tables) as $i) {
+ foreach (\array_keys($tables) as $i) {
if (1 == $tables[$i]->getVar('table_permissions')) {
$tableName = $tables[$i]->getVar('table_name');
- $ucfTablename = ucfirst($tableName);
+ $ucfTablename = \ucfirst($tableName);
$cases["approve_{$tableName}"] = [
"{$t}\$formTitle = {$language}PERMISSIONS_APPROVE;{$n}",
"{$t}\$permName = '{$moduleDirname}_approve_{$tableName}';{$n}",
@@ -169,69 +182,58 @@ private function getPermissionsSwitch($module, $language)
];
}
}
- $contentSwitch = $pc->getPhpCodeCaseSwitch($cases, true, false, "\t");
+ $contentSwitch = $this->pc->getPhpCodeCaseSwitch($cases, true,"\t");
- return $pc->getPhpCodeSwitch('op', $contentSwitch);
+ return $this->pc->getPhpCodeSwitch('op', $contentSwitch);
}
/**
* @private function getPermissionsBody
*
- * @param string $module
+ * @param $module
* @param string $language
*
* @return string
*/
- private function getPermissionsBody($module, $language)
+ private function getPermissionsBody($module, string $language)
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
$tables = $this->getTableTables($module->getVar('mod_id'));
- $ret = $xc->getXcGetVar('moduleId', 'xoopsModule', 'mid');
- $ret .= $xc->getXcXoopsFormGroupPerm('permform', '$formTitle', '$moduleId', '$permName', '$permDesc', "'admin/permissions.php'");
- $ret .= $xc->getXcEqualsOperator('$permFound', 'false');
- $foreach1 = $xc->getXcAddItem('permform', '$gPermId', '$gPermName', "\t\t");
- $if1 = $pc->getPhpCodeForeach('globalPerms', false, 'gPermId', 'gPermName', $foreach1, "\t");
- $if1 .= $xc->getXcXoopsTplAssign('form', '$permform->render()', true, "\t");
- $if1 .= $xc->getXcEqualsOperator('$permFound', 'true', null, "\t");
- $ret .= $pc->getPhpCodeConditions('$op', ' === ', "'global'", $if1, false);
+ $ret = $this->xc->getXcGetVar('moduleId', 'xoopsModule', 'mid');
+ $ret .= $this->xc->getXcXoopsFormGroupPerm('permform', '$formTitle', '$moduleId', '$permName', '$permDesc', "'admin/permissions.php'");
+ $ret .= $this->xc->getXcEqualsOperator('$permFound', 'false');
+ $foreach1 = $this->xc->getXcAddItem('permform', '$gPermId', '$gPermName', "\t\t");
+ $if1 = $this->pc->getPhpCodeForeach('globalPerms', false, 'gPermId', 'gPermName', $foreach1, "\t");
+ $if1 .= $this->xc->getXcXoopsTplAssign('form', '$permform->render()', true, "\t");
+ $if1 .= $this->xc->getXcEqualsOperator('$permFound', 'true', null, "\t");
+ $ret .= $this->pc->getPhpCodeConditions("'global'", ' === ', '$op', $if1);
- foreach (array_keys($tables) as $t) {
+ foreach (\array_keys($tables) as $t) {
if (1 == $tables[$t]->getVar('table_permissions')) {
$tableId = $tables[$t]->getVar('table_id');
$tableMid = $tables[$t]->getVar('table_mid');
$tableName = $tables[$t]->getVar('table_name');
$fields = $this->getTableFields($tableMid, $tableId);
- $fieldId = 'id';
- $fieldMain = 'title';
- foreach (array_keys($fields) as $f) {
- $fieldName = $fields[$f]->getVar('field_name');
- if (0 == $f) {
- $fieldId = $fieldName;
- }
- if (1 == $fields[$f]->getVar('field_main')) {
- $fieldMain = $fieldName;
- }
- }
- $if_count = $xc->getXcHandlerAllObj($tableName, $fieldMain, 0, 0, "\t\t");
- $getVar1 = $xc->getXcGetVar('', "{$tableName}All[\$i]", $fieldId, true);
- $getVar2 = $xc->getXcGetVar('', "{$tableName}All[\$i]", $fieldMain, true);
- $fe_content = $xc->getXcAddItem('permform', $getVar1, $getVar2, "\t\t\t");
- $if_table = $xc->getXcHandlerCountObj($tableName, "\t");
- $if_count .= $pc->getPhpCodeForeach("{$tableName}All", true, false, 'i', $fe_content, "\t\t");
- $if_count .= $xc->getXcXoopsTplAssign('form', '$permform->render()', true, "\t\t");
- $if_table .= $pc->getPhpCodeConditions("\${$tableName}Count", ' > ', '0', $if_count, false, "\t");
- $if_table .= $xc->getXcEqualsOperator('$permFound', 'true', null, "\t");
- $cond = "\$op === 'approve_{$tableName}' || \$op === 'submit_{$tableName}' || \$op === 'view_{$tableName}'";
- $ret .= $pc->getPhpCodeConditions($cond, '', '', $if_table, false);
+ $fieldId = $this->xc->getXcTableFieldId($fields);
+ $fieldMain = $this->xc->getXcTableFieldMain($fields);
+ $if_count = $this->xc->getXcHandlerAllObj($tableName, $fieldMain, '0', '0', "\t\t");
+ $getVar1 = $this->xc->getXcGetVar('', "{$tableName}All[\$i]", $fieldId, true);
+ $getVar2 = $this->xc->getXcGetVar('', "{$tableName}All[\$i]", $fieldMain, true);
+ $fe_content = $this->xc->getXcAddItem('permform', $getVar1, $getVar2, "\t\t\t");
+ $if_table = $this->xc->getXcHandlerCountObj($tableName, "\t");
+ $if_count .= $this->pc->getPhpCodeForeach("{$tableName}All", true, false, 'i', $fe_content, "\t\t");
+ $if_count .= $this->xc->getXcXoopsTplAssign('form', '$permform->render()', true, "\t\t");
+ $if_table .= $this->pc->getPhpCodeConditions("\${$tableName}Count", ' > ', '0', $if_count, false, "\t");
+ $if_table .= $this->xc->getXcEqualsOperator('$permFound', 'true', null, "\t");
+ $cond = "'approve_{$tableName}' === \$op || 'submit_{$tableName}' === \$op || 'view_{$tableName}' === \$op";
+ $ret .= $this->pc->getPhpCodeConditions($cond, '', '', $if_table);
}
}
- $ret .= $pc->getPhpCodeUnset('permform');
- $elseInter = $xc->getXcRedirectHeader("'permissions.php'", '', '3', "{$language}NO_PERMISSIONS_SET", false, "\t");
- $elseInter .= $this->getSimpleString("exit();", "\t");
- $ret .= $pc->getPhpCodeConditions('$permFound', ' !== ', 'true', $elseInter, false);
+ $ret .= $this->pc->getPhpCodeUnset('permform');
+ $elseInter = $this->xc->getXcRedirectHeader("'permissions.php'", '', '3', "{$language}NO_PERMISSIONS_SET", false, "\t");
+ $elseInter .= $this->getSimpleString('exit();', "\t");
+ $ret .= $this->pc->getPhpCodeConditions('$permFound', ' !== ', 'true', $elseInter);
return $ret;
}
@@ -239,9 +241,9 @@ private function getPermissionsBody($module, $language)
/**
* @public function render
*
- * @param null
+
*
- * @return bool|string
+ * @return string
*/
public function render()
{
@@ -253,9 +255,9 @@ public function render()
$content .= $this->getPermissionsHeader($module, $language);
$content .= $this->getPermissionsSwitch($module, $language);
$content .= $this->getPermissionsBody($module, $language);
- $content .= $this->getInclude('footer');
+ $content .= $this->getRequire('footer');
- $this->create($moduleDirname, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->create($moduleDirname, 'admin', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $this->renderFile();
}
diff --git a/class/Files/Admin/index.php b/class/Files/Admin/index.php
new file mode 100644
index 00000000..e5ee0725
--- /dev/null
+++ b/class/Files/Admin/index.php
@@ -0,0 +1,2 @@
+setModule($module);
$this->setFileName($filename);
@@ -67,8 +66,8 @@ public function write($module, $filename)
/**
* @public function render
- * @param null
- * @return bool|string
+ *
+ * @return string
*/
public function render()
{
@@ -77,11 +76,11 @@ public function render()
$moduleDirname = $module->getVar('mod_dirname');
$content = $this->getHeaderFilesComments($module, '@charset "UTF-8";');
$content .= <<<'EOT'
-img {
- max-width: 200px;
-}
-EOT;
- $this->create($moduleDirname, 'assets/css/admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ img {
+ max-width: 200px;
+ }
+ EOT;
+ $this->create($moduleDirname, 'assets/css/admin', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $this->renderFile();
}
diff --git a/class/Files/Assets/Css/Admin/index.php b/class/Files/Assets/Css/Admin/index.php
new file mode 100644
index 00000000..e5ee0725
--- /dev/null
+++ b/class/Files/Assets/Css/Admin/index.php
@@ -0,0 +1,2 @@
+setModule($module);
$this->setFileName($filename);
@@ -67,8 +66,8 @@ public function write($module, $filename)
/**
* @public function render
- * @param null
- * @return bool|string
+ *
+ * @return string
*/
public function render()
{
@@ -77,29 +76,29 @@ public function render()
$moduleDirname = $module->getVar('mod_dirname');
$content = $this->getHeaderFilesComments($module, '@charset "UTF-8";');
$content .= << li {
- display: inline-block;
-}
+ ul.menu > li {
+ display: inline-block;
+ }
-ul.menu > li + li:before {
- content: "|\a0";
-}
+ ul.menu > li + li:before {
+ content: "|\a0";
+ }
-.printOnly {
- display: none;
-}
+ .printOnly {
+ display: none;
+ }
-img {
- max-width: 300px;
-}
-EOT;
- $this->create($moduleDirname, 'assets/css', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ img {
+ max-width: 300px;
+ }
+ EOT;
+ $this->create($moduleDirname, 'assets/css', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $this->renderFile();
}
diff --git a/class/Files/Assets/Css/index.php b/class/Files/Assets/Css/index.php
new file mode 100644
index 00000000..e5ee0725
--- /dev/null
+++ b/class/Files/Assets/Css/index.php
@@ -0,0 +1,2 @@
+setModule($module);
$this->setFileName($filename);
@@ -68,118 +67,111 @@ public function write($module, $filename)
/**
* @public function getJavascriptJQueryButtons
- * @param null
*
* @return string
*/
public function getJavascriptJQueryButtons()
{
- $ret = <<
-EOT;
-
- return $ret;
+ return <<<'EOT'
+ //
+ EOT;
}
/**
* @public function render
- * @param null
*
- * @return bool|string
+ * @return string
*/
public function render()
{
$module = $this->getModule();
$filename = $this->getFileName();
$moduleDirname = $module->getVar('mod_dirname');
- $content = $this->getHeaderFilesComments($module);
- $content = $this->getJavascriptJQueryButtons();
+ $content = $this->getHeaderFilesComments($module, true);
+ $content .= $this->getJavascriptJQueryButtons();
$content .= $this->getJavascriptJQueryPrint();
- $this->create($moduleDirname, 'assets/js', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->create($moduleDirname, 'assets/js', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $this->renderFile();
}
diff --git a/class/Files/Assets/Js/JsJquery.php b/class/Files/Assets/Js/JsJquery.php
index 622d3a58..38d4698b 100644
--- a/class/Files/Assets/Js/JsJquery.php
+++ b/class/Files/Assets/Js/JsJquery.php
@@ -1,9 +1,9 @@
-setModule($module);
$this->setFileName($filename);
@@ -75,25 +74,25 @@ public function write($module, $filename)
/**
* @public function render
- * @param null
- * @return bool|string
+ *
+ * @return string
*/
public function render()
{
$module = $this->getModule();
$filename = $this->getFileName();
$moduleDirname = $module->getVar('mod_dirname');
- $content = $this->getHeaderFilesComments($module, 0);
+ $content = $this->getHeaderFilesComments($module, true);
$content .= <<<'EOT'
-$(document).ready(function(){
- $( "button, input:button, input:submit, input:file, input:reset" ).css("color","inherit").button();
- $( ".check" ).css("color","#fff").button();
- $( ".radio" ).css("color","#fff").buttonset();
- $( ".toolbar" ).css("color","#000").buttonset();
-});
-EOT;
+ $(document).ready(function(){
+ $( "button, input:button, input:submit, input:file, input:reset" ).css("color","inherit").button();
+ $( ".check" ).css("color","#fff").button();
+ $( ".radio" ).css("color","#fff").buttonset();
+ $( ".toolbar" ).css("color","#000").buttonset();
+ });
+ EOT;
- $this->tdmcfile->create($moduleDirname, 'assets/js', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->tdmcfile->create($moduleDirname, 'assets/js', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
}
diff --git a/class/Files/Assets/Js/index.php b/class/Files/Assets/Js/index.php
new file mode 100644
index 00000000..e5ee0725
--- /dev/null
+++ b/class/Files/Assets/Js/index.php
@@ -0,0 +1,2 @@
+history.go(-1);
diff --git a/class/Files/Assets/index.php b/class/Files/Assets/index.php
new file mode 100644
index 00000000..e5ee0725
--- /dev/null
+++ b/class/Files/Assets/index.php
@@ -0,0 +1,2 @@
+xc = Modulebuilder\Files\CreateXoopsCode::getInstance();
+ $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance();
}
- /**
+ /**
* @static function getInstance
- * @param null
+ *
* @return BlocksFiles
*/
public static function getInstance()
@@ -58,11 +70,11 @@ public static function getInstance()
/**
* @public function write
- * @param string $module
+ * @param $module
* @param mixed $table
* @param $filename
*/
- public function write($module, $table, $filename)
+ public function write($module, $table, $filename): void
{
$this->setModule($module);
$this->setTable($table);
@@ -74,98 +86,119 @@ public function write($module, $table, $filename)
* @param $moduleDirname
* @param $tableName
* @param $tableFieldname
+ * @param $tablePermissions
* @param $fields
* @param $fieldId
* @param int $fieldParent
* @return string
*/
- private function getBlocksShow($moduleDirname, $tableName, $tableFieldname, $fields, $fieldId, $fieldParent = 0)
+ private function getBlocksShow($moduleDirname, $tableName, $tableFieldname, $tablePermissions, $fields, $fieldId, int $fieldParent = 0)
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $stuModuleDirname = mb_strtoupper($moduleDirname);
- $ucfTableName = ucfirst($tableName);
+ $ucfTableName = \ucfirst($tableName);
$critName = 'cr' . $ucfTableName;
+ $stuModuleDirname = \mb_strtoupper($moduleDirname);
+ $ucfModuleDirname = \ucfirst($moduleDirname);
- $ret = $pc->getPhpCodeCommentMultiLine(['Function' => 'show block', '@param $options' => '', '@return' => 'array']);
-
- $func = $pc->getPhpCodeIncludeDir("XOOPS_ROOT_PATH . '/modules/{$moduleDirname}/class/{$tableName}.php'",'',true, true, '', "\t");
- $func .= $xc->getXcEqualsOperator('$myts', 'MyTextSanitizer::getInstance()', '',"\t");
- $func .= $xc->getXcXoopsTplAssign("{$moduleDirname}_upload_url","{$stuModuleDirname}_UPLOAD_URL",'',"\t");
- $func .= $xc->getXcEqualsOperator('$block ', '[]', '',"\t");
- $func .= $xc->getXcEqualsOperator('$typeBlock ', '$options[0]','',"\t");
- $func .= $xc->getXcEqualsOperator('$limit ', '$options[1]','',"\t");
- $func .= $xc->getXcEqualsOperator('$lenghtTitle', '$options[2]','',"\t");
- $func .= $xc->getXcEqualsOperator('$helper ', 'Helper::getInstance()','',"\t");
- $func .= $xc->getXcHandlerLine($tableName, "\t");
- $func .= $xc->getXcCriteriaCompo($critName, "\t");
- $func .= $pc->getPhpCodeArrayShift('$options', "\t");
- $func .= $pc->getPhpCodeArrayShift('$options', "\t");
- $func .= $pc->getPhpCodeArrayShift('$options', "\t");
- $func .= $pc->getPhpCodeBlankLine();
+ $configMaxchar = 0;
+ foreach (\array_keys($fields) as $f) {
+ $fieldElement = $fields[$f]->getVar('field_element');
+ if (Constants::FIELD_ELE_TEXTAREA == $fieldElement || Constants::FIELD_ELE_DHTMLTEXTAREA == $fieldElement) {
+ $configMaxchar = 1;
+ }
+ }
+ $ret = $this->pc->getPhpCodeCommentMultiLine(['Function' => 'show block', '@param $options' => '', '@return' => 'array']);
+ $func = $this->xc->getXcEqualsOperator('$helper ', 'Helper::getInstance()','',"\t");
+ if (1 === $configMaxchar) {
+ $func .= $this->xc->getXcEqualsOperator('$utility ', "new \XoopsModules\\{$ucfModuleDirname}\Utility()", '',"\t");
+ }
+ //$func .= $this->xc->getXcEqualsOperator('$myts', 'MyTextSanitizer::getInstance()', '',"\t");
+ $func .= $this->xc->getXcEqualsOperator('$block ', '[]', '',"\t");
+ $func .= $this->xc->getXcEqualsOperator('$typeBlock ', '$options[0]','',"\t");
+ $func .= $this->xc->getXcEqualsOperator('$limit ', '$options[1]','',"\t");
+ $func .= $this->xc->getXcEqualsOperator('$lenghtTitle', '$options[2]','',"\t");
+ $func .= $this->pc->getPhpCodeArrayShift('$options', "\t");
+ $func .= $this->pc->getPhpCodeArrayShift('$options', "\t");
+ $func .= $this->pc->getPhpCodeArrayShift('$options', "\t");
+ $func .= $this->pc->getPhpCodeBlankLine();
+ $func .= $this->xc->getXcHandlerLine($tableName, "\t");
+ $func .= $this->pc->getPhpCodeBlankLine();
+ $func .= $this->xc->getXcCriteriaCompo($critName, "\t");
//content if: parent
- $contIf = $xc->getXcEqualsOperator("\${$tableName}", "{$moduleDirname}_getMyItemIds('{$moduleDirname}_view', '{$moduleDirname}')", null, "\t");
- $crit = $xc->getXcCriteria('', "'cid'", "'(' . implode(',', \${$tableName}) . ')'", "'IN'", true);
- $contIf .= $xc->getXcCriteriaAdd($critName, $crit, "\t");
- $crit = $xc->getXcCriteria('', "'{$fieldId}'", "{$moduleDirname}_block_addCatSelect(\$options)", "'IN'", true);
- $contIf2 = $xc->getXcCriteriaAdd($critName, $crit, "\t\t");
- $contIf .= $pc->getPhpCodeConditions('1 != (count(\$options) && 0 == \$options[0])', null, null, $contIf2, false, "\t");
- $crit = $xc->getXcCriteria('', "'{$fieldId}'", '0', "'!='", true);
- $contIf2 = $xc->getXcCriteriaAdd($critName, $crit, "\t\t");
- $contIf2 .= $xc->getXcCriteriaSetSort($critName, "'{$fieldId}'", "\t\t");
- $contIf2 .= $xc->getXcCriteriaSetOrder($critName, "'ASC'", "\t\t");
- $contIf .= $pc->getPhpCodeConditions('$typeBlock', null, null, $contIf2, false, "\t");
+ $contIf = $this->xc->getXcEqualsOperator("\${$tableName}", "{$moduleDirname}_getMyItemIds('{$moduleDirname}_view', '{$moduleDirname}')", null, "\t");
+ $crit = $this->xc->getXcCriteria('', "'cid'", "'(' . \implode(',', \${$tableName}) . ')'", "'IN'", true);
+ $contIf .= $this->xc->getXcCriteriaAdd($critName, $crit, "\t");
+ $crit = $this->xc->getXcCriteria('', "'{$fieldId}'", "{$moduleDirname}_block_addCatSelect(\$options)", "'IN'", true);
+ $contIf2 = $this->xc->getXcCriteriaAdd($critName, $crit, "\t\t");
+ $contIf .= $this->pc->getPhpCodeConditions('1 != (\count(\$options) && 0 == \$options[0])', '', '', $contIf2, false, "\t");
+ $crit = $this->xc->getXcCriteria('', "'{$fieldId}'", '0', "'!='", true);
+ $contIf2 = $this->xc->getXcCriteriaAdd($critName, $crit, "\t\t");
+ $contIf2 .= $this->xc->getXcCriteriaSetSort($critName, "'{$fieldId}'", "\t\t");
+ $contIf2 .= $this->xc->getXcCriteriaSetOrder($critName, "'ASC'", "\t\t");
+ $contIf .= $this->pc->getPhpCodeConditions('$typeBlock', '', '', $contIf2, false, "\t");
//content else: parent
- //search for SelectStatus field
- $fieldStatus = '';
- $critStatus = '';
+ $fieldDate = '';
+ $fieldRating = '';
foreach ($fields as $field) {
- if ($field->getVar('field_element') == 16) {
- $fieldStatus = $field->getVar('field_name');
+ if ($field->getVar('field_element') == Constants::FIELD_ELE_TEXTDATESELECT || $field->getVar('field_element') == Constants::FIELD_ELE_DATETIME) {
+ $fieldDate = $field->getVar('field_name');
+ }
+ if ($field->getVar('field_element') == Constants::FIELD_ELE_TEXTRATINGS || $field->getVar('field_element') == Constants::FIELD_ELE_TEXTVOTES) {
+ $fieldRating = $field->getVar('field_name');
}
}
- if ('' !== $fieldStatus) {
- $crit = $xc->getXcCriteria('', "'{$fieldStatus}'", 'Constants::PERM_GLOBAL_VIEW', '', true);
- $critStatus .= $xc->getXcCriteriaAdd($critName, $crit, "\t\t\t");
+ //search for SelectStatus field
+ $fieldStatus = '';
+ if (1 == $tablePermissions) {
+ foreach ($fields as $field) {
+ if ($field->getVar('field_element') == Constants::FIELD_ELE_SELECTSTATUS) {
+ $fieldStatus = $field->getVar('field_name');
+ }
+ }
+ if ('' !== $fieldStatus) {
+ $constant = $this->xc->getXcGetConstants('STATUS_APPROVED');
+ $crit = $this->xc->getXcCriteria('', "'{$fieldStatus}'", $constant, "'='", true);
+ $func .= $this->pc->getPhpCodeCommentLine("Criteria for status field",'',"\t");
+ $func .= $this->xc->getXcCriteriaAdd($critName, $crit, "\t");
+ $func .= $this->pc->getPhpCodeBlankLine();
+ }
}
- $case1[] = $pc->getPhpCodeCommentLine("For the block: {$tableName} last",'',"\t\t\t");
- if ('' !== $fieldStatus) {
- $case1[] = $critStatus;
+ $case1 = [];
+ $case2 = [];
+ $case3 = [];
+ $case4 = [];
+ $case5 = [];
+ $case1[] = $this->pc->getPhpCodeCommentLine("For the block: {$tableName} last",'',"\t\t\t");
+ $case1[] = $this->xc->getXcCriteriaSetSort($critName, "'{$fieldId}'","\t\t\t");
+ $case1[] = $this->xc->getXcCriteriaSetOrder($critName, "'DESC'","\t\t\t");
+ $case2[] = $this->pc->getPhpCodeCommentLine("For the block: {$tableName} new",'',"\t\t\t");
+ $case2[] = $this->pc->getPhpCodeCommentLine('New since last week: 7 * 24 * 60 * 60 = 604800', '', "\t\t\t");
+ if ('' === $fieldDate) {
+ $fieldDate = "{$tableFieldname}_date";
+ $case2[] = $this->pc->getPhpCodeCommentLine("Table {$tableName} must have {$tableFieldname}_date or you have to change into corresponding field name",'',"\t\t\t");
}
- $case1[] = $xc->getXcCriteriaSetSort($critName, "'{$tableFieldname}_date'","\t\t\t");
- $case1[] = $xc->getXcCriteriaSetOrder($critName, "'DESC'","\t\t\t");
- $case2[] = $pc->getPhpCodeCommentLine("For the block: {$tableName} new",'',"\t\t\t");
- if ('' !== $fieldStatus) {
- $case2[] = $critStatus;
- }
- $crit = $xc->getXcCriteria('', "'{$tableFieldname}_date'", 'strtotime(date(_SHORTDATESTRING))', "'>='", true);
- $case2[] = $xc->getXcCriteriaAdd($critName, $crit,"\t\t\t");
- $crit = $xc->getXcCriteria('', "'{$tableFieldname}_date'", 'strtotime(date(_SHORTDATESTRING))+86400', "'<='", true);
- $case2[] = $xc->getXcCriteriaAdd($critName, $crit,"\t\t\t");
- $case2[] = $xc->getXcCriteriaSetSort($critName, "'{$tableFieldname}_date'","\t\t\t");
- $case2[] = $xc->getXcCriteriaSetOrder($critName, "'ASC'","\t\t\t");
- $case3[] = $pc->getPhpCodeCommentLine("For the block: {$tableName} hits",'',"\t\t\t");
- if ('' !== $fieldStatus) {
- $case3[] = $critStatus;
- }
- $case3[] = $xc->getXcCriteriaSetSort($critName, "'{$tableFieldname}_hits'","\t\t\t");
- $case3[] = $xc->getXcCriteriaSetOrder($critName, "'DESC'","\t\t\t");
- $case4[] = $pc->getPhpCodeCommentLine("For the block: {$tableName} top",'',"\t\t\t");
- if ('' !== $fieldStatus) {
- $case4[] = $critStatus;
- }
- $case4[] = $xc->getXcCriteriaAdd($critName, $crit,"\t\t\t");
- $case4[] = $xc->getXcCriteriaSetSort($critName, "'{$tableFieldname}_top'","\t\t\t");
- $case4[] = $xc->getXcCriteriaSetOrder($critName, "'ASC'","\t\t\t");
- $case5[] = $pc->getPhpCodeCommentLine("For the block: {$tableName} random",'',"\t\t\t");
- if ('' !== $fieldStatus) {
- $case5[] = $critStatus;
+ $crit = $this->xc->getXcCriteria('', "'{$fieldDate}'", '\time() - 604800', "'>='", true);
+ $case2[] = $this->xc->getXcCriteriaAdd($critName, $crit,"\t\t\t");
+ $crit = $this->xc->getXcCriteria('', "'{$fieldDate}'", '\time()', "'<='", true);
+ $case2[] = $this->xc->getXcCriteriaAdd($critName, $crit,"\t\t\t");
+ $case2[] = $this->xc->getXcCriteriaSetSort($critName, "'{$fieldDate}'","\t\t\t");
+ $case2[] = $this->xc->getXcCriteriaSetOrder($critName, "'DESC'","\t\t\t");
+ $case3[] = $this->pc->getPhpCodeCommentLine("For the block: {$tableName} hits",'',"\t\t\t");
+ $case3[] = $this->pc->getPhpCodeCommentLine("Table {$tableName} must have {$tableFieldname}_hits or you have to change into corresponding field name",'',"\t\t\t");
+ $case3[] = $this->xc->getXcCriteriaSetSort($critName, "'{$tableFieldname}_hits'","\t\t\t");
+ $case3[] = $this->xc->getXcCriteriaSetOrder($critName, "'DESC'","\t\t\t");
+ $case4[] = $this->pc->getPhpCodeCommentLine("For the block: {$tableName} top",'',"\t\t\t");
+ if ('' !== $fieldRating) {
+ $case4[] = $this->xc->getXcCriteriaSetSort($critName, "'{$fieldRating}'","\t\t\t");
+ } else {
+ $case4[] = $this->pc->getPhpCodeCommentLine("Table {$tableName} must have {$tableFieldname}_top or you have to change into corresponding field name",'',"\t\t\t");
+ $case4[] = $this->xc->getXcCriteriaSetSort($critName, "'{$tableFieldname}_top'","\t\t\t");
}
- $case5[] = $xc->getXcCriteriaAdd($critName, $crit,"\t\t\t");
- $case5[] = $xc->getXcCriteriaSetSort($critName, "'RAND()'","\t\t\t");
+ $case4[] = $this->xc->getXcCriteriaSetOrder($critName, "'DESC'","\t\t\t");
+ $case5[] = $this->pc->getPhpCodeCommentLine("For the block: {$tableName} random",'',"\t\t\t");
+ $case5[] = $this->xc->getXcCriteriaSetSort($critName, "'RAND()'","\t\t\t");
$cases = [
'last' => $case1,
'new' => $case2,
@@ -173,55 +206,103 @@ private function getBlocksShow($moduleDirname, $tableName, $tableFieldname, $fie
'top' => $case4,
'random' => $case5,
];
- $contSwitch = $pc->getPhpCodeCaseSwitch($cases, true, false, "\t\t");
- $contElse = $pc->getPhpCodeSwitch('typeBlock', $contSwitch, "\t");
+ $contSwitch = $this->pc->getPhpCodeCaseSwitch($cases, true, "\t\t");
+ $contElse = $this->pc->getPhpCodeSwitch('typeBlock', $contSwitch, "\t");
//end: content else: parent
if (1 == $fieldParent) {
$func .= $contIf;
} else {
$func .= $contElse;
}
- $func .= $pc->getPhpCodeBlankLine();
+ $func .= $this->pc->getPhpCodeBlankLine();
- $func .= $xc->getXcCriteriaSetLimit($critName, '$limit', "\t");
- $func .= $xc->getXcHandlerAllClear("{$tableName}All", $tableName, "\${$critName}", "\t");
- $func .= $pc->getPhpCodeUnset($critName, "\t");
- $contentForeach = '';
- foreach (array_keys($fields) as $f) {
- $fieldName = $fields[$f]->getVar('field_name');
- // Verify if table_fieldname is not empty
- //$lpFieldName = !empty($tableFieldname) ? substr($fieldName, 0, strpos($fieldName, '_')) : $tableName;
- $rpFieldName = $this->getRightString($fieldName);
+ $func .= $this->xc->getXcCriteriaSetLimit($critName, '$limit', "\t");
+ $func .= $this->xc->getXcHandlerAllClear("{$tableName}All", $tableName, "\${$critName}", "\t");
+ $func .= $this->pc->getPhpCodeUnset($critName, "\t");
+ $contentForeach = $this->xc->getXcEqualsOperator("\${$tableName}","\${$tableName}All[\$i]->getValues{$ucfTableName}()", '', "\t\t\t");
+ $contentForeach .= $this->pc->getPhpCodeCommentMultiLine([
+ 'If you want to use the parameter for limits you have to adapt the line where it should be applied' => '',
+ 'e.g. change' => '',
+ "\t\$block[\$i]['title']" => "= \${$tableName}All[\$i]->getVar('art_title');",
+ 'into' => '',
+ "\t" . '$myTitle' => "= \${$tableName}All[\$i]->getVar('art_title');",
+ "\t" . 'if ($limit > 0) {' => '',
+ "\t\t" . '$myTitle' => '= \substr($myTitle, 0, (int)$limit);',
+ "\t" . '}' => '',
+ "\t\$block[\$i]['title'] = " => '$myTitle;',
+ ], "\t\t\t", false);
+ $lenName = 0;
+ foreach (\array_keys($fields) as $f) {
+ $fieldName = $fields[$f]->getVar('field_name');
$fieldElement = $fields[$f]->getVar('field_element');
if (1 == $fields[$f]->getVar('field_block')) {
switch ($fieldElement) {
- case 2:
- $contentForeach .= $xc->getXcEqualsOperator("\$block[\$i]['{$rpFieldName}']", "\$myts->htmlSpecialChars(\${$tableName}All[\$i]->getVar('{$fieldName}'))", null, "\t\t\t");
+ case Constants::FIELD_ELE_TEXTAREA:
+ case Constants::FIELD_ELE_DHTMLTEXTAREA:
+ $lenName = max(strlen($this->getRightString($fieldName)) + 6, $lenName);
break;
- case 3:
- case 4:
- $contentForeach .= $xc->getXcEqualsOperator("\$block[\$i]['{$rpFieldName}']", "strip_tags(\${$tableName}All[\$i]->getVar('{$fieldName}'))", null, "\t\t\t");
+ case Constants::FIELD_ELE_SELECTUSER:
+ case Constants::FIELD_ELE_TEXTDATESELECT:
+ case Constants::FIELD_ELE_SELECTSTATUS:
+ case Constants::FIELD_ELE_RADIOYN:
+ case Constants::FIELD_ELE_RADIO_ONOFFLINE:
+ case Constants::FIELD_ELE_DATETIME:
+ $lenName = max(strlen($this->getRightString($fieldName)) + 5, $lenName);
break;
- case 8:
- $contentForeach .= $xc->getXcEqualsOperator("\$block[\$i]['{$rpFieldName}']", "\XoopsUser::getUnameFromId(\${$tableName}All[\$i]->getVar('{$fieldName}'))", null, "\t\t\t");
+ case 0:
+ default:
+ $lenName = max(strlen($this->getRightString($fieldName)), $lenName);
break;
- case 15:
- $contentForeach .= $xc->getXcEqualsOperator("\$block[\$i]['{$rpFieldName}']","formatTimeStamp(\${$tableName}All[\$i]->getVar('{$fieldName}'))", null, "\t\t\t");
+ }
+ }
+ }
+ $lenName += 15;
+ foreach (\array_keys($fields) as $f) {
+ $fieldName = $fields[$f]->getVar('field_name');
+ $rpFieldName = $this->getRightString($fieldName);
+ $fieldElement = $fields[$f]->getVar('field_element');
+
+ if (0 == $f) {
+ $contentForeach .= $this->xc->getXcEqualsOperator(str_pad("\$block[\$i]['id']", $lenName), "\${$tableName}['{$rpFieldName}']", null, "\t\t\t");
+ }
+ if (1 == $fields[$f]->getVar('field_block')) {
+ switch ($fieldElement) {
+ case Constants::FIELD_ELE_TEXTAREA:
+ case Constants::FIELD_ELE_DHTMLTEXTAREA:
+ $contentForeach .= $this->xc->getXcEqualsOperator(str_pad("\$block[\$i]['{$rpFieldName}_text']", $lenName), "\${$tableName}['{$rpFieldName}_text']", null, "\t\t\t");
+ $truncate = "\$utility::truncateHtml(\$block[\$i]['{$rpFieldName}_text'], \$lenghtTitle)";
+ $contentForeach .= $this->xc->getXcEqualsOperator(str_pad("\$block[\$i]['{$rpFieldName}_short']", $lenName), $truncate, false, "\t\t\t");
break;
+ case Constants::FIELD_ELE_TEXTDATESELECT:
+ case Constants::FIELD_ELE_DATETIME:
+ case Constants::FIELD_ELE_SELECTUSER:
+ $contentForeach .= $this->xc->getXcEqualsOperator(str_pad("\$block[\$i]['{$rpFieldName}_text']", $lenName), "\${$tableName}['{$rpFieldName}_text']", null, "\t\t\t");
+ break;
+ case Constants::FIELD_ELE_SELECTSTATUS:
+ case Constants::FIELD_ELE_RADIOYN:
+ case Constants::FIELD_ELE_RADIO_ONOFFLINE:
+ $contentForeach .= $this->xc->getXcEqualsOperator(str_pad("\$block[\$i]['{$rpFieldName}_text']", $lenName),"\${$tableName}['{$rpFieldName}_text']", null, "\t\t\t");
+ break;
+ case 0:
+ case Constants::FIELD_ELE_TEXT:
default:
- $contentForeach .= $xc->getXcEqualsOperator("\$block[\$i]['{$rpFieldName}']","\${$tableName}All[\$i]->getVar('{$fieldName}')", null, "\t\t\t");
+ $contentForeach .= $this->xc->getXcEqualsOperator(str_pad("\$block[\$i]['{$rpFieldName}']", $lenName),"\${$tableName}['{$rpFieldName}']", null, "\t\t\t");
break;
}
}
}
- $foreach = $pc->getPhpCodeForeach("{$tableName}All", true, false, 'i', $contentForeach, "\t\t");
+ $foreach = $this->pc->getPhpCodeForeach("{$tableName}All", true, false, 'i', $contentForeach, "\t\t");
- $func .= $pc->getPhpCodeConditions("count(\${$tableName}All)", ' > ', '0', $foreach, false, "\t");
- $func .= $pc->getPhpCodeBlankLine();
+ $func .= $this->pc->getPhpCodeConditions("\count(\${$tableName}All)", ' > ', '0', $foreach, false, "\t");
+ $func .= $this->pc->getPhpCodeBlankLine();
+ $func .= $this->xc->getXcXoopsTplAssign("{$moduleDirname}_url", "\\{$stuModuleDirname}_URL", true ,"\t");
+ $config = $this->xc->getXcGetConfig('table_type');
+ $func .= $this->xc->getXcXoopsTplAssign('table_type', $config, true, "\t");
+ $func .= $this->pc->getPhpCodeBlankLine();
$func .= $this->getSimpleString('return $block;',"\t");
- $func .= $pc->getPhpCodeBlankLine();
+ $func .= $this->pc->getPhpCodeBlankLine();
- $ret .= $pc->getPhpCodeFunction("b_{$moduleDirname}_{$tableName}_show", '$options', $func, '', false, "");
+ $ret .= $this->pc->getPhpCodeFunction("b_{$moduleDirname}_{$tableName}_show", '$options', $func, '');
return $ret;
}
@@ -236,72 +317,74 @@ private function getBlocksShow($moduleDirname, $tableName, $tableFieldname, $fie
*
* @return string
*/
- private function getBlocksEdit($moduleDirname, $tableName, $fieldId, $fieldMain, $language)
+ private function getBlocksEdit(string $moduleDirname, string $tableName, string $fieldId, string $fieldMain, string $language)
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $stuModuleDirname = mb_strtoupper($moduleDirname);
- $stuTableName = mb_strtoupper($tableName);
- $ucfTableName = ucfirst($tableName);
+ $stuModuleDirname = \mb_strtoupper($moduleDirname);
+ $stuTableName = \mb_strtoupper($tableName);
+ $ucfTableName = \ucfirst($tableName);
$critName = 'cr' . $ucfTableName;
- $ret = $pc->getPhpCodeCommentMultiLine(['Function' => 'edit block', '@param $options' => '', '@return' => 'string']);
- $func = $pc->getPhpCodeIncludeDir("XOOPS_ROOT_PATH . '/modules/{$moduleDirname}/class/{$tableName}.php'",'',true, true, '', "\t");
- $func .= $xc->getXcEqualsOperator('$helper', 'Helper::getInstance()', '',"\t");
- $func .= $xc->getXcHandlerLine($tableName, "\t");
- $func .= $xc->getXcXoopsTplAssign("{$moduleDirname}_upload_url","{$stuModuleDirname}_UPLOAD_URL",'',"\t");
- $func .= $xc->getXcEqualsOperator('$form', "{$language}DISPLAY", '',"\t");
- $func .= $xc->getXcEqualsOperator('$form', "\"\"", '.',"\t");
- $func .= $xc->getXcEqualsOperator('$form', "\"
\"", '.',"\t"); - $func .= $xc->getXcEqualsOperator('$form', "{$language}TITLE_LENGTH . \" :
\"", '.',"\t"); - $func .= $pc->getPhpCodeArrayShift('$options', "\t"); - $func .= $pc->getPhpCodeArrayShift('$options', "\t"); - $func .= $pc->getPhpCodeArrayShift('$options', "\t"); - $func .= $pc->getPhpCodeBlankLine(); - $func .= $xc->getXcCriteriaCompo($critName, "\t"); - $crit = $xc->getXcCriteria('', "'{$fieldId}'", '0', "'!='", true); - $func .= $xc->getXcCriteriaAdd($critName, $crit, "\t", "\n"); - $func .= $xc->getXcCriteriaSetSort($critName, "'{$fieldId}'","\t","\n"); - $func .= $xc->getXcCriteriaSetOrder($critName, "'ASC'","\t","\n"); - $func .= $xc->getXcHandlerAllClear("{$tableName}All", $tableName, "\${$critName}", "\t"); - $func .= $pc->getPhpCodeUnset($critName, "\t"); - $func .= $xc->getXcEqualsOperator('$form', "{$language}{$stuTableName}_TO_DISPLAY . \"
'", '.',"\t"); - $func .= $pc->getPhpCodeBlankLine(); + $ret = $this->pc->getPhpCodeCommentMultiLine(['Function' => 'edit block', '@param $options' => '', '@return' => 'string']); + $func = $this->xc->getXcXoopsTplAssign("{$moduleDirname}_upload_url","\\{$stuModuleDirname}_UPLOAD_URL",true,"\t"); + $func .= $this->xc->getXcEqualsOperator('$form', "{$language}DISPLAY . ' : '", '',"\t"); + $func .= $this->xc->getXcEqualsOperator('$form', "\"\"", '.',"\t"); + $func .= $this->xc->getXcEqualsOperator('$form', "\"
\"", '.',"\t"); + $func .= $this->xc->getXcEqualsOperator('$form', "{$language}TITLE_LENGTH . \" :
\"", '.',"\t"); + $func .= $this->pc->getPhpCodeArrayShift('$options', "\t"); + $func .= $this->pc->getPhpCodeArrayShift('$options', "\t"); + $func .= $this->pc->getPhpCodeArrayShift('$options', "\t"); + $func .= $this->pc->getPhpCodeBlankLine(); + + $func .= $this->pc->getPhpCodeCommentMultiLine([ + 'If you want to filter your results by e.g. a category used in your' . $tableName => '', + 'then you can activate the following code, but you have to change it according your category' => '' + ], "\t"); + $func .= $this->getSimpleString('/*', "\t"); + $func .= $this->xc->getXcEqualsOperator('$helper', 'Helper::getInstance()', '',"\t"); + $func .= $this->xc->getXcHandlerLine($tableName, "\t"); + $func .= $this->xc->getXcCriteriaCompo($critName, "\t"); + $crit = $this->xc->getXcCriteria('', "'{$fieldId}'", '0', "'!='", true); + $func .= $this->xc->getXcCriteriaAdd($critName, $crit, "\t"); + $func .= $this->xc->getXcCriteriaSetSort($critName, "'{$fieldId}'","\t"); + $func .= $this->xc->getXcCriteriaSetOrder($critName, "'ASC'","\t"); + $func .= $this->xc->getXcHandlerAllClear("{$tableName}All", $tableName, "\${$critName}", "\t"); + $func .= $this->pc->getPhpCodeUnset($critName, "\t"); + $func .= $this->xc->getXcEqualsOperator('$form', "{$language}{$stuTableName}_TO_DISPLAY . \"
'", '.',"\t"); + $func .= $this->pc->getPhpCodeBlankLine(); + $func .= $this->getSimpleString('*/', "\t"); $func .= $this->getSimpleString('return $form;', "\t"); - $func .= $pc->getPhpCodeBlankLine(); + $func .= $this->pc->getPhpCodeBlankLine(); - $ret .= $pc->getPhpCodeFunction("b_{$moduleDirname}_{$tableName}_edit", '$options', $func, '', false, ""); + $ret .= $this->pc->getPhpCodeFunction("b_{$moduleDirname}_{$tableName}_edit", '$options', $func, ''); return $ret; - } /** * @public function render - * @param null * - * @return bool|string + * @return string */ public function render() { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $module = $this->getModule(); - $filename = $this->getFileName(); - $table = $this->getTable(); - $moduleDirname = $module->getVar('mod_dirname'); - $tableName = $table->getVar('table_name'); - $tableFieldname = $table->getVar('table_fieldname'); - $language = $this->getLanguage($moduleDirname, 'MB'); - $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); - $fieldId = null; - $fieldParent = null; - $fieldMain = null; - foreach (array_keys($fields) as $f) { + $module = $this->getModule(); + $filename = $this->getFileName(); + $table = $this->getTable(); + $moduleDirname = $module->getVar('mod_dirname'); + $tableName = $table->getVar('table_name'); + $tableFieldname = $table->getVar('table_fieldname'); + $tablePermissions = $table->getVar('table_permissions'); + $language = $this->getLanguage($moduleDirname, 'MB'); + $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); + $fieldId = null; + $fieldParent = null; + $fieldMain = null; + foreach (\array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); $fieldParent = $fields[$f]->getVar('field_parent'); if (0 == $f) { @@ -312,14 +395,14 @@ public function render() } } $content = $this->getHeaderFilesComments($module); - $content .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', ''); - $content .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Helper'], '', ''); - $content .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']); - $content .= $pc->getPhpCodeIncludeDir("XOOPS_ROOT_PATH . '/modules/{$moduleDirname}/include/common.php'",'',true, true); - $content .= $this->getBlocksShow($moduleDirname, $tableName, $tableFieldname, $fields, $fieldId, $fieldParent); + $content .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', ''); + $content .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Helper'], '', ''); + $content .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']); + $content .= $this->pc->getPhpCodeIncludeDir("\XOOPS_ROOT_PATH . '/modules/{$moduleDirname}/include/common.php'",'',true, true); + $content .= $this->getBlocksShow($moduleDirname, $tableName, $tableFieldname, $tablePermissions, $fields, $fieldId, $fieldParent); $content .= $this->getBlocksEdit($moduleDirname, $tableName, $fieldId, $fieldMain, $language); - $this->create($moduleDirname, 'blocks', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'blocks', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/Blocks/BlocksFilesSpotlight.php b/class/Files/Blocks/BlocksFilesSpotlight.php new file mode 100644 index 00000000..5c550768 --- /dev/null +++ b/class/Files/Blocks/BlocksFilesSpotlight.php @@ -0,0 +1,340 @@ +xc = Modulebuilder\Files\CreateXoopsCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); + } + + /** + * @static function getInstance + * + * @return BlocksFilesSpotlight|false + */ + public static function getInstance() + { + static $instance = false; + if (!$instance) { + $instance = new self(); + } + + return $instance; + } + + /** + * @public function write + * @param $module + * @param mixed $table + * @param $filename + */ + public function write($module, $table, $filename) + { + $this->setModule($module); + $this->setTable($table); + $this->setFileName($filename); + } + + /** + * @private function getBlocksShow + * @param $moduleDirname + * @param $tableName + * @param $tablePermissions + * @param $fields + * @param $fieldId + * @return string + */ + private function getBlocksShow($moduleDirname, $tableName, $tablePermissions, $fields, $fieldId) + { + $ucfTableName = \ucfirst($tableName); + $critName = 'cr' . $ucfTableName; + $stuModuleDirname = \mb_strtoupper($moduleDirname); + $ucfModuleDirname = \ucfirst($moduleDirname); + + $configMaxchar = 0; + foreach (\array_keys($fields) as $f) { + $fieldElement = $fields[$f]->getVar('field_element'); + if (Constants::FIELD_ELE_TEXTAREA == $fieldElement || Constants::FIELD_ELE_DHTMLTEXTAREA == $fieldElement) { + $configMaxchar = 1; + } + } + + $ret = $this->pc->getPhpCodeCommentMultiLine(['Function' => 'show block', '@param $options' => '', '@return' => 'array']); + + //$func .= $this->xc->getXcEqualsOperator('$myts', 'MyTextSanitizer::getInstance()', '',"\t"); + $func = $this->xc->getXcEqualsOperator('$block ', '[]', '',"\t"); + $func .= '//' . $this->xc->getXcEqualsOperator('$typeBlock ', '$options[0]','',"\t"); + $func .= $this->xc->getXcEqualsOperator('$limit ', '$options[1]','',"\t"); + $func .= $this->xc->getXcEqualsOperator('$lenghtTitle ', '$options[2]','',"\t"); + $func .= $this->xc->getXcEqualsOperator('$helper ', 'Helper::getInstance()','',"\t"); + if (1 === $configMaxchar) { + $func .= $this->xc->getXcEqualsOperator('$utility ', "new \XoopsModules\\{$ucfModuleDirname}\Utility()", '',"\t"); + } + $func .= $this->xc->getXcHandlerLine($tableName, "\t"); + $func .= $this->xc->getXcCriteriaCompo($critName, "\t"); + $func .= $this->pc->getPhpCodeArrayShift('$options', "\t"); + $func .= $this->pc->getPhpCodeArrayShift('$options', "\t"); + $func .= $this->pc->getPhpCodeArrayShift('$options', "\t"); + $func .= $this->pc->getPhpCodeBlankLine(); + + //Criteria for status field + $fieldStatus = ''; + if (1 == $tablePermissions) { + foreach ($fields as $field) { + if ($field->getVar('field_element') == 16) { + $fieldStatus = $field->getVar('field_name'); + } + } + if ('' !== $fieldStatus) { + $constant = $this->xc->getXcGetConstants('STATUS_OFFLINE'); + $crit = $this->xc->getXcCriteria('', "'{$fieldStatus}'", $constant, "'>'", true); + $func .= $this->pc->getPhpCodeCommentLine("Criteria for status field",'',"\t"); + $func .= $this->xc->getXcCriteriaAdd($critName, $crit, "\t"); + $func .= $this->pc->getPhpCodeBlankLine(); + } + } + + $crit = $this->xc->getXcCriteria('', "'{$fieldId}'", "'(' . \implode(',', \$options) . ')'", "'IN'", true); + $contIf = $this->xc->getXcCriteriaAdd($critName, $crit, "\t\t"); + $contIf .= $this->xc->getXcEqualsOperator('$limit', '0', '',"\t\t"); + $func .= $this->pc->getPhpCodeConditions('\count($options) > 0 && (int)$options[0] > 0', '', '', $contIf, false, "\t"); + $func .= $this->pc->getPhpCodeBlankLine(); + + $func .= $this->xc->getXcCriteriaSetSort($critName, "'{$fieldId}'","\t"); + $func .= $this->xc->getXcCriteriaSetOrder($critName, "'DESC'","\t"); + $func .= $this->xc->getXcCriteriaSetLimit($critName, '$limit', "\t"); + $func .= $this->xc->getXcHandlerAllClear("{$tableName}All", $tableName, "\${$critName}", "\t"); + $func .= $this->pc->getPhpCodeUnset($critName, "\t"); + $contentForeach = $this->xc->getXcEqualsOperator("\${$tableName}","\${$tableName}All[\$i]->getValues{$ucfTableName}()", '', "\t\t\t"); + $contentForeach .= $this->pc->getPhpCodeCommentMultiLine([ + 'If you want to use the parameter for limits you have to adapt the line where it should be applied' => '', + 'e.g. change' => '', + "\t\$block[\$i]['title']" => "= \${$tableName}All[\$i]->getVar('art_title');", + 'into' => '', + "\t" . '$myTitle' => "= \${$tableName}All[\$i]->getVar('art_title');", + "\t" . 'if ($limit > 0) {' => '', + "\t\t" . '$myTitle' => '= \substr($myTitle, 0, (int)$limit);', + "\t" . '}' => '', + "\t\$block[\$i]['title'] = " => '$myTitle;', + ], "\t\t\t", false); + + + $lenName = 0; + foreach (\array_keys($fields) as $f) { + $fieldName = $fields[$f]->getVar('field_name'); + $fieldElement = $fields[$f]->getVar('field_element'); + if (1 == $fields[$f]->getVar('field_block')) { + switch ($fieldElement) { + case Constants::FIELD_ELE_TEXTAREA: + case Constants::FIELD_ELE_DHTMLTEXTAREA: + $lenName = max(strlen($this->getRightString($fieldName)) + 6, $lenName); + break; + case Constants::FIELD_ELE_SELECTUSER: + case Constants::FIELD_ELE_TEXTDATESELECT: + case Constants::FIELD_ELE_SELECTSTATUS: + case Constants::FIELD_ELE_RADIOYN: + case Constants::FIELD_ELE_RADIO_ONOFFLINE: + case Constants::FIELD_ELE_DATETIME: + $lenName = max(strlen($this->getRightString($fieldName)) + 5, $lenName); + break; + case 0: + default: + $lenName = max(strlen($this->getRightString($fieldName)), $lenName); + break; + } + } + } + $lenName += 15; + foreach (\array_keys($fields) as $f) { + $fieldName = $fields[$f]->getVar('field_name'); + $rpFieldName = $this->getRightString($fieldName); + $fieldElement = $fields[$f]->getVar('field_element'); + + if (0 == $f) { + $contentForeach .= $this->xc->getXcEqualsOperator(str_pad("\$block[\$i]['id']", $lenName), "\${$tableName}['{$fieldId}']", null, "\t\t\t"); + } + if (1 == $fields[$f]->getVar('field_block')) { + switch ($fieldElement) { + case Constants::FIELD_ELE_TEXTAREA: + case Constants::FIELD_ELE_DHTMLTEXTAREA: + $contentForeach .= $this->xc->getXcEqualsOperator(str_pad("\$block[\$i]['{$rpFieldName}_text']", $lenName), "\${$tableName}['{$rpFieldName}_text']", null, "\t\t\t"); + $truncate = "\$utility::truncateHtml(\$block[\$i]['{$rpFieldName}_text'], \$lenghtTitle)"; + $contentForeach .= $this->xc->getXcEqualsOperator(str_pad("\$block[\$i]['{$rpFieldName}_short']", $lenName), $truncate, false, "\t\t\t"); + break; + case Constants::FIELD_ELE_TEXTDATESELECT: + case Constants::FIELD_ELE_DATETIME: + case Constants::FIELD_ELE_SELECTUSER: + $contentForeach .= $this->xc->getXcEqualsOperator(str_pad("\$block[\$i]['{$rpFieldName}_text']", $lenName), "\${$tableName}['{$rpFieldName}_text']", null, "\t\t\t"); + break; + case Constants::FIELD_ELE_SELECTSTATUS: + case Constants::FIELD_ELE_RADIOYN: + case Constants::FIELD_ELE_RADIO_ONOFFLINE: + $contentForeach .= $this->xc->getXcEqualsOperator(str_pad("\$block[\$i]['{$rpFieldName}_text']", $lenName),"\${$tableName}['{$rpFieldName}_text']", null, "\t\t\t"); + break; + case 0: + case Constants::FIELD_ELE_TEXT: + default: + $contentForeach .= $this->xc->getXcEqualsOperator(str_pad("\$block[\$i]['{$rpFieldName}']", $lenName),"\${$tableName}['{$rpFieldName}']", null, "\t\t\t"); + break; + } + } + } + $foreach = $this->pc->getPhpCodeForeach("{$tableName}All", true, false, 'i', $contentForeach, "\t\t"); + + $func .= $this->pc->getPhpCodeConditions("\count(\${$tableName}All)", ' > ', '0', $foreach, false, "\t"); + $func .= $this->pc->getPhpCodeBlankLine(); + $func .= $this->xc->getXcXoopsTplAssign("{$moduleDirname}_url", "\\{$stuModuleDirname}_URL", true ,"\t"); + $config = $this->xc->getXcGetConfig('table_type'); + $func .= $this->xc->getXcXoopsTplAssign('table_type', $config, true, "\t"); + + $func .= $this->pc->getPhpCodeBlankLine(); + $func .= $this->getSimpleString('return $block;',"\t"); + $func .= $this->pc->getPhpCodeBlankLine(); + + $ret .= $this->pc->getPhpCodeFunction("b_{$moduleDirname}_{$tableName}_spotlight_show", '$options', $func, ''); + + return $ret; + } + + /** + * @public function getBlocksEdit + * @param string $moduleDirname + * @param string $tableName + * @param string $fieldId + * @param string $fieldMain + * @param string $language + * + * @return string + */ + private function getBlocksEdit(string $moduleDirname, string $tableName, string $fieldId, string $fieldMain, string $language) + { + $stuModuleDirname = \mb_strtoupper($moduleDirname); + $stuTableName = \mb_strtoupper($tableName); + $ucfTableName = \ucfirst($tableName); + $critName = 'cr' . $ucfTableName; + + $ret = $this->pc->getPhpCodeCommentMultiLine(['Function' => 'edit block', '@param $options' => '', '@return' => 'string']); + $func = $this->xc->getXcEqualsOperator('$helper', 'Helper::getInstance()', '',"\t"); + $func .= $this->xc->getXcHandlerLine($tableName, "\t"); + $func .= $this->xc->getXcXoopsTplAssign("{$moduleDirname}_upload_url","\\{$stuModuleDirname}_UPLOAD_URL",true,"\t"); + $func .= $this->xc->getXcEqualsOperator('$form', "{$language}DISPLAY_SPOTLIGHT . ' : '", '',"\t"); + $func .= $this->xc->getXcEqualsOperator('$form', "\"\"", '.',"\t"); + $func .= $this->xc->getXcEqualsOperator('$form', "\"
\"", '.',"\t"); + $func .= $this->xc->getXcEqualsOperator('$form', "{$language}TITLE_LENGTH . \" :
\"", '.',"\t"); + $func .= $this->pc->getPhpCodeArrayShift('$options', "\t"); + $func .= $this->pc->getPhpCodeArrayShift('$options', "\t"); + $func .= $this->pc->getPhpCodeArrayShift('$options', "\t"); + $func .= $this->pc->getPhpCodeBlankLine(); + $func .= $this->xc->getXcCriteriaCompo($critName, "\t"); + $crit = $this->xc->getXcCriteria('', "'{$fieldId}'", '0', "'!='", true); + $func .= $this->xc->getXcCriteriaAdd($critName, $crit, "\t"); + $func .= $this->xc->getXcCriteriaSetSort($critName, "'{$fieldId}'","\t"); + $func .= $this->xc->getXcCriteriaSetOrder($critName, "'ASC'","\t"); + $func .= $this->xc->getXcHandlerAllClear("{$tableName}All", $tableName, "\${$critName}", "\t"); + $func .= $this->pc->getPhpCodeUnset($critName, "\t"); + $func .= $this->xc->getXcEqualsOperator('$form', "{$language}{$stuTableName}_TO_DISPLAY . \"
'", '.',"\t"); + $func .= $this->pc->getPhpCodeBlankLine(); + $func .= $this->getSimpleString('return $form;', "\t"); + $func .= $this->pc->getPhpCodeBlankLine(); + + $ret .= $this->pc->getPhpCodeFunction("b_{$moduleDirname}_{$tableName}_spotlight_edit", '$options', $func, ''); + + return $ret; + + } + + /** + * @public function render + * + * @return string + */ + public function render() + { + $module = $this->getModule(); + $filename = $this->getFileName(); + $table = $this->getTable(); + $moduleDirname = $module->getVar('mod_dirname'); + $tableName = $table->getVar('table_name'); + $tablePermissions = $table->getVar('table_permissions'); + $language = $this->getLanguage($moduleDirname, 'MB'); + $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); + $fieldId = null; + $fieldMain = null; + foreach (\array_keys($fields) as $f) { + $fieldName = $fields[$f]->getVar('field_name'); + if (0 == $f) { + $fieldId = $fieldName; + } + if (1 == $fields[$f]->getVar('field_main')) { + $fieldMain = $fieldName; + } + } + $content = $this->getHeaderFilesComments($module); + $content .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', ''); + $content .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Helper'], '', ''); + $content .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']); + $content .= $this->pc->getPhpCodeIncludeDir("\XOOPS_ROOT_PATH . '/modules/{$moduleDirname}/include/common.php'",'',true, true); + $content .= $this->getBlocksShow($moduleDirname, $tableName, $tablePermissions, $fields, $fieldId); + $content .= $this->getBlocksEdit($moduleDirname, $tableName, $fieldId, $fieldMain, $language); + + $this->create($moduleDirname, 'blocks', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); + + return $this->renderFile(); + } +} diff --git a/class/Files/Blocks/index.php b/class/Files/Blocks/index.php new file mode 100644 index 00000000..e5ee0725 --- /dev/null +++ b/class/Files/Blocks/index.php @@ -0,0 +1,2 @@ +cf = Modulebuilder\Files\CreateFile::getInstance(); + } + + /** + * @static function getInstance + * + * @return Modulebuilder\Files\CheckData + */ + public static function getInstance() + { + static $instance = false; + if (!$instance) { + $instance = new self(); + } + + return $instance; + } + + /** + * @public function getCheckResult + * + * @param $module + * @return array + */ + public function getCheckPreBuilding($module) + { + $this->modId = $module->getVar('mod_id'); + $this->tables = $this->cf->getTableTables($this->modId); + $this->infos = []; + + $this->getCheckBlock(); + $this->getCheckBroken(); + $this->getCheckComments(); + $this->getCheckUserpage(); + $this->getCheckRating(); + $this->getCheckReads(); + $this->getCheckSql(); + + return $this->infos; + } + + /** + * @public function getCheckBroken + * + * @return void + */ + private function getCheckBroken(): void + { + foreach (\array_keys($this->tables) as $t) { + if (1 == $this->tables[$t]->getVar('table_broken')) { + $tableId = $this->tables[$t]->getVar('table_id'); + $tableName = $this->tables[$t]->getVar('table_name'); + $fields = $this->cf->getTableFields($this->modId, $tableId); + $fieldSatus = ''; + + foreach (\array_keys($fields) as $f) { + $fieldName = $fields[$f]->getVar('field_name'); + if (Constants::FIELD_ELE_SELECTSTATUS == $fields[$f]->getVar('field_element')) { + $fieldSatus = $fieldName; + } + } + // check whether each table with handling "broken" has also a field "status" + if ('' == $fieldSatus) { + $info = \str_replace('%t', $tableName, \_AM_MODULEBUILDER_BUILDING_CHECK_BROKEN1); + $this->infos[] = ['icon' => 'error', 'info' => $info]; + } + } + } + } + + /** + * @private function getCheckUserpage + * + * @return void + */ + private function getCheckUserpage(): void + { + //check field params: minimum one param is selected + foreach (\array_keys($this->tables) as $t) { + $tableId = $this->tables[$t]->getVar('table_id'); + $tableName = $this->tables[$t]->getVar('table_name'); + $fields = $this->cf->getTableFields($this->modId, $tableId); + + foreach (\array_keys($fields) as $f) { + $fieldName = $fields[$f]->getVar('field_name'); + // check fields for parameters + if ($f > 0) { + $fieldParams = (int)$fields[$f]->getVar('field_parent') + (int)$fields[$f]->getVar('field_admin') + (int)$fields[$f]->getVar('field_inlist') + (int)$fields[$f]->getVar('field_inform') + + (int)$fields[$f]->getVar('field_user') + (int)$fields[$f]->getVar('field_ihead') + (int)$fields[$f]->getVar('field_ibody') + (int)$fields[$f]->getVar('field_ifoot') + + (int)$fields[$f]->getVar('field_thead') + (int)$fields[$f]->getVar('field_tbody') + (int)$fields[$f]->getVar('field_tfoot') + (int)$fields[$f]->getVar('field_block') + + (int)$fields[$f]->getVar('field_main') + (int)$fields[$f]->getVar('field_search') + (int)$fields[$f]->getVar('field_required'); + if (0 == $fieldParams) { + $info = \str_replace(['%f', '%t'], [$fieldName, $tableName], \_AM_MODULEBUILDER_BUILDING_CHECK_FIELDS1); + $this->infos[] = ['icon' => 'error', 'info' => $info]; + } + } + } + } + + //check field params: user file no usage in index or item + foreach (\array_keys($this->tables) as $t) { + $tableId = $this->tables[$t]->getVar('table_id'); + $tableName = $this->tables[$t]->getVar('table_name'); + $fields = $this->cf->getTableFields($this->modId, $tableId); + + foreach (\array_keys($fields) as $f) { + $fieldName = $fields[$f]->getVar('field_name'); + if (1 == $fields[$f]->getVar('field_user')) { + // check fields for parameters + if ($f > 0) { + $fieldParams = (int)$fields[$f]->getVar('field_ihead') + (int)$fields[$f]->getVar('field_ibody') + (int)$fields[$f]->getVar('field_ifoot') + + (int)$fields[$f]->getVar('field_thead') + (int)$fields[$f]->getVar('field_tbody') + (int)$fields[$f]->getVar('field_tfoot'); + if (0 == $fieldParams) { + $info = \str_replace(['%f', '%t'], [$fieldName, $tableName], \_AM_MODULEBUILDER_BUILDING_CHECK_FIELDS2); + $this->infos[] = ['icon' => 'warning', 'info' => $info]; + } + } + } + } + } + //check field params: user file index multiple usage + //check field params: user file item multiple usage + foreach (\array_keys($this->tables) as $t) { + $tableId = $this->tables[$t]->getVar('table_id'); + $tableName = $this->tables[$t]->getVar('table_name'); + $fields = $this->cf->getTableFields($this->modId, $tableId); + + foreach (\array_keys($fields) as $f) { + $fieldName = $fields[$f]->getVar('field_name'); + if (1 == $fields[$f]->getVar('field_user')) { + // check fields for parameters + if ($f > 0) { + $fieldParams = (int)$fields[$f]->getVar('field_ihead') + (int)$fields[$f]->getVar('field_ibody') + (int)$fields[$f]->getVar('field_ifoot'); + if ($fieldParams > 1) { + $info = \str_replace(['%f', '%t'], [$fieldName, $tableName], \_AM_MODULEBUILDER_BUILDING_CHECK_FIELDS3); + $this->infos[] = ['icon' => 'warning', 'info' => $info]; + } + $fieldParams = (int)$fields[$f]->getVar('field_thead') + (int)$fields[$f]->getVar('field_tbody') + (int)$fields[$f]->getVar('field_tfoot'); + if ($fieldParams > 1) { + $info = \str_replace(['%f', '%t'], [$fieldName, $tableName], \_AM_MODULEBUILDER_BUILDING_CHECK_FIELDS3); + $this->infos[] = ['icon' => 'warning', 'info' => $info]; + } + } + } + } + } + + //check table params: user submit or rate or broken, but table not for user side + foreach (\array_keys($this->tables) as $t) { + $tableName = $this->tables[$t]->getVar('table_name'); + if ((0 == $this->tables[$t]->getVar('table_user')) && (1 == $this->tables[$t]->getVar('table_submit') || 1 == $this->tables[$t]->getVar('table_broken') || 1 == $this->tables[$t]->getVar('table_rate'))) { + $info = \str_replace(['%t'], [$tableName], \_AM_MODULEBUILDER_BUILDING_CHECK_USERPAGE1); + $this->infos[] = ['icon' => 'error', 'info' => $info]; + } + } + + //check field/table params: params for index file, but table param table_index = 0 + //check field/table params: params for user file, but table param table_user = 0 + foreach (\array_keys($this->tables) as $t) { + $tableId = $this->tables[$t]->getVar('table_id'); + $tableName = $this->tables[$t]->getVar('table_name'); + $tableIndex = (int)$this->tables[$t]->getVar('table_index'); + $tableUser = (int)$this->tables[$t]->getVar('table_user'); + $fields = $this->cf->getTableFields($this->modId, $tableId); + + $fieldParamsIndex = 0; + $fieldParamsUser = 0; + $fieldName = ''; + foreach (\array_keys($fields) as $f) { + $fieldName = $fields[$f]->getVar('field_name'); + if (1 == $fields[$f]->getVar('field_user')) { + // check fields for parameters + if ($f > 0) { + $fieldParams = (int)$fields[$f]->getVar('field_ihead') + (int)$fields[$f]->getVar('field_ibody') + (int)$fields[$f]->getVar('field_ifoot'); + $fieldParamsIndex += $fieldParams; + if ($fieldParams >= 1 && 0 == $tableIndex) { + $info = \str_replace(['%f', '%t'], [$fieldName, $tableName], \_AM_MODULEBUILDER_BUILDING_CHECK_FIELDS5); + $this->infos[] = ['icon' => 'warning', 'info' => $info]; + } + $fieldParams = (int)$fields[$f]->getVar('field_thead') + (int)$fields[$f]->getVar('field_tbody') + (int)$fields[$f]->getVar('field_tfoot'); + $fieldParamsUser += $fieldParams; + if ($fieldParams >= 1 && 0 == $tableUser) { + $info = \str_replace(['%f', '%t'], [$fieldName, $tableName], \_AM_MODULEBUILDER_BUILDING_CHECK_FIELDS7); + $this->infos[] = ['icon' => 'warning', 'info' => $info]; + } + } + } + } + if (0 == $fieldParamsIndex && 1 == $tableIndex) { + $info = \str_replace(['%f', '%t'], [$fieldName, $tableName], \_AM_MODULEBUILDER_BUILDING_CHECK_FIELDS4); + $this->infos[] = ['icon' => 'warning', 'info' => $info]; + } + if (0 == $fieldParamsUser && 1 == $tableUser) { + $info = \str_replace(['%f', '%t'], [$fieldName, $tableName], \_AM_MODULEBUILDER_BUILDING_CHECK_FIELDS6); + $this->infos[] = ['icon' => 'warning', 'info' => $info]; + } + } + + } + + /** + * @private function getCheckBlock + * + * @return void + */ + private function getCheckBlock(): void + { + //use in block but no field selected + foreach (\array_keys($this->tables) as $t) { + $tableId = $this->tables[$t]->getVar('table_id'); + $tableName = $this->tables[$t]->getVar('table_name'); + $fields = $this->cf->getTableFields($this->modId, $tableId); + $count = 0; + if (1 == $this->tables[$t]->getVar('table_blocks')) { + foreach (\array_keys($fields) as $f) { + if (1 == $fields[$f]->getVar('field_block')) { + $count++; + } + } + if (0 == $count) { + $info = \str_replace(['%t'], [$tableName], \_AM_MODULEBUILDER_BUILDING_CHECK_BLOCK1); + $this->infos[] = ['icon' => 'warning', 'info' => $info]; + } + } + } + //use in block but no field date + foreach (\array_keys($this->tables) as $t) { + $tableId = $this->tables[$t]->getVar('table_id'); + $tableName = $this->tables[$t]->getVar('table_name'); + + $count = 0; + if (1 == $this->tables[$t]->getVar('table_blocks')) { + $fields = $this->cf->getTableFields($this->modId, $tableId); + foreach (\array_keys($fields) as $f) { + if (Constants::FIELD_ELE_TEXTDATESELECT == $fields[$f]->getVar('field_element') || Constants::FIELD_ELE_DATETIME == $fields[$f]->getVar('field_element')) { + $count++; + } + } + if (0 == $count) { + $info = \str_replace(['%t'], [$tableName], \_AM_MODULEBUILDER_BUILDING_CHECK_BLOCK2); + $this->infos[] = ['icon' => 'warning', 'info' => $info]; + } + } + } + + } + + /** + * @private function getCheckComments + * + * @return void + */ + private function getCheckComments(): void + { + //use comments in multiple tables + $count = 0; + $tableComments = []; + foreach (\array_keys($this->tables) as $t) { + if (1 == $this->tables[$t]->getVar('table_comments')) { + $count++; + $tableComments[] = $this->tables[$t]->getVar('table_name'); + } + } + if ($count > 1) { + $tablesComments = \implode(', ', $tableComments); + $info = \str_replace('%t', $tablesComments, \_AM_MODULEBUILDER_BUILDING_CHECK_COMMENTS1); + $this->infos[] = ['icon' => 'error', 'info' => $info]; + } + + foreach (\array_keys($this->tables) as $t) { + if (1 == $this->tables[$t]->getVar('table_comments')) { + $tableId = $this->tables[$t]->getVar('table_id'); + $tableName = $this->tables[$t]->getVar('table_name'); + $fields = $this->cf->getTableFields($this->modId, $tableId); + $fieldComments = 0; + foreach (\array_keys($fields) as $f) { + if (Constants::FIELD_ELE_TEXTCOMMENTS == (int)$fields[$f]->getVar('field_element')) { + $fieldComments++; + } + } + // check whether each table with handling "comments" has also a field "comments" + if (0 == $fieldComments) { + $info = \str_replace('%t', $tableName, \_AM_MODULEBUILDER_BUILDING_CHECK_COMMENTS2); + $this->infos[] = ['icon' => 'warning', 'info' => $info]; + } + } + } + + } + + /** + * @private function getCheckRatings + * + * @return void + */ + private function getCheckRating(): void + { + foreach (\array_keys($this->tables) as $t) { + if (1 == $this->tables[$t]->getVar('table_rate')) { + $tableId = $this->tables[$t]->getVar('table_id'); + $tableName = $this->tables[$t]->getVar('table_name'); + $fields = $this->cf->getTableFields($this->modId, $tableId); + $fieldRatings = 0; + $fieldVotes = 0; + foreach (\array_keys($fields) as $f) { + if (Constants::FIELD_ELE_TEXTRATINGS == (int)$fields[$f]->getVar('field_element')) { + $fieldRatings++; + } + if (Constants::FIELD_ELE_TEXTVOTES == (int)$fields[$f]->getVar('field_element')) { + $fieldVotes++; + } + } + // check whether each table with handling "rating" has also a field "rating" + if (0 == $fieldRatings) { + $info = \str_replace('%t', $tableName, \_AM_MODULEBUILDER_BUILDING_CHECK_RATINGS1); + $this->infos[] = ['icon' => 'error', 'info' => $info]; + } + // check whether each table with handling "rating" has also a field "votes" + if (0 == $fieldVotes) { + $info = \str_replace('%t', $tableName, \_AM_MODULEBUILDER_BUILDING_CHECK_RATINGS2); + $this->infos[] = ['icon' => 'error', 'info' => $info]; + } + } + } + + } + + /** + * @private function getCheckReads + * + * @return void + */ + private function getCheckReads(): void + { + foreach (\array_keys($this->tables) as $t) { + if (1 == $this->tables[$t]->getVar('table_reads')) { + $tableId = $this->tables[$t]->getVar('table_id'); + $tableName = $this->tables[$t]->getVar('table_name'); + $fields = $this->cf->getTableFields($this->modId, $tableId); + $fieldReads = 0; + foreach (\array_keys($fields) as $f) { + if (Constants::FIELD_ELE_TEXTREADS == (int)$fields[$f]->getVar('field_element')) { + $fieldReads++; + } + } + // check whether each table with handling "reads" has also a field "reads" + if (0 == $fieldReads) { + $info = \str_replace('%t', $tableName, \_AM_MODULEBUILDER_BUILDING_CHECK_READS1); + $this->infos[] = ['icon' => 'error', 'info' => $info]; + } + } + } + + } + + /** + * @private function getCheckSql + * + * @return void + */ + private function getCheckSql(): void + { + foreach (\array_keys($this->tables) as $t) { + $tableId = $this->tables[$t]->getVar('table_id'); + $tableName = $this->tables[$t]->getVar('table_name'); + $fields = $this->cf->getTableFields($this->modId, $tableId); + foreach (\array_keys($fields) as $f) { + $fieldName = $fields[$f]->getVar('field_name'); + $fieldType = $fields[$f]->getVar('field_type'); + if (6 == $fieldType || 7 == $fieldType || 8 == $fieldType) { + $fieldValue = $fields[$f]->getVar('field_value'); + if (0 == \mb_strpos($fieldValue, ',')) { + $info = \str_replace(['%f', '%t'], [$fieldName, $tableName], \_AM_MODULEBUILDER_BUILDING_CHECK_SQL1); + $this->infos[] = ['icon' => 'error', 'info' => $info]; + } + $fieldDefault = $fields[$f]->getVar('field_default'); + if (0 == \mb_strpos($fieldDefault, '.')) { + $info = \str_replace(['%f', '%t'], [$fieldName, $tableName], \_AM_MODULEBUILDER_BUILDING_CHECK_SQL2); + $this->infos[] = ['icon' => 'warning', 'info' => $info]; + } + } + } + } + + } +} diff --git a/class/Files/Classes/ClassFiles.php b/class/Files/Classes/ClassFiles.php index d2e9410e..6907ec07 100644 --- a/class/Files/Classes/ClassFiles.php +++ b/class/Files/Classes/ClassFiles.php @@ -1,9 +1,12 @@ -cf = Modulebuilder\Files\CreateFile::getInstance(); + $this->xc = Modulebuilder\Files\CreateXoopsCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); + $this->cxc = Modulebuilder\Files\Classes\ClassXoopsCode::getInstance(); + $this->helper = Modulebuilder\Helper::getInstance(); } /** * @static function getInstance * - * @param null - * * @return ClassFiles */ public static function getInstance() @@ -61,12 +86,12 @@ public static function getInstance() /** * @public function write * - * @param string $module - * @param string $table - * @param mixed $tables + * @param $module + * @param $table + * @param $tables * @param $filename */ - public function write($module, $table, $tables, $filename) + public function write($module, $table, $tables, $filename): void { $this->setModule($module); $this->setTable($table); @@ -82,11 +107,9 @@ public function write($module, $table, $tables, $filename) * * @return string */ - private function getInitVar($fieldName, $type = 'INT') + private function getInitVar(string $fieldName, string $type = 'INT') { - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - - return $cxc->getClassInitVar($fieldName, $type); + return $this->cxc->getClassInitVar($fieldName, $type); } /** @@ -96,19 +119,20 @@ private function getInitVar($fieldName, $type = 'INT') * * @return string */ - private function getInitVars($fields) + private function getInitVars(array $fields) { $ret = ''; // Creation of the initVar functions list - foreach (array_keys($fields) as $f) { + foreach (\array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); $fieldType = $fields[$f]->getVar('field_type'); + //Attention: field_type is not the same as field_ele_type switch ($fieldType) { case 2: case 3: case 4: case 5: - $ret .= $this->getInitVar($fieldName, 'INT'); + $ret .= $this->getInitVar($fieldName); break; case 6: $ret .= $this->getInitVar($fieldName, 'FLOAT'); @@ -134,7 +158,11 @@ private function getInitVars($fields) case 16: case 17: case 18: - $ret .= $this->getInitVar($fieldName, 'TXTAREA'); + if ((int)$fields[$f]->getVar('field_element') == 4) { + $ret .= $this->getInitVar($fieldName, 'OTHER'); + } else { + $ret .= $this->getInitVar($fieldName, 'TXTAREA'); + } break; case 19: case 20: @@ -158,29 +186,30 @@ private function getInitVars($fields) */ private function getClassObject($module, $table, $fields) { - $tc = Tdmcreate\Helper::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); $moduleDirname = $module->getVar('mod_dirname'); $tableName = $table->getVar('table_name'); - $ucfTableName = ucfirst($tableName); - $ret = $pc->getPhpCodeDefined(); - $ret .= $pc->getPhpCodeCommentMultiLine(['Class Object' => $ucfTableName]); + $ucfTableName = \ucfirst($tableName); + $ret = $this->pc->getPhpCodeDefined(); + $ret .= $this->pc->getPhpCodeCommentMultiLine(['Class Object' => $ucfTableName]); $cCl = ''; $fieldInForm = []; $fieldElementId = []; $optionsFieldName = []; + $fieldUpload = false; $fieldId = null; - foreach (array_keys($fields) as $f) { + foreach (\array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); $fieldElement = $fields[$f]->getVar('field_element'); $fieldInForm[] = $fields[$f]->getVar('field_inform'); - $fieldElements = $tc->getHandler('fieldelements')->get($fieldElement); + $fieldElements = $this->helper->getHandler('Fieldelements')->get($fieldElement); $fieldElementId[] = $fieldElements->getVar('fieldelement_id'); + if (Constants::FIELD_ELE_UPLOADIMAGE == $fieldElements->getVar('fieldelement_id') || Constants::FIELD_ELE_UPLOADFILE == $fieldElements->getVar('fieldelement_id')) { + $fieldUpload = true; + } $rpFieldName = $this->getRightString($fieldName); - if (in_array(5, $fieldElementId)) { - //if (count($rpFieldName) % 5) { + if (\in_array(5, $fieldElementId)) { + //if (\count($rpFieldName) % 5) { //$optionsFieldName[] = "'" . $rpFieldName . "'"; //} else { $optionsFieldName[] = "'" . $rpFieldName . "'\n"; @@ -190,34 +219,38 @@ private function getClassObject($module, $table, $fields) $fieldId = $fieldName; } } - if (in_array(5, $fieldElementId) > 1) { - $cCl .= $pc->getPhpCodeCommentMultiLine(['Options' => '']); - $options = $pc->getPhpCodeArray('', $optionsFieldName, true); - $cCl .= $pc->getPhpCodeVariableClass('private', 'options', $options); + if (\in_array(5, $fieldElementId) > 1) { + $cCl .= $this->pc->getPhpCodeCommentMultiLine(['Options' => '']); + $options = $this->pc->getPhpCodeArray('', $optionsFieldName, true); + $cCl .= $this->pc->getPhpCodeVariableClass('private', 'options', $options); } unset($optionsFieldName); - - $cCl .= $pc->getPhpCodeCommentMultiLine(['Constructor' => '', '' => '', '@param' => 'null'], "\t"); + $cCl .= $this->pc->getPhpCodeCommentMultiLine(['@var' => 'int'], "\t"); + $cCl .= $this->pc->getPhpCodeVariableClass('public', 'start', '0', "\t"); + $cCl .= $this->pc->getPhpCodeCommentMultiLine(['@var' => 'int'], "\t"); + $cCl .= $this->pc->getPhpCodeVariableClass('public', 'limit', '0', "\t"); + $cCl .= $this->pc->getPhpCodeCommentMultiLine(['Constructor' => '', '' => ''], "\t"); $constr = $this->getInitVars($fields); - $cCl .= $pc->getPhpCodeFunction('__construct', '', $constr, 'public ', false, "\t"); - $arrayGetInstance = ['@static function' => '&getInstance', '' => '', '@param' => 'null']; - $cCl .= $pc->getPhpCodeCommentMultiLine($arrayGetInstance, "\t"); - $getInstance = $pc->getPhpCodeVariableClass('static', 'instance', 'false', "\t\t"); - $instance = $xc->getXcEqualsOperator('$instance', 'new self()', null, "\t\t\t"); - $getInstance .= $pc->getPhpCodeConditions('!$instance', '', '', $instance, false, "\t\t"); - $cCl .= $pc->getPhpCodeFunction('getInstance', '', $getInstance, 'public static ', false, "\t"); + $cCl .= $this->pc->getPhpCodeFunction('__construct', '', $constr, 'public ', false, "\t"); + $arrayGetInstance = ['@static function' => 'getInstance', '' => '']; + $cCl .= $this->pc->getPhpCodeCommentMultiLine($arrayGetInstance, "\t"); + $getInstance = $this->pc->getPhpCodeVariableClass('static', 'instance', 'false', "\t\t"); + $instance = $this->xc->getXcEqualsOperator('$instance', 'new self()', null, "\t\t\t"); + $getInstance .= $this->pc->getPhpCodeConditions('!$instance', '', '', $instance, false, "\t\t"); + $getInstance .= $this->cf->getSimpleString('return $instance;', "\t\t"); + $cCl .= $this->pc->getPhpCodeFunction('getInstance', '', $getInstance, 'public static ', false, "\t"); $cCl .= $this->getNewInsertId($table); - $cCl .= $this->getFunctionForm($module, $table, $fieldId, $fieldInForm); + $cCl .= $this->getFunctionForm($module, $table, $fieldId, $fieldInForm, $fieldUpload); $cCl .= $this->getValuesInObject($moduleDirname, $table, $fields); $cCl .= $this->getToArrayInObject($table); - if (in_array(5, $fieldElementId) > 1) { + if (\in_array(5, $fieldElementId) > 1) { $cCl .= $this->getOptionsCheck($table); } unset($fieldElementId); - $ret .= $pc->getPhpCodeClass($ucfTableName, $cCl, '\XoopsObject'); + $ret .= $this->pc->getPhpCodeClass($ucfTableName, $cCl, '\XoopsObject'); return $ret; } @@ -231,15 +264,13 @@ private function getClassObject($module, $table, $fields) */ private function getNewInsertId($table) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); $tableName = $table->getVar('table_name'); - $ucfTableName = ucfirst($tableName); - $ret = $pc->getPhpCodeCommentMultiLine(['The new inserted' => '$Id', '@return' => 'inserted id'], "\t"); - $getInsertedId = $xc->getXcEqualsOperator('$newInsertedId', "\$GLOBALS['xoopsDB']->getInsertId()", null, "\t\t"); + $ucfTableName = \ucfirst($tableName); + $ret = $this->pc->getPhpCodeCommentMultiLine(['The new inserted' => '$Id', '@return' => 'int'], "\t"); + $getInsertedId = $this->xc->getXcEqualsOperator('$newInsertedId', "\$GLOBALS['xoopsDB']->getInsertId()", null, "\t\t"); $getInsertedId .= $this->getSimpleString('return $newInsertedId;', "\t\t"); - $ret .= $pc->getPhpCodeFunction('getNewInsertedId' . $ucfTableName, '', $getInsertedId, 'public ', false, "\t"); + $ret .= $this->pc->getPhpCodeFunction('getNewInsertedId' . $ucfTableName, '', $getInsertedId, 'public ', false, "\t"); return $ret; } @@ -247,66 +278,60 @@ private function getNewInsertId($table) /** * @private function getFunctionForm * - * @param string $module - * @param string $table - * + * @param $module + * @param $table * @param $fieldId * @param $fieldInForm + * @param $fieldUpload * @return string */ - private function getFunctionForm($module, $table, $fieldId, $fieldInForm) + private function getFunctionForm($module, $table, $fieldId, $fieldInForm, $fieldUpload) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); $fe = ClassFormElements::getInstance(); $moduleDirname = $module->getVar('mod_dirname'); $tableName = $table->getVar('table_name'); $tableSoleName = $table->getVar('table_solename'); - $tableCategory = $table->getVar('table_category'); - $ucfTableName = ucfirst($tableName); - $stuTableSoleName = mb_strtoupper($tableSoleName); + $ucfTableName = \ucfirst($tableName); + $stuTableSoleName = \mb_strtoupper($tableSoleName); $language = $this->getLanguage($moduleDirname, 'AM'); $fe->initForm($module, $table); - $ret = $pc->getPhpCodeCommentMultiLine(['@public function' => 'getForm', '@param bool' => '$action', '@return' => '\XoopsThemeForm'], "\t"); - $action = $xc->getXcEqualsOperator('$action', "\$_SERVER['REQUEST_URI']", null, "\t\t\t"); - $ucfModuleDirname = ucfirst($moduleDirname); - $getForm = $xc->getXcGetInstance('helper', "\XoopsModules\\{$ucfModuleDirname}\Helper", "\t\t"); - $getForm .= $pc->getPhpCodeConditions('false', ' === ', '$action', $action, false, "\t\t"); - $xUser = $pc->getPhpCodeGlobals('xoopsUser'); - $xModule = $pc->getPhpCodeGlobals('xoopsModule'); - $permString = 'upload_groups'; - if (1 != $tableCategory/* && (1 == $tablePermissions)*/) { - $getForm .= $pc->getPhpCodeCommentLine('Permissions for', 'uploader', "\t\t"); - $getForm .= $xc->getXcXoopsHandler('groupperm', "\t\t"); - $getForm .= $pc->getPhpCodeTernaryOperator('groups', 'is_object(' . $xUser . ')', $xUser . '->getGroups()', 'XOOPS_GROUP_ANONYMOUS', "\t\t"); - $checkRight = $xc->getXcCheckRight('$grouppermHandler', $permString, 32, '$groups', $xModule . '->getVar(\'mid\')', true); - $ternaryOperator = $pc->getPhpCodeTernaryOperator('permissionUpload', $checkRight, 'true', 'false', "\t\t\t"); - $permissionUpload = $xc->getXcEqualsOperator('$permissionUpload', 'true', null, "\t\t\t\t"); - $ternOperator = $pc->getPhpCodeRemoveCarriageReturn($ternaryOperator, '', "\r"); - $if = $pc->getPhpCodeConditions('!' . $xUser . '->isAdmin(' . $xModule . '->mid())', '', '', "\t" . $ternaryOperator, $permissionUpload, "\t\t\t"); - $getForm .= $pc->getPhpCodeConditions($xUser, '', '', $if, $ternOperator, "\t\t"); + $ret = $this->pc->getPhpCodeCommentMultiLine(['@public function' => 'getForm', '@param bool' => '$action', '@return' => '\XoopsThemeForm'], "\t"); + $action = $this->xc->getXcEqualsOperator('$action', "\$_SERVER['REQUEST_URI']", null, "\t\t\t"); + $ucfModuleDirname = \ucfirst($moduleDirname); + $getForm = $this->xc->getXcGetInstance('helper', "\XoopsModules\\{$ucfModuleDirname}\Helper", "\t\t"); + $getForm .= $this->pc->getPhpCodeConditions('!', '', '$action', $action, false, "\t\t"); + $xUser = $this->pc->getPhpCodeGlobals('xoopsUser'); + $xModule = $this->pc->getPhpCodeGlobals('xoopsModule'); + $getForm .= $this->xc->getXcEqualsOperator('$isAdmin', "\is_object(\$GLOBALS['xoopsUser']) && \$GLOBALS['xoopsUser']->isAdmin(\$GLOBALS['xoopsModule']->mid())", null, "\t\t"); + if ($fieldUpload) { + $permString = 'upload_groups'; + $getForm .= $this->pc->getPhpCodeCommentLine('Permissions for', 'uploader', "\t\t"); + $getForm .= $this->xc->getXcXoopsHandler('groupperm', "\t\t"); + $getForm .= $this->pc->getPhpCodeTernaryOperator('groups', '\is_object(' . $xUser . ')', $xUser . '->getGroups()', '[\XOOPS_GROUP_ANONYMOUS]', "\t\t"); + $checkRight = $this->xc->getXcCheckRight('$grouppermHandler', $permString, '32', '$groups', $xModule . '->getVar(\'mid\')', true); + $getForm .= $this->pc->getPhpCodeTernaryOperator('permissionUpload', $checkRight, 'true', 'false', "\t\t"); } - $getForm .= $pc->getPhpCodeCommentLine('Title', '', "\t\t"); - $getForm .= $pc->getPhpCodeTernaryOperator('title', '$this->isNew()', "sprintf({$language}{$stuTableSoleName}_ADD)", "sprintf({$language}{$stuTableSoleName}_EDIT)", "\t\t"); - $getForm .= $pc->getPhpCodeCommentLine('Get Theme', 'Form', "\t\t"); - $getForm .= $xc->getXcXoopsLoad('XoopsFormLoader', "\t\t"); - $getForm .= $cxc->getClassXoopsThemeForm('form', 'title', 'form', 'action', 'post'); - $getForm .= $cxc->getClassSetExtra('form', "'enctype=\"multipart/form-data\"'"); + $getForm .= $this->pc->getPhpCodeCommentLine('Title', '', "\t\t"); + $getForm .= $this->pc->getPhpCodeTernaryOperator('title', '$this->isNew()', "{$language}{$stuTableSoleName}_ADD", "{$language}{$stuTableSoleName}_EDIT", "\t\t"); + $getForm .= $this->pc->getPhpCodeCommentLine('Get Theme', 'Form', "\t\t"); + $getForm .= $this->xc->getXcXoopsLoad('XoopsFormLoader', "\t\t"); + $getForm .= $this->cxc->getClassXoopsThemeForm('form', 'title', 'form', 'action', 'post'); + $getForm .= $this->cxc->getClassSetExtra('form', "'enctype=\"multipart/form-data\"'"); $getForm .= $fe->renderElements(); - if (in_array(1, $fieldInForm)) { + if (\in_array(1, $fieldInForm)) { if (1 == $table->getVar('table_permissions')) { $getForm .= $this->getPermissionsInForm($moduleDirname, $fieldId, $tableName); } } - $getForm .= $pc->getPhpCodeCommentLine('To Save', '', "\t\t"); - //$hiddenSave = $cc->getClassXoopsFormHidden('', "'op'", "'save'", true, false); - $getForm .= $cxc->getClassAddElement('form', "new \XoopsFormHidden('op', 'save')"); - $getForm .= $cxc->getClassAddElement('form', "new \XoopsFormButtonTray('', _SUBMIT, 'submit', '', false)"); + $getForm .= $this->pc->getPhpCodeCommentLine('To Save', '', "\t\t"); + $getForm .= $this->cxc->getClassAddElement('form', "new \XoopsFormHidden('op', 'save')"); + $getForm .= $this->cxc->getClassAddElement('form', "new \XoopsFormHidden('start', \$this->start)"); + $getForm .= $this->cxc->getClassAddElement('form', "new \XoopsFormHidden('limit', \$this->limit)"); + $getForm .= $this->cxc->getClassAddElement('form', "new \XoopsFormButtonTray('', \_SUBMIT, 'submit', '', false)"); $getForm .= $this->getSimpleString('return $form;', "\t\t"); - $ret .= $pc->getPhpCodeFunction('getForm' . $ucfTableName, '$action = false', $getForm, 'public ', false, "\t"); + $ret .= $this->pc->getPhpCodeFunction('getForm' . $ucfTableName, '$action = false', $getForm, 'public ', false, "\t"); return $ret; } @@ -315,50 +340,44 @@ private function getFunctionForm($module, $table, $fieldId, $fieldInForm) * @private function getPermissionsInForm * * @param string $moduleDirname - * @param string $fieldId + * @param string|null $fieldId * * @param $tableName * @return string */ - private function getPermissionsInForm($moduleDirname, $fieldId, $tableName) + private function getPermissionsInForm(string $moduleDirname, ?string $fieldId, $tableName) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); $permissionApprove = $this->getLanguage($moduleDirname, 'AM', 'PERMISSIONS_APPROVE'); $permissionSubmit = $this->getLanguage($moduleDirname, 'AM', 'PERMISSIONS_SUBMIT'); $permissionView = $this->getLanguage($moduleDirname, 'AM', 'PERMISSIONS_VIEW'); - $ret = $pc->getPhpCodeCommentLine('Permissions', '', "\t\t"); - $ret .= $xc->getXcXoopsHandler('member', "\t\t"); - $ret .= $xc->getXcEqualsOperator('$groupList', '$memberHandler->getGroupList()', null, "\t\t"); - $ret .= $xc->getXcXoopsHandler('groupperm', "\t\t"); - $ret .= $pc->getPhpCodeArrayType('fullList', 'keys', 'groupList', null, false, "\t\t"); - $fId = $xc->getXcGetVar('', 'this', $fieldId, true); - $mId = $xc->getXcGetVar('', "GLOBALS['xoopsModule']", 'mid', true); - $ifGroups = $xc->getXcGetGroupIds('groupsIdsApprove', 'grouppermHandler', "'{$moduleDirname}_approve_{$tableName}'", $fId, $mId, "\t\t\t"); - $ifGroups .= $pc->getPhpCodeArrayType('groupsIdsApprove', 'values', 'groupsIdsApprove', null, false, "\t\t\t"); - $ifGroups .= $cxc->getClassXoopsFormCheckBox('groupsCanApproveCheckbox', $permissionApprove, "groups_approve_{$tableName}[]", '$groupsIdsApprove', false, "\t\t\t"); - $ifGroups .= $xc->getXcGetGroupIds('groupsIdsSubmit', 'grouppermHandler', "'{$moduleDirname}_submit_{$tableName}'", $fId, $mId, "\t\t\t"); - $ifGroups .= $pc->getPhpCodeArrayType('groupsIdsSubmit', 'values', 'groupsIdsSubmit', null, false, "\t\t\t"); - $ifGroups .= $cxc->getClassXoopsFormCheckBox('groupsCanSubmitCheckbox', $permissionSubmit, "groups_submit_{$tableName}[]", '$groupsIdsSubmit', false, "\t\t\t"); - $ifGroups .= $xc->getXcGetGroupIds('groupsIdsView', 'grouppermHandler', "'{$moduleDirname}_view_{$tableName}'", $fId, $mId, "\t\t\t"); - $ifGroups .= $pc->getPhpCodeArrayType('groupsIdsView', 'values', 'groupsIdsView', null, false, "\t\t\t"); - $ifGroups .= $cxc->getClassXoopsFormCheckBox('groupsCanViewCheckbox', $permissionView, "groups_view_{$tableName}[]", '$groupsIdsView', false, "\t\t\t"); - - $else = $cxc->getClassXoopsFormCheckBox('groupsCanApproveCheckbox', $permissionApprove, "groups_approve_{$tableName}[]", '$fullList', false, "\t\t\t"); - $else .= $cxc->getClassXoopsFormCheckBox('groupsCanSubmitCheckbox', $permissionSubmit, "groups_submit_{$tableName}[]", '$fullList', false, "\t\t\t"); - $else .= $cxc->getClassXoopsFormCheckBox('groupsCanViewCheckbox', $permissionView, "groups_view_{$tableName}[]", '$fullList', false, "\t\t\t"); - - $ret .= $pc->getPhpCodeConditions('!$this->isNew()', null, null, $ifGroups, $else, "\t\t"); - $ret .= $pc->getPhpCodeCommentLine('To Approve', '', "\t\t"); - $ret .= $cxc->getClassAddOptionArray('groupsCanApproveCheckbox', '$groupList'); - $ret .= $cxc->getClassAddElement('form', '$groupsCanApproveCheckbox'); - $ret .= $pc->getPhpCodeCommentLine('To Submit', '', "\t\t"); - $ret .= $cxc->getClassAddOptionArray('groupsCanSubmitCheckbox', '$groupList'); - $ret .= $cxc->getClassAddElement('form', '$groupsCanSubmitCheckbox'); - $ret .= $pc->getPhpCodeCommentLine('To View', '', "\t\t"); - $ret .= $cxc->getClassAddOptionArray('groupsCanViewCheckbox', '$groupList'); - $ret .= $cxc->getClassAddElement('form', '$groupsCanViewCheckbox'); + $ret = $this->pc->getPhpCodeCommentLine('Permissions', '', "\t\t"); + $ret .= $this->xc->getXcXoopsHandler('member', "\t\t"); + $ret .= $this->xc->getXcEqualsOperator('$groupList', '$memberHandler->getGroupList()', null, "\t\t"); + $ret .= $this->xc->getXcXoopsHandler('groupperm', "\t\t"); + $ret .= $this->pc->getPhpCodeArrayType('fullList', 'keys', 'groupList'); + $fId = $this->xc->getXcGetVar('', 'this', $fieldId, true); + $mId = $this->xc->getXcGetVar('', "GLOBALS['xoopsModule']", 'mid', true); + $contElse = $this->xc->getXcGetGroupIds('groupsIdsApprove', 'grouppermHandler', "'{$moduleDirname}_approve_{$tableName}'", $fId, $mId, "\t\t\t"); + $contElse .= $this->cxc->getClassXoopsFormCheckBox('groupsCanApproveCheckbox', $permissionApprove, "groups_approve_{$tableName}[]", '$groupsIdsApprove', false, "\t\t\t"); + $contElse .= $this->xc->getXcGetGroupIds('groupsIdsSubmit', 'grouppermHandler', "'{$moduleDirname}_submit_{$tableName}'", $fId, $mId, "\t\t\t"); + $contElse .= $this->cxc->getClassXoopsFormCheckBox('groupsCanSubmitCheckbox', $permissionSubmit, "groups_submit_{$tableName}[]", '$groupsIdsSubmit', false, "\t\t\t"); + $contElse .= $this->xc->getXcGetGroupIds('groupsIdsView', 'grouppermHandler', "'{$moduleDirname}_view_{$tableName}'", $fId, $mId, "\t\t\t"); + $contElse .= $this->cxc->getClassXoopsFormCheckBox('groupsCanViewCheckbox', $permissionView, "groups_view_{$tableName}[]", '$groupsIdsView', false, "\t\t\t"); + + $contIf = $this->cxc->getClassXoopsFormCheckBox('groupsCanApproveCheckbox', $permissionApprove, "groups_approve_{$tableName}[]", '$fullList', false, "\t\t\t"); + $contIf .= $this->cxc->getClassXoopsFormCheckBox('groupsCanSubmitCheckbox', $permissionSubmit, "groups_submit_{$tableName}[]", '$fullList', false, "\t\t\t"); + $contIf .= $this->cxc->getClassXoopsFormCheckBox('groupsCanViewCheckbox', $permissionView, "groups_view_{$tableName}[]", '$fullList', false, "\t\t\t"); + + $ret .= $this->pc->getPhpCodeConditions('$this->isNew()', '', '', $contIf, $contElse, "\t\t"); + $ret .= $this->pc->getPhpCodeCommentLine('To Approve', '', "\t\t"); + $ret .= $this->cxc->getClassAddOptionArray('groupsCanApproveCheckbox', '$groupList'); + $ret .= $this->cxc->getClassAddElement('form', '$groupsCanApproveCheckbox'); + $ret .= $this->pc->getPhpCodeCommentLine('To Submit', '', "\t\t"); + $ret .= $this->cxc->getClassAddOptionArray('groupsCanSubmitCheckbox', '$groupList'); + $ret .= $this->cxc->getClassAddElement('form', '$groupsCanSubmitCheckbox'); + $ret .= $this->pc->getPhpCodeCommentLine('To View', '', "\t\t"); + $ret .= $this->cxc->getClassAddOptionArray('groupsCanViewCheckbox', '$groupList'); + $ret .= $this->cxc->getClassAddElement('form', '$groupsCanViewCheckbox'); return $ret; } @@ -374,66 +393,145 @@ private function getPermissionsInForm($moduleDirname, $fieldId, $tableName) */ private function getValuesInObject($moduleDirname, $table, $fields) { - $tc = Tdmcreate\Helper::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $ucfTableName = ucfirst($table->getVar('table_name')); - $ret = $pc->getPhpCodeCommentMultiLine(['Get' => 'Values', '@param null $keys' => '', '@param null $format' => '', '@param null$maxDepth' => '', '@return' => 'array'], "\t"); - $ucfModuleDirname = ucfirst($moduleDirname); - $getValues = $xc->getXcGetInstance('helper', "\XoopsModules\\{$ucfModuleDirname}\Helper", "\t\t"); - $getValues .= $xc->getXcEqualsOperator('$ret', '$this->getValues($keys, $format, $maxDepth)', null, "\t\t"); + $ucfTableName = \ucfirst($table->getVar('table_name')); + $ret = $this->pc->getPhpCodeCommentMultiLine(['Get' => 'Values', '@param string $keys' => '', '@param string $format' => '', '@param string $maxDepth' => '', '@return' => 'array'], "\t"); + $ucfModuleDirname = \ucfirst($moduleDirname); + $language = $this->getLanguage($moduleDirname, 'AM'); + $getValues = $this->xc->getXcEqualsOperator('$ret', '$this->getValues($keys, $format, $maxDepth)', null, "\t\t"); + $tablePermissions = $table->getVar('table_permissions'); + $tableBroken = $table->getVar('table_broken'); $fieldMainTopic = null; - foreach (array_keys($fields) as $f) { + $helper = 0; + $utility = 0; + $header = ''; + $configMaxchar = 0; + $lenMaxName = 0; + foreach (\array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); $fieldElement = $fields[$f]->getVar('field_element'); $rpFieldName = $this->getRightString($fieldName); + $len = \mb_strlen($rpFieldName) + \mb_strlen('_short'); + $lenMaxName = max($len, $lenMaxName); + if (Constants::FIELD_ELE_TEXTAREA == $fieldElement || Constants::FIELD_ELE_DHTMLTEXTAREA == $fieldElement) { + $configMaxchar = 1; + } + } + if (1 === $configMaxchar) { + $getValues .= $this->xc->getXcEqualsOperator('$editorMaxchar', $this->xc->getXcGetConfig('editor_maxchar'), false, "\t\t"); + } + foreach (\array_keys($fields) as $f) { + $fieldName = $fields[$f]->getVar('field_name'); + $fieldElement = $fields[$f]->getVar('field_element'); + $rpFieldName = $this->getRightString($fieldName); + $spacer = str_repeat(' ', $lenMaxName - \mb_strlen($rpFieldName)); switch ($fieldElement) { - case 3: - case 4: - $getValues .= $pc->getPhpCodeStripTags("ret['{$rpFieldName}']", "\$this->getVar('{$fieldName}')", false, "\t\t"); + case Constants::FIELD_ELE_TEXTAREA: + $spacer = str_repeat(' ', \max(0, $lenMaxName - 5 - \mb_strlen($rpFieldName))); + $getValues .= $this->pc->getPhpCodeStripTags("ret['{$rpFieldName}_text']{$spacer}", "\$this->getVar('{$fieldName}', 'e')", false, "\t\t"); + $truncate = "\$utility::truncateHtml(\$ret['{$rpFieldName}_text'], \$editorMaxchar)"; + $spacer = str_repeat(' ', $lenMaxName - \mb_strlen($rpFieldName) - \mb_strlen('_short')); + $getValues .= $this->xc->getXcEqualsOperator("\$ret['{$rpFieldName}_short']{$spacer}", $truncate, false, "\t\t"); + $helper = 1; + $utility = 1; break; - case 6: - $getValues .= $xc->getXcEqualsOperator("\$ret['{$rpFieldName}']", "(int)\$this->getVar('{$fieldName}') > 0 ? _YES : _NO", false, "\t\t"); + case Constants::FIELD_ELE_DHTMLTEXTAREA: + $spacer = str_repeat(' ', \max(0, $lenMaxName - 5 - \mb_strlen($rpFieldName))); + $getValues .= $this->xc->getXcGetVar("ret['{$rpFieldName}_text']{$spacer}", 'this', $fieldName, false, "\t\t", ", 'e'"); + $truncate = "\$utility::truncateHtml(\$ret['{$rpFieldName}_text'], \$editorMaxchar)"; + $spacer = str_repeat(' ', $lenMaxName - \mb_strlen($rpFieldName) - \mb_strlen('_short')); + $getValues .= $this->xc->getXcEqualsOperator("\$ret['{$rpFieldName}_short']{$spacer}", $truncate, false, "\t\t"); + $helper = 1; + $utility = 1; break; - case 8: - $getValues .= $xc->getXcXoopsUserUnameFromId("ret['{$rpFieldName}']", "\$this->getVar('{$fieldName}')", "\t\t"); + case Constants::FIELD_ELE_RADIOYN: + $spacer = str_repeat(' ', \max(0, $lenMaxName - 5 - \mb_strlen($rpFieldName))); + $getValues .= $this->xc->getXcEqualsOperator("\$ret['{$rpFieldName}_text']{$spacer}", "(int)\$this->getVar('{$fieldName}') > 0 ? _YES : _NO", false, "\t\t"); break; - case 15: - $getValues .= $xc->getXcFormatTimeStamp("ret['{$rpFieldName}']", "\$this->getVar('{$fieldName}')", 's', "\t\t"); + case Constants::FIELD_ELE_RADIO_ONOFFLINE: + $spacer = str_repeat(' ', \max(0, $lenMaxName - 5 - \mb_strlen($rpFieldName))); + $defaultRO = $this->xc->getXcGetConstants('RADIO_OFFLINE'); + $offlineRO = $language . 'STATUS_OFFLINE'; + $onlineRO = $language . 'STATUS_ONLINE'; + $getValues .= $this->xc->getXcEqualsOperator("\$ret['{$rpFieldName}_text']{$spacer}", "(int)\$this->getVar('{$fieldName}') > $defaultRO ? $onlineRO : $offlineRO", false, "\t\t"); break; - case 21: - $getValues .= $xc->getXcFormatTimeStamp("ret['{$rpFieldName}']", "\$this->getVar('{$fieldName}')", 'm', "\t\t"); + case Constants::FIELD_ELE_SELECTUSER: + $spacer = str_repeat(' ', \max(0, $lenMaxName - 5 - \mb_strlen($rpFieldName))); + $getValues .= $this->xc->getXcXoopsUserUnameFromId("ret['{$rpFieldName}_text']{$spacer}", "\$this->getVar('{$fieldName}')", "\t\t"); + break; + case Constants::FIELD_ELE_TEXTDATESELECT: + $spacer = str_repeat(' ', \max(0, $lenMaxName - 5 - \mb_strlen($rpFieldName))); + $getValues .= $this->xc->getXcFormatTimeStamp("ret['{$rpFieldName}_text']{$spacer}", "\$this->getVar('{$fieldName}')", 's', "\t\t"); + break; + case Constants::FIELD_ELE_SELECTSTATUS: + $spacer = str_repeat(' ', $lenMaxName - \mb_strlen('status') + 7); + $getValues .= $this->xc->getXcGetVar("status{$spacer}", 'this', $fieldName, false, "\t\t"); + $spacer = str_repeat(' ', $lenMaxName - \mb_strlen('status')); + $getValues .= $this->xc->getXcEqualsOperator("\$ret['status']{$spacer}", '$status', false, "\t\t"); + $contCase1 = $this->xc->getXcEqualsOperator('$status_text', $language . 'STATUS_NONE', false, "\t\t\t\t"); + $cases[$this->xc->getXcGetConstants('STATUS_NONE')] = [$contCase1]; + $contCase2 = $this->xc->getXcEqualsOperator('$status_text', $language . 'STATUS_OFFLINE', false, "\t\t\t\t"); + $cases[$this->xc->getXcGetConstants('STATUS_OFFLINE')] = [$contCase2]; + $contCase3 = $this->xc->getXcEqualsOperator('$status_text', $language . 'STATUS_SUBMITTED', false, "\t\t\t\t"); + $cases[$this->xc->getXcGetConstants('STATUS_SUBMITTED')] = [$contCase3]; + if (1 == $tablePermissions) { + $contCase4 = $this->xc->getXcEqualsOperator('$status_text', $language . 'STATUS_APPROVED', false, "\t\t\t\t"); + $cases[$this->xc->getXcGetConstants('STATUS_APPROVED')] = [$contCase4]; + } + if (1 == $tableBroken) { + $contCase5 = $this->xc->getXcEqualsOperator('$status_text', $language . 'STATUS_BROKEN', false, "\t\t\t\t"); + $cases[$this->xc->getXcGetConstants('STATUS_BROKEN')] = [$contCase5]; + } + $contentSwitch = $this->pc->getPhpCodeCaseSwitch($cases, true, "\t\t\t", true); + $getValues .= $this->pc->getPhpCodeSwitch('status', $contentSwitch, "\t\t"); + $len = $lenMaxName - \mb_strlen('status_text'); + $spacer = $len > 0 ? str_repeat(' ', $len) : ''; + $getValues .= $this->xc->getXcEqualsOperator("\$ret['status_text']{$spacer}", '$status_text', false, "\t\t"); + break; + case Constants::FIELD_ELE_DATETIME: + $spacer = str_repeat(' ', \max(0, $lenMaxName - 5 - \mb_strlen($rpFieldName))); + $getValues .= $this->xc->getXcFormatTimeStamp("ret['{$rpFieldName}_text']{$spacer}", "\$this->getVar('{$fieldName}')", 'm', "\t\t"); break; default: - $fieldElements = $tc->getHandler('fieldelements')->get($fieldElement); + $fieldElements = $this->helper->getHandler('Fieldelements')->get($fieldElement); $fieldElementTid = $fieldElements->getVar('fieldelement_tid'); if ((int)$fieldElementTid > 0 ) { $fieldElementMid = $fieldElements->getVar('fieldelement_mid'); - $fieldElementName = $fieldElements->getVar('fieldelement_name'); - $fieldNameDesc = mb_substr($fieldElementName, mb_strrpos($fieldElementName, ':'), mb_strlen($fieldElementName)); - $topicTableName = str_replace(': ', '', mb_strtolower($fieldNameDesc)); + $fieldElementName = (string)$fieldElements->getVar('fieldelement_name'); + $fieldNameDesc = mb_substr($fieldElementName, \mb_strrpos($fieldElementName, ':'), mb_strlen($fieldElementName)); + $topicTableName = \str_replace(': ', '', \mb_strtolower($fieldNameDesc)); $fieldsTopics = $this->getTableFields($fieldElementMid, $fieldElementTid); - foreach (array_keys($fieldsTopics) as $g) { + foreach (\array_keys($fieldsTopics) as $g) { $fieldNameTopic = $fieldsTopics[$g]->getVar('field_name'); if (1 == $fieldsTopics[$g]->getVar('field_main')) { $fieldMainTopic = $fieldNameTopic; } } - $getValues .= $xc->getXcHandlerLine($topicTableName, "\t\t"); + $getValues .= $this->xc->getXcHandlerLine($topicTableName, "\t\t"); $getTopicTable = "\${$topicTableName}Handler->get(\$this->getVar('{$fieldName}'))"; - $getValues .= $xc->getXcEqualsOperator("\${$topicTableName}Obj", $getTopicTable, null, "\t\t"); - $fMainTopic = "\${$topicTableName}Obj->getVar('{$fieldMainTopic}')"; - $getValues .= $xc->getXcEqualsOperator("\$ret['{$rpFieldName}']", $fMainTopic, null, "\t\t"); - + $getValues .= $this->xc->getXcEqualsOperator("\${$topicTableName}Obj", $getTopicTable, null, "\t\t"); + $fMainTopic = "\${$topicTableName}Obj->getVar('{$fieldMainTopic}')"; + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $getValues .= $this->xc->getXcEqualsOperator("\${$ccFieldName}", "''", null, "\t\t"); + $condIf = $this->xc->getXcEqualsOperator("\${$ccFieldName}", $fMainTopic, null, "\t\t\t"); + $tablenameObj = $this->pc->getPhpCodeIsobject($topicTableName . 'Obj'); + $getValues .= $this->pc->getPhpCodeConditions($tablenameObj, '', '', $condIf, false, "\t\t"); + $getValues .= $this->xc->getXcEqualsOperator("\$ret['{$rpFieldName}']{$spacer}", "\${$ccFieldName}", null, "\t\t"); + $helper = 1; } else { - $getValues .= $xc->getXcGetVar("ret['{$rpFieldName}']", 'this', $fieldName, false, "\t\t"); + $getValues .= $this->xc->getXcGetVar("ret['{$rpFieldName}']{$spacer}", 'this', $fieldName, false, "\t\t"); } break; } } + if ($helper > 0) { + $header .= $this->xc->getXcGetInstance('helper ', "\XoopsModules\\{$ucfModuleDirname}\Helper", "\t\t"); + } + if ($utility > 0) { + $header .= $this->xc->getXcEqualsOperator('$utility', "new \XoopsModules\\{$ucfModuleDirname}\Utility()", '',"\t\t"); + } $getValues .= $this->getSimpleString('return $ret;', "\t\t"); - $ret .= $pc->getPhpCodeFunction('getValues' . $ucfTableName, '$keys = null, $format = null, $maxDepth = null', $getValues, 'public ', false, "\t"); + $ret .= $this->pc->getPhpCodeFunction('getValues' . $ucfTableName, '$keys = null, $format = null, $maxDepth = null', $header . $getValues, 'public ', false, "\t"); return $ret; } @@ -447,20 +545,18 @@ private function getValuesInObject($moduleDirname, $table, $fields) */ private function getToArrayInObject($table) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); $tableName = $table->getVar('table_name'); - $ucfTableName = ucfirst($tableName); + $ucfTableName = \ucfirst($tableName); $multiLineCom = ['Returns an array representation' => 'of the object', '' => '', '@return' => 'array']; - $ret = $pc->getPhpCodeCommentMultiLine($multiLineCom, "\t"); + $ret = $this->pc->getPhpCodeCommentMultiLine($multiLineCom, "\t"); - $getToArray = $pc->getPhpCodeArray('ret', [], false, "\t\t"); - $getToArray .= $xc->getXcEqualsOperator('$vars', '$this->getVars()', null, "\t\t"); - $foreach = $xc->getXcGetVar('ret[$var]', 'this', '"{$var}"', false, "\t\t\t"); - $getToArray .= $pc->getPhpCodeForeach('vars', true, false, 'var', $foreach, "\t\t"); + $getToArray = $this->pc->getPhpCodeArray('ret', []); + $getToArray .= $this->xc->getXcEqualsOperator('$vars', '$this->getVars()', null, "\t\t"); + $foreach = $this->xc->getXcEqualsOperator('$ret[$var]', '$this->getVar($var)', null, "\t\t\t"); + $getToArray .= $this->pc->getPhpCodeForeach('vars', true, false, 'var', $foreach, "\t\t"); $getToArray .= $this->getSimpleString('return $ret;', "\t\t"); - $ret .= $pc->getPhpCodeFunction('toArray' . $ucfTableName, '', $getToArray, 'public ', false, "\t"); + $ret .= $this->pc->getPhpCodeFunction('toArray' . $ucfTableName, '', $getToArray, 'public ', false, "\t"); return $ret; } @@ -474,55 +570,51 @@ private function getToArrayInObject($table) */ private function getOptionsCheck($table) { - $tc = Tdmcreate\Helper::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); $tableName = $table->getVar('table_name'); - $ucfTableName = ucfirst($tableName); - $ret = $pc->getPhpCodeCommentMultiLine(['Get' => 'Options'], "\t"); - $getOptions = $pc->getPhpCodeArray('ret', [], false, "\t"); + $ucfTableName = \ucfirst($tableName); + $ret = $this->pc->getPhpCodeCommentMultiLine(['Get' => 'Options'], "\t"); + $getOptions = $this->pc->getPhpCodeArray('ret', [], false, "\t"); $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); - foreach (array_keys($fields) as $f) { + foreach (\array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); $fieldElement = $fields[$f]->getVar('field_element'); - $fieldElements = $tc->getHandler('fieldelements')->get($fieldElement); + $fieldElements = $this->helper->getHandler('Fieldelements')->get($fieldElement); $fieldElementId = $fieldElements->getVar('fieldelement_id'); $rpFieldName = $this->getRightString($fieldName); if (5 == $fieldElementId) { - $arrayPush = $pc->getPhpCodeArrayType('ret', 'push', "'{$rpFieldName}'", null, false, "\t\t\t"); - $getOptions .= $pc->getPhpCodeConditions(1, ' == ', "\$this->getVar('{$fieldName}')", $arrayPush, false, "\t\t"); + $arrayPush = $this->pc->getPhpCodeArrayType('ret', 'push', "'{$rpFieldName}'", null, false, "\t\t\t"); + $getOptions .= $this->pc->getPhpCodeConditions("\$this->getVar('{$fieldName}')", ' == ', '1', $arrayPush, false, "\t\t"); } } $getOptions .= $this->getSimpleString('return $ret;', "\t\t"); - $ret .= $pc->getPhpCodeFunction('getOptions' . $ucfTableName, '', $getOptions, 'public ', false, "\t"); + $ret .= $this->pc->getPhpCodeFunction('getOptions' . $ucfTableName, '', $getOptions, 'public ', false, "\t"); return $ret; } /** * @public function render - * @param null * - * @return bool|string + * @return string */ public function render() { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); $module = $this->getModule(); $table = $this->getTable(); $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); - $namespace = $pc->getPhpCodeNamespace(['XoopsModules', $moduleDirname]); + $namespace = $this->pc->getPhpCodeNamespace(['XoopsModules', $moduleDirname]); $content = $this->getHeaderFilesComments($module, null, $namespace); - $content .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname]); + $content .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname]); $content .= $this->getClassObject($module, $table, $fields); - $this->create($moduleDirname, 'class', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'class', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/Classes/ClassFormElements.php b/class/Files/Classes/ClassFormElements.php index 3ff31b95..c90ca222 100644 --- a/class/Files/Classes/ClassFormElements.php +++ b/class/Files/Classes/ClassFormElements.php @@ -1,8 +1,9 @@ -helper = Modulebuilder\Helper::getInstance(); + $this->cf = Modulebuilder\Files\CreateFile::getInstance(); + $this->xc = Modulebuilder\Files\CreateXoopsCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); + $this->tf = Modulebuilder\Files\CreateTableFields::getInstance(); + $this->cxc = Modulebuilder\Files\Classes\ClassXoopsCode::getInstance(); + } + /** * @static function getInstance - * @param null * * @return ClassFormElements */ @@ -52,7 +90,7 @@ public static function getInstance() * @param $module * @param $table */ - public function initForm($module, $table) + public function initForm($module, $table): void { $this->setModule($module); $this->setTable($table); @@ -67,22 +105,17 @@ public function initForm($module, $table) * @param string $required * @return string */ - private function getXoopsFormText($language, $fieldName, $fieldDefault, $required = 'false') + private function getXoopsFormText($language, $fieldName, $fieldDefault, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $ret = $this->pc->getPhpCodeCommentLine('Form Text', $ccFieldName, "\t\t"); if ('' != $fieldDefault) { - $ret = $pc->getPhpCodeCommentLine('Form Text', $ccFieldName, "\t\t"); - $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', "'{$fieldDefault}'", "\$this->getVar('{$fieldName}')", "\t\t"); - $formText = $cxc->getClassXoopsFormText('', $language, $fieldName, 20, 150, $ccFieldName, true); - $ret .= $cxc->getClassAddElement('form', $formText . $required); + $ret .= $this->pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', "'{$fieldDefault}'", "\$this->getVar('{$fieldName}')", "\t\t"); + $formText = $this->cxc->getClassXoopsFormText('', $language, $fieldName, 20, 150, $ccFieldName, true); } else { - $ret = $pc->getPhpCodeCommentLine('Form Text', $ccFieldName, "\t\t"); - $formText = $cxc->getClassXoopsFormText('', $language, $fieldName, 50, 255, "this->getVar('{$fieldName}')", true); - $ret .= $cxc->getClassAddElement('form', $formText . $required); + $formText = $this->cxc->getClassXoopsFormText('', $language, $fieldName, 50, 255, "this->getVar('{$fieldName}')", true); } + $ret .= $this->cxc->getClassAddElement('form', $formText . $required); return $ret; } @@ -92,19 +125,16 @@ private function getXoopsFormText($language, $fieldName, $fieldDefault, $require * * @param $language * @param $fieldName - * @param $required + * @param string $required * * @return string */ - private function getXoopsFormTextArea($language, $fieldName, $required = 'false') + private function getXoopsFormTextArea($language, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $ret = $pc->getPhpCodeCommentLine('Form Editor', 'TextArea ' . $ccFieldName, "\t\t"); - $formTextArea = $cxc->getClassXoopsFormTextArea('', $language, $fieldName, 4, 47, true); - $ret .= $cxc->getClassAddElement('form', $formTextArea . $required); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $ret = $this->pc->getPhpCodeCommentLine('Form Editor', 'TextArea ' . $ccFieldName, "\t\t"); + $formTextArea = $this->cxc->getClassXoopsFormTextArea('', $language, $fieldName, 4, 47, true); + $ret .= $this->cxc->getClassAddElement('form', $formTextArea . $required); return $ret; } @@ -114,21 +144,21 @@ private function getXoopsFormTextArea($language, $fieldName, $required = 'false' * * @param $language * @param $fieldName - * @param $required + * @param string $required * * @return string */ - private function getXoopsFormDhtmlTextArea($language, $fieldName, $required = 'false') + private function getXoopsFormDhtmlTextArea($language, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $rpFieldName = $tf->getRightString($fieldName); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $ret = $pc->getPhpCodeCommentLine('Form Editor', 'DhtmlTextArea ' . $ccFieldName, "\t\t"); - $ret .= $pc->getPhpCodeArray('editorConfigs', null, false, "\t\t"); - $getConfig = $xc->getXcGetConfig('editor_' . $rpFieldName); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $ret = $this->pc->getPhpCodeCommentLine('Form Editor', 'DhtmlTextArea ' . $ccFieldName, "\t\t"); + $ret .= $this->pc->getPhpCodeArray('editorConfigs'); + $getConfig = $this->xc->getXcGetConfig('editor_admin'); + $contIf = $this->xc->getXcEqualsOperator('$editor', $getConfig, null, "\t\t\t"); + $getConfig = $this->xc->getXcGetConfig('editor_user'); + $contElse = $this->xc->getXcEqualsOperator('$editor', $getConfig, null, "\t\t\t"); + $ret .= $this->pc->getPhpCodeConditions('$isAdmin','','', $contIf, $contElse, "\t\t"); + $configs = [ 'name' => "'{$fieldName}'", 'value' => "\$this->getVar('{$fieldName}', 'e')", @@ -136,13 +166,13 @@ private function getXoopsFormDhtmlTextArea($language, $fieldName, $required = 'f 'cols' => 40, 'width' => "'100%'", 'height' => "'400px'", - 'editor' => $getConfig, + 'editor' => '$editor', ]; foreach ($configs as $c => $d) { - $ret .= $xc->getXcEqualsOperator("\$editorConfigs['{$c}']", $d, null, "\t\t"); + $ret .= $this->xc->getXcEqualsOperator("\$editorConfigs['{$c}']", $d, null, "\t\t"); } - $formEditor = $cxc->getClassXoopsFormEditor('', $language, $fieldName, 'editorConfigs', true); - $ret .= $cxc->getClassAddElement('form', $formEditor . $required); + $formEditor = $this->cxc->getClassXoopsFormEditor('', $language, $fieldName, 'editorConfigs', true); + $ret .= $this->cxc->getClassAddElement('form', $formEditor . $required); return $ret; } @@ -157,34 +187,28 @@ private function getXoopsFormDhtmlTextArea($language, $fieldName, $required = 'f * @param string $required * @return string */ - private function getXoopsFormCheckBox($language, $tableSoleName, $fieldName, $fieldElementId, $required = 'false') + private function getXoopsFormCheckBox($language, $tableSoleName, $fieldName, $fieldElementId, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $stuTableSoleName = mb_strtoupper($tableSoleName); - $ucfFieldName = $tf->getCamelCase($fieldName, true); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); + $stuTableSoleName = \mb_strtoupper($tableSoleName); + $ucfFieldName = $this->cf->getCamelCase($fieldName, true); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); $t = "\t\t"; - if (in_array(5, $fieldElementId) > 1) { - $ret = $pc->getPhpCodeCommentLine('Form Check Box', 'List Options ' . $ccFieldName, $t); - $ret .= $xc->getXcEqualsOperator('$checkOption', '$this->getOptions()'); - $foreach = $cxc->getClassXoopsFormCheckBox('check' . $ucfFieldName, '
', $tableSoleName . '_option', '$checkOption', false, $t . "\t"); - $foreach .= $cxc->getClassSetDescription('check' . $ucfFieldName, "{$language}{$stuTableSoleName}_OPTIONS_DESC", $t . "\t"); - $foreach .= $cxc->getClassAddOption('check' . $ucfFieldName, "\$option, {$language}{$stuTableSoleName}_ . strtoupper(\$option)", $t . "\t"); - $ret .= $pc->getPhpCodeForeach("{$tableSoleName}All", false, false, 'option', $foreach, $t); - $intElem = "\$check{$ucfFieldName}{$required}"; - $ret .= $cxc->getClassAddElement('form', $intElem, $t); + if (\in_array(5, $fieldElementId) > 1) { + $ret = $this->pc->getPhpCodeCommentLine('Form Check Box', 'List Options ' . $ccFieldName, $t); + $ret .= $this->xc->getXcEqualsOperator('$checkOption', '$this->getOptions()'); + $foreach = $this->cxc->getClassXoopsFormCheckBox('check' . $ucfFieldName, '
', $tableSoleName . '_option', '$checkOption', false, $t . "\t"); + $foreach .= $this->cxc->getClassSetDescription('check' . $ucfFieldName, "{$language}{$stuTableSoleName}_OPTIONS_DESC", $t . "\t"); + $foreach .= $this->cxc->getClassAddOption('check' . $ucfFieldName, "\$option, {$language}{$stuTableSoleName}_ . strtoupper(\$option)", $t . "\t"); + $ret .= $this->pc->getPhpCodeForeach("{$tableSoleName}All", false, false, 'option', $foreach, $t); } else { - $ret = $pc->getPhpCodeCommentLine('Form Check Box', $ccFieldName, $t); - $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', 0, "\$this->getVar('{$fieldName}')", $t); - $ret .= $cxc->getClassXoopsFormCheckBox('check' . $ucfFieldName, (string)$language, $fieldName, "\${$ccFieldName}", false, $t); + $ret = $this->pc->getPhpCodeCommentLine('Form Check Box', $ccFieldName, $t); + $ret .= $this->pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', 0, "\$this->getVar('{$fieldName}')", $t); + $ret .= $this->cxc->getClassXoopsFormCheckBox('check' . $ucfFieldName, $language, $fieldName, "\${$ccFieldName}", false, $t); $option = "1, {$language}"; - $ret .= $cxc->getClassAddOption('check' . $ucfFieldName, $option, $t); - $intElem = "\$check{$ucfFieldName}{$required}"; - $ret .= $cxc->getClassAddElement('form', $intElem, $t); + $ret .= $this->cxc->getClassAddOption('check' . $ucfFieldName, $option, $t); } + $intElem = "\$check{$ucfFieldName}{$required}"; + $ret .= $this->cxc->getClassAddElement('form', $intElem, $t); return $ret; } @@ -198,13 +222,10 @@ private function getXoopsFormCheckBox($language, $tableSoleName, $fieldName, $fi */ private function getXoopsFormHidden($fieldName) { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $ret = $pc->getPhpCodeCommentLine('Form Hidden', $ccFieldName, "\t\t"); - $formHidden = $cxc->getClassXoopsFormHidden('', $fieldName, $fieldName, true, true); - $ret .= $cxc->getClassAddElement('form', $formHidden); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $ret = $this->pc->getPhpCodeCommentLine('Form Hidden', $ccFieldName, "\t\t"); + $formHidden = $this->cxc->getClassXoopsFormHidden('', $fieldName, $fieldName, true, true); + $ret .= $this->cxc->getClassAddElement('form', $formHidden); return $ret; } @@ -216,48 +237,42 @@ private function getXoopsFormHidden($fieldName) * @param $language * @param $moduleDirname * @param $fieldName - * @param $required + * @param string $required * * @return string */ - private function getXoopsFormImageList($language, $moduleDirname, $fieldName, $required = 'false') + private function getXoopsFormImageList($language, $moduleDirname, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ucfFieldName = $tf->getCamelCase($fieldName, true); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $languageShort = substr($language, 0, 4) . mb_strtoupper($moduleDirname) . '_'; + $ucfFieldName = $this->cf->getCamelCase($fieldName, true); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $languageShort = \mb_substr($language, 0, 5) . \mb_strtoupper($moduleDirname) . '_'; $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine('Form Frameworks Images', 'Files ' . $ccFieldName, $t); - $ret .= $pc->getPhpCodeCommentLine('Form Frameworks Images', $ccFieldName .': Select Uploaded Image', $t); - $ret .= $xc->getXcEqualsOperator('$get' . $ucfFieldName, "\$this->getVar('{$fieldName}')", null, $t); - $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$get' . $ucfFieldName, '$get' . $ucfFieldName, "'blank.gif'", $t); - $ret .= $xc->getXcEqualsOperator('$imageDirectory', "'/Frameworks/moduleclasses/icons/32'", null, $t); - $ret .= $cxc->getClassXoopsFormElementTray('imageTray', $language, '
', $t); - $sprintf = $pc->getPhpCodeSprintf($language . '_UPLOADS', '".{$imageDirectory}/"'); - $ret .= $cxc->getClassXoopsFormSelect('imageSelect', $sprintf, $fieldName, $ccFieldName, 5, 'false', false, $t); - $ret .= $xc->getXcXoopsListImgListArray('imageArray', 'XOOPS_ROOT_PATH . $imageDirectory', $t); - $contForeach = $cxc->getClassAddOption('imageSelect', '"{$image1}", $image1', $t . "\t"); - $ret .= $pc->getPhpCodeForeach('imageArray', false, false, 'image1', $contForeach, $t); - $setExtraParam = "\"onchange='showImgSelected(\\\"imglabel_{$fieldName}\\\", \\\"{$fieldName}\\\", \\\"\" . \$imageDirectory . \"\\\", \\\"\\\", \\\"\" . XOOPS_URL . \"\\\")'\""; - $ret .= $cxc->getClassSetExtra('imageSelect', $setExtraParam, $t); - $ret .= $cxc->getClassAddElement('imageTray', '$imageSelect, false', $t); - - $paramLabel = "\"
![](\" . XOOPS_URL . \"/\" . \$imageDirectory . \"/\" . \${$ccFieldName} . \")
\"";
- $xoopsFormLabel = $cxc->getClassXoopsFormLabel('', "''", $paramLabel, true, '');
-
- $ret .= $cxc->getClassAddElement('imageTray', $xoopsFormLabel, $t);
- $ret .= $pc->getPhpCodeCommentLine('Form Frameworks Images', $ccFieldName .': Upload new image', $t);
- $ret .= $cxc->getClassXoopsFormElementTray('fileSelectTray', "''", '
', $t); - $getConfig = $xc->getXcGetConfig('maxsize_image'); - $xoopsFormFile = $cxc->getClassXoopsFormFile('', $languageShort . 'FORM_UPLOAD_NEW', $fieldName, $getConfig, true, ''); - $ret .= $cxc->getClassAddElement('fileSelectTray', $xoopsFormFile, $t); - $xoopsFormLabel1 = $cxc->getClassXoopsFormLabel('', "''", null, true, $t); - $ret .= $cxc->getClassAddElement('fileSelectTray', $xoopsFormLabel1, $t); - $ret .= $cxc->getClassAddElement('imageTray', '$fileSelectTray', $t); - $ret .= $cxc->getClassAddElement('form', "\$imageTray{$required}", $t); + $ret = $this->pc->getPhpCodeCommentLine('Form Frameworks Images', 'Files ' . $ccFieldName, $t); + $ret .= $this->pc->getPhpCodeCommentLine('Form Frameworks Images', $ccFieldName .': Select Uploaded Image', $t); + $ret .= $this->xc->getXcEqualsOperator('$get' . $ucfFieldName, "\$this->getVar('{$fieldName}')", null, $t); + $ret .= $this->pc->getPhpCodeTernaryOperator($ccFieldName, '$get' . $ucfFieldName, '', "'blank.gif'", $t); + $ret .= $this->xc->getXcEqualsOperator('$imageDirectory', "'/Frameworks/moduleclasses/icons/32'", null, $t); + $ret .= $this->cxc->getClassXoopsFormElementTray('imageTray', $language, '
', $t); + $sprintf = $this->pc->getPhpCodeSprintf($language . '_UPLOADS', '".{$imageDirectory}/"'); + $ret .= $this->cxc->getClassXoopsFormSelect('imageSelect', $sprintf, $fieldName, $ccFieldName, 5, 'false', false, $t); + $ret .= $this->xc->getXcXoopsListImgListArray('imageArray', '\XOOPS_ROOT_PATH . $imageDirectory', $t); + $contForeach = $this->cxc->getClassAddOption('imageSelect', '($image1), $image1', $t . "\t"); + $ret .= $this->pc->getPhpCodeForeach('imageArray', false, false, 'image1', $contForeach, $t); + $setExtraParam = "\"onchange='showImgSelected(\\\"imglabel_{$fieldName}\\\", \\\"{$fieldName}\\\", \\\"\" . \$imageDirectory . '\", \"\", \"' . \XOOPS_URL . \"\\\")'\""; + $ret .= $this->cxc->getClassSetExtra('imageSelect', $setExtraParam, $t); + $ret .= $this->cxc->getClassAddElement('imageTray', '$imageSelect, false', $t); + $paramLabel = "\"
![](\" . \XOOPS_URL . )
\"";
+ $xoopsFormLabel = $this->cxc->getClassXoopsFormLabel('', "''", $paramLabel, true, '');
+ $ret .= $this->cxc->getClassAddElement('imageTray', $xoopsFormLabel, $t);
+ $ret .= $this->pc->getPhpCodeCommentLine('Form Frameworks Images', $ccFieldName .': Upload new image', $t);
+ $ret .= $this->cxc->getClassXoopsFormElementTray('fileSelectTray', "''", '
', $t); + $getConfig = $this->xc->getXcGetConfig('maxsize_image'); + $xoopsFormFile = $this->cxc->getClassXoopsFormFile('', $languageShort . 'FORM_UPLOAD_NEW', $fieldName, $getConfig, true, ''); + $ret .= $this->cxc->getClassAddElement('fileSelectTray', $xoopsFormFile, $t); + $xoopsFormLabel1 = $this->cxc->getClassXoopsFormLabel('', "''", null, true, $t); + $ret .= $this->cxc->getClassAddElement('fileSelectTray', $xoopsFormLabel1, $t); + $ret .= $this->cxc->getClassAddElement('imageTray', '$fileSelectTray', $t); + $ret .= $this->cxc->getClassAddElement('form', "\$imageTray{$required}", $t); return $ret; } @@ -270,50 +285,46 @@ private function getXoopsFormImageList($language, $moduleDirname, $fieldName, $r * @param $moduleDirname * @param $tableName * @param $fieldName - * @param $required + * @param string $required * * @return string */ - private function getXoopsFormSelectFile($language, $moduleDirname, $tableName, $fieldName, $required = 'false') + private function getXoopsFormSelectFile($language, $moduleDirname, $tableName, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ucfFieldName = $tf->getCamelCase($fieldName, true); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $languageShort = substr($language, 0, 4) . mb_strtoupper($moduleDirname) . '_'; + $ucfFieldName = $this->cf->getCamelCase($fieldName, true); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $languageShort = \mb_substr($language, 0, 5) . \mb_strtoupper($moduleDirname) . '_'; $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine('Form File', $ccFieldName, $t); - $ret .= $pc->getPhpCodeCommentLine("Form File {$ccFieldName}:", 'Select Uploaded File ', $t); - $ret .= $xc->getXcEqualsOperator('$get' . $ucfFieldName, "\$this->getVar('{$fieldName}')", null, $t); - $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$get' . $ucfFieldName, '$get' . $ucfFieldName, "'blank.gif'", $t); - $ret .= $xc->getXcEqualsOperator('$fileDirectory', "'/uploads/{$moduleDirname}/files/{$tableName}'", null, $t); - $ret .= $cxc->getClassXoopsFormElementTray('fileTray', $language, '
', $t); - $sprintf = $pc->getPhpCodeSprintf($language . '_UPLOADS', '".{$fileDirectory}/"'); - $ret .= $cxc->getClassXoopsFormSelect('fileSelect', $sprintf, $fieldName, $ccFieldName, 5, 'false', false, $t); - $ret .= $xc->getXcXoopsListImgListArray('fileArray', 'XOOPS_ROOT_PATH . $fileDirectory', $t); - $contForeach = $cxc->getClassAddOption('fileSelect', '"{$file1}", $file1', $t . "\t"); - $ret .= $pc->getPhpCodeForeach('fileArray', false, false, 'file1', $contForeach, $t); + $ret = $this->pc->getPhpCodeCommentLine('Form File', $ccFieldName, $t); + $ret .= $this->pc->getPhpCodeCommentLine("Form File {$ccFieldName}:", 'Select Uploaded File ', $t); + $ret .= $this->xc->getXcEqualsOperator('$get' . $ucfFieldName, "\$this->getVar('{$fieldName}')", null, $t); + $ret .= $this->pc->getPhpCodeTernaryOperator($ccFieldName, '$get' . $ucfFieldName, '', "'blank.gif'", $t); + $ret .= $this->xc->getXcEqualsOperator('$fileDirectory', "'/uploads/{$moduleDirname}/files/{$tableName}'", null, $t); + $ret .= $this->cxc->getClassXoopsFormElementTray('fileTray', $language, '
', $t); + $sprintf = $this->pc->getPhpCodeSprintf($language . '_UPLOADS', '".{$fileDirectory}/"'); + $ret .= $this->cxc->getClassXoopsFormSelect('fileSelect', $sprintf, $fieldName, $ccFieldName, 5, 'false', false, $t); + $ret .= $this->xc->getXcXoopsListImgListArray('fileArray', '\XOOPS_ROOT_PATH . $fileDirectory', $t); + $contForeach = $this->cxc->getClassAddOption('fileSelect', '($file1), $file1', $t . "\t"); + $ret .= $this->pc->getPhpCodeForeach('fileArray', false, false, 'file1', $contForeach, $t); //TODO: make preview for images or show "no preview possible" - //$setExtraParam = "\"onchange='showImgSelected(\\\"filelabel_{$fieldName}\\\", \\\"{$fieldName}\\\", \\\"\".\$fileDirectory.\"\\\", \\\"\\\", \\\"\".XOOPS_URL.\"\\\")'\""; + //$setExtraParam = "\"onchange='showImgSelected(\\\"imglabel_{$fieldName}\\\", \\\"{$fieldName}\\\", \\\"\" . \$imageDirectory . '\", \"\", \"' . \XOOPS_URL . \"\\\")'\""; //$ret .= $cc->getClassSetExtra('fileSelect', $setExtraParam, $t); - $ret .= $cxc->getClassAddElement('fileTray', '$fileSelect, false', $t); - //$paramLabel = "\"
![](\".XOOPS_URL.\"/\".\$fileDirectory.\"/\".\${$ccFieldName}.\")
\"";
+ $ret .= $this->cxc->getClassAddElement('fileTray', '$fileSelect, false', $t);
+ //$paramLabel = "\"
\"";
//$xoopsFormLabel = $cc->getClassXoopsFormLabel('', "''", $paramLabel, true, '');
//$ret .= $cc->getClassAddElement('fileTray', $xoopsFormLabel, $t);
- $ret .= $pc->getPhpCodeCommentLine("Form File {$ccFieldName}:", 'Upload new file', $t);
- $getConfigSize = $xc->getXcGetConfig('maxsize_file');
- $contIf = $xc->getXcEqualsOperator('$maxsize', $getConfigSize,'', "\t\t\t");
- $xoopsFormFile = $cxc->getClassXoopsFormFile('fileTray', "'
' . " . $languageShort . 'FORM_UPLOAD_NEW', $fieldName, '$maxsize', true, ''); - $contIf .= $cxc->getClassAddElement('fileTray', $xoopsFormFile, $t . "\t"); + $ret .= $this->pc->getPhpCodeCommentLine("Form File {$ccFieldName}:", 'Upload new file', $t); + $getConfigSize = $this->xc->getXcGetConfig('maxsize_file'); + $contIf = $this->xc->getXcEqualsOperator('$maxsize', $getConfigSize,'', "\t\t\t"); + $xoopsFormFile = $this->cxc->getClassXoopsFormFile('fileTray', "'
' . " . $languageShort . 'FORM_UPLOAD_NEW', $fieldName, '$maxsize', true, ''); + $contIf .= $this->cxc->getClassAddElement('fileTray', $xoopsFormFile, $t . "\t"); $configText = "(\$maxsize / 1048576) . ' ' . " . $languageShort . 'FORM_UPLOAD_SIZE_MB'; - $labelInfo1 = $cxc->getClassXoopsFormLabel('', $languageShort . 'FORM_UPLOAD_SIZE', $configText, true, ''); - $contIf .= $cxc->getClassAddElement('fileTray', $labelInfo1, $t . "\t"); - $formHidden = $cxc->getClassXoopsFormHidden('', $fieldName, $ccFieldName, true, true, $t, true); - $contElse = $cxc->getClassAddElement('fileTray', $formHidden, $t . "\t"); - $ret .= $pc->getPhpCodeConditions('$permissionUpload', null, null, $contIf, $contElse, "\t\t"); - $ret .= $cxc->getClassAddElement('form', "\$fileTray, {$required}", $t); + $labelInfo1 = $this->cxc->getClassXoopsFormLabel('', $languageShort . 'FORM_UPLOAD_SIZE', $configText, true, ''); + $contIf .= $this->cxc->getClassAddElement('fileTray', $labelInfo1, $t . "\t"); + $formHidden = $this->cxc->getClassXoopsFormHidden('', $fieldName, $ccFieldName, true, true, $t, true); + $contElse = $this->cxc->getClassAddElement('fileTray', $formHidden, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions('$permissionUpload', '', '', $contIf, $contElse, "\t\t"); + $ret .= $this->cxc->getClassAddElement('form', "\$fileTray{$required}", $t); return $ret; } @@ -326,28 +337,24 @@ private function getXoopsFormSelectFile($language, $moduleDirname, $tableName, $ * @param $moduleDirname * @param $fieldName * @param $fieldDefault - * @param $required + * @param string $required * * @return string */ - private function getXoopsFormUrlFile($language, $moduleDirname, $fieldName, $fieldDefault, $required = 'false') + private function getXoopsFormUrlFile($language, $moduleDirname, $fieldName, $fieldDefault, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $languageShort = substr($language, 0, 4) . mb_strtoupper($moduleDirname) . '_'; + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $languageShort = \mb_substr($language, 0, 5) . \mb_strtoupper($moduleDirname) . '_'; $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine('Form Url', 'Text File ' . $ccFieldName, $t); - $ret .= $cxc->getClassXoopsFormElementTray('formUrlFile', $language, '
', $t); - $ret .= $pc->getPhpCodeTernaryOperator('formUrl', '$this->isNew()', "'{$fieldDefault}'", "\$this->getVar('{$fieldName}')", $t); - $ret .= $cxc->getClassXoopsFormText('formText', $language . '_UPLOADS', $fieldName, 75, 255, 'formUrl', false, $t); - $ret .= $cxc->getClassAddElement('formUrlFile', '$formText' . $required, $t); - $getConfig = $xc->getXcGetConfig('maxsize_file'); - $xoopsFormFile = $cxc->getClassXoopsFormFile('', $languageShort . 'FORM_UPLOAD', $fieldName, $getConfig, true, ''); - $ret .= $cxc->getClassAddElement('formUrlFile', $xoopsFormFile . $required, $t); - $ret .= $cxc->getClassAddElement('form', '$formUrlFile', $t); + $ret = $this->pc->getPhpCodeCommentLine('Form Url', 'Text File ' . $ccFieldName, $t); + $ret .= $this->cxc->getClassXoopsFormElementTray('formUrlFile', $language, '
', $t); + $ret .= $this->pc->getPhpCodeTernaryOperator('formUrl', '$this->isNew()', "'{$fieldDefault}'", "\$this->getVar('{$fieldName}')", $t); + $ret .= $this->cxc->getClassXoopsFormText('formText', $language . '_UPLOADS', $fieldName, 75, 255, 'formUrl', false, $t); + $ret .= $this->cxc->getClassAddElement('formUrlFile', '$formText' . $required, $t); + $getConfig = $this->xc->getXcGetConfig('maxsize_file'); + $xoopsFormFile = $this->cxc->getClassXoopsFormFile('', $languageShort . 'FORM_UPLOAD', $fieldName, $getConfig, true, ''); + $ret .= $this->cxc->getClassAddElement('formUrlFile', $xoopsFormFile . $required, $t); + $ret .= $this->cxc->getClassAddElement('form', '$formUrlFile', $t); return $ret; } @@ -363,51 +370,45 @@ private function getXoopsFormUrlFile($language, $moduleDirname, $fieldName, $fie * @param string $required * @return string */ - private function getXoopsFormUploadImage($language, $moduleDirname, $tableName, $fieldName, $required = 'false') + private function getXoopsFormUploadImage($language, $moduleDirname, $tableName, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ucfFieldName = $tf->getCamelCase($fieldName, true); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $languageShort = substr($language, 0, 4) . mb_strtoupper($moduleDirname) . '_'; + $ucfFieldName = $this->cf->getCamelCase($fieldName, true); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $languageShort = \mb_substr($language, 0, 5) . \mb_strtoupper($moduleDirname) . '_'; $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine('Form Image', $ccFieldName, $t); - $ret .= $pc->getPhpCodeCommentLine("Form Image {$ccFieldName}:", 'Select Uploaded Image ', $t); - $ret .= $xc->getXcEqualsOperator('$get' . $ucfFieldName, "\$this->getVar('{$fieldName}')", null, $t); - $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$get' . $ucfFieldName, '$get' . $ucfFieldName, "'blank.gif'", $t); - $ret .= $xc->getXcEqualsOperator('$imageDirectory', "'/uploads/{$moduleDirname}/images/{$tableName}'", null, $t); - $ret .= $cxc->getClassXoopsFormElementTray('imageTray', $language, '
', $t); - $sprintf = $pc->getPhpCodeSprintf($language . '_UPLOADS', '".{$imageDirectory}/"'); - $ret .= $cxc->getClassXoopsFormSelect('imageSelect', $sprintf, $fieldName, $ccFieldName, 5, 'false', false, $t); - $ret .= $xc->getXcXoopsListImgListArray('imageArray', 'XOOPS_ROOT_PATH . $imageDirectory', $t); - $contForeach = $cxc->getClassAddOption('imageSelect', '"{$image1}", $image1', $t . "\t"); - $ret .= $pc->getPhpCodeForeach('imageArray', false, false, 'image1', $contForeach, $t); - $setExtraParam = "\"onchange='showImgSelected(\\\"imglabel_{$fieldName}\\\", \\\"{$fieldName}\\\", \\\"\" . \$imageDirectory . \"\\\", \\\"\\\", \\\"\" . XOOPS_URL . \"\\\")'\""; - $ret .= $cxc->getClassSetExtra('imageSelect', $setExtraParam, $t); - $ret .= $cxc->getClassAddElement('imageTray', '$imageSelect, false', $t); - $paramLabel = "\"
\"";
- $xoopsFormLabel = $cxc->getClassXoopsFormLabel('', "''", $paramLabel, true, '');
- $ret .= $cxc->getClassAddElement('imageTray', $xoopsFormLabel, $t);
- $ret .= $pc->getPhpCodeCommentLine("Form Image {$ccFieldName}:", 'Upload new image', $t);
- $getConfigSize = $xc->getXcGetConfig('maxsize_image');
- $contIf = $xc->getXcEqualsOperator('$maxsize', $getConfigSize,'', "\t\t\t");
- $xoopsFormFile = $cxc->getClassXoopsFormFile('imageTray', "'
' . " . $languageShort . 'FORM_UPLOAD_NEW', $fieldName, '$maxsize', true, ''); - $contIf .= $cxc->getClassAddElement('imageTray', $xoopsFormFile, $t . "\t"); + $ret = $this->pc->getPhpCodeCommentLine('Form Image', $ccFieldName, $t); + $ret .= $this->pc->getPhpCodeCommentLine("Form Image {$ccFieldName}:", 'Select Uploaded Image ', $t); + $ret .= $this->xc->getXcEqualsOperator('$get' . $ucfFieldName, "\$this->getVar('{$fieldName}')", null, $t); + $ret .= $this->pc->getPhpCodeTernaryOperator($ccFieldName, '$get' . $ucfFieldName, '', "'blank.gif'", $t); + $ret .= $this->xc->getXcEqualsOperator('$imageDirectory', "'/uploads/{$moduleDirname}/images/{$tableName}'", null, $t); + $ret .= $this->cxc->getClassXoopsFormElementTray('imageTray', $language, '
', $t); + $sprintf = $this->pc->getPhpCodeSprintf($language . '_UPLOADS', '".{$imageDirectory}/"'); + $ret .= $this->cxc->getClassXoopsFormSelect('imageSelect', $sprintf, $fieldName, $ccFieldName, 5, 'false', false, $t); + $ret .= $this->xc->getXcXoopsListImgListArray('imageArray', '\XOOPS_ROOT_PATH . $imageDirectory', $t); + $contForeach = $this->cxc->getClassAddOption('imageSelect', '($image1), $image1', $t . "\t"); + $ret .= $this->pc->getPhpCodeForeach('imageArray', false, false, 'image1', $contForeach, $t); + $setExtraParam = "\"onchange='showImgSelected(\\\"imglabel_{$fieldName}\\\", \\\"{$fieldName}\\\", \\\"\" . \$imageDirectory . '\", \"\", \"' . \XOOPS_URL . \"\\\")'\""; + $ret .= $this->cxc->getClassSetExtra('imageSelect', $setExtraParam, $t); + $ret .= $this->cxc->getClassAddElement('imageTray', '$imageSelect, false', $t); + $paramLabel = "\"
\"";
+ $xoopsFormLabel = $this->cxc->getClassXoopsFormLabel('', "''", $paramLabel, true, '');
+ $ret .= $this->cxc->getClassAddElement('imageTray', $xoopsFormLabel, $t);
+ $ret .= $this->pc->getPhpCodeCommentLine("Form Image {$ccFieldName}:", 'Upload new image', $t);
+ $getConfigSize = $this->xc->getXcGetConfig('maxsize_image');
+ $contIf = $this->xc->getXcEqualsOperator('$maxsize', $getConfigSize,'', "\t\t\t");
+ $xoopsFormFile = $this->cxc->getClassXoopsFormFile('imageTray', "'
' . " . $languageShort . 'FORM_UPLOAD_NEW', $fieldName, '$maxsize', true, ''); + $contIf .= $this->cxc->getClassAddElement('imageTray', $xoopsFormFile, $t . "\t"); $configText = "(\$maxsize / 1048576) . ' ' . " . $languageShort . 'FORM_UPLOAD_SIZE_MB'; - $labelInfo1 = $cxc->getClassXoopsFormLabel('', $languageShort . 'FORM_UPLOAD_SIZE', $configText, true, ''); - $contIf .= $cxc->getClassAddElement('imageTray', $labelInfo1, $t . "\t"); - $getConfig = $xc->getXcGetConfig('maxwidth_image'); - $labelInfo2 = $cxc->getClassXoopsFormLabel('', $languageShort . 'FORM_UPLOAD_IMG_WIDTH', $getConfig . " . ' px'", true, ''); - $contIf .= $cxc->getClassAddElement('imageTray', $labelInfo2, $t . "\t"); - $getConfig = $xc->getXcGetConfig('maxheight_image'); - $labelInfo3 = $cxc->getClassXoopsFormLabel('', $languageShort . 'FORM_UPLOAD_IMG_HEIGHT', $getConfig . " . ' px'", true, ''); - $contIf .= $cxc->getClassAddElement('imageTray', $labelInfo3, $t . "\t"); - $formHidden = $cxc->getClassXoopsFormHidden('', $fieldName, $ccFieldName, true, true, $t, true); - $contElse = $cxc->getClassAddElement('imageTray', $formHidden, $t . "\t"); - $ret .= $pc->getPhpCodeConditions('$permissionUpload', null, null, $contIf, $contElse, "\t\t"); - $ret .= $cxc->getClassAddElement('form', "\$imageTray, {$required}", $t); + $labelInfo1 = $this->cxc->getClassXoopsFormLabel('', $languageShort . 'FORM_UPLOAD_SIZE', $configText, true, ''); + $contIf .= $this->cxc->getClassAddElement('imageTray', $labelInfo1, $t . "\t"); + $getConfig = $this->xc->getXcGetConfig('maxwidth_image'); + $labelInfo2 = $this->cxc->getClassXoopsFormLabel('', $languageShort . 'FORM_UPLOAD_IMG_WIDTH', $getConfig . " . ' px'", true, ''); + $contIf .= $this->cxc->getClassAddElement('imageTray', $labelInfo2, $t . "\t"); + $getConfig = $this->xc->getXcGetConfig('maxheight_image'); + $labelInfo3 = $this->cxc->getClassXoopsFormLabel('', $languageShort . 'FORM_UPLOAD_IMG_HEIGHT', $getConfig . " . ' px'", true, ''); + $contIf .= $this->cxc->getClassAddElement('imageTray', $labelInfo3, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions('$permissionUpload', '', '', $contIf, false, "\t\t"); + $ret .= $this->cxc->getClassAddElement('form', "\$imageTray{$required}", $t); return $ret; } @@ -424,35 +425,31 @@ private function getXoopsFormUploadImage($language, $moduleDirname, $tableName, * @param string $required * @return string */ - private function getXoopsFormUploadFile($language, $moduleDirname, $tableName, $fieldName, $required = 'false') + private function getXoopsFormUploadFile($language, $moduleDirname, $tableName, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $languageShort = substr($language, 0, 4) . mb_strtoupper($moduleDirname) . '_'; + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $languageShort = \mb_substr($language, 0, 5) . \mb_strtoupper($moduleDirname) . '_'; $t = "\t\t\t"; - $ret = $pc->getPhpCodeCommentLine('Form File', 'Upload ' . $ccFieldName, "\t\t"); - $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', "''", "\$this->getVar('{$fieldName}')", "\t\t"); - $uForm = $cxc->getClassXoopsFormElementTray('fileUploadTray', $language, '
', $t); - $uForm .= $xc->getXcEqualsOperator('$fileDirectory', "'/uploads/{$moduleDirname}/files/{$tableName}'", null, $t); - $sprintf = $pc->getPhpCodeSprintf($language . '_UPLOADS', '".{$fileDirectory}/"'); - $xoopsFormLabel = $cxc->getClassXoopsFormLabel('', $sprintf, $ccFieldName, true, "\t\t", true); - $condIf = $cxc->getClassAddElement('fileUploadTray', $xoopsFormLabel, $t . "\t"); - $uForm .= $pc->getPhpCodeConditions('!$this->isNew()', null, null, $condIf, false, "\t\t\t"); - $getConfig = $xc->getXcGetConfig('maxsize_file'); - $uForm .= $xc->getXcEqualsOperator('$maxsize', $getConfig,'', "\t\t\t"); - $xoopsFormFile = $cxc->getClassXoopsFormFile('', "''", $fieldName, '$maxsize', true, ''); - $uForm .= $cxc->getClassAddElement('fileUploadTray', $xoopsFormFile, $t); + $ret = $this->pc->getPhpCodeCommentLine('Form File:', 'Upload ' . $ccFieldName, "\t\t"); + $ret .= $this->pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', "''", "\$this->getVar('{$fieldName}')", "\t\t"); + $uForm = $this->cxc->getClassXoopsFormElementTray('fileUploadTray', $language, '
', $t); + $uForm .= $this->xc->getXcEqualsOperator('$fileDirectory', "'/uploads/{$moduleDirname}/files/{$tableName}'", null, $t); + $sprintf = $this->pc->getPhpCodeSprintf($language . '_UPLOADS', '".{$fileDirectory}/"'); + $xoopsFormLabel = $this->cxc->getClassXoopsFormLabel('', $sprintf, $ccFieldName, true, "\t\t", true); + $condIf = $this->cxc->getClassAddElement('fileUploadTray', $xoopsFormLabel, $t . "\t"); + $uForm .= $this->pc->getPhpCodeConditions('!$this->isNew()', '', '', $condIf, false, "\t\t\t"); + $getConfig = $this->xc->getXcGetConfig('maxsize_file'); + $uForm .= $this->xc->getXcEqualsOperator('$maxsize', $getConfig,'', "\t\t\t"); + $xoopsFormFile = $this->cxc->getClassXoopsFormFile('', "''", $fieldName, '$maxsize', true, ''); + $uForm .= $this->cxc->getClassAddElement('fileUploadTray', $xoopsFormFile, $t); $configText = "(\$maxsize / 1048576) . ' ' . " . $languageShort . 'FORM_UPLOAD_SIZE_MB'; - $labelInfo1 = $cxc->getClassXoopsFormLabel('', $languageShort . 'FORM_UPLOAD_SIZE', $configText, true, ''); - $uForm .= $cxc->getClassAddElement('fileUploadTray', $labelInfo1, $t ); - $uForm .= $cxc->getClassAddElement('form', "\$fileUploadTray, {$required}", $t); - $formHidden = $cxc->getClassXoopsFormHidden('', $fieldName, $ccFieldName, true, true, "\t\t", true); - $contElse = $cxc->getClassAddElement('form', $formHidden, $t); + $labelInfo1 = $this->cxc->getClassXoopsFormLabel('', $languageShort . 'FORM_UPLOAD_SIZE', $configText, true, ''); + $uForm .= $this->cxc->getClassAddElement('fileUploadTray', $labelInfo1, $t ); + $uForm .= $this->cxc->getClassAddElement('form', "\$fileUploadTray{$required}", $t); + $formHidden = $this->cxc->getClassXoopsFormHidden('', $fieldName, $ccFieldName, true, true, "\t\t", true); + $contElse = $this->cxc->getClassAddElement('form', $formHidden, $t); - $ret .= $pc->getPhpCodeConditions('$permissionUpload', null, null, $uForm, $contElse, "\t\t"); + $ret .= $this->pc->getPhpCodeConditions('$permissionUpload', '', '', $uForm, $contElse, "\t\t"); return $ret; } @@ -466,18 +463,14 @@ private function getXoopsFormUploadFile($language, $moduleDirname, $tableName, $ * @param string $required * @return string */ - private function getXoopsFormColorPicker($language, $fieldName, $required = 'false') + private function getXoopsFormColorPicker($language, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine('Form Color', 'Picker ' . $ccFieldName, $t); - $getVar = $xc->getXcGetVar('', 'this', $fieldName, true); - $xoopsFormFile = $cxc->getClassXoopsFormColorPicker('', $language, $fieldName, $getVar, true, ''); - $ret .= $cxc->getClassAddElement('form', $xoopsFormFile. $required, $t); + $ret = $this->pc->getPhpCodeCommentLine('Form Color', 'Picker ' . $ccFieldName, $t); + $getVar = $this->xc->getXcGetVar('', 'this', $fieldName, true); + $xoopsFormFile = $this->cxc->getClassXoopsFormColorPicker('', $language, $fieldName, $getVar, true, ''); + $ret .= $this->cxc->getClassAddElement('form', $xoopsFormFile. $required, $t); return $ret; } @@ -488,26 +481,22 @@ private function getXoopsFormColorPicker($language, $fieldName, $required = 'fal * @param $language * @param $tableName * @param $fieldName - * @param $required + * @param string $required * * @return string */ - private function getXoopsFormSelectBox($language, $tableName, $fieldName, $required = 'false') + private function getXoopsFormSelectBox($language, $tableName, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ucfTableName = ucfirst($tableName); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); + $ucfTableName = \ucfirst($tableName); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine($ucfTableName, 'handler', $t); - $ret .= $xc->getXcHandlerLine($tableName, $t); - $ret .= $pc->getPhpCodeCommentLine('Form', 'Select ' . $ccFieldName, $t); - $ret .= $cxc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "'Empty'", $t); - $ret .= $cxc->getClassAddOptionArray($ccFieldName . 'Select', "\${$tableName}Handler->getList()", $t); - $ret .= $cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); + $ret = $this->pc->getPhpCodeCommentLine($ucfTableName, 'Handler', $t); + $ret .= $this->xc->getXcHandlerLine($tableName, $t); + $ret .= $this->pc->getPhpCodeCommentLine('Form', 'Select ' . $ccFieldName, $t); + $ret .= $this->cxc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', "'Empty'", $t); + $ret .= $this->cxc->getClassAddOptionArray($ccFieldName . 'Select', "\${$tableName}Handler->getList()", $t); + $ret .= $this->cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); return $ret; } @@ -520,16 +509,16 @@ private function getXoopsFormSelectBox($language, $tableName, $fieldName, $requi * @param string $required * @return string */ - private function getXoopsFormSelectUser($language, $fieldName, $required = 'false') + private function getXoopsFormSelectUser($language, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine('Form Select', 'User ' . $ccFieldName, $t); - $xoopsSelectUser = $cxc->getClassXoopsFormSelectUser('', $language, $fieldName, 'false', $fieldName, true, $t); - $ret .= $cxc->getClassAddElement('form', $xoopsSelectUser . $required, $t); + $ret = $this->pc->getPhpCodeCommentLine('Form Select', 'User ' . $ccFieldName, $t); + $xUser = $this->pc->getPhpCodeGlobals('xoopsUser'); + $ret .= $this->pc->getPhpCodeTernaryOperator('uidCurrent', '\is_object(' . $xUser . ')', $xUser . '->uid()', '0', "\t\t"); + $ret .= $this->pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', '$uidCurrent', "\$this->getVar('{$fieldName}')", $t); + $xoopsSelectUser = $this->cxc->getClassXoopsFormSelectUser('', $language, $fieldName, 'false', '$' . $ccFieldName, true, $t); + $ret .= $this->cxc->getClassAddElement('form', $xoopsSelectUser . $required, $t); return $ret; } @@ -539,21 +528,18 @@ private function getXoopsFormSelectUser($language, $fieldName, $required = 'fals * * @param $language * @param $fieldName - * @param $required + * @param string $required * * @return string */ - private function getXoopsFormRadioYN($language, $fieldName, $required = 'false') + private function getXoopsFormRadioYN($language, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine('Form Radio', 'Yes/No ' . $ccFieldName, $t); - $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', 0, "\$this->getVar('{$fieldName}')", $t); - $xoopsRadioYN = $cxc->getClassXoopsFormRadioYN('', $language, $fieldName, $ccFieldName, true, $t); - $ret .= $cxc->getClassAddElement('form', $xoopsRadioYN . $required, $t); + $ret = $this->pc->getPhpCodeCommentLine('Form Radio', 'Yes/No ' . $ccFieldName, $t); + $ret .= $this->pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', 0, "\$this->getVar('{$fieldName}')", $t); + $xoopsRadioYN = $this->cxc->getClassXoopsFormRadioYN('', $language, $fieldName, $ccFieldName, true, $t); + $ret .= $this->cxc->getClassAddElement('form', $xoopsRadioYN . $required, $t); return $ret; } @@ -563,21 +549,18 @@ private function getXoopsFormRadioYN($language, $fieldName, $required = 'false') * * @param $language * @param $fieldName - * @param $required + * @param string $required * * @return string */ - private function getXoopsFormTextDateSelect($language, $fieldName, $required = 'false') + private function getXoopsFormTextDateSelect($language, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); $t = "\t\t"; - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $ret = $pc->getPhpCodeCommentLine('Form Text', 'Date Select ' . $ccFieldName, $t); - $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', 0, "\$this->getVar('{$fieldName}')", $t); - $xoopsTextDateSelect = $cxc->getClassXoopsFormTextDateSelect('', $language, $fieldName, $fieldName, $ccFieldName, true, $t); - $ret .= $cxc->getClassAddElement('form', $xoopsTextDateSelect . $required, $t); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $ret = $this->pc->getPhpCodeCommentLine('Form Text', 'Date Select ' . $ccFieldName, $t); + $ret .= $this->pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', '\time()', "\$this->getVar('{$fieldName}')", $t); + $xoopsTextDateSelect = $this->cxc->getClassXoopsFormTextDateSelect('', $language, $fieldName, $fieldName, $ccFieldName, true, $t); + $ret .= $this->cxc->getClassAddElement('form', $xoopsTextDateSelect . $required, $t); return $ret; } @@ -587,21 +570,18 @@ private function getXoopsFormTextDateSelect($language, $fieldName, $required = ' * * @param $language * @param $fieldName - * @param $required + * @param string $required * * @return string */ - private function getXoopsFormDateTime($language, $fieldName, $required = 'false') + private function getXoopsFormDateTime($language, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); $t = "\t\t"; - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $ret = $pc->getPhpCodeCommentLine('Form Text', 'Date Select ' . $ccFieldName, $t); - $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', 0, "\$this->getVar('{$fieldName}')", $t); - $xoopsTextDateSelect = $cxc->getClassXoopsFormDateTime('', $language, $fieldName, $fieldName, $ccFieldName, true, $t); - $ret .= $cxc->getClassAddElement('form', $xoopsTextDateSelect . $required, $t); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $ret = $this->pc->getPhpCodeCommentLine('Form Text', 'Date Select ' . $ccFieldName, $t); + $ret .= $this->pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', '\time()', "\$this->getVar('{$fieldName}')", $t); + $xoopsTextDateSelect = $this->cxc->getClassXoopsFormDateTime('', $language, $fieldName, $fieldName, $ccFieldName, true, $t); + $ret .= $this->cxc->getClassAddElement('form', $xoopsTextDateSelect . $required, $t); return $ret; } @@ -612,25 +592,30 @@ private function getXoopsFormDateTime($language, $fieldName, $required = 'false' * @param $language * @param $moduleDirname * @param $fieldName + * @param $tablePermissions * @param string $required * * @return string */ - private function getXoopsFormSelectStatus($language, $moduleDirname, $fieldName, $required = 'false') + private function getXoopsFormSelectStatus($language, $moduleDirname, $fieldName, $tablePermissions, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $languageShort = substr($language, 0, 4) . mb_strtoupper($moduleDirname) . '_'; + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $languageShort = \mb_substr($language, 0, 5) . \mb_strtoupper($moduleDirname) . '_'; $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine('Form Select', 'Status ' . $ccFieldName, $t); - $ret .= $cxc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "Constants::STATUS_NONE, {$languageShort}STATUS_NONE", $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "Constants::STATUS_OFFLINE, {$languageShort}STATUS_OFFLINE", $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "Constants::STATUS_SUBMITTED, {$languageShort}STATUS_SUBMITTED", $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "Constants::STATUS_APPROVED, {$languageShort}STATUS_APPROVED", $t); - $ret .= $cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); + $ret = $this->pc->getPhpCodeCommentLine('Form Select', 'Status ' . $ccFieldName, $t); + if (1 == $tablePermissions) { + $ret .= $this->xc->getXcHandlerLine('permissions', $t); + } + $ret .= $this->cxc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', $this->xc->getXcGetConstants('STATUS_NONE') . ", {$languageShort}STATUS_NONE", $t); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', $this->xc->getXcGetConstants('STATUS_OFFLINE') . ", {$languageShort}STATUS_OFFLINE", $t); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', $this->xc->getXcGetConstants('STATUS_SUBMITTED') . ", {$languageShort}STATUS_SUBMITTED", $t); + if (1 == $tablePermissions) { + $contIf = $this->cxc->getClassAddOption($ccFieldName . 'Select', $this->xc->getXcGetConstants('STATUS_APPROVED') . ", {$languageShort}STATUS_APPROVED", $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions('$permissionsHandler->getPermGlobalApprove()', '', '', $contIf, false, $t); + } + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', $this->xc->getXcGetConstants('STATUS_BROKEN') . ", {$languageShort}STATUS_BROKEN", $t); + $ret .= $this->cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); return $ret; } @@ -640,20 +625,17 @@ private function getXoopsFormSelectStatus($language, $moduleDirname, $fieldName, * * @param $language * @param $fieldName - * @param $required + * @param string $required * * @return string */ - private function getXoopsFormPassword($language, $fieldName, $required = 'false') + private function getXoopsFormPassword($language, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); $t = "\t\t"; - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $ret = $pc->getPhpCodeCommentLine('Form Text', 'Enter Password ' . $ccFieldName, $t); - $xoopsPassword = $cxc->getClassXoopsFormPassword('', $language, $fieldName, 10, 32, true, $t); - $ret .= $cxc->getClassAddElement('form', $xoopsPassword . $required, $t); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $ret = $this->pc->getPhpCodeCommentLine('Form Text', 'Enter Password ' . $ccFieldName, $t); + $xoopsPassword = $this->cxc->getClassXoopsFormPassword('', $language, $fieldName, '10', '32', true, $t); + $ret .= $this->cxc->getClassAddElement('form', $xoopsPassword . $required, $t); return $ret; } @@ -667,20 +649,16 @@ private function getXoopsFormPassword($language, $fieldName, $required = 'false' * * @return string */ - private function getXoopsFormSelectCountry($language, $fieldName, $required = 'false') + private function getXoopsFormSelectCountry($language, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine('Form Select', 'Country ' . $ccFieldName, $t); - $ret .= $cxc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "'', _NONE", $t); - $ret .= $xc->getXcXoopsListCountryList('countryArray', $t); - $ret .= $cxc->getClassAddOptionArray($ccFieldName . 'Select', '$countryArray', $t); - $ret .= $cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); + $ret = $this->pc->getPhpCodeCommentLine('Form Select', 'Country ' . $ccFieldName, $t); + $ret .= $this->cxc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', "'', \_NONE", $t); + $ret .= $this->xc->getXcXoopsListCountryList('countryArray', $t); + $ret .= $this->cxc->getClassAddOptionArray($ccFieldName . 'Select', '$countryArray', $t); + $ret .= $this->cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); return $ret; } @@ -694,20 +672,16 @@ private function getXoopsFormSelectCountry($language, $fieldName, $required = 'f * * @return string */ - private function getXoopsFormSelectLang($language, $fieldName, $required = 'false') + private function getXoopsFormSelectLang($language, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine('Form Select', 'Lang ' . $ccFieldName, $t); - $ret .= $cxc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "'', _NONE", $t); - $ret .= $xc->getXcXoopsListLangList('langArray', $t); - $ret .= $cxc->getClassAddOptionArray($ccFieldName . 'Select', '$langArray', $t); - $ret .= $cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); + $ret = $this->pc->getPhpCodeCommentLine('Form Select', 'Lang ' . $ccFieldName, $t); + $ret .= $this->cxc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', "'', \_NONE", $t); + $ret .= $this->xc->getXcXoopsListLangList('langArray', $t); + $ret .= $this->cxc->getClassAddOptionArray($ccFieldName . 'Select', '$langArray', $t); + $ret .= $this->cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); return $ret; } @@ -722,22 +696,44 @@ private function getXoopsFormSelectLang($language, $fieldName, $required = 'fals * * @return string */ - private function getXoopsFormRadio($language, $moduleDirname, $fieldName, $required = 'false') + private function getXoopsFormRadio($language, $moduleDirname, $fieldName, string $required = 'false') + { + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $languageShort = \mb_substr($language, 0, 5) . \mb_strtoupper($moduleDirname) . '_'; + $t = "\t\t"; + $ret = $this->pc->getPhpCodeCommentLine('Form Radio', $ccFieldName, $t); + $ret .= $this->pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', '0', "\$this->getVar('{$fieldName}')", $t); + $ret .= $this->cxc->getClassXoopsFormRadio($ccFieldName . 'Select', $language, $fieldName, "{$ccFieldName}", false, $t); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', "'0', \_NONE", $t); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', "'1', {$languageShort}LIST_1", $t); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', "'2', {$languageShort}LIST_2", $t); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', "'3', {$languageShort}LIST_3", $t); + $ret .= $this->cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); + + return $ret; + } + + /** + * @private function getXoopsFormRadioOnoffline + * + * @param $language + * @param $fieldName + * @param string $required + * + * @return string + */ + private function getXoopsFormRadioOnoffline($language, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $languageShort = substr($language, 0, 4) . mb_strtoupper($moduleDirname) . '_'; + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine('Form Radio', $ccFieldName, $t); - $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', '0', "\$this->getVar('{$fieldName}')", $t); - $ret .= $cxc->getClassXoopsFormRadio($ccFieldName . 'Select', $language, $fieldName, "{$ccFieldName}", false, $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "'0', _NONE", $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "'1', {$languageShort}LIST_1", $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "'2', {$languageShort}LIST_2", $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "'3', {$languageShort}LIST_3", $t); - $ret .= $cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); + $ret = $this->pc->getPhpCodeCommentLine('Form Radio on-/offline', $ccFieldName, $t); + $ret .= $this->pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', '0', "\$this->getVar('{$fieldName}')", $t); + $ret .= $this->cxc->getClassXoopsFormRadio($ccFieldName . 'Select', $language, $fieldName, "{$ccFieldName}", false, $t); + $param = $this->xc->getXcGetConstants('RADIO_OFFLINE'); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', "{$param}, {$language}_OFFLINE", $t); + $param = $this->xc->getXcGetConstants('RADIO_ONLINE'); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', "{$param}, {$language}_ONLINE", $t); + $ret .= $this->cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); return $ret; } @@ -753,25 +749,21 @@ private function getXoopsFormRadio($language, $moduleDirname, $fieldName, $requi * * @return string */ - private function getXoopsFormSelectCombo($language, $moduleDirname, $tableName, $fieldName, $required = 'false') + private function getXoopsFormSelectCombo($language, $moduleDirname, $tableName, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ucfTableName = ucfirst($tableName); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $languageShort = substr($language, 0, 4) . mb_strtoupper($moduleDirname) . '_'; + $ucfTableName = \ucfirst($tableName); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $languageShort = \mb_substr($language, 0, 5) . \mb_strtoupper($moduleDirname) . '_'; $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine($ucfTableName, 'handler', $t); - $ret .= $xc->getXcHandlerLine($tableName, $t); - $ret .= $pc->getPhpCodeCommentLine('Form', 'Select ' . $ccFieldName, $t); - $ret .= $cxc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", '5', '', false, $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "'0', _NONE", $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "'1', {$languageShort}LIST_1", $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "'2', {$languageShort}LIST_2", $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "'3', {$languageShort}LIST_3", $t); - $ret .= $cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); + $ret = $this->pc->getPhpCodeCommentLine($ucfTableName, 'Handler', $t); + $ret .= $this->xc->getXcHandlerLine($tableName, $t); + $ret .= $this->pc->getPhpCodeCommentLine('Form', 'Select ' . $ccFieldName, $t); + $ret .= $this->cxc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", '5', '', false, $t); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', "'0', \_NONE", $t); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', "'1', {$languageShort}LIST_1", $t); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', "'2', {$languageShort}LIST_2", $t); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', "'3', {$languageShort}LIST_3", $t); + $ret .= $this->cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); return $ret; } @@ -782,28 +774,25 @@ private function getXoopsFormSelectCombo($language, $moduleDirname, $tableName, * @param $language * @param $fieldName * @param $fieldElement - * @param $required + * @param string $required * * @return string */ - private function getXoopsFormTable($language,$fieldName, $fieldElement, $required = 'false') + private function getXoopsFormTable($language, $fieldName, $fieldElement, string $required = 'false') { - $tc = Tdmcreate\Helper::getInstance(); - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $t = "\t\t"; $ret = ''; - $fElement = $tc->getHandler('fieldelements')->get($fieldElement); - $rpFieldelementName = mb_strtolower(str_replace('Table : ', '', $fElement->getVar('fieldelement_name'))); - $ret .= $pc->getPhpCodeCommentLine('Form Table', $rpFieldelementName, $t); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $ret .= $xc->getXcHandlerLine($rpFieldelementName, $t); - $ret .= $cxc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t); - $ret .= $cxc->getClassAddOptionArray($ccFieldName . 'Select', "\${$rpFieldelementName}Handler->getList()", $t); - $ret .= $cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); + $fElement = $this->helper->getHandler('Fieldelements')->get($fieldElement); + $rpFieldelementName = \mb_strtolower(\str_replace('Table : ', '', $fElement->getVar('fieldelement_name'))); + $ret .= $this->pc->getPhpCodeCommentLine('Form Table', $rpFieldelementName, $t); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $ret .= $this->xc->getXcHandlerLine($rpFieldelementName, $t); + $ret .= $this->cxc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t); + if ('' === $required || 'false' === $required) { + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', "0, ' '", $t); + } + $ret .= $this->cxc->getClassAddOptionArray($ccFieldName . 'Select', "\${$rpFieldelementName}Handler->getList()", $t); + $ret .= $this->cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); return $ret; } @@ -820,26 +809,22 @@ private function getXoopsFormTable($language,$fieldName, $fieldElement, $require */ private function getXoopsFormTopic($language, $topicTableName, $fieldId, $fieldPid, $fieldMain) { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ucfTopicTableName = ucfirst($topicTableName); - $stlTopicTableName = mb_strtolower($topicTableName); - $ccFieldPid = $tf->getCamelCase($fieldPid, false, true); + $ucfTopicTableName = \ucfirst($topicTableName); + $stlTopicTableName = \mb_strtolower($topicTableName); + $ccFieldPid = $this->cf->getCamelCase($fieldPid, false, true); $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine('Form Table', $ucfTopicTableName, $t); - $ret .= $xc->getXcHandlerLine($stlTopicTableName, $t); - $ret .= $xc->getXcCriteriaCompo('cr' . $ucfTopicTableName, $t); - $ret .= $xc->getXcHandlerCountClear($stlTopicTableName . 'Count', $stlTopicTableName, '$cr' . $ucfTopicTableName, $t); - $contIf = $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/tree', true, false, 'include', $t . "\t"); - $contIf .= $xc->getXcHandlerAllClear($stlTopicTableName . 'All', $stlTopicTableName, '$cr' . $ucfTopicTableName, $t . "\t"); - $contIf .= $cxc->getClassXoopsObjectTree($stlTopicTableName . 'Tree', $stlTopicTableName . 'All', $fieldId, $fieldPid, $t . "\t"); - $contIf .= $cxc->getClassXoopsMakeSelBox($ccFieldPid, $stlTopicTableName . 'Tree', $fieldPid, $fieldMain, '--', $fieldPid, $t . "\t"); - $formLabel = $cxc->getClassXoopsFormLabel('', $language, "\${$ccFieldPid}", true, ''); - $contIf .= $cxc->getClassAddElement('form', $formLabel, $t . "\t"); - $ret .= $pc->getPhpCodeConditions("\${$stlTopicTableName}Count", null, null, $contIf, false, $t); - $ret .= $pc->getPhpCodeUnset('cr' . $ucfTopicTableName, $t); + $ret = $this->pc->getPhpCodeCommentLine('Form Table', $ucfTopicTableName, $t); + $ret .= $this->xc->getXcHandlerLine($stlTopicTableName, $t); + $ret .= $this->xc->getXcCriteriaCompo('cr' . $ucfTopicTableName, $t); + $ret .= $this->xc->getXcHandlerCountClear($stlTopicTableName . 'Count', $stlTopicTableName, '$cr' . $ucfTopicTableName, $t); + $contIf = $this->pc->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH', 'class/tree', true, false, 'require', $t . "\t"); + $contIf .= $this->xc->getXcHandlerAllClear($stlTopicTableName . 'All', $stlTopicTableName, '$cr' . $ucfTopicTableName, $t . "\t"); + $contIf .= $this->cxc->getClassXoopsObjectTree($stlTopicTableName . 'Tree', $stlTopicTableName . 'All', $fieldId, $fieldPid, $t . "\t"); + $contIf .= $this->cxc->getClassXoopsMakeSelBox($ccFieldPid, $stlTopicTableName . 'Tree', $fieldPid, $fieldMain, '--', $fieldPid, $t . "\t"); + $formLabel = $this->cxc->getClassXoopsFormLabel('', $language, "\${$ccFieldPid}", true, ''); + $contIf .= $this->cxc->getClassAddElement('form', $formLabel, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions("\${$stlTopicTableName}Count", '', '', $contIf, false, $t); + $ret .= $this->pc->getPhpCodeUnset('cr' . $ucfTopicTableName, $t); return $ret; } @@ -848,55 +833,93 @@ private function getXoopsFormTopic($language, $topicTableName, $fieldId, $fieldP * @private function getXoopsFormTag * * @param $fieldId - * @param $required + * @param string $required * * @return string */ - private function getXoopsFormTag($fieldId, $required = 'false') + private function getXoopsFormTag($fieldId, string $required = 'false') { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine('Use tag', 'module', $t); - $isDir = $pc->getPhpCodeIsDir("XOOPS_ROOT_PATH . '/modules/tag'"); - $ret .= $pc->getPhpCodeTernaryOperator('dirTag', $isDir, 'true', 'false', $t); - $paramIf = '(' . $xc->getXcGetConfig('usetag') . ' == 1)'; - $condIf = $pc->getPhpCodeTernaryOperator('tagId', '$this->isNew()', '0', "\$this->getVar('{$fieldId}')", $t . "\t"); - $condIf .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'modules/tag/include/formtag', true, false, $type = 'include', $t . "\t"); - $paramElem = $cxc->getClassXoopsFormTag('', 'tag', 60, 255, 'tagId', 0, true, ''); - $condIf .= $cxc->getClassAddElement('form', $paramElem . $required, $t . "\t"); - $ret .= $pc->getPhpCodeConditions($paramIf, ' && ', '$dirTag', $condIf, false, $t); + $ret = $this->pc->getPhpCodeCommentLine('Use tag', 'module', $t); + $isDir = $this->pc->getPhpCodeIsDir("\XOOPS_ROOT_PATH . '/modules/tag'"); + $ret .= $this->pc->getPhpCodeTernaryOperator('dirTag', $isDir, 'true', 'false', $t); + $paramIf = '(' . $this->xc->getXcGetConfig('usetag') . ' == 1)'; + $condIf = $this->pc->getPhpCodeTernaryOperator('tagId', '$this->isNew()', '0', "\$this->getVar('{$fieldId}')", $t . "\t"); + $condIf .= $this->pc->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH', 'modules/tag/include/formtag', true, false, 'require', $t . "\t"); + $paramElem = $this->cxc->getClassXoopsFormTag('', 'tag', 60, 255, 'tagId', 0, true, ''); + $condIf .= $this->cxc->getClassAddElement('form', $paramElem . $required, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions($paramIf, ' && ', '$dirTag', $condIf, false, $t); + + return $ret; + } + + /** + * @private function getXoopsFormTextUuid + * + * @param $language + * @param $fieldName + * @param string $required + * @return string + */ + private function getXoopsFormTextUuid($language, $fieldName, string $required = 'false') + { + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $ret = $this->pc->getPhpCodeCommentLine('Form Text Uuid', $ccFieldName, "\t\t"); + $ret .= $this->pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', '\Xmf\Uuid::generate()', "\$this->getVar('{$fieldName}')", "\t\t"); + $formText = $this->cxc->getClassXoopsFormText('', $language, $fieldName, 50, 150, $ccFieldName, true); + $ret .= $this->cxc->getClassAddElement('form', $formText . $required); + + return $ret; + } + + /** + * @private function getXoopsFormTextIp + * + * @param $language + * @param $fieldName + * @param string $required + * @return string + */ + private function getXoopsFormTextIp($language, $fieldName, string $required = 'false') + { + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + + $ret = $this->pc->getPhpCodeCommentLine('Form Text IP', $ccFieldName, "\t\t"); + $ret .= $this->xc->getXcEqualsOperator('$' . $ccFieldName, "\$_SERVER['REMOTE_ADDR']", null, "\t\t"); + + $ret .= $this->pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', "(\$_SERVER['REMOTE_ADDR'] ?? '')", "\$this->getVar('{$fieldName}')", "\t\t"); + + + + $formText = $this->cxc->getClassXoopsFormText('', $language, $fieldName, 20, 150, $ccFieldName, true); + $ret .= $this->cxc->getClassAddElement('form', $formText . $required); return $ret; } /** * @public function renderElements - * @param null + * * @return string */ public function renderElements() { - $tc = Tdmcreate\Helper::getInstance(); - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $ttf = Tdmcreate\Files\CreateTableFields::getInstance(); - $module = $this->getModule(); - $table = $this->getTable(); - $moduleDirname = $module->getVar('mod_dirname'); - $tableName = $table->getVar('table_name'); - $tableSoleName = $table->getVar('table_solename'); - $languageFunct = $tf->getLanguage($moduleDirname, 'AM'); - //$language_table = $languageFunct . strtoupper($tableName); - $ret = ''; - $fields = $ttf->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'), 'field_order ASC, field_id'); - $fieldId = ''; - $fieldIdTopic = ''; - $fieldPidTopic = ''; - $fieldMainTopic = ''; - $fieldElementId = []; - $counter = 0; - foreach (array_keys($fields) as $f) { + $module = $this->getModule(); + $table = $this->getTable(); + $moduleDirname = $module->getVar('mod_dirname'); + $tableName = $table->getVar('table_name'); + $tableSoleName = $table->getVar('table_solename'); + $tablePermissions = $table->getVar('table_permissions'); + $languageFunct = $this->cf->getLanguage($moduleDirname, 'AM'); + $ret = ''; + $fields = $this->tf->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); + $fieldId = ''; + $fieldIdTopic = ''; + $fieldPidTopic = ''; + $fieldMainTopic = ''; + $fieldElementId = []; + $tagDone = false; + foreach (\array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); $fieldDefault = $fields[$f]->getVar('field_default'); $fieldElement = $fields[$f]->getVar('field_element'); @@ -905,86 +928,101 @@ public function renderElements() if ((0 == $f) && (1 == $table->getVar('table_autoincrement'))) { $fieldId = $fieldName; } - $rpFieldName = $tf->getRightString($fieldName); - $language = $languageFunct . mb_strtoupper($tableSoleName) . '_' . mb_strtoupper($rpFieldName); + $rpFieldName = $this->cf->getRightString($fieldName); + $language = $languageFunct . \mb_strtoupper($tableSoleName) . '_' . \mb_strtoupper($rpFieldName); $required = (1 == $fields[$f]->getVar('field_required')) ? ', true' : ''; - $fieldElements = $tc->getHandler('fieldelements')->get($fieldElement); + $fieldElements = $this->helper->getHandler('Fieldelements')->get($fieldElement); $fieldElementId[] = $fieldElements->getVar('fieldelement_id'); if (1 == $fieldInForm) { - $counter++; // Switch elements switch ($fieldElement) { case 1: break; - case 2: + case Constants::FIELD_ELE_TEXT: // textbox + case Constants::FIELD_ELE_TEXTINTEGER: // textbox integer + case Constants::FIELD_ELE_TEXTFLOAT: // textbox float + case Constants::FIELD_ELE_TEXTCOMMENTS: // textbox comments + case Constants::FIELD_ELE_TEXTRATINGS: // textbox ratings + case Constants::FIELD_ELE_TEXTVOTES: // textbox votes + case Constants::FIELD_ELE_TEXTREADS: // textbox reads $ret .= $this->getXoopsFormText($language, $fieldName, $fieldDefault, $required); break; - case 3: + case Constants::FIELD_ELE_TEXTAREA: $ret .= $this->getXoopsFormTextArea($language, $fieldName, $required); break; - case 4: + case Constants::FIELD_ELE_DHTMLTEXTAREA: $ret .= $this->getXoopsFormDhtmlTextArea($language, $fieldName, $required); break; - case 5: + case Constants::FIELD_ELE_CHECKBOX: $ret .= $this->getXoopsFormCheckBox($language, $tableSoleName, $fieldName, $fieldElementId, $required); break; - case 6: + case Constants::FIELD_ELE_RADIOYN: $ret .= $this->getXoopsFormRadioYN($language, $fieldName, $required); break; - case 7: + case Constants::FIELD_ELE_RADIO_ONOFFLINE: + $ret .= $this->getXoopsFormRadioOnoffline($language, $fieldName, $required); + break; + case Constants::FIELD_ELE_SELECTBOX: $ret .= $this->getXoopsFormSelectBox($language, $tableName, $fieldName, $required); break; - case 8: + case Constants::FIELD_ELE_SELECTUSER: $ret .= $this->getXoopsFormSelectUser($language, $fieldName, $required); break; - case 9: + case Constants::FIELD_ELE_COLORPICKER: $ret .= $this->getXoopsFormColorPicker($language, $fieldName, $required); break; - case 10: + case Constants::FIELD_ELE_IMAGELIST: $ret .= $this->getXoopsFormImageList($language, $moduleDirname, $fieldName, $required); break; - case 11: + case Constants::FIELD_ELE_SELECTFILE: $ret .= $this->getXoopsFormSelectFile($language, $moduleDirname, $tableName, $fieldName, $required); break; - case 12: + case Constants::FIELD_ELE_URLFILE: $ret .= $this->getXoopsFormUrlFile($language, $moduleDirname, $fieldName, $fieldDefault, $required); break; - case 13: + case Constants::FIELD_ELE_UPLOADIMAGE: $ret .= $this->getXoopsFormUploadImage($language, $moduleDirname, $tableName, $fieldName, $required); break; - case 14: + case Constants::FIELD_ELE_UPLOADFILE: $ret .= $this->getXoopsFormUploadFile($language, $moduleDirname, $tableName, $fieldName, $required); break; - case 15: + case Constants::FIELD_ELE_TEXTDATESELECT: $ret .= $this->getXoopsFormTextDateSelect($language, $fieldName, $required); break; - case 16: - $ret .= $this->getXoopsFormSelectStatus($language, $moduleDirname, $fieldName, $required); + case Constants::FIELD_ELE_SELECTSTATUS: + $ret .= $this->getXoopsFormSelectStatus($language, $moduleDirname, $fieldName, $tablePermissions, $required); break; - case 17: + case Constants::FIELD_ELE_PASSWORD: $ret .= $this->getXoopsFormPassword($language, $fieldName, $required); break; - case 18: + case Constants::FIELD_ELE_SELECTCOUNTRY: $ret .= $this->getXoopsFormSelectCountry($language, $fieldName, $required); break; - case 19: + case Constants::FIELD_ELE_SELECTLANG: $ret .= $this->getXoopsFormSelectLang($language, $fieldName, $required); break; - case 20: + case Constants::FIELD_ELE_RADIO: $ret .= $this->getXoopsFormRadio($language, $moduleDirname, $fieldName, $required); break; - case 21: + case Constants::FIELD_ELE_DATETIME: $ret .= $this->getXoopsFormDateTime($language, $fieldName, $required); break; - case 22: + case Constants::FIELD_ELE_SELECTCOMBO: $ret .= $this->getXoopsFormSelectCombo($language, $moduleDirname, $tableName, $fieldName, $required); break; + case Constants::FIELD_ELE_TEXTUUID: + $ret .= $this->getXoopsFormTextUuid($language, $fieldName, $required); + break; + case Constants::FIELD_ELE_TEXTIP: + $ret .= $this->getXoopsFormTextIp($language, $fieldName, $required); + break; default: // If we use tag module - if (1 == $table->getVar('table_tag')) { + if (!$tagDone && 1 == $table->getVar('table_tag')) { $ret .= $this->getXoopsFormTag($fieldId, $required); + $tagDone = true; } // If we want to hide XoopsFormHidden() or field id if ((0 == $f) && (1 == $table->getVar('table_autoincrement'))) { @@ -993,16 +1031,16 @@ public function renderElements() break; } - $fieldElements = $tc->getHandler('fieldelements')->get($fieldElement); + $fieldElements = $this->helper->getHandler('Fieldelements')->get($fieldElement); $fieldElementTid = $fieldElements->getVar('fieldelement_tid'); if ((int)$fieldElementTid > 0 ) { if ((1 == $fieldParent) || 1 == $table->getVar('table_category')) { $fieldElementMid = $fieldElements->getVar('fieldelement_mid'); $fieldElementName = $fieldElements->getVar('fieldelement_name'); - $fieldNameDesc = mb_substr($fieldElementName, mb_strrpos($fieldElementName, ':'), mb_strlen($fieldElementName)); - $topicTableName = str_replace(': ', '', $fieldNameDesc); - $fieldsTopics = $ttf->getTableFields($fieldElementMid, $fieldElementTid); - foreach (array_keys($fieldsTopics) as $g) { + $fieldNameDesc = mb_substr($fieldElementName, \mb_strrpos($fieldElementName, ':'), mb_strlen($fieldElementName)); + $topicTableName = \str_replace(': ', '', $fieldNameDesc); + $fieldsTopics = $this->tf->getTableFields($fieldElementMid, $fieldElementTid); + foreach (\array_keys($fieldsTopics) as $g) { $fieldNameTopic = $fieldsTopics[$g]->getVar('field_name'); if ((0 == $g) && (1 == $table->getVar('table_autoincrement'))) { $fieldIdTopic = $fieldNameTopic; diff --git a/class/Files/Classes/ClassHandlerFiles.php b/class/Files/Classes/ClassHandlerFiles.php index b46be306..8e08bd24 100644 --- a/class/Files/Classes/ClassHandlerFiles.php +++ b/class/Files/Classes/ClassHandlerFiles.php @@ -1,9 +1,9 @@ -xc = Modulebuilder\Files\CreateXoopsCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); + //$this->helper = Modulebuilder\Helper::getInstance(); } /** @@ -59,12 +74,12 @@ public static function getInstance() /** * @public function write * - * @param string $module - * @param string $table + * @param $module + * @param $table * @param mixed $tables * @param $filename */ - public function write($module, $table, $tables, $filename) + public function write($module, $table, $tables, $filename): void { $this->setModule($module); $this->setTable($table); @@ -76,39 +91,36 @@ public function write($module, $table, $tables, $filename) * @public function getClassHandler * * @param string $moduleDirname - * @param string $table + * @param $table * @param string $fieldId - * @param $fieldName * @param string $fieldMain * @param $fieldParentId * @param $fieldElement * @return string */ - private function getClassObjectHandler($moduleDirname, $table, $fieldId, $fieldName, $fieldMain, $fieldParentId, $fieldElement) + private function getClassObjectHandler(string $moduleDirname, $table, string $fieldId, string $fieldMain, $fieldParentId, $fieldElement) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $tableName = $table->getVar('table_name'); - $tableFieldName = $table->getVar('table_fieldname'); - $ucfTableName = ucfirst($tableName); - $multiLineCom = ['Class Object Handler' => $ucfTableName]; - $ret = $pc->getPhpCodeCommentMultiLine($multiLineCom); + $tableName = $table->getVar('table_name'); + $ucfTableName = \ucfirst($tableName); + $multiLineCom = ['Class Object Handler' => $ucfTableName]; + $ret = $this->pc->getPhpCodeCommentMultiLine($multiLineCom); - $cClh = $pc->getPhpCodeCommentMultiLine(['Constructor' => '', '' => '', '@param' => '\XoopsDatabase $db'], "\t"); + $cClh = $this->pc->getPhpCodeCommentMultiLine(['Constructor' => '', '' => '', '@param' => '\XoopsDatabase $db'], "\t"); $constr = "\t\tparent::__construct(\$db, '{$moduleDirname}_{$tableName}', {$ucfTableName}::class, '{$fieldId}', '{$fieldMain}');\n"; - $cClh .= $pc->getPhpCodeFunction('__construct', '\XoopsDatabase $db', $constr, 'public ', false, "\t"); + $cClh .= $this->pc->getPhpCodeFunction('__construct', '\XoopsDatabase $db', $constr, 'public ', false, "\t"); $cClh .= $this->getClassCreate(); $cClh .= $this->getClassGet(); $cClh .= $this->getClassGetInsertId(); $cClh .= $this->getClassCounter($tableName, $fieldId, $fieldMain); $cClh .= $this->getClassAll($tableName, $fieldId, $fieldMain); $cClh .= $this->getClassCriteria($tableName); - if ($fieldElement > 16 && in_array(1, $fieldParentId)) { - $cClh .= $this->getClassByCategory($moduleDirname, $tableName, $tableFieldName, $fieldId, $fieldName, $fieldMain, $fieldElement); + if ($fieldElement > 16 && \in_array(1, $fieldParentId)) { + //$cClh .= $this->getClassByCategory($moduleDirname, $tableName, $tableFieldName, $fieldId, $fieldName, $fieldMain, $fieldElement); $cClh .= $this->getClassGetTableSolenameById($table, $fieldMain); } - $ret .= $pc->getPhpCodeClass("{$ucfTableName}Handler", $cClh, '\XoopsPersistableObjectHandler'); + $ret .= $this->pc->getPhpCodeClass("{$ucfTableName}Handler", $cClh, '\XoopsPersistableObjectHandler'); return $ret; } @@ -120,11 +132,10 @@ private function getClassObjectHandler($moduleDirname, $table, $fieldId, $fieldN */ private function getClassCreate() { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $ret = $pc->getPhpCodeCommentMultiLine(['@param bool' => '$isNew', '' => '', '@return' => 'object'], "\t"); + $ret = $this->pc->getPhpCodeCommentMultiLine(['@param bool' => '$isNew', '' => '', '@return' => 'object'], "\t"); $cClhc = $this->getSimpleString('return parent::create($isNew);', "\t\t"); - $ret .= $pc->getPhpCodeFunction('create', '$isNew = true', $cClhc, 'public ', false, "\t"); + $ret .= $this->pc->getPhpCodeFunction('create', '$isNew = true', $cClhc, 'public ', false, "\t"); return $ret; } @@ -136,11 +147,10 @@ private function getClassCreate() */ private function getClassGet() { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $ret = $pc->getPhpCodeCommentMultiLine(['retrieve a' => 'field', '' => '', '@param int' => '$i field id', '@param null' => 'fields', '@return mixed reference to the' => '{@link Get} object'], "\t"); - $cClhg = $this->getSimpleString('return parent::get($i, $fields);', "\t\t"); + $ret = $this->pc->getPhpCodeCommentMultiLine(['retrieve a' => 'field', '' => '', '@param int' => '$id field id', '@param null' => 'fields', '@return \XoopsObject|null reference to the' => '{@link Get} object'], "\t"); + $cClhg = $this->getSimpleString('return parent::get($id, $fields);', "\t\t"); - $ret .= $pc->getPhpCodeFunction('get', '$i = null, $fields = null', $cClhg, 'public ', false, "\t"); + $ret .= $this->pc->getPhpCodeFunction('get', '$id = null, $fields = null', $cClhg, 'public ', false, "\t"); return $ret; } @@ -152,11 +162,10 @@ private function getClassGet() */ private function getClassGetInsertId() { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $ret = $pc->getPhpCodeCommentMultiLine(['get inserted' => 'id', '' => '', '@param' => 'null', '@return integer reference to the' => '{@link Get} object'], "\t"); + $ret = $this->pc->getPhpCodeCommentMultiLine(['get inserted' => 'id', '' => '', '@return int reference to the' => '{@link Get} object'], "\t"); $cClhgid = $this->getSimpleString('return $this->db->getInsertId();', "\t\t"); - $ret .= $pc->getPhpCodeFunction('getInsertId', '', $cClhgid, 'public ', false, "\t"); + $ret .= $this->pc->getPhpCodeFunction('getInsertId', '', $cClhgid, 'public ', false, "\t"); return $ret; } @@ -172,18 +181,16 @@ private function getClassGetInsertId() */ private function getClassCounter($tableName, $fieldId, $fieldMain) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $ucfTableName = ucfirst($tableName); - $ret = $pc->getPhpCodeCommentMultiLine(['Get Count ' . $ucfTableName => 'in the database', '@param int $start' => '', '@param int $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'int'], "\t"); - - $critCount = $xc->getXcCriteriaCompo('crCount' . $ucfTableName, "\t\t"); - $paramsCrit = "\$this->get{$ucfTableName}Criteria(\$crCount{$ucfTableName}, \$start, \$limit, \$sort, \$order)"; - $critCount .= $xc->getXcEqualsOperator('$crCount' . $ucfTableName, $paramsCrit, null, "\t\t"); - $critCount .= $this->getSimpleString("return parent::getCount(\$crCount{$ucfTableName});", "\t\t"); - $params = "\$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC'"; + $ucfTableName = \ucfirst($tableName); + $ret = $this->pc->getPhpCodeCommentMultiLine(['Get Count ' . $ucfTableName => 'in the database', '@param string $sort' => '', '@param string $order' => '', '@return' => 'int'], "\t"); - $ret .= $pc->getPhpCodeFunction('getCount' . $ucfTableName, $params, $critCount, 'public ', false, "\t"); + $critCount = $this->xc->getXcCriteriaCompo('crCount' . $ucfTableName, "\t\t"); + $paramsCrit = "\$this->get{$ucfTableName}Criteria(\$crCount{$ucfTableName}, 0, 0, \$sort, \$order)"; + $critCount .= $this->xc->getXcEqualsOperator('$crCount' . $ucfTableName, $paramsCrit, null, "\t\t"); + $critCount .= $this->getSimpleString("return \$this->getCount(\$crCount{$ucfTableName});", "\t\t"); + $params = "\$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC'"; + + $ret .= $this->pc->getPhpCodeFunction('getCount' . $ucfTableName, $params, $critCount, 'public ', false, "\t"); return $ret; } @@ -199,22 +206,21 @@ private function getClassCounter($tableName, $fieldId, $fieldMain) */ private function getClassAll($tableName, $fieldId, $fieldMain) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $ucfTableName = ucfirst($tableName); - $ret = $pc->getPhpCodeCommentMultiLine(['Get All ' . $ucfTableName => 'in the database', '@param int $start' => '', '@param int $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'array'], "\t"); + $ucfTableName = \ucfirst($tableName); + $ret = $this->pc->getPhpCodeCommentMultiLine(['Get All ' . $ucfTableName => 'in the database', '@param int $start' => '', '@param int $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'array'], "\t"); - $critAll = $xc->getXcCriteriaCompo('crAll' . $ucfTableName, "\t\t"); + $critAll = $this->xc->getXcCriteriaCompo('crAll' . $ucfTableName, "\t\t"); $paramsCrit = "\$this->get{$ucfTableName}Criteria(\$crAll{$ucfTableName}, \$start, \$limit, \$sort, \$order)"; - $critAll .= $xc->getXcEqualsOperator('$crAll' . $ucfTableName, $paramsCrit, null, "\t\t"); - $critAll .= $this->getSimpleString("return parent::getAll(\$crAll{$ucfTableName});", "\t\t"); + $critAll .= $this->xc->getXcEqualsOperator('$crAll' . $ucfTableName, $paramsCrit, null, "\t\t"); + $critAll .= $this->getSimpleString("return \$this->getAll(\$crAll{$ucfTableName});", "\t\t"); $params = "\$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC'"; - $ret .= $pc->getPhpCodeFunction('getAll' . $ucfTableName, $params, $critAll, 'public ', false, "\t"); + $ret .= $this->pc->getPhpCodeFunction('getAll' . $ucfTableName, $params, $critAll, 'public ', false, "\t"); return $ret; } + /*remark from goffy: 'getClassByCategory' currently not in use*/ /** * @public function getClassByCategory * @@ -227,41 +233,41 @@ private function getClassAll($tableName, $fieldId, $fieldMain) * @param $fieldElement * @return string */ + /* private function getClassByCategory($moduleDirname, $tableName, $tableFieldName, $fieldId, $fieldName, $fieldMain, $fieldElement) { - $tc = Tdmcreate\Helper::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $ucfTableName = ucfirst($tableName); - $fieldElements = $tc->getHandler('fieldelements')->get($fieldElement); + $ucfTableName = \ucfirst($tableName); + $fieldElements = $this->helper->getHandler('Fieldelements')->get($fieldElement); $fieldElementName = $fieldElements->getVar('fieldelement_name'); - $fieldNameDesc = ucfirst(mb_substr($fieldElementName, mb_strrpos($fieldElementName, ':'), mb_strlen($fieldElementName))); - $topicTableName = str_replace(': ', '', $fieldNameDesc); + $fieldNameDesc = \ucfirst(mb_substr($fieldElementName, \mb_strrpos($fieldElementName, ':'), mb_strlen($fieldElementName))); + $topicTableName = \str_replace(': ', '', $fieldNameDesc); $lcfTopicTableName = lcfirst($topicTableName); - $ret = $pc->getPhpCodeCommentMultiLine(["Get All {$ucfTableName} By" => "{$fieldNameDesc} Id", '@param int $start' => '', '@param int $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'array'], "\t"); + $ret = $this->pc->getPhpCodeCommentMultiLine(["Get All {$ucfTableName} By" => "{$fieldNameDesc} Id", '@param int $start' => '', '@param int $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'array'], "\t"); - $critAll = $xc->getXcXoopsHandler('groupperm', "\t\t"); + $critAll = $this->xc->getXcXoopsHandler('groupperm', "\t\t"); $param1 = "'{$moduleDirname}_view'"; $param2 = "\$GLOBALS['xoopsUser']->getGroups()"; $param3 = "\$GLOBALS['xoopsModule']->getVar('mid')"; - $critAll .= $xc->getXcGetItemIds($lcfTopicTableName, 'grouppermHandler', $param1, $param2, $param3, "\t\t"); - $critAll .= $xc->getXcCriteriaCompo('crAll' . $ucfTableName, "\t\t"); + $critAll .= $this->xc->getXcGetItemIds($lcfTopicTableName, 'grouppermHandler', $param1, $param2, $param3, "\t\t"); + $critAll .= $this->xc->getXcCriteriaCompo('crAll' . $ucfTableName, "\t\t"); if (false !== mb_strpos($fieldName, 'status')) { - $crit = $xc->getXcCriteria('', "'{$fieldName}'", '0', "'!='", true); - $critAll .= $xc->getXcCriteriaAdd('crAll' . $ucfTableName, $crit, "\t\t"); + $crit = $this->xc->getXcCriteria('', "'{$fieldName}'", '0', "'!='", true); + $critAll .= $this->xc->getXcCriteriaAdd('crAll' . $ucfTableName, $crit, "\t\t"); } $paramsCritAll = "\$this->get{$ucfTableName}Criteria(\$crAll{$ucfTableName}, \$start, \$limit, \$sort, \$order)"; - $critAll .= $xc->getXcEqualsOperator('$crAll' . $ucfTableName, $paramsCritAll, null, "\t\t"); + $critAll .= $this->xc->getXcEqualsOperator('$crAll' . $ucfTableName, $paramsCritAll, null, "\t\t"); - $critAll .= $this->getSimpleString("return parent::getAll(\$crAll{$ucfTableName});", "\t\t"); + $critAll .= $this->getSimpleString("return \$this->getAll(\$crAll{$ucfTableName});", "\t\t"); $params = "\${$tableFieldName}Id, \$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC'"; - $ret .= $pc->getPhpCodeFunction("getAll{$ucfTableName}By{$fieldNameDesc}Id" . $ucfTableName, $params, $critAll, 'public ', false, "\t"); + $ret .= $this->pc->getPhpCodeFunction("getAll{$ucfTableName}By{$fieldNameDesc}Id" . $ucfTableName, $params, $critAll, 'public ', false, "\t"); return $ret; + } + */ /** * @public function getClassCriteria @@ -271,20 +277,18 @@ private function getClassByCategory($moduleDirname, $tableName, $tableFieldName, */ private function getClassCriteria($tableName) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $ucfTableName = ucfirst($tableName); - $ret = $pc->getPhpCodeCommentMultiLine(['Get' => 'Criteria ' . $ucfTableName, '@param ' => "\$cr{$ucfTableName}", '@param int $start' => '', '@param int $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'int'], "\t"); + $ucfTableName = \ucfirst($tableName); + $ret = $this->pc->getPhpCodeCommentMultiLine(['Get' => 'Criteria ' . $ucfTableName, '@param ' => "\$cr{$ucfTableName}", '@param int $start' => '', '@param int $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => '\CriteriaCompo'], "\t"); $paramsAllCriteria = "\$cr{$ucfTableName}, \$start, \$limit, \$sort, \$order"; - - $critSets = $xc->getXcCriteriaSetStart('cr' . $ucfTableName, '$start', "\t\t"); - $critSets .= $xc->getXcCriteriaSetLimit('cr' . $ucfTableName, '$limit', "\t\t"); - $critSets .= $xc->getXcCriteriaSetSort('cr' . $ucfTableName, '$sort', "\t\t"); - $critSets .= $xc->getXcCriteriaSetOrder('cr' . $ucfTableName, '$order', "\t\t"); + $condIf = $this->xc->getXcCriteriaSetStart('cr' . $ucfTableName, '$start', "\t\t\t"); + $condIf .= $this->xc->getXcCriteriaSetLimit('cr' . $ucfTableName, '$limit', "\t\t\t"); + $critSets = $this->pc->getPhpCodeConditions('$limit', ' > ', '0', $condIf, false, "\t\t"); + $critSets .= $this->xc->getXcCriteriaSetSort('cr' . $ucfTableName, '$sort', "\t\t"); + $critSets .= $this->xc->getXcCriteriaSetOrder('cr' . $ucfTableName, '$order', "\t\t"); $critSets .= $this->getSimpleString("return \$cr{$ucfTableName};", "\t\t"); - $ret .= $pc->getPhpCodeFunction("get{$ucfTableName}Criteria", $paramsAllCriteria, $critSets, 'private ', false, "\t"); + $ret .= $this->pc->getPhpCodeFunction("get{$ucfTableName}Criteria", $paramsAllCriteria, $critSets, 'private ', false, "\t"); return $ret; } @@ -298,53 +302,44 @@ private function getClassCriteria($tableName) */ private function getClassGetTableSolenameById($table, $fieldMain) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); $tableName = $table->getVar('table_name'); $tableSoleName = $table->getVar('table_solename'); - $ucfTableSoleName = ucfirst($tableSoleName); - $ccTableSoleName = $this->getCamelCase($tableSoleName, true); + $ucfTableSoleName = \ucfirst($tableSoleName); - $ret = $pc->getPhpCodeCommentMultiLine(['Returns the' => $ucfTableSoleName . ' from id', '' => '', '@return' => 'string'], "\t"); - $soleName = $xc->getXcEqualsOperator("\${$tableSoleName}Id", "(int)( \${$tableSoleName}Id )", null, "\t\t"); - $soleName .= $xc->getXcEqualsOperator("\${$tableSoleName}", "''", null, "\t\t"); - $contentIf = $xc->getXcHandlerLine($tableName, "\t\t\t"); - $contentIf .= $xc->getXcHandlerGet($tableName, "\${$tableSoleName}Id", 'Obj', true, false, "\t\t\t"); - $getVar = $xc->getXcGetVar($ccTableSoleName, "{$tableSoleName}Obj", $fieldMain, false, "\t\t\t\t"); - $contentIf .= $pc->getPhpCodeConditions("is_object( \${$tableSoleName}Obj )", '', '', $getVar, false, "\t\t\t"); - $soleName .= $pc->getPhpCodeConditions("\${$tableSoleName}Id", ' > ', '0', $contentIf, false, "\t\t"); - $soleName .= $this->getSimpleString("return \${$tableSoleName};", "\t\t"); + $ret = $this->pc->getPhpCodeCommentMultiLine(['Returns the' => $ucfTableSoleName . ' from id', '' => '', '@return' => 'string'], "\t"); + $soleName = $this->xc->getXcEqualsOperator("\${$tableSoleName}Id", "(int)( \${$tableSoleName}Id )", null, "\t\t"); + $soleName .= $this->xc->getXcEqualsOperator("\${$tableSoleName}", "''", null, "\t\t"); + $contentIf = $this->xc->getXcHandlerLine($tableName, "\t\t\t"); + $contentIf .= $this->xc->getXcHandlerGet($tableName, "{$tableSoleName}Id", 'Obj', $tableName . 'Handler', false, "\t\t\t"); + $getVar = $this->xc->getXcGetVar($tableSoleName, "{$tableSoleName}Obj", $fieldMain, false, "\t\t\t\t"); + $contentIf .= $this->pc->getPhpCodeConditions("\is_object( \${$tableSoleName}Obj )", '', '', $getVar, false, "\t\t\t"); + $soleName .= $this->pc->getPhpCodeConditions("\${$tableSoleName}Id", ' > ', '0', $contentIf, false, "\t\t"); + $soleName .= $this->getSimpleString("return \${$tableSoleName};", "\t\t"); - $ret .= $pc->getPhpCodeFunction("get{$ucfTableSoleName}FromId", "\${$tableSoleName}Id", $soleName, 'public ', false, "\t"); + $ret .= $this->pc->getPhpCodeFunction("get{$ucfTableSoleName}FromId", "\${$tableSoleName}Id", $soleName, 'public ', false, "\t"); return $ret; } /** * @public function render - * @param null * - * @return bool|string + * @return string */ public function render() { - $tc = Tdmcreate\Helper::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); $module = $this->getModule(); $table = $this->getTable(); $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); - $fieldInForm = []; + //$fieldInForm = []; $fieldParentId = []; - $fieldElementId = []; $fieldId = null; - $fieldName = null; $fieldMain = null; $fieldElement = null; - foreach (array_keys($fields) as $f) { + foreach (\array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); - $fieldInForm[] = $fields[$f]->getVar('field_inform'); $fieldParentId[] = $fields[$f]->getVar('field_parent'); if ((0 == $f) && (1 == $table->getVar('table_autoincrement'))) { $fieldId = $fieldName; // $fieldId = fields parameter index field @@ -353,16 +348,13 @@ public function render() $fieldMain = $fieldName; // $fieldMain = fields parameter main field } $fieldElement = $fields[$f]->getVar('field_element'); - - $fieldElements = $tc->getHandler('fieldelements')->get($fieldElement); - $fieldElementId[] = $fieldElements->getVar('fieldelement_id'); } - $namespace = $pc->getPhpCodeNamespace(['XoopsModules', $moduleDirname]); + $namespace = $this->pc->getPhpCodeNamespace(['XoopsModules', $moduleDirname]); $content = $this->getHeaderFilesComments($module, null, $namespace); - $content .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname]); - $content .= $this->getClassObjectHandler($moduleDirname, $table, $fieldId, $fieldName, $fieldMain, $fieldParentId, $fieldElement); + $content .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname]); + $content .= $this->getClassObjectHandler($moduleDirname, $table, $fieldId, $fieldMain, $fieldParentId, $fieldElement); - $this->create($moduleDirname, 'class', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'class', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/Classes/ClassSpecialFiles.php b/class/Files/Classes/ClassSpecialFiles.php index 6c1a7f94..6a9fe6bb 100644 --- a/class/Files/Classes/ClassSpecialFiles.php +++ b/class/Files/Classes/ClassSpecialFiles.php @@ -1,9 +1,12 @@ -xc = Modulebuilder\Files\CreateXoopsCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); } /** @@ -68,12 +78,12 @@ public static function getInstance() /** * @public function write * - * @param string $module + * @param $module * @param string $table * @param mixed $tables * @param $filename */ - public function write($module, $table, $tables, $filename) + public function write($module, string $table, $tables, $filename): void { $this->setModule($module); $this->setTable($table); @@ -82,223 +92,213 @@ public function write($module, $table, $tables, $filename) } /** - * @public function renderPermissionsHandler - * @param null + * @public function render * - * @return bool|string + * @return string */ - public function getGlobalPerms($permId) + public function renderClass() { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); $module = $this->getModule(); + $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); + $namespace = $this->pc->getPhpCodeNamespace(['XoopsModules', $moduleDirname]); + $content = $this->getHeaderFilesComments($module, null, $namespace); + $content .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname]); + $content .= $this->pc->getPhpCodeDefined(); + $content .= $this->pc->getPhpCodeCommentMultiLine(['Class Object' => $this->className]); + $cCl = $this->pc->getPhpCodeCommentMultiLine(['Constructor' => '', '' => ''], "\t"); + $constr = ''; + $cCl .= $this->pc->getPhpCodeFunction('__construct', '', $constr, 'public ', false, "\t"); + $arrGetInstance = ['@static function' => 'getInstance', '' => '']; + $cCl .= $this->pc->getPhpCodeCommentMultiLine($arrGetInstance, "\t"); + $getInstance = $this->pc->getPhpCodeVariableClass('static', 'instance', 'false', "\t\t"); + $instance = $this->xc->getXcEqualsOperator('$instance', 'new self()', null, "\t\t\t"); + $getInstance .= $this->pc->getPhpCodeConditions('!$instance', '', '', $instance, false, "\t\t"); + $cCl .= $this->pc->getPhpCodeFunction('getInstance', '', $getInstance, 'public static ', false, "\t"); + $content .= $this->pc->getPhpCodeClass($this->className, $cCl, '\XoopsObject'); + + $this->create($moduleDirname, 'class', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); + + return $this->renderFile(); + } - $returnTrue = $this->getSimpleString("return true;", "\t\t\t"); - $right = ''; - $cond = ''; - $funcname = ''; - $comment = ''; + /** + * @public function getGlobalPerms + * @param mixed $permId + * + * @return string + */ + public function getGlobalPerms($permId) + { + $module = $this->getModule(); + $moduleDirname = $module->getVar('mod_dirname'); + + $returnTrue = $this->getSimpleString('return true;', "\t\t\t"); + $right = ''; + $cond = ''; + $funcname = ''; + $comment = ''; switch ($permId) { case 4: - $comment .= $pc->getPhpCodeCommentMultiLine(['@public' => 'function permGlobalApprove', 'returns' => 'right for global approve', '' => '', '@param' => 'null', '@return' => 'bool'], "\t"); - $right .= $xc->getXcCheckRight('$grouppermHandler', $moduleDirname . '_ac', 4, '$my_group_ids', '$mid', true, "\t\t\t"); - $cond .= $pc->getPhpCodeConditions($right, '', '', $returnTrue, false, "\t\t"); + $comment .= $this->pc->getPhpCodeCommentMultiLine(['@public' => 'function permGlobalApprove', 'returns' => 'right for global approve', '' => '', '@return' => 'bool'], "\t"); + $right .= $this->xc->getXcCheckRight('$grouppermHandler', $moduleDirname . '_ac', '4', '$my_group_ids', '$mid', true, "\t\t\t"); + $cond .= $this->pc->getPhpCodeConditions($right, '', '', $returnTrue, false, "\t\t"); $funcname .= 'getPermGlobalApprove'; break; case 8: - $comment .= $pc->getPhpCodeCommentMultiLine(['@public' => 'function permGlobalSubmit', 'returns' => 'right for global submit', '' => '', '@param' => 'null', '@return' => 'bool'], "\t"); - $cond .= $pc->getPhpCodeConditions('$this->getGlobalApprove()', '', '', $returnTrue, false, "\t\t"); - $right .= $xc->getXcCheckRight('$grouppermHandler', $moduleDirname . '_ac', 8, '$my_group_ids', '$mid', true, "\t\t\t"); - $cond .= $pc->getPhpCodeConditions($right, '', '', $returnTrue, false, "\t\t"); + $comment .= $this->pc->getPhpCodeCommentMultiLine(['@public' => 'function permGlobalSubmit', 'returns' => 'right for global submit', '' => '', '@return' => 'bool'], "\t"); + $cond .= $this->pc->getPhpCodeConditions('$this->getPermGlobalApprove()', '', '', $returnTrue, false, "\t\t"); + $right .= $this->xc->getXcCheckRight('$grouppermHandler', $moduleDirname . '_ac', '8', '$my_group_ids', '$mid', true, "\t\t\t"); + $cond .= $this->pc->getPhpCodeConditions($right, '', '', $returnTrue, false, "\t\t"); $funcname .= 'getPermGlobalSubmit'; break; case 16: - $comment .= $pc->getPhpCodeCommentMultiLine(['@public' => 'function permGlobalView', 'returns' => 'right for global view', '' => '', '@param' => 'null', '@return' => 'bool'], "\t"); - $cond .= $pc->getPhpCodeConditions('$this->getGlobalApprove()', '', '', $returnTrue, false, "\t\t"); - $cond .= $pc->getPhpCodeConditions('$this->getGlobalSubmit()', '', '', $returnTrue, false, "\t\t"); - $right .= $xc->getXcCheckRight('$grouppermHandler', $moduleDirname . '_ac', 16, '$my_group_ids', '$mid', true, "\t\t\t"); - $cond .= $pc->getPhpCodeConditions($right, '', '', $returnTrue, false, "\t\t"); + $comment .= $this->pc->getPhpCodeCommentMultiLine(['@public' => 'function permGlobalView', 'returns' => 'right for global view', '' => '', '@return' => 'bool'], "\t"); + $cond .= $this->pc->getPhpCodeConditions('$this->getPermGlobalApprove()', '', '', $returnTrue, false, "\t\t"); + $cond .= $this->pc->getPhpCodeConditions('$this->getPermGlobalSubmit()', '', '', $returnTrue, false, "\t\t"); + $right .= $this->xc->getXcCheckRight('$grouppermHandler', $moduleDirname . '_ac', '16', '$my_group_ids', '$mid', true, "\t\t\t"); + $cond .= $this->pc->getPhpCodeConditions($right, '', '', $returnTrue, false, "\t\t"); $funcname .= 'getPermGlobalView'; break; case 0: default: break; } - $functions = $comment; - $globalContent = $xc->getXcGetGlobal(['xoopsUser', 'xoopsModule'], "\t\t"); - $globalContent .= $xc->getXcEqualsOperator('$currentuid', '0', null, "\t\t"); - - $contIf = $pc->getPhpCodeConditions("\$xoopsUser->isAdmin(\$xoopsModule->mid())", '', '', "\t" . $returnTrue, false, "\t\t\t"); - $contIf .= $xc->getXcEqualsOperator('$currentuid', '$xoopsUser->uid()', null, "\t\t\t"); - $globalContent .= $pc->getPhpCodeConditions('isset($xoopsUser)', ' && ', 'is_object($xoopsUser)', $contIf, false, "\t\t"); - $globalContent .= $xc->getXcXoopsHandler('groupperm', "\t\t"); - $globalContent .= $xc->getXcEqualsOperator('$mid', '$xoopsModule->mid()', null, "\t\t"); - $globalContent .= $xc->getXcXoopsHandler('member', "\t\t"); - - $contIfInt = $xc->getXcEqualsOperator('$my_group_ids', '[XOOPS_GROUP_ANONYMOUS]', null, "\t\t\t"); - $contElseInt = $xc->getXcEqualsOperator('$my_group_ids', '$memberHandler->getGroupsByUser($currentuid);', null, "\t\t\t"); - $globalContent .= $pc->getPhpCodeConditions('0', ' == ', '$currentuid', $contIfInt, $contElseInt, "\t\t"); - $globalContent .= $cond; - $globalContent .= $this->getSimpleString("return false;", "\t\t"); - $functions .= $pc->getPhpCodeFunction($funcname, '', $globalContent, 'public ', false, "\t"); + $functions = $comment; + $globalContent = $this->xc->getXcGetGlobal(['xoopsUser', 'xoopsModule'], "\t\t"); + $globalContent .= $this->xc->getXcEqualsOperator('$currentuid', '0', null, "\t\t"); + + $contIf = $this->pc->getPhpCodeConditions('$xoopsUser->isAdmin($xoopsModule->mid())', '', '', "\t" . $returnTrue, false, "\t\t\t"); + $contIf .= $this->xc->getXcEqualsOperator('$currentuid', '$xoopsUser->uid()', null, "\t\t\t"); + $globalContent .= $this->pc->getPhpCodeConditions('isset($xoopsUser)', ' && ', '\is_object($xoopsUser)', $contIf, false, "\t\t"); + $globalContent .= $this->xc->getXcXoopsHandler('groupperm', "\t\t"); + $globalContent .= $this->xc->getXcEqualsOperator('$mid', '$xoopsModule->mid()', null, "\t\t"); + $globalContent .= $this->xc->getXcXoopsHandler('member', "\t\t"); + + $contIfInt = $this->xc->getXcEqualsOperator('$my_group_ids', '[\XOOPS_GROUP_ANONYMOUS]', null, "\t\t\t"); + $contElseInt = $this->xc->getXcEqualsOperator('$my_group_ids', '$memberHandler->getGroupsByUser($currentuid)', null, "\t\t\t"); + $globalContent .= $this->pc->getPhpCodeConditions('$currentuid', ' == ', '0', $contIfInt, $contElseInt, "\t\t"); + $globalContent .= $cond; + $globalContent .= $this->getSimpleString('return false;', "\t\t"); + $functions .= $this->pc->getPhpCodeFunction($funcname, '', $globalContent, 'public ', false, "\t"); return $functions; } - /** - * @public function render - * @param null - * - * @return bool|string - */ - public function renderClass() - { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $module = $this->getModule(); - $filename = $this->getFileName(); - $moduleDirname = $module->getVar('mod_dirname'); - $namespace = $pc->getPhpCodeNamespace(['XoopsModules', $moduleDirname]); - $content = $this->getHeaderFilesComments($module, null, $namespace); - $content .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname]); - $content .= $pc->getPhpCodeDefined(); - $content .= $pc->getPhpCodeCommentMultiLine(['Class Object' => $this->className]); - $cCl = $pc->getPhpCodeCommentMultiLine(['Constructor' => '', '' => '', '@param' => 'null'], "\t"); - $constr = ''; - $cCl .= $pc->getPhpCodeFunction('__construct', '', $constr, 'public ', false, "\t"); - $arrGetInstance = ['@static function' => '&getInstance', '' => '', '@param' => 'null']; - $cCl .= $pc->getPhpCodeCommentMultiLine($arrGetInstance, "\t"); - $getInstance = $pc->getPhpCodeVariableClass('static', 'instance', 'false', "\t\t"); - $instance = $xc->getXcEqualsOperator('$instance', 'new self()', null, "\t\t\t"); - $getInstance .= $pc->getPhpCodeConditions('!$instance', '', '', $instance, false, "\t\t"); - $cCl .= $pc->getPhpCodeFunction('getInstance', '', $getInstance, 'public static ', false, "\t"); - $content .= $pc->getPhpCodeClass($this->className, $cCl, '\XoopsObject'); - - $this->create($moduleDirname, 'class', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); - - - - return $this->renderFile(); - } - /** * @public function renderPermissionsHandler - * @param null * - * @return bool|string + * @return string */ public function renderPermissionsHandler() { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $module = $this->getModule(); - $filename = $this->getFileName(); - $moduleDirname = $module->getVar('mod_dirname'); - $namespace = $pc->getPhpCodeNamespace(['XoopsModules', $moduleDirname]); - $content = $this->getHeaderFilesComments($module, null, $namespace); - $content .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname]); - $content .= $pc->getPhpCodeDefined(); - $content .= $pc->getPhpCodeCommentMultiLine(['Class Object' => $this->className]); - - $constr = $pc->getPhpCodeCommentMultiLine(['Constructor' => '', '' => '', '@param' => 'null'], "\t"); - $constr .= $pc->getPhpCodeFunction('__construct', '', '', 'public ', false, "\t"); - $functions = $constr; - $functions .= $this->getGlobalPerms(4); - $functions .= $this->getGlobalPerms(8); - $functions .= $this->getGlobalPerms(16); - - $content .= $pc->getPhpCodeClass($this->className, $functions, '\XoopsPersistableObjectHandler'); - $this->create($moduleDirname, 'class', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $module = $this->getModule(); + $filename = $this->getFileName(); + $moduleDirname = $module->getVar('mod_dirname'); + $namespace = $this->pc->getPhpCodeNamespace(['XoopsModules', $moduleDirname]); + $content = $this->getHeaderFilesComments($module, null, $namespace); + $content .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname]); + $content .= $this->pc->getPhpCodeDefined(); + $content .= $this->pc->getPhpCodeCommentMultiLine(['Class Object' => $this->className]); + + $constr = $this->pc->getPhpCodeCommentMultiLine(['Constructor' => '', '@param' => '\XoopsDatabase $db'], "\t"); + $constr .= $this->pc->getPhpCodeFunction('__construct', '\XoopsDatabase $db', '', 'public ', false, "\t"); + $functions = $constr; + $functions .= $this->getGlobalPerms(4); + $functions .= $this->getGlobalPerms(8); + $functions .= $this->getGlobalPerms(16); + + $content .= $this->pc->getPhpCodeClass($this->className, $functions, '\XoopsPersistableObjectHandler'); + $this->create($moduleDirname, 'class', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } /** - * @public function renderConstants - * @param null + * @public function renderConstantsInterface * - * @return bool|string + * @return string */ - public function renderConstants() + public function renderConstantsInterface() { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $module = $this->getModule(); $filename = $this->getFileName(); $tables = $this->getTables(); - $tablePermissions = []; - foreach (array_keys($tables) as $t) { - $tablePermissions[] = $tables[$t]->getVar('table_permissions'); - } - $moduleDirname = $module->getVar('mod_dirname'); - $namespace = $pc->getPhpCodeNamespace(['XoopsModules', $moduleDirname]); - $contentFile = $this->getHeaderFilesComments($module, null, $namespace); - $contentFile .= $pc->getPhpCodeDefined(); - $contentFile .= $pc->getPhpCodeCommentMultiLine(['Class ' => $this->className]); - $contentClass = $pc->getPhpCodeBlankLine(); - $contentClass .= $pc->getPhpCodeCommentLine('Constants for status', '', "\t"); - $contentClass .= $pc->getPhpCodeConstant("STATUS_NONE ", 0, "\t"); - $contentClass .= $pc->getPhpCodeConstant("STATUS_OFFLINE ", 1, "\t"); - $contentClass .= $pc->getPhpCodeConstant("STATUS_SUBMITTED", 2, "\t"); - $contentClass .= $pc->getPhpCodeConstant("STATUS_APPROVED ", 3, "\t"); - if (in_array(1, $tablePermissions)) { - $constPerm = $pc->getPhpCodeBlankLine(); - $constPerm .= $pc->getPhpCodeCommentLine('Constants for permissions', '', "\t"); - $constPerm .= $pc->getPhpCodeConstant("PERM_GLOBAL_NONE ", 0, "\t"); - $constPerm .= $pc->getPhpCodeConstant("PERM_GLOBAL_VIEW ", 1, "\t"); - $constPerm .= $pc->getPhpCodeConstant("PERM_GLOBAL_SUBMIT ", 2, "\t"); - $constPerm .= $pc->getPhpCodeConstant("PERM_GLOBAL_APPROVE", 3, "\t"); - $contentClass .= $constPerm; + $tablePermissions = []; + $tableRate = []; + $hasRadioOnoffline = false; + $hasSelectStatus = false; + foreach (\array_keys($tables) as $t) { + $tablePermissions[] = $tables[$t]->getVar('table_permissions'); + $tableRate[] = $tables[$t]->getVar('table_rate'); + $fields = $this->getTableFields($tables[$t]->getVar('table_mid'), $tables[$t]->getVar('table_id')); + foreach (\array_keys($fields) as $f) { + $fieldElement = $fields[$f]->getVar('field_element'); + switch ($fieldElement) { + case Constants::FIELD_ELE_RADIO_ONOFFLINE: + $hasRadioOnoffline = true; + break; + case Constants::FIELD_ELE_SELECTSTATUS: + $hasSelectStatus = true; + break; + } + } + } + $moduleDirname = $module->getVar('mod_dirname'); + $namespace = $this->pc->getPhpCodeNamespace(['XoopsModules', $moduleDirname]); + $contentFile = $this->getHeaderFilesComments($module, null, $namespace); + $contentFile .= $this->pc->getPhpCodeCommentMultiLine(['Interface ' => $this->className]); + + $contentClass = $this->pc->getPhpCodeBlankLine(); + $contentClass .= $this->pc->getPhpCodeCommentLine('Constants for tables', '', "\t"); + foreach (\array_keys($tables) as $t) { + $tablePermissions[] = $tables[$t]->getVar('table_permissions'); + $stuTableName = \mb_strtoupper($tables[$t]->getVar('table_name')); + $contentClass .= $this->pc->getPhpCodeConstant('TABLE_' . $stuTableName, $t, "\t", 'public const'); } - $contentClass .= $pc->getPhpCodeBlankLine(); - $contentFile .= $pc->getPhpCodeClass($this->className, $contentClass); - - $this->create($moduleDirname, 'class', $filename, $contentFile, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); - - return $this->renderFile(); - } - - public function renderConstantsTestInterface() - { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $module = $this->getModule(); - $filename = $this->getFileName(); - $tables = $this->getTables(); - $tablePermissions = []; - foreach (array_keys($tables) as $t) { - $tablePermissions[] = $tables[$t]->getVar('table_permissions'); + if ($hasSelectStatus) { + $contentClass .= $this->pc->getPhpCodeBlankLine(); + $contentClass .= $this->pc->getPhpCodeCommentLine('Constants for status', '', "\t"); + $contentClass .= $this->pc->getPhpCodeConstant('STATUS_NONE ', 0, "\t", 'public const'); + $contentClass .= $this->pc->getPhpCodeConstant('STATUS_OFFLINE ', 1, "\t", 'public const'); + $contentClass .= $this->pc->getPhpCodeConstant('STATUS_SUBMITTED', 2, "\t", 'public const'); + $contentClass .= $this->pc->getPhpCodeConstant('STATUS_APPROVED ', 3, "\t", 'public const'); + $contentClass .= $this->pc->getPhpCodeConstant('STATUS_BROKEN ', 4, "\t", 'public const'); } - $moduleDirname = $module->getVar('mod_dirname'); - $namespace = $pc->getPhpCodeNamespace(['XoopsModules', $moduleDirname]); - $contentFile = $this->getHeaderFilesComments($module, null, $namespace); - $contentFile .= $pc->getPhpCodeDefined(); - $contentFile .= $pc->getPhpCodeCommentMultiLine(['Interface ' => $this->className]); - $contentClass = ''; - if (in_array(1, $tablePermissions)) { - $constPerm = $pc->getPhpCodeBlankLine(); - $constPerm .= $pc->getPhpCodeCommentLine('Constants for permissions', '', "\t"); - $constPerm .= $pc->getPhpCodeConstant("PERM_GLOBAL_NONE ", 0, 'protected static',"\t"); - $constPerm .= $pc->getPhpCodeConstant("PERM_GLOBAL_VIEW ", 1, 'protected static',"\t"); - $constPerm .= $pc->getPhpCodeConstant("PERM_GLOBAL_SUBMIT ", 2, 'protected static',"\t"); - $constPerm .= $pc->getPhpCodeConstant("PERM_GLOBAL_APPROVE", 3, 'protected static',"\t"); + if ($hasRadioOnoffline) { + $contentClass .= $this->pc->getPhpCodeBlankLine(); + $contentClass .= $this->pc->getPhpCodeCommentLine('Constants for radio on-/offline', '', "\t"); + $contentClass .= $this->pc->getPhpCodeConstant('RADIO_OFFLINE', 0, "\t", 'public const'); + $contentClass .= $this->pc->getPhpCodeConstant('RADIO_ONLINE ', 1, "\t", 'public const'); + } + if (\in_array(1, $tablePermissions)) { + $constPerm = $this->pc->getPhpCodeBlankLine(); + $constPerm .= $this->pc->getPhpCodeCommentLine('Constants for permissions', '', "\t"); + $constPerm .= $this->pc->getPhpCodeConstant('PERM_GLOBAL_NONE ', 0, "\t", 'public const'); + $constPerm .= $this->pc->getPhpCodeConstant('PERM_GLOBAL_VIEW ', 1, "\t", 'public const'); + $constPerm .= $this->pc->getPhpCodeConstant('PERM_GLOBAL_SUBMIT ', 2, "\t", 'public const'); + $constPerm .= $this->pc->getPhpCodeConstant('PERM_GLOBAL_APPROVE', 3, "\t", 'public const'); $contentClass .= $constPerm; } - $contentClass .= $pc->getPhpCodeBlankLine(); - $func = $pc->getPhpCodeCommentLine('trigger a warning if invalid "constant" requested', '', "\t\t"); - $if = $pc->getPhpCodeTriggerError("\"Invalid Constant requested ('{\$val}')\"", 'E_USER_WARNING', "\t\t\t"); - $if .= $this->getSimpleString("return false;", "\t\t\t"); - $func .= $pc->getPhpCodeConditions('!isset($$val)', null, null, $if, false, "\t\t"); - $func .= $this->getSimpleString('return self::$$val;', "\t"); - $contentClass .= $pc->getPhpCodeFunction('getConstant', '$val', $func, 'final public static ', false, "\t"); + if (\in_array(1, $tableRate)) { + $constRate = $this->pc->getPhpCodeBlankLine(); + $constRate .= $this->pc->getPhpCodeCommentLine('Constants for rating', '', "\t"); + $constRate .= $this->pc->getPhpCodeConstant('RATING_NONE ', 0, "\t", 'public const'); + $constRate .= $this->pc->getPhpCodeConstant('RATING_5STARS ', 1, "\t", 'public const'); + $constRate .= $this->pc->getPhpCodeConstant('RATING_10STARS ', 2, "\t", 'public const'); + $constRate .= $this->pc->getPhpCodeConstant('RATING_LIKES ', 3, "\t", 'public const'); + $constRate .= $this->pc->getPhpCodeConstant('RATING_10NUM ', 4, "\t", 'public const'); + $contentClass .= $constRate; + } + $contentClass .= $this->pc->getPhpCodeBlankLine(); - $contentFile .= $pc->getPhpCodeInterface($this->className, $contentClass); + $contentFile .= $this->pc->getPhpCodeInterface($this->className, $contentClass); - $this->create($moduleDirname, 'class', $filename, $contentFile, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'class', $filename, $contentFile, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } - } diff --git a/class/Files/Classes/ClassXoopsCode.php b/class/Files/Classes/ClassXoopsCode.php index cdd05ffa..f6172c12 100644 --- a/class/Files/Classes/ClassXoopsCode.php +++ b/class/Files/Classes/ClassXoopsCode.php @@ -1,8 +1,8 @@ -initVar('{$paramLeft}', XOBJ_DTYPE_{$stuParamRight});\n"; + return "{$t}\${$var}->initVar('{$paramLeft}', \XOBJ_DTYPE_{$stuParamRight});\n"; } /** @@ -74,12 +71,12 @@ public function getClassInitVar($paramLeft = '', $paramRight = '', $var = 'this' * @param null $param3 * @param null $param4 * @param null $param5 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsPageNav($var, $param1, $param2 = null, $param3 = null, $param4 = null, $param5 = null, $isParam = false, $t = '') + public function getClassXoopsPageNav($var, $param1, $param2 = null, $param3 = null, $param4 = null, $param5 = null, bool $isParam = false, string $t = '') { $xPageNav = 'new \XoopsPageNav('; if (false === $isParam) { @@ -105,7 +102,7 @@ public function getClassXoopsPageNav($var, $param1, $param2 = null, $param3 = nu * * @return string */ - public function getXoopsSimpleForm($left = '', $element = '', $elementsContent = '', $caption = '', $var = '', $filename = '', $type = 'post', $t = '') + public function getXoopsSimpleForm(string $left = '', string $element = '', string $elementsContent = '', string $caption = '', string $var = '', string $filename = '', string $type = 'post', string $t = '') { $ret = "{$t}\${$left} = new \XoopsSimpleForm({$caption}, '{$var}', '{$filename}.php', '{$type}');\n"; if (!empty($elementsContent)) { @@ -125,12 +122,12 @@ public function getXoopsSimpleForm($left = '', $element = '', $elementsContent = * @param null $param2 * @param null $param3 * @param null $param4 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsThemeForm($var, $param1, $param2 = null, $param3 = null, $param4 = null, $isParam = false, $t = "\t\t") + public function getClassXoopsThemeForm($var, $param1, $param2 = null, $param3 = null, $param4 = null, bool $isParam = false, string $t = "\t\t") { $themeForm = 'new \XoopsThemeForm('; if (false === $isParam) { @@ -152,9 +149,9 @@ public function getClassXoopsThemeForm($var, $param1, $param2 = null, $param3 = * * @return string */ - public function getClassXoopsFormElementTray($var, $param1, $param2 = '', $t = "\t\t") + public function getClassXoopsFormElementTray($var, $param1, string $param2 = '', string $t = "\t\t") { - return "{$t}\${$var} = new \XoopsFormElementTray({$param1}, '{$param2}' );\n"; + return "{$t}\${$var} = new \XoopsFormElementTray({$param1}, '{$param2}');\n"; } /** @@ -162,16 +159,16 @@ public function getClassXoopsFormElementTray($var, $param1, $param2 = '', $t = " * * @param $var * @param string $param1 - * @param null $param2 + * @param null $param2 * @param bool $isParam * @param string $t * * @param bool $useParam * @return string */ - public function getClassXoopsFormLabel($var, $param1 = '', $param2 = null, $isParam = false, $t = "\t\t", $useParam = false) + public function getClassXoopsFormLabel($var, string $param1 = '', $param2 = null, bool $isParam = false, string $t = "\t\t", bool $useParam = false) { - $label = 'new \XoopsFormLabel('; + $label = 'new \XoopsFormLabel('; if (false === $useParam) { $params = null != $param2 ? "{$param1}, {$param2}" : $param1; } else { @@ -193,18 +190,18 @@ public function getClassXoopsFormLabel($var, $param1 = '', $param2 = null, $isPa * @param $param1 * @param $param2 * @param $param3 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormFile($var, $param1, $param2, $param3, $isParam = false, $t = "\t\t") + public function getClassXoopsFormFile($var, $param1, $param2, $param3, bool $isParam = false, string $t = "\t\t") { - $file = 'new \XoopsFormFile( '; + $file = 'new \XoopsFormFile('; if (false === $isParam) { - $ret = "{$t}\${$var} = {$file}{$param1}, '{$param2}', {$param3} );\n"; + $ret = "{$t}\${$var} = {$file}{$param1}, '{$param2}', {$param3});\n"; } else { - $ret = "{$file}{$param1}, '{$param2}', {$param3} )"; + $ret = "{$file}{$param1}, '{$param2}', {$param3})"; } return $ret; @@ -223,21 +220,21 @@ public function getClassXoopsFormFile($var, $param1, $param2, $param3, $isParam * @param bool $useParam * @return string */ - public function getClassXoopsFormHidden($var, $param1, $param2, $isForm = false, $isParam = false, $t = "\t\t", $useParam = false) + public function getClassXoopsFormHidden($var, $param1, $param2, bool $isForm = false, bool $isParam = false, string $t = "\t\t", bool $useParam = false) { - $hidden = 'new \XoopsFormHidden( '; - $getVarHidden = Tdmcreate\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param2, true); + $hidden = 'new \XoopsFormHidden('; + $getVarHidden = Modulebuilder\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param2, true); $ret = ''; if (false === $isParam) { - $ret .= "{$t}\${$var} = {$hidden}{$param1}, {$getVarHidden} );\n"; + $ret .= "{$t}\${$var} = {$hidden}{$param1}, {$getVarHidden});\n"; } else { if (false === $isForm) { - $ret .= "{$hidden}{$param1}, {$param2} )"; + $ret .= "{$hidden}{$param1}, {$param2})"; } else { if (false === $useParam) { - $ret .= "{$hidden}'{$param1}', '{$param2}' )"; + $ret .= "{$hidden}'{$param1}', '{$param2}')"; } else { - $ret .= "{$hidden}'{$param1}', \${$param2} )"; + $ret .= "{$hidden}'{$param1}', \${$param2})"; } } } @@ -251,21 +248,21 @@ public function getClassXoopsFormHidden($var, $param1, $param2, $isForm = false, * @param $var * @param $param1 * @param $param2 - * @param int $param3 - * @param int $param4 + * @param int $param3 + * @param int $param4 * @param $param5 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormText($var, $param1, $param2, $param3, $param4, $param5, $isParam = false, $t = "\t\t") + public function getClassXoopsFormText($var, $param1, $param2, int $param3, int $param4, $param5, bool $isParam = false, string $t = "\t\t") { - $text = 'new \XoopsFormText( '; + $text = 'new \XoopsFormText('; if (false === $isParam) { - $ret = "{$t}\${$var} = {$text}{$param1}, '{$param2}', {$param3}, {$param4}, \${$param5} );\n"; + $ret = "{$t}\${$var} = {$text}{$param1}, '{$param2}', {$param3}, {$param4}, \${$param5});\n"; } else { - $ret = "{$text}{$param1}, '{$param2}', {$param3}, {$param4}, \${$param5} )"; + $ret = "{$text}{$param1}, '{$param2}', {$param3}, {$param4}, \${$param5})"; } return $ret; @@ -279,19 +276,19 @@ public function getClassXoopsFormText($var, $param1, $param2, $param3, $param4, * @param $param2 * @param $param3 * @param $param4 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormTextArea($var, $param1, $param2, $param3, $param4, $isParam = false, $t = "\t\t") + public function getClassXoopsFormTextArea($var, $param1, $param2, $param3, $param4, bool $isParam = false, string $t = "\t\t") { - $area = 'new \XoopsFormTextArea( '; - $getVarTextArea = Tdmcreate\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param2, true); + $area = 'new \XoopsFormTextArea('; + $getVarTextArea = Modulebuilder\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param2, true, '', ", 'e'"); if (false === $isParam) { - $ret = "{$t}\${$var} = {$area}{$param1}, '{$param2}', {$getVarTextArea}, {$param3}, {$param4} );\n"; + $ret = "{$t}\${$var} = {$area}{$param1}, '{$param2}', {$getVarTextArea}, {$param3}, {$param4});\n"; } else { - $ret = "{$area}{$param1}, '{$param2}', {$getVarTextArea}, {$param3}, {$param4} )"; + $ret = "{$area}{$param1}, '{$param2}', {$getVarTextArea}, {$param3}, {$param4})"; } return $ret; @@ -304,18 +301,18 @@ public function getClassXoopsFormTextArea($var, $param1, $param2, $param3, $para * @param $param1 * @param $param2 * @param $param3 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormColorPicker($var, $param1, $param2, $param3, $isParam = false, $t = "\t\t") + public function getClassXoopsFormColorPicker($var, $param1, $param2, $param3, bool $isParam = false, string $t = "\t\t") { - $picker = 'new \XoopsFormColorPicker( '; + $picker = 'new \XoopsFormColorPicker('; if (false === $isParam) { - $ret = "{$t}\${$var} = {$picker}{$param1}, '{$param2}', {$param3} );\n"; + $ret = "{$t}\${$var} = {$picker}{$param1}, '{$param2}', {$param3});\n"; } else { - $ret = "{$picker}{$param1}, '{$param2}', {$param3} )"; + $ret = "{$picker}{$param1}, '{$param2}', {$param3})"; } return $ret; @@ -328,20 +325,20 @@ public function getClassXoopsFormColorPicker($var, $param1, $param2, $param3, $i * @param $param1 * @param $param2 * @param string $param3 - * @param $param4 - * @param bool $isParam + * @param $ccFieldName + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormSelectUser($var, $param1, $param2, $param3, $param4, $isParam = false, $t = "\t\t") + public function getClassXoopsFormSelectUser($var, $param1, $param2, string $param3, $ccFieldName, bool $isParam = false, string $t = "\t\t") { - $user = 'new \XoopsFormSelectUser( '; - $getVarSelectUser = Tdmcreate\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param4, true); + $user = 'new \XoopsFormSelectUser('; + //$getVarSelectUser = Modulebuilder\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param4, true); if (false === $isParam) { - $ret = "{$t}\${$var} = {$user}{$param1}, '{$param2}', {$param3}, {$getVarSelectUser} );\n"; + $ret = "{$t}\${$var} = {$user}{$param1}, '{$param2}', {$param3}, {$ccFieldName});\n"; } else { - $ret = "{$user}{$param1}, '{$param2}', {$param3}, {$getVarSelectUser} )"; + $ret = "{$user}{$param1}, '{$param2}', {$param3}, {$ccFieldName})"; } return $ret; @@ -355,19 +352,19 @@ public function getClassXoopsFormSelectUser($var, $param1, $param2, $param3, $pa * @param $param2 * @param string $param3 * @param $param4 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormTextDateSelect($var, $param1, $param2, $param3, $param4, $isParam = false, $t = "\t\t") + public function getClassXoopsFormTextDateSelect($var, $param1, $param2, string $param3, $param4, bool $isParam = false, string $t = "\t\t") { - $tdate = 'new \XoopsFormTextDateSelect( '; - $getVarTextDateSelect = Tdmcreate\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param3, true); + $tdate = 'new \XoopsFormTextDateSelect('; + $getVarTextDateSelect = Modulebuilder\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param3, true); if (false === $isParam) { - $ret = "{$t}\${$var} = {$tdate}{$param1}, '{$param2}', '', {$getVarTextDateSelect} );\n"; + $ret = "{$t}\${$var} = {$tdate}{$param1}, '{$param2}', '', {$getVarTextDateSelect});\n"; } else { - $ret = "{$tdate}{$param1}, '{$param2}', '', \${$param4} )"; + $ret = "{$tdate}{$param1}, '{$param2}', '', \${$param4})"; } return $ret; @@ -381,19 +378,19 @@ public function getClassXoopsFormTextDateSelect($var, $param1, $param2, $param3, * @param $param2 * @param string $param3 * @param $param4 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormDateTime($var, $param1, $param2, $param3, $param4, $isParam = false, $t = "\t\t") + public function getClassXoopsFormDateTime($var, $param1, $param2, string $param3, $param4, bool $isParam = false, string $t = "\t\t") { - $tdate = 'new \XoopsFormDateTime( '; - $getVarTextDateSelect = Tdmcreate\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param3, true); + $tdate = 'new \XoopsFormDateTime('; + $getVarTextDateSelect = Modulebuilder\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param3, true); if (false === $isParam) { - $ret = "{$t}\${$var} = {$tdate}{$param1}, '{$param2}', '', {$getVarTextDateSelect} );\n"; + $ret = "{$t}\${$var} = {$tdate}{$param1}, '{$param2}', '', {$getVarTextDateSelect});\n"; } else { - $ret = "{$tdate}{$param1}, '{$param2}', '', \${$param4} )"; + $ret = "{$tdate}{$param1}, '{$param2}', '', \${$param4})"; } return $ret; @@ -406,14 +403,14 @@ public function getClassXoopsFormDateTime($var, $param1, $param2, $param3, $para * @param $param1 * @param $param2 * @param $param3 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormEditor($var, $param1, $param2, $param3, $isParam = false, $t = "\t\t") + public function getClassXoopsFormEditor($var, $param1, $param2, $param3, bool $isParam = false, string $t = "\t\t") { - $editor = 'new \XoopsFormEditor( '; + $editor = 'new \XoopsFormEditor('; if (false === $isParam) { $ret = "{$t}\${$var} = {$editor}{$param1}, '{$param2}', \${$param3});\n"; } else { @@ -430,14 +427,14 @@ public function getClassXoopsFormEditor($var, $param1, $param2, $param3, $isPara * @param $param1 * @param $param2 * @param $param3 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormCheckBox($var, $param1, $param2, $param3, $isParam = false, $t = "\t\t") + public function getClassXoopsFormCheckBox($var, $param1, $param2, $param3, bool $isParam = false, string $t = "\t\t") { - $checkBox = 'new \XoopsFormCheckBox( '; + $checkBox = 'new \XoopsFormCheckBox('; if (false === $isParam) { $ret = "{$t}\${$var} = {$checkBox}{$param1}, '{$param2}', {$param3});\n"; } else { @@ -454,14 +451,14 @@ public function getClassXoopsFormCheckBox($var, $param1, $param2, $param3, $isPa * @param $param1 * @param $param2 * @param $param3 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormRadioYN($var, $param1, $param2, $param3, $isParam = false, $t = "\t\t") + public function getClassXoopsFormRadioYN($var, $param1, $param2, $param3, bool $isParam = false, string $t = "\t\t") { - $radioYN = 'new \XoopsFormRadioYN( '; + $radioYN = 'new \XoopsFormRadioYN('; if (false === $isParam) { $ret = "{$t}\${$var} = {$radioYN}{$param1}, '{$param2}', \${$param3});\n"; } else { @@ -478,14 +475,14 @@ public function getClassXoopsFormRadioYN($var, $param1, $param2, $param3, $isPar * @param $param1 * @param $param2 * @param $param3 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormRadio($var, $param1, $param2, $param3, $isParam = false, $t = "\t\t") + public function getClassXoopsFormRadio($var, $param1, $param2, $param3, bool $isParam = false, string $t = "\t\t") { - $radioYN = 'new \XoopsFormRadio( '; + $radioYN = 'new \XoopsFormRadio('; if (false === $isParam) { $ret = "{$t}\${$var} = {$radioYN}{$param1}, '{$param2}', \${$param3});\n"; } else { @@ -504,15 +501,15 @@ public function getClassXoopsFormRadio($var, $param1, $param2, $param3, $isParam * @param $param3 * @param null $param4 * @param null $param5 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormSelect($var, $param1, $param2, $param3, $param4 = null, $param5 = null, $isParam = false, $t = "\t\t") + public function getClassXoopsFormSelect($var, $param1, $param2, $param3, $param4 = null, $param5 = null, bool $isParam = false, string $t = "\t\t") { $otherParam = null != $param4 ? ", {$param4}" : (null != $param5 ? ", {$param5}" : ''); - $select = 'new \XoopsFormSelect( '; + $select = 'new \XoopsFormSelect('; if (false === $isParam) { $ret = "{$t}\${$var} = {$select}{$param1}, '{$param2}', \${$param3}{$otherParam});\n"; } else { @@ -530,19 +527,19 @@ public function getClassXoopsFormSelect($var, $param1, $param2, $param3, $param4 * @param $param2 * @param $param3 * @param $param4 - * @param int $param5 - * @param bool $isParam + * @param int $param5 + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormTag($var, $param1, $param2, $param3, $param4, $param5 = 0, $isParam = false, $t = "\t\t") + public function getClassXoopsFormTag($var, $param1, $param2, $param3, $param4, int $param5 = 0, bool $isParam = false, string $t = "\t\t") { - $tag = 'new \XoopsFormTag( '; + $tag = 'new \XoopsFormTag('; if (false === $isParam) { - $ret = "{$t}\${$var} = {$tag}'{$param1}', {$param2}, {$param3}, \${$param4}, {$param5} );\n"; + $ret = "{$t}\${$var} = {$tag}'{$param1}', {$param2}, {$param3}, \${$param4}, {$param5});\n"; } else { - $ret = "{$tag}'{$param1}', {$param2}, {$param3}, \${$param4}, {$param5} )"; + $ret = "{$tag}'{$param1}', {$param2}, {$param3}, \${$param4}, {$param5})"; } return $ret; @@ -556,14 +553,14 @@ public function getClassXoopsFormTag($var, $param1, $param2, $param3, $param4, $ * @param $param2 * @param $param3 * @param $param4 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormButton($var, $param1, $param2, $param3, $param4, $isParam = false, $t = "\t\t") + public function getClassXoopsFormButton($var, $param1, $param2, $param3, $param4, bool $isParam = false, string $t = "\t\t") { - $button = 'new \XoopsFormButton( '; + $button = 'new \XoopsFormButton('; if (false === $isParam) { $ret = "{$t}\${$var} = {$button}'{$param1}', '{$param2}', {$param3}, '{$param4}');\n"; } else { @@ -576,24 +573,24 @@ public function getClassXoopsFormButton($var, $param1, $param2, $param3, $param4 /** * @public function getClassXoopsFormPassword * - * @param $var - * @param $param1 - * @param $param2 + * @param string $var + * @param string $param1 + * @param string $param2 * @param string $param3 - * @param $param4 - * @param bool $isParam + * @param string $param4 + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormPassword($var, $param1, $param2, $param3, $param4, $isParam = false, $t = "\t\t") + public function getClassXoopsFormPassword(string $var, string $param1, string $param2, string $param3, string $param4, bool $isParam = false, string $t = "\t\t") { - $tpassword = 'new \XoopsFormPassword( '; - $getVarPassword = Tdmcreate\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param3, true); + $tpassword = 'new \XoopsFormPassword('; + $getVarPassword = Modulebuilder\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param3, true); if (false === $isParam) { - $ret = "{$t}\${$var} = {$tpassword}{$param1}, '{$param2}', '', {$getVarPassword} );\n"; + $ret = "{$t}\${$var} = {$tpassword}{$param1}, '{$param2}', '', {$getVarPassword});\n"; } else { - $ret = "{$tpassword}{$param1}, '{$param2}', {$param3}, {$param4} )"; + $ret = "{$tpassword}{$param1}, '{$param2}', {$param3}, {$param4})"; } return $ret; @@ -608,15 +605,15 @@ public function getClassXoopsFormPassword($var, $param1, $param2, $param3, $para * @param $param3 * @param null $param4 * @param null $param5 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormSelectCountry($var, $param1, $param2, $param3, $param4 = null, $param5 = null, $isParam = false, $t = "\t\t") + public function getClassXoopsFormSelectCountry($var, $param1, $param2, $param3, $param4 = null, $param5 = null, bool $isParam = false, string $t = "\t\t") { $otherParam = null != $param4 ? ", {$param4}" : (null != $param5 ? ", {$param5}" : ''); - $select = 'new \XoopsFormSelectCountry( '; + $select = 'new \XoopsFormSelectCountry('; if (false === $isParam) { $ret = "{$t}\${$var} = {$select}{$param1}, '{$param2}', \${$param3}{$otherParam});\n"; } else { @@ -637,11 +634,9 @@ public function getClassXoopsFormSelectCountry($var, $param1, $param2, $param3, * * @return string */ - public function getClassXoopsObjectTree($var, $param1, $param2, $param3, $t = '') + public function getClassXoopsObjectTree(string $var, $param1, $param2, $param3, string $t = '') { - $ret = "{$t}\${$var} = new \XoopsObjectTree(\${$param1}, '{$param2}', '{$param3}');\n"; - - return $ret; + return "{$t}\${$var} = new \XoopsObjectTree(\${$param1}, '{$param2}', '{$param3}');\n"; } /** @@ -657,12 +652,10 @@ public function getClassXoopsObjectTree($var, $param1, $param2, $param3, $t = '' * * @return string */ - public function getClassXoopsMakeSelBox($var, $anchor, $param1, $param2, $param3, $param4, $t = '') + public function getClassXoopsMakeSelBox($var, $anchor, $param1, $param2, string $param3, $param4, string $t = '') { - $getVar = Tdmcreate\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param4, true); - $ret = "{$t}\${$var} = \${$anchor}->makeSelBox( '{$param1}', '{$param2}', '{$param3}', {$getVar}, true );\n"; - - return $ret; + $getVar = Modulebuilder\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param4, true); + return "{$t}\${$var} = \${$anchor}->makeSelBox('{$param1}', '{$param2}', '{$param3}', {$getVar}, true );\n"; } /** @@ -674,7 +667,7 @@ public function getClassXoopsMakeSelBox($var, $anchor, $param1, $param2, $param3 * * @return string */ - public function getClassAddOption($var, $params, $t = "\t\t") + public function getClassAddOption($var, $params, string $t = "\t\t") { return "{$t}\${$var}->addOption({$params});\n"; } @@ -688,7 +681,7 @@ public function getClassAddOption($var, $params, $t = "\t\t") * * @return string */ - public function getClassAddOptionArray($var, $params, $t = "\t\t") + public function getClassAddOptionArray($var, $params, string $t = "\t\t") { return "{$t}\${$var}->addOptionArray({$params});\n"; } @@ -702,7 +695,7 @@ public function getClassAddOptionArray($var, $params, $t = "\t\t") * * @return string */ - public function getClassAddElement($var = '', $params = '', $t = "\t\t") + public function getClassAddElement(string $var = '', string $params = '', string $t = "\t\t") { return "{$t}\${$var}->addElement({$params});\n"; } @@ -716,7 +709,7 @@ public function getClassAddElement($var = '', $params = '', $t = "\t\t") * * @return string */ - public function getClassSetDescription($var, $params, $t = "\t\t") + public function getClassSetDescription($var, $params, string $t = "\t\t") { return "{$t}\${$var}->setDescription({$params});\n"; } @@ -730,7 +723,7 @@ public function getClassSetDescription($var, $params, $t = "\t\t") * * @return string */ - public function getClassSetExtra($var, $params, $t = "\t\t") + public function getClassSetExtra($var, $params, string $t = "\t\t") { return "{$t}\${$var}->setExtra({$params});\n"; } diff --git a/class/Files/Classes/index.php b/class/Files/Classes/index.php new file mode 100644 index 00000000..e5ee0725 --- /dev/null +++ b/class/Files/Classes/index.php @@ -0,0 +1,2 @@ +xc = Modulebuilder\Files\CreateXoopsCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); } /** @@ -56,11 +66,11 @@ public static function getInstance() /** * @public function write - * @param string $module - * @param $tables + * @param $module + * @param $tables * @param string $filename */ - public function write($module, $tables, $filename) + public function write($module, $tables, string $filename): void { $this->setModule($module); $this->setTables($tables); @@ -73,73 +83,73 @@ public function write($module, $tables, $filename) */ private function getConfigCode() { - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); $tables = $this->getTables(); - $ret = $this->getSimpleString(''); - $ret .= $xc->getXcEqualsOperator('$moduleDirName ', 'basename(dirname(__DIR__))'); - $ret .= $xc->getXcEqualsOperator('$moduleDirNameUpper ', 'mb_strtoupper($moduleDirName)'); + $ret = $this->pc->getPhpCodeCommentMultiLine(['return' => 'object']); + $ret .= $this->getSimpleString(''); + $ret .= $this->xc->getXcEqualsOperator('$moduleDirName ', '\basename(\dirname(__DIR__))'); + $ret .= $this->xc->getXcEqualsOperator('$moduleDirNameUpper ', '\mb_strtoupper($moduleDirName)'); - $ret .= $this->getSimpleString('return (object)['); - $ret .= $this->getSimpleString("'name' => mb_strtoupper(\$moduleDirName) . ' Module Configurator',", "\t"); - $ret .= $this->getSimpleString("'paths' => [", "\t"); - $ret .= $this->getSimpleString("'dirname' => \$moduleDirName,", "\t\t"); - $ret .= $this->getSimpleString("'admin' => XOOPS_ROOT_PATH . '/modules/' . \$moduleDirName . '/admin',", "\t\t"); - $ret .= $this->getSimpleString("'modPath' => XOOPS_ROOT_PATH . '/modules/' . \$moduleDirName,", "\t\t"); - $ret .= $this->getSimpleString("'modUrl' => XOOPS_URL . '/modules/' . \$moduleDirName,", "\t\t"); - $ret .= $this->getSimpleString("'uploadPath' => XOOPS_UPLOAD_PATH . '/' . \$moduleDirName,", "\t\t"); - $ret .= $this->getSimpleString("'uploadUrl' => XOOPS_UPLOAD_URL . '/' . \$moduleDirName,", "\t\t"); - $ret .= $this->getSimpleString("],", "\t"); - $ret .= $this->getSimpleString("'uploadFolders' => [", "\t"); - $ret .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName,", "\t\t"); - foreach (array_keys($tables) as $t) { + $ret .= $this->getSimpleString('return (object)['); + $ret .= $this->getSimpleString("'name' => \mb_strtoupper(\$moduleDirName) . ' Module Configurator',", "\t"); + $ret .= $this->getSimpleString("'paths' => [", "\t"); + $ret .= $this->getSimpleString("'dirname' => \$moduleDirName,", "\t\t"); + $ret .= $this->getSimpleString("'admin' => \XOOPS_ROOT_PATH . '/modules/' . \$moduleDirName . '/admin',", "\t\t"); + $ret .= $this->getSimpleString("'modPath' => \XOOPS_ROOT_PATH . '/modules/' . \$moduleDirName,", "\t\t"); + $ret .= $this->getSimpleString("'modUrl' => \XOOPS_URL . '/modules/' . \$moduleDirName,", "\t\t"); + $ret .= $this->getSimpleString("'uploadPath' => \XOOPS_UPLOAD_PATH . '/' . \$moduleDirName,", "\t\t"); + $ret .= $this->getSimpleString("'uploadUrl' => \XOOPS_UPLOAD_URL . '/' . \$moduleDirName,", "\t\t"); + $ret .= $this->getSimpleString('],', "\t"); + $ret .= $this->getSimpleString("'uploadFolders' => [", "\t"); + $ret .= $this->getSimpleString("\XOOPS_UPLOAD_PATH . '/' . \$moduleDirName,", "\t\t"); + foreach (\array_keys($tables) as $t) { $tableName = $tables[$t]->getVar('table_name'); - $ret .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/{$tableName}',", "\t\t"); + $ret .= $this->getSimpleString("\XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/{$tableName}',", "\t\t"); } - $ret .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/images',", "\t\t"); - foreach (array_keys($tables) as $t) { + $ret .= $this->getSimpleString("\XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/images',", "\t\t"); + foreach (\array_keys($tables) as $t) { $tableName = $tables[$t]->getVar('table_name'); - $ret .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/images/{$tableName}',", "\t\t"); + $ret .= $this->getSimpleString("\XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/images/{$tableName}',", "\t\t"); } - $ret .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/files',", "\t\t"); - foreach (array_keys($tables) as $t) { + $ret .= $this->getSimpleString("\XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/files',", "\t\t"); + foreach (\array_keys($tables) as $t) { $tableName = $tables[$t]->getVar('table_name'); - $ret .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/files/{$tableName}',", "\t\t"); + $ret .= $this->getSimpleString("\XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/files/{$tableName}',", "\t\t"); } - $ret .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/temp',", "\t\t"); - $ret .= $this->getSimpleString("],", "\t"); - $ret .= $this->getSimpleString("'copyBlankFiles' => [", "\t"); - $ret .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/images',", "\t\t"); - foreach (array_keys($tables) as $t) { + $ret .= $this->getSimpleString("\XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/temp',", "\t\t"); + $ret .= $this->getSimpleString('],', "\t"); + $ret .= $this->getSimpleString("'copyBlankFiles' => [", "\t"); + $ret .= $this->getSimpleString("\XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/images',", "\t\t"); + foreach (\array_keys($tables) as $t) { $tableName = $tables[$t]->getVar('table_name'); - $ret .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/images/{$tableName}',", "\t\t"); + $ret .= $this->getSimpleString("\XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/images/{$tableName}',", "\t\t"); } - $ret .= $this->getSimpleString("],", "\t"); - $ret .= $this->getSimpleString("'copyTestFolders' => [", "\t"); - $ret .= $this->getSimpleString("XOOPS_ROOT_PATH . '/modules/' . \$moduleDirName . '/testdata/uploads',", "\t\t"); - $ret .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName,", "\t\t"); - $ret .= $this->getSimpleString("],", "\t"); - $ret .= $this->getSimpleString("'templateFolders' => [", "\t"); - $ret .= $this->getSimpleString("'/templates/',", "\t\t"); - $ret .= $this->getSimpleString("],", "\t"); - $ret .= $this->getSimpleString("'oldFiles' => [", "\t"); - $ret .= $this->getSimpleString("],", "\t"); - $ret .= $this->getSimpleString("'oldFolders' => [", "\t"); - $ret .= $this->getSimpleString("],", "\t"); - $ret .= $this->getSimpleString("'renameTables' => [", "\t"); - $ret .= $this->getSimpleString("],", "\t"); - $ret .= $this->getSimpleString("'moduleStats' => [", "\t"); - $ret .= $this->getSimpleString("],", "\t"); - $ret .= $this->getSimpleString("'modCopyright' => \"![XOOPS Project](\" . XOOPS_ROOT_PATH . )
\",", "\t");
- $ret .= $this->getSimpleString('];');
+ $ret .= $this->getSimpleString('],', "\t");
+ $ret .= $this->getSimpleString("'copyTestFolders' => [", "\t");
+ $ret .= $this->getSimpleString("[\XOOPS_ROOT_PATH . '/modules/' . \$moduleDirName . '/testdata/uploads',", "\t\t");
+ $ret .= $this->getSimpleString("\XOOPS_UPLOAD_PATH . '/' . \$moduleDirName],", "\t\t");
+ $ret .= $this->getSimpleString('],', "\t");
+ $ret .= $this->getSimpleString("'templateFolders' => [", "\t");
+ $ret .= $this->getSimpleString("'/templates/',", "\t\t");
+ $ret .= $this->getSimpleString('],', "\t");
+ $ret .= $this->getSimpleString("'oldFiles' => [", "\t");
+ $ret .= $this->getSimpleString('],', "\t");
+ $ret .= $this->getSimpleString("'oldFolders' => [", "\t");
+ $ret .= $this->getSimpleString('],', "\t");
+ $ret .= $this->getSimpleString("'renameTables' => [", "\t");
+ $ret .= $this->getSimpleString('],', "\t");
+ $ret .= $this->getSimpleString("'moduleStats' => [", "\t");
+ $ret .= $this->getSimpleString('],', "\t");
+ $ret .= $this->getSimpleString("'modCopyright' => \"![XOOPS Project](\" . \XOOPS_ROOT_PATH . )
\",", "\t");
+ $ret .= $this->getSimpleString('];');
return $ret;
}
/**
* @public function render
- * @param null
- * @return bool|string
+ *
+ * @return string
*/
public function render()
{
@@ -148,7 +158,7 @@ public function render()
$filename = $this->getFileName();
$content = $this->getHeaderFilesComments($module);
$content .= $this->getConfigCode();
- $this->create($moduleDirname, 'config', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->create($moduleDirname, 'config', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $this->renderFile();
}
diff --git a/class/Files/Config/index.php b/class/Files/Config/index.php
new file mode 100644
index 00000000..e5ee0725
--- /dev/null
+++ b/class/Files/Config/index.php
@@ -0,0 +1,2 @@
+module = $module;
}
}
@@ -85,9 +82,9 @@ public function getModule()
*
* @param mixed $table
*/
- public function setTable($table)
+ public function setTable($table): void
{
- if (is_object($table) && ($table instanceof Tdmcreate\Tables)) {
+ if (($table instanceof Modulebuilder\Tables)) {
$this->table = $table;
}
}
@@ -107,9 +104,9 @@ public function getTable()
*
* @param mixed $tables
*/
- public function setTables($tables)
+ public function setTables($tables): void
{
- if (is_array($tables)) {
+ if (\is_array($tables)) {
$this->tables = $tables;
}
}
@@ -129,9 +126,9 @@ public function getTables()
*
* @param mixed $fields
*/
- public function setFields($fields)
+ public function setFields($fields): void
{
- if (is_object($fields) && ($fields instanceof Tdmcreate\Fields)) {
+ if (($fields instanceof Modulebuilder\Fields)) {
$this->fields = $fields;
}
}
diff --git a/class/Files/CreateArchitecture.php b/class/Files/CreateArchitecture.php
index ae9014b1..0facd6c5 100644
--- a/class/Files/CreateArchitecture.php
+++ b/class/Files/CreateArchitecture.php
@@ -1,8 +1,8 @@
-helper = Modulebuilder\Helper::getInstance();
+ $this->cf = Modulebuilder\Files\CreateFile::getInstance();
$this->setUploadPath(TDMC_UPLOAD_REPOSITORY_PATH);
}
/**
* @static function getInstance
*
- * @param null
- *
- * @return Tdmcreate\Files\CreateArchitecture
+ * @return Modulebuilder\Files\CreateArchitecture
*/
public static function getInstance()
{
@@ -65,39 +80,37 @@ public static function getInstance()
*
* @param $module
*/
- public function setBaseFoldersFiles($module)
+ public function setBaseFoldersFiles($module): void
{
- $helper = Tdmcreate\Helper::getInstance();
- $tf = Tdmcreate\Files\CreateFile::getInstance();
// Module
$modId = $module->getVar('mod_id');
// Id of tables
- $tables = $tf->getTableTables($modId);
+ $tables = $this->cf->getTableTables($modId);
$table = null;
- foreach (array_keys($tables) as $t) {
+ foreach (\array_keys($tables) as $t) {
$tableId = $tables[$t]->getVar('table_id');
$tableName = $tables[$t]->getVar('table_name');
- $table = $helper->getHandler('Tables')->get($tableId);
+ $table = $this->helper->getHandler('Tables')->get($tableId);
}
- $indexFile = XOOPS_UPLOAD_PATH . '/index.html';
- $stlModuleAuthor = str_replace(' ', '', mb_strtolower($module->getVar('mod_author')));
+ $indexFile = TDMC_PATH . '/index.php';
+ $stlModuleAuthor = \str_replace(' ', '', \mb_strtolower($module->getVar('mod_author')));
$this->setModuleName($module->getVar('mod_dirname'));
$uploadPath = $this->getUploadPath();
// Creation of "module" folder in the Directory repository
$this->makeDir($uploadPath . '/' . $this->getModuleName());
if (1 != $module->getVar('mod_user')) {
- // Copied of index.html file in "root module" folder
- $this->copyFile('', $indexFile, 'index.html');
+ // Copied of index.php file in "root module" folder
+ $this->copyFile('', $indexFile, 'index.php');
}
if (1 == $module->getVar('mod_admin')) {
- // Creation of "admin" folder and index.html file
- $this->makeDirAndCopyFile('admin', $indexFile, 'index.html');
+ // Creation of "admin" folder and index.php file
+ $this->makeDirInModule('admin');
}
if (1 == $module->getVar('mod_blocks')) {
- // Creation of "blocks" folder and index.html file
- $this->makeDirAndCopyFile('blocks', $indexFile, 'index.html');
+ // Creation of "blocks" folder and index.php file
+ $this->makeDirAndCopyFile('blocks', $indexFile, 'index.php');
}
$language = ('english' !== $GLOBALS['xoopsConfig']['language']) ? $GLOBALS['xoopsConfig']['language'] : 'english';
$copyFiles = [
@@ -119,11 +132,11 @@ public function setBaseFoldersFiles($module)
'preloads' => $indexFile,
];
foreach ($copyFiles as $k => $v) {
- // Creation of folders and index.html file
- $this->makeDirAndCopyFile($k, $v, 'index.html');
+ // Creation of folders and index.php file
+ $this->makeDirAndCopyFile($k, $v, 'index.php');
}
//Copy the logo of the module
- $modImage = str_replace(' ', '', mb_strtolower($module->getVar('mod_image')));
+ $modImage = \str_replace(' ', '', $module->getVar('mod_image'));
$targetImage = 'logoModule.png';
$this->copyFile('assets/images', TDMC_UPLOAD_IMGMOD_PATH . '/' . $modImage, $targetImage);
@@ -131,23 +144,25 @@ public function setBaseFoldersFiles($module)
$targetImage = 'blank.gif';
$this->copyFile('assets/images', TDMC_IMAGE_PATH . '/' . $targetImage, $targetImage);
$targetImage = 'blank.png';
- $this->copyFile('assets/images', TDMC_IMAGE_PATH . '/' . $targetImage , $targetImage);
+ $this->copyFile('assets/images', TDMC_IMAGE_PATH . '/' . $targetImage, $targetImage);
// Copy of 'module_author_logo.png' file in uploads dir
$logoPng = $stlModuleAuthor . '_logo.png';
$logoGifFrom = TDMC_UPLOAD_IMGMOD_PATH . '/' . $logoPng;
// If file exists
- if (!file_exists($logoGifFrom)) {
+ if (!\file_exists($logoGifFrom)) {
// Rename file
$copyFile = TDMC_IMAGES_LOGOS_URL . '/xoopsdevelopmentteam_logo.gif';
- $copyNewFile = $logoGifFrom;
- copy($copyFile, $copyNewFile);
} else {
// Copy file
+ if (!\file_exists($logoPng)) {
+ $logoPng = 'tdmxoops_logo.png';
+ $logoGifFrom = TDMC_UPLOAD_IMGMOD_PATH . '/' . $logoPng;
+ }
$copyFile = TDMC_IMAGES_LOGOS_URL . '/' . $logoPng;
- $copyNewFile = $logoGifFrom;
- copy($copyFile, $copyNewFile);
}
+ $copyNewFile = $logoGifFrom;
+ \copy($copyFile, $copyNewFile);
// Creation of 'module_author_logo.gif' file
$this->copyFile('assets/images', $copyNewFile, $logoPng);
@@ -164,22 +179,22 @@ public function setBaseFoldersFiles($module)
}
if (!empty($tableName)) {
if (1 == $module->getVar('mod_admin') || 1 == $module->getVar('mod_user')) {
- // Creation of "templates" folder and index.html file
- $this->makeDirAndCopyFile('templates', $indexFile, 'index.html');
+ // Creation of "templates" folder and index.php file
+ $this->makeDirAndCopyFile('templates', $indexFile, 'index.php');
}
if (1 == $module->getVar('mod_admin')) {
- // Creation of "templates/admin" folder and index.html file
- $this->makeDirAndCopyFile('templates/admin', $indexFile, 'index.html');
+ // Creation of "templates/admin" folder and index.php file
+ $this->makeDirAndCopyFile('templates/admin', $indexFile, 'index.php');
}
if ((1 == $module->getVar('mod_blocks')) && (1 == $table->getVar('table_blocks'))) {
- // Creation of "templates/blocks" folder and index.html file
- $this->makeDirAndCopyFile('templates/blocks', $indexFile, 'index.html');
+ // Creation of "templates/blocks" folder and index.php file
+ $this->makeDirAndCopyFile('templates/blocks', $indexFile, 'index.php');
}
- // Creation of "sql" folder and index.html file
- $this->makeDirAndCopyFile('sql', $indexFile, 'index.html');
+ // Creation of "sql" folder and index.php file
+ $this->makeDirAndCopyFile('sql', $indexFile, 'index.php');
if ((1 == $module->getVar('mod_notifications')) && (1 == $table->getVar('table_notifications'))) {
- // Creation of "language/local_language/mail_template" folder and index.html file
- $this->makeDirAndCopyFile('language/' . $language . '/mail_template', $indexFile, 'index.html');
+ // Creation of "language/local_language/mail_template" folder and index.php file
+ $this->makeDirAndCopyFile('language/' . $language . '/mail_template', $indexFile, 'index.php');
}
}
}
@@ -187,26 +202,33 @@ public function setBaseFoldersFiles($module)
/**
* @public function setFilesToBuilding
*
- * @param string $module
+ * @param $module
*
* @return array
*/
public function setFilesToBuilding($module)
{
- $helper = Tdmcreate\Helper::getInstance();
- $tf = Tdmcreate\Files\CreateFile::getInstance();
// Module
$modId = $module->getVar('mod_id');
$moduleDirname = $module->getVar('mod_dirname');
$icon32 = 'assets/icons/32';
- $tables = $tf->getTableTables($modId);
- $files = $tf->getTableMoreFiles($modId);
+ $tables = $this->cf->getTableTables($modId);
+ $files = $this->cf->getTableMorefiles($modId);
$ret = [];
+ $templateType = 'defstyle'; // currently no other template style is implemented
+
+ $patterns = [
+ \mb_strtolower('modulebuilder') => \mb_strtolower($moduleDirname),
+ \mb_strtoupper('modulebuilder') => \mb_strtoupper($moduleDirname),
+ \ucfirst(\mb_strtolower('modulebuilder')) => \ucfirst(\mb_strtolower($moduleDirname)),
+ ];
+ $this->patKeys = \array_keys($patterns);
+ $this->patValues = \array_values($patterns);
- $table = null;
- $tableCategory = [];
+ $table = null;
+ //$tableCategory = [];
//$tableName = [];
- $tableAdmin = [];
+ //$tableAdmin = [];
$tableUser = [];
$tableBlocks = [];
$tableSearch = [];
@@ -219,16 +241,17 @@ public function setFilesToBuilding($module)
$tablePrint = [];
$tableRate = [];
$tableRss = [];
- $tableSingle = [];
- $tableSubmit = [];
- $tableVisit = [];
+ //$tableSingle = [];
+ //$tableSubmit = [];
+ //$tableVisit = [];
$tableTag = [];
- foreach (array_keys($tables) as $t) {
+ foreach (\array_keys($tables) as $t) {
$tableId = $tables[$t]->getVar('table_id');
$tableName = $tables[$t]->getVar('table_name');
- $tableCategory[] = $tables[$t]->getVar('table_category');
+ $tableSoleName = $tables[$t]->getVar('table_solename');
+ //$tableCategory[] = $tables[$t]->getVar('table_category');
$tableImage = $tables[$t]->getVar('table_image');
- $tableAdmin[] = $tables[$t]->getVar('table_admin');
+ //$tableAdmin[] = $tables[$t]->getVar('table_admin');
$tableUser[] = $tables[$t]->getVar('table_user');
$tableBlocks[] = $tables[$t]->getVar('table_blocks');
$tableSearch[] = $tables[$t]->getVar('table_search');
@@ -241,154 +264,227 @@ public function setFilesToBuilding($module)
$tablePrint[] = $tables[$t]->getVar('table_print');
$tableRate[] = $tables[$t]->getVar('table_rate');
$tableRss[] = $tables[$t]->getVar('table_rss');
- $tableSingle[] = $tables[$t]->getVar('table_single');
- $tableSubmit[] = $tables[$t]->getVar('table_submit');
- $tableVisit[] = $tables[$t]->getVar('table_visit');
+ //$tableSingle[] = $tables[$t]->getVar('table_single');
+ //$tableSubmit[] = $tables[$t]->getVar('table_submit');
+ //$tableVisit[] = $tables[$t]->getVar('table_visit');
$tableTag[] = $tables[$t]->getVar('table_tag');
+
// Get Table Object
- $table = $helper->getHandler('Tables')->get($tableId);
+ $table = $this->helper->getHandler('Tables')->get($tableId);
// Copy of tables images file
- if (file_exists($uploadTableImage = TDMC_UPLOAD_IMGTAB_PATH . '/' . $tableImage)) {
+ if (\file_exists($uploadTableImage = TDMC_UPLOAD_IMGTAB_PATH . '/' . $tableImage)) {
$this->copyFile($icon32, $uploadTableImage, $tableImage);
- } elseif (file_exists($uploadTableImage = XOOPS_ICONS32_PATH . '/' . $tableImage)) {
+ } elseif (\file_exists($uploadTableImage = \XOOPS_ICONS32_PATH . '/' . $tableImage)) {
$this->copyFile($icon32, $uploadTableImage, $tableImage);
}
// Creation of admin files
if (1 === (int)$tables[$t]->getVar('table_admin')) {
// Admin Pages File
- $adminPages = Tdmcreate\Files\Admin\AdminPages::getInstance();
+ $adminPages = Modulebuilder\Files\Admin\AdminPages::getInstance();
$adminPages->write($module, $table, $tableName . '.php');
$ret[] = $adminPages->render();
// Admin Templates File
- $adminTemplatesPages = Tdmcreate\Files\Templates\Admin\TemplatesAdminPages::getInstance();
+ $adminTemplatesPages = Modulebuilder\Files\Templates\Admin\TemplatesAdminPages::getInstance();
$adminTemplatesPages->write($module, $table, $moduleDirname . '_admin_' . $tableName . '.tpl');
$ret[] = $adminTemplatesPages->render();
}
// Creation of blocks
if (1 === (int)$tables[$t]->getVar('table_blocks')) {
+ // Default block
// Blocks Files
- $blocksFiles = Tdmcreate\Files\Blocks\BlocksFiles::getInstance();
+ $blocksFiles = Modulebuilder\Files\Blocks\BlocksFiles::getInstance();
$blocksFiles->write($module, $table, $tableName . '.php');
$ret[] = $blocksFiles->render();
// Templates Blocks Files
- $templatesBlocks = Tdmcreate\Files\Templates\Blocks\TemplatesBlocks::getInstance();
+/* if ($templateType == 'bootstrap') {
+ $templatesBlocks = Modulebuilder\Files\Templates\Blocks\Bootstrap\TemplatesBlocks::getInstance();
+ } else {*/
+ $templatesBlocks = Modulebuilder\Files\Templates\Blocks\Defstyle\TemplatesBlocks::getInstance();
+ /*}*/
$templatesBlocks->write($module, $table, $moduleDirname . '_block_' . $tableName . '.tpl');
$ret[] = $templatesBlocks->render();
+ // Spotlight block
+ // Blocks Files
+ $blocksFiles = Modulebuilder\Files\Blocks\BlocksFilesSpotlight::getInstance();
+ $blocksFiles->write($module, $table, $tableName . '_spotlight.php');
+ $ret[] = $blocksFiles->render();
+ // Templates Blocks Files
+/* if ($templateType == 'bootstrap') {
+ $templatesBlocks = Modulebuilder\Files\Templates\Blocks\Bootstrap\TemplatesBlocksSpotlight::getInstance();
+ } else {*/
+ $templatesBlocks = Modulebuilder\Files\Templates\Blocks\Defstyle\TemplatesBlocksSpotlight::getInstance();
+ /*}*/
+ $templatesBlocks->write($module, $table, $moduleDirname . '_block_' . $tableName . '_spotlight.tpl');
+ $ret[] = $templatesBlocks->render();
}
// Creation of classes
if (1 === (int)$tables[$t]->getVar('table_admin') || 1 === (int)$tables[$t]->getVar('table_user')) {
// Class Files
- $classFiles = Tdmcreate\Files\Classes\ClassFiles::getInstance();
- $classFiles->write($module, $table, $tables, ucfirst($tableName) . '.php');
+ $classFiles = Modulebuilder\Files\Classes\ClassFiles::getInstance();
+ $classFiles->write($module, $table, $tables, \ucfirst($tableName) . '.php');
$ret[] = $classFiles->render();
}
// Creation of classhandlers
if (1 === (int)$tables[$t]->getVar('table_admin') || 1 === (int)$tables[$t]->getVar('table_user')) {
// Class Files
- $classFiles = Tdmcreate\Files\Classes\ClassHandlerFiles::getInstance();
- $classFiles->write($module, $table, $tables, ucfirst($tableName) . 'handler.php');
+ $classFiles = Modulebuilder\Files\Classes\ClassHandlerFiles::getInstance();
+ $classFiles->write($module, $table, $tables, \ucfirst($tableName) . 'Handler.php');
$ret[] = $classFiles->render();
}
// Creation of user files
if (1 === (int)$tables[$t]->getVar('table_user')) {
// User Pages File
- $userPages = Tdmcreate\Files\User\UserPages::getInstance();
+ $userPages = Modulebuilder\Files\User\UserPages::getInstance();
$userPages->write($module, $table, $tableName . '.php');
$ret[] = $userPages->render();
// User Templates File
- $userTemplatesPages = Tdmcreate\Files\Templates\User\Pages::getInstance();
+/* if ($templateType == 'bootstrap') {
+ $userTemplatesPages = Modulebuilder\Files\Templates\User\Bootstrap\Pages::getInstance();
+ } else {*/
+ $userTemplatesPages = Modulebuilder\Files\Templates\User\Defstyle\Pages::getInstance();
+ /*}*/
$userTemplatesPages->write($module, $table, $moduleDirname . '_' . $tableName . '.tpl');
$ret[] = $userTemplatesPages->render();
// User List Templates File
- $userTemplatesPagesList = Tdmcreate\Files\Templates\User\PagesList::getInstance();
+/* if ($templateType == 'bootstrap') {
+ $userTemplatesPagesList = Modulebuilder\Files\Templates\User\Bootstrap\PagesList::getInstance();
+ } else {*/
+ $userTemplatesPagesList = Modulebuilder\Files\Templates\User\Defstyle\PagesList::getInstance();
+ /*}*/
$userTemplatesPagesList->write($module, $table, $tables, $moduleDirname . '_' . $tableName . '_list' . '.tpl');
$ret[] = $userTemplatesPagesList->render();
+ // User Item Templates File
+/* if ($templateType == 'bootstrap') {
+ $userTemplatesPagesItem = Modulebuilder\Files\Templates\User\Bootstrap\PagesItem::getInstance();
+ } else {*/
+ $userTemplatesPagesItem = Modulebuilder\Files\Templates\User\Defstyle\PagesItem::getInstance();
+ /*}*/
+ $userTemplatesPagesItem->write($module, $table, $tables, $moduleDirname . '_' . $tableName . '_item' . '.tpl');
+ $ret[] = $userTemplatesPagesItem->render();
if (1 === (int)$tables[$t]->getVar('table_category')) {
// User List Templates File
- $userTemplatesCategories = Templates\User\Categories::getInstance();
+ $userTemplatesCategories = Templates\User\Defstyle\Categories::getInstance();
$userTemplatesCategories->write($module, $table, $moduleDirname . '_' . $tableName . '_cat.tpl');
$ret[] = $userTemplatesCategories->render();
// User List Templates File
- $userTemplatesCategoriesList = Templates\User\CategoriesList::getInstance();
+ $userTemplatesCategoriesList = Templates\User\Defstyle\CategoriesList::getInstance();
$userTemplatesCategoriesList->write($module, $table, $moduleDirname . '_' . $tableName . '_cat_list' . '.tpl');
$ret[] = $userTemplatesCategoriesList->render();
}
+ // Creation of notifications files
+ if (1 === (int)$tables[$t]->getVar('table_notifications')) {
+ $languageMailTpl = Modulebuilder\Files\Language\LanguageMailTpl::getInstance();
+ // Language Mail Template Modify File
+ $languageMailTpl->write($module, $table, $tableSoleName . '_modify_notify.tpl');
+ $ret[] = $languageMailTpl->render();
+ // Language Mail Template Delete File
+ $languageMailTpl->write($module, $table, $tableSoleName . '_delete_notify.tpl');
+ $ret[] = $languageMailTpl->render();
+ // Language Mail Template Approve File
+ $languageMailTpl->write($module, $table, $tableSoleName . '_approve_notify.tpl');
+ $ret[] = $languageMailTpl->render();
+ if (1 === (int)$tables[$t]->getVar('table_broken')) {
+ // Language Mail Template Category File
+ $languageMailTpl = Modulebuilder\Files\Language\LanguageMailTpl::getInstance();
+ $languageMailTpl->write($module, $table, $tableSoleName . '_broken_notify.tpl');
+ $ret[] = $languageMailTpl->render();
+ }
+ // Creation of notifications files
+ if (1 === (int)$tables[$t]->getVar('table_comments')) {
+ // Language Mail Template Category File
+ $languageMailTpl = Modulebuilder\Files\Language\LanguageMailTpl::getInstance();
+ $languageMailTpl->write($module, $table, $tableSoleName . '_comment_notify.tpl');
+ $ret[] = $languageMailTpl->render();
+ }
+ }
}
}
// Creation of constants
- $classSpecialFiles = Tdmcreate\Files\Classes\ClassSpecialFiles::getInstance();
- $classSpecialFiles->write($module, '', $tables, ucfirst('constants') . '.php');
+ $classSpecialFiles = Modulebuilder\Files\Classes\ClassSpecialFiles::getInstance();
+ $classSpecialFiles->write($module, '', $tables, \ucfirst('constants') . '.php');
$classSpecialFiles->className = 'Constants';
- $ret[] = $classSpecialFiles->renderConstants();
+ $ret[] = $classSpecialFiles->renderConstantsInterface();
// Creation of permissions
- if (in_array(1, $tablePermissions)) {
+ if (\in_array(1, $tablePermissions)) {
// Creation of classes
- $classSpecialFiles = Tdmcreate\Files\Classes\ClassSpecialFiles::getInstance();
- $classSpecialFiles->write($module, '', null, ucfirst('permissions') . '.php');
+ $classSpecialFiles = Modulebuilder\Files\Classes\ClassSpecialFiles::getInstance();
+ $classSpecialFiles->write($module, '', null, \ucfirst('permissions') . '.php');
$classSpecialFiles->className = 'Permissions';
- $ret[] = $classSpecialFiles->renderClass();
+ $ret[] = $classSpecialFiles->renderClass();
// Creation of classhandlers
- $classSpecialFiles = Tdmcreate\Files\Classes\ClassSpecialFiles::getInstance();
- $classSpecialFiles->write($module, '', $permTables, ucfirst('permissionshandler') . '.php');
- $classSpecialFiles->className = 'Permissionshandler';
- $ret[] = $classSpecialFiles->renderPermissionsHandler();
-
+ $classSpecialFiles = Modulebuilder\Files\Classes\ClassSpecialFiles::getInstance();
+ $classSpecialFiles->write($module, '', $permTables, \ucfirst('PermissionsHandler') . '.php');
+ $classSpecialFiles->className = 'PermissionsHandler';
+ $ret[] = $classSpecialFiles->renderPermissionsHandler();
}
- foreach (array_keys($files) as $t) {
- $fileName = $files[$t]->getVar('file_name');
- $fileExtension = $files[$t]->getVar('file_extension');
- $fileInfolder = $files[$t]->getVar('file_infolder');
- // More File
- $moreFiles = Tdmcreate\MoreFiles::getInstance();
- $moreFiles->write($module, $fileName, $fileInfolder, $fileExtension);
- $ret[] = $moreFiles->render();
+ foreach (\array_keys($files) as $t) {
+ $fileInfolder = $files[$t]->getVar('file_infolder');
+ if (Modulebuilder\Constants::MORE_FILES_TYPE_COPY == $files[$t]->getVar('file_type')) {
+ $src_file = TDMC_UPLOAD_FILES_PATH . '/' . $files[$t]->getVar('file_upload');
+ $dst_file = TDMC_UPLOAD_REPOSITORY_PATH . '/' . \mb_strtolower($moduleDirname) . '/';
+ if ('' !== $fileInfolder) {
+ if ('/' !== \mb_substr($fileInfolder, -1)) {
+ $fileInfolder .= '/';
+ }
+ $dst_file .= $fileInfolder;
+ }
+ $dst_file .= $files[$t]->getVar('file_upload');
+ Modulebuilder\Files\CreateClone::cloneFile($src_file, $dst_file, true, $this->patKeys, $this->patValues);
+ } else {
+ $fileName = $files[$t]->getVar('file_name');
+ $fileExtension = $files[$t]->getVar('file_extension');
+ // More File
+ $moreFiles = Modulebuilder\Files\CreateMoreFiles::getInstance();
+ $moreFiles->write($module, $fileName, $fileInfolder, $fileExtension);
+ $ret[] = $moreFiles->render();
+ }
}
// Language Modinfo File
- $languageModinfo = Tdmcreate\Files\Language\LanguageModinfo::getInstance();
+ $languageModinfo = Modulebuilder\Files\Language\LanguageModinfo::getInstance();
$languageModinfo->write($module, $table, 'modinfo.php');
$ret[] = $languageModinfo->render();
if (1 == $module->getVar('mod_admin')) {
// Admin Header File
- $adminHeader = Tdmcreate\Files\Admin\AdminHeader::getInstance();
+ $adminHeader = Modulebuilder\Files\Admin\AdminHeader::getInstance();
$adminHeader->write($module, $table, $tables, 'header.php');
$ret[] = $adminHeader->render();
// Admin Index File
- $adminIndex = Tdmcreate\Files\Admin\AdminIndex::getInstance();
+ $adminIndex = Modulebuilder\Files\Admin\AdminIndex::getInstance();
$adminIndex->write($module, $tables, 'index.php');
$ret[] = $adminIndex->render();
// Admin Menu File
- $adminObject = Tdmcreate\Files\Admin\AdminMenu::getInstance();
+ $adminObject = Modulebuilder\Files\Admin\AdminMenu::getInstance();
$adminObject->write($module, 'menu.php');
$ret[] = $adminObject->render();
// Admin About File
- $adminAbout = Tdmcreate\Files\Admin\AdminAbout::getInstance();
+ $adminAbout = Modulebuilder\Files\Admin\AdminAbout::getInstance();
$adminAbout->write($module, 'about.php');
$ret[] = $adminAbout->render();
// Admin Footer File
- $adminFooter = Tdmcreate\Files\Admin\AdminFooter::getInstance();
+ $adminFooter = Modulebuilder\Files\Admin\AdminFooter::getInstance();
$adminFooter->write($module, 'footer.php');
$ret[] = $adminFooter->render();
// Templates Admin About File
- $adminTemplatesAbout = Tdmcreate\Files\Templates\Admin\TemplatesAdminAbout::getInstance();
+ $adminTemplatesAbout = Modulebuilder\Files\Templates\Admin\TemplatesAdminAbout::getInstance();
$adminTemplatesAbout->write($module, $moduleDirname . '_admin_about.tpl');
$ret[] = $adminTemplatesAbout->render();
// Templates Admin Index File
- $adminTemplatesIndex = Tdmcreate\Files\Templates\Admin\TemplatesAdminIndex::getInstance();
+ $adminTemplatesIndex = Modulebuilder\Files\Templates\Admin\TemplatesAdminIndex::getInstance();
$adminTemplatesIndex->write($module, $moduleDirname . '_admin_index.tpl');
$ret[] = $adminTemplatesIndex->render();
// Templates Admin Footer File
- $adminTemplatesFooter = Tdmcreate\Files\Templates\Admin\TemplatesAdminFooter::getInstance();
+ $adminTemplatesFooter = Modulebuilder\Files\Templates\Admin\TemplatesAdminFooter::getInstance();
$adminTemplatesFooter->write($module, $moduleDirname . '_admin_footer.tpl');
$ret[] = $adminTemplatesFooter->render();
// Templates Admin Header File
- $adminTemplatesHeader = Tdmcreate\Files\Templates\Admin\TemplatesAdminHeader::getInstance();
+ $adminTemplatesHeader = Modulebuilder\Files\Templates\Admin\TemplatesAdminHeader::getInstance();
$adminTemplatesHeader->write($module, $moduleDirname . '_admin_header.tpl');
$ret[] = $adminTemplatesHeader->render();
// Language Admin File
- $languageAdmin = Tdmcreate\Files\Language\LanguageAdmin::getInstance();
+ $languageAdmin = Modulebuilder\Files\Language\LanguageAdmin::getInstance();
$languageAdmin->write($module, $table, $tables, 'admin.php');
$ret[] = $languageAdmin->render();
}
@@ -396,7 +492,7 @@ public function setFilesToBuilding($module)
// Class Helper File ==> setCommonFiles
// Include Functions File
- $includeFunctions = Tdmcreate\Files\Includes\IncludeFunctions::getInstance();
+ $includeFunctions = Modulebuilder\Files\Includes\IncludeFunctions::getInstance();
$includeFunctions->write($module, 'functions.php');
$ret[] = $includeFunctions->render();
@@ -404,249 +500,285 @@ public function setFilesToBuilding($module)
// Include Uninstall File ==> setCommonFiles
// Include Update File ==> setCommonFiles
- if (in_array(1, $tableBlocks)) {
+ if (\in_array(1, $tableBlocks)) {
// Language Blocks File
- $languageBlocks = Tdmcreate\Files\Language\LanguageBlocks::getInstance();
+ $languageBlocks = Modulebuilder\Files\Language\LanguageBlocks::getInstance();
$languageBlocks->write($module, $tables, 'blocks.php');
$ret[] = $languageBlocks->render();
}
+ // Creation of admin broken files
+ if (\in_array(1, $tableBroken)) {
+ // Admin broken File
+ $adminPermissions = Modulebuilder\Files\Admin\AdminBroken::getInstance();
+ $adminPermissions->write($module, $tables, 'broken.php');
+ $ret[] = $adminPermissions->render();
+ // Templates Admin broken File
+ $adminTemplatesPermissions = Modulebuilder\Files\Templates\Admin\TemplatesAdminBroken::getInstance();
+ $adminTemplatesPermissions->write($module, $tables, $moduleDirname . '_admin_broken.tpl');
+ $ret[] = $adminTemplatesPermissions->render();
+ }
// Creation of admin permission files
- if (in_array(1, $tablePermissions)) {
+ if (\in_array(1, $tablePermissions)) {
// Admin Permissions File
- $adminPermissions = Tdmcreate\Files\Admin\AdminPermissions::getInstance();
+ $adminPermissions = Modulebuilder\Files\Admin\AdminPermissions::getInstance();
$adminPermissions->write($module, $tables, 'permissions.php');
$ret[] = $adminPermissions->render();
// Templates Admin Permissions File
- $adminTemplatesPermissions = Tdmcreate\Files\Templates\Admin\TemplatesAdminPermissions::getInstance();
+ $adminTemplatesPermissions = Modulebuilder\Files\Templates\Admin\TemplatesAdminPermissions::getInstance();
$adminTemplatesPermissions->write($module, $moduleDirname . '_admin_permissions.tpl');
$ret[] = $adminTemplatesPermissions->render();
}
// Creation of notifications files
- if (in_array(1, $tableNotifications)) {
+ if (\in_array(1, $tableNotifications)) {
// Include Notifications File
- $includeNotifications = Tdmcreate\Files\Includes\IncludeNotifications::getInstance();
- $includeNotifications->write($module, $tables, 'notifications.inc.php');
- $ret[] = $includeNotifications->render();
+ $includeNotifications = Modulebuilder\Files\Includes\IncludeNotifications::getInstance();
+ $includeNotifications->write($module, $tables, 'notification.inc.php');
+ $ret[] = $includeNotifications->render();
+ $languageMailTpl = Modulebuilder\Files\Language\LanguageMailTpl::getInstance();
// Language Mail Template Category File
- $languageMailTpl = Tdmcreate\Files\Language\LanguageMailTpl::getInstance();
- $languageMailTpl->write($module, 'category_new_notify.tpl');
+ //$languageMailTpl->write($module, $table, 'category_new_notify.tpl');
+ //$ret[] = $languageMailTpl->render();
+ // Language Mail Template New File
+ $languageMailTpl->write($module, $table, 'global_new_notify.tpl');
+ $ret[] = $languageMailTpl->render();
+ // Language Mail Template Modify File
+ $languageMailTpl->write($module, $table, 'global_modify_notify.tpl');
+ $ret[] = $languageMailTpl->render();
+ // Language Mail Template Delete File
+ $languageMailTpl->write($module, $table, 'global_delete_notify.tpl');
$ret[] = $languageMailTpl->render();
+ // Language Mail Template Approve File
+ $languageMailTpl->write($module, $table, 'global_approve_notify.tpl');
+ $ret[] = $languageMailTpl->render();
+ if (\in_array(1, $tableBroken)) {
+ // Language Mail Template Broken File
+ $languageMailTpl->write($module, $table, 'global_broken_notify.tpl');
+ $ret[] = $languageMailTpl->render();
+ }
+ if (\in_array(1, $tableComments)) {
+ // Language Mail Template Broken File
+ $languageMailTpl->write($module, $table, 'global_comment_notify.tpl');
+ $ret[] = $languageMailTpl->render();
+ }
}
// Creation of sql file
- if (null != $table->getVar('table_name')) {
+ if (\count($tables) > 0) {
// Sql File
- $sqlFile = Tdmcreate\Files\Sql\SqlFile::getInstance();
+ $sqlFile = Modulebuilder\Files\Sql\SqlFile::getInstance();
$sqlFile->write($module, 'mysql.sql');
$ret[] = $sqlFile->render();
}
// Creation of search file
- if (in_array(1, $tableSearch)) {
+ if (\in_array(1, $tableSearch)) {
// Search File
//TODO: UserSearch has to be adapted
/*
- $userSearch = Tdmcreate\Files\User\UserSearch::getInstance();
+ $userSearch = Modulebuilder\Files\User\UserSearch::getInstance();
$userSearch->write($module, $table, 'search.php');
$ret[] = $userSearch->render();
*/
// Include Search File
- $includeSearch = Tdmcreate\Files\Includes\IncludeSearch::getInstance();
+ $includeSearch = Modulebuilder\Files\Includes\IncludeSearch::getInstance();
$includeSearch->write($module, $tables, 'search.inc.php');
$ret[] = $includeSearch->render();
}
// Creation of comments files
- if (in_array(1, $tableComments)) {
- /*
- * TODO: are this comment files required?
+ if (\in_array(1, $tableComments)) {
// Include Comments File
- $includeComments = Tdmcreate\Files\Includes\IncludeComments::getInstance();
+ $includeComments = Modulebuilder\Files\Includes\IncludeComments::getInstance();
+ foreach (\array_keys($tables) as $t) {
+ if (1 == (int)$tables[$t]->getVar('table_comments')) {
+ $table = $tables[$t];
+ }
+ }
$includeComments->write($module, $table);
$ret[] = $includeComments->renderCommentsIncludes($module, 'comment_edit');
// Include Comments File
- $includeComments = Tdmcreate\Files\Includes\IncludeComments::getInstance();
+ $includeComments = Modulebuilder\Files\Includes\IncludeComments::getInstance();
$includeComments->write($module, $table);
$ret[] = $includeComments->renderCommentsIncludes($module, 'comment_delete');
// Include Comments File
- $includeComments = Tdmcreate\Files\Includes\IncludeComments::getInstance();
+ $includeComments = Modulebuilder\Files\Includes\IncludeComments::getInstance();
$includeComments->write($module, $table);
$ret[] = $includeComments->renderCommentsIncludes($module, 'comment_post');
// Include Comments File
- $includeComments = Tdmcreate\Files\Includes\IncludeComments::getInstance();
+ $includeComments = Modulebuilder\Files\Includes\IncludeComments::getInstance();
$includeComments->write($module, $table);
$ret[] = $includeComments->renderCommentsIncludes($module, 'comment_reply');
// Include Comments File
- $includeComments = Tdmcreate\Files\Includes\IncludeComments::getInstance();
- $includeComments->write($module, $table);
- $ret[] = $includeComments->renderCommentsNew($module, 'comment_new');
- */
-
+ //$includeComments = Modulebuilder\Files\Includes\IncludeComments::getInstance();
+ //$includeComments->write($module, $table);
+ //$ret[] = $includeComments->renderCommentsNew($module, 'comment_new');
// Include Comment Functions File
- $includeCommentFunctions = Tdmcreate\Files\Includes\IncludeCommentFunctions::getInstance();
+ $includeCommentFunctions = Modulebuilder\Files\Includes\IncludeCommentFunctions::getInstance();
$includeCommentFunctions->write($module, $table, 'comment_functions.php');
$ret[] = $includeCommentFunctions->render();
}
- if ((1 == $module->getVar('mod_user')) && in_array(1, $tableUser)) {
+ if ((1 == $module->getVar('mod_user')) && \in_array(1, $tableUser)) {
// Creation of user template files
// Templates Index File
- $userTemplatesIndex = Tdmcreate\Files\Templates\User\Index::getInstance();
+/* if ($templateType == 'bootstrap') {
+ $userTemplatesIndex = Modulebuilder\Files\Templates\User\Bootstrap\Index::getInstance();
+ } else {*/
+ $userTemplatesIndex = Modulebuilder\Files\Templates\User\Defstyle\Index::getInstance();
+ /*}*/
$userTemplatesIndex->write($module, $table, $tables, $moduleDirname . '_index.tpl');
$ret[] = $userTemplatesIndex->render();
// Templates Footer File
- $userTemplatesFooter = Tdmcreate\Files\Templates\User\Footer::getInstance();
+/* if ($templateType == 'bootstrap') {
+ $userTemplatesFooter = Modulebuilder\Files\Templates\User\Bootstrap\Footer::getInstance();
+ } else {*/
+ $userTemplatesFooter = Modulebuilder\Files\Templates\User\Defstyle\Footer::getInstance();
+ /*}*/
$userTemplatesFooter->write($module, $table, $moduleDirname . '_footer.tpl');
$ret[] = $userTemplatesFooter->render();
// Templates Header File
- $userTemplatesHeader = Tdmcreate\Files\Templates\User\Header::getInstance();
+/* if ($templateType == 'bootstrap') {
+ $userTemplatesHeader = Modulebuilder\Files\Templates\User\Bootstrap\Header::getInstance();
+ } else {*/
+ $userTemplatesHeader = Modulebuilder\Files\Templates\User\Defstyle\Header::getInstance();
+ /*}*/
$userTemplatesHeader->write($module, $moduleDirname . '_header.tpl');
$ret[] = $userTemplatesHeader->render();
// Creation of user files
// User Footer File
- $userFooter = Tdmcreate\Files\User\UserFooter::getInstance();
+ $userFooter = Modulebuilder\Files\User\UserFooter::getInstance();
$userFooter->write($module, 'footer.php');
$ret[] = $userFooter->render();
// User Header File
- $userHeader = Tdmcreate\Files\User\UserHeader::getInstance();
+ $userHeader = Modulebuilder\Files\User\UserHeader::getInstance();
$userHeader->write($module, $table, $tables, 'header.php');
$ret[] = $userHeader->render();
// User Notification Update File
- if ((1 == $module->getVar('mod_notifications')) && in_array(1, $tableNotifications)) {
- $userNotificationUpdate = Tdmcreate\Files\User\UserNotificationUpdate::getInstance();
+ if ((1 == $module->getVar('mod_notifications')) && \in_array(1, $tableNotifications)) {
+ $userNotificationUpdate = Modulebuilder\Files\User\UserNotificationUpdate::getInstance();
$userNotificationUpdate->write($module, 'notification_update.php');
$ret[] = $userNotificationUpdate->render();
}
- // User Broken File
- if (in_array(1, $tableBroken)) {
- $userBroken = Tdmcreate\Files\User\UserBroken::getInstance();
- $userBroken->write($module, $table, 'broken.php');
- $ret[] = $userBroken->render();
- // User Templates Broken File
- $userTemplatesBroken = Templates\User\Broken::getInstance();
- $userTemplatesBroken->write($module, $table, $moduleDirname . '_broken.tpl');
- $ret[] = $userTemplatesBroken->render();
- }
// User Pdf File
- if (in_array(1, $tablePdf)) {
- $userPdf = Tdmcreate\Files\User\UserPdf::getInstance();
- $userPdf->write($module, $table, 'pdf.php');
- $ret[] = $userPdf->render();
- // User Templates Pdf File
- $userTemplatesPdf = Tdmcreate\Files\Templates\User\Pdf::getInstance();
- $userTemplatesPdf->write($module, $moduleDirname . '_pdf.tpl');
- $ret[] = $userTemplatesPdf->render();
+ if (\in_array(1, $tablePdf)) {
+ foreach ($tables as $table) {
+ if ($table->getVar('table_pdf')) {
+ $tableName = $table->getVar('table_name');
+ $userPdf = Modulebuilder\Files\User\UserPdf::getInstance();
+ $userPdf->write($module, $table, $tableName . '_pdf.php');
+ $ret[] = $userPdf->render();
+ // User Templates Pdf File
+ /*if ($templateType == 'bootstrap') {
+ $userTemplatesPdf = Modulebuilder\Files\Templates\User\Bootstrap\Pdf::getInstance();
+ } else {*/
+ $userTemplatesPdf = Modulebuilder\Files\Templates\User\Defstyle\Pdf::getInstance();
+ /*}*/
+ $userTemplatesPdf->write($module, $table, $moduleDirname . '_' . $tableName . '_pdf.tpl');
+ $ret[] = $userTemplatesPdf->render();
+ }
+ }
}
// User Print File
- if (in_array(1, $tablePrint)) {
- $userPrint = Tdmcreate\Files\User\UserPrint::getInstance();
- $userPrint->write($module, $table, 'print.php');
- $ret[] = $userPrint->render();
- // User Templates Print File
- $userTemplatesPrint = Tdmcreate\Files\Templates\User\UserPrint::getInstance();
- $userTemplatesPrint->write($module, $table, $moduleDirname . '_print.tpl');
- $ret[] = $userTemplatesPrint->render();
+ if (\in_array(1, $tablePrint)) {
+ foreach ($tables as $table) {
+ if ($table->getVar('table_print')) {
+ $tableName = $table->getVar('table_name');
+ $userPrint = Modulebuilder\Files\User\UserPrint::getInstance();
+ $userPrint->write($module, $table, $tableName . '_print.php');
+ $ret[] = $userPrint->render();
+ // User Templates Print File
+ /*if ($templateType == 'bootstrap') {
+ $userTemplatesPrint = Modulebuilder\Files\Templates\User\Bootstrap\UserPrint::getInstance();
+ } else {*/
+ $userTemplatesPrint = Modulebuilder\Files\Templates\User\Defstyle\UserPrint::getInstance();
+ /*}*/
+ $userTemplatesPrint->write($module, $table, $moduleDirname . '_' . $tableName . '_print.tpl');
+ $ret[] = $userTemplatesPrint->render();
+ }
+ }
}
- // User Rate File
+
//TODO: UserSearch has to be adapted
- if (in_array(1, $tableRate)) {
- $userRate = Tdmcreate\Files\User\UserRate::getInstance();
- $userRate->write($module, $table, 'rate.php');
+
+ // User Rate File
+ if (\in_array(1, $tableRate)) {
+ $userRate = Modulebuilder\Files\User\UserRate::getInstance();
+ $userRate->write($module, $tables, 'rate.php');
$ret[] = $userRate->render();
- // User Templates Rate File
- $userTemplatesRate = Tdmcreate\Files\Templates\User\Rate::getInstance();
- $userTemplatesRate->write($module, $table, $moduleDirname . '_rate.tpl');
- $ret[] = $userTemplatesRate->render();
+
+ $this->CopyRatingFiles($moduleDirname);
+ $ret[] = \_AM_MODULEBUILDER_BUILDING_RATING;
}
// User Rss File
- if (in_array(1, $tableRss)) {
- $userRss = Tdmcreate\Files\User\UserRss::getInstance();
+ if (\in_array(1, $tableRss)) {
+ $userRss = Modulebuilder\Files\User\UserRss::getInstance();
$userRss->write($module, $table, 'rss.php');
$ret[] = $userRss->render();
// User Templates Rss File
- $userTemplatesRss = Tdmcreate\Files\Templates\User\Rss::getInstance();
+ /*if ($templateType == 'bootstrap') {
+ $userTemplatesRss = Modulebuilder\Files\Templates\User\Bootstrap\Rss::getInstance();
+ } else {*/
+ $userTemplatesRss = Modulebuilder\Files\Templates\User\Defstyle\Rss::getInstance();
+ /*}*/
$userTemplatesRss->write($module, $moduleDirname . '_rss.tpl');
$ret[] = $userTemplatesRss->render();
}
- // User Single File
- if (in_array(1, $tableSingle)) {
- $userSingle = Tdmcreate\Files\User\UserSingle::getInstance();
- $userSingle->write($module, $table, 'single.php');
- $ret[] = $userSingle->render();
- // User Templates Single File
- $userTemplatesSingle = Tdmcreate\Files\Templates\User\Single::getInstance();
- $userTemplatesSingle->write($module, $table, $moduleDirname . '_single.tpl');
- $ret[] = $userTemplatesSingle->render();
- }
-
- // User Submit File
- if (in_array(1, $tableSubmit)) {
- $userSubmit = Tdmcreate\Files\User\UserSubmit::getInstance();
- $userSubmit->write($module, $table, 'submit.php');
- $ret[] = $userSubmit->render();
- // User Templates Submit File
- $userTemplatesSubmit = Tdmcreate\Files\Templates\User\Submit::getInstance();
- $userTemplatesSubmit->write($module, $table, $moduleDirname . '_submit.tpl');
- $ret[] = $userTemplatesSubmit->render();
- }
- // User Visit File
- if (in_array(1, $tableVisit)) {
- $userVisit = Tdmcreate\Files\User\UserVisit::getInstance();
- $userVisit->write($module, $table, 'visit.php');
- $ret[] = $userVisit->render();
- }
// User Tag Files
- if (in_array(1, $tableTag)) {
- $userListTag = Tdmcreate\Files\User\UserListTag::getInstance();
+ if (\in_array(1, $tableTag)) {
+ $userListTag = Modulebuilder\Files\User\UserListTag::getInstance();
$userListTag->write($module, 'list.tag.php');
$ret[] = $userListTag->render();
- $userViewTag = Tdmcreate\Files\User\UserViewTag::getInstance();
+ $userViewTag = Modulebuilder\Files\User\UserViewTag::getInstance();
$userViewTag->write($module, 'view.tag.php');
$ret[] = $userViewTag->render();
}
// User Index File
- $userIndex = Tdmcreate\Files\User\UserIndex::getInstance();
+ $userIndex = Modulebuilder\Files\User\UserIndex::getInstance();
$userIndex->write($module, $table, 'index.php');
$ret[] = $userIndex->render();
// Language Main File
- $languageMain = Tdmcreate\Files\Language\LanguageMain::getInstance();
+ $languageMain = Modulebuilder\Files\Language\LanguageMain::getInstance();
$languageMain->write($module, $tables, 'main.php');
$ret[] = $languageMain->render();
- // User Templates Submit File
- $userTemplatesUserBreadcrumbs = Templates\User\Breadcrumbs::getInstance();
+ // User Templates Breadcrumbs File
+ /*if ($templateType == 'bootstrap') {
+ $userTemplatesUserBreadcrumbs = Modulebuilder\Files\Templates\User\Bootstrap\Breadcrumbs::getInstance();
+ } else {*/
+ $userTemplatesUserBreadcrumbs = Modulebuilder\Files\Templates\User\Defstyle\Breadcrumbs::getInstance();
+ /*}*/
$userTemplatesUserBreadcrumbs->write($module, $moduleDirname . '_breadcrumbs.tpl');
$ret[] = $userTemplatesUserBreadcrumbs->render();
}
// Css Admin Styles File
- $cssStyles = Tdmcreate\Files\Assets\Css\Admin\CssAdminStyles::getInstance();
+ $cssStyles = Modulebuilder\Files\Assets\Css\Admin\CssAdminStyles::getInstance();
$cssStyles->write($module, 'style.css');
$ret[] = $cssStyles->render();
// Css Styles File
- $cssStyles = Tdmcreate\Files\Assets\Css\CssStyles::getInstance();
+ $cssStyles = Modulebuilder\Files\Assets\Css\CssStyles::getInstance();
$cssStyles->write($module, 'style.css');
$ret[] = $cssStyles->render();
// Include Jquery File
- $JavascriptJQuery = Tdmcreate\Files\Assets\Js\JavascriptJQuery::getInstance();
+ $JavascriptJQuery = Modulebuilder\Files\Assets\Js\JavascriptJQuery::getInstance();
$JavascriptJQuery->write($module, 'functions.js');
$ret[] = $JavascriptJQuery->render();
// Include Common File
- $includeCommon = Tdmcreate\Files\Includes\IncludeCommon::getInstance();
+ $includeCommon = Modulebuilder\Files\Includes\IncludeCommon::getInstance();
$includeCommon->write($module, $table, 'common.php');
$ret[] = $includeCommon->render();
// Common Config File
- $includeConfig = Tdmcreate\Files\Config\ConfigConfig::getInstance();
+ $includeConfig = Modulebuilder\Files\Config\ConfigConfig::getInstance();
$includeConfig->write($module, $tables, 'config.php');
$ret[] = $includeConfig->render();
// Docs Changelog File
- $docsChangelog = Tdmcreate\Files\Docs\DocsChangelog::getInstance();
+ $docsChangelog = Modulebuilder\Files\Docs\DocsChangelog::getInstance();
$docsChangelog->write($module, 'changelog.txt');
$ret[] = $docsChangelog->render();
// Language Help File
- $languageHelp = Tdmcreate\Files\Language\LanguageHelp::getInstance();
+ $languageHelp = Modulebuilder\Files\Language\LanguageHelp::getInstance();
$languageHelp->write($module, 'help.html');
$ret[] = $languageHelp->render();
// User Xoops Version File
- $userXoopsVersion = Tdmcreate\Files\User\UserXoopsVersion::getInstance();
+ $userXoopsVersion = Modulebuilder\Files\User\UserXoopsVersion::getInstance();
$userXoopsVersion->write($module, $table, $tables, 'xoops_version.php');
$ret[] = $userXoopsVersion->render();
@@ -659,31 +791,20 @@ public function setFilesToBuilding($module)
*
* @param $module
*/
- public function setCommonFiles($module)
+ public function setCommonFiles($module): void
{
-
$moduleName = $module->getVar('mod_dirname');
- //$src_path = XOOPS_ROOT_PATH . '/modules/tdmcreate/files';
- //$tmp_path = XOOPS_UPLOAD_PATH . '/tdmcreate/temp';
- $upl_path = TDMC_UPLOAD_REPOSITORY_PATH . '/' . mb_strtolower($moduleName);
-
- $patterns = [
- mb_strtolower('tdmcreate') => mb_strtolower($moduleName),
- mb_strtoupper('tdmcreate') => mb_strtoupper($moduleName),
- ucfirst(mb_strtolower('tdmcreate')) => ucfirst(mb_strtolower($moduleName)),
- ];
-
- $patKeys = array_keys($patterns);
- $patValues = array_values($patterns);
+ $upl_path = TDMC_UPLOAD_REPOSITORY_PATH . '/' . \mb_strtolower($moduleName);
/* clone complete missing folders */
+ $cloneFolders = [];
$cloneFolders[] = [
- 'src' => TDMC_PATH . '/commonfiles',
+ 'src' => TDMC_PATH . '/files/commonfiles',
'dst' => $upl_path,
- 'rcode' => true
+ 'rcode' => true,
];
foreach ($cloneFolders as $folder) {
- Tdmcreate\Files\CreateClone::cloneFileFolder($folder['src'], $folder['dst'], $folder['rcode'], $patKeys, $patValues);
+ Modulebuilder\Files\CreateClone::cloneFileFolder($folder['src'], $folder['dst'], $folder['rcode'], $this->patKeys, $this->patValues);
}
unset($cloneFolders);
@@ -694,24 +815,24 @@ public function setCommonFiles($module)
$createFolders[] = $upl_path . '/language/english';
}
foreach ($createFolders as $folder) {
- @mkdir($folder);
+ @\mkdir($folder);
}
unset($createFolders);
if ('english' !== $GLOBALS['xoopsConfig']['language']) {
$cloneFolders[] = [
- 'src' => TDMC_PATH . '/commonfiles/language/english',
+ 'src' => TDMC_PATH . '/files/commonfiles/language/english',
'dst' => $upl_path . '/language/' . $GLOBALS['xoopsConfig']['language'],
- 'rcode' => true
+ 'rcode' => true,
];
//copy back all language files to english language folder
$cloneFolders[] = [
'src' => $upl_path . '/language/' . $GLOBALS['xoopsConfig']['language'],
'dst' => $upl_path . '/language/english',
- 'rcode' => false
+ 'rcode' => false,
];
foreach ($cloneFolders as $folder) {
- Tdmcreate\Files\CreateClone::cloneFileFolder($folder['src'], $folder['dst'], $folder['rcode'], $patKeys, $patValues);
+ Modulebuilder\Files\CreateClone::cloneFileFolder($folder['src'], $folder['dst'], $folder['rcode'], $this->patKeys, $this->patValues);
}
unset($cloneFolders);
}
@@ -721,23 +842,44 @@ public function setCommonFiles($module)
'src' => TDMC_PATH . '/config/',
'dst' => $upl_path . '/config/',
'file' => 'admin.yml',
- 'rcode' => true
+ 'rcode' => true,
];
$cloneFiles[] = [
'src' => TDMC_PATH . '/config/',
'dst' => $upl_path . '/config/',
'file' => 'icons.php',
- 'rcode' => true
+ 'rcode' => true,
];
$cloneFiles[] = [
'src' => TDMC_PATH . '/config/',
'dst' => $upl_path . '/config/',
'file' => 'paths.php',
- 'rcode' => true
+ 'rcode' => true,
];
foreach ($cloneFiles as $file) {
- Tdmcreate\Files\CreateClone::cloneFile($file['src'] . $file['file'], $file['dst'] . $file['file'], $file['rcode'], $patKeys, $patValues);
+ Modulebuilder\Files\CreateClone::cloneFile($file['src'] . $file['file'], $file['dst'] . $file['file'], $file['rcode'], $this->patKeys, $this->patValues);
}
unset($cloneFiles);
}
+
+ /**
+ * @private function CopyRatingFiles
+ *
+ * @param $moduleName
+ */
+ private function CopyRatingFiles($moduleName): void
+ {
+ $upl_path = TDMC_UPLOAD_REPOSITORY_PATH . '/' . \mb_strtolower($moduleName);
+
+ /* clone complete missing folders */
+ $cloneFolders[] = [
+ 'src' => TDMC_PATH . '/files/ratingfiles',
+ 'dst' => $upl_path,
+ 'rcode' => true,
+ ];
+ foreach ($cloneFolders as $folder) {
+ Modulebuilder\Files\CreateClone::cloneFileFolder($folder['src'], $folder['dst'], $folder['rcode'], $this->patKeys, $this->patValues);
+ }
+ unset($cloneFolders);
+ }
}
diff --git a/class/Files/CreateClone.php b/class/Files/CreateClone.php
index 776c1245..2bfb541f 100644
--- a/class/Files/CreateClone.php
+++ b/class/Files/CreateClone.php
@@ -1,7 +1,6 @@
-$path) {
- self::deleteFileFolder($path);
- }
- return @rmdir($path);
- }
- }*/
+ *
+ * public static function deleteFileFolder($path) {
+ *
+ * if (is_file($path)) {
+ * return @\unlink($path);
+ * }
+ * elseif (\is_dir($path)) {
+ * $scan = glob(r\trim($path,'/').'/*');
+ * foreach($scan as $index=>$path) {
+ * self::deleteFileFolder($path);
+ * }
+ * return @\rmdir($path);
+ * }
+ * }*/
// recursive cloning script
+
/**
- * @param $src_path
- * @param $dst_path
+ * @param $src_path
+ * @param $dst_path
* @param bool $replace_code
* @param array $patKeys
* @param array $patValues
*/
- public static function cloneFileFolder($src_path, $dst_path, $replace_code = false, $patKeys = [], $patValues =[])
+ public static function cloneFileFolder($src_path, $dst_path, bool $replace_code = false, array $patKeys = [], array $patValues = []): void
{
// open the source directory
- $dir = opendir($src_path);
+ $dir = \opendir($src_path);
+ if (false === $dir) {
+ throw new \RuntimeException("Unable to open source directory: {$src_path}");
+ }
// Make the destination directory if not exist
- @mkdir($dst_path);
+ if (!\is_dir($dst_path) && !\mkdir($dst_path, 0755) && !\is_dir($dst_path)) {
+ throw new \RuntimeException("Unable to create destination directory: {$dst_path}");
+ }
+
// Loop through the files in source directory
- while( $file = readdir($dir) ) {
- if (( $file != '.' ) && ( $file != '..' )) {
- if ( is_dir($src_path . '/' . $file) ) {
+ while ($file = \readdir($dir)) {
+ if (($file != '.') && ($file != '..')) {
+ if (\is_dir($src_path . '/' . $file)) {
// Recursively calling custom copy function for sub directory
self::cloneFileFolder($src_path . '/' . $file, $dst_path . '/' . $file, $replace_code, $patKeys, $patValues);
} else {
@@ -52,31 +58,45 @@ public static function cloneFileFolder($src_path, $dst_path, $replace_code = fal
}
}
}
- closedir($dir);
+ \closedir($dir);
}
/**
- * @param $src_file
- * @param $dst_file
+ * @param $src_file
+ * @param $dst_file
* @param bool $replace_code
* @param array $patKeys
* @param array $patValues
*/
- public static function cloneFile($src_file, $dst_file, $replace_code = false, $patKeys = [], $patValues =[])
+ public static function cloneFile($src_file, $dst_file, bool $replace_code = false, array $patKeys = [], array $patValues = []): void
{
if ($replace_code) {
$noChangeExtensions = ['jpeg', 'jpg', 'gif', 'png', 'zip', 'ttf'];
- if (in_array(mb_strtolower(pathinfo($src_file, PATHINFO_EXTENSION)), $noChangeExtensions)) {
+ if (\in_array(\mb_strtolower(\pathinfo($src_file, PATHINFO_EXTENSION)), $noChangeExtensions)) {
// image
- copy($src_file, $dst_file);
+ if (!\copy($src_file, $dst_file)) {
+ throw new \RuntimeException("Unable to copy {$src_file} to {$dst_file}");
+ }
} else {
- // file, read it
- $content = file_get_contents($src_file);
- $content = str_replace($patKeys, $patValues, $content);
- file_put_contents($dst_file, $content);
+ // file, read it and replace text
+ $content = \file_get_contents($src_file);
+ if (false === $content) {
+ throw new \RuntimeException("Unable to read source file: {$src_file}");
+ }
+ $content = \str_replace($patKeys, $patValues, $content);
+ //check file name whether it contains replace code
+ $path_parts = \pathinfo($dst_file);
+ $path = $path_parts['dirname'];
+ $file = $path_parts['basename'];
+ $dst_file = $path . '/' . \str_replace($patKeys, $patValues, $file);
+ if (false === \file_put_contents($dst_file, $content)) {
+ throw new \RuntimeException("Unable to write destination file: {$dst_file}");
+ }
}
} else {
- copy($src_file, $dst_file);
+ if (!\copy($src_file, $dst_file)) {
+ throw new \RuntimeException("Unable to copy {$src_file} to {$dst_file}");
+ }
}
}
}
diff --git a/class/Files/CreateCodeIndents.php b/class/Files/CreateCodeIndents.php
index 3547ee6c..6f95e1cf 100644
--- a/class/Files/CreateCodeIndents.php
+++ b/class/Files/CreateCodeIndents.php
@@ -1,6 +1,6 @@
-setFileName($fileName);
$this->created = $created;
$this->notCreated = $notCreated;
$this->setMode($mode);
$this->setRepositoryPath($moduleDirname);
- if (!empty($content) && is_string($content)) {
+ if (!empty($content) && \is_string($content)) {
$this->setContent($content);
}
- if (isset($subdir) && is_string($subdir)) {
+ if (isset($subdir) && \is_string($subdir)) {
$this->setSubDir($subdir);
}
}
@@ -152,14 +146,14 @@ public function create($moduleDirname, $subdir = null, $fileName = null, $conten
* @private function setRepositoryPath
* @param string $moduleDirname
*/
- private function setRepositoryPath($moduleDirname)
+ private function setRepositoryPath(string $moduleDirname): void
{
$this->uploadPath = TDMC_UPLOAD_REPOSITORY_PATH . '/' . $moduleDirname;
}
/**
* @private function getRepositoryPath
- * @param null
+ *
* @return string
*/
private function getRepositoryPath()
@@ -171,14 +165,14 @@ private function getRepositoryPath()
* @private function setSubDir
* @param $subdir
*/
- private function setSubDir($subdir)
+ private function setSubDir($subdir): void
{
$this->subdir = $subdir;
}
/**
* @private function getSubDir
- * @param null
+ *
* @return string
*/
private function getSubDir()
@@ -191,14 +185,14 @@ private function getSubDir()
*
* @param $fileName
*/
- public function setFileName($fileName)
+ public function setFileName($fileName): void
{
$this->fileName = $fileName;
}
/**
* @public function getFileName
- * @param null
+ *
* @return mixed
*/
public function getFileName()
@@ -210,14 +204,15 @@ public function getFileName()
* @private function setContent
* @param $content
*/
- private function setContent($content)
+ private function setContent($content): void
{
- $this->content = $content;
+ //replace tabs by 4 spaces
+ $this->content = \preg_replace('/\t/', $this->tab, $content);
}
/**
* @private function setContent
- * @param null
+ *
* @return string
*/
private function getContent()
@@ -227,19 +222,19 @@ private function getContent()
/**
* @private function getFolderName
- * @param null
+ *
* @return string
*/
private function getFolderName()
{
$path = $this->getUploadPath();
- if (mb_strrpos($path, '\\')) {
- $str = mb_strrpos($path, '\\');
+ if (\mb_strrpos($path, '\\')) {
+ $str = \mb_strrpos($path, '\\');
if (false !== $str) {
- return mb_substr($path, $str + 1, mb_strlen($path));
+ return \mb_substr($path, $str + 1, mb_strlen($path));
}
- return mb_substr($path, $str, mb_strlen($path));
+ return \mb_substr($path, $str, mb_strlen($path));
}
//return 'root module';
return false;
@@ -247,7 +242,7 @@ private function getFolderName()
/**
* @public function getUploadPath
- * @param null
+ *
* @return string
*/
private function getUploadPath()
@@ -263,7 +258,7 @@ private function getUploadPath()
/**
* @private function getCreated
- * @param null
+ *
* @return bool
*/
private function getCreated()
@@ -273,7 +268,7 @@ private function getCreated()
/**
* @private function getNotCreated
- * @param null
+ *
* @return bool
*/
private function getNotCreated()
@@ -285,14 +280,14 @@ private function getNotCreated()
* @private function setMode
* @param $mode
*/
- private function setMode($mode)
+ private function setMode($mode): void
{
$this->mode = $mode;
}
/**
* @private function getMode
- * @param null
+ *
* @return string
*/
private function getMode()
@@ -305,12 +300,16 @@ private function getMode()
* @param string $moduleDirname
* @param string $prefix
* @param string $suffix
- *
+ * @param bool $addFq //add function qualifier
* @return string
*/
- public function getLanguage($moduleDirname, $prefix = '', $suffix = '')
+ public function getLanguage(string $moduleDirname, string $prefix = '', string $suffix = '', bool $addFq = true)
{
- $lang = '_' . $prefix . '_' . mb_strtoupper($moduleDirname);
+ $lang = '';
+ if ($addFq) {
+ $lang = '\\';
+ }
+ $lang .= '_' . $prefix . '_' . \mb_strtoupper($moduleDirname);
$ret = $lang;
if (!empty($suffix) || '_' !== $suffix) {
$ret = $lang . '_' . $suffix;
@@ -327,9 +326,13 @@ public function getLanguage($moduleDirname, $prefix = '', $suffix = '')
*
* @return string
*/
- public function getLeftString($string)
+ public function getLeftString(string $string)
{
- return mb_substr($string, 0, mb_strpos($string, '_'));
+ $ret = '';
+ if ('' != $string) {
+ $ret .= \mb_substr($string, 0, (int)\mb_strpos($string, '_'));
+ }
+ return $ret;
}
/**
@@ -340,12 +343,12 @@ public function getLeftString($string)
*/
public function getRightString($string = null)
{
- if (mb_strpos($string, '_')) {
- $str = mb_strpos($string, '_');
- if (false !== $str) {
- $ret = mb_substr($string, $str + 1, mb_strlen($string));
-
- return $ret;
+ if ('' != $string) {
+ if (\mb_strpos($string, '_')) {
+ $str = \mb_strpos($string, '_');
+ if (false !== $str) {
+ return \mb_substr($string, $str + 1, \mb_strlen($string));
+ }
}
}
@@ -355,12 +358,12 @@ public function getRightString($string = null)
/**
* @public function getCamelCase
* @param $string
- * @param $ucfirst
- * @param $lcfirst
+ * @param bool $ucfirst
+ * @param bool $lcfirst
*
* @return string
*/
- public function getCamelCase($string, $ucfirst = false, $lcfirst = false)
+ public function getCamelCase($string, bool $ucfirst = false, bool $lcfirst = false)
{
$rightString = $this->getRightString($string);
$leftString = $this->getLeftString($string);
@@ -382,7 +385,11 @@ public function getCamelCase($string, $ucfirst = false, $lcfirst = false)
*/
public function getUcfirst($string)
{
- return ucfirst($string);
+ $ret = '';
+ if ('' != $string) {
+ $ret .= \ucfirst($string);
+ }
+ return $ret;
}
/**
@@ -393,7 +400,11 @@ public function getUcfirst($string)
*/
public function getLcfirst($string)
{
- return lcfirst($string);
+ $ret = '';
+ if ('' != $string) {
+ $ret .= \lcfirst($string);
+ }
+ return $ret;
}
/**
@@ -404,7 +415,11 @@ public function getLcfirst($string)
*/
public function getStrToUpper($string)
{
- return mb_strtoupper($string);
+ $ret = '';
+ if ('' != $string) {
+ $ret .= \mb_strtoupper($string);
+ }
+ return $ret;
}
/**
@@ -415,25 +430,29 @@ public function getStrToUpper($string)
*/
public function getStrToLower($string)
{
- return mb_strtolower($string);
+ $ret = '';
+ if ('' != $string) {
+ $ret .= \mb_strtolower($string);
+ }
+ return $ret;
}
/**
- * @public function getInclude
- * @param $filename
+ * @public function getRequire
+ * @param string $filename
* @return string
*/
- public function getInclude($filename = 'header')
+ public function getRequire(string $filename = 'header')
{
return "require __DIR__ . '/{$filename}.php';\n";
}
/**
- * @public function getIncludeOnce
- * @param $filename
+ * @public function getRequireOnce
+ * @param string $filename
* @return string
*/
- public function getIncludeOnce($filename = 'header')
+ public function getRequireOnce(string $filename = 'header')
{
return "require_once __DIR__ . '/{$filename}.php';\n";
}
@@ -457,61 +476,68 @@ public function getDashComment($comment)
* @param string $t
* @return string
*/
- public function getSimpleString($string, $t = '')
+ public function getSimpleString($string, string $t = '')
{
return "{$t}{$string}\n";
}
/**
* @public function getHeaderFilesComments
- * @param string $module
+ * @param $module
* @param $noPhpFile
*
* @param string $namespace
* @return string
*/
- public function getHeaderFilesComments($module, $noPhpFile = null, $namespace = '')
+ public function getHeaderFilesComments($module, $noPhpFile = null, string $namespace = '')
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $name = $module->getVar('mod_name');
- $dirname = $module->getVar('mod_dirname');
- $version = $module->getVar('mod_version');
- $since = $module->getVar('mod_since');
- $minXoops = $module->getVar('mod_min_xoops');
- $author = $module->getVar('mod_author');
- $credits = $module->getVar('mod_credits');
+ $pc = Modulebuilder\Files\CreatePhpCode::getInstance();
+ $name = $module->getVar('mod_name');
+ $dirname = $module->getVar('mod_dirname');
+ //$version = $module->getVar('mod_version');
+ //$since = $module->getVar('mod_since');
+ //$minXoops = $module->getVar('mod_min_xoops');
+ $author = $module->getVar('mod_author');
+ //$credits = $module->getVar('mod_credits');
$authorMail = $module->getVar('mod_author_mail');
$authorWebsiteUrl = $module->getVar('mod_author_website_url');
$license = $module->getVar('mod_license');
- $subversion = $module->getVar('mod_subversion');
- $date = date('D Y-m-d H:i:s');
+ //$subversion = $module->getVar('mod_subversion');
+ //$date = date('D Y-m-d H:i:s');
if (null === $noPhpFile) {
- $ret = " 'module for xoops',
'' => '',
- '@copyright ' => ' 2020 XOOPS Project (https://xooops.org)',
- '@license ' => " {$license}",
- '@package ' => " {$dirname}",
- '@since ' => " {$since}",
- '@min_xoops ' => " {$minXoops}",
- '@author ' => " {$author} - Email:<{$authorMail}> - Website:<{$authorWebsiteUrl}>",
-// '@version ' => " \$Id: {$version} {$fileName} {$subversion} {$date}Z {$credits} \$",
+ '@copyright ' => date('Y') . ' XOOPS Project (https://xoops.org)',
+ '@license ' => $license,
+ '@package ' => $dirname,
+ //'@since ' => $since,
+ //'@min_xoops ' => $minXoops,
];
+ $authorLine = $author;
+ if ('' !== $authorMail) {
+ $authorLine .= ' - Email:' . $authorMail;
+ }
+ if ('' !== $authorWebsiteUrl) {
+ $authorLine .= ' - Website:' . $authorWebsiteUrl;
+ }
+ $copyright['@author '] = $authorLine;
+
$ret .= $pc->getPhpCodeCommentMultiLine($copyright);
return $ret;
@@ -519,7 +545,7 @@ public function getHeaderFilesComments($module, $noPhpFile = null, $namespace =
/**
* @public function renderFile
- * @param null
+ *
* @return string
*/
public function renderFile()
@@ -537,20 +563,21 @@ public function renderFile()
if ($this->xf->writable()) {
// Integration of the content in the file
if (!$this->xf->write($this->getContent(), $mode, true)) {
- $ret .= sprintf($notCreated, $fileName, $folderName);
+ $ret .= \sprintf($notCreated, $fileName, $folderName);
$GLOBALS['xoopsTpl']->assign('created', false);
- exit();
+
+ return $ret;
}
// Created
- $ret .= sprintf($created, $fileName, $folderName);
+ $ret .= \sprintf($created, $fileName, $folderName);
$GLOBALS['xoopsTpl']->assign('created', true);
$this->xf->close();
} else {
- $ret .= sprintf($notCreated, $fileName, $folderName);
+ $ret .= \sprintf($notCreated, $fileName, $folderName);
$GLOBALS['xoopsTpl']->assign('created', false);
}
} else {
- $ret .= sprintf($notCreated, $fileName, $folderName);
+ $ret .= \sprintf($notCreated, $fileName, $folderName);
$GLOBALS['xoopsTpl']->assign('created', false);
}
}
diff --git a/class/Files/CreateHtmlCode.php b/class/Files/CreateHtmlCode.php
index babeaa67..fb1a2b05 100644
--- a/class/Files/CreateHtmlCode.php
+++ b/class/Files/CreateHtmlCode.php
@@ -1,8 +1,8 @@
-{$n}";
} elseif ($noClosed) {
- $ret = "{$t}<{$tag}{$attr} />{$n}";
- } elseif ($multiLine) {
+ if ('img' === $tag) {
+ $ret = "{$t}<{$tag}{$attr} >{$n}";
+ } else {
+ $ret = "{$t}<{$tag}{$attr} />{$n}";
+ }
+ } elseif ($multiLine) {
$ret = "{$t}<{$tag}{$attr}>{$n}";
$ret .= "{$content}";
$ret .= "{$t}{$n}";
@@ -84,7 +86,7 @@ public function getHtmlTag($tag = '', $attributes = [], $content = '', $noClosed
* @param array $attributes
* @return string
*/
- private function getAttributes($attributes)
+ private function getAttributes(array $attributes)
{
$str = '';
foreach ($attributes as $name => $value) {
@@ -103,7 +105,7 @@ private function getAttributes($attributes)
* @param string $n
* @return string
*/
- public function getHtmlEmpty($empty = '', $t = '', $n = '')
+ public function getHtmlEmpty(string $empty = '', string $t = '', string $n = '')
{
return "{$t}{$empty}{$n}";
}
@@ -111,12 +113,13 @@ public function getHtmlEmpty($empty = '', $t = '', $n = '')
/**
* @public function getHtmlComment
* @param string $htmlComment
- * @param string $n
+ * @param string $t
+ * @param string $n
* @return string
*/
- public function getHtmlComment($htmlComment = '', $n = '')
+ public function getHtmlComment(string $htmlComment = '', string $t = '', string $n = '')
{
- return "{$n}";
+ return "{$t}{$n}";
}
/**
@@ -127,15 +130,10 @@ public function getHtmlComment($htmlComment = '', $n = '')
* @param string $n
* @return string
*/
- public function getHtmlBr($brNumb = 1, $htmlClass = '', $t = '', $n = "\n")
+ public function getHtmlBr(int $brNumb = 1, string $htmlClass = '', string $t = '', string $n = "\n")
{
$brClass = ('' != $htmlClass) ? " class='{$htmlClass}'" : '';
- $ret = '';
- for ($i = 0; $i < $brNumb; ++$i) {
- $ret .= "{$t}{$n}", $brNumb);
}
/**
@@ -147,12 +145,10 @@ public function getHtmlBr($brNumb = 1, $htmlClass = '', $t = '', $n = "\n")
* @param string $n
* @return string
*/
- public function getHtmlHNumb($content = '', $l = '1', $htmlHClass = '', $t = '', $n = "\n")
+ public function getHtmlHNumb(string $content = '', string $l = '1', string $htmlHClass = '', string $t = '', string $n = "\n")
{
$hClass = ('' != $htmlHClass) ? " class='{$htmlHClass}'" : '';
- $ret = "{$t}{$content}{$n}";
-
- return $ret;
+ return "{$t}{$content}{$n}";
}
/**
@@ -164,16 +160,16 @@ public function getHtmlHNumb($content = '', $l = '1', $htmlHClass = '', $t = '',
* @param bool $split
* @return string
*/
- public function getHtmlDiv($content = '', $divClass = '', $t = '', $n = "\n", $split = true)
+ public function getHtmlDiv(string $content = '', string $divClass = '', string $t = '', string $n = "\n", bool $split = true)
{
$rDivClass = ('' != $divClass) ? " class='{$divClass}'" : '';
if ($split) {
- $ret = "{$t}{$n}";
- $ret .= "{$content}";
- $ret .= "{$t}
{$n}";
+ $ret = "{$t}' . constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SEND_ERROR') . '
+ echo '
+
';
$form = $feedback->getFormFeedback();
$form->display();
diff --git a/admin/fields.php b/admin/fields.php
index eaf4e8f3..d6b56a17 100644
--- a/admin/fields.php
+++ b/admin/fields.php
@@ -1,4 +1,4 @@
-getConfig('tables_adminpager'));
- $GLOBALS['xoTheme']->addStylesheet('modules/tdmcreate/assets/css/admin/style.css');
+ $GLOBALS['xoTheme']->addStylesheet('modules/modulebuilder/assets/css/admin/style.css');
$GLOBALS['xoTheme']->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
- $GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/functions.js');
- $GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/sortable.js');
+ $GLOBALS['xoTheme']->addScript('modules/modulebuilder/assets/js/functions.js');
+ $GLOBALS['xoTheme']->addScript('modules/modulebuilder/assets/js/sortable.js');
$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('fields.php'));
- $adminObject->addItemButton(_AM_TDMCREATE_ADD_TABLE, 'tables.php?op=new', 'add');
+ $adminObject->addItemButton(\_AM_MODULEBUILDER_TABLES_ADD, 'tables.php?op=new');
$GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
$GLOBALS['xoopsTpl']->assign('modPathIcon16', TDMC_URL . '/' . $modPathIcon16);
// Redirect if there aren't modules
$modulesCount = $helper->getHandler('Modules')->getCountModules();
if (0 == $modulesCount) {
- redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES);
+ \redirect_header('modules.php?op=new', 2, \_AM_MODULEBUILDER_THEREARENT_MODULES2);
}
unset($modulesCount);
// Redirect if there aren't tables
$tablesCount = $helper->getHandler('Tables')->getCountTables();
if (0 == $tablesCount) {
- redirect_header('tables.php?op=new', 2, _AM_TDMCREATE_NOTTABLES);
+ \redirect_header('tables.php?op=new', 2, \_AM_MODULEBUILDER_THEREARENT_TABLES2);
}
// Get the list of tables
- $tablesAll = $helper->getHandler('Tables')->getAllTables($start, $limit, 'table_order');
+ $tablesAll = $helper->getHandler('Tables')->getAllTables($start, $limit);
if ($tablesCount > 0) {
$tlid = 1;
- foreach (array_keys($tablesAll) as $tid) {
+ foreach (\array_keys($tablesAll) as $tid) {
// Display tables list
$table = $tablesAll[$tid]->getValuesTables();
$talid = ['lid' => $tlid];
$table = array_merge($table, $talid);
// Get the list of fields
$fieldsCount = $helper->getHandler('Fields')->getCountFields();
- $fieldsAll = $helper->getHandler('Fields')->getAllFieldsByModuleAndTableId($table['mid'], $tid);
+ $fieldsAll = $helper->getHandler('Fields')->getAllFieldsByTableId($tid);
// Display fields list
$fields = [];
$lid = 1;
if ($fieldsCount > 0) {
- foreach (array_keys($fieldsAll) as $fid) {
+ foreach (\array_keys($fieldsAll) as $fid) {
$field = $fieldsAll[$fid]->getValuesFields();
$falid = ['lid' => $lid];
$fields[] = array_merge($field, $falid);
@@ -100,21 +100,21 @@
unset($tlid);
unset($fields);
if ($tablesCount > $limit) {
- include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+ require_once \XOOPS_ROOT_PATH . '/class/pagenav.php';
$pagenav = new \XoopsPageNav($tablesCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
- $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
+ $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
}
} else {
- $GLOBALS['xoopsTpl']->assign('error', _AM_TDMCREATE_THEREARENT_FIELDS);
+ $GLOBALS['xoopsTpl']->assign('error', \_AM_MODULEBUILDER_THEREARENT_FIELDS);
}
break;
case 'new':
- $GLOBALS['xoTheme']->addStylesheet('modules/tdmcreate/assets/css/admin/style.css');
+ $GLOBALS['xoTheme']->addStylesheet('modules/modulebuilder/assets/css/admin/style.css');
$GLOBALS['xoTheme']->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
- $GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/functions.js');
+ $GLOBALS['xoTheme']->addScript('modules/modulebuilder/assets/js/functions.js');
$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('fields.php'));
- $adminObject->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php', 'list');
- $adminObject->addItemButton(_AM_TDMCREATE_FIELDS_LIST, 'fields.php', 'list');
+ $adminObject->addItemButton(\_AM_MODULEBUILDER_TABLES_LIST, 'tables.php', 'list');
+ $adminObject->addItemButton(\_AM_MODULEBUILDER_FIELDS_LIST, 'fields.php', 'list');
$GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
// Form Add
$fieldsObj = $helper->getHandler('Fields')->create();
@@ -123,7 +123,7 @@
break;
case 'save':
if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header('fields.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ \redirect_header('fields.php', 3, \implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
$fieldId = \Xmf\Request::getInt('field_id');
// Fields Handler
@@ -154,6 +154,9 @@
$fieldsObj->setVar('field_inlist', (1 == $_REQUEST['field_inlist'][$key]) ? 1 : 0);
$fieldsObj->setVar('field_inform', (1 == $_REQUEST['field_inform'][$key]) ? 1 : 0);
$fieldsObj->setVar('field_user', (1 == $_REQUEST['field_user'][$key]) ? 1 : 0);
+ $fieldsObj->setVar('field_ihead', (1 == $_REQUEST['field_ihead'][$key]) ? 1 : 0);
+ $fieldsObj->setVar('field_ibody', (1 == $_REQUEST['field_ibody'][$key]) ? 1 : 0);
+ $fieldsObj->setVar('field_ifoot', (1 == $_REQUEST['field_ifoot'][$key]) ? 1 : 0);
$fieldsObj->setVar('field_thead', (1 == $_REQUEST['field_thead'][$key]) ? 1 : 0);
$fieldsObj->setVar('field_tbody', (1 == $_REQUEST['field_tbody'][$key]) ? 1 : 0);
$fieldsObj->setVar('field_tfoot', (1 == $_REQUEST['field_tfoot'][$key]) ? 1 : 0);
@@ -172,10 +175,10 @@
// Set field elements
if ($fieldsObj->isNew()) {
// Redirect to field.php if saved
- redirect_header('fields.php', 2, sprintf(_AM_TDMCREATE_FIELDS_FORM_SAVED_OK, $tableName));
+ \redirect_header('fields.php', 2, \sprintf(\_AM_MODULEBUILDER_FIELDS_FORM_SAVED_OK, $tableName));
} else {
// Redirect to field.php if updated - (Needed code from table name by field_tid)
- redirect_header('fields.php', 2, sprintf(_AM_TDMCREATE_FIELDS_FORM_UPDATED_OK, $tableName));
+ \redirect_header('fields.php', 2, \sprintf(\_AM_MODULEBUILDER_FIELDS_FORM_UPDATED_OK, $tableName));
}
$GLOBALS['xoopsTpl']->assign('error', $fieldsObj->getHtmlErrors());
@@ -183,13 +186,13 @@
$GLOBALS['xoopsTpl']->assign('form', $form->render());
break;
case 'edit':
- $GLOBALS['xoTheme']->addStylesheet('modules/tdmcreate/assets/css/admin/style.css');
+ $GLOBALS['xoTheme']->addStylesheet('modules/modulebuilder/assets/css/admin/style.css');
$GLOBALS['xoTheme']->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
- $GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/functions.js');
+ $GLOBALS['xoTheme']->addScript('modules/modulebuilder/assets/js/functions.js');
$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('fields.php'));
- $adminObject->addItemButton(_AM_TDMCREATE_ADD_TABLE, 'tables.php?op=new', 'add');
- $adminObject->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php', 'list');
- $adminObject->addItemButton(_AM_TDMCREATE_FIELDS_LIST, 'fields.php', 'list');
+ $adminObject->addItemButton(\_AM_MODULEBUILDER_TABLES_ADD, 'tables.php?op=new');
+ $adminObject->addItemButton(\_AM_MODULEBUILDER_TABLES_LIST, 'tables.php', 'list');
+ $adminObject->addItemButton(\_AM_MODULEBUILDER_FIELDS_LIST, 'fields.php', 'list');
$GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
// Form Edit
$fieldId = \Xmf\Request::getInt('field_id');
@@ -198,39 +201,34 @@
$GLOBALS['xoopsTpl']->assign('form', $form->render());
break;
case 'order':
+ $error = false;
// Initialize fields handler
- $fieldsObj = $helper->getHandler('Fields');
+ $fieldsHandler = $helper->getHandler('Fields');
if (isset($_POST['forder'])) {
$i = 0;
foreach ($_POST['forder'] as $order) {
if ($order > 0) {
- $fieldOrder = $fieldsObj->get($order);
- $fieldOrder->setVar('field_order', $i);
- if (!$fieldsObj->insert($fieldOrder)) {
+ $fieldsObj = $fieldsHandler->get((int)$order);
+ if ($fieldsObj instanceof \XoopsObject) {
+ $fieldsObj->setVar('field_order', $i);
+ if (!$fieldsHandler->insert($fieldsObj)) {
+ $error = true;
+ }
+ } else {
$error = true;
+ continue;
}
++$i;
}
}
- redirect_header('fields.php', 5, _AM_TDMCREATE_FIELD_ORDER_ERROR);
+ if ($error) {
+ \redirect_header('fields.php', 5, \_AM_MODULEBUILDER_FIELD_ORDER_ERROR);
+ }
unset($i);
}
exit;
- break;
case 'delete':
- $tablesObj = $helper->getHandler('Tables')->get($fieldTid);
- if (isset($_REQUEST['ok']) && 1 == $_REQUEST['ok']) {
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header('fields.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
- }
- if ($helper->getHandler('Tables')->delete($tablesObj)) {
- redirect_header('fields.php', 3, _AM_TDMCREATE_FORMDELOK);
- } else {
- echo $tablesObj->getHtmlErrors();
- }
- } else {
- xoops_confirm(['ok' => 1, 'field_tid' => $fieldTid, 'op' => 'delete'], \Xmf\Request::getString('REQUEST_URI', '', 'SERVER'), sprintf(_AM_TDMCREATE_FORMSUREDEL, $tablesObj->getVar('table_name')));
- }
+ //delete is not needed as deletion is done by deleting whole table
break;
case 'display':
$fieldsArray = ['parent', 'inlist', 'inform', 'admin', 'user', 'block', 'main', 'search', 'required'];
@@ -244,10 +242,10 @@
}
}
if ($helper->getHandler('Fields')->insert($fieldsObj)) {
- redirect_header('fields.php', 3, _AM_TDMCREATE_TOGGLE_SUCCESS);
+ \redirect_header('fields.php', 3, \_AM_MODULEBUILDER_TOGGLE_SUCCESS);
}
$GLOBALS['xoopsTpl']->assign('error', $fieldsObj->getHtmlErrors());
}
break;
}
-include __DIR__ . '/footer.php';
+require __DIR__ . '/footer.php';
diff --git a/admin/footer.php b/admin/footer.php
index 8bd0b22d..2e0e4289 100644
--- a/admin/footer.php
+++ b/admin/footer.php
@@ -1,4 +1,4 @@
-display("db:{$templateMain}");
diff --git a/admin/header.php b/admin/header.php
index 3f2bc7e7..94043ee4 100644
--- a/admin/header.php
+++ b/admin/header.php
@@ -1,4 +1,4 @@
-getVar('dirname');
// Link System Icons
@@ -34,14 +34,13 @@
$modPathIcon32 = $GLOBALS['xoopsModule']->getInfo('modicons32');
//$pathModuleAdmin = $GLOBALS['xoopsModule']->getInfo('dirmoduleadmin');
-/** @var \XoopsModules\Tdmcreate\Helper $helper */
-$helper = \XoopsModules\Tdmcreate\Helper::getInstance();
-$utility = new \XoopsModules\Tdmcreate\Utility();
+$helper = \XoopsModules\Modulebuilder\Helper::getInstance();
+$utility = new \XoopsModules\Modulebuilder\Utility();
// MyTextSanitizer
$myts = MyTextSanitizer::getInstance();
-if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
- include_once XOOPS_ROOT_PATH . '/class/template.php';
+if (!isset($xoopsTpl) || !\is_object($xoopsTpl)) {
+ require_once \XOOPS_ROOT_PATH . '/class/template.php';
$xoopsTpl = new \XoopsTpl();
}
// System Icons
diff --git a/admin/import_module.php b/admin/import_module.php
new file mode 100644
index 00000000..82c66b41
--- /dev/null
+++ b/admin/import_module.php
@@ -0,0 +1,77 @@
+displayNavigation('modules.php');
+$adminObject->addItemButton(_MI_MODULEBUILDER_ADMIN_MODULES, 'modules.php', 'list');
+$adminObject->displayButton('left');
+
+require XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+
+$formImportModule = new \XoopsThemeForm('modules_import', 'Class', 'modules.php?op=modules_import', 'post', true);
+$select_module = new \XoopsFormSelect(_AM_MODULEBUILDER_MODULE_ID, 'moduleName', '');
+$newModuleName = new \XoopsFormText(_AM_MODULEBUILDER_MODULE_NEW_NAME, 'moduleNewName', 50, 50, '');
+/** @var \XoopsModuleHandler $moduleHandler */
+$moduleHandler = xoops_getHandler('module');
+$installed_mods = $moduleHandler->getObjects();
+$listed_mods = [];
+$count = 0;
+foreach ($installed_mods as $module) {
+ $select_module->addOption($module->getVar('dirname', 'E'), $module->getVar('dirname', 'E'));
+}
+$select_table = new \XoopsFormSelect(_AM_MODULEBUILDER_TABLE_ID, 'table_id', '');
+
+$sql = 'SHOW TABLES';
+$result = $GLOBALS['xoopsDB']->queryF($sql);
+
+if (!$result instanceof \mysqli_result) {
+ // echo '_AM_MODULEBUILDER_ERROR_DATABASE';
+ // echo '_AM_MODULEBUILDER_ERROR_SQL' . $GLOBALS['xoopsDB']->error();
+ \trigger_error($GLOBALS['xoopsDB']->error());
+}
+
+while (false !== ($row = $GLOBALS['xoopsDB']->fetchRow($result))) {
+ $select_table->addOption($row[0], $row[0]);
+}
+//TODO: add an option to set a name of the new module created by importing the old one
+$formImportModule->addElement($select_module);
+$formImportModule->addElement($newModuleName);
+$op_hidden = new \XoopsFormHidden('op', 'modules_import');
+$formImportModule->addElement($op_hidden);
+$dbname_hidden = new \XoopsFormHidden('dbname', '');
+$formImportModule->addElement($dbname_hidden);
+
+//Submit buttons
+$buttonTray = new \XoopsFormElementTray('', '');
+$submit_button = new \XoopsFormButton('', '', _AM_MODULEBUILDER_GENERATE, 'submit');
+$buttonTray->addElement($submit_button);
+
+$cancel_button = new \XoopsFormButton('', '', _CANCEL, 'button');
+$cancel_button->setExtra('onclick="history.go(-1)"');
+$buttonTray->addElement($cancel_button);
+
+$formImportModule->addElement($buttonTray);
+
+$GLOBALS['xoopsTpl']->assign('form', $formImportModule->render());
+
+require __DIR__ . '/footer.php';
diff --git a/admin/index.html b/admin/index.html
deleted file mode 100644
index 74b6f45c..00000000
--- a/admin/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/admin/index.php b/admin/index.php
index 79976ec8..13c16d96 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -1,4 +1,4 @@
-getHandler('Settings')->getCount();
$countModules = $helper->getHandler('Modules')->getCount();
$countTables = $helper->getHandler('Tables')->getCount();
@@ -31,13 +42,13 @@
$countFiles = $helper->getHandler('Morefiles')->getCount();
unset($criteria);
-//$templateMain = 'tdmcreate_index.tpl';
-$adminObject->addInfoBox(_AM_TDMCREATE_ADMIN_NUMMODULES);
-$adminObject->addInfoBoxLine(sprintf('', $countSettings), 'Blue');
-$adminObject->addInfoBoxLine(sprintf('', $countModules), 'Green');
-$adminObject->addInfoBoxLine(sprintf('', $countTables), 'Orange');
-$adminObject->addInfoBoxLine(sprintf('', $countFields), 'Gray');
-$adminObject->addInfoBoxLine(sprintf('', $countFiles), 'Red');
+//$templateMain = 'modulebuilder_index.tpl';
+$adminObject->addInfoBox(\_AM_MODULEBUILDER_ADMIN_NUMMODULES);
+$adminObject->addInfoBoxLine(\sprintf('', $countSettings), 'Blue');
+$adminObject->addInfoBoxLine(\sprintf('', $countModules), 'Green');
+$adminObject->addInfoBoxLine(\sprintf('', $countTables), 'Orange');
+$adminObject->addInfoBoxLine(\sprintf('', $countFields), 'Gray');
+$adminObject->addInfoBoxLine(\sprintf('', $countFiles), 'Red');
// Upload Folders
$folder = [
TDMC_UPLOAD_PATH,
@@ -46,89 +57,35 @@
TDMC_UPLOAD_IMGTAB_PATH,
];
-// Uploads Folders Created
-foreach (array_keys($folder) as $i) {
- $adminObject->addConfigBoxLine($folder[$i], 'folder');
- $adminObject->addConfigBoxLine([$folder[$i], '777'], 'chmod');
-}
+//------ check Upload Folders ---------------
+$adminObject->addConfigBoxLine();
+$redirectFile = $_SERVER['SCRIPT_NAME'];
-$adminObject->displayNavigation(basename(__FILE__));
+foreach (\array_keys($folder) as $i) {
+ $adminObject->addConfigBoxLine(Common\DirectoryChecker::getDirectoryStatus($folder[$i], 0777, $redirectFile));
+}
-//------------- Test Data ----------------------------
+$adminObject->displayNavigation(\basename(__FILE__));
+//------------- Test Data Buttons ----------------------------
if ($helper->getConfig('displaySampleButton')) {
- $yamlFile = dirname(__DIR__) . '/config/admin.yml';
- $config = loadAdminConfig($yamlFile);
- $displaySampleButton = $config['displaySampleButton'];
-
- if (1 == $displaySampleButton) {
- xoops_loadLanguage('admin/modulesadmin', 'system');
- require __DIR__ . '/../testdata/index.php';
-
- $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'ADD_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=load', 'add');
- $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=save', 'add');
- // $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA'), '__DIR__ . /../../testdata/index.php?op=exportschema', 'add');
- $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'HIDE_SAMPLEDATA_BUTTONS'), '?op=hide_buttons', 'delete');
- } else {
- $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLEDATA_BUTTONS'), '?op=show_buttons', 'add');
- $displaySampleButton = $config['displaySampleButton'];
- }
+ TestdataButtons::loadButtonConfig($adminObject);
$adminObject->displayButton('left', '');
}
-
-//------------- End Test Data ----------------------------
-
-$adminObject->displayIndex();
-
-/**
- * @param $yamlFile
- * @return array|bool
- */
-function loadAdminConfig($yamlFile)
-{
- $config = \Xmf\Yaml::readWrapped($yamlFile); // work with phpmyadmin YAML dumps
- return $config;
-}
-
-/**
- * @param $yamlFile
- */
-function hideButtons($yamlFile)
-{
- $app['displaySampleButton'] = 0;
- \Xmf\Yaml::save($app, $yamlFile);
- redirect_header('index.php', 0, '');
-}
-
-/**
- * @param $yamlFile
- */
-function showButtons($yamlFile)
-{
- $app['displaySampleButton'] = 1;
- \Xmf\Yaml::save($app, $yamlFile);
- redirect_header('index.php', 0, '');
-}
-
-$op = \Xmf\Request::getString('op', 0, 'GET');
-
+$op = Request::getString('op', 0, 'GET');
switch ($op) {
case 'hide_buttons':
- hideButtons($yamlFile);
+ TestdataButtons::hideButtons();
break;
case 'show_buttons':
- showButtons($yamlFile);
+ TestdataButtons::showButtons();
break;
}
+//------------- End Test Data Buttons ----------------------------
+$adminObject->displayIndex();
echo $utility::getServerStats();
-
-
-
-
-//$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('index.php'));
-//$GLOBALS['xoopsTpl']->assign('index', $adminObject->displayIndex());
-
-include __DIR__ . '/footer.php';
+//codeDump(__FILE__);
+require __DIR__ . '/footer.php';
diff --git a/admin/logo.php b/admin/logo.php
index 9cb82bed..869f6e10 100644
--- a/admin/logo.php
+++ b/admin/logo.php
@@ -1,6 +1,6 @@
-
- *
*/
-include __DIR__ . '/header.php';
+require __DIR__ . '/header.php';
$funct = \Xmf\Request::getString('funct', '', 'GET');
$iconName = \Xmf\Request::getString('iconName', '', 'GET');
$caption = \Xmf\Request::getString('caption', '', 'GET');
-if (function_exists($funct)) {
- $ret = Tdmcreate\Logo::getInstance()->createLogo($iconName, $caption);
- phpFunction($ret);
+if (\function_exists($funct)) {
+ $ret = Modulebuilder\Logo::getInstance()->createLogo($iconName, $caption);
+ if (false !== $ret) {
+ phpFunction($ret);
+ }
} else {
- redirect_header('logo.php', 3, 'Method Not Exist');
+ \redirect_header('logo.php', 3, 'Method Not Exist');
}
// phpFunction
/**
* @param string $val
*/
-function phpFunction($val = '')
+function phpFunction(string $val = ''): void
{
// create php function here
echo $val;
diff --git a/admin/menu.php b/admin/menu.php
index ce75c3d7..11f358be 100644
--- a/admin/menu.php
+++ b/admin/menu.php
@@ -1,4 +1,4 @@
-loadLanguage('common');
$helper->loadLanguage('feedback');
$pathIcon32 = \Xmf\Module\Admin::menuIconPath('');
-if (is_object($helper->getModule())) {
+//if (\is_object($helper->getModule())) {
// $pathModIcon32 = $helper->url($helper->getModule()->getInfo('modicons32'));
-}
+//}
-$moduleHandler = xoops_getHandler('module');
+$moduleHandler = \xoops_getHandler('module');
$xoopsModule = \XoopsModule::getByDirname($moduleDirName);
$moduleInfo = $moduleHandler->get($xoopsModule->getVar('mid'));
$sysPathIcon32 = $moduleInfo->getInfo('sysicons32');
$modPathIcon32 = $moduleInfo->getInfo('modicons32');
$adminmenu[] = [
- 'title' => _MI_TDMCREATE_ADMENU1,
+ 'title' => \_MI_MODULEBUILDER_ADMENU1,
'link' => 'admin/index.php',
'icon' => $pathIcon32 . '/dashboard.png',
];
$adminmenu[] = [
- 'title' => _MI_TDMCREATE_ADMENU2,
+ 'title' => \_MI_MODULEBUILDER_ADMENU2,
'link' => 'admin/settings.php',
'icon' => $modPathIcon32 . '/settings.png',
];
$adminmenu[] = [
- 'title' => _MI_TDMCREATE_ADMENU3,
+ 'title' => \_MI_MODULEBUILDER_ADMENU3,
'link' => 'admin/modules.php',
'icon' => $modPathIcon32 . '/addmodule.png',
];
$adminmenu[] = [
- 'title' => _MI_TDMCREATE_ADMENU4,
+ 'title' => \_MI_MODULEBUILDER_ADMENU4,
'link' => 'admin/tables.php',
'icon' => $modPathIcon32 . '/addtable.png',
];
$adminmenu[] = [
- 'title' => _MI_TDMCREATE_ADMENU5,
+ 'title' => \_MI_MODULEBUILDER_ADMENU5,
'link' => 'admin/fields.php',
'icon' => $modPathIcon32 . '/fields.png',
];
$adminmenu[] = [
- 'title' => _MI_TDMCREATE_ADMENU6,
+ 'title' => \_MI_MODULEBUILDER_ADMENU6,
'link' => 'admin/morefiles.php',
'icon' => $modPathIcon32 . '/files.png',
];
$adminmenu[] = [
- 'title' => _MI_TDMCREATE_ADMENU7,
+ 'title' => \_MI_MODULEBUILDER_ADMENU7,
'link' => 'admin/building.php',
'icon' => $modPathIcon32 . '/builder.png',
];
+$adminmenu[] = [
+ 'title' => \_MI_MODULEBUILDER_ADMENU8,
+ 'link' => 'admin/devtools.php',
+ 'icon' => $modPathIcon32 . '/devtools.png',
+];
+
//Feedback
$adminmenu[] = [
- 'title' => constant('CO_' . $moduleDirNameUpper . '_' . 'ADMENU_FEEDBACK'),
+ 'title' => \constant('CO_' . $moduleDirNameUpper . '_' . 'ADMENU_FEEDBACK'),
'link' => 'admin/feedback.php',
'icon' => $pathIcon32 . 'mail_foward.png',
];
-if (is_object($helper->getModule()) && $helper->getConfig('displayDeveloperTools')) {
+if (\is_object($helper->getModule()) && $helper->getConfig('displayDeveloperTools')) {
$adminmenu[] = [
- 'title' => constant('CO_' . $moduleDirNameUpper . '_' . 'ADMENU_MIGRATE'),
+ 'title' => \constant('CO_' . $moduleDirNameUpper . '_' . 'ADMENU_MIGRATE'),
'link' => 'admin/migrate.php',
'icon' => $pathIcon32 . 'database_go.png',
];
}
$adminmenu[] = [
- 'title' => _MI_TDMCREATE_ABOUT,
+ 'title' => \_MI_MODULEBUILDER_ABOUT,
'link' => 'admin/about.php',
'icon' => $pathIcon32 . 'about.png',
];
diff --git a/admin/migrate.php b/admin/migrate.php
index aa2fad7a..6c690352 100644
--- a/admin/migrate.php
+++ b/admin/migrate.php
@@ -1,71 +1,58 @@
- //
-// ------------------------------------------------------------------------ //
-// This program is free software; you can redistribute it and/or modify //
-// it under the terms of the GNU General Public License as published by //
-// the Free Software Foundation; either version 2 of the License, or //
-// (at your option) any later version. //
-// //
-// 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. See the //
-// GNU General Public License for more details. //
-// //
-// You should have received a copy of the GNU General Public License //
-// along with this program; if not, write to the Free Software //
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
-// ------------------------------------------------------------------------ //
-// Author: Kazumi Ono (AKA onokazu) //
-// URL: http://www.myweb.ne.jp/, https://xoops.org/, http://jp.xoops.org/ //
-// Project: XOOPS Project //
-// ------------------------------------------------------------------------- //
+
+ * @author Michael Beck ' . \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SEND_ERROR') . '
-
-
-
-
-
-
-
-
-
-EOF;
+
+ EOF;
//XoopsLoad::load('migrate', 'newbb');
-/** @var Tdmcreate\Common\Configurator $configurator */
-$configurator = new Tdmcreate\Common\Configurator();
+$configurator = new Modulebuilder\Common\Configurator();
-/** @var \XoopsModules\Tdmcreate\Common\Migrate $migrator */
-$migrator = new \XoopsModules\Tdmcreate\Common\Migrate($configurator);
+$migrator = new \XoopsModules\Modulebuilder\Common\Migrate($configurator);
-$op = Request::getCmd('op', 'default');
-$opShow = Request::getCmd('show', null, 'POST');
+$op = Request::getCmd('op', 'default');
+$opShow = Request::getCmd('show', null, 'POST');
$opMigrate = Request::getCmd('migrate', null, 'POST');
-$opSchema = Request::getCmd('schema', null, 'POST');
-$op = !empty($opShow) ? 'show' : $op;
-$op = !empty($opMigrate) ? 'migrate' : $op;
-$op = !empty($opSchema) ? 'schema' : $op;
+$opSchema = Request::getCmd('schema', null, 'POST');
+$op = !empty($opShow) ? 'show' : $op;
+$op = !empty($opMigrate) ? 'migrate' : $op;
+$op = !empty($opSchema) ? 'schema' : $op;
$message = '';
diff --git a/admin/modules.php b/admin/modules.php
index e4144805..709f30a5 100644
--- a/admin/modules.php
+++ b/admin/modules.php
@@ -1,4 +1,4 @@
-
- *
*/
+use Xmf\Request;
+use XoopsModules\Modulebuilder\{
+ Helper,
+ Import
+};
+
+/** @var Helper $helper */
+/** @var Admin $adminObject */
+
// Define main template
-$templateMain = 'tdmcreate_modules.tpl';
+$templateMain = 'modulebuilder_modules.tpl';
-include __DIR__ . '/header.php';
+require __DIR__ . '/header.php';
// Recovered value of argument op in the URL $
-$op = \Xmf\Request::getString('op', 'list');
-$modId = \Xmf\Request::getInt('mod_id');
+$op = Request::getString('op', 'list');
+$modId = Request::getInt('mod_id');
switch ($op) {
case 'list':
default:
- $start = \Xmf\Request::getInt('start', 0);
- $limit = \Xmf\Request::getInt('limit', $helper->getConfig('modules_adminpager'));
- $GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/functions.js');
- $GLOBALS['xoTheme']->addStylesheet('modules/tdmcreate/assets/css/admin/style.css');
+ $start = Request::getInt('start');
+ $limit = Request::getInt('limit', $helper->getConfig('modules_adminpager'));
+ $GLOBALS['xoTheme']->addScript('modules/modulebuilder/assets/js/functions.js');
+ $GLOBALS['xoTheme']->addStylesheet('modules/modulebuilder/assets/css/admin/style.css');
$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('modules.php'));
- $adminObject->addItemButton(_AM_TDMCREATE_ADD_MODULE, 'modules.php?op=new', 'add');
+ $adminObject->addItemButton(\_AM_MODULEBUILDER_MODULES_ADD, 'modules.php?op=new');
+
+ $adminObject->addItemButton(_AM_MODULEBUILDER_MODULES_IMPORT, 'import_module.php', 'compfile');
+
$GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
$GLOBALS['xoopsTpl']->assign('tdmc_url', TDMC_URL);
$GLOBALS['xoopsTpl']->assign('tdmc_upload_imgmod_url', TDMC_UPLOAD_IMGMOD_URL);
@@ -47,71 +58,86 @@
$modulesAll = $helper->getHandler('Modules')->getAllModules($start, $limit);
// Redirect if there aren't modules
if (0 == $modulesCount) {
- redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES);
+ \redirect_header('modules.php?op=new', 2, \_AM_MODULEBUILDER_THEREARENT_MODULES2);
}
// Display modules list
if ($modulesCount > 0) {
- foreach (array_keys($modulesAll) as $i) {
+ foreach (\array_keys($modulesAll) as $i) {
$module = $modulesAll[$i]->getValuesModules();
$GLOBALS['xoopsTpl']->append('modules_list', $module);
unset($module);
}
if ($modulesCount > $limit) {
- include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+ require_once \XOOPS_ROOT_PATH . '/class/pagenav.php';
$pagenav = new \XoopsPageNav($modulesCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
- $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
+ $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
}
} else {
- $GLOBALS['xoopsTpl']->assign('error', _AM_TDMCREATE_THEREARENT_MODULES);
+ $GLOBALS['xoopsTpl']->assign('error', \_AM_MODULEBUILDER_THEREARENT_MODULES);
}
break;
case 'new':
- $GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/functions.js');
+ $GLOBALS['xoTheme']->addScript('modules/modulebuilder/assets/js/functions.js');
$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('modules.php'));
- $adminObject->addItemButton(_AM_TDMCREATE_MODULES_LIST, 'modules.php', 'list');
+ $adminObject->addItemButton(\_AM_MODULEBUILDER_MODULES_LIST, 'modules.php', 'list');
$GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
+ $settings = $helper->getHandler('Settings')->getActiveSetting();
+ if (0 == \count($settings)) {
+ \redirect_header('settings.php', 5, \_AM_MODULEBUILDER_MODULE_NOACTSET);
+ }
$modulesObj = $helper->getHandler('Modules')->create();
$form = $modulesObj->getFormModules();
$GLOBALS['xoopsTpl']->assign('form', $form->render());
break;
+ case 'modules_import':
+ $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('modules.php'));
+ $adminObject->addItemButton(\_AM_MODULEBUILDER_MODULES_LIST, 'modules.php', 'list');
+ $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
+ $result = Import::importModule();
+ if (false === $result['result']) {
+ $GLOBALS['xoopsTpl']->assign('error', $result['error']);
+ } else {
+ $GLOBALS['xoopsTpl']->assign('tables_list', $result['tables']);
+ }
+ break;
case 'save':
if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header('modules.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ \redirect_header('modules.php', 3, \implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
if (isset($modId)) {
$modulesObj = $helper->getHandler('Modules')->get($modId);
} else {
$modulesObj = $helper->getHandler('Modules')->create();
}
- $moduleDirname = preg_replace('/[^a-zA-Z0-9]\s+/', '', mb_strtolower(\Xmf\Request::getString('mod_dirname', '', 'POST')));
+ $moduleDirname = \preg_replace('/[^a-zA-Z0-9]\s+/', '', \mb_strtolower(Request::getString('mod_dirname', '', 'POST')));
//Form module save
$modulesObj->setVars(
[
- 'mod_name' => \Xmf\Request::getString('mod_name', '', 'POST'),
+ 'mod_name' => Request::getString('mod_name', '', 'POST'),
'mod_dirname' => $moduleDirname,
- 'mod_version' => \Xmf\Request::getString('mod_version', '', 'POST'),
- 'mod_since' => \Xmf\Request::getString('mod_since', '', 'POST'),
- 'mod_min_php' => \Xmf\Request::getString('mod_min_php', '', 'POST'),
- 'mod_min_xoops' => \Xmf\Request::getString('mod_min_xoops', '', 'POST'),
- 'mod_min_admin' => \Xmf\Request::getString('mod_min_admin', '', 'POST'),
- 'mod_min_mysql' => \Xmf\Request::getString('mod_min_mysql', '', 'POST'),
- 'mod_description' => \Xmf\Request::getString('mod_description', '', 'POST'),
- 'mod_author' => \Xmf\Request::getString('mod_author', '', 'POST'),
- 'mod_author_mail' => \Xmf\Request::getString('mod_author_mail', '', 'POST'),
- 'mod_author_website_url' => \Xmf\Request::getString('mod_author_website_url', '', 'POST'),
- 'mod_author_website_name' => \Xmf\Request::getString('mod_author_website_name', '', 'POST'),
- 'mod_credits' => \Xmf\Request::getString('mod_credits', '', 'POST'),
- 'mod_license' => \Xmf\Request::getString('mod_license', '', 'POST'),
- 'mod_release_info' => \Xmf\Request::getString('mod_release_info', '', 'POST'),
- 'mod_release_file' => \Xmf\Request::getString('mod_release_file', '', 'POST'),
- 'mod_manual' => \Xmf\Request::getString('mod_manual', '', 'POST'),
- 'mod_manual_file' => \Xmf\Request::getString('mod_manual_file', '', 'POST'),
+ 'mod_version' => Request::getString('mod_version', '', 'POST'),
+ 'mod_since' => Request::getString('mod_since', '', 'POST'),
+ 'mod_min_php' => Request::getString('mod_min_php', '', 'POST'),
+ 'mod_min_xoops' => Request::getString('mod_min_xoops', '', 'POST'),
+ 'mod_min_admin' => Request::getString('mod_min_admin', '', 'POST'),
+ 'mod_min_mysql' => Request::getString('mod_min_mysql', '', 'POST'),
+ 'mod_description' => Request::getString('mod_description', '', 'POST'),
+ 'mod_author' => Request::getString('mod_author', '', 'POST'),
+ 'mod_author_mail' => Request::getString('mod_author_mail', '', 'POST'),
+ 'mod_author_website_url' => Request::getString('mod_author_website_url', '', 'POST'),
+ 'mod_author_website_name' => Request::getString('mod_author_website_name', '', 'POST'),
+ 'mod_credits' => Request::getString('mod_credits', '', 'POST'),
+ 'mod_license' => Request::getString('mod_license', '', 'POST'),
+ 'mod_release_info' => Request::getString('mod_release_info', '', 'POST'),
+ 'mod_release_file' => Request::getString('mod_release_file', '', 'POST'),
+ 'mod_manual' => Request::getString('mod_manual', '', 'POST'),
+ 'mod_manual_file' => Request::getString('mod_manual_file', '', 'POST'),
]
);
//Form mod_image
- include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+ require_once \XOOPS_ROOT_PATH . '/class/uploader.php';
$uploader = new \XoopsMediaUploader(
TDMC_UPLOAD_IMGMOD_PATH, $helper->getConfig('mimetypes_image'), $helper->getConfig('maxsize_image'), null, null
);
@@ -119,43 +145,43 @@
$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
if (!$uploader->upload()) {
$errors = &$uploader->getErrors();
- redirect_header('javascript:history.go(-1)', 3, $errors);
+ \redirect_header('javascript:history.go(-1)', 3, $errors);
} else {
$modulesObj->setVar('mod_image', $uploader->getSavedFileName());
}
} else {
- $modulesObj->setVar('mod_image', \Xmf\Request::getString('mod_image', '', 'POST'));
+ $modulesObj->setVar('mod_image', Request::getString('mod_image', '', 'POST'));
}
//Form module save
$modulesObj->setVars(
[
- 'mod_demo_site_url' => \Xmf\Request::getString('mod_demo_site_url', '', 'POST'),
- 'mod_demo_site_name' => \Xmf\Request::getString('mod_demo_site_name', '', 'POST'),
- 'mod_support_url' => \Xmf\Request::getString('mod_support_url', '', 'POST'),
- 'mod_support_name' => \Xmf\Request::getString('mod_support_name', '', 'POST'),
- 'mod_website_url' => \Xmf\Request::getString('mod_website_url', '', 'POST'),
- 'mod_website_name' => \Xmf\Request::getString('mod_website_name', '', 'POST'),
- 'mod_release' => \Xmf\Request::getString('mod_release', '', 'POST'),
- 'mod_status' => \Xmf\Request::getString('mod_status', '', 'POST'),
- 'mod_donations' => \Xmf\Request::getString('mod_donations', '', 'POST'),
- 'mod_subversion' => \Xmf\Request::getString('mod_subversion', '', 'POST'),
+ 'mod_demo_site_url' => Request::getString('mod_demo_site_url', '', 'POST'),
+ 'mod_demo_site_name' => Request::getString('mod_demo_site_name', '', 'POST'),
+ 'mod_support_url' => Request::getString('mod_support_url', '', 'POST'),
+ 'mod_support_name' => Request::getString('mod_support_name', '', 'POST'),
+ 'mod_website_url' => Request::getString('mod_website_url', '', 'POST'),
+ 'mod_website_name' => Request::getString('mod_website_name', '', 'POST'),
+ 'mod_release' => Request::getString('mod_release', '', 'POST'),
+ 'mod_status' => Request::getString('mod_status', '', 'POST'),
+ 'mod_donations' => Request::getString('mod_donations', '', 'POST'),
+ 'mod_subversion' => Request::getString('mod_subversion', '', 'POST'),
]
);
- $moduleOption = \Xmf\Request::getArray('module_option', []);
- $modulesObj->setVar('mod_admin', in_array('admin', $moduleOption));
- $modulesObj->setVar('mod_user', in_array('user', $moduleOption));
- $modulesObj->setVar('mod_blocks', in_array('blocks', $moduleOption));
- $modulesObj->setVar('mod_search', in_array('search', $moduleOption));
- $modulesObj->setVar('mod_comments', in_array('comments', $moduleOption));
- $modulesObj->setVar('mod_notifications', in_array('notifications', $moduleOption));
- $modulesObj->setVar('mod_permissions', in_array('permissions', $moduleOption));
- //$modulesObj->setVar('mod_inroot_copy', in_array('inroot_copy', $moduleOption));
+ $moduleOption = Request::getArray('module_option');
+ $modulesObj->setVar('mod_admin', \in_array('admin', $moduleOption));
+ $modulesObj->setVar('mod_user', \in_array('user', $moduleOption));
+ $modulesObj->setVar('mod_blocks', \in_array('blocks', $moduleOption));
+ $modulesObj->setVar('mod_search', \in_array('search', $moduleOption));
+ $modulesObj->setVar('mod_comments', \in_array('comments', $moduleOption));
+ $modulesObj->setVar('mod_notifications', \in_array('notifications', $moduleOption));
+ $modulesObj->setVar('mod_permissions', \in_array('permissions', $moduleOption));
+ //$modulesObj->setVar('mod_inroot_copy', \in_array('inroot_copy', $moduleOption));
if ($helper->getHandler('Modules')->insert($modulesObj)) {
if ($modulesObj->isNew()) {
- redirect_header('tables.php', 5, sprintf(_AM_TDMCREATE_MODULE_FORM_CREATED_OK, \Xmf\Request::getString('mod_name', '', 'POST')));
+ \redirect_header('tables.php', 5, \sprintf(\_AM_MODULEBUILDER_MODULE_FORM_CREATED_OK, Request::getString('mod_name', '', 'POST')));
} else {
- redirect_header('modules.php', 5, sprintf(_AM_TDMCREATE_MODULE_FORM_UPDATED_OK, \Xmf\Request::getString('mod_name', '', 'POST')));
+ \redirect_header('modules.php', 5, \sprintf(\_AM_MODULEBUILDER_MODULE_FORM_UPDATED_OK, Request::getString('mod_name', '', 'POST')));
}
}
@@ -164,10 +190,10 @@
$GLOBALS['xoopsTpl']->assign('form', $form->render());
break;
case 'edit':
- $GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/functions.js');
+ $GLOBALS['xoTheme']->addScript('modules/modulebuilder/assets/js/functions.js');
$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('modules.php'));
- $adminObject->addItemButton(_AM_TDMCREATE_ADD_MODULE, 'modules.php?op=new', 'add');
- $adminObject->addItemButton(_AM_TDMCREATE_MODULES_LIST, 'modules.php', 'list');
+ $adminObject->addItemButton(\_AM_MODULEBUILDER_MODULES_ADD, 'modules.php?op=new');
+ $adminObject->addItemButton(\_AM_MODULEBUILDER_MODULES_LIST, 'modules.php', 'list');
$GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
$modulesObj = $helper->getHandler('Modules')->get($modId);
@@ -178,21 +204,42 @@
$modulesObj = $helper->getHandler('Modules')->get($modId);
if (isset($_REQUEST['ok']) && 1 == $_REQUEST['ok']) {
if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header('modules.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ \redirect_header('modules.php', 3, \implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
+ //delete all morefiles
+ $critDelete = new \CriteriaCompo();
+ $critDelete->add(new \Criteria('file_mid', $modId));
+ $helper->getHandler('Morefiles')->deleteAll($critDelete);
+ unset($critDelete);
+ //delete all fields
+ $critDelete = new \CriteriaCompo();
+ $critDelete->add(new \Criteria('field_mid', $modId));
+ $helper->getHandler('Fields')->deleteAll($critDelete);
+ unset($critDelete);
+ //delete all tables
+ $critDelete = new \CriteriaCompo();
+ $critDelete->add(new \Criteria('table_mid', $modId));
+ $helper->getHandler('Tables')->deleteAll($critDelete);
+ unset($critDelete);
+ //delete module
if ($helper->getHandler('Modules')->delete($modulesObj)) {
- redirect_header('modules.php', 3, _AM_TDMCREATE_FORMDELOK);
+ \redirect_header('modules.php', 3, \_AM_MODULEBUILDER_FORMDELOK);
} else {
$GLOBALS['xoopsTpl']->assign('error', $modulesObj->getHtmlErrors());
}
} else {
- xoops_confirm(['ok' => 1, 'mod_id' => $modId, 'op' => 'delete'], \Xmf\Request::getString('REQUEST_URI', '', 'SERVER'), sprintf(_AM_TDMCREATE_FORMSUREDEL, $modulesObj->getVar('mod_name')));
+ $customConfirm = new \XoopsModules\Modulebuilder\Common\Confirm(
+ ['ok' => 1, 'mod_id' => $modId, 'op' => 'delete'],
+ \Xmf\Request::getString('REQUEST_URI', '', 'SERVER'),
+ $modulesObj->getVar('mod_name')
+ );
+ $form = $customConfirm->getFormConfirm();
+ $GLOBALS['xoopsTpl']->assign('form', $form->render());
}
-
break;
case 'display':
$modFieldArray = ['admin', 'user', 'blocks', 'search', 'comments', 'notifications', 'permissions'];
- $id = \Xmf\Request::getInt('mod_id', 0, 'POST');
+ $id = Request::getInt('mod_id', 0, 'POST');
if ($id > 0) {
$modulesObj = $helper->getHandler('Modules')->get($id);
foreach ($modFieldArray as $moduleField) {
@@ -202,12 +249,121 @@
}
}
if ($helper->getHandler('Modules')->insert($modulesObj)) {
- redirect_header('modules.php', 3, _AM_TDMCREATE_TOGGLE_SUCCESS);
+ \redirect_header('modules.php', 3, \_AM_MODULEBUILDER_TOGGLE_SUCCESS);
}
$GLOBALS['xoopsTpl']->assign('error', $modulesObj->getHtmlErrors());
}
break;
-}
+ case 'clone':
+ $modIdSource = Request::getInt('mod_id');
+ if ($modIdSource > 0) {
+ //clone data table modules
+ $modulesHandler = $helper->getHandler('Modules');
+ $tablesHandler = $helper->getHandler('Tables');
+ $fieldsHandler = $helper->getHandler('Fields');
+ $moduleSource = $modulesHandler->get($modIdSource);
+ $moduleTarget = $modulesHandler->create();
+ $sourceVars = $moduleSource->getVars();
+ foreach ($sourceVars as $varKey => $varArray) {
+ if ('mod_id' !== $varKey) {
+ if (in_array($varKey, ['mod_name', 'mod_dirname'])) {
+ $uniqValue = '';
+ for ($i = 1; $i <= 10; $i++) {
+ $uniqValue = $varArray['value'] . $i;
+ $result = $GLOBALS['xoopsDB']->query(
+ 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('modulebuilder_modules') . " as ms WHERE ms.{$varKey} = '{$uniqValue}'"
+ );
+ $num_rows = $GLOBALS['xoopsDB']->getRowsNum($result);
+ if ($num_rows == 0) {
+ break;
+ }
+ }
+ $moduleTarget->setVar($varKey, $uniqValue);
+ } else {
+ $moduleTarget->setVar($varKey, $varArray['value']);
+ }
+ }
+ }
+
+ if ($modulesHandler->insert($moduleTarget)) {
+ //get new mod_id
+ $modIdTarget = $GLOBALS['xoopsDB']->getInsertId();
+ } else {
+ \redirect_header('modules.php', 5, \_AM_MODULEBUILDER_MODULE_CLONE_ERROR);
+ }
-include __DIR__ . '/footer.php';
+ //clone data table tables
+ $resultTables = $GLOBALS['xoopsDB']->query(
+ 'SELECT table_id FROM ' . $GLOBALS['xoopsDB']->prefix('modulebuilder_tables') . " as ts WHERE ts.table_mid = '{$modIdSource}'"
+ );
+ if (!$resultTables instanceof \mysqli_result) {
+ \trigger_error($GLOBALS['xoopsDB']->error());
+ }
+ $num_rows1 = $GLOBALS['xoopsDB']->getRowsNum($resultTables);
+ if ($num_rows1 > 0) {
+ while (false !== ($myTables = $GLOBALS['xoopsDB']->fetchArray($resultTables))) {
+ $tableIdSource = $myTables['table_id'];
+ $tableSource = $tablesHandler->get($tableIdSource);
+ $tableTarget = $tablesHandler->create();
+ $sourceVars = $tableSource->getVars();
+ foreach ($sourceVars as $varKey => $varArray) {
+ //skip table_id
+ if ('table_id' !== $varKey) {
+ //replace mod_id by new mod_id
+ if ('table_mid' === $varKey) {
+ $tableTarget->setVar($varKey, $modIdTarget);
+ } else {
+ $tableTarget->setVar($varKey, $varArray['value']);
+ }
+ }
+ }
+ if ($tablesHandler->insert($tableTarget)) {
+ //get new table_id
+ $tableIdTarget = $GLOBALS['xoopsDB']->getInsertId();
+ } else {
+ \redirect_header('modules.php', 5, \_AM_MODULEBUILDER_MODULE_CLONE_ERROR);
+ }
+
+ //clone data table fields
+ $resultFields = $GLOBALS['xoopsDB']->query(
+ 'SELECT field_id FROM ' . $GLOBALS['xoopsDB']->prefix('modulebuilder_fields') . " as fs WHERE fs.field_tid = '{$tableIdSource}'"
+ );
+ if (!$resultFields instanceof \mysqli_result) {
+ \trigger_error($GLOBALS['xoopsDB']->error());
+ }
+ $num_rows2 = $GLOBALS['xoopsDB']->getRowsNum($resultFields);
+ if ($num_rows2 > 0) {
+ while (false !== ($myField = $GLOBALS['xoopsDB']->fetchArray($resultFields))) {
+ $fieldIdSource = $myField['field_id'];
+ $fieldsSource = $fieldsHandler->get($fieldIdSource);
+ $fieldsTarget = $fieldsHandler->create();
+ $sourceVars = $fieldsSource->getVars();
+ foreach ($sourceVars as $varKey => $varArray) {
+ //skip field_id
+ if ('field_id' !== $varKey) {
+ if ('field_mid' === $varKey) {
+ //replace mod_id by new mod_id
+ $fieldsTarget->setVar($varKey, $modIdTarget);
+ } elseif ('field_tid' === $varKey) {
+ //replace table_id by new table_id
+ $fieldsTarget->setVar($varKey, $tableIdTarget);
+ } else {
+ $fieldsTarget->setVar($varKey, $varArray['value']);
+ }
+ }
+ }
+ if (!$fieldsHandler->insert($fieldsTarget)) {
+ \redirect_header('modules.php', 5, \_AM_MODULEBUILDER_MODULE_CLONE_ERROR);
+ }
+ }
+ }
+ }
+ }
+
+ \redirect_header('modules.php', 5, \_AM_MODULEBUILDER_MODULE_CLONE_SUCCESS);
+ }
+
+ break;
+}
+require __DIR__ . '/footer.php';
diff --git a/admin/morefiles.php b/admin/morefiles.php
index c6b1d4f3..4d1cce46 100644
--- a/admin/morefiles.php
+++ b/admin/morefiles.php
@@ -1,4 +1,4 @@
-
- *
*/
// Define main template
-$templateMain = 'tdmcreate_morefiles.tpl';
+$templateMain = 'modulebuilder_morefiles.tpl';
-include __DIR__ . '/header.php';
+require __DIR__ . '/header.php';
// Recovered value of argument op in the URL $
$op = \Xmf\Request::getString('op', 'list');
@@ -34,12 +33,12 @@
switch ($op) {
case 'list':
default:
- $start = \Xmf\Request::getInt('start', 0);
+ $start = \Xmf\Request::getInt('start');
$limit = \Xmf\Request::getInt('limit', $helper->getConfig('morefiles_adminpager'));
- $GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/functions.js');
- $GLOBALS['xoTheme']->addStylesheet('modules/tdmcreate/assets/css/admin/style.css');
+ $GLOBALS['xoTheme']->addScript('modules/modulebuilder/assets/js/functions.js');
+ $GLOBALS['xoTheme']->addStylesheet('modules/modulebuilder/assets/css/admin/style.css');
$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('morefiles.php'));
- $adminObject->addItemButton(_AM_TDMCREATE_ADD_MORE_FILE, 'morefiles.php?op=new', 'add');
+ $adminObject->addItemButton(\_AM_MODULEBUILDER_MORE_FILES_ADD, 'morefiles.php?op=new');
$GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
$GLOBALS['xoopsTpl']->assign('tdmc_url', TDMC_URL);
$GLOBALS['xoopsTpl']->assign('tdmc_upload_imgfile_url', TDMC_UPLOAD_IMGMOD_URL);
@@ -48,39 +47,39 @@
$modulesCount = $helper->getHandler('Modules')->getCountModules();
// Redirect if there aren't modules
if (0 == $modulesCount) {
- redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES);
+ \redirect_header('modules.php?op=new', 2, \_AM_MODULEBUILDER_THEREARENT_MODULES2);
}
- $morefilesCount = $helper->getHandler('Morefiles')->getCountMoreFiles();
- $morefilesAll = $helper->getHandler('Morefiles')->getAllMoreFiles($start, $limit);
+ $morefilesCount = $helper->getHandler('Morefiles')->getCountMorefiles();
+ $morefilesAll = $helper->getHandler('Morefiles')->getAllMorefiles($start, $limit);
// Display morefiles list
if ($morefilesCount > 0) {
- foreach (array_keys($morefilesAll) as $i) {
- $files = $morefilesAll[$i]->getValuesMoreFiles();
+ foreach (\array_keys($morefilesAll) as $i) {
+ $files = $morefilesAll[$i]->getValuesMorefiles();
$GLOBALS['xoopsTpl']->append('files_list', $files);
unset($files);
}
if ($morefilesCount > $limit) {
- include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+ require_once \XOOPS_ROOT_PATH . '/class/pagenav.php';
$pagenav = new \XoopsPageNav($morefilesCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
- $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
+ $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
}
} else {
- $GLOBALS['xoopsTpl']->assign('error', _AM_TDMCREATE_THEREARENT_MORE_FILES);
+ $GLOBALS['xoopsTpl']->assign('error', \_AM_MODULEBUILDER_THEREARENT_MORE_FILES);
}
break;
case 'new':
- $GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/functions.js');
+ $GLOBALS['xoTheme']->addScript('modules/modulebuilder/assets/js/functions.js');
$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('morefiles.php'));
- $adminObject->addItemButton(_AM_TDMCREATE_MORE_FILES_LIST, 'morefiles.php', 'list');
+ $adminObject->addItemButton(\_AM_MODULEBUILDER_MORE_FILES_LIST, 'morefiles.php', 'list');
$GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
$morefilesObj = $helper->getHandler('Morefiles')->create();
- $form = $morefilesObj->getFormMoreFiles();
+ $form = $morefilesObj->getFormMorefiles();
$GLOBALS['xoopsTpl']->assign('form', $form->render());
break;
case 'save':
if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header('morefiles.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ \redirect_header('morefiles.php', 3, \implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
if (isset($fileId)) {
$morefilesObj = $helper->getHandler('Morefiles')->get($fileId);
@@ -91,52 +90,56 @@
$morefilesObj->setVars(
[
'file_mid' => \Xmf\Request::getInt('file_mid', 0, 'POST'),
+ 'file_type' => \Xmf\Request::getString('file_type', '', 'POST'),
'file_name' => \Xmf\Request::getString('file_name', '', 'POST'),
'file_extension' => \Xmf\Request::getString('file_extension', '', 'POST'),
+ 'file_upload' => \Xmf\Request::getString('file_upload', '', 'POST'),
'file_infolder' => \Xmf\Request::getString('file_infolder', '', 'POST'),
]
);
if ($helper->getHandler('Morefiles')->insert($morefilesObj)) {
if ($morefilesObj->isNew()) {
- redirect_header('morefiles.php', 5, sprintf(_AM_TDMCREATE_FILE_FORM_CREATED_OK, \Xmf\Request::getString('file_name', '', 'POST')));
+ \redirect_header('morefiles.php', 5, \sprintf(\_AM_MODULEBUILDER_FILE_FORM_CREATED_OK, \Xmf\Request::getString('file_name', '', 'POST')));
} else {
- redirect_header('morefiles.php', 5, sprintf(_AM_TDMCREATE_FILE_FORM_UPDATED_OK, \Xmf\Request::getString('file_name', '', 'POST')));
+ \redirect_header('morefiles.php', 5, \sprintf(\_AM_MODULEBUILDER_FILE_FORM_UPDATED_OK, \Xmf\Request::getString('file_name', '', 'POST')));
}
}
$GLOBALS['xoopsTpl']->assign('error', $morefilesObj->getHtmlErrors());
- $form = $morefilesObj->getFormMoreFiles();
+ $form = $morefilesObj->getFormMorefiles();
$GLOBALS['xoopsTpl']->assign('form', $form->render());
break;
case 'edit':
- // Define main template
- // $templateMain = 'tdmcreate_morefiles.tpl';
- $GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/functions.js');
+ $GLOBALS['xoTheme']->addScript('modules/modulebuilder/assets/js/functions.js');
$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('morefiles.php'));
- $adminObject->addItemButton(_AM_TDMCREATE_ADD_MODULE, 'morefiles.php?op=new', 'add');
- $adminObject->addItemButton(_AM_TDMCREATE_MORE_FILES_LIST, 'morefiles.php', 'list');
+ $adminObject->addItemButton(\_AM_MODULEBUILDER_MORE_FILES_ADD, 'morefiles.php?op=new');
+ $adminObject->addItemButton(\_AM_MODULEBUILDER_MORE_FILES_LIST, 'morefiles.php', 'list');
$GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
$morefilesObj = $helper->getHandler('Morefiles')->get($fileId);
- $form = $morefilesObj->getFormMoreFiles();
+ $form = $morefilesObj->getFormMorefiles();
$GLOBALS['xoopsTpl']->assign('form', $form->render());
break;
case 'delete':
$morefilesObj = $helper->getHandler('Morefiles')->get($fileId);
if (isset($_REQUEST['ok']) && 1 == $_REQUEST['ok']) {
if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header('morefiles.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ \redirect_header('morefiles.php', 3, \implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
if ($helper->getHandler('Morefiles')->delete($morefilesObj)) {
- redirect_header('morefiles.php', 3, _AM_TDMCREATE_FORM_DELETED_OK);
+ \redirect_header('morefiles.php', 3, \_AM_MODULEBUILDER_FORM_DELETED_OK);
} else {
$GLOBALS['xoopsTpl']->assign('error', $morefilesObj->getHtmlErrors());
}
} else {
- xoops_confirm(['ok' => 1, 'file_id' => $fileId, 'op' => 'delete'], \Xmf\Request::getString('REQUEST_URI', '', 'SERVER'), sprintf(_AM_TDMCREATE_FORM_SURE_DELETE, $morefilesObj->getVar('file_name')));
+ $customConfirm = new \XoopsModules\Modulebuilder\Common\Confirm(
+ ['ok' => 1, 'file_id' => $fileId, 'op' => 'delete'], \Xmf\Request::getString('REQUEST_URI', '', 'SERVER'), $morefilesObj->getVar('file_name')
+ );
+ $form = $customConfirm->getFormConfirm();
+ $GLOBALS['xoopsTpl']->assign('form', $form->render());
}
break;
}
-include __DIR__ . '/footer.php';
+require __DIR__ . '/footer.php';
diff --git a/admin/moremymodule.php b/admin/moremymodule.php
deleted file mode 100644
index d8b7571c..00000000
--- a/admin/moremymodule.php
+++ /dev/null
@@ -1,142 +0,0 @@
-
- *
- */
-
-// Define main template
-$templateMain = 'tdmcreate_moremymodule.tpl';
-
-include __DIR__ . '/header.php';
-// Recovered value of argument op in the URL $
-$op = \Xmf\Request::getString('op', 'list');
-
-$fileId = \Xmf\Request::getInt('file_id');
-
-switch ($op) {
- case 'list':
- default:
- $start = \Xmf\Request::getInt('start', 0);
- $limit = \Xmf\Request::getInt('limit', $helper->getConfig('moremymodule_adminpager'));
- $GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/functions.js');
- $GLOBALS['xoTheme']->addStylesheet('modules/tdmcreate/assets/css/admin/style.css');
- $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('moremymodule.php'));
- $adminObject->addItemButton(_AM_TDMCREATE_ADD_MORE_FILE, 'moremymodule.php?op=new', 'add');
- $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
- $GLOBALS['xoopsTpl']->assign('tdmc_url', TDMC_URL);
- $GLOBALS['xoopsTpl']->assign('tdmc_upload_imgfile_url', TDMC_UPLOAD_IMGMOD_URL);
- $GLOBALS['xoopsTpl']->assign('modPathIcon16', $modPathIcon16);
- $GLOBALS['xoopsTpl']->assign('sysPathIcon32', $sysPathIcon32);
- $modulesCount = $helper->getHandler('Modules')->getCountModules();
- // Redirect if there aren't modules
- if (0 == $modulesCount) {
- redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES);
- }
- $moremymoduleCount = $helper->getHandler('Moremymodule')->getCountMoreMymodule();
- $moremymoduleAll = $helper->getHandler('Moremymodule')->getAllMoreMymodule($start, $limit);
- // Display moremymodule list
- if ($moremymoduleCount > 0) {
- foreach (array_keys($moremymoduleAll) as $i) {
- $mymodule = $moremymoduleAll[$i]->getValuesMoreMymodule();
- $GLOBALS['xoopsTpl']->append('mymodule_list', $mymodule);
- unset($mymodule);
- }
- if ($moremymoduleCount > $limit) {
- include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- $pagenav = new \XoopsPageNav($moremymoduleCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
- $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
- }
- } else {
- $GLOBALS['xoopsTpl']->assign('error', _AM_TDMCREATE_THEREARENT_MORE_MYMODULE);
- }
- break;
- case 'new':
- $GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/functions.js');
- $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('moremymodule.php'));
- $adminObject->addItemButton(_AM_TDMCREATE_MORE_MYMODULE_LIST, 'moremymodule.php', 'list');
- $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
-
- $moremymoduleObj = $helper->getHandler('Moremymodule')->create();
- $form = $moremymoduleObj->getFormMoreMymodule();
- $GLOBALS['xoopsTpl']->assign('form', $form->render());
- break;
- case 'save':
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header('moremymodule.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
- }
- if (isset($fileId)) {
- $moremymoduleObj = $helper->getHandler('Moremymodule')->get($fileId);
- } else {
- $moremymoduleObj = $helper->getHandler('Moremymodule')->create();
- }
- // Form file save
- $moremymoduleObj->setVars(
- [
- 'file_mid' => \Xmf\Request::getInt('file_mid', 0, 'POST'),
- 'file_name' => \Xmf\Request::getString('file_name', '', 'POST'),
- 'file_extension' => \Xmf\Request::getString('file_extension', '', 'POST'),
- 'file_infolder' => \Xmf\Request::getString('file_infolder', '', 'POST'),
- ]
- );
-
- if ($helper->getHandler('Moremymodule')->insert($moremymoduleObj)) {
- if ($moremymoduleObj->isNew()) {
- redirect_header('moremymodule.php', 5, sprintf(_AM_TDMCREATE_FILE_FORM_CREATED_OK, \Xmf\Request::getString('file_name', '', 'POST')));
- } else {
- redirect_header('moremymodule.php', 5, sprintf(_AM_TDMCREATE_FILE_FORM_UPDATED_OK, \Xmf\Request::getString('file_name', '', 'POST')));
- }
- }
-
- $GLOBALS['xoopsTpl']->assign('error', $moremymoduleObj->getHtmlErrors());
- $form = $moremymoduleObj->getFormMoreMymodule();
- $GLOBALS['xoopsTpl']->assign('form', $form->render());
- break;
- case 'edit':
- // Define main template
- // $templateMain = 'tdmcreate_moremymodule.tpl';
- $GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/functions.js');
- $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('moremymodule.php'));
- $adminObject->addItemButton(_AM_TDMCREATE_ADD_MODULE, 'moremymodule.php?op=new', 'add');
- $adminObject->addItemButton(_AM_TDMCREATE_MORE_MYMODULE_LIST, 'moremymodule.php', 'list');
- $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
-
- $moremymoduleObj = $helper->getHandler('Moremymodule')->get($fileId);
- $form = $moremymoduleObj->getFormMoreMymodule();
- $GLOBALS['xoopsTpl']->assign('form', $form->render());
- break;
- case 'delete':
- $moremymoduleObj = $helper->getHandler('Moremymodule')->get($fileId);
- if (isset($_REQUEST['ok']) && 1 == $_REQUEST['ok']) {
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header('moremymodule.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
- }
- if ($helper->getHandler('Moremymodule')->delete($moremymoduleObj)) {
- redirect_header('moremymodule.php', 3, _AM_TDMCREATE_FORM_DELETED_OK);
- } else {
- $GLOBALS['xoopsTpl']->assign('error', $moremymoduleObj->getHtmlErrors());
- }
- } else {
- xoops_confirm(['ok' => 1, 'file_id' => $fileId, 'op' => 'delete'], \Xmf\Request::getString('REQUEST_URI', '', 'SERVER'), sprintf(_AM_TDMCREATE_FORM_SURE_DELETE, $moremymoduleObj->getVar('file_name')));
- }
- break;
-}
-
-include __DIR__ . '/footer.php';
diff --git a/admin/settings.php b/admin/settings.php
index 5e6caab7..3d2cb32c 100644
--- a/admin/settings.php
+++ b/admin/settings.php
@@ -1,4 +1,4 @@
-
- *
*/
// Define main template
-$templateMain = 'tdmcreate_settings.tpl';
+$templateMain = 'modulebuilder_settings.tpl';
-include __DIR__ . '/header.php';
+require __DIR__ . '/header.php';
// Recovered value of argument op in the URL $
$op = \Xmf\Request::getString('op', 'list');
@@ -34,12 +33,12 @@
switch ($op) {
case 'list':
default:
- $start = \Xmf\Request::getInt('start', 0);
+ $start = \Xmf\Request::getInt('start');
$limit = \Xmf\Request::getInt('limit', $helper->getConfig('settings_adminpager'));
- $GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/functions.js');
- $GLOBALS['xoTheme']->addStylesheet('modules/tdmcreate/assets/css/admin/style.css');
+ $GLOBALS['xoTheme']->addScript('modules/modulebuilder/assets/js/functions.js');
+ $GLOBALS['xoTheme']->addStylesheet('modules/modulebuilder/assets/css/admin/style.css');
$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('settings.php'));
- $adminObject->addItemButton(_AM_TDMCREATE_ADD_SETTING, 'settings.php?op=new', 'add');
+ $adminObject->addItemButton(\_AM_MODULEBUILDER_SETTINGS_ADD, 'settings.php?op=new');
$GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
$GLOBALS['xoopsTpl']->assign('tdmc_upload_imgmod_url', TDMC_UPLOAD_IMGMOD_URL);
$GLOBALS['xoopsTpl']->assign('tdmc_url', TDMC_URL);
@@ -49,24 +48,24 @@
$settingsAll = $helper->getHandler('Settings')->getAllSettings($start, $limit);
// Display settings list
if ($settingsCount > 0) {
- foreach (array_keys($settingsAll) as $i) {
+ foreach (\array_keys($settingsAll) as $i) {
$setting = $settingsAll[$i]->getValuesSettings();
$GLOBALS['xoopsTpl']->append('settings_list', $setting);
unset($setting);
}
if ($settingsCount > $limit) {
- include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+ require_once \XOOPS_ROOT_PATH . '/class/pagenav.php';
$pagenav = new \XoopsPageNav($settingsCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
- $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
+ $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
}
} else {
- $GLOBALS['xoopsTpl']->assign('error', _AM_TDMCREATE_THEREARENT_SETTINGS);
+ $GLOBALS['xoopsTpl']->assign('error', \_AM_MODULEBUILDER_THEREARENT_SETTINGS);
}
break;
case 'new':
- $GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/functions.js');
+ $GLOBALS['xoTheme']->addScript('modules/modulebuilder/assets/js/functions.js');
$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('settings.php'));
- $adminObject->addItemButton(_AM_TDMCREATE_SETTINGS_LIST, 'settings.php', 'list');
+ $adminObject->addItemButton(\_AM_MODULEBUILDER_SETTINGS_LIST, 'settings.php', 'list');
$GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
$settingsObj = $helper->getHandler('Settings')->create();
@@ -75,14 +74,14 @@
break;
case 'save':
if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header('settings.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ \redirect_header('settings.php', 3, \implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
if (isset($setId)) {
$settingsObj = $helper->getHandler('Settings')->get($setId);
} else {
$settingsObj = $helper->getHandler('Settings')->create();
}
- $setModuleDirname = preg_replace('/[^a-zA-Z0-9]\s+/', '', mb_strtolower($_POST['set_dirname']));
+ $setModuleDirname = \preg_replace('/[^a-zA-Z0-9]\s+/', '', \mb_strtolower($_POST['set_dirname']));
//Form module save
$settingsObj->setVars(
[
@@ -124,21 +123,25 @@
'set_subversion' => \Xmf\Request::getString('set_subversion', '', 'POST'),
]
);
- $settingOption = \Xmf\Request::getArray('setting_option', []);
- $settingsObj->setVar('set_admin', in_array('admin', $settingOption));
- $settingsObj->setVar('set_user', in_array('user', $settingOption));
- $settingsObj->setVar('set_blocks', in_array('blocks', $settingOption));
- $settingsObj->setVar('set_search', in_array('search', $settingOption));
- $settingsObj->setVar('set_comments', in_array('comments', $settingOption));
- $settingsObj->setVar('set_notifications', in_array('notifications', $settingOption));
- $settingsObj->setVar('set_permissions', in_array('permissions', $settingOption));
- //$settingsObj->setVar('set_inroot_copy', in_array('inroot', $settingOption));
- if (\Xmf\Request::hasVar('set_type')) {
- $settingsObj->setVar('set_type', \Xmf\Request::getString('set_type', '', 'POST'));
+ $settingOption = \Xmf\Request::getArray('setting_option');
+ $settingsObj->setVar('set_admin', \in_array('admin', $settingOption));
+ $settingsObj->setVar('set_user', \in_array('user', $settingOption));
+ $settingsObj->setVar('set_blocks', \in_array('blocks', $settingOption));
+ $settingsObj->setVar('set_search', \in_array('search', $settingOption));
+ $settingsObj->setVar('set_comments', \in_array('comments', $settingOption));
+ $settingsObj->setVar('set_notifications', \in_array('notifications', $settingOption));
+ $settingsObj->setVar('set_permissions', \in_array('permissions', $settingOption));
+ $settingsObj->setVar('set_inroot_copy', \in_array('inroot', $settingOption));
+ $setType = \Xmf\Request::getString('set_type', '', 'POST');
+ if (1 == $setType) {
+ // reset all
+ $strSQL = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('modulebuilder_settings') . ' SET ' . $GLOBALS['xoopsDB']->prefix('modulebuilder_settings') . '.set_type = 0';
+ $GLOBALS['xoopsDB']->queryF($strSQL);
}
+ $settingsObj->setVar('set_type', $setType);
if ($helper->getHandler('Settings')->insert($settingsObj)) {
- redirect_header('settings.php', 5, sprintf(_AM_TDMCREATE_MODULE_FORM_UPDATED_OK, \Xmf\Request::getString('set_name', '', 'POST')));
+ \redirect_header('settings.php', 5, \sprintf(\_AM_MODULEBUILDER_MODULE_FORM_UPDATED_OK, \Xmf\Request::getString('set_name', '', 'POST')));
}
$GLOBALS['xoopsTpl']->assign('error', $settingsObj->getHtmlErrors());
@@ -147,8 +150,8 @@
break;
case 'edit':
$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('settings.php'));
- $adminObject->addItemButton(_AM_TDMCREATE_ADD_SETTING, 'settings.php?op=new', 'add');
- $adminObject->addItemButton(_AM_TDMCREATE_SETTINGS_LIST, 'settings.php', 'list');
+ $adminObject->addItemButton(\_AM_MODULEBUILDER_SETTINGS_ADD, 'settings.php?op=new');
+ $adminObject->addItemButton(\_AM_MODULEBUILDER_SETTINGS_LIST, 'settings.php', 'list');
$GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
$settingsObj = $helper->getHandler('Settings')->get($setId);
$form = $settingsObj->getFormSettings();
@@ -158,27 +161,36 @@
$settingsObj = $helper->getHandler('Settings')->get($setId);
if (isset($_REQUEST['ok']) && 1 == $_REQUEST['ok']) {
if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header('settings.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ \redirect_header('settings.php', 3, \implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
if ($helper->getHandler('Settings')->delete($settingsObj)) {
- redirect_header('settings.php', 3, _AM_TDMCREATE_FORMDELOK);
+ \redirect_header('settings.php', 3, \_AM_MODULEBUILDER_FORMDELOK);
} else {
$GLOBALS['xoopsTpl']->assign('error', $settingsObj->getHtmlErrors());
}
} else {
- xoops_confirm(['ok' => 1, 'set_id' => $setId, 'op' => 'delete'], \Xmf\Request::getString('REQUEST_URI', '', 'SERVER'), sprintf(_AM_TDMCREATE_FORMSUREDEL, $settingsObj->getVar('set_name')));
+ $customConfirm = new \XoopsModules\Modulebuilder\Common\Confirm(
+ ['ok' => 1, 'set_id' => $setId, 'op' => 'delete'], \Xmf\Request::getString('REQUEST_URI', '', 'SERVER'), $settingsObj->getVar('set_name')
+ );
+ $form = $customConfirm->getFormConfirm();
+ $GLOBALS['xoopsTpl']->assign('form', $form->render());
}
break;
case 'display':
- $id = \Xmf\Request::getInt('set_id', 0, 'POST');
- if ($id > 0) {
- $settingsObj = $helper->getHandler('Settings')->get($id);
- if (isset($_POST['set_type'])) {
- $setType = $settingsObj->getVar('set_type');
- $settingsObj->setVar('set_type', !$setType);
+ $setId = \Xmf\Request::getInt('set_id');
+ if ($setId > 0) {
+ $settingsHandler = $helper->getHandler('Settings');
+ $settingsObj = $settingsHandler->get($setId);
+ $setType = $settingsObj->getVar('set_type');
+ // reset all
+ $strSQL = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('modulebuilder_settings') . ' SET ' . $GLOBALS['xoopsDB']->prefix('modulebuilder_settings') . '.set_type = 0';
+ $GLOBALS['xoopsDB']->queryF($strSQL);
+ $strSQL = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('modulebuilder_settings') . ' SET ' . $GLOBALS['xoopsDB']->prefix('modulebuilder_settings') . '.set_type = 1 WHERE ' . $GLOBALS['xoopsDB']->prefix('modulebuilder_settings') . '.set_id = ' . $setId;
+ if ($GLOBALS['xoopsDB']->queryF($strSQL)) {
+ \redirect_header('settings.php', 5, \sprintf(\_AM_MODULEBUILDER_MODULE_FORM_UPDATED_OK, \Xmf\Request::getString('set_name', '', 'POST')));
}
$GLOBALS['xoopsTpl']->assign('error', $settingsObj->getHtmlErrors());
}
break;
}
-include __DIR__ . '/footer.php';
+require __DIR__ . '/footer.php';
diff --git a/admin/tables.php b/admin/tables.php
index 267f1211..b6805908 100644
--- a/admin/tables.php
+++ b/admin/tables.php
@@ -1,4 +1,4 @@
-getConfig('modules_adminpager'));
- $GLOBALS['xoTheme']->addStylesheet('modules/tdmcreate/assets/css/admin/style.css');
+ $GLOBALS['xoTheme']->addStylesheet('modules/modulebuilder/assets/css/admin/style.css');
$GLOBALS['xoTheme']->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
- $GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/functions.js');
- $GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/sortable.js');
+ $GLOBALS['xoTheme']->addScript('modules/modulebuilder/assets/js/functions.js');
+ $GLOBALS['xoTheme']->addScript('modules/modulebuilder/assets/js/sortable.js');
$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('tables.php'));
- $adminObject->addItemButton(_AM_TDMCREATE_ADD_TABLE, 'tables.php?op=new', 'add');
+ $adminObject->addItemButton(\_AM_MODULEBUILDER_TABLES_ADD, 'tables.php?op=new');
$GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
$GLOBALS['xoopsTpl']->assign('tdmc_upload_imgmod_url', TDMC_UPLOAD_IMGMOD_URL);
$GLOBALS['xoopsTpl']->assign('modPathIcon16', TDMC_URL . '/' . $modPathIcon16);
@@ -55,18 +55,18 @@
$modulesCount = $helper->getHandler('Modules')->getCountModules();
// Redirect if there aren't modules
if (0 == $modulesCount) {
- redirect_header('modules.php?op=new', 10, _AM_TDMCREATE_NOTMODULES);
+ \redirect_header('modules.php?op=new', 10, \_AM_MODULEBUILDER_THEREARENT_MODULES2);
}
$modulesAll = $helper->getHandler('Modules')->getAllModules($start, $limit);
- $tablesCount = $helper->getHandler('Tables')->getObjects(null);
+ $tablesCount = $helper->getHandler('Tables')->getObjects();
// Redirect if there aren't tables
if (0 == $tablesCount) {
- redirect_header('tables.php?op=new', 10, _AM_TDMCREATE_NOTTABLES);
+ \redirect_header('tables.php?op=new', 10, \_AM_MODULEBUILDER_THEREARENT_TABLES2);
}
unset($tablesCount);
// Display modules list
if ($modulesCount > 0) {
- foreach (array_keys($modulesAll) as $i) {
+ foreach (\array_keys($modulesAll) as $i) {
$module = $modulesAll[$i]->getValuesModules();
// Get the list of tables
$tablesCount = $helper->getHandler('Tables')->getCountTables();
@@ -75,7 +75,7 @@
$tables = [];
$lid = 1;
if ($tablesCount > 0) {
- foreach (array_keys($tablesAll) as $t) {
+ foreach (\array_keys($tablesAll) as $t) {
$table = $tablesAll[$t]->getValuesTables();
$alid = ['lid' => $lid];
$tables[] = array_merge($table, $alid);
@@ -89,29 +89,29 @@
unset($module);
}
if ($modulesCount > $limit) {
- include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+ require_once \XOOPS_ROOT_PATH . '/class/pagenav.php';
$pagenav = new \XoopsPageNav($modulesCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
- $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
+ $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
}
} else {
- $GLOBALS['xoopsTpl']->assign('error', _AM_TDMCREATE_THEREARENT_TABLES);
+ $GLOBALS['xoopsTpl']->assign('error', \_AM_MODULEBUILDER_THEREARENT_TABLES);
}
break;
case 'new':
$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('tables.php'));
- $adminObject->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php', 'list');
+ $adminObject->addItemButton(\_AM_MODULEBUILDER_TABLES_LIST, 'tables.php', 'list');
$GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
$tablesObj = $helper->getHandler('Tables')->create();
if ($tableMid > 0) {
$tablesObj->setVar('table_mid', $tableMid);
}
- $form = $tablesObj->getFormTables();
+ $form = $tablesObj->getFormTables();
$GLOBALS['xoopsTpl']->assign('form', $form->render());
break;
case 'save':
if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ \redirect_header('tables.php', 3, \implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
$tables = $helper->getHandler('Tables');
if (isset($tableId)) {
@@ -123,9 +123,9 @@
$tableNameSearch = $tables->getObjects($criteria);
unset($criteria);
//unset($criteria);
- foreach (array_keys($tableNameSearch) as $t) {
+ foreach (\array_keys($tableNameSearch) as $t) {
if ($tableNameSearch[$t]->getVar('table_name') === \Xmf\Request::getString('table_name', '', 'POST')) {
- redirect_header('tables.php?op=new', 3, sprintf(_AM_TDMCREATE_ERROR_TABLE_NAME_EXIST, \Xmf\Request::getString('table_name', '', 'POST')));
+ \redirect_header('tables.php?op=new', 3, \sprintf(\_AM_MODULEBUILDER_TABLE_ERROR_NAME_EXIST, \Xmf\Request::getString('table_name', '', 'POST')));
}
}
$tablesObj = $tables->create();
@@ -145,8 +145,8 @@
]
);
//Form table_image
- include_once XOOPS_ROOT_PATH . '/class/uploader.php';
- $uploaddir = is_dir(XOOPS_ICONS32_PATH) ? XOOPS_ICONS32_PATH : TDMC_UPLOAD_IMGTAB_PATH;
+ require_once \XOOPS_ROOT_PATH . '/class/uploader.php';
+ $uploaddir = \is_dir(\XOOPS_ICONS32_PATH) ? \XOOPS_ICONS32_PATH : TDMC_UPLOAD_IMGTAB_PATH;
$uploader = new \XoopsMediaUploader(
$uploaddir, $helper->getConfig('mimetypes_image'), $helper->getConfig('maxsize_image'), null, null
);
@@ -154,7 +154,7 @@
$uploader->fetchMedia(\Xmf\Request::getString('xoops_upload_file', '', 'POST')[0]);
if (!$uploader->upload()) {
$errors = $uploader->getErrors();
- redirect_header('javascript:history.go(-1)', 3, $errors);
+ \redirect_header('javascript:history.go(-1)', 3, $errors);
} else {
$tablesObj->setVar('table_image', $uploader->getSavedFileName());
}
@@ -163,26 +163,27 @@
}
$tablesObj->setVar('table_autoincrement', (1 == $_REQUEST['table_autoincrement']) ? 1 : 0);
// Options
- $tableOption = \Xmf\Request::getArray('table_option', []);
- $tablesObj->setVar('table_install', in_array('install', $tableOption));
- $tablesObj->setVar('table_index', in_array('index', $tableOption));
- $tablesObj->setVar('table_blocks', in_array('blocks', $tableOption));
- $tablesObj->setVar('table_admin', in_array('admin', $tableOption));
- $tablesObj->setVar('table_user', in_array('user', $tableOption));
- $tablesObj->setVar('table_submenu', in_array('submenu', $tableOption));
- $tablesObj->setVar('table_submit', in_array('submit', $tableOption));
- $tablesObj->setVar('table_tag', in_array('tag', $tableOption));
- $tablesObj->setVar('table_broken', in_array('broken', $tableOption));
- $tablesObj->setVar('table_search', in_array('search', $tableOption));
- $tablesObj->setVar('table_comments', in_array('comments', $tableOption));
- $tablesObj->setVar('table_notifications', in_array('notifications', $tableOption));
- $tablesObj->setVar('table_permissions', in_array('permissions', $tableOption));
- $tablesObj->setVar('table_rate', in_array('rate', $tableOption));
- $tablesObj->setVar('table_print', in_array('print', $tableOption));
- $tablesObj->setVar('table_pdf', in_array('pdf', $tableOption));
- $tablesObj->setVar('table_rss', in_array('rss', $tableOption));
- $tablesObj->setVar('table_single', in_array('single', $tableOption));
- $tablesObj->setVar('table_visit', in_array('visit', $tableOption));
+ $tableOption = \Xmf\Request::getArray('table_option');
+ $tablesObj->setVar('table_install', \in_array('install', $tableOption));
+ $tablesObj->setVar('table_index', \in_array('index', $tableOption));
+ $tablesObj->setVar('table_blocks', \in_array('blocks', $tableOption));
+ $tablesObj->setVar('table_admin', \in_array('admin', $tableOption));
+ $tablesObj->setVar('table_user', \in_array('user', $tableOption));
+ $tablesObj->setVar('table_submenu', \in_array('submenu', $tableOption));
+ $tablesObj->setVar('table_submit', \in_array('submit', $tableOption));
+ $tablesObj->setVar('table_tag', \in_array('tag', $tableOption));
+ $tablesObj->setVar('table_broken', \in_array('broken', $tableOption));
+ $tablesObj->setVar('table_search', \in_array('search', $tableOption));
+ $tablesObj->setVar('table_comments', \in_array('comments', $tableOption));
+ $tablesObj->setVar('table_notifications', \in_array('notifications', $tableOption));
+ $tablesObj->setVar('table_permissions', \in_array('permissions', $tableOption));
+ $tablesObj->setVar('table_rate', \in_array('rate', $tableOption));
+ $tablesObj->setVar('table_print', \in_array('print', $tableOption));
+ $tablesObj->setVar('table_pdf', \in_array('pdf', $tableOption));
+ $tablesObj->setVar('table_rss', \in_array('rss', $tableOption));
+ $tablesObj->setVar('table_reads', \in_array('reads', $tableOption));
+ $tablesObj->setVar('table_single', \in_array('single', $tableOption));
+ $tablesObj->setVar('table_visit', \in_array('visit', $tableOption));
if ($tables->insert($tablesObj)) {
if ($tablesObj->isNew()) {
@@ -192,15 +193,32 @@
$fieldelementObj = $helper->getHandler('Fieldelements')->create();
$fieldelementObj->setVar('fieldelement_mid', $tableMid);
$fieldelementObj->setVar('fieldelement_tid', $tableTid);
- $fieldelementObj->setVar('fieldelement_name', 'Table : ' . ucfirst(\Xmf\Request::getString('table_name', '', 'POST')));
- $fieldelementObj->setVar('fieldelement_value', 'XoopsFormTables-' . ucfirst(\Xmf\Request::getString('table_name', '', 'POST')));
+ $fieldelementObj->setVar('fieldelement_name', 'Table : ' . \ucfirst(\Xmf\Request::getString('table_name', '', 'POST')));
+ $fieldelementObj->setVar('fieldelement_value', 'XoopsFormTables-' . \ucfirst(\Xmf\Request::getString('table_name', '', 'POST')));
+ $fieldelementObj->setVar('fieldelement_deftype', 2);
+ $fieldelementObj->setVar('fieldelement_defvalue', 10);
// Insert new field element id for table name
if (!$helper->getHandler('Fieldelements')->insert($fieldelementObj)) {
$GLOBALS['xoopsTpl']->assign('error', $fieldelementObj->getHtmlErrors() . ' Field element');
}
- redirect_header('fields.php?op=new' . $tableAction, 5, sprintf(_AM_TDMCREATE_TABLE_FORM_CREATED_OK, \Xmf\Request::getString('table_name', '', 'POST')));
+ \redirect_header('fields.php?op=new' . $tableAction, 5, \sprintf(\_AM_MODULEBUILDER_TABLE_FORM_CREATED_OK, \Xmf\Request::getString('table_name', '', 'POST')));
} else {
- redirect_header('tables.php', 5, sprintf(_AM_TDMCREATE_TABLE_FORM_UPDATED_OK, \Xmf\Request::getString('table_name', '', 'POST')));
+ // table exists, recreate fieldelement_name/fieldelement_value in order to catch changes of table name
+ $crFieldelements = new \CriteriaCompo();
+ $crFieldelements->add(new \Criteria('fieldelement_mid', $tableMid));
+ $crFieldelements->add(new \Criteria('fieldelement_tid', $tableId));
+ $fieldelementsAll = $helper->getHandler('Fieldelements')->getAll($crFieldelements);
+ foreach (\array_keys($fieldelementsAll) as $feid) {
+ $fieldelementObj = $helper->getHandler('Fieldelements')->get($feid);
+ $fieldelementObj->setVar('fieldelement_name', 'Table : ' . \ucfirst(\Xmf\Request::getString('table_name', '', 'POST')));
+ $fieldelementObj->setVar('fieldelement_value', 'XoopsFormTables-' . \ucfirst(\Xmf\Request::getString('table_name', '', 'POST')));
+ // Insert new field element id for table name
+ if (!$helper->getHandler('Fieldelements')->insert($fieldelementObj)) {
+ $GLOBALS['xoopsTpl']->assign('error', $fieldelementObj->getHtmlErrors() . ' Field element');
+ }
+ }
+
+ \redirect_header('tables.php', 5, \sprintf(\_AM_MODULEBUILDER_TABLE_FORM_UPDATED_OK, \Xmf\Request::getString('table_name', '', 'POST')));
}
}
@@ -210,8 +228,8 @@
break;
case 'edit':
$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('tables.php'));
- $adminObject->addItemButton(_AM_TDMCREATE_ADD_TABLE, 'tables.php?op=new', 'add');
- $adminObject->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php?op=list', 'list');
+ $adminObject->addItemButton(\_AM_MODULEBUILDER_TABLES_ADD, 'tables.php?op=new');
+ $adminObject->addItemButton(\_AM_MODULEBUILDER_TABLES_LIST, 'tables.php?op=list', 'list');
$GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
$tablesObj = $helper->getHandler('Tables')->get($tableId);
@@ -219,47 +237,68 @@
$GLOBALS['xoopsTpl']->assign('form', $form->render());
break;
case 'order':
+ $error = false;
// Initialize tables handler
- $tablesObj = $helper->getHandler('Tables');
+ $tablesHandler = $helper->getHandler('Tables');
if (isset($_POST['torder'])) {
$i = 0;
foreach ($_POST['torder'] as $order) {
if ($order > 0) {
- $tableOrder = $tablesObj->get($order);
- $tableOrder->setVar('table_order', $i);
- if (!$tablesObj->insert($tableOrder)) {
+ $tablesObj = $tablesHandler->get((int)$order);
+ if ($tablesObj instanceof \XoopsObject) {
+ $tablesObj->setVar('table_order', $i);
+ if (!$tablesHandler->insert($tablesObj)) {
+ $error = true;
+ }
+ } else {
$error = true;
+ continue;
}
++$i;
}
}
- redirect_header('tables.php', 5, _AM_TDMCREATE_TABLE_ORDER_ERROR);
+ if ($error) {
+ \redirect_header('tables.php', 5, \_AM_MODULEBUILDER_TABLE_ORDER_ERROR);
+ }
unset($i);
}
exit;
- break;
case 'delete':
$tablesObj = $helper->getHandler('Tables')->get($tableId);
if (isset($_REQUEST['ok']) && 1 == $_REQUEST['ok']) {
if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ \redirect_header('tables.php', 3, \implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
+ $fieldelements = $helper->getHandler('Fieldelements')->getAllFieldelementsByTableId($tableId);
if ($helper->getHandler('Tables')->delete($tablesObj)) {
- // Delete items in table fieldelements - idea by goffy
- $fieldelements = $helper->getHandler('Fieldelements')->getAllFieldElementsByModuleAndTableId($tableMid, $tableId);
- foreach (array_keys($fieldelements) as $fe) {
+ // Delete items in table fieldelements
+ $fieldelements = $helper->getHandler('Fieldelements')->getAllFieldelementsByTableId($tableId);
+ foreach (\array_keys($fieldelements) as $fe) {
$fieldElementsObj = $helper->getHandler('Fieldelements')->get($fieldelements[$fe]->getVar('fieldelement_id'));
if (!$helper->getHandler('Fieldelements')->delete($fieldElementsObj)) {
$GLOBALS['xoopsTpl']->assign('error', $fieldElementsObj->getHtmlErrors());
}
unset($fieldElementsObj);
}
- redirect_header('tables.php', 3, _AM_TDMCREATE_FORMDELOK);
+ // Delete items in table fields
+ $fields = $helper->getHandler('Fields')->getAllFieldsByTableId($tableId);
+ foreach (\array_keys($fields) as $fd) {
+ $fieldsObj = $helper->getHandler('Fields')->get($fields[$fd]->getVar('field_id'));
+ if (!$helper->getHandler('Fields')->delete($fieldsObj)) {
+ $GLOBALS['xoopsTpl']->assign('error', $fieldsObj->getHtmlErrors());
+ }
+ unset($fieldElementsObj);
+ }
+ \redirect_header('tables.php', 3, \_AM_MODULEBUILDER_FORMDELOK);
} else {
$GLOBALS['xoopsTpl']->assign('error', $tablesObj->getHtmlErrors());
}
} else {
- xoops_confirm(['ok' => 1, 'table_id' => $tableId, 'op' => 'delete'], \Xmf\Request::getString('REQUEST_URI', '', 'SERVER'), sprintf(_AM_TDMCREATE_FORMSUREDEL, $tablesObj->getVar('table_name')));
+ $customConfirm = new \XoopsModules\Modulebuilder\Common\Confirm(
+ ['ok' => 1, 'table_id' => $tableId, 'table_mid' => $tableMid, 'op' => 'delete'], \Xmf\Request::getString('REQUEST_URI', '', 'SERVER'), $tablesObj->getVar('table_name')
+ );
+ $form = $customConfirm->getFormConfirm();
+ $GLOBALS['xoopsTpl']->assign('form', $form->render());
}
break;
case 'display':
@@ -274,7 +313,7 @@
}
}
if ($helper->getHandler('Modules')->insert($modulesObj)) {
- redirect_header('modules.php', 3, _AM_TDMCREATE_TOGGLE_SUCCESS);
+ \redirect_header('modules.php', 3, \_AM_MODULEBUILDER_TOGGLE_SUCCESS);
}
$GLOBALS['xoopsTpl']->assign('error', $modulesObj->getHtmlErrors());
}
@@ -289,10 +328,10 @@
}
}
if ($helper->getHandler('Tables')->insert($tablesObj)) {
- redirect_header('tables.php', 3, _AM_TDMCREATE_TOGGLE_SUCCESS);
+ \redirect_header('tables.php', 3, \_AM_MODULEBUILDER_TOGGLE_SUCCESS);
}
$GLOBALS['xoopsTpl']->assign('error', $tablesObj->getHtmlErrors());
}
break;
}
-include __DIR__ . '/footer.php';
+require __DIR__ . '/footer.php';
diff --git a/assets/css/admin/index.html b/assets/css/admin/index.html
deleted file mode 100644
index 2c5cdd3f..00000000
--- a/assets/css/admin/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/assets/css/admin/index.php b/assets/css/admin/index.php
new file mode 100644
index 00000000..e5ee0725
--- /dev/null
+++ b/assets/css/admin/index.php
@@ -0,0 +1,2 @@
+history.go(-1);
\ No newline at end of file
diff --git a/assets/css/index.php b/assets/css/index.php
new file mode 100644
index 00000000..e5ee0725
--- /dev/null
+++ b/assets/css/index.php
@@ -0,0 +1,2 @@
+history.go(-1);
\ No newline at end of file
diff --git a/assets/fonts/index.php b/assets/fonts/index.php
new file mode 100644
index 00000000..e5ee0725
--- /dev/null
+++ b/assets/fonts/index.php
@@ -0,0 +1,2 @@
+history.go(-1);
\ No newline at end of file
diff --git a/assets/images/icons/16/index.php b/assets/images/icons/16/index.php
new file mode 100644
index 00000000..e5ee0725
--- /dev/null
+++ b/assets/images/icons/16/index.php
@@ -0,0 +1,2 @@
+history.go(-1);
\ No newline at end of file
diff --git a/assets/images/icons/24/index.php b/assets/images/icons/24/index.php
new file mode 100644
index 00000000..e5ee0725
--- /dev/null
+++ b/assets/images/icons/24/index.php
@@ -0,0 +1,2 @@
+history.go(-1);
\ No newline at end of file
diff --git a/assets/images/icons/32/index.php b/assets/images/icons/32/index.php
new file mode 100644
index 00000000..e5ee0725
--- /dev/null
+++ b/assets/images/icons/32/index.php
@@ -0,0 +1,2 @@
+history.go(-1);
\ No newline at end of file
diff --git a/assets/images/icons/index.php b/assets/images/icons/index.php
new file mode 100644
index 00000000..e5ee0725
--- /dev/null
+++ b/assets/images/icons/index.php
@@ -0,0 +1,2 @@
+history.go(-1);
\ No newline at end of file
diff --git a/assets/images/index.php b/assets/images/index.php
new file mode 100644
index 00000000..e5ee0725
--- /dev/null
+++ b/assets/images/index.php
@@ -0,0 +1,2 @@
+history.go(-1);
\ No newline at end of file
diff --git a/assets/images/logos/index.php b/assets/images/logos/index.php
new file mode 100644
index 00000000..e5ee0725
--- /dev/null
+++ b/assets/images/logos/index.php
@@ -0,0 +1,2 @@
+history.go(-1);
\ No newline at end of file
diff --git a/assets/index.php b/assets/index.php
new file mode 100644
index 00000000..e5ee0725
--- /dev/null
+++ b/assets/index.php
@@ -0,0 +1,2 @@
+history.go(-1);
\ No newline at end of file
diff --git a/assets/js/index.php b/assets/js/index.php
new file mode 100644
index 00000000..e5ee0725
--- /dev/null
+++ b/assets/js/index.php
@@ -0,0 +1,2 @@
+ - ";
+ $path_status .= "$path (" . \constant('CO_' . $moduleDirNameUpper . '_' . 'DC_AVAILABLE') . ') ';
+ $currentMode = \mb_substr(\decoct(\fileperms($path)), 2);
+ if ($currentMode != \decoct($mode)) {
+ $path_status = "";
+ $path_status .= $path . \sprintf(\constant('CO_' . $moduleDirNameUpper . '_' . 'DC_NOTWRITABLE'), \decoct($mode), $currentMode);
+ $path_status .= "';
+ }
+ } else {
+ $currentMode = \mb_substr(\decoct(\fileperms($path)), 2);
+ $path_status = "";
+ $path_status .= $path . \sprintf(\constant('CO_' . $moduleDirNameUpper . '_' . 'DC_NOTWRITABLE'), \decoct($mode), $currentMode);
+ $path_status .= "';
+ }
+
+ return $path_status;
+ }
+
+ /**
+ * @param $target
+ * @param int $mode
+ *
+ * @return bool
+ */
+ public static function createDirectory($target, int $mode = 0777)
+ {
+ $target = \str_replace('..', '', $target);
+
+ // https://www.php.net/manual/en/function.mkdir.php
+ return \is_dir($target)
+ || (
+ self::createDirectory(\dirname($target), $mode)
+ && (\mkdir($target, $mode) || \is_dir($target))
+ );
+ }
+
+ /**
+ * @param $target
+ * @param int $mode
+ *
+ * @return bool
+ */
+ public static function setDirectoryPermissions($target, int $mode = 0777)
+ {
+ $target = \str_replace('..', '', $target);
+
+ return @\chmod($target, (int)$mode);
+ }
+
+ /**
+ * @param $dir_path
+ *
+ * @return bool
+ */
+ public static function dirExists($dir_path)
+ {
+ return \is_dir($dir_path);
+ }
+}
+
+$op = Request::getString('op', '', 'POST');
+switch ($op) {
+ case 'createdir':
+ if (!\Xmf\Request::hasVar('path', 'POST') || !\Xmf\Request::hasVar('redirect', 'POST')) {
+ break;
+ }
+ $path = \Xmf\Request::getString('path','', 'POST');
+ $redirect = \Xmf\Request::getString('redirect','', 'POST');
+ $msg = DirectoryChecker::createDirectory($path) ? \constant('CO_' . $moduleDirNameUpper . '_' . 'DC_DIRCREATED') : \constant('CO_' . $moduleDirNameUpper . '_' . 'DC_DIRNOTCREATED');
+ \redirect_header($redirect, 2, $msg . ': ' . $path);
+ break;
+ case 'setdirperm':
+ if (!\Xmf\Request::hasVar('path', 'POST') || !\Xmf\Request::hasVar('redirect', 'POST') || !\Xmf\Request::hasVar('mode', 'POST')) {
+ break;
+ }
+ $path = \Xmf\Request::getString('path','', 'POST');
+ $redirect = \Xmf\Request::getString('redirect','', 'POST');
+ $mode = \Xmf\Request::getInt('mode',0 , 'POST');
+ $msg = DirectoryChecker::setDirectoryPermissions($path, $mode) ? \constant('CO_' . $moduleDirNameUpper . '_' . 'DC_PERMSET') : \constant('CO_' . $moduleDirNameUpper . '_' . 'DC_PERMNOTSET');
+
+ \redirect_header($redirect, 2, $msg . ': ' . $path);
+ break;
+}
diff --git a/class/Common/FileChecker.php b/class/Common/FileChecker.php
new file mode 100644
index 00000000..8d0872d6
--- /dev/null
+++ b/class/Common/FileChecker.php
@@ -0,0 +1,159 @@
+";
+ $path_status .= "$file_path (" . \constant('CO_' . $moduleDirNameUpper . '_' . 'FC_AVAILABLE') . ') ';
+ } else {
+ $path_status = "";
+ $path_status .= "$file_path (" . \constant('CO_' . $moduleDirNameUpper . '_' . 'FC_NOTAVAILABLE') . ') ';
+ }
+ } else {
+ if (self::compareFiles($file_path, $original_file_path)) {
+ $path_status = "";
+ $path_status .= "$file_path (" . \constant('CO_' . $moduleDirNameUpper . '_' . 'FC_AVAILABLE') . ') ';
+ } else {
+ $path_status = "";
+ $path_status .= "$file_path (" . \constant('CO_' . $moduleDirNameUpper . '_' . 'FC_NOTAVAILABLE') . ') ';
+ $path_status .= "';
+ }
+ }
+
+ return $path_status;
+ }
+
+ /**
+ * @param $source_path
+ * @param $destination_path
+ *
+ * @return bool
+ */
+ public static function copyFile($source_path, $destination_path)
+ {
+ $source_path = \str_replace('..', '', $source_path);
+ $destination_path = \str_replace('..', '', $destination_path);
+
+ return @\copy($source_path, $destination_path);
+ }
+
+ /**
+ * @param $file1_path
+ * @param $file2_path
+ *
+ * @return bool
+ */
+ public static function compareFiles($file1_path, $file2_path)
+ {
+ if (!self::fileExists($file1_path) || !self::fileExists($file2_path)) {
+ return false;
+ }
+ if (\filetype($file1_path) !== \filetype($file2_path)) {
+ return false;
+ }
+ if (\filesize($file1_path) !== \filesize($file2_path)) {
+ return false;
+ }
+ $crc1 = \mb_strtoupper(\dechex(\crc32(\file_get_contents($file1_path))));
+ $crc2 = \mb_strtoupper(\dechex(\crc32(\file_get_contents($file2_path))));
+
+ return !($crc1 !== $crc2);
+ }
+
+ /**
+ * @param $file_path
+ *
+ * @return bool
+ */
+ public static function fileExists($file_path)
+ {
+ return \is_file($file_path);
+ }
+
+ /**
+ * @param $target
+ * @param int $mode
+ *
+ * @return bool
+ */
+ public static function setFilePermissions($target, int $mode = 0777)
+ {
+ $target = \str_replace('..', '', $target);
+
+ return @\chmod($target, (int)$mode);
+ }
+}
+
+$op = Request::getString('op', '', 'POST');
+if ($op == 'copyfile') {
+ if (!\Xmf\Request::hasVar('original_file_path', 'POST')
+ || !\Xmf\Request::hasVar('file_path', 'POST')
+ || !\Xmf\Request::hasVar('redirect', 'POST')) {
+ return;
+ }
+ $original_file_path = \Xmf\Request::getString('original_file_path');
+ $file_path = \Xmf\Request::getString('file_path');
+ $redirect =\Xmf\Request::getString('redirect');
+ $msg = FileChecker::copyFile($original_file_path, $file_path) ? \constant('CO_' . $moduleDirNameUpper . '_' . 'FC_FILECOPIED') : \constant('CO_' . $moduleDirNameUpper . '_' . 'FC_FILENOTCOPIED');
+ \redirect_header($redirect, 2, $msg . ': ' . $file_path);
+}
diff --git a/class/Common/FilesManagement.php b/class/Common/FilesManagement.php
index 549ef697..e9ca0196 100644
--- a/class/Common/FilesManagement.php
+++ b/class/Common/FilesManagement.php
@@ -1,6 +1,6 @@
-
*/
trait FilesManagement
{
/**
- * Function responsible for checking if a directory exists, we can also write in and create an index.html file
+ * Function responsible for checking if a directory exists, we can also write in and create an index.php file
*
* @param string $folder The full path of the directory to check
*
* @return void
* @throws \RuntimeException
*/
- public static function createFolder($folder)
+ public static function createFolder($folder): void
{
try {
- if (!file_exists($folder)) {
- if (!is_dir($folder) && !mkdir($folder) && !is_dir($folder)) {
- throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
+ if (!\file_exists($folder)) {
+ if (!\is_dir($folder) && !\mkdir($folder) && !\is_dir($folder)) {
+ throw new \RuntimeException(\sprintf('Unable to create the %s directory', $folder));
}
- file_put_contents($folder . '/index.html', '');
+ \file_put_contents($folder . '/index.php', "getMessage(), ''; @@ -43,36 +43,36 @@ public static function createFolder($folder) } /** - * @param $file - * @param $folder + * @param string $file + * @param string $folder * @return bool */ - public static function copyFile($file, $folder) + public static function copyFile(string $file, string $folder): bool { - return copy($file, $folder); + return \copy($file, $folder); } /** * @param $src * @param $dst */ - public static function recurseCopy($src, $dst) + public static function recurseCopy($src, $dst): void { - $dir = opendir($src); - // @mkdir($dst); - if (!@mkdir($dst) && !is_dir($dst)) { + $dir = \opendir($src); + // @\mkdir($dst); + if (!@\mkdir($dst) && !\is_dir($dst)) { throw new \RuntimeException('The directory ' . $dst . ' could not be created.'); } - while (false !== ($file = readdir($dir))) { + while (false !== ($file = \readdir($dir))) { if (('.' !== $file) && ('..' !== $file)) { - if (is_dir($src . '/' . $file)) { + if (\is_dir($src . '/' . $file)) { self::recurseCopy($src . '/' . $file, $dst . '/' . $file); } else { - copy($src . '/' . $file, $dst . '/' . $file); + \copy($src . '/' . $file, $dst . '/' . $file); } } } - closedir($dir); + \closedir($dir); } /** @@ -82,30 +82,30 @@ public static function recurseCopy($src, $dst) * @return bool Returns true on success, false on failure * @author Aidan Lister
'; diff --git a/class/Common/SysUtility.php b/class/Common/SysUtility.php new file mode 100644 index 00000000..48840524 --- /dev/null +++ b/class/Common/SysUtility.php @@ -0,0 +1,215 @@ + + * @author Mamba
' . $tabledef['name']; + //check whether table exist or not + $table = $tabledef['name']; + $check = $GLOBALS['xoopsDB']->queryF("SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='$table'"); + $numRows = $GLOBALS['xoopsDB']->getRowsNum($check); + if ($numRows) { + //table exist + $this->result[] = 'Table exist:' . $table; + $this->checkTableFields($table, $tabledef['fields']); + } else { + if ($this::CHECKTYPE_UPDATE == $this->checktype || $this::CHECKTYPE_UPDATE_REPORT == $this->checktype) { + // create new table + $sql = $tabledef['sql']; + if ($GLOBALS['xoopsDB']->queryF($sql)) { + $this->result[] = 'Table created:' . $table; + } else { + \xoops_error($GLOBALS['xoopsDB']->error() . '
' . $sql); + $this->result[] = 'Error creating table:' . $table; + } + } else { + $this->result[] = 'Table do not exist:' . $table . ' (creation not activated)'; + } + } + } + + if (self::CHECKTYPE_REPORT == $this->checktype || self::CHECKTYPE_UPDATE_REPORT == $this->checktype) { + return $this->result; + } + + return []; + } + + private function readSQLFile() + { + $tabledefs = []; + + $moduleHandler = \xoops_getHandler('module'); + $module = $moduleHandler->getByDirname($this->mydirname); + $module->loadInfoAsVar($this->mydirname); + $sqlfile = $module->getInfo('sqlfile'); + $sql_file_path = \XOOPS_ROOT_PATH . '/modules/' . $this->mydirname . '/' . $sqlfile[\XOOPS_DB_TYPE]; + + if (\file_exists($sql_file_path)) { + require_once \XOOPS_ROOT_PATH . '/class/database/sqlutility.php'; + $sqlutil = new \SqlUtility(); + $pieces = []; + $sql_query = \trim(file_get_contents($sql_file_path)); + $sqlutil::splitMySqlFile($pieces, $sql_query); + + $countTable = 0; + foreach ($pieces as $piece) { + $singleSql = $sqlutil::prefixQuery($piece, $GLOBALS['xoopsDB']->prefix()); + $lines = \preg_split('/\r\n|\n|\r/', $piece); + //var_dump($lines); + $needle1 = 'create table'; + if ($needle1 == \mb_strtolower($singleSql[1])) { + $countLine = 0; + $tabledefs[$countTable]['sql'] = $singleSql[0]; + $tabledefs[$countTable]['name'] = $GLOBALS['xoopsDB']->prefix() . '_' . $singleSql[4]; + $this->after = ''; + foreach($lines as $line) { + if ($countLine > 0) { + $needle2 = 'primary key'; + $needle3 = 'unique key'; + $needle4 = 'key'; + if (0 === \mb_stripos(\trim($line), $needle2)) { + $tabledefs[$countTable][$needle2] = $line; + } elseif (0 === \mb_stripos(\trim($line), $needle3)) { + $tabledefs[$countTable][$needle3] = $line; + } elseif (0 === \mb_stripos(\trim($line), $needle4)) { + $tabledefs[$countTable][$needle4] = $line; + } else { + if (\mb_strpos($line, '`') > 0) { + $tabledefs[$countTable]['fields'][] = $this->extractField($line); + } + } + } + $countLine++; + } + $countTable++; + } + } + //var_dump($tabledefs); + } else { + $this->result[] = 'File do not exist:' . $sql_file_path; + } + + return $tabledefs; + } + + private function extractKey($line) + { + //todo: split string into single keys + $needle = '('; + $key_text = \substr($line, \strpos($line, $needle) + 1); + $needle = ')'; + return \substr($key_text, 0, \strpos($key_text, $needle)); + } + + private function extractField($line) + { + //todo + $counter = 0; + $clean = mb_substr(\trim($line), 0, -1); + $params = \array_values(\array_filter(\explode(' ', $clean))); + $field['sql'] = $clean; + $field['name'] = \trim($params[$counter], '`'); + $counter++; + $field['type'] = $params[$counter]; + $counter++; + if ('unsigned' == \mb_strtolower($params[$counter])) { + $field['unsigned'] = $params[$counter]; + $counter++; + } + if ('not' == \mb_strtolower($params[$counter]) && 'null' == \mb_strtolower($params[$counter + 1])) { + $field['null'] = $params[$counter] . ' ' . $params[$counter + 1]; + $counter = $counter+2; + } + if (\count($params) > $counter) { + if ('auto_increment' == \mb_strtolower($params[$counter])) { + $field['auto_increment'] = $params[$counter]; + $counter++; + } + } + if (\count($params) > $counter) { + if ('default' == \mb_strtolower($params[$counter])) { + $field['default'] = $params[$counter] . ' ' . $params[$counter + 1]; + //$counter = $counter + 2; + } + } + + $field['after'] = $this->after; + $this->after = $field['name']; + + return $field; + } + + private function checkTableFields($table, $fields) + { + //to be created + foreach ($fields as $field) { + //check whether column exist or not + $fieldname = $field['name']; + $check = $GLOBALS['xoopsDB']->queryF("SHOW COLUMNS FROM `$table` LIKE '$fieldname'"); + $numRows = $GLOBALS['xoopsDB']->getRowsNum($check); + if ($numRows) { + //field exist + $this->checkField($field); + } else { + if (self::CHECKTYPE_UPDATE == $this->checktype || self::CHECKTYPE_UPDATE_REPORT == $this->checktype) { + // create new field + $sql = "ALTER TABLE `$table` ADD " . $field['sql']; + if ('' !== (string)$field['after']) { + $sql .= ' AFTER `' . $field['after'] . '`;'; + } + if ($GLOBALS['xoopsDB']->queryF($sql)) { + $this->result[] = 'Field added:' . $fieldname; + } else { + \xoops_error($GLOBALS['xoopsDB']->error() . '
' . $sql); + $this->result[] = "Error when adding '$fieldname' to table '$table'."; + } + } else { + $this->result[] = 'Field do not exist:' . $fieldname . ' (creation not activated)'; + } + } + } + + return true; + } + + private function checkField($field): void + { + //to be created + $this->result[] = 'Field exist:' . $field['name'] . ' - no changes'; + + } +} diff --git a/class/Common/TestdataButtons.php b/class/Common/TestdataButtons.php new file mode 100644 index 00000000..3c7791df --- /dev/null +++ b/class/Common/TestdataButtons.php @@ -0,0 +1,83 @@ + + * @copyright {@link https://xoops.org/ XOOPS Project} + * @license GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html) + */ + +use Xmf\Request; +use Xmf\Yaml; +use XoopsModules\Modulebuilder\Helper; + +/** @var Helper $helper */ + +/** + * Class SysUtility + */ +class TestdataButtons +{ + /** Button status constants */ + private const SHOW_BUTTONS = 1; + private const HIDE_BUTTONS = 0; + + /** + * Load the test button configuration + * + * @param \Xmf\Module\Admin $adminObject + * + * @return void + */ + public static function loadButtonConfig(\Xmf\Module\Admin $adminObject): void + { + $moduleDirName = \basename(\dirname(__DIR__, 2)); + $moduleDirNameUpper = \mb_strtoupper($moduleDirName); + $helper = Helper::getInstance(); + $yamlFile = $helper->path('/config/admin.yml'); + $config = Yaml::readWrapped($yamlFile); // work with phpmyadmin YAML dumps + $displaySampleButton = $config['displaySampleButton']; + + if (self::SHOW_BUTTONS == $displaySampleButton) { + \xoops_loadLanguage('admin/modulesadmin', 'system'); + $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA'), $helper->url('testdata/index.php?op=load')); + $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA'), $helper->url('testdata/index.php?op=save')); + $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA'), $helper->url('testdata/index.php?op=clear'), 'alert'); + // $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA'), $helper->url( 'testdata/index.php?op=exportschema'), 'add'); + $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'HIDE_SAMPLEDATA_BUTTONS'), '?op=hide_buttons', 'delete'); + } else { + $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLEDATA_BUTTONS'), '?op=show_buttons'); + // $displaySampleButton = $config['displaySampleButton']; + } + } + + public static function hideButtons(): void + { + $yamlFile = \dirname(__DIR__, 2) . '/config/admin.yml'; + $app = []; + $app['displaySampleButton'] = 0; + Yaml::save($app, $yamlFile); + \redirect_header('index.php', 0); + } + + public static function showButtons(): void + { + $yamlFile = \dirname(__DIR__, 2) . '/config/admin.yml'; + $app = []; + $app['displaySampleButton'] = 1; + Yaml::save($app, $yamlFile); + \redirect_header('index.php', 0); + } +} diff --git a/class/Common/VersionChecks.php b/class/Common/VersionChecks.php index 25c18881..a18c6f28 100644 --- a/class/Common/VersionChecks.php +++ b/class/Common/VersionChecks.php @@ -1,6 +1,6 @@ - */ trait VersionChecks @@ -29,24 +29,24 @@ trait VersionChecks */ public static function checkVerXoops(\XoopsModule $module = null, $requiredVer = null) { - $moduleDirName = basename(dirname(dirname(__DIR__))); - $moduleDirNameUpper = mb_strtoupper($moduleDirName); + $moduleDirName = \basename(\dirname(__DIR__, 2)); + $moduleDirNameUpper = \mb_strtoupper($moduleDirName); if (null === $module) { $module = \XoopsModule::getByDirname($moduleDirName); } - xoops_loadLanguage('admin', $moduleDirName); - xoops_loadLanguage('common', $moduleDirName); + \xoops_loadLanguage('admin', $moduleDirName); + \xoops_loadLanguage('common', $moduleDirName); //check for minimum XOOPS version - $currentVer = mb_substr(XOOPS_VERSION, 6); // get the numeric part of string + $currentVer = \mb_substr(\XOOPS_VERSION, 6); // get the numeric part of string if (null === $requiredVer) { $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string } $success = true; - if (version_compare($currentVer, $requiredVer, '<')) { + if ($module->versionCompare($currentVer, $requiredVer, '<')) { $success = false; - $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer)); + $module->setErrors(\sprintf(\constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer)); } return $success; @@ -61,21 +61,21 @@ public static function checkVerXoops(\XoopsModule $module = null, $requiredVer = */ public static function checkVerPhp(\XoopsModule $module = null) { - $moduleDirName = basename(dirname(dirname(__DIR__))); - $moduleDirNameUpper = mb_strtoupper($moduleDirName); + $moduleDirName = \basename(\dirname(__DIR__, 2)); + $moduleDirNameUpper = \mb_strtoupper($moduleDirName); if (null === $module) { $module = \XoopsModule::getByDirname($moduleDirName); } - xoops_loadLanguage('admin', $moduleDirName); + \xoops_loadLanguage('admin', $moduleDirName); // check for minimum PHP version $success = true; - $verNum = PHP_VERSION; + $verNum = \PHP_VERSION; $reqVer = &$module->getInfo('min_php'); if (false !== $reqVer && '' !== $reqVer) { - if (version_compare($verNum, $reqVer, '<')) { - $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum)); + if (\version_compare($verNum, $reqVer, '<')) { + $module->setErrors(\sprintf(\constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum)); $success = false; } } @@ -84,7 +84,7 @@ public static function checkVerPhp(\XoopsModule $module = null) } /** - * compares current module version with latest GitHub release + * compares current module version with the latest GitHub release * @static * @param \Xmf\Module\Helper $helper * @param string|null $source @@ -92,52 +92,52 @@ public static function checkVerPhp(\XoopsModule $module = null) * * @return string|array info about the latest module version, if newer */ - public static function checkVerModule($helper, $source = 'github', $default = 'master') + public static function checkVerModule(\Xmf\Module\Helper $helper, ?string $source = 'github', ?string $default = 'master'): ?array { - $moduleDirName = basename(dirname(dirname(__DIR__))); - $moduleDirNameUpper = mb_strtoupper($moduleDirName); + $moduleDirName = \basename(\dirname(__DIR__, 2)); + $moduleDirNameUpper = \mb_strtoupper($moduleDirName); $update = ''; $repository = 'XoopsModules25x/' . $moduleDirName; // $repository = 'XoopsModules25x/publisher'; //for testing only - $ret = ''; + $ret = null; $infoReleasesUrl = "https://api.github.com/repos/$repository/releases"; if ('github' === $source) { - if (function_exists('curl_init') && false !== ($curlHandle = curl_init())) { - curl_setopt($curlHandle, CURLOPT_URL, $infoReleasesUrl); - curl_setopt($curlHandle, CURLOPT_RETURNTRANSFER, true); - curl_setopt($curlHandle, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curlHandle, CURLOPT_HTTPHEADER, ["User-Agent:Publisher\r\n"]); - $curlReturn = curl_exec($curlHandle); + if (\function_exists('curl_init') && false !== ($curlHandle = \curl_init())) { + \curl_setopt($curlHandle, \CURLOPT_URL, $infoReleasesUrl); + \curl_setopt($curlHandle, \CURLOPT_RETURNTRANSFER, true); + \curl_setopt($curlHandle, \CURLOPT_SSL_VERIFYPEER, false); + \curl_setopt($curlHandle, \CURLOPT_HTTPHEADER, ["User-Agent:Publisher\r\n"]); + $curlReturn = \curl_exec($curlHandle); if (false === $curlReturn) { - trigger_error(curl_error($curlHandle)); + \trigger_error(\curl_error($curlHandle)); } elseif (mb_strpos($curlReturn, 'Not Found')) { - trigger_error('Repository Not Found: ' . $infoReleasesUrl); + \trigger_error('Repository Not Found: ' . $infoReleasesUrl); } else { - $file = json_decode($curlReturn, false); - $latestVersionLink = sprintf("https://github.com/$repository/archive/%s.zip", $file ? reset($file)->tag_name : $default); + $file = \json_decode($curlReturn, false); + $latestVersionLink = \sprintf("https://github.com/$repository/archive/%s.zip", $file ? \reset($file)->tag_name : $default); $latestVersion = $file[0]->tag_name; $prerelease = $file[0]->prerelease; if ('master' !== $latestVersionLink) { - $update = constant('CO_' . $moduleDirNameUpper . '_' . 'NEW_VERSION') . $latestVersion; + $update = \constant('CO_' . $moduleDirNameUpper . '_' . 'NEW_VERSION') . $latestVersion; } //"PHP-standardized" version - $latestVersion = mb_strtolower($latestVersion); + $latestVersion = \mb_strtolower($latestVersion); if (false !== mb_strpos($latestVersion, 'final')) { - $latestVersion = str_replace('_', '', mb_strtolower($latestVersion)); - $latestVersion = str_replace('final', '', mb_strtolower($latestVersion)); + $latestVersion = \str_replace('_', '', \mb_strtolower($latestVersion)); + $latestVersion = \str_replace('final', '', \mb_strtolower($latestVersion)); } $moduleVersion = ($helper->getModule()->getInfo('version') . '_' . $helper->getModule()->getInfo('module_status')); //"PHP-standardized" version - $moduleVersion = str_replace(' ', '', mb_strtolower($moduleVersion)); + $moduleVersion = \str_replace(' ', '', \mb_strtolower($moduleVersion)); // $moduleVersion = '1.0'; //for testing only // $moduleDirName = 'publisher'; //for testing only - if (!$prerelease && version_compare($moduleVersion, $latestVersion, '<')) { + if (!$prerelease && \version_compare($moduleVersion, $latestVersion, '<')) { $ret = []; $ret[] = $update; $ret[] = $latestVersionLink; } } - curl_close($curlHandle); + \curl_close($curlHandle); } } diff --git a/class/Common/index.html b/class/Common/index.html deleted file mode 100644 index 74b6f45c..00000000 --- a/class/Common/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/class/Common/index.php b/class/Common/index.php new file mode 100644 index 00000000..e5ee0725 --- /dev/null +++ b/class/Common/index.php @@ -0,0 +1,2 @@ + - Website:
| ' . $title . ' | ||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| ' . _AM_TDMCREATE_FIELD_ID . ' | ')); - $form->addElement(new Tdmcreate\Html\FormLabel('' . _AM_TDMCREATE_FIELD_NAME . ' | ')); - $form->addElement(new Tdmcreate\Html\FormLabel('' . _AM_TDMCREATE_FIELD_ELEMENT . ' | ')); - $form->addElement(new Tdmcreate\Html\FormLabel('' . _AM_TDMCREATE_FIELD_TYPE . ' | ')); - $form->addElement(new Tdmcreate\Html\FormLabel('' . _AM_TDMCREATE_FIELD_VALUE . '')); - $form->addElement(new Tdmcreate\Html\FormLabel(' | ' . _AM_TDMCREATE_FIELD_ATTRIBUTE . '')); - $form->addElement(new Tdmcreate\Html\FormLabel(' | ' . _AM_TDMCREATE_FIELD_NULL . '')); - $form->addElement(new Tdmcreate\Html\FormLabel(' | ' . _AM_TDMCREATE_FIELD_DEFAULT . '')); - $form->addElement(new Tdmcreate\Html\FormLabel(' | ' . _AM_TDMCREATE_FIELD_KEY . '')); - $form->addElement(new Tdmcreate\Html\FormLabel(' | ' . _AM_TDMCREATE_FIELD_PARAMETERS . '')); - $form->addElement(new Tdmcreate\Html\FormLabel(' | |||||||||||
| ' . $title . ' | ||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| ' . \_AM_MODULEBUILDER_FIELD_ID . ' | ')); + $form->addElement(new Modulebuilder\Html\FormLabel('' . \_AM_MODULEBUILDER_FIELD_NAME . ' | ')); + $form->addElement(new Modulebuilder\Html\FormLabel('' . \_AM_MODULEBUILDER_FIELD_ELEMENT . ' | ')); + $form->addElement(new Modulebuilder\Html\FormLabel('' . \_AM_MODULEBUILDER_FIELD_TYPE . ' | ')); + $form->addElement(new Modulebuilder\Html\FormLabel('' . \_AM_MODULEBUILDER_FIELD_VALUE . '')); + $form->addElement(new Modulebuilder\Html\FormLabel(' | ' . \_AM_MODULEBUILDER_FIELD_ATTRIBUTE . '')); + $form->addElement(new Modulebuilder\Html\FormLabel(' | ' . \_AM_MODULEBUILDER_FIELD_NULL . '')); + $form->addElement(new Modulebuilder\Html\FormLabel(' | ' . \_AM_MODULEBUILDER_FIELD_DEFAULT . '')); + $form->addElement(new Modulebuilder\Html\FormLabel(' | ' . \_AM_MODULEBUILDER_FIELD_KEY . '')); + $form->addElement(new Modulebuilder\Html\FormLabel(' | ' . \_AM_MODULEBUILDER_FIELD_PARAMETERS . '')); + $form->addElement(new Modulebuilder\Html\FormLabel(' | |||||||||||
| ' . $i . ' | ')); + $form->addElement(new Modulebuilder\Html\FormLabel('' . $i . ' | ')); // Field Name $thisFieldName = (!empty($fName) ? ((1 == $i) ? $fName . '_id' : $fName . '_') : ''); - $fieldName = new \XoopsFormText(_AM_TDMCREATE_FIELD_NAME, 'field_name[' . $i . ']', 15, 255, $thisFieldName); - $form->addElement(new Tdmcreate\Html\FormLabel('' . $fieldName->render() . ' | ')); + //$thisFieldName = (1 === $i) ? 'id' : ''; + $fieldName = new \XoopsFormText(\_AM_MODULEBUILDER_FIELD_NAME, 'field_name[' . $i . ']', 15, 255, $thisFieldName); + $form->addElement(new Modulebuilder\Html\FormLabel('' . $fieldName->render() . ' | ')); // Field Element if ((1 == $i) && (1 == $tableAutoincrement)) { - $form->addElement(new Tdmcreate\Html\FormLabel('')); + $form->addElement(new Modulebuilder\Html\FormLabel(' | ')); } else { // Field Elements $crElement = new \CriteriaCompo(); $crElement->add(new \Criteria('fieldelement_tid', 0)); $crTable = new \CriteriaCompo(); $crTable->add(new \Criteria('fieldelement_mid', $fieldMid)); - $fieldElementsSelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_ELEMENT_NAME, 'field_element[' . $i . ']'); - $fieldElementsSelect->addOptionArray($helper->getHandler('Fieldelements')->getFieldElementsList($crElement)); + $fieldElementsSelect = new \XoopsFormSelect(\_AM_MODULEBUILDER_FIELD_ELEMENT_NAME, 'field_element[' . $i . ']'); + $fieldElementsSelect->addOptionArray($helper->getHandler('Fieldelements')->getFieldelementsList($crElement)); $fieldElementsSelect->addOptionArray($helper->getHandler('Fieldelements')->getList($crTable)); - $fieldElementsSelect->setExtra(" onchange='presetField(". $i . ")' "); + $fieldElementsSelect->setExtra(" onchange='presetField(" . $i . ")' "); unset($crElement, $crTable); - $form->addElement(new Tdmcreate\Html\FormLabel(' | ' . $fieldElementsSelect->render() . ' | ')); + $form->addElement(new Modulebuilder\Html\FormLabel('' . $fieldElementsSelect->render() . ' | ')); unset($fieldElementsSelect); } // Field Type $value = (1 == $i) && (1 == $tableAutoincrement) ? '2' : ''; - $fieldTypeSelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_type[' . $i . ']', $value); + $fieldTypeSelect = new \XoopsFormSelect(\_AM_MODULEBUILDER_FIELD_TYPE, 'field_type[' . $i . ']', $value); $fieldTypeSelect->addOptionArray($helper->getHandler('Fieldtype')->getList()); - $form->addElement(new Tdmcreate\Html\FormLabel('' . $fieldTypeSelect->render() . ' | ')); + $form->addElement(new Modulebuilder\Html\FormLabel('' . $fieldTypeSelect->render() . ' | ')); // Field Value $value = (1 == $i) && (1 == $tableAutoincrement) ? '8' : ''; - $fieldValue = new \XoopsFormText(_AM_TDMCREATE_FIELD_VALUE, 'field_value[' . $i . ']', 10, 200, $value); - $form->addElement(new Tdmcreate\Html\FormLabel('' . $fieldValue->render() . ' | ')); + $fieldValue = new \XoopsFormText(\_AM_MODULEBUILDER_FIELD_VALUE, 'field_value[' . $i . ']', 10, 200, $value); + $form->addElement(new Modulebuilder\Html\FormLabel('' . $fieldValue->render() . ' | ')); // Field Attributes $value = (1 == $i) && (1 == $tableAutoincrement) ? '3' : ''; - $fieldAttributesSelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_attribute[' . $i . ']', $value); + $fieldAttributesSelect = new \XoopsFormSelect(\_AM_MODULEBUILDER_FIELD_TYPE, 'field_attribute[' . $i . ']', $value); $fieldAttributesSelect->addOptionArray($helper->getHandler('Fieldattributes')->getList()); - $form->addElement(new Tdmcreate\Html\FormLabel('' . $fieldAttributesSelect->render() . ' | ')); + $form->addElement(new Modulebuilder\Html\FormLabel('' . $fieldAttributesSelect->render() . ' | ')); // Field Null - $value = (1 == $i && 1 == $tableAutoincrement) ? '2' : '2'; - $fieldNullSelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_NULL, 'field_null[' . $i . ']', $value); + //$value = (1 == $i) && (1 == $tableAutoincrement) ? '2' : '2'; + $value = '2'; + $fieldNullSelect = new \XoopsFormSelect(\_AM_MODULEBUILDER_FIELD_NULL, 'field_null[' . $i . ']', $value); $fieldNullSelect->addOptionArray($helper->getHandler('Fieldnull')->getList()); - $form->addElement(new Tdmcreate\Html\FormLabel('' . $fieldNullSelect->render() . ' | ')); + $form->addElement(new Modulebuilder\Html\FormLabel('' . $fieldNullSelect->render() . ' | ')); // Field Default - $fieldDefault = new \XoopsFormText(_AM_TDMCREATE_FIELD_DEFAULT, 'field_default[' . $i . ']', 15, 25); - $form->addElement(new Tdmcreate\Html\FormLabel('' . $fieldDefault->render() . ' | ')); + $fieldDefault = new \XoopsFormText(\_AM_MODULEBUILDER_FIELD_DEFAULT, 'field_default[' . $i . ']', 15, 25); + $form->addElement(new Modulebuilder\Html\FormLabel('' . $fieldDefault->render() . ' | ')); // Field Key $value = (1 == $i) && (1 == $tableAutoincrement) ? '2' : ''; - $fieldKeySelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_KEY, 'field_key[' . $i . ']', $value); + $fieldKeySelect = new \XoopsFormSelect(\_AM_MODULEBUILDER_FIELD_KEY, 'field_key[' . $i . ']', $value); $fieldKeySelect->addOptionArray($helper->getHandler('Fieldkey')->getList()); - $form->addElement(new Tdmcreate\Html\FormLabel('' . $fieldKeySelect->render() . ' | ')); + $form->addElement(new Modulebuilder\Html\FormLabel('' . $fieldKeySelect->render() . ' | ')); // Field Void if ((1 == $i) && (1 == $tableAutoincrement)) { - $form->addElement(new Tdmcreate\Html\FormLabel('')); } else { // Box header row $parametersTray = new \XoopsFormElementTray('', ' | ' . _AM_TDMCREATE_FIELD_PARAMETERS_LIST . ' ' . $parametersTray->render() . ' | '));
+ $form->addElement(new Modulebuilder\Html\FormLabel('' . \_AM_MODULEBUILDER_FIELD_PARAMETERS_LIST . ' ' . $parametersTray->render() . ' | '));
}
}
@@ -319,9 +336,9 @@ private function getFormNewLine($form, $class, $i, $fieldMid, $fieldTid, $fName,
* @param bool $action
* @return mixed
*/
- public function getFormEdit($fieldMid = null, $fieldTid = null, $action = false)
+ public function getFormEdit($fieldMid = null, $fieldTid = null, bool $action = false)
{
- $helper = Tdmcreate\Helper::getInstance();
+ $helper = Modulebuilder\Helper::getInstance();
$tablesHandler = $helper->getHandler('Tables');
$tables = $tablesHandler->get($fieldTid);
$prefix = $tables->getVar('table_fieldname');
@@ -329,7 +346,7 @@ public function getFormEdit($fieldMid = null, $fieldTid = null, $action = false)
$fieldsForm = self::getInstance();
$form = $fieldsForm->getHeaderForm($prefix, $action);
- $class = 'even';
+ $class = 'even';
$tableAutoincrement = $tables->getVar('table_autoincrement');
$fieldNumb = $tables->getVar('table_nbfields');
$fName = $tables->getVar('table_fieldname');
@@ -345,6 +362,7 @@ public function getFormEdit($fieldMid = null, $fieldTid = null, $action = false)
foreach ($fieldElements as $fe) {
$form->addElement(new \XoopsFormHidden('fe_defaulttype[' . $fe->getVar('fieldelement_id') . ']', $fe->getVar('fieldelement_deftype')));
$form->addElement(new \XoopsFormHidden('fe_defaultvalue[' . $fe->getVar('fieldelement_id') . ']', $fe->getVar('fieldelement_defvalue')));
+ $form->addElement(new \XoopsFormHidden('fe_defaultfield[' . $fe->getVar('fieldelement_id') . ']', $fe->getVar('fieldelement_deffield')));
}
$id = 1;
foreach ($fields as $field) {
@@ -357,108 +375,120 @@ public function getFormEdit($fieldMid = null, $fieldTid = null, $action = false)
// show field with settings
$form->addElement(new \XoopsFormHidden('field_id[' . $id . ']', $fieldId));
- $form->addElement(new Tdmcreate\Html\FormLabel('
| ' . $id . ' | ')); + $form->addElement(new Modulebuilder\Html\FormLabel('' . $id . ' | ')); // Field Name - $fieldName = new \XoopsFormText(_AM_TDMCREATE_FIELD_NAME, 'field_name[' . $id . ']', 15, 255, $field->getVar('field_name')); - $form->addElement(new Tdmcreate\Html\FormLabel('' . $fieldName->render() . ' | ')); + $fieldName = new \XoopsFormText(\_AM_MODULEBUILDER_FIELD_NAME, 'field_name[' . $id . ']', 15, 255, $field->getVar('field_name')); + $form->addElement(new Modulebuilder\Html\FormLabel('' . $fieldName->render() . ' | ')); // Field Element if ((1 == $id) && (1 == $tableAutoincrement)) { - $form->addElement(new Tdmcreate\Html\FormLabel('')); + $form->addElement(new Modulebuilder\Html\FormLabel(' | ')); } else { // Field Elements $crElement = new \CriteriaCompo(); $crElement->add(new \Criteria('fieldelement_tid', 0)); $crTable = new \CriteriaCompo(); $crTable->add(new \Criteria('fieldelement_mid', $fieldMid)); - $fieldElementsSelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_ELEMENT_NAME, 'field_element[' . $id . ']', $field->getVar('field_element')); - $fieldElementsSelect->addOptionArray($helper->getHandler('Fieldelements')->getFieldElementsList($crElement)); + $fieldElementsSelect = new \XoopsFormSelect(\_AM_MODULEBUILDER_FIELD_ELEMENT_NAME, 'field_element[' . $id . ']', $field->getVar('field_element')); + $fieldElementsSelect->addOptionArray($helper->getHandler('Fieldelements')->getFieldelementsList($crElement)); $fieldElementsSelect->addOptionArray($helper->getHandler('Fieldelements')->getList($crTable)); - $fieldElementsSelect->setExtra(" onchange='presetField(". $id . ")' "); + $fieldElementsSelect->setExtra(" onchange='presetField(" . $id . ")' "); unset($crElement, $crTable); - $form->addElement(new Tdmcreate\Html\FormLabel(' | ' . $fieldElementsSelect->render() . ' | ')); + $form->addElement(new Modulebuilder\Html\FormLabel('' . $fieldElementsSelect->render() . ' | ')); unset($fieldElementsSelect); } // Field Type - $fieldTypeSelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_type[' . $id . ']', $field->getVar('field_type')); + $fieldTypeSelect = new \XoopsFormSelect(\_AM_MODULEBUILDER_FIELD_TYPE, 'field_type[' . $id . ']', $field->getVar('field_type')); $fieldTypeSelect->addOptionArray($helper->getHandler('Fieldtype')->getList()); - $form->addElement(new Tdmcreate\Html\FormLabel('' . $fieldTypeSelect->render() . ' | ')); + $form->addElement(new Modulebuilder\Html\FormLabel('' . $fieldTypeSelect->render() . ' | ')); // Field Value - $fieldValue = new \XoopsFormText(_AM_TDMCREATE_FIELD_VALUE, 'field_value[' . $id . ']', 10, 200, $field->getVar('field_value')); - $form->addElement(new Tdmcreate\Html\FormLabel('' . $fieldValue->render() . ' | ')); + $fieldValue = new \XoopsFormText(\_AM_MODULEBUILDER_FIELD_VALUE, 'field_value[' . $id . ']', 10, 200, $field->getVar('field_value')); + $form->addElement(new Modulebuilder\Html\FormLabel('' . $fieldValue->render() . ' | ')); // Field Attributes - $fieldAttributesSelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_attribute[' . $id . ']', $field->getVar('field_attribute')); + $fieldAttributesSelect = new \XoopsFormSelect(\_AM_MODULEBUILDER_FIELD_TYPE, 'field_attribute[' . $id . ']', $field->getVar('field_attribute')); $fieldAttributesSelect->addOptionArray($helper->getHandler('Fieldattributes')->getList()); - $form->addElement(new Tdmcreate\Html\FormLabel('' . $fieldAttributesSelect->render() . ' | ')); + $form->addElement(new Modulebuilder\Html\FormLabel('' . $fieldAttributesSelect->render() . ' | ')); // Field Null - $fieldNullSelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_NULL, 'field_null[' . $id . ']', $field->getVar('field_null')); + $fieldNullSelect = new \XoopsFormSelect(\_AM_MODULEBUILDER_FIELD_NULL, 'field_null[' . $id . ']', $field->getVar('field_null')); $fieldNullSelect->addOptionArray($helper->getHandler('Fieldnull')->getList()); - $form->addElement(new Tdmcreate\Html\FormLabel('' . $fieldNullSelect->render() . ' | ')); + $form->addElement(new Modulebuilder\Html\FormLabel('' . $fieldNullSelect->render() . ' | ')); // Field Default - $fieldDefault = new \XoopsFormText(_AM_TDMCREATE_FIELD_DEFAULT, 'field_default[' . $id . ']', 15, 25, $field->getVar('field_default')); - $form->addElement(new Tdmcreate\Html\FormLabel('' . $fieldDefault->render() . ' | ')); + $fieldDefault = new \XoopsFormText(\_AM_MODULEBUILDER_FIELD_DEFAULT, 'field_default[' . $id . ']', 15, 25, $field->getVar('field_default')); + $form->addElement(new Modulebuilder\Html\FormLabel('' . $fieldDefault->render() . ' | ')); // Field Key - $fieldKeySelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_KEY, 'field_key[' . $id . ']', $field->getVar('field_key')); + $fieldKeySelect = new \XoopsFormSelect(\_AM_MODULEBUILDER_FIELD_KEY, 'field_key[' . $id . ']', $field->getVar('field_key')); $fieldKeySelect->addOptionArray($helper->getHandler('Fieldkey')->getList()); - $form->addElement(new Tdmcreate\Html\FormLabel('' . $fieldKeySelect->render() . ' | ')); + $form->addElement(new Modulebuilder\Html\FormLabel('' . $fieldKeySelect->render() . ' | ')); // Field Void if ((1 == $id) && (1 == $tableAutoincrement)) { - $form->addElement(new Tdmcreate\Html\FormLabel('')); } else { // Box header row $parametersTray = new \XoopsFormElementTray('', ' | ' . _AM_TDMCREATE_FIELD_PARAMETERS_LIST . ' ' . $parametersTray->render() . ' | '));
+ $form->addElement(new Modulebuilder\Html\FormLabel('' . \_AM_MODULEBUILDER_FIELD_PARAMETERS_LIST . ' ' . $parametersTray->render() . ' | '));
}
}
++$id;
@@ -486,13 +516,13 @@ public function getFormEdit($fieldMid = null, $fieldTid = null, $action = false)
private function getFooterForm($form)
{
// Send Form Data
- $form->addElement(new Tdmcreate\Html\FormLabel(''));
- $form->addElement(new Tdmcreate\Html\FormLabel('
| ' . $formHidden->render() . ' | ')); - $form->addElement(new Tdmcreate\Html\FormLabel('' . $formButton->render() . ' | ')); - $form->addElement(new Tdmcreate\Html\FormLabel('|||||||||||||||||||
\"", '.',"\t"); - $func .= $xc->getXcEqualsOperator('$form', "{$language}TITLE_LENGTH . \" :
\"", '.',"\t"); - $func .= $pc->getPhpCodeArrayShift('$options', "\t"); - $func .= $pc->getPhpCodeArrayShift('$options', "\t"); - $func .= $pc->getPhpCodeArrayShift('$options', "\t"); - $func .= $pc->getPhpCodeBlankLine(); - $func .= $xc->getXcCriteriaCompo($critName, "\t"); - $crit = $xc->getXcCriteria('', "'{$fieldId}'", '0', "'!='", true); - $func .= $xc->getXcCriteriaAdd($critName, $crit, "\t", "\n"); - $func .= $xc->getXcCriteriaSetSort($critName, "'{$fieldId}'","\t","\n"); - $func .= $xc->getXcCriteriaSetOrder($critName, "'ASC'","\t","\n"); - $func .= $xc->getXcHandlerAllClear("{$tableName}All", $tableName, "\${$critName}", "\t"); - $func .= $pc->getPhpCodeUnset($critName, "\t"); - $func .= $xc->getXcEqualsOperator('$form', "{$language}{$stuTableName}_TO_DISPLAY . \"
'", '.',"\t"); - $func .= $pc->getPhpCodeBlankLine(); + $ret = $this->pc->getPhpCodeCommentMultiLine(['Function' => 'edit block', '@param $options' => '', '@return' => 'string']); + $func = $this->xc->getXcXoopsTplAssign("{$moduleDirname}_upload_url","\\{$stuModuleDirname}_UPLOAD_URL",true,"\t"); + $func .= $this->xc->getXcEqualsOperator('$form', "{$language}DISPLAY . ' : '", '',"\t"); + $func .= $this->xc->getXcEqualsOperator('$form', "\"\"", '.',"\t"); + $func .= $this->xc->getXcEqualsOperator('$form', "\"
\"", '.',"\t"); + $func .= $this->xc->getXcEqualsOperator('$form', "{$language}TITLE_LENGTH . \" :
\"", '.',"\t"); + $func .= $this->pc->getPhpCodeArrayShift('$options', "\t"); + $func .= $this->pc->getPhpCodeArrayShift('$options', "\t"); + $func .= $this->pc->getPhpCodeArrayShift('$options', "\t"); + $func .= $this->pc->getPhpCodeBlankLine(); + + $func .= $this->pc->getPhpCodeCommentMultiLine([ + 'If you want to filter your results by e.g. a category used in your' . $tableName => '', + 'then you can activate the following code, but you have to change it according your category' => '' + ], "\t"); + $func .= $this->getSimpleString('/*', "\t"); + $func .= $this->xc->getXcEqualsOperator('$helper', 'Helper::getInstance()', '',"\t"); + $func .= $this->xc->getXcHandlerLine($tableName, "\t"); + $func .= $this->xc->getXcCriteriaCompo($critName, "\t"); + $crit = $this->xc->getXcCriteria('', "'{$fieldId}'", '0', "'!='", true); + $func .= $this->xc->getXcCriteriaAdd($critName, $crit, "\t"); + $func .= $this->xc->getXcCriteriaSetSort($critName, "'{$fieldId}'","\t"); + $func .= $this->xc->getXcCriteriaSetOrder($critName, "'ASC'","\t"); + $func .= $this->xc->getXcHandlerAllClear("{$tableName}All", $tableName, "\${$critName}", "\t"); + $func .= $this->pc->getPhpCodeUnset($critName, "\t"); + $func .= $this->xc->getXcEqualsOperator('$form', "{$language}{$stuTableName}_TO_DISPLAY . \"
'", '.',"\t"); + $func .= $this->pc->getPhpCodeBlankLine(); + $func .= $this->getSimpleString('*/', "\t"); $func .= $this->getSimpleString('return $form;', "\t"); - $func .= $pc->getPhpCodeBlankLine(); + $func .= $this->pc->getPhpCodeBlankLine(); - $ret .= $pc->getPhpCodeFunction("b_{$moduleDirname}_{$tableName}_edit", '$options', $func, '', false, ""); + $ret .= $this->pc->getPhpCodeFunction("b_{$moduleDirname}_{$tableName}_edit", '$options', $func, ''); return $ret; - } /** * @public function render - * @param null * - * @return bool|string + * @return string */ public function render() { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $module = $this->getModule(); - $filename = $this->getFileName(); - $table = $this->getTable(); - $moduleDirname = $module->getVar('mod_dirname'); - $tableName = $table->getVar('table_name'); - $tableFieldname = $table->getVar('table_fieldname'); - $language = $this->getLanguage($moduleDirname, 'MB'); - $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); - $fieldId = null; - $fieldParent = null; - $fieldMain = null; - foreach (array_keys($fields) as $f) { + $module = $this->getModule(); + $filename = $this->getFileName(); + $table = $this->getTable(); + $moduleDirname = $module->getVar('mod_dirname'); + $tableName = $table->getVar('table_name'); + $tableFieldname = $table->getVar('table_fieldname'); + $tablePermissions = $table->getVar('table_permissions'); + $language = $this->getLanguage($moduleDirname, 'MB'); + $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); + $fieldId = null; + $fieldParent = null; + $fieldMain = null; + foreach (\array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); $fieldParent = $fields[$f]->getVar('field_parent'); if (0 == $f) { @@ -312,14 +395,14 @@ public function render() } } $content = $this->getHeaderFilesComments($module); - $content .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', ''); - $content .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Helper'], '', ''); - $content .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']); - $content .= $pc->getPhpCodeIncludeDir("XOOPS_ROOT_PATH . '/modules/{$moduleDirname}/include/common.php'",'',true, true); - $content .= $this->getBlocksShow($moduleDirname, $tableName, $tableFieldname, $fields, $fieldId, $fieldParent); + $content .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', ''); + $content .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Helper'], '', ''); + $content .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']); + $content .= $this->pc->getPhpCodeIncludeDir("\XOOPS_ROOT_PATH . '/modules/{$moduleDirname}/include/common.php'",'',true, true); + $content .= $this->getBlocksShow($moduleDirname, $tableName, $tableFieldname, $tablePermissions, $fields, $fieldId, $fieldParent); $content .= $this->getBlocksEdit($moduleDirname, $tableName, $fieldId, $fieldMain, $language); - $this->create($moduleDirname, 'blocks', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'blocks', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/Blocks/BlocksFilesSpotlight.php b/class/Files/Blocks/BlocksFilesSpotlight.php new file mode 100644 index 00000000..5c550768 --- /dev/null +++ b/class/Files/Blocks/BlocksFilesSpotlight.php @@ -0,0 +1,340 @@ +xc = Modulebuilder\Files\CreateXoopsCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); + } + + /** + * @static function getInstance + * + * @return BlocksFilesSpotlight|false + */ + public static function getInstance() + { + static $instance = false; + if (!$instance) { + $instance = new self(); + } + + return $instance; + } + + /** + * @public function write + * @param $module + * @param mixed $table + * @param $filename + */ + public function write($module, $table, $filename) + { + $this->setModule($module); + $this->setTable($table); + $this->setFileName($filename); + } + + /** + * @private function getBlocksShow + * @param $moduleDirname + * @param $tableName + * @param $tablePermissions + * @param $fields + * @param $fieldId + * @return string + */ + private function getBlocksShow($moduleDirname, $tableName, $tablePermissions, $fields, $fieldId) + { + $ucfTableName = \ucfirst($tableName); + $critName = 'cr' . $ucfTableName; + $stuModuleDirname = \mb_strtoupper($moduleDirname); + $ucfModuleDirname = \ucfirst($moduleDirname); + + $configMaxchar = 0; + foreach (\array_keys($fields) as $f) { + $fieldElement = $fields[$f]->getVar('field_element'); + if (Constants::FIELD_ELE_TEXTAREA == $fieldElement || Constants::FIELD_ELE_DHTMLTEXTAREA == $fieldElement) { + $configMaxchar = 1; + } + } + + $ret = $this->pc->getPhpCodeCommentMultiLine(['Function' => 'show block', '@param $options' => '', '@return' => 'array']); + + //$func .= $this->xc->getXcEqualsOperator('$myts', 'MyTextSanitizer::getInstance()', '',"\t"); + $func = $this->xc->getXcEqualsOperator('$block ', '[]', '',"\t"); + $func .= '//' . $this->xc->getXcEqualsOperator('$typeBlock ', '$options[0]','',"\t"); + $func .= $this->xc->getXcEqualsOperator('$limit ', '$options[1]','',"\t"); + $func .= $this->xc->getXcEqualsOperator('$lenghtTitle ', '$options[2]','',"\t"); + $func .= $this->xc->getXcEqualsOperator('$helper ', 'Helper::getInstance()','',"\t"); + if (1 === $configMaxchar) { + $func .= $this->xc->getXcEqualsOperator('$utility ', "new \XoopsModules\\{$ucfModuleDirname}\Utility()", '',"\t"); + } + $func .= $this->xc->getXcHandlerLine($tableName, "\t"); + $func .= $this->xc->getXcCriteriaCompo($critName, "\t"); + $func .= $this->pc->getPhpCodeArrayShift('$options', "\t"); + $func .= $this->pc->getPhpCodeArrayShift('$options', "\t"); + $func .= $this->pc->getPhpCodeArrayShift('$options', "\t"); + $func .= $this->pc->getPhpCodeBlankLine(); + + //Criteria for status field + $fieldStatus = ''; + if (1 == $tablePermissions) { + foreach ($fields as $field) { + if ($field->getVar('field_element') == 16) { + $fieldStatus = $field->getVar('field_name'); + } + } + if ('' !== $fieldStatus) { + $constant = $this->xc->getXcGetConstants('STATUS_OFFLINE'); + $crit = $this->xc->getXcCriteria('', "'{$fieldStatus}'", $constant, "'>'", true); + $func .= $this->pc->getPhpCodeCommentLine("Criteria for status field",'',"\t"); + $func .= $this->xc->getXcCriteriaAdd($critName, $crit, "\t"); + $func .= $this->pc->getPhpCodeBlankLine(); + } + } + + $crit = $this->xc->getXcCriteria('', "'{$fieldId}'", "'(' . \implode(',', \$options) . ')'", "'IN'", true); + $contIf = $this->xc->getXcCriteriaAdd($critName, $crit, "\t\t"); + $contIf .= $this->xc->getXcEqualsOperator('$limit', '0', '',"\t\t"); + $func .= $this->pc->getPhpCodeConditions('\count($options) > 0 && (int)$options[0] > 0', '', '', $contIf, false, "\t"); + $func .= $this->pc->getPhpCodeBlankLine(); + + $func .= $this->xc->getXcCriteriaSetSort($critName, "'{$fieldId}'","\t"); + $func .= $this->xc->getXcCriteriaSetOrder($critName, "'DESC'","\t"); + $func .= $this->xc->getXcCriteriaSetLimit($critName, '$limit', "\t"); + $func .= $this->xc->getXcHandlerAllClear("{$tableName}All", $tableName, "\${$critName}", "\t"); + $func .= $this->pc->getPhpCodeUnset($critName, "\t"); + $contentForeach = $this->xc->getXcEqualsOperator("\${$tableName}","\${$tableName}All[\$i]->getValues{$ucfTableName}()", '', "\t\t\t"); + $contentForeach .= $this->pc->getPhpCodeCommentMultiLine([ + 'If you want to use the parameter for limits you have to adapt the line where it should be applied' => '', + 'e.g. change' => '', + "\t\$block[\$i]['title']" => "= \${$tableName}All[\$i]->getVar('art_title');", + 'into' => '', + "\t" . '$myTitle' => "= \${$tableName}All[\$i]->getVar('art_title');", + "\t" . 'if ($limit > 0) {' => '', + "\t\t" . '$myTitle' => '= \substr($myTitle, 0, (int)$limit);', + "\t" . '}' => '', + "\t\$block[\$i]['title'] = " => '$myTitle;', + ], "\t\t\t", false); + + + $lenName = 0; + foreach (\array_keys($fields) as $f) { + $fieldName = $fields[$f]->getVar('field_name'); + $fieldElement = $fields[$f]->getVar('field_element'); + if (1 == $fields[$f]->getVar('field_block')) { + switch ($fieldElement) { + case Constants::FIELD_ELE_TEXTAREA: + case Constants::FIELD_ELE_DHTMLTEXTAREA: + $lenName = max(strlen($this->getRightString($fieldName)) + 6, $lenName); + break; + case Constants::FIELD_ELE_SELECTUSER: + case Constants::FIELD_ELE_TEXTDATESELECT: + case Constants::FIELD_ELE_SELECTSTATUS: + case Constants::FIELD_ELE_RADIOYN: + case Constants::FIELD_ELE_RADIO_ONOFFLINE: + case Constants::FIELD_ELE_DATETIME: + $lenName = max(strlen($this->getRightString($fieldName)) + 5, $lenName); + break; + case 0: + default: + $lenName = max(strlen($this->getRightString($fieldName)), $lenName); + break; + } + } + } + $lenName += 15; + foreach (\array_keys($fields) as $f) { + $fieldName = $fields[$f]->getVar('field_name'); + $rpFieldName = $this->getRightString($fieldName); + $fieldElement = $fields[$f]->getVar('field_element'); + + if (0 == $f) { + $contentForeach .= $this->xc->getXcEqualsOperator(str_pad("\$block[\$i]['id']", $lenName), "\${$tableName}['{$fieldId}']", null, "\t\t\t"); + } + if (1 == $fields[$f]->getVar('field_block')) { + switch ($fieldElement) { + case Constants::FIELD_ELE_TEXTAREA: + case Constants::FIELD_ELE_DHTMLTEXTAREA: + $contentForeach .= $this->xc->getXcEqualsOperator(str_pad("\$block[\$i]['{$rpFieldName}_text']", $lenName), "\${$tableName}['{$rpFieldName}_text']", null, "\t\t\t"); + $truncate = "\$utility::truncateHtml(\$block[\$i]['{$rpFieldName}_text'], \$lenghtTitle)"; + $contentForeach .= $this->xc->getXcEqualsOperator(str_pad("\$block[\$i]['{$rpFieldName}_short']", $lenName), $truncate, false, "\t\t\t"); + break; + case Constants::FIELD_ELE_TEXTDATESELECT: + case Constants::FIELD_ELE_DATETIME: + case Constants::FIELD_ELE_SELECTUSER: + $contentForeach .= $this->xc->getXcEqualsOperator(str_pad("\$block[\$i]['{$rpFieldName}_text']", $lenName), "\${$tableName}['{$rpFieldName}_text']", null, "\t\t\t"); + break; + case Constants::FIELD_ELE_SELECTSTATUS: + case Constants::FIELD_ELE_RADIOYN: + case Constants::FIELD_ELE_RADIO_ONOFFLINE: + $contentForeach .= $this->xc->getXcEqualsOperator(str_pad("\$block[\$i]['{$rpFieldName}_text']", $lenName),"\${$tableName}['{$rpFieldName}_text']", null, "\t\t\t"); + break; + case 0: + case Constants::FIELD_ELE_TEXT: + default: + $contentForeach .= $this->xc->getXcEqualsOperator(str_pad("\$block[\$i]['{$rpFieldName}']", $lenName),"\${$tableName}['{$rpFieldName}']", null, "\t\t\t"); + break; + } + } + } + $foreach = $this->pc->getPhpCodeForeach("{$tableName}All", true, false, 'i', $contentForeach, "\t\t"); + + $func .= $this->pc->getPhpCodeConditions("\count(\${$tableName}All)", ' > ', '0', $foreach, false, "\t"); + $func .= $this->pc->getPhpCodeBlankLine(); + $func .= $this->xc->getXcXoopsTplAssign("{$moduleDirname}_url", "\\{$stuModuleDirname}_URL", true ,"\t"); + $config = $this->xc->getXcGetConfig('table_type'); + $func .= $this->xc->getXcXoopsTplAssign('table_type', $config, true, "\t"); + + $func .= $this->pc->getPhpCodeBlankLine(); + $func .= $this->getSimpleString('return $block;',"\t"); + $func .= $this->pc->getPhpCodeBlankLine(); + + $ret .= $this->pc->getPhpCodeFunction("b_{$moduleDirname}_{$tableName}_spotlight_show", '$options', $func, ''); + + return $ret; + } + + /** + * @public function getBlocksEdit + * @param string $moduleDirname + * @param string $tableName + * @param string $fieldId + * @param string $fieldMain + * @param string $language + * + * @return string + */ + private function getBlocksEdit(string $moduleDirname, string $tableName, string $fieldId, string $fieldMain, string $language) + { + $stuModuleDirname = \mb_strtoupper($moduleDirname); + $stuTableName = \mb_strtoupper($tableName); + $ucfTableName = \ucfirst($tableName); + $critName = 'cr' . $ucfTableName; + + $ret = $this->pc->getPhpCodeCommentMultiLine(['Function' => 'edit block', '@param $options' => '', '@return' => 'string']); + $func = $this->xc->getXcEqualsOperator('$helper', 'Helper::getInstance()', '',"\t"); + $func .= $this->xc->getXcHandlerLine($tableName, "\t"); + $func .= $this->xc->getXcXoopsTplAssign("{$moduleDirname}_upload_url","\\{$stuModuleDirname}_UPLOAD_URL",true,"\t"); + $func .= $this->xc->getXcEqualsOperator('$form', "{$language}DISPLAY_SPOTLIGHT . ' : '", '',"\t"); + $func .= $this->xc->getXcEqualsOperator('$form', "\"\"", '.',"\t"); + $func .= $this->xc->getXcEqualsOperator('$form', "\"
\"", '.',"\t"); + $func .= $this->xc->getXcEqualsOperator('$form', "{$language}TITLE_LENGTH . \" :
\"", '.',"\t"); + $func .= $this->pc->getPhpCodeArrayShift('$options', "\t"); + $func .= $this->pc->getPhpCodeArrayShift('$options', "\t"); + $func .= $this->pc->getPhpCodeArrayShift('$options', "\t"); + $func .= $this->pc->getPhpCodeBlankLine(); + $func .= $this->xc->getXcCriteriaCompo($critName, "\t"); + $crit = $this->xc->getXcCriteria('', "'{$fieldId}'", '0', "'!='", true); + $func .= $this->xc->getXcCriteriaAdd($critName, $crit, "\t"); + $func .= $this->xc->getXcCriteriaSetSort($critName, "'{$fieldId}'","\t"); + $func .= $this->xc->getXcCriteriaSetOrder($critName, "'ASC'","\t"); + $func .= $this->xc->getXcHandlerAllClear("{$tableName}All", $tableName, "\${$critName}", "\t"); + $func .= $this->pc->getPhpCodeUnset($critName, "\t"); + $func .= $this->xc->getXcEqualsOperator('$form', "{$language}{$stuTableName}_TO_DISPLAY . \"
'", '.',"\t"); + $func .= $this->pc->getPhpCodeBlankLine(); + $func .= $this->getSimpleString('return $form;', "\t"); + $func .= $this->pc->getPhpCodeBlankLine(); + + $ret .= $this->pc->getPhpCodeFunction("b_{$moduleDirname}_{$tableName}_spotlight_edit", '$options', $func, ''); + + return $ret; + + } + + /** + * @public function render + * + * @return string + */ + public function render() + { + $module = $this->getModule(); + $filename = $this->getFileName(); + $table = $this->getTable(); + $moduleDirname = $module->getVar('mod_dirname'); + $tableName = $table->getVar('table_name'); + $tablePermissions = $table->getVar('table_permissions'); + $language = $this->getLanguage($moduleDirname, 'MB'); + $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); + $fieldId = null; + $fieldMain = null; + foreach (\array_keys($fields) as $f) { + $fieldName = $fields[$f]->getVar('field_name'); + if (0 == $f) { + $fieldId = $fieldName; + } + if (1 == $fields[$f]->getVar('field_main')) { + $fieldMain = $fieldName; + } + } + $content = $this->getHeaderFilesComments($module); + $content .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', ''); + $content .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Helper'], '', ''); + $content .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']); + $content .= $this->pc->getPhpCodeIncludeDir("\XOOPS_ROOT_PATH . '/modules/{$moduleDirname}/include/common.php'",'',true, true); + $content .= $this->getBlocksShow($moduleDirname, $tableName, $tablePermissions, $fields, $fieldId); + $content .= $this->getBlocksEdit($moduleDirname, $tableName, $fieldId, $fieldMain, $language); + + $this->create($moduleDirname, 'blocks', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); + + return $this->renderFile(); + } +} diff --git a/class/Files/Blocks/index.php b/class/Files/Blocks/index.php new file mode 100644 index 00000000..e5ee0725 --- /dev/null +++ b/class/Files/Blocks/index.php @@ -0,0 +1,2 @@ +cf = Modulebuilder\Files\CreateFile::getInstance(); + } + + /** + * @static function getInstance + * + * @return Modulebuilder\Files\CheckData + */ + public static function getInstance() + { + static $instance = false; + if (!$instance) { + $instance = new self(); + } + + return $instance; + } + + /** + * @public function getCheckResult + * + * @param $module + * @return array + */ + public function getCheckPreBuilding($module) + { + $this->modId = $module->getVar('mod_id'); + $this->tables = $this->cf->getTableTables($this->modId); + $this->infos = []; + + $this->getCheckBlock(); + $this->getCheckBroken(); + $this->getCheckComments(); + $this->getCheckUserpage(); + $this->getCheckRating(); + $this->getCheckReads(); + $this->getCheckSql(); + + return $this->infos; + } + + /** + * @public function getCheckBroken + * + * @return void + */ + private function getCheckBroken(): void + { + foreach (\array_keys($this->tables) as $t) { + if (1 == $this->tables[$t]->getVar('table_broken')) { + $tableId = $this->tables[$t]->getVar('table_id'); + $tableName = $this->tables[$t]->getVar('table_name'); + $fields = $this->cf->getTableFields($this->modId, $tableId); + $fieldSatus = ''; + + foreach (\array_keys($fields) as $f) { + $fieldName = $fields[$f]->getVar('field_name'); + if (Constants::FIELD_ELE_SELECTSTATUS == $fields[$f]->getVar('field_element')) { + $fieldSatus = $fieldName; + } + } + // check whether each table with handling "broken" has also a field "status" + if ('' == $fieldSatus) { + $info = \str_replace('%t', $tableName, \_AM_MODULEBUILDER_BUILDING_CHECK_BROKEN1); + $this->infos[] = ['icon' => 'error', 'info' => $info]; + } + } + } + } + + /** + * @private function getCheckUserpage + * + * @return void + */ + private function getCheckUserpage(): void + { + //check field params: minimum one param is selected + foreach (\array_keys($this->tables) as $t) { + $tableId = $this->tables[$t]->getVar('table_id'); + $tableName = $this->tables[$t]->getVar('table_name'); + $fields = $this->cf->getTableFields($this->modId, $tableId); + + foreach (\array_keys($fields) as $f) { + $fieldName = $fields[$f]->getVar('field_name'); + // check fields for parameters + if ($f > 0) { + $fieldParams = (int)$fields[$f]->getVar('field_parent') + (int)$fields[$f]->getVar('field_admin') + (int)$fields[$f]->getVar('field_inlist') + (int)$fields[$f]->getVar('field_inform') + + (int)$fields[$f]->getVar('field_user') + (int)$fields[$f]->getVar('field_ihead') + (int)$fields[$f]->getVar('field_ibody') + (int)$fields[$f]->getVar('field_ifoot') + + (int)$fields[$f]->getVar('field_thead') + (int)$fields[$f]->getVar('field_tbody') + (int)$fields[$f]->getVar('field_tfoot') + (int)$fields[$f]->getVar('field_block') + + (int)$fields[$f]->getVar('field_main') + (int)$fields[$f]->getVar('field_search') + (int)$fields[$f]->getVar('field_required'); + if (0 == $fieldParams) { + $info = \str_replace(['%f', '%t'], [$fieldName, $tableName], \_AM_MODULEBUILDER_BUILDING_CHECK_FIELDS1); + $this->infos[] = ['icon' => 'error', 'info' => $info]; + } + } + } + } + + //check field params: user file no usage in index or item + foreach (\array_keys($this->tables) as $t) { + $tableId = $this->tables[$t]->getVar('table_id'); + $tableName = $this->tables[$t]->getVar('table_name'); + $fields = $this->cf->getTableFields($this->modId, $tableId); + + foreach (\array_keys($fields) as $f) { + $fieldName = $fields[$f]->getVar('field_name'); + if (1 == $fields[$f]->getVar('field_user')) { + // check fields for parameters + if ($f > 0) { + $fieldParams = (int)$fields[$f]->getVar('field_ihead') + (int)$fields[$f]->getVar('field_ibody') + (int)$fields[$f]->getVar('field_ifoot') + + (int)$fields[$f]->getVar('field_thead') + (int)$fields[$f]->getVar('field_tbody') + (int)$fields[$f]->getVar('field_tfoot'); + if (0 == $fieldParams) { + $info = \str_replace(['%f', '%t'], [$fieldName, $tableName], \_AM_MODULEBUILDER_BUILDING_CHECK_FIELDS2); + $this->infos[] = ['icon' => 'warning', 'info' => $info]; + } + } + } + } + } + //check field params: user file index multiple usage + //check field params: user file item multiple usage + foreach (\array_keys($this->tables) as $t) { + $tableId = $this->tables[$t]->getVar('table_id'); + $tableName = $this->tables[$t]->getVar('table_name'); + $fields = $this->cf->getTableFields($this->modId, $tableId); + + foreach (\array_keys($fields) as $f) { + $fieldName = $fields[$f]->getVar('field_name'); + if (1 == $fields[$f]->getVar('field_user')) { + // check fields for parameters + if ($f > 0) { + $fieldParams = (int)$fields[$f]->getVar('field_ihead') + (int)$fields[$f]->getVar('field_ibody') + (int)$fields[$f]->getVar('field_ifoot'); + if ($fieldParams > 1) { + $info = \str_replace(['%f', '%t'], [$fieldName, $tableName], \_AM_MODULEBUILDER_BUILDING_CHECK_FIELDS3); + $this->infos[] = ['icon' => 'warning', 'info' => $info]; + } + $fieldParams = (int)$fields[$f]->getVar('field_thead') + (int)$fields[$f]->getVar('field_tbody') + (int)$fields[$f]->getVar('field_tfoot'); + if ($fieldParams > 1) { + $info = \str_replace(['%f', '%t'], [$fieldName, $tableName], \_AM_MODULEBUILDER_BUILDING_CHECK_FIELDS3); + $this->infos[] = ['icon' => 'warning', 'info' => $info]; + } + } + } + } + } + + //check table params: user submit or rate or broken, but table not for user side + foreach (\array_keys($this->tables) as $t) { + $tableName = $this->tables[$t]->getVar('table_name'); + if ((0 == $this->tables[$t]->getVar('table_user')) && (1 == $this->tables[$t]->getVar('table_submit') || 1 == $this->tables[$t]->getVar('table_broken') || 1 == $this->tables[$t]->getVar('table_rate'))) { + $info = \str_replace(['%t'], [$tableName], \_AM_MODULEBUILDER_BUILDING_CHECK_USERPAGE1); + $this->infos[] = ['icon' => 'error', 'info' => $info]; + } + } + + //check field/table params: params for index file, but table param table_index = 0 + //check field/table params: params for user file, but table param table_user = 0 + foreach (\array_keys($this->tables) as $t) { + $tableId = $this->tables[$t]->getVar('table_id'); + $tableName = $this->tables[$t]->getVar('table_name'); + $tableIndex = (int)$this->tables[$t]->getVar('table_index'); + $tableUser = (int)$this->tables[$t]->getVar('table_user'); + $fields = $this->cf->getTableFields($this->modId, $tableId); + + $fieldParamsIndex = 0; + $fieldParamsUser = 0; + $fieldName = ''; + foreach (\array_keys($fields) as $f) { + $fieldName = $fields[$f]->getVar('field_name'); + if (1 == $fields[$f]->getVar('field_user')) { + // check fields for parameters + if ($f > 0) { + $fieldParams = (int)$fields[$f]->getVar('field_ihead') + (int)$fields[$f]->getVar('field_ibody') + (int)$fields[$f]->getVar('field_ifoot'); + $fieldParamsIndex += $fieldParams; + if ($fieldParams >= 1 && 0 == $tableIndex) { + $info = \str_replace(['%f', '%t'], [$fieldName, $tableName], \_AM_MODULEBUILDER_BUILDING_CHECK_FIELDS5); + $this->infos[] = ['icon' => 'warning', 'info' => $info]; + } + $fieldParams = (int)$fields[$f]->getVar('field_thead') + (int)$fields[$f]->getVar('field_tbody') + (int)$fields[$f]->getVar('field_tfoot'); + $fieldParamsUser += $fieldParams; + if ($fieldParams >= 1 && 0 == $tableUser) { + $info = \str_replace(['%f', '%t'], [$fieldName, $tableName], \_AM_MODULEBUILDER_BUILDING_CHECK_FIELDS7); + $this->infos[] = ['icon' => 'warning', 'info' => $info]; + } + } + } + } + if (0 == $fieldParamsIndex && 1 == $tableIndex) { + $info = \str_replace(['%f', '%t'], [$fieldName, $tableName], \_AM_MODULEBUILDER_BUILDING_CHECK_FIELDS4); + $this->infos[] = ['icon' => 'warning', 'info' => $info]; + } + if (0 == $fieldParamsUser && 1 == $tableUser) { + $info = \str_replace(['%f', '%t'], [$fieldName, $tableName], \_AM_MODULEBUILDER_BUILDING_CHECK_FIELDS6); + $this->infos[] = ['icon' => 'warning', 'info' => $info]; + } + } + + } + + /** + * @private function getCheckBlock + * + * @return void + */ + private function getCheckBlock(): void + { + //use in block but no field selected + foreach (\array_keys($this->tables) as $t) { + $tableId = $this->tables[$t]->getVar('table_id'); + $tableName = $this->tables[$t]->getVar('table_name'); + $fields = $this->cf->getTableFields($this->modId, $tableId); + $count = 0; + if (1 == $this->tables[$t]->getVar('table_blocks')) { + foreach (\array_keys($fields) as $f) { + if (1 == $fields[$f]->getVar('field_block')) { + $count++; + } + } + if (0 == $count) { + $info = \str_replace(['%t'], [$tableName], \_AM_MODULEBUILDER_BUILDING_CHECK_BLOCK1); + $this->infos[] = ['icon' => 'warning', 'info' => $info]; + } + } + } + //use in block but no field date + foreach (\array_keys($this->tables) as $t) { + $tableId = $this->tables[$t]->getVar('table_id'); + $tableName = $this->tables[$t]->getVar('table_name'); + + $count = 0; + if (1 == $this->tables[$t]->getVar('table_blocks')) { + $fields = $this->cf->getTableFields($this->modId, $tableId); + foreach (\array_keys($fields) as $f) { + if (Constants::FIELD_ELE_TEXTDATESELECT == $fields[$f]->getVar('field_element') || Constants::FIELD_ELE_DATETIME == $fields[$f]->getVar('field_element')) { + $count++; + } + } + if (0 == $count) { + $info = \str_replace(['%t'], [$tableName], \_AM_MODULEBUILDER_BUILDING_CHECK_BLOCK2); + $this->infos[] = ['icon' => 'warning', 'info' => $info]; + } + } + } + + } + + /** + * @private function getCheckComments + * + * @return void + */ + private function getCheckComments(): void + { + //use comments in multiple tables + $count = 0; + $tableComments = []; + foreach (\array_keys($this->tables) as $t) { + if (1 == $this->tables[$t]->getVar('table_comments')) { + $count++; + $tableComments[] = $this->tables[$t]->getVar('table_name'); + } + } + if ($count > 1) { + $tablesComments = \implode(', ', $tableComments); + $info = \str_replace('%t', $tablesComments, \_AM_MODULEBUILDER_BUILDING_CHECK_COMMENTS1); + $this->infos[] = ['icon' => 'error', 'info' => $info]; + } + + foreach (\array_keys($this->tables) as $t) { + if (1 == $this->tables[$t]->getVar('table_comments')) { + $tableId = $this->tables[$t]->getVar('table_id'); + $tableName = $this->tables[$t]->getVar('table_name'); + $fields = $this->cf->getTableFields($this->modId, $tableId); + $fieldComments = 0; + foreach (\array_keys($fields) as $f) { + if (Constants::FIELD_ELE_TEXTCOMMENTS == (int)$fields[$f]->getVar('field_element')) { + $fieldComments++; + } + } + // check whether each table with handling "comments" has also a field "comments" + if (0 == $fieldComments) { + $info = \str_replace('%t', $tableName, \_AM_MODULEBUILDER_BUILDING_CHECK_COMMENTS2); + $this->infos[] = ['icon' => 'warning', 'info' => $info]; + } + } + } + + } + + /** + * @private function getCheckRatings + * + * @return void + */ + private function getCheckRating(): void + { + foreach (\array_keys($this->tables) as $t) { + if (1 == $this->tables[$t]->getVar('table_rate')) { + $tableId = $this->tables[$t]->getVar('table_id'); + $tableName = $this->tables[$t]->getVar('table_name'); + $fields = $this->cf->getTableFields($this->modId, $tableId); + $fieldRatings = 0; + $fieldVotes = 0; + foreach (\array_keys($fields) as $f) { + if (Constants::FIELD_ELE_TEXTRATINGS == (int)$fields[$f]->getVar('field_element')) { + $fieldRatings++; + } + if (Constants::FIELD_ELE_TEXTVOTES == (int)$fields[$f]->getVar('field_element')) { + $fieldVotes++; + } + } + // check whether each table with handling "rating" has also a field "rating" + if (0 == $fieldRatings) { + $info = \str_replace('%t', $tableName, \_AM_MODULEBUILDER_BUILDING_CHECK_RATINGS1); + $this->infos[] = ['icon' => 'error', 'info' => $info]; + } + // check whether each table with handling "rating" has also a field "votes" + if (0 == $fieldVotes) { + $info = \str_replace('%t', $tableName, \_AM_MODULEBUILDER_BUILDING_CHECK_RATINGS2); + $this->infos[] = ['icon' => 'error', 'info' => $info]; + } + } + } + + } + + /** + * @private function getCheckReads + * + * @return void + */ + private function getCheckReads(): void + { + foreach (\array_keys($this->tables) as $t) { + if (1 == $this->tables[$t]->getVar('table_reads')) { + $tableId = $this->tables[$t]->getVar('table_id'); + $tableName = $this->tables[$t]->getVar('table_name'); + $fields = $this->cf->getTableFields($this->modId, $tableId); + $fieldReads = 0; + foreach (\array_keys($fields) as $f) { + if (Constants::FIELD_ELE_TEXTREADS == (int)$fields[$f]->getVar('field_element')) { + $fieldReads++; + } + } + // check whether each table with handling "reads" has also a field "reads" + if (0 == $fieldReads) { + $info = \str_replace('%t', $tableName, \_AM_MODULEBUILDER_BUILDING_CHECK_READS1); + $this->infos[] = ['icon' => 'error', 'info' => $info]; + } + } + } + + } + + /** + * @private function getCheckSql + * + * @return void + */ + private function getCheckSql(): void + { + foreach (\array_keys($this->tables) as $t) { + $tableId = $this->tables[$t]->getVar('table_id'); + $tableName = $this->tables[$t]->getVar('table_name'); + $fields = $this->cf->getTableFields($this->modId, $tableId); + foreach (\array_keys($fields) as $f) { + $fieldName = $fields[$f]->getVar('field_name'); + $fieldType = $fields[$f]->getVar('field_type'); + if (6 == $fieldType || 7 == $fieldType || 8 == $fieldType) { + $fieldValue = $fields[$f]->getVar('field_value'); + if (0 == \mb_strpos($fieldValue, ',')) { + $info = \str_replace(['%f', '%t'], [$fieldName, $tableName], \_AM_MODULEBUILDER_BUILDING_CHECK_SQL1); + $this->infos[] = ['icon' => 'error', 'info' => $info]; + } + $fieldDefault = $fields[$f]->getVar('field_default'); + if (0 == \mb_strpos($fieldDefault, '.')) { + $info = \str_replace(['%f', '%t'], [$fieldName, $tableName], \_AM_MODULEBUILDER_BUILDING_CHECK_SQL2); + $this->infos[] = ['icon' => 'warning', 'info' => $info]; + } + } + } + } + + } +} diff --git a/class/Files/Classes/ClassFiles.php b/class/Files/Classes/ClassFiles.php index d2e9410e..6907ec07 100644 --- a/class/Files/Classes/ClassFiles.php +++ b/class/Files/Classes/ClassFiles.php @@ -1,9 +1,12 @@ -cf = Modulebuilder\Files\CreateFile::getInstance(); + $this->xc = Modulebuilder\Files\CreateXoopsCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); + $this->cxc = Modulebuilder\Files\Classes\ClassXoopsCode::getInstance(); + $this->helper = Modulebuilder\Helper::getInstance(); } /** * @static function getInstance * - * @param null - * * @return ClassFiles */ public static function getInstance() @@ -61,12 +86,12 @@ public static function getInstance() /** * @public function write * - * @param string $module - * @param string $table - * @param mixed $tables + * @param $module + * @param $table + * @param $tables * @param $filename */ - public function write($module, $table, $tables, $filename) + public function write($module, $table, $tables, $filename): void { $this->setModule($module); $this->setTable($table); @@ -82,11 +107,9 @@ public function write($module, $table, $tables, $filename) * * @return string */ - private function getInitVar($fieldName, $type = 'INT') + private function getInitVar(string $fieldName, string $type = 'INT') { - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - - return $cxc->getClassInitVar($fieldName, $type); + return $this->cxc->getClassInitVar($fieldName, $type); } /** @@ -96,19 +119,20 @@ private function getInitVar($fieldName, $type = 'INT') * * @return string */ - private function getInitVars($fields) + private function getInitVars(array $fields) { $ret = ''; // Creation of the initVar functions list - foreach (array_keys($fields) as $f) { + foreach (\array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); $fieldType = $fields[$f]->getVar('field_type'); + //Attention: field_type is not the same as field_ele_type switch ($fieldType) { case 2: case 3: case 4: case 5: - $ret .= $this->getInitVar($fieldName, 'INT'); + $ret .= $this->getInitVar($fieldName); break; case 6: $ret .= $this->getInitVar($fieldName, 'FLOAT'); @@ -134,7 +158,11 @@ private function getInitVars($fields) case 16: case 17: case 18: - $ret .= $this->getInitVar($fieldName, 'TXTAREA'); + if ((int)$fields[$f]->getVar('field_element') == 4) { + $ret .= $this->getInitVar($fieldName, 'OTHER'); + } else { + $ret .= $this->getInitVar($fieldName, 'TXTAREA'); + } break; case 19: case 20: @@ -158,29 +186,30 @@ private function getInitVars($fields) */ private function getClassObject($module, $table, $fields) { - $tc = Tdmcreate\Helper::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); $moduleDirname = $module->getVar('mod_dirname'); $tableName = $table->getVar('table_name'); - $ucfTableName = ucfirst($tableName); - $ret = $pc->getPhpCodeDefined(); - $ret .= $pc->getPhpCodeCommentMultiLine(['Class Object' => $ucfTableName]); + $ucfTableName = \ucfirst($tableName); + $ret = $this->pc->getPhpCodeDefined(); + $ret .= $this->pc->getPhpCodeCommentMultiLine(['Class Object' => $ucfTableName]); $cCl = ''; $fieldInForm = []; $fieldElementId = []; $optionsFieldName = []; + $fieldUpload = false; $fieldId = null; - foreach (array_keys($fields) as $f) { + foreach (\array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); $fieldElement = $fields[$f]->getVar('field_element'); $fieldInForm[] = $fields[$f]->getVar('field_inform'); - $fieldElements = $tc->getHandler('fieldelements')->get($fieldElement); + $fieldElements = $this->helper->getHandler('Fieldelements')->get($fieldElement); $fieldElementId[] = $fieldElements->getVar('fieldelement_id'); + if (Constants::FIELD_ELE_UPLOADIMAGE == $fieldElements->getVar('fieldelement_id') || Constants::FIELD_ELE_UPLOADFILE == $fieldElements->getVar('fieldelement_id')) { + $fieldUpload = true; + } $rpFieldName = $this->getRightString($fieldName); - if (in_array(5, $fieldElementId)) { - //if (count($rpFieldName) % 5) { + if (\in_array(5, $fieldElementId)) { + //if (\count($rpFieldName) % 5) { //$optionsFieldName[] = "'" . $rpFieldName . "'"; //} else { $optionsFieldName[] = "'" . $rpFieldName . "'\n"; @@ -190,34 +219,38 @@ private function getClassObject($module, $table, $fields) $fieldId = $fieldName; } } - if (in_array(5, $fieldElementId) > 1) { - $cCl .= $pc->getPhpCodeCommentMultiLine(['Options' => '']); - $options = $pc->getPhpCodeArray('', $optionsFieldName, true); - $cCl .= $pc->getPhpCodeVariableClass('private', 'options', $options); + if (\in_array(5, $fieldElementId) > 1) { + $cCl .= $this->pc->getPhpCodeCommentMultiLine(['Options' => '']); + $options = $this->pc->getPhpCodeArray('', $optionsFieldName, true); + $cCl .= $this->pc->getPhpCodeVariableClass('private', 'options', $options); } unset($optionsFieldName); - - $cCl .= $pc->getPhpCodeCommentMultiLine(['Constructor' => '', '' => '', '@param' => 'null'], "\t"); + $cCl .= $this->pc->getPhpCodeCommentMultiLine(['@var' => 'int'], "\t"); + $cCl .= $this->pc->getPhpCodeVariableClass('public', 'start', '0', "\t"); + $cCl .= $this->pc->getPhpCodeCommentMultiLine(['@var' => 'int'], "\t"); + $cCl .= $this->pc->getPhpCodeVariableClass('public', 'limit', '0', "\t"); + $cCl .= $this->pc->getPhpCodeCommentMultiLine(['Constructor' => '', '' => ''], "\t"); $constr = $this->getInitVars($fields); - $cCl .= $pc->getPhpCodeFunction('__construct', '', $constr, 'public ', false, "\t"); - $arrayGetInstance = ['@static function' => '&getInstance', '' => '', '@param' => 'null']; - $cCl .= $pc->getPhpCodeCommentMultiLine($arrayGetInstance, "\t"); - $getInstance = $pc->getPhpCodeVariableClass('static', 'instance', 'false', "\t\t"); - $instance = $xc->getXcEqualsOperator('$instance', 'new self()', null, "\t\t\t"); - $getInstance .= $pc->getPhpCodeConditions('!$instance', '', '', $instance, false, "\t\t"); - $cCl .= $pc->getPhpCodeFunction('getInstance', '', $getInstance, 'public static ', false, "\t"); + $cCl .= $this->pc->getPhpCodeFunction('__construct', '', $constr, 'public ', false, "\t"); + $arrayGetInstance = ['@static function' => 'getInstance', '' => '']; + $cCl .= $this->pc->getPhpCodeCommentMultiLine($arrayGetInstance, "\t"); + $getInstance = $this->pc->getPhpCodeVariableClass('static', 'instance', 'false', "\t\t"); + $instance = $this->xc->getXcEqualsOperator('$instance', 'new self()', null, "\t\t\t"); + $getInstance .= $this->pc->getPhpCodeConditions('!$instance', '', '', $instance, false, "\t\t"); + $getInstance .= $this->cf->getSimpleString('return $instance;', "\t\t"); + $cCl .= $this->pc->getPhpCodeFunction('getInstance', '', $getInstance, 'public static ', false, "\t"); $cCl .= $this->getNewInsertId($table); - $cCl .= $this->getFunctionForm($module, $table, $fieldId, $fieldInForm); + $cCl .= $this->getFunctionForm($module, $table, $fieldId, $fieldInForm, $fieldUpload); $cCl .= $this->getValuesInObject($moduleDirname, $table, $fields); $cCl .= $this->getToArrayInObject($table); - if (in_array(5, $fieldElementId) > 1) { + if (\in_array(5, $fieldElementId) > 1) { $cCl .= $this->getOptionsCheck($table); } unset($fieldElementId); - $ret .= $pc->getPhpCodeClass($ucfTableName, $cCl, '\XoopsObject'); + $ret .= $this->pc->getPhpCodeClass($ucfTableName, $cCl, '\XoopsObject'); return $ret; } @@ -231,15 +264,13 @@ private function getClassObject($module, $table, $fields) */ private function getNewInsertId($table) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); $tableName = $table->getVar('table_name'); - $ucfTableName = ucfirst($tableName); - $ret = $pc->getPhpCodeCommentMultiLine(['The new inserted' => '$Id', '@return' => 'inserted id'], "\t"); - $getInsertedId = $xc->getXcEqualsOperator('$newInsertedId', "\$GLOBALS['xoopsDB']->getInsertId()", null, "\t\t"); + $ucfTableName = \ucfirst($tableName); + $ret = $this->pc->getPhpCodeCommentMultiLine(['The new inserted' => '$Id', '@return' => 'int'], "\t"); + $getInsertedId = $this->xc->getXcEqualsOperator('$newInsertedId', "\$GLOBALS['xoopsDB']->getInsertId()", null, "\t\t"); $getInsertedId .= $this->getSimpleString('return $newInsertedId;', "\t\t"); - $ret .= $pc->getPhpCodeFunction('getNewInsertedId' . $ucfTableName, '', $getInsertedId, 'public ', false, "\t"); + $ret .= $this->pc->getPhpCodeFunction('getNewInsertedId' . $ucfTableName, '', $getInsertedId, 'public ', false, "\t"); return $ret; } @@ -247,66 +278,60 @@ private function getNewInsertId($table) /** * @private function getFunctionForm * - * @param string $module - * @param string $table - * + * @param $module + * @param $table * @param $fieldId * @param $fieldInForm + * @param $fieldUpload * @return string */ - private function getFunctionForm($module, $table, $fieldId, $fieldInForm) + private function getFunctionForm($module, $table, $fieldId, $fieldInForm, $fieldUpload) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); $fe = ClassFormElements::getInstance(); $moduleDirname = $module->getVar('mod_dirname'); $tableName = $table->getVar('table_name'); $tableSoleName = $table->getVar('table_solename'); - $tableCategory = $table->getVar('table_category'); - $ucfTableName = ucfirst($tableName); - $stuTableSoleName = mb_strtoupper($tableSoleName); + $ucfTableName = \ucfirst($tableName); + $stuTableSoleName = \mb_strtoupper($tableSoleName); $language = $this->getLanguage($moduleDirname, 'AM'); $fe->initForm($module, $table); - $ret = $pc->getPhpCodeCommentMultiLine(['@public function' => 'getForm', '@param bool' => '$action', '@return' => '\XoopsThemeForm'], "\t"); - $action = $xc->getXcEqualsOperator('$action', "\$_SERVER['REQUEST_URI']", null, "\t\t\t"); - $ucfModuleDirname = ucfirst($moduleDirname); - $getForm = $xc->getXcGetInstance('helper', "\XoopsModules\\{$ucfModuleDirname}\Helper", "\t\t"); - $getForm .= $pc->getPhpCodeConditions('false', ' === ', '$action', $action, false, "\t\t"); - $xUser = $pc->getPhpCodeGlobals('xoopsUser'); - $xModule = $pc->getPhpCodeGlobals('xoopsModule'); - $permString = 'upload_groups'; - if (1 != $tableCategory/* && (1 == $tablePermissions)*/) { - $getForm .= $pc->getPhpCodeCommentLine('Permissions for', 'uploader', "\t\t"); - $getForm .= $xc->getXcXoopsHandler('groupperm', "\t\t"); - $getForm .= $pc->getPhpCodeTernaryOperator('groups', 'is_object(' . $xUser . ')', $xUser . '->getGroups()', 'XOOPS_GROUP_ANONYMOUS', "\t\t"); - $checkRight = $xc->getXcCheckRight('$grouppermHandler', $permString, 32, '$groups', $xModule . '->getVar(\'mid\')', true); - $ternaryOperator = $pc->getPhpCodeTernaryOperator('permissionUpload', $checkRight, 'true', 'false', "\t\t\t"); - $permissionUpload = $xc->getXcEqualsOperator('$permissionUpload', 'true', null, "\t\t\t\t"); - $ternOperator = $pc->getPhpCodeRemoveCarriageReturn($ternaryOperator, '', "\r"); - $if = $pc->getPhpCodeConditions('!' . $xUser . '->isAdmin(' . $xModule . '->mid())', '', '', "\t" . $ternaryOperator, $permissionUpload, "\t\t\t"); - $getForm .= $pc->getPhpCodeConditions($xUser, '', '', $if, $ternOperator, "\t\t"); + $ret = $this->pc->getPhpCodeCommentMultiLine(['@public function' => 'getForm', '@param bool' => '$action', '@return' => '\XoopsThemeForm'], "\t"); + $action = $this->xc->getXcEqualsOperator('$action', "\$_SERVER['REQUEST_URI']", null, "\t\t\t"); + $ucfModuleDirname = \ucfirst($moduleDirname); + $getForm = $this->xc->getXcGetInstance('helper', "\XoopsModules\\{$ucfModuleDirname}\Helper", "\t\t"); + $getForm .= $this->pc->getPhpCodeConditions('!', '', '$action', $action, false, "\t\t"); + $xUser = $this->pc->getPhpCodeGlobals('xoopsUser'); + $xModule = $this->pc->getPhpCodeGlobals('xoopsModule'); + $getForm .= $this->xc->getXcEqualsOperator('$isAdmin', "\is_object(\$GLOBALS['xoopsUser']) && \$GLOBALS['xoopsUser']->isAdmin(\$GLOBALS['xoopsModule']->mid())", null, "\t\t"); + if ($fieldUpload) { + $permString = 'upload_groups'; + $getForm .= $this->pc->getPhpCodeCommentLine('Permissions for', 'uploader', "\t\t"); + $getForm .= $this->xc->getXcXoopsHandler('groupperm', "\t\t"); + $getForm .= $this->pc->getPhpCodeTernaryOperator('groups', '\is_object(' . $xUser . ')', $xUser . '->getGroups()', '[\XOOPS_GROUP_ANONYMOUS]', "\t\t"); + $checkRight = $this->xc->getXcCheckRight('$grouppermHandler', $permString, '32', '$groups', $xModule . '->getVar(\'mid\')', true); + $getForm .= $this->pc->getPhpCodeTernaryOperator('permissionUpload', $checkRight, 'true', 'false', "\t\t"); } - $getForm .= $pc->getPhpCodeCommentLine('Title', '', "\t\t"); - $getForm .= $pc->getPhpCodeTernaryOperator('title', '$this->isNew()', "sprintf({$language}{$stuTableSoleName}_ADD)", "sprintf({$language}{$stuTableSoleName}_EDIT)", "\t\t"); - $getForm .= $pc->getPhpCodeCommentLine('Get Theme', 'Form', "\t\t"); - $getForm .= $xc->getXcXoopsLoad('XoopsFormLoader', "\t\t"); - $getForm .= $cxc->getClassXoopsThemeForm('form', 'title', 'form', 'action', 'post'); - $getForm .= $cxc->getClassSetExtra('form', "'enctype=\"multipart/form-data\"'"); + $getForm .= $this->pc->getPhpCodeCommentLine('Title', '', "\t\t"); + $getForm .= $this->pc->getPhpCodeTernaryOperator('title', '$this->isNew()', "{$language}{$stuTableSoleName}_ADD", "{$language}{$stuTableSoleName}_EDIT", "\t\t"); + $getForm .= $this->pc->getPhpCodeCommentLine('Get Theme', 'Form', "\t\t"); + $getForm .= $this->xc->getXcXoopsLoad('XoopsFormLoader', "\t\t"); + $getForm .= $this->cxc->getClassXoopsThemeForm('form', 'title', 'form', 'action', 'post'); + $getForm .= $this->cxc->getClassSetExtra('form', "'enctype=\"multipart/form-data\"'"); $getForm .= $fe->renderElements(); - if (in_array(1, $fieldInForm)) { + if (\in_array(1, $fieldInForm)) { if (1 == $table->getVar('table_permissions')) { $getForm .= $this->getPermissionsInForm($moduleDirname, $fieldId, $tableName); } } - $getForm .= $pc->getPhpCodeCommentLine('To Save', '', "\t\t"); - //$hiddenSave = $cc->getClassXoopsFormHidden('', "'op'", "'save'", true, false); - $getForm .= $cxc->getClassAddElement('form', "new \XoopsFormHidden('op', 'save')"); - $getForm .= $cxc->getClassAddElement('form', "new \XoopsFormButtonTray('', _SUBMIT, 'submit', '', false)"); + $getForm .= $this->pc->getPhpCodeCommentLine('To Save', '', "\t\t"); + $getForm .= $this->cxc->getClassAddElement('form', "new \XoopsFormHidden('op', 'save')"); + $getForm .= $this->cxc->getClassAddElement('form', "new \XoopsFormHidden('start', \$this->start)"); + $getForm .= $this->cxc->getClassAddElement('form', "new \XoopsFormHidden('limit', \$this->limit)"); + $getForm .= $this->cxc->getClassAddElement('form', "new \XoopsFormButtonTray('', \_SUBMIT, 'submit', '', false)"); $getForm .= $this->getSimpleString('return $form;', "\t\t"); - $ret .= $pc->getPhpCodeFunction('getForm' . $ucfTableName, '$action = false', $getForm, 'public ', false, "\t"); + $ret .= $this->pc->getPhpCodeFunction('getForm' . $ucfTableName, '$action = false', $getForm, 'public ', false, "\t"); return $ret; } @@ -315,50 +340,44 @@ private function getFunctionForm($module, $table, $fieldId, $fieldInForm) * @private function getPermissionsInForm * * @param string $moduleDirname - * @param string $fieldId + * @param string|null $fieldId * * @param $tableName * @return string */ - private function getPermissionsInForm($moduleDirname, $fieldId, $tableName) + private function getPermissionsInForm(string $moduleDirname, ?string $fieldId, $tableName) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); $permissionApprove = $this->getLanguage($moduleDirname, 'AM', 'PERMISSIONS_APPROVE'); $permissionSubmit = $this->getLanguage($moduleDirname, 'AM', 'PERMISSIONS_SUBMIT'); $permissionView = $this->getLanguage($moduleDirname, 'AM', 'PERMISSIONS_VIEW'); - $ret = $pc->getPhpCodeCommentLine('Permissions', '', "\t\t"); - $ret .= $xc->getXcXoopsHandler('member', "\t\t"); - $ret .= $xc->getXcEqualsOperator('$groupList', '$memberHandler->getGroupList()', null, "\t\t"); - $ret .= $xc->getXcXoopsHandler('groupperm', "\t\t"); - $ret .= $pc->getPhpCodeArrayType('fullList', 'keys', 'groupList', null, false, "\t\t"); - $fId = $xc->getXcGetVar('', 'this', $fieldId, true); - $mId = $xc->getXcGetVar('', "GLOBALS['xoopsModule']", 'mid', true); - $ifGroups = $xc->getXcGetGroupIds('groupsIdsApprove', 'grouppermHandler', "'{$moduleDirname}_approve_{$tableName}'", $fId, $mId, "\t\t\t"); - $ifGroups .= $pc->getPhpCodeArrayType('groupsIdsApprove', 'values', 'groupsIdsApprove', null, false, "\t\t\t"); - $ifGroups .= $cxc->getClassXoopsFormCheckBox('groupsCanApproveCheckbox', $permissionApprove, "groups_approve_{$tableName}[]", '$groupsIdsApprove', false, "\t\t\t"); - $ifGroups .= $xc->getXcGetGroupIds('groupsIdsSubmit', 'grouppermHandler', "'{$moduleDirname}_submit_{$tableName}'", $fId, $mId, "\t\t\t"); - $ifGroups .= $pc->getPhpCodeArrayType('groupsIdsSubmit', 'values', 'groupsIdsSubmit', null, false, "\t\t\t"); - $ifGroups .= $cxc->getClassXoopsFormCheckBox('groupsCanSubmitCheckbox', $permissionSubmit, "groups_submit_{$tableName}[]", '$groupsIdsSubmit', false, "\t\t\t"); - $ifGroups .= $xc->getXcGetGroupIds('groupsIdsView', 'grouppermHandler', "'{$moduleDirname}_view_{$tableName}'", $fId, $mId, "\t\t\t"); - $ifGroups .= $pc->getPhpCodeArrayType('groupsIdsView', 'values', 'groupsIdsView', null, false, "\t\t\t"); - $ifGroups .= $cxc->getClassXoopsFormCheckBox('groupsCanViewCheckbox', $permissionView, "groups_view_{$tableName}[]", '$groupsIdsView', false, "\t\t\t"); - - $else = $cxc->getClassXoopsFormCheckBox('groupsCanApproveCheckbox', $permissionApprove, "groups_approve_{$tableName}[]", '$fullList', false, "\t\t\t"); - $else .= $cxc->getClassXoopsFormCheckBox('groupsCanSubmitCheckbox', $permissionSubmit, "groups_submit_{$tableName}[]", '$fullList', false, "\t\t\t"); - $else .= $cxc->getClassXoopsFormCheckBox('groupsCanViewCheckbox', $permissionView, "groups_view_{$tableName}[]", '$fullList', false, "\t\t\t"); - - $ret .= $pc->getPhpCodeConditions('!$this->isNew()', null, null, $ifGroups, $else, "\t\t"); - $ret .= $pc->getPhpCodeCommentLine('To Approve', '', "\t\t"); - $ret .= $cxc->getClassAddOptionArray('groupsCanApproveCheckbox', '$groupList'); - $ret .= $cxc->getClassAddElement('form', '$groupsCanApproveCheckbox'); - $ret .= $pc->getPhpCodeCommentLine('To Submit', '', "\t\t"); - $ret .= $cxc->getClassAddOptionArray('groupsCanSubmitCheckbox', '$groupList'); - $ret .= $cxc->getClassAddElement('form', '$groupsCanSubmitCheckbox'); - $ret .= $pc->getPhpCodeCommentLine('To View', '', "\t\t"); - $ret .= $cxc->getClassAddOptionArray('groupsCanViewCheckbox', '$groupList'); - $ret .= $cxc->getClassAddElement('form', '$groupsCanViewCheckbox'); + $ret = $this->pc->getPhpCodeCommentLine('Permissions', '', "\t\t"); + $ret .= $this->xc->getXcXoopsHandler('member', "\t\t"); + $ret .= $this->xc->getXcEqualsOperator('$groupList', '$memberHandler->getGroupList()', null, "\t\t"); + $ret .= $this->xc->getXcXoopsHandler('groupperm', "\t\t"); + $ret .= $this->pc->getPhpCodeArrayType('fullList', 'keys', 'groupList'); + $fId = $this->xc->getXcGetVar('', 'this', $fieldId, true); + $mId = $this->xc->getXcGetVar('', "GLOBALS['xoopsModule']", 'mid', true); + $contElse = $this->xc->getXcGetGroupIds('groupsIdsApprove', 'grouppermHandler', "'{$moduleDirname}_approve_{$tableName}'", $fId, $mId, "\t\t\t"); + $contElse .= $this->cxc->getClassXoopsFormCheckBox('groupsCanApproveCheckbox', $permissionApprove, "groups_approve_{$tableName}[]", '$groupsIdsApprove', false, "\t\t\t"); + $contElse .= $this->xc->getXcGetGroupIds('groupsIdsSubmit', 'grouppermHandler', "'{$moduleDirname}_submit_{$tableName}'", $fId, $mId, "\t\t\t"); + $contElse .= $this->cxc->getClassXoopsFormCheckBox('groupsCanSubmitCheckbox', $permissionSubmit, "groups_submit_{$tableName}[]", '$groupsIdsSubmit', false, "\t\t\t"); + $contElse .= $this->xc->getXcGetGroupIds('groupsIdsView', 'grouppermHandler', "'{$moduleDirname}_view_{$tableName}'", $fId, $mId, "\t\t\t"); + $contElse .= $this->cxc->getClassXoopsFormCheckBox('groupsCanViewCheckbox', $permissionView, "groups_view_{$tableName}[]", '$groupsIdsView', false, "\t\t\t"); + + $contIf = $this->cxc->getClassXoopsFormCheckBox('groupsCanApproveCheckbox', $permissionApprove, "groups_approve_{$tableName}[]", '$fullList', false, "\t\t\t"); + $contIf .= $this->cxc->getClassXoopsFormCheckBox('groupsCanSubmitCheckbox', $permissionSubmit, "groups_submit_{$tableName}[]", '$fullList', false, "\t\t\t"); + $contIf .= $this->cxc->getClassXoopsFormCheckBox('groupsCanViewCheckbox', $permissionView, "groups_view_{$tableName}[]", '$fullList', false, "\t\t\t"); + + $ret .= $this->pc->getPhpCodeConditions('$this->isNew()', '', '', $contIf, $contElse, "\t\t"); + $ret .= $this->pc->getPhpCodeCommentLine('To Approve', '', "\t\t"); + $ret .= $this->cxc->getClassAddOptionArray('groupsCanApproveCheckbox', '$groupList'); + $ret .= $this->cxc->getClassAddElement('form', '$groupsCanApproveCheckbox'); + $ret .= $this->pc->getPhpCodeCommentLine('To Submit', '', "\t\t"); + $ret .= $this->cxc->getClassAddOptionArray('groupsCanSubmitCheckbox', '$groupList'); + $ret .= $this->cxc->getClassAddElement('form', '$groupsCanSubmitCheckbox'); + $ret .= $this->pc->getPhpCodeCommentLine('To View', '', "\t\t"); + $ret .= $this->cxc->getClassAddOptionArray('groupsCanViewCheckbox', '$groupList'); + $ret .= $this->cxc->getClassAddElement('form', '$groupsCanViewCheckbox'); return $ret; } @@ -374,66 +393,145 @@ private function getPermissionsInForm($moduleDirname, $fieldId, $tableName) */ private function getValuesInObject($moduleDirname, $table, $fields) { - $tc = Tdmcreate\Helper::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $ucfTableName = ucfirst($table->getVar('table_name')); - $ret = $pc->getPhpCodeCommentMultiLine(['Get' => 'Values', '@param null $keys' => '', '@param null $format' => '', '@param null$maxDepth' => '', '@return' => 'array'], "\t"); - $ucfModuleDirname = ucfirst($moduleDirname); - $getValues = $xc->getXcGetInstance('helper', "\XoopsModules\\{$ucfModuleDirname}\Helper", "\t\t"); - $getValues .= $xc->getXcEqualsOperator('$ret', '$this->getValues($keys, $format, $maxDepth)', null, "\t\t"); + $ucfTableName = \ucfirst($table->getVar('table_name')); + $ret = $this->pc->getPhpCodeCommentMultiLine(['Get' => 'Values', '@param string $keys' => '', '@param string $format' => '', '@param string $maxDepth' => '', '@return' => 'array'], "\t"); + $ucfModuleDirname = \ucfirst($moduleDirname); + $language = $this->getLanguage($moduleDirname, 'AM'); + $getValues = $this->xc->getXcEqualsOperator('$ret', '$this->getValues($keys, $format, $maxDepth)', null, "\t\t"); + $tablePermissions = $table->getVar('table_permissions'); + $tableBroken = $table->getVar('table_broken'); $fieldMainTopic = null; - foreach (array_keys($fields) as $f) { + $helper = 0; + $utility = 0; + $header = ''; + $configMaxchar = 0; + $lenMaxName = 0; + foreach (\array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); $fieldElement = $fields[$f]->getVar('field_element'); $rpFieldName = $this->getRightString($fieldName); + $len = \mb_strlen($rpFieldName) + \mb_strlen('_short'); + $lenMaxName = max($len, $lenMaxName); + if (Constants::FIELD_ELE_TEXTAREA == $fieldElement || Constants::FIELD_ELE_DHTMLTEXTAREA == $fieldElement) { + $configMaxchar = 1; + } + } + if (1 === $configMaxchar) { + $getValues .= $this->xc->getXcEqualsOperator('$editorMaxchar', $this->xc->getXcGetConfig('editor_maxchar'), false, "\t\t"); + } + foreach (\array_keys($fields) as $f) { + $fieldName = $fields[$f]->getVar('field_name'); + $fieldElement = $fields[$f]->getVar('field_element'); + $rpFieldName = $this->getRightString($fieldName); + $spacer = str_repeat(' ', $lenMaxName - \mb_strlen($rpFieldName)); switch ($fieldElement) { - case 3: - case 4: - $getValues .= $pc->getPhpCodeStripTags("ret['{$rpFieldName}']", "\$this->getVar('{$fieldName}')", false, "\t\t"); + case Constants::FIELD_ELE_TEXTAREA: + $spacer = str_repeat(' ', \max(0, $lenMaxName - 5 - \mb_strlen($rpFieldName))); + $getValues .= $this->pc->getPhpCodeStripTags("ret['{$rpFieldName}_text']{$spacer}", "\$this->getVar('{$fieldName}', 'e')", false, "\t\t"); + $truncate = "\$utility::truncateHtml(\$ret['{$rpFieldName}_text'], \$editorMaxchar)"; + $spacer = str_repeat(' ', $lenMaxName - \mb_strlen($rpFieldName) - \mb_strlen('_short')); + $getValues .= $this->xc->getXcEqualsOperator("\$ret['{$rpFieldName}_short']{$spacer}", $truncate, false, "\t\t"); + $helper = 1; + $utility = 1; break; - case 6: - $getValues .= $xc->getXcEqualsOperator("\$ret['{$rpFieldName}']", "(int)\$this->getVar('{$fieldName}') > 0 ? _YES : _NO", false, "\t\t"); + case Constants::FIELD_ELE_DHTMLTEXTAREA: + $spacer = str_repeat(' ', \max(0, $lenMaxName - 5 - \mb_strlen($rpFieldName))); + $getValues .= $this->xc->getXcGetVar("ret['{$rpFieldName}_text']{$spacer}", 'this', $fieldName, false, "\t\t", ", 'e'"); + $truncate = "\$utility::truncateHtml(\$ret['{$rpFieldName}_text'], \$editorMaxchar)"; + $spacer = str_repeat(' ', $lenMaxName - \mb_strlen($rpFieldName) - \mb_strlen('_short')); + $getValues .= $this->xc->getXcEqualsOperator("\$ret['{$rpFieldName}_short']{$spacer}", $truncate, false, "\t\t"); + $helper = 1; + $utility = 1; break; - case 8: - $getValues .= $xc->getXcXoopsUserUnameFromId("ret['{$rpFieldName}']", "\$this->getVar('{$fieldName}')", "\t\t"); + case Constants::FIELD_ELE_RADIOYN: + $spacer = str_repeat(' ', \max(0, $lenMaxName - 5 - \mb_strlen($rpFieldName))); + $getValues .= $this->xc->getXcEqualsOperator("\$ret['{$rpFieldName}_text']{$spacer}", "(int)\$this->getVar('{$fieldName}') > 0 ? _YES : _NO", false, "\t\t"); break; - case 15: - $getValues .= $xc->getXcFormatTimeStamp("ret['{$rpFieldName}']", "\$this->getVar('{$fieldName}')", 's', "\t\t"); + case Constants::FIELD_ELE_RADIO_ONOFFLINE: + $spacer = str_repeat(' ', \max(0, $lenMaxName - 5 - \mb_strlen($rpFieldName))); + $defaultRO = $this->xc->getXcGetConstants('RADIO_OFFLINE'); + $offlineRO = $language . 'STATUS_OFFLINE'; + $onlineRO = $language . 'STATUS_ONLINE'; + $getValues .= $this->xc->getXcEqualsOperator("\$ret['{$rpFieldName}_text']{$spacer}", "(int)\$this->getVar('{$fieldName}') > $defaultRO ? $onlineRO : $offlineRO", false, "\t\t"); break; - case 21: - $getValues .= $xc->getXcFormatTimeStamp("ret['{$rpFieldName}']", "\$this->getVar('{$fieldName}')", 'm', "\t\t"); + case Constants::FIELD_ELE_SELECTUSER: + $spacer = str_repeat(' ', \max(0, $lenMaxName - 5 - \mb_strlen($rpFieldName))); + $getValues .= $this->xc->getXcXoopsUserUnameFromId("ret['{$rpFieldName}_text']{$spacer}", "\$this->getVar('{$fieldName}')", "\t\t"); + break; + case Constants::FIELD_ELE_TEXTDATESELECT: + $spacer = str_repeat(' ', \max(0, $lenMaxName - 5 - \mb_strlen($rpFieldName))); + $getValues .= $this->xc->getXcFormatTimeStamp("ret['{$rpFieldName}_text']{$spacer}", "\$this->getVar('{$fieldName}')", 's', "\t\t"); + break; + case Constants::FIELD_ELE_SELECTSTATUS: + $spacer = str_repeat(' ', $lenMaxName - \mb_strlen('status') + 7); + $getValues .= $this->xc->getXcGetVar("status{$spacer}", 'this', $fieldName, false, "\t\t"); + $spacer = str_repeat(' ', $lenMaxName - \mb_strlen('status')); + $getValues .= $this->xc->getXcEqualsOperator("\$ret['status']{$spacer}", '$status', false, "\t\t"); + $contCase1 = $this->xc->getXcEqualsOperator('$status_text', $language . 'STATUS_NONE', false, "\t\t\t\t"); + $cases[$this->xc->getXcGetConstants('STATUS_NONE')] = [$contCase1]; + $contCase2 = $this->xc->getXcEqualsOperator('$status_text', $language . 'STATUS_OFFLINE', false, "\t\t\t\t"); + $cases[$this->xc->getXcGetConstants('STATUS_OFFLINE')] = [$contCase2]; + $contCase3 = $this->xc->getXcEqualsOperator('$status_text', $language . 'STATUS_SUBMITTED', false, "\t\t\t\t"); + $cases[$this->xc->getXcGetConstants('STATUS_SUBMITTED')] = [$contCase3]; + if (1 == $tablePermissions) { + $contCase4 = $this->xc->getXcEqualsOperator('$status_text', $language . 'STATUS_APPROVED', false, "\t\t\t\t"); + $cases[$this->xc->getXcGetConstants('STATUS_APPROVED')] = [$contCase4]; + } + if (1 == $tableBroken) { + $contCase5 = $this->xc->getXcEqualsOperator('$status_text', $language . 'STATUS_BROKEN', false, "\t\t\t\t"); + $cases[$this->xc->getXcGetConstants('STATUS_BROKEN')] = [$contCase5]; + } + $contentSwitch = $this->pc->getPhpCodeCaseSwitch($cases, true, "\t\t\t", true); + $getValues .= $this->pc->getPhpCodeSwitch('status', $contentSwitch, "\t\t"); + $len = $lenMaxName - \mb_strlen('status_text'); + $spacer = $len > 0 ? str_repeat(' ', $len) : ''; + $getValues .= $this->xc->getXcEqualsOperator("\$ret['status_text']{$spacer}", '$status_text', false, "\t\t"); + break; + case Constants::FIELD_ELE_DATETIME: + $spacer = str_repeat(' ', \max(0, $lenMaxName - 5 - \mb_strlen($rpFieldName))); + $getValues .= $this->xc->getXcFormatTimeStamp("ret['{$rpFieldName}_text']{$spacer}", "\$this->getVar('{$fieldName}')", 'm', "\t\t"); break; default: - $fieldElements = $tc->getHandler('fieldelements')->get($fieldElement); + $fieldElements = $this->helper->getHandler('Fieldelements')->get($fieldElement); $fieldElementTid = $fieldElements->getVar('fieldelement_tid'); if ((int)$fieldElementTid > 0 ) { $fieldElementMid = $fieldElements->getVar('fieldelement_mid'); - $fieldElementName = $fieldElements->getVar('fieldelement_name'); - $fieldNameDesc = mb_substr($fieldElementName, mb_strrpos($fieldElementName, ':'), mb_strlen($fieldElementName)); - $topicTableName = str_replace(': ', '', mb_strtolower($fieldNameDesc)); + $fieldElementName = (string)$fieldElements->getVar('fieldelement_name'); + $fieldNameDesc = mb_substr($fieldElementName, \mb_strrpos($fieldElementName, ':'), mb_strlen($fieldElementName)); + $topicTableName = \str_replace(': ', '', \mb_strtolower($fieldNameDesc)); $fieldsTopics = $this->getTableFields($fieldElementMid, $fieldElementTid); - foreach (array_keys($fieldsTopics) as $g) { + foreach (\array_keys($fieldsTopics) as $g) { $fieldNameTopic = $fieldsTopics[$g]->getVar('field_name'); if (1 == $fieldsTopics[$g]->getVar('field_main')) { $fieldMainTopic = $fieldNameTopic; } } - $getValues .= $xc->getXcHandlerLine($topicTableName, "\t\t"); + $getValues .= $this->xc->getXcHandlerLine($topicTableName, "\t\t"); $getTopicTable = "\${$topicTableName}Handler->get(\$this->getVar('{$fieldName}'))"; - $getValues .= $xc->getXcEqualsOperator("\${$topicTableName}Obj", $getTopicTable, null, "\t\t"); - $fMainTopic = "\${$topicTableName}Obj->getVar('{$fieldMainTopic}')"; - $getValues .= $xc->getXcEqualsOperator("\$ret['{$rpFieldName}']", $fMainTopic, null, "\t\t"); - + $getValues .= $this->xc->getXcEqualsOperator("\${$topicTableName}Obj", $getTopicTable, null, "\t\t"); + $fMainTopic = "\${$topicTableName}Obj->getVar('{$fieldMainTopic}')"; + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $getValues .= $this->xc->getXcEqualsOperator("\${$ccFieldName}", "''", null, "\t\t"); + $condIf = $this->xc->getXcEqualsOperator("\${$ccFieldName}", $fMainTopic, null, "\t\t\t"); + $tablenameObj = $this->pc->getPhpCodeIsobject($topicTableName . 'Obj'); + $getValues .= $this->pc->getPhpCodeConditions($tablenameObj, '', '', $condIf, false, "\t\t"); + $getValues .= $this->xc->getXcEqualsOperator("\$ret['{$rpFieldName}']{$spacer}", "\${$ccFieldName}", null, "\t\t"); + $helper = 1; } else { - $getValues .= $xc->getXcGetVar("ret['{$rpFieldName}']", 'this', $fieldName, false, "\t\t"); + $getValues .= $this->xc->getXcGetVar("ret['{$rpFieldName}']{$spacer}", 'this', $fieldName, false, "\t\t"); } break; } } + if ($helper > 0) { + $header .= $this->xc->getXcGetInstance('helper ', "\XoopsModules\\{$ucfModuleDirname}\Helper", "\t\t"); + } + if ($utility > 0) { + $header .= $this->xc->getXcEqualsOperator('$utility', "new \XoopsModules\\{$ucfModuleDirname}\Utility()", '',"\t\t"); + } $getValues .= $this->getSimpleString('return $ret;', "\t\t"); - $ret .= $pc->getPhpCodeFunction('getValues' . $ucfTableName, '$keys = null, $format = null, $maxDepth = null', $getValues, 'public ', false, "\t"); + $ret .= $this->pc->getPhpCodeFunction('getValues' . $ucfTableName, '$keys = null, $format = null, $maxDepth = null', $header . $getValues, 'public ', false, "\t"); return $ret; } @@ -447,20 +545,18 @@ private function getValuesInObject($moduleDirname, $table, $fields) */ private function getToArrayInObject($table) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); $tableName = $table->getVar('table_name'); - $ucfTableName = ucfirst($tableName); + $ucfTableName = \ucfirst($tableName); $multiLineCom = ['Returns an array representation' => 'of the object', '' => '', '@return' => 'array']; - $ret = $pc->getPhpCodeCommentMultiLine($multiLineCom, "\t"); + $ret = $this->pc->getPhpCodeCommentMultiLine($multiLineCom, "\t"); - $getToArray = $pc->getPhpCodeArray('ret', [], false, "\t\t"); - $getToArray .= $xc->getXcEqualsOperator('$vars', '$this->getVars()', null, "\t\t"); - $foreach = $xc->getXcGetVar('ret[$var]', 'this', '"{$var}"', false, "\t\t\t"); - $getToArray .= $pc->getPhpCodeForeach('vars', true, false, 'var', $foreach, "\t\t"); + $getToArray = $this->pc->getPhpCodeArray('ret', []); + $getToArray .= $this->xc->getXcEqualsOperator('$vars', '$this->getVars()', null, "\t\t"); + $foreach = $this->xc->getXcEqualsOperator('$ret[$var]', '$this->getVar($var)', null, "\t\t\t"); + $getToArray .= $this->pc->getPhpCodeForeach('vars', true, false, 'var', $foreach, "\t\t"); $getToArray .= $this->getSimpleString('return $ret;', "\t\t"); - $ret .= $pc->getPhpCodeFunction('toArray' . $ucfTableName, '', $getToArray, 'public ', false, "\t"); + $ret .= $this->pc->getPhpCodeFunction('toArray' . $ucfTableName, '', $getToArray, 'public ', false, "\t"); return $ret; } @@ -474,55 +570,51 @@ private function getToArrayInObject($table) */ private function getOptionsCheck($table) { - $tc = Tdmcreate\Helper::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); $tableName = $table->getVar('table_name'); - $ucfTableName = ucfirst($tableName); - $ret = $pc->getPhpCodeCommentMultiLine(['Get' => 'Options'], "\t"); - $getOptions = $pc->getPhpCodeArray('ret', [], false, "\t"); + $ucfTableName = \ucfirst($tableName); + $ret = $this->pc->getPhpCodeCommentMultiLine(['Get' => 'Options'], "\t"); + $getOptions = $this->pc->getPhpCodeArray('ret', [], false, "\t"); $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); - foreach (array_keys($fields) as $f) { + foreach (\array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); $fieldElement = $fields[$f]->getVar('field_element'); - $fieldElements = $tc->getHandler('fieldelements')->get($fieldElement); + $fieldElements = $this->helper->getHandler('Fieldelements')->get($fieldElement); $fieldElementId = $fieldElements->getVar('fieldelement_id'); $rpFieldName = $this->getRightString($fieldName); if (5 == $fieldElementId) { - $arrayPush = $pc->getPhpCodeArrayType('ret', 'push', "'{$rpFieldName}'", null, false, "\t\t\t"); - $getOptions .= $pc->getPhpCodeConditions(1, ' == ', "\$this->getVar('{$fieldName}')", $arrayPush, false, "\t\t"); + $arrayPush = $this->pc->getPhpCodeArrayType('ret', 'push', "'{$rpFieldName}'", null, false, "\t\t\t"); + $getOptions .= $this->pc->getPhpCodeConditions("\$this->getVar('{$fieldName}')", ' == ', '1', $arrayPush, false, "\t\t"); } } $getOptions .= $this->getSimpleString('return $ret;', "\t\t"); - $ret .= $pc->getPhpCodeFunction('getOptions' . $ucfTableName, '', $getOptions, 'public ', false, "\t"); + $ret .= $this->pc->getPhpCodeFunction('getOptions' . $ucfTableName, '', $getOptions, 'public ', false, "\t"); return $ret; } /** * @public function render - * @param null * - * @return bool|string + * @return string */ public function render() { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); $module = $this->getModule(); $table = $this->getTable(); $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); - $namespace = $pc->getPhpCodeNamespace(['XoopsModules', $moduleDirname]); + $namespace = $this->pc->getPhpCodeNamespace(['XoopsModules', $moduleDirname]); $content = $this->getHeaderFilesComments($module, null, $namespace); - $content .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname]); + $content .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname]); $content .= $this->getClassObject($module, $table, $fields); - $this->create($moduleDirname, 'class', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'class', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/Classes/ClassFormElements.php b/class/Files/Classes/ClassFormElements.php index 3ff31b95..c90ca222 100644 --- a/class/Files/Classes/ClassFormElements.php +++ b/class/Files/Classes/ClassFormElements.php @@ -1,8 +1,9 @@ -helper = Modulebuilder\Helper::getInstance(); + $this->cf = Modulebuilder\Files\CreateFile::getInstance(); + $this->xc = Modulebuilder\Files\CreateXoopsCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); + $this->tf = Modulebuilder\Files\CreateTableFields::getInstance(); + $this->cxc = Modulebuilder\Files\Classes\ClassXoopsCode::getInstance(); + } + /** * @static function getInstance - * @param null * * @return ClassFormElements */ @@ -52,7 +90,7 @@ public static function getInstance() * @param $module * @param $table */ - public function initForm($module, $table) + public function initForm($module, $table): void { $this->setModule($module); $this->setTable($table); @@ -67,22 +105,17 @@ public function initForm($module, $table) * @param string $required * @return string */ - private function getXoopsFormText($language, $fieldName, $fieldDefault, $required = 'false') + private function getXoopsFormText($language, $fieldName, $fieldDefault, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $ret = $this->pc->getPhpCodeCommentLine('Form Text', $ccFieldName, "\t\t"); if ('' != $fieldDefault) { - $ret = $pc->getPhpCodeCommentLine('Form Text', $ccFieldName, "\t\t"); - $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', "'{$fieldDefault}'", "\$this->getVar('{$fieldName}')", "\t\t"); - $formText = $cxc->getClassXoopsFormText('', $language, $fieldName, 20, 150, $ccFieldName, true); - $ret .= $cxc->getClassAddElement('form', $formText . $required); + $ret .= $this->pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', "'{$fieldDefault}'", "\$this->getVar('{$fieldName}')", "\t\t"); + $formText = $this->cxc->getClassXoopsFormText('', $language, $fieldName, 20, 150, $ccFieldName, true); } else { - $ret = $pc->getPhpCodeCommentLine('Form Text', $ccFieldName, "\t\t"); - $formText = $cxc->getClassXoopsFormText('', $language, $fieldName, 50, 255, "this->getVar('{$fieldName}')", true); - $ret .= $cxc->getClassAddElement('form', $formText . $required); + $formText = $this->cxc->getClassXoopsFormText('', $language, $fieldName, 50, 255, "this->getVar('{$fieldName}')", true); } + $ret .= $this->cxc->getClassAddElement('form', $formText . $required); return $ret; } @@ -92,19 +125,16 @@ private function getXoopsFormText($language, $fieldName, $fieldDefault, $require * * @param $language * @param $fieldName - * @param $required + * @param string $required * * @return string */ - private function getXoopsFormTextArea($language, $fieldName, $required = 'false') + private function getXoopsFormTextArea($language, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $ret = $pc->getPhpCodeCommentLine('Form Editor', 'TextArea ' . $ccFieldName, "\t\t"); - $formTextArea = $cxc->getClassXoopsFormTextArea('', $language, $fieldName, 4, 47, true); - $ret .= $cxc->getClassAddElement('form', $formTextArea . $required); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $ret = $this->pc->getPhpCodeCommentLine('Form Editor', 'TextArea ' . $ccFieldName, "\t\t"); + $formTextArea = $this->cxc->getClassXoopsFormTextArea('', $language, $fieldName, 4, 47, true); + $ret .= $this->cxc->getClassAddElement('form', $formTextArea . $required); return $ret; } @@ -114,21 +144,21 @@ private function getXoopsFormTextArea($language, $fieldName, $required = 'false' * * @param $language * @param $fieldName - * @param $required + * @param string $required * * @return string */ - private function getXoopsFormDhtmlTextArea($language, $fieldName, $required = 'false') + private function getXoopsFormDhtmlTextArea($language, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $rpFieldName = $tf->getRightString($fieldName); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $ret = $pc->getPhpCodeCommentLine('Form Editor', 'DhtmlTextArea ' . $ccFieldName, "\t\t"); - $ret .= $pc->getPhpCodeArray('editorConfigs', null, false, "\t\t"); - $getConfig = $xc->getXcGetConfig('editor_' . $rpFieldName); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $ret = $this->pc->getPhpCodeCommentLine('Form Editor', 'DhtmlTextArea ' . $ccFieldName, "\t\t"); + $ret .= $this->pc->getPhpCodeArray('editorConfigs'); + $getConfig = $this->xc->getXcGetConfig('editor_admin'); + $contIf = $this->xc->getXcEqualsOperator('$editor', $getConfig, null, "\t\t\t"); + $getConfig = $this->xc->getXcGetConfig('editor_user'); + $contElse = $this->xc->getXcEqualsOperator('$editor', $getConfig, null, "\t\t\t"); + $ret .= $this->pc->getPhpCodeConditions('$isAdmin','','', $contIf, $contElse, "\t\t"); + $configs = [ 'name' => "'{$fieldName}'", 'value' => "\$this->getVar('{$fieldName}', 'e')", @@ -136,13 +166,13 @@ private function getXoopsFormDhtmlTextArea($language, $fieldName, $required = 'f 'cols' => 40, 'width' => "'100%'", 'height' => "'400px'", - 'editor' => $getConfig, + 'editor' => '$editor', ]; foreach ($configs as $c => $d) { - $ret .= $xc->getXcEqualsOperator("\$editorConfigs['{$c}']", $d, null, "\t\t"); + $ret .= $this->xc->getXcEqualsOperator("\$editorConfigs['{$c}']", $d, null, "\t\t"); } - $formEditor = $cxc->getClassXoopsFormEditor('', $language, $fieldName, 'editorConfigs', true); - $ret .= $cxc->getClassAddElement('form', $formEditor . $required); + $formEditor = $this->cxc->getClassXoopsFormEditor('', $language, $fieldName, 'editorConfigs', true); + $ret .= $this->cxc->getClassAddElement('form', $formEditor . $required); return $ret; } @@ -157,34 +187,28 @@ private function getXoopsFormDhtmlTextArea($language, $fieldName, $required = 'f * @param string $required * @return string */ - private function getXoopsFormCheckBox($language, $tableSoleName, $fieldName, $fieldElementId, $required = 'false') + private function getXoopsFormCheckBox($language, $tableSoleName, $fieldName, $fieldElementId, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $stuTableSoleName = mb_strtoupper($tableSoleName); - $ucfFieldName = $tf->getCamelCase($fieldName, true); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); + $stuTableSoleName = \mb_strtoupper($tableSoleName); + $ucfFieldName = $this->cf->getCamelCase($fieldName, true); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); $t = "\t\t"; - if (in_array(5, $fieldElementId) > 1) { - $ret = $pc->getPhpCodeCommentLine('Form Check Box', 'List Options ' . $ccFieldName, $t); - $ret .= $xc->getXcEqualsOperator('$checkOption', '$this->getOptions()'); - $foreach = $cxc->getClassXoopsFormCheckBox('check' . $ucfFieldName, '
', $tableSoleName . '_option', '$checkOption', false, $t . "\t"); - $foreach .= $cxc->getClassSetDescription('check' . $ucfFieldName, "{$language}{$stuTableSoleName}_OPTIONS_DESC", $t . "\t"); - $foreach .= $cxc->getClassAddOption('check' . $ucfFieldName, "\$option, {$language}{$stuTableSoleName}_ . strtoupper(\$option)", $t . "\t"); - $ret .= $pc->getPhpCodeForeach("{$tableSoleName}All", false, false, 'option', $foreach, $t); - $intElem = "\$check{$ucfFieldName}{$required}"; - $ret .= $cxc->getClassAddElement('form', $intElem, $t); + if (\in_array(5, $fieldElementId) > 1) { + $ret = $this->pc->getPhpCodeCommentLine('Form Check Box', 'List Options ' . $ccFieldName, $t); + $ret .= $this->xc->getXcEqualsOperator('$checkOption', '$this->getOptions()'); + $foreach = $this->cxc->getClassXoopsFormCheckBox('check' . $ucfFieldName, '
', $tableSoleName . '_option', '$checkOption', false, $t . "\t"); + $foreach .= $this->cxc->getClassSetDescription('check' . $ucfFieldName, "{$language}{$stuTableSoleName}_OPTIONS_DESC", $t . "\t"); + $foreach .= $this->cxc->getClassAddOption('check' . $ucfFieldName, "\$option, {$language}{$stuTableSoleName}_ . strtoupper(\$option)", $t . "\t"); + $ret .= $this->pc->getPhpCodeForeach("{$tableSoleName}All", false, false, 'option', $foreach, $t); } else { - $ret = $pc->getPhpCodeCommentLine('Form Check Box', $ccFieldName, $t); - $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', 0, "\$this->getVar('{$fieldName}')", $t); - $ret .= $cxc->getClassXoopsFormCheckBox('check' . $ucfFieldName, (string)$language, $fieldName, "\${$ccFieldName}", false, $t); + $ret = $this->pc->getPhpCodeCommentLine('Form Check Box', $ccFieldName, $t); + $ret .= $this->pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', 0, "\$this->getVar('{$fieldName}')", $t); + $ret .= $this->cxc->getClassXoopsFormCheckBox('check' . $ucfFieldName, $language, $fieldName, "\${$ccFieldName}", false, $t); $option = "1, {$language}"; - $ret .= $cxc->getClassAddOption('check' . $ucfFieldName, $option, $t); - $intElem = "\$check{$ucfFieldName}{$required}"; - $ret .= $cxc->getClassAddElement('form', $intElem, $t); + $ret .= $this->cxc->getClassAddOption('check' . $ucfFieldName, $option, $t); } + $intElem = "\$check{$ucfFieldName}{$required}"; + $ret .= $this->cxc->getClassAddElement('form', $intElem, $t); return $ret; } @@ -198,13 +222,10 @@ private function getXoopsFormCheckBox($language, $tableSoleName, $fieldName, $fi */ private function getXoopsFormHidden($fieldName) { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $ret = $pc->getPhpCodeCommentLine('Form Hidden', $ccFieldName, "\t\t"); - $formHidden = $cxc->getClassXoopsFormHidden('', $fieldName, $fieldName, true, true); - $ret .= $cxc->getClassAddElement('form', $formHidden); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $ret = $this->pc->getPhpCodeCommentLine('Form Hidden', $ccFieldName, "\t\t"); + $formHidden = $this->cxc->getClassXoopsFormHidden('', $fieldName, $fieldName, true, true); + $ret .= $this->cxc->getClassAddElement('form', $formHidden); return $ret; } @@ -216,48 +237,42 @@ private function getXoopsFormHidden($fieldName) * @param $language * @param $moduleDirname * @param $fieldName - * @param $required + * @param string $required * * @return string */ - private function getXoopsFormImageList($language, $moduleDirname, $fieldName, $required = 'false') + private function getXoopsFormImageList($language, $moduleDirname, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ucfFieldName = $tf->getCamelCase($fieldName, true); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $languageShort = substr($language, 0, 4) . mb_strtoupper($moduleDirname) . '_'; + $ucfFieldName = $this->cf->getCamelCase($fieldName, true); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $languageShort = \mb_substr($language, 0, 5) . \mb_strtoupper($moduleDirname) . '_'; $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine('Form Frameworks Images', 'Files ' . $ccFieldName, $t); - $ret .= $pc->getPhpCodeCommentLine('Form Frameworks Images', $ccFieldName .': Select Uploaded Image', $t); - $ret .= $xc->getXcEqualsOperator('$get' . $ucfFieldName, "\$this->getVar('{$fieldName}')", null, $t); - $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$get' . $ucfFieldName, '$get' . $ucfFieldName, "'blank.gif'", $t); - $ret .= $xc->getXcEqualsOperator('$imageDirectory', "'/Frameworks/moduleclasses/icons/32'", null, $t); - $ret .= $cxc->getClassXoopsFormElementTray('imageTray', $language, '
', $t); - $sprintf = $pc->getPhpCodeSprintf($language . '_UPLOADS', '".{$imageDirectory}/"'); - $ret .= $cxc->getClassXoopsFormSelect('imageSelect', $sprintf, $fieldName, $ccFieldName, 5, 'false', false, $t); - $ret .= $xc->getXcXoopsListImgListArray('imageArray', 'XOOPS_ROOT_PATH . $imageDirectory', $t); - $contForeach = $cxc->getClassAddOption('imageSelect', '"{$image1}", $image1', $t . "\t"); - $ret .= $pc->getPhpCodeForeach('imageArray', false, false, 'image1', $contForeach, $t); - $setExtraParam = "\"onchange='showImgSelected(\\\"imglabel_{$fieldName}\\\", \\\"{$fieldName}\\\", \\\"\" . \$imageDirectory . \"\\\", \\\"\\\", \\\"\" . XOOPS_URL . \"\\\")'\""; - $ret .= $cxc->getClassSetExtra('imageSelect', $setExtraParam, $t); - $ret .= $cxc->getClassAddElement('imageTray', '$imageSelect, false', $t); - - $paramLabel = "\"
', $t); - $getConfig = $xc->getXcGetConfig('maxsize_image'); - $xoopsFormFile = $cxc->getClassXoopsFormFile('', $languageShort . 'FORM_UPLOAD_NEW', $fieldName, $getConfig, true, ''); - $ret .= $cxc->getClassAddElement('fileSelectTray', $xoopsFormFile, $t); - $xoopsFormLabel1 = $cxc->getClassXoopsFormLabel('', "''", null, true, $t); - $ret .= $cxc->getClassAddElement('fileSelectTray', $xoopsFormLabel1, $t); - $ret .= $cxc->getClassAddElement('imageTray', '$fileSelectTray', $t); - $ret .= $cxc->getClassAddElement('form', "\$imageTray{$required}", $t); + $ret = $this->pc->getPhpCodeCommentLine('Form Frameworks Images', 'Files ' . $ccFieldName, $t); + $ret .= $this->pc->getPhpCodeCommentLine('Form Frameworks Images', $ccFieldName .': Select Uploaded Image', $t); + $ret .= $this->xc->getXcEqualsOperator('$get' . $ucfFieldName, "\$this->getVar('{$fieldName}')", null, $t); + $ret .= $this->pc->getPhpCodeTernaryOperator($ccFieldName, '$get' . $ucfFieldName, '', "'blank.gif'", $t); + $ret .= $this->xc->getXcEqualsOperator('$imageDirectory', "'/Frameworks/moduleclasses/icons/32'", null, $t); + $ret .= $this->cxc->getClassXoopsFormElementTray('imageTray', $language, '
', $t); + $sprintf = $this->pc->getPhpCodeSprintf($language . '_UPLOADS', '".{$imageDirectory}/"'); + $ret .= $this->cxc->getClassXoopsFormSelect('imageSelect', $sprintf, $fieldName, $ccFieldName, 5, 'false', false, $t); + $ret .= $this->xc->getXcXoopsListImgListArray('imageArray', '\XOOPS_ROOT_PATH . $imageDirectory', $t); + $contForeach = $this->cxc->getClassAddOption('imageSelect', '($image1), $image1', $t . "\t"); + $ret .= $this->pc->getPhpCodeForeach('imageArray', false, false, 'image1', $contForeach, $t); + $setExtraParam = "\"onchange='showImgSelected(\\\"imglabel_{$fieldName}\\\", \\\"{$fieldName}\\\", \\\"\" . \$imageDirectory . '\", \"\", \"' . \XOOPS_URL . \"\\\")'\""; + $ret .= $this->cxc->getClassSetExtra('imageSelect', $setExtraParam, $t); + $ret .= $this->cxc->getClassAddElement('imageTray', '$imageSelect, false', $t); + $paramLabel = "\"
', $t); + $getConfig = $this->xc->getXcGetConfig('maxsize_image'); + $xoopsFormFile = $this->cxc->getClassXoopsFormFile('', $languageShort . 'FORM_UPLOAD_NEW', $fieldName, $getConfig, true, ''); + $ret .= $this->cxc->getClassAddElement('fileSelectTray', $xoopsFormFile, $t); + $xoopsFormLabel1 = $this->cxc->getClassXoopsFormLabel('', "''", null, true, $t); + $ret .= $this->cxc->getClassAddElement('fileSelectTray', $xoopsFormLabel1, $t); + $ret .= $this->cxc->getClassAddElement('imageTray', '$fileSelectTray', $t); + $ret .= $this->cxc->getClassAddElement('form', "\$imageTray{$required}", $t); return $ret; } @@ -270,50 +285,46 @@ private function getXoopsFormImageList($language, $moduleDirname, $fieldName, $r * @param $moduleDirname * @param $tableName * @param $fieldName - * @param $required + * @param string $required * * @return string */ - private function getXoopsFormSelectFile($language, $moduleDirname, $tableName, $fieldName, $required = 'false') + private function getXoopsFormSelectFile($language, $moduleDirname, $tableName, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ucfFieldName = $tf->getCamelCase($fieldName, true); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $languageShort = substr($language, 0, 4) . mb_strtoupper($moduleDirname) . '_'; + $ucfFieldName = $this->cf->getCamelCase($fieldName, true); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $languageShort = \mb_substr($language, 0, 5) . \mb_strtoupper($moduleDirname) . '_'; $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine('Form File', $ccFieldName, $t); - $ret .= $pc->getPhpCodeCommentLine("Form File {$ccFieldName}:", 'Select Uploaded File ', $t); - $ret .= $xc->getXcEqualsOperator('$get' . $ucfFieldName, "\$this->getVar('{$fieldName}')", null, $t); - $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$get' . $ucfFieldName, '$get' . $ucfFieldName, "'blank.gif'", $t); - $ret .= $xc->getXcEqualsOperator('$fileDirectory', "'/uploads/{$moduleDirname}/files/{$tableName}'", null, $t); - $ret .= $cxc->getClassXoopsFormElementTray('fileTray', $language, '
', $t); - $sprintf = $pc->getPhpCodeSprintf($language . '_UPLOADS', '".{$fileDirectory}/"'); - $ret .= $cxc->getClassXoopsFormSelect('fileSelect', $sprintf, $fieldName, $ccFieldName, 5, 'false', false, $t); - $ret .= $xc->getXcXoopsListImgListArray('fileArray', 'XOOPS_ROOT_PATH . $fileDirectory', $t); - $contForeach = $cxc->getClassAddOption('fileSelect', '"{$file1}", $file1', $t . "\t"); - $ret .= $pc->getPhpCodeForeach('fileArray', false, false, 'file1', $contForeach, $t); + $ret = $this->pc->getPhpCodeCommentLine('Form File', $ccFieldName, $t); + $ret .= $this->pc->getPhpCodeCommentLine("Form File {$ccFieldName}:", 'Select Uploaded File ', $t); + $ret .= $this->xc->getXcEqualsOperator('$get' . $ucfFieldName, "\$this->getVar('{$fieldName}')", null, $t); + $ret .= $this->pc->getPhpCodeTernaryOperator($ccFieldName, '$get' . $ucfFieldName, '', "'blank.gif'", $t); + $ret .= $this->xc->getXcEqualsOperator('$fileDirectory', "'/uploads/{$moduleDirname}/files/{$tableName}'", null, $t); + $ret .= $this->cxc->getClassXoopsFormElementTray('fileTray', $language, '
', $t); + $sprintf = $this->pc->getPhpCodeSprintf($language . '_UPLOADS', '".{$fileDirectory}/"'); + $ret .= $this->cxc->getClassXoopsFormSelect('fileSelect', $sprintf, $fieldName, $ccFieldName, 5, 'false', false, $t); + $ret .= $this->xc->getXcXoopsListImgListArray('fileArray', '\XOOPS_ROOT_PATH . $fileDirectory', $t); + $contForeach = $this->cxc->getClassAddOption('fileSelect', '($file1), $file1', $t . "\t"); + $ret .= $this->pc->getPhpCodeForeach('fileArray', false, false, 'file1', $contForeach, $t); //TODO: make preview for images or show "no preview possible" - //$setExtraParam = "\"onchange='showImgSelected(\\\"filelabel_{$fieldName}\\\", \\\"{$fieldName}\\\", \\\"\".\$fileDirectory.\"\\\", \\\"\\\", \\\"\".XOOPS_URL.\"\\\")'\""; + //$setExtraParam = "\"onchange='showImgSelected(\\\"imglabel_{$fieldName}\\\", \\\"{$fieldName}\\\", \\\"\" . \$imageDirectory . '\", \"\", \"' . \XOOPS_URL . \"\\\")'\""; //$ret .= $cc->getClassSetExtra('fileSelect', $setExtraParam, $t); - $ret .= $cxc->getClassAddElement('fileTray', '$fileSelect, false', $t); - //$paramLabel = "\"
' . " . $languageShort . 'FORM_UPLOAD_NEW', $fieldName, '$maxsize', true, ''); - $contIf .= $cxc->getClassAddElement('fileTray', $xoopsFormFile, $t . "\t"); + $ret .= $this->pc->getPhpCodeCommentLine("Form File {$ccFieldName}:", 'Upload new file', $t); + $getConfigSize = $this->xc->getXcGetConfig('maxsize_file'); + $contIf = $this->xc->getXcEqualsOperator('$maxsize', $getConfigSize,'', "\t\t\t"); + $xoopsFormFile = $this->cxc->getClassXoopsFormFile('fileTray', "'
' . " . $languageShort . 'FORM_UPLOAD_NEW', $fieldName, '$maxsize', true, ''); + $contIf .= $this->cxc->getClassAddElement('fileTray', $xoopsFormFile, $t . "\t"); $configText = "(\$maxsize / 1048576) . ' ' . " . $languageShort . 'FORM_UPLOAD_SIZE_MB'; - $labelInfo1 = $cxc->getClassXoopsFormLabel('', $languageShort . 'FORM_UPLOAD_SIZE', $configText, true, ''); - $contIf .= $cxc->getClassAddElement('fileTray', $labelInfo1, $t . "\t"); - $formHidden = $cxc->getClassXoopsFormHidden('', $fieldName, $ccFieldName, true, true, $t, true); - $contElse = $cxc->getClassAddElement('fileTray', $formHidden, $t . "\t"); - $ret .= $pc->getPhpCodeConditions('$permissionUpload', null, null, $contIf, $contElse, "\t\t"); - $ret .= $cxc->getClassAddElement('form', "\$fileTray, {$required}", $t); + $labelInfo1 = $this->cxc->getClassXoopsFormLabel('', $languageShort . 'FORM_UPLOAD_SIZE', $configText, true, ''); + $contIf .= $this->cxc->getClassAddElement('fileTray', $labelInfo1, $t . "\t"); + $formHidden = $this->cxc->getClassXoopsFormHidden('', $fieldName, $ccFieldName, true, true, $t, true); + $contElse = $this->cxc->getClassAddElement('fileTray', $formHidden, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions('$permissionUpload', '', '', $contIf, $contElse, "\t\t"); + $ret .= $this->cxc->getClassAddElement('form', "\$fileTray{$required}", $t); return $ret; } @@ -326,28 +337,24 @@ private function getXoopsFormSelectFile($language, $moduleDirname, $tableName, $ * @param $moduleDirname * @param $fieldName * @param $fieldDefault - * @param $required + * @param string $required * * @return string */ - private function getXoopsFormUrlFile($language, $moduleDirname, $fieldName, $fieldDefault, $required = 'false') + private function getXoopsFormUrlFile($language, $moduleDirname, $fieldName, $fieldDefault, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $languageShort = substr($language, 0, 4) . mb_strtoupper($moduleDirname) . '_'; + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $languageShort = \mb_substr($language, 0, 5) . \mb_strtoupper($moduleDirname) . '_'; $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine('Form Url', 'Text File ' . $ccFieldName, $t); - $ret .= $cxc->getClassXoopsFormElementTray('formUrlFile', $language, '
', $t); - $ret .= $pc->getPhpCodeTernaryOperator('formUrl', '$this->isNew()', "'{$fieldDefault}'", "\$this->getVar('{$fieldName}')", $t); - $ret .= $cxc->getClassXoopsFormText('formText', $language . '_UPLOADS', $fieldName, 75, 255, 'formUrl', false, $t); - $ret .= $cxc->getClassAddElement('formUrlFile', '$formText' . $required, $t); - $getConfig = $xc->getXcGetConfig('maxsize_file'); - $xoopsFormFile = $cxc->getClassXoopsFormFile('', $languageShort . 'FORM_UPLOAD', $fieldName, $getConfig, true, ''); - $ret .= $cxc->getClassAddElement('formUrlFile', $xoopsFormFile . $required, $t); - $ret .= $cxc->getClassAddElement('form', '$formUrlFile', $t); + $ret = $this->pc->getPhpCodeCommentLine('Form Url', 'Text File ' . $ccFieldName, $t); + $ret .= $this->cxc->getClassXoopsFormElementTray('formUrlFile', $language, '
', $t); + $ret .= $this->pc->getPhpCodeTernaryOperator('formUrl', '$this->isNew()', "'{$fieldDefault}'", "\$this->getVar('{$fieldName}')", $t); + $ret .= $this->cxc->getClassXoopsFormText('formText', $language . '_UPLOADS', $fieldName, 75, 255, 'formUrl', false, $t); + $ret .= $this->cxc->getClassAddElement('formUrlFile', '$formText' . $required, $t); + $getConfig = $this->xc->getXcGetConfig('maxsize_file'); + $xoopsFormFile = $this->cxc->getClassXoopsFormFile('', $languageShort . 'FORM_UPLOAD', $fieldName, $getConfig, true, ''); + $ret .= $this->cxc->getClassAddElement('formUrlFile', $xoopsFormFile . $required, $t); + $ret .= $this->cxc->getClassAddElement('form', '$formUrlFile', $t); return $ret; } @@ -363,51 +370,45 @@ private function getXoopsFormUrlFile($language, $moduleDirname, $fieldName, $fie * @param string $required * @return string */ - private function getXoopsFormUploadImage($language, $moduleDirname, $tableName, $fieldName, $required = 'false') + private function getXoopsFormUploadImage($language, $moduleDirname, $tableName, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ucfFieldName = $tf->getCamelCase($fieldName, true); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $languageShort = substr($language, 0, 4) . mb_strtoupper($moduleDirname) . '_'; + $ucfFieldName = $this->cf->getCamelCase($fieldName, true); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $languageShort = \mb_substr($language, 0, 5) . \mb_strtoupper($moduleDirname) . '_'; $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine('Form Image', $ccFieldName, $t); - $ret .= $pc->getPhpCodeCommentLine("Form Image {$ccFieldName}:", 'Select Uploaded Image ', $t); - $ret .= $xc->getXcEqualsOperator('$get' . $ucfFieldName, "\$this->getVar('{$fieldName}')", null, $t); - $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$get' . $ucfFieldName, '$get' . $ucfFieldName, "'blank.gif'", $t); - $ret .= $xc->getXcEqualsOperator('$imageDirectory', "'/uploads/{$moduleDirname}/images/{$tableName}'", null, $t); - $ret .= $cxc->getClassXoopsFormElementTray('imageTray', $language, '
', $t); - $sprintf = $pc->getPhpCodeSprintf($language . '_UPLOADS', '".{$imageDirectory}/"'); - $ret .= $cxc->getClassXoopsFormSelect('imageSelect', $sprintf, $fieldName, $ccFieldName, 5, 'false', false, $t); - $ret .= $xc->getXcXoopsListImgListArray('imageArray', 'XOOPS_ROOT_PATH . $imageDirectory', $t); - $contForeach = $cxc->getClassAddOption('imageSelect', '"{$image1}", $image1', $t . "\t"); - $ret .= $pc->getPhpCodeForeach('imageArray', false, false, 'image1', $contForeach, $t); - $setExtraParam = "\"onchange='showImgSelected(\\\"imglabel_{$fieldName}\\\", \\\"{$fieldName}\\\", \\\"\" . \$imageDirectory . \"\\\", \\\"\\\", \\\"\" . XOOPS_URL . \"\\\")'\""; - $ret .= $cxc->getClassSetExtra('imageSelect', $setExtraParam, $t); - $ret .= $cxc->getClassAddElement('imageTray', '$imageSelect, false', $t); - $paramLabel = "\"
' . " . $languageShort . 'FORM_UPLOAD_NEW', $fieldName, '$maxsize', true, ''); - $contIf .= $cxc->getClassAddElement('imageTray', $xoopsFormFile, $t . "\t"); + $ret = $this->pc->getPhpCodeCommentLine('Form Image', $ccFieldName, $t); + $ret .= $this->pc->getPhpCodeCommentLine("Form Image {$ccFieldName}:", 'Select Uploaded Image ', $t); + $ret .= $this->xc->getXcEqualsOperator('$get' . $ucfFieldName, "\$this->getVar('{$fieldName}')", null, $t); + $ret .= $this->pc->getPhpCodeTernaryOperator($ccFieldName, '$get' . $ucfFieldName, '', "'blank.gif'", $t); + $ret .= $this->xc->getXcEqualsOperator('$imageDirectory', "'/uploads/{$moduleDirname}/images/{$tableName}'", null, $t); + $ret .= $this->cxc->getClassXoopsFormElementTray('imageTray', $language, '
', $t); + $sprintf = $this->pc->getPhpCodeSprintf($language . '_UPLOADS', '".{$imageDirectory}/"'); + $ret .= $this->cxc->getClassXoopsFormSelect('imageSelect', $sprintf, $fieldName, $ccFieldName, 5, 'false', false, $t); + $ret .= $this->xc->getXcXoopsListImgListArray('imageArray', '\XOOPS_ROOT_PATH . $imageDirectory', $t); + $contForeach = $this->cxc->getClassAddOption('imageSelect', '($image1), $image1', $t . "\t"); + $ret .= $this->pc->getPhpCodeForeach('imageArray', false, false, 'image1', $contForeach, $t); + $setExtraParam = "\"onchange='showImgSelected(\\\"imglabel_{$fieldName}\\\", \\\"{$fieldName}\\\", \\\"\" . \$imageDirectory . '\", \"\", \"' . \XOOPS_URL . \"\\\")'\""; + $ret .= $this->cxc->getClassSetExtra('imageSelect', $setExtraParam, $t); + $ret .= $this->cxc->getClassAddElement('imageTray', '$imageSelect, false', $t); + $paramLabel = "\"
' . " . $languageShort . 'FORM_UPLOAD_NEW', $fieldName, '$maxsize', true, ''); + $contIf .= $this->cxc->getClassAddElement('imageTray', $xoopsFormFile, $t . "\t"); $configText = "(\$maxsize / 1048576) . ' ' . " . $languageShort . 'FORM_UPLOAD_SIZE_MB'; - $labelInfo1 = $cxc->getClassXoopsFormLabel('', $languageShort . 'FORM_UPLOAD_SIZE', $configText, true, ''); - $contIf .= $cxc->getClassAddElement('imageTray', $labelInfo1, $t . "\t"); - $getConfig = $xc->getXcGetConfig('maxwidth_image'); - $labelInfo2 = $cxc->getClassXoopsFormLabel('', $languageShort . 'FORM_UPLOAD_IMG_WIDTH', $getConfig . " . ' px'", true, ''); - $contIf .= $cxc->getClassAddElement('imageTray', $labelInfo2, $t . "\t"); - $getConfig = $xc->getXcGetConfig('maxheight_image'); - $labelInfo3 = $cxc->getClassXoopsFormLabel('', $languageShort . 'FORM_UPLOAD_IMG_HEIGHT', $getConfig . " . ' px'", true, ''); - $contIf .= $cxc->getClassAddElement('imageTray', $labelInfo3, $t . "\t"); - $formHidden = $cxc->getClassXoopsFormHidden('', $fieldName, $ccFieldName, true, true, $t, true); - $contElse = $cxc->getClassAddElement('imageTray', $formHidden, $t . "\t"); - $ret .= $pc->getPhpCodeConditions('$permissionUpload', null, null, $contIf, $contElse, "\t\t"); - $ret .= $cxc->getClassAddElement('form', "\$imageTray, {$required}", $t); + $labelInfo1 = $this->cxc->getClassXoopsFormLabel('', $languageShort . 'FORM_UPLOAD_SIZE', $configText, true, ''); + $contIf .= $this->cxc->getClassAddElement('imageTray', $labelInfo1, $t . "\t"); + $getConfig = $this->xc->getXcGetConfig('maxwidth_image'); + $labelInfo2 = $this->cxc->getClassXoopsFormLabel('', $languageShort . 'FORM_UPLOAD_IMG_WIDTH', $getConfig . " . ' px'", true, ''); + $contIf .= $this->cxc->getClassAddElement('imageTray', $labelInfo2, $t . "\t"); + $getConfig = $this->xc->getXcGetConfig('maxheight_image'); + $labelInfo3 = $this->cxc->getClassXoopsFormLabel('', $languageShort . 'FORM_UPLOAD_IMG_HEIGHT', $getConfig . " . ' px'", true, ''); + $contIf .= $this->cxc->getClassAddElement('imageTray', $labelInfo3, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions('$permissionUpload', '', '', $contIf, false, "\t\t"); + $ret .= $this->cxc->getClassAddElement('form', "\$imageTray{$required}", $t); return $ret; } @@ -424,35 +425,31 @@ private function getXoopsFormUploadImage($language, $moduleDirname, $tableName, * @param string $required * @return string */ - private function getXoopsFormUploadFile($language, $moduleDirname, $tableName, $fieldName, $required = 'false') + private function getXoopsFormUploadFile($language, $moduleDirname, $tableName, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $languageShort = substr($language, 0, 4) . mb_strtoupper($moduleDirname) . '_'; + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $languageShort = \mb_substr($language, 0, 5) . \mb_strtoupper($moduleDirname) . '_'; $t = "\t\t\t"; - $ret = $pc->getPhpCodeCommentLine('Form File', 'Upload ' . $ccFieldName, "\t\t"); - $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', "''", "\$this->getVar('{$fieldName}')", "\t\t"); - $uForm = $cxc->getClassXoopsFormElementTray('fileUploadTray', $language, '
', $t); - $uForm .= $xc->getXcEqualsOperator('$fileDirectory', "'/uploads/{$moduleDirname}/files/{$tableName}'", null, $t); - $sprintf = $pc->getPhpCodeSprintf($language . '_UPLOADS', '".{$fileDirectory}/"'); - $xoopsFormLabel = $cxc->getClassXoopsFormLabel('', $sprintf, $ccFieldName, true, "\t\t", true); - $condIf = $cxc->getClassAddElement('fileUploadTray', $xoopsFormLabel, $t . "\t"); - $uForm .= $pc->getPhpCodeConditions('!$this->isNew()', null, null, $condIf, false, "\t\t\t"); - $getConfig = $xc->getXcGetConfig('maxsize_file'); - $uForm .= $xc->getXcEqualsOperator('$maxsize', $getConfig,'', "\t\t\t"); - $xoopsFormFile = $cxc->getClassXoopsFormFile('', "''", $fieldName, '$maxsize', true, ''); - $uForm .= $cxc->getClassAddElement('fileUploadTray', $xoopsFormFile, $t); + $ret = $this->pc->getPhpCodeCommentLine('Form File:', 'Upload ' . $ccFieldName, "\t\t"); + $ret .= $this->pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', "''", "\$this->getVar('{$fieldName}')", "\t\t"); + $uForm = $this->cxc->getClassXoopsFormElementTray('fileUploadTray', $language, '
', $t); + $uForm .= $this->xc->getXcEqualsOperator('$fileDirectory', "'/uploads/{$moduleDirname}/files/{$tableName}'", null, $t); + $sprintf = $this->pc->getPhpCodeSprintf($language . '_UPLOADS', '".{$fileDirectory}/"'); + $xoopsFormLabel = $this->cxc->getClassXoopsFormLabel('', $sprintf, $ccFieldName, true, "\t\t", true); + $condIf = $this->cxc->getClassAddElement('fileUploadTray', $xoopsFormLabel, $t . "\t"); + $uForm .= $this->pc->getPhpCodeConditions('!$this->isNew()', '', '', $condIf, false, "\t\t\t"); + $getConfig = $this->xc->getXcGetConfig('maxsize_file'); + $uForm .= $this->xc->getXcEqualsOperator('$maxsize', $getConfig,'', "\t\t\t"); + $xoopsFormFile = $this->cxc->getClassXoopsFormFile('', "''", $fieldName, '$maxsize', true, ''); + $uForm .= $this->cxc->getClassAddElement('fileUploadTray', $xoopsFormFile, $t); $configText = "(\$maxsize / 1048576) . ' ' . " . $languageShort . 'FORM_UPLOAD_SIZE_MB'; - $labelInfo1 = $cxc->getClassXoopsFormLabel('', $languageShort . 'FORM_UPLOAD_SIZE', $configText, true, ''); - $uForm .= $cxc->getClassAddElement('fileUploadTray', $labelInfo1, $t ); - $uForm .= $cxc->getClassAddElement('form', "\$fileUploadTray, {$required}", $t); - $formHidden = $cxc->getClassXoopsFormHidden('', $fieldName, $ccFieldName, true, true, "\t\t", true); - $contElse = $cxc->getClassAddElement('form', $formHidden, $t); + $labelInfo1 = $this->cxc->getClassXoopsFormLabel('', $languageShort . 'FORM_UPLOAD_SIZE', $configText, true, ''); + $uForm .= $this->cxc->getClassAddElement('fileUploadTray', $labelInfo1, $t ); + $uForm .= $this->cxc->getClassAddElement('form', "\$fileUploadTray{$required}", $t); + $formHidden = $this->cxc->getClassXoopsFormHidden('', $fieldName, $ccFieldName, true, true, "\t\t", true); + $contElse = $this->cxc->getClassAddElement('form', $formHidden, $t); - $ret .= $pc->getPhpCodeConditions('$permissionUpload', null, null, $uForm, $contElse, "\t\t"); + $ret .= $this->pc->getPhpCodeConditions('$permissionUpload', '', '', $uForm, $contElse, "\t\t"); return $ret; } @@ -466,18 +463,14 @@ private function getXoopsFormUploadFile($language, $moduleDirname, $tableName, $ * @param string $required * @return string */ - private function getXoopsFormColorPicker($language, $fieldName, $required = 'false') + private function getXoopsFormColorPicker($language, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine('Form Color', 'Picker ' . $ccFieldName, $t); - $getVar = $xc->getXcGetVar('', 'this', $fieldName, true); - $xoopsFormFile = $cxc->getClassXoopsFormColorPicker('', $language, $fieldName, $getVar, true, ''); - $ret .= $cxc->getClassAddElement('form', $xoopsFormFile. $required, $t); + $ret = $this->pc->getPhpCodeCommentLine('Form Color', 'Picker ' . $ccFieldName, $t); + $getVar = $this->xc->getXcGetVar('', 'this', $fieldName, true); + $xoopsFormFile = $this->cxc->getClassXoopsFormColorPicker('', $language, $fieldName, $getVar, true, ''); + $ret .= $this->cxc->getClassAddElement('form', $xoopsFormFile. $required, $t); return $ret; } @@ -488,26 +481,22 @@ private function getXoopsFormColorPicker($language, $fieldName, $required = 'fal * @param $language * @param $tableName * @param $fieldName - * @param $required + * @param string $required * * @return string */ - private function getXoopsFormSelectBox($language, $tableName, $fieldName, $required = 'false') + private function getXoopsFormSelectBox($language, $tableName, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ucfTableName = ucfirst($tableName); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); + $ucfTableName = \ucfirst($tableName); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine($ucfTableName, 'handler', $t); - $ret .= $xc->getXcHandlerLine($tableName, $t); - $ret .= $pc->getPhpCodeCommentLine('Form', 'Select ' . $ccFieldName, $t); - $ret .= $cxc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "'Empty'", $t); - $ret .= $cxc->getClassAddOptionArray($ccFieldName . 'Select', "\${$tableName}Handler->getList()", $t); - $ret .= $cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); + $ret = $this->pc->getPhpCodeCommentLine($ucfTableName, 'Handler', $t); + $ret .= $this->xc->getXcHandlerLine($tableName, $t); + $ret .= $this->pc->getPhpCodeCommentLine('Form', 'Select ' . $ccFieldName, $t); + $ret .= $this->cxc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', "'Empty'", $t); + $ret .= $this->cxc->getClassAddOptionArray($ccFieldName . 'Select', "\${$tableName}Handler->getList()", $t); + $ret .= $this->cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); return $ret; } @@ -520,16 +509,16 @@ private function getXoopsFormSelectBox($language, $tableName, $fieldName, $requi * @param string $required * @return string */ - private function getXoopsFormSelectUser($language, $fieldName, $required = 'false') + private function getXoopsFormSelectUser($language, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine('Form Select', 'User ' . $ccFieldName, $t); - $xoopsSelectUser = $cxc->getClassXoopsFormSelectUser('', $language, $fieldName, 'false', $fieldName, true, $t); - $ret .= $cxc->getClassAddElement('form', $xoopsSelectUser . $required, $t); + $ret = $this->pc->getPhpCodeCommentLine('Form Select', 'User ' . $ccFieldName, $t); + $xUser = $this->pc->getPhpCodeGlobals('xoopsUser'); + $ret .= $this->pc->getPhpCodeTernaryOperator('uidCurrent', '\is_object(' . $xUser . ')', $xUser . '->uid()', '0', "\t\t"); + $ret .= $this->pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', '$uidCurrent', "\$this->getVar('{$fieldName}')", $t); + $xoopsSelectUser = $this->cxc->getClassXoopsFormSelectUser('', $language, $fieldName, 'false', '$' . $ccFieldName, true, $t); + $ret .= $this->cxc->getClassAddElement('form', $xoopsSelectUser . $required, $t); return $ret; } @@ -539,21 +528,18 @@ private function getXoopsFormSelectUser($language, $fieldName, $required = 'fals * * @param $language * @param $fieldName - * @param $required + * @param string $required * * @return string */ - private function getXoopsFormRadioYN($language, $fieldName, $required = 'false') + private function getXoopsFormRadioYN($language, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine('Form Radio', 'Yes/No ' . $ccFieldName, $t); - $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', 0, "\$this->getVar('{$fieldName}')", $t); - $xoopsRadioYN = $cxc->getClassXoopsFormRadioYN('', $language, $fieldName, $ccFieldName, true, $t); - $ret .= $cxc->getClassAddElement('form', $xoopsRadioYN . $required, $t); + $ret = $this->pc->getPhpCodeCommentLine('Form Radio', 'Yes/No ' . $ccFieldName, $t); + $ret .= $this->pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', 0, "\$this->getVar('{$fieldName}')", $t); + $xoopsRadioYN = $this->cxc->getClassXoopsFormRadioYN('', $language, $fieldName, $ccFieldName, true, $t); + $ret .= $this->cxc->getClassAddElement('form', $xoopsRadioYN . $required, $t); return $ret; } @@ -563,21 +549,18 @@ private function getXoopsFormRadioYN($language, $fieldName, $required = 'false') * * @param $language * @param $fieldName - * @param $required + * @param string $required * * @return string */ - private function getXoopsFormTextDateSelect($language, $fieldName, $required = 'false') + private function getXoopsFormTextDateSelect($language, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); $t = "\t\t"; - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $ret = $pc->getPhpCodeCommentLine('Form Text', 'Date Select ' . $ccFieldName, $t); - $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', 0, "\$this->getVar('{$fieldName}')", $t); - $xoopsTextDateSelect = $cxc->getClassXoopsFormTextDateSelect('', $language, $fieldName, $fieldName, $ccFieldName, true, $t); - $ret .= $cxc->getClassAddElement('form', $xoopsTextDateSelect . $required, $t); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $ret = $this->pc->getPhpCodeCommentLine('Form Text', 'Date Select ' . $ccFieldName, $t); + $ret .= $this->pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', '\time()', "\$this->getVar('{$fieldName}')", $t); + $xoopsTextDateSelect = $this->cxc->getClassXoopsFormTextDateSelect('', $language, $fieldName, $fieldName, $ccFieldName, true, $t); + $ret .= $this->cxc->getClassAddElement('form', $xoopsTextDateSelect . $required, $t); return $ret; } @@ -587,21 +570,18 @@ private function getXoopsFormTextDateSelect($language, $fieldName, $required = ' * * @param $language * @param $fieldName - * @param $required + * @param string $required * * @return string */ - private function getXoopsFormDateTime($language, $fieldName, $required = 'false') + private function getXoopsFormDateTime($language, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); $t = "\t\t"; - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $ret = $pc->getPhpCodeCommentLine('Form Text', 'Date Select ' . $ccFieldName, $t); - $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', 0, "\$this->getVar('{$fieldName}')", $t); - $xoopsTextDateSelect = $cxc->getClassXoopsFormDateTime('', $language, $fieldName, $fieldName, $ccFieldName, true, $t); - $ret .= $cxc->getClassAddElement('form', $xoopsTextDateSelect . $required, $t); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $ret = $this->pc->getPhpCodeCommentLine('Form Text', 'Date Select ' . $ccFieldName, $t); + $ret .= $this->pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', '\time()', "\$this->getVar('{$fieldName}')", $t); + $xoopsTextDateSelect = $this->cxc->getClassXoopsFormDateTime('', $language, $fieldName, $fieldName, $ccFieldName, true, $t); + $ret .= $this->cxc->getClassAddElement('form', $xoopsTextDateSelect . $required, $t); return $ret; } @@ -612,25 +592,30 @@ private function getXoopsFormDateTime($language, $fieldName, $required = 'false' * @param $language * @param $moduleDirname * @param $fieldName + * @param $tablePermissions * @param string $required * * @return string */ - private function getXoopsFormSelectStatus($language, $moduleDirname, $fieldName, $required = 'false') + private function getXoopsFormSelectStatus($language, $moduleDirname, $fieldName, $tablePermissions, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $languageShort = substr($language, 0, 4) . mb_strtoupper($moduleDirname) . '_'; + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $languageShort = \mb_substr($language, 0, 5) . \mb_strtoupper($moduleDirname) . '_'; $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine('Form Select', 'Status ' . $ccFieldName, $t); - $ret .= $cxc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "Constants::STATUS_NONE, {$languageShort}STATUS_NONE", $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "Constants::STATUS_OFFLINE, {$languageShort}STATUS_OFFLINE", $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "Constants::STATUS_SUBMITTED, {$languageShort}STATUS_SUBMITTED", $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "Constants::STATUS_APPROVED, {$languageShort}STATUS_APPROVED", $t); - $ret .= $cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); + $ret = $this->pc->getPhpCodeCommentLine('Form Select', 'Status ' . $ccFieldName, $t); + if (1 == $tablePermissions) { + $ret .= $this->xc->getXcHandlerLine('permissions', $t); + } + $ret .= $this->cxc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', $this->xc->getXcGetConstants('STATUS_NONE') . ", {$languageShort}STATUS_NONE", $t); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', $this->xc->getXcGetConstants('STATUS_OFFLINE') . ", {$languageShort}STATUS_OFFLINE", $t); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', $this->xc->getXcGetConstants('STATUS_SUBMITTED') . ", {$languageShort}STATUS_SUBMITTED", $t); + if (1 == $tablePermissions) { + $contIf = $this->cxc->getClassAddOption($ccFieldName . 'Select', $this->xc->getXcGetConstants('STATUS_APPROVED') . ", {$languageShort}STATUS_APPROVED", $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions('$permissionsHandler->getPermGlobalApprove()', '', '', $contIf, false, $t); + } + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', $this->xc->getXcGetConstants('STATUS_BROKEN') . ", {$languageShort}STATUS_BROKEN", $t); + $ret .= $this->cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); return $ret; } @@ -640,20 +625,17 @@ private function getXoopsFormSelectStatus($language, $moduleDirname, $fieldName, * * @param $language * @param $fieldName - * @param $required + * @param string $required * * @return string */ - private function getXoopsFormPassword($language, $fieldName, $required = 'false') + private function getXoopsFormPassword($language, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); $t = "\t\t"; - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $ret = $pc->getPhpCodeCommentLine('Form Text', 'Enter Password ' . $ccFieldName, $t); - $xoopsPassword = $cxc->getClassXoopsFormPassword('', $language, $fieldName, 10, 32, true, $t); - $ret .= $cxc->getClassAddElement('form', $xoopsPassword . $required, $t); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $ret = $this->pc->getPhpCodeCommentLine('Form Text', 'Enter Password ' . $ccFieldName, $t); + $xoopsPassword = $this->cxc->getClassXoopsFormPassword('', $language, $fieldName, '10', '32', true, $t); + $ret .= $this->cxc->getClassAddElement('form', $xoopsPassword . $required, $t); return $ret; } @@ -667,20 +649,16 @@ private function getXoopsFormPassword($language, $fieldName, $required = 'false' * * @return string */ - private function getXoopsFormSelectCountry($language, $fieldName, $required = 'false') + private function getXoopsFormSelectCountry($language, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine('Form Select', 'Country ' . $ccFieldName, $t); - $ret .= $cxc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "'', _NONE", $t); - $ret .= $xc->getXcXoopsListCountryList('countryArray', $t); - $ret .= $cxc->getClassAddOptionArray($ccFieldName . 'Select', '$countryArray', $t); - $ret .= $cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); + $ret = $this->pc->getPhpCodeCommentLine('Form Select', 'Country ' . $ccFieldName, $t); + $ret .= $this->cxc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', "'', \_NONE", $t); + $ret .= $this->xc->getXcXoopsListCountryList('countryArray', $t); + $ret .= $this->cxc->getClassAddOptionArray($ccFieldName . 'Select', '$countryArray', $t); + $ret .= $this->cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); return $ret; } @@ -694,20 +672,16 @@ private function getXoopsFormSelectCountry($language, $fieldName, $required = 'f * * @return string */ - private function getXoopsFormSelectLang($language, $fieldName, $required = 'false') + private function getXoopsFormSelectLang($language, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine('Form Select', 'Lang ' . $ccFieldName, $t); - $ret .= $cxc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "'', _NONE", $t); - $ret .= $xc->getXcXoopsListLangList('langArray', $t); - $ret .= $cxc->getClassAddOptionArray($ccFieldName . 'Select', '$langArray', $t); - $ret .= $cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); + $ret = $this->pc->getPhpCodeCommentLine('Form Select', 'Lang ' . $ccFieldName, $t); + $ret .= $this->cxc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', "'', \_NONE", $t); + $ret .= $this->xc->getXcXoopsListLangList('langArray', $t); + $ret .= $this->cxc->getClassAddOptionArray($ccFieldName . 'Select', '$langArray', $t); + $ret .= $this->cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); return $ret; } @@ -722,22 +696,44 @@ private function getXoopsFormSelectLang($language, $fieldName, $required = 'fals * * @return string */ - private function getXoopsFormRadio($language, $moduleDirname, $fieldName, $required = 'false') + private function getXoopsFormRadio($language, $moduleDirname, $fieldName, string $required = 'false') + { + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $languageShort = \mb_substr($language, 0, 5) . \mb_strtoupper($moduleDirname) . '_'; + $t = "\t\t"; + $ret = $this->pc->getPhpCodeCommentLine('Form Radio', $ccFieldName, $t); + $ret .= $this->pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', '0', "\$this->getVar('{$fieldName}')", $t); + $ret .= $this->cxc->getClassXoopsFormRadio($ccFieldName . 'Select', $language, $fieldName, "{$ccFieldName}", false, $t); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', "'0', \_NONE", $t); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', "'1', {$languageShort}LIST_1", $t); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', "'2', {$languageShort}LIST_2", $t); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', "'3', {$languageShort}LIST_3", $t); + $ret .= $this->cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); + + return $ret; + } + + /** + * @private function getXoopsFormRadioOnoffline + * + * @param $language + * @param $fieldName + * @param string $required + * + * @return string + */ + private function getXoopsFormRadioOnoffline($language, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $languageShort = substr($language, 0, 4) . mb_strtoupper($moduleDirname) . '_'; + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine('Form Radio', $ccFieldName, $t); - $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', '0', "\$this->getVar('{$fieldName}')", $t); - $ret .= $cxc->getClassXoopsFormRadio($ccFieldName . 'Select', $language, $fieldName, "{$ccFieldName}", false, $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "'0', _NONE", $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "'1', {$languageShort}LIST_1", $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "'2', {$languageShort}LIST_2", $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "'3', {$languageShort}LIST_3", $t); - $ret .= $cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); + $ret = $this->pc->getPhpCodeCommentLine('Form Radio on-/offline', $ccFieldName, $t); + $ret .= $this->pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', '0', "\$this->getVar('{$fieldName}')", $t); + $ret .= $this->cxc->getClassXoopsFormRadio($ccFieldName . 'Select', $language, $fieldName, "{$ccFieldName}", false, $t); + $param = $this->xc->getXcGetConstants('RADIO_OFFLINE'); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', "{$param}, {$language}_OFFLINE", $t); + $param = $this->xc->getXcGetConstants('RADIO_ONLINE'); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', "{$param}, {$language}_ONLINE", $t); + $ret .= $this->cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); return $ret; } @@ -753,25 +749,21 @@ private function getXoopsFormRadio($language, $moduleDirname, $fieldName, $requi * * @return string */ - private function getXoopsFormSelectCombo($language, $moduleDirname, $tableName, $fieldName, $required = 'false') + private function getXoopsFormSelectCombo($language, $moduleDirname, $tableName, $fieldName, string $required = 'false') { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ucfTableName = ucfirst($tableName); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $languageShort = substr($language, 0, 4) . mb_strtoupper($moduleDirname) . '_'; + $ucfTableName = \ucfirst($tableName); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $languageShort = \mb_substr($language, 0, 5) . \mb_strtoupper($moduleDirname) . '_'; $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine($ucfTableName, 'handler', $t); - $ret .= $xc->getXcHandlerLine($tableName, $t); - $ret .= $pc->getPhpCodeCommentLine('Form', 'Select ' . $ccFieldName, $t); - $ret .= $cxc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", '5', '', false, $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "'0', _NONE", $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "'1', {$languageShort}LIST_1", $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "'2', {$languageShort}LIST_2", $t); - $ret .= $cxc->getClassAddOption($ccFieldName . 'Select', "'3', {$languageShort}LIST_3", $t); - $ret .= $cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); + $ret = $this->pc->getPhpCodeCommentLine($ucfTableName, 'Handler', $t); + $ret .= $this->xc->getXcHandlerLine($tableName, $t); + $ret .= $this->pc->getPhpCodeCommentLine('Form', 'Select ' . $ccFieldName, $t); + $ret .= $this->cxc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", '5', '', false, $t); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', "'0', \_NONE", $t); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', "'1', {$languageShort}LIST_1", $t); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', "'2', {$languageShort}LIST_2", $t); + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', "'3', {$languageShort}LIST_3", $t); + $ret .= $this->cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); return $ret; } @@ -782,28 +774,25 @@ private function getXoopsFormSelectCombo($language, $moduleDirname, $tableName, * @param $language * @param $fieldName * @param $fieldElement - * @param $required + * @param string $required * * @return string */ - private function getXoopsFormTable($language,$fieldName, $fieldElement, $required = 'false') + private function getXoopsFormTable($language, $fieldName, $fieldElement, string $required = 'false') { - $tc = Tdmcreate\Helper::getInstance(); - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $t = "\t\t"; $ret = ''; - $fElement = $tc->getHandler('fieldelements')->get($fieldElement); - $rpFieldelementName = mb_strtolower(str_replace('Table : ', '', $fElement->getVar('fieldelement_name'))); - $ret .= $pc->getPhpCodeCommentLine('Form Table', $rpFieldelementName, $t); - $ccFieldName = $tf->getCamelCase($fieldName, false, true); - $ret .= $xc->getXcHandlerLine($rpFieldelementName, $t); - $ret .= $cxc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t); - $ret .= $cxc->getClassAddOptionArray($ccFieldName . 'Select', "\${$rpFieldelementName}Handler->getList()", $t); - $ret .= $cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); + $fElement = $this->helper->getHandler('Fieldelements')->get($fieldElement); + $rpFieldelementName = \mb_strtolower(\str_replace('Table : ', '', $fElement->getVar('fieldelement_name'))); + $ret .= $this->pc->getPhpCodeCommentLine('Form Table', $rpFieldelementName, $t); + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $ret .= $this->xc->getXcHandlerLine($rpFieldelementName, $t); + $ret .= $this->cxc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t); + if ('' === $required || 'false' === $required) { + $ret .= $this->cxc->getClassAddOption($ccFieldName . 'Select', "0, ' '", $t); + } + $ret .= $this->cxc->getClassAddOptionArray($ccFieldName . 'Select', "\${$rpFieldelementName}Handler->getList()", $t); + $ret .= $this->cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t); return $ret; } @@ -820,26 +809,22 @@ private function getXoopsFormTable($language,$fieldName, $fieldElement, $require */ private function getXoopsFormTopic($language, $topicTableName, $fieldId, $fieldPid, $fieldMain) { - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); - $ucfTopicTableName = ucfirst($topicTableName); - $stlTopicTableName = mb_strtolower($topicTableName); - $ccFieldPid = $tf->getCamelCase($fieldPid, false, true); + $ucfTopicTableName = \ucfirst($topicTableName); + $stlTopicTableName = \mb_strtolower($topicTableName); + $ccFieldPid = $this->cf->getCamelCase($fieldPid, false, true); $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine('Form Table', $ucfTopicTableName, $t); - $ret .= $xc->getXcHandlerLine($stlTopicTableName, $t); - $ret .= $xc->getXcCriteriaCompo('cr' . $ucfTopicTableName, $t); - $ret .= $xc->getXcHandlerCountClear($stlTopicTableName . 'Count', $stlTopicTableName, '$cr' . $ucfTopicTableName, $t); - $contIf = $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/tree', true, false, 'include', $t . "\t"); - $contIf .= $xc->getXcHandlerAllClear($stlTopicTableName . 'All', $stlTopicTableName, '$cr' . $ucfTopicTableName, $t . "\t"); - $contIf .= $cxc->getClassXoopsObjectTree($stlTopicTableName . 'Tree', $stlTopicTableName . 'All', $fieldId, $fieldPid, $t . "\t"); - $contIf .= $cxc->getClassXoopsMakeSelBox($ccFieldPid, $stlTopicTableName . 'Tree', $fieldPid, $fieldMain, '--', $fieldPid, $t . "\t"); - $formLabel = $cxc->getClassXoopsFormLabel('', $language, "\${$ccFieldPid}", true, ''); - $contIf .= $cxc->getClassAddElement('form', $formLabel, $t . "\t"); - $ret .= $pc->getPhpCodeConditions("\${$stlTopicTableName}Count", null, null, $contIf, false, $t); - $ret .= $pc->getPhpCodeUnset('cr' . $ucfTopicTableName, $t); + $ret = $this->pc->getPhpCodeCommentLine('Form Table', $ucfTopicTableName, $t); + $ret .= $this->xc->getXcHandlerLine($stlTopicTableName, $t); + $ret .= $this->xc->getXcCriteriaCompo('cr' . $ucfTopicTableName, $t); + $ret .= $this->xc->getXcHandlerCountClear($stlTopicTableName . 'Count', $stlTopicTableName, '$cr' . $ucfTopicTableName, $t); + $contIf = $this->pc->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH', 'class/tree', true, false, 'require', $t . "\t"); + $contIf .= $this->xc->getXcHandlerAllClear($stlTopicTableName . 'All', $stlTopicTableName, '$cr' . $ucfTopicTableName, $t . "\t"); + $contIf .= $this->cxc->getClassXoopsObjectTree($stlTopicTableName . 'Tree', $stlTopicTableName . 'All', $fieldId, $fieldPid, $t . "\t"); + $contIf .= $this->cxc->getClassXoopsMakeSelBox($ccFieldPid, $stlTopicTableName . 'Tree', $fieldPid, $fieldMain, '--', $fieldPid, $t . "\t"); + $formLabel = $this->cxc->getClassXoopsFormLabel('', $language, "\${$ccFieldPid}", true, ''); + $contIf .= $this->cxc->getClassAddElement('form', $formLabel, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions("\${$stlTopicTableName}Count", '', '', $contIf, false, $t); + $ret .= $this->pc->getPhpCodeUnset('cr' . $ucfTopicTableName, $t); return $ret; } @@ -848,55 +833,93 @@ private function getXoopsFormTopic($language, $topicTableName, $fieldId, $fieldP * @private function getXoopsFormTag * * @param $fieldId - * @param $required + * @param string $required * * @return string */ - private function getXoopsFormTag($fieldId, $required = 'false') + private function getXoopsFormTag($fieldId, string $required = 'false') { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance(); $t = "\t\t"; - $ret = $pc->getPhpCodeCommentLine('Use tag', 'module', $t); - $isDir = $pc->getPhpCodeIsDir("XOOPS_ROOT_PATH . '/modules/tag'"); - $ret .= $pc->getPhpCodeTernaryOperator('dirTag', $isDir, 'true', 'false', $t); - $paramIf = '(' . $xc->getXcGetConfig('usetag') . ' == 1)'; - $condIf = $pc->getPhpCodeTernaryOperator('tagId', '$this->isNew()', '0', "\$this->getVar('{$fieldId}')", $t . "\t"); - $condIf .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'modules/tag/include/formtag', true, false, $type = 'include', $t . "\t"); - $paramElem = $cxc->getClassXoopsFormTag('', 'tag', 60, 255, 'tagId', 0, true, ''); - $condIf .= $cxc->getClassAddElement('form', $paramElem . $required, $t . "\t"); - $ret .= $pc->getPhpCodeConditions($paramIf, ' && ', '$dirTag', $condIf, false, $t); + $ret = $this->pc->getPhpCodeCommentLine('Use tag', 'module', $t); + $isDir = $this->pc->getPhpCodeIsDir("\XOOPS_ROOT_PATH . '/modules/tag'"); + $ret .= $this->pc->getPhpCodeTernaryOperator('dirTag', $isDir, 'true', 'false', $t); + $paramIf = '(' . $this->xc->getXcGetConfig('usetag') . ' == 1)'; + $condIf = $this->pc->getPhpCodeTernaryOperator('tagId', '$this->isNew()', '0', "\$this->getVar('{$fieldId}')", $t . "\t"); + $condIf .= $this->pc->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH', 'modules/tag/include/formtag', true, false, 'require', $t . "\t"); + $paramElem = $this->cxc->getClassXoopsFormTag('', 'tag', 60, 255, 'tagId', 0, true, ''); + $condIf .= $this->cxc->getClassAddElement('form', $paramElem . $required, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions($paramIf, ' && ', '$dirTag', $condIf, false, $t); + + return $ret; + } + + /** + * @private function getXoopsFormTextUuid + * + * @param $language + * @param $fieldName + * @param string $required + * @return string + */ + private function getXoopsFormTextUuid($language, $fieldName, string $required = 'false') + { + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + $ret = $this->pc->getPhpCodeCommentLine('Form Text Uuid', $ccFieldName, "\t\t"); + $ret .= $this->pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', '\Xmf\Uuid::generate()', "\$this->getVar('{$fieldName}')", "\t\t"); + $formText = $this->cxc->getClassXoopsFormText('', $language, $fieldName, 50, 150, $ccFieldName, true); + $ret .= $this->cxc->getClassAddElement('form', $formText . $required); + + return $ret; + } + + /** + * @private function getXoopsFormTextIp + * + * @param $language + * @param $fieldName + * @param string $required + * @return string + */ + private function getXoopsFormTextIp($language, $fieldName, string $required = 'false') + { + $ccFieldName = $this->cf->getCamelCase($fieldName, false, true); + + $ret = $this->pc->getPhpCodeCommentLine('Form Text IP', $ccFieldName, "\t\t"); + $ret .= $this->xc->getXcEqualsOperator('$' . $ccFieldName, "\$_SERVER['REMOTE_ADDR']", null, "\t\t"); + + $ret .= $this->pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', "(\$_SERVER['REMOTE_ADDR'] ?? '')", "\$this->getVar('{$fieldName}')", "\t\t"); + + + + $formText = $this->cxc->getClassXoopsFormText('', $language, $fieldName, 20, 150, $ccFieldName, true); + $ret .= $this->cxc->getClassAddElement('form', $formText . $required); return $ret; } /** * @public function renderElements - * @param null + * * @return string */ public function renderElements() { - $tc = Tdmcreate\Helper::getInstance(); - $tf = Tdmcreate\Files\CreateFile::getInstance(); - $ttf = Tdmcreate\Files\CreateTableFields::getInstance(); - $module = $this->getModule(); - $table = $this->getTable(); - $moduleDirname = $module->getVar('mod_dirname'); - $tableName = $table->getVar('table_name'); - $tableSoleName = $table->getVar('table_solename'); - $languageFunct = $tf->getLanguage($moduleDirname, 'AM'); - //$language_table = $languageFunct . strtoupper($tableName); - $ret = ''; - $fields = $ttf->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'), 'field_order ASC, field_id'); - $fieldId = ''; - $fieldIdTopic = ''; - $fieldPidTopic = ''; - $fieldMainTopic = ''; - $fieldElementId = []; - $counter = 0; - foreach (array_keys($fields) as $f) { + $module = $this->getModule(); + $table = $this->getTable(); + $moduleDirname = $module->getVar('mod_dirname'); + $tableName = $table->getVar('table_name'); + $tableSoleName = $table->getVar('table_solename'); + $tablePermissions = $table->getVar('table_permissions'); + $languageFunct = $this->cf->getLanguage($moduleDirname, 'AM'); + $ret = ''; + $fields = $this->tf->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); + $fieldId = ''; + $fieldIdTopic = ''; + $fieldPidTopic = ''; + $fieldMainTopic = ''; + $fieldElementId = []; + $tagDone = false; + foreach (\array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); $fieldDefault = $fields[$f]->getVar('field_default'); $fieldElement = $fields[$f]->getVar('field_element'); @@ -905,86 +928,101 @@ public function renderElements() if ((0 == $f) && (1 == $table->getVar('table_autoincrement'))) { $fieldId = $fieldName; } - $rpFieldName = $tf->getRightString($fieldName); - $language = $languageFunct . mb_strtoupper($tableSoleName) . '_' . mb_strtoupper($rpFieldName); + $rpFieldName = $this->cf->getRightString($fieldName); + $language = $languageFunct . \mb_strtoupper($tableSoleName) . '_' . \mb_strtoupper($rpFieldName); $required = (1 == $fields[$f]->getVar('field_required')) ? ', true' : ''; - $fieldElements = $tc->getHandler('fieldelements')->get($fieldElement); + $fieldElements = $this->helper->getHandler('Fieldelements')->get($fieldElement); $fieldElementId[] = $fieldElements->getVar('fieldelement_id'); if (1 == $fieldInForm) { - $counter++; // Switch elements switch ($fieldElement) { case 1: break; - case 2: + case Constants::FIELD_ELE_TEXT: // textbox + case Constants::FIELD_ELE_TEXTINTEGER: // textbox integer + case Constants::FIELD_ELE_TEXTFLOAT: // textbox float + case Constants::FIELD_ELE_TEXTCOMMENTS: // textbox comments + case Constants::FIELD_ELE_TEXTRATINGS: // textbox ratings + case Constants::FIELD_ELE_TEXTVOTES: // textbox votes + case Constants::FIELD_ELE_TEXTREADS: // textbox reads $ret .= $this->getXoopsFormText($language, $fieldName, $fieldDefault, $required); break; - case 3: + case Constants::FIELD_ELE_TEXTAREA: $ret .= $this->getXoopsFormTextArea($language, $fieldName, $required); break; - case 4: + case Constants::FIELD_ELE_DHTMLTEXTAREA: $ret .= $this->getXoopsFormDhtmlTextArea($language, $fieldName, $required); break; - case 5: + case Constants::FIELD_ELE_CHECKBOX: $ret .= $this->getXoopsFormCheckBox($language, $tableSoleName, $fieldName, $fieldElementId, $required); break; - case 6: + case Constants::FIELD_ELE_RADIOYN: $ret .= $this->getXoopsFormRadioYN($language, $fieldName, $required); break; - case 7: + case Constants::FIELD_ELE_RADIO_ONOFFLINE: + $ret .= $this->getXoopsFormRadioOnoffline($language, $fieldName, $required); + break; + case Constants::FIELD_ELE_SELECTBOX: $ret .= $this->getXoopsFormSelectBox($language, $tableName, $fieldName, $required); break; - case 8: + case Constants::FIELD_ELE_SELECTUSER: $ret .= $this->getXoopsFormSelectUser($language, $fieldName, $required); break; - case 9: + case Constants::FIELD_ELE_COLORPICKER: $ret .= $this->getXoopsFormColorPicker($language, $fieldName, $required); break; - case 10: + case Constants::FIELD_ELE_IMAGELIST: $ret .= $this->getXoopsFormImageList($language, $moduleDirname, $fieldName, $required); break; - case 11: + case Constants::FIELD_ELE_SELECTFILE: $ret .= $this->getXoopsFormSelectFile($language, $moduleDirname, $tableName, $fieldName, $required); break; - case 12: + case Constants::FIELD_ELE_URLFILE: $ret .= $this->getXoopsFormUrlFile($language, $moduleDirname, $fieldName, $fieldDefault, $required); break; - case 13: + case Constants::FIELD_ELE_UPLOADIMAGE: $ret .= $this->getXoopsFormUploadImage($language, $moduleDirname, $tableName, $fieldName, $required); break; - case 14: + case Constants::FIELD_ELE_UPLOADFILE: $ret .= $this->getXoopsFormUploadFile($language, $moduleDirname, $tableName, $fieldName, $required); break; - case 15: + case Constants::FIELD_ELE_TEXTDATESELECT: $ret .= $this->getXoopsFormTextDateSelect($language, $fieldName, $required); break; - case 16: - $ret .= $this->getXoopsFormSelectStatus($language, $moduleDirname, $fieldName, $required); + case Constants::FIELD_ELE_SELECTSTATUS: + $ret .= $this->getXoopsFormSelectStatus($language, $moduleDirname, $fieldName, $tablePermissions, $required); break; - case 17: + case Constants::FIELD_ELE_PASSWORD: $ret .= $this->getXoopsFormPassword($language, $fieldName, $required); break; - case 18: + case Constants::FIELD_ELE_SELECTCOUNTRY: $ret .= $this->getXoopsFormSelectCountry($language, $fieldName, $required); break; - case 19: + case Constants::FIELD_ELE_SELECTLANG: $ret .= $this->getXoopsFormSelectLang($language, $fieldName, $required); break; - case 20: + case Constants::FIELD_ELE_RADIO: $ret .= $this->getXoopsFormRadio($language, $moduleDirname, $fieldName, $required); break; - case 21: + case Constants::FIELD_ELE_DATETIME: $ret .= $this->getXoopsFormDateTime($language, $fieldName, $required); break; - case 22: + case Constants::FIELD_ELE_SELECTCOMBO: $ret .= $this->getXoopsFormSelectCombo($language, $moduleDirname, $tableName, $fieldName, $required); break; + case Constants::FIELD_ELE_TEXTUUID: + $ret .= $this->getXoopsFormTextUuid($language, $fieldName, $required); + break; + case Constants::FIELD_ELE_TEXTIP: + $ret .= $this->getXoopsFormTextIp($language, $fieldName, $required); + break; default: // If we use tag module - if (1 == $table->getVar('table_tag')) { + if (!$tagDone && 1 == $table->getVar('table_tag')) { $ret .= $this->getXoopsFormTag($fieldId, $required); + $tagDone = true; } // If we want to hide XoopsFormHidden() or field id if ((0 == $f) && (1 == $table->getVar('table_autoincrement'))) { @@ -993,16 +1031,16 @@ public function renderElements() break; } - $fieldElements = $tc->getHandler('fieldelements')->get($fieldElement); + $fieldElements = $this->helper->getHandler('Fieldelements')->get($fieldElement); $fieldElementTid = $fieldElements->getVar('fieldelement_tid'); if ((int)$fieldElementTid > 0 ) { if ((1 == $fieldParent) || 1 == $table->getVar('table_category')) { $fieldElementMid = $fieldElements->getVar('fieldelement_mid'); $fieldElementName = $fieldElements->getVar('fieldelement_name'); - $fieldNameDesc = mb_substr($fieldElementName, mb_strrpos($fieldElementName, ':'), mb_strlen($fieldElementName)); - $topicTableName = str_replace(': ', '', $fieldNameDesc); - $fieldsTopics = $ttf->getTableFields($fieldElementMid, $fieldElementTid); - foreach (array_keys($fieldsTopics) as $g) { + $fieldNameDesc = mb_substr($fieldElementName, \mb_strrpos($fieldElementName, ':'), mb_strlen($fieldElementName)); + $topicTableName = \str_replace(': ', '', $fieldNameDesc); + $fieldsTopics = $this->tf->getTableFields($fieldElementMid, $fieldElementTid); + foreach (\array_keys($fieldsTopics) as $g) { $fieldNameTopic = $fieldsTopics[$g]->getVar('field_name'); if ((0 == $g) && (1 == $table->getVar('table_autoincrement'))) { $fieldIdTopic = $fieldNameTopic; diff --git a/class/Files/Classes/ClassHandlerFiles.php b/class/Files/Classes/ClassHandlerFiles.php index b46be306..8e08bd24 100644 --- a/class/Files/Classes/ClassHandlerFiles.php +++ b/class/Files/Classes/ClassHandlerFiles.php @@ -1,9 +1,9 @@ -xc = Modulebuilder\Files\CreateXoopsCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); + //$this->helper = Modulebuilder\Helper::getInstance(); } /** @@ -59,12 +74,12 @@ public static function getInstance() /** * @public function write * - * @param string $module - * @param string $table + * @param $module + * @param $table * @param mixed $tables * @param $filename */ - public function write($module, $table, $tables, $filename) + public function write($module, $table, $tables, $filename): void { $this->setModule($module); $this->setTable($table); @@ -76,39 +91,36 @@ public function write($module, $table, $tables, $filename) * @public function getClassHandler * * @param string $moduleDirname - * @param string $table + * @param $table * @param string $fieldId - * @param $fieldName * @param string $fieldMain * @param $fieldParentId * @param $fieldElement * @return string */ - private function getClassObjectHandler($moduleDirname, $table, $fieldId, $fieldName, $fieldMain, $fieldParentId, $fieldElement) + private function getClassObjectHandler(string $moduleDirname, $table, string $fieldId, string $fieldMain, $fieldParentId, $fieldElement) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $tableName = $table->getVar('table_name'); - $tableFieldName = $table->getVar('table_fieldname'); - $ucfTableName = ucfirst($tableName); - $multiLineCom = ['Class Object Handler' => $ucfTableName]; - $ret = $pc->getPhpCodeCommentMultiLine($multiLineCom); + $tableName = $table->getVar('table_name'); + $ucfTableName = \ucfirst($tableName); + $multiLineCom = ['Class Object Handler' => $ucfTableName]; + $ret = $this->pc->getPhpCodeCommentMultiLine($multiLineCom); - $cClh = $pc->getPhpCodeCommentMultiLine(['Constructor' => '', '' => '', '@param' => '\XoopsDatabase $db'], "\t"); + $cClh = $this->pc->getPhpCodeCommentMultiLine(['Constructor' => '', '' => '', '@param' => '\XoopsDatabase $db'], "\t"); $constr = "\t\tparent::__construct(\$db, '{$moduleDirname}_{$tableName}', {$ucfTableName}::class, '{$fieldId}', '{$fieldMain}');\n"; - $cClh .= $pc->getPhpCodeFunction('__construct', '\XoopsDatabase $db', $constr, 'public ', false, "\t"); + $cClh .= $this->pc->getPhpCodeFunction('__construct', '\XoopsDatabase $db', $constr, 'public ', false, "\t"); $cClh .= $this->getClassCreate(); $cClh .= $this->getClassGet(); $cClh .= $this->getClassGetInsertId(); $cClh .= $this->getClassCounter($tableName, $fieldId, $fieldMain); $cClh .= $this->getClassAll($tableName, $fieldId, $fieldMain); $cClh .= $this->getClassCriteria($tableName); - if ($fieldElement > 16 && in_array(1, $fieldParentId)) { - $cClh .= $this->getClassByCategory($moduleDirname, $tableName, $tableFieldName, $fieldId, $fieldName, $fieldMain, $fieldElement); + if ($fieldElement > 16 && \in_array(1, $fieldParentId)) { + //$cClh .= $this->getClassByCategory($moduleDirname, $tableName, $tableFieldName, $fieldId, $fieldName, $fieldMain, $fieldElement); $cClh .= $this->getClassGetTableSolenameById($table, $fieldMain); } - $ret .= $pc->getPhpCodeClass("{$ucfTableName}Handler", $cClh, '\XoopsPersistableObjectHandler'); + $ret .= $this->pc->getPhpCodeClass("{$ucfTableName}Handler", $cClh, '\XoopsPersistableObjectHandler'); return $ret; } @@ -120,11 +132,10 @@ private function getClassObjectHandler($moduleDirname, $table, $fieldId, $fieldN */ private function getClassCreate() { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $ret = $pc->getPhpCodeCommentMultiLine(['@param bool' => '$isNew', '' => '', '@return' => 'object'], "\t"); + $ret = $this->pc->getPhpCodeCommentMultiLine(['@param bool' => '$isNew', '' => '', '@return' => 'object'], "\t"); $cClhc = $this->getSimpleString('return parent::create($isNew);', "\t\t"); - $ret .= $pc->getPhpCodeFunction('create', '$isNew = true', $cClhc, 'public ', false, "\t"); + $ret .= $this->pc->getPhpCodeFunction('create', '$isNew = true', $cClhc, 'public ', false, "\t"); return $ret; } @@ -136,11 +147,10 @@ private function getClassCreate() */ private function getClassGet() { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $ret = $pc->getPhpCodeCommentMultiLine(['retrieve a' => 'field', '' => '', '@param int' => '$i field id', '@param null' => 'fields', '@return mixed reference to the' => '{@link Get} object'], "\t"); - $cClhg = $this->getSimpleString('return parent::get($i, $fields);', "\t\t"); + $ret = $this->pc->getPhpCodeCommentMultiLine(['retrieve a' => 'field', '' => '', '@param int' => '$id field id', '@param null' => 'fields', '@return \XoopsObject|null reference to the' => '{@link Get} object'], "\t"); + $cClhg = $this->getSimpleString('return parent::get($id, $fields);', "\t\t"); - $ret .= $pc->getPhpCodeFunction('get', '$i = null, $fields = null', $cClhg, 'public ', false, "\t"); + $ret .= $this->pc->getPhpCodeFunction('get', '$id = null, $fields = null', $cClhg, 'public ', false, "\t"); return $ret; } @@ -152,11 +162,10 @@ private function getClassGet() */ private function getClassGetInsertId() { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $ret = $pc->getPhpCodeCommentMultiLine(['get inserted' => 'id', '' => '', '@param' => 'null', '@return integer reference to the' => '{@link Get} object'], "\t"); + $ret = $this->pc->getPhpCodeCommentMultiLine(['get inserted' => 'id', '' => '', '@return int reference to the' => '{@link Get} object'], "\t"); $cClhgid = $this->getSimpleString('return $this->db->getInsertId();', "\t\t"); - $ret .= $pc->getPhpCodeFunction('getInsertId', '', $cClhgid, 'public ', false, "\t"); + $ret .= $this->pc->getPhpCodeFunction('getInsertId', '', $cClhgid, 'public ', false, "\t"); return $ret; } @@ -172,18 +181,16 @@ private function getClassGetInsertId() */ private function getClassCounter($tableName, $fieldId, $fieldMain) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $ucfTableName = ucfirst($tableName); - $ret = $pc->getPhpCodeCommentMultiLine(['Get Count ' . $ucfTableName => 'in the database', '@param int $start' => '', '@param int $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'int'], "\t"); - - $critCount = $xc->getXcCriteriaCompo('crCount' . $ucfTableName, "\t\t"); - $paramsCrit = "\$this->get{$ucfTableName}Criteria(\$crCount{$ucfTableName}, \$start, \$limit, \$sort, \$order)"; - $critCount .= $xc->getXcEqualsOperator('$crCount' . $ucfTableName, $paramsCrit, null, "\t\t"); - $critCount .= $this->getSimpleString("return parent::getCount(\$crCount{$ucfTableName});", "\t\t"); - $params = "\$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC'"; + $ucfTableName = \ucfirst($tableName); + $ret = $this->pc->getPhpCodeCommentMultiLine(['Get Count ' . $ucfTableName => 'in the database', '@param string $sort' => '', '@param string $order' => '', '@return' => 'int'], "\t"); - $ret .= $pc->getPhpCodeFunction('getCount' . $ucfTableName, $params, $critCount, 'public ', false, "\t"); + $critCount = $this->xc->getXcCriteriaCompo('crCount' . $ucfTableName, "\t\t"); + $paramsCrit = "\$this->get{$ucfTableName}Criteria(\$crCount{$ucfTableName}, 0, 0, \$sort, \$order)"; + $critCount .= $this->xc->getXcEqualsOperator('$crCount' . $ucfTableName, $paramsCrit, null, "\t\t"); + $critCount .= $this->getSimpleString("return \$this->getCount(\$crCount{$ucfTableName});", "\t\t"); + $params = "\$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC'"; + + $ret .= $this->pc->getPhpCodeFunction('getCount' . $ucfTableName, $params, $critCount, 'public ', false, "\t"); return $ret; } @@ -199,22 +206,21 @@ private function getClassCounter($tableName, $fieldId, $fieldMain) */ private function getClassAll($tableName, $fieldId, $fieldMain) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $ucfTableName = ucfirst($tableName); - $ret = $pc->getPhpCodeCommentMultiLine(['Get All ' . $ucfTableName => 'in the database', '@param int $start' => '', '@param int $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'array'], "\t"); + $ucfTableName = \ucfirst($tableName); + $ret = $this->pc->getPhpCodeCommentMultiLine(['Get All ' . $ucfTableName => 'in the database', '@param int $start' => '', '@param int $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'array'], "\t"); - $critAll = $xc->getXcCriteriaCompo('crAll' . $ucfTableName, "\t\t"); + $critAll = $this->xc->getXcCriteriaCompo('crAll' . $ucfTableName, "\t\t"); $paramsCrit = "\$this->get{$ucfTableName}Criteria(\$crAll{$ucfTableName}, \$start, \$limit, \$sort, \$order)"; - $critAll .= $xc->getXcEqualsOperator('$crAll' . $ucfTableName, $paramsCrit, null, "\t\t"); - $critAll .= $this->getSimpleString("return parent::getAll(\$crAll{$ucfTableName});", "\t\t"); + $critAll .= $this->xc->getXcEqualsOperator('$crAll' . $ucfTableName, $paramsCrit, null, "\t\t"); + $critAll .= $this->getSimpleString("return \$this->getAll(\$crAll{$ucfTableName});", "\t\t"); $params = "\$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC'"; - $ret .= $pc->getPhpCodeFunction('getAll' . $ucfTableName, $params, $critAll, 'public ', false, "\t"); + $ret .= $this->pc->getPhpCodeFunction('getAll' . $ucfTableName, $params, $critAll, 'public ', false, "\t"); return $ret; } + /*remark from goffy: 'getClassByCategory' currently not in use*/ /** * @public function getClassByCategory * @@ -227,41 +233,41 @@ private function getClassAll($tableName, $fieldId, $fieldMain) * @param $fieldElement * @return string */ + /* private function getClassByCategory($moduleDirname, $tableName, $tableFieldName, $fieldId, $fieldName, $fieldMain, $fieldElement) { - $tc = Tdmcreate\Helper::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $ucfTableName = ucfirst($tableName); - $fieldElements = $tc->getHandler('fieldelements')->get($fieldElement); + $ucfTableName = \ucfirst($tableName); + $fieldElements = $this->helper->getHandler('Fieldelements')->get($fieldElement); $fieldElementName = $fieldElements->getVar('fieldelement_name'); - $fieldNameDesc = ucfirst(mb_substr($fieldElementName, mb_strrpos($fieldElementName, ':'), mb_strlen($fieldElementName))); - $topicTableName = str_replace(': ', '', $fieldNameDesc); + $fieldNameDesc = \ucfirst(mb_substr($fieldElementName, \mb_strrpos($fieldElementName, ':'), mb_strlen($fieldElementName))); + $topicTableName = \str_replace(': ', '', $fieldNameDesc); $lcfTopicTableName = lcfirst($topicTableName); - $ret = $pc->getPhpCodeCommentMultiLine(["Get All {$ucfTableName} By" => "{$fieldNameDesc} Id", '@param int $start' => '', '@param int $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'array'], "\t"); + $ret = $this->pc->getPhpCodeCommentMultiLine(["Get All {$ucfTableName} By" => "{$fieldNameDesc} Id", '@param int $start' => '', '@param int $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'array'], "\t"); - $critAll = $xc->getXcXoopsHandler('groupperm', "\t\t"); + $critAll = $this->xc->getXcXoopsHandler('groupperm', "\t\t"); $param1 = "'{$moduleDirname}_view'"; $param2 = "\$GLOBALS['xoopsUser']->getGroups()"; $param3 = "\$GLOBALS['xoopsModule']->getVar('mid')"; - $critAll .= $xc->getXcGetItemIds($lcfTopicTableName, 'grouppermHandler', $param1, $param2, $param3, "\t\t"); - $critAll .= $xc->getXcCriteriaCompo('crAll' . $ucfTableName, "\t\t"); + $critAll .= $this->xc->getXcGetItemIds($lcfTopicTableName, 'grouppermHandler', $param1, $param2, $param3, "\t\t"); + $critAll .= $this->xc->getXcCriteriaCompo('crAll' . $ucfTableName, "\t\t"); if (false !== mb_strpos($fieldName, 'status')) { - $crit = $xc->getXcCriteria('', "'{$fieldName}'", '0', "'!='", true); - $critAll .= $xc->getXcCriteriaAdd('crAll' . $ucfTableName, $crit, "\t\t"); + $crit = $this->xc->getXcCriteria('', "'{$fieldName}'", '0', "'!='", true); + $critAll .= $this->xc->getXcCriteriaAdd('crAll' . $ucfTableName, $crit, "\t\t"); } $paramsCritAll = "\$this->get{$ucfTableName}Criteria(\$crAll{$ucfTableName}, \$start, \$limit, \$sort, \$order)"; - $critAll .= $xc->getXcEqualsOperator('$crAll' . $ucfTableName, $paramsCritAll, null, "\t\t"); + $critAll .= $this->xc->getXcEqualsOperator('$crAll' . $ucfTableName, $paramsCritAll, null, "\t\t"); - $critAll .= $this->getSimpleString("return parent::getAll(\$crAll{$ucfTableName});", "\t\t"); + $critAll .= $this->getSimpleString("return \$this->getAll(\$crAll{$ucfTableName});", "\t\t"); $params = "\${$tableFieldName}Id, \$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC'"; - $ret .= $pc->getPhpCodeFunction("getAll{$ucfTableName}By{$fieldNameDesc}Id" . $ucfTableName, $params, $critAll, 'public ', false, "\t"); + $ret .= $this->pc->getPhpCodeFunction("getAll{$ucfTableName}By{$fieldNameDesc}Id" . $ucfTableName, $params, $critAll, 'public ', false, "\t"); return $ret; + } + */ /** * @public function getClassCriteria @@ -271,20 +277,18 @@ private function getClassByCategory($moduleDirname, $tableName, $tableFieldName, */ private function getClassCriteria($tableName) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $ucfTableName = ucfirst($tableName); - $ret = $pc->getPhpCodeCommentMultiLine(['Get' => 'Criteria ' . $ucfTableName, '@param ' => "\$cr{$ucfTableName}", '@param int $start' => '', '@param int $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'int'], "\t"); + $ucfTableName = \ucfirst($tableName); + $ret = $this->pc->getPhpCodeCommentMultiLine(['Get' => 'Criteria ' . $ucfTableName, '@param ' => "\$cr{$ucfTableName}", '@param int $start' => '', '@param int $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => '\CriteriaCompo'], "\t"); $paramsAllCriteria = "\$cr{$ucfTableName}, \$start, \$limit, \$sort, \$order"; - - $critSets = $xc->getXcCriteriaSetStart('cr' . $ucfTableName, '$start', "\t\t"); - $critSets .= $xc->getXcCriteriaSetLimit('cr' . $ucfTableName, '$limit', "\t\t"); - $critSets .= $xc->getXcCriteriaSetSort('cr' . $ucfTableName, '$sort', "\t\t"); - $critSets .= $xc->getXcCriteriaSetOrder('cr' . $ucfTableName, '$order', "\t\t"); + $condIf = $this->xc->getXcCriteriaSetStart('cr' . $ucfTableName, '$start', "\t\t\t"); + $condIf .= $this->xc->getXcCriteriaSetLimit('cr' . $ucfTableName, '$limit', "\t\t\t"); + $critSets = $this->pc->getPhpCodeConditions('$limit', ' > ', '0', $condIf, false, "\t\t"); + $critSets .= $this->xc->getXcCriteriaSetSort('cr' . $ucfTableName, '$sort', "\t\t"); + $critSets .= $this->xc->getXcCriteriaSetOrder('cr' . $ucfTableName, '$order', "\t\t"); $critSets .= $this->getSimpleString("return \$cr{$ucfTableName};", "\t\t"); - $ret .= $pc->getPhpCodeFunction("get{$ucfTableName}Criteria", $paramsAllCriteria, $critSets, 'private ', false, "\t"); + $ret .= $this->pc->getPhpCodeFunction("get{$ucfTableName}Criteria", $paramsAllCriteria, $critSets, 'private ', false, "\t"); return $ret; } @@ -298,53 +302,44 @@ private function getClassCriteria($tableName) */ private function getClassGetTableSolenameById($table, $fieldMain) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); $tableName = $table->getVar('table_name'); $tableSoleName = $table->getVar('table_solename'); - $ucfTableSoleName = ucfirst($tableSoleName); - $ccTableSoleName = $this->getCamelCase($tableSoleName, true); + $ucfTableSoleName = \ucfirst($tableSoleName); - $ret = $pc->getPhpCodeCommentMultiLine(['Returns the' => $ucfTableSoleName . ' from id', '' => '', '@return' => 'string'], "\t"); - $soleName = $xc->getXcEqualsOperator("\${$tableSoleName}Id", "(int)( \${$tableSoleName}Id )", null, "\t\t"); - $soleName .= $xc->getXcEqualsOperator("\${$tableSoleName}", "''", null, "\t\t"); - $contentIf = $xc->getXcHandlerLine($tableName, "\t\t\t"); - $contentIf .= $xc->getXcHandlerGet($tableName, "\${$tableSoleName}Id", 'Obj', true, false, "\t\t\t"); - $getVar = $xc->getXcGetVar($ccTableSoleName, "{$tableSoleName}Obj", $fieldMain, false, "\t\t\t\t"); - $contentIf .= $pc->getPhpCodeConditions("is_object( \${$tableSoleName}Obj )", '', '', $getVar, false, "\t\t\t"); - $soleName .= $pc->getPhpCodeConditions("\${$tableSoleName}Id", ' > ', '0', $contentIf, false, "\t\t"); - $soleName .= $this->getSimpleString("return \${$tableSoleName};", "\t\t"); + $ret = $this->pc->getPhpCodeCommentMultiLine(['Returns the' => $ucfTableSoleName . ' from id', '' => '', '@return' => 'string'], "\t"); + $soleName = $this->xc->getXcEqualsOperator("\${$tableSoleName}Id", "(int)( \${$tableSoleName}Id )", null, "\t\t"); + $soleName .= $this->xc->getXcEqualsOperator("\${$tableSoleName}", "''", null, "\t\t"); + $contentIf = $this->xc->getXcHandlerLine($tableName, "\t\t\t"); + $contentIf .= $this->xc->getXcHandlerGet($tableName, "{$tableSoleName}Id", 'Obj', $tableName . 'Handler', false, "\t\t\t"); + $getVar = $this->xc->getXcGetVar($tableSoleName, "{$tableSoleName}Obj", $fieldMain, false, "\t\t\t\t"); + $contentIf .= $this->pc->getPhpCodeConditions("\is_object( \${$tableSoleName}Obj )", '', '', $getVar, false, "\t\t\t"); + $soleName .= $this->pc->getPhpCodeConditions("\${$tableSoleName}Id", ' > ', '0', $contentIf, false, "\t\t"); + $soleName .= $this->getSimpleString("return \${$tableSoleName};", "\t\t"); - $ret .= $pc->getPhpCodeFunction("get{$ucfTableSoleName}FromId", "\${$tableSoleName}Id", $soleName, 'public ', false, "\t"); + $ret .= $this->pc->getPhpCodeFunction("get{$ucfTableSoleName}FromId", "\${$tableSoleName}Id", $soleName, 'public ', false, "\t"); return $ret; } /** * @public function render - * @param null * - * @return bool|string + * @return string */ public function render() { - $tc = Tdmcreate\Helper::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); $module = $this->getModule(); $table = $this->getTable(); $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); - $fieldInForm = []; + //$fieldInForm = []; $fieldParentId = []; - $fieldElementId = []; $fieldId = null; - $fieldName = null; $fieldMain = null; $fieldElement = null; - foreach (array_keys($fields) as $f) { + foreach (\array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); - $fieldInForm[] = $fields[$f]->getVar('field_inform'); $fieldParentId[] = $fields[$f]->getVar('field_parent'); if ((0 == $f) && (1 == $table->getVar('table_autoincrement'))) { $fieldId = $fieldName; // $fieldId = fields parameter index field @@ -353,16 +348,13 @@ public function render() $fieldMain = $fieldName; // $fieldMain = fields parameter main field } $fieldElement = $fields[$f]->getVar('field_element'); - - $fieldElements = $tc->getHandler('fieldelements')->get($fieldElement); - $fieldElementId[] = $fieldElements->getVar('fieldelement_id'); } - $namespace = $pc->getPhpCodeNamespace(['XoopsModules', $moduleDirname]); + $namespace = $this->pc->getPhpCodeNamespace(['XoopsModules', $moduleDirname]); $content = $this->getHeaderFilesComments($module, null, $namespace); - $content .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname]); - $content .= $this->getClassObjectHandler($moduleDirname, $table, $fieldId, $fieldName, $fieldMain, $fieldParentId, $fieldElement); + $content .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname]); + $content .= $this->getClassObjectHandler($moduleDirname, $table, $fieldId, $fieldMain, $fieldParentId, $fieldElement); - $this->create($moduleDirname, 'class', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'class', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/Classes/ClassSpecialFiles.php b/class/Files/Classes/ClassSpecialFiles.php index 6c1a7f94..6a9fe6bb 100644 --- a/class/Files/Classes/ClassSpecialFiles.php +++ b/class/Files/Classes/ClassSpecialFiles.php @@ -1,9 +1,12 @@ -xc = Modulebuilder\Files\CreateXoopsCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); } /** @@ -68,12 +78,12 @@ public static function getInstance() /** * @public function write * - * @param string $module + * @param $module * @param string $table * @param mixed $tables * @param $filename */ - public function write($module, $table, $tables, $filename) + public function write($module, string $table, $tables, $filename): void { $this->setModule($module); $this->setTable($table); @@ -82,223 +92,213 @@ public function write($module, $table, $tables, $filename) } /** - * @public function renderPermissionsHandler - * @param null + * @public function render * - * @return bool|string + * @return string */ - public function getGlobalPerms($permId) + public function renderClass() { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); $module = $this->getModule(); + $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); + $namespace = $this->pc->getPhpCodeNamespace(['XoopsModules', $moduleDirname]); + $content = $this->getHeaderFilesComments($module, null, $namespace); + $content .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname]); + $content .= $this->pc->getPhpCodeDefined(); + $content .= $this->pc->getPhpCodeCommentMultiLine(['Class Object' => $this->className]); + $cCl = $this->pc->getPhpCodeCommentMultiLine(['Constructor' => '', '' => ''], "\t"); + $constr = ''; + $cCl .= $this->pc->getPhpCodeFunction('__construct', '', $constr, 'public ', false, "\t"); + $arrGetInstance = ['@static function' => 'getInstance', '' => '']; + $cCl .= $this->pc->getPhpCodeCommentMultiLine($arrGetInstance, "\t"); + $getInstance = $this->pc->getPhpCodeVariableClass('static', 'instance', 'false', "\t\t"); + $instance = $this->xc->getXcEqualsOperator('$instance', 'new self()', null, "\t\t\t"); + $getInstance .= $this->pc->getPhpCodeConditions('!$instance', '', '', $instance, false, "\t\t"); + $cCl .= $this->pc->getPhpCodeFunction('getInstance', '', $getInstance, 'public static ', false, "\t"); + $content .= $this->pc->getPhpCodeClass($this->className, $cCl, '\XoopsObject'); + + $this->create($moduleDirname, 'class', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); + + return $this->renderFile(); + } - $returnTrue = $this->getSimpleString("return true;", "\t\t\t"); - $right = ''; - $cond = ''; - $funcname = ''; - $comment = ''; + /** + * @public function getGlobalPerms + * @param mixed $permId + * + * @return string + */ + public function getGlobalPerms($permId) + { + $module = $this->getModule(); + $moduleDirname = $module->getVar('mod_dirname'); + + $returnTrue = $this->getSimpleString('return true;', "\t\t\t"); + $right = ''; + $cond = ''; + $funcname = ''; + $comment = ''; switch ($permId) { case 4: - $comment .= $pc->getPhpCodeCommentMultiLine(['@public' => 'function permGlobalApprove', 'returns' => 'right for global approve', '' => '', '@param' => 'null', '@return' => 'bool'], "\t"); - $right .= $xc->getXcCheckRight('$grouppermHandler', $moduleDirname . '_ac', 4, '$my_group_ids', '$mid', true, "\t\t\t"); - $cond .= $pc->getPhpCodeConditions($right, '', '', $returnTrue, false, "\t\t"); + $comment .= $this->pc->getPhpCodeCommentMultiLine(['@public' => 'function permGlobalApprove', 'returns' => 'right for global approve', '' => '', '@return' => 'bool'], "\t"); + $right .= $this->xc->getXcCheckRight('$grouppermHandler', $moduleDirname . '_ac', '4', '$my_group_ids', '$mid', true, "\t\t\t"); + $cond .= $this->pc->getPhpCodeConditions($right, '', '', $returnTrue, false, "\t\t"); $funcname .= 'getPermGlobalApprove'; break; case 8: - $comment .= $pc->getPhpCodeCommentMultiLine(['@public' => 'function permGlobalSubmit', 'returns' => 'right for global submit', '' => '', '@param' => 'null', '@return' => 'bool'], "\t"); - $cond .= $pc->getPhpCodeConditions('$this->getGlobalApprove()', '', '', $returnTrue, false, "\t\t"); - $right .= $xc->getXcCheckRight('$grouppermHandler', $moduleDirname . '_ac', 8, '$my_group_ids', '$mid', true, "\t\t\t"); - $cond .= $pc->getPhpCodeConditions($right, '', '', $returnTrue, false, "\t\t"); + $comment .= $this->pc->getPhpCodeCommentMultiLine(['@public' => 'function permGlobalSubmit', 'returns' => 'right for global submit', '' => '', '@return' => 'bool'], "\t"); + $cond .= $this->pc->getPhpCodeConditions('$this->getPermGlobalApprove()', '', '', $returnTrue, false, "\t\t"); + $right .= $this->xc->getXcCheckRight('$grouppermHandler', $moduleDirname . '_ac', '8', '$my_group_ids', '$mid', true, "\t\t\t"); + $cond .= $this->pc->getPhpCodeConditions($right, '', '', $returnTrue, false, "\t\t"); $funcname .= 'getPermGlobalSubmit'; break; case 16: - $comment .= $pc->getPhpCodeCommentMultiLine(['@public' => 'function permGlobalView', 'returns' => 'right for global view', '' => '', '@param' => 'null', '@return' => 'bool'], "\t"); - $cond .= $pc->getPhpCodeConditions('$this->getGlobalApprove()', '', '', $returnTrue, false, "\t\t"); - $cond .= $pc->getPhpCodeConditions('$this->getGlobalSubmit()', '', '', $returnTrue, false, "\t\t"); - $right .= $xc->getXcCheckRight('$grouppermHandler', $moduleDirname . '_ac', 16, '$my_group_ids', '$mid', true, "\t\t\t"); - $cond .= $pc->getPhpCodeConditions($right, '', '', $returnTrue, false, "\t\t"); + $comment .= $this->pc->getPhpCodeCommentMultiLine(['@public' => 'function permGlobalView', 'returns' => 'right for global view', '' => '', '@return' => 'bool'], "\t"); + $cond .= $this->pc->getPhpCodeConditions('$this->getPermGlobalApprove()', '', '', $returnTrue, false, "\t\t"); + $cond .= $this->pc->getPhpCodeConditions('$this->getPermGlobalSubmit()', '', '', $returnTrue, false, "\t\t"); + $right .= $this->xc->getXcCheckRight('$grouppermHandler', $moduleDirname . '_ac', '16', '$my_group_ids', '$mid', true, "\t\t\t"); + $cond .= $this->pc->getPhpCodeConditions($right, '', '', $returnTrue, false, "\t\t"); $funcname .= 'getPermGlobalView'; break; case 0: default: break; } - $functions = $comment; - $globalContent = $xc->getXcGetGlobal(['xoopsUser', 'xoopsModule'], "\t\t"); - $globalContent .= $xc->getXcEqualsOperator('$currentuid', '0', null, "\t\t"); - - $contIf = $pc->getPhpCodeConditions("\$xoopsUser->isAdmin(\$xoopsModule->mid())", '', '', "\t" . $returnTrue, false, "\t\t\t"); - $contIf .= $xc->getXcEqualsOperator('$currentuid', '$xoopsUser->uid()', null, "\t\t\t"); - $globalContent .= $pc->getPhpCodeConditions('isset($xoopsUser)', ' && ', 'is_object($xoopsUser)', $contIf, false, "\t\t"); - $globalContent .= $xc->getXcXoopsHandler('groupperm', "\t\t"); - $globalContent .= $xc->getXcEqualsOperator('$mid', '$xoopsModule->mid()', null, "\t\t"); - $globalContent .= $xc->getXcXoopsHandler('member', "\t\t"); - - $contIfInt = $xc->getXcEqualsOperator('$my_group_ids', '[XOOPS_GROUP_ANONYMOUS]', null, "\t\t\t"); - $contElseInt = $xc->getXcEqualsOperator('$my_group_ids', '$memberHandler->getGroupsByUser($currentuid);', null, "\t\t\t"); - $globalContent .= $pc->getPhpCodeConditions('0', ' == ', '$currentuid', $contIfInt, $contElseInt, "\t\t"); - $globalContent .= $cond; - $globalContent .= $this->getSimpleString("return false;", "\t\t"); - $functions .= $pc->getPhpCodeFunction($funcname, '', $globalContent, 'public ', false, "\t"); + $functions = $comment; + $globalContent = $this->xc->getXcGetGlobal(['xoopsUser', 'xoopsModule'], "\t\t"); + $globalContent .= $this->xc->getXcEqualsOperator('$currentuid', '0', null, "\t\t"); + + $contIf = $this->pc->getPhpCodeConditions('$xoopsUser->isAdmin($xoopsModule->mid())', '', '', "\t" . $returnTrue, false, "\t\t\t"); + $contIf .= $this->xc->getXcEqualsOperator('$currentuid', '$xoopsUser->uid()', null, "\t\t\t"); + $globalContent .= $this->pc->getPhpCodeConditions('isset($xoopsUser)', ' && ', '\is_object($xoopsUser)', $contIf, false, "\t\t"); + $globalContent .= $this->xc->getXcXoopsHandler('groupperm', "\t\t"); + $globalContent .= $this->xc->getXcEqualsOperator('$mid', '$xoopsModule->mid()', null, "\t\t"); + $globalContent .= $this->xc->getXcXoopsHandler('member', "\t\t"); + + $contIfInt = $this->xc->getXcEqualsOperator('$my_group_ids', '[\XOOPS_GROUP_ANONYMOUS]', null, "\t\t\t"); + $contElseInt = $this->xc->getXcEqualsOperator('$my_group_ids', '$memberHandler->getGroupsByUser($currentuid)', null, "\t\t\t"); + $globalContent .= $this->pc->getPhpCodeConditions('$currentuid', ' == ', '0', $contIfInt, $contElseInt, "\t\t"); + $globalContent .= $cond; + $globalContent .= $this->getSimpleString('return false;', "\t\t"); + $functions .= $this->pc->getPhpCodeFunction($funcname, '', $globalContent, 'public ', false, "\t"); return $functions; } - /** - * @public function render - * @param null - * - * @return bool|string - */ - public function renderClass() - { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $module = $this->getModule(); - $filename = $this->getFileName(); - $moduleDirname = $module->getVar('mod_dirname'); - $namespace = $pc->getPhpCodeNamespace(['XoopsModules', $moduleDirname]); - $content = $this->getHeaderFilesComments($module, null, $namespace); - $content .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname]); - $content .= $pc->getPhpCodeDefined(); - $content .= $pc->getPhpCodeCommentMultiLine(['Class Object' => $this->className]); - $cCl = $pc->getPhpCodeCommentMultiLine(['Constructor' => '', '' => '', '@param' => 'null'], "\t"); - $constr = ''; - $cCl .= $pc->getPhpCodeFunction('__construct', '', $constr, 'public ', false, "\t"); - $arrGetInstance = ['@static function' => '&getInstance', '' => '', '@param' => 'null']; - $cCl .= $pc->getPhpCodeCommentMultiLine($arrGetInstance, "\t"); - $getInstance = $pc->getPhpCodeVariableClass('static', 'instance', 'false', "\t\t"); - $instance = $xc->getXcEqualsOperator('$instance', 'new self()', null, "\t\t\t"); - $getInstance .= $pc->getPhpCodeConditions('!$instance', '', '', $instance, false, "\t\t"); - $cCl .= $pc->getPhpCodeFunction('getInstance', '', $getInstance, 'public static ', false, "\t"); - $content .= $pc->getPhpCodeClass($this->className, $cCl, '\XoopsObject'); - - $this->create($moduleDirname, 'class', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); - - - - return $this->renderFile(); - } - /** * @public function renderPermissionsHandler - * @param null * - * @return bool|string + * @return string */ public function renderPermissionsHandler() { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $module = $this->getModule(); - $filename = $this->getFileName(); - $moduleDirname = $module->getVar('mod_dirname'); - $namespace = $pc->getPhpCodeNamespace(['XoopsModules', $moduleDirname]); - $content = $this->getHeaderFilesComments($module, null, $namespace); - $content .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname]); - $content .= $pc->getPhpCodeDefined(); - $content .= $pc->getPhpCodeCommentMultiLine(['Class Object' => $this->className]); - - $constr = $pc->getPhpCodeCommentMultiLine(['Constructor' => '', '' => '', '@param' => 'null'], "\t"); - $constr .= $pc->getPhpCodeFunction('__construct', '', '', 'public ', false, "\t"); - $functions = $constr; - $functions .= $this->getGlobalPerms(4); - $functions .= $this->getGlobalPerms(8); - $functions .= $this->getGlobalPerms(16); - - $content .= $pc->getPhpCodeClass($this->className, $functions, '\XoopsPersistableObjectHandler'); - $this->create($moduleDirname, 'class', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $module = $this->getModule(); + $filename = $this->getFileName(); + $moduleDirname = $module->getVar('mod_dirname'); + $namespace = $this->pc->getPhpCodeNamespace(['XoopsModules', $moduleDirname]); + $content = $this->getHeaderFilesComments($module, null, $namespace); + $content .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname]); + $content .= $this->pc->getPhpCodeDefined(); + $content .= $this->pc->getPhpCodeCommentMultiLine(['Class Object' => $this->className]); + + $constr = $this->pc->getPhpCodeCommentMultiLine(['Constructor' => '', '@param' => '\XoopsDatabase $db'], "\t"); + $constr .= $this->pc->getPhpCodeFunction('__construct', '\XoopsDatabase $db', '', 'public ', false, "\t"); + $functions = $constr; + $functions .= $this->getGlobalPerms(4); + $functions .= $this->getGlobalPerms(8); + $functions .= $this->getGlobalPerms(16); + + $content .= $this->pc->getPhpCodeClass($this->className, $functions, '\XoopsPersistableObjectHandler'); + $this->create($moduleDirname, 'class', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } /** - * @public function renderConstants - * @param null + * @public function renderConstantsInterface * - * @return bool|string + * @return string */ - public function renderConstants() + public function renderConstantsInterface() { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $module = $this->getModule(); $filename = $this->getFileName(); $tables = $this->getTables(); - $tablePermissions = []; - foreach (array_keys($tables) as $t) { - $tablePermissions[] = $tables[$t]->getVar('table_permissions'); - } - $moduleDirname = $module->getVar('mod_dirname'); - $namespace = $pc->getPhpCodeNamespace(['XoopsModules', $moduleDirname]); - $contentFile = $this->getHeaderFilesComments($module, null, $namespace); - $contentFile .= $pc->getPhpCodeDefined(); - $contentFile .= $pc->getPhpCodeCommentMultiLine(['Class ' => $this->className]); - $contentClass = $pc->getPhpCodeBlankLine(); - $contentClass .= $pc->getPhpCodeCommentLine('Constants for status', '', "\t"); - $contentClass .= $pc->getPhpCodeConstant("STATUS_NONE ", 0, "\t"); - $contentClass .= $pc->getPhpCodeConstant("STATUS_OFFLINE ", 1, "\t"); - $contentClass .= $pc->getPhpCodeConstant("STATUS_SUBMITTED", 2, "\t"); - $contentClass .= $pc->getPhpCodeConstant("STATUS_APPROVED ", 3, "\t"); - if (in_array(1, $tablePermissions)) { - $constPerm = $pc->getPhpCodeBlankLine(); - $constPerm .= $pc->getPhpCodeCommentLine('Constants for permissions', '', "\t"); - $constPerm .= $pc->getPhpCodeConstant("PERM_GLOBAL_NONE ", 0, "\t"); - $constPerm .= $pc->getPhpCodeConstant("PERM_GLOBAL_VIEW ", 1, "\t"); - $constPerm .= $pc->getPhpCodeConstant("PERM_GLOBAL_SUBMIT ", 2, "\t"); - $constPerm .= $pc->getPhpCodeConstant("PERM_GLOBAL_APPROVE", 3, "\t"); - $contentClass .= $constPerm; + $tablePermissions = []; + $tableRate = []; + $hasRadioOnoffline = false; + $hasSelectStatus = false; + foreach (\array_keys($tables) as $t) { + $tablePermissions[] = $tables[$t]->getVar('table_permissions'); + $tableRate[] = $tables[$t]->getVar('table_rate'); + $fields = $this->getTableFields($tables[$t]->getVar('table_mid'), $tables[$t]->getVar('table_id')); + foreach (\array_keys($fields) as $f) { + $fieldElement = $fields[$f]->getVar('field_element'); + switch ($fieldElement) { + case Constants::FIELD_ELE_RADIO_ONOFFLINE: + $hasRadioOnoffline = true; + break; + case Constants::FIELD_ELE_SELECTSTATUS: + $hasSelectStatus = true; + break; + } + } + } + $moduleDirname = $module->getVar('mod_dirname'); + $namespace = $this->pc->getPhpCodeNamespace(['XoopsModules', $moduleDirname]); + $contentFile = $this->getHeaderFilesComments($module, null, $namespace); + $contentFile .= $this->pc->getPhpCodeCommentMultiLine(['Interface ' => $this->className]); + + $contentClass = $this->pc->getPhpCodeBlankLine(); + $contentClass .= $this->pc->getPhpCodeCommentLine('Constants for tables', '', "\t"); + foreach (\array_keys($tables) as $t) { + $tablePermissions[] = $tables[$t]->getVar('table_permissions'); + $stuTableName = \mb_strtoupper($tables[$t]->getVar('table_name')); + $contentClass .= $this->pc->getPhpCodeConstant('TABLE_' . $stuTableName, $t, "\t", 'public const'); } - $contentClass .= $pc->getPhpCodeBlankLine(); - $contentFile .= $pc->getPhpCodeClass($this->className, $contentClass); - - $this->create($moduleDirname, 'class', $filename, $contentFile, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); - - return $this->renderFile(); - } - - public function renderConstantsTestInterface() - { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $module = $this->getModule(); - $filename = $this->getFileName(); - $tables = $this->getTables(); - $tablePermissions = []; - foreach (array_keys($tables) as $t) { - $tablePermissions[] = $tables[$t]->getVar('table_permissions'); + if ($hasSelectStatus) { + $contentClass .= $this->pc->getPhpCodeBlankLine(); + $contentClass .= $this->pc->getPhpCodeCommentLine('Constants for status', '', "\t"); + $contentClass .= $this->pc->getPhpCodeConstant('STATUS_NONE ', 0, "\t", 'public const'); + $contentClass .= $this->pc->getPhpCodeConstant('STATUS_OFFLINE ', 1, "\t", 'public const'); + $contentClass .= $this->pc->getPhpCodeConstant('STATUS_SUBMITTED', 2, "\t", 'public const'); + $contentClass .= $this->pc->getPhpCodeConstant('STATUS_APPROVED ', 3, "\t", 'public const'); + $contentClass .= $this->pc->getPhpCodeConstant('STATUS_BROKEN ', 4, "\t", 'public const'); } - $moduleDirname = $module->getVar('mod_dirname'); - $namespace = $pc->getPhpCodeNamespace(['XoopsModules', $moduleDirname]); - $contentFile = $this->getHeaderFilesComments($module, null, $namespace); - $contentFile .= $pc->getPhpCodeDefined(); - $contentFile .= $pc->getPhpCodeCommentMultiLine(['Interface ' => $this->className]); - $contentClass = ''; - if (in_array(1, $tablePermissions)) { - $constPerm = $pc->getPhpCodeBlankLine(); - $constPerm .= $pc->getPhpCodeCommentLine('Constants for permissions', '', "\t"); - $constPerm .= $pc->getPhpCodeConstant("PERM_GLOBAL_NONE ", 0, 'protected static',"\t"); - $constPerm .= $pc->getPhpCodeConstant("PERM_GLOBAL_VIEW ", 1, 'protected static',"\t"); - $constPerm .= $pc->getPhpCodeConstant("PERM_GLOBAL_SUBMIT ", 2, 'protected static',"\t"); - $constPerm .= $pc->getPhpCodeConstant("PERM_GLOBAL_APPROVE", 3, 'protected static',"\t"); + if ($hasRadioOnoffline) { + $contentClass .= $this->pc->getPhpCodeBlankLine(); + $contentClass .= $this->pc->getPhpCodeCommentLine('Constants for radio on-/offline', '', "\t"); + $contentClass .= $this->pc->getPhpCodeConstant('RADIO_OFFLINE', 0, "\t", 'public const'); + $contentClass .= $this->pc->getPhpCodeConstant('RADIO_ONLINE ', 1, "\t", 'public const'); + } + if (\in_array(1, $tablePermissions)) { + $constPerm = $this->pc->getPhpCodeBlankLine(); + $constPerm .= $this->pc->getPhpCodeCommentLine('Constants for permissions', '', "\t"); + $constPerm .= $this->pc->getPhpCodeConstant('PERM_GLOBAL_NONE ', 0, "\t", 'public const'); + $constPerm .= $this->pc->getPhpCodeConstant('PERM_GLOBAL_VIEW ', 1, "\t", 'public const'); + $constPerm .= $this->pc->getPhpCodeConstant('PERM_GLOBAL_SUBMIT ', 2, "\t", 'public const'); + $constPerm .= $this->pc->getPhpCodeConstant('PERM_GLOBAL_APPROVE', 3, "\t", 'public const'); $contentClass .= $constPerm; } - $contentClass .= $pc->getPhpCodeBlankLine(); - $func = $pc->getPhpCodeCommentLine('trigger a warning if invalid "constant" requested', '', "\t\t"); - $if = $pc->getPhpCodeTriggerError("\"Invalid Constant requested ('{\$val}')\"", 'E_USER_WARNING', "\t\t\t"); - $if .= $this->getSimpleString("return false;", "\t\t\t"); - $func .= $pc->getPhpCodeConditions('!isset($$val)', null, null, $if, false, "\t\t"); - $func .= $this->getSimpleString('return self::$$val;', "\t"); - $contentClass .= $pc->getPhpCodeFunction('getConstant', '$val', $func, 'final public static ', false, "\t"); + if (\in_array(1, $tableRate)) { + $constRate = $this->pc->getPhpCodeBlankLine(); + $constRate .= $this->pc->getPhpCodeCommentLine('Constants for rating', '', "\t"); + $constRate .= $this->pc->getPhpCodeConstant('RATING_NONE ', 0, "\t", 'public const'); + $constRate .= $this->pc->getPhpCodeConstant('RATING_5STARS ', 1, "\t", 'public const'); + $constRate .= $this->pc->getPhpCodeConstant('RATING_10STARS ', 2, "\t", 'public const'); + $constRate .= $this->pc->getPhpCodeConstant('RATING_LIKES ', 3, "\t", 'public const'); + $constRate .= $this->pc->getPhpCodeConstant('RATING_10NUM ', 4, "\t", 'public const'); + $contentClass .= $constRate; + } + $contentClass .= $this->pc->getPhpCodeBlankLine(); - $contentFile .= $pc->getPhpCodeInterface($this->className, $contentClass); + $contentFile .= $this->pc->getPhpCodeInterface($this->className, $contentClass); - $this->create($moduleDirname, 'class', $filename, $contentFile, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'class', $filename, $contentFile, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } - } diff --git a/class/Files/Classes/ClassXoopsCode.php b/class/Files/Classes/ClassXoopsCode.php index cdd05ffa..f6172c12 100644 --- a/class/Files/Classes/ClassXoopsCode.php +++ b/class/Files/Classes/ClassXoopsCode.php @@ -1,8 +1,8 @@ -initVar('{$paramLeft}', XOBJ_DTYPE_{$stuParamRight});\n"; + return "{$t}\${$var}->initVar('{$paramLeft}', \XOBJ_DTYPE_{$stuParamRight});\n"; } /** @@ -74,12 +71,12 @@ public function getClassInitVar($paramLeft = '', $paramRight = '', $var = 'this' * @param null $param3 * @param null $param4 * @param null $param5 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsPageNav($var, $param1, $param2 = null, $param3 = null, $param4 = null, $param5 = null, $isParam = false, $t = '') + public function getClassXoopsPageNav($var, $param1, $param2 = null, $param3 = null, $param4 = null, $param5 = null, bool $isParam = false, string $t = '') { $xPageNav = 'new \XoopsPageNav('; if (false === $isParam) { @@ -105,7 +102,7 @@ public function getClassXoopsPageNav($var, $param1, $param2 = null, $param3 = nu * * @return string */ - public function getXoopsSimpleForm($left = '', $element = '', $elementsContent = '', $caption = '', $var = '', $filename = '', $type = 'post', $t = '') + public function getXoopsSimpleForm(string $left = '', string $element = '', string $elementsContent = '', string $caption = '', string $var = '', string $filename = '', string $type = 'post', string $t = '') { $ret = "{$t}\${$left} = new \XoopsSimpleForm({$caption}, '{$var}', '{$filename}.php', '{$type}');\n"; if (!empty($elementsContent)) { @@ -125,12 +122,12 @@ public function getXoopsSimpleForm($left = '', $element = '', $elementsContent = * @param null $param2 * @param null $param3 * @param null $param4 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsThemeForm($var, $param1, $param2 = null, $param3 = null, $param4 = null, $isParam = false, $t = "\t\t") + public function getClassXoopsThemeForm($var, $param1, $param2 = null, $param3 = null, $param4 = null, bool $isParam = false, string $t = "\t\t") { $themeForm = 'new \XoopsThemeForm('; if (false === $isParam) { @@ -152,9 +149,9 @@ public function getClassXoopsThemeForm($var, $param1, $param2 = null, $param3 = * * @return string */ - public function getClassXoopsFormElementTray($var, $param1, $param2 = '', $t = "\t\t") + public function getClassXoopsFormElementTray($var, $param1, string $param2 = '', string $t = "\t\t") { - return "{$t}\${$var} = new \XoopsFormElementTray({$param1}, '{$param2}' );\n"; + return "{$t}\${$var} = new \XoopsFormElementTray({$param1}, '{$param2}');\n"; } /** @@ -162,16 +159,16 @@ public function getClassXoopsFormElementTray($var, $param1, $param2 = '', $t = " * * @param $var * @param string $param1 - * @param null $param2 + * @param null $param2 * @param bool $isParam * @param string $t * * @param bool $useParam * @return string */ - public function getClassXoopsFormLabel($var, $param1 = '', $param2 = null, $isParam = false, $t = "\t\t", $useParam = false) + public function getClassXoopsFormLabel($var, string $param1 = '', $param2 = null, bool $isParam = false, string $t = "\t\t", bool $useParam = false) { - $label = 'new \XoopsFormLabel('; + $label = 'new \XoopsFormLabel('; if (false === $useParam) { $params = null != $param2 ? "{$param1}, {$param2}" : $param1; } else { @@ -193,18 +190,18 @@ public function getClassXoopsFormLabel($var, $param1 = '', $param2 = null, $isPa * @param $param1 * @param $param2 * @param $param3 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormFile($var, $param1, $param2, $param3, $isParam = false, $t = "\t\t") + public function getClassXoopsFormFile($var, $param1, $param2, $param3, bool $isParam = false, string $t = "\t\t") { - $file = 'new \XoopsFormFile( '; + $file = 'new \XoopsFormFile('; if (false === $isParam) { - $ret = "{$t}\${$var} = {$file}{$param1}, '{$param2}', {$param3} );\n"; + $ret = "{$t}\${$var} = {$file}{$param1}, '{$param2}', {$param3});\n"; } else { - $ret = "{$file}{$param1}, '{$param2}', {$param3} )"; + $ret = "{$file}{$param1}, '{$param2}', {$param3})"; } return $ret; @@ -223,21 +220,21 @@ public function getClassXoopsFormFile($var, $param1, $param2, $param3, $isParam * @param bool $useParam * @return string */ - public function getClassXoopsFormHidden($var, $param1, $param2, $isForm = false, $isParam = false, $t = "\t\t", $useParam = false) + public function getClassXoopsFormHidden($var, $param1, $param2, bool $isForm = false, bool $isParam = false, string $t = "\t\t", bool $useParam = false) { - $hidden = 'new \XoopsFormHidden( '; - $getVarHidden = Tdmcreate\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param2, true); + $hidden = 'new \XoopsFormHidden('; + $getVarHidden = Modulebuilder\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param2, true); $ret = ''; if (false === $isParam) { - $ret .= "{$t}\${$var} = {$hidden}{$param1}, {$getVarHidden} );\n"; + $ret .= "{$t}\${$var} = {$hidden}{$param1}, {$getVarHidden});\n"; } else { if (false === $isForm) { - $ret .= "{$hidden}{$param1}, {$param2} )"; + $ret .= "{$hidden}{$param1}, {$param2})"; } else { if (false === $useParam) { - $ret .= "{$hidden}'{$param1}', '{$param2}' )"; + $ret .= "{$hidden}'{$param1}', '{$param2}')"; } else { - $ret .= "{$hidden}'{$param1}', \${$param2} )"; + $ret .= "{$hidden}'{$param1}', \${$param2})"; } } } @@ -251,21 +248,21 @@ public function getClassXoopsFormHidden($var, $param1, $param2, $isForm = false, * @param $var * @param $param1 * @param $param2 - * @param int $param3 - * @param int $param4 + * @param int $param3 + * @param int $param4 * @param $param5 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormText($var, $param1, $param2, $param3, $param4, $param5, $isParam = false, $t = "\t\t") + public function getClassXoopsFormText($var, $param1, $param2, int $param3, int $param4, $param5, bool $isParam = false, string $t = "\t\t") { - $text = 'new \XoopsFormText( '; + $text = 'new \XoopsFormText('; if (false === $isParam) { - $ret = "{$t}\${$var} = {$text}{$param1}, '{$param2}', {$param3}, {$param4}, \${$param5} );\n"; + $ret = "{$t}\${$var} = {$text}{$param1}, '{$param2}', {$param3}, {$param4}, \${$param5});\n"; } else { - $ret = "{$text}{$param1}, '{$param2}', {$param3}, {$param4}, \${$param5} )"; + $ret = "{$text}{$param1}, '{$param2}', {$param3}, {$param4}, \${$param5})"; } return $ret; @@ -279,19 +276,19 @@ public function getClassXoopsFormText($var, $param1, $param2, $param3, $param4, * @param $param2 * @param $param3 * @param $param4 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormTextArea($var, $param1, $param2, $param3, $param4, $isParam = false, $t = "\t\t") + public function getClassXoopsFormTextArea($var, $param1, $param2, $param3, $param4, bool $isParam = false, string $t = "\t\t") { - $area = 'new \XoopsFormTextArea( '; - $getVarTextArea = Tdmcreate\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param2, true); + $area = 'new \XoopsFormTextArea('; + $getVarTextArea = Modulebuilder\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param2, true, '', ", 'e'"); if (false === $isParam) { - $ret = "{$t}\${$var} = {$area}{$param1}, '{$param2}', {$getVarTextArea}, {$param3}, {$param4} );\n"; + $ret = "{$t}\${$var} = {$area}{$param1}, '{$param2}', {$getVarTextArea}, {$param3}, {$param4});\n"; } else { - $ret = "{$area}{$param1}, '{$param2}', {$getVarTextArea}, {$param3}, {$param4} )"; + $ret = "{$area}{$param1}, '{$param2}', {$getVarTextArea}, {$param3}, {$param4})"; } return $ret; @@ -304,18 +301,18 @@ public function getClassXoopsFormTextArea($var, $param1, $param2, $param3, $para * @param $param1 * @param $param2 * @param $param3 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormColorPicker($var, $param1, $param2, $param3, $isParam = false, $t = "\t\t") + public function getClassXoopsFormColorPicker($var, $param1, $param2, $param3, bool $isParam = false, string $t = "\t\t") { - $picker = 'new \XoopsFormColorPicker( '; + $picker = 'new \XoopsFormColorPicker('; if (false === $isParam) { - $ret = "{$t}\${$var} = {$picker}{$param1}, '{$param2}', {$param3} );\n"; + $ret = "{$t}\${$var} = {$picker}{$param1}, '{$param2}', {$param3});\n"; } else { - $ret = "{$picker}{$param1}, '{$param2}', {$param3} )"; + $ret = "{$picker}{$param1}, '{$param2}', {$param3})"; } return $ret; @@ -328,20 +325,20 @@ public function getClassXoopsFormColorPicker($var, $param1, $param2, $param3, $i * @param $param1 * @param $param2 * @param string $param3 - * @param $param4 - * @param bool $isParam + * @param $ccFieldName + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormSelectUser($var, $param1, $param2, $param3, $param4, $isParam = false, $t = "\t\t") + public function getClassXoopsFormSelectUser($var, $param1, $param2, string $param3, $ccFieldName, bool $isParam = false, string $t = "\t\t") { - $user = 'new \XoopsFormSelectUser( '; - $getVarSelectUser = Tdmcreate\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param4, true); + $user = 'new \XoopsFormSelectUser('; + //$getVarSelectUser = Modulebuilder\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param4, true); if (false === $isParam) { - $ret = "{$t}\${$var} = {$user}{$param1}, '{$param2}', {$param3}, {$getVarSelectUser} );\n"; + $ret = "{$t}\${$var} = {$user}{$param1}, '{$param2}', {$param3}, {$ccFieldName});\n"; } else { - $ret = "{$user}{$param1}, '{$param2}', {$param3}, {$getVarSelectUser} )"; + $ret = "{$user}{$param1}, '{$param2}', {$param3}, {$ccFieldName})"; } return $ret; @@ -355,19 +352,19 @@ public function getClassXoopsFormSelectUser($var, $param1, $param2, $param3, $pa * @param $param2 * @param string $param3 * @param $param4 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormTextDateSelect($var, $param1, $param2, $param3, $param4, $isParam = false, $t = "\t\t") + public function getClassXoopsFormTextDateSelect($var, $param1, $param2, string $param3, $param4, bool $isParam = false, string $t = "\t\t") { - $tdate = 'new \XoopsFormTextDateSelect( '; - $getVarTextDateSelect = Tdmcreate\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param3, true); + $tdate = 'new \XoopsFormTextDateSelect('; + $getVarTextDateSelect = Modulebuilder\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param3, true); if (false === $isParam) { - $ret = "{$t}\${$var} = {$tdate}{$param1}, '{$param2}', '', {$getVarTextDateSelect} );\n"; + $ret = "{$t}\${$var} = {$tdate}{$param1}, '{$param2}', '', {$getVarTextDateSelect});\n"; } else { - $ret = "{$tdate}{$param1}, '{$param2}', '', \${$param4} )"; + $ret = "{$tdate}{$param1}, '{$param2}', '', \${$param4})"; } return $ret; @@ -381,19 +378,19 @@ public function getClassXoopsFormTextDateSelect($var, $param1, $param2, $param3, * @param $param2 * @param string $param3 * @param $param4 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormDateTime($var, $param1, $param2, $param3, $param4, $isParam = false, $t = "\t\t") + public function getClassXoopsFormDateTime($var, $param1, $param2, string $param3, $param4, bool $isParam = false, string $t = "\t\t") { - $tdate = 'new \XoopsFormDateTime( '; - $getVarTextDateSelect = Tdmcreate\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param3, true); + $tdate = 'new \XoopsFormDateTime('; + $getVarTextDateSelect = Modulebuilder\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param3, true); if (false === $isParam) { - $ret = "{$t}\${$var} = {$tdate}{$param1}, '{$param2}', '', {$getVarTextDateSelect} );\n"; + $ret = "{$t}\${$var} = {$tdate}{$param1}, '{$param2}', '', {$getVarTextDateSelect});\n"; } else { - $ret = "{$tdate}{$param1}, '{$param2}', '', \${$param4} )"; + $ret = "{$tdate}{$param1}, '{$param2}', '', \${$param4})"; } return $ret; @@ -406,14 +403,14 @@ public function getClassXoopsFormDateTime($var, $param1, $param2, $param3, $para * @param $param1 * @param $param2 * @param $param3 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormEditor($var, $param1, $param2, $param3, $isParam = false, $t = "\t\t") + public function getClassXoopsFormEditor($var, $param1, $param2, $param3, bool $isParam = false, string $t = "\t\t") { - $editor = 'new \XoopsFormEditor( '; + $editor = 'new \XoopsFormEditor('; if (false === $isParam) { $ret = "{$t}\${$var} = {$editor}{$param1}, '{$param2}', \${$param3});\n"; } else { @@ -430,14 +427,14 @@ public function getClassXoopsFormEditor($var, $param1, $param2, $param3, $isPara * @param $param1 * @param $param2 * @param $param3 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormCheckBox($var, $param1, $param2, $param3, $isParam = false, $t = "\t\t") + public function getClassXoopsFormCheckBox($var, $param1, $param2, $param3, bool $isParam = false, string $t = "\t\t") { - $checkBox = 'new \XoopsFormCheckBox( '; + $checkBox = 'new \XoopsFormCheckBox('; if (false === $isParam) { $ret = "{$t}\${$var} = {$checkBox}{$param1}, '{$param2}', {$param3});\n"; } else { @@ -454,14 +451,14 @@ public function getClassXoopsFormCheckBox($var, $param1, $param2, $param3, $isPa * @param $param1 * @param $param2 * @param $param3 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormRadioYN($var, $param1, $param2, $param3, $isParam = false, $t = "\t\t") + public function getClassXoopsFormRadioYN($var, $param1, $param2, $param3, bool $isParam = false, string $t = "\t\t") { - $radioYN = 'new \XoopsFormRadioYN( '; + $radioYN = 'new \XoopsFormRadioYN('; if (false === $isParam) { $ret = "{$t}\${$var} = {$radioYN}{$param1}, '{$param2}', \${$param3});\n"; } else { @@ -478,14 +475,14 @@ public function getClassXoopsFormRadioYN($var, $param1, $param2, $param3, $isPar * @param $param1 * @param $param2 * @param $param3 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormRadio($var, $param1, $param2, $param3, $isParam = false, $t = "\t\t") + public function getClassXoopsFormRadio($var, $param1, $param2, $param3, bool $isParam = false, string $t = "\t\t") { - $radioYN = 'new \XoopsFormRadio( '; + $radioYN = 'new \XoopsFormRadio('; if (false === $isParam) { $ret = "{$t}\${$var} = {$radioYN}{$param1}, '{$param2}', \${$param3});\n"; } else { @@ -504,15 +501,15 @@ public function getClassXoopsFormRadio($var, $param1, $param2, $param3, $isParam * @param $param3 * @param null $param4 * @param null $param5 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormSelect($var, $param1, $param2, $param3, $param4 = null, $param5 = null, $isParam = false, $t = "\t\t") + public function getClassXoopsFormSelect($var, $param1, $param2, $param3, $param4 = null, $param5 = null, bool $isParam = false, string $t = "\t\t") { $otherParam = null != $param4 ? ", {$param4}" : (null != $param5 ? ", {$param5}" : ''); - $select = 'new \XoopsFormSelect( '; + $select = 'new \XoopsFormSelect('; if (false === $isParam) { $ret = "{$t}\${$var} = {$select}{$param1}, '{$param2}', \${$param3}{$otherParam});\n"; } else { @@ -530,19 +527,19 @@ public function getClassXoopsFormSelect($var, $param1, $param2, $param3, $param4 * @param $param2 * @param $param3 * @param $param4 - * @param int $param5 - * @param bool $isParam + * @param int $param5 + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormTag($var, $param1, $param2, $param3, $param4, $param5 = 0, $isParam = false, $t = "\t\t") + public function getClassXoopsFormTag($var, $param1, $param2, $param3, $param4, int $param5 = 0, bool $isParam = false, string $t = "\t\t") { - $tag = 'new \XoopsFormTag( '; + $tag = 'new \XoopsFormTag('; if (false === $isParam) { - $ret = "{$t}\${$var} = {$tag}'{$param1}', {$param2}, {$param3}, \${$param4}, {$param5} );\n"; + $ret = "{$t}\${$var} = {$tag}'{$param1}', {$param2}, {$param3}, \${$param4}, {$param5});\n"; } else { - $ret = "{$tag}'{$param1}', {$param2}, {$param3}, \${$param4}, {$param5} )"; + $ret = "{$tag}'{$param1}', {$param2}, {$param3}, \${$param4}, {$param5})"; } return $ret; @@ -556,14 +553,14 @@ public function getClassXoopsFormTag($var, $param1, $param2, $param3, $param4, $ * @param $param2 * @param $param3 * @param $param4 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormButton($var, $param1, $param2, $param3, $param4, $isParam = false, $t = "\t\t") + public function getClassXoopsFormButton($var, $param1, $param2, $param3, $param4, bool $isParam = false, string $t = "\t\t") { - $button = 'new \XoopsFormButton( '; + $button = 'new \XoopsFormButton('; if (false === $isParam) { $ret = "{$t}\${$var} = {$button}'{$param1}', '{$param2}', {$param3}, '{$param4}');\n"; } else { @@ -576,24 +573,24 @@ public function getClassXoopsFormButton($var, $param1, $param2, $param3, $param4 /** * @public function getClassXoopsFormPassword * - * @param $var - * @param $param1 - * @param $param2 + * @param string $var + * @param string $param1 + * @param string $param2 * @param string $param3 - * @param $param4 - * @param bool $isParam + * @param string $param4 + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormPassword($var, $param1, $param2, $param3, $param4, $isParam = false, $t = "\t\t") + public function getClassXoopsFormPassword(string $var, string $param1, string $param2, string $param3, string $param4, bool $isParam = false, string $t = "\t\t") { - $tpassword = 'new \XoopsFormPassword( '; - $getVarPassword = Tdmcreate\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param3, true); + $tpassword = 'new \XoopsFormPassword('; + $getVarPassword = Modulebuilder\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param3, true); if (false === $isParam) { - $ret = "{$t}\${$var} = {$tpassword}{$param1}, '{$param2}', '', {$getVarPassword} );\n"; + $ret = "{$t}\${$var} = {$tpassword}{$param1}, '{$param2}', '', {$getVarPassword});\n"; } else { - $ret = "{$tpassword}{$param1}, '{$param2}', {$param3}, {$param4} )"; + $ret = "{$tpassword}{$param1}, '{$param2}', {$param3}, {$param4})"; } return $ret; @@ -608,15 +605,15 @@ public function getClassXoopsFormPassword($var, $param1, $param2, $param3, $para * @param $param3 * @param null $param4 * @param null $param5 - * @param bool $isParam + * @param bool $isParam * @param string $t * * @return string */ - public function getClassXoopsFormSelectCountry($var, $param1, $param2, $param3, $param4 = null, $param5 = null, $isParam = false, $t = "\t\t") + public function getClassXoopsFormSelectCountry($var, $param1, $param2, $param3, $param4 = null, $param5 = null, bool $isParam = false, string $t = "\t\t") { $otherParam = null != $param4 ? ", {$param4}" : (null != $param5 ? ", {$param5}" : ''); - $select = 'new \XoopsFormSelectCountry( '; + $select = 'new \XoopsFormSelectCountry('; if (false === $isParam) { $ret = "{$t}\${$var} = {$select}{$param1}, '{$param2}', \${$param3}{$otherParam});\n"; } else { @@ -637,11 +634,9 @@ public function getClassXoopsFormSelectCountry($var, $param1, $param2, $param3, * * @return string */ - public function getClassXoopsObjectTree($var, $param1, $param2, $param3, $t = '') + public function getClassXoopsObjectTree(string $var, $param1, $param2, $param3, string $t = '') { - $ret = "{$t}\${$var} = new \XoopsObjectTree(\${$param1}, '{$param2}', '{$param3}');\n"; - - return $ret; + return "{$t}\${$var} = new \XoopsObjectTree(\${$param1}, '{$param2}', '{$param3}');\n"; } /** @@ -657,12 +652,10 @@ public function getClassXoopsObjectTree($var, $param1, $param2, $param3, $t = '' * * @return string */ - public function getClassXoopsMakeSelBox($var, $anchor, $param1, $param2, $param3, $param4, $t = '') + public function getClassXoopsMakeSelBox($var, $anchor, $param1, $param2, string $param3, $param4, string $t = '') { - $getVar = Tdmcreate\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param4, true); - $ret = "{$t}\${$var} = \${$anchor}->makeSelBox( '{$param1}', '{$param2}', '{$param3}', {$getVar}, true );\n"; - - return $ret; + $getVar = Modulebuilder\Files\CreateXoopsCode::getInstance()->getXcGetVar('', 'this', $param4, true); + return "{$t}\${$var} = \${$anchor}->makeSelBox('{$param1}', '{$param2}', '{$param3}', {$getVar}, true );\n"; } /** @@ -674,7 +667,7 @@ public function getClassXoopsMakeSelBox($var, $anchor, $param1, $param2, $param3 * * @return string */ - public function getClassAddOption($var, $params, $t = "\t\t") + public function getClassAddOption($var, $params, string $t = "\t\t") { return "{$t}\${$var}->addOption({$params});\n"; } @@ -688,7 +681,7 @@ public function getClassAddOption($var, $params, $t = "\t\t") * * @return string */ - public function getClassAddOptionArray($var, $params, $t = "\t\t") + public function getClassAddOptionArray($var, $params, string $t = "\t\t") { return "{$t}\${$var}->addOptionArray({$params});\n"; } @@ -702,7 +695,7 @@ public function getClassAddOptionArray($var, $params, $t = "\t\t") * * @return string */ - public function getClassAddElement($var = '', $params = '', $t = "\t\t") + public function getClassAddElement(string $var = '', string $params = '', string $t = "\t\t") { return "{$t}\${$var}->addElement({$params});\n"; } @@ -716,7 +709,7 @@ public function getClassAddElement($var = '', $params = '', $t = "\t\t") * * @return string */ - public function getClassSetDescription($var, $params, $t = "\t\t") + public function getClassSetDescription($var, $params, string $t = "\t\t") { return "{$t}\${$var}->setDescription({$params});\n"; } @@ -730,7 +723,7 @@ public function getClassSetDescription($var, $params, $t = "\t\t") * * @return string */ - public function getClassSetExtra($var, $params, $t = "\t\t") + public function getClassSetExtra($var, $params, string $t = "\t\t") { return "{$t}\${$var}->setExtra({$params});\n"; } diff --git a/class/Files/Classes/index.php b/class/Files/Classes/index.php new file mode 100644 index 00000000..e5ee0725 --- /dev/null +++ b/class/Files/Classes/index.php @@ -0,0 +1,2 @@ +xc = Modulebuilder\Files\CreateXoopsCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); } /** @@ -56,11 +66,11 @@ public static function getInstance() /** * @public function write - * @param string $module - * @param $tables + * @param $module + * @param $tables * @param string $filename */ - public function write($module, $tables, $filename) + public function write($module, $tables, string $filename): void { $this->setModule($module); $this->setTables($tables); @@ -73,73 +83,73 @@ public function write($module, $tables, $filename) */ private function getConfigCode() { - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); $tables = $this->getTables(); - $ret = $this->getSimpleString(''); - $ret .= $xc->getXcEqualsOperator('$moduleDirName ', 'basename(dirname(__DIR__))'); - $ret .= $xc->getXcEqualsOperator('$moduleDirNameUpper ', 'mb_strtoupper($moduleDirName)'); + $ret = $this->pc->getPhpCodeCommentMultiLine(['return' => 'object']); + $ret .= $this->getSimpleString(''); + $ret .= $this->xc->getXcEqualsOperator('$moduleDirName ', '\basename(\dirname(__DIR__))'); + $ret .= $this->xc->getXcEqualsOperator('$moduleDirNameUpper ', '\mb_strtoupper($moduleDirName)'); - $ret .= $this->getSimpleString('return (object)['); - $ret .= $this->getSimpleString("'name' => mb_strtoupper(\$moduleDirName) . ' Module Configurator',", "\t"); - $ret .= $this->getSimpleString("'paths' => [", "\t"); - $ret .= $this->getSimpleString("'dirname' => \$moduleDirName,", "\t\t"); - $ret .= $this->getSimpleString("'admin' => XOOPS_ROOT_PATH . '/modules/' . \$moduleDirName . '/admin',", "\t\t"); - $ret .= $this->getSimpleString("'modPath' => XOOPS_ROOT_PATH . '/modules/' . \$moduleDirName,", "\t\t"); - $ret .= $this->getSimpleString("'modUrl' => XOOPS_URL . '/modules/' . \$moduleDirName,", "\t\t"); - $ret .= $this->getSimpleString("'uploadPath' => XOOPS_UPLOAD_PATH . '/' . \$moduleDirName,", "\t\t"); - $ret .= $this->getSimpleString("'uploadUrl' => XOOPS_UPLOAD_URL . '/' . \$moduleDirName,", "\t\t"); - $ret .= $this->getSimpleString("],", "\t"); - $ret .= $this->getSimpleString("'uploadFolders' => [", "\t"); - $ret .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName,", "\t\t"); - foreach (array_keys($tables) as $t) { + $ret .= $this->getSimpleString('return (object)['); + $ret .= $this->getSimpleString("'name' => \mb_strtoupper(\$moduleDirName) . ' Module Configurator',", "\t"); + $ret .= $this->getSimpleString("'paths' => [", "\t"); + $ret .= $this->getSimpleString("'dirname' => \$moduleDirName,", "\t\t"); + $ret .= $this->getSimpleString("'admin' => \XOOPS_ROOT_PATH . '/modules/' . \$moduleDirName . '/admin',", "\t\t"); + $ret .= $this->getSimpleString("'modPath' => \XOOPS_ROOT_PATH . '/modules/' . \$moduleDirName,", "\t\t"); + $ret .= $this->getSimpleString("'modUrl' => \XOOPS_URL . '/modules/' . \$moduleDirName,", "\t\t"); + $ret .= $this->getSimpleString("'uploadPath' => \XOOPS_UPLOAD_PATH . '/' . \$moduleDirName,", "\t\t"); + $ret .= $this->getSimpleString("'uploadUrl' => \XOOPS_UPLOAD_URL . '/' . \$moduleDirName,", "\t\t"); + $ret .= $this->getSimpleString('],', "\t"); + $ret .= $this->getSimpleString("'uploadFolders' => [", "\t"); + $ret .= $this->getSimpleString("\XOOPS_UPLOAD_PATH . '/' . \$moduleDirName,", "\t\t"); + foreach (\array_keys($tables) as $t) { $tableName = $tables[$t]->getVar('table_name'); - $ret .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/{$tableName}',", "\t\t"); + $ret .= $this->getSimpleString("\XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/{$tableName}',", "\t\t"); } - $ret .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/images',", "\t\t"); - foreach (array_keys($tables) as $t) { + $ret .= $this->getSimpleString("\XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/images',", "\t\t"); + foreach (\array_keys($tables) as $t) { $tableName = $tables[$t]->getVar('table_name'); - $ret .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/images/{$tableName}',", "\t\t"); + $ret .= $this->getSimpleString("\XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/images/{$tableName}',", "\t\t"); } - $ret .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/files',", "\t\t"); - foreach (array_keys($tables) as $t) { + $ret .= $this->getSimpleString("\XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/files',", "\t\t"); + foreach (\array_keys($tables) as $t) { $tableName = $tables[$t]->getVar('table_name'); - $ret .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/files/{$tableName}',", "\t\t"); + $ret .= $this->getSimpleString("\XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/files/{$tableName}',", "\t\t"); } - $ret .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/temp',", "\t\t"); - $ret .= $this->getSimpleString("],", "\t"); - $ret .= $this->getSimpleString("'copyBlankFiles' => [", "\t"); - $ret .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/images',", "\t\t"); - foreach (array_keys($tables) as $t) { + $ret .= $this->getSimpleString("\XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/temp',", "\t\t"); + $ret .= $this->getSimpleString('],', "\t"); + $ret .= $this->getSimpleString("'copyBlankFiles' => [", "\t"); + $ret .= $this->getSimpleString("\XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/images',", "\t\t"); + foreach (\array_keys($tables) as $t) { $tableName = $tables[$t]->getVar('table_name'); - $ret .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/images/{$tableName}',", "\t\t"); + $ret .= $this->getSimpleString("\XOOPS_UPLOAD_PATH . '/' . \$moduleDirName . '/images/{$tableName}',", "\t\t"); } - $ret .= $this->getSimpleString("],", "\t"); - $ret .= $this->getSimpleString("'copyTestFolders' => [", "\t"); - $ret .= $this->getSimpleString("XOOPS_ROOT_PATH . '/modules/' . \$moduleDirName . '/testdata/uploads',", "\t\t"); - $ret .= $this->getSimpleString("XOOPS_UPLOAD_PATH . '/' . \$moduleDirName,", "\t\t"); - $ret .= $this->getSimpleString("],", "\t"); - $ret .= $this->getSimpleString("'templateFolders' => [", "\t"); - $ret .= $this->getSimpleString("'/templates/',", "\t\t"); - $ret .= $this->getSimpleString("],", "\t"); - $ret .= $this->getSimpleString("'oldFiles' => [", "\t"); - $ret .= $this->getSimpleString("],", "\t"); - $ret .= $this->getSimpleString("'oldFolders' => [", "\t"); - $ret .= $this->getSimpleString("],", "\t"); - $ret .= $this->getSimpleString("'renameTables' => [", "\t"); - $ret .= $this->getSimpleString("],", "\t"); - $ret .= $this->getSimpleString("'moduleStats' => [", "\t"); - $ret .= $this->getSimpleString("],", "\t"); - $ret .= $this->getSimpleString("'modCopyright' => \"
\n";
$ret .= "\tPlease! put your template code here\n";
@@ -114,10 +112,10 @@ private function getMoreFilesTpl()
}
/**
- * @private function getMoreFilesHtml
+ * @private function getMorefilesHtml
* @return string
*/
- private function getMoreFilesHtml()
+ private function getMorefilesHtml()
{
$ret = "
-As you can see, you have created a page with a list of links at the top to navigate between the pages of your module. This description is only visible on the homepage of this module, the other pages you will see the content you created when you built this module with the module TDMCreate, and after creating new content in admin of this module. In order to expand this module with other resources, just add the code you need to extend the functionality of the same. The files are grouped by type, from the header to the footer to see how divided the source code.
If you see this message, it is because you have not created content for this module. Once you have created any type of content, you will not see this message.
If you liked the module TDMCreate and thanks to the long process for giving the opportunity to the new module to be created in a moment, consider making a donation to keep the module TDMCreate and make a donation using this button
Thanks!
Use the link below to go to the admin and create content.", - true - ); - $ret .= $this->defines->getDefine($language, 'NO_PDF_LIBRARY', 'Libraries TCPDF not there yet, upload them in root/Frameworks'); - $ret .= $this->defines->getDefine($language, 'NO', 'No'); - $ret .= $this->defines->getAboveHeadDefines('Contents'); + $ret = $this->ld->getBlankLine(); + $ret .= $this->pc->getPhpCodeIncludeDir('__DIR__', 'admin', true); + $ret .= $this->ld->getBlankLine(); + $ret .= $this->ld->getAboveHeadDefines('Main'); + $ret .= $this->ld->getDefine($language, 'HOME', 'Home'); + $ret .= $this->ld->getDefine($language, 'INDEX', 'Overview ' . $module->getVar('mod_name')); + $ret .= $this->ld->getDefine($language, 'TITLE', (string)$module->getVar('mod_name')); + $ret .= $this->ld->getDefine($language, 'DESC', (string)$module->getVar('mod_description')); + $ret .= $this->ld->getDefine($language, 'NO_PDF_LIBRARY', 'Libraries TCPDF not there yet, upload them in root/Frameworks'); + $ret .= $this->ld->getDefine($language, 'NO', 'No'); + $ret .= $this->ld->getDefine($language, 'DETAILS', 'Show details'); + $ret .= $this->ld->getDefine($language, 'BROKEN', 'Notify broken'); + $ret .= $this->ld->getAboveHeadDefines('Contents'); $ucfTableName = ''; - $ucfTableSoleName = ''; - $stuTableSoleName = ''; - $tableSoleName = ''; - foreach (array_keys($tables) as $i) { - $tableName = $tables[$i]->getVar('table_name'); - $tableSoleName = $tables[$i]->getVar('table_solename'); - $stuTableName = mb_strtoupper($tableName); - $stuTableSoleName = mb_strtoupper($tableSoleName); - $ucfTableName = $utility::UcFirstAndToLower($tableName); - $ucfTableSoleName = $utility::UcFirstAndToLower($tableSoleName); - $ret .= $this->defines->getAboveDefines($ucfTableSoleName); - $ret .= $this->defines->getDefine($language, $stuTableSoleName, $ucfTableSoleName); - $ret .= $this->defines->getDefine($language, $stuTableName, $ucfTableName); - $ret .= $this->defines->getDefine($language, "{$stuTableName}_TITLE", "{$ucfTableName} title"); - $ret .= $this->defines->getDefine($language, "{$stuTableName}_DESC", "{$ucfTableName} description"); - $ret .= $this->defines->getAboveDefines("Caption of {$ucfTableSoleName}"); - $fields = $this->getTableFields($tables[$i]->getVar('table_mid'), $tables[$i]->getVar('table_id')); - foreach (array_keys($fields) as $f) { - $fieldName = $fields[$f]->getVar('field_name'); - $rpFieldName = $this->getRightString($fieldName); - $fieldNameDesc = ucfirst($rpFieldName); - $ret .= $this->defines->getDefine($language, $stuTableSoleName . '_' . $rpFieldName, $fieldNameDesc); + $tableSubmit = 0; + $tableBroken = 0; + $tableRate = 0; + $tablePrint = 0; + foreach (\array_keys($tables) as $i) { + if (1 == $tables[$i]->getVar('table_user')) { + $tableName = $tables[$i]->getVar('table_name'); + $tableSoleName = $tables[$i]->getVar('table_solename'); + if (1 === (int)$tables[$i]->getVar('table_submit')) { + $tableSubmit = 1; + } + if (1 === (int)$tables[$i]->getVar('table_broken')) { + $tableBroken = 1; + } + if (1 === (int)$tables[$i]->getVar('table_rate')) { + $tableRate = 1; + } + if (1 === (int)$tables[$i]->getVar('table_print')) { + $tablePrint = 1; + } + $stuTableName = \mb_strtoupper($tableName); + $stuTableSoleName = \mb_strtoupper($tableSoleName); + $ucfTableName = $utility::UcFirstAndToLower($tableName); + $ucfTableSoleName = $utility::UcFirstAndToLower($tableSoleName); + $ret .= $this->ld->getAboveDefines($ucfTableSoleName); + $ret .= $this->ld->getDefine($language, $stuTableSoleName, $ucfTableSoleName); + if (1 === $tableSubmit) { + $ret .= $this->ld->getDefine($language, "{$stuTableSoleName}_ADD", "Add {$ucfTableSoleName}"); + $ret .= $this->ld->getDefine($language, "{$stuTableSoleName}_EDIT", "Edit {$ucfTableSoleName}"); + $ret .= $this->ld->getDefine($language, "{$stuTableSoleName}_DELETE", "Delete {$ucfTableSoleName}"); + $ret .= $this->ld->getDefine($language, "{$stuTableSoleName}_CLONE", "Clone {$ucfTableSoleName}"); + } + $ret .= $this->ld->getDefine($language, "{$stuTableSoleName}_DETAILS", "Details {$ucfTableSoleName}"); + //$ret .= $this->ld->getDefine($language, $stuTableName, $ucfTableName); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_LIST", "List of {$ucfTableName}"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_TITLE", "{$ucfTableName} title"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_DESC", "{$ucfTableName} description"); + + $ret .= $this->ld->getAboveDefines("Caption of {$ucfTableSoleName}"); + $fields = $this->getTableFields($tables[$i]->getVar('table_mid'), $tables[$i]->getVar('table_id')); + foreach (\array_keys($fields) as $f) { + $fieldName = $fields[$f]->getVar('field_name'); + $rpFieldName = $this->getRightString($fieldName); + $fieldNameDesc = \ucfirst($rpFieldName); + $ret .= $this->ld->getDefine($language, $stuTableSoleName . '_' . $rpFieldName, $fieldNameDesc); + } + } + } + $ret .= $this->ld->getDefine($language, 'INDEX_THEREARE', "There are %s {$ucfTableName}"); + $ret .= $this->ld->getDefine($language, 'INDEX_LATEST_LIST', "Last {$module->getVar('mod_name')}"); + if (1 === $tableSubmit) { + $ret .= $this->ld->getAboveDefines('Submit'); + $ret .= $this->ld->getDefine($language, 'SUBMIT', 'Submit'); + $ret .= $this->ld->getDefine($language, 'SAVE', 'Save'); + $ret .= $this->ld->getAboveDefines('Form'); + $ret .= $this->ld->getDefine($language, 'FORM_OK', 'Successfully saved'); + $ret .= $this->ld->getDefine($language, 'FORM_DELETE_OK', 'Successfully deleted'); + $ret .= $this->ld->getDefine($language, 'FORM_SURE_DELETE', "Are you sure to delete: %s ", true); + $ret .= $this->ld->getDefine($language, 'FORM_SURE_RENEW', "Are you sure to update: %s ", true); + if (1 === $tableBroken) { + $ret .= $this->ld->getDefine($language, 'FORM_SURE_BROKEN', "Are you sure to notify as broken: %s ", true); } } - $ret .= $this->defines->getDefine($language, 'INDEX_THEREARE', "There are %s {$ucfTableName}"); - $ret .= $this->defines->getDefine($language, 'INDEX_LATEST_LIST', "Last {$module->getVar('mod_name')}"); - $ret .= $this->defines->getAboveDefines('Submit'); - $ret .= $this->defines->getDefine($language, 'SUBMIT', 'Submit'); - $ret .= $this->defines->getDefine($language, "SUBMIT_{$stuTableSoleName}", "Submit {$ucfTableSoleName}"); - $ret .= $this->defines->getDefine($language, 'SUBMIT_ALLPENDING', "All {$tableSoleName}/script information are posted pending verification."); - $ret .= $this->defines->getDefine($language, 'SUBMIT_DONTABUSE', 'Username and IP are recorded, so please do not abuse the system.'); - $ret .= $this->defines->getDefine($language, 'SUBMIT_ISAPPROVED', "Your {$tableSoleName} has been approved"); - $ret .= $this->defines->getDefine($language, 'SUBMIT_PROPOSER', "Submit a {$tableSoleName}"); - $ret .= $this->defines->getDefine($language, 'SUBMIT_RECEIVED', "We have received your {$tableSoleName} info. Thank you !"); - $ret .= $this->defines->getDefine($language, 'SUBMIT_SUBMITONCE', "Submit your {$tableSoleName}/script only once."); - $ret .= $this->defines->getDefine($language, 'SUBMIT_TAKEDAYS', "This will take many days to see your {$tableSoleName}/script added successfully in our database."); - $ret .= $this->defines->getAboveDefines('Form'); - $ret .= $this->defines->getDefine($language, 'FORM_OK', 'Successfully saved'); - $ret .= $this->defines->getDefine($language, 'FORM_DELETE_OK', 'Successfully deleted'); - $ret .= $this->defines->getDefine($language, 'FORM_SURE_DELETE', "Are you sure to delete: %s ", true); - $ret .= $this->defines->getDefine($language, 'FORM_SURE_RENEW', "Are you sure to update: %s ", true); + if (1 === $tableRate) { + $ret .= $this->ld->getAboveHeadDefines('Ratings'); + $ret .= $this->ld->getDefine($language, 'RATING_CURRENT_1', 'Rating: %c / %m (%t rating totally)'); + $ret .= $this->ld->getDefine($language, 'RATING_CURRENT_X', 'Rating: %c / %m (%t ratings totally)'); + $ret .= $this->ld->getDefine($language, 'RATING_CURRENT_SHORT_1', '%c (%t rating)'); + $ret .= $this->ld->getDefine($language, 'RATING_CURRENT_SHORT_X', '%c (%t ratings)'); + $ret .= $this->ld->getDefine($language, 'RATING1', '1 of 5'); + $ret .= $this->ld->getDefine($language, 'RATING2', '2 of 5'); + $ret .= $this->ld->getDefine($language, 'RATING3', '3 of 5'); + $ret .= $this->ld->getDefine($language, 'RATING4', '4 of 5'); + $ret .= $this->ld->getDefine($language, 'RATING5', '5 of 5'); + $ret .= $this->ld->getDefine($language, 'RATING_10_1', '1 of 10'); + $ret .= $this->ld->getDefine($language, 'RATING_10_2', '2 of 10'); + $ret .= $this->ld->getDefine($language, 'RATING_10_3', '3 of 10'); + $ret .= $this->ld->getDefine($language, 'RATING_10_4', '4 of 10'); + $ret .= $this->ld->getDefine($language, 'RATING_10_5', '5 of 10'); + $ret .= $this->ld->getDefine($language, 'RATING_10_6', '6 of 10'); + $ret .= $this->ld->getDefine($language, 'RATING_10_7', '7 of 10'); + $ret .= $this->ld->getDefine($language, 'RATING_10_8', '8 of 10'); + $ret .= $this->ld->getDefine($language, 'RATING_10_9', '9 of 10'); + $ret .= $this->ld->getDefine($language, 'RATING_10_10', '10 of 10'); + $ret .= $this->ld->getDefine($language, 'RATING_VOTE_BAD', 'Invalid vote'); + $ret .= $this->ld->getDefine($language, 'RATING_VOTE_ALREADY', 'You have already voted'); + $ret .= $this->ld->getDefine($language, 'RATING_VOTE_THANKS', 'Thank you for rating'); + $ret .= $this->ld->getDefine($language, 'RATING_NOPERM', "Sorry, you don't have permission to rate items", true); + $ret .= $this->ld->getDefine($language, 'RATING_LIKE', 'Like'); + $ret .= $this->ld->getDefine($language, 'RATING_DISLIKE', 'Dislike'); + $ret .= $this->ld->getDefine($language, 'RATING_ERROR1', 'Error: update base table failed!'); + } + if (1 === $tablePrint) { + $ret .= $this->ld->getAboveHeadDefines('Print'); + $ret .= $this->ld->getDefine($language, 'PRINT', 'Print'); + } + $ret .= $this->ld->getAboveDefines('Errors'); + $ret .= $this->ld->getDefine($language, 'INVALID_DATE', 'Invalid date'); + $ret .= $this->ld->getDefine($language, 'INVALID_PARAM', 'Invalid parameter'); + return $ret; } @@ -154,32 +213,32 @@ private function getLanguageMain($module, $language) * * @return string */ - private function getLanguageMainFooter($language) + private function getLanguageMainFooter(string $language) { - $ret = $this->defines->getAboveDefines('Admin link'); - $ret .= $this->defines->getDefine($language, 'ADMIN', 'Admin'); - $ret .= $this->defines->getBelowDefines('End'); - $ret .= $this->defines->getBlankLine(); + $ret = $this->ld->getAboveDefines('Admin link'); + $ret .= $this->ld->getDefine($language, 'ADMIN', 'Admin'); + $ret .= $this->ld->getBelowDefines('End'); + $ret .= $this->ld->getBlankLine(); return $ret; } /** * @public function render - * @param null - * @return bool|string + * + * @return string */ public function render() { $module = $this->getModule(); $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); - $language = $this->getLanguage($moduleDirname, 'MA'); + $language = $this->getLanguage($moduleDirname, 'MA', '', false); $content = $this->getHeaderFilesComments($module); $content .= $this->getLanguageMain($module, $language); $content .= $this->getLanguageMainFooter($language); - $this->create($moduleDirname, 'language/' . $GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'language/' . $GLOBALS['xoopsConfig']['language'], $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/Language/LanguageModinfo.php b/class/Files/Language/LanguageModinfo.php index f03725de..2ba32095 100644 --- a/class/Files/Language/LanguageModinfo.php +++ b/class/Files/Language/LanguageModinfo.php @@ -1,9 +1,9 @@ -ld = LanguageDefines::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); } /** * @static function getInstance - * @param null + * * @return LanguageModinfo */ public static function getInstance() @@ -83,14 +93,12 @@ public function write($module, $table, $filename) */ private function getLanguageMain($language, $module) { - $df = LanguageDefines::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $ret = $df->getBlankLine(); - $ret .= $pc->getPhpCodeIncludeDir("'common.php'",'', true, true, 'include'); - $ret .= $df->getBlankLine(); - $ret .= $df->getAboveHeadDefines('Admin Main'); - $ret .= $df->getDefine($language, 'NAME', (string)$module->getVar('mod_name')); - $ret .= $df->getDefine($language, 'DESC', (string)$module->getVar('mod_description')); + $ret = $this->ld->getBlankLine(); + $ret .= $this->pc->getPhpCodeIncludeDir('__DIR__', 'common', true); + $ret .= $this->ld->getBlankLine(); + $ret .= $this->ld->getAboveHeadDefines('Admin Main'); + $ret .= $this->ld->getDefine($language, 'NAME', (string)$module->getVar('mod_name')); + $ret .= $this->ld->getDefine($language, 'DESC', (string)$module->getVar('mod_description')); return $ret; } @@ -105,25 +113,32 @@ private function getLanguageMain($language, $module) */ private function getLanguageMenu($module, $language) { - $df = Tdmcreate\Files\Language\LanguageDefines::getInstance(); $tables = $this->getTableTables($module->getVar('mod_id'), 'table_order'); $menu = 1; - $ret = $df->getAboveHeadDefines('Admin Menu'); - $ret .= $df->getDefine($language, "ADMENU{$menu}", 'Dashboard'); + $ret = $this->ld->getAboveHeadDefines('Admin Menu'); + $ret .= $this->ld->getDefine($language, "ADMENU{$menu}", 'Dashboard'); $tablePermissions = []; - foreach (array_keys($tables) as $i) { + $tableBroken = []; + foreach (\array_keys($tables) as $i) { ++$menu; $tablePermissions[] = $tables[$i]->getVar('table_permissions'); - $ucfTableName = ucfirst($tables[$i]->getVar('table_name')); - $ret .= $df->getDefine($language, "ADMENU{$menu}", $ucfTableName); + $tableBroken[] = $tables[$i]->getVar('table_broken'); + $ucfTableName = \ucfirst($tables[$i]->getVar('table_name')); + $ret .= $this->ld->getDefine($language, "ADMENU{$menu}", $ucfTableName); } - if (in_array(1, $tablePermissions)) { + if (\in_array(1, $tableBroken)) { ++$menu; - $ret .= $df->getDefine($language, "ADMENU{$menu}", 'Permissions'); + $ret .= $this->ld->getDefine($language, "ADMENU{$menu}", 'Broken items'); + } + if (\in_array(1, $tablePermissions)) { + ++$menu; + $ret .= $this->ld->getDefine($language, "ADMENU{$menu}", 'Permissions'); } ++$menu; - $ret .= $df->getDefine($language, "ADMENU{$menu}", 'Feedback'); - $ret .= $df->getDefine($language, 'ABOUT', 'About'); + $ret .= $this->ld->getDefine($language, "ADMENU{$menu}", 'Clone'); + ++$menu; + $ret .= $this->ld->getDefine($language, "ADMENU{$menu}", 'Feedback'); + $ret .= $this->ld->getDefine($language, 'ABOUT', 'About'); unset($menu, $tablePermissions); return $ret; @@ -137,10 +152,9 @@ private function getLanguageMenu($module, $language) */ private function getLanguageAdmin($language) { - $df = LanguageDefines::getInstance(); - $ret = $df->getAboveHeadDefines('Admin Nav'); - $ret .= $df->getDefine($language, 'ADMIN_PAGER', 'Admin pager'); - $ret .= $df->getDefine($language, 'ADMIN_PAGER_DESC', 'Admin per page list'); + $ret = $this->ld->getAboveHeadDefines('Admin Nav'); + $ret .= $this->ld->getDefine($language, 'ADMIN_PAGER', 'Admin pager'); + $ret .= $this->ld->getDefine($language, 'ADMIN_PAGER_DESC', 'Admin per page list'); return $ret; } @@ -152,30 +166,29 @@ private function getLanguageAdmin($language) * * @return string */ - private function getLanguageSubmenu($language, $tables) + private function getLanguageSubmenu($language, array $tables) { - $df = LanguageDefines::getInstance(); - $ret = $df->getAboveDefines('Submenu'); - $ret .= $df->getDefine($language, 'SMNAME1', 'Index page'); - $i = 1; + $ret = $this->ld->getAboveDefines('Submenu'); + $ret .= $this->ld->getDefine($language, 'SMNAME1', 'Index page'); + $i = 2; $tableSubmit = []; $tableSearch = []; - foreach (array_keys($tables) as $t) { + foreach (\array_keys($tables) as $t) { $tableName = $tables[$t]->getVar('table_name'); - $tableSubmit[] = $tables[$t]->getVar('table_submit'); $tableSearch[] = $tables[$t]->getVar('table_search'); - $desc = ucfirst(mb_strtolower($tableName)); + $ucfTablename = \ucfirst(\mb_strtolower($tableName)); if (1 == $tables[$t]->getVar('table_submenu')) { - $ret .= $df->getDefine($language, "SMNAME{$i}", $desc); + $ret .= $this->ld->getDefine($language, "SMNAME{$i}", $ucfTablename); } ++$i; + if (1 == $tables[$t]->getVar('table_submit')) { + $ret .= $this->ld->getDefine($language, "SMNAME{$i}", 'Submit ' . $ucfTablename); + ++$i; + } } - if (in_array(1, $tableSubmit)) { - $ret .= $df->getDefine($language, "SMNAME{$i}", 'Submit'); - ++$i; - } - if (in_array(1, $tableSearch)) { - $ret .= $df->getDefine($language, "SMNAME{$i}", 'Search'); + + if (\in_array(1, $tableSearch)) { + $ret .= $this->ld->getDefine($language, "SMNAME{$i}", 'Search'); } unset($i, $tableSubmit); @@ -189,36 +202,38 @@ private function getLanguageSubmenu($language, $tables) * * @return string */ - private function getLanguageBlocks($tables, $language) + private function getLanguageBlocks(array $tables, $language) { - $df = LanguageDefines::getInstance(); - $ret = $df->getAboveDefines('Blocks'); - foreach (array_keys($tables) as $i) { - $tableName = $tables[$i]->getVar('table_name'); - $stuTableName = mb_strtoupper($tableName); - $tableSoleName = $tables[$i]->getVar('table_solename'); - $stuTableSoleName = mb_strtoupper($tableSoleName); - $ucfTableName = ucfirst($tableName); - $ucfTableSoleName = ucfirst($stuTableSoleName); - - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK", "{$ucfTableName} block"); - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_DESC", "{$ucfTableName} block description"); - if (1 == $tables[$i]->getVar('table_category')) { - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_{$stuTableSoleName}", "{$ucfTableName} block {$ucfTableSoleName}"); - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_{$stuTableSoleName}_DESC", "{$ucfTableName} block {$ucfTableSoleName} description"); - } else { - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_{$stuTableSoleName}", "{$ucfTableName} block {$ucfTableSoleName}"); - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_{$stuTableSoleName}_DESC", "{$ucfTableName} block {$ucfTableSoleName} description"); - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_LAST", "{$ucfTableName} block last"); - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_LAST_DESC", "{$ucfTableName} block last description"); - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_NEW", "{$ucfTableName} block new"); - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_NEW_DESC", "{$ucfTableName} block new description"); - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_HITS", "{$ucfTableName} block hits"); - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_HITS_DESC", "{$ucfTableName} block hits description"); - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_TOP", "{$ucfTableName} block top"); - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_TOP_DESC", "{$ucfTableName} block top description"); - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_RANDOM", "{$ucfTableName} block random"); - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_RANDOM_DESC", "{$ucfTableName} block random description"); + $ret = $this->ld->getAboveDefines('Blocks'); + foreach (\array_keys($tables) as $i) { + if (1 == $tables[$i]->getVar('table_blocks')) { + $tableName = $tables[$i]->getVar('table_name'); + $stuTableName = \mb_strtoupper($tableName); + $tableSoleName = $tables[$i]->getVar('table_solename'); + $stuTableSoleName = \mb_strtoupper($tableSoleName); + $ucfTableName = \ucfirst($tableName); + $ucfTableSoleName = \ucfirst($stuTableSoleName); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK", "{$ucfTableName} block"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_DESC", "{$ucfTableName} block description"); + if (1 == $tables[$i]->getVar('table_category')) { + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_{$stuTableSoleName}", "{$ucfTableName} block {$ucfTableSoleName}"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_{$stuTableSoleName}_DESC", "{$ucfTableName} block {$ucfTableSoleName} description"); + } else { + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_{$stuTableSoleName}", "{$ucfTableName} block {$ucfTableSoleName}"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_{$stuTableSoleName}_DESC", "{$ucfTableName} block {$ucfTableSoleName} description"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_LAST", "{$ucfTableName} block last"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_LAST_DESC", "{$ucfTableName} block last description"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_NEW", "{$ucfTableName} block new"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_NEW_DESC", "{$ucfTableName} block new description"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_HITS", "{$ucfTableName} block hits"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_HITS_DESC", "{$ucfTableName} block hits description"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_TOP", "{$ucfTableName} block top"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_TOP_DESC", "{$ucfTableName} block top description"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_RANDOM", "{$ucfTableName} block random"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_RANDOM_DESC", "{$ucfTableName} block random description"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_SPOTLIGHT", "{$ucfTableName} block spotlight"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_SPOTLIGHT_DESC", "{$ucfTableName} block spotlight description"); + } } } @@ -233,10 +248,9 @@ private function getLanguageBlocks($tables, $language) */ private function getLanguageUser($language) { - $df = LanguageDefines::getInstance(); - $ret = $df->getAboveDefines('User'); - $ret .= $df->getDefine($language, 'USER_PAGER', 'User pager'); - $ret .= $df->getDefine($language, 'USER_PAGER_DESC', 'User per page list'); + $ret = $this->ld->getAboveDefines('User'); + $ret .= $this->ld->getDefine($language, 'USER_PAGER', 'User pager'); + $ret .= $this->ld->getDefine($language, 'USER_PAGER_DESC', 'User per page list'); return $ret; } @@ -250,177 +264,193 @@ private function getLanguageUser($language) */ private function getLanguageConfig($language, $tables) { - $df = LanguageDefines::getInstance(); - $ret = $df->getAboveDefines('Config'); - $fieldImage = false; - $fieldFile = false; - $useTag = false; + $ret = $this->ld->getAboveDefines('Config'); + $fieldImage = false; + $fieldFile = false; + $useTag = false; + $fieldEditor = false; // $usePermissions = false; - foreach (array_keys($tables) as $i) { + foreach (\array_keys($tables) as $i) { $fields = $this->getTableFields($tables[$i]->getVar('table_mid'), $tables[$i]->getVar('table_id')); - foreach (array_keys($fields) as $f) { + foreach (\array_keys($fields) as $f) { $fieldElement = $fields[$f]->getVar('field_element'); + if (3 == $fieldElement) { + $fieldEditor = true; + } if (4 == $fieldElement) { - $fieldName = $fields[$f]->getVar('field_name'); - $rpFieldName = $this->getRightString($fieldName); - $ucfFieldName = ucfirst($rpFieldName); - $stuFieldName = mb_strtoupper($rpFieldName); - $ret .= $df->getDefine($language, 'EDITOR_' . $stuFieldName, 'Editor'); - $ret .= $df->getDefine($language, 'EDITOR_' . $stuFieldName . '_DESC', 'Select the Editor ' . $ucfFieldName . ' to use'); + $fieldEditor = true; + } + if (10 == $fieldElement) { + $fieldImage = true; } if (13 == $fieldElement) { $fieldImage = true; } - if (14 == $fieldElement) { + if (14 == $fieldElement) { $fieldFile = true; } } if (0 != $tables[$i]->getVar('table_tag')) { $useTag = true; } - // if (0 != $tables[$i]->getVar('table_permissions')) {$usePermissions = true;} } - $ret .= $df->getDefine($language, 'KEYWORDS', 'Keywords'); - $ret .= $df->getDefine($language, 'KEYWORDS_DESC', 'Insert here the keywords (separate by comma)'); - /*if (usePermissions) { - $ret .= $df->getDefine($language, "GROUPS", "Groups"); - $ret .= $df->getDefine($language, "GROUPS_DESC", "Groups to have permissions"); - $ret .= $df->getDefine($language, "ADMIN_GROUPS", "Admin Groups"); - $ret .= $df->getDefine($language, "ADMIN_GROUPS_DESC", "Admin Groups to have permissions access"); - }*/ + $ret .= $this->ld->getDefine($language, 'MDESC', 'Meta module description'); + $ret .= $this->ld->getDefine($language, 'MDESC_DESC', 'Insert here module description which should be shown in meta data description'); + $ret .= $this->ld->getDefine($language, 'KEYWORDS', 'Meta keywords'); + $ret .= $this->ld->getDefine($language, 'KEYWORDS_DESC', 'Insert here the keywords (separate by comma) which should be shown in meta data'); + + if ($fieldEditor) { + $ret .= $this->ld->getDefine($language, 'EDITOR_ADMIN', 'Editor admin'); + $ret .= $this->ld->getDefine($language, 'EDITOR_ADMIN_DESC', 'Select the editor which should be used in admin area for text area fields'); + $ret .= $this->ld->getDefine($language, 'EDITOR_USER', 'Editor user'); + $ret .= $this->ld->getDefine($language, 'EDITOR_USER_DESC', 'Select the editor which should be used in user area for text area fields'); + $ret .= $this->ld->getDefine($language, 'EDITOR_MAXCHAR', 'Text max characters'); + $ret .= $this->ld->getDefine($language, 'EDITOR_MAXCHAR_DESC', 'Max characters for showing text of a textarea or editor field as short version'); + } if ($fieldImage || $fieldFile) { - $ret .= $df->getDefine($language, 'SIZE_MB', 'MB'); + $ret .= $this->ld->getDefine($language, 'SIZE_MB', 'MB'); } if ($fieldImage) { - $ret .= $df->getDefine($language, 'MAXSIZE_IMAGE', 'Max size image'); - $ret .= $df->getDefine($language, 'MAXSIZE_IMAGE_DESC', 'Define the max size for uploading images'); - $ret .= $df->getDefine($language, 'MIMETYPES_IMAGE', 'Mime types image'); - $ret .= $df->getDefine($language, 'MIMETYPES_IMAGE_DESC', 'Define the allowed mime types for uploading images'); - $ret .= $df->getDefine($language, 'MAXWIDTH_IMAGE', 'Max width image'); - $ret .= $df->getDefine($language, 'MAXWIDTH_IMAGE_DESC', 'Set the max width which is allowed for uploading images (in pixel)
0 means that images keep original size
If original image is smaller the image will be not enlarged'); - $ret .= $df->getDefine($language, 'MAXHEIGHT_IMAGE', 'Max height image'); - $ret .= $df->getDefine($language, 'MAXHEIGHT_IMAGE_DESC', 'Set the max height which is allowed for uploading images (in pixel)
0 means that images keep original size
If original image is smaller the image will be not enlarged'); - //MB define + $ret .= $this->ld->getDefine($language, 'MAXSIZE_IMAGE', 'Max size image'); + $ret .= $this->ld->getDefine($language, 'MAXSIZE_IMAGE_DESC', 'Define the max size for uploading images'); + $ret .= $this->ld->getDefine($language, 'MIMETYPES_IMAGE', 'Mime types image'); + $ret .= $this->ld->getDefine($language, 'MIMETYPES_IMAGE_DESC', 'Define the allowed mime types for uploading images'); + $ret .= $this->ld->getDefine($language, 'MAXWIDTH_IMAGE', 'Max width image'); + $ret .= $this->ld->getDefine($language, 'MAXWIDTH_IMAGE_DESC', 'Set the max width to which uploaded images should be scaled (in pixel)
0 means, that images keeps the original size.
If an image is smaller than maximum value then the image will be not enlarge, it will be save in original width.'); + $ret .= $this->ld->getDefine($language, 'MAXHEIGHT_IMAGE', 'Max height image'); + $ret .= $this->ld->getDefine($language, 'MAXHEIGHT_IMAGE_DESC', 'Set the max height to which uploaded images should be scaled (in pixel)
0 means, that images keeps the original size.
If an image is smaller than maximum value then the image will be not enlarge, it will be save in original height'); } - if ($fieldFile) { - $ret .= $df->getDefine($language, 'MAXSIZE_FILE', 'Max size file'); - $ret .= $df->getDefine($language, 'MAXSIZE_FILE_DESC', 'Define the max size for uploading files'); - $ret .= $df->getDefine($language, 'MIMETYPES_FILE', 'Mime types file'); - $ret .= $df->getDefine($language, 'MIMETYPES_FILE_DESC', 'Define the allowed mime types for uploading files'); + if ($fieldFile) { + $ret .= $this->ld->getDefine($language, 'MAXSIZE_FILE', 'Max size file'); + $ret .= $this->ld->getDefine($language, 'MAXSIZE_FILE_DESC', 'Define the max size for uploading files'); + $ret .= $this->ld->getDefine($language, 'MIMETYPES_FILE', 'Mime types file'); + $ret .= $this->ld->getDefine($language, 'MIMETYPES_FILE_DESC', 'Define the allowed mime types for uploading files'); } if ($useTag) { - $ret .= $df->getDefine($language, 'USE_TAG', 'Use TAG'); - $ret .= $df->getDefine($language, 'USE_TAG_DESC', 'If you use tag module, check this option to yes'); + $ret .= $this->ld->getDefine($language, 'USE_TAG', 'Use TAG'); + $ret .= $this->ld->getDefine($language, 'USE_TAG_DESC', 'If you use tag module, check this option to yes'); } $getDefinesConf = [ - 'NUMB_COL' => 'Number Columns', - 'NUMB_COL_DESC' => 'Number Columns to View.', - 'DIVIDEBY' => 'Divide By', - 'DIVIDEBY_DESC' => 'Divide by columns number.', - 'TABLE_TYPE' => 'Table Type', - 'TABLE_TYPE_DESC' => 'Table Type is the bootstrap html table.', - 'PANEL_TYPE' => 'Panel Type', - 'PANEL_TYPE_DESC' => 'Panel Type is the bootstrap html div.', - 'IDPAYPAL' => 'Paypal ID', - 'IDPAYPAL_DESC' => 'Insert here your PayPal ID for donactions.', - 'ADVERTISE' => 'Advertisement Code', - 'ADVERTISE_DESC' => 'Insert here the advertisement code', - 'MAINTAINEDBY' => 'Maintained By', - 'MAINTAINEDBY_DESC' => 'Allow url of support site or community', - 'BOOKMARKS' => 'Social Bookmarks', - 'BOOKMARKS_DESC' => 'Show Social Bookmarks in the single page', - 'FACEBOOK_COMMENTS' => 'Facebook comments', - 'FACEBOOK_COMMENTS_DESC' => 'Allow Facebook comments in the single page', - 'DISQUS_COMMENTS' => 'Disqus comments', - 'DISQUS_COMMENTS_DESC' => 'Allow Disqus comments in the single page', + 'NUMB_COL' => 'Number Columns', + 'NUMB_COL_DESC' => 'Number Columns to View', + 'DIVIDEBY' => 'Divide By', + 'DIVIDEBY_DESC' => 'Divide by columns number', + 'TABLE_TYPE' => 'Table Type', + 'TABLE_TYPE_DESC' => 'Table Type is the bootstrap html table', + 'PANEL_TYPE' => 'Panel Type', + 'PANEL_TYPE_DESC' => 'Panel Type is the bootstrap html div', + 'IDPAYPAL' => 'Paypal ID', + 'IDPAYPAL_DESC' => 'Insert here your PayPal ID for donations', + 'SHOW_BREADCRUMBS' => 'Show breadcrumb navigation', + 'SHOW_BREADCRUMBS_DESC' => 'Show breadcrumb navigation which displays the current page in context within the site structure', + 'ADVERTISE' => 'Advertisement Code', + 'ADVERTISE_DESC' => 'Insert here the advertisement code', + 'MAINTAINEDBY' => 'Maintained By', + 'MAINTAINEDBY_DESC' => 'Allow url of support site or community', + 'BOOKMARKS' => 'Social Bookmarks', + 'BOOKMARKS_DESC' => 'Show Social Bookmarks in the single page', + //'FACEBOOK_COMMENTS' => 'Facebook comments', + //'FACEBOOK_COMMENTS_DESC' => 'Allow Facebook comments in the single page', + //'DISQUS_COMMENTS' => 'Disqus comments', + //'DISQUS_COMMENTS_DESC' => 'Allow Disqus comments in the single page', ]; foreach ($getDefinesConf as $defc => $descc) { - $ret .= $df->getDefine($language, $defc, $descc); + $ret .= $this->ld->getDefine($language, $defc, $descc); + } + + return $ret; + } + + /** + * @private function getLanguageNotificationsGlobal + * @param $language + * @param $tableBroken + * @param $tableComment + * @return string + */ + private function getLanguageNotificationsGlobal($language, $tableBroken, $tableComment) + { + $ret = $this->ld->getAboveDefines('Global notifications'); + $getDefinesNotif = [ + 'NOTIFY_GLOBAL' => 'Global notification', + 'NOTIFY_GLOBAL_NEW' => 'Any new item', + 'NOTIFY_GLOBAL_NEW_CAPTION' => 'Notify me about any new item', + 'NOTIFY_GLOBAL_NEW_SUBJECT' => 'Notification about new item', + 'NOTIFY_GLOBAL_MODIFY' => 'Any modified item', + 'NOTIFY_GLOBAL_MODIFY_CAPTION' => 'Notify me about any item modification', + 'NOTIFY_GLOBAL_MODIFY_SUBJECT' => 'Notification about modification', + 'NOTIFY_GLOBAL_DELETE' => 'Any deleted item', + 'NOTIFY_GLOBAL_DELETE_CAPTION' => 'Notify me about any deleted item', + 'NOTIFY_GLOBAL_DELETE_SUBJECT' => 'Notification about deleted item', + 'NOTIFY_GLOBAL_APPROVE' => 'Any item to approve', + 'NOTIFY_GLOBAL_APPROVE_CAPTION' => 'Notify me about any item waiting for approvement', + 'NOTIFY_GLOBAL_APPROVE_SUBJECT' => 'Notification about item waiting for approvement', + //'CATEGORY_NOTIFY' => 'Category notification', + //'CATEGORY_NOTIFY_DESC' => 'Category notification desc', + //'CATEGORY_NOTIFY_CAPTION' => 'Category notification caption', + //'CATEGORY_NOTIFY_SUBJECT' => 'Category notification Subject', + //'CATEGORY_SUBMIT_NOTIFY' => 'Category submit notification', + //'CATEGORY_SUBMIT_NOTIFY_CAPTION' => 'Category submit notification caption', + //'CATEGORY_SUBMIT_NOTIFY_DESC' => 'Category submit notification desc', + //'CATEGORY_SUBMIT_NOTIFY_SUBJECT' => 'Category submit notification subject', + ]; + if ($tableBroken) { + $getDefinesNotif['NOTIFY_GLOBAL_BROKEN'] = 'Any broken item'; + $getDefinesNotif['NOTIFY_GLOBAL_BROKEN_CAPTION'] = 'Notify me about any broken item'; + $getDefinesNotif['NOTIFY_GLOBAL_BROKEN_SUBJECT'] = 'Notification about broken item'; + } + if ($tableComment) { + $getDefinesNotif['NOTIFY_GLOBAL_COMMENT'] = 'Any comments'; + $getDefinesNotif['NOTIFY_GLOBAL_COMMENT_CAPTION'] = 'Notify me about any comment'; + $getDefinesNotif['NOTIFY_GLOBAL_COMMENT_SUBJECT'] = 'Notification about any comment'; + } + foreach ($getDefinesNotif as $defn => $descn) { + $ret .= $this->ld->getDefine($language, $defn, $descn); } return $ret; } /** - * @private function getLanguageNotifications + * @private function getLanguageNotificationsTable * @param $language + * @param $tableName * @param mixed $tableSoleName * + * @param $tableBroken + * @param $tableComment * @return string */ - private function getLanguageNotifications($language, $tableSoleName) + private function getLanguageNotificationsTable($language, $tableName, $tableSoleName, $tableBroken, $tableComment) { - $df = LanguageDefines::getInstance(); - $ret = $df->getAboveDefines('Notifications'); - $stuTableSoleName = mb_strtoupper($tableSoleName); - $ucfTableSoleName = ucfirst($tableSoleName); + $stuTableSoleName = \mb_strtoupper($tableSoleName); + $ucfTableSoleName = \ucfirst($tableSoleName); + $ret = $this->ld->getAboveDefines($ucfTableSoleName . ' notifications'); $getDefinesNotif = [ - 'GLOBAL_NOTIFY' => 'Global notify', - 'GLOBAL_NOTIFY_DESC' => 'Global notify desc', - 'GLOBAL_MODIFY_NOTIFY' => 'Global modify notify', - 'GLOBAL_MODIFY_NOTIFY_CAPTION' => 'Global modify notify caption', - 'GLOBAL_MODIFY_NOTIFY_DESC' => 'Global modify notify desc', - 'GLOBAL_MODIFY_NOTIFY_SUBJECT' => 'Global modify notify subject', - 'GLOBAL_BROKEN_NOTIFY' => 'Global broken notify', - 'GLOBAL_BROKEN_NOTIFY_CAPTION' => 'Global broken notify caption', - 'GLOBAL_BROKEN_NOTIFY_DESC' => 'Global broken notify desc', - 'GLOBAL_BROKEN_NOTIFY_SUBJECT' => 'Global broken notify subject', - 'GLOBAL_SUBMIT_NOTIFY' => 'Global submit notify', - 'GLOBAL_SUBMIT_NOTIFY_CAPTION' => 'Global submit notify caption', - 'GLOBAL_SUBMIT_NOTIFY_DESC' => 'Global submit notify desc', - 'GLOBAL_SUBMIT_NOTIFY_SUBJECT' => 'Global submit notify subject', - 'GLOBAL_NEW_NOTIFY' => 'Global new notify', - 'GLOBAL_NEW_NOTIFY_CAPTION' => 'Global new notify caption', - 'GLOBAL_NEW_NOTIFY_DESC' => 'Global new notify desc', - 'GLOBAL_NEW_NOTIFY_SUBJECT' => 'Global new notify subject', - 'CATEGORY_NOTIFY' => 'Category notify', - 'CATEGORY_NOTIFY_DESC' => 'Category notify desc', - 'CATEGORY_NOTIFY_CAPTION' => 'Category notify caption', - 'CATEGORY_NOTIFY_SUBJECT' => 'Category notify Subject', - 'CATEGORY_SUBMIT_NOTIFY' => 'Category submit notify', - 'CATEGORY_SUBMIT_NOTIFY_CAPTION' => 'Category submit notify caption', - 'CATEGORY_SUBMIT_NOTIFY_DESC' => 'Category submit notify desc', - 'CATEGORY_SUBMIT_NOTIFY_SUBJECT' => 'Category submit notify subject', - $stuTableSoleName . '_NOTIFY' => $ucfTableSoleName . ' notify', - $stuTableSoleName . '_NOTIFY_DESC' => $ucfTableSoleName . ' notify desc', - $stuTableSoleName . '_NOTIFY_CAPTION' => $ucfTableSoleName . ' notify caption', - $stuTableSoleName . '_NOTIFY_SUBJECT' => $ucfTableSoleName . ' notify subject', - 'GLOBAL_NEW_CATEGORY_NOTIFY' => 'Global newcategory notify', - 'GLOBAL_NEW_CATEGORY_NOTIFY_CAPTION' => 'Global newcategory notify caption', - 'GLOBAL_NEW_CATEGORY_NOTIFY_DESC' => 'Global newcategory notify desc', - 'GLOBAL_NEW_CATEGORY_NOTIFY_SUBJECT' => 'Global newcategory notify subject', - 'GLOBAL_' . $stuTableSoleName . '_MODIFY_NOTIFY' => 'Global ' . $tableSoleName . ' modify notify', - 'GLOBAL_' . $stuTableSoleName . '_MODIFY_NOTIFY_CAPTION' => 'Global ' . $tableSoleName . ' modify notify caption', - 'GLOBAL_' . $stuTableSoleName . '_MODIFY_NOTIFY_DESC' => 'Global ' . $tableSoleName . ' modify notify desc', - 'GLOBAL_' . $stuTableSoleName . '_MODIFY_NOTIFY_SUBJECT' => 'Global ' . $tableSoleName . ' modify notify subject', - 'GLOBAL_' . $stuTableSoleName . '_BROKEN_NOTIFY' => 'Global ' . $tableSoleName . ' broken notify', - 'GLOBAL_' . $stuTableSoleName . '_BROKEN_NOTIFY_CAPTION' => 'Global ' . $tableSoleName . ' broken notify caption', - 'GLOBAL_' . $stuTableSoleName . '_BROKEN_NOTIFY_DESC' => 'Global ' . $tableSoleName . ' broken notify desc', - 'GLOBAL_' . $stuTableSoleName . '_BROKEN_NOTIFY_SUBJECT' => 'Global ' . $tableSoleName . ' broken notify subject', - 'GLOBAL_' . $stuTableSoleName . '_SUBMIT_NOTIFY' => 'Global ' . $tableSoleName . ' submit notify', - 'GLOBAL_' . $stuTableSoleName . '_SUBMIT_NOTIFY_CAPTION' => 'Global ' . $tableSoleName . ' submit notify caption', - 'GLOBAL_' . $stuTableSoleName . '_SUBMIT_NOTIFY_DESC' => 'Global ' . $tableSoleName . ' submit notify desc', - 'GLOBAL_' . $stuTableSoleName . '_SUBMIT_NOTIFY_SUBJECT' => 'Global ' . $tableSoleName . ' submit notify subject', - 'GLOBAL_NEW_' . $stuTableSoleName . '_NOTIFY' => 'Global new ' . $tableSoleName . ' notify', - 'GLOBAL_NEW_' . $stuTableSoleName . '_NOTIFY_CAPTION' => 'Global new ' . $tableSoleName . ' notify caption', - 'GLOBAL_NEW_' . $stuTableSoleName . '_NOTIFY_DESC' => 'Global new ' . $tableSoleName . ' notify desc', - 'GLOBAL_NEW_' . $stuTableSoleName . '_NOTIFY_SUBJECT' => 'Global new ' . $tableSoleName . ' notify subject', - 'CATEGORY_' . $stuTableSoleName . '_SUBMIT_NOTIFY' => 'Category ' . $tableSoleName . ' submit notify', - 'CATEGORY_' . $stuTableSoleName . '_SUBMIT_NOTIFY_CAPTION' => 'Category ' . $tableSoleName . ' submit notify caption', - 'CATEGORY_' . $stuTableSoleName . '_SUBMIT_NOTIFY_DESC' => 'Category ' . $tableSoleName . ' submit notify desc', - 'CATEGORY_' . $stuTableSoleName . '_SUBMIT_NOTIFY_SUBJECT' => 'Category ' . $tableSoleName . ' submit notify subject', - 'CATEGORY_NEW_' . $stuTableSoleName . '_NOTIFY' => 'Category new ' . $tableSoleName . ' notify', - 'CATEGORY_NEW_' . $stuTableSoleName . '_NOTIFY_CAPTION' => 'Category new ' . $tableSoleName . ' notify caption', - 'CATEGORY_NEW_' . $stuTableSoleName . '_NOTIFY_DESC' => 'Category new ' . $tableSoleName . ' notify desc', - 'CATEGORY_NEW_' . $stuTableSoleName . '_NOTIFY_SUBJECT' => 'Category new ' . $tableSoleName . ' notify subject', - 'APPROVE_NOTIFY' => $ucfTableSoleName . ' approve notify', - 'APPROVE_NOTIFY_CAPTION' => $ucfTableSoleName . ' approve notify caption', - 'APPROVE_NOTIFY_DESC' => $ucfTableSoleName . ' approve notify desc', - 'APPROVE_NOTIFY_SUBJECT' => $ucfTableSoleName . ' approve notify subject', + 'NOTIFY_' . $stuTableSoleName => $ucfTableSoleName . ' notification', + 'NOTIFY_' . $stuTableSoleName . '_MODIFY' => "{$ucfTableSoleName} modification", + 'NOTIFY_' . $stuTableSoleName . '_MODIFY_CAPTION' => "Notify me about {$tableSoleName} modification", + 'NOTIFY_' . $stuTableSoleName . '_MODIFY_SUBJECT' => 'Notification about modification', + 'NOTIFY_' . $stuTableSoleName . '_DELETE' => "{$ucfTableSoleName} deleted", + 'NOTIFY_' . $stuTableSoleName . '_DELETE_CAPTION' => "Notify me about deleted {$tableName}", + 'NOTIFY_' . $stuTableSoleName . '_DELETE_SUBJECT' => "Notification delete {$tableSoleName}", + 'NOTIFY_' . $stuTableSoleName . '_APPROVE' => "{$ucfTableSoleName} approve", + 'NOTIFY_' . $stuTableSoleName . '_APPROVE_CAPTION' => "Notify me about {$tableName} waiting for approvement", + 'NOTIFY_' . $stuTableSoleName . '_APPROVE_SUBJECT' => "Notification {$tableSoleName} waiting for approvement", ]; + if (1 == $tableBroken) { + $getDefinesNotif['NOTIFY_' . $stuTableSoleName . '_BROKEN'] = "{$ucfTableSoleName} broken"; + $getDefinesNotif['NOTIFY_' . $stuTableSoleName . '_BROKEN_CAPTION'] = "Notify me about broken {$tableSoleName}"; + $getDefinesNotif['NOTIFY_' . $stuTableSoleName . '_BROKEN_SUBJECT'] = "Notification about broken {$tableSoleName}"; + } + if (1 == $tableComment) { + $getDefinesNotif['NOTIFY_' . $stuTableSoleName . '_COMMENT'] = "{$ucfTableSoleName} comment"; + $getDefinesNotif['NOTIFY_' . $stuTableSoleName . '_COMMENT_CAPTION'] = "Notify me about comments for {$tableSoleName}"; + $getDefinesNotif['NOTIFY_' . $stuTableSoleName . '_COMMENT_SUBJECT'] = "Notification about comments for {$tableSoleName}"; + } foreach ($getDefinesNotif as $defn => $descn) { - $ret .= $df->getDefine($language, $defn, $descn); + $ret .= $this->ld->getDefine($language, $defn, $descn); } return $ret; @@ -434,85 +464,123 @@ private function getLanguageNotifications($language, $tableSoleName) */ private function getLanguagePermissionsGroups($language) { - $df = LanguageDefines::getInstance(); - $ret = $df->getAboveDefines('Permissions Groups'); - $ret .= $df->getDefine($language, 'GROUPS', 'Groups access'); - $ret .= $df->getDefine($language, 'GROUPS_DESC', 'Select general access permission for groups.'); - $ret .= $df->getDefine($language, 'ADMIN_GROUPS', 'Admin Group Permissions'); - $ret .= $df->getDefine($language, 'ADMIN_GROUPS_DESC', 'Which groups have access to tools and permissions page'); - $ret .= $df->getDefine($language, 'UPLOAD_GROUPS', 'Upload Group Permissions'); - $ret .= $df->getDefine($language, 'UPLOAD_GROUPS_DESC', 'Which groups have permissions to upload files'); + $ret = $this->ld->getAboveDefines('Permissions Groups'); + $ret .= $this->ld->getDefine($language, 'GROUPS', 'Groups access'); + $ret .= $this->ld->getDefine($language, 'GROUPS_DESC', 'Select general access permission for groups.'); + $ret .= $this->ld->getDefine($language, 'ADMIN_GROUPS', 'Admin Group Permissions'); + $ret .= $this->ld->getDefine($language, 'ADMIN_GROUPS_DESC', 'Which groups have access to tools and permissions page'); + $ret .= $this->ld->getDefine($language, 'UPLOAD_GROUPS', 'Upload Group Permissions'); + $ret .= $this->ld->getDefine($language, 'UPLOAD_GROUPS_DESC', 'Which groups have permissions to upload files'); + + return $ret; + } + + /** + * @private function getLanguagePermissionsGroups + * @param $language + * + * @return string + */ + private function getLanguageRatingbars($language) + { + $ret = $this->ld->getAboveDefines('Rating bars'); + $ret .= $this->ld->getDefine($language, 'RATINGBAR_GROUPS', 'Groups with rating rights'); + $ret .= $this->ld->getDefine($language, 'RATINGBAR_GROUPS_DESC', 'Select groups which should have the right to rate'); + $ret .= $this->ld->getDefine($language, 'RATINGBARS', 'Allow rating'); + $ret .= $this->ld->getDefine($language, 'RATINGBARS_DESC', 'Define whether rating should be possible and which kind of rating should be used'); + $ret .= $this->ld->getDefine($language, 'RATING_NONE', 'Do not use rating'); + $ret .= $this->ld->getDefine($language, 'RATING_5STARS', 'Rating with 5 stars'); + $ret .= $this->ld->getDefine($language, 'RATING_10STARS', 'Rating with 10 stars'); + $ret .= $this->ld->getDefine($language, 'RATING_LIKES', 'Rating with likes and dislikes'); + $ret .= $this->ld->getDefine($language, 'RATING_10NUM', 'Rating with 10 points'); return $ret; } /** * @private function getFooter - * @param null + * * @return string */ private function getLanguageFooter() { - $df = LanguageDefines::getInstance(); - $ret = $df->getBelowDefines('End'); - $ret .= $df->getBlankLine(); + $ret = $this->ld->getBelowDefines('End'); + $ret .= $this->ld->getBlankLine(); return $ret; } /** * @public function render - * @param null - * @return bool|string + * + * @return string */ public function render() { $module = $this->getModule(); $tables = $this->getTableTables($module->getVar('mod_id')); + $filename = $this->getFileName(); + $moduleDirname = $module->getVar('mod_dirname'); + $language = $this->getLanguage($moduleDirname, 'MI', '', false); $tableAdmin = []; $tableUser = []; $tableSubmenu = []; $tableBlocks = []; $tableNotifications = []; $tablePermissions = []; - $tableSoleName = ''; - foreach (array_keys($tables) as $t) { + $notifTable = ''; + $tableBrokens = []; + $tableComments = []; + $tableRate = []; + foreach (\array_keys($tables) as $t) { + $tableName = $tables[$t]->getVar('table_name'); $tableSoleName = $tables[$t]->getVar('table_solename'); $tableAdmin[] = $tables[$t]->getVar('table_admin'); $tableUser[] = $tables[$t]->getVar('table_user'); $tableSubmenu[] = $tables[$t]->getVar('table_submenu'); $tableBlocks[] = $tables[$t]->getVar('table_blocks'); $tableNotifications[] = $tables[$t]->getVar('table_notifications'); + $tableBroken = $tables[$t]->getVar('table_broken'); + $tableBrokens[] = $tables[$t]->getVar('table_broken'); + $tableComment = $tables[$t]->getVar('table_comments'); + $tableComments[] = $tables[$t]->getVar('table_comments'); + $tableRate[] = $tables[$t]->getVar('table_rate'); $tablePermissions[] = $tables[$t]->getVar('table_permissions'); + if (1 === (int)$tables[$t]->getVar('table_notifications')) { + $notifTable .= $this->getLanguageNotificationsTable($language, $tableName, $tableSoleName, $tableBroken, $tableComment); + } } - $filename = $this->getFileName(); - $moduleDirname = $module->getVar('mod_dirname'); - $language = $this->getLanguage($moduleDirname, 'MI'); - $content = $this->getHeaderFilesComments($module); - $content .= $this->getLanguageMain($language, $module); - $content .= $this->getLanguageMenu($module, $language); - if (in_array(1, $tableAdmin)) { + + $content = $this->getHeaderFilesComments($module); + $content .= $this->getLanguageMain($language, $module); + $content .= $this->getLanguageMenu($module, $language); + if (\in_array(1, $tableAdmin)) { $content .= $this->getLanguageAdmin($language); } - if (in_array(1, $tableUser)) { + if (\in_array(1, $tableUser)) { $content .= $this->getLanguageUser($language); } - if (in_array(1, $tableSubmenu)) { + if (\in_array(1, $tableSubmenu)) { $content .= $this->getLanguageSubmenu($language, $tables); } - //if (in_array(1, $tableBlocks)) { - $content .= $this->getLanguageBlocks($tables, $language); - //} + if (\in_array(1, $tableRate)) { + $content .= $this->getLanguageRatingbars($language); + } + + if (\in_array(1, $tableBlocks)) { + $content .= $this->getLanguageBlocks($tables, $language); + } $content .= $this->getLanguageConfig($language, $tables); - if (in_array(1, $tableNotifications)) { - $content .= $this->getLanguageNotifications($language, $tableSoleName); + if (\in_array(1, $tableNotifications)) { + $content .= $this->getLanguageNotificationsGlobal($language, \in_array(1, $tableBrokens, true), \in_array(1, $tableComments)); + $content .= $notifTable; } - if (in_array(1, $tablePermissions)) { + if (\in_array(1, $tablePermissions)) { $content .= $this->getLanguagePermissionsGroups($language); } $content .= $this->getLanguageFooter(); - $this->create($moduleDirname, 'language/' . $GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'language/' . $GLOBALS['xoopsConfig']['language'], $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/Language/index.php b/class/Files/Language/index.php new file mode 100644 index 00000000..e5ee0725 --- /dev/null +++ b/class/Files/Language/index.php @@ -0,0 +1,2 @@ +setModule($module); $this->setFileName($filename); @@ -89,7 +86,7 @@ private function getHeaderSqlComments($moduleName) $arrayServerInfo = [ "# SQL Dump for {$moduleName} module", '# PhpMyAdmin Version: 4.0.4', - '# http://www.phpmyadmin.net', + '# https://www.phpmyadmin.net', '#', "# Host: {$serverName}", "# Generated on: {$date} to {$time}", @@ -113,7 +110,7 @@ private function getHeaderSqlComments($moduleName) * * @return string */ - private function getHeadDatabaseTable($moduleDirname, $tableName, $fieldsNumb) + private function getHeadDatabaseTable($moduleDirname, $tableName, int $fieldsNumb) { $ret = null; $arrayDbTable = [ @@ -138,16 +135,29 @@ private function getHeadDatabaseTable($moduleDirname, $tableName, $fieldsNumb) */ private function getDatabaseTables($module) { - $ret = null; - $moduleDirname = mb_strtolower($module->getVar('mod_dirname')); - $tables = $this->getTableTables($module->getVar('mod_id'), 'table_order ASC, table_id'); - foreach (array_keys($tables) as $t) { + $ret = null; + $moduleDirname = \mb_strtolower($module->getVar('mod_dirname')); + $tables = $this->getTableTables($module->getVar('mod_id'), 'table_order ASC, table_id'); + $tableMid = 0; + $tableId = 0; + $tableName = 0; + $tableAutoincrement = 0; + $fieldsNumb = 0; + $tableRate = 0; + foreach (\array_keys($tables) as $t) { $tableId = $tables[$t]->getVar('table_id'); $tableMid = $tables[$t]->getVar('table_mid'); $tableName = $tables[$t]->getVar('table_name'); $tableAutoincrement = $tables[$t]->getVar('table_autoincrement'); - $fieldsNumb = $tables[$t]->getVar('table_nbfields'); - $ret .= $this->getDatabaseFields($moduleDirname, $tableMid, $tableId, $tableName, $tableAutoincrement, $fieldsNumb); + $fieldsNumb = (int)$tables[$t]->getVar('table_nbfields'); + if (1 === (int)$tables[$t]->getVar('table_rate')) { + $tableRate = 1; + } + $ret .= $this->getDatabaseFields($moduleDirname, $tableMid, $tableId, $tableName, $tableAutoincrement, $fieldsNumb); + } + + if (1 === $tableRate) { + $ret .= $this->getTableRatings($moduleDirname); } return $ret; @@ -166,23 +176,29 @@ private function getDatabaseTables($module) */ private function getDatabaseFields($moduleDirname, $tableMid, $tableId, $tableName, $tableAutoincrement, $fieldsNumb) { - $helper = Tdmcreate\Helper::getInstance(); - $ret = null; - $j = 0; - $comma = []; - $row = []; - //$type = ''; + $helper = Modulebuilder\Helper::getInstance(); + $ret = null; + $j = 0; + $comma = []; + $row = []; + $lenMax = 0; $fieldTypeName = ''; - $fields = $this->getTableFields($tableMid, $tableId, 'field_id ASC, field_name'); - foreach (array_keys($fields) as $f) { + $fields = $this->getTableFields($tableMid, $tableId); + //get max length + foreach (\array_keys($fields) as $f) { + $len = \mb_strlen($fields[$f]->getVar('field_name')); + $lenMax = max($len, $lenMax); + } + //create + foreach (\array_keys($fields) as $f) { // Creation of database table $ret = $this->getHeadDatabaseTable($moduleDirname, $tableName, $fieldsNumb); $fieldName = $fields[$f]->getVar('field_name'); $fieldType = $fields[$f]->getVar('field_type'); - $fieldValue = $fields[$f]->getVar('field_value'); + $fieldValue = \str_replace(''', '', $fields[$f]->getVar('field_value')); //remove single quotes $fieldAttribute = $fields[$f]->getVar('field_attribute'); $fieldNull = $fields[$f]->getVar('field_null'); - $fieldDefault = $fields[$f]->getVar('field_default'); + $fieldDefault = \str_replace(''', '', $fields[$f]->getVar('field_default')); //remove single quotes $fieldKey = $fields[$f]->getVar('field_key'); if ($fieldType > 1) { $fType = $helper->getHandler('Fieldtype')->get($fieldType); @@ -220,14 +236,14 @@ private function getDatabaseFields($moduleDirname, $tableMid, $tableId, $tableNa case 8: $type = $fieldTypeName . '(' . $fieldValue . ')'; if (empty($fieldDefault)) { - $default = "DEFAULT '0.00'"; // From MySQL 5.7 Manual + $default = "DEFAULT '0'"; // From MySQL 5.7 Manual } else { $default = "DEFAULT '{$fieldDefault}'"; } break; case 9: case 10: - $fValues = str_replace(',', "', '", str_replace(' ', '', $fieldValue)); + $fValues = \str_replace(',', "', '", \str_replace(' ', '', $fieldValue)); $type = $fieldTypeName . '(\'' . $fValues . '\')'; // Used with comma separator $default = "DEFAULT '{$fieldDefault}'"; break; @@ -242,16 +258,11 @@ private function getDatabaseFields($moduleDirname, $tableMid, $tableId, $tableNa case 12: $type = $fieldTypeName . '(' . $fieldValue . ')'; if (empty($fieldDefault)) { - $default = "DEFAULT 'http:\\'"; + $default = "DEFAULT 'https:\\'"; } else { $default = "DEFAULT '{$fieldDefault}'"; } break; - case 13: - case 14: - $type = $fieldTypeName . '(' . $fieldValue . ')'; - $default = "DEFAULT '{$fieldDefault}'"; - break; case 15: case 16: case 17: @@ -259,13 +270,6 @@ private function getDatabaseFields($moduleDirname, $tableMid, $tableId, $tableNa $type = $fieldTypeName; $default = null; break; - case 19: - case 20: - case 21: - case 22: - $type = $fieldTypeName . '(' . $fieldValue . ')'; - $default = "DEFAULT '{$fieldDefault}'"; - break; case 23: $type = $fieldTypeName; if (empty($fieldDefault)) { @@ -274,45 +278,48 @@ private function getDatabaseFields($moduleDirname, $tableMid, $tableId, $tableNa $default = "DEFAULT '{$fieldDefault}'"; } break; + case 13: + case 14: + case 22: default: $type = $fieldTypeName . '(' . $fieldValue . ')'; $default = "DEFAULT '{$fieldDefault}'"; break; } if ((0 == $f) && (1 == $tableAutoincrement)) { - $row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, null, 'AUTO_INCREMENT'); + $row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, null, 'AUTO_INCREMENT', $lenMax); $comma[$j] = $this->getKey(2, $fieldName); ++$j; } elseif ((0 == $f) && (0 == $tableAutoincrement)) { - $row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default); + $row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default, null, $lenMax); $comma[$j] = $this->getKey(2, $fieldName); ++$j; } else { if (3 == $fieldKey || 4 == $fieldKey || 5 == $fieldKey || 6 == $fieldKey) { switch ($fieldKey) { case 3: - $row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default); + $row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default, null, $lenMax); $comma[$j] = $this->getKey(3, $fieldName); ++$j; break; case 4: - $row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default); + $row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default, null, $lenMax); $comma[$j] = $this->getKey(4, $fieldName); ++$j; break; case 5: - $row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default); + $row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default, null, $lenMax); $comma[$j] = $this->getKey(5, $fieldName); ++$j; break; case 6: - $row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default); + $row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default, null, $lenMax); $comma[$j] = $this->getKey(6, $fieldName); ++$j; break; } } else { - $row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default); + $row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default, null, $lenMax); } } } @@ -326,7 +333,7 @@ private function getDatabaseFields($moduleDirname, $tableMid, $tableId, $tableNa } } // ================= COMMA CICLE ================= // - $ret .= implode("\n", $row); + $ret .= \implode("\n", $row); unset($j); $ret .= $this->getFootDatabaseTable(); @@ -334,9 +341,32 @@ private function getDatabaseFields($moduleDirname, $tableMid, $tableId, $tableNa } /** - * @private function getFootDatabaseTable + * @private function getDatabaseFields * - * @param null + * @param $moduleDirname + * @return null|string + */ + private function getTableRatings($moduleDirname) + { + $row = []; + $ret = $this->getHeadDatabaseTable($moduleDirname, 'ratings', 6); + $row[] = $this->getFieldRow('rate_id', 'INT(8)', 'UNSIGNED', 'NOT NULL', null, 'AUTO_INCREMENT'); + $row[] = $this->getFieldRow('rate_itemid', 'INT(8)', null, 'NOT NULL', "DEFAULT '0'"); + $row[] = $this->getFieldRow('rate_source', 'INT(8)', null, 'NOT NULL', "DEFAULT '0'"); + $row[] = $this->getFieldRow('rate_value', 'INT(1)', null, 'NOT NULL', "DEFAULT '0'"); + $row[] = $this->getFieldRow('rate_uid', 'INT(8)', null, 'NOT NULL', "DEFAULT '0'"); + $row[] = $this->getFieldRow('rate_ip', 'VARCHAR(60)', null, 'NOT NULL', "DEFAULT ''"); + $row[] = $this->getFieldRow('rate_date', 'INT(8)', null, 'NOT NULL', "DEFAULT '0'"); + $row[] = $this->getKey(2, 'rate_id'); + + $ret .= \implode("\n", $row); + $ret .= $this->getFootDatabaseTable(); + + return $ret; + } + + /** + * @private function getFootDatabaseTable * * @return string */ @@ -354,15 +384,24 @@ private function getFootDatabaseTable() * @param $fieldNull * @param $fieldDefault * @param $autoincrement + * @param int $lenMax * * @return string */ - private function getFieldRow($fieldName, $fieldTypeValue, $fieldAttribute = null, $fieldNull = null, $fieldDefault = null, $autoincrement = null) + private function getFieldRow($fieldName, $fieldTypeValue, $fieldAttribute = null, $fieldNull = null, $fieldDefault = null, $autoincrement = null, int $lenMax = 0) { - $retAutoincrement = " `{$fieldName}` {$fieldTypeValue} {$fieldAttribute} {$fieldNull} {$autoincrement},"; - $retFieldAttribute = " `{$fieldName}` {$fieldTypeValue} {$fieldAttribute} {$fieldNull} {$fieldDefault},"; - $fieldDefault = " `{$fieldName}` {$fieldTypeValue} {$fieldNull} {$fieldDefault},"; - $retShort = " `{$fieldName}` {$fieldTypeValue},"; + $fieldNameMax = " `{$fieldName}`"; + if ($lenMax > 0) { + $fieldNameMax .= \str_repeat(' ', $lenMax - \strlen($fieldName)); + } + $fieldTypeValueMax = $fieldTypeValue; + if (\strlen($fieldTypeValue) < 15) { + $fieldTypeValueMax .= \str_repeat(' ', 15 - \strlen($fieldTypeValue)); + } + $retAutoincrement = $fieldNameMax . " {$fieldTypeValueMax} {$fieldAttribute} {$fieldNull} {$autoincrement},"; + $retFieldAttribute = $fieldNameMax . " {$fieldTypeValueMax} {$fieldAttribute} {$fieldNull} {$fieldDefault},"; + $fieldDefault = $fieldNameMax . " {$fieldTypeValueMax} {$fieldNull} {$fieldDefault},"; + $retShort = $fieldNameMax . " {$fieldTypeValueMax},"; $ret = $retShort; if (null != $autoincrement) { @@ -407,36 +446,21 @@ private function getKey($key, $fieldName) return $ret; } - /** - * @private function getComma - * - * @param $row - * @param $comma - * - * @return string - */ - private function getComma($row, $comma = null) - { - return " {$row}{$comma}"; - } - /** * @public function render * - * @param null - * - * @return bool|string + * @return string */ public function render() { $module = $this->getModule(); $filename = $this->getFileName(); - $moduleName = mb_strtolower($module->getVar('mod_name')); - $moduleDirname = mb_strtolower($module->getVar('mod_dirname')); + $moduleName = \mb_strtolower($module->getVar('mod_name')); + $moduleDirname = \mb_strtolower($module->getVar('mod_dirname')); $content = $this->getHeaderSqlComments($moduleName); $content .= $this->getDatabaseTables($module); - $this->create($moduleDirname, 'sql', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'sql', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/Sql/index.php b/class/Files/Sql/index.php new file mode 100644 index 00000000..e5ee0725 --- /dev/null +++ b/class/Files/Sql/index.php @@ -0,0 +1,2 @@ +hc = Modulebuilder\Files\CreateHtmlCode::getInstance(); + $this->sc = Modulebuilder\Files\CreateSmartyCode::getInstance(); } /** @@ -59,7 +69,7 @@ public static function getInstance() * @param $module * @param $filename */ - public function write($module, $filename) + public function write($module, $filename): void { $this->setModule($module); $this->setFileName($filename); @@ -67,25 +77,23 @@ public function write($module, $filename) /** * @public function render - * @param null - * @return bool|string + * + * @return string */ public function render() { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); $module = $this->getModule(); $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); - $content = $hc->getHtmlComment('Header') . PHP_EOL; - $content .= $sc->getSmartyIncludeFile($moduleDirname, 'header', true, true) . PHP_EOL; - $content .= $hc->getHtmlComment('About Page') . PHP_EOL; - $single = $sc->getSmartySingleVar('about'); - $content .= $hc->getHtmlTag('div', ['class' => 'top'], $single) . PHP_EOL; - $content .= $hc->getHtmlComment('Footer') . PHP_EOL; - $content .= $sc->getSmartyIncludeFile($moduleDirname, 'footer', true, true); + $content = $this->hc->getHtmlComment('Header', '', "\n"); + $content .= $this->sc->getSmartyIncludeFile($moduleDirname, 'header', true) . PHP_EOL; + $content .= $this->hc->getHtmlComment('About Page', '', "\n"); + $single = $this->sc->getSmartySingleVar('about'); + $content .= $this->hc->getHtmlTag('div', ['class' => 'top'], $single) . PHP_EOL; + $content .= $this->hc->getHtmlComment('Footer', '', "\n"); + $content .= $this->sc->getSmartyIncludeFile($moduleDirname, 'footer', true); - $this->create($moduleDirname, 'templates/admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'templates/admin', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/Templates/Admin/TemplatesAdminBroken.php b/class/Files/Templates/Admin/TemplatesAdminBroken.php new file mode 100644 index 00000000..404892d7 --- /dev/null +++ b/class/Files/Templates/Admin/TemplatesAdminBroken.php @@ -0,0 +1,233 @@ +hc = Modulebuilder\Files\CreateHtmlCode::getInstance(); + $this->sc = Modulebuilder\Files\CreateSmartyCode::getInstance(); + } + + /** + * @static function getInstance + * + * @return TemplatesAdminBroken + */ + public static function getInstance() + { + static $instance = false; + if (!$instance) { + $instance = new self(); + } + + return $instance; + } + + /** + * @public function write + * @param $module + * @param $tables + * @param $filename + */ + public function write($module, $tables, $filename): void + { + $this->setModule($module); + $this->setTables($tables); + $this->setFileName($filename); + } + + /** + * @private function getTemplatesAdminBrokenHeader + * @param string $moduleDirname + * @return string + */ + private function getTemplatesAdminBrokenHeader(string $moduleDirname) + { + $ret = $this->hc->getHtmlComment('Header', '', "\n"); + $ret .= $this->sc->getSmartyIncludeFile($moduleDirname, 'header', true, '', "\n\n"); + + return $ret; + } + + /** + * @private function getTemplatesAdminBrokenTableThead + * @param string $language + * @return string + */ + private function getTemplatesAdminBrokenTableThead(string $language) + { + $th = ''; + $lang = $this->sc->getSmartyConst($language, 'BROKEN_TABLE'); + $th .= $this->hc->getHtmlTableHead($lang, 'center', '', "\t\t\t\t"); + $lang = $this->sc->getSmartyConst($language, 'BROKEN_MAIN'); + $th .= $this->hc->getHtmlTableHead($lang, 'center', '', "\t\t\t\t"); + $lang = $this->sc->getSmartyConst($language, 'FORM_ACTION'); + $th .= $this->hc->getHtmlTableHead($lang, 'center width5', '', "\t\t\t\t"); + $tr = $this->hc->getHtmlTableRow($th, 'head', "\t\t" . "\t"); + return $this->hc->getHtmlTableThead($tr, '', "\t\t"); + } + + /** + * @private function getTemplatesAdminBrokenTableTBody + * @param string $tableName + * @param $tableSoleName + * @return string + * @internal param string $language + */ + private function getTemplatesAdminBrokenTableTBody(string $tableName, $tableSoleName) + { + $td = ''; + $doubleKey = $this->sc->getSmartyDoubleVar($tableSoleName, 'key', '', '', "''", "'htmlattr'"); + $doubleVal = $this->sc->getSmartyDoubleVar($tableSoleName, 'keyval', '', '', "''", "'htmlattr'"); + + $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'table', '', '', "''", "'html'"); + $td .= $this->hc->getHtmlTableData($double, 'center', '', "\t\t\t\t"); + $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'main', '', '', "''", "'html'"); + $td .= $this->hc->getHtmlTableData($double, 'center', '', "\t\t\t\t"); + $lang = $this->sc->getSmartyConst('', '_EDIT'); + $src = $this->sc->getSmartyNoSimbol("xoModuleIcons16 'edit.png'"); + $img = $this->hc->getHtmlImage($src, $tableName); + $anchor = $this->hc->getHtmlAnchor($tableName . ".php?op=edit&{$doubleKey}=" . $doubleVal, $img, $lang, '', '', '', "\t\t" . "\t\t\t", "\n"); + $lang = $this->sc->getSmartyConst('', '_DELETE'); + $src = $this->sc->getSmartyNoSimbol("xoModuleIcons16 'delete.png'"); + $img = $this->hc->getHtmlImage($src, $tableName); + $anchor .= $this->hc->getHtmlAnchor($tableName . ".php?op=delete&{$doubleKey}=" . $doubleVal, $img, $lang, '', '', '', "\t\t" . "\t\t\t", "\n"); + $td .= $this->hc->getHtmlTableData($anchor, 'center width5', '', "\t\t\t\t", "\n", true); + $cycle = $this->sc->getSmartyNoSimbol('cycle values=\'odd, even\''); + $tr = $this->hc->getHtmlTableRow($td, $cycle, "\t\t" . "\t"); + $foreach = $this->sc->getSmartyForeach($tableSoleName, $tableName . '_list', $tr, '', '', "\t\t" . "\t"); + return $this->hc->getHtmlTableTbody($foreach, '', "\t\t"); + } + + /** + * @private function getTemplatesAdminBrokenTable + * @param string $tableName + * @param $tableSoleName + * @param string $language + * @return string + */ + private function getTemplatesAdminBrokenTable(string $tableName, $tableSoleName, string $language) + { + $tbody = $this->getTemplatesAdminBrokenTableThead($language); + $tbody .= $this->getTemplatesAdminBrokenTableTBody($tableName, $tableSoleName); + return $this->hc->getHtmlTable($tbody, 'outer', "\t"); + } + + /** + * @private function getTemplatesAdminBrokenList + * @param $table + * @param string $language + * @param string $t + * @return string + */ + private function getTemplatesAdminBrokenList($table, string $language, string $t = '') + { + $tableName = $table->getVar('table_name'); + $tableSoleName = $table->getVar('table_solename'); + $ucfTableName = \ucfirst($tableName); + $double = $this->sc->getSmartySingleVar($tableName . '_result'); + $ret = $this->hc->getHtmlHNumb($double, '3'); + $htmlTable = $this->getTemplatesAdminBrokenTable($tableName, $tableSoleName, $language); + $htmlTable .= $this->hc->getHtmlDiv(' ', 'clear', $t, "\n", false); + $single = $this->sc->getSmartySingleVar('pagenav_' . $tableName, '', '', ''); + $div = $this->hc->getHtmlDiv($single, 'xo-pagenav floatright', $t . "\t", "\n", false); + $div .= $this->hc->getHtmlDiv('', 'clear spacer', $t . "\t", "\n", false); + $htmlTable .= $this->sc->getSmartyConditions('pagenav_' . $tableName, '', '', $div, '', '', '', $t); + $noData = $this->sc->getSmartySingleVar('nodata' . $ucfTableName, $t . "\t\t"); + $src = $this->sc->getSmartyNoSimbol("xoModuleIcons32 'button_ok.png'"); + $noData .= $this->hc->getHtmlImage($src, $tableName, '', '', "\n"); + $div = $this->hc->getHtmlDiv($noData, '', $t . "\t"); + $div .= $this->hc->getHtmlDiv('', 'clear spacer', $t . "\t", "\n", false); + $div .= $this->hc->getHtmlBr(2, '', $t . "\t"); + $contElse = $this->sc->getSmartyConditions('nodata' . $ucfTableName, '', '', $div, false, '', '', $t); + $ret .= $this->sc->getSmartyConditions($tableName . '_count', '', '', $htmlTable, $contElse); + $ret .= $this->hc->getHtmlBr(3); + + return $ret; + } + + /** + * @private function getTemplatesAdminBrokenFooter + * @param string $moduleDirname + * @return string + */ + private function getTemplatesAdminBrokenFooter(string $moduleDirname) + { + $single = $this->sc->getSmartySingleVar('error'); + $strong = $this->hc->getHtmlTag('strong', [], $single, false, '', ''); + $div = $this->hc->getHtmlDiv($strong, 'errorMsg', "\t"); + $ret = $this->sc->getSmartyConditions('error', '', '', $div); + $ret .= $this->hc->getHtmlEmpty('', '', "\n"); + $ret .= $this->hc->getHtmlComment('Footer', '', "\n"); + $ret .= $this->sc->getSmartyIncludeFile($moduleDirname, 'footer', true); + + return $ret; + } + + /** + * @public function render + * + * @return string + */ + public function render() + { + $module = $this->getModule(); + $tables = $this->getTables(); + $filename = $this->getFileName(); + $moduleDirname = $module->getVar('mod_dirname'); + $language = $this->getLanguage($moduleDirname, 'AM', '', false); + $content = $this->getTemplatesAdminBrokenHeader($moduleDirname); + foreach ($tables as $table) { + if (1 === (int)$table->getVar('table_broken')) { + $content .= $this->getTemplatesAdminBrokenList($table, $language, "\t"); + } + } + $content .= $this->getTemplatesAdminBrokenFooter($moduleDirname); + + $this->create($moduleDirname, 'templates/admin', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); + + return $this->renderFile(); + } +} diff --git a/class/Files/Templates/Admin/TemplatesAdminFooter.php b/class/Files/Templates/Admin/TemplatesAdminFooter.php index bc70e4b6..b8b99325 100644 --- a/class/Files/Templates/Admin/TemplatesAdminFooter.php +++ b/class/Files/Templates/Admin/TemplatesAdminFooter.php @@ -1,9 +1,9 @@ -hc = Modulebuilder\Files\CreateHtmlCode::getInstance(); + $this->sc = Modulebuilder\Files\CreateSmartyCode::getInstance(); } /** @@ -56,10 +66,10 @@ public static function getInstance() /** * @public function write - * @param string $module + * @param $module * @param string $filename */ - public function write($module, $filename) + public function write($module, string $filename): void { $this->setModule($module); $this->setFileName($filename); @@ -67,29 +77,27 @@ public function write($module, $filename) /** * @public function render - * @param null - * @return bool|string + * + * @return string */ public function render() { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); $module = $this->getModule(); $filename = $this->getFileName(); $moduleName = $module->getVar('mod_name'); $moduleDirname = $module->getVar('mod_dirname'); $supportName = $module->getVar('mod_support_name'); - $language = $this->getLanguage($moduleDirname, 'AM'); - $singleNoVar = $sc->getSmartyNoSimbol('xoModuleIcons32 xoopsmicrobutton.gif'); - $img = $hc->getHtmlTag('img', ['src' => $singleNoVar, 'alt' => 'XOOPS'], '', true, '',''); - $anchor = $hc->getHtmlTag('a', ['href' => 'https://xoops.org/', 'title' => 'Visit XOOPS', 'target' => '_blank'], $img) ; - $content = $hc->getHtmlTag('div', ['class' => 'center'], "\n\t" . $anchor); - $tree = $hc->getHtmlTag('strong', [], $moduleName, false, '', ''); - $tree .= $sc->getSmartyConst($language, 'MAINTAINEDBY'); - $tree .= $hc->getHtmlTag('a', ['href' => '<{$maintainedby}>', 'title' => 'Visit ' . $supportName, 'class' => 'tooltip', 'rel' => 'external'], $supportName); - $content .= $hc->getHtmlTag('div', ['class' => 'center smallsmall italic pad5'], "\n\t" . $tree); + $language = $this->getLanguage($moduleDirname, 'AM', '', false); + $singleNoVar = $this->sc->getSmartyNoSimbol("xoModuleIcons32 'xoopsmicrobutton.gif'"); + $img = $this->hc->getHtmlTag('img', ['src' => $singleNoVar, 'alt' => 'XOOPS'], '', true, '', ''); + $anchor = $this->hc->getHtmlTag('a', ['href' => 'https://xoops.org/', 'title' => 'Visit XOOPS', 'target' => '_blank', 'rel' => 'noopener noreferrer'], $img); + $content = $this->hc->getHtmlTag('div', ['class' => 'center'], "\n\t" . $anchor); + $tree = $this->hc->getHtmlTag('strong', [], $moduleName, false, '', ''); + $tree .= $this->sc->getSmartyConst($language, 'MAINTAINEDBY'); + $tree .= $this->hc->getHtmlTag('a', ['href' => '<{$maintainedby|default:\'#\'|escape:\'htmlattr\'}>', 'title' => 'Visit ' . $supportName, 'class' => 'tooltip', 'rel' => 'external'], $supportName); + $content .= $this->hc->getHtmlTag('div', ['class' => 'center smallsmall italic pad5'], "\n\t" . $tree); - $this->create($moduleDirname, 'templates/admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'templates/admin', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/Templates/Admin/TemplatesAdminHeader.php b/class/Files/Templates/Admin/TemplatesAdminHeader.php index 74a92b81..c3894506 100644 --- a/class/Files/Templates/Admin/TemplatesAdminHeader.php +++ b/class/Files/Templates/Admin/TemplatesAdminHeader.php @@ -1,9 +1,9 @@ -hc = Modulebuilder\Files\CreateHtmlCode::getInstance(); + $this->sc = Modulebuilder\Files\CreateSmartyCode::getInstance(); } /** @@ -56,10 +66,10 @@ public static function getInstance() /** * @public function write - * @param string $module + * @param $module * @param string $filename */ - public function write($module, $filename) + public function write($module, string $filename): void { $this->setModule($module); $this->setFileName($filename); @@ -67,25 +77,23 @@ public function write($module, $filename) /** * @public function render - * @param null - * @return bool|string + * + * @return string */ public function render() { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); $module = $this->getModule(); $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); - $navigation = $sc->getSmartySingleVar('navigation'); - $due = $hc->getHtmlSpan($navigation, 'left', "\t") ; - $buttons = $sc->getSmartySingleVar('buttons'); - $right = $hc->getHtmlSpan($buttons, 'left', "\t\t", "\n"); - $due .= $sc->getSmartyConditions('buttons', '', '', $right, '', '', '', "\t", "\n"); - $content = $hc->getHtmlDiv($due, 'top'); + $navigation = $this->sc->getSmartySingleVar('navigation'); + $due = $this->hc->getHtmlSpan($navigation, 'left', "\t"); + $buttons = $this->sc->getSmartySingleVar('buttons'); + $right = $this->hc->getHtmlSpan($buttons, 'left', "\t\t"); + $due .= $this->sc->getSmartyConditions('buttons', '', '', $right, '', '', '', "\t"); + $content = $this->hc->getHtmlDiv($due, 'top'); - $this->create($moduleDirname, 'templates/admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'templates/admin', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/Templates/Admin/TemplatesAdminIndex.php b/class/Files/Templates/Admin/TemplatesAdminIndex.php index ac557047..c90934e7 100644 --- a/class/Files/Templates/Admin/TemplatesAdminIndex.php +++ b/class/Files/Templates/Admin/TemplatesAdminIndex.php @@ -1,9 +1,9 @@ -hc = Modulebuilder\Files\CreateHtmlCode::getInstance(); + $this->sc = Modulebuilder\Files\CreateSmartyCode::getInstance(); } /** @@ -56,10 +66,10 @@ public static function getInstance() /** * @public function write - * @param string $module + * @param $module * @param string $filename */ - public function write($module, $filename) + public function write($module, string $filename): void { $this->setModule($module); $this->setFileName($filename); @@ -67,26 +77,24 @@ public function write($module, $filename) /** * @public function render - * @param null - * @return bool|string + * + * @return string */ public function render() { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); $module = $this->getModule(); $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); - $content = $hc->getHtmlComment('Header') . PHP_EOL; - $content .= $sc->getSmartyIncludeFile($moduleDirname, 'header', true, true) . PHP_EOL; - $content .= $hc->getHtmlComment('Index Page') . PHP_EOL; - $single = $sc->getSmartySingleVar('index'); - $content .= $hc->getHtmlTag('div', ['class' => 'top'], $single) . PHP_EOL; - $content .= $hc->getHtmlComment('Footer') . PHP_EOL; - $content .= $sc->getSmartyIncludeFile($moduleDirname, 'footer', true, true); + $content = $this->hc->getHtmlComment('Header', '', "\n"); + $content .= $this->sc->getSmartyIncludeFile($moduleDirname, 'header', true) . PHP_EOL; + $content .= $this->hc->getHtmlComment('Index Page', '', "\n"); + $single = $this->sc->getSmartySingleVar('index'); + $content .= $this->hc->getHtmlTag('div', ['class' => 'top'], $single) . PHP_EOL; + $content .= $this->hc->getHtmlComment('Footer', '', "\n"); + $content .= $this->sc->getSmartyIncludeFile($moduleDirname, 'footer', true); - $this->create($moduleDirname, 'templates/admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'templates/admin', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/Templates/Admin/TemplatesAdminPages.php b/class/Files/Templates/Admin/TemplatesAdminPages.php index b3a6904d..76328a6d 100644 --- a/class/Files/Templates/Admin/TemplatesAdminPages.php +++ b/class/Files/Templates/Admin/TemplatesAdminPages.php @@ -1,9 +1,12 @@ -hc = Modulebuilder\Files\CreateHtmlCode::getInstance(); + $this->sc = Modulebuilder\Files\CreateSmartyCode::getInstance(); } /** * @static function getInstance - * @param null + * * @return TemplatesAdminPages */ public static function getInstance() @@ -57,11 +70,11 @@ public static function getInstance() /** * @public function write - * @param string $module - * @param string $table - * @param $filename + * @param $module + * @param $table + * @param string $filename */ - public function write($module, $table, $filename) + public function write($module, $table, string $filename): void { $this->setModule($module); $this->setTable($table); @@ -73,12 +86,10 @@ public function write($module, $table, $filename) * @param string $moduleDirname * @return string */ - private function getTemplatesAdminPagesHeader($moduleDirname) + private function getTemplatesAdminPagesHeader(string $moduleDirname) { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); - $ret = $hc->getHtmlComment('Header', "\n"); - $ret .= $sc->getSmartyIncludeFile($moduleDirname, 'header', true, '', '', "\n\n"); + $ret = $this->hc->getHtmlComment('Header', '',"\n"); + $ret .= $this->sc->getSmartyIncludeFile($moduleDirname, 'header', true, '', "\n\n"); return $ret; } @@ -87,36 +98,32 @@ private function getTemplatesAdminPagesHeader($moduleDirname) * @private function getTemplatesAdminPagesTableThead * @param $tableSoleName * @param $tableAutoincrement - * @param string $fields + * @param array $fields * @param string $language * @return string */ - private function getTemplatesAdminPagesTableThead($tableSoleName, $tableAutoincrement, $fields, $language) + private function getTemplatesAdminPagesTableThead($tableSoleName, $tableAutoincrement, array $fields, string $language) { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); $th = ''; - $langHeadId = mb_strtoupper($tableSoleName) . '_ID'; + $langHeadId = \mb_strtoupper($tableSoleName) . '_ID'; if (1 == $tableAutoincrement) { - $lang = $sc->getSmartyConst($language, $langHeadId); - $th .= $hc->getHtmlTag('th', ['class' => 'center'], $lang, false, "\t\t\t\t"); + $lang = $this->sc->getSmartyConst($language, $langHeadId); + $th .= $this->hc->getHtmlTag('th', ['class' => 'center'], $lang, false, "\t\t\t\t"); } - foreach (array_keys($fields) as $f) { + foreach (\array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); $rpFieldName = $this->getRightString($fieldName); - $langFieldName = mb_strtoupper($tableSoleName) . '_' . mb_strtoupper($rpFieldName); + $langFieldName = \mb_strtoupper($tableSoleName) . '_' . \mb_strtoupper($rpFieldName); if (1 == $fields[$f]->getVar('field_inlist')) { - $lang = $sc->getSmartyConst($language, $langFieldName); - $th .= $hc->getHtmlTag('th', ['class' => 'center'], $lang, false, "\t\t\t\t"); + $lang = $this->sc->getSmartyConst($language, $langFieldName); + $th .= $this->hc->getHtmlTag('th', ['class' => 'center'], $lang, false, "\t\t\t\t"); } } - $lang = $sc->getSmartyConst($language, 'FORM_ACTION'); - $th .= $hc->getHtmlTag('th', ['class' => 'center width5'], $lang, false, "\t\t\t\t"); - $tr = $hc->getHtmlTableRow($th, 'head', "\t\t\t"); - $ret = $hc->getHtmlTableThead($tr, '', "\t\t"); - - return $ret; + $lang = $this->sc->getSmartyConst($language, 'FORM_ACTION'); + $th .= $this->hc->getHtmlTag('th', ['class' => 'center width5'], $lang, false, "\t\t\t\t"); + $tr = $this->hc->getHtmlTableRow($th, 'head', "\t\t\t"); + return $this->hc->getHtmlTableThead($tr, '', "\t\t"); } /** @@ -125,21 +132,19 @@ private function getTemplatesAdminPagesTableThead($tableSoleName, $tableAutoincr * @param string $tableName * @param $tableSoleName * @param $tableAutoincrement - * @param string $fields + * @param array $fields * @return string * @internal param string $language */ - private function getTemplatesAdminPagesTableTBody($moduleDirname, $tableName, $tableSoleName, $tableAutoincrement, $fields) + private function getTemplatesAdminPagesTableTBody(string $moduleDirname, string $tableName, $tableSoleName, $tableAutoincrement, array $fields) { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); $td = ''; if (1 == $tableAutoincrement) { - $double = $sc->getSmartyDoubleVar($tableSoleName, 'id'); - $td .= $hc->getHtmlTableData($double, 'center', '',"\t\t\t\t"); + $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'id'); + $td .= $this->hc->getHtmlTableData($double, 'center', '',"\t\t\t\t"); } $fieldId = ''; - foreach (array_keys($fields) as $f) { + foreach (\array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); $fieldElement = $fields[$f]->getVar('field_element'); $rpFieldName = $this->getRightString($fieldName); @@ -148,64 +153,83 @@ private function getTemplatesAdminPagesTableTBody($moduleDirname, $tableName, $t } if (1 == $fields[$f]->getVar('field_inlist')) { switch ($fieldElement) { - case 5: - $double = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName); - $src = $sc->getSmartyNoSimbol('xoModuleIcons16') . $double . '.png'; - $img = $hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true,'',''); - $td .= $hc->getHtmlTableData($img, 'center', '',"\t\t\t\t"); + case Constants::FIELD_ELE_TEXTAREA: + case Constants::FIELD_ELE_DHTMLTEXTAREA: + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName . '_short', '', '', "''", "'html'"); + $td .= $this->hc->getHtmlTableData($double, 'center', '',"\t\t\t\t"); + break; + case Constants::FIELD_ELE_CHECKBOX: + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName); + $src = $this->sc->getSmartyNoSimbol('xoModuleIcons16') . $double . '.png'; + $img = $this->hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true,'',''); + $td .= $this->hc->getHtmlTableData($img, 'center', '',"\t\t\t\t"); break; - case 9: + case Constants::FIELD_ELE_COLORPICKER: // This is to be reviewed, as it was initially to style = "backgroung-color: #" // Now with HTML5 is not supported inline style in the parameters of the HTML tag // Old code was ... - $double = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName); + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName); $color = " "; - $td .= $hc->getHtmlTableData($color, 'center', '',"\t\t\t\t"); + $td .= $this->hc->getHtmlTableData($color, 'center', '',"\t\t\t\t"); break; - case 10: - $src = $sc->getSmartyNoSimbol('xoModuleIcons32'); - $src .= $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName); - $img = $hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true,'',''); - $td .= $hc->getHtmlTableData($img, 'center', '',"\t\t\t\t"); + case Constants::FIELD_ELE_IMAGELIST: + $src = $this->sc->getSmartyNoSimbol('xoModuleIcons32'); + $src .= $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName, '', '', "''", "'htmlattr'"); + $img = $this->hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true,'',''); + $td .= $this->hc->getHtmlTableData($img, 'center', '',"\t\t\t\t"); break; - case 13: - $single = $sc->getSmartySingleVar($moduleDirname . '_upload_url'); - $double = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName); - $img = $hc->getHtmlTag('img', ['src' => $single . "/images/{$tableName}/" . $double, 'alt' => $tableName, 'style' => 'max-width:100px'], '', true, '', ''); - $td .= $hc->getHtmlTableData($img, 'center', '',"\t\t\t\t"); + case Constants::FIELD_ELE_UPLOADIMAGE: + $single = $this->sc->getSmartySingleVar($moduleDirname . '_upload_url','','',"''", "'htmlattr'"); + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName,'','',"''", "'htmlattr'"); + $img = $this->hc->getHtmlTag('img', ['src' => $single . "/images/{$tableName}/" . $double, 'alt' => $tableName, 'style' => 'max-width:100px'], '', true, '', ''); + $td .= $this->hc->getHtmlTableData($img, 'center', '',"\t\t\t\t"); break; - case 16: - $double = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName); - $src = $sc->getSmartyNoSimbol('$modPathIcon16') . '/status' . $double . '.png'; - $img = $hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true,'',''); - $td .= $hc->getHtmlTableData($img, 'center', '',"\t\t\t\t"); + case Constants::FIELD_ELE_SELECTSTATUS: + $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'status', '', '', "''", "'html'"); + $src = $this->sc->getSmartyNoSimbol('$modPathIcon16') . 'status' . $double . '.png'; + $imgAlt = $this->sc->getSmartyDoubleVar($tableSoleName, 'status_text', '', '', "''", "'html'"); + $img = $this->hc->getHtmlTag('img', ['src' => $src, 'alt' => $imgAlt, 'title' => $imgAlt], '', true,'',''); + $td .= $this->hc->getHtmlTableData($img, 'center', '',"\t\t\t\t"); + break; + case Constants::FIELD_ELE_RADIOYN: + case Constants::FIELD_ELE_SELECTUSER: + case Constants::FIELD_ELE_DATETIME: + case Constants::FIELD_ELE_RADIO_ONOFFLINE: + case Constants::FIELD_ELE_TEXTDATESELECT: + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName . '_text', '', '', "''", "'html'"); + $td .= $this->hc->getHtmlTableData($double, 'center', '',"\t\t\t\t"); break; default: if (0 != $f) { - $double = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName); - $td .= $hc->getHtmlTableData($double, 'center', '',"\t\t\t\t"); + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName, '', '', "''", "'html'"); + $td .= $this->hc->getHtmlTableData($double, 'center', '',"\t\t\t\t"); } break; } } } - $lang = $sc->getSmartyConst('', '_EDIT'); - $double = $sc->getSmartyDoubleVar($tableSoleName, 'id'); - $src = $sc->getSmartyNoSimbol('xoModuleIcons16 edit.png'); - $img = $hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true,'', ''); - $anchor = $hc->getHtmlTag('a', ['href' => $tableName . ".php?op=edit&{$fieldId}=" . $double, 'title' => $lang], $img, false, "\t\t\t\t\t"); - $lang = $sc->getSmartyConst('', '_DELETE'); - $double = $sc->getSmartyDoubleVar($tableSoleName, 'id'); - $src = $sc->getSmartyNoSimbol('xoModuleIcons16 delete.png'); - $img = $hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true, '', ''); - $anchor .= $hc->getHtmlTag('a', ['href' => $tableName . ".php?op=delete&{$fieldId}=" . $double, 'title' => $lang], $img, false, "\t\t\t\t\t"); - $td .= $hc->getHtmlTag('td', ['class' => 'center width5'], "\n" . $anchor . "\t\t\t\t", false, "\t\t\t\t"); - $cycle = $sc->getSmartyNoSimbol('cycle values=\'odd, even\''); - $tr = $hc->getHtmlTableRow($td, $cycle, "\t\t\t"); - $foreach = $sc->getSmartyForeach($tableSoleName, $tableName . '_list', $tr, '','', "\t\t\t"); - $tbody = $hc->getHtmlTableTbody($foreach,'' , "\t\t"); + $lang = $this->sc->getSmartyConst('', '_EDIT'); + $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'id'); + $src = $this->sc->getSmartyNoSimbol("xoModuleIcons16 'edit.png'"); + $img = $this->hc->getHtmlTag('img', ['src' => $src, 'alt' => $lang . ' ' . $tableName], '', true,'', ''); + $anchor = $this->hc->getHtmlTag('a', ['href' => $tableName . ".php?op=edit&{$fieldId}=" . $double . '&start=<{$start|default:0}>&limit=<{$limit|default:0}>', 'title' => $lang], $img, false, "\t\t\t\t\t"); + $lang = $this->sc->getSmartyConst('', '_CLONE'); + $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'id'); + $src = $this->sc->getSmartyNoSimbol("xoModuleIcons16 'editcopy.png'"); + $img = $this->hc->getHtmlTag('img', ['src' => $src, 'alt' => $lang . ' ' . $tableName], '', true,'', ''); + $anchor .= $this->hc->getHtmlTag('a', ['href' => $tableName . ".php?op=clone&{$fieldId}_source=" . $double, 'title' => $lang], $img, false, "\t\t\t\t\t"); + $lang = $this->sc->getSmartyConst('', '_DELETE'); + $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'id'); + $src = $this->sc->getSmartyNoSimbol("xoModuleIcons16 'delete.png'"); + $img = $this->hc->getHtmlTag('img', ['src' => $src, 'alt' => $lang . ' ' . $tableName], '', true, '', ''); + $anchor .= $this->hc->getHtmlTag('a', ['href' => $tableName . ".php?op=delete&{$fieldId}=" . $double, 'title' => $lang], $img, false, "\t\t\t\t\t"); + $td .= $this->hc->getHtmlTag('td', ['class' => 'center width5'], "\n" . $anchor . "\t\t\t\t", false, "\t\t\t\t"); + $cycle = $this->sc->getSmartyNoSimbol('cycle values=\'odd, even\''); + $tr = $this->hc->getHtmlTableRow($td, $cycle, "\t\t\t"); + $foreach = $this->sc->getSmartyForeach($tableSoleName, $tableName . '_list', $tr, '','', "\t\t\t"); + $tbody = $this->hc->getHtmlTableTbody($foreach,'' , "\t\t"); - return $sc->getSmartyConditions($tableName . '_count', '', '', $tbody, '', false, false, "\t\t"); + return $this->sc->getSmartyConditions($tableName . '_count', '', '', $tbody, '', false, false, "\t\t"); } /** @@ -214,17 +238,16 @@ private function getTemplatesAdminPagesTableTBody($moduleDirname, $tableName, $t * @param string $tableName * @param $tableSoleName * @param $tableAutoincrement - * @param string $fields + * @param $fields * @param string $language * @return string */ - private function getTemplatesAdminPagesTable($moduleDirname, $tableName, $tableSoleName, $tableAutoincrement, $fields, $language) + private function getTemplatesAdminPagesTable(string $moduleDirname, string $tableName, $tableSoleName, $tableAutoincrement, $fields, string $language) { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); $tbody = $this->getTemplatesAdminPagesTableThead($tableSoleName, $tableAutoincrement, $fields, $language); $tbody .= $this->getTemplatesAdminPagesTableTBody($moduleDirname, $tableName, $tableSoleName, $tableAutoincrement, $fields); - return $hc->getHtmlTable($tbody, 'table table-bordered', "\t"); + return $this->hc->getHtmlTable($tbody, 'outer', "\t"); } /** @@ -233,28 +256,26 @@ private function getTemplatesAdminPagesTable($moduleDirname, $tableName, $tableS * @param string $tableName * @param $tableSoleName * @param $tableAutoincrement - * @param string $fields + * @param $fields * @param string $language * @return string */ - private function getTemplatesAdminPages($moduleDirname, $tableName, $tableSoleName, $tableAutoincrement, $fields, $language) + private function getTemplatesAdminPages(string $moduleDirname, string $tableName, $tableSoleName, $tableAutoincrement, $fields, string $language) { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); $htmlTable = $this->getTemplatesAdminPagesTable($moduleDirname, $tableName, $tableSoleName, $tableAutoincrement, $fields, $language); - $htmlTable .= $hc->getHtmlTag('div', ['class' => 'clear'], ' ', false, "\t"); - $single = $sc->getSmartySingleVar('pagenav'); - $div = $hc->getHtmlTag('div', ['class' => 'xo-pagenav floatright'], $single, false, "\t\t"); - $div .= $hc->getHtmlTag('div', ['class' => 'clear spacer'], '', false, "\t\t", "\n"); - $htmlTable .= $sc->getSmartyConditions('pagenav', '', '', $div, '', '', '', "\t" ); - $ifList = $sc->getSmartyConditions($tableName . '_list', '', '', $htmlTable); - $single = $sc->getSmartySingleVar('form', "\t", "\n"); - $ifList .= $sc->getSmartyConditions('form', '', '', $single); - $single = $sc->getSmartySingleVar('error'); - $strong = $hc->getHtmlTag('strong', [], $single, false, '', ''); - $div = $hc->getHtmlTag('div', ['class' => 'errorMsg'], $strong, false, "\t", "\n"); - $ifList .= $sc->getSmartyConditions('error', '', '', $div); - $ifList .= $hc->getHtmlEmpty('', '', "\n");; + $htmlTable .= $this->hc->getHtmlTag('div', ['class' => 'clear'], ' ', false, "\t"); + $single = $this->sc->getSmartySingleVar('pagenav'); + $div = $this->hc->getHtmlTag('div', ['class' => 'xo-pagenav floatright'], $single, false, "\t\t"); + $div .= $this->hc->getHtmlTag('div', ['class' => 'clear spacer'], '', false, "\t\t"); + $htmlTable .= $this->sc->getSmartyConditions('pagenav', '', '', $div, '', '', '', "\t" ); + $ifList = $this->sc->getSmartyConditions($tableName . '_list', '', '', $htmlTable); + $single = $this->sc->getSmartySingleVar('form', "\t", "\n"); + $ifList .= $this->sc->getSmartyConditions('form', '', '', $single); + $single = $this->sc->getSmartySingleVar('error'); + $strong = $this->hc->getHtmlTag('strong', [], $single, false, '', ''); + $div = $this->hc->getHtmlTag('div', ['class' => 'errorMsg'], $strong, false, "\t"); + $ifList .= $this->sc->getSmartyConditions('error', '', '', $div); + $ifList .= $this->hc->getHtmlEmpty('', '', "\n"); return $ifList; } @@ -264,20 +285,18 @@ private function getTemplatesAdminPages($moduleDirname, $tableName, $tableSoleNa * @param string $moduleDirname * @return string */ - private function getTemplatesAdminPagesFooter($moduleDirname) + private function getTemplatesAdminPagesFooter(string $moduleDirname) { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); - $ret = $hc->getHtmlComment('Footer', "\n"); - $ret .= $sc->getSmartyIncludeFile($moduleDirname, 'footer', true); + $ret = $this->hc->getHtmlComment('Footer', '', "\n"); + $ret .= $this->sc->getSmartyIncludeFile($moduleDirname, 'footer', true); return $ret; } /** * @public function render - * @param null - * @return bool|string + * + * @return string */ public function render() { @@ -285,13 +304,13 @@ public function render() $table = $this->getTable(); $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); - $language = $this->getLanguage($moduleDirname, 'AM'); + $language = $this->getLanguage($moduleDirname, 'AM', '', false); $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'), 'field_order'); $content = $this->getTemplatesAdminPagesHeader($moduleDirname); $content .= $this->getTemplatesAdminPages($moduleDirname, $table->getVar('table_name'), $table->getVar('table_solename'), $table->getVar('table_autoincrement'), $fields, $language); $content .= $this->getTemplatesAdminPagesFooter($moduleDirname); - $this->create($moduleDirname, 'templates/admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'templates/admin', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/Templates/Admin/TemplatesAdminPermissions.php b/class/Files/Templates/Admin/TemplatesAdminPermissions.php index 25e09d2c..06ca2611 100644 --- a/class/Files/Templates/Admin/TemplatesAdminPermissions.php +++ b/class/Files/Templates/Admin/TemplatesAdminPermissions.php @@ -1,9 +1,9 @@ -hc = Modulebuilder\Files\CreateHtmlCode::getInstance(); + $this->sc = Modulebuilder\Files\CreateSmartyCode::getInstance(); } /** * @static function getInstance - * @param null + * * @return TemplatesAdminPermissions */ public static function getInstance() @@ -57,10 +67,10 @@ public static function getInstance() /** * @public function write - * @param string $module + * @param $module * @param $filename */ - public function write($module, $filename) + public function write($module, $filename): void { $this->setModule($module); $this->setFileName($filename); @@ -72,25 +82,20 @@ public function write($module, $filename) * * @return string */ - private function getTemplatesAdminPermissionsHeader($moduleDirname) + private function getTemplatesAdminPermissionsHeader(string $moduleDirname) { - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); - - return $sc->getSmartyIncludeFile($moduleDirname, 'header', true, '', '', "\n\n"); + return $this->sc->getSmartyIncludeFile($moduleDirname, 'header', true, '', "\n\n"); } /** * @private function getTemplatesAdminPermissions - * @param null + * * @return string */ private function getTemplatesAdminPermissions() { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); - $form = $sc->getSmartySingleVar('form'); - $ret = $hc->getHtmlTag('div', ['class' => 'spacer'], $form, '', '', "\n\n"); - return $ret; + $form = $this->sc->getSmartySingleVar('form'); + return $this->hc->getHtmlTag('div', ['class' => 'spacer'], $form, false, '', "\n\n"); } /** @@ -99,16 +104,15 @@ private function getTemplatesAdminPermissions() * * @return string */ - private function getTemplatesAdminPermissionsFooter($moduleDirname) + private function getTemplatesAdminPermissionsFooter(string $moduleDirname) { - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); - return $sc->getSmartyIncludeFile($moduleDirname, 'footer', true); + return $this->sc->getSmartyIncludeFile($moduleDirname, 'footer', true); } /** * @public function render - * @param null - * @return bool|string + * + * @return string */ public function render() { @@ -119,7 +123,7 @@ public function render() $content .= $this->getTemplatesAdminPermissions(); $content .= $this->getTemplatesAdminPermissionsFooter($moduleDirname); - $this->create($moduleDirname, 'templates/admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'templates/admin', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/Templates/Admin/index.php b/class/Files/Templates/Admin/index.php new file mode 100644 index 00000000..e5ee0725 --- /dev/null +++ b/class/Files/Templates/Admin/index.php @@ -0,0 +1,2 @@ +hc = Modulebuilder\Files\CreateHtmlCode::getInstance(); + $this->sc = Modulebuilder\Files\CreateSmartyCode::getInstance(); + } + + /** + * @static function getInstance + * + * @return TemplatesBlocks + */ + public static function getInstance() + { + static $instance = false; + if (!$instance) { + $instance = new self(); + } + + return $instance; + } + + /** + * @public function write + * @param $module + * @param $table + * @param string $filename + */ + public function write($module, $table, string $filename): void + { + $this->setModule($module); + $this->setTable($table); + $this->setFileName($filename); + } + + /** + * @private function getTemplatesBlocksTableThead + * @param $tableId + * @param $tableMid + * @param string $language + * @param $tableAutoincrement + * @return string + */ + private function getTemplatesBlocksTableThead($tableId, $tableMid, string $language, $tableAutoincrement) + { + $th = ''; + if (1 == $tableAutoincrement) { + $th .= $this->hc->getHtmlTableHead(' ', '', '', "\t\t\t"); + } + $fields = $this->getTableFields($tableMid, $tableId); + foreach (\array_keys($fields) as $f) { + if (1 === (int)$fields[$f]->getVar('field_block')) { + $fieldName = $fields[$f]->getVar('field_name'); + $stuFieldName = \mb_strtoupper($fieldName); + $lang = $this->sc->getSmartyConst($language, $stuFieldName); + $th .= $this->hc->getHtmlTableHead($lang, 'center', '', "\t\t\t"); + } + } + $th .= $this->hc->getHtmlTableHead(' ', '', '', "\t\t\t"); + $tr = $this->hc->getHtmlTableRow($th, 'head', "\t\t"); + + return $this->hc->getHtmlTableThead($tr, '', "\t"); + } + + /** + * @private function getTemplatesBlocksTableTbody + * @param string $moduleDirname + * @param $tableId + * @param $tableMid + * @param $tableName + * @param $tableSoleName + * @param $tableAutoincrement + * @param $language + * @return string + */ + private function getTemplatesBlocksTableTbody(string $moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableAutoincrement, $language) + { + $td = ''; + $fieldId = ''; + $stuTableSoleName = \mb_strtoupper($tableSoleName); + if (1 == $tableAutoincrement) { + $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'id'); + $td .= $this->hc->getHtmlTableData($double, 'center', '', "\t\t\t"); + } + $fields = $this->getTableFields($tableMid, $tableId); + foreach (\array_keys($fields) as $f) { + if (0 == $f) { + $fieldId = $fields[$f]->getVar('field_name'); + } + if (1 === (int)$fields[$f]->getVar('field_block')) { + $fieldName = $fields[$f]->getVar('field_name'); + $fieldElement = $fields[$f]->getVar('field_element'); + $rpFieldName = $this->getRightString($fieldName); + if (1 == $fields[$f]->getVar('field_inlist')) { + switch ($fieldElement) { + case Constants::FIELD_ELE_COLORPICKER: + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName); + $span = $this->hc->getHtmlTag('span', [], $double, false, '', ''); + $td .= $this->hc->getHtmlTableData($span, 'center', '', "\t\t\t"); + break; + case Constants::FIELD_ELE_IMAGELIST: + $src = $this->sc->getSmartyNoSimbol('xoModuleIcons32'); + $src .= $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName, '', '', "''", "'html'"); + $img = $this->hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true, '', ''); + $td .= $this->hc->getHtmlTableData($img, 'center', '', "\t\t\t"); + break; + case Constants::FIELD_ELE_UPLOADIMAGE: + $single = $this->sc->getSmartySingleVar($moduleDirname . '_upload_url', '', '', "''", "'htmlattr'"); + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName, '', '', "''", "'html'"); + $img = $this->hc->getHtmlTag('img', ['src' => $single . "/images/{$tableName}/" . $double, 'alt' => $tableName], '', true, '', ''); + $td .= $this->hc->getHtmlTableData($img, 'center', '', "\t\t\t"); + break; + case Constants::FIELD_ELE_TEXTAREA: + case Constants::FIELD_ELE_DHTMLTEXTAREA: + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName . '_short', '', '', "''", "'html'"); + $td .= $this->hc->getHtmlTableData($double, 'center', '', "\t\t\t"); + break; + case Constants::FIELD_ELE_SELECTSTATUS: + case Constants::FIELD_ELE_RADIOYN: + case Constants::FIELD_ELE_RADIO_ONOFFLINE: + case Constants::FIELD_ELE_SELECTUSER: + case Constants::FIELD_ELE_DATETIME: + case Constants::FIELD_ELE_TEXTDATESELECT: + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName . '_text', '', '', "''", "'html'"); + $td .= $this->hc->getHtmlTableData($double, 'center', '', "\t\t\t"); + break; + default: + if (0 != $f) { + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName, '', '', "''", "'html'"); + $td .= $this->hc->getHtmlTableData($double, 'center', '', "\t\t\t"); + } + break; + } + } + } + } + // TODO: allow edit only for admins + // $lang = $this->sc->getSmartyConst('', '_EDIT'); + // $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'id'); + // $src = $this->sc->getSmartyNoSimbol('xoModuleIcons32 edit.png'); + // $img = $this->hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true, '', ''); + // $anchor = $this->hc->getHtmlTag('a', ['href' => $tableName . ".php?op=edit&{$fieldId}=" . $double, 'title' => $lang], $img, false, "\t\t\t\t"); + // $lang = $this->sc->getSmartyConst('', '_DELETE'); + // $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'id'); + // $src = $this->sc->getSmartyNoSimbol('xoModuleIcons32 delete.png'); + // $img = $this->hc->getHtmlTag('img', ['src' => $src . $double, 'alt' => $tableName], '', true, '', ''); + // $anchor .= $this->hc->getHtmlTag('a', ['href' => $tableName . ".php?op=delete&{$fieldId}=" . $double, 'title' => $lang], $img, false, "\t\t\t\t"); + // $td .= $this->hc->getHtmlTag('td', ['class' => 'center'], "\n" . $anchor . "\t\t\t", false, "\t\t\t"); + $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'id'); + $lang = $this->sc->getSmartyConst($language, $stuTableSoleName . '_GOTO|escape:"htmlattr"'); + $single = $this->sc->getSmartySingleVar($moduleDirname . '_url', '', '', "''", "'htmlattr'"); + $anchor = $this->hc->getHtmlAnchor($single . '/' . $tableName . ".php?op=show&{$fieldId}=" . $double, $lang, $lang); + $td .= $this->hc->getHtmlTableData($anchor, 'center', '', "\t\t\t"); + $cycle = $this->sc->getSmartyNoSimbol('cycle values="odd, even"'); + $tr = $this->hc->getHtmlTableRow($td, $cycle, "\t\t"); + $foreach = $this->sc->getSmartyForeach($tableSoleName, 'block', $tr, '', '', "\t\t"); + $tbody = $this->hc->getHtmlTableTbody($foreach, '', "\t"); + + return $this->sc->getSmartyConditions('block', ' > ', '0', $tbody, false, true, true, "\t"); + } + + /** + * @private function getTemplatesBlocksTfoot + * @return string + */ + private function getTemplatesBlocksTableTfoot() + { + $td = $this->hc->getHtmlTag('td', [], ' ', false, '', ''); + $tr = $this->hc->getHtmlTag('tr', [], $td, false, '', ''); + + return $this->hc->getHtmlTag('tfoot', [], $tr, false, "\t"); + } + + /** + * @private function getTemplatesBlocksTable + * @param string $moduleDirname + * @param $tableId + * @param $tableMid + * @param string $tableName + * @param $tableSoleName + * @param $tableAutoincrement + * @param string $language + * @return string + */ + private function getTemplatesBlocksTable(string $moduleDirname, $tableId, $tableMid, string $tableName, $tableSoleName, $tableAutoincrement, string $language) + { + $tbody = $this->getTemplatesBlocksTableThead($tableId, $tableMid, $language, $tableAutoincrement); + $tbody .= $this->getTemplatesBlocksTableTbody($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableAutoincrement, $language); + $tbody .= $this->getTemplatesBlocksTableTfoot(); + $single = $this->sc->getSmartySingleVar('table_type'); + + return $this->hc->getHtmlTable($tbody, 'table table-responsive table-' . $single); + } + + /** + * @public function render + * + * @return string + */ + public function render() + { + $module = $this->getModule(); + $table = $this->getTable(); + $filename = $this->getFileName(); + $moduleDirname = $module->getVar('mod_dirname'); + $tableId = $table->getVar('table_id'); + $tableMid = $table->getVar('table_mid'); + $tableName = $table->getVar('table_name'); + $tableSoleName = $table->getVar('table_solename'); + $tableAutoincrement = $table->getVar('table_autoincrement'); + $language = $this->getLanguage($moduleDirname, 'MB', '', false); + $content = $this->getTemplatesBlocksTable($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableAutoincrement, $language); + + $this->create($moduleDirname, 'templates/blocks', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); + + return $this->renderFile(); + } +} diff --git a/class/Files/Templates/Blocks/Defstyle/TemplatesBlocksSpotlight.php b/class/Files/Templates/Blocks/Defstyle/TemplatesBlocksSpotlight.php new file mode 100644 index 00000000..36a2d94b --- /dev/null +++ b/class/Files/Templates/Blocks/Defstyle/TemplatesBlocksSpotlight.php @@ -0,0 +1,267 @@ +hc = Modulebuilder\Files\CreateHtmlCode::getInstance(); + $this->sc = Modulebuilder\Files\CreateSmartyCode::getInstance(); + } + + /** + * @static function getInstance + * + * @return false|TemplatesBlocksSpotlight + */ + public static function getInstance() + { + static $instance = false; + if (!$instance) { + $instance = new self(); + } + + return $instance; + } + + /** + * @public function write + * @param $module + * @param $table + * @param string $filename + */ + public function write($module, $table, string $filename) + { + $this->setModule($module); + $this->setTable($table); + $this->setFileName($filename); + } + + /** + * @private function getTemplatesBlocksTableThead + * @param $tableId + * @param $tableMid + * @param string $language + * @param $tableAutoincrement + * @return string + */ + private function getTemplatesBlocksTableThead($tableId, $tableMid, string $language, $tableAutoincrement) + { + $th = ''; + if (1 == $tableAutoincrement) { + $th .= $this->hc->getHtmlTableHead(' ', '', '', "\t\t\t"); + } + $fields = $this->getTableFields($tableMid, $tableId); + foreach (\array_keys($fields) as $f) { + if (1 === (int)$fields[$f]->getVar('field_block')) { + $fieldName = $fields[$f]->getVar('field_name'); + $stuFieldName = \mb_strtoupper($fieldName); + $lang = $this->sc->getSmartyConst($language, $stuFieldName); + $th .= $this->hc->getHtmlTableHead($lang, 'center', '', "\t\t\t"); + } + } + $th .= $this->hc->getHtmlTableHead(' ', '', '', "\t\t\t"); + $tr = $this->hc->getHtmlTableRow($th, 'head', "\t\t"); + + return $this->hc->getHtmlTableThead($tr, '', "\t"); + } + + /** + * @private function getTemplatesBlocksTableTbody + * @param string $moduleDirname + * @param $tableId + * @param $tableMid + * @param $tableName + * @param $tableSoleName + * @param $tableAutoincrement + * @param $language + * @return string + */ + private function getTemplatesBlocksTableTbody(string $moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableAutoincrement, $language) + { + $td = ''; + $fieldId = ''; + $stuTableSoleName = \mb_strtoupper($tableSoleName); + if (1 == $tableAutoincrement) { + $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'id'); + $td .= $this->hc->getHtmlTableData($double, 'center', '', "\t\t\t"); + } + $fields = $this->getTableFields($tableMid, $tableId); + foreach (\array_keys($fields) as $f) { + if (0 == $f) { + $fieldId = $fields[$f]->getVar('field_name'); + } + if (1 === (int)$fields[$f]->getVar('field_block')) { + $fieldName = $fields[$f]->getVar('field_name'); + $fieldElement = $fields[$f]->getVar('field_element'); + $rpFieldName = $this->getRightString($fieldName); + if (1 == $fields[$f]->getVar('field_inlist')) { + switch ($fieldElement) { + case Constants::FIELD_ELE_COLORPICKER: + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName); + $span = $this->hc->getHtmlTag('span', [], $double, false, '', ''); + $td .= $this->hc->getHtmlTableData($span, 'center', '', "\t\t\t"); + break; + case Constants::FIELD_ELE_IMAGELIST: + $src = $this->sc->getSmartyNoSimbol('xoModuleIcons32'); + $src .= $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName); + $img = $this->hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true, '', ''); + $td .= $this->hc->getHtmlTableData($img, 'center', '', "\t\t\t"); + break; + case Constants::FIELD_ELE_UPLOADIMAGE: + $single = $this->sc->getSmartySingleVar($moduleDirname . '_upload_url'); + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName); + $img = $this->hc->getHtmlTag('img', ['src' => $single . "/images/{$tableName}/" . $double, 'alt' => $tableName], '', true, '', ''); + $td .= $this->hc->getHtmlTableData($img, 'center', '', "\t\t\t"); + break; + case Constants::FIELD_ELE_TEXTAREA: + case Constants::FIELD_ELE_DHTMLTEXTAREA: + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName . '_short'); + $td .= $this->hc->getHtmlTableData($double, 'center', '', "\t\t\t"); + break; + case Constants::FIELD_ELE_SELECTSTATUS: + case Constants::FIELD_ELE_RADIOYN: + case Constants::FIELD_ELE_SELECTUSER: + case Constants::FIELD_ELE_DATETIME: + case Constants::FIELD_ELE_TEXTDATESELECT: + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName . '_text'); + $td .= $this->hc->getHtmlTableData($double, 'center', '', "\t\t\t"); + break; + default: + if (0 != $f) { + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName); + $td .= $this->hc->getHtmlTableData($double, 'center', '', "\t\t\t"); + } + break; + } + } + } + } + // TODO: allow edit only for admins + // $lang = $this->sc->getSmartyConst('', '_EDIT'); + // $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'id'); + // $src = $this->sc->getSmartyNoSimbol('xoModuleIcons32 edit.png'); + // $img = $this->hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true, '', ''); + // $anchor = $this->hc->getHtmlTag('a', ['href' => $tableName . ".php?op=edit&{$fieldId}=" . $double, 'title' => $lang], $img, false, "\t\t\t\t"); + // $lang = $this->sc->getSmartyConst('', '_DELETE'); + // $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'id'); + // $src = $this->sc->getSmartyNoSimbol('xoModuleIcons32 delete.png'); + // $img = $this->hc->getHtmlTag('img', ['src' => $src . $double, 'alt' => $tableName], '', true, '', ''); + // $anchor .= $this->hc->getHtmlTag('a', ['href' => $tableName . ".php?op=delete&{$fieldId}=" . $double, 'title' => $lang], $img, false, "\t\t\t\t"); + // $td .= $this->hc->getHtmlTag('td', ['class' => 'center'], "\n" . $anchor . "\t\t\t", false, "\t\t\t"); + $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'id'); + $lang = $this->sc->getSmartyConst($language, $stuTableSoleName . '_GOTO'); + $single = $this->sc->getSmartySingleVar($moduleDirname . '_url'); + $anchor = $this->hc->getHtmlAnchor($single . '/' . $tableName . ".php?op=show&{$fieldId}=" . $double, $lang, $lang); + $td .= $this->hc->getHtmlTableData($anchor, 'center', '', "\t\t\t"); + $cycle = $this->sc->getSmartyNoSimbol('cycle values="odd, even"'); + $tr = $this->hc->getHtmlTableRow($td, $cycle, "\t\t"); + $foreach = $this->sc->getSmartyForeach($tableSoleName, 'block', $tr, '','', "\t\t"); + $tbody = $this->hc->getHtmlTableTbody($foreach,'' , "\t"); + + return $this->sc->getSmartyConditions("block|default:0", ' > ', '0', $tbody, false, true, true, "\t"); + } + + /** + * @private function getTemplatesBlocksTfoot + * @return string + */ + private function getTemplatesBlocksTableTfoot() + { + $td = $this->hc->getHtmlTag('td', [], " ", false, '', ''); + $tr = $this->hc->getHtmlTag('tr', [], $td, false, '', ''); + + return $this->hc->getHtmlTag('tfoot', [], $tr, false, "\t"); + } + + /** + * @private function getTemplatesBlocksTable + * @param string $moduleDirname + * @param $tableId + * @param $tableMid + * @param string $tableName + * @param $tableSoleName + * @param $tableAutoincrement + * @param string $language + * @return string + */ + private function getTemplatesBlocksTable(string $moduleDirname, $tableId, $tableMid, string $tableName, $tableSoleName, $tableAutoincrement, string $language) + { + $tbody = $this->getTemplatesBlocksTableThead($tableId, $tableMid, $language, $tableAutoincrement); + $tbody .= $this->getTemplatesBlocksTableTbody($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableAutoincrement, $language); + $tbody .= $this->getTemplatesBlocksTableTfoot(); + $single = $this->sc->getSmartySingleVar('table_type'); + + return $this->hc->getHtmlTable($tbody, 'table table-responsive table-' . $single); + } + + /** + * @public function render + * + * @return string + */ + public function render() + { + $module = $this->getModule(); + $table = $this->getTable(); + $filename = $this->getFileName(); + $moduleDirname = $module->getVar('mod_dirname'); + $tableId = $table->getVar('table_id'); + $tableMid = $table->getVar('table_mid'); + $tableName = $table->getVar('table_name'); + $tableSoleName = $table->getVar('table_solename'); + $tableAutoincrement = $table->getVar('table_autoincrement'); + $language = $this->getLanguage($moduleDirname, 'MB', '', false); + $content = $this->getTemplatesBlocksTable($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableAutoincrement, $language); + + $this->create($moduleDirname, 'templates/blocks', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); + + return $this->renderFile(); + } +} diff --git a/class/Files/Templates/Blocks/Defstyle/index.php b/class/Files/Templates/Blocks/Defstyle/index.php new file mode 100644 index 00000000..e5ee0725 --- /dev/null +++ b/class/Files/Templates/Blocks/Defstyle/index.php @@ -0,0 +1,2 @@ +setModule($module); - $this->setTable($table); - $this->setFileName($filename); - } - - /** - * @private function getTemplatesBlocksTableThead - * @param $tableId - * @param $tableMid - * @param string $language - * @param $tableAutoincrement - * @return string - */ - private function getTemplatesBlocksTableThead($tableId, $tableMid, $language, $tableAutoincrement) - { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); - $th = ''; - if (1 == $tableAutoincrement) { - $th .= $hc->getHtmlTableHead(' ', '', '', "\t\t\t"); - } - $fields = $this->getTableFields($tableMid, $tableId); - foreach (array_keys($fields) as $f) { - if (1 === (int)$fields[$f]->getVar('field_block')) { - $fieldName = $fields[$f]->getVar('field_name'); - $stuFieldName = mb_strtoupper($fieldName); - $lang = $sc->getSmartyConst($language, $stuFieldName); - $th .= $hc->getHtmlTableHead($lang, 'center', '', "\t\t\t"); - } - } - $tr = $hc->getHtmlTableRow($th, 'head', "\t\t"); - - return $hc->getHtmlTableThead($tr, '', "\t"); - } - - /** - * @private function getTemplatesBlocksTableTbody - * @param string $moduleDirname - * @param $tableId - * @param $tableMid - * @param $tableName - * @param $tableSoleName - * @param $tableAutoincrement - * @return string - */ - private function getTemplatesBlocksTableTbody($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableAutoincrement) - { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); - $td = ''; - if (1 == $tableAutoincrement) { - $double = $sc->getSmartyDoubleVar($tableSoleName, 'id'); - $td .= $hc->getHtmlTableData($double, 'center', '', "\t\t\t"); - } - $fields = $this->getTableFields($tableMid, $tableId); - foreach (array_keys($fields) as $f) { - if (1 === (int)$fields[$f]->getVar('field_block')) { - $fieldName = $fields[$f]->getVar('field_name'); - $fieldElement = $fields[$f]->getVar('field_element'); - $rpFieldName = $this->getRightString($fieldName); - if (1 == $fields[$f]->getVar('field_inlist')) { - switch ($fieldElement) { - case 9: - // This is to be reviewed, as it was initially to style = "backgroung-color: #" - // Now with HTML5 is not supported inline style in the parameters of the HTML tag - // Old code was ... - $double = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName); - $span = $hc->getHtmlTag('span', [], $double); - $td .= $hc->getHtmlTableData($span, 'center', '', "\t\t\t"); - /*$ret .= << \n
- EOT;*/
- break;
- case 10:
- $src = $sc->getSmartyNoSimbol('xoModuleIcons32');
- $src .= $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
- $img = $hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true, '', '');
- $td .= $hc->getHtmlTableData($img, 'center', '', "\t\t\t");
- break;
- case 13:
- $single = $sc->getSmartySingleVar($moduleDirname . '_upload_url');
- $double = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
- $img = $hc->getHtmlTag('img', ['src' => $single . "/images/{$tableName}/" . $double, 'alt' => $tableName], '', true, '', '');
- $td .= $hc->getHtmlTableData($img, 'center', '', "\t\t\t");
- break;
- default:
- if (0 != $f) {
- $double = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
- $td .= $hc->getHtmlTableData($double, 'center', '', "\t\t\t");
- }
- break;
- }
- }
- }
- }
- // TODO: allow edit only for admins
- // $lang = $sc->getSmartyConst('', '_EDIT');
- // $double = $sc->getSmartyDoubleVar($tableSoleName, 'id');
- // $src = $sc->getSmartyNoSimbol('xoModuleIcons32 edit.png');
- // $img = $hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true, '', '');
- // $anchor = $hc->getHtmlTag('a', ['href' => $tableName . ".php?op=edit&{$fieldId}=" . $double, 'title' => $lang], $img, false, "\t\t\t\t");
- // $lang = $sc->getSmartyConst('', '_DELETE');
- // $double = $sc->getSmartyDoubleVar($tableSoleName, 'id');
- // $src = $sc->getSmartyNoSimbol('xoModuleIcons32 delete.png');
- // $img = $hc->getHtmlTag('img', ['src' => $src . $double, 'alt' => $tableName], '', true, '', '');
- // $anchor .= $hc->getHtmlTag('a', ['href' => $tableName . ".php?op=delete&{$fieldId}=" . $double, 'title' => $lang], $img, false, "\t\t\t\t");
- // $td .= $hc->getHtmlTag('td', ['class' => 'center'], "\n" . $anchor . "\t\t\t", false, "\t\t\t");
- $cycle = $sc->getSmartyNoSimbol('cycle values="odd, even"');
- $tr = $hc->getHtmlTableRow($td, $cycle, "\t\t");
- $foreach = $sc->getSmartyForeach($tableSoleName, 'block', $tr, '','', "\t\t");
- $tbody = $hc->getHtmlTableTbody($foreach,'' , "\t");
-
- return $sc->getSmartyConditions("block", '', '', $tbody, false, true, true, "\t");
- }
-
- /**
- * @private function getTemplatesBlocksTfoot
- * @return string
- */
- private function getTemplatesBlocksTableTfoot()
- {
- $hc = Tdmcreate\Files\CreateHtmlCode::getInstance();
- $td = $hc->getHtmlTag('td', [], " ", false, '', '');
- $tr = $hc->getHtmlTag('tr', [], $td, false, '', '');
-
- return $hc->getHtmlTag('tfoot', [], $tr, false, "\t");
- }
-
- /**
- * @private function getTemplatesBlocksTable
- * @param string $moduleDirname
- * @param $tableId
- * @param $tableMid
- * @param string $tableName
- * @param $tableSoleName
- * @param $tableAutoincrement
- * @param string $language
- * @return string
- */
- private function getTemplatesBlocksTable($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableAutoincrement, $language)
- {
- $hc = Tdmcreate\Files\CreateHtmlCode::getInstance();
- $sc = Tdmcreate\Files\CreateSmartyCode::getInstance();
- $tbody = $this->getTemplatesBlocksTableThead($tableId, $tableMid, $language, $tableAutoincrement);
- $tbody .= $this->getTemplatesBlocksTableTbody($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableAutoincrement);
- $tbody .= $this->getTemplatesBlocksTableTfoot();
- $single = $sc->getSmartySingleVar('table_type');
-
- return $hc->getHtmlTable($tbody, 'table table-' . $single);
- }
-
- /**
- * @public function render
- * @param null
- *
- * @return bool|string
- */
- public function render()
- {
- $module = $this->getModule();
- $table = $this->getTable();
- $filename = $this->getFileName();
- $moduleDirname = $module->getVar('mod_dirname');
- $tableId = $table->getVar('table_id');
- $tableMid = $table->getVar('table_mid');
- $tableName = $table->getVar('table_name');
- $tableSoleName = $table->getVar('table_solename');
- $tableAutoincrement = $table->getVar('table_autoincrement');
- $language = $this->getLanguage($moduleDirname, 'MB');
- $content = $this->getTemplatesBlocksTable($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableAutoincrement, $language);
-
- $this->create($moduleDirname, 'templates/blocks', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
-
- return $this->renderFile();
- }
-}
diff --git a/class/Files/Templates/Blocks/index.php b/class/Files/Templates/Blocks/index.php
new file mode 100644
index 00000000..e5ee0725
--- /dev/null
+++ b/class/Files/Templates/Blocks/index.php
@@ -0,0 +1,2 @@
+hc = Modulebuilder\Files\CreateHtmlCode::getInstance();
+ $this->sc = Modulebuilder\Files\CreateSmartyCode::getInstance();
+ $this->cf = Modulebuilder\Files\CreateFile::getInstance();
+ }
+
+ /**
+ * @static function getInstance
+ * @return bool|Breadcrumbs
+ */
+ public static function getInstance()
+ {
+ static $instance = false;
+ if (!$instance) {
+ $instance = new self();
+ }
+
+ return $instance;
+ }
+
+ /**
+ * @public function write
+ * @param $module
+ * @param string $filename
+ */
+ public function write($module, string $filename): void
+ {
+ $this->setModule($module);
+ $this->setFileName($filename);
+ }
+
+ /**
+ * @public function render
+ *
+ * @return string
+ */
+ public function render(): string
+ {
+ $module = $this->getModule();
+ $filename = $this->getFileName();
+ $moduleDirname = $module->getVar('mod_dirname');
+ $stuModuleDirname = \strtoupper($moduleDirname);
+
+ $title = $this->sc->getSmartyDoubleVar('itm', 'title','','',"''", "'html'");
+ $title2 = $this->sc->getSmartyDoubleVar('itm', 'title','','',"''", "'htmlattr'");
+ $titleElse = $this->sc->getSmartyDoubleVar('itm', 'title', "\t\t\t", "\n", "''", "'html'");
+ $link = $this->sc->getSmartyDoubleVar('itm', 'link','','',"''", "'htmlattr'");
+ $glyph = $this->hc->getHtmlTag('i', ['class' => 'glyphicon glyphicon-home fa fa-home'], '', false, '', '');
+ $langHome = $this->sc->getSmartyConst('_MA_' . $stuModuleDirname, '_HOME');
+ $anchor = $this->hc->getHtmlAnchor("<{xoAppUrl 'index.php'}>", $glyph, $langHome);
+ $into = $this->hc->getHtmlLi($anchor, 'breadcrumb-item', "\t");
+ $anchorIf = $this->hc->getHtmlAnchor($link, $title, $title2, '', '', '', "\t\t\t", "\n");
+ $breadcrumb = $this->sc->getSmartyConditions('itm.link', '', '', $anchorIf, $titleElse, false, false, "\t\t");
+ $foreach = $this->hc->getHtmlLi($breadcrumb, 'breadcrumb-item', "\t", "\n", true);
+ $into .= $this->sc->getSmartyForeach('itm', 'xoBreadcrumbs', $foreach, 'bcloop', '', "\t");
+
+ $content = $this->hc->getHtmlOl($into, 'breadcrumb');
+
+ $this->cf->create($moduleDirname, 'templates', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
+
+ return $this->cf->renderFile();
+ }
+}
diff --git a/class/Files/Templates/User/Defstyle/Categories.php b/class/Files/Templates/User/Defstyle/Categories.php
new file mode 100644
index 00000000..6dda46ff
--- /dev/null
+++ b/class/Files/Templates/User/Defstyle/Categories.php
@@ -0,0 +1,228 @@
+hc = Modulebuilder\Files\CreateHtmlCode::getInstance();
+ $this->sc = Modulebuilder\Files\CreateSmartyCode::getInstance();
+ }
+
+ /**
+ * @static function getInstance
+ * @return bool|Categories
+ */
+ public static function getInstance()
+ {
+ static $instance = false;
+ if (!$instance) {
+ $instance = new self();
+ }
+
+ return $instance;
+ }
+
+ /**
+ * @public function write
+ * @param $module
+ * @param $table
+ * @param string $filename
+ */
+ public function write($module, $table, string $filename): void
+ {
+ $this->setModule($module);
+ $this->setTable($table);
+ $this->setFileName($filename);
+ }
+
+ /**
+ * @private function getTemplatesUserCategoriesHeader
+ * @param string $moduleDirname
+ * @return string
+ */
+ private function getTemplatesUserCategoriesHeader(string $moduleDirname): string
+ {
+ return $this->sc->getSmartyIncludeFile($moduleDirname) . PHP_EOL;
+ }
+
+ /**
+ * @private function getTemplatesUserCategoriesTable
+ * @param string $language
+ * @param $moduleDirname
+ * @param $tableName
+ * @param $tableSoleName
+ * @return string
+ */
+ private function getTemplatesUserCategoriesTable($moduleDirname, $tableName, $tableSoleName, string $language): string
+ {
+ $single = $this->sc->getSmartySingleVar('table_type');
+ $table = $this->getTemplatesUserCategoriesThead($tableName, $language);
+ $table .= $this->getTemplatesUserCategoriesTbody($moduleDirname, $tableName, $tableSoleName);
+
+ return $this->hc->getHtmlTable($table, 'table table-' . $single) . PHP_EOL;
+ }
+
+ /**
+ * @private function getTemplatesUserCategoriesThead
+ * @param string $language
+ * @param $tableName
+ * @return string
+ */
+ private function getTemplatesUserCategoriesThead($tableName, string $language): string
+ {
+ $stuTableName = \mb_strtoupper($tableName);
+ $lang = $this->sc->getSmartyConst($language, $stuTableName . '_TITLE');
+ $single = $this->sc->getSmartySingleVar('numb_col');
+ $th = $this->hc->getHtmlTableHead($lang, '', $single) . PHP_EOL;
+ $tr = $this->hc->getHtmlTableRow($th, 'head') . PHP_EOL;
+
+ return $this->hc->getHtmlTableThead($tr) . PHP_EOL;
+ }
+
+ /**
+ * @private function getTemplatesUserCategoriesTbody
+ * @param string $moduleDirname
+ * @param $tableName
+ * @param $tableSoleName
+ * @return string
+ */
+ private function getTemplatesUserCategoriesTbody(string $moduleDirname, $tableName, $tableSoleName): string
+ {
+ $single = $this->sc->getSmartySingleVar('panel_type');
+ $include = $this->sc->getSmartyIncludeFileListForeach($moduleDirname, $tableName, $tableSoleName);
+ $div = $this->hc->getHtmlDiv($include, 'panel panel-' . $single);
+ $cont = $this->hc->getHtmlTableData($div) . PHP_EOL;
+ $html = $this->hc->getHtmlEmpty('') . PHP_EOL;
+ $cont .= $this->sc->getSmartyConditions($tableSoleName . '.count', ' is div by ', '$divideby', $html, false, false, false, '', "\n", true, false) . PHP_EOL;
+ $foreach = $this->sc->getSmartyForeach($tableSoleName, $tableName, $cont) . PHP_EOL;
+ $tr = $this->hc->getHtmlTableRow($foreach) . PHP_EOL;
+
+ return $this->hc->getHtmlTableTbody($tr) . PHP_EOL;
+ }
+
+ /**
+ * @private function getTemplatesUserCategoriesTfoot
+ * @return string
+ */
+ private function getTemplatesUserCategoriesTfoot(): string
+ {
+ $td = $this->hc->getHtmlTableData(' ') . PHP_EOL;
+ $tr = $this->hc->getHtmlTableRow($td) . PHP_EOL;
+
+ return $this->hc->getHtmlTableTfoot($tr) . PHP_EOL;
+ }
+
+ /**
+ * @private function getTemplatesUserCategories
+ * @param $moduleDirname
+ * @param $tableName
+ * @param $tableSoleName
+ * @param $language
+ * @return string
+ */
+ private function getTemplatesUserCategories($moduleDirname, $tableName, $tableSoleName, $language): string
+ {
+ $tab = $this->getTemplatesUserCategoriesTable($moduleDirname, $tableName, $tableSoleName, $language) . PHP_EOL;
+ $div = $this->hc->getHtmlDiv($tab, 'table-responsive') . PHP_EOL;
+
+ return $this->sc->getSmartyConditions($tableName, ' gt ', '0', $div, false, true, false, '', "\n", true, 'int') . PHP_EOL;
+ }
+
+ /**
+ * @private function getTemplatesUserCategoriesPanel
+ * @param string $moduleDirname
+ * @param string $tableName
+ * @param $tableSoleName
+ * @param $language
+ * @return string
+ */
+ private function getTemplatesUserCategoriesPanel(string $moduleDirname, string $tableName, $tableSoleName, $language): string
+ {
+ $stuTableName = \mb_strtoupper($tableName);
+ $incl = $this->sc->getSmartyIncludeFileListForeach($moduleDirname, $tableName, $tableSoleName) . PHP_EOL;
+ $html = $this->hc->getHtmlEmpty('
') . PHP_EOL; + $incl .= $this->sc->getSmartyConditions($tableSoleName . '.count', ' is div by ', '$numb_col', $html, false, false, false, '',"\n", true, false) . PHP_EOL; + $const = $this->sc->getSmartyConst($language, $stuTableName . '_TITLE'); + $div = $this->hc->getHtmlDiv($const, 'panel-heading') . PHP_EOL; + $cont = $this->hc->getHtmlDiv($incl, 'panel panel-body') . PHP_EOL; + $div .= $this->sc->getSmartyForeach($tableSoleName, $tableName, $cont) . PHP_EOL; + $panelType = $this->sc->getSmartySingleVar('panel_type'); + + return $this->hc->getHtmlDiv($div, 'panel panel-' . $panelType) . PHP_EOL; + } + + /** + * @private function getTemplatesUserCategoriesFooter + * @param string $moduleDirname + * + * @return string + */ + private function getTemplatesUserCategoriesFooter(string $moduleDirname): string + { + return $this->sc->getSmartyIncludeFile($moduleDirname, 'footer'); + } + + /** + * @public function render + * @return string + */ + public function render(): string + { + $module = $this->getModule(); + $table = $this->getTable(); + $filename = $this->getFileName(); + $moduleDirname = $module->getVar('mod_dirname'); + $tableName = $table->getVar('table_name'); + $tableSoleName = $table->getVar('table_solename'); + $language = $this->getLanguage($moduleDirname, 'MA', '', false); + $content = $this->getTemplatesUserCategoriesHeader($moduleDirname); + $content .= $this->getTemplatesUserCategoriesPanel($moduleDirname, $tableName, $tableSoleName, $language); + $content .= $this->getTemplatesUserCategoriesFooter($moduleDirname); + + $this->create($moduleDirname, 'templates', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); + + return $this->renderFile(); + } +} diff --git a/class/Files/Templates/user/CategoriesList.php b/class/Files/Templates/User/Defstyle/CategoriesList.php similarity index 61% rename from class/Files/Templates/user/CategoriesList.php rename to class/Files/Templates/User/Defstyle/CategoriesList.php index 88173928..6327fa9a 100644 --- a/class/Files/Templates/user/CategoriesList.php +++ b/class/Files/Templates/User/Defstyle/CategoriesList.php @@ -1,10 +1,9 @@ -hc = Modulebuilder\Files\CreateHtmlCode::getInstance(); + $this->sc = Modulebuilder\Files\CreateSmartyCode::getInstance(); } /** * @static function getInstance - * @param null - * @return User\CategoriesList + * @return bool|CategoriesList */ public static function getInstance() { @@ -58,11 +66,11 @@ public static function getInstance() /** * @public function write - * @param string $module - * @param string $table + * @param $module + * @param $table * @param string $filename */ - public function write($module, $table, $filename) + public function write($module, $table, string $filename): void { $this->setModule($module); $this->setTable($table); @@ -75,12 +83,10 @@ public function write($module, $table, $filename) */ private function getTemplatesUserCategoriesListStartTable() { - $ret = <<
- \n
-EOT;
-
- return $ret;
+ return <<
\n
+ EOT;
return $ret;
}
@@ -214,19 +213,16 @@ private function getTemplatesUserRateBodyFieldnameEmpty($moduleDirname, $table,
*
* @return string
*/
- private function getTemplatesUserRateFooter($moduleDirname)
+ private function getTemplatesUserRateFooter(string $moduleDirname)
{
- $ret = <<
-EOT;
-
- return $ret;
+ return <<
+ EOT;
}
/**
* @public function render
- * @param null
- * @return bool|string
+ * @return string
*/
public function render()
{
@@ -235,17 +231,17 @@ public function render()
$filename = $this->getFileName();
$moduleDirname = $module->getVar('mod_dirname');
$tableFieldname = $table->getVar('table_fieldname');
- $language = $this->getLanguage($moduleDirname, 'MA');
+ $language = $this->getLanguage($moduleDirname, 'MA', '', false);
$content = $this->getTemplatesUserRateHeader($moduleDirname, $table, $language);
// Verify if table_fieldname is not empty
if (!empty($tableFieldname)) {
- $content .= $this->getTemplatesUserRateBody($moduleDirname, $table, $language);
+ $content .= $this->getTemplatesUserRateBody($moduleDirname, $table);
} else {
- $content .= $this->getTemplatesUserRateBodyFieldnameEmpty($moduleDirname, $table, $language);
+ $content .= $this->getTemplatesUserRateBodyFieldnameEmpty($moduleDirname, $table);
}
$content .= $this->getTemplatesUserRateFooter($moduleDirname);
- $this->create($moduleDirname, 'templates', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->create($moduleDirname, 'templates', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $this->renderFile();
}
diff --git a/class/Files/Templates/User/Defstyle/Rss.php b/class/Files/Templates/User/Defstyle/Rss.php
new file mode 100644
index 00000000..a83de0bf
--- /dev/null
+++ b/class/Files/Templates/User/Defstyle/Rss.php
@@ -0,0 +1,125 @@
+setModule($module);
+ $this->setFileName($filename);
+ }
+
+ /**
+ * @private function getTemplatesUserRssXml
+ * @return string
+ */
+ private function getTemplatesUserRssXml()
+ {
+ return <<
+
+
+ <{\$channel_title|escape:'html':'UTF-8'}>
+ <{\$channel_link|escape:'html':'UTF-8'}>
+ <{\$channel_desc|escape:'html':'UTF-8'}>
+ <{\$channel_lastbuild|escape:'html':'UTF-8'}>
+ <{\$docs|escape:'html':'UTF-8'}>
+ <{\$channel_generator|escape:'html':'UTF-8'}>
+ <{\$channel_category|escape:'html':'UTF-8'}>
+ <{\$channel_editor|escape:'html':'UTF-8'}>
+ <{\$channel_webmaster|escape:'html':'UTF-8'}>
+ <{\$channel_language|escape:'html':'UTF-8'}>
+ <{if \$image_url != ""}>
+
+ <{\$channel_title|escape:'html':'UTF-8'}>
+ <{\$image_url|escape:'html':'UTF-8'}>
+ <{\$channel_link|escape:'html':'UTF-8'}>
+ <{\$image_width}>
+ <{\$image_height}>
+
+ <{/if}>
+ <{foreach item=item from=\$items}>
+ -
+
<{\$item.title|escape:'html':'UTF-8'}>
+ <{\$item.link|escape:'html':'UTF-8'}>
+ <{\$item.description|escape:'html':'UTF-8'}>
+ <{\$item.pubdate|escape:'html':'UTF-8'}>
+ <{\$item.guid|escape:'html':'UTF-8'}>
+
+ <{/foreach}>
+
+ \n
+ EOT;
+ }
+
+ /**
+ * @public function render
+ * @return string
+ */
+ public function render()
+ {
+ $module = $this->getModule();
+ $filename = $this->getFileName();
+ $moduleDirname = $module->getVar('mod_dirname');
+ $content = $this->getTemplatesUserRssXml();
+
+ $this->create($moduleDirname, 'templates', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
+
+ return $this->renderFile();
+ }
+}
diff --git a/class/Files/Templates/user/Search.php b/class/Files/Templates/User/Defstyle/Search.php
similarity index 58%
rename from class/Files/Templates/user/Search.php
rename to class/Files/Templates/User/Defstyle/Search.php
index 7d91377f..d7d78ae1 100644
--- a/class/Files/Templates/user/Search.php
+++ b/class/Files/Templates/User/Defstyle/Search.php
@@ -1,9 +1,9 @@
-setModule($module);
$this->setTable($table);
@@ -71,33 +69,33 @@ public function write($module, $table, $filename)
/**
* @private function getTemplatesUserSearchHeader
* @param string $moduleDirname
- * @param string $table
+ * @param $table
* @param string $language
*
* @return string
*/
- private function getTemplatesUserSearchHeader($moduleDirname, $table, $language)
+ private function getTemplatesUserSearchHeader(string $moduleDirname, $table, string $language)
{
$ret = <<
-
-
-
\n
+ EOT;
return $ret;
}
@@ -161,49 +158,48 @@ private function getTemplatesUserSearchBody($moduleDirname, $table, $language)
/**
* @private function getTemplatesUserSearchBodyFieldnameEmpty
* @param string $moduleDirname
- * @param string $table
- * @param string $language
+ * @param $table
*
* @return string
*/
- private function getTemplatesUserSearchBodyFieldnameEmpty($moduleDirname, $table, $language)
+ private function getTemplatesUserSearchBodyFieldnameEmpty(string $moduleDirname, $table)
{
$tableName = $table->getVar('table_name');
$ret = <<
- <{foreach item=list from=\${$tableName}}>
- \n
-EOT;
+
+ <{foreach item=list from=\${$tableName}}>
+ \n
+ EOT;
$fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'));
- foreach (array_keys($fields) as $f) {
+ 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 .= <<\n
-EOT;
+ 
\n
-EOT;
+ <{\$list.{$fieldName}}>\n
-EOT;
+ <{\$list.{$fieldName}}> \n
+ EOT;
break;
}
}
}
$ret .= <<
- <{/foreach}>
-
-\n
-EOT;
+
+ <{/foreach}>
+
+ \n
+ EOT;
return $ret;
}
@@ -213,19 +209,16 @@ private function getTemplatesUserSearchBodyFieldnameEmpty($moduleDirname, $table
* @param string $moduleDirname
* @return string
*/
- private function getTemplatesUserSearchFooter($moduleDirname)
+ private function getTemplatesUserSearchFooter(string $moduleDirname)
{
- $ret = <<
-EOT;
-
- return $ret;
+ return <<
+ EOT;
}
/**
* @public function render
- * @param null
- * @return bool|string
+ * @return string
*/
public function render()
{
@@ -234,17 +227,17 @@ public function render()
$filename = $this->getFileName();
$moduleDirname = $module->getVar('mod_dirname');
$tableFieldname = $table->getVar('table_fieldname');
- $language = $this->getLanguage($moduleDirname, 'MA');
+ $language = $this->getLanguage($moduleDirname, 'MA', '', false);
$content = $this->getTemplatesUserSearchHeader($moduleDirname, $table, $language);
// Verify if table_fieldname is not empty
if (!empty($tableFieldname)) {
- $content .= $this->getTemplatesUserSearchBody($moduleDirname, $table, $language);
+ $content .= $this->getTemplatesUserSearchBody($moduleDirname, $table);
} else {
- $content .= $this->getTemplatesUserSearchBodyFieldnameEmpty($moduleDirname, $table, $language);
+ $content .= $this->getTemplatesUserSearchBodyFieldnameEmpty($moduleDirname, $table);
}
$content .= $this->getTemplatesUserSearchFooter($moduleDirname);
- $this->create($moduleDirname, 'templates', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->create($moduleDirname, 'templates', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $this->renderFile();
}
diff --git a/class/Files/Templates/User/Defstyle/UserPrint.php b/class/Files/Templates/User/Defstyle/UserPrint.php
new file mode 100644
index 00000000..17a08323
--- /dev/null
+++ b/class/Files/Templates/User/Defstyle/UserPrint.php
@@ -0,0 +1,275 @@
+hc = Modulebuilder\Files\CreateHtmlCode::getInstance();
+ $this->sc = Modulebuilder\Files\CreateSmartyCode::getInstance();
+ }
+
+ /**
+ * @static function getInstance
+ * @return UserPrint
+ */
+ public static function getInstance()
+ {
+ static $instance = false;
+ if (!$instance) {
+ $instance = new self();
+ }
+
+ return $instance;
+ }
+
+ /**
+ * @public function write
+ * @param $module
+ * @param $table
+ * @param string $filename
+ */
+ public function write($module, $table, string $filename): void
+ {
+ $this->setModule($module);
+ $this->setTable($table);
+ $this->setFileName($filename);
+ }
+
+ /**
+ * @private function getTemplatesUserPrintHeader
+ * @param string $moduleDirname
+ * @return string
+ */
+ private function getTemplatesUserPrintHeader(string $moduleDirname)
+ {
+ $ret = $this->hc->getHtmlComment('Header', '', "\n");
+ $ret .= $this->sc->getSmartyIncludeFile($moduleDirname, 'header', false, '', "\n\n");
+
+ return $ret;
+ }
+
+ /**
+ * @private function getTemplatesUserPrintTableThead
+ * @param $tableSoleName
+ * @param $tableAutoincrement
+ * @param array $fields
+ * @param string $language
+ * @return string
+ */
+ private function getTemplatesUserPrintTableThead($tableSoleName, $tableAutoincrement, array $fields, string $language)
+ {
+ $th = '';
+ $langHeadId = \mb_strtoupper($tableSoleName) . '_ID';
+ if (1 == $tableAutoincrement) {
+ $lang = $this->sc->getSmartyConst($language, $langHeadId);
+ $th .= $this->hc->getHtmlTag('th', ['class' => 'center'], $lang, false, "\t\t\t");
+ }
+ foreach (\array_keys($fields) as $f) {
+ $fieldName = $fields[$f]->getVar('field_name');
+ $rpFieldName = $this->getRightString($fieldName);
+ $langFieldName = \mb_strtoupper($tableSoleName) . '_' . \mb_strtoupper($rpFieldName);
+ if (1 == $fields[$f]->getVar('field_user')) {
+ $lang = $this->sc->getSmartyConst($language, $langFieldName);
+ $th .= $this->hc->getHtmlTag('th', ['class' => 'center'], $lang, false, "\t\t\t");
+ }
+ }
+
+ $tr = $this->hc->getHtmlTableRow($th, 'head', "\t\t");
+ return $this->hc->getHtmlTableThead($tr, '', "\t");
+ }
+
+ /**
+ * @private function getTemplatesUserPrintTableTBody
+ * @param string $moduleDirname
+ * @param string $tableName
+ * @param $tableSoleName
+ * @param $tableAutoincrement
+ * @param array $fields
+ * @return string
+ * @internal param string $language
+ */
+ private function getTemplatesUserPrintTableTBody(string $moduleDirname, string $tableName, $tableSoleName, $tableAutoincrement, array $fields)
+ {
+ $td = '';
+ if (1 == $tableAutoincrement) {
+ $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'id');
+ $td .= $this->hc->getHtmlTableData($double, 'center', '', "\t\t\t");
+ }
+ foreach (\array_keys($fields) as $f) {
+ $fieldName = $fields[$f]->getVar('field_name');
+ $fieldElement = $fields[$f]->getVar('field_element');
+ $rpFieldName = $this->getRightString($fieldName);
+ if (1 == $fields[$f]->getVar('field_user')) {
+ switch ($fieldElement) {
+ case Constants::FIELD_ELE_RADIOYN:
+ case Constants::FIELD_ELE_SELECTUSER:
+ case Constants::FIELD_ELE_DATETIME:
+ case Constants::FIELD_ELE_TEXTDATESELECT:
+ $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName . '_text');
+ $td .= $this->hc->getHtmlTableData($double, 'center', '', "\t\t\t");
+ break;
+ case Constants::FIELD_ELE_TEXTAREA:
+ case Constants::FIELD_ELE_DHTMLTEXTAREA:
+ $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName . '_short');
+ $td .= $this->hc->getHtmlTableData($double, 'center', '', "\t\t\t");
+ break;
+ case Constants::FIELD_ELE_CHECKBOX:
+ $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
+ $src = $this->sc->getSmartyNoSimbol('xoModuleIcons16') . $double . '.png';
+ $img = $this->hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true, '', '');
+ $td .= $this->hc->getHtmlTableData($img, 'center', '', "\t\t\t");
+ break;
+ case Constants::FIELD_ELE_COLORPICKER:
+ // This is to be reviewed, as it was initially to style = "backgroung-color: #"
+ // Now with HTML5 is not supported inline style in the parameters of the HTML tag
+ // Old code was ...
+ $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
+ $color = " ";
+ $td .= $this->hc->getHtmlTableData($color, 'center', '', "\t\t\t");
+ break;
+ case Constants::FIELD_ELE_IMAGELIST:
+ $src = $this->sc->getSmartyNoSimbol('xoModuleIcons32');
+ $src .= $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
+ $img = $this->hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true, '', '');
+ $td .= $this->hc->getHtmlTableData($img, 'center', '', "\t\t\t");
+ break;
+ case Constants::FIELD_ELE_UPLOADIMAGE:
+ $single = $this->sc->getSmartySingleVar($moduleDirname . '_upload_url');
+ $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
+ $img = $this->hc->getHtmlTag('img', ['src' => $single . "/images/{$tableName}/" . $double, 'alt' => $tableName, 'style' => 'max-width:100px'], '', true, '', '');
+ $td .= $this->hc->getHtmlTableData($img, 'center', '', "\t\t\t");
+ break;
+ case Constants::FIELD_ELE_SELECTSTATUS:
+ $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
+ $src = $this->sc->getSmartyNoSimbol('$modPathIcon16') . 'status' . $double . '.png';
+ $imgAlt = $this->sc->getSmartyDoubleVar($tableSoleName, 'status_text');
+ $img = $this->hc->getHtmlTag('img', ['src' => $src, 'alt' => $imgAlt, 'title' => $imgAlt], '', true, '', '');
+ $td .= $this->hc->getHtmlTableData($img, 'center', '', "\t\t\t");
+ break;
+ default:
+ if (0 != $f) {
+ $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
+ $td .= $this->hc->getHtmlTableData($double, 'center', '', "\t\t\t");
+ }
+ break;
+ }
+ }
+ }
+ $cycle = $this->sc->getSmartyNoSimbol('cycle values=\'odd, even\'');
+ $tr = $this->hc->getHtmlTableRow($td, $cycle, "\t\t");
+ $foreach = $this->sc->getSmartyForeach($tableSoleName, $tableName . '_list', $tr, '', '', "\t\t");
+ return $this->hc->getHtmlTableTbody($foreach, '', "\t");
+ }
+
+ /**
+ * @private function getTemplatesUserPrintTable
+ * @param string $moduleDirname
+ * @param string $tableName
+ * @param $tableSoleName
+ * @param $tableAutoincrement
+ * @param $fields
+ * @param string $language
+ * @return string
+ */
+ private function getTemplatesUserPrintTable(string $moduleDirname, string $tableName, $tableSoleName, $tableAutoincrement, $fields, string $language)
+ {
+ $tbody = $this->getTemplatesUserPrintTableThead($tableSoleName, $tableAutoincrement, $fields, $language);
+ $tbody .= $this->getTemplatesUserPrintTableTBody($moduleDirname, $tableName, $tableSoleName, $tableAutoincrement, $fields);
+
+ return $this->hc->getHtmlTable($tbody, 'table table-bordered');
+ }
+
+ /**
+ * @private function getTemplatesUserPrint
+ * @param string $moduleDirname
+ * @param string $tableName
+ * @param $tableSoleName
+ * @param $tableAutoincrement
+ * @param $fields
+ * @param string $language
+ * @return string
+ */
+ private function getTemplatesUserPrint(string $moduleDirname, string $tableName, $tableSoleName, $tableAutoincrement, $fields, string $language)
+ {
+ return $this->getTemplatesUserPrintTable($moduleDirname, $tableName, $tableSoleName, $tableAutoincrement, $fields, $language);
+ }
+
+ /**
+ * @private function getTemplatesUserPrintFooter
+ * @param string $moduleDirname
+ * @return string
+ */
+ private function getTemplatesUserPrintFooter(string $moduleDirname)
+ {
+ $ret = $this->hc->getHtmlComment('Footer', '', "\n");
+ $ret .= $this->sc->getSmartyIncludeFile($moduleDirname, 'footer');
+
+ return $ret;
+ }
+
+ /**
+ * @public function render
+ * @return string
+ */
+ public function render()
+ {
+ $module = $this->getModule();
+ $table = $this->getTable();
+ $filename = $this->getFileName();
+ $moduleDirname = $module->getVar('mod_dirname');
+ $language = $this->getLanguage($moduleDirname, 'MA', '', false);
+ $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'), 'field_order');
+ $content = $this->getTemplatesUserPrintHeader($moduleDirname);
+ $content .= $this->getTemplatesUserPrint($moduleDirname, $table->getVar('table_name'), $table->getVar('table_solename'), $table->getVar('table_autoincrement'), $fields, $language);
+ $content .= $this->getTemplatesUserPrintFooter($moduleDirname);
+
+ $this->create($moduleDirname, 'templates', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
+
+ return $this->renderFile();
+ }
+}
diff --git a/class/Files/Templates/User/index.php b/class/Files/Templates/User/index.php
new file mode 100644
index 00000000..e5ee0725
--- /dev/null
+++ b/class/Files/Templates/User/index.php
@@ -0,0 +1,2 @@
+setModule($module);
- $this->setFileName($filename);
- }
-
- /**
- * @public function render
- * @param null
- * @return bool|string
- */
- public function render()
- {
- $module = $this->getModule();
- $filename = $this->getFileName();
- $moduleDirname = $module->getVar('mod_dirname');
- $tf = Tdmcreate\Files\CreateFile::getInstance();
- $hc = Tdmcreate\Files\CreateHtmlCode::getInstance();
- $sc = Tdmcreate\Files\CreateSmartyCode::getInstance();
- $title = $sc->getSmartyDoubleVar('itm', 'title');
- $titleElse = $sc->getSmartyDoubleVar('itm', 'title', "\t\t\t", "\n") ;
- $link = $sc->getSmartyDoubleVar('itm', 'link');
- $glyph = $hc->getHtmlTag('i', ['class' => 'glyphicon glyphicon-home'], '', false, '', '');
- $anchor = $hc->getHtmlAnchor('<{xoAppUrl index.php}>', $glyph, 'home');
- $into = $hc->getHtmlLi($anchor, 'bc-item', "\t");
- $anchorIf = $hc->getHtmlAnchor($link, $title, $title, '', '', '', "\t\t\t", "\n");
- $breadcrumb = $sc->getSmartyConditions('itm.link', '', '', $anchorIf, $titleElse, false, false, "\t\t", "\n");
- $foreach = $hc->getHtmlLi($breadcrumb, 'bc-item', "\t", "\n", true);
- $into .= $sc->getSmartyForeach('itm', 'xoBreadcrumbs', $foreach, 'bcloop', '', "\t");
-
- $content = $hc->getHtmlOl($into, 'breadcrumb');
-
- $tf->create($moduleDirname, 'templates', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
-
- return $tf->renderFile();
- }
-}
diff --git a/class/Files/Templates/user/Broken.php b/class/Files/Templates/user/Broken.php
deleted file mode 100644
index 19635065..00000000
--- a/class/Files/Templates/user/Broken.php
+++ /dev/null
@@ -1,198 +0,0 @@
-setModule($module);
- $this->setTable($table);
- $this->setFileName($filename);
- }
-
- /**
- * @private function getTemplatesUserBrokenFileHeader
- * @param string $moduleDirname
- *
- * @return string
- */
- private function getTemplatesUserBrokenFileHeader($moduleDirname)
- {
- $sc = Tdmcreate\Files\CreateSmartyCode::getInstance();
-
- return $sc->getSmartyIncludeFile($moduleDirname, 'header');
- }
-
- /**
- * @private function getTemplatesUserBrokenTableHead
- * @param $tableMid
- * @param $tableId
- * @param $tableAutoincrement
- * @param $language
- * @return string
- */
- private function getTemplatesUserBrokenTableHead($tableMid, $tableId, $tableAutoincrement, $language)
- {
- $hc = Tdmcreate\Files\CreateHtmlCode::getInstance();
- $sc = Tdmcreate\Files\CreateSmartyCode::getInstance();
- $th = '';
- $fields = $this->getTableFields($tableMid, $tableId);
- foreach (array_keys($fields) as $f) {
- $fieldName = $fields[$f]->getVar('field_name');
- $stuFieldName = mb_strtoupper($fieldName);
- if ((1 == $tableAutoincrement) || (1 == $fields[$f]->getVar('field_user'))) {
- $const = $sc->getSmartyConst($language, $stuFieldName);
- $th .= $hc->getHtmlTag('th', ['class' => 'center'], $const, '', "\t\t\t");
- }
- }
- $tr = $hc->getHtmlTableRow($th, 'head',"\t\t");
-
- return $hc->getHtmlTableThead($tr, 'outer', "\t");
- }
-
- /**
- * @private function getTemplatesUserBrokenBody
- * @param $moduleDirname
- * @param $tableMid
- * @param $tableId
- * @param $tableName
- * @param $tableSoleName
- * @param $tableAutoincrement
- * @return string
- */
- private function getTemplatesUserBrokenBody($moduleDirname, $tableMid, $tableId, $tableName, $tableSoleName, $tableAutoincrement)
- {
- $hc = Tdmcreate\Files\CreateHtmlCode::getInstance();
- $sc = Tdmcreate\Files\CreateSmartyCode::getInstance();
- $ret = '';
- $fields = $this->getTableFields($tableMid, $tableId);
- foreach (array_keys($fields) as $f) {
- $fieldName = $fields[$f]->getVar('field_name');
- $fieldElement = $fields[$f]->getVar('field_element');
- $rpFieldName = $this->getRightString($fieldName);
- if ((1 == $tableAutoincrement) || (1 == $fields[$f]->getVar('field_user'))) {
- switch ($fieldElement) {
- case 9:
- $span = $hc->getHtmlSpan("<{\${$moduleDirname}_upload_url}>/images/{$tableName}/<{\${$tableSoleName}.{$rpFieldName}}>", "#<{\${$tableSoleName}.{$rpFieldName}}>");
- $ret .= $hc->getHtmlTableData($span, 'center', '', "\t\t\t");
- break;
- case 10:
- $img = $hc->getHtmlImage("<{xoModuleIcons32}><{\${$tableSoleName}.{$rpFieldName}}>", $tableName);
- $ret .= $hc->getHtmlTableData($img, 'center', '', "\t\t\t");
- break;
- case 13:
- $img = $hc->getHtmlImage("<{\${$moduleDirname}_upload_url}>/images/{$tableName}/<{\${$tableSoleName}.{$rpFieldName}}>", $tableName);
- $ret .= $hc->getHtmlTableData($img, 'center', '', "\t\t\t") ;
- break;
- default:
- $ret .= $hc->getHtmlTableData("<{\${$tableSoleName}.{$rpFieldName}}>", 'center', '', "\t\t\t") ;
- break;
- }
- }
- }
- $row = $hc->getHtmlTableRow($ret, '<{cycle values="odd, even"}>',"\t\t") ;
- $foreach = $sc->getSmartyForeach($tableSoleName, $tableName, $row, '', '', "\t\t");
-
- return $hc->getHtmlTableTbody($foreach, '', "\t");
- }
-
- /**
- * @private function getTemplatesUserBrokenFileFooter
- * @param string $moduleDirname
- *
- * @return string
- */
- private function getTemplatesUserBrokenFileFooter($moduleDirname)
- {
- $sc = Tdmcreate\Files\CreateSmartyCode::getInstance();
-
- return $sc->getSmartyIncludeFile($moduleDirname, 'footer');
- }
-
- /**
- * @public function render
- * @return bool|string
- */
- public function render()
- {
- $hc = Tdmcreate\Files\CreateHtmlCode::getInstance();
- $module = $this->getModule();
- $table = $this->getTable();
- $filename = $this->getFileName();
- $moduleDirname = $module->getVar('mod_dirname');
- $tableId = $table->getVar('table_id');
- $tableMid = $table->getVar('table_mid');
- $tableName = $table->getVar('table_name');
- $tableSoleName = $table->getVar('table_solename');
- $tableAutoincrement = $table->getVar('table_autoincrement');
- $language = $this->getLanguage($moduleDirname, 'MA');
- $content = $this->getTemplatesUserBrokenFileHeader($moduleDirname);
- $contentTable = $this->getTemplatesUserBrokenTableHead($tableMid, $tableId, $tableAutoincrement, $language);
- $contentTable .= $this->getTemplatesUserBrokenBody($moduleDirname, $tableMid, $tableId, $tableName, $tableSoleName, $tableAutoincrement);
- $content .= $hc->getHtmlTable($contentTable, 'table table-bordered');
- $content .= $this->getTemplatesUserBrokenFileFooter($moduleDirname);
-
- $this->create($moduleDirname, 'templates', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
-
- return $this->renderFile();
- }
-}
diff --git a/class/Files/Templates/user/Categories.php b/class/Files/Templates/user/Categories.php
deleted file mode 100644
index 5f5f0c01..00000000
--- a/class/Files/Templates/user/Categories.php
+++ /dev/null
@@ -1,248 +0,0 @@
-setModule($module);
- $this->setTable($table);
- $this->setFileName($filename);
- }
-
- /**
- * @private function getTemplatesUserCategoriesHeader
- * @param string $moduleDirname
- * @return string
- */
- private function getTemplatesUserCategoriesHeader($moduleDirname)
- {
- $sc = Tdmcreate\Files\CreateSmartyCode::getInstance();
-
- return $sc->getSmartyIncludeFile($moduleDirname, 'header') . PHP_EOL;
- }
-
- /**
- * @private function getTemplatesUserCategoriesTable
- * @param string $language
- * @param $moduleDirname
- * @param $tableName
- * @param $tableSoleName
- * @return string
- */
- private function getTemplatesUserCategoriesTable($moduleDirname, $tableName, $tableSoleName, $language)
- {
- $hc = Tdmcreate\Files\CreateHtmlCode::getInstance();
- $sc = Tdmcreate\Files\CreateSmartyCode::getInstance();
- $single = $sc->getSmartySingleVar('table_type');
- $table = $this->getTemplatesAdminPagesTableThead($tableName, $language);
- $table .= $this->getTemplatesAdminPagesTableTBody($moduleDirname, $tableName, $tableSoleName, $language);
-
- return $hc->getHtmlTable($table, 'table table-' . $single) . PHP_EOL;
- }
-
- /**
- * @private function getTemplatesUserCategoriesThead
- * @param string $language
- * @param $tableName
- * @return string
- */
- private function getTemplatesUserCategoriesThead($tableName, $language)
- {
- $hc = Tdmcreate\Files\CreateHtmlCode::getInstance();
- $sc = Tdmcreate\Files\CreateSmartyCode::getInstance();
- $stuTableName = mb_strtoupper($tableName);
- $lang = $sc->getSmartyConst($language, $stuTableName . '_TITLE');
- $single = $sc->getSmartySingleVar('numb_col');
- $th = $hc->getHtmlTableHead($lang, '', $single) . PHP_EOL;
- $tr = $hc->getHtmlTableRow($th, 'head') . PHP_EOL;
-
- return $hc->getHtmlTableThead($tr) . PHP_EOL;
- }
-
- /**
- * @private function getTemplatesUserCategoriesTbody
- * @param string $moduleDirname
- * @param $tableName
- * @param $tableSoleName
- * @return string
- */
- private function getTemplatesUserCategoriesTbody($moduleDirname, $tableName, $tableSoleName)
- {
- $hc = Tdmcreate\Files\CreateHtmlCode::getInstance();
- $sc = Tdmcreate\Files\CreateSmartyCode::getInstance();
- $single = $sc->getSmartySingleVar('panel_type');
- $include = $sc->getSmartyIncludeFileListForeach($moduleDirname, $tableName, $tableSoleName);
- $div = $hc->getHtmlDiv($include, 'panel panel-' . $single);
- $cont = $hc->getHtmlTableData($div) . PHP_EOL;
- $html = $hc->getHtmlEmpty('') . PHP_EOL;
- $cont .= $sc->getSmartyConditions($tableSoleName . '.count', ' is div by ', '$divideby', $html) . PHP_EOL;
- $foreach = $sc->getSmartyForeach($tableSoleName, $tableName, $cont) . PHP_EOL;
- $tr = $hc->getHtmlTableRow($foreach) . PHP_EOL;
-
- return $hc->getHtmlTableTbody($tr) . PHP_EOL;
- }
-
- /**
- * @private function getTemplatesUserCategoriesTfoot
- * @return string
- */
- private function getTemplatesUserCategoriesTfoot()
- {
- $hc = Tdmcreate\Files\CreateHtmlCode::getInstance();
- $td = $hc->getHtmlTableData(' ') . PHP_EOL;
- $tr = $hc->getHtmlTableRow($td) . PHP_EOL;
-
- return $hc->getHtmlTableTfoot($tr) . PHP_EOL;
- }
-
- /**
- * @private function getTemplatesUserCategories
- * @param $moduleDirname
- * @param $tableName
- * @param $tableSoleName
- * @param $language
- * @return string
- */
- private function getTemplatesUserCategories($moduleDirname, $tableName, $tableSoleName, $language)
- {
- $hc = Tdmcreate\Files\CreateHtmlCode::getInstance();
- $sc = Tdmcreate\Files\CreateSmartyCode::getInstance();
- $tab = $this->getTemplatesUserCategoriesTable($moduleDirname, $tableName, $tableSoleName, $language) . PHP_EOL;
- $div = $hc->getHtmlDiv($tab, 'table-responsive') . PHP_EOL;
-
- return $sc->getSmartyConditions($tableName, ' gt ', '0', $div, false, true) . PHP_EOL;
- }
-
- /**
- * @private function getTemplatesUserCategoriesPanel
- * @param string $moduleDirname
- * @param string $tableName
- * @param $tableSoleName
- * @param $language
- * @return string
- */
- private function getTemplatesUserCategoriesPanel($moduleDirname, $tableName, $tableSoleName, $language)
- {
- $stuTableName = mb_strtoupper($tableName);
- /*$ret = <<
-
') . PHP_EOL; - $incl .= $sc->getSmartyConditions($tableSoleName . '.count', ' is div by ', '$numb_col', $html) . PHP_EOL; - $const = $sc->getSmartyConst($language, $stuTableName . '_TITLE'); - $div = $hc->getHtmlDiv($const, 'panel-heading') . PHP_EOL; - $cont = $hc->getHtmlDiv($incl, 'panel panel-body') . PHP_EOL; - $div .= $sc->getSmartyForeach($tableSoleName, $tableName, $cont) . PHP_EOL; - $panelType = $sc->getSmartySingleVar('panel_type'); - - return $hc->getHtmlDiv($div, 'panel panel-' . $panelType) . PHP_EOL; - } - - /** - * @private function getTemplatesUserCategoriesFooter - * @param string $moduleDirname - * - * @return string - */ - private function getTemplatesUserCategoriesFooter($moduleDirname) - { - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); - - return $sc->getSmartyIncludeFile($moduleDirname, 'footer'); - } - - /** - * @public function render - * @return bool|string - */ - public function render() - { - $module = $this->getModule(); - $table = $this->getTable(); - $filename = $this->getFileName(); - $moduleDirname = $module->getVar('mod_dirname'); - $tableName = $table->getVar('table_name'); - $tableSoleName = $table->getVar('table_solename'); - $language = $this->getLanguage($moduleDirname, 'MA'); - $content = $this->getTemplatesUserCategoriesHeader($moduleDirname); - $content .= $this->getTemplatesUserCategoriesPanel($moduleDirname, $tableName, $tableSoleName, $language); - $content .= $this->getTemplatesUserCategoriesFooter($moduleDirname); - - $this->create($moduleDirname, 'templates', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); - - return $this->renderFile(); - } -} diff --git a/class/Files/Templates/user/DisqusComments.php b/class/Files/Templates/user/DisqusComments.php deleted file mode 100644 index 39c3388a..00000000 --- a/class/Files/Templates/user/DisqusComments.php +++ /dev/null @@ -1,97 +0,0 @@ -setModule($module); - $this->setFileName($filename); - } - - /** - * @private function getTemplatesCommentCode - * @param null - * - * @return string - */ - private function getTemplatesCommentCode() - { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - - return $hc->getHtmlEmpty('Please! Enter here your comments code'); - } - - /** - * @public function render - * @return bool|string - */ - public function render() - { - $module = $this->getModule(); - $filename = $this->getFileName(); - $moduleDirname = $module->getVar('mod_dirname'); - $content = $this->getTemplatesCommentCode(); - - $this->create($moduleDirname, 'templates', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); - - return $this->renderFile(); - } -} diff --git a/class/Files/Templates/user/FacebookComments.php b/class/Files/Templates/user/FacebookComments.php deleted file mode 100644 index 30c530d6..00000000 --- a/class/Files/Templates/user/FacebookComments.php +++ /dev/null @@ -1,97 +0,0 @@ -setModule($module); - $this->setFileName($filename); - } - - /** - * @private function getTemplatesCommentCode - * @param null - * - * @return string - */ - private function getTemplatesCommentCode() - { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - - return $hc->getHtmlEmpty('Please! Enter here your comments code'); - } - - /** - * @public function render - * @return bool|string - */ - public function render() - { - $module = $this->getModule(); - $filename = $this->getFileName(); - $moduleDirname = $module->getVar('mod_dirname'); - $content = $this->getTemplatesCommentCode(); - - $this->create($moduleDirname, 'templates', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); - - return $this->renderFile(); - } -} diff --git a/class/Files/Templates/user/Footer.php b/class/Files/Templates/user/Footer.php deleted file mode 100644 index 9ff3e74e..00000000 --- a/class/Files/Templates/user/Footer.php +++ /dev/null @@ -1,145 +0,0 @@ -setModule($module); - $this->setTable($table); - $this->setFileName($filename); - } - - /** - * @public function getTemplateUserFooterFacebookLikeButton - * @param null - * - * @return bool|string - */ - public function getTemplateUserFooterFacebookLikeButton() - { - return ""; - } - - /** - * @public function getTemplateUserFooterFacebookShareButton - * @param null - * - * @return bool|string - */ - public function getTemplateUserFooterFacebookShareButton() - { - return ""; - } - - /** - * @public function render - * @param null - * @return bool|string - */ - private function getTemplateUserFooterContent($moduleDirname, $language) - { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); - $ret = $hc->getHtmlDiv('<{$copyright}>', 'pull-left', '', "\n", false); - $ret .= $hc->getHtmlEmpty("\n"); - $contIf = $hc->getHtmlDiv('<{$pagenav}>', 'pull-right', "\t", "\n", false); - $ret .= $sc->getSmartyConditions('pagenav', ' != ', "''", $contIf); - $ret .= $hc->getHtmlEmpty("
\n"); - $contIf = $hc->getHtmlDiv("<{\$smarty.const.{$language}ADMIN}>", 'text-center bold', "\t", "\n", false); - $ret .= $sc->getSmartyConditions('xoops_isadmin', ' != ', "''", $contIf); - $ret .= $hc->getHtmlEmpty("\n"); - $contIf = $sc->getSmartyIncludeFile('system_comments','flat',false, false,"\t\t\t"); - $contIf .= $this->getSimpleString('<{elseif $comment_mode == "thread"}>',"\t\t"); - $contIf .= $sc->getSmartyIncludeFile('system_comments','thread',false, false,"\t\t\t"); - $contIf .= $this->getSimpleString('<{elseif $comment_mode == "nest"}>',"\t\t"); - $contIf .= $sc->getSmartyIncludeFile('system_comments','nest',false, false,"\t\t\t"); - $contDiv = $sc->getSmartyConditions('comment_mode', ' == ', '"flat"', $contIf, false, '','',"\t\t"); - $contIf = $hc->getHtmlDiv($contDiv, 'pad2 marg2', "\t", "\n", true); - $ret .= $sc->getSmartyConditions('comment_mode', '', '', $contIf); - - return $ret; - } - - - /** - * @public function render - * @param null - * @return bool|string - */ - public function render() - { - $module = $this->getModule(); - $filename = $this->getFileName(); - $moduleDirname = $module->getVar('mod_dirname'); - $language = $this->getLanguage($moduleDirname, 'MA'); - $content = $this->getTemplateUserFooterContent($moduleDirname, $language); - - $this->create($moduleDirname, 'templates', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); - - return $this->renderFile(); - } -} diff --git a/class/Files/Templates/user/Index.php b/class/Files/Templates/user/Index.php deleted file mode 100644 index dd2b12ad..00000000 --- a/class/Files/Templates/user/Index.php +++ /dev/null @@ -1,345 +0,0 @@ -setModule($module); - $this->setTable($table); - $this->setTables($tables); - $this->setFileName($filename); - } - - /** - * @public function getTemplateUserIndexHeader - * @param $moduleDirname - * @return bool|string - */ - public function getTemplateUserIndexHeader($moduleDirname) - { - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); - - return $sc->getSmartyIncludeFile($moduleDirname, 'header') . PHP_EOL; - } - - /** - * @private function getTemplatesUserIndexTable - * @param $moduleDirname - * @param $tableName - * @param $tableSoleName - * @param $language - * @return string - */ - private function getTemplatesUserIndexTable($moduleDirname, $tableName, $tableSoleName, $language) - { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); - $single = $sc->getSmartySingleVar('table_type'); - $table = $this->getTemplatesUserIndexTableThead($tableName, $language); - $table .= $this->getTemplatesUserIndexTableTBody($moduleDirname, $tableName, $tableSoleName); - - return $hc->getHtmlTable($table, 'table table-' . $single) . PHP_EOL; - } - - /** - * @private function getTemplatesUserIndexThead - * @param string $language - * @param $tableName - * @return string - */ - private function getTemplatesUserIndexTableThead($tableName, $language) - { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); - $stuTableName = mb_strtoupper($tableName); - $lang = $sc->getSmartyConst($language, $stuTableName); - $col = $sc->getSmartySingleVar('numb_col'); - $th = $hc->getHtmlTableHead($lang, '', $col) . PHP_EOL; - $tr = $hc->getHtmlTableRow($th, 'head') . PHP_EOL; - - return $hc->getHtmlTableThead($tr) . PHP_EOL; - } - - /** - * @private function getTemplatesUserIndexTbody - * @param $moduleDirname - * @param $tableName - * @param $tableSoleName - * @return string - */ - private function getTemplatesUserIndexTableTBody($moduleDirname, $tableName, $tableSoleName) - { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); - $type = $sc->getSmartySingleVar('panel_type'); - $include = $sc->getSmartyIncludeFileListForeach($moduleDirname, $tableName, $tableSoleName); - $div = $hc->getHtmlDiv($include, 'panel panel-' . $type); - $cont = $hc->getHtmlTableData($div) . PHP_EOL; - $html = $hc->getHtmlEmpty(' ') . PHP_EOL;
- $cont .= $sc->getSmartyConditions($tableSoleName . '.count', ' is div by ', '$divideby', $html) . PHP_EOL;
- $foreach = $sc->getSmartyForeach($tableSoleName, $tableName, $cont) . PHP_EOL;
- $tr = $hc->getHtmlTableRow($foreach) . PHP_EOL;
-
- return $hc->getHtmlTableTbody($tr) . PHP_EOL;
- }
-
- /**
- * @private function getTemplatesUserIndexTfoot
- * @return string
- */
- private function getTemplatesUserIndexTableTfoot()
- {
- $hc = Tdmcreate\Files\CreateHtmlCode::getInstance();
- $td = $hc->getHtmlTableData(' ') . PHP_EOL;
- $tr = $hc->getHtmlTableRow($td) . PHP_EOL;
-
- return $hc->getHtmlTableTfoot($tr) . PHP_EOL;
- }
-
- /**
- * @public function getTemplatesUserIndexBodyDefault
- * @param $module
- * @param $table
- * @param $language
- * @return bool|string
- */
- public function getTemplatesUserIndexBodyDefault($module, $table, $language)
- {
- $moduleDirname = $module->getVar('mod_dirname');
- $tableName = $table->getVar('table_name');
- $ret = <<
-
-
-
-<{/if}>\n
-EOT;
-
- return $ret;
- }
-
- /**
- * @public function getTemplateUserIndexCategories
- * @param $moduleDirname
- * @param $tableName
- * @param $tableSoleName
- * @param $language
- * @return bool|string
- */
- public function getTemplateUserIndexCategories($moduleDirname, $tableName, $tableSoleName, $language)
- {
- $stuTableName = mb_strtoupper($tableName);
- $ret = << 0}>
- 0}>
-
-
-
-
-<{/if}>\n
-EOT;
-
- return $ret;
- }
-
- /**
- * @public function getTemplateUserIndexFooter
- * @param $moduleDirname
- * @return bool|string
- */
- public function getTemplateUserIndexFooter($moduleDirname)
- {
- $sc = Tdmcreate\Files\CreateSmartyCode::getInstance();
-
- return $sc->getSmartyIncludeFile($moduleDirname, 'footer');
- }
-
- /**
- * @public function render
- * @param null
- * @return bool|string
- */
- public function render()
- {
- $module = $this->getModule();
- $table = $this->getTable();
- $tables = $this->getTableTables($module->getVar('mod_id'), 'table_order');
- $filename = $this->getFileName();
- $moduleDirname = $module->getVar('mod_dirname');
- $language = $this->getLanguage($moduleDirname, 'MA');
- $content = $this->getTemplateUserIndexHeader($moduleDirname);
- $content .= $this->getTemplatesUserIndexBodyDefault($module, $table, $language);
- foreach (array_keys($tables) as $t) {
- $tableName = $tables[$t]->getVar('table_name');
- $tableSoleName = $tables[$t]->getVar('table_solename');
- $tableCategory[] = $tables[$t]->getVar('table_category');
- $tableFieldname = $tables[$t]->getVar('table_fieldname');
- $tableIndex[] = $tables[$t]->getVar('table_index');
- if (in_array(1, $tableCategory, true) && in_array(1, $tableIndex)) {
- $content .= $this->getTemplateUserIndexCategories($moduleDirname, $tableName, $tableSoleName, $language);
- }
- if (in_array(0, $tableCategory, true) && in_array(1, $tableIndex)) {
- $content .= $this->getTemplateUserIndexTable($moduleDirname, $tableName, $tableSoleName, $language);
- }
- }
- $content .= $this->getTemplateUserIndexFooter($moduleDirname);
- $tdmcfile = Tdmcreate\Files\CreateFile::getInstance();
- $tdmcfile->create($moduleDirname, 'templates', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
-
- return $tdmcfile->renderFile();
- }
-}
diff --git a/class/Files/Templates/user/Pages.php b/class/Files/Templates/user/Pages.php
deleted file mode 100644
index 8d8a2a7f..00000000
--- a/class/Files/Templates/user/Pages.php
+++ /dev/null
@@ -1,216 +0,0 @@
-setModule($module);
- $this->setTable($table);
- $this->setFileName($filename);
- }
-
- /**
- * @private function getTemplatesUserPagesHeader
- * @param string $moduleDirname
- * @return string
- */
- private function getTemplatesUserPagesHeader($moduleDirname)
- {
- $sc = Tdmcreate\Files\CreateSmartyCode::getInstance();
-
- return $sc->getSmartyIncludeFile($moduleDirname, 'header', '','','',"\n\n");
- }
-
- /**
- * @private function getTemplatesUserPagesTable
- * @param string $moduleDirname
- * @param string $tableName
- * @param $tableSoleName
- * @param string $language
- * @return string
- */
- private function getTemplatesUserPagesTable($moduleDirname, $tableName, $tableSoleName, $language)
- {
- $hc = Tdmcreate\Files\CreateHtmlCode::getInstance();
- $sc = Tdmcreate\Files\CreateSmartyCode::getInstance();
- $tbody = $this->getTemplatesUserPagesTableThead($tableName, $language);
- $tbody .= $this->getTemplatesUserPagesTableTbody($moduleDirname, $tableName, $tableSoleName);
- $tbody .= $this->getTemplatesUserPagesTableTfoot();
- $single = $sc->getSmartySingleVar('table_type');
-
- return $hc->getHtmlTable($tbody, 'table table-' . $single, "\t");
- }
-
- /**
- * @private function getTemplatesUserPagesThead
- * @param string $language
- * @param $tableName
- * @return string
- */
- private function getTemplatesUserPagesTableThead($tableName, $language)
- {
- $hc = Tdmcreate\Files\CreateHtmlCode::getInstance();
- $sc = Tdmcreate\Files\CreateSmartyCode::getInstance();
- $stuTableName = mb_strtoupper($tableName);
- $single = $sc->getSmartySingleVar('divideby');
- $lang = $sc->getSmartyConst($language, $stuTableName . '_TITLE');
- $th = $hc->getHtmlTableHead($lang, '', $single, "\t\t\t\t");
- $tr = $hc->getHtmlTableRow($th, 'head', "\t\t\t");
-
- return $hc->getHtmlTableThead($tr, '', "\t\t");
- }
-
- /**
- * @private function getTemplatesUserPagesTbody
- * @param string $moduleDirname
- * @param $tableName
- * @param $tableSoleName
- * @return string
- */
- private function getTemplatesUserPagesTableTbody($moduleDirname, $tableName, $tableSoleName)
- {
- $hc = Tdmcreate\Files\CreateHtmlCode::getInstance();
- $sc = Tdmcreate\Files\CreateSmartyCode::getInstance();
- $single = $sc->getSmartySingleVar('panel_type');
- $include = $sc->getSmartyIncludeFileListForeach($moduleDirname, $tableName, $tableSoleName, "\t\t\t\t\t\t", "\n");
- $div = $hc->getHtmlDiv($include, 'panel panel-' . $single, "\t\t\t\t\t", "\n");
- $cont = $hc->getHtmlTableData($div, '', '', "\t\t\t\t", "\n", true);
- $html = $hc->getHtmlEmpty(' ', "\t\t\t\t\t", "\n");
- $cont .= $sc->getSmartyConditions($tableSoleName . '.count', ' is div by ', '$divideby', $html, '', '', '',"\t\t\t\t");
- $foreach = $sc->getSmartyForeach($tableSoleName, $tableName, $cont,'','',"\t\t\t\t");
- $tr = $hc->getHtmlTableRow($foreach,'',"\t\t\t");
-
- return $hc->getHtmlTableTbody($tr,'',"\t\t");
- }
-
- /**
- * @private function getTemplatesUserPagesTfoot
- * @param null
- * @return string
- */
- private function getTemplatesUserPagesTableTfoot()
- {
- $hc = Tdmcreate\Files\CreateHtmlCode::getInstance();
- $td = $hc->getHtmlTableData(" ", '', '', '', '');
- $tr = $hc->getHtmlTableRow($td, '', '', '');
-
- return $hc->getHtmlTableTfoot($tr, '', "\t\t", "\n", false);
- }
-
- /**
- * @private function getTemplatesUserPages
- * @param $moduleDirname
- * @param $tableName
- * @param $tableSoleName
- * @param $language
- * @return string
- */
- private function getTemplatesUserPages($moduleDirname, $tableName, $tableSoleName, $language)
- {
- $hc = Tdmcreate\Files\CreateHtmlCode::getInstance();
- $sc = Tdmcreate\Files\CreateSmartyCode::getInstance();
- $table = $this->getTemplatesUserPagesTable($moduleDirname, $tableName, $tableSoleName, $language);
- $div = $hc->getHtmlDiv($table, 'table-responsive');
-
- return $sc->getSmartyConditions($tableName . 'Count', ' > ', '0', $div, false, false, true);
- }
-
- /**
- * @private function getTemplatesUserPagesFooter
- * @param string $moduleDirname
- *
- * @return string
- */
- private function getTemplatesUserPagesFooter($moduleDirname)
- {
- $hc = Tdmcreate\Files\CreateHtmlCode::getInstance();
- $sc = Tdmcreate\Files\CreateSmartyCode::getInstance();
- $ret = $hc->getHtmlEmpty('', '', "\n");
- $ret .= $sc->getSmartyIncludeFile($moduleDirname, 'footer');
-
- return $ret;
- }
-
- /**
- * @public function render
- * @param null
- *
- * @return bool|string
- */
- public function render()
- {
- $module = $this->getModule();
- $table = $this->getTable();
- $filename = $this->getFileName();
- $moduleDirname = $module->getVar('mod_dirname');
- $tableName = $table->getVar('table_name');
- $tableSoleName = $table->getVar('table_solename');
- $language = $this->getLanguage($moduleDirname, 'MA');
- $content = $this->getTemplatesUserPagesHeader($moduleDirname);
- $content .= $this->getTemplatesUserPages($moduleDirname, $tableName, $tableSoleName, $language);
- $content .= $this->getTemplatesUserPagesFooter($moduleDirname);
-
- $this->create($moduleDirname, 'templates', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
-
- return $this->renderFile();
- }
-}
diff --git a/class/Files/Templates/user/PagesList.php b/class/Files/Templates/user/PagesList.php
deleted file mode 100644
index 4752405f..00000000
--- a/class/Files/Templates/user/PagesList.php
+++ /dev/null
@@ -1,191 +0,0 @@
-setModule($module);
- $this->setTable($table);
- $this->setTables($tables);
- $this->setFileName($filename);
- }
-
- /**
- * @private function getTemplatesUserPagesListPanel
- * @param string $moduleDirname
- * @param $tableId
- * @param $tableMid
- * @param $tableName
- * @param $tableSoleName
- * @param $language
- * @return string
- */
- private function getTemplatesUserPagesListPanel($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $language)
- {
- $hc = Tdmcreate\Files\CreateHtmlCode::getInstance();
- $sc = Tdmcreate\Files\CreateSmartyCode::getInstance();
- $fields = $this->getTableFields($tableMid, $tableId);
- $ret = '';
- $retNumb = '';
- foreach (array_keys($fields) as $f) {
- $fieldElement = $fields[$f]->getVar('field_element');
- if (1 == $fields[$f]->getVar('field_user')) {
- if (1 == $fields[$f]->getVar('field_thead')) {
- switch ($fieldElement) {
- default:
- case 2:
- $fieldName = $fields[$f]->getVar('field_name');
- $rpFieldName = $this->getRightString($fieldName);
- $doubleVar = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
- $retNumb = $hc->getHtmlHNumb($doubleVar, '3', 'panel-title', "\t");
- break;
- }
- }
- }
- }
- $ret .= $hc->getHtmlDiv($retNumb, 'panel-heading');
- $retElem = '';
- foreach (array_keys($fields) as $f) {
- $fieldElement = $fields[$f]->getVar('field_element');
- if (1 == $fields[$f]->getVar('field_user')) {
- if (1 == $fields[$f]->getVar('field_tbody')) {
- switch ($fieldElement) {
- default:
- case 3:
- case 4:
- $fieldName = $fields[$f]->getVar('field_name');
- $rpFieldName = $this->getRightString($fieldName);
- $doubleVar = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
- $retElem .= $hc->getHtmlSpan($doubleVar, 'col-sm-9 justify', "\t");
- break;
- case 10:
- $fieldName = $fields[$f]->getVar('field_name');
- $rpFieldName = $this->getRightString($fieldName);
- $singleVar = $sc->getSmartySingleVar('xoops_icons32_url');
- $doubleVar = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
- $img = $hc->getHtmlImage($singleVar . '/' . $doubleVar, (string)$tableName);
- $retElem .= $hc->getHtmlSpan($img, 'col-sm-3', "\t");
- unset($img);
- break;
- case 13:
- $fieldName = $fields[$f]->getVar('field_name');
- $rpFieldName = $this->getRightString($fieldName);
- $singleVar = $sc->getSmartySingleVar($moduleDirname . '_upload_url');
- $doubleVar = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
- $img = $hc->getHtmlImage($singleVar . "/images/{$tableName}/" . $doubleVar, (string)$tableName);
- $retElem .= $hc->getHtmlSpan($img, 'col-sm-3',"\t");
- unset($img);
- break;
- }
- }
- }
- }
- $ret .= $hc->getHtmlDiv($retElem, 'panel-body');
- $retFoot = '';
- foreach (array_keys($fields) as $f) {
- if (1 == $fields[$f]->getVar('field_user')) {
- if (1 == $fields[$f]->getVar('field_tfoot')) {
- $fieldName = $fields[$f]->getVar('field_name');
- $rpFieldName = $this->getRightString($fieldName);
- $langConst = mb_strtoupper($tableSoleName) . '_' . mb_strtoupper($rpFieldName);
- $lang = $sc->getSmartyConst($language, $langConst);
- $doubleVar = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
- $retFoot .= $hc->getHtmlSpan($lang . ': ' . $doubleVar, 'block-pie justify',"\t");
- }
- }
- }
- $ret .= $hc->getHtmlDiv($retFoot, 'panel-foot');
-
- return $ret;
- }
-
- /**
- * @public function render
- * @param null
- * @return bool|string
- */
- public function render()
- {
- $module = $this->getModule();
- $table = $this->getTable();
- //$tables = $this->getTables();
- //$tables = $this->getTableTables($module->getVar('mod_id'), 'table_order');
- $moduleDirname = $module->getVar('mod_dirname');
- $filename = $this->getFileName();
- $language = $this->getLanguage($moduleDirname, 'MA');
- $content = '';
- $tableId = $table->getVar('table_id');
- $tableMid = $table->getVar('table_mid');
- $tableName = $table->getVar('table_name');
- $tableSoleName = $table->getVar('table_solename');
- $tableCategory[] = $table->getVar('table_category');
- //$tableIndex = $table->getVar('table_index');
- if (in_array(0, $tableCategory)) {
- $content .= $this->getTemplatesUserPagesListPanel($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $language);
- }
-
- $this->create($moduleDirname, 'templates', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
-
- return $this->renderFile();
- }
-}
diff --git a/class/Files/Templates/user/Pdf.php b/class/Files/Templates/user/Pdf.php
deleted file mode 100644
index d97ee048..00000000
--- a/class/Files/Templates/user/Pdf.php
+++ /dev/null
@@ -1,102 +0,0 @@
-setModule($module);
- $this->setFileName($filename);
- }
-
- /**
- * @private function getTemplatesUserPdfBody
- *
- * @param null
- *
- * @return string
- */
- private function getTemplatesUserPdfBody()
- {
- $ret = <<<'EOT'
-
-
-
- <{\$channel_title}>
- <{\$channel_link}>
- <{\$channel_desc}>
- <{\$channel_lastbuild}>
- http://backend.userland.com/rss/
- <{\$channel_generator}>
- <{\$channel_category}>
- <{\$channel_editor}>
- <{\$channel_webmaster}>
- <{\$channel_language}>
- <{if \$image_url != ""}>
-
- <{\$channel_title}>
- <{\$image_url}>
- <{\$channel_link}>
- <{\$image_width}>
- <{\$image_height}>
-
- <{/if}>
- <{foreach item=item from=\$items}>
- -
-
<{\$item.title}>
- <{\$item.link}>
- <{\$item.description}>
- <{\$item.pubdate}>
- <{\$item.guid}>
-
- <{/foreach}>
-
- \n
-EOT;
-
- return $ret;
- }
-
- /**
- * @public function render
- * @param null
- * @return bool|string
- */
- public function render()
- {
- $module = $this->getModule();
- $filename = $this->getFileName();
- $moduleDirname = $module->getVar('mod_dirname');
- $language = $this->getLanguage($moduleDirname, 'MA');
- $content = $this->getTemplatesUserRssXml();
-
- $this->create($moduleDirname, 'templates', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
-
- return $this->renderFile();
- }
-}
diff --git a/class/Files/Templates/user/Single.php b/class/Files/Templates/user/Single.php
deleted file mode 100644
index 86daffee..00000000
--- a/class/Files/Templates/user/Single.php
+++ /dev/null
@@ -1,141 +0,0 @@
-setModule($module);
- $this->setTable($table);
- $this->setFileName($filename);
- }
-
- /**
- * @private function getTemplatesUserSingleHeader
- * @param $moduleDirname
- * @return string
- */
- private function getTemplatesUserSingleHeader($moduleDirname)
- {
- $sc = Tdmcreate\Files\CreateSmartyCode::getInstance();
- $ret = $sc->getSmartyIncludeFile($moduleDirname);
-
- return $ret;
- }
-
- /**
- * @private function getTemplatesUserSingleBody
- * @param string $moduleDirname
- * @param string $table
- * @param string $language
- *
- * @return string
- */
- private function getTemplatesUserSingleBody($moduleDirname, $table, $language)
- {
- $tableName = $table->getVar('table_name');
- $hc = Tdmcreate\Files\CreateHtmlCode::getInstance();
- $ret = '';
- $ret .= $hc->getHtmlEmpty('', '',"\n");
- $content = $hc->getHtmlHNumb('Services Panels', '2', 'page-header', "\t\t\t");
- $collg12 = $hc->getHtmlDiv($content, 'col-lg-12', "\t\t");
- $row = $hc->getHtmlDiv($collg12, 'row', "\t");
- $ret .= $hc->getHtmlDiv($row, 'container');
- $ret .= $hc->getHtmlEmpty('', '',"\n");
-
- return $ret;
- }
-
- /**
- * @private function getTemplatesUserSingleFooter
- * @param string $moduleDirname
- *
- * @return string
- */
- private function getTemplatesUserSingleFooter($moduleDirname)
- {
- $sc = Tdmcreate\Files\CreateSmartyCode::getInstance();
- $ret = $sc->getSmartyIncludeFile($moduleDirname, 'footer');
-
- return $ret;
- }
-
- /**
- * @public function render
- * @param null
- * @return bool|string
- */
- public function render()
- {
- $module = $this->getModule();
- $table = $this->getTable();
- $filename = $this->getFileName();
- $moduleDirname = $module->getVar('mod_dirname');
- $language = $this->getLanguage($moduleDirname, 'MA');
- $content = $this->getTemplatesUserSingleHeader($moduleDirname);
- $content .= $this->getTemplatesUserSingleBody($moduleDirname, $table, $language);
- $content .= $this->getTemplatesUserSingleFooter($moduleDirname);
-
- $this->create($moduleDirname, 'templates', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
-
- return $this->renderFile();
- }
-}
diff --git a/class/Files/Templates/user/Submit.php b/class/Files/Templates/user/Submit.php
deleted file mode 100644
index 29f89de1..00000000
--- a/class/Files/Templates/user/Submit.php
+++ /dev/null
@@ -1,151 +0,0 @@
-setModule($module);
- $this->setTable($table);
- $this->setFileName($filename);
- }
-
- /**
- * @private function getTemplatesUserSubmitHeader
- * @param $moduleDirname
- * @return string
- */
- private function getTemplatesUserSubmitHeader($moduleDirname)
- {
- $sc = Tdmcreate\Files\CreateSmartyCode::getInstance();
-
- return $sc->getSmartyIncludeFile($moduleDirname, 'header');
- }
-
- /**
- * @private function getTemplatesUserSubmit
- * @param string $moduleDirname
- * @param string $language
- *
- * @return string
- */
- private function getTemplatesUserSubmit($moduleDirname, $language)
- {
- $hc = Tdmcreate\Files\CreateHtmlCode::getInstance();
- $sc = Tdmcreate\Files\CreateSmartyCode::getInstance();
-
- $const = $sc->getSmartyConst($language, 'SUBMIT_SUBMITONCE');
- $li = $hc->getHtmlLi($const, '',"\t\t");
- $const = $sc->getSmartyConst($language, 'SUBMIT_ALLPENDING');
- $li .= $hc->getHtmlLi($const, '',"\t\t");
- $const = $sc->getSmartyConst($language, 'SUBMIT_DONTABUSE');
- $li .= $hc->getHtmlLi($const, '',"\t\t");
- $const = $sc->getSmartyConst($language, 'SUBMIT_TAKEDAYS');
- $li .= $hc->getHtmlLi($const, '',"\t\t");
- $ul = $hc->getHtmlUl($li, '', "\t");
-
- $ret = $hc->getHtmlEmpty('', '',"\n");
- $ret .= $hc->getHtmlDiv($ul, $moduleDirname . '-tips');
- $single = $sc->getSmartySingleVar('message_error');
- $divError = $hc->getHtmlDiv($single, 'errorMsg', "\t", "\n", false);
- $ret .= $sc->getSmartyConditions('message_error', ' != ', '\'\'', $divError);
- $single = $sc->getSmartySingleVar('form', "\t", "\n");
- $ret .= $hc->getHtmlDiv($single, $moduleDirname . '-submitform');
- $ret .= $hc->getHtmlEmpty('', '',"\n");
-
- return $ret;
- }
-
- /**
- * @private function getTemplatesUserSubmitFooter
- * @param string $moduleDirname
- *
- * @return string
- */
- private function getTemplatesUserSubmitFooter($moduleDirname)
- {
- $sc = Tdmcreate\Files\CreateSmartyCode::getInstance();
-
- return $sc->getSmartyIncludeFile($moduleDirname, 'footer');
- }
-
- /**
- * @public function render
- * @param null
- * @return bool|string
- */
- public function render()
- {
- $module = $this->getModule();
- //$table = $this->getTable();
- $filename = $this->getFileName();
- $moduleDirname = $module->getVar('mod_dirname');
- //$tableFieldname = $table->getVar('table_fieldname');
- $language = $this->getLanguage($moduleDirname, 'MA');
- $content = $this->getTemplatesUserSubmitHeader($moduleDirname);
- $content .= $this->getTemplatesUserSubmit($moduleDirname, $language);
- $content .= $this->getTemplatesUserSubmitFooter($moduleDirname);
-
- $this->create($moduleDirname, 'templates', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
-
- return $this->renderFile();
- }
-}
diff --git a/class/Files/Templates/user/UserPrint.php b/class/Files/Templates/user/UserPrint.php
deleted file mode 100644
index ca2afc2d..00000000
--- a/class/Files/Templates/user/UserPrint.php
+++ /dev/null
@@ -1,248 +0,0 @@
-setModule($module);
- $this->setTable($table);
- $this->setFileName($filename);
- }
-
- /**
- * @private function getTemplatesUserPrintHeader
- * @param string $moduleDirname
- * @param string $table
- * @param string $language
- *
- * @return string
- */
- private function getTemplatesUserPrintHeader($moduleDirname, $table, $language)
- {
- $ret = <<
-
-
-
\n
-EOT;
-
- return $ret;
- }
-
- /**
- * @private function getTemplatesUserPrintBodyFieldnameEmpty
- * @param string $moduleDirname
- * @param $table
- * @return string
- */
- private function getTemplatesUserPrintBodyFieldnameEmpty($moduleDirname, $table)
- {
- $tableName = $table->getVar('table_name');
- $ret = <<
- <{foreach item=list from=\${$tableName}}>
- \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 .= <<\n
-EOT;
- break;
- case 13:
- $ret .= <<\n
-EOT;
- break;
- default:
- $ret .= <<<{\$list.{$fieldName}}>\n
-EOT;
- break;
- }
- }
- }
- $ret .= <<
- <{/foreach}>
-
-\n
-EOT;
-
- return $ret;
- }
-
- /**
- * @private function getTemplatesUserPrintFooter
- * @param string $moduleDirname
- *
- * @return string
- */
- private function getTemplatesUserPrintFooter($moduleDirname)
- {
- $ret = <<
-EOT;
-
- return $ret;
- }
-
- /**
- * @public function render
- * @param null
- * @return bool|string
- */
- public function render()
- {
- $module = $this->getModule();
- $table = $this->getTable();
- $filename = $this->getFileName();
- $moduleDirname = $module->getVar('mod_dirname');
- $tableFieldname = $table->getVar('table_fieldname');
- $language = $this->getLanguage($moduleDirname, 'MA');
- $content = $this->getTemplatesUserPrintHeader($moduleDirname, $table, $language);
- // Verify if table_fieldname is not empty
- if (!empty($tableFieldname)) {
- $content .= $this->getTemplatesUserPrintBody($moduleDirname, $table);
- } else {
- $content .= $this->getTemplatesUserPrintBodyFieldnameEmpty($moduleDirname, $table);
- }
- $content .= $this->getTemplatesUserPrintFooter($moduleDirname);
-
- $this->create($moduleDirname, 'templates', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
-
- return $this->renderFile();
- }
-}
diff --git a/class/Files/User/UserBroken.php b/class/Files/User/UserBroken.php
deleted file mode 100644
index cd60752c..00000000
--- a/class/Files/User/UserBroken.php
+++ /dev/null
@@ -1,227 +0,0 @@
-setModule($module);
- $this->setTable($table);
- $this->setFileName($filename);
- }
-
- /**
- * @public function getUserBrokenHeader
- * @param $moduleDirname
- * @param $fields
- * @return string
- */
- public function getUserBrokenHeader($moduleDirname, $fields)
- {
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $uxc = UserXoopsCode::getInstance();
- $fieldId = $xc->getXcSaveFieldId($fields);
- $ccFieldId = $this->getCamelCase($fieldId, false, true);
- $ret = $pc->getPhpCodeUseNamespace(['Xmf', 'Request'], '', '');
- $ret .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', '');
- $ret .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']);
- $ret .= $this->getInclude();
- $ret .= $xc->getXcXoopsRequest('op', 'op', 'list');
- $ret .= $xc->getXcXoopsRequest($ccFieldId, $fieldId, '', 'Int');
- $ret .= $pc->getPhpCodeCommentLine('Template');
- $ret .= $uxc->getUserTplMain($moduleDirname, 'broken');
- $ret .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'header', true);
- $ret .= $xc->getXcXoThemeAddStylesheet();
- $ret .= $pc->getPhpCodeCommentLine('Redirection if not permissions');
- $condIf = $xc->getXcRedirectHeader('index', '', '2', '_NOPERM', true, "\t");
- $condIf .= $this->getSimpleString('exit();', "\t");
- $ret .= $pc->getPhpCodeConditions('$permSubmit', ' === ', 'false', $condIf);
-
- return $ret;
- }
-
- /**
- * @public function getAdminPagesList
- * @param $tableName
- * @param $language
- * @param $t
- * @return string
- */
- public function getUserBrokenForm($tableName, $language, $t)
- {
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $uxc = UserXoopsCode::getInstance();
- $ret = $pc->getPhpCodeCommentLine('Navigation','', $t);
- $ret .= $xc->getXcEqualsOperator('$navigation', "{$language}SUBMIT_PROPOSER", null, $t);
- $ret .= $xc->getXcXoopsTplAssign('navigation', '$navigation', true, $t);
- $ret .= $pc->getPhpCodeCommentLine('Title of page', null, $t);
- $ret .= $xc->getXcEqualsOperator('$title', "{$language}SUBMIT_PROPOSER . ' - '", null, $t);
- $ret .= $xc->getXcEqualsOperator('$title', "\$GLOBALS['xoopsModule']->name()", '.', $t);
- $ret .= $xc->getXcXoopsTplAssign('xoops_pagetitle', '$title', true, $t);
- $ret .= $pc->getPhpCodeCommentLine('Description', null, $t);
- $ret .= $uxc->getUserAddMeta('description', $language, 'SUBMIT_PROPOSER', $t);
- $ret .= $pc->getPhpCodeCommentLine('Form Create', null, $t);
- $ret .= $xc->getXcHandlerCreateObj($tableName, $t);
- $ret .= $xc->getXcGetForm('form', $tableName, 'Obj', $t);
- $ret .= $xc->getXcXoopsTplAssign('form', '$form->render()', true, $t);
-
- return $ret;
- }
-
- /**
- * @public function getUserBrokenSave
- * @param $moduleDirname
- * @param $fields
- * @param $tableName
- * @param $tableSoleName
- * @param $language
- * @param $t
- * @return string
- */
- public function getUserBrokenSave($moduleDirname, $fields, $tableName, $tableSoleName, $language, $t)
- {
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $ret = $pc->getPhpCodeCommentLine('Security Check','',$t);
- $xoopsSecurityCheck = $xc->getXcXoopsSecurityCheck();
- $securityError = $xc->getXcXoopsSecurityErrors();
- $implode = $pc->getPhpCodeImplode(',', $securityError);
- $redirectError = $xc->getXcRedirectHeader($tableName, '', '3', $implode, true, $t . "\t");
- $ret .= $pc->getPhpCodeConditions($xoopsSecurityCheck, '', '', $redirectError, false, $t);
- $ret .= $xc->getXcHandlerCreateObj($tableName, $t);
-
- $ret .= $this->getSimpleString('$error = false;', $t);
- $ret .= $this->getSimpleString("\$errorMessage = '';", $t);
- $ret .= $pc->getPhpCodeCommentLine('Test first the validation', null, $t);
- $ret .= $xc->getXcXoopsLoad('captcha', $t);
- $ret .= $xc->getXcXoopsCaptcha($t);
-
- $ret .= $pc->getPhpCodeConditions('!$xoopsCaptcha->verify()', '', '', "\t\t\t\$errorMessage .= \$xoopsCaptcha->getMessage().'
';\n\t\t\t\$error = true;\n", false, $t); - - $ret .= $xc->getXcSaveElements($moduleDirname, $tableName, $tableSoleName, $fields, $t); - - $condElse = $pc->getPhpCodeCommentLine('Insert Data', null, $t . "\t"); - $insert = $xc->getXcHandlerInsert($tableName, $tableName, 'Obj'); - $redirctHeader = $xc->getXcRedirectHeader('index', '', '2', "{$language}FORM_OK", true, $t . "\t\t"); - $condElse .= $pc->getPhpCodeConditions($insert, '', '', $redirctHeader, false, $t . "\t"); - $assigne = $xc->getXcXoopsTplAssign('error_message', '$errorMessage', true, $t . "\t"); - $ret .= $pc->getPhpCodeConditions('$error', ' === ', 'true', $assigne, $condElse, $t); - - $ret .= $pc->getPhpCodeCommentLine('Get Form Error', null, $t); - $ret .= $xc->getXcXoopsTplAssign('error', "\${$tableName}Obj->getHtmlErrors()", true, $t); - $ret .= $xc->getXcGetForm('form', $tableName, 'Obj', $t); - $ret .= $xc->getXcXoopsTplAssign('form', '$form->display()', true, $t); - - return $ret; - } - - /** - * @private function getUserSubmitSwitch - * @param $moduleDirname - * @param $tableName - * @param $tableSoleName - * @param $language - * @return bool|string - */ - private function getUserBrokenSwitch($moduleDirname, $tableName, $tableSoleName, $language) - { - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $table = $this->getTable(); - $tableId = $table->getVar('table_id'); - $tableMid = $table->getVar('table_mid'); - $fields = $this->getTableFields($tableMid, $tableId); - $cases = [ - 'form' => [$this->getUserBrokenForm($tableName, $language, "\t\t")], - 'save' => [$this->getUserBrokenSave($moduleDirname, $fields, $tableName, $tableSoleName, $language, "\t\t")], - ]; - - return $xc->getXcSwitch('op', $cases, true, false); - } - - /** - * @public function render - * @param null - * @return bool|string - */ - public function render() - { - $module = $this->getModule(); - $table = $this->getTable(); - $filename = $this->getFileName(); - $moduleDirname = $module->getVar('mod_dirname'); - $tableId = $table->getVar('table_id'); - $tableMid = $table->getVar('table_mid'); - $tableName = $table->getVar('table_name'); - $tableSoleName = $table->getVar('table_solename'); - $fields = $this->getTableFields($tableMid, $tableId); - $language = $this->getLanguage($moduleDirname, 'MA'); - $content = $this->getHeaderFilesComments($module); - $content .= $this->getUserBrokenHeader($moduleDirname, $fields); - $content .= $this->getUserBrokenSwitch($moduleDirname, $tableName, $tableSoleName, $language); - $content .= $this->getInclude('footer'); - - $this->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); - - return $this->renderFile(); - } -} diff --git a/class/Files/User/UserFooter.php b/class/Files/User/UserFooter.php index 17659e54..1532ebce 100644 --- a/class/Files/User/UserFooter.php +++ b/class/Files/User/UserFooter.php @@ -1,9 +1,9 @@ -xc = Modulebuilder\Files\CreateXoopsCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); + $this->uxc = Modulebuilder\Files\User\UserXoopsCode::getInstance(); } /** * @static function getInstance - * @param null * @return UserFooter */ public static function getInstance() @@ -57,10 +71,10 @@ public static function getInstance() /** * @public function write - * @param string $module + * @param $module * @param string $filename */ - public function write($module, $filename) + public function write($module, string $filename): void { $this->setModule($module); $this->setFileName($filename); @@ -69,43 +83,51 @@ public function write($module, $filename) /** * @private function getUserFooter * @param $moduleDirname + * @param $language * * @return string */ - private function getUserFooter($moduleDirname) + private function getUserFooter($moduleDirname, $language) { - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $stuModuleDirname = mb_strtoupper($moduleDirname); - $xoBreadcrumbs = $xc->getXcXoopsTplAssign('xoBreadcrumbs', '$xoBreadcrumbs', true, "\t"); - $ret = $pc->getPhpCodeConditions('count($xoBreadcrumbs)', ' > ', '1', $xoBreadcrumbs); - $ret .= $xc->getXcXoopsTplAssign('adv', "\$helper->getConfig('advertise')"); - $ret .= $pc->getPhpCodeCommentLine(); - $ret .= $xc->getXcXoopsTplAssign('bookmarks', "\$helper->getConfig('bookmarks')"); - $ret .= $xc->getXcXoopsTplAssign('fbcomments', "\$helper->getConfig('fbcomments')"); - $ret .= $pc->getPhpCodeCommentLine(); - $ret .= $xc->getXcXoopsTplAssign('admin', "{$stuModuleDirname}_ADMIN"); - $ret .= $xc->getXcXoopsTplAssign('copyright', '$copyright'); - $ret .= $pc->getPhpCodeCommentLine(); - $ret .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'footer', true); + $stuModuleDirname = \mb_strtoupper($moduleDirname); + $xoBreadcrumbs = $this->xc->getXcXoopsTplAssign('xoBreadcrumbs', '$xoBreadcrumbs', true, "\t"); + $config = $this->xc->getXcGetConfig('show_breadcrumbs'); + $ret = $this->pc->getPhpCodeConditions($config . ' && \count($xoBreadcrumbs) > 0', '', '', $xoBreadcrumbs); + $ret .= $this->xc->getXcXoopsTplAssign('adv', "\$helper->getConfig('advertise')"); + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->xc->getXcXoopsTplAssign('bookmarks', "\$helper->getConfig('bookmarks')"); + $ret .= $this->xc->getXcXoopsTplAssign('fbcomments', "\$helper->getConfig('fbcomments')"); + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->xc->getXcXoopsTplAssign('admin', "\\{$stuModuleDirname}_ADMIN"); + $ret .= $this->xc->getXcXoopsTplAssign('copyright', '$copyright'); + $ret .= $this->pc->getPhpCodeCommentLine('Meta description'); + $ret .= $this->uxc->getUserMetaDesc($moduleDirname); + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->pc->getPhpCodeCommentLine('Paths'); + $ret .= $this->xc->getXcXoopsTplAssign('xoops_mpageurl', "\\{$stuModuleDirname}_URL.'/index.php'"); + $ret .= $this->xc->getXcXoopsTplAssign('xoops_icons32_url', '\XOOPS_ICONS32_URL'); + $ret .= $this->xc->getXcXoopsTplAssign("{$moduleDirname}_url", "\\{$stuModuleDirname}_URL"); + $ret .= $this->xc->getXcXoopsTplAssign("{$moduleDirname}_upload_url", "\\{$stuModuleDirname}_UPLOAD_URL"); + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->pc->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH', 'footer', true); return $ret; } /** * @public function render - * @param null - * @return bool|string + * @return string */ public function render() { $module = $this->getModule(); $moduleDirname = $module->getVar('mod_dirname'); + $language = $this->getLanguage($moduleDirname, 'MA'); $filename = $this->getFileName(); $content = $this->getHeaderFilesComments($module); - $content .= $this->getUserFooter($moduleDirname); + $content .= $this->getUserFooter($moduleDirname, $language); - $this->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, '/', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/User/UserHeader.php b/class/Files/User/UserHeader.php index 8c48bf11..da25d5e1 100644 --- a/class/Files/User/UserHeader.php +++ b/class/Files/User/UserHeader.php @@ -1,9 +1,9 @@ -xc = Modulebuilder\Files\CreateXoopsCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); } /** * @static function getInstance - * @param null * @return UserHeader */ public static function getInstance() @@ -57,12 +66,12 @@ public static function getInstance() /** * @public function write - * @param string $module + * @param $module * @param mixed $table * @param array $tables * @param string $filename */ - public function write($module, $table, $tables, $filename) + public function write($module, $table, array $tables, string $filename): void { $this->setModule($module); $this->setTable($table); @@ -78,57 +87,55 @@ public function write($module, $table, $tables, $filename) */ private function getUserHeader($moduleDirname) { - $stuModuleDirname = mb_strtoupper($moduleDirname); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $uxc = UserXoopsCode::getInstance(); - $ret = $pc->getPhpCodeIncludeDir('dirname(dirname(__DIR__))', 'mainfile'); - $ret .= $pc->getPhpCodeIncludeDir('__DIR__', 'include/common'); - $ret .= $xc->getXcEqualsOperator('$moduleDirName', 'basename(__DIR__)'); - $language = $this->getLanguage($moduleDirname, 'MA'); - $ret .= $uxc->getUserBreadcrumbsHeaderFile($moduleDirname, $language); - - $table = $this->getTable(); - $tables = $this->getTables(); - if (is_object($table) && '' != $table->getVar('table_name')) { - $ret .= $xc->getXcHelperGetInstance($moduleDirname); - } - if (is_array($tables)) { - foreach (array_keys($tables) as $i) { + $stuModuleDirname = \mb_strtoupper($moduleDirname); + $tables = $this->getTables(); + + $ret = $this->pc->getPhpCodeIncludeDir('\dirname(__DIR__, 2)', 'mainfile'); + $ret .= $this->pc->getPhpCodeIncludeDir('__DIR__', 'include/common'); + $ret .= $this->xc->getXcEqualsOperator('$moduleDirName', '\basename(__DIR__)'); + $ret .= $this->pc->getPhpCodeCommentLine('Breadcrumbs'); + $ret .= $this->pc->getPhpCodeArray('xoBreadcrumbs', null, false, ''); + $ret .= $this->xc->getXcHelperGetInstance($moduleDirname); + $permissions = 0; + $ratings = 0; + if (\is_array($tables)) { + foreach (\array_keys($tables) as $i) { $tableName = $tables[$i]->getVar('table_name'); - $ret .= $xc->getXcHandlerLine($tableName); + $ret .= $this->xc->getXcHandlerLine($tableName); + if (1 == $tables[$i]->getVar('table_permissions')) { + $permissions = 1; + } + if (1 == $tables[$i]->getVar('table_rate')) { + $ratings = 1; + } } } - $ret .= $pc->getPhpCodeCommentLine('Permission'); - $ret .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/xoopsform/grouppermform', true); - $ret .= $xc->getXcXoopsHandler('groupperm'); - - $condIf = $xc->getXcEqualsOperator('$groups ', '$xoopsUser->getGroups()', null, "\t"); - $condElse = $xc->getXcEqualsOperator('$groups ', 'XOOPS_GROUP_ANONYMOUS', null, "\t"); - - $ret .= $pc->getPhpCodeConditions('is_object($xoopsUser)', '', '', $condIf, $condElse); - $ret .= $pc->getPhpCodeCommentLine(); - $ret .= $xc->getXcEqualsOperator('$myts', 'MyTextSanitizer::getInstance()'); - $ret .= $pc->getPhpCodeCommentLine('Default Css Style'); - $ret .= $xc->getXcEqualsOperator('$style', "{$stuModuleDirname}_URL . '/assets/css/style.css'"); - $ret .= $pc->getPhpCodeConditions('!file_exists($style)', '', '', "\treturn false;\n"); - $ret .= $pc->getPhpCodeCommentLine('Smarty Default'); - $ret .= $xc->getXcXoopsModuleGetInfo('sysPathIcon16', 'sysicons16'); - $ret .= $xc->getXcXoopsModuleGetInfo('sysPathIcon32', 'sysicons32'); - $ret .= $xc->getXcXoopsModuleGetInfo('pathModuleAdmin', 'dirmoduleadmin'); - $ret .= $xc->getXcXoopsModuleGetInfo('modPathIcon16', 'modicons16'); - $ret .= $xc->getXcXoopsModuleGetInfo('modPathIcon32', 'modicons16'); - $ret .= $pc->getPhpCodeCommentLine('Load Languages'); - $ret .= $xc->getXcXoopsLoadLanguage('main'); - $ret .= $xc->getXcXoopsLoadLanguage('modinfo'); + if (1 == $permissions) { + $ret .= $this->xc->getXcHandlerLine('permissions'); + } + if (1 == $ratings) { + $ret .= $this->xc->getXcHandlerLine('ratings'); + } + $ret .= $this->pc->getPhpCodeCommentLine(); + $ret .= $this->xc->getXcEqualsOperator('$myts', 'MyTextSanitizer::getInstance()'); + $ret .= $this->pc->getPhpCodeCommentLine('Default Css Style'); + $ret .= $this->xc->getXcEqualsOperator('$style', "\\{$stuModuleDirname}_URL . '/assets/css/style.css'"); + $ret .= $this->pc->getPhpCodeCommentLine('Smarty Default'); + $ret .= $this->xc->getXcXoopsModuleGetInfo('sysPathIcon16', 'sysicons16'); + $ret .= $this->xc->getXcXoopsModuleGetInfo('sysPathIcon32', 'sysicons32'); + $ret .= $this->xc->getXcXoopsModuleGetInfo('pathModuleAdmin', 'dirmoduleadmin'); + $ret .= $this->xc->getXcXoopsModuleGetInfo('modPathIcon16', 'modicons16'); + $ret .= $this->xc->getXcXoopsModuleGetInfo('modPathIcon32', 'modicons16'); + $ret .= $this->pc->getPhpCodeCommentLine('Load Languages'); + $ret .= $this->xc->getXcXoopsLoadLanguage('main'); + $ret .= $this->xc->getXcXoopsLoadLanguage('modinfo'); return $ret; } /** * @public function render - * @param null - * @return bool|string + * @return string */ public function render() { @@ -138,7 +145,7 @@ public function render() $content = $this->getHeaderFilesComments($module); $content .= $this->getUserHeader($moduleDirname); - $this->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, '/', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/User/UserIndex.php b/class/Files/User/UserIndex.php index e9346d3f..36e77fcc 100644 --- a/class/Files/User/UserIndex.php +++ b/class/Files/User/UserIndex.php @@ -1,9 +1,9 @@ -xc = Modulebuilder\Files\CreateXoopsCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); + $this->uxc = Modulebuilder\Files\User\UserXoopsCode::getInstance(); } /** * @static function getInstance - * @param null * @return UserIndex */ public static function getInstance() @@ -57,11 +71,11 @@ public static function getInstance() /** * @public function write - * @param string $module + * @param $module * @param $table * @param string $filename */ - public function write($module, $table, $filename) + public function write($module, $table, string $filename) { $this->setModule($module); $this->setTable($table); @@ -69,22 +83,22 @@ public function write($module, $table, $filename) } /** - * @private function getTemplateHeaderFile + * @private function getUserIndexHeader + * @param $language * @param $moduleDirname * * @return string */ - private function getTemplateHeaderFile($moduleDirname) + private function getUserIndexHeader($language, $moduleDirname) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $uxc = UserXoopsCode::getInstance(); - $ret = $this->getInclude(); - $ret .= $uxc->getUserTplMain($moduleDirname); - $ret .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'header', true); - $ret .= $pc->getPhpCodeCommentLine('Define Stylesheet'); - $ret .= $xc->getXcXoThemeAddStylesheet(); - $ret .= $pc->getPhpCodeArray('keywords', null, false, ''); + $ret = $this->getRequire(); + $ret .= $this->uxc->getUserTplMain($moduleDirname); + $ret .= $this->pc->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH', 'header', true); + $ret .= $this->pc->getPhpCodeCommentLine('Define Stylesheet'); + $ret .= $this->xc->getXcXoThemeAddStylesheet(); + $ret .= $this->pc->getPhpCodeCommentLine('Keywords'); + $ret .= $this->pc->getPhpCodeArray('keywords', null, false, ''); + $ret .= $this->uxc->getUserBreadcrumbs($language); return $ret; } @@ -103,32 +117,30 @@ private function getBodyCategoriesIndex($tableMid, $tableId, $tableName, $tableS // Fields $fields = $this->getTableFields($tableMid, $tableId); $fieldParentId = []; - foreach (array_keys($fields) as $f) { + foreach (\array_keys($fields) as $f) { $fieldParentId[] = $fields[$f]->getVar('field_parent'); } $ret = ''; - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - if (in_array(1, $fieldParentId)) { - $ret .= $xc->getXcHandlerCountObj($tableName); - $ret .= $pc->getPhpCodeCommentLine('If there are ', $tableName); + if (\in_array(1, $fieldParentId)) { + $ret .= $this->xc->getXcHandlerCountObj($tableName); + $ret .= $this->pc->getPhpCodeCommentLine('If there are ', $tableName); $ret .= $this->getSimpleString('$count = 1;'); - $contentIf = $xc->getXcHandlerAllObj($tableName, '', 0, 0, "\t"); - $contentIf .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/tree', true, false, 'include', "\t"); + $contentIf = $this->xc->getXcHandlerAllObj($tableName, '', '0', '0', "\t"); + $contentIf .= $this->pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/tree', true, false, 'require', "\t"); //$contentIf .= $cc->getClassXoopsObjectTree('mytree', $tableName, $fieldId, $fieldParent, "\t"); - $contentIf .= $pc->getPhpCodeArray($tableName, "\t"); - $foreach = $xc->getXcGetValues($tableName, $tableSoleName . 'Values', $tableFieldname, false, "\t\t"); - $foreach .= $pc->getPhpCodeArray('acount', ["'count'", '$count']); - $foreach .= $pc->getPhpCodeArrayType($tableName, 'merge', $tableSoleName . 'Values', '$acount'); + $contentIf .= $this->pc->getPhpCodeArray($tableName, "\t"); + $foreach = $this->xc->getXcGetValues($tableName.'aaa', $tableSoleName.'bbb' . 'Values', $tableFieldname, false, "\t\t"); + $foreach .= $this->pc->getPhpCodeArray('acount', ["'count'", '$count']); + $foreach .= $this->pc->getPhpCodeArrayType($tableName, 'merge', $tableSoleName . 'Values', '$acount'); $foreach .= $this->getSimpleString('++$count;', "\t\t"); - $contentIf .= $pc->getPhpCodeForeach("{$tableName}All", true, false, $tableFieldname, $foreach, "\t"); - $contentIf .= $xc->getXcXoopsTplAssign($tableName, '$' . $tableName, true, "\t"); - $contentIf .= $pc->getPhpCodeUnset($tableName, "\t"); - $getConfig = $xc->getXcGetConfig('numb_col'); - $contentIf .= $xc->getXcXoopsTplAssign('numb_col', $getConfig, true, "\t"); - $ret .= $pc->getPhpCodeConditions("\${$tableName}Count", ' > ', '0', $contentIf, false); - $ret .= $pc->getPhpCodeUnset('count'); + $contentIf .= $this->pc->getPhpCodeForeach("{$tableName}All", true, false, $tableFieldname, $foreach, "\t"); + $contentIf .= $this->xc->getXcXoopsTplAssign($tableName, '$' . $tableName, true, "\t"); + $contentIf .= $this->pc->getPhpCodeUnset($tableName, "\t"); + $getConfig = $this->xc->getXcGetConfig('numb_col'); + $contentIf .= $this->xc->getXcXoopsTplAssign('numb_col', $getConfig, true, "\t"); + $ret .= $this->pc->getPhpCodeConditions("\${$tableName}Count", ' > ', '0', $contentIf); + $ret .= $this->pc->getPhpCodeUnset('count'); } unset($fieldParentId); @@ -137,61 +149,54 @@ private function getBodyCategoriesIndex($tableMid, $tableId, $tableName, $tableS /** * @private function getBodyPagesIndex - * @param $moduleDirname * @param $tableName - * @param $tableSoleName * @param $language + * @param $tableMid + * @param $tableId * @return string */ - private function getBodyPagesIndex($moduleDirname, $tableName, $tableSoleName, $language) + private function getBodyPagesIndex($tableName, $language, $tableMid, $tableId) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $stuModuleDirname = mb_strtoupper($moduleDirname); - $ucfTableName = ucfirst($tableName); - $ret = $pc->getPhpCodeCommentLine(); - $ret .= $xc->getXcXoopsTplAssign('xoops_icons32_url', 'XOOPS_ICONS32_URL'); - $ret .= $xc->getXcXoopsTplAssign("{$moduleDirname}_url", "{$stuModuleDirname}_URL"); - $ret .= $pc->getPhpCodeCommentLine(); - $ret .= $xc->getXcHandlerCountObj($tableName); - $ret .= $xc->getXcXoopsTplAssign($tableName . 'Count', "\${$tableName}Count"); - $ret .= $this->getSimpleString('$count = 1;'); - $condIf = $xc->getXcXoopsRequest('start', 'start', '0', 'Int', false, "\t"); - $userpager = $xc->getXcGetConfig('userpager'); - $condIf .= $xc->getXcXoopsRequest('limit', 'limit', $userpager, 'Int', false, "\t"); - $condIf .= $xc->getXcHandlerAllObj($tableName, '', '$start', '$limit', "\t"); - $condIf .= $pc->getPhpCodeCommentLine('Get All', $ucfTableName, "\t"); - $condIf .= $pc->getPhpCodeArray($tableName, null, false, "\t"); - $foreach = $xc->getXcGetValues($tableName, $tableSoleName, 'i', false, "\t\t"); - $foreach .= $pc->getPhpCodeArray('acount', ["'count'", '$count']); - $foreach .= $pc->getPhpCodeArrayType($tableName, 'merge', $tableSoleName, '$acount'); - $table = $this->getTable(); + $ucfTableName = \ucfirst($tableName); + $fields = $this->getTableFields($tableMid, $tableId); + + $ret = $this->pc->getPhpCodeCommentLine('Tables'); + $ret .= $this->xc->getXcHandlerCountObj($tableName); + $ret .= $this->xc->getXcXoopsTplAssign($tableName . 'Count', "\${$tableName}Count"); + //$ret .= $this->getSimpleString('$count = 1;'); + $condIf = $this->xc->getXcXoopsRequest('start', 'start', '', 'Int', "\t"); + $userpager = $this->xc->getXcGetConfig('userpager'); + $condIf .= $this->xc->getXcXoopsRequest('limit', 'limit', $userpager, 'Int', "\t"); + $condIf .= $this->xc->getXcHandlerAllObj($tableName, '', '$start', '$limit', "\t"); + $condIf .= $this->pc->getPhpCodeCommentLine('Get All', $ucfTableName, "\t"); + $condIf .= $this->pc->getPhpCodeArray($tableName . '_list', null, false, "\t"); + $foreach = $this->xc->getXcGetValues($tableName, $tableName . '_list[]', 'i', false, "\t\t"); + //$foreach .= $this->pc->getPhpCodeArray('acount', ["'count'", '$count']); + //$foreach .= $this->pc->getPhpCodeArrayType($tableName . '_list', 'merge', $tableSoleName . '_list', '$acount'); // Fields - $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); $fieldMain = ''; - foreach (array_keys($fields) as $f) { + foreach (\array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); if (1 == $fields[$f]->getVar('field_main')) { $fieldMain = $fieldName; // fieldMain = fields parameters main field } } - $foreach .= $xc->getXcGetVar('keywords[]', "{$tableName}All[\$i]", $fieldMain, false, "\t\t"); - $foreach .= $this->getSimpleString('++$count;', "\t\t"); - $condIf .= $pc->getPhpCodeForeach("{$tableName}All", true, false, 'i', $foreach, "\t"); - $condIf .= $xc->getXcXoopsTplAssign($tableName, '$' . $tableName, true, "\t"); - $condIf .= $pc->getPhpCodeUnset($tableName, "\t"); - $condIf .= $xc->getXcPageNav($tableName, "\t"); - $thereare = $pc->getPhpCodeSprintf("{$language}INDEX_THEREARE", "\${$tableName}Count"); - $condIf .= $xc->getXcXoopsTplAssign('lang_thereare', $thereare, true, "\t"); - $divideby = $xc->getXcGetConfig('divideby'); - $condIf .= $xc->getXcXoopsTplAssign('divideby', $divideby, true, "\t"); - $numb_col = $xc->getXcGetConfig('numb_col'); - $condIf .= $xc->getXcXoopsTplAssign('numb_col', $numb_col, true, "\t"); - - $ret .= $pc->getPhpCodeConditions("\${$tableName}Count", ' > ', '0', $condIf); - $ret .= $pc->getPhpCodeUnset('count'); - $tableType = $xc->getXcGetConfig('table_type'); - $ret .= $xc->getXcXoopsTplAssign('table_type', $tableType); + $foreach .= $this->xc->getXcGetVar('keywords[]', "{$tableName}All[\$i]", $fieldMain, false, "\t\t"); + //$foreach .= $this->getSimpleString('++$count;', "\t\t"); + $condIf .= $this->pc->getPhpCodeForeach("{$tableName}All", true, false, 'i', $foreach, "\t"); + $condIf .= $this->xc->getXcXoopsTplAssign($tableName . '_list', '$' . $tableName . '_list', true, "\t"); + $condIf .= $this->pc->getPhpCodeUnset($tableName, "\t"); + $condIf .= $this->xc->getXcPageNav($tableName, "\t"); + $thereare = $this->pc->getPhpCodeSprintf("{$language}INDEX_THEREARE", "\${$tableName}Count"); + $condIf .= $this->xc->getXcXoopsTplAssign('lang_thereare', $thereare, true, "\t"); + $divideby = $this->xc->getXcGetConfig('divideby'); + $condIf .= $this->xc->getXcXoopsTplAssign('divideby', $divideby, true, "\t"); + $numb_col = $this->xc->getXcGetConfig('numb_col'); + $condIf .= $this->xc->getXcXoopsTplAssign('numb_col', $numb_col, true, "\t"); + $ret .= $this->pc->getPhpCodeConditions("\${$tableName}Count", ' > ', '0', $condIf); + //$ret .= $this->pc->getPhpCodeUnset('count'); + $tableType = $this->xc->getXcGetConfig('table_type'); + $ret .= $this->xc->getXcXoopsTplAssign('table_type', $tableType); return $ret; } @@ -199,66 +204,55 @@ private function getBodyPagesIndex($moduleDirname, $tableName, $tableSoleName, $ /** * @private function getUserPagesFooter * @param $moduleDirname - * @param $language + * * @return string */ - private function getUserIndexFooter($moduleDirname, $language) + private function getUserIndexFooter($moduleDirname) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $uxc = UserXoopsCode::getInstance(); - $stuModuleDirname = mb_strtoupper($moduleDirname); - $ret = $pc->getPhpCodeCommentLine('Breadcrumbs'); - $ret .= $uxc->getUserBreadcrumbs($language); - $ret .= $pc->getPhpCodeCommentLine('Keywords'); - $ret .= $uxc->getUserMetaKeywords($moduleDirname); - $ret .= $pc->getPhpCodeUnset('keywords'); - $ret .= $pc->getPhpCodeCommentLine('Description'); - $ret .= $uxc->getUserMetaDesc($moduleDirname, $language); - $ret .= $xc->getXcXoopsTplAssign('xoops_mpageurl', "{$stuModuleDirname}_URL.'/index.php'"); - $ret .= $xc->getXcXoopsTplAssign('xoops_icons32_url', 'XOOPS_ICONS32_URL'); - $ret .= $xc->getXcXoopsTplAssign("{$moduleDirname}_upload_url", "{$stuModuleDirname}_UPLOAD_URL"); - $ret .= $this->getInclude('footer'); + $ret = $this->pc->getPhpCodeCommentLine('Meta keywords'); + $ret .= $this->uxc->getUserMetaKeywords($moduleDirname); + $ret .= $this->pc->getPhpCodeUnset('keywords'); + $ret .= $this->getRequire('footer'); return $ret; } /** * @public function render - * @param null - * @return bool|string + * @return string */ public function render() { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); $module = $this->getModule(); $tables = $this->getTableTables($module->getVar('mod_id'), 'table_order'); $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); $language = $this->getLanguage($moduleDirname, 'MA'); - $content = $this->getHeaderFilesComments($module, null); - $content .= $pc->getPhpCodeUseNamespace(['Xmf', 'Request'], '', ''); - $content .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', ''); - $content .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']); - $content .= $this->getTemplateHeaderFile($moduleDirname); - foreach (array_keys($tables) as $t) { - $tableId = $tables[$t]->getVar('table_id'); - $tableMid = $tables[$t]->getVar('table_mid'); - $tableName = $tables[$t]->getVar('table_name'); - $tableSoleName = $tables[$t]->getVar('table_solename'); - $tableCategory[] = $tables[$t]->getVar('table_category'); - $tableFieldname = $tables[$t]->getVar('table_fieldname'); - $tableIndex[] = $tables[$t]->getVar('table_index'); - if (in_array(1, $tableCategory, true) && in_array(1, $tableIndex)) { + + $content = $this->getHeaderFilesComments($module); + $content .= $this->pc->getPhpCodeUseNamespace(['Xmf', 'Request'], '', ''); + $content .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', ''); + $content .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']); + $content .= $this->getUserIndexHeader($language, $moduleDirname); + + foreach (\array_keys($tables) as $t) { + $tableId = $tables[$t]->getVar('table_id'); + $tableMid = $tables[$t]->getVar('table_mid'); + $tableName = $tables[$t]->getVar('table_name'); + $tableSoleName = $tables[$t]->getVar('table_solename'); + $tableCategory = $tables[$t]->getVar('table_category'); + $tableFieldname = $tables[$t]->getVar('table_fieldname'); + $tableIndex = $tables[$t]->getVar('table_index'); + if (1 == $tableCategory && 1 == $tableIndex) { $content .= $this->getBodyCategoriesIndex($tableMid, $tableId, $tableName, $tableSoleName, $tableFieldname); } - if (in_array(0, $tableCategory, true) && in_array(1, $tableIndex)) { - $content .= $this->getBodyPagesIndex($moduleDirname, $tableName, $tableSoleName, $language); + if (0 == $tableCategory && 1 == $tableIndex) { + $content .= $this->getBodyPagesIndex($tableName, $language, $tableMid, $tableId); } } - $content .= $this->getUserIndexFooter($moduleDirname, $language); + $content .= $this->getUserIndexFooter($moduleDirname); - $this->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, '/', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/User/UserListTag.php b/class/Files/User/UserListTag.php index 34b2c732..d88699a3 100644 --- a/class/Files/User/UserListTag.php +++ b/class/Files/User/UserListTag.php @@ -1,9 +1,9 @@ -pc = Tdmcreate\Files\CreatePhpCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); } /** * @static function getInstance - * @param null * @return UserListTag */ public static function getInstance() @@ -63,10 +61,10 @@ public static function getInstance() /** * @public function write - * @param string $module + * @param $module * @param string $filename */ - public function write($module, $filename) + public function write($module, string $filename): void { $this->setModule($module); $this->setFileName($filename); @@ -74,21 +72,19 @@ public function write($module, $filename) /** * @public function getUserListTag - * @param null * @return string */ public function getUserListTag() { - $ret = $this->getInclude(); - $ret .= $this->pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'modules/tag/list.tag'); + $ret = $this->getRequire(); + $ret .= $this->pc->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH', 'modules/tag/list.tag'); return $ret; } /** * @public function render - * @param null - * @return bool|string + * @return string */ public function render() { @@ -98,7 +94,7 @@ public function render() $content = $this->getHeaderFilesComments($module); $content .= $this->getUserListTag(); - $this->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, '/', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/User/UserNotificationUpdate.php b/class/Files/User/UserNotificationUpdate.php index f6d6fbf2..a494d813 100644 --- a/class/Files/User/UserNotificationUpdate.php +++ b/class/Files/User/UserNotificationUpdate.php @@ -1,9 +1,9 @@ -pc = Tdmcreate\Files\CreatePhpCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); } /** * @static function getInstance - * @param null * @return UserNotificationUpdate */ public static function getInstance() @@ -63,10 +61,10 @@ public static function getInstance() /** * @public function write - * @param string $module + * @param $module * @param string $filename */ - public function write($module, $filename) + public function write($module, string $filename): void { $this->setModule($module); $this->setFileName($filename); @@ -74,8 +72,7 @@ public function write($module, $filename) /** * @public function render - * @param null - * @return bool|string + * @return string */ public function render() { @@ -83,10 +80,10 @@ public function render() $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); $content = $this->getHeaderFilesComments($module); - $content .= $this->pc->getPhpCodeIncludeDir('dirname(dirname(__DIR__))', 'mainfile'); - $content .= $this->pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'include/notification_update'); + $content .= $this->pc->getPhpCodeIncludeDir('\dirname(__DIR__, 2)', 'mainfile'); + $content .= $this->pc->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH', 'include/notification_update'); - $this->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, '/', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/User/UserPages.php b/class/Files/User/UserPages.php index 5525f51d..74b2b211 100644 --- a/class/Files/User/UserPages.php +++ b/class/Files/User/UserPages.php @@ -1,9 +1,12 @@ -xc = Modulebuilder\Files\CreateXoopsCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); + $this->uxc = Modulebuilder\Files\User\UserXoopsCode::getInstance(); } /** * @static function getInstance - * @param null * @return UserPages */ public static function getInstance() @@ -73,81 +90,480 @@ public function write($module, $table, $filename) * @param $moduleDirname * @param $tableName * @param $fieldId + * @param $tablePermissions + * @param $language * @return string */ - private function getUserPagesHeader($moduleDirname, $tableName, $fieldId) + private function getUserPagesHeader($moduleDirname, $tableName, $fieldId, $tablePermissions, $language) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $uxc = UserXoopsCode::getInstance(); - $ccFieldId = $this->getCamelCase($fieldId, false, true); - $ret = $pc->getPhpCodeUseNamespace(['Xmf', 'Request'], '', ''); - $ret .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', ''); - $ret .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']); - $ret .= $this->getInclude(); - $ret .= $uxc->getUserTplMain($moduleDirname, $tableName); - $ret .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'header', true); - $ret .= $pc->getPhpCodeBlankLine(); - $ret .= $xc->getXcXoopsRequest('op', 'op', 'list', 'String'); - $ret .= $xc->getXcXoopsRequest($ccFieldId, $fieldId, '0', 'Int'); - $ret .= $xc->getXcXoopsRequest('start', 'start', '0', 'Int'); - $userpager = $xc->getXcGetConfig('userpager'); - $ret .= $xc->getXcXoopsRequest('limit', 'limit', $userpager, 'Int'); - $ret .= $pc->getPhpCodeBlankLine(); - $ret .= $pc->getPhpCodeCommentLine('Define Stylesheet'); - $ret .= $xc->getXcXoThemeAddStylesheet(); + $ccFieldId = $this->getCamelCase($fieldId, false, true); + + $ret = $this->pc->getPhpCodeUseNamespace(['Xmf', 'Request'], '', ''); + $ret .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', ''); + $ret .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants'], '', ''); + $ret .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Common']); + $ret .= $this->getRequire(); + $ret .= $this->uxc->getUserTplMain($moduleDirname, $tableName); + $ret .= $this->pc->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH', 'header', true); + $ret .= $this->pc->getPhpCodeBlankLine(); + $leftLen = \strlen($ccFieldId); + $leftOp = 'op'; + $leftField = $ccFieldId; + $leftStart = 'start'; + $leftLimit = 'limit'; + if ($leftLen > 5) { + $leftOp .= \str_repeat(' ', $leftLen - 2); + $leftStart .= \str_repeat(' ', $leftLen - 5); + $leftLimit .= \str_repeat(' ', $leftLen - 5); + } else { + $leftOp .= \str_repeat(' ', 3); + if (\strlen($ccFieldId) < 5) { + $leftField .= \str_repeat(' ', 5 - $leftLen); + } + } + $ret .= $this->xc->getXcXoopsRequest($leftOp, 'op', 'list', 'Cmd'); + $ret .= $this->xc->getXcXoopsRequest($leftField, $fieldId, '', 'Int'); + $ret .= $this->xc->getXcXoopsRequest($leftStart, 'start', '', 'Int'); + $userpager = $this->xc->getXcGetConfig('userpager'); + $ret .= $this->xc->getXcXoopsRequest($leftLimit, 'limit', $userpager, 'Int'); + $ret .= $this->xc->getXcXoopsTplAssign('start', '$start'); + $ret .= $this->xc->getXcXoopsTplAssign('limit', '$limit'); + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->pc->getPhpCodeCommentLine('Define Stylesheet'); + $ret .= $this->xc->getXcXoThemeAddStylesheet(); + $ret .= $this->pc->getPhpCodeCommentLine('Keywords'); + $ret .= $this->pc->getPhpCodeArray('keywords', null, false, ''); + $ret .= $this->uxc->getUserBreadcrumbs($language, 'index', '', 'index.php'); + $ret .= $this->pc->getPhpCodeCommentLine('Permissions'); + if (1 == $tablePermissions) { + $ret .= $this->xc->getXcEqualsOperator('$permEdit', '$permissionsHandler->getPermGlobalSubmit()'); + $ret .= $this->xc->getXcXoopsTplAssign('permEdit', '$permEdit'); + } + $ret .= $this->xc->getXcXoopsTplAssign('showItem', "\${$ccFieldId} > 0"); + $ret .= $this->pc->getPhpCodeBlankLine(); return $ret; } /** - * @private function getUserPages + * @private function getUserPagesList * @param $moduleDirname * @param $tableName * @param $fieldId * @param $fieldMain + * @param $tableRate + * @param $fieldReads + * @param $language + * @param string $t * @return string */ - private function getUserPages($moduleDirname, $tableName, $fieldId, $fieldMain) + private function getUserPagesList($moduleDirname, $tableName, $fieldId, $fieldMain, $tableRate, $fieldReads, $language, string $t = '') { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $stuModuleDirname = mb_strtoupper($moduleDirname); - $ucfTableName = ucfirst($tableName); + $ucfTableName = \ucfirst($tableName); + $stuTableName = \mb_strtoupper($tableName); $ccFieldId = $this->getCamelCase($fieldId, false, true); + $ccFieldMain = $this->getCamelCase($fieldMain, false, true); + $ccFieldReads = $this->getCamelCase($fieldReads, false, true); + $stuModuleDirname = \mb_strtoupper($moduleDirname); + + $ret = $this->uxc->getUserBreadcrumbs($language, $tableName, 'list', '', $t); + if ($tableRate) { + $varRate = '$ratingbars'; + $ret .= $this->xc->getXcEqualsOperator($varRate, '(int)' . $this->xc->getXcGetConfig('ratingbars'),'', $t); + $contIf = $this->xc->getXcXoThemeAddStylesheet("\\{$stuModuleDirname}_URL . '/assets/css/rating.css'", $t . "\t", false); + $contIf .= $this->xc->getXcXoopsTplAssign('rating', $varRate, true, $t . "\t"); + $contIf .= $this->xc->getXcXoopsTplAssign('rating_5stars', "(Constants::RATING_5STARS === {$varRate})", true, $t . "\t"); + $contIf .= $this->xc->getXcXoopsTplAssign('rating_10stars', "(Constants::RATING_10STARS === {$varRate})", true, $t . "\t"); + $contIf .= $this->xc->getXcXoopsTplAssign('rating_10num', "(Constants::RATING_10NUM === {$varRate})", true, $t . "\t"); + $contIf .= $this->xc->getXcXoopsTplAssign('rating_likes', "(Constants::RATING_LIKES === {$varRate})", true, $t . "\t"); + $contIf .= $this->xc->getXcXoopsTplAssign('itemid', "'{$fieldId}'", true, $t . "\t"); + $contIf .= $this->xc->getXcXoopsTplAssign($moduleDirname . '_icon_url_16', "\\{$stuModuleDirname}_URL . '/' . \$modPathIcon16", true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions($varRate, ' > ', '0', $contIf, false, $t); + } + $critName = 'cr' . $ucfTableName; + $ret .= $this->xc->getXcCriteriaCompo($critName, $t); + $crit = $this->xc->getXcCriteria('', "'{$fieldId}'", "\${$ccFieldId}",'',true); + $contIf = $this->xc->getXcCriteriaAdd($critName, $crit, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions("\${$ccFieldId}", ' > ', '0', $contIf, false, $t); + $ret .= $this->xc->getXcHandlerCountClear($tableName . 'Count', $tableName, '$' . $critName, $t); + $ret .= $this->xc->getXcXoopsTplAssign($tableName . 'Count', "\${$tableName}Count", true, $t); + $contIf = $this->xc->getXcCriteriaSetStart($critName, '$start', $t . "\t"); + $contIf .= $this->xc->getXcCriteriaSetLimit($critName, '$limit', $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions("\${$ccFieldId}", ' === ', '0', $contIf, false, $t); + $ret .= $this->xc->getXcHandlerAllClear($tableName . 'All', $tableName, '$' . $critName, $t); + $condIf = $this->pc->getPhpCodeArray($tableName . 'List', null, false, $t . "\t"); + $condIf .= $this->xc->getXcEqualsOperator("\${$ccFieldMain}", "''",'', $t . "\t"); + $condIf .= $this->pc->getPhpCodeCommentLine('Get All', $ucfTableName, $t . "\t"); + $foreach = $this->xc->getXcGetValues($tableName, $tableName . 'List' . '[$i]', 'i', false, $t . "\t\t"); + $foreach .= $this->xc->getXcGetVar($ccFieldMain, "{$tableName}All[\$i]", $fieldMain, false, $t . "\t\t"); + $foreach .= $this->xc->getXcEqualsOperator('$keywords[$i]', "\${$ccFieldMain}",'', $t . "\t\t"); + if ($tableRate) { + $itemId = $this->xc->getXcGetVar($ccFieldId, "{$tableName}All[\$i]", $fieldId, true); + $const = $this->xc->getXcGetConstants('TABLE_' . $stuTableName); + $foreach .= $this->xc->getXcEqualsOperator("\${$tableName}List[\$i]['rating']", "\$ratingsHandler->getItemRating({$itemId}, {$const})",'', $t . "\t\t"); + $foreach .= $this->xc->getXcEqualsOperator("\${$tableName}List[\$i]['rating_source']", "{$const}",'', $t . "\t\t"); + $foreach .= $this->xc->getXcEqualsOperator("\$token", "\$GLOBALS['xoopsSecurity']->createToken()",'', $t . "\t\t"); + $foreach .= $this->xc->getXcXoopsTplAssign('xoops_token', '$token', true, $t . "\t\t"); + } + $condIf .= $this->pc->getPhpCodeForeach("{$tableName}All", true, false, 'i', $foreach, $t . "\t"); + $condIf .= $this->xc->getXcXoopsTplAssign($tableName . '_list', "\${$tableName}List", true, $t . "\t"); + $condIf .= $this->pc->getPhpCodeUnset($tableName . 'List', $t . "\t"); + $condIf .= $this->xc->getXcPageNav($tableName, $t . "\t"); + $config = $this->xc->getXcGetConfig('table_type'); + $condIf .= $this->xc->getXcXoopsTplAssign('table_type', $config, true, $t . "\t"); + $config = $this->xc->getXcGetConfig('panel_type'); + $condIf .= $this->xc->getXcXoopsTplAssign('panel_type', $config, true, $t . "\t"); + $divideby = $this->xc->getXcGetConfig('divideby'); + $condIf .= $this->xc->getXcXoopsTplAssign('divideby', $divideby, true, $t . "\t"); + $numbCol = $this->xc->getXcGetConfig('numb_col'); + $condIf .= $this->xc->getXcXoopsTplAssign('numb_col', $numbCol, true, $t . "\t"); + $stripTags = $this->pc->getPhpCodeStripTags('', "\${$ccFieldMain} . ' - ' . " . "\$GLOBALS['xoopsModule']->getVar('name')", true); + $condIf2 = $this->xc->getXcXoopsTplAssign('xoops_pagetitle', $stripTags, true, $t . "\t\t"); + $condIf .= $this->pc->getPhpCodeConditions("'show' == \$op && '' != \${$ccFieldMain}", '', '', $condIf2, false, $t . "\t"); + + if ('' !== $fieldReads) { + $redirectError = $this->xc->getXcRedirectHeader($tableName, '', '3', "{$language}INVALID_PARAM", true, $t . "\t\t\t"); + $condIf3 = $this->pc->getPhpCodeConditions('0 === $' . $ccFieldId, '', '', $redirectError, false, $t . "\t\t"); + + $condIf3 .= $this->xc->getXcHandlerGetObj($tableName, $ccFieldId, $t . "\t\t"); + + $getVar = $this->xc->getXcGetVar('', "{$tableName}Obj", $fieldReads, true); + + $tablenameObj = $this->pc->getPhpCodeIsobject($tableName . 'Obj'); + $condIf3 .= $this->pc->getPhpCodeConditions('!' . $tablenameObj, '', '', $redirectError, false, $t . "\t\t"); + + + + $condIf3 .= $this->xc->getXcEqualsOperator("\${$ccFieldReads}", '(int)' . $getVar . ' + 1', false, $t . "\t\t"); + $condIf3 .= $this->xc->getXcSetVarObj($tableName, $fieldReads, "\${$ccFieldReads}", $t . "\t\t"); + $condIf3 .= $this->pc->getPhpCodeCommentLine('Insert Data', null, $t . "\t\t"); + $insert = $this->xc->getXcHandlerInsert($tableName, $tableName, 'Obj'); + $condIf3 .= $this->getSimpleString($insert .';',$t . "\t\t"); + //$contentInsert = $this->xc->getXcRedirectHeader("'{$tableName}.php?op=list&{$fieldId}=' . \${$ccFieldId}", '', '5', "\${$tableName}Obj->getHtmlErrors()", false, $t . "\t\t\t"); + //$condIf3 .= $this->pc->getPhpCodeConditions('!' . $insert, '', '', $contentInsert, false, $t . "\t\t"); + $condIf .= $this->pc->getPhpCodeConditions("'show' == \$op", '', '', $condIf3, false, $t . "\t"); + } - $t = "\t"; - $ret = $pc->getPhpCodeBlankLine(); - $ret .= $xc->getXcXoopsTplAssign('xoops_icons32_url', 'XOOPS_ICONS32_URL'); - $ret .= $xc->getXcXoopsTplAssign("{$moduleDirname}_url", "{$stuModuleDirname}_URL"); - $ret .= $pc->getPhpCodeBlankLine(); - $critName = 'cr' . $ucfTableName; - $ret .= $xc->getXcCriteriaCompo($critName); - $crit = $xc->getXcCriteria('', "'{$fieldId}'", "\${$ccFieldId}",'',true); - $contIf = $xc->getXcCriteriaAdd($critName, $crit, "\t"); - $ret .= $pc->getPhpCodeConditions("\${$ccFieldId}", ' > ', '0', $contIf); - $ret .= $xc->getXcHandlerCountClear($tableName . 'Count', $tableName, '$' . $critName); - $ret .= $xc->getXcXoopsTplAssign($tableName . 'Count', "\${$tableName}Count"); - $ret .= $xc->getXcCriteriaSetStart($critName, '$start'); - $ret .= $xc->getXcCriteriaSetLimit($critName, '$limit'); - $ret .= $xc->getXcHandlerAllClear($tableName . 'All', $tableName, '$' . $critName); - $ret .= $pc->getPhpCodeArray('keywords', null, false, ''); - $condIf = $pc->getPhpCodeArray($tableName, null, false, $t); - $condIf .= $pc->getPhpCodeCommentLine('Get All', $ucfTableName, $t); - $foreach = $xc->getXcGetValues($tableName, $tableName . '[]', 'i', false, $t . "\t"); - $foreach .= $xc->getXcGetVar('keywords[]', "{$tableName}All[\$i]", $fieldMain, false, $t . "\t"); - $condIf .= $pc->getPhpCodeForeach("{$tableName}All", true, false, 'i', $foreach, $t); - $condIf .= $xc->getXcXoopsTplAssign($tableName, "\${$tableName}", true, $t); - $condIf .= $pc->getPhpCodeUnset($tableName, $t); - $condIf .= $xc->getXcPageNav($tableName, $t); - $tableType = $xc->getXcGetConfig('table_type'); - $condIf .= $xc->getXcXoopsTplAssign('type', $tableType, true, $t); - $divideby = $xc->getXcGetConfig('divideby'); - $condIf .= $xc->getXcXoopsTplAssign('divideby', $divideby, true, $t); - $numbCol = $xc->getXcGetConfig('numb_col'); - $condIf .= $xc->getXcXoopsTplAssign('numb_col', $numbCol, true, $t); - - $ret .= $pc->getPhpCodeConditions("\${$tableName}Count", ' > ', '0', $condIf); + $ret .= $this->pc->getPhpCodeConditions("\${$tableName}Count", ' > ', '0', $condIf, false, $t); + + return $ret; + } + + /** + * @public function getUserSubmitSave + * @param string $moduleDirname + * @param $fields + * @param string $tableName + * @param $tableSoleName + * @param $tablePermissions + * @param $tableNotifications + * @param $language + * @param string $t + * @return string + */ + public function getUserPagesSave(string $moduleDirname, $fields, string $tableName, $tableSoleName, $tablePermissions, $tableNotifications, $language, string $t = '') + { + $ucfTableName = \ucfirst($tableName); + $countUploader = 0; + $fieldId = ''; + $ccFieldId = ''; + $fieldMain = ''; + $fieldStatus = ''; + $ucfFieldId = ''; + $ccFieldMain = ''; + $ccFieldStatus = ''; + foreach (\array_keys($fields) as $f) { + $fieldName = $fields[$f]->getVar('field_name'); + if (0 == $f) { + $fieldId = $fieldName; + $ccFieldId = $this->getCamelCase($fieldId, false, true); + $ucfFieldId = \ucfirst($ccFieldId); + } + if ($fields[$f]->getVar('field_element') >= Constants::FIELD_ELE_IMAGELIST && $fields[$f]->getVar('field_element') <= Constants::FIELD_ELE_UPLOADFILE) { + $countUploader++; + } + if (1 == $fields[$f]->getVar('field_main')) { + $fieldMain = $fieldName; // fieldMain = fields parameters main field + $ccFieldMain = $this->getCamelCase($fieldMain, false, true); + } + if ($fields[$f]->getVar('field_element') == Constants::FIELD_ELE_SELECTSTATUS) { + $fieldStatus = $fieldName; + $ccFieldStatus = $this->getCamelCase($fieldStatus, false, true); + } + } + + $ret = $this->pc->getPhpCodeCommentLine('Security Check', '', $t); + $xoopsSecurityCheck = $this->xc->getXcXoopsSecurityCheck(); + $securityError = $this->xc->getXcXoopsSecurityErrors(); + $implode = $this->pc->getPhpCodeImplode(',', $securityError); + $redirectError = $this->xc->getXcRedirectHeader($tableName, '', '3', $implode, true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions('!' . $xoopsSecurityCheck, '', '', $redirectError, false, $t); + + if (1 == $tablePermissions) { + $ret .= $this->pc->getPhpCodeCommentLine('Check permissions', '', $t); + $contIf = $this->xc->getXcRedirectHeader($tableName, '?op=list', 3, '\_NOPERM', true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions('!$permissionsHandler->getPermGlobalSubmit()', '', '', $contIf, false, $t); + } + $getObj = $this->xc->getXcHandlerGetObj($tableName, $ccFieldId, $t . "\t"); + $createObj = $this->xc->getXcHandlerCreateObj($tableName, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions("\${$ccFieldId}", ' > ', '0', $getObj, $createObj, $t); + $tablenameObj = $this->pc->getPhpCodeIsobject($tableName . 'Obj'); + $redirectError = $this->xc->getXcRedirectHeader($tableName, '', '3', "{$language}INVALID_PARAM", true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions('!' . $tablenameObj, '', '', $redirectError, false, $t); + $ret .= $this->xc->getXcSaveElements($moduleDirname, $tableName, $tableSoleName, $fields, $t); + $ret .= $this->pc->getPhpCodeCommentLine('Insert Data', null, $t); + $insert = $this->xc->getXcHandlerInsert($tableName, $tableName, 'Obj'); + + $contentInsert = ''; + if (1 == $tableNotifications || $countUploader > 0) { + $contentInsert .= $this->pc->getPhpCodeTernaryOperator("new{$ucfFieldId}", "\${$ccFieldId} > 0", "\${$ccFieldId}", "\${$tableName}Obj->getNewInsertedId{$ucfTableName}()", $t . "\t"); + } + + if (1 == $tablePermissions) { + $contentInsert .= $this->xc->getXcXoopsHandler('groupperm', $t . "\t"); + $contentInsert .= $this->xc->getXcEqualsOperator('$mid', "\$GLOBALS['xoopsModule']->getVar('mid')", null, $t . "\t"); + $contentInsert .= $this->getPermissionsSave($moduleDirname, $ucfFieldId,'view_' . $tableName); + $contentInsert .= $this->getPermissionsSave($moduleDirname, $ucfFieldId, 'submit_' . $tableName); + $contentInsert .= $this->getPermissionsSave($moduleDirname, $ucfFieldId, 'approve_' . $tableName); + } + + if (1 == $tableNotifications) { + $contentInsert .= $this->pc->getPhpCodeCommentLine('Handle notification', null, $t . "\t"); + $contentInsert .= $this->xc->getXcGetVar($ccFieldMain, "{$tableName}Obj", $fieldMain, false, $t. "\t"); + if ('' !== $fieldStatus) { + $contentInsert .= $this->xc->getXcGetVar($ccFieldStatus, "{$tableName}Obj", $fieldStatus, false, $t . "\t"); + } + $contentInsert .= $this->pc->getPhpCodeArray('tags', [], false, $t . "\t"); + $contentInsert .= $this->xc->getXcEqualsOperator("\$tags['ITEM_NAME']", "\${$ccFieldMain}", '', $t . "\t"); + $url = "\XOOPS_URL . '/modules/{$moduleDirname}/{$tableName}.php?op=show&{$fieldId}=' . \$new{$ucfFieldId}"; + + + + $contentInsert .= $this->xc->getXcEqualsOperator("\$tags['ITEM_URL'] ", $url, '', $t . "\t"); + $contentInsert .= $this->xc->getXcXoopsHandler('notification', $t . "\t"); + if ('' === $fieldStatus) { + $not2If = $this->pc->getPhpCodeCommentLine('Event modify notification', null, $t . "\t\t"); + $not2If .= $this->getSimpleString("\$notificationHandler->triggerEvent('global', 0, 'global_modify', \$tags);", $t . "\t\t"); + $not2If .= $this->getSimpleString("\$notificationHandler->triggerEvent('{$tableName}', \$new{$ucfFieldId}, '{$tableSoleName}_modify', \$tags);", $t . "\t\t"); + $not2Else = $this->pc->getPhpCodeCommentLine('Event new notification', null, $t . "\t\t"); + $not2Else .= $this->getSimpleString("\$notificationHandler->triggerEvent('global', 0, 'global_new', \$tags);", $t . "\t\t"); + //$not2Else .= $this->getSimpleString("\$notificationHandler->triggerEvent('{$tableName}', \$new{$ucfFieldId}, '{$tableSoleName}_new', \$tags);", $t . "\t\t"); + $not1Else = $this->pc->getPhpCodeConditions("\${$ccFieldId}", ' > ', '0', $not2If, $not2Else, $t . "\t"); + $contentInsert .= $not1Else; + } else { + $not1If = $this->pc->getPhpCodeCommentLine('Event approve notification', null, $t . "\t\t"); + $not1If .= $this->getSimpleString("\$notificationHandler->triggerEvent('global', 0, 'global_approve', \$tags);", $t . "\t\t"); + $not1If .= $this->getSimpleString("\$notificationHandler->triggerEvent('{$tableName}', \$new{$ucfFieldId}, '{$tableSoleName}_approve', \$tags);", $t . "\t\t"); + $not2If = $this->pc->getPhpCodeCommentLine('Event modify notification', null, $t . "\t\t\t"); + $not2If .= $this->getSimpleString("\$notificationHandler->triggerEvent('global', 0, 'global_modify', \$tags);", $t . "\t\t\t"); + $not2If .= $this->getSimpleString("\$notificationHandler->triggerEvent('{$tableName}', \$new{$ucfFieldId}, '{$tableSoleName}_modify', \$tags);", $t . "\t\t\t"); + $not2Else = $this->pc->getPhpCodeCommentLine('Event new notification', null, $t . "\t\t\t"); + $not2Else .= $this->getSimpleString("\$notificationHandler->triggerEvent('global', 0, 'global_new', \$tags);", $t . "\t\t\t"); + $not1Else = $this->pc->getPhpCodeConditions("\${$ccFieldId}", ' > ', '0', $not2If, $not2Else, $t . "\t\t"); + $contentInsert .= $this->pc->getPhpCodeConditions("\${$ccFieldStatus}", ' == ', $this->xc->getXcGetConstants('STATUS_APPROVED'), $not1If, $not1Else, $t . "\t"); + } + } + + $contentInsert .= $this->pc->getPhpCodeCommentLine('redirect after insert', null, $t . "\t"); + if ($countUploader > 0) { + $errIf = $this->xc->getXcRedirectHeader("'{$tableName}.php?op=edit&{$fieldId}=' . \$new{$ucfFieldId}", '', '5', '$uploaderErrors', false, $t . "\t\t"); + $errElse = $this->xc->getXcRedirectHeader("'{$tableName}.php?op=list&start=' . \$start . '&limit=' . \$limit", '', '2', "{$language}FORM_OK", false, $t . "\t\t"); + $confirmOk = $this->pc->getPhpCodeConditions('$uploaderErrors', ' !== ', "''", $errIf, $errElse, $t . "\t"); + } else { + $confirmOk = $this->xc->getXcRedirectHeader("'{$tableName}.php?op=list&start=' . \$start . '&limit=' . \$limit", '', '2', "{$language}FORM_OK", false, $t . "\t\t"); + } + $contentInsert .= $confirmOk; + $ret .= $this->pc->getPhpCodeConditions($insert, '', '', $contentInsert, false, $t); + + $ret .= $this->pc->getPhpCodeCommentLine('Get Form Error', null, $t); + $ret .= $this->xc->getXcXoopsTplAssign('error', "\${$tableName}Obj->getHtmlErrors()", true, $t); + $ret .= $this->xc->getXcGetForm('form', $tableName, 'Obj', $t); + $ret .= $this->xc->getXcXoopsTplAssign('form', '$form->render()', true, $t); + + return $ret; + } + + /** + * @private function getPermissionsSave + * @param $moduleDirname + * @param $ucfFieldId + * @param string $perm + * + * @return string + */ + private function getPermissionsSave($moduleDirname, $ucfFieldId, string $perm = 'view') + { + $ret = $this->pc->getPhpCodeCommentLine('Permission to', $perm, "\t\t\t"); + $ret .= $this->xc->getXcDeleteRight('grouppermHandler', "{$moduleDirname}_{$perm}", '$mid', "\$new{$ucfFieldId}", false, "\t\t\t"); + $content = $this->xc->getXcAddRight('grouppermHandler', "{$moduleDirname}_{$perm}", "\$new{$ucfFieldId}", '$onegroupId', '$mid', false, "\t\t\t\t\t"); + $foreach = $this->pc->getPhpCodeForeach("_POST['groups_{$perm}']", false, false, 'onegroupId', $content, "\t\t\t\t"); + $ret .= $this->pc->getPhpCodeConditions("isset(\$_POST['groups_{$perm}'])", '', '', $foreach, false, "\t\t\t"); + + return $ret; + } + + /** + * @public function getUserPagesNew + * @param $tableName + * @param $tableSoleName + * @param $tablePermissions + * @param $language + * @param string $t + * @return string + */ + public function getUserPagesNew($tableName, $tableSoleName, $tablePermissions, $language, string $t = '') + { + $ret = $this->uxc->getUserBreadcrumbs($language, $tableSoleName, 'add', '', $t); + if (1 == $tablePermissions) { + $ret .= $this->pc->getPhpCodeCommentLine('Check permissions', '', $t); + $contIf = $this->xc->getXcRedirectHeader($tableName, '?op=list', 3, '\_NOPERM', true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions('!$permissionsHandler->getPermGlobalSubmit()', '', '', $contIf, false, $t); + } + $ret .= $this->xc->getXcCommonPagesNew($tableName, $t); + + return $ret; + } + + /** + * @public function getUserPagesEdit + * @param $tableName + * @param $tableSoleName + * @param $tablePermissions + * @param $fieldId + * @param $language + * @param string $t + * @return string + */ + public function getUserPagesEdit($tableName, $tableSoleName, $tablePermissions, $fieldId, $language, string $t = '') + { + $ret = $this->uxc->getUserBreadcrumbs($language, $tableSoleName, 'edit', '', $t); + $ccFieldId = $this->getCamelCase($fieldId, false, true); + if (1 == $tablePermissions) { + $ret .= $this->pc->getPhpCodeCommentLine('Check permissions', '', $t); + $contIf = $this->xc->getXcRedirectHeader($tableName, '?op=list', 3, '\_NOPERM', true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions('!$permissionsHandler->getPermGlobalSubmit()', '', '', $contIf, false, $t); + } + $ret .= $this->pc->getPhpCodeCommentLine('Check params', '', $t); + $contIf = $this->xc->getXcRedirectHeader($tableName, '?op=list', 3, "{$language}INVALID_PARAM", true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions("\${$ccFieldId}", ' == ', '0', $contIf, false, $t); + $ret .= $this->xc->getXcCommonPagesEdit($tableName, $ccFieldId, $t, $language); + + return $ret; + } + + /** + * @public function getUserPagesClone + * @param $tableName + * @param $tableSoleName + * @param $tablePermissions + * @param $fieldId + * @param $language + * @param string $t + * @return string + */ + public function getUserPagesClone($tableName, $tableSoleName, $tablePermissions, $fieldId, $language, string $t = '') + { + $ret = $this->uxc->getUserBreadcrumbs($language, $tableSoleName, 'clone', '', $t); + $ccFieldId = $this->getCamelCase($fieldId, false, true); + if (1 == $tablePermissions) { + $ret .= $this->pc->getPhpCodeCommentLine('Check permissions', '', $t); + $contIf = $this->xc->getXcRedirectHeader($tableName, '?op=list', 3, '\_NOPERM', true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions('!$permissionsHandler->getPermGlobalSubmit()', '', '', $contIf, false, $t); + } + $ret .= $this->pc->getPhpCodeCommentLine('Request source', '', $t); + $ret .= $this->xc->getXcXoopsRequest($ccFieldId . 'Source', $fieldId . '_source', '', 'Int', $t); + $ret .= $this->pc->getPhpCodeCommentLine('Check params', '', $t); + $contIf = $this->xc->getXcRedirectHeader($tableName, '?op=list', 3, "{$language}INVALID_PARAM", true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions("\${$ccFieldId}Source", ' == ', '0', $contIf, false, $t); + $ret .= $this->xc->getXcCommonPagesClone($tableName, $ccFieldId, $t, $language); + + return $ret; + } + + /** + * @private function getUserPagesDelete + * @param $tableName + * @param $tableSoleName + * @param $tablePermissions + * @param $language + * @param $fieldId + * @param $fieldMain + * @param $tableNotifications + * @param string $t + * @return string + */ + private function getUserPagesDelete($tableName, $tableSoleName, $tablePermissions, $language, $fieldId, $fieldMain, $tableNotifications, string $t = '') + { + $ret = $this->uxc->getUserBreadcrumbs($language, $tableSoleName, 'delete', '', $t); + $ccFieldId = $this->getCamelCase($fieldId, false, true); + if (1 == $tablePermissions) { + $ret .= $this->pc->getPhpCodeCommentLine('Check permissions', '', $t); + $contIf = $this->xc->getXcRedirectHeader($tableName, '?op=list', 3, '\_NOPERM', true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions('!$permissionsHandler->getPermGlobalSubmit()', '', '', $contIf, false, $t); + } + $ret .= $this->pc->getPhpCodeCommentLine('Check params', '', $t); + $contIf = $this->xc->getXcRedirectHeader($tableName, '?op=list', 3, "{$language}INVALID_PARAM", true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions("\${$ccFieldId}", ' == ', '0', $contIf, false, $t); + $ret .= $this->xc->getXcCommonPagesDelete($language, $tableName, $tableSoleName, $fieldId, $fieldMain, $tableNotifications, $t); + + return $ret; + } + + /** + * @private function getUserPagesBroken + * @param $language + * @param $moduleDirname + * @param $tableName + * @param $tableSoleName + * @param $fieldId + * @param $fieldStatus + * @param $fieldMain + * @param $tableNotifications + * @param string $t + * @return string + */ + private function getUserPagesBroken($language, $moduleDirname, $tableName, $tableSoleName, $fieldId, $fieldStatus, $fieldMain, $tableNotifications, string $t = '') + { + $ccFieldId = $this->getCamelCase($fieldId, false, true); + $ccFieldMain = $this->getCamelCase($fieldMain, false, true); + $ret = $this->uxc->getUserBreadcrumbs($language, '', 'broken', '', $t); + $ret .= $this->pc->getPhpCodeCommentLine('Check params', '', $t); + $contIf = $this->xc->getXcRedirectHeader($tableName, '?op=list', 3, "{$language}INVALID_PARAM", true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions("\${$ccFieldId}", ' == ', '0', $contIf, false, $t); + + $ret .= $this->xc->getXcHandlerGet($tableName, $ccFieldId, 'Obj', $tableName . 'Handler', false, $t); + $tablenameObj = $this->pc->getPhpCodeIsobject($tableName . 'Obj'); + $redirectError = $this->xc->getXcRedirectHeader($tableName, '', '3', "{$language}INVALID_PARAM", true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions('!' . $tablenameObj, '', '', $redirectError, false, $t); + $ret .= $this->xc->getXcGetVar($ccFieldMain, "{$tableName}Obj", $fieldMain, false, $t); + $reqOk = "_REQUEST['ok']"; + $isset = $this->pc->getPhpCodeIsset($reqOk); + $xoopsSecurityCheck = $this->xc->getXcXoopsSecurityCheck(); + $xoopsSecurityErrors = $this->xc->getXcXoopsSecurityErrors(); + $implode = $this->pc->getPhpCodeImplode(', ', $xoopsSecurityErrors); + $redirectHeaderErrors = $this->xc->getXcRedirectHeader($tableName, '', '3', $implode, true, $t . "\t\t"); + $insert = $this->xc->getXcHandlerInsert($tableName, $tableName, 'Obj'); + $condition = $this->pc->getPhpCodeConditions('!' . $xoopsSecurityCheck, '', '', $redirectHeaderErrors, false, $t . "\t"); + $constant = $this->xc->getXcGetConstants('STATUS_BROKEN'); + $condition .= $this->xc->getXcSetVarObj($tableName, $fieldStatus, $constant, $t . "\t"); + + $contInsert = ''; + if (1 == $tableNotifications) { + $contInsert .= $this->pc->getPhpCodeCommentLine('Event broken notification', null, $t . "\t\t"); + $contInsert .= $this->pc->getPhpCodeArray('tags', [], false, $t . "\t\t"); + $contInsert .= $this->xc->getXcEqualsOperator("\$tags['ITEM_NAME']", "\${$ccFieldMain}", '', $t . "\t\t"); + $url = "\XOOPS_URL . '/modules/{$moduleDirname}/{$tableName}.php?op=show&{$fieldId}=' . \${$ccFieldId}"; + $contInsert .= $this->xc->getXcEqualsOperator("\$tags['ITEM_URL'] ", $url, '', $t . "\t\t"); + $contInsert .= $this->xc->getXcXoopsHandler('notification', $t . "\t\t"); + $contInsert .= $this->getSimpleString("\$notificationHandler->triggerEvent('global', 0, 'global_broken', \$tags);", $t . "\t\t"); + $contInsert .= $this->getSimpleString("\$notificationHandler->triggerEvent('{$tableName}', \${$ccFieldId}, '{$tableSoleName}_broken', \$tags);", $t . "\t\t"); + } + $contInsert .= $this->xc->getXcRedirectHeader("'{$tableName}.php?op=list&start=' . \$start . '&limit=' . \$limit", '', '2', "{$language}FORM_OK", false, $t . "\t\t"); + $htmlErrors = $this->xc->getXcHtmlErrors($tableName, true); + $internalElse = $this->xc->getXcXoopsTplAssign('error', $htmlErrors, true, $t . "\t\t"); + $condition .= $this->pc->getPhpCodeConditions($insert, '', '', $contInsert, $internalElse, $t . "\t"); + $mainElse = $this->xc->getXcXoopsConfirm($language, $fieldId, $fieldMain, 'broken', $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions($isset, ' && ', "1 == \${$reqOk}", $condition, $mainElse, $t); return $ret; } @@ -155,67 +571,114 @@ private function getUserPages($moduleDirname, $tableName, $fieldId, $fieldMain) /** * @private function getUserPagesFooter * @param $moduleDirname - * @param $tableName - * @param $language + * @param $tableComments * * @return string */ - private function getUserPagesFooter($moduleDirname, $tableName, $language) + private function getUserPagesFooter($moduleDirname, $tableComments) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $uxc = UserXoopsCode::getInstance(); - $stuModuleDirname = mb_strtoupper($moduleDirname); - $stuTableName = mb_strtoupper($tableName); - $ret = $pc->getPhpCodeBlankLine(); - $ret .= $pc->getPhpCodeCommentLine('Breadcrumbs'); - $ret .= $uxc->getUserBreadcrumbs($language, $stuTableName); - $ret .= $pc->getPhpCodeBlankLine(); - $ret .= $pc->getPhpCodeCommentLine('Keywords'); - $ret .= $uxc->getUserMetaKeywords($moduleDirname); - $ret .= $pc->getPhpCodeUnset('keywords'); - $ret .= $pc->getPhpCodeBlankLine(); - $ret .= $pc->getPhpCodeCommentLine('Description'); - $ret .= $uxc->getUserMetaDesc($moduleDirname, $language, $stuTableName); - $ret .= $xc->getXcXoopsTplAssign('xoops_mpageurl', "{$stuModuleDirname}_URL.'/{$tableName}.php'"); - $ret .= $xc->getXcXoopsTplAssign("{$moduleDirname}_upload_url", "{$stuModuleDirname}_UPLOAD_URL"); - $ret .= $this->getInclude('footer'); + $ret = $this->pc->getPhpCodeBlankLine(); + $ret .= $this->pc->getPhpCodeCommentLine('Meta keywords'); + $ret .= $this->uxc->getUserMetaKeywords($moduleDirname); + $ret .= $this->pc->getPhpCodeUnset('keywords'); + if (1 == $tableComments) { + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->pc->getPhpCodeCommentLine('View comments'); + $ret .= $this->pc->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH', 'include/comment_view', true); + } + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->getRequire('footer'); return $ret; } + /** + * @private function getUserPagesSwitch + * @param $moduleDirname + * @param $tableId + * @param $tableMid + * @param $tableName + * @param $tableSoleName + * @param $tableSubmit + * @param $tablePermissions + * @param $tableBroken + * @param $fieldId + * @param $fieldMain + * @param $fieldStatus + * @param $tableNotifications + * @param $tableRate + * @param $fieldReads + * @param $language + * @return string + */ + private function getUserPagesSwitch($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableSubmit, $tablePermissions, $tableBroken, $fieldId, $fieldMain, $fieldStatus, $tableNotifications, $tableRate, $fieldReads, $language) + { + $fields = $this->getTableFields($tableMid, $tableId); + $cases['show'] = []; + $cases['list'] = [$this->getUserPagesList($moduleDirname, $tableName, $fieldId, $fieldMain, $tableRate, $fieldReads, $language, "\t\t")]; + if (1 == $tableSubmit) { + $cases['save'] = [$this->getUserPagesSave($moduleDirname, $fields, $tableName, $tableSoleName, $tablePermissions, $tableNotifications, $language, "\t\t")]; + $cases['new'] = [$this->getUserPagesNew($tableName, $tableSoleName, $tablePermissions, $language, "\t\t")]; + $cases['edit'] = [$this->getUserPagesEdit($tableName, $tableSoleName, $tablePermissions, $fieldId, $language, "\t\t")]; + $cases['clone'] = [$this->getUserPagesClone($tableName, $tableSoleName, $tablePermissions, $fieldId, $language, "\t\t")]; + $cases['delete'] = [$this->getUserPagesDelete($tableName, $tableSoleName, $tablePermissions, $language, $fieldId, $fieldMain, $tableNotifications, "\t\t")]; + } + if (1 == $tableBroken) { + $cases['broken'] = [$this->getUserPagesBroken($language, $moduleDirname, $tableName, $tableSoleName, $fieldId, $fieldStatus, $fieldMain, $tableNotifications, "\t\t")]; + } + + return $this->xc->getXcSwitch('op', $cases, true); + } + /** * @public function render - * @param null - * @return bool|string + * @return string */ public function render() { - $module = $this->getModule(); - $table = $this->getTable(); - $tableName = $table->getVar('table_name'); - $filename = $this->getFileName(); - $moduleDirname = $module->getVar('mod_dirname'); - $language = $this->getLanguage($moduleDirname, 'MA'); + $module = $this->getModule(); + $table = $this->getTable(); + $tableId = $table->getVar('table_id'); + $tableMid = $table->getVar('table_mid'); + $tableName = $table->getVar('table_name'); + $tableSubmit = $table->getVar('table_submit'); + $tablePermissions = $table->getVar('table_permissions'); + $tableSoleName = $table->getVar('table_solename'); + $tableBroken = $table->getVar('table_broken'); + $tableNotifications = $table->getVar('table_notifications'); + $tableComments = $table->getVar('table_comments'); + $tableRate = $table->getVar('table_rate'); + $filename = $this->getFileName(); + $moduleDirname = $module->getVar('mod_dirname'); + $language = $this->getLanguage($moduleDirname, 'MA'); + // Fields - $fieldId = ''; - $fieldMain = ''; + $fieldId = ''; + $fieldMain = ''; + $fieldStatus = ''; + $fieldReads = ''; $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); - foreach (array_keys($fields) as $f) { + foreach (\array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); if (0 == $f) { $fieldId = $fieldName; } if (1 == $fields[$f]->getVar('field_main')) { - $fieldMain = $fieldName; // fieldMain = fields parameters main field + $fieldMain = $fieldName; // fields parameters main field + } + if (Constants::FIELD_ELE_SELECTSTATUS == $fields[$f]->getVar('field_element')) { + $fieldStatus = $fieldName; // fields for status + } + if (Constants::FIELD_ELE_TEXTREADS == $fields[$f]->getVar('field_element')) { + $fieldReads = $fieldName; // fields for count reads } } - $content = $this->getHeaderFilesComments($module); - $content .= $this->getUserPagesHeader($moduleDirname, $tableName, $fieldId); - $content .= $this->getUserPages($moduleDirname, $tableName, $fieldId, $fieldMain); - $content .= $this->getUserPagesFooter($moduleDirname, $tableName, $language); + $content = $this->getHeaderFilesComments($module); + $content .= $this->getUserPagesHeader($moduleDirname, $tableName, $fieldId, $tablePermissions, $language); + $content .= $this->getUserPagesSwitch($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableSubmit, $tablePermissions, $tableBroken, $fieldId, $fieldMain, $fieldStatus, $tableNotifications, $tableRate, $fieldReads, $language); + $content .= $this->getUserPagesFooter($moduleDirname, $tableComments); - $this->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, '/', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/User/UserPdf.php b/class/Files/User/UserPdf.php index d653e90a..b38f7b7d 100644 --- a/class/Files/User/UserPdf.php +++ b/class/Files/User/UserPdf.php @@ -1,9 +1,12 @@ -xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $this->pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $this->uxc = UserXoopsCode::getInstance(); + $this->xc = Modulebuilder\Files\CreateXoopsCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); + $this->cf = Modulebuilder\Files\CreateFile::getInstance(); } /** * @static function getInstance - * @param null * @return UserPdf */ public static function getInstance() @@ -75,11 +74,11 @@ public static function getInstance() /** * @public function write - * @param string $module + * @param $module * @param mixed $table * @param string $filename */ - public function write($module, $table, $filename) + public function write($module, $table, string $filename): void { $this->setModule($module); $this->setTable($table); @@ -96,20 +95,34 @@ public function write($module, $table, $filename) */ private function getUserPdfHeader($moduleDirname, $tableName, $fields, $language) { - $fieldId = $this->xc->getXcSaveFieldId($fields); + $fieldId = $this->xc->getXcTableFieldId($fields); $ccFieldId = $this->getCamelCase($fieldId, false, true); $ret = $this->pc->getPhpCodeUseNamespace(['Xmf', 'Request'], '', ''); $ret .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', ''); $ret .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']); - $ret .= $this->getInclude(); - $fileExist = $this->pc->getPhpCodeFileExists("\$tcpdf = XOOPS_ROOT_PATH.'/Frameworks/tcpdf/tcpdf.php'"); - $requireOnce = $this->pc->getPhpCodeIncludeDir('$tcpdf', '', true, true, 'require', "\t"); - $ret .= $this->xc->getXcXoopsRequest($ccFieldId, $fieldId, '', 'Int'); - $redirectHeader = $this->xc->getXcRedirectHeader($tableName, '', $numb = '2', "{$language}NO_PDF_LIBRARY", true, "\t"); + $ret .= $this->getRequire(); + $ret .= $this->pc->getPhpCodeIncludeDir("\XOOPS_ROOT_PATH . '/header.php'", '', true, true); + $ret .= $this->xc->getXcEqualsOperator('$tcpdf', "\XOOPS_ROOT_PATH.'/Frameworks/tcpdf/'"); + $fileExist = $this->pc->getPhpCodeFileExists("\$tcpdf . 'tcpdf.php'"); + $requireOnce = $this->pc->getPhpCodeIncludeDir("\$tcpdf . 'tcpdf.php'", '', true, true, 'require', "\t"); + $redirectHeader = $this->xc->getXcRedirectHeader($tableName, '', '2', "{$language}NO_PDF_LIBRARY", true, "\t"); $ret .= $this->pc->getPhpCodeConditions($fileExist, '', '', $requireOnce, $redirectHeader); + $ret .= $this->pc->getPhpCodeIncludeDir("\$tcpdf . 'config/tcpdf_config.php'", '', true, true); + $ret .= $this->pc->getPhpCodeCommentLine('Get new template'); + $ret .= $this->pc->getPhpCodeIncludeDir("\XOOPS_ROOT_PATH . '/class/template.php'", '', true, true); + $ret .= $this->xc->getXcEqualsOperator('$pdfTpl', 'new \XoopsTpl()'); + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->pc->getPhpCodeCommentLine('Get requests'); + $ret .= $this->xc->getXcXoopsRequest($ccFieldId, $fieldId, '', 'Int'); $ret .= $this->pc->getPhpCodeCommentLine('Get Instance of Handler'); $ret .= $this->xc->getXcHandlerLine($tableName); - //$ret .= $this->xc->getXcGetVar($tableName, 'this', $fieldId, false, ''); + $ret .= $this->xc->getXcHandlerGetObj($tableName, $ccFieldId); + $tablenameObj = $this->pc->getPhpCodeIsobject($tableName . 'Obj'); + $redirectError = $this->xc->getXcRedirectHeader($tableName, '', '3', "{$language}INVALID_PARAM", true, "\t"); + $ret .= $this->pc->getPhpCodeConditions('!' . $tablenameObj, '', '', $redirectError); + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->xc->getXcEqualsOperator('$myts', 'MyTextSanitizer::getInstance()'); + $ret .= $this->cf->getSimpleString("\$pdfTpl->assign('" . $moduleDirname . "_upload_url', \\" . strtoupper($moduleDirname) . '_UPLOAD_URL);'); $ret .= $this->pc->getPhpCodeBlankLine(); return $ret; @@ -119,84 +132,129 @@ private function getUserPdfHeader($moduleDirname, $tableName, $fields, $language * @public function getAdminPagesList * @param $moduleDirname * @param $tableName + * @param $tableSolename * @param $fields + * @param $tablePermissions * @return string */ - public function getUserPdfTcpdf($moduleDirname, $tableName, $fields) + public function getUserPdfTcpdf($moduleDirname, $tableName, $tableSolename, $fields, $tablePermissions) { - $stuModuleDirname = mb_strtoupper($moduleDirname); - $ret = ''; - foreach (array_keys($fields) as $f) { + $stuModuleDirname = \mb_strtoupper($moduleDirname); + + $fieldId = $this->xc->getXcTableFieldId($fields); + $ccFieldId = $this->getCamelCase($fieldId, false, true); + $fieldMain = $this->xc->getXcTableFieldMain($fields); + + $ret = ''; + if (1 === $tablePermissions) { + $ret .= $this->pc->getPhpCodeCommentLine('Check permissions'); + $ret .= $this->getSimpleString('$currentuid = 0;'); + $condIf = $this->getSimpleString('$currentuid = $xoopsUser->uid();', "\t"); + $ret .= $this->pc->getPhpCodeConditions('isset($xoopsUser) && \is_object($xoopsUser)', '', '', $condIf); + $ret .= $this->xc->getXcXoopsHandler('groupperm'); + $ret .= $this->xc->getXcXoopsHandler('member'); + $condIf = $this->getSimpleString('$my_group_ids = [\XOOPS_GROUP_ANONYMOUS];', "\t"); + $condElse = $this->getSimpleString('$my_group_ids = $memberHandler->getGroupsByUser($currentuid);', "\t"); + $ret .= $this->pc->getPhpCodeConditions('0', ' === ', '$currentuid', $condIf, $condElse); + $gperm = $this->xc->getXcCheckRight('!$grouppermHandler', "{$moduleDirname}_view_{$tableName}", "\${$ccFieldId}", '$my_group_ids', "\$GLOBALS['xoopsModule']->getVar('mid')", true); + $ret .= $this->pc->getPhpCodeCommentLine('Verify permissions'); + $noPerm = $this->xc->getXcRedirectHeader("\\{$stuModuleDirname}_URL . '/index.php'", '', '3', '\_NOPERM', false, "\t"); + $noPerm .= $this->getSimpleString('exit();', "\t"); + $ret .= $this->pc->getPhpCodeConditions($gperm, '', '', $noPerm); + } + $ret .= $this->pc->getPhpCodeCommentLine('Set defaults'); + $ret .= $this->xc->getXcEqualsOperator('$pdfFilename', "'$tableName.pdf'"); + $ret .= $this->xc->getXcEqualsOperator('$content ', "''"); + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->pc->getPhpCodeCommentLine('Read data from table and create pdfData'); + + $titleFound = false; + foreach (\array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); $fieldDefault = $fields[$f]->getVar('field_default'); $fieldElement = $fields[$f]->getVar('field_element'); - $getVar = $this->xc->getXcGetVar('', $tableName . 'Handler', $fieldName, true); + $getVar = $this->xc->getXcGetVar('', $tableName . 'Obj', $fieldName, true); switch ($fieldElement) { - case 2: + case Constants::FIELD_ELE_TEXT: if (false !== mb_strpos($fieldName, 'title') || false !== mb_strpos($fieldName, 'name') && '' == $fieldDefault) { - $ret .= $this->pc->getPhpCodeStripTags("pdfData['title'] ", $getVar); + $ret .= $this->pc->getPhpCodeStripTags("pdfData['title'] ", $getVar); + $ret .= $this->pc->getPhpCodeStripTags("pdfData['subject'] ", $getVar); + $titleFound = true; } break; - case 3: - case 4: - $ret .= $this->pc->getPhpCodeStripTags("pdfData['content']", $getVar); + case Constants::FIELD_ELE_TEXTAREA: + case Constants::FIELD_ELE_DHTMLTEXTAREA: + $ret .= $this->pc->getPhpCodeStripTags('content', $getVar, false, '', '.='); break; - case 8: - $ret .= $this->xc->getXcXoopsUserUnameFromId("pdfData['author'] ", $getVar); + case Constants::FIELD_ELE_SELECTUSER: + $ret .= $this->xc->getXcXoopsUserUnameFromId("pdfData['author'] ", $getVar); break; - case 15: - $ret .= $this->xc->getXcFormatTimeStamp("pdfData['date'] ", $getVar); + case Constants::FIELD_ELE_TEXTDATESELECT: + $ret .= $this->xc->getXcFormatTimeStamp("pdfData['date'] ", $getVar); break; } } + if (!$titleFound) { + $getVar = $this->xc->getXcGetVar('', $tableName . 'Obj', $fieldMain, true); + $ret .= $this->xc->getXcEqualsOperator("\$pdfData['title'] ", $getVar); + $ret .= $this->xc->getXcEqualsOperator("\$pdfData['subject'] ", $getVar); + } + $ret .= $this->xc->getXcEqualsOperator("\$pdfData['content'] ", '$myts->undoHtmlSpecialChars($content)'); + $ret .= $this->xc->getXcEqualsOperator("\$pdfData['fontname']", 'PDF_FONT_NAME_MAIN'); + $ret .= $this->xc->getXcEqualsOperator("\$pdfData['fontsize']", 'PDF_FONT_SIZE_MAIN'); + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->pc->getPhpCodeCommentLine('Get Config'); + $ret .= $this->xc->getXcEqualsOperator("\$pdfData['creator'] ", "\$GLOBALS['xoopsConfig']['sitename']"); + //$ret .= $this->xc->getXcEqualsOperator("\$pdfData['subject'] ", "\$GLOBALS['xoopsConfig']['slogan']"); + $ret .= $this->xc->getXcEqualsOperator("\$pdfData['keywords'] ", "\$helper->getConfig('keywords')"); + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->pc->getPhpCodeCommentLine('Defines'); + $ret .= $this->pc->getPhpCodeDefine("{$stuModuleDirname}_CREATOR", "\$pdfData['creator']"); + $ret .= $this->pc->getPhpCodeDefine("{$stuModuleDirname}_AUTHOR", "\$pdfData['author']"); + $ret .= $this->pc->getPhpCodeDefine("{$stuModuleDirname}_HEADER_TITLE", "\$pdfData['title']"); + $ret .= $this->pc->getPhpCodeDefine("{$stuModuleDirname}_HEADER_STRING", "\$pdfData['subject']"); + $ret .= $this->pc->getPhpCodeDefine("{$stuModuleDirname}_HEADER_LOGO", "'logo.gif'"); + $ret .= $this->pc->getPhpCodeDefine("{$stuModuleDirname}_IMAGES_PATH", "\XOOPS_ROOT_PATH.'/images/'"); + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->pc->getPhpCodeCommentLine('Assign customs tpl fields'); + $ret .= $this->xc->getXcXoopsTplAssign('content_header', "'$tableName'", true, '', 'pdfTpl'); + $ret .= $this->xc->getXcGetValues($tableName, $tableSolename, '', true, '', 'Obj'); + $ret .= $this->xc->getXcXoopsTplAssign($tableSolename, '$' .$tableSolename, true, '', 'pdfTpl'); + $ret .= $this->pc->getPhpCodeBlankLine(); - $ret .= $this->pc->getPhpCodeCommentLine('Get Config'); - $ret .= $this->xc->getXcEqualsOperator("\$pdfData['creator'] ", "\$GLOBALS['xoopsConfig']['xoops_sitename']"); - $ret .= $this->xc->getXcEqualsOperator("\$pdfData['subject'] ", "\$GLOBALS['xoopsConfig']['slogan']"); - $ret .= $this->xc->getXcEqualsOperator("\$pdfData['keywords'] ", "\$GLOBALS['xoopsConfig']['keywords']"); - $ret .= $this->pc->getPhpCodeCommentLine('Defines'); - $ret .= $this->pc->getPhpCodeDefine("{$stuModuleDirname}_CREATOR", "\$pdfData['creator']"); - $ret .= $this->pc->getPhpCodeDefine("{$stuModuleDirname}_AUTHOR", "\$pdfData['author']"); - $ret .= $this->pc->getPhpCodeDefine("{$stuModuleDirname}_HEADER_TITLE", "\$pdfData['title']"); - $ret .= $this->pc->getPhpCodeDefine("{$stuModuleDirname}_HEADER_STRING", "\$pdfData['subject']"); - $ret .= $this->pc->getPhpCodeDefine("{$stuModuleDirname}_HEADER_LOGO", "'logo.gif'"); - $ret .= $this->pc->getPhpCodeDefine("{$stuModuleDirname}_IMAGES_PATH", "XOOPS_ROOT_PATH.'/images/'"); - $ret .= $this->xc->getXcEqualsOperator('$myts', 'MyTextSanitizer::getInstance()'); - $ret .= $this->xc->getXcEqualsOperator('$content', "''"); - $ret .= $this->xc->getXcEqualsOperator('$content', "\$myts->undoHtmlSpecialChars(\$pdfData['content'])", '.'); - $ret .= $this->xc->getXcEqualsOperator('$content', '$myts->displayTarea($content)'); + $ret .= $this->pc->getPhpCodeCommentLine('Create pdf'); $ret .= $this->xc->getXcEqualsOperator('$pdf', 'new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, _CHARSET, false)'); - $ret .= $this->xc->getXcEqualsOperator('$title', "\$myts->undoHtmlSpecialChars(\$pdfData['title'])"); - $ret .= $this->xc->getXcEqualsOperator('$keywords', "\$myts->undoHtmlSpecialChars(\$pdfData['keywords'])"); - $ret .= $this->xc->getXcEqualsOperator("\$pdfData['fontsize']", '12'); - $ret .= $this->pc->getPhpCodeCommentLine('For schinese'); - $ifLang = $this->getSimpleString("\$pdf->SetFont('gbsn00lp', '', \$pdfData['fontsize']);", "\t"); - $elseLang = $this->getSimpleString("\$pdf->SetFont(\$pdfData['fontname'], '', \$pdfData['fontsize']);", "\t"); - $ret .= $this->pc->getPhpCodeConditions('_LANGCODE', ' == ', "'cn'", $ifLang, $elseLang); + $ret .= $this->pc->getPhpCodeCommentLine('Remove/add default header/footer'); + $ret .= $this->getSimpleString('$pdf->setPrintHeader(false);'); + $ret .= $this->getSimpleString('$pdf->setPrintFooter(true);'); $ret .= $this->pc->getPhpCodeCommentLine('Set document information'); $ret .= $this->getSimpleString("\$pdf->SetCreator(\$pdfData['creator']);"); $ret .= $this->getSimpleString("\$pdf->SetAuthor(\$pdfData['author']);"); - $ret .= $this->getSimpleString('$pdf->SetTitle($title);'); - $ret .= $this->getSimpleString('$pdf->SetKeywords($keywords);'); + $ret .= $this->getSimpleString("\$pdf->SetTitle(\$pdfData['title']);"); + $ret .= $this->getSimpleString("\$pdf->SetKeywords(\$pdfData['keywords']);"); $ret .= $this->pc->getPhpCodeCommentLine('Set default header data'); - $ret .= $this->getSimpleString("\$pdf->SetHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, {$stuModuleDirname}_HEADER_TITLE, {$stuModuleDirname}_HEADER_STRING);"); + $ret .= $this->getSimpleString("\$pdf->setHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, {$stuModuleDirname}_HEADER_TITLE, {$stuModuleDirname}_HEADER_STRING);"); $ret .= $this->pc->getPhpCodeCommentLine('Set margins'); $ret .= $this->getSimpleString('$pdf->SetMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP + 10, PDF_MARGIN_RIGHT);'); $ret .= $this->pc->getPhpCodeCommentLine('Set auto page breaks'); $ret .= $this->getSimpleString('$pdf->SetAutoPageBreak(true, PDF_MARGIN_BOTTOM);'); - $ret .= $this->getSimpleString('$pdf->SetHeaderMargin(PDF_MARGIN_HEADER);'); - $ret .= $this->getSimpleString('$pdf->SetFooterMargin(PDF_MARGIN_FOOTER);'); + $ret .= $this->getSimpleString('$pdf->setHeaderMargin(PDF_MARGIN_HEADER);'); + $ret .= $this->getSimpleString('$pdf->setFooterMargin(PDF_MARGIN_FOOTER);'); $ret .= $this->getSimpleString('$pdf->setImageScale(PDF_IMAGE_SCALE_RATIO); //set image scale factor'); - $ifLang = $this->getSimpleString("\$pdf->setHeaderFont(array('gbsn00lp', '', \$pdfData['fontsize']));", "\t"); - $ifLang .= $this->getSimpleString("\$pdf->setFooterFont(array('gbsn00lp', '', \$pdfData['fontsize']));", "\t"); - $elseLang = $this->getSimpleString("\$pdf->setHeaderFont(array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN));", "\t"); - $elseLang .= $this->getSimpleString("\$pdf->setFooterFont(array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));", "\t"); + $ret .= $this->pc->getPhpCodeCommentLine('For chinese'); + $ifLang = $this->getSimpleString("\$pdf->setHeaderFont(['gbsn00lp', '', \$pdfData['fontsize']]);", "\t"); + $ifLang .= $this->getSimpleString("\$pdf->SetFont('gbsn00lp', '', \$pdfData['fontsize']);", "\t"); + $ifLang .= $this->getSimpleString("\$pdf->setFooterFont(['gbsn00lp', '', \$pdfData['fontsize']]);", "\t"); + $elseLang = $this->getSimpleString("\$pdf->setHeaderFont([PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN]);", "\t"); + $elseLang .= $this->getSimpleString("\$pdf->SetFont(\$pdfData['fontname'], '', \$pdfData['fontsize']);", "\t"); + $elseLang .= $this->getSimpleString("\$pdf->setFooterFont([PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA]);", "\t"); $ret .= $this->pc->getPhpCodeConditions('_LANGCODE', ' == ', "'cn'", $ifLang, $elseLang); $ret .= $this->pc->getPhpCodeCommentLine('Set some language-dependent strings (optional)'); - $ret .= $this->xc->getXcEqualsOperator('$lang', "XOOPS_ROOT_PATH.'/Frameworks/tcpdf/lang/eng.php'"); - $fileExist = $this->pc->getPhpCodeFileExists('$lang'); - $contIf = $this->pc->getPhpCodeIncludeDir('$lang', '', true, true, 'require', "\t"); - $contIf .= $this->getSimpleString('$pdf->setLanguageArray($lang);', "\t"); + $ret .= $this->xc->getXcEqualsOperator('$langFile', "\XOOPS_ROOT_PATH.'/Frameworks/tcpdf/lang/eng.php'"); + $fileExist = $this->pc->getPhpCodeFileExists('$langFile'); + $contIf = $this->pc->getPhpCodeIncludeDir('$langFile', '', true, true, 'require', "\t"); + $contIfInt = $this->getSimpleString('$pdf->setLanguageArray($l);', "\t\t"); + $contIf .= $this->pc->getPhpCodeConditions('isset($l) && \is_array($l)', '', '', $contIfInt, false, "\t"); $ret .= $this->pc->getPhpCodeConditions("@{$fileExist}", '', '', $contIf); return $ret; @@ -212,41 +270,40 @@ public function getUserPdfTcpdf($moduleDirname, $tableName, $fields) */ private function getUserPdfFooter($moduleDirname, $tableName) { - $ret = $this->pc->getPhpCodeCommentLine('Initialize document'); - $ret .= $this->getSimpleString('$pdf->AliasNbPages();'); - $ret .= $this->pc->getPhpCodeCommentLine('Add Page document'); + $ret = $this->pc->getPhpCodeCommentLine('Add Page document'); $ret .= $this->getSimpleString('$pdf->AddPage();'); - $ret .= $this->getSimpleString("\$pdf->writeHTMLCell(\$w=0, \$h=0, \$x='', \$y='', \$content, \$border=0, \$ln=1, \$fill=0, \$reseth=true, \$align='', \$autopadding=true);"); - $ret .= $this->pc->getPhpCodeCommentLine('Pdf Filename'); $ret .= $this->pc->getPhpCodeCommentLine('Output'); - $ret .= $this->xc->getXcXoopsTplAssign('pdfoutput', "\$pdf->Output('{$tableName}.pdf', 'I')"); - $ret .= $this->xc->getXcXoopsTplDisplay($moduleDirname . '_pdf.tpl', '', false); + $ret .= $this->xc->getXcEqualsOperator('$template_path', '\\' . \mb_strtoupper($moduleDirname) . "_PATH . '/templates/" . $moduleDirname . '_' . $tableName . "_pdf.tpl'"); + $ret .= $this->xc->getXcEqualsOperator('$content', '$pdfTpl->fetch($template_path)'); + $ret .= $this->getSimpleString("\$pdf->writeHTMLCell(\$w=0, \$h=0, \$x='', \$y='', \$content, \$border=0, \$ln=1, \$fill=0, \$reseth=true, \$align='', \$autopadding=true);"); + $ret .= $this->getSimpleString("\$pdf->Output(\$pdfFilename, 'I');"); return $ret; } /** * @public function render - * @param null - * @return bool|string + * @return string */ public function render() { - $module = $this->getModule(); - $table = $this->getTable(); - $filename = $this->getFileName(); - $moduleDirname = $module->getVar('mod_dirname'); - $tableId = $table->getVar('table_id'); - $tableMid = $table->getVar('table_mid'); - $tableName = $table->getVar('table_name'); - $fields = $this->getTableFields($tableMid, $tableId); - $language = $this->getLanguage($moduleDirname, 'MA'); - $content = $this->getHeaderFilesComments($module); - $content .= $this->getUserPdfHeader($moduleDirname, $tableName, $fields, $language); - $content .= $this->getUserPdfTcpdf($moduleDirname, $tableName, $fields); - $content .= $this->getUserPdfFooter($moduleDirname, $tableName); - - $this->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $module = $this->getModule(); + $table = $this->getTable(); + $filename = $this->getFileName(); + $moduleDirname = $module->getVar('mod_dirname'); + $tableId = $table->getVar('table_id'); + $tableMid = $table->getVar('table_mid'); + $tableName = $table->getVar('table_name'); + $tableSolename = $table->getVar('table_solename'); + $tablePermissions = (int)$table->getVar('table_permissions'); + $fields = $this->getTableFields($tableMid, $tableId); + $language = $this->getLanguage($moduleDirname, 'MA'); + $content = $this->getHeaderFilesComments($module); + $content .= $this->getUserPdfHeader($moduleDirname, $tableName, $fields, $language); + $content .= $this->getUserPdfTcpdf($moduleDirname, $tableName, $tableSolename, $fields, $tablePermissions); + $content .= $this->getUserPdfFooter($moduleDirname, $tableName); + + $this->create($moduleDirname, '/', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/User/UserPrint.php b/class/Files/User/UserPrint.php index 8b960d70..75a30cc4 100644 --- a/class/Files/User/UserPrint.php +++ b/class/Files/User/UserPrint.php @@ -1,9 +1,9 @@ -xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $this->pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $this->uxc = UserXoopsCode::getInstance(); + $this->xc = Modulebuilder\Files\CreateXoopsCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); } /** * @static function getInstance - * @param null * @return UserPrint */ public static function getInstance() @@ -75,11 +66,11 @@ public static function getInstance() /** * @public function write - * @param string $module + * @param $module * @param mixed $table * @param string $filename */ - public function write($module, $table, $filename) + public function write($module, $table, string $filename): void { $this->setModule($module); $this->setTable($table); @@ -93,18 +84,19 @@ public function write($module, $table, $filename) * * @return string */ - public function getUserPrint($moduleDirname, $language) + public function getUserPrint(string $moduleDirname, string $language, int $tablePermissions) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $stuModuleDirname = mb_strtoupper($moduleDirname); + $stuModuleDirname = \mb_strtoupper($moduleDirname); $table = $this->getTable(); $tableName = $table->getVar('table_name'); $tableSoleName = $table->getVar('table_solename'); $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); + $fieldId = ''; $fieldMain = ''; + $fieldName = ''; $ucfFieldName = ''; - foreach (array_keys($fields) as $f) { + foreach (\array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); if ((0 == $f) && (1 == $this->table->getVar('table_autoincrement'))) { $fieldId = $fieldName; @@ -113,19 +105,19 @@ public function getUserPrint($moduleDirname, $language) $fieldMain = $fieldName; // fieldMain = fields parameters main field } } - $ucfFieldName = ucfirst($fieldName); + $ucfFieldName = \ucfirst($fieldName); } $ccFieldId = $this->getCamelCase($fieldId, false, true); - $stuLpFieldName = mb_strtoupper($ccFieldId); - $ret = $pc->getPhpCodeUseNamespace(['Xmf', 'Request'], '', ''); - $ret .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', ''); - $ret .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']); - $ret .= $this->getInclude(); + $ret = $this->pc->getPhpCodeUseNamespace(['Xmf', 'Request'], '', ''); + $ret .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', ''); + $ret .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']); + $ret .= $this->getRequire(); + $ret .= $this->pc->getPhpCodeIncludeDir("\XOOPS_ROOT_PATH . '/header.php'", '', true, true); $ret .= $this->xc->getXcXoopsRequest($ccFieldId, (string)$fieldId, '', 'Int'); $ret .= $this->pc->getPhpCodeCommentLine('Define Stylesheet'); $ret .= $this->xc->getXcXoThemeAddStylesheet(); - $redirectHeader = $this->xc->getXcRedirectHeader("{$stuModuleDirname}_URL . '/index.php'", '', '2', "{$language}NO{$stuLpFieldName}", false, "\t"); - $ret .= $this->pc->getPhpCodeConditions("empty(\${$ccFieldId})", '', '', $redirectHeader); + $redirectHeader = $this->xc->getXcRedirectHeader("\\{$stuModuleDirname}_URL . '/index.php'", '', '2', "{$language}INVALID_PARAM", false, "\t"); + $ret .= $this->pc->getPhpCodeConditions("\${$ccFieldId}", ' == ', '0', $redirectHeader); $ret .= $this->pc->getPhpCodeCommentLine('Get Instance of Handler'); $ret .= $this->xc->getXcHandlerLine($tableName); @@ -134,56 +126,70 @@ public function getUserPrint($moduleDirname, $language) if (false !== mb_strpos($fieldName, 'published')) { $ret .= $this->pc->getPhpCodeCommentLine('Not yet', $fieldName); $redirectHeader .= $this->getSimpleString('exit();'); - $ret .= $this->pc->getPhpCodeConditions("\${$tableName}Handler->getVar('{$fieldName}') == 0 || \${$tableName}Handler->getVar('{$fieldName}') > time()", '', '', $redirectHeader); + $ret .= $this->pc->getPhpCodeConditions("\${$tableName}Handler->getVar('{$fieldName}') == 0 || \${$tableName}Handler->getVar('{$fieldName}') > \time()", '', '', $redirectHeader); } if (false !== mb_strpos($fieldName, 'expired')) { $ret .= $this->pc->getPhpCodeCommentLine('Expired', $ucfFieldName); $redirectHeader .= $this->getSimpleString('exit();'); - $ret .= $this->pc->getPhpCodeConditions("\${$tableName}Handler->getVar('{$fieldName}') != 0 && \${$tableName}Handler->getVar('{$fieldName}') < time()", '', '', $redirectHeader); + $ret .= $this->pc->getPhpCodeConditions("\${$tableName}Handler->getVar('{$fieldName}') != 0 && \${$tableName}Handler->getVar('{$fieldName}') < \time()", '', '', $redirectHeader); } if (false !== mb_strpos($fieldName, 'date')) { $ret .= $this->pc->getPhpCodeCommentLine('Date', $ucfFieldName); $redirectHeader .= $this->getSimpleString('exit();'); - $ret .= $this->pc->getPhpCodeConditions("\${$tableName}Handler->getVar('{$fieldName}') != 0 && \${$tableName}Handler->getVar('{$fieldName}') < time()", '', '', $redirectHeader); + $ret .= $this->pc->getPhpCodeConditions("\${$tableName}Handler->getVar('{$fieldName}') != 0 && \${$tableName}Handler->getVar('{$fieldName}') < \time()", '', '', $redirectHeader); } if (false !== mb_strpos($fieldName, 'time')) { $ret .= $this->pc->getPhpCodeCommentLine('Time', $ucfFieldName); $redirectHeader .= $this->getSimpleString('exit();'); - $ret .= $this->pc->getPhpCodeConditions("\${$tableName}Handler->getVar('{$fieldName}') != 0 && \${$tableName}Handler->getVar('{$fieldName}') < time()", '', '', $redirectHeader); + $ret .= $this->pc->getPhpCodeConditions("\${$tableName}Handler->getVar('{$fieldName}') != 0 && \${$tableName}Handler->getVar('{$fieldName}') < \time()", '', '', $redirectHeader); + } + $ret .= $this->xc->getXcHandlerGet($tableName . 'Obj', $ccFieldId, '', $tableName . 'Handler'); + $tablenameObj = $this->pc->getPhpCodeIsobject($tableName . 'Obj'); + $redirectError = $this->xc->getXcRedirectHeader($tableName, '', '3', "{$language}INVALID_PARAM", true, "\t"); + $ret .= $this->pc->getPhpCodeConditions('!' . $tablenameObj, '', '', $redirectError); + if (1 === $tablePermissions) { + $ret .= $this->getSimpleString('$currentuid = 0;'); + $condIf = $this->getSimpleString('$currentuid = $xoopsUser->uid();', "\t"); + $ret .= $this->pc->getPhpCodeConditions('isset($xoopsUser) && \is_object($xoopsUser)', '', '', $condIf); + $ret .= $this->xc->getXcXoopsHandler('groupperm'); + $ret .= $this->xc->getXcXoopsHandler('member'); + $condIf = $this->getSimpleString('$my_group_ids = [\XOOPS_GROUP_ANONYMOUS];', "\t"); + $condElse = $this->getSimpleString('$my_group_ids = $memberHandler->getGroupsByUser($currentuid);', "\t"); + $ret .= $this->pc->getPhpCodeConditions('0', ' === ', '$currentuid', $condIf, $condElse); + $gperm = $this->xc->getXcCheckRight('!$grouppermHandler', "{$moduleDirname}_view_{$tableName}", "\${$tableName}Obj->getVar('{$fieldId}')", '$my_group_ids', "\$GLOBALS['xoopsModule']->getVar('mid')", true); + $ret .= $this->pc->getPhpCodeCommentLine('Verify permissions'); + $noPerm = $this->xc->getXcRedirectHeader("\\{$stuModuleDirname}_URL . '/index.php'", '', '3', '\_NOPERM', false, "\t"); + $noPerm .= $this->getSimpleString('exit();', "\t"); + $ret .= $this->pc->getPhpCodeConditions($gperm, '', '', $noPerm); } - $ret .= $this->xc->getXcHandlerGet($tableName, $ccFieldId, '', $tableName . 'Handler',false); - $gperm = $this->xc->getXcCheckRight('!$grouppermHandler', "{$moduleDirname}_view", "\${$ccFieldId}->getVar('{$fieldId}')", '$groups', "\$GLOBALS['xoopsModule']->getVar('mid')", true); - $ret .= $this->pc->getPhpCodeCommentLine('Verify permissions'); - $noPerm = $this->xc->getXcRedirectHeader("{$stuModuleDirname}_URL . '/index.php'", '', '3', '_NOPERM', false, "\t"); - $noPerm .= $this->getSimpleString('exit();', "\t"); - $ret .= $this->pc->getPhpCodeConditions($gperm, '', '', $noPerm); - $ret .= $this->xc->getXcGetValues($tableName, $tableSoleName, '', true); - $contentForeach = $this->xc->getXcXoopsTplAppend('"{$k}"', '$v', "\t"); - $ret .= $this->pc->getPhpCodeForeach($tableSoleName, false, 'k', 'v', $contentForeach); + $ret .= $this->xc->getXcGetValues($tableName, $tableSoleName . 'List', '', true, '', 'Obj'); + $ret .= $this->xc->getXcXoopsTplAppend($tableName . '_list', '$' . $tableSoleName . 'List'); + $ret .= $this->pc->getPhpCodeBlankLine(); $ret .= $this->xc->getXcXoopsTplAssign('xoops_sitename', "\$GLOBALS['xoopsConfig']['sitename']"); - $getVar = $this->xc->getXcGetVar('', $tableSoleName, $fieldMain, true); - $stripTags = $this->pc->getPhpCodeStripTags('', $getVar . ' - ' . "{$language}PRINT" . ' - ' . "\$GLOBALS['xoopsModule']->name()", true); + $getVar = $this->xc->getXcGetVar('', $tableName . 'Obj', $fieldMain, true); + $stripTags = $this->pc->getPhpCodeStripTags('', $getVar . " . ' - ' . " . "{$language}PRINT" . " . ' - ' . " . "\$GLOBALS['xoopsModule']->getVar('name')", true); $ret .= $this->xc->getXcXoopsTplAssign('xoops_pagetitle', $stripTags); - $ret .= $this->xc->getXcXoopsTplDisplay($tableName . '_print.tpl', '', false); + $ret .= $this->xc->getXcXoopsTplDisplay($moduleDirname . '_' . $tableName . '_print.tpl', '', false); return $ret; } /** * @public function render - * @param null - * @return bool|string + * @return string */ public function render() { - $module = $this->getModule(); - $filename = $this->getFileName(); - $moduleDirname = $module->getVar('mod_dirname'); - $language = $this->getLanguage($moduleDirname, 'MA'); - $content = $this->getHeaderFilesComments($module); - $content .= $this->getUserPrint($moduleDirname, $language); - - $this->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $module = $this->getModule(); + $filename = $this->getFileName(); + $table = $this->getTable(); + $tablePermissions = (int)$table->getVar('table_permissions'); + $moduleDirname = $module->getVar('mod_dirname'); + $language = $this->getLanguage($moduleDirname, 'MA'); + $content = $this->getHeaderFilesComments($module); + $content .= $this->getUserPrint($moduleDirname, $language, $tablePermissions); + + $this->create($moduleDirname, '/', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/User/UserRate.php b/class/Files/User/UserRate.php index db1af079..85861d08 100644 --- a/class/Files/User/UserRate.php +++ b/class/Files/User/UserRate.php @@ -1,9 +1,9 @@ -xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $this->pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $this->uxc = UserXoopsCode::getInstance(); + $this->xc = Modulebuilder\Files\CreateXoopsCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); } /** * @static function getInstance * - * @param null * * @return UserRate */ @@ -79,14 +69,14 @@ public static function getInstance() /** * @public function write - * @param string $module - * @param mixed $table + * @param $module + * @param $tables * @param string $filename */ - public function write($module, $table, $filename) + public function write($module, $tables, string $filename) { $this->setModule($module); - $this->setTable($table); + $this->setTables($tables); $this->setFileName($filename); } @@ -94,148 +84,227 @@ public function write($module, $table, $filename) * @private function getUserRateHeader * * @param $moduleDirname - * @param $tableName - * * @return string */ - public function getUserRateHeader($moduleDirname, $tableName) + public function getUserRateHeader($moduleDirname) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $ret = $pc->getPhpCodeUseNamespace(['Xmf', 'Request'], '', ''); - $ret .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', ''); - $ret .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']); - $ret .= $this->getInclude(); - $ret .= $this->xc->getXcXoopsRequest('op', 'op', 'form'); - $ret .= $this->xc->getXcXoopsRequest('lid', 'lid', '', 'Int'); - $ret .= $this->uxc->getUserTplMain($moduleDirname, $tableName); - $ret .= $this->pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'header', true); - $ret .= $this->pc->getPhpCodeCommentLine('Define Stylesheet'); - $ret .= $this->xc->getXcXoThemeAddStylesheet(); + $ret = $this->pc->getPhpCodeUseNamespace(['Xmf', 'Request'], '', ''); + $ret .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', ''); + $ret .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']); + $ret .= $this->getRequire(); + $ret .= $this->xc->getXcXoopsRequest('op', 'op', 'list', 'Cmd'); + $ret .= $this->xc->getXcXoopsRequest('source', 'source', '', 'Int'); return $ret; } /** * @private function getUserRateSwitch - * @param $moduleDirname - * @param $tableId - * @param $tableMid - * @param $tableName - * @param $tableSoleName - * @param $tableAutoincrement + * @param $tables * @param $language + * @param $moduleDirname * @return string */ - private function getUserRateSwitch($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableAutoincrement, $language) + private function getUserRateSwitch($tables, $language, $moduleDirname) { - $fields = $this->getTableFields($tableMid, $tableId); + $t = "\t\t"; $cases = [ - 'form' => [$this->getUserRateForm($tableName, $language)], - 'save' => [$this->getUserRateSave($moduleDirname, $fields, $tableName, $tableSoleName, $tableAutoincrement, $language)], + 'list' => [$this->getUserRateDefault( $t)], + 'save' => [$this->getUserRateSave($tables, $language, $t, $moduleDirname)], ]; - return $this->xc->getXcSwitch('op', $cases, true, false, "\t"); + return $this->xc->getXcSwitch('op', $cases, true); } /** * @public function getAdminPagesList - * @param $tableName - * @param $language - * + * @param string $t * @return string */ - public function getUserRateForm($tableName, $language) + public function getUserRateDefault(string $t = '') { - $ret = $this->pc->getPhpCodeCommentLine('Navigation'); - $ret .= $this->xc->getXcEqualsOperator('$navigation', "{$language}RATE", null, "\t\t"); - $ret .= $this->xc->getXcXoopsTplAssign('navigation', '$navigation', true, "\t\t"); - $ret .= $this->pc->getPhpCodeCommentLine('Title of page', null, "\t\t"); - $ret .= $this->xc->getXcEqualsOperator('$title', "{$language}RATE . ' - '", null, "\t\t"); - $ret .= $this->xc->getXcEqualsOperator('$title', "\$GLOBALS['xoopsModule']->name()", '.', "\t\t"); - $ret .= $this->xc->getXcXoopsTplAssign('xoops_pagetitle', '$title', true, "\t\t"); - $ret .= $this->pc->getPhpCodeCommentLine('Description', null, "\t\t"); - $ret .= $this->uxc->getUserAddMeta('description', $language, 'RATE', "\t\t"); - $ret .= $this->pc->getPhpCodeCommentLine('Form Create', null, "\t\t"); - $ret .= $this->xc->getXcHandlerCreateObj($tableName, "\t\t"); - $ret .= $this->xc->getXcGetForm('form', $tableName, 'Obj', "\t\t"); - $ret .= $this->xc->getXcXoopsTplAssign('form', '$form->render()', true, "\t\t"); + $ret = $this->pc->getPhpCodeCommentLine('default should not happen','', $t); + $ret .= $this->xc->getXcRedirectHeader('index', '', '3', '\_NOPERM', true, $t); return $ret; } /** * @public function getUserRateSave - * @param $moduleDirname - * @param $fields - * @param $tableName - * @param $tableSoleName - * @param $tableAutoincrement + * @param $tables * @param $language + * @param $t + * @param $moduleDirname * @return string */ - public function getUserRateSave($moduleDirname, $fields, $tableName, $tableSoleName, $tableAutoincrement, $language) + public function getUserRateSave($tables, $language, $t, $moduleDirname) { - $ret = $this->pc->getPhpCodeCommentLine('Security Check'); + $ret = $this->pc->getPhpCodeCommentLine('Security Check', '', $t); $xoopsSecurityCheck = $this->xc->getXcXoopsSecurityCheck(); $securityError = $this->xc->getXcXoopsSecurityErrors(); $implode = $this->pc->getPhpCodeImplode(',', $securityError); - $redirectError = $this->xc->getXcRedirectHeader($tableName, '', '3', $implode, true, "\t\t\t"); - $ret .= $this->pc->getPhpCodeConditions($xoopsSecurityCheck, '', '', $redirectError, false, "\t\t"); - $ret .= $this->xc->getXcHandlerCreateObj($tableName, "\t\t"); + $redirectError = $this->xc->getXcRedirectHeader('index', '', '3', $implode, true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions('!' . $xoopsSecurityCheck, '', '', $redirectError, false, $t); + + $ret .= $this->xc->getXcXoopsRequest('rating', 'rating', '', 'Int', $t); + $ret .= $this->xc->getXcEqualsOperator('$itemid', '0','', $t); + $ret .= $this->xc->getXcEqualsOperator('$redir ', "\Xmf\Request::getString('HTTP_REFERER', '', 'SERVER')",'', $t); + foreach ($tables as $table) { + $tableName = $table->getVar('table_name'); + $stuTableName = \mb_strtoupper($tableName); + if (1 == $table->getVar('table_rate')) { + $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); + $fieldId = ''; + foreach (\array_keys($fields) as $f) { + if (0 == $f) { + $fieldId = $fields[$f]->getVar('field_name'); + } + } + $contIf = $this->xc->getXcXoopsRequest('itemid', $fieldId, '', 'Int', $t . "\t"); + $contIf .= $this->xc->getXcEqualsOperator('$redir', "'{$tableName}.php?op=show&{$fieldId}=' . \$itemid",'', $t . "\t"); + $const = $this->xc->getXcGetConstants('TABLE_' . $stuTableName); + $ret .= $this->pc->getPhpCodeConditions('$source', ' === ', $const, $contIf, false, $t); + } + } + $redirectError = $this->xc->getXcRedirectHeader('$redir', '', '3', "{$language}INVALID_PARAM", false, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions('(int)$itemid', ' === ', '0', $redirectError, false, $t); - $ret .= $this->xc->getXcSaveElements($moduleDirname, $tableName, $tableSoleName, $fields, "\t\t"); + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->pc->getPhpCodeCommentLine('Check permissions', '', $t); + $ret .= $this->xc->getXcEqualsOperator('$rate_allowed', 'false','', $t); + $xUser = $this->pc->getPhpCodeGlobals('xoopsUser'); + $ret .= $this->pc->getPhpCodeTernaryOperator('groups', '(isset(' . $xUser . ') && \is_object(' . $xUser . '))', $xUser . '->getGroups()', '[\XOOPS_GROUP_ANONYMOUS]', "\t\t"); + $contIf = $this->xc->getXcEqualsOperator('$rate_allowed', 'true','', $t . "\t\t"); + $contIf .= $this->getSimpleString('break;', $t . "\t\t"); + $cond = '\XOOPS_GROUP_ADMIN == $group || \in_array($group, $helper->getConfig(\'ratingbar_groups\'))'; + $contFe = $this->pc->getPhpCodeConditions($cond, '', '', $contIf, false, $t . "\t"); + $ret .= $this->pc->getPhpCodeForeach('groups', false, false, 'group', $contFe, $t); + $contIf = $this->xc->getXcRedirectHeader('index', '', '3', $language . 'RATING_NOPERM', true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions('!$rate_allowed', '', '', $contIf, false, $t); - $ret .= $this->pc->getPhpCodeCommentLine('Insert Data', null, "\t\t"); - $insert = $this->xc->getXcHandlerInsert($tableName, $tableName, 'Obj', true); - $confirmOk = $this->xc->getXcRedirectHeader('index', '', '2', "{$language}FORM_OK", true, "\t\t\t"); - $ret .= $this->pc->getPhpCodeConditions($insert, '', '', $confirmOk, false, "\t\t"); + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->pc->getPhpCodeCommentLine('Check rating value', null, $t); + $cases = []; + $contIf = $this->xc->getXcRedirectHeader('index', '', '3', $language . 'RATING_VOTE_BAD', true, $t . "\t\t"); + $contIf .= $this->getSimpleString('exit;', $t . "\t\t"); + $const = $this->xc->getXcGetConstants('RATING_NONE'); + $cases[$const] = [$contIf]; + $contIf = $this->xc->getXcRedirectHeader('index', '', '3', $language . 'RATING_VOTE_BAD', true, $t . "\t\t\t"); + $contIf .= $this->getSimpleString('exit;', $t . "\t\t\t"); + $const = $this->xc->getXcGetConstants('RATING_LIKES'); + $cases[$const] = [$this->pc->getPhpCodeConditions('!\in_array($rating, [-1, 1], true)', '', '', $contIf, false, $t . "\t\t")]; + $const = $this->xc->getXcGetConstants('RATING_5STARS'); + $cases[$const] = [$this->pc->getPhpCodeConditions('$rating > 5 || $rating < 1', '', '', $contIf, false, $t . "\t\t")]; + $const = $this->xc->getXcGetConstants('RATING_10STARS'); + $cases[$const] = ''; + $const = $this->xc->getXcGetConstants('RATING_10NUM'); + $cases[$const] = [$this->pc->getPhpCodeConditions('$rating > 10 || $rating < 1', '', '', $contIf, false, $t . "\t\t")]; + $config = '(int)' . $this->xc->getXcGetConfig('ratingbars'); + $ret .= $this->xc->getXcSwitch($config, $cases, true, $t, false, true); - $ret .= $this->pc->getPhpCodeCommentLine('Get Form Error', null, "\t\t"); - $ret .= $this->xc->getXcXoopsTplAssign('error', "\${$tableName}Obj->getHtmlErrors()", true, "\t\t"); - $ret .= $this->xc->getXcGetForm('form', $tableName, 'Obj', "\t\t"); - $ret .= $this->xc->getXcXoopsTplAssign('form', '$form->display()', true, "\t\t"); + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->pc->getPhpCodeCommentLine('Get existing rating', null, $t); + $ret .= $this->xc->getXcEqualsOperator('$itemrating', '$ratingsHandler->getItemRating($itemid, $source)','', $t); + + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->pc->getPhpCodeCommentLine('Set data rating', null, $t); + $contIf = $this->pc->getPhpCodeCommentLine('If yo want to avoid revoting then activate next line', null, $t . "\t"); + $contIf .= $t . "\t//" . $this->xc->getXcRedirectHeader('index', '', '3', $language . 'RATING_VOTE_BAD'); + $contIf .= $this->xc->getXcHandlerGet('ratings', "itemrating['id']",'Obj', 'ratingsHandler', false, $t . "\t"); + $contElse = $this->xc->getXcHandlerCreateObj('ratings', $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions("\$itemrating['voted']", '', '', $contIf, $contElse, $t); + $ret .= $this->xc->getXcSetVarObj('ratings', 'rate_source', '$source', $t); + $ret .= $this->xc->getXcSetVarObj('ratings', 'rate_itemid', '$itemid', $t); + $ret .= $this->xc->getXcSetVarObj('ratings', 'rate_value', '$rating', $t); + $ret .= $this->xc->getXcSetVarObj('ratings', 'rate_uid', "\$itemrating['uid']", $t); + $ret .= $this->xc->getXcSetVarObj('ratings', 'rate_ip', "\$itemrating['ip']", $t); + $ret .= $this->xc->getXcSetVarObj('ratings', 'rate_date', '\time()', $t); + $ret .= $this->pc->getPhpCodeCommentLine('Insert Data', null, $t); + $insert = $this->xc->getXcHandlerInsert('ratings', 'ratings', 'Obj'); + $contIf = $this->pc->getPhpCodeUnset('ratingsObj', $t . "\t"); + + $contIf .= $this->pc->getPhpCodeCommentLine('Calc average rating value', null, $t . "\t"); + foreach ($tables as $table) { + $tableName = $table->getVar('table_name'); + $stuTableName = \mb_strtoupper($tableName); + if (1 == $table->getVar('table_rate')) { + $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); + $fieldId = ''; + $fieldRatings = ''; + $fieldVotes = ''; + foreach (\array_keys($fields) as $f) { + if (0 == $f) { + $fieldId = $fields[$f]->getVar('field_name'); + } + $fieldElement = $fields[$f]->getVar('field_element'); + if($fieldElement == Modulebuilder\Constants::FIELD_ELE_TEXTRATINGS) { + $fieldRatings = $fields[$f]->getVar('field_name'); + } + if($fieldElement == Modulebuilder\Constants::FIELD_ELE_TEXTVOTES) { + $fieldVotes = $fields[$f]->getVar('field_name'); + } + } + $sql = $this->getSimpleString("\$sql = '", $t . "\t\t"); + $sql .= $this->getSimpleString("UPDATE ' . \$GLOBALS['xoopsDB']->prefix('" . $moduleDirname . '_' . $tableName . "') . ' t", $t . "\t\t\t"); + $sql .= $this->getSimpleString('LEFT JOIN (', $t . "\t\t\t"); + $sql .= $this->getSimpleString('SELECT', $t . "\t\t\t\t"); + $sql .= $this->getSimpleString('rate_itemid, rate_source, COUNT(*) AS votes, ROUND(AVG(rate_value), 2) AS avg_rating', $t . "\t\t\t\t\t"); + $sql .= $this->getSimpleString("FROM ' . \$GLOBALS['xoopsDB']->prefix('{$moduleDirname}_ratings') . '", $t . "\t\t\t\t"); + $sql .= $this->getSimpleString('GROUP BY rate_itemid, rate_source', $t . "\t\t\t\t"); + $sql .= $this->getSimpleString(") r ON r.rate_itemid = t." . $fieldId . " and r.rate_source = ' . \$source . '", $t . "\t\t\t"); + $sql .= $this->getSimpleString('SET', $t . "\t\t\t"); + $sql .= $this->getSimpleString('t.' . $fieldVotes . ' = COALESCE(r.votes, 0),', $t . "\t\t\t\t"); + $sql .= $this->getSimpleString('t.' . $fieldRatings . ' = COALESCE(r.avg_rating, 0)', $t . "\t\t\t\t"); + $sql .= $this->getSimpleString("WHERE t." . $fieldId . " = ' . \$itemid;", $t . "\t\t\t"); + $contIfInt = $sql; + + $insertInt = "\$GLOBALS['xoopsDB']->queryF(\$sql)"; + + $insertOK = $this->xc->getXcRedirectHeader('$redir', '', '2', "{$language}RATING_VOTE_THANKS", false, $t . "\t\t\t"); + $insertErr = $this->xc->getXcRedirectHeader($tableName, '', '3', "{$language}RATING_ERROR1", true, $t . "\t\t\t"); + $contIfInt .= $this->pc->getPhpCodeConditions($insertInt, '', '', $insertOK, $insertErr, $t. "\t\t"); + $contIfInt .= $this->pc->getPhpCodeUnset($tableName . 'Obj', $t . "\t\t"); + $const = $this->xc->getXcGetConstants('TABLE_' . $stuTableName); + $contIf .= $this->pc->getPhpCodeConditions('$source', ' === ', $const, $contIfInt, false, $t . "\t"); + } + } + + $contIf .= $this->pc->getPhpCodeBlankLine(); + $contIf .= $this->xc->getXcRedirectHeader('index', '', '2', "{$language}INVALID_PARAM", true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions($insert, '', '', $contIf, false, $t); + + $ret .= $this->pc->getPhpCodeCommentLine('Get Error', null, $t); + $ret .= $this->getSimpleString("echo 'Error: ' . \$ratingsObj->getHtmlErrors();", $t); return $ret; } /** * @public function getUserRateFooter - * @param $moduleDirname - * @param $language * @return string */ - public function getUserRateFooter($moduleDirname, $language) + public function getUserRateFooter() { - $ret = $this->pc->getPhpCodeCommentLine('Breadcrumbs'); - $ret .= $this->uxc->getUserBreadcrumbs('RATE', $language); - $ret .= $this->getInclude('footer'); - - return $ret; + return $this->getRequire('footer'); } /** * @public function render - * @param null - * @return bool|string + * @return string */ public function render() { $module = $this->getModule(); - $table = $this->getTable(); + $tables = $this->getTables(); $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); - $tableId = $table->getVar('table_id'); - $tableMid = $table->getVar('table_mid'); - $tableName = $table->getVar('table_name'); - $tableSoleName = $table->getVar('table_solename'); - $tableAutoincrement = $table->getVar('table_autoincrement'); $language = $this->getLanguage($moduleDirname, 'MA'); $content = $this->getHeaderFilesComments($module); - //$content .= $this->getUserRateHeader($moduleDirname, $tableName); - //$content .= $this->getUserRateSwitch($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableAutoincrement, $language); - //$content .= $this->getUserRateFooter($moduleDirname, $language); + $content .= $this->getUserRateHeader($moduleDirname); + $content .= $this->getUserRateSwitch($tables, $language, $moduleDirname); + $content .= $this->getUserRateFooter(); - $this->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, '/', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/User/UserRss.php b/class/Files/User/UserRss.php index d640e913..14a32bad 100644 --- a/class/Files/User/UserRss.php +++ b/class/Files/User/UserRss.php @@ -1,9 +1,9 @@ -xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $this->pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $this->uxc = UserXoopsCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); } /** * @static function getInstance - * @param null * @return UserRss */ public static function getInstance() @@ -75,11 +61,11 @@ public static function getInstance() /** * @public function write - * @param string $module + * @param $module * @param mixed $table * @param string $filename */ - public function write($module, $table, $filename) + public function write($module, $table, string $filename): void { $this->setModule($module); $this->setTable($table); @@ -91,13 +77,15 @@ public function write($module, $table, $filename) * @param string $moduleDirname * @return string */ - public function getUserRss($moduleDirname) + public function getUserRss(string $moduleDirname) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); $table = $this->getTable(); $tableName = $table->getVar('table_name'); + $fppf = ''; + $fpmf = ''; + $fieldId = ''; $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); - foreach (array_keys($fields) as $f) { + foreach (\array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); $fieldMain[] = $fields[$f]->getVar('field_main'); $fieldParent[] = $fields[$f]->getVar('field_parent'); @@ -105,115 +93,116 @@ public function getUserRss($moduleDirname) if (0 == $f) { $fieldId = $fieldName; } - if (in_array(1, $fieldMain)) { + if (\in_array(1, $fieldMain)) { $fpmf = $fieldName; } - if (in_array(1, $fieldParent)) { + if (\in_array(1, $fieldParent)) { $fppf = $fieldName; } else { $fppf = 'cid'; } } - $ret = $pc->getPhpCodeUseNamespace(['Xmf', 'Request']); - $ret .= $this->getInclude(); + $ret = $this->pc->getPhpCodeUseNamespace(['Xmf', 'Request']); + $ret .= $this->getRequire(); $ret .= <<xoops_setCaching(2); //1 = Cache global, 2 = Cache individual (for template)
-\$tpl->xoops_setCacheTime(\$helper->getConfig('timecacherss')*60); // Time of the cache on seconds
-\$categories = {$moduleDirname}MyGetItemIds('{$moduleDirname}_view', '{$moduleDirname}');
-\$criteria = new \CriteriaCompo();
-
-\$criteria->add(new \Criteria('cat_status', 0, '!='));
-\$criteria->add(new \Criteria('{$fppf}', '(' . implode(',', \$categories) . ')','IN'));
-if (\${$fppf} != 0){
- \$criteria->add(new \Criteria('{$fppf}', \${$fppf}));
- \${$tableName} = \${$tableName}Handler->get(\${$fppf});
- \$title = \$xoopsConfig['sitename'] . ' - ' . \$xoopsModule->getVar('name') . ' - ' . \${$tableName}->getVar('{$fpmf}');
-} else {
- \$title = \$xoopsConfig['sitename'] . ' - ' . \$xoopsModule->getVar('name');
-}
-\$criteria->setLimit(\$helper->getConfig('perpagerss'));
-\$criteria->setSort('date');
-\$criteria->setOrder('DESC');
-\${$tableName}Arr = \${$tableName}Handler->getAll(\$criteria);
-unset(\$criteria);
-
-if (!\$tpl->is_cached('db:{$moduleDirname}_rss.tpl', \${$fppf})) {
- \$tpl->assign('channel_title', htmlspecialchars(\$title, ENT_QUOTES));
- \$tpl->assign('channel_link', XOOPS_URL.'/');
- \$tpl->assign('channel_desc', htmlspecialchars(\$xoopsConfig['slogan'], ENT_QUOTES));
- \$tpl->assign('channel_lastbuild', formatTimestamp(time(), 'rss'));
- \$tpl->assign('channel_webmaster', \$xoopsConfig['adminmail']);
- \$tpl->assign('channel_editor', \$xoopsConfig['adminmail']);
- \$tpl->assign('channel_category', 'Event');
- \$tpl->assign('channel_generator', 'XOOPS - ' . htmlspecialchars(\$xoopsModule->getVar('{$fpmf}'), ENT_QUOTES));
- \$tpl->assign('channel_language', _LANGCODE);
- if ( _LANGCODE == 'fr' ) {
- \$tpl->assign('docs', 'http://www.scriptol.fr/rss/RSS-2.0.html');
- } else {
- \$tpl->assign('docs', 'http://cyber.law.harvard.edu/rss/rss.html');
- }
- \$tpl->assign('image_url', XOOPS_URL . \$xoopsModuleConfig['logorss']);
- \$dimention = getimagesize(XOOPS_ROOT_PATH . \$xoopsModuleConfig['logorss']);
- if (empty(\$dimention[0])) {
- \$width = 88;
- } else {
- \$width = (\$dimention[0] > 144) ? 144 : \$dimention[0];
- }
- if (empty(\$dimention[1])) {
- \$height = 31;
- } else {
- \$height = (\$dimention[1] > 400) ? 400 : \$dimention[1];
- }
- \$tpl->assign('image_width', \$width);
- \$tpl->assign('image_height', \$height);
- foreach (array_keys(\${$tableName}Arr) as \$i) {
- \$description = \${$tableName}Arr[\$i]->getVar('description');
- //permet d'afficher uniquement la description courte
- if (strpos(\$description,'[pagebreak]')==false){
- \$description_short = \$description;
- } else {
- \$description_short = substr(\$description,0,strpos(\$description,'[pagebreak]'));
- }
- \$tpl->append('items', array('title' => htmlspecialchars(\${$tableName}Arr[\$i]->getVar('{$fpmf}'), ENT_QUOTES),
- 'link' => XOOPS_URL . '/modules/{$moduleDirname}/single.php?{$fppf}=' . \${$tableName}Arr[\$i]->getVar('{$fppf}') . '&{$fieldId}=' . \${$tableName}Arr[\$i]->getVar('{$fieldId}'),
- 'guid' => XOOPS_URL . '/modules/{$moduleDirname}/single.php?{$fppf}=' . \${$tableName}Arr[\$i]->getVar('{$fppf}') . '&{$fieldId}=' . \${$tableName}Arr[\$i]->getVar('{$fieldId}'),
- 'pubdate' => formatTimestamp(\${$tableName}Arr[\$i]->getVar('date'), 'rss'),
- 'description' => htmlspecialchars(\$description_short, ENT_QUOTES)));
- }
-}
-header('Content-Type:text/xml; charset=' . _CHARSET);
-\$tpl->display('db:{$moduleDirname}_rss.tpl', \${$fppf});
-EOT;
+ \${$fppf} = Request::getInt('{$fppf}', 0, 'GET');
+ require_once \XOOPS_ROOT_PATH.'/class/template.php';
+ if (\\function_exists('mb_http_output')) {
+ mb_http_output('pass');
+ }
+ //header ('Content-Type:text/xml; charset=UTF-8');
+ \$xoopsModuleConfig['utf8'] = false;
+
+ \$tpl = new \XoopsTpl();
+ \$tpl->xoops_setCaching(2); //1 = Cache global, 2 = Cache individual (for template)
+ \$tpl->xoops_setCacheTime(\$helper->getConfig('timecacherss')*60); // Time of the cache on seconds
+ \$categories = {$moduleDirname}MyGetItemIds('{$moduleDirname}_view', '{$moduleDirname}');
+ \$criteria = new \CriteriaCompo();
+
+ \$criteria->add(new \Criteria('cat_status', 0, '!='));
+ \$criteria->add(new \Criteria('{$fppf}', '(' . \implode(',', \$categories) . ')','IN'));
+ if (0 != \${$fppf}){
+ \$criteria->add(new \Criteria('{$fppf}', \${$fppf}));
+ \${$tableName} = \${$tableName}Handler->get(\${$fppf});
+ \$title = \$xoopsConfig['sitename'] . ' - ' . \$xoopsModule->getVar('name') . ' - ' . \${$tableName}->getVar('{$fpmf}');
+ } else {
+ \$title = \$xoopsConfig['sitename'] . ' - ' . \$xoopsModule->getVar('name');
+ }
+ \$criteria->setLimit(\$helper->getConfig('perpagerss'));
+ \$criteria->setSort('date');
+ \$criteria->setOrder('DESC');
+ \${$tableName}Arr = \${$tableName}Handler->getAll(\$criteria);
+ unset(\$criteria);
+
+ if (!\$tpl->is_cached('db:{$moduleDirname}_rss.tpl', \${$fppf})) {
+ \$tpl->assign('channel_title', \htmlspecialchars(\$title, ENT_QUOTES));
+ \$tpl->assign('channel_link', \XOOPS_URL.'/');
+ \$tpl->assign('channel_desc', \htmlspecialchars(\$xoopsConfig['slogan'], ENT_QUOTES));
+ \$tpl->assign('channel_lastbuild', \\formatTimestamp(\\time(), 'rss'));
+ \$tpl->assign('channel_webmaster', \$xoopsConfig['adminmail']);
+ \$tpl->assign('channel_editor', \$xoopsConfig['adminmail']);
+ \$tpl->assign('channel_category', 'Event');
+ \$tpl->assign('channel_generator', 'XOOPS - ' . \htmlspecialchars(\$xoopsModule->getVar('name'), ENT_QUOTES));
+ \$tpl->assign('channel_language', _LANGCODE);
+ if ( 'fr' == _LANGCODE ) {
+ \$tpl->assign('docs', 'https://www.scriptol.fr/rss/RSS-2.0.html');
+ } else {
+ \$tpl->assign('docs', 'https://cyber.law.harvard.edu/rss/rss.html');
+ }
+ \$tpl->assign('image_url', \XOOPS_URL . \$xoopsModuleConfig['logorss']);
+ \$logoPath = \XOOPS_ROOT_PATH . \$xoopsModuleConfig['logorss'];
+ \$width = 88;
+ \$height = 31;
+ if (\\file_exists(\$logoPath)) {
+ \$dimension = \getimagesize(\$logoPath);
+ if (!empty(\$dimension[0])) {
+ \$width = (\$dimension[0] > 144) ? 144 : \$dimension[0];
+ }
+ if (!empty(\$dimension[1])) {
+ \$height = (\$dimension[1] > 400) ? 400 : \$dimension[1];
+ }
+ }
+ \$tpl->assign('image_width', \$width);
+ \$tpl->assign('image_height', \$height);
+ foreach (\array_keys(\${$tableName}Arr) as \$i) {
+ \$description = \${$tableName}Arr[\$i]->getVar('description');
+ //permet d'afficher uniquement la description courte
+ if (false === \strpos(\$description,'[pagebreak]')){
+ \$description_short = \$description;
+ } else {
+ \$description_short = \substr(\$description,0,\strpos(\$description,'[pagebreak]'));
+ }
+ \$tpl->append('items', ['title' => \htmlspecialchars(\${$tableName}Arr[\$i]->getVar('{$fpmf}'), ENT_QUOTES),
+ 'link' => \XOOPS_URL . '/modules/{$moduleDirname}/single.php?{$fppf}=' . \${$tableName}Arr[\$i]->getVar('{$fppf}') . '&{$fieldId}=' . \${$tableName}Arr[\$i]->getVar('{$fieldId}'),
+ 'guid' => \XOOPS_URL . '/modules/{$moduleDirname}/single.php?{$fppf}=' . \${$tableName}Arr[\$i]->getVar('{$fppf}') . '&{$fieldId}=' . \${$tableName}Arr[\$i]->getVar('{$fieldId}'),
+ 'pubdate' => \\formatTimestamp(\${$tableName}Arr[\$i]->getVar('date'), 'rss'),
+ 'description' => \htmlspecialchars(\$description_short, ENT_QUOTES)
+ ]);
+ }
+ }
+ header('Content-Type:text/xml; charset=' . _CHARSET);
+ \$tpl->display('db:{$moduleDirname}_rss.tpl', \${$fppf});
+
+ EOT;
return $ret;
}
/**
* @public function render
- * @param null
- * @return bool|string
+ * @return string
*/
public function render()
{
$module = $this->getModule();
$filename = $this->getFileName();
$moduleDirname = $module->getVar('mod_dirname');
- $language = $this->getLanguage($moduleDirname, 'MA');
$content = $this->getHeaderFilesComments($module);
$content .= $this->getUserRss($moduleDirname);
- $this->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->create($moduleDirname, '/', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $this->renderFile();
}
diff --git a/class/Files/User/UserSearch.php b/class/Files/User/UserSearch.php
index 76eea160..913bd9d4 100644
--- a/class/Files/User/UserSearch.php
+++ b/class/Files/User/UserSearch.php
@@ -1,9 +1,9 @@
-xoopscode = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $this->phpcode = Tdmcreate\Files\CreatePhpCode::getInstance();
- $this->usercode = UserXoopsCode::getInstance();
+ $this->xc = Modulebuilder\Files\CreateXoopsCode::getInstance();
+ $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance();
+ $this->uxc = UserXoopsCode::getInstance();
}
/**
* @static function getInstance
- * @param null
* @return UserSearch
*/
public static function getInstance()
@@ -70,11 +71,11 @@ public static function getInstance()
/**
* @public function write
- * @param string $module
+ * @param $module
* @param mixed $table
* @param string $filename
*/
- public function write($module, $table, $filename)
+ public function write($module, $table, string $filename)
{
$this->setModule($module);
$this->setTable($table);
@@ -92,12 +93,13 @@ public function write($module, $table, $filename)
*/
private function getUserSearchHeader($moduleDirname, $table, $fields)
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $ret = $pc->getPhpCodeUseNamespace(['Xmf', 'Request'], '', '');
- $ret .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', '');
- $ret .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']);
- $ret .= $this->getInclude();
- foreach (array_keys($fields) as $f) {
+ $ret = $this->pc->getPhpCodeUseNamespace(['Xmf', 'Request'], '', '');
+ $ret .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', '');
+ $ret .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']);
+ $ret .= $this->getRequire();
+ $fieldId = 0;
+ $fieldPid = 0;
+ foreach (\array_keys($fields) as $f) {
$fieldName = $fields[$f]->getVar('field_name');
if (0 == $f) {
$fieldId = $fieldName;
@@ -108,33 +110,28 @@ private function getUserSearchHeader($moduleDirname, $table, $fields)
}
if (1 == $table->getVar('table_category')) {
$ccFieldPid = $this->getCamelCase($fieldPid, false, true);
- $ret .= $this->xoopscode->getXcXoopsRequest($ccFieldPid, (string)$fieldPid, '0', 'Int');
+ $ret .= $this->xc->getXcXoopsRequest($ccFieldPid, (string)$fieldPid, '', 'Int');
}
$ccFieldId = $this->getCamelCase($fieldId, false, true);
- $ret .= $this->xoopscode->getXcXoopsRequest($ccFieldId, (string)$fieldId, '0', 'Int');
- $ret .= $this->usercode->getUserTplMain($moduleDirname);
- $ret .= $this->phpcode->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'header', true);
+ $ret .= $this->xc->getXcXoopsRequest($ccFieldId, (string)$fieldId, '', 'Int');
+ $ret .= $this->uxc->getUserTplMain($moduleDirname);
+ $ret .= $this->phpcode->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH', 'header', true);
$ret .= $this->getDashComment('Define Stylesheet');
- $ret .= $this->xoopscode->getXcXoThemeAddStylesheet();
+ $ret .= $this->xc->getXcXoThemeAddStylesheet();
return $ret;
}
/**
* @public function getAdminPagesList
- * @param $moduleDirname
- * @param $tableName
- * @param $language
* @return string
*/
- public function getUserSearch($moduleDirname, $tableName, $language)
+ public function getUserSearch()
{
- $ret = <<<'EOT'
+ /*$ret = <<<'EOT'
-EOT;
- $ret .= $this->getSimpleString('$keywords = array();');
-
- return $ret;
+EOT;*/
+ return $this->getSimpleString('$keywords = [];');
}
/**
@@ -148,27 +145,20 @@ public function getUserSearch($moduleDirname, $tableName, $language)
*/
private function getUserSearchFooter($moduleDirname, $tableName, $language)
{
- $stuModuleDirname = mb_strtoupper($moduleDirname);
- $stuTableName = mb_strtoupper($tableName);
+ $stuTableName = \mb_strtoupper($tableName);
$ret = $this->getDashComment('Breadcrumbs');
- $ret .= $this->usercode->getUserBreadcrumbs((string)$stuTableName, $language);
+ $ret .= $this->uxc->getUserBreadcrumbs((string)$stuTableName, $language);
$ret .= $this->getDashComment('Keywords');
- $ret .= $this->usercode->getUserMetaKeywords($moduleDirname);
+ $ret .= $this->uxc->getUserMetaKeywords($moduleDirname);
$ret .= $this->phpcode->getPhpCodeUnset('keywords');
- $ret .= $this->getDashComment('Description');
- $ret .= $this->usercode->getUserMetaDesc($moduleDirname, 'DESC', $language);
- $ret .= $this->xoopscode->getXcXoopsTplAssign('xoops_mpageurl', "{$stuModuleDirname}_URL.'/index.php'");
- $ret .= $this->xoopscode->getXcXoopsTplAssign('xoops_icons32_url', 'XOOPS_ICONS32_URL');
- $ret .= $this->xoopscode->getXcXoopsTplAssign("{$moduleDirname}_upload_url", "{$stuModuleDirname}_UPLOAD_URL");
- $ret .= $this->getInclude('footer');
+ $ret .= $this->getRequire('footer');
return $ret;
}
/**
* @public function render
- * @param null
- * @return bool|string
+ * @return string
*/
public function render()
{
@@ -183,10 +173,10 @@ public function render()
$language = $this->getLanguage($moduleDirname, 'MA');
$content = $this->getHeaderFilesComments($module);
$content .= $this->getUserSearchHeader($moduleDirname, $table, $fields);
- $content .= $this->getUserSearch($moduleDirname, $tableName, $language);
+ $content .= $this->getUserSearch();
$content .= $this->getUserSearchFooter($moduleDirname, $tableName, $language);
- $this->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->create($moduleDirname, '/', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $this->renderFile();
}
diff --git a/class/Files/User/UserSingle.php b/class/Files/User/UserSingle.php
deleted file mode 100644
index 334965f1..00000000
--- a/class/Files/User/UserSingle.php
+++ /dev/null
@@ -1,182 +0,0 @@
-setModule($module);
- $this->setTable($table);
- $this->setFileName($filename);
- }
-
- /**
- * @private function getUserSingleHeader
- * @param $moduleDirname
- * @param $table
- * @param $fields
- * @return string
- */
- private function getUserSingleHeader($moduleDirname, $table, $fields)
- {
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $uxc = UserXoopsCode::getInstance();
- $ret = $pc->getPhpCodeUseNamespace(['Xmf', 'Request'], '', '');
- $ret .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', '');
- $ret .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']);
- $ret .= $this->getInclude();
- foreach (array_keys($fields) as $f) {
- $fieldName = $fields[$f]->getVar('field_name');
- if (0 == $f) {
- $fieldId = $fieldName;
- }
- if (1 == $fields[$f]->getVar('field_parent')) {
- $fieldPid = $fieldName;
- }
- }
- if (1 == $table->getVar('table_category')) {
- $ccFieldPid = $this->getCamelCase($fieldPid, false, true);
- $ret .= $xc->getXcXoopsRequest($ccFieldPid, (string)$fieldPid, '0', 'Int');
- }
- $ccFieldId = $this->getCamelCase($fieldId, false, true);
- $ret .= $xc->getXcXoopsRequest($ccFieldId, (string)$fieldId, '0', 'Int');
- $ret .= $uxc->getUserTplMain($moduleDirname, 'single');
- $ret .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'header', true);
- $ret .= $pc->getPhpCodeCommentLine('Define Stylesheet');
- $ret .= $xc->getXcXoThemeAddStylesheet();
-
- return $ret;
- }
-
- /**
- * @public function getUserSingleBody
- * @param $moduleDirname
- * @param $tableName
- * @param $language
- *
- * @return string
- */
- public function getUserSingleBody($moduleDirname, $tableName, $language)
- {
- $ret = <<<'EOT'
-
-EOT;
- $ret .= $this->getSimpleString('$keywords = array();');
-
- return $ret;
- }
-
- /**
- * @private function getUserSingleFooter
- * @param $moduleDirname
- * @param $tableName
- * @param $language
- *
- * @return string
- */
- private function getUserSingleFooter($moduleDirname, $tableName, $language)
- {
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $uxc = UserXoopsCode::getInstance();
- $stuModuleDirname = mb_strtoupper($moduleDirname);
- $stuTableName = mb_strtoupper($tableName);
- $ret = $pc->getPhpCodeCommentLine('Breadcrumbs');
- $ret .= $uxc->getUserBreadcrumbs($language, $stuTableName);
- $ret .= $pc->getPhpCodeCommentLine('Keywords');
- $ret .= $uxc->getUserMetaKeywords($moduleDirname);
- $ret .= $pc->getPhpCodeUnset('keywords');
- $ret .= $pc->getPhpCodeCommentLine('Description');
- $ret .= $uxc->getUserMetaDesc($moduleDirname, $language, $stuTableName);
- $ret .= $xc->getXcXoopsTplAssign('xoops_mpageurl', "{$stuModuleDirname}_URL.'/index.php'");
- $ret .= $xc->getXcXoopsTplAssign('xoops_icons32_url', 'XOOPS_ICONS32_URL');
- $ret .= $xc->getXcXoopsTplAssign("{$moduleDirname}_upload_url", "{$stuModuleDirname}_UPLOAD_URL");
- $ret .= $this->getInclude('footer');
-
- return $ret;
- }
-
- /**
- * @public function render
- * @param null
- * @return bool|string
- */
- public function render()
- {
- $module = $this->getModule();
- $table = $this->getTable();
- $filename = $this->getFileName();
- $moduleDirname = $module->getVar('mod_dirname');
- $tableId = $table->getVar('table_id');
- $tableMid = $table->getVar('table_mid');
- $tableName = $table->getVar('table_name');
- $fields = $this->getTableFields($tableMid, $tableId);
- $language = $this->getLanguage($moduleDirname, 'MA');
- $content = $this->getHeaderFilesComments($module);
- $content .= $this->getUserSingleHeader($moduleDirname, $table, $fields);
- $content .= $this->getUserSingleBody($module, $tableName, $language);
- $content .= $this->getUserSingleFooter($moduleDirname, $tableName, $language);
- $this->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
-
- return $this->renderFile();
- }
-}
diff --git a/class/Files/User/UserSubmit.php b/class/Files/User/UserSubmit.php
deleted file mode 100644
index db074d9d..00000000
--- a/class/Files/User/UserSubmit.php
+++ /dev/null
@@ -1,305 +0,0 @@
-setModule($module);
- $this->setTable($table);
- $this->setFileName($filename);
- }
-
- /**
- * @public function getUserSubmitHeader
- * @param $moduleDirname
- *
- * @param $tablePermissions
- * @return string
- */
- public function getUserSubmitHeader($moduleDirname, $tablePermissions)
- {
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $uxc = UserXoopsCode::getInstance();
- $t = "\t";
- $ret = $pc->getPhpCodeUseNamespace(['Xmf', 'Request'], '', '');
- $ret .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', '');
- $ret .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']);
- $ret .= $this->getInclude();
- $ret .= $xc->getXcXoopsLoadLanguage('admin', '', $moduleDirname);
- $ret .= $pc->getPhpCodeCommentLine('It recovered the value of argument op in URL$');
- $ret .= $xc->getXcXoopsRequest('op', 'op', 'form');
- $ret .= $pc->getPhpCodeCommentLine('Template');
- $ret .= $uxc->getUserTplMain($moduleDirname, 'submit');
- $ret .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'header', true);
- $ret .= $xc->getXcXoThemeAddStylesheet();
- if (1 == $tablePermissions) {
- $ret .= $xc->getXcHandlerLine('permissions');
- $ret .= $xc->getXcEqualsOperator('$permSubmit', '$permissionsHandler->getPermGlobalSubmit()');
- $ret .= $pc->getPhpCodeCommentLine('Redirection if not permissions');
- $condIf = $xc->getXcRedirectHeader('index', '', '2', '_NOPERM', true, $t);
- $condIf .= $this->getSimpleString('exit();', $t);
- $ret .= $pc->getPhpCodeConditions('$permSubmit', ' === ', 'false', $condIf, false);
- }
-
- return $ret;
- }
-
- /**
- * @public function getAdminPagesList
- * @param $tableName
- * @param $language
- * @param string $t
- * @return string
- */
- public function getUserSubmitForm($tableName, $language, $t = '')
- {
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $uxc = UserXoopsCode::getInstance();
- $ret = $pc->getPhpCodeCommentLine('Navigation', '', $t);
- $ret .= $xc->getXcEqualsOperator('$navigation', "{$language}SUBMIT_PROPOSER", '', $t);
- $ret .= $xc->getXcXoopsTplAssign('navigation', '$navigation', true, $t);
- $ret .= $pc->getPhpCodeCommentLine('Title of page', null, $t);
- $ret .= $xc->getXcEqualsOperator('$title', "{$language}SUBMIT_PROPOSER . ' - '", '', $t );
- $ret .= $xc->getXcEqualsOperator('$title', "\$GLOBALS['xoopsModule']->name()", '.', $t);
- $ret .= $xc->getXcXoopsTplAssign('xoops_pagetitle', '$title', true, $t);
- $ret .= $pc->getPhpCodeCommentLine('Description', null, $t);
- $ret .= $uxc->getUserAddMeta('description', $language, 'SUBMIT_PROPOSER', $t);
- $ret .= $pc->getPhpCodeCommentLine('Form Create', null, $t);
- $ret .= $xc->getXcHandlerCreateObj($tableName, $t);
- $ret .= $xc->getXcGetForm('form', $tableName, 'Obj', $t);
- $ret .= $xc->getXcXoopsTplAssign('form', '$form->render()', true, $t);
-
- return $ret;
- }
-
- /**
- * @public function getUserSubmitSave
- * @param string $moduleDirname
- * @param $fields
- * @param string $tableName
- * @param $tableSoleName
- * @param $tableSubmit
- * @param $tablePermissions
- * @param $language
- * @param string $t
- * @return string
- */
- public function getUserSubmitSave($moduleDirname, $fields, $tableName, $tableSoleName, $tableSubmit, $tablePermissions, $language, $t = '')
- {
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $ret = $pc->getPhpCodeCommentLine('Security Check', '', $t);
- $xoopsSecurityCheck = $xc->getXcXoopsSecurityCheck();
- $securityError = $xc->getXcXoopsSecurityErrors();
- $implode = $pc->getPhpCodeImplode(',', $securityError);
- $redirectError = $xc->getXcRedirectHeader($tableName, '', '3', $implode, true, $t . "\t");
- $ret .= $pc->getPhpCodeConditions('!' . $xoopsSecurityCheck, '', '', $redirectError, false, $t);
- $ret .= $xc->getXcHandlerCreateObj($tableName, $t);
- if (in_array(1, $tableSubmit)) {
- $ret .= $xc->getXcSaveElements($moduleDirname, $tableName, $tableSoleName, $fields, $t);
- }
- $ret .= $pc->getPhpCodeCommentLine('Insert Data', null, $t);
- $insert = $xc->getXcHandlerInsert($tableName, $tableName, 'Obj', 'Handler');
- $countUploader = 0;
- $fieldId = '';
- $ccFieldId = '';
- foreach (array_keys($fields) as $f) {
- $fieldName = $fields[$f]->getVar('field_name');
- if (0 == $f) {
- $fieldId = $fieldName;
- $ccFieldId = $this->getCamelCase($fieldId, false, true);
- }
- if ($fields[$f]->getVar('field_type') >= 10 && $fields[$f]->getVar('field_type') <= 14) {
- $countUploader++;
- }
- }
- $contentInsert = '';
- if (1 == $tablePermissions) {
- $ucfTableName = ucfirst($tableName);
- $ucfFieldId = $this->getCamelCase($fieldId, true);
- $contentInsert .= $xc->getXcEqualsOperator("\$new{$ucfFieldId}", "\${$tableName}Obj->getNewInsertedId{$ucfTableName}()", null, $t . "\t");
- $contentInsert .= $pc->getPhpCodeTernaryOperator('permId', "isset(\$_REQUEST['{$fieldId}'])", "\${$ccFieldId}", "\$new{$ucfFieldId}", $t . "\t");
- $contentInsert .= $xc->getXcXoopsHandler('groupperm', $t . "\t");
- $contentInsert .= $xc->getXcEqualsOperator('$mid', "\$GLOBALS['xoopsModule']->getVar('mid')", null, $t . "\t");
- $contentInsert .= $this->getPermissionsSave($moduleDirname, 'view_' . $tableName);
- $contentInsert .= $this->getPermissionsSave($moduleDirname, 'submit_' . $tableName);
- $contentInsert .= $this->getPermissionsSave($moduleDirname, 'approve_' . $tableName);
- }
-
- if ($countUploader > 0) {
- $errIf = $xc->getXcRedirectHeader("'{$tableName}.php?op=edit&{$fieldId}=' . \${$ccFieldId}", '', '5', '$uploaderErrors', false, $t . "\t\t");
- $errElse = $xc->getXcRedirectHeader($tableName, '?op=list', '2', "{$language}FORM_OK", true, $t . "\t\t");
- $confirmOk = $pc->getPhpCodeConditions("''", ' !== ', '$uploaderErrors', $errIf, $errElse, $t . "\t");
- } else {
- $confirmOk = $xc->getXcRedirectHeader('index', '', '2', "{$language}FORM_OK", true, $t . "\t");
- }
- $contentInsert .= $confirmOk;
- $ret .= $pc->getPhpCodeConditions($insert, '', '', $contentInsert, false, $t);
-
- $ret .= $pc->getPhpCodeCommentLine('Get Form Error', null, $t);
- $ret .= $xc->getXcXoopsTplAssign('error', "\${$tableName}Obj->getHtmlErrors()", true, $t);
- $ret .= $xc->getXcGetForm('form', $tableName, 'Obj', $t);
- $ret .= $xc->getXcXoopsTplAssign('form', '$form->display()', true, $t);
-
- return $ret;
- }
-
- /**
- * @public function getUserSubmitFooter
- * @param $language
- * @return string
- */
- public function getUserSubmitFooter($language)
- {
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $uxc = UserXoopsCode::getInstance();
- $ret = $pc->getPhpCodeCommentLine('Breadcrumbs');
- $ret .= $uxc->getUserBreadcrumbs($language, 'SUBMIT');
- $ret .= $this->getInclude('footer');
-
- return $ret;
- }
-
- /**
- * @private function getUserSubmitSwitch
- * @param $moduleDirname
- * @param $tableId
- * @param $tableMid
- * @param $tableName
- * @param $tableSoleName
- * @param $tableSubmit
- * @param $tablePermissions
- * @param $language
- * @param $t
- * @return string
- */
- private function getUserSubmitSwitch($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableSubmit, $tablePermissions, $language, $t)
- {
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $fields = $this->getTableFields($tableMid, $tableId);
- $cases = [
- 'form' => [$this->getUserSubmitForm($tableName, $language, $t . "\t")],
- 'save' => [$this->getUserSubmitSave($moduleDirname, $fields, $tableName, $tableSoleName, $tableSubmit, $tablePermissions, $language, $t . "\t")],
- ];
-
- return $xc->getXcSwitch('op', $cases, true, false);
- }
-
- /**
- * @private function getPermissionsSave
- * @param $moduleDirname
- * @param string $perm
- *
- * @return string
- */
- private function getPermissionsSave($moduleDirname, $perm = 'view')
- {
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
-
- $ret = $pc->getPhpCodeCommentLine('Permission to', $perm, "\t\t\t");
- $ret .= $xc->getXcDeleteRight('grouppermHandler', "{$moduleDirname}_{$perm}", '$mid', '$permId', false, "\t\t\t");
- $content = $xc->getXcAddRight('grouppermHandler', "{$moduleDirname}_{$perm}", '$permId', '$onegroupId', '$mid', false, "\t\t\t\t\t");
- $foreach = $pc->getPhpCodeForeach("_POST['groups_{$perm}']", false, false, 'onegroupId', $content, "\t\t\t\t");
- $ret .= $pc->getPhpCodeConditions("isset(\$_POST['groups_{$perm}'])", null, null, $foreach, false, "\t\t\t");
-
- return $ret;
- }
-
- /**
- * @public function render
- * @param null
- * @return bool|string
- */
- public function render()
- {
- $module = $this->getModule();
- $filename = $this->getFileName();
- $moduleDirname = $module->getVar('mod_dirname');
- $tables = $this->getTableTables($module->getVar('mod_id'));
- $tableSoleName = '';
- $tableSubmit = [];
- $tablePermissions = [];
- $tableId = '';
- $tableMid = '';
- $tableName = '';
- foreach (array_keys($tables) as $t) {
- $tableId = $tables[$t]->getVar('table_id');
- $tableMid = $tables[$t]->getVar('table_mid');
- $tableName = $tables[$t]->getVar('table_name');
- $tableSoleName = $tables[$t]->getVar('table_solename');
- $tableSubmit[] = $tables[$t]->getVar('table_submit');
- $tablePermissions = $tables[$t]->getVar('table_permissions');
- }
- $language = $this->getLanguage($moduleDirname, 'MA');
- $content = $this->getHeaderFilesComments($module);
- $content .= $this->getUserSubmitHeader($moduleDirname, $tablePermissions);
- $content .= $this->getUserSubmitSwitch($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableSubmit, $tablePermissions, $language, "\t");
- $content .= $this->getUserSubmitFooter($language);
-
- $this->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
-
- return $this->renderFile();
- }
-}
diff --git a/class/Files/User/UserViewTag.php b/class/Files/User/UserViewTag.php
index 5c5365df..2a6fce3c 100644
--- a/class/Files/User/UserViewTag.php
+++ b/class/Files/User/UserViewTag.php
@@ -1,9 +1,9 @@
-pc = Tdmcreate\Files\CreatePhpCode::getInstance();
+ $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance();
}
/**
* @static function getInstance
- * @param null
* @return UserViewTag
*/
public static function getInstance()
@@ -63,10 +61,10 @@ public static function getInstance()
/**
* @public function write
- * @param string $module
+ * @param $module
* @param string $filename
*/
- public function write($module, $filename)
+ public function write($module, string $filename): void
{
$this->setModule($module);
$this->setFileName($filename);
@@ -74,21 +72,19 @@ public function write($module, $filename)
/**
* @public function getUserViewTag
- * @param null
* @return string
*/
public function getUserViewTag()
{
- $ret = $this->getInclude();
- $ret .= $this->pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'modules/tag/view.tag');
+ $ret = $this->getRequire();
+ $ret .= $this->pc->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH', 'modules/tag/view.tag');
return $ret;
}
/**
* @public function render
- * @param null
- * @return bool|string
+ * @return string
*/
public function render()
{
@@ -98,7 +94,7 @@ public function render()
$content = $this->getHeaderFilesComments($module);
$content .= $this->getUserViewTag();
- $this->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->create($moduleDirname, '/', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $this->renderFile();
}
diff --git a/class/Files/User/UserVisit.php b/class/Files/User/UserVisit.php
deleted file mode 100644
index 14da010b..00000000
--- a/class/Files/User/UserVisit.php
+++ /dev/null
@@ -1,191 +0,0 @@
-xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $this->pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $this->uxc = UserXoopsCode::getInstance();
- }
-
- /**
- * @static function getInstance
- * @param null
- * @return UserVisit
- */
- public static function getInstance()
- {
- static $instance = false;
- if (!$instance) {
- $instance = new self();
- }
-
- return $instance;
- }
-
- /**
- * @public function write
- * @param string $module
- * @param mixed $table
- * @param string $filename
- */
- public function write($module, $table, $filename)
- {
- $this->setModule($module);
- $this->setTable($table);
- $this->setFileName($filename);
- }
-
- /**
- * @private function getUserVisitHeader
- *
- * @param $table
- *
- * @param $fields
- * @return string
- */
- private function getUserVisitHeader($table, $fields)
- {
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $module = $this->getModule();
- $moduleDirname = $module->getVar('mod_dirname');
- $ret = $pc->getPhpCodeUseNamespace(['Xmf', 'Request'], '', '');
- $ret .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', '');
- $ret .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']);
- $ret .= $this->getInclude();
- foreach (array_keys($fields) as $f) {
- $fieldName = $fields[$f]->getVar('field_name');
- if (0 == $f) {
- $fieldId = $fieldName;
- }
- if (1 == $fields[$f]->getVar('field_parent')) {
- $fieldPid = $fieldName;
- }
- }
- if (1 == $table->getVar('table_category')) {
- $ccFieldPid = $this->getCamelCase($fieldPid, false, true);
- $ret .= $this->xc->getXcXoopsRequest($ccFieldPid, (string)$fieldPid, '0', 'Int');
- }
- $ccFieldId = $this->getCamelCase($fieldId, false, true);
- $ret .= $this->xc->getXcXoopsRequest($ccFieldId, (string)$fieldId, '0', 'Int');
-
- return $ret;
- }
-
- /**
- * @private function getUserVisitCheckPermissions
- *
- * @param null
- *
- * @return string
- */
- private function getUserVisitCheckPermissions()
- {
- $ret = '';
-
- return $ret;
- }
-
- /**
- * @private function getUserVisitCheckLimit
- *
- * @param null
- *
- * @return string
- */
- private function getUserVisitCheckLimit()
- {
- $ret = '';
-
- return $ret;
- }
-
- /**
- * @private function getUserVisitCheckHost
- *
- * @param null
- *
- * @return string
- */
- private function getUserVisitCheckHost()
- {
- $ret = '';
-
- return $ret;
- }
-
- /**
- * @public function render
- * @param null
- * @return bool|string
- */
- public function render()
- {
- $module = $this->getModule();
- $table = $this->getTable();
- $filename = $this->getFileName();
- $moduleDirname = $module->getVar('mod_dirname');
- $tableId = $table->getVar('table_id');
- $tableMid = $table->getVar('table_mid');
- $fields = $this->getTableFields($tableMid, $tableId);
- $content = $this->getHeaderFilesComments($module);
- $content .= $this->getUserVisitHeader($table, $fields);
- $content .= $this->getUserVisitCheckPermissions();
- $content .= $this->getUserVisitCheckLimit();
- $content .= $this->getUserVisitCheckHost();
-
- $this->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
-
- return $this->renderFile();
- }
-}
diff --git a/class/Files/User/UserXoopsCode.php b/class/Files/User/UserXoopsCode.php
index 9627df29..00cfa5df 100644
--- a/class/Files/User/UserXoopsCode.php
+++ b/class/Files/User/UserXoopsCode.php
@@ -1,8 +1,8 @@
-xc = Modulebuilder\Files\CreateXoopsCode::getInstance();
+ $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance();
+ }
+
/*
* @static function getInstance
* @param null
@@ -56,7 +74,7 @@ public static function getInstance()
*
* @return string
*/
- public function getUserTplMain($moduleDirname, $tableName = 'index')
+ public function getUserTplMain($moduleDirname, string $tableName = 'index')
{
return "\$GLOBALS['xoopsOption']['template_main'] = '{$moduleDirname}_{$tableName}.tpl';\n";
}
@@ -71,13 +89,12 @@ public function getUserTplMain($moduleDirname, $tableName = 'index')
* @param string $t
* @return string
*/
- public function getUserAddMeta($type, $language, $tableName, $t = '')
+ public function getUserAddMeta(string $type, $language, $tableName, string $t = '')
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $stuTableName = mb_strtoupper($tableName);
- $stripTags = $pc->getPhpCodeStripTags('', $language . $stuTableName, true);
+ $stuTableName = \mb_strtoupper($tableName);
+ $stripTags = $this->pc->getPhpCodeStripTags('', $language . $stuTableName, true);
- return "{$t}\$GLOBALS['xoTheme']->addMeta( 'meta', '{$type}', {$stripTags});\n";
+ return "{$t}\$GLOBALS['xoTheme']->addMeta('meta', '{$type}', {$stripTags});\n";
}
/**
@@ -89,24 +106,21 @@ public function getUserAddMeta($type, $language, $tableName, $t = '')
*/
public function getUserMetaKeywords($moduleDirname)
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $implode = $pc->getPhpCodeImplode(',', '$keywords');
+ $implode = $this->pc->getPhpCodeImplode(',', '$keywords');
- return "{$moduleDirname}MetaKeywords(\$helper->getConfig('keywords').', '. {$implode});\n";
+ return "{$moduleDirname}MetaKeywords(\$helper->getConfig('keywords') . ', ' . {$implode});\n";
}
/**
* @public function getUserMetaDesc
*
- * @param $moduleDirname
- * @param $language
- * @param string $file
+ * @param string $moduleDirname
*
* @return string
*/
- public function getUserMetaDesc($moduleDirname, $language, $file = 'INDEX')
+ public function getUserMetaDesc(string $moduleDirname)
{
- return "{$moduleDirname}MetaDescription({$language}{$file}_DESC);\n";
+ return $moduleDirname. 'MetaDescription((string)$helper->' . "getConfig('metadescription'));\n";
}
/**
@@ -114,35 +128,30 @@ public function getUserMetaDesc($moduleDirname, $language, $file = 'INDEX')
*
* @param $language
* @param string $tableName
+ * @param string $op
+ * @param string $link
* @param string $t
*
* @return string
*/
- public function getUserBreadcrumbs($language, $tableName = 'index', $t = '')
+ public function getUserBreadcrumbs($language, string $tableName = 'index', string $op = '', string $link = '', string $t = '')
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $stuTableName = mb_strtoupper($tableName);
- $title = ["'title'" => "{$language}{$stuTableName}"];
-
- return $pc->getPhpCodeArray('xoBreadcrumbs[]', $title, false, $t);
- }
-
- /**
- * @public function getUserBreadcrumbs
- *
- * @param $moduleDirname
- *
- * @param $language
- * @return string
- */
- public function getUserBreadcrumbsHeaderFile($moduleDirname, $language)
- {
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $stuModuleDirname = mb_strtoupper($moduleDirname);
- $ret = $pc->getPhpCodeCommentLine('Breadcrumbs');
- $ret .= $pc->getPhpCodeArray('xoBreadcrumbs', null, false, '');
- $titleLink = ["'title'" => $language . 'TITLE', "'link'" => "{$stuModuleDirname}_URL . '/'"];
- $ret .= $pc->getPhpCodeArray('xoBreadcrumbs[]', $titleLink, false, '');
+ $stuTableName = \mb_strtoupper($tableName);
+ $stuOp = '';
+ $ret = $this->pc->getPhpCodeCommentLine('Breadcrumbs', '', $t);
+ if ('' !== $op) {
+ $stuOp = '';
+ if ('' !== $tableName) {
+ $stuOp .= '_';
+ }
+ $stuOp .= \mb_strtoupper($op);
+ }
+ if ('' === $link) {
+ $arrBCrumb = ["'title'" => "{$language}{$stuTableName}{$stuOp}"];
+ } else {
+ $arrBCrumb = ["'title'" => "{$language}{$stuTableName}{$stuOp}", "'link'" => "'{$link}'"];
+ }
+ $ret .= $this->pc->getPhpCodeArray('xoBreadcrumbs[]', $arrBCrumb, false, $t);
return $ret;
}
@@ -154,40 +163,36 @@ public function getUserBreadcrumbsHeaderFile($moduleDirname, $language)
*/
public function getUserBreadcrumbsFooterFile()
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $cond = $xc->getXcXoopsTplAssign('xoBreadcrumbs', '$xoBreadcrumbs');
- $ret = $pc->getPhpCodeConditions('count($xoBreadcrumbs)', ' > ', '1', $cond, false, "\t\t");
-
- return $ret;
+ $cond = $this->xc->getXcXoopsTplAssign('xoBreadcrumbs', '$xoBreadcrumbs');
+ return $this->pc->getPhpCodeConditions('\count($xoBreadcrumbs)', ' > ', '1', $cond, false, "\t\t");
}
/**
* @public function getUserModVersionArray
*
- * @param int $eleArray
- * @param $descriptions
- * @param null $name
- * @param null $index
- * @param bool $num
+ * @param int $eleArray
+ * @param string|array $descriptions
+ * @param null $name
+ * @param null $index
+ * @param null $num
* @param string $t
*
* @return string
*/
- public function getUserModVersionArray($eleArray, $descriptions, $name = null, $index = null, $num = false, $t = '')
+ public function getUserModVersionArray(int $eleArray, $descriptions, $name = null, $index = null, $num = null, string $t = '')
{
- $ret = $t . '$modversion';
+ $ret = $t . '$modversion';
$isArray = false;
- $n = '';
- if (!is_array($descriptions)) {
+ $n = '';
+ if (!\is_array($descriptions)) {
$descs = [$descriptions];
} else {
- $descs = $descriptions;
+ $descs = $descriptions;
$isArray = true;
- $n = "\n";
+ $n = "\n";
}
if (0 === $eleArray) {
- $ret .= " = ";
+ $ret .= ' = ';
} elseif (1 === $eleArray || 11 === $eleArray) {
$ret .= "['{$name}'] = ";
} elseif (2 === $eleArray) {
@@ -196,35 +201,35 @@ public function getUserModVersionArray($eleArray, $descriptions, $name = null, $
$ret .= "['{$name}'][{$index}][{$num}] = ";
}
if ($isArray) {
- $ret .= "[";
+ $ret .= '[';
}
$ret .= $n;
//search for longest key
$len = 0;
foreach ($descs as $key => $desc) {
- $len = strlen($key) > $len ? strlen($key) : $len;
+ $len = \mb_strlen((string)$key) > $len ? \mb_strlen((string)$key) : $len;
}
foreach ($descs as $key => $desc) {
- $space = str_repeat ( ' ' , $len - strlen($key));
+ $space = str_repeat(' ', $len - \mb_strlen((string)$key));
if ($eleArray < 4) {
$ret .= $t . "\t'{$key}'{$space} => {$desc},{$n}";
} elseif (11 === $eleArray) {
- if ('/' === substr($desc, 1, 1)) {
+ if ('/' === \mb_substr($desc, 1, 1)) {
$ret .= $t . "\t{$desc}";
} else {
$ret .= $t . "\t{$desc},{$n}";
}
-
} elseif (12 === $eleArray) {
$ret .= $t . "\t{$desc}{$n}";
}
}
$ret .= $t;
if ($isArray) {
- $ret .= "]";
+ $ret .= ']';
}
$ret .= ";\n";
+
return $ret;
}
@@ -232,20 +237,20 @@ public function getUserModVersionArray($eleArray, $descriptions, $name = null, $
* @public function getUserModVersionText
*
* @param int $eleArray
- * @param $text
- * @param null $name
- * @param null $index
- * @param bool $num
+ * @param $text
+ * @param null $name
+ * @param null $index
+ * @param null $num
* @param string $t
*
* @return string
*/
- public function getUserModVersionText($eleArray, $text, $name = null, $index = null, $num = false, $t = '')
+ public function getUserModVersionText(int $eleArray, $text, $name = null, $index = null, $num = null, string $t = '')
{
$ret = $t . '$modversion';
if (0 === $eleArray) {
- $ret .= " = ";
+ $ret .= ' = ';
} elseif (1 === $eleArray) {
$ret .= "['{$name}'] = ";
} elseif (2 === $eleArray) {
@@ -255,6 +260,7 @@ public function getUserModVersionText($eleArray, $text, $name = null, $index = n
}
$ret .= $t . "{$text};\n";
+
return $ret;
}
}
diff --git a/class/Files/User/UserXoopsVersion.php b/class/Files/User/UserXoopsVersion.php
index 6afb2ffa..f590aa7d 100644
--- a/class/Files/User/UserXoopsVersion.php
+++ b/class/Files/User/UserXoopsVersion.php
@@ -1,9 +1,9 @@
-xc = Modulebuilder\Files\CreateXoopsCode::getInstance();
+ $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance();
+ $this->uxc = Modulebuilder\Files\User\UserXoopsCode::getInstance();
}
/**
* @static function getInstance
- * @param null
* @return UserXoopsVersion
*/
public static function getInstance()
@@ -67,13 +80,13 @@ public static function getInstance()
* @param mixed $tables
* @param $filename
*/
- public function write($module, $table, $tables, $filename)
+ public function write($module, $table, $tables, $filename): void
{
$this->setModule($module);
$this->setTable($table);
$this->setTables($tables);
$this->setFileName($filename);
- foreach (array_keys($tables) as $t) {
+ foreach (\array_keys($tables) as $t) {
$tableName = $tables[$t]->getVar('table_name');
$this->setKeywords($tableName);
}
@@ -83,9 +96,9 @@ public function write($module, $table, $tables, $filename)
* @public function setKeywords
* @param mixed $keywords
*/
- public function setKeywords($keywords)
+ public function setKeywords($keywords): void
{
- if (is_array($keywords)) {
+ if (\is_array($keywords)) {
$this->kw = $keywords;
} else {
$this->kw[] = $keywords;
@@ -94,7 +107,6 @@ public function setKeywords($keywords)
/**
* @public function getKeywords
- * @param null
* @return array
*/
public function getKeywords()
@@ -111,20 +123,22 @@ public function getKeywords()
*/
private function getXoopsVersionHeader($module, $language)
{
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $uxc = UserXoopsCode::getInstance();
$date = date('Y/m/d');
$ret = $this->getSimpleString('');
- $ret .= Tdmcreate\Files\CreatePhpCode::getInstance()->getPhpCodeCommentLine();
- $ret .= $xc->getXcEqualsOperator('$moduleDirName ', 'basename(__DIR__)');
- $ret .= $xc->getXcEqualsOperator('$moduleDirNameUpper', 'mb_strtoupper($moduleDirName)');
+ $ret .= Modulebuilder\Files\CreatePhpCode::getInstance()->getPhpCodeCommentLine();
+ $ret .= $this->xc->getXcEqualsOperator('$moduleDirName ', '\basename(__DIR__)');
+ $ret .= $this->xc->getXcEqualsOperator('$moduleDirNameUpper', '\mb_strtoupper($moduleDirName)');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->pc->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH . ' . "'/modules/'" . ' . $moduleDirName', 'preloads/autoloader', false, false, 'include');
+ $ret .= $this->getSimpleString('');
$ret .= $this->getDashComment('Informations');
- $ha = (1 == $module->getVar('mod_admin')) ? 1 : 0;
- $hm = (1 == $module->getVar('mod_user')) ? 1 : 0;
+
+ $ha = (1 == $module->getVar('mod_admin')) ? '1' : '0';
+ $hm = (1 == $module->getVar('mod_user')) ? '1' : '0';
$descriptions = [
'name' => "{$language}NAME",
- 'version' => (string)$module->getVar('mod_version'),
+ 'version' => "'" . $module->getVar('mod_version') . "'",
'description' => "{$language}DESC",
'author' => "'{$module->getVar('mod_author')}'",
'author_mail' => "'{$module->getVar('mod_author_mail')}'",
@@ -132,19 +146,19 @@ private function getXoopsVersionHeader($module, $language)
'author_website_name' => "'{$module->getVar('mod_author_website_name')}'",
'credits' => "'{$module->getVar('mod_credits')}'",
'license' => "'{$module->getVar('mod_license')}'",
- 'license_url' => "'http://www.gnu.org/licenses/gpl-3.0.en.html'",
+ 'license_url' => "'https://www.gnu.org/licenses/gpl-3.0.en.html'",
'help' => "'page=help'",
'release_info' => "'{$module->getVar('mod_release_info')}'",
- 'release_file' => "XOOPS_URL . '/modules/{$module->getVar('mod_dirname')}/docs/{$module->getVar('mod_release_file')}'",
+ 'release_file' => "\XOOPS_URL . '/modules/{$module->getVar('mod_dirname')}/docs/{$module->getVar('mod_release_file')}'",
'release_date' => "'{$date}'",
'manual' => "'{$module->getVar('mod_manual')}'",
- 'manual_file' => "XOOPS_URL . '/modules/{$module->getVar('mod_dirname')}/docs/{$module->getVar('mod_manual_file')}'",
+ 'manual_file' => "\XOOPS_URL . '/modules/{$module->getVar('mod_dirname')}/docs/{$module->getVar('mod_manual_file')}'",
'min_php' => "'{$module->getVar('mod_min_php')}'",
'min_xoops' => "'{$module->getVar('mod_min_xoops')}'",
'min_admin' => "'{$module->getVar('mod_min_admin')}'",
- 'min_db' => "array('mysql' => '{$module->getVar('mod_min_mysql')}', 'mysqli' => '{$module->getVar('mod_min_mysql')}')",
+ 'min_db' => "['mysql' => '{$module->getVar('mod_min_mysql')}', 'mysqli' => '{$module->getVar('mod_min_mysql')}']",
'image' => "'assets/images/logoModule.png'",
- 'dirname' => 'basename(__DIR__)',
+ 'dirname' => '\basename(__DIR__)',
'dirmoduleadmin' => "'Frameworks/moduleclasses/moduleadmin'",
'sysicons16' => "'../../Frameworks/moduleclasses/icons/16'",
'sysicons32' => "'../../Frameworks/moduleclasses/icons/32'",
@@ -168,7 +182,7 @@ private function getXoopsVersionHeader($module, $language)
'onUpdate' => "'include/update.php'",
];
- $ret .= $uxc->getUserModVersionArray(0, $descriptions);
+ $ret .= $this->uxc->getUserModVersionArray(0, $descriptions);
return $ret;
}
@@ -182,22 +196,29 @@ private function getXoopsVersionHeader($module, $language)
*/
private function getXoopsVersionMySQL($moduleDirname, $table, $tables)
{
- $uxc = UserXoopsCode::getInstance();
$tableName = $table->getVar('table_name');
$n = 1;
$ret = '';
$items = [];
+ $tableRate = 0;
if (!empty($tableName)) {
$ret .= $this->getDashComment('Mysql');
$description = "'sql/mysql.sql'";
- $ret .= $uxc->getUserModVersionText(2, $description, 'sqlfile', "'mysql'");
- $ret .= Tdmcreate\Files\CreatePhpCode::getInstance()->getPhpCodeCommentLine('Tables');
+ $ret .= $this->uxc->getUserModVersionText(2, $description, 'sqlfile', "'mysql'");
+ $ret .= Modulebuilder\Files\CreatePhpCode::getInstance()->getPhpCodeCommentLine('Tables');
- foreach (array_keys($tables) as $t) {
+ foreach (\array_keys($tables) as $t) {
$items[] = "'{$moduleDirname}_{$tables[$t]->getVar('table_name')}'";
+ if (1 === (int)$tables[$t]->getVar('table_rate')) {
+ $tableRate = 1;
+ }
+ ++$n;
+ }
+ if (1 === $tableRate) {
+ $items[] = "'{$moduleDirname}_ratings'";
++$n;
}
- $ret .= $uxc->getUserModVersionArray(11, $items, 'tables', $n);
+ $ret .= $this->uxc->getUserModVersionArray(11, $items, 'tables', $n);
unset($n);
}
@@ -212,11 +233,10 @@ private function getXoopsVersionMySQL($moduleDirname, $table, $tables)
*/
private function getXoopsVersionSearch($moduleDirname)
{
- $uxc = UserXoopsCode::getInstance();
$ret = $this->getDashComment('Search');
- $ret .= $uxc->getUserModVersionText(1, 1, 'hasSearch');
+ $ret .= $this->uxc->getUserModVersionText(1, 1, 'hasSearch');
$items = ['file' => "'include/search.inc.php'", 'func' => "'{$moduleDirname}_search'"];
- $ret .= $uxc->getUserModVersionArray(1, $items, 'search');
+ $ret .= $this->uxc->getUserModVersionArray(1, $items, 'search');
return $ret;
}
@@ -225,18 +245,33 @@ private function getXoopsVersionSearch($moduleDirname)
* @private function getXoopsVersionComments
* @param $moduleDirname
*
+ * @param $tables
* @return string
*/
- private function getXoopsVersionComments($moduleDirname)
+ private function getXoopsVersionComments($moduleDirname, $tables)
{
- $uxc = UserXoopsCode::getInstance();
+ $tableName = '';
+ $fieldId = '';
+ foreach (\array_keys($tables) as $t) {
+ if (1 == $tables[$t]->getVar('table_comments')) {
+ $tableName = $tables[$t]->getVar('table_name');
+ $fields = $this->getTableFields($tables[$t]->getVar('table_mid'), $tables[$t]->getVar('table_id'));
+ foreach (\array_keys($fields) as $f) {
+ $fieldName = $fields[$f]->getVar('field_name');
+ if (0 == $f) {
+ $fieldId = $fieldName;
+ }
+ }
+ }
+ }
$ret = $this->getDashComment('Comments');
- $ret .= $uxc->getUserModVersionText(2, "'comments.php'", 'comments', "'pageName'");
- $ret .= $uxc->getUserModVersionText(2, "'com_id'", 'comments', "'itemName'");
- $ret .= Tdmcreate\Files\CreatePhpCode::getInstance()->getPhpCodeCommentLine('Comment callback functions');
- $ret .= $uxc->getUserModVersionText(2, "'include/comment_functions.php'", 'comments', "'callbackFile'");
+ $ret .= $this->uxc->getUserModVersionText(1, '1', 'hasComments');
+ $ret .= $this->uxc->getUserModVersionText(2, "'{$tableName}.php'", 'comments', "'pageName'");
+ $ret .= $this->uxc->getUserModVersionText(2, "'{$fieldId}'", 'comments', "'itemName'");
+ $ret .= Modulebuilder\Files\CreatePhpCode::getInstance()->getPhpCodeCommentLine('Comment callback functions');
+ $ret .= $this->uxc->getUserModVersionText(2, "'include/comment_functions.php'", 'comments', "'callbackFile'");
$descriptions = ['approve' => "'{$moduleDirname}CommentsApprove'", 'update' => "'{$moduleDirname}CommentsUpdate'"];
- $ret .= $uxc->getUserModVersionArray(2, $descriptions, 'comments', "'callback'");
+ $ret .= $this->uxc->getUserModVersionArray(2, $descriptions, 'comments', "'callback'");
return $ret;
}
@@ -252,94 +287,106 @@ private function getXoopsVersionComments($moduleDirname)
*/
private function getXoopsVersionTemplatesAdminUser($moduleDirname, $tables, $admin, $user)
{
- $uxc = UserXoopsCode::getInstance();
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
$ret = $this->getDashComment('Templates');
$item = [];
if ($admin) {
- $item[] = $pc->getPhpCodeCommentLine('Admin templates');
+ $item[] = $this->pc->getPhpCodeCommentLine('Admin templates');
$item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, 'about', '', true);
$item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, 'header', '', true);
$item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, 'index', '', true);
$tablePermissions = [];
- foreach (array_keys($tables) as $t) {
+ $tableBroken = [];
+ foreach (\array_keys($tables) as $t) {
$tableName = $tables[$t]->getVar('table_name');
$tablePermissions[] = $tables[$t]->getVar('table_permissions');
+ $tableBroken[] = $tables[$t]->getVar('table_broken');
$item[] .= $this->getXoopsVersionTemplatesLine($moduleDirname, $tableName, '', true);
}
- if (in_array(1, $tablePermissions)) {
+ if (\in_array(1, $tableBroken)) {
+ $item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, 'broken', '', true);
+ }
+ if (\in_array(1, $tablePermissions)) {
$item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, 'permissions', '', true);
}
+ $item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, 'clone', '', true);
$item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, 'footer', '', true);
}
if ($user) {
- $item[] = $pc->getPhpCodeCommentLine('User templates');
- $item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, 'header', '');
- $item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, 'index', '');
- $tableBroken = [];
+ $item[] = $this->pc->getPhpCodeCommentLine('User templates');
+ $item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, 'header');
+ $item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, 'index');
+ //$tableBroken = [];
$tablePdf = [];
$tablePrint = [];
$tableRate = [];
$tableRss = [];
$tableSearch = [];
$tableSingle = [];
- $tableSubmit = [];
- foreach (array_keys($tables) as $t) {
- $tableName = $tables[$t]->getVar('table_name');
- $tableBroken[] = $tables[$t]->getVar('table_broken');
- $tablePdf[] = $tables[$t]->getVar('table_pdf');
- $tablePrint[] = $tables[$t]->getVar('table_print');
- $tableRate[] = $tables[$t]->getVar('table_rate');
- $tableRss[] = $tables[$t]->getVar('table_rss');
- $tableSearch[] = $tables[$t]->getVar('table_search');
- $tableSingle[] = $tables[$t]->getVar('table_single');
- $tableSubmit[] = $tables[$t]->getVar('table_submit');
- $item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, $tableName, '');
- $item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, $tableName, 'list');
- }
- $item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, 'breadcrumbs', '');
- if (in_array(1, $tableBroken)) {
- $item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, 'broken', '');
- }
- if (in_array(1, $tablePdf)) {
- $item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, 'pdf', '');
+ //$tableSubmit = [];
+ foreach (\array_keys($tables) as $t) {
+ if (1 == $tables[$t]->getVar('table_user')) {
+ $tableName = $tables[$t]->getVar('table_name');
+ //$tableBroken[] = $tables[$t]->getVar('table_broken');
+ $tablePdf[] = $tables[$t]->getVar('table_pdf');
+ $tablePrint[] = $tables[$t]->getVar('table_print');
+ $tableRate[] = $tables[$t]->getVar('table_rate');
+ $tableRss[] = $tables[$t]->getVar('table_rss');
+ $tableSearch[] = $tables[$t]->getVar('table_search');
+ $tableSingle[] = $tables[$t]->getVar('table_single');
+ //$tableSubmit[] = $tables[$t]->getVar('table_submit');
+ $tableRate[] = $tables[$t]->getVar('table_rate');
+ $item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, $tableName);
+ $item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, $tableName, 'list');
+ $item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, $tableName, 'item');
+ }
}
- if (in_array(1, $tablePrint)) {
- $item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, 'print', '');
+ $item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, 'breadcrumbs');
+ if (\in_array(1, $tablePdf)) {
+ foreach (\array_keys($tables) as $t) {
+ if ($tables[$t]->getVar('table_pdf')) {
+ $tableName = $tables[$t]->getVar('table_name');
+ $item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, $tableName . '_pdf');
+ }
+ }
}
- if (in_array(1, $tableRate)) {
- $item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, 'rate', '');
+ if (\in_array(1, $tablePrint)) {
+ foreach (\array_keys($tables) as $t) {
+ if ($tables[$t]->getVar('table_print')) {
+ $tableName = $tables[$t]->getVar('table_name');
+ $item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, $tableName . '_print');
+ }
+ }
}
- if (in_array(1, $tableRss)) {
- $item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, 'rss', '');
+ if (\in_array(1, $tableRate)) {
+ $item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, 'rate');
}
- if (in_array(1, $tableSearch)) {
- $item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, 'search', '');
+ if (\in_array(1, $tableRss)) {
+ $item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, 'rss');
}
- if (in_array(1, $tableSingle)) {
- $item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, 'single', '');
+ if (\in_array(1, $tableSearch)) {
+ $item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, 'search');
}
- if (in_array(1, $tableSubmit)) {
- $item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, 'submit', '');
+ if (\in_array(1, $tableSingle)) {
+ $item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, 'single');
}
- $item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, 'footer', '');
+ $item[] = $this->getXoopsVersionTemplatesLine($moduleDirname, 'footer');
}
- $ret .= $uxc->getUserModVersionArray(11, $item, "templates");
+ $ret .= $this->uxc->getUserModVersionArray(11, $item, 'templates');
return $ret;
}
/**
* @private function getXoopsVersionTemplatesLine
- * @param $moduleDirname
- * @param $type
+ * @param string $moduleDirname
+ * @param string $type
* @param string $extra
- * @param bool $isAdmin
+ * @param bool $isAdmin
* @return string
*/
- private function getXoopsVersionTemplatesLine($moduleDirname, $type, $extra = '', $isAdmin = false)
+ private function getXoopsVersionTemplatesLine(string $moduleDirname, string $type, string $extra = '', bool $isAdmin = false)
{
$ret = '';
$desc = "'description' => ''";
@@ -365,62 +412,59 @@ private function getXoopsVersionTemplatesLine($moduleDirname, $type, $extra = ''
*/
private function getXoopsVersionSubmenu($language, $tables)
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $uxc = UserXoopsCode::getInstance();
-
$ret = $this->getDashComment('Menu');
- $xModule = $pc->getPhpCodeGlobals('xoopsModule');
- $cond = 'isset(' . $xModule . ') && is_object(' . $xModule . ')';
- $one = $pc->getPhpCodeGlobals('xoopsModule') . "->getVar('dirname')";
- $ret .= $pc->getPhpCodeTernaryOperator('currdirname ', $cond, $one, "'system'");
+ $xModule = $this->pc->getPhpCodeGlobals('xoopsModule');
+ $cond = 'isset(' . $xModule . ') && \is_object(' . $xModule . ')';
+ $one = $this->pc->getPhpCodeGlobals('xoopsModule') . "->getVar('dirname')";
+ $ret .= $this->pc->getPhpCodeTernaryOperator('currdirname ', $cond, $one, "'system'");
$i = 1;
$descriptions = [
'name' => "{$language}SMNAME{$i}",
'url' => "'index.php'",
];
- $contentIf = $uxc->getUserModVersionArray(2, $descriptions, 'sub', '','', "\t");
+ $contentIf = $this->uxc->getUserModVersionArray(2, $descriptions, 'sub', '','', "\t");
+ ++$i;
- $tableSubmit = [];
- $tableSearch = [];
- foreach (array_keys($tables) as $t) {
+ //$tableSearch = [];
+ foreach (\array_keys($tables) as $t) {
$tableName = $tables[$t]->getVar('table_name');
- $tableSubmit[] = $tables[$t]->getVar('table_submit');
- $tableSearch[] = $tables[$t]->getVar('table_search');
+ //$tableSearch[] = $tables[$t]->getVar('table_search');
if (1 == $tables[$t]->getVar('table_submenu')) {
- $contentIf .= $pc->getPhpCodeCommentLine('Sub', $tableName, "\t");
+ $contentIf .= $this->pc->getPhpCodeCommentLine('Sub', $tableName, "\t");
$descriptions = [
'name' => "{$language}SMNAME{$i}",
'url' => "'{$tableName}.php'",
];
- $contentIf .= $uxc->getUserModVersionArray(2, $descriptions, 'sub', '','', "\t");
+ $contentIf .= $this->uxc->getUserModVersionArray(2, $descriptions, 'sub', '','', "\t");
unset($item);
}
++$i;
+ if (1 == $tables[$t]->getVar('table_submit')) {
+ $contentIf .= $this->pc->getPhpCodeCommentLine('Sub', 'Submit', "\t");
+ $descriptions = [
+ 'name' => "{$language}SMNAME{$i}",
+ 'url' => "'{$tableName}.php?op=new'",
+ ];
+ $contentIf .= $this->uxc->getUserModVersionArray(2, $descriptions, 'sub', '','', "\t");
+ ++$i;
+ }
}
- if (in_array(1, $tableSubmit)) {
- $contentIf .= $pc->getPhpCodeCommentLine('Sub', 'Submit', "\t");
- $descriptions = [
- 'name' => "{$language}SMNAME{$i}",
- 'url' => "'submit.php'",
- ];
- $contentIf .= $uxc->getUserModVersionArray(2, $descriptions, 'sub', '','', "\t");
- ++$i;
- }
+
//TODO: after finalizing creation of search.php by User/UserSearch.php this sub menu item can be activated
/*
- if (in_array(1, $tableSearch)) {
+ if (\in_array(1, $tableSearch)) {
$contentIf .= $cpc->getPhpCodeCommentLine('Sub', 'Search', "\t");
$descriptions = [
'name' => "{$language}SMNAME{$i}",
'url' => "'search.php'",
];
- $contentIf .= $uxc->getUserModVersionArray(2, $descriptions, 'sub', '','', "\t");
+ $contentIf .= $this->uxc->getUserModVersionArray(2, $descriptions, 'sub', '','', "\t");
}
*/
unset($i);
- $ret .= $pc->getPhpCodeConditions('$moduleDirName', ' == ', '$currdirname', $contentIf);
+ $ret .= $this->pc->getPhpCodeConditions('$moduleDirName', ' == ', '$currdirname', $contentIf);
return $ret;
}
@@ -434,12 +478,10 @@ private function getXoopsVersionSubmenu($language, $tables)
*/
private function getXoopsVersionBlocks($moduleDirname, $tables, $language)
{
- $ret = $this->getDashComment('Blocks');
- $tableCategory = [];
- foreach (array_keys($tables) as $i) {
+ $ret = $this->getDashComment('Default Blocks');
+ foreach (\array_keys($tables) as $i) {
$tableName = $tables[$i]->getVar('table_name');
- $tableCategory[] = $tables[$i]->getVar('table_category');
- if (0 == $tables[$i]->getVar('table_category')) {
+ if (0 == $tables[$i]->getVar('table_category') && 1 == $tables[$i]->getVar('table_blocks')) {
$ret .= $this->getXoopsVersionTypeBlocks($moduleDirname, $tableName, 'LAST', $language, 'last');
$ret .= $this->getXoopsVersionTypeBlocks($moduleDirname, $tableName, 'NEW', $language, 'new');
$ret .= $this->getXoopsVersionTypeBlocks($moduleDirname, $tableName, 'HITS', $language, 'hits');
@@ -447,6 +489,13 @@ private function getXoopsVersionBlocks($moduleDirname, $tables, $language)
$ret .= $this->getXoopsVersionTypeBlocks($moduleDirname, $tableName, 'RANDOM', $language, 'random');
}
}
+ $ret .= $this->getDashComment('Spotlight Blocks');
+ foreach (\array_keys($tables) as $i) {
+ $tableName = $tables[$i]->getVar('table_name');
+ if (0 == $tables[$i]->getVar('table_category') && 1 == $tables[$i]->getVar('table_blocks')) {
+ $ret .= $this->getXoopsVersionSpotlightBlocks($moduleDirname, $tableName, $language);
+ }
+ }
return $ret;
}
@@ -462,11 +511,9 @@ private function getXoopsVersionBlocks($moduleDirname, $tables, $language)
*/
private function getXoopsVersionTypeBlocks($moduleDirname, $tableName, $stuTableSoleName, $language, $type)
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $uxc = UserXoopsCode::getInstance();
- $stuTableName = mb_strtoupper($tableName);
- $ucfTableName = ucfirst($tableName);
- $ret = $pc->getPhpCodeCommentLine($ucfTableName . ' ' . $type);
+ $stuTableName = \mb_strtoupper($tableName);
+ $ucfTableName = \ucfirst($tableName);
+ $ret = $this->pc->getPhpCodeCommentLine($ucfTableName . ' ' . $type);
$blocks = [
'file' => "'{$tableName}.php'",
'name' => "{$language}{$stuTableName}_BLOCK_{$stuTableSoleName}",
@@ -476,7 +523,33 @@ private function getXoopsVersionTypeBlocks($moduleDirname, $tableName, $stuTable
'template' => "'{$moduleDirname}_block_{$tableName}.tpl'",
'options' => "'{$type}|5|25|0'",
];
- $ret .= $uxc->getUserModVersionArray(2, $blocks, 'blocks');
+ $ret .= $this->uxc->getUserModVersionArray(2, $blocks, 'blocks');
+
+ return $ret;
+ }
+
+ /**
+ * @private function getXoopsVersionTypeBlocks
+ * @param $moduleDirname
+ * @param $tableName
+ * @param $language
+ * @return string
+ */
+ private function getXoopsVersionSpotlightBlocks($moduleDirname, $tableName, $language)
+ {
+ $stuTableName = \mb_strtoupper($tableName);
+ $ucfTableName = \ucfirst($tableName);
+ $ret = $this->pc->getPhpCodeCommentLine($ucfTableName . ' spotlight');
+ $blocks = [
+ 'file' => "'{$tableName}_spotlight.php'",
+ 'name' => "{$language}{$stuTableName}_BLOCK_SPOTLIGHT",
+ 'description' => "{$language}{$stuTableName}_BLOCK_SPOTLIGHT_DESC",
+ 'show_func' => "'b_{$moduleDirname}_{$tableName}_spotlight_show'",
+ 'edit_func' => "'b_{$moduleDirname}_{$tableName}_spotlight_edit'",
+ 'template' => "'{$moduleDirname}_block_{$tableName}_spotlight.tpl'",
+ 'options' => "'spotlight|5|25|0'",
+ ];
+ $ret .= $this->uxc->getUserModVersionArray(2, $blocks, 'blocks');
return $ret;
}
@@ -491,42 +564,25 @@ private function getXoopsVersionTypeBlocks($moduleDirname, $tableName, $stuTable
*/
private function getXoopsVersionConfig($module, $tables, $language)
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $uxc = UserXoopsCode::getInstance();
$moduleDirname = $module->getVar('mod_dirname');
$ret = $this->getDashComment('Config');
+ $table_editors = 0;
$table_permissions = 0;
$table_admin = 0;
$table_user = 0;
$table_tag = 0;
$table_uploadimage = 0;
$table_uploadfile = 0;
+ $table_rate = 0;
foreach ($tables as $table) {
$fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'));
- foreach (array_keys($fields) as $f) {
+ foreach (\array_keys($fields) as $f) {
$fieldElement = (int)$fields[$f]->getVar('field_element');
switch ($fieldElement) {
case 3:
case 4:
- $fieldName = $fields[$f]->getVar('field_name');
- $rpFieldName = $this->getRightString($fieldName);
- $ucfFieldName = ucfirst($rpFieldName);
- $stuFieldName = mb_strtoupper($rpFieldName);
- $ret .= $pc->getPhpCodeCommentLine('Editor', $rpFieldName);
- $ret .= $xc->getXcXoopsLoad('xoopseditorhandler');
- $ret .= $xc->getXcEqualsOperator('$editorHandler' . $ucfFieldName, 'XoopsEditorHandler::getInstance()');
- $editor = [
- 'name' => "'editor_{$rpFieldName}'",
- 'title' => "'{$language}EDITOR_{$stuFieldName}'",
- 'description' => "'{$language}EDITOR_{$stuFieldName}_DESC'",
- 'formtype' => "'select'",
- 'valuetype' => "'text'",
- 'default' => "'dhtml'",
- 'options' => 'array_flip($editorHandler' . $ucfFieldName . '->getList())',
- ];
- $ret .= $uxc->getUserModVersionArray(2, $editor, 'config');
+ $table_editors = 1;
break;
case 10:
case 11:
@@ -554,16 +610,81 @@ private function getXoopsVersionConfig($module, $tables, $language)
if (1 == $table->getVar('table_tag')) {
$table_tag = 1;
}
+ if (1 == $table->getVar('table_rate')) {
+ $table_rate = 1;
+ }
}
+ //meta descrition
+ $ret .= $this->pc->getPhpCodeCommentLine('Meta descrition', '');
+ $descr = [
+ 'name' => "'metadescription'",
+ 'title' => "'{$language}MDESC'",
+ 'description' => "'{$language}MDESC_DESC'",
+ 'formtype' => "'textbox'",
+ 'valuetype' => "'text'",
+ 'default' => "{$language}DESC",
+ ];
+ $ret .= $this->uxc->getUserModVersionArray(2, $descr, 'config');
+ //meta keywords
+ $keyword = \implode(', ', $this->getKeywords());
+ $ret .= $this->pc->getPhpCodeCommentLine('Meta Keywords');
+ $arrayKeyword = [
+ 'name' => "'keywords'",
+ 'title' => "'{$language}KEYWORDS'",
+ 'description' => "'{$language}KEYWORDS_DESC'",
+ 'formtype' => "'textbox'",
+ 'valuetype' => "'text'",
+ 'default' => "'{$moduleDirname}, {$keyword}'",
+ ];
+ $ret .= $this->uxc->getUserModVersionArray(2, $arrayKeyword, 'config');
+ unset($this->keywords);
+ if (1 === $table_editors) {
+ $ret .= $this->pc->getPhpCodeCommentLine('Editor Admin', '');
+ $ret .= $this->xc->getXcXoopsLoad('xoopseditorhandler');
+ $ret .= $this->xc->getXcEqualsOperator('$editorHandler', 'XoopsEditorHandler::getInstance()');
+ $editor = [
+ 'name' => "'editor_admin'",
+ 'title' => "'{$language}EDITOR_ADMIN'",
+ 'description' => "'{$language}EDITOR_ADMIN_DESC'",
+ 'formtype' => "'select'",
+ 'valuetype' => "'text'",
+ 'default' => "'dhtml'",
+ 'options' => 'array_flip($editorHandler->getList())',
+ ];
+ $ret .= $this->uxc->getUserModVersionArray(2, $editor, 'config');
+ $ret .= $this->pc->getPhpCodeCommentLine('Editor User', '');
+ $ret .= $this->xc->getXcXoopsLoad('xoopseditorhandler');
+ $ret .= $this->xc->getXcEqualsOperator('$editorHandler', 'XoopsEditorHandler::getInstance()');
+ $editor = [
+ 'name' => "'editor_user'",
+ 'title' => "'{$language}EDITOR_USER'",
+ 'description' => "'{$language}EDITOR_USER_DESC'",
+ 'formtype' => "'select'",
+ 'valuetype' => "'text'",
+ 'default' => "'dhtml'",
+ 'options' => 'array_flip($editorHandler->getList())',
+ ];
+ $ret .= $this->uxc->getUserModVersionArray(2, $editor, 'config');
+ $ret .= $this->pc->getPhpCodeCommentLine('Editor : max characters admin area');
+ $maxsize_image = [
+ 'name' => "'editor_maxchar'",
+ 'title' => "'{$language}EDITOR_MAXCHAR'",
+ 'description' => "'{$language}EDITOR_MAXCHAR_DESC'",
+ 'formtype' => "'textbox'",
+ 'valuetype' => "'int'",
+ 'default' => '50',
+ ];
+ $ret .= $this->uxc->getUserModVersionArray(2, $maxsize_image, 'config');
+ }
if (1 === $table_permissions) {
- $ret .= $pc->getPhpCodeCommentLine('Get groups');
- $ret .= $xc->getXcXoopsHandler('member');
- $ret .= $xc->getXcEqualsOperator('$xoopsGroups ', '$memberHandler->getGroupList()');
- $ret .= $xc->getXcEqualsOperator('$groups', '[]');
- $group = $xc->getXcEqualsOperator('$groups[$group] ', '$key', null, "\t");
- $ret .= $pc->getPhpCodeForeach('xoopsGroups', false, 'key', 'group', $group);
- $ret .= $pc->getPhpCodeCommentLine('General access groups');
+ $ret .= $this->pc->getPhpCodeCommentLine('Get groups');
+ $ret .= $this->xc->getXcXoopsHandler('member');
+ $ret .= $this->xc->getXcEqualsOperator('$xoopsGroups ', '$memberHandler->getGroupList()');
+ $ret .= $this->xc->getXcEqualsOperator('$groups', '[]');
+ $group = $this->xc->getXcEqualsOperator('$groups[$group] ', '$key', null, "\t");
+ $ret .= $this->pc->getPhpCodeForeach('xoopsGroups', false, 'key', 'group', $group);
+ $ret .= $this->pc->getPhpCodeCommentLine('General access groups');
$groups = [
'name' => "'groups'",
'title' => "'{$language}GROUPS'",
@@ -573,8 +694,8 @@ private function getXoopsVersionConfig($module, $tables, $language)
'default' => '$groups',
'options' => '$groups',
];
- $ret .= $uxc->getUserModVersionArray(2, $groups, 'config');
- $ret .= $pc->getPhpCodeCommentLine('Upload groups');
+ $ret .= $this->uxc->getUserModVersionArray(2, $groups, 'config');
+ $ret .= $this->pc->getPhpCodeCommentLine('Upload groups');
$uplgroups = [
'name' => "'upload_groups'",
'title' => "'{$language}UPLOAD_GROUPS'",
@@ -584,17 +705,17 @@ private function getXoopsVersionConfig($module, $tables, $language)
'default' => '$groups',
'options' => '$groups',
];
- $ret .= $uxc->getUserModVersionArray(2, $uplgroups, 'config');
-
- $ret .= $pc->getPhpCodeCommentLine('Get Admin groups');
- $ret .= $xc->getXcCriteriaCompo('crGroups');
- $crit = $xc->getXcCriteria('', "'group_type'", "'Admin'", '', true);
- $ret .= $xc->getXcCriteriaAdd('crGroups', $crit, '', "\n");
- $ret .= $xc->getXcXoopsHandler('member');
- $ret .= $xc->getXcEqualsOperator('$adminXoopsGroups ', '$memberHandler->getGroupList($crGroups)');
- $ret .= $xc->getXcEqualsOperator('$adminGroups', '[]');
- $adminGroup = $xc->getXcEqualsOperator('$adminGroups[$adminGroup] ', '$key', null, "\t");
- $ret .= $pc->getPhpCodeForeach('adminXoopsGroups', false, 'key', 'adminGroup', $adminGroup);
+ $ret .= $this->uxc->getUserModVersionArray(2, $uplgroups, 'config');
+
+ $ret .= $this->pc->getPhpCodeCommentLine('Get Admin groups');
+ $ret .= $this->xc->getXcCriteriaCompo('crGroups');
+ $crit = $this->xc->getXcCriteria('', "'group_type'", "'Admin'", '', true);
+ $ret .= $this->xc->getXcCriteriaAdd('crGroups', $crit);
+ $ret .= $this->xc->getXcXoopsHandler('member');
+ $ret .= $this->xc->getXcEqualsOperator('$adminXoopsGroups ', '$memberHandler->getGroupList($crGroups)');
+ $ret .= $this->xc->getXcEqualsOperator('$adminGroups', '[]');
+ $adminGroup = $this->xc->getXcEqualsOperator('$adminGroups[$adminGroup] ', '$key', null, "\t");
+ $ret .= $this->pc->getPhpCodeForeach('adminXoopsGroups', false, 'key', 'adminGroup', $adminGroup);
$adminGroups = [
'name' => "'admin_groups'",
'title' => "'{$language}ADMIN_GROUPS'",
@@ -604,27 +725,47 @@ private function getXoopsVersionConfig($module, $tables, $language)
'default' => '$adminGroups',
'options' => '$adminGroups',
];
- $ret .= $uxc->getUserModVersionArray(2, $adminGroups, 'config');
- $ret .= $pc->getPhpCodeUnset('crGroups');
+ $ret .= $this->uxc->getUserModVersionArray(2, $adminGroups, 'config');
+ $ret .= $this->pc->getPhpCodeUnset('crGroups');
+ }
+
+ if (1 === $table_rate) {
+ $ret .= $this->pc->getPhpCodeCommentLine('Get groups');
+ $ret .= $this->xc->getXcXoopsHandler('member');
+ $ret .= $this->xc->getXcEqualsOperator('$xoopsGroups ', '$memberHandler->getGroupList()');
+ $ret .= $this->xc->getXcEqualsOperator('$ratingbar_groups', '[]');
+ $group = $this->xc->getXcEqualsOperator('$ratingbar_groups[$group] ', '$key', null, "\t");
+ $ret .= $this->pc->getPhpCodeForeach('xoopsGroups', false, 'key', 'group', $group);
+ $ret .= $this->pc->getPhpCodeCommentLine('Rating: Groups with rating permissions');
+ $groups = [
+ 'name' => "'ratingbar_groups'",
+ 'title' => "'{$language}RATINGBAR_GROUPS'",
+ 'description' => "'{$language}RATINGBAR_GROUPS_DESC'",
+ 'formtype' => "'select_multi'",
+ 'valuetype' => "'array'",
+ 'default' => '[1]',
+ 'options' => '$ratingbar_groups',
+ ];
+ $ret .= $this->uxc->getUserModVersionArray(2, $groups, 'config');
+
+ $ret .= $this->pc->getPhpCodeCommentLine('Rating : used ratingbar');
+ $mimetypes_image = [
+ 'name' => "'ratingbars'",
+ 'title' => "'{$language}RATINGBARS'",
+ 'description' => "'{$language}RATINGBARS_DESC'",
+ 'formtype' => "'select'",
+ 'valuetype' => "'int'",
+ 'default' => '0',
+ 'options' => "['{$language}RATING_NONE' => 0, '{$language}RATING_5STARS' => 1, '{$language}RATING_10STARS' => 2, '{$language}RATING_LIKES' => 3, '{$language}RATING_10NUM' => 4]",
+ ];
+ $ret .= $this->uxc->getUserModVersionArray(2, $mimetypes_image, 'config');
}
- $keyword = implode(', ', $this->getKeywords());
- $ret .= $pc->getPhpCodeCommentLine('Keywords');
- $arrayKeyword = [
- 'name' => "'keywords'",
- 'title' => "'{$language}KEYWORDS'",
- 'description' => "'{$language}KEYWORDS_DESC'",
- 'formtype' => "'textbox'",
- 'valuetype' => "'text'",
- 'default' => "'{$moduleDirname}, {$keyword}'",
- ];
- $ret .= $uxc->getUserModVersionArray(2, $arrayKeyword, 'config');
- unset($this->keywords);
if (1 === $table_uploadimage || 1 === $table_uploadfile) {
$ret .= $this->getXoopsVersionSelectSizeMB($moduleDirname);
}
if (1 === $table_uploadimage) {
- $ret .= $pc->getPhpCodeCommentLine('Uploads : maxsize of image');
+ $ret .= $this->pc->getPhpCodeCommentLine('Uploads : maxsize of image');
$maxsize_image = [
'name' => "'maxsize_image'",
'title' => "'{$language}MAXSIZE_IMAGE'",
@@ -634,8 +775,8 @@ private function getXoopsVersionConfig($module, $tables, $language)
'default' => '3145728',
'options' => '$optionMaxsize',
];
- $ret .= $uxc->getUserModVersionArray(2, $maxsize_image, 'config');
- $ret .= $pc->getPhpCodeCommentLine('Uploads : mimetypes of image');
+ $ret .= $this->uxc->getUserModVersionArray(2, $maxsize_image, 'config');
+ $ret .= $this->pc->getPhpCodeCommentLine('Uploads : mimetypes of image');
$mimetypes_image = [
'name' => "'mimetypes_image'",
'title' => "'{$language}MIMETYPES_IMAGE'",
@@ -645,28 +786,28 @@ private function getXoopsVersionConfig($module, $tables, $language)
'default' => "['image/gif', 'image/jpeg', 'image/png']",
'options' => "['bmp' => 'image/bmp','gif' => 'image/gif','pjpeg' => 'image/pjpeg', 'jpeg' => 'image/jpeg','jpg' => 'image/jpg','jpe' => 'image/jpe', 'png' => 'image/png']",
];
- $ret .= $uxc->getUserModVersionArray(2, $mimetypes_image, 'config');
+ $ret .= $this->uxc->getUserModVersionArray(2, $mimetypes_image, 'config');
$maxwidth_image = [
'name' => "'maxwidth_image'",
'title' => "'{$language}MAXWIDTH_IMAGE'",
'description' => "'{$language}MAXWIDTH_IMAGE_DESC'",
'formtype' => "'textbox'",
'valuetype' => "'int'",
- 'default' => '8000',
+ 'default' => '800',
];
- $ret .= $uxc->getUserModVersionArray(2, $maxwidth_image, 'config');
+ $ret .= $this->uxc->getUserModVersionArray(2, $maxwidth_image, 'config');
$maxheight_image = [
'name' => "'maxheight_image'",
'title' => "'{$language}MAXHEIGHT_IMAGE'",
'description' => "'{$language}MAXHEIGHT_IMAGE_DESC'",
'formtype' => "'textbox'",
'valuetype' => "'int'",
- 'default' => '8000',
+ 'default' => '800',
];
- $ret .= $uxc->getUserModVersionArray(2, $maxheight_image, 'config');
+ $ret .= $this->uxc->getUserModVersionArray(2, $maxheight_image, 'config');
}
if (1 === $table_uploadfile) {
- $ret .= $pc->getPhpCodeCommentLine('Uploads : maxsize of file');
+ $ret .= $this->pc->getPhpCodeCommentLine('Uploads : maxsize of file');
$maxsize_file = [
'name' => "'maxsize_file'",
'title' => "'{$language}MAXSIZE_FILE'",
@@ -676,8 +817,8 @@ private function getXoopsVersionConfig($module, $tables, $language)
'default' => '3145728',
'options' => '$optionMaxsize',
];
- $ret .= $uxc->getUserModVersionArray(2, $maxsize_file, 'config');
- $ret .= $pc->getPhpCodeCommentLine('Uploads : mimetypes of file');
+ $ret .= $this->uxc->getUserModVersionArray(2, $maxsize_file, 'config');
+ $ret .= $this->pc->getPhpCodeCommentLine('Uploads : mimetypes of file');
$mimetypes_file = [
'name' => "'mimetypes_file'",
'title' => "'{$language}MIMETYPES_FILE'",
@@ -687,10 +828,10 @@ private function getXoopsVersionConfig($module, $tables, $language)
'default' => "['application/pdf', 'application/zip', 'text/comma-separated-values', 'text/plain', 'image/gif', 'image/jpeg', 'image/png']",
'options' => "['gif' => 'image/gif','pjpeg' => 'image/pjpeg', 'jpeg' => 'image/jpeg','jpg' => 'image/jpg','jpe' => 'image/jpe', 'png' => 'image/png', 'pdf' => 'application/pdf','zip' => 'application/zip','csv' => 'text/comma-separated-values', 'txt' => 'text/plain', 'xml' => 'application/xml', 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document']",
];
- $ret .= $uxc->getUserModVersionArray(2, $mimetypes_file, 'config');
+ $ret .= $this->uxc->getUserModVersionArray(2, $mimetypes_file, 'config');
}
if (1 === $table_admin) {
- $ret .= $pc->getPhpCodeCommentLine('Admin pager');
+ $ret .= $this->pc->getPhpCodeCommentLine('Admin pager');
$adminPager = [
'name' => "'adminpager'",
'title' => "'{$language}ADMIN_PAGER'",
@@ -699,10 +840,10 @@ private function getXoopsVersionConfig($module, $tables, $language)
'valuetype' => "'int'",
'default' => '10',
];
- $ret .= $uxc->getUserModVersionArray(2, $adminPager, 'config');
+ $ret .= $this->uxc->getUserModVersionArray(2, $adminPager, 'config');
}
if (1 === $table_user) {
- $ret .= $pc->getPhpCodeCommentLine('User pager');
+ $ret .= $this->pc->getPhpCodeCommentLine('User pager');
$userPager = [
'name' => "'userpager'",
'title' => "'{$language}USER_PAGER'",
@@ -711,10 +852,10 @@ private function getXoopsVersionConfig($module, $tables, $language)
'valuetype' => "'int'",
'default' => '10',
];
- $ret .= $uxc->getUserModVersionArray(2, $userPager, 'config');
+ $ret .= $this->uxc->getUserModVersionArray(2, $userPager, 'config');
}
if (1 === $table_tag) {
- $ret .= $pc->getPhpCodeCommentLine('Use tag');
+ $ret .= $this->pc->getPhpCodeCommentLine('Use tag');
$useTag = [
'name' => "'usetag'",
'title' => "'{$language}USE_TAG'",
@@ -723,9 +864,9 @@ private function getXoopsVersionConfig($module, $tables, $language)
'valuetype' => "'int'",
'default' => '0',
];
- $ret .= $uxc->getUserModVersionArray(2, $useTag, 'config');
+ $ret .= $this->uxc->getUserModVersionArray(2, $useTag, 'config');
}
- $ret .= $pc->getPhpCodeCommentLine('Number column');
+ $ret .= $this->pc->getPhpCodeCommentLine('Number column');
$numbCol = [
'name' => "'numb_col'",
'title' => "'{$language}NUMB_COL'",
@@ -735,9 +876,9 @@ private function getXoopsVersionConfig($module, $tables, $language)
'default' => '1',
'options' => "[1 => '1', 2 => '2', 3 => '3', 4 => '4']",
];
- $ret .= $uxc->getUserModVersionArray(2, $numbCol, 'config');
+ $ret .= $this->uxc->getUserModVersionArray(2, $numbCol, 'config');
- $ret .= $pc->getPhpCodeCommentLine('Divide by');
+ $ret .= $this->pc->getPhpCodeCommentLine('Divide by');
$divideby = [
'name' => "'divideby'",
'title' => "'{$language}DIVIDEBY'",
@@ -747,21 +888,21 @@ private function getXoopsVersionConfig($module, $tables, $language)
'default' => '1',
'options' => "[1 => '1', 2 => '2', 3 => '3', 4 => '4']",
];
- $ret .= $uxc->getUserModVersionArray(2, $divideby, 'config');
+ $ret .= $this->uxc->getUserModVersionArray(2, $divideby, 'config');
- $ret .= $pc->getPhpCodeCommentLine('Table type');
+ $ret .= $this->pc->getPhpCodeCommentLine('Table type');
$tableType = [
'name' => "'table_type'",
'title' => "'{$language}TABLE_TYPE'",
'description' => "'{$language}DIVIDEBY_DESC'",
'formtype' => "'select'",
- 'valuetype' => "'int'",
+ 'valuetype' => "'text'",
'default' => "'bordered'",
'options' => "['bordered' => 'bordered', 'striped' => 'striped', 'hover' => 'hover', 'condensed' => 'condensed']",
];
- $ret .= $uxc->getUserModVersionArray(2, $tableType, 'config');
+ $ret .= $this->uxc->getUserModVersionArray(2, $tableType, 'config');
- $ret .= $pc->getPhpCodeCommentLine('Panel by');
+ $ret .= $this->pc->getPhpCodeCommentLine('Panel by');
$panelType = [
'name' => "'panel_type'",
'title' => "'{$language}PANEL_TYPE'",
@@ -771,9 +912,28 @@ private function getXoopsVersionConfig($module, $tables, $language)
'default' => "'default'",
'options' => "['default' => 'default', 'primary' => 'primary', 'success' => 'success', 'info' => 'info', 'warning' => 'warning', 'danger' => 'danger']",
];
- $ret .= $uxc->getUserModVersionArray(2, $panelType, 'config');
-
- $ret .= $pc->getPhpCodeCommentLine('Advertise');
+ $ret .= $this->uxc->getUserModVersionArray(2, $panelType, 'config');
+ $ret .= $this->pc->getPhpCodeCommentLine('Paypal ID');
+ $paypal = [
+ 'name' => "'donations'",
+ 'title' => "'{$language}IDPAYPAL'",
+ 'description' => "'{$language}IDPAYPAL_DESC'",
+ 'formtype' => "'textbox'",
+ 'valuetype' => "'text'",
+ 'default' => "'XYZ123'",
+ ];
+ $ret .= $this->uxc->getUserModVersionArray(2, $paypal, 'config');
+ $ret .= $this->pc->getPhpCodeCommentLine('Show Breadcrumbs');
+ $breadcrumbs = [
+ 'name' => "'show_breadcrumbs'",
+ 'title' => "'{$language}SHOW_BREADCRUMBS'",
+ 'description' => "'{$language}SHOW_BREADCRUMBS_DESC'",
+ 'formtype' => "'yesno'",
+ 'valuetype' => "'int'",
+ 'default' => '1',
+ ];
+ $ret .= $this->uxc->getUserModVersionArray(2, $breadcrumbs, 'config');
+ $ret .= $this->pc->getPhpCodeCommentLine('Advertise');
$advertise = [
'name' => "'advertise'",
'title' => "'{$language}ADVERTISE'",
@@ -782,9 +942,8 @@ private function getXoopsVersionConfig($module, $tables, $language)
'valuetype' => "'text'",
'default' => "''",
];
- $ret .= $uxc->getUserModVersionArray(2, $advertise, 'config');
-
- $ret .= $pc->getPhpCodeCommentLine('Bookmarks');
+ $ret .= $this->uxc->getUserModVersionArray(2, $advertise, 'config');
+ $ret .= $this->pc->getPhpCodeCommentLine('Bookmarks');
$bookmarks = [
'name' => "'bookmarks'",
'title' => "'{$language}BOOKMARKS'",
@@ -793,12 +952,12 @@ private function getXoopsVersionConfig($module, $tables, $language)
'valuetype' => "'int'",
'default' => '0',
];
- $ret .= $uxc->getUserModVersionArray(2, $bookmarks, 'config');
+ $ret .= $this->uxc->getUserModVersionArray(2, $bookmarks, 'config');
/*
* removed, as there are no system templates in xoops core for fb or disqus comments
- * tdmcreate currently is also not creatings tpl files for this
- $ret .= $pc->getPhpCodeCommentLine('Facebook Comments');
+ * modulebuilder currently is also not creatings tpl files for this
+ $ret .= $this->pc->getPhpCodeCommentLine('Facebook Comments');
$facebookComments = [
'name' => "'facebook_comments'",
'title' => "'{$language}FACEBOOK_COMMENTS'",
@@ -807,9 +966,9 @@ private function getXoopsVersionConfig($module, $tables, $language)
'valuetype' => "'int'",
'default' => '0',
];
- $ret .= $uxc->getUserModVersion(3, $facebookComments, 'config', '$c');
+ $ret .= $this->uxc->getUserModVersion(3, $facebookComments, 'config', '$c');
$ret .= $this->getSimpleString('++$c;');
- $ret .= $pc->getPhpCodeCommentLine('Disqus Comments');
+ $ret .= $this->pc->getPhpCodeCommentLine('Disqus Comments');
$disqusComments = [
'name' => "'disqus_comments'",
'title' => "'{$language}DISQUS_COMMENTS'",
@@ -818,11 +977,11 @@ private function getXoopsVersionConfig($module, $tables, $language)
'valuetype' => "'int'",
'default' => '0',
];
- $ret .= $uxc->getUserModVersion(3, $disqusComments, 'config', '$c');
+ $ret .= $this->uxc->getUserModVersion(3, $disqusComments, 'config', '$c');
$ret .= $this->getSimpleString('++$c;');
*/
- $ret .= $pc->getPhpCodeCommentLine('Make Sample button visible?');
+ $ret .= $this->pc->getPhpCodeCommentLine('Make Sample button visible?');
$maintainedby = [
'name' => "'displaySampleButton'",
'title' => "'CO_' . \$moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON'",
@@ -831,9 +990,9 @@ private function getXoopsVersionConfig($module, $tables, $language)
'valuetype' => "'int'",
'default' => '1',
];
- $ret .= $uxc->getUserModVersionArray(2, $maintainedby, 'config');
+ $ret .= $this->uxc->getUserModVersionArray(2, $maintainedby, 'config');
- $ret .= $pc->getPhpCodeCommentLine('Maintained by');
+ $ret .= $this->pc->getPhpCodeCommentLine('Maintained by');
$maintainedby = [
'name' => "'maintainedby'",
'title' => "'{$language}MAINTAINEDBY'",
@@ -842,59 +1001,7 @@ private function getXoopsVersionConfig($module, $tables, $language)
'valuetype' => "'text'",
'default' => "'{$module->getVar('mod_support_url')}'",
];
- $ret .= $uxc->getUserModVersionArray(2, $maintainedby, 'config');
-
- return $ret;
- }
-
- /**
- * @private function getNotificationsType
- * @param $language
- * @param $type
- * @param $tableName
- * @param $notifyFile
- * @param $item
- * @param $typeOfNotify
- *
- * @return string
- */
- private function getNotificationsType($language, $type, $tableName, $notifyFile, $item, $typeOfNotify)
- {
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $uxc = UserXoopsCode::getInstance();
- $stuTableName = mb_strtoupper($tableName);
- $stuTypeOfNotify = mb_strtoupper($typeOfNotify);
- $notifyFile = explode(', ', $notifyFile);
- $notifyFile = implode(', ', $notifyFile);
- $ret = '';
- switch ($type) {
- case 'category':
- $ret .= $pc->getPhpCodeCommentLine('Category Notify');
- $category = [
- 'name' => "'category'",
- 'title' => "'{$language}{$stuTableName}_NOTIFY'",
- 'description' => "'{$language}{$stuTableName}_NOTIFY_DESC'",
- 'subscribe_from' => "['index.php',{$notifyFile}]",
- 'item_name' => "'{$item}'",
- "'allow_bookmark'" => '1',
- ];
- $ret .= $uxc->getUserModVersionArray(2, $category, 'notification', "'{$type}'");
- break;
- case 'event':
- $ret .= $pc->getPhpCodeCommentLine('Event Notify');
- $event = [
- 'name' => "'{$typeOfNotify}'",
- 'category' => "'{$tableName}'",
- 'admin_only' => '1',
- "'title'" => "'{$language}{$stuTableName}_{$stuTypeOfNotify}_NOTIFY'",
- 'caption' => "'{$language}{$stuTableName}_{$stuTypeOfNotify}_NOTIFY_CAPTION'",
- 'description' => "'{$language}{$stuTableName}_{$stuTypeOfNotify}_NOTIFY_DESC'",
- 'mail_template' => "'{$tableName}_{$typeOfNotify}_notify'",
- 'mail_subject' => "'{$language}{$stuTableName}_{$stuTypeOfNotify}_NOTIFY_SUBJECT'",
- ];
- $ret .= $uxc->getUserModVersionArray(2, $event, 'notification', "'{$type}'");
- break;
- }
+ $ret .= $this->uxc->getUserModVersionArray(2, $maintainedby, 'config');
return $ret;
}
@@ -907,85 +1014,77 @@ private function getNotificationsType($language, $type, $tableName, $notifyFile,
*/
private function getXoopsVersionNotifications($module, $language)
{
- $uxc = UserXoopsCode::getInstance();
$moduleDirname = $module->getVar('mod_dirname');
$ret = $this->getDashComment('Notifications');
- $ret .= $uxc->getUserModVersionText(1, 1, 'hasNotification');
+ $ret .= $this->uxc->getUserModVersionText(1, 1, 'hasNotification');
$notifications = ['lookup_file' => "'include/notification.inc.php'", 'lookup_func' => "'{$moduleDirname}_notify_iteminfo'"];
- $ret .= $uxc->getUserModVersionArray(1, $notifications, 'notification');
-
- $notifyFiles = [];
- $single = 'single';
- $tables = $this->getTableTables($module->getVar('mod_id'), 'table_order');
- $tableCategory = [];
- $tableBroken = [];
- $tableSubmit = [];
- $tableId = null;
- $tableMid = null;
- $tableSoleName = '';
- foreach (array_keys($tables) as $t) {
+ $ret .= $this->uxc->getUserModVersionArray(1, $notifications, 'notification');
+
+ $notifyFiles = [];
+ $tables = $this->getTableTables($module->getVar('mod_id'), 'table_order');
+ //$tableCategory = [];
+ $tableBroken = [];
+ $tableComments = [];
+ //$tableSubmit = [];
+ //$tableId = null;
+ //$tableMid = null;
+ $notifyCategory = '';
+ $notifyEventGlobal = $this->pc->getPhpCodeCommentLine('Global events notification');
+ $notifyEventTable = $this->pc->getPhpCodeCommentLine('Event notifications for items');
+
+ //global events
+ $notifyEventGlobal .= $this->getXoopsVersionNotificationCodeComplete($language, 'global_new', 'global', 0, 'global_new', 'global_new_notify');
+ $notifyEventGlobal .= $this->getXoopsVersionNotificationCodeComplete($language, 'global_modify', 'global', 0, 'global_modify', 'global_modify_notify');
+ $notifyEventGlobal .= $this->getXoopsVersionNotificationCodeComplete($language, 'global_delete', 'global', 0, 'global_delete', 'global_delete_notify');
+ $notifyEventGlobal .= $this->getXoopsVersionNotificationCodeComplete($language, 'global_approve', 'global', 1, 'global_approve', 'global_approve_notify');
+ foreach (\array_keys($tables) as $t) {
+ $tableBroken[] = $tables[$t]->getVar('table_broken');
+ $tableComments[] = $tables[$t]->getVar('table_comments');
+ }
+ if (\in_array(1, $tableBroken)) {
+ $notifyEventGlobal .= $this->getXoopsVersionNotificationCodeComplete($language, 'global_broken', 'global', 1, 'global_broken', 'global_broken_notify');
+ }
+ if (\in_array(1, $tableComments)) {
+ $notifyEventGlobal .= $this->getXoopsVersionNotificationCodeComplete($language, 'global_comment', 'global', 0, 'global_comment', 'global_comment_notify');
+ }
+
+ foreach (\array_keys($tables) as $t) {
$tableId = $tables[$t]->getVar('table_id');
$tableMid = $tables[$t]->getVar('table_mid');
$tableName = $tables[$t]->getVar('table_name');
$tableSoleName = $tables[$t]->getVar('table_solename');
- $tableCategory[] = $tables[$t]->getVar('table_category');
- $tableBroken[] = $tables[$t]->getVar('table_broken');
- $tableSubmit[] = $tables[$t]->getVar('table_submit');
- if (1 == $tables[$t]->getVar('table_notifications')) {
- //if ($t <= count($tableName)) {
- $notifyFiles[] = $tableName;
- //}
- }
- if (1 == $tables[$t]->getVar('table_single')) {
- $single = $tableName;
- }
- }
- $fields = $this->getTableFields($tableMid, $tableId);
- $fieldId = null;
- $fieldParent = null;
- foreach (array_keys($fields) as $f) {
- $fieldName = $fields[$f]->getVar('field_name');
- $fieldElement = $fields[$f]->getVar('field_element');
- if (0 == $f) {
- $fieldId = $fieldName;
+ //$tableCategory[] = $tables[$t]->getVar('table_category');
+ //$tableSubmit[] = $tables[$t]->getVar('table_submit');
+ $fields = $this->getTableFields($tableMid, $tableId);
+ $fieldId = 0;
+ foreach (\array_keys($fields) as $f) {
+ $fieldName = $fields[$f]->getVar('field_name');
+ if (0 == $f) {
+ $fieldId = $fieldName;
+ }
}
- if ($fieldElement > 16) {
- $fieldParent = $fieldName;
+ if (1 == $tables[$t]->getVar('table_notifications')) {
+ $notifyFiles[] = $tableName;
+ $notifyCategory .= $this->getXoopsVersionNotificationTableName($language, $tableName, $tableSoleName, $tableName, $fieldId);
+ //$notifyEvent .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', $tableSoleName . '_new', $tableName, 0, $tableSoleName, $tableSoleName . '_new_notify');
+ $notifyEventTable .= $this->getXoopsVersionNotificationCodeComplete($language, $tableSoleName . '_modify', $tableName, 0, $tableSoleName . '_modify', $tableSoleName . '_modify_notify');
+ $notifyEventTable .= $this->getXoopsVersionNotificationCodeComplete($language, $tableSoleName . '_delete', $tableName, 0, $tableSoleName . '_delete', $tableSoleName . '_delete_notify');
+ $notifyEventTable .= $this->getXoopsVersionNotificationCodeComplete($language, $tableSoleName . '_approve', $tableName, 0, $tableSoleName . '_approve', $tableSoleName . '_approve_notify');
+ if (1 == $tables[$t]->getVar('table_broken')) {
+ $notifyEventTable .= $this->getXoopsVersionNotificationCodeComplete($language, $tableSoleName . '_broken', $tableName, 0, $tableSoleName . '_broken', $tableSoleName . '_broken_notify');
+ }
+ /*event will be added by xoops
+ if (1 == $tables[$t]->getVar('table_comments')) {
+ $notifyEventTable .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', $tableSoleName . '_comment', $tableName, 0, $tableSoleName . '_comment', $tableSoleName . '_comment_notify');
+ }*/
}
}
+ $ret .= $this->pc->getPhpCodeCommentLine('Categories of notification');
+ $ret .= $this->getXoopsVersionNotificationGlobal($language, 'category', 'global', $notifyFiles);
- $num = 1;
- $ret .= $this->getXoopsVersionNotificationGlobal($language, 'category', 'global', 'global', $notifyFiles, $num);
- ++$num;
- $ret .= $this->getXoopsVersionNotificationCategory($language, 'category', 'category', 'category', $notifyFiles, $fieldParent, '1', $num);
- ++$num;
- $ret .= $this->getXoopsVersionNotificationTableName($language, 'category', $tableSoleName, $tableSoleName, $single, $fieldId, 1, $num);
- unset($num);
- $num = 1;
- if (in_array(1, $tableCategory)) {
- $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'new_category', 'global', 0, 'global_new_category', 'global_newcategory_notify', $num);
- ++$num;
- }
- $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'modify', 'global', 1, 'global_modify', 'global_' . 'modify_notify', $num);
- if (in_array(1, $tableBroken)) {
- ++$num;
- $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'broken', 'global', 1, 'global_broken', 'global_' . 'broken_notify', $num);
- }
- if (in_array(1, $tableSubmit)) {
- ++$num;
- $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'submit', 'global', 1, 'global_submit', 'global_' . 'submit_notify', $num);
- }
- ++$num;
- $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'new_' . $tableSoleName, 'global', 0, 'global_new', 'global_new' . $tableSoleName . '_notify', $num);
- if (in_array(1, $tableCategory)) {
- ++$num;
- $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'submit', 'category', 1, 'category_submit', 'category_' . $tableSoleName . 'submit_notify', $num);
- ++$num;
- $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'new_category', 'category', 0, 'category', 'category_new' . $tableSoleName . '_notify', $num);
- }
- ++$num;
- $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'approve', $tableSoleName, 1, $tableSoleName, $tableSoleName . '_approve_notify', $num);
- unset($num);
+ //$ret .= $this->getXoopsVersionNotificationCategory($language, 'category', 'category', 'category', $notifyFiles, $fieldParent, '1');
+
+ $ret .= $notifyCategory . $notifyEventGlobal . $notifyEventTable;
return $ret;
}
@@ -994,59 +1093,23 @@ private function getXoopsVersionNotifications($module, $language)
* @private function getXoopsVersionNotificationGlobal
* @param $language
* @param $type
- * @param $name
* @param $title
* @param $from
*
- * @param $num
* @return string
*/
- private function getXoopsVersionNotificationGlobal($language, $type, $name, $title, $from, $num)
+ private function getXoopsVersionNotificationGlobal($language, $type, $title, $from)
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $uxc = UserXoopsCode::getInstance();
- $title = mb_strtoupper($title);
- $implodeFrom = implode(".php', '", $from);
- $ret = $pc->getPhpCodeCommentLine('Global Notify');
+ $title = \mb_strtoupper($title);
+ $implodeFrom = \implode(".php', '", $from);
+ $ret = $this->pc->getPhpCodeCommentLine('Global Notify');
$global = [
- 'name' => "'{$name}'",
- 'title' => "{$language}{$title}_NOTIFY",
- 'description' => "{$language}{$title}_NOTIFY_DESC",
+ 'name' => "'global'",
+ 'title' => "{$language}NOTIFY_{$title}",
+ 'description' => "''",
'subscribe_from' => "['index.php', '{$implodeFrom}.php']",
];
- $ret .= $uxc->getUserModVersionArray(3, $global, 'notification', "'{$type}'", $num);
-
- return $ret;
- }
-
- /**
- * @private function getXoopsVersionNotificationCategory
- * @param $language
- * @param $type
- * @param $name
- * @param $title
- * @param $file
- * @param $item
- * @param $allow
- * @param $num
- * @return string
- */
- private function getXoopsVersionNotificationCategory($language, $type, $name, $title, $file, $item, $allow, $num)
- {
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $uxc = UserXoopsCode::getInstance();
- $title = mb_strtoupper($title);
- $impFile = implode(".php', '", $file);
- $ret = $pc->getPhpCodeCommentLine('Category Notify');
- $global = [
- 'name' => "'{$name}'",
- 'title' => "{$language}{$title}_NOTIFY",
- 'description' => "{$language}{$title}_NOTIFY_DESC",
- 'subscribe_from' => "['{$impFile}.php']",
- 'item_name' => "'{$item}'",
- 'allow_bookmark' => (string)$allow,
- ];
- $ret .= $uxc->getUserModVersionArray(3, $global, 'notification', "'{$type}'", $num);
+ $ret .= $this->uxc->getUserModVersionArray(3, $global, 'notification', "'{$type}'");
return $ret;
}
@@ -1054,32 +1117,28 @@ private function getXoopsVersionNotificationCategory($language, $type, $name, $t
/**
* @private function getXoopsVersionNotificationTableName
* @param $language
- * @param $type
* @param $name
* @param $title
* @param $file
* @param $item
- * @param $allow
*
- * @param $num
* @return string
*/
- private function getXoopsVersionNotificationTableName($language, $type, $name, $title, $file, $item, $allow, $num)
+ private function getXoopsVersionNotificationTableName($language, $name, $title, $file, $item)
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $uxc = UserXoopsCode::getInstance();
- $stuTitle = mb_strtoupper($title);
- $ucfTitle = ucfirst($title);
- $ret = $pc->getPhpCodeCommentLine($ucfTitle . ' Notify');
+ $allow = 1;
+ $stuTitle = \mb_strtoupper($title);
+ $ucfTitle = \ucfirst($title);
+ $ret = $this->pc->getPhpCodeCommentLine($ucfTitle . ' Notify');
$table = [
'name' => "'{$name}'",
- 'title' => "{$language}{$stuTitle}_NOTIFY",
- 'description' => "{$language}{$stuTitle}_NOTIFY_DESC",
+ 'title' => "{$language}NOTIFY_{$stuTitle}",
+ 'description' => "''",
'subscribe_from' => "'{$file}.php'",
'item_name' => "'{$item}'",
- 'allow_bookmark' => (string)$allow,
+ 'allow_bookmark' => (string)(1),
];
- $ret .= $uxc->getUserModVersionArray(3, $table, 'notification', "'{$type}'", $num);
+ $ret .= $this->uxc->getUserModVersionArray(3, $table, 'notification', "'category'");
return $ret;
}
@@ -1087,34 +1146,30 @@ private function getXoopsVersionNotificationTableName($language, $type, $name, $
/**
* @private function getXoopsVersionNotifications
* @param $language
- * @param $type
* @param $name
* @param $category
* @param $admin
* @param $title
* @param $mail
*
- * @param $num
* @return string
*/
- private function getXoopsVersionNotificationCodeComplete($language, $type, $name, $category, $admin, $title, $mail, $num)
+ private function getXoopsVersionNotificationCodeComplete($language, $name, $category, $admin, $title, $mail)
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $uxc = UserXoopsCode::getInstance();
- $title = mb_strtoupper($title);
- $ucfTitle = ucfirst($title);
- $ret = $pc->getPhpCodeCommentLine($ucfTitle . ' Notify');
+ $title = \mb_strtoupper($title);
+ $ucfTitle = \ucfirst($title);
+ $ret = $this->pc->getPhpCodeCommentLine($ucfTitle . ' Notify');
$event = [
'name' => "'{$name}'",
'category' => "'{$category}'",
'admin_only' => (string)$admin,
- 'title' => "{$language}{$title}_NOTIFY",
- 'caption' => "{$language}{$title}_NOTIFY_CAPTION",
- 'description' => "{$language}{$title}_NOTIFY_DESC",
+ 'title' => "{$language}NOTIFY_{$title}",
+ 'caption' => "{$language}NOTIFY_{$title}_CAPTION",
+ 'description' => "''",
'mail_template' => "'{$mail}'",
- 'mail_subject' => "{$language}{$title}_NOTIFY_SUBJECT",
+ 'mail_subject' => "{$language}NOTIFY_{$title}_SUBJECT",
];
- $ret .= $uxc->getUserModVersionArray(3, $event, 'notification', "'{$type}'", $num);
+ $ret .= $this->uxc->getUserModVersionArray(3, $event, 'notification', "'event'");
return $ret;
}
@@ -1122,51 +1177,47 @@ private function getXoopsVersionNotificationCodeComplete($language, $type, $name
/**
* @private function getXoopsVersionNotifications
* @param $moduleDirname
- * @param string $t
* @return string
*/
- private function getXoopsVersionSelectSizeMB($moduleDirname, $t = '')
+ private function getXoopsVersionSelectSizeMB($moduleDirname)
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $ucModuleDirname = mb_strtoupper($moduleDirname);
-
- $ret = $pc->getPhpCodeCommentLine('create increment steps for file size');
- $ret .= $pc->getPhpCodeIncludeDir("__DIR__ . '/include/xoops_version.inc.php'", '',true,true);
- $ret .= $xc->getXcEqualsOperator('$iniPostMaxSize ', "{$moduleDirname}ReturnBytes(ini_get('post_max_size'))");
- $ret .= $xc->getXcEqualsOperator('$iniUploadMaxFileSize', "{$moduleDirname}ReturnBytes(ini_get('upload_max_filesize'))");
- $ret .= $xc->getXcEqualsOperator('$maxSize ', "min(\$iniPostMaxSize, \$iniUploadMaxFileSize)");
- $cond = $xc->getXcEqualsOperator('$increment', '500', null, $t . "\t");
- $ret .= $pc->getPhpCodeConditions('$maxSize', ' > ', '10000 * 1048576', $cond, false, $t);
- $cond = $xc->getXcEqualsOperator('$increment', '200', null, $t . "\t");
- $ret .= $pc->getPhpCodeConditions('$maxSize', ' <= ', '10000 * 1048576', $cond, false, $t);
- $cond = $xc->getXcEqualsOperator('$increment', '100', null, $t . "\t");
- $ret .= $pc->getPhpCodeConditions('$maxSize', ' <= ', '5000 * 1048576', $cond, false, $t);
- $cond = $xc->getXcEqualsOperator('$increment', '50', null, $t . "\t");
- $ret .= $pc->getPhpCodeConditions('$maxSize', ' <= ', '2500 * 1048576', $cond, false, $t);
- $cond = $xc->getXcEqualsOperator('$increment', '10', null, $t . "\t");
- $ret .= $pc->getPhpCodeConditions('$maxSize', ' <= ', '1000 * 1048576', $cond, false, $t);
- $cond = $xc->getXcEqualsOperator('$increment', '5', null, $t . "\t");
- $ret .= $pc->getPhpCodeConditions('$maxSize', ' <= ', '500 * 1048576', $cond, false, $t);
- $cond = $xc->getXcEqualsOperator('$increment', '2', null, $t . "\t");
- $ret .= $pc->getPhpCodeConditions('$maxSize', ' <= ', '100 * 1048576', $cond, false, $t);
- $cond = $xc->getXcEqualsOperator('$increment', '1', null, $t . "\t");
- $ret .= $pc->getPhpCodeConditions('$maxSize', ' <= ', '50 * 1048576', $cond, false, $t);
- $cond = $xc->getXcEqualsOperator('$increment', '0.5', null, $t . "\t");
- $ret .= $pc->getPhpCodeConditions('$maxSize', ' <= ', '25 * 1048576', $cond, false, $t);
- $ret .= $xc->getXcEqualsOperator('$optionMaxsize', '[]');
- $ret .= $xc->getXcEqualsOperator('$i', '$increment');
- $while = $xc->getXcEqualsOperator("\$optionMaxsize[\$i . ' ' . _MI_{$ucModuleDirname}_SIZE_MB]", '$i * 1048576', null, $t . "\t");
- $while .= $xc->getXcEqualsOperator('$i', '$increment', '+',$t . "\t");
- $ret .= $pc->getPhpCodeWhile('i * 1048576', $while, '$maxSize', ' <= ');
+ $ucModuleDirname = \mb_strtoupper($moduleDirname);
+
+ $ret = $this->pc->getPhpCodeCommentLine('create increment steps for file size');
+ $ret .= $this->pc->getPhpCodeIncludeDir("__DIR__ . '/include/xoops_version.inc.php'", '',true,true);
+ $ret .= $this->xc->getXcEqualsOperator('$iniPostMaxSize ', "{$moduleDirname}ReturnBytes(\ini_get('post_max_size'))");
+ $ret .= $this->xc->getXcEqualsOperator('$iniUploadMaxFileSize', "{$moduleDirname}ReturnBytes(\ini_get('upload_max_filesize'))");
+ $ret .= $this->xc->getXcEqualsOperator('$maxSize ', 'min($iniPostMaxSize, $iniUploadMaxFileSize)');
+ $cond = $this->xc->getXcEqualsOperator('$increment', '500', null, "\t");
+ $ret .= $this->pc->getPhpCodeConditions('$maxSize', ' > ', '10000 * 1048576', $cond, false, '');
+ $cond = $this->xc->getXcEqualsOperator('$increment', '200', null, "\t");
+ $ret .= $this->pc->getPhpCodeConditions('$maxSize', ' <= ', '10000 * 1048576', $cond, false, '');
+ $cond = $this->xc->getXcEqualsOperator('$increment', '100', null, "\t");
+ $ret .= $this->pc->getPhpCodeConditions('$maxSize', ' <= ', '5000 * 1048576', $cond, false, '');
+ $cond = $this->xc->getXcEqualsOperator('$increment', '50', null, "\t");
+ $ret .= $this->pc->getPhpCodeConditions('$maxSize', ' <= ', '2500 * 1048576', $cond, false, '');
+ $cond = $this->xc->getXcEqualsOperator('$increment', '10', null, "\t");
+ $ret .= $this->pc->getPhpCodeConditions('$maxSize', ' <= ', '1000 * 1048576', $cond, false, '');
+ $cond = $this->xc->getXcEqualsOperator('$increment', '5', null, "\t");
+ $ret .= $this->pc->getPhpCodeConditions('$maxSize', ' <= ', '500 * 1048576', $cond, false, '');
+ $cond = $this->xc->getXcEqualsOperator('$increment', '2', null, "\t");
+ $ret .= $this->pc->getPhpCodeConditions('$maxSize', ' <= ', '100 * 1048576', $cond, false, '');
+ $cond = $this->xc->getXcEqualsOperator('$increment', '1', null, "\t");
+ $ret .= $this->pc->getPhpCodeConditions('$maxSize', ' <= ', '50 * 1048576', $cond, false, '');
+ $cond = $this->xc->getXcEqualsOperator('$increment', '0.5', null, "\t");
+ $ret .= $this->pc->getPhpCodeConditions('$maxSize', ' <= ', '25 * 1048576', $cond, false, '');
+ $ret .= $this->xc->getXcEqualsOperator('$optionMaxsize', '[]');
+ $ret .= $this->xc->getXcEqualsOperator('$i', '$increment');
+ $while = $this->xc->getXcEqualsOperator("\$optionMaxsize[\$i . ' ' . _MI_{$ucModuleDirname}_SIZE_MB]", '$i * 1048576', null, "\t");
+ $while .= $this->xc->getXcEqualsOperator('$i', '$increment', '+', "\t");
+ $ret .= $this->pc->getPhpCodeWhile('i * 1048576', $while, '$maxSize', '<=');
return $ret;
}
/**
* @public function render
- * @param null
- * @return bool|string
+ * @return string
*/
public function render()
{
@@ -1179,36 +1230,38 @@ public function render()
$content = $this->getHeaderFilesComments($module);
$content .= $this->getXoopsVersionHeader($module, $language);
$content .= $this->getXoopsVersionTemplatesAdminUser($moduleDirname, $tables, $module->getVar('mod_admin'), $module->getVar('mod_user'));
- $content .= $this->getXoopsVersionMySQL($moduleDirname, $table, $tables);
+ if (\count($tables) > 0) {
+ $content .= $this->getXoopsVersionMySQL($moduleDirname, $table, $tables);
+ }
$tableSearch = [];
$tableComments = [];
$tableSubmenu = [];
$tableBlocks = [];
$tableNotifications = [];
- foreach (array_keys($tables) as $t) {
+ foreach (\array_keys($tables) as $t) {
$tableSearch[] = $tables[$t]->getVar('table_search');
$tableComments[] = $tables[$t]->getVar('table_comments');
$tableSubmenu[] = $tables[$t]->getVar('table_submenu');
$tableBlocks[] = $tables[$t]->getVar('table_blocks');
$tableNotifications[] = $tables[$t]->getVar('table_notifications');
}
- if (in_array(1, $tableSearch)) {
+ if (\in_array(1, $tableSearch)) {
$content .= $this->getXoopsVersionSearch($moduleDirname);
}
- if (in_array(1, $tableComments)) {
- $content .= $this->getXoopsVersionComments($moduleDirname);
+ if (\in_array(1, $tableComments)) {
+ $content .= $this->getXoopsVersionComments($moduleDirname, $tables);
}
- if (in_array(1, $tableSubmenu)) {
+ if (\in_array(1, $tableSubmenu)) {
$content .= $this->getXoopsVersionSubmenu($language, $tables);
}
- if (in_array(1, $tableBlocks)) {
+ if (\in_array(1, $tableBlocks)) {
$content .= $this->getXoopsVersionBlocks($moduleDirname, $tables, $language);
}
$content .= $this->getXoopsVersionConfig($module, $tables, $language);
- if (in_array(1, $tableNotifications)) {
+ if (\in_array(1, $tableNotifications)) {
$content .= $this->getXoopsVersionNotifications($module, $language);
}
- $this->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->create($moduleDirname, '/', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $this->renderFile();
}
diff --git a/class/Files/User/index.php b/class/Files/User/index.php
new file mode 100644
index 00000000..e5ee0725
--- /dev/null
+++ b/class/Files/User/index.php
@@ -0,0 +1,2 @@
+xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $this->axc = Tdmcreate\Files\Admin\AdminXoopsCode::getInstance();
+ $this->xc = Modulebuilder\Files\CreateXoopsCode::getInstance();
+ $this->axc = Modulebuilder\Files\Admin\AdminXoopsCode::getInstance();
}
/**
* @static function getInstance
- * @param null
+
* @return AdminAbout
*/
public static function getInstance()
@@ -69,8 +68,8 @@ public static function getInstance()
/**
* @public function write
- * @param string $module
- * @param string $filename
+ * @param $module
+ * @param $filename
*/
public function write($module, $filename)
{
@@ -80,8 +79,8 @@ public function write($module, $filename)
/**
* @public function render
- * @param null
- * @return bool|string
+
+ * @return string
*/
public function render()
{
@@ -90,14 +89,15 @@ public function render()
$moduleDirname = $module->getVar('mod_dirname');
$moduleDonations = $module->getVar('mod_donations');
$content = $this->getHeaderFilesComments($module);
- $content .= $this->getInclude();
+ $content .= $this->getSimpleString('');
+ $content .= $this->getRequire();
$content .= $this->axc->getAdminTemplateMain($moduleDirname, 'about');
$content .= $this->xc->getXcXoopsTplAssign('navigation', "\$adminObject->displayNavigation('about.php')");
- $content .= $this->getSimpleString("\$adminObject->setPaypal('{$moduleDonations}');");
+ $content .= $this->getSimpleString("\$adminObject->setPaypal('$moduleDonations');");
$content .= $this->xc->getXcXoopsTplAssign('about', "\$adminObject->renderAbout(false)");
- $content .= $this->getInclude('footer');
+ $content .= $this->getRequire('footer');
- $this->create($moduleDirname, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->create($moduleDirname, 'admin', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $this->renderFile();
}
diff --git a/class/Files/admin/AdminFooter.php b/class/Files/admin/AdminFooter.php
index fa7bee7a..cb5f744d 100644
--- a/class/Files/admin/AdminFooter.php
+++ b/class/Files/admin/AdminFooter.php
@@ -1,9 +1,9 @@
-xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $this->pc = Tdmcreate\Files\CreatePhpCode::getInstance();
+ $this->xc = Modulebuilder\Files\CreateXoopsCode::getInstance();
+ $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance();
}
/**
@@ -67,10 +66,10 @@ public static function getInstance()
/**
* @public function write
- * @param string $module
- * @param string $filename
+ * @param $module
+ * @param $filename
*/
- public function write($module, $filename)
+ public function write($module, $filename): void
{
$this->setModule($module);
$this->setFileName($filename);
@@ -78,8 +77,8 @@ public function write($module, $filename)
/**
* @public function render
- * @param null
- * @return bool|string
+
+ * @return string
*/
public function render()
{
@@ -87,13 +86,14 @@ public function render()
$filename = $this->getFileName();
$moduleDirname = $module->getVar('mod_dirname');
$content = $this->getHeaderFilesComments($module);
+ $content .= $this->getSimpleString('');
$isset = $this->pc->getPhpCodeIsset('templateMain');
$display = "\t" . $this->xc->getXcXoopsTplAssign('maintainedby', "\$helper->getConfig('maintainedby')");
- $display .= "\t" . $this->pc->getPhpCodeRemoveCarriageReturn($this->xc->getXcXoopsTplDisplay(), '', "\r");
- $content .= $this->pc->getPhpCodeConditions($isset, '', '', $display, false, '') . PHP_EOL;
+ $display .= "\t" . $this->xc->getXcXoopsTplDisplay();
+ $content .= $this->pc->getPhpCodeConditions($isset, '', '', $display) . PHP_EOL;
$content .= $this->xc->getXcXoopsCPFooter();
- $this->create($moduleDirname, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->create($moduleDirname, 'admin', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $this->renderFile();
}
diff --git a/class/Files/admin/AdminPages.php b/class/Files/admin/AdminPages.php
index afd9857b..2273b5eb 100644
--- a/class/Files/admin/AdminPages.php
+++ b/class/Files/admin/AdminPages.php
@@ -1,9 +1,11 @@
-xc = Files\CreateXoopsCode::getInstance();
+ $this->pc = Files\CreatePhpCode::getInstance();
+ $this->axc = Files\Admin\AdminXoopsCode::getInstance();
}
/**
* @static function getInstance
- * @param null
+
*
* @return AdminPages
*/
@@ -77,33 +94,51 @@ public function write($module, $table, $filename)
*/
private function getAdminPagesHeader($moduleDirname, $fieldId)
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
$ccFieldId = $this->getCamelCase($fieldId, false, true);
- $ret = $pc->getPhpCodeUseNamespace(['Xmf', 'Request'], '', '');
- $ret .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', '');
- $ret .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']);
- $ret .= $this->getInclude();
- $ret .= $pc->getPhpCodeCommentLine('It recovered the value of argument op in URL$');
- $ret .= $xc->getXcXoopsRequest('op', 'op', 'list');
- $ret .= $pc->getPhpCodeCommentLine("Request {$fieldId}");
- $ret .= $xc->getXcXoopsRequest($ccFieldId, $fieldId, '', 'Int');
+ $ret = $this->pc->getPhpCodeUseNamespace(['Xmf', 'Request'], '', '');
+ $ret .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', '');
+ $ret .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants'], '', '');
+ $ret .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Common']);
+ $ret .= $this->getRequire();
+ $ret .= $this->pc->getPhpCodeCommentLine('Get all request values');
+ $leftLen = \strlen($ccFieldId);
+ $leftOp = 'op';
+ $leftField = $ccFieldId;
+ $leftStart = 'start';
+ $leftLimit = 'limit';
+ if ($leftLen > 5) {
+ $leftOp .= \str_repeat(' ', $leftLen - 2);
+ $leftStart .= \str_repeat(' ', $leftLen - 5);
+ $leftLimit .= \str_repeat(' ', $leftLen - 5);
+ } else {
+ $leftOp .= \str_repeat(' ', 3);
+ if (\strlen($ccFieldId) < 5) {
+ $leftField .= \str_repeat(' ', 5 - $leftLen);
+ }
+ }
+ $ret .= $this->xc->getXcXoopsRequest($leftOp, 'op', 'list', 'Cmd');
+ $ret .= $this->xc->getXcXoopsRequest($leftField, $fieldId, '', 'Int');
+ $ret .= $this->xc->getXcXoopsRequest($leftStart, 'start', '', 'Int');
+ $config = $this->xc->getXcGetConfig('adminpager');
+ $ret .= $this->xc->getXcXoopsRequest($leftLimit, 'limit', $config, 'Int');
+ $ret .= $this->xc->getXcXoopsTplAssign('start', '$start');
+ $ret .= $this->xc->getXcXoopsTplAssign('limit', '$limit');
+ $ret .= $this->pc->getPhpCodeBlankLine();
return $ret;
}
/**
* @private function getAdminPagesSwitch
- * @param $cases
+ * @param array $cases
*
* @return string
*/
- private function getAdminPagesSwitch($cases = [])
+ private function getAdminPagesSwitch(array $cases = [])
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $contentSwitch = $pc->getPhpCodeCaseSwitch($cases, true, false, "\t");
+ $contentSwitch = $this->pc->getPhpCodeCaseSwitch($cases, true, "\t");
- return $pc->getPhpCodeSwitch('op', $contentSwitch);
+ return $this->pc->getPhpCodeSwitch('op', $contentSwitch);
}
/**
@@ -115,46 +150,39 @@ private function getAdminPagesSwitch($cases = [])
* @param string $t
* @return string
*/
- private function getAdminPagesList($moduleDirname, $table, $language, $fieldInForm, $t = '')
+ private function getAdminPagesList($moduleDirname, $table, $language, $fieldInForm, string $t = '')
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $axc = Tdmcreate\Files\Admin\AdminXoopsCode::getInstance();
-
- $stuModuleDirname = mb_strtoupper($moduleDirname);
+ $stuModuleDirname = \mb_strtoupper($moduleDirname);
$tableName = $table->getVar('table_name');
$tableSoleName = $table->getVar('table_solename');
- $stuTableName = mb_strtoupper($tableName);
- $stuTableSoleName = mb_strtoupper($tableSoleName);
-
- $ret = $pc->getPhpCodeCommentLine('Define Stylesheet', '', $t);
- $ret .= $xc->getXcXoThemeAddStylesheet('style', $t);
- $ret .= $xc->getXcXoopsRequest('start', 'start', '0', 'Int', false, $t);
- $adminpager = $xc->getXcGetConfig('adminpager');
- $ret .= $xc->getXcXoopsRequest('limit', 'limit', $adminpager, 'Int', false, $t);
- $ret .= $axc->getAdminTemplateMain($moduleDirname, $tableName, $t);
- $navigation = $axc->getAdminDisplayNavigation($tableName);
- $ret .= $xc->getXcXoopsTplAssign('navigation', $navigation, true, $t);
-
- if (in_array(1, $fieldInForm)) {
- $ret .= $axc->getAdminItemButton($language, $tableName, $stuTableSoleName, '?op=new', 'add', $t);
- $ret .= $xc->getXcXoopsTplAssign('buttons', '$adminObject->displayButton(\'left\')', true, $t);
+ $stuTableName = \mb_strtoupper($tableName);
+ $stuTableSoleName = \mb_strtoupper($tableSoleName);
+
+ $ret = $this->pc->getPhpCodeCommentLine('Define Stylesheet', '', $t);
+ $ret .= $this->xc->getXcXoThemeAddStylesheet('style', $t);
+ $ret .= $this->axc->getAdminTemplateMain($moduleDirname, $tableName, $t);
+ $navigation = $this->axc->getAdminDisplayNavigation($tableName);
+ $ret .= $this->xc->getXcXoopsTplAssign('navigation', $navigation, true, $t);
+
+ if (\in_array(1, $fieldInForm)) {
+ $ret .= $this->axc->getAdminItemButton($language, $tableName, $stuTableSoleName, '?op=new', 'add', $t);
+ $ret .= $this->xc->getXcXoopsTplAssign('buttons', '$adminObject->displayButton(\'left\')', true, $t);
}
- $ret .= $xc->getXcHandlerCountObj($tableName, $t);
- $ret .= $xc->getXcHandlerAllObj($tableName, '', '$start', '$limit', $t);
- $ret .= $xc->getXcXoopsTplAssign("{$tableName}_count", "\${$tableName}Count", true, $t);
- $ret .= $xc->getXcXoopsTplAssign("{$moduleDirname}_url", "{$stuModuleDirname}_URL", true, $t);
- $ret .= $xc->getXcXoopsTplAssign("{$moduleDirname}_upload_url", "{$stuModuleDirname}_UPLOAD_URL", true, $t);
-
- $ret .= $pc->getPhpCodeCommentLine('Table view', $tableName, $t);
- $contentForeach = $xc->getXcGetValues($tableName, $tableSoleName, 'i', false, $t . "\t\t");
- $contentForeach .= $xc->getXcXoopsTplAppend("{$tableName}_list", "\${$tableSoleName}", $t . "\t\t");
- $contentForeach .= $pc->getPhpCodeUnset($tableSoleName, $t . "\t\t");
- $condIf = $pc->getPhpCodeForeach("{$tableName}All", true, false, 'i', $contentForeach, $t . "\t");
- $condIf .= $xc->getXcPageNav($tableName, $t . "\t");
- $condElse = $xc->getXcXoopsTplAssign('error', "{$language}THEREARENT_{$stuTableName}", true, $t . "\t");
- $ret .= $pc->getPhpCodeConditions("\${$tableName}Count", ' > ', '0', $condIf, $condElse, $t);
+ $ret .= $this->xc->getXcHandlerCountObj($tableName, $t);
+ $ret .= $this->xc->getXcHandlerAllObj($tableName, '', '$start', '$limit', $t);
+ $ret .= $this->xc->getXcXoopsTplAssign("{$tableName}_count", "\${$tableName}Count", true, $t);
+ $ret .= $this->xc->getXcXoopsTplAssign("{$moduleDirname}_url", "\\{$stuModuleDirname}_URL", true, $t);
+ $ret .= $this->xc->getXcXoopsTplAssign("{$moduleDirname}_upload_url", "\\{$stuModuleDirname}_UPLOAD_URL", true, $t);
+
+ $ret .= $this->pc->getPhpCodeCommentLine('Table view', $tableName, $t);
+ $contentForeach = $this->xc->getXcGetValues($tableName, $tableSoleName, 'i', false, $t . "\t\t");
+ $contentForeach .= $this->xc->getXcXoopsTplAppend("{$tableName}_list", "\${$tableSoleName}", $t . "\t\t");
+ $contentForeach .= $this->pc->getPhpCodeUnset($tableSoleName, $t . "\t\t");
+ $condIf = $this->pc->getPhpCodeForeach("{$tableName}All", true, false, 'i', $contentForeach, $t . "\t");
+ $condIf .= $this->xc->getXcPageNav($tableName, $t . "\t");
+ $condElse = $this->xc->getXcXoopsTplAssign('error', "{$language}THEREARENO_{$stuTableName}", true, $t . "\t");
+ $ret .= $this->pc->getPhpCodeConditions("\${$tableName}Count", ' > ', '0', $condIf, $condElse, $t);
return $ret;
}
@@ -168,25 +196,55 @@ private function getAdminPagesList($moduleDirname, $table, $language, $fieldInFo
* @param string $t
* @return string
*/
- private function getAdminPagesNew($moduleDirname, $tableName, $fieldInForm, $language, $t = '')
+ private function getAdminPagesNew($moduleDirname, $tableName, $fieldInForm, $language, string $t = '')
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $axc = Tdmcreate\Files\Admin\AdminXoopsCode::getInstance();
-
- $stuTableName = mb_strtoupper($tableName);
- $ret = $axc->getAdminTemplateMain($moduleDirname, $tableName, $t);
- $navigation = $axc->getAdminDisplayNavigation($tableName);
- $ret .= $xc->getXcXoopsTplAssign('navigation', $navigation, true, $t);
-
- if (in_array(1, $fieldInForm)) {
- $ret .= $axc->getAdminItemButton($language, $tableName, $stuTableName, '', 'list', $t);
- $ret .= $xc->getXcXoopsTplAssign('buttons', '$adminObject->displayButton(\'left\')', true, $t);
+ $stuTableName = \mb_strtoupper($tableName);
+ $ret = $this->axc->getAdminTemplateMain($moduleDirname, $tableName, $t);
+ $navigation = $this->axc->getAdminDisplayNavigation($tableName);
+ $ret .= $this->xc->getXcXoopsTplAssign('navigation', $navigation, true, $t);
+
+ if (\in_array(1, $fieldInForm)) {
+ $ret .= $this->axc->getAdminItemButton($language, $tableName, $stuTableName, '', 'list', $t);
+ $ret .= $this->xc->getXcXoopsTplAssign('buttons', '$adminObject->displayButton(\'left\')', true, $t);
}
- $ret .= $pc->getPhpCodeCommentLine('Get Form', null, $t);
- $ret .= $xc->getXcHandlerCreateObj($tableName, $t);
- $ret .= $xc->getXcGetForm('form', $tableName, 'Obj', $t);
- $ret .= $xc->getXcXoopsTplAssign('form', '$form->render()', true, $t);
+ $ret .= $this->xc->getXcCommonPagesNew($tableName, $t);
+
+ return $ret;
+ }
+
+ /**
+ * @private function getAdminPagesClone
+ * @param $moduleDirname
+ * @param $tableName
+ * @param $tableSoleName
+ * @param $fieldInForm
+ * @param $fieldId
+ * @param $language
+ * @param string $t
+ * @return string
+ */
+ private function getAdminPagesClone($moduleDirname, $tableName, $tableSoleName, $fieldInForm, $fieldId, $language, string $t = '')
+ {
+ $stuTableName = \mb_strtoupper($tableName);
+ $stuTableSoleName = \mb_strtoupper($tableSoleName);
+ $ccFieldId = $this->getCamelCase($fieldId, false, true);
+ $ret = $this->axc->getAdminTemplateMain($moduleDirname, $tableName, $t);
+ $navigation = $this->axc->getAdminDisplayNavigation($tableName);
+ $ret .= $this->xc->getXcXoopsTplAssign('navigation', $navigation, true, $t);
+
+ if (\in_array(1, $fieldInForm)) {
+ $ret .= $this->axc->getAdminItemButton($language, $tableName, $stuTableName, '', 'list', $t);
+ $ret .= $this->axc->getAdminItemButton($language, $tableName, $stuTableSoleName, '?op=new', 'add', $t);
+ $ret .= $this->xc->getXcXoopsTplAssign('buttons', '$adminObject->displayButton(\'left\')', true, $t);
+ }
+ $ret .= $this->pc->getPhpCodeCommentLine('Request source', '', $t);
+ $ret .= $this->xc->getXcXoopsRequest($ccFieldId . 'Source', $fieldId . '_source', '', 'Int', $t);
+
+ $ret .= $this->pc->getPhpCodeCommentLine('Check params', '', $t);
+ $contIf = $this->xc->getXcRedirectHeader($tableName, '?op=list', 3, "{$language}INVALID_PARAM", true, $t . "\t");
+ $ret .= $this->pc->getPhpCodeConditions("\${$ccFieldId}Source", ' === ', '0', $contIf, false, $t);
+
+ $ret .= $this->xc->getXcCommonPagesClone($tableName, $ccFieldId, $t, $language);
return $ret;
}
@@ -194,20 +252,17 @@ private function getAdminPagesNew($moduleDirname, $tableName, $fieldInForm, $lan
/**
* @private function getPermissionsSave
* @param $moduleDirname
- * @param $perm
+ * @param string $perm
*
* @return string
*/
- private function getPermissionsSave($moduleDirname, $perm = 'view')
+ private function getPermissionsSave($moduleDirname, string $perm = 'view')
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
-
- $ret = $pc->getPhpCodeCommentLine('Permission to', $perm, "\t\t\t");
- $ret .= $xc->getXcDeleteRight('grouppermHandler', "{$moduleDirname}_{$perm}", '$mid', '$permId', false, "\t\t\t");
- $content = $xc->getXcAddRight('grouppermHandler', "{$moduleDirname}_{$perm}", '$permId', '$onegroupId', '$mid', false, "\t\t\t\t\t");
- $foreach = $pc->getPhpCodeForeach("_POST['groups_{$perm}']", false, false, 'onegroupId', $content, "\t\t\t\t");
- $ret .= $pc->getPhpCodeConditions("isset(\$_POST['groups_{$perm}'])", null, null, $foreach, false, "\t\t\t");
+ $ret = $this->pc->getPhpCodeCommentLine('Permission to', $perm, "\t\t\t");
+ $ret .= $this->xc->getXcDeleteRight('grouppermHandler', "{$moduleDirname}_{$perm}", '$mid', '$permId', false, "\t\t\t");
+ $content = $this->xc->getXcAddRight('grouppermHandler', "{$moduleDirname}_{$perm}", '$permId', '$onegroupId', '$mid', false, "\t\t\t\t\t");
+ $foreach = $this->pc->getPhpCodeForeach("_POST['groups_{$perm}']", false, false, 'onegroupId', $content, "\t\t\t\t");
+ $ret .= $this->pc->getPhpCodeConditions("isset(\$_POST['groups_{$perm}'])", '', '', $foreach, false, "\t\t\t");
return $ret;
}
@@ -221,105 +276,102 @@ private function getPermissionsSave($moduleDirname, $perm = 'view')
* @param $fields
* @param $fieldId
* @param $fieldMain
- * @param $tablePerms
+ * @param $tablePerms
* @param string $t
* @return string
*/
- private function getAdminPagesSave($moduleDirname, $tableName, $tableSoleName, $language, $fields, $fieldId, $fieldMain, $tablePerms, $t = '')
+ private function getAdminPagesSave($moduleDirname, $tableName, $tableSoleName, $language, $fields, $fieldId, $fieldMain, $tablePerms, string $t = '')
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $axc = Tdmcreate\Files\Admin\AdminXoopsCode::getInstance();
-
+ $ret = $this->axc->getAdminTemplateMain($moduleDirname, $tableName, $t);
$ccFieldId = $this->getCamelCase($fieldId, false, true);
- $ret = $pc->getPhpCodeCommentLine('Security Check','', $t);
- $xoopsSecurityCheck = $xc->getXcXoopsSecurityCheck('!');
- $securityError = $xc->getXcXoopsSecurityErrors();
- $implode = $pc->getPhpCodeImplode(',', $securityError);
- $redirectError = $xc->getXcRedirectHeader($tableName, '', '3', $implode, true, $t . "\t");
- $ret .= $pc->getPhpCodeConditions($xoopsSecurityCheck, '', '', $redirectError, false, $t);
-
- $isset = $pc->getPhpCodeIsset($ccFieldId);
- $contentIf = $xc->getXcHandlerGet($tableName, $ccFieldId, 'Obj', $tableName . 'Handler', false, $t . "\t");
- $contentElse = $xc->getXcHandlerCreateObj($tableName, "\t\t\t");
- $ret .= $pc->getPhpCodeConditions($isset, '', '', $contentIf, $contentElse, $t);
- $ret .= $pc->getPhpCodeCommentLine('Set Vars', null, "\t\t");
+ $ret .= $this->pc->getPhpCodeCommentLine('Security Check', '', $t);
+ $xoopsSecurityCheck = $this->xc->getXcXoopsSecurityCheck('!');
+ $securityError = $this->xc->getXcXoopsSecurityErrors();
+ $implode = $this->pc->getPhpCodeImplode(',', $securityError);
+ $redirectError = $this->xc->getXcRedirectHeader($tableName, '', '3', $implode, true, $t . "\t");
+ $ret .= $this->pc->getPhpCodeConditions($xoopsSecurityCheck, '', '', $redirectError, false, $t);
+
+ $contentIf = $this->xc->getXcHandlerGetObj($tableName, $ccFieldId, $t . "\t");
+ $contentElse = $this->xc->getXcHandlerCreateObj($tableName, $t . "\t");
+ $ret .= $this->pc->getPhpCodeConditions("\${$ccFieldId}", ' > ', '0', $contentIf, $contentElse, $t);
+ $tablenameObj = $this->pc->getPhpCodeIsobject($tableName . 'Obj');
+ $redirectError = $this->xc->getXcRedirectHeader($tableName, '', '3', "{$language}INVALID_PARAM", true, $t . "\t");
+ $ret .= $this->pc->getPhpCodeConditions('!' . $tablenameObj, '', '', $redirectError, false, $t);
+ $ret .= $this->pc->getPhpCodeCommentLine('Set Vars', null, $t);
$countUploader = 0;
- foreach (array_keys($fields) as $f) {
+ $fieldLines = '';
+ foreach (\array_keys($fields) as $f) {
$fieldName = $fields[$f]->getVar('field_name');
$fieldType = $fields[$f]->getVar('field_type');
$fieldElement = $fields[$f]->getVar('field_element');
- if (1 == $fields[$f]->getVar('field_main')) {
- $fieldMain = $fieldName;
- }
if ($f > 0) { // If we want to hide field id
switch ($fieldElement) {
- case 5:
- case 6:
- $ret .= $xc->getXcSetVarCheckBoxOrRadioYN($tableName, $fieldName, $t);
- break;
- case 10:
- $ret .= $axc->getAxcSetVarImageList($tableName, $fieldName, $t, $countUploader);
- $countUploader++;
+ case Constants::FIELD_ELE_CHECKBOX:
+ case Constants::FIELD_ELE_RADIOYN:
+ $fieldLines .= $this->xc->getXcSetVarCheckBoxOrRadioYN($tableName, $fieldName, $t);
break;
- case 11:
- $ret .= $axc->getAxcSetVarUploadFile($moduleDirname, $tableName, $fieldName, false, $t, $countUploader, $fieldMain);
+ case Constants::FIELD_ELE_IMAGELIST:
+ $fieldLines .= $this->axc->getAxcSetVarImageList($tableName, $fieldName, $t, $countUploader);
$countUploader++;
break;
- case 12:
- $ret .= $axc->getAxcSetVarUploadFile($moduleDirname, $tableName, $fieldName, true, $t, $countUploader, $fieldMain);
+ case Constants::FIELD_ELE_UPLOADFILE:
+ case Constants::FIELD_ELE_SELECTFILE:
+ $fieldLines .= $this->axc->getAxcSetVarUploadFile($moduleDirname, $tableName, $fieldName, false, $t, $countUploader, $fieldMain);
$countUploader++;
break;
- case 13:
- $ret .= $axc->getAxcSetVarUploadImage($moduleDirname, $tableName, $fieldName, $fieldMain, $t, $countUploader);
+ case Constants::FIELD_ELE_URLFILE:
+ $fieldLines .= $this->axc->getAxcSetVarUploadFile($moduleDirname, $tableName, $fieldName, true, $t, $countUploader, $fieldMain);
$countUploader++;
break;
- case 14:
- $ret .= $axc->getAxcSetVarUploadFile($moduleDirname, $tableName, $fieldName, false, $t, $countUploader, $fieldMain);
+ case Constants::FIELD_ELE_UPLOADIMAGE:
+ $fieldLines .= $this->axc->getAxcSetVarUploadImage($moduleDirname, $tableName, $fieldName, $fieldMain, $t, $countUploader);
$countUploader++;
break;
- case 15:
- $ret .= $xc->getXcSetVarTextDateSelect($tableName, $tableSoleName, $fieldName, $t);
+ case Constants::FIELD_ELE_TEXTDATESELECT:
+ $fieldLines .= $this->xc->getXcSetVarTextDateSelect($tableName, $tableSoleName, $fieldName, $language, $t);
break;
- case 17:
- $ret .= $axc->getAxcSetVarPassword($tableName, $fieldName, $t);
+ case Constants::FIELD_ELE_PASSWORD:
+ $fieldLines .= $this->axc->getAxcSetVarPassword($tableName, $fieldName, $t);
break;
- case 21:
- $ret .= $xc->getXcSetVarDateTime($tableName, $tableSoleName, $fieldName, $t);
+ case Constants::FIELD_ELE_DATETIME:
+ $fieldLines .= $this->xc->getXcSetVarDateTime($tableName, $tableSoleName, $fieldName, $t, $language);
break;
default:
- $ret .= $axc->getAxcSetVarMisc($tableName, $fieldName, $fieldType, $t);
+ $fieldLines .= $this->axc->getAxcSetVarMisc($tableName, $fieldName, $fieldType, $fieldElement, $t);
break;
}
}
}
- $ret .= $pc->getPhpCodeCommentLine('Insert Data', null, "\t\t");
- $insert = $xc->getXcHandlerInsert($tableName, $tableName, 'Obj');
- $contentInsert = '';
- //if (1 == $tableCategory) {
+ if ($countUploader > 0) {
+ $ret .= $this->xc->getXcEqualsOperator('$uploaderErrors', "''", null, $t);
+ }
+ $ret .= $fieldLines;
+ $ret .= $this->pc->getPhpCodeCommentLine('Insert Data', null, $t);
+ $insert = $this->xc->getXcHandlerInsert($tableName, $tableName, 'Obj');
+ $ucfTableName = \ucfirst($tableName);
+ $ucfFieldId = $this->getCamelCase($fieldId, true);
+ $contentInsert = $this->xc->getXcEqualsOperator("\$saved{$ucfFieldId}", "\${$ccFieldId} > 0 ? \${$ccFieldId} : \${$tableName}Obj->getNewInsertedId{$ucfTableName}()", null, $t . "\t");
+
if (1 == $tablePerms) {
- $ucfTableName = ucfirst($tableName);
- $ucfFieldId = $this->getCamelCase($fieldId, true);
- $contentInsert = $xc->getXcEqualsOperator("\$new{$ucfFieldId}", "\${$tableName}Obj->getNewInsertedId{$ucfTableName}()", null, $t . "\t");
- $contentInsert .= $pc->getPhpCodeTernaryOperator('permId', "isset(\$_REQUEST['{$fieldId}'])", "\${$ccFieldId}", "\$new{$ucfFieldId}", $t . "\t");
- $contentInsert .= $xc->getXcXoopsHandler('groupperm', $t . "\t");
- $contentInsert .= $xc->getXcEqualsOperator('$mid', "\$GLOBALS['xoopsModule']->getVar('mid')", null, $t . "\t");
+ $contentInsert .= $this->xc->getXcEqualsOperator("\$permId", "\$saved{$ucfFieldId}",'', "\t\t\t");
+ $contentInsert .= $this->xc->getXcXoopsHandler('groupperm', $t . "\t");
+ $contentInsert .= $this->xc->getXcEqualsOperator('$mid', "\$GLOBALS['xoopsModule']->getVar('mid')", null, $t . "\t");
$contentInsert .= $this->getPermissionsSave($moduleDirname, 'view_' . $tableName);
$contentInsert .= $this->getPermissionsSave($moduleDirname, 'submit_' . $tableName);
$contentInsert .= $this->getPermissionsSave($moduleDirname, 'approve_' . $tableName);
}
if ($countUploader > 0) {
- $errIf = $xc->getXcRedirectHeader("'{$tableName}.php?op=edit&{$fieldId}=' . \${$ccFieldId}", '', '5', '$uploaderErrors', false, $t . "\t\t");
- $errElse = $xc->getXcRedirectHeader($tableName, '?op=list', '2', "{$language}FORM_OK", true, $t . "\t\t");
- $contentInsert .= $pc->getPhpCodeConditions("''", ' !== ', '$uploaderErrors', $errIf, $errElse, $t . "\t");
+ $errIf = $this->xc->getXcRedirectHeader("'{$tableName}.php?op=edit&{$fieldId}=' . \$saved{$ucfFieldId}", '', '5', '$uploaderErrors', false, $t . "\t\t");
+ $errElse = $this->xc->getXcRedirectHeader("'{$tableName}.php?op=list&start=' . \$start . '&limit=' . \$limit", '', '2', "{$language}FORM_OK", false, $t . "\t\t");
+ $contentInsert .= $this->pc->getPhpCodeConditions('$uploaderErrors', ' !== ', "''", $errIf, $errElse, $t . "\t");
} else {
- $contentInsert .= $xc->getXcRedirectHeader($tableName . '', '?op=list', '2', "{$language}FORM_OK", true, $t . "\t");
+ $contentInsert .= $this->xc->getXcRedirectHeader("'{$tableName}.php?op=list&start=' . \$start . '&limit=' . \$limit", '', '2', "{$language}FORM_OK", false, $t . "\t\t");
}
- $ret .= $pc->getPhpCodeConditions($insert, '', '', $contentInsert, false, $t);
- $ret .= $pc->getPhpCodeCommentLine('Get Form', null, "\t\t");
- $ret .= $xc->getXcXoopsTplAssign('error', "\${$tableName}Obj->getHtmlErrors()", true, $t);
- $ret .= $xc->getXcGetForm('form', $tableName, 'Obj', $t);
- $ret .= $xc->getXcXoopsTplAssign('form', '$form->render()', true, $t);
+ $ret .= $this->pc->getPhpCodeConditions($insert, '', '', $contentInsert, false, $t);
+ $ret .= $this->pc->getPhpCodeCommentLine('Get Form', null, $t);
+ $ret .= $this->xc->getXcXoopsTplAssign('error', "\${$tableName}Obj->getHtmlErrors()", true, $t);
+ $ret .= $this->xc->getXcGetForm('form', $tableName, 'Obj', $t);
+ $ret .= $this->xc->getXcXoopsTplAssign('form', '$form->render()', true, $t);
return $ret;
}
@@ -334,75 +386,74 @@ private function getAdminPagesSave($moduleDirname, $tableName, $tableSoleName, $
* @param string $t
* @return string
*/
- private function getAdminPagesEdit($moduleDirname, $table, $language, $fieldId, $fieldInForm, $t = '')
+ private function getAdminPagesEdit($moduleDirname, $table, $language, $fieldId, $fieldInForm, string $t = '')
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $axc = Tdmcreate\Files\Admin\AdminXoopsCode::getInstance();
-
- $tableName = $table->getVar('table_name');
- $tableSoleName = $table->getVar('table_solename');
- $stuTableName = mb_strtoupper($tableName);
- $stuTableSoleName = mb_strtoupper($tableSoleName);
- $ccFieldId = $this->getCamelCase($fieldId, false, true);
-
- $ret = $axc->getAdminTemplateMain($moduleDirname, $tableName, $t);
- $navigation = $axc->getAdminDisplayNavigation($tableName);
- $ret .= $xc->getXcXoopsTplAssign('navigation', $navigation, true, $t);
-
- if (in_array(1, $fieldInForm)) {
- $ret .= $axc->getAdminItemButton($language, $tableName, $stuTableSoleName, '?op=new', 'add', $t);
- $ret .= $axc->getAdminItemButton($language, $tableName, $stuTableName, '', 'list', $t);
- $ret .= $xc->getXcXoopsTplAssign('buttons', '$adminObject->displayButton(\'left\')', true, $t);
+ $tableName = $table->getVar('table_name');
+ $tableSoleName = $table->getVar('table_solename');
+ $stuTableName = \mb_strtoupper($tableName);
+ $stuTableSoleName = \mb_strtoupper($tableSoleName);
+ $ccFieldId = $this->getCamelCase($fieldId, false, true);
+
+ $ret = $this->axc->getAdminTemplateMain($moduleDirname, $tableName, $t);
+ $navigation = $this->axc->getAdminDisplayNavigation($tableName);
+ $ret .= $this->xc->getXcXoopsTplAssign('navigation', $navigation, true, $t);
+
+ if (\in_array(1, $fieldInForm)) {
+ $ret .= $this->axc->getAdminItemButton($language, $tableName, $stuTableSoleName, '?op=new', 'add', $t);
+ $ret .= $this->axc->getAdminItemButton($language, $tableName, $stuTableName, '', 'list', $t);
+ $ret .= $this->xc->getXcXoopsTplAssign('buttons', '$adminObject->displayButton(\'left\')', true, $t);
}
- $ret .= $pc->getPhpCodeCommentLine('Get Form', null, "\t\t");
- $ret .= $xc->getXcHandlerGet($tableName, $ccFieldId, 'Obj', $tableName . 'Handler', false, $t);
- $ret .= $xc->getXcGetForm('form', $tableName, 'Obj', $t);
- $ret .= $xc->getXcXoopsTplAssign('form', '$form->render()', true, $t);
+ $ret .= $this->xc->getXcCommonPagesEdit($tableName, $ccFieldId, $t, $language);
return $ret;
}
/**
* @private function getAdminPagesDelete
+ * @param $moduleDirname
* @param $tableName
+ * @param $tableSoleName
* @param $language
* @param $fieldId
* @param $fieldMain
+ * @param $tableNotifications
* @param string $t
* @return string
*/
- private function getAdminPagesDelete($tableName, $language, $fieldId, $fieldMain, $t = '')
+ private function getAdminPagesDelete($moduleDirname, $tableName, $tableSoleName, $language, $fieldId, $fieldMain, $tableNotifications, string $t = '')
{
- $axc = Tdmcreate\Files\Admin\AdminXoopsCode::getInstance();
-
- return $axc->getAdminCodeCaseDelete($language, $tableName, $fieldId, $fieldMain, $t);
+ $ret = $this->axc->getAdminTemplateMain($moduleDirname, $tableName, $t);
+ $navigation = $this->axc->getAdminDisplayNavigation($tableName);
+ $ret .= $this->xc->getXcXoopsTplAssign('navigation', $navigation, true, $t);
+ $ret .= $this->xc->getXcCommonPagesDelete($language, $tableName, $tableSoleName, $fieldId, $fieldMain, $tableNotifications, $t, true);
+ return $ret;
}
/**
* @public function render
- * @param null
+
*
- * @return bool|string
+ * @return string
*/
public function render()
{
- $tf = Tdmcreate\Files\CreateFile::getInstance();
- $new = $save = $edit = '';
-
- $module = $this->getModule();
- $table = $this->getTable();
- $filename = $this->getFileName();
- $moduleDirname = $module->getVar('mod_dirname');
- $tableName = $table->getVar('table_name');
- $tableSoleName = $table->getVar('table_solename');
- $tablePerms = $table->getVar('table_permissions');
- $language = $this->getLanguage($moduleDirname, 'AM');
- $fields = $tf->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'));
- $fieldInForm = null;
- $fieldId = null;
- $fieldMain = null;
- foreach (array_keys($fields) as $f) {
+ $tf = Files\CreateFile::getInstance();
+ $new = $clone = $save = $edit = '';
+
+ $module = $this->getModule();
+ $table = $this->getTable();
+ $filename = $this->getFileName();
+ $moduleDirname = $module->getVar('mod_dirname');
+ $tableName = $table->getVar('table_name');
+ $tableSoleName = $table->getVar('table_solename');
+ $tablePerms = $table->getVar('table_permissions');
+ $tableNotifications = $table->getVar('table_notifications');
+ $language = $this->getLanguage($moduleDirname, 'AM');
+ $fields = $tf->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'));
+ $fieldInForm = null;
+ $fieldId = null;
+ $fieldMain = null;
+ foreach (\array_keys($fields) as $f) {
$fieldName = $fields[$f]->getVar('field_name');
$fieldInForm[] = $fields[$f]->getVar('field_inform');
if (0 == $f) {
@@ -415,24 +466,26 @@ public function render()
$content = $this->getHeaderFilesComments($module);
$content .= $this->getAdminPagesHeader($moduleDirname, $fieldId);
$list = $this->getAdminPagesList($moduleDirname, $table, $language, $fieldInForm, "\t\t");
- if (in_array(1, $fieldInForm)) {
- $new = $this->getAdminPagesNew($moduleDirname, $tableName, $fieldInForm, $language, "\t\t");
- $save = $this->getAdminPagesSave($moduleDirname, $tableName, $tableSoleName, $language, $fields, $fieldId, $fieldMain, $tablePerms, "\t\t");
- $edit = $this->getAdminPagesEdit($moduleDirname, $table, $language, $fieldId, $fieldInForm, "\t\t");
+ if (\in_array(1, $fieldInForm)) {
+ $new = $this->getAdminPagesNew($moduleDirname, $tableName, $fieldInForm, $language, "\t\t");
+ $clone = $this->getAdminPagesClone($moduleDirname, $tableName, $tableSoleName, $fieldInForm, $fieldId, $language, "\t\t");
+ $save = $this->getAdminPagesSave($moduleDirname, $tableName, $tableSoleName, $language, $fields, $fieldId, $fieldMain, $tablePerms, "\t\t");
+ $edit = $this->getAdminPagesEdit($moduleDirname, $table, $language, $fieldId, $fieldInForm, "\t\t");
}
- $delete = $this->getAdminPagesDelete($tableName, $language, $fieldId, $fieldMain, "\t\t");
+ $delete = $this->getAdminPagesDelete($moduleDirname, $tableName, $tableSoleName, $language, $fieldId, $fieldMain, $tableNotifications, "\t\t");
$cases = [
'list' => [$list],
'new' => [$new],
+ 'clone' => [$clone],
'save' => [$save],
'edit' => [$edit],
'delete' => [$delete],
];
$content .= $this->getAdminPagesSwitch($cases);
- $content .= $this->getInclude('footer');
+ $content .= $this->getRequire('footer');
- $tf->create($moduleDirname, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $tf->create($moduleDirname, 'admin', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $tf->renderFile();
}
diff --git a/class/Files/admin/AdminXoopsCode.php b/class/Files/admin/AdminXoopsCode.php
index c270371d..1b94fe7f 100644
--- a/class/Files/admin/AdminXoopsCode.php
+++ b/class/Files/admin/AdminXoopsCode.php
@@ -1,8 +1,8 @@
-xc = Modulebuilder\Files\CreateXoopsCode::getInstance();
+ $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance();
+ $this->cf = Modulebuilder\Files\CreateFile::getInstance();
+ }
+
/**
* @static function getInstance
- * @param null
+
* @return AdminXoopsCode
*/
public static function getInstance()
@@ -53,7 +76,7 @@ public static function getInstance()
* @param string $t
* @return string
*/
- public function getAdminTemplateMain($moduleDirname, $tableName, $t = '')
+ public function getAdminTemplateMain($moduleDirname, $tableName, string $t = '')
{
return "{$t}\$templateMain = '{$moduleDirname}_admin_{$tableName}.tpl';\n";
}
@@ -69,20 +92,20 @@ public function getAdminTemplateMain($moduleDirname, $tableName, $t = '')
* @param string $t
* @return string
*/
- public function getAdminItemButton($language, $tableName, $stuTableSoleName, $op = '?op=new', $type = 'add', $t = '')
+ public function getAdminItemButton($language, $tableName, $stuTableSoleName, string $op = '?op=new', string $type = 'add', string $t = '')
{
- $stuType = mb_strtoupper($type);
+ $stuType = \mb_strtoupper($type);
$aM = $t . '$adminObject->addItemButton(';
switch ($type) {
- case 'add';
- $ret = $aM . "{$language}ADD_{$stuTableSoleName}, '{$tableName}.php{$op}', '{$type}');\n";
+ case 'add':
+ $ret = $aM . "{$language}ADD_{$stuTableSoleName}, '{$tableName}.php{$op}');\n";
break;
- case 'samplebutton';
+ case 'samplebutton':
$ret = $aM . "{$language}, '{$op}', 'add');\n";
break;
case 'default':
default:
- $ret = $aM . "{$language}{$stuTableSoleName}_{$stuType}, '{$tableName}.php{$op}', '{$type}');\n";
+ $ret = $aM . "{$language}{$stuType}_{$stuTableSoleName}, '{$tableName}.php{$op}', '{$type}');\n";
break;
}
@@ -96,7 +119,7 @@ public function getAdminItemButton($language, $tableName, $stuTableSoleName, $op
* @param string $t
* @return string
*/
- public function getAdminDisplayButton($type, $t = '')
+ public function getAdminDisplayButton($type, string $t = '')
{
return "{$t}\$adminObject->displayButton('{$type}');\n";
}
@@ -109,7 +132,7 @@ public function getAdminDisplayButton($type, $t = '')
* @param string $t
* @return string
*/
- public function getAdminDisplayNavigation($tableName, $t = '')
+ public function getAdminDisplayNavigation($tableName, string $t = '')
{
return "{$t}\$adminObject->displayNavigation('{$tableName}.php')";
}
@@ -121,7 +144,7 @@ public function getAdminDisplayNavigation($tableName, $t = '')
* @param string $t
* @return string
*/
- public function getAxcAddInfoBox($language, $t = '')
+ public function getAxcAddInfoBox($language, string $t = '')
{
return "{$t}\$adminObject->addInfoBox({$language});\n";
}
@@ -134,13 +157,13 @@ public function getAxcAddInfoBox($language, $t = '')
* @param string $t
* @return string
*/
- public function getAxcAddInfoBoxLine($label = '', $var = '', $t = '')
+ public function getAxcAddInfoBoxLine(string $label = '', string $var = '', string $t = '')
{
- $aMenu = $t . '$adminObject->addInfoBoxLine(sprintf(';
+ $aMenu = $t . '$adminObject->addInfoBoxLine(\sprintf(';
if ('' != $var) {
- $ret = $aMenu . " '', {$var}));\n";
+ $ret = $aMenu . " '', {$var}));\n";
} else {
- $ret = $aMenu . " ''));\n";
+ $ret = $aMenu . " ''));\n";
}
return $ret;
@@ -155,7 +178,7 @@ public function getAxcAddInfoBoxLine($label = '', $var = '', $t = '')
* @param string $t
* @return string
*/
- public function getAxcAddConfigBoxLine($language, $label = '', $var = '', $t = '')
+ public function getAxcAddConfigBoxLine($language, string $label = '', string $var = '', string $t = '')
{
$aMenu = $t . '$adminObject->addConfigBoxLine(';
if ('' != $var) {
@@ -175,25 +198,22 @@ public function getAxcAddConfigBoxLine($language, $label = '', $var = '', $t = '
* @param int $countUploader
* @return string
*/
- public function getAxcSetVarImageList($tableName, $fieldName, $t = '', $countUploader = 0)
+ public function getAxcSetVarImageList(string $tableName, string $fieldName, string $t = '', int $countUploader = 0)
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $ret = $pc->getPhpCodeCommentLine('Set Var', $fieldName, $t);
- $ret .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/uploader', true, false, '', $t);
- $xRootPath = "XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32'";
- $ret .= $xc->getXcMediaUploader('uploader', $xRootPath, 'mimetypes_image', 'maxsize_image', $t);
- $post = $pc->getPhpCodeGlobalsVariables('xoops_upload_file', 'POST') . '[' . $countUploader . ']';
+ $ret = $this->pc->getPhpCodeCommentLine('Set Var', $fieldName, $t);
+ $ret .= $this->pc->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH', 'class/uploader', true, false, '', $t);
+ $xRootPath = "\XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32'";
+ $ret .= $this->xc->getXcMediaUploader('uploader', $xRootPath, 'mimetypes_image', 'maxsize_image', $t);
+ $post = $this->pc->getPhpCodeGlobalsVariables('xoops_upload_file', 'POST') . '[' . $countUploader . ']';
$fetchMedia = $this->getAxcFetchMedia('uploader', $post);
$ifelse = $t . "\t//" . $this->getAxcSetPrefix('uploader', "{$fieldName}_") . ";\n";
$ifelse .= $t . "\t//{$fetchMedia};\n";
- $contElseInt = $xc->getXcSetVarObj($tableName, $fieldName, '$uploader->getSavedFileName()', $t . "\t\t");
- $contIf = $xc->getXcEqualsOperator('$errors', '$uploader->getErrors()', null, $t . "\t\t");
- $contIf .= $xc->getXcRedirectHeader('javascript:history.go(-1)', '', '3', '$errors', true, $t . "\t\t");
- $ifelse .= $pc->getPhpCodeConditions('!$uploader->upload()', '', '', $contIf, $contElseInt, $t . "\t");
- $contElseExt = $xc->getXcSetVarObj($tableName, $fieldName, "Request::getString('{$fieldName}')", $t . "\t");
+ $contIf = $this->xc->getXcSetVarObj($tableName, $fieldName, '$uploader->getSavedFileName()', $t . "\t\t");
+ $contElseInt = $this->xc->getXcEqualsOperator('$uploaderErrors', "'
' . \$uploader->getErrors()", '.', $t . "\t\t"); + $ifelse .= $this->pc->getPhpCodeConditions('$uploader->upload()', '', '', $contIf, $contElseInt, $t . "\t"); + $contElseExt = $this->xc->getXcSetVarObj($tableName, $fieldName, "Request::getString('{$fieldName}')", $t . "\t"); - $ret .= $pc->getPhpCodeConditions($fetchMedia, '', '', $ifelse, $contElseExt, $t); + $ret .= $this->pc->getPhpCodeConditions($fetchMedia, '', '', $ifelse, $contElseExt, $t); return $ret; } @@ -205,54 +225,51 @@ public function getAxcSetVarImageList($tableName, $fieldName, $t = '', $countUpl * @param string $fieldName * @param $fieldMain * @param string $t - * @param int $countUploader + * @param int $countUploader * @return string */ - public function getAxcSetVarUploadImage($moduleDirname, $tableName, $fieldName, $fieldMain, $t = '', $countUploader = 0) + public function getAxcSetVarUploadImage(string $moduleDirname, string $tableName, string $fieldName, $fieldMain, string $t = '', int $countUploader = 0) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $stuModuleDirname = mb_strtoupper($moduleDirname); - $ucfModuleDirname = ucfirst($moduleDirname); - $ret = $pc->getPhpCodeCommentLine('Set Var', $fieldName, $t); - $ret .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/uploader', true, false, '', $t); - $file = $pc->getPhpCodeGlobalsVariables($fieldName, 'FILES') . "['name']"; - $ret .= $xc->getXcEqualsOperator('$filename ', $file, null, $t); - $mimetype = $pc->getPhpCodeGlobalsVariables($fieldName, 'FILES') . "['type']"; - $ret .= $xc->getXcEqualsOperator('$imgMimetype ', $mimetype, null, $t); - $ret .= $xc->getXcEqualsOperator('$imgNameDef ', "Request::getString('{$fieldMain}')", null, $t); - $ret .= $xc->getXcEqualsOperator('$uploaderErrors', "''", null, $t); - $xUploadImage = "{$stuModuleDirname}_UPLOAD_IMAGE_PATH"; - $ret .= $xc->getXcMediaUploader('uploader', $xUploadImage . " . '/{$tableName}/'", 'mimetypes_image', 'maxsize_image', $t); - $post = $pc->getPhpCodeGlobalsVariables('xoops_upload_file', 'POST') . '[' . $countUploader . ']'; + $stuModuleDirname = \mb_strtoupper($moduleDirname); + + $ret = $this->pc->getPhpCodeCommentLine('Set Var', $fieldName, $t); + $condIf = $this->pc->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH', 'class/uploader', true, false, '', $t . "\t"); + $file = $this->pc->getPhpCodeGlobalsVariables($fieldName, 'FILES') . "['name']"; + $ret .= $this->xc->getXcEqualsOperator('$filename', $file, null, $t); + $mimetype = $this->pc->getPhpCodeGlobalsVariables($fieldName, 'FILES') . "['type']"; + $condIf .= $this->xc->getXcEqualsOperator('$imgMimetype ', $mimetype, null, $t . "\t"); + $condIf .= $this->xc->getXcEqualsOperator('$imgNameDef ', "Request::getString('{$fieldMain}')", null, $t . "\t"); + $xUploadImage = "\\{$stuModuleDirname}_UPLOAD_IMAGE_PATH"; + $condIf .= $this->xc->getXcMediaUploader('uploader', $xUploadImage . " . '/{$tableName}/'", 'mimetypes_image', 'maxsize_image', $t . "\t"); + $isset = "isset(\$_POST['xoops_upload_file'][" . $countUploader . '])'; + $post = $this->pc->getPhpCodeGlobalsVariables('xoops_upload_file', 'POST') . '[' . $countUploader . ']'; $fetchMedia = $this->getAxcFetchMedia('uploader', $post); - $expr = '/^.+\.([^.]+)$/sU'; - $ifelse = $pc->getPhpCodePregFunzions('extension', $expr, '', "\$filename", 'replace', false, $t . "\t"); - $ifelse .= $t . "\t\$imgName = str_replace(' ', '', \$imgNameDef) . '.' . \$extension;\n"; - $ifelse .= $this->getAxcSetPrefix('uploader', '$imgName', $t . "\t") . ";\n"; - $ifelse .= $t . "\t{$fetchMedia};\n"; - $contElseInt = $xc->getXcEqualsOperator('$savedFilename', '$uploader->getSavedFileName()', null, $t . "\t\t"); - $config = $xc->getXcGetConfig('maxwidth_image'); - $contElseInt .= $xc->getXcEqualsOperator('$maxwidth ', "(int){$config}", null, $t . "\t\t"); - $config = $xc->getXcGetConfig('maxheight_image'); - $contElseInt .= $xc->getXcEqualsOperator('$maxheight', "(int){$config}", null, $t . "\t\t"); - $resizer = $pc->getPhpCodeCommentLine('Resize image', '', $t . "\t\t\t"); - $resizer .= $xc->getXcEqualsOperator('$imgHandler ', "new {$ucfModuleDirname}\Common\Resizer()", null, $t . "\t\t\t"); - $resizer .= $xc->getXcEqualsOperator('$imgHandler->sourceFile ', $xUploadImage . " . '/{$tableName}/' . \$savedFilename", null, $t . "\t\t\t"); - $resizer .= $xc->getXcEqualsOperator('$imgHandler->endFile ', $xUploadImage . " . '/{$tableName}/' . \$savedFilename", null, $t . "\t\t\t"); - $resizer .= $xc->getXcEqualsOperator('$imgHandler->imageMimetype', '$imgMimetype', null, $t . "\t\t\t"); - $resizer .= $xc->getXcEqualsOperator('$imgHandler->maxWidth ', '$maxwidth', null, $t . "\t\t\t"); - $resizer .= $xc->getXcEqualsOperator('$imgHandler->maxHeight ', '$maxheight', null, $t . "\t\t\t"); - $resizer .= $xc->getXcEqualsOperator('$result ', '$imgHandler->resizeImage()', null, $t . "\t\t\t"); - $contElseInt .= $pc->getPhpCodeConditions('$maxwidth > 0 && $maxheight > 0', '', '', $resizer, false, $t . "\t\t"); - $contElseInt .= $xc->getXcSetVarObj($tableName, $fieldName, '$savedFilename', $t . "\t\t"); - $contIf = $xc->getXcEqualsOperator('$uploaderErrors', '$uploader->getErrors()', null, $t . "\t\t"); - $ifelse .= $pc->getPhpCodeConditions('!$uploader->upload()', '', '', $contIf, $contElseInt, $t . "\t"); - $ifelseExt = $xc->getXcEqualsOperator('$uploaderErrors', '$uploader->getErrors()', null, $t . "\t\t"); - $contElseExt = $pc->getPhpCodeConditions("\$filename", ' > ', "''", $ifelseExt, false, $t . "\t"); - $contElseExt .= $xc->getXcSetVarObj($tableName, $fieldName, "Request::getString('{$fieldName}')", $t . "\t"); - - $ret .= $pc->getPhpCodeConditions($fetchMedia, '', '', $ifelse, $contElseExt, $t); + $ifelse = $this->xc->getXcEqualsOperator('$extension', '\pathinfo($filename, \PATHINFO_EXTENSION)',null, $t . "\t\t"); + $ifelse .= $this->xc->getXcEqualsOperator('$imgName', "\str_replace(' ', '', \$imgNameDef) . '.' . \$extension", null,$t . "\t\t"); + $ifelse .= $this->getAxcSetPrefix('uploader', '$imgName', $t . "\t\t") . ";\n"; + $contIf = $this->xc->getXcEqualsOperator('$savedFilename', '$uploader->getSavedFileName()', null, $t . "\t\t\t"); + $config = $this->xc->getXcGetConfig('maxwidth_image'); + $contIf .= $this->xc->getXcEqualsOperator('$maxwidth ', "(int){$config}", null, $t . "\t\t\t"); + $config = $this->xc->getXcGetConfig('maxheight_image'); + $contIf .= $this->xc->getXcEqualsOperator('$maxheight', "(int){$config}", null, $t . "\t\t\t"); + $resizer = $this->pc->getPhpCodeCommentLine('Resize image', '', $t . "\t\t\t"); + $resizer .= $this->xc->getXcEqualsOperator('$imgHandler ', "new Common\Resizer()", null, $t . "\t\t\t\t"); + $resizer .= $this->xc->getXcEqualsOperator('$imgHandler->sourceFile ', $xUploadImage . " . '/{$tableName}/' . \$savedFilename", null, $t . "\t\t\t\t"); + $resizer .= $this->xc->getXcEqualsOperator('$imgHandler->endFile ', $xUploadImage . " . '/{$tableName}/' . \$savedFilename", null, $t . "\t\t\t\t"); + $resizer .= $this->xc->getXcEqualsOperator('$imgHandler->imageMimetype', '$imgMimetype', null, $t . "\t\t\t\t"); + $resizer .= $this->xc->getXcEqualsOperator('$imgHandler->maxWidth ', '$maxwidth', null, $t . "\t\t\t\t"); + $resizer .= $this->xc->getXcEqualsOperator('$imgHandler->maxHeight ', '$maxheight', null, $t . "\t\t\t\t"); + $resizer .= $this->xc->getXcEqualsOperator('$result ', '$imgHandler->resizeImage()', null, $t . "\t\t\t\t"); + $contIf .= $this->pc->getPhpCodeConditions('$maxwidth > 0 && $maxheight > 0', '', '', $resizer, false, $t . "\t\t\t"); + $contIf .= $this->xc->getXcSetVarObj($tableName, $fieldName, '$savedFilename', $t . "\t\t\t"); + $contElseInt = $this->xc->getXcEqualsOperator('$uploaderErrors', "'
' . \$uploader->getErrors()", '.', $t . "\t\t\t"); + $ifelse .= $this->pc->getPhpCodeConditions('$uploader->upload()', '', '', $contIf, $contElseInt, $t . "\t\t"); + $ifelseExt = $this->xc->getXcEqualsOperator('$uploaderErrors', "'
' . \$uploader->getErrors()", '.', $t . "\t\t\t"); + $contElseExt = $this->pc->getPhpCodeConditions('$filename', ' > ', "''", $ifelseExt, false, $t . "\t\t"); + $contElseExt .= $this->xc->getXcSetVarObj($tableName, $fieldName, "Request::getString('{$fieldName}')", $t . "\t\t"); + $condIf .= $this->pc->getPhpCodeConditions($isset . ' && ' . $fetchMedia, '', '', $ifelse, $contElseExt, $t . "\t"); + $condElse = $this->xc->getXcSetVarObj($tableName, $fieldName, "Request::getString('{$fieldName}')", $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions("'' !== (string)\$filename", '', '', $condIf, $condElse, $t); return $ret; } @@ -262,18 +279,16 @@ public function getAxcSetVarUploadImage($moduleDirname, $tableName, $fieldName, * @param $moduleDirname * @param $tableName * @param $fieldName - * @param bool $formatUrl + * @param bool $formatUrl * @param string $t - * @param int $countUploader + * @param int $countUploader * @param string $fieldMain * @return string */ - public function getAxcSetVarUploadFile($moduleDirname, $tableName, $fieldName, $formatUrl = false, $t = '', $countUploader = 0, $fieldMain = '') + public function getAxcSetVarUploadFile($moduleDirname, $tableName, $fieldName, bool $formatUrl = false, string $t = '', int $countUploader = 0, string $fieldMain = '') { - $stuModuleDirname = mb_strtoupper($moduleDirname); - $ret = $this->getAxcSetVarImageFile($stuModuleDirname . '_UPLOAD_FILES_PATH', $tableName, $fieldName, $formatUrl, $t, $countUploader, $fieldMain, 'mimetypes_file', 'maxsize_file'); - - return $ret; + $stuModuleDirname = \mb_strtoupper($moduleDirname); + return $this->getAxcSetVarImageFile('\\' . $stuModuleDirname . '_UPLOAD_FILES_PATH', $tableName, $fieldName, $formatUrl, $t, $countUploader, $fieldMain, 'mimetypes_file', 'maxsize_file'); } /** @@ -289,38 +304,45 @@ public function getAxcSetVarUploadFile($moduleDirname, $tableName, $fieldName, $ * @param string $maxsize * @return string */ - private function getAxcSetVarImageFile($dirname, $tableName, $fieldName, $formatUrl = false, $t = '', $countUploader = 0, $fieldMain = '', $mimetype = 'mimetypes_image', $maxsize = 'maxsize_image') + private function getAxcSetVarImageFile($dirname, $tableName, $fieldName, bool $formatUrl = false, string $t = '', int $countUploader = 0, string $fieldMain = '', string $mimetype = 'mimetypes_image', string $maxsize = 'maxsize_image') { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); $ret = ''; $files = ''; - $contIf = ''; + + $rpFieldName = '$' . $this->cf->getCamelCase($fieldName, false, true); if ($formatUrl) { - $ret .= $xc->getXcSetVarObj($tableName, $fieldName, "formatUrl(\$_REQUEST['{$fieldName}'])", $t); + $ret .= $this->xc->getXcEqualsOperator($rpFieldName, "formatURL((string)(\$_REQUEST['{$fieldName}'] ?? ''))", null, $t); } - $ret .= $pc->getPhpCodeCommentLine('Set Var', $fieldName, $t); - $ret .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/uploader', true, false, '', $t); - $file = $pc->getPhpCodeGlobalsVariables($fieldName, 'FILES') . "['name']"; - $ret .= $xc->getXcEqualsOperator('$filename ', $file, null, $t); - $ret .= $xc->getXcEqualsOperator('$imgNameDef ', "Request::getString('{$fieldMain}')", null, $t); - $ret .= $xc->getXcMediaUploader('uploader', $dirname . " . '/{$tableName}{$files}/'", $mimetype, $maxsize, $t); - $post = $pc->getPhpCodeGlobalsVariables('xoops_upload_file', 'POST') . '[' . $countUploader . ']'; + $ret .= $this->pc->getPhpCodeCommentLine('Set Var', $fieldName, $t); + $file = $this->pc->getPhpCodeGlobalsVariables($fieldName, 'FILES') . "['name']"; + $ret .= $this->xc->getXcEqualsOperator('$filename', $file, null, $t); + $condIf = $this->pc->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH', 'class/uploader', true, false, '', $t . "\t"); + $condIf .= $this->xc->getXcEqualsOperator('$imgNameDef', "Request::getString('{$fieldMain}')", null, $t . "\t"); + $condIf .= $this->xc->getXcMediaUploader('uploader', $dirname . " . '/{$tableName}{$files}/'", $mimetype, $maxsize, $t . "\t"); + $isset = "isset(\$_POST['xoops_upload_file'][" . $countUploader . '])'; + $post = $this->pc->getPhpCodeGlobalsVariables('xoops_upload_file', 'POST') . '[' . $countUploader . ']'; $fetchMedia = $this->getAxcFetchMedia('uploader', $post); - $expr = '/^.+\.([^.]+)$/sU'; - $ifelse = $pc->getPhpCodePregFunzions('extension', $expr, '', "\$filename", 'replace', false, $t . "\t"); - $ifelse .= $t . "\t\$imgName = str_replace(' ', '', \$imgNameDef) . '.' . \$extension;\n"; - $ifelse .= $this->getAxcSetPrefix('uploader', '$imgName', $t . "\t") . ";\n"; - $ifelse .= $t . "\t{$fetchMedia};\n"; - $contElseInt = $xc->getXcSetVarObj($tableName, $fieldName, '$uploader->getSavedFileName()', $t . "\t\t"); - $contIf .= $xc->getXcEqualsOperator('$errors', '$uploader->getErrors()', null, $t . "\t\t"); - $ifelse .= $pc->getPhpCodeConditions('!$uploader->upload()', '', '', $contIf, $contElseInt, $t . "\t"); - $ifelseExt = $xc->getXcEqualsOperator('$uploaderErrors', '$uploader->getErrors()', null, $t . "\t\t"); - $contElseExt = $pc->getPhpCodeConditions("\$filename", ' > ', "''", $ifelseExt, false, $t . "\t"); - $contElseExt .= $xc->getXcSetVarObj($tableName, $fieldName, "Request::getString('{$fieldName}')", $t . "\t"); - - $ret .= $pc->getPhpCodeConditions($fetchMedia, '', '', $ifelse, $contElseExt, $t); + $ifelse = $this->xc->getXcEqualsOperator('$extension', '\pathinfo($filename, \PATHINFO_EXTENSION)',null, $t . "\t\t"); + $ifelse .= $this->xc->getXcEqualsOperator('$imgName', "\str_replace(' ', '', \$imgNameDef) . '.' . \$extension", null,$t . "\t\t"); + $ifelse .= $this->getAxcSetPrefix('uploader', '$imgName', $t . "\t\t") . ";\n"; + $contIf = $this->xc->getXcSetVarObj($tableName, $fieldName, '$uploader->getSavedFileName()', $t . "\t\t\t"); + $contElseInt = $this->xc->getXcEqualsOperator('$uploaderErrors', "'
' . \$uploader->getErrors()", '.', $t . "\t\t\t"); + $ifelse .= $this->pc->getPhpCodeConditions('$uploader->upload()', '', '', $contIf, $contElseInt, $t . "\t\t"); + $ifelseExt = $this->xc->getXcEqualsOperator('$uploaderErrors', "'
' . \$uploader->getErrors()", '.', $t . "\t\t\t"); + $contElseExt = $this->pc->getPhpCodeConditions('$filename', ' > ', "''", $ifelseExt, false, $t . "\t\t"); + if ($formatUrl) { + $contElseExt .= $this->xc->getXcSetVarObj($tableName, $fieldName, $rpFieldName, $t . "\t\t"); + } else { + $contElseExt .= $this->xc->getXcSetVarObj($tableName, $fieldName, "Request::getString('{$fieldName}')", $t . "\t\t"); + } + $condIf.= $this->pc->getPhpCodeConditions($isset . ' && ' . $fetchMedia, '', '', $ifelse, $contElseExt, $t . "\t"); + if ($formatUrl) { + $condElse= $this->xc->getXcSetVarObj($tableName, $fieldName, $rpFieldName, $t . "\t"); + } else { + $condElse = $this->xc->getXcSetVarObj($tableName, $fieldName, "Request::getString('{$fieldName}')", $t . "\t"); + } + $ret .= $this->pc->getPhpCodeConditions("'' !== (string)\$filename", '', '', $condIf, $condElse, $t); return $ret; } @@ -332,42 +354,39 @@ private function getAxcSetVarImageFile($dirname, $tableName, $fieldName, $format * @param string $t * @return string */ - public function getAxcSetVarPassword($tableName, $fieldName, $t = '') + public function getAxcSetVarPassword($tableName, $fieldName, string $t = '') { - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $cf = Tdmcreate\Files\CreateFile::getInstance(); + $cf = Modulebuilder\Files\CreateFile::getInstance(); $ccFieldId = $cf->getCamelCase($fieldName, false, true); - $ret = $xc->getXcEqualsOperator("\${$ccFieldId}", "Request::getString('{$fieldName}', '')", '',$t); - $contIf = $xc->getXcSetVarObj($tableName, $fieldName, "password_hash(\${$ccFieldId}, PASSWORD_DEFAULT)", $t . "\t"); - $ret .= $pc->getPhpCodeConditions("''", ' !== ', "\${$ccFieldId}",$contIf, false, $t); + $ret = $this->xc->getXcEqualsOperator("\${$ccFieldId}", "Request::getString('{$fieldName}')", '',$t); + $contIf = $this->xc->getXcSetVarObj($tableName, $fieldName, "password_hash(\${$ccFieldId}, PASSWORD_DEFAULT)", $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions("\${$ccFieldId}", ' !== ', "''", $contIf, false, $t); return $ret; } - /** * @public function getAxcSetVarMisc * @param $tableName * @param $fieldName * @param $fieldType + * @param $fieldElement * @param string $t * @return string */ - public function getAxcSetVarMisc($tableName, $fieldName, $fieldType, $t = '') + public function getAxcSetVarMisc($tableName, $fieldName, $fieldType, $fieldElement, string $t = '') { - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); switch ((int)$fieldType){ case 2: case 3: case 4: case 5: - $ret = $xc->getXcSetVarObj($tableName, $fieldName, "Request::getInt('{$fieldName}', 0)", $t); + $ret = $this->xc->getXcSetVarObj($tableName, $fieldName, "Request::getInt('{$fieldName}')", $t); break; case 6: case 7: case 8: - $ret = $xc->getXcSetVarObj($tableName, $fieldName, "Request::getFloat('{$fieldName}', 0)", $t); + $ret = $this->xc->getXcSetVarObj($tableName, $fieldName, "Request::getFloat('{$fieldName}')", $t); break; case 13: case 14: @@ -375,12 +394,16 @@ public function getAxcSetVarMisc($tableName, $fieldName, $fieldType, $t = '') case 16: case 17: case 18: - $ret = $xc->getXcSetVarObj($tableName, $fieldName, "Request::getString('{$fieldName}', '')", $t); + if ((int)$fieldElement == 4) { + $ret = $this->xc->getXcSetVarObj($tableName, $fieldName, "Request::getText('{$fieldName}')", $t); + } else { + $ret = $this->xc->getXcSetVarObj($tableName, $fieldName, "Request::getString('{$fieldName}')", $t); + } break; case 0: default: //TODO: should be finally - $ret = $xc->getXcSetVarObj($tableName, $fieldName, "\$_POST['{$fieldName}']", $t); + $ret = $this->xc->getXcSetVarObj($tableName, $fieldName, "\$_POST['{$fieldName}']", $t); break; } @@ -396,7 +419,7 @@ public function getAxcSetVarMisc($tableName, $fieldName, $fieldType, $t = '') * @param string $t * @return string */ - public function getAxcFetchMedia($anchor, $var, $t = '') + public function getAxcFetchMedia($anchor, $var, string $t = '') { return "{$t}\${$anchor}->fetchMedia({$var})"; } @@ -410,42 +433,8 @@ public function getAxcFetchMedia($anchor, $var, $t = '') * @param string $t * @return string */ - public function getAxcSetPrefix($anchor, $var, $t = '') + public function getAxcSetPrefix($anchor, $var, string $t = '') { return "{$t}\${$anchor}->setPrefix({$var})"; } - - /** - * @public function getAdminCodeCaseDelete - * @param $language - * @param $tableName - * @param $fieldId - * @param $fieldMain - * @param string $t - * @return string - */ - public function getAdminCodeCaseDelete($language, $tableName, $fieldId, $fieldMain, $t = '') - { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cf = Tdmcreate\Files\CreateFile::getInstance(); - $ccFieldId = $cf->getCamelCase($fieldId, false, true); - $ret = $xc->getXcHandlerGet($tableName, $ccFieldId, 'Obj', $tableName . 'Handler', '', $t); - $reqOk = "_REQUEST['ok']"; - $isset = $pc->getPhpCodeIsset($reqOk); - $xoopsSecurityCheck = $xc->getXcXoopsSecurityCheck(); - $xoopsSecurityErrors = $xc->getXcXoopsSecurityErrors(); - $implode = $pc->getPhpCodeImplode(', ', $xoopsSecurityErrors); - $redirectHeaderErrors = $xc->getXcRedirectHeader($tableName, '', '3', $implode, true, $t . "\t\t"); - $delete = $xc->getXcHandlerDelete($tableName, $tableName, 'Obj', 'Handler'); - $condition = $pc->getPhpCodeConditions('!' . $xoopsSecurityCheck, '', '', $redirectHeaderErrors, false, $t . "\t"); - $redirectHeaderLanguage = $xc->getXcRedirectHeader($tableName, '', '3', "{$language}FORM_DELETE_OK", true, $t . "\t\t"); - $htmlErrors = $xc->getXcHtmlErrors($tableName, true); - $internalElse = $xc->getXcXoopsTplAssign('error', $htmlErrors, true, $t . "\t\t"); - $condition .= $pc->getPhpCodeConditions($delete, '', '', $redirectHeaderLanguage, $internalElse, $t . "\t"); - $mainElse = $xc->getXcXoopsConfirm($tableName, $language, $fieldId, $fieldMain, 'delete', $t . "\t"); - $ret .= $pc->getPhpCodeConditions($isset, ' && ', "1 == \${$reqOk}", $condition, $mainElse, $t); - - return $ret; - } } diff --git a/class/Files/index.php b/class/Files/index.php new file mode 100644 index 00000000..e5ee0725 --- /dev/null +++ b/class/Files/index.php @@ -0,0 +1,2 @@ + - * */ class FormRadio extends \XoopsFormRadio { @@ -32,8 +31,8 @@ public function render() { $ret = ''; $ele_name = $this->getName(); - $ele_title = $this->getTitle(); - $ele_value = $this->getValue(); + $ele_title = (string)$this->getTitle(); + $ele_value = (string)$this->getValue(); $ele_options = $this->getOptions(); $ele_extra = $this->getExtra(); $ele_delimeter = empty($this->columns) ? $this->getDelimeter() : ''; @@ -42,6 +41,12 @@ public function render() } $i = 0; $id_ele = 0; + if ('' != $ele_title) { + $ele_title = htmlspecialchars($ele_title, ENT_QUOTES); + } + if ('' != $ele_value) { + $ele_value = htmlspecialchars($ele_value, ENT_QUOTES); + } foreach ($ele_options as $value => $name) { ++$id_ele; if (!empty($this->columns)) { @@ -50,11 +55,11 @@ public function render() } $ret .= '';
}
- $ret .= '' . "' . $ele_delimeter;
+ $ret .= $ele_extra . '>' . "' . $ele_delimeter;
if (!empty($this->columns)) {
$ret .= ' ';
if (0 == ++$i % $this->columns) {
diff --git a/class/Form/FormRaw.php b/class/Form/FormRaw.php
index d1d94574..35dfc1e1 100644
--- a/class/Form/FormRaw.php
+++ b/class/Form/FormRaw.php
@@ -1,6 +1,6 @@
-
* @copyright 2012-2014 XOOPS Project (https://xoops.org)
- * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @license GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
*
* @link https://xoops.org
* @since 2.6.0
@@ -34,7 +34,7 @@ class FormRaw extends \XoopsFormElement
*
* @param string $value value
*/
- public function __construct($value = '')
+ public function __construct(string $value = '')
{
$this->setValue($value);
}
diff --git a/class/Form/FormTab.php b/class/Form/FormTab.php
index 4cf65bb9..53369760 100644
--- a/class/Form/FormTab.php
+++ b/class/Form/FormTab.php
@@ -1,6 +1,6 @@
-
* @copyright 2012-2014 XOOPS Project (https://xoops.org)
- * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @license GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
*
* @link https://xoops.org
* @since 2.0.0
@@ -26,7 +26,7 @@
\XoopsLoad::load('XoopsFormElementTray');
/**
- * Class Tdmcreate\FormTab.
+ * Class Modulebuilder\FormTab.
*/
class FormTab extends \XoopsFormElementTray
{
@@ -50,7 +50,6 @@ public function __construct($caption, $name)
public function render()
{
$ret = '';
- /* @var \XoopsFormElement $ele */
foreach ($this->getElements() as $ele) {
$ret .= NWLINE;
$ret .= '' . NWLINE;
diff --git a/class/Form/FormTabTray.php b/class/Form/FormTabTray.php
index 7745fc98..fae47ebb 100644
--- a/class/Form/FormTabTray.php
+++ b/class/Form/FormTabTray.php
@@ -1,8 +1,8 @@
-
* @copyright 2012-2014 XOOPS Project (https://xoops.org)
- * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @license GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
*
* @link https://xoops.org
* @since 2.0.0
@@ -28,7 +28,7 @@
\XoopsLoad::load('XoopsFormElementTray');
/**
- * Class Tdmcreate\FormTabTray.
+ * Class Modulebuilder\FormTabTray.
*/
class FormTabTray extends \XoopsFormElementTray
{
@@ -48,7 +48,7 @@ class FormTabTray extends \XoopsFormElementTray
* @param string $uiTheme Theme to use for jquery UI (remove? now set by theme)
* @param string $delimiter delimiter
*/
- public function __construct($caption, $name, $uiTheme = 'base', $delimiter = ' ')
+ public function __construct($caption, $name, $uiTheme = 'base', string $delimiter = ' ')
{
$this->setName($name);
$this->setCaption($caption);
@@ -65,13 +65,13 @@ public function render()
{
$GLOBALS['xoTheme']->addScript('browse.php?Frameworks/jquery/jquery.js');
$GLOBALS['xoTheme']->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
- $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . $this->uiTheme . '/ui.all.css');
+ $GLOBALS['xoTheme']->addStylesheet(\XOOPS_URL . '/modules/system/css/ui/' . $this->uiTheme . '/ui.all.css');
$GLOBALS['xoTheme']->addScript('', ['type' => 'text/javascript'], '$(function() { $("#tabs_' . $this->getName() . '").tabs(); });');
$ret = '
\n";
$ret .= "\tPlease! put your Html code here\n";
@@ -127,34 +125,32 @@ private function getMoreFilesHtml()
}
/**
- * @private function getMoreFilesText
- * @param null
+ * @private function getMorefilesText
*
* @return string
*/
- private function getMoreFilesText()
+ private function getMorefilesText()
{
return "# Please! put your text code here\n";
}
/**
- * @private function getMoreFilesSql
- * @param null
+ * @private function getMorefilesSql
*
* @return string
*/
- private function getMoreFilesSql()
+ private function getMorefilesSql()
{
return "# Please! put your sql code here\n";
}
/**
- * @private function getMoreFilesCss
- * @param $header
+ * @private function getMorefilesCss
+ * @param string $header
*
* @return string
*/
- private function getMoreFilesCss($header = '')
+ private function getMorefilesCss(string $header = '')
{
$ret = "@charset \"UTF-8\"\n";
$ret .= "{$header}\n\nPlease! put your css code here\n";
@@ -163,19 +159,18 @@ private function getMoreFilesCss($header = '')
}
/**
- * @private function getMoreFilesDefault
- * @param null
+ * @private function getMorefilesDefault
*
* @return string
*/
- private function getMoreFilesDefault()
+ private function getMorefilesDefault()
{
return "Default File\n";
}
/**
* @public function render
- * @return bool|string
+ * @return string
*/
public function render()
{
@@ -185,29 +180,29 @@ public function render()
$header = $this->getHeaderFilesComments($module, 0);
switch ($this->extension) {
case 'php':
- $content = $this->getMoreFilesPhp($header);
+ $content = $this->getMorefilesPhp($header);
break;
case 'tpl':
- $content = $this->getMoreFilesTpl();
+ $content = $this->getMorefilesTpl();
break;
case 'html':
- $content = $this->getMoreFilesHtml();
+ $content = $this->getMorefilesHtml();
break;
case 'text':
- $content = $this->getMoreFilesText();
+ $content = $this->getMorefilesText();
break;
case 'sql':
- $content = $this->getMoreFilesSql();
+ $content = $this->getMorefilesSql();
break;
case 'css':
- $content = $this->getMoreFilesCss($header);
+ $content = $this->getMorefilesCss($header);
break;
default:
- $content = $this->getMoreFilesDefault();
+ $content = $this->getMorefilesDefault();
break;
}
- $this->create($moduleDirname, $this->folder, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->create($moduleDirname, $this->folder, $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $this->renderFile();
}
diff --git a/class/Files/CreatePhpCode.php b/class/Files/CreatePhpCode.php
index 957edccf..b57e2823 100644
--- a/class/Files/CreatePhpCode.php
+++ b/class/Files/CreatePhpCode.php
@@ -1,8 +1,8 @@
- $value) {
if ('' === $string && '' === $value) {
$ret .= "{$t} *\n";
} else {
- $ret .= "{$t} * {$string} {$value}\n";
+ if ('' === $value) {
+ $ret .= "{$t} * {$string}\n";
+ } else {
+ $ret .= "{$t} * {$string} {$value}\n";
+ }
}
}
$ret .= "{$t} */\n";
@@ -86,45 +92,46 @@ public function getPhpCodeCommentMultiLine($multiLine = [], $t = '')
/**
* @public function getPhpCodeDefine
- * @param $left
- * @param $right
+ * @param $left
+ * @param $right
*
* @param string $t
* @param bool $leftstr
* @return string
*/
- public function getPhpCodeDefine($left, $right, $t = '', $leftstr = true)
+ public function getPhpCodeDefine($left, $right, string $t = '', bool $leftstr = true)
{
- $ret = "{$t}define(";
+ $ret = "{$t}\define(";
if ($leftstr) {
$ret .= "'{$left}'";
} else {
$ret .= "{$left}";
}
$ret .= ", {$right});\n";
+
return $ret;
}
/**
* @public function getPhpCodeDefine
- * @param $left
- * @param $right
+ * @param string $left
+ * @param string $right
*
* @return string
*/
- public function getPhpCodeDefined($left = 'XOOPS_ROOT_PATH', $right = 'Restricted access')
+ public function getPhpCodeDefined(string $left = 'XOOPS_ROOT_PATH', string $right = 'Restricted access')
{
- return "defined('{$left}') || die('{$right}');\n";
+ return "\defined('{$left}') || die('{$right}');\n";
}
/**
* @public function getPhpCodeGlobals
* @param $var
- * @param $value
+ * @param string $value
*
* @return string
*/
- public function getPhpCodeGlobals($var, $value = '')
+ public function getPhpCodeGlobals($var, string $value = '')
{
if ('' != $value) {
$ret = "\$GLOBALS['{$var}'] = \${$value};\n";
@@ -138,13 +145,13 @@ public function getPhpCodeGlobals($var, $value = '')
/**
* @public function getPhpCodeGlobalsVariables
* @param $var
- * @param $type
+ * @param string $type
*
* @return string
*/
- public function getPhpCodeGlobalsVariables($var = null, $type = 'REQUEST')
+ public function getPhpCodeGlobalsVariables($var = null, string $type = 'REQUEST')
{
- $type = mb_strtoupper($type);
+ $type = \mb_strtoupper($type);
switch ($type) {
case 'GET':
$ret = "\$_GET['{$var}']";
@@ -177,12 +184,12 @@ public function getPhpCodeGlobalsVariables($var = null, $type = 'REQUEST')
* @param $string
*
* @param string $n
- * @param string $t
+ * @param string $r
* @return string
*/
- public function getPhpCodeRemoveCarriageReturn($string, $n = "\n", $t = "\r")
+ public function getPhpCodeRemoveCarriageReturn($string, string $n = "\n", string $r = "\r")
{
- return str_replace([(string)$n, (string)$t], '', $string);
+ return \str_replace([(string)$n, (string)$r], '', $string);
}
/**
@@ -193,24 +200,24 @@ public function getPhpCodeRemoveCarriageReturn($string, $n = "\n", $t = "\r")
*/
public function getPhpCodeFileExists($filename)
{
- return "file_exists({$filename})";
+ return "\\file_exists({$filename})";
}
/**
* @public function getPhpCodeIncludeDir
* @param $directory
* @param $filename
- * @param bool $once
- * @param bool $isPath
+ * @param bool $once
+ * @param bool $isPath
*
* @param string $type
* @param string $t
* @return string
*/
- public function getPhpCodeIncludeDir($directory = null, $filename = null, $once = false, $isPath = false, $type = 'include', $t = '')
+ public function getPhpCodeIncludeDir($directory = null, $filename = null, bool $once = false, bool $isPath = false, string $type = 'require', string $t = '')
{
if ('' === $type) {
- $type = 'include';
+ $type = 'require';
}
if (false === $once) {
if (!$isPath) {
@@ -235,29 +242,38 @@ public function getPhpCodeIncludeDir($directory = null, $filename = null, $once
* @param $condition
* @param $one
* @param $two
- * @param $t - Indentation
+ * @param string $t - Indentation
*
* @return string
*/
- public function getPhpCodeTernaryOperator($return, $condition, $one, $two, $t = '')
+ public function getPhpCodeTernaryOperator($return, $condition, $one, $two, string $t = '')
{
- return "{$t}\${$return} = {$condition} ? {$one} : {$two};\n";
+ $ret = "{$t}\${$return} = {$condition} ?";
+ if ('' != $one) {
+ //not shorthand/elvis
+ $ret .= " {$one} ";
+ }
+ $ret .= ": {$two};\n";
+
+ return $ret;
}
/**
* @public function getPhpCodeClass
- * @param $name
- * @param $content
- * @param $extends
- * @param $type
+ * @param $name
+ * @param $content
+ * @param $extends
+ * @param $type
*
+ * @param null $implements
* @return string
*/
- public function getPhpCodeClass($name = null, $content = null, $extends = null, $type = null)
+ public function getPhpCodeClass($name = null, $content = null, $extends = null, $type = null, $implements = null)
{
$typ = (null != $type) ? "{$type} " : '';
$ext = (null != $extends) ? " extends {$extends}" : '';
- $ret = "{$typ}class {$name}{$ext}\n";
+ $imp = (null != $implements) ? " implements {$implements}" : '';
+ $ret = "{$typ}class {$name}{$ext}{$imp}\n";
$ret .= '{';
$ret .= $content;
$ret .= "}\n";
@@ -267,14 +283,14 @@ public function getPhpCodeClass($name = null, $content = null, $extends = null,
/**
* @public function getPhpCodeClass
- * @param $type
+ * @param string $type
* @param $name
- * @param $assign
- * @param $t - Indentation
+ * @param string $assign
+ * @param string $t - Indentation
*
* @return string
*/
- public function getPhpCodeVariableClass($type = 'private', $name = null, $assign = 'null', $t = '')
+ public function getPhpCodeVariableClass(string $type = 'private', $name = null, string $assign = 'null', string $t = '')
{
return "{$t}{$type} \${$name} = {$assign};\n";
}
@@ -306,11 +322,11 @@ public function getPhpCodeInterface($name = null, $content = null, $extends = nu
* @param $params
* @param $content
* @param $method
- * @param bool $isRef
+ * @param bool $isRef
* @param string $t - Indentation
* @return string
*/
- public function getPhpCodeFunction($name = null, $params = null, $content = null, $method = null, $isRef = false, $t = '')
+ public function getPhpCodeFunction($name = null, $params = null, $content = null, $method = null, bool $isRef = false, string $t = '')
{
$inClass = (null != $method) ? $method : '';
$ref = (false !== $isRef) ? '&' : '';
@@ -328,21 +344,25 @@ public function getPhpCodeFunction($name = null, $params = null, $content = null
* @param string $operator
* @param string $type
* @param string $contentIf
- * @param mixed $contentElse
+ * @param mixed $contentElse
* @param string $t - Indentation
*
* @param string $conditionElse
* @return string
*/
- public function getPhpCodeConditions($condition = null, $operator = null, $type = null, $contentIf = null, $contentElse = false, $t = '', $conditionElse = '')
+ public function getPhpCodeConditions(string $condition = '', string $operator = '', string $type = '', string $contentIf = '', $contentElse = false, string $t = '', string $conditionElse = '')
{
- if (false === $contentElse) {
- $ret = "{$t}if ({$condition}{$operator}{$type}) {\n";
- $ret .= $contentIf;
- $ret .= "{$t}}\n";
+ if ('==' === \trim($operator) || '===' === \trim($operator) || '!=' === \trim($operator) || '!==' === \trim($operator)) {
+ //yoda conditions
+ $left = $type;
+ $right = $condition;
} else {
- $ret = "{$t}if ({$condition}{$operator}{$type}) {\n";
- $ret .= $contentIf;
+ $left = $condition;
+ $right = $type;
+ }
+ $ret = "{$t}if ({$left}{$operator}{$right}) {\n";
+ $ret .= $contentIf;
+ if (false !== $contentElse) {
if ('' !== $conditionElse) {
$ret .= "{$t}} elseif ({$conditionElse}) {\n";
} else {
@@ -350,24 +370,24 @@ public function getPhpCodeConditions($condition = null, $operator = null, $type
}
$ret .= $contentElse;
- $ret .= "{$t}}\n";
}
+ $ret .= "{$t}}\n";
return $ret;
}
/**
* @public function getPhpCodeForeach
- * @param string $array
+ * @param string $array
* @param bool|string $arrayKey
* @param bool|string $key
* @param bool|string $value
- * @param string $content
+ * @param string|null $content
*
- * @param string $t
+ * @param string $t
* @return string
*/
- public function getPhpCodeForeach($array, $arrayKey = false, $key = false, $value = false, $content = null, $t = '')
+ public function getPhpCodeForeach(string $array, $arrayKey = false, $key = false, $value = false, string $content = null, string $t = '')
{
$vars = '';
$value = '' !== $value ? $value : 'i';
@@ -376,10 +396,10 @@ public function getPhpCodeForeach($array, $arrayKey = false, $key = false, $valu
} elseif ((false === $arrayKey) && (false !== $key)) {
$vars = "\${$array} as \${$key} => \${$value}";
} elseif ((false !== $arrayKey) && (false === $key)) {
- $vars = "array_keys(\${$array}) as \${$value}";
+ $vars = "\array_keys(\${$array}) as \${$value}";
}
- $ret = "{$t}foreach({$vars}) {\n";
+ $ret = "{$t}foreach ({$vars}) {\n";
$ret .= "{$content}";
$ret .= "{$t}}\n";
@@ -397,9 +417,9 @@ public function getPhpCodeForeach($array, $arrayKey = false, $key = false, $valu
* @param string $t
* @return string
*/
- public function getPhpCodeFor($var = null, $content = null, $value = null, $initVal = null, $operator = null, $t = '')
+ public function getPhpCodeFor($var = null, $content = null, $value = null, $initVal = null, $operator = null, string $t = '')
{
- $ret = "{$t}for(\${$var} = {$initVal}; \${$var} {$operator} \${$value}; \${$var}++) {\n";
+ $ret = "{$t}for (\${$var} = {$initVal}; \${$var} {$operator} \${$value}; \${$var}++) {\n";
$ret .= "{$content}";
$ret .= "{$t}}\n";
@@ -412,11 +432,11 @@ public function getPhpCodeFor($var = null, $content = null, $value = null, $init
* @param $content
* @param $value
* @param $operator
- * @param $t
+ * @param string $t
*
* @return string
*/
- public function getPhpCodeWhile($var = null, $content = null, $value = null, $operator = null, $t = '')
+ public function getPhpCodeWhile($var = null, $content = null, $value = null, $operator = null, string $t = '')
{
$ret = "{$t}while (\${$var} {$operator} {$value}) {\n";
$ret .= "{$t}{$content}";
@@ -428,17 +448,19 @@ public function getPhpCodeWhile($var = null, $content = null, $value = null, $op
/**
* @public function getPhpCodeSwitch
*
- * @param $op
- * @param $content
- * @param $t
+ * @param $op
+ * @param $content
+ * @param string $t
*
+ * @param bool $isParam
* @return string
*/
- public function getPhpCodeSwitch($op = null, $content = null, $t = '')
+ public function getPhpCodeSwitch($op = null, $content = null, string $t = '', bool $isParam = true)
{
- $ret = "{$t}switch(\${$op}) {\n";
- $ret .= $content;
- $ret .= "{$t}}\n";
+ $value = $isParam ? "\${$op}" : $op;
+ $ret = "{$t}switch ({$value}) {\n";
+ $ret .= $content;
+ $ret .= "{$t}}\n";
return $ret;
}
@@ -446,37 +468,37 @@ public function getPhpCodeSwitch($op = null, $content = null, $t = '')
/**
* @public function getPhpCodeCaseSwitch
*
- * @param $cases
- * @param $defaultAfterCase
- * @param $default
- * @param $t
- *
+ * @param array $cases
+ * @param bool $defaultAfterCase
+ * @param string $t
+ * @param bool $isConst
* @return string
*/
- public function getPhpCodeCaseSwitch($cases = [], $defaultAfterCase = false, $default = false, $t = '')
+ public function getPhpCodeCaseSwitch(array $cases = [], bool $defaultAfterCase = false, string $t = '', bool $isConst = false)
{
$ret = '';
$def = "{$t}default:\n";
foreach ($cases as $case => $value) {
- $case = is_string($case) ? "'{$case}'" : $case;
- if (!empty($case)) {
+ $case = $isConst || !\is_string($case) ? $case : "'{$case}'";
+ if (empty($value)) {
+ $ret .= "{$t}case {$case}:\n";
+ } elseif (!empty($case)) {
$ret .= "{$t}case {$case}:\n";
if (false !== $defaultAfterCase) {
$ret .= $def;
}
- if (is_array($value)) {
+ $lastContent = '';
+ if (\is_array($value)) {
foreach ($value as $content) {
$ret .= "{$content}";
+ $lastContent = $content;
}
}
- $ret .= "{$t}break;\n";
+ if (0 == strpos(strtolower($lastContent), "\treturn ")) {
+ $ret .= "{$t}\tbreak;\n";
+ }
+ $defaultAfterCase = false;
}
- $defaultAfterCase = false;
- }
- if (false !== $default) {
- $ret .= $def;
- $ret .= "{$t}{$default}\n";
- $ret .= "{$t}break;\n";
}
return $ret;
@@ -492,13 +514,23 @@ public function getPhpCodeIsset($var)
return "isset(\${$var})";
}
+ /**
+ * @public function getPhpCodeIsset
+ * @param $var
+ * @return string
+ */
+ public function getPhpCodeIsobject($var)
+ {
+ return "\is_object(\${$var})";
+ }
+
/**
* @public function getPhpCodeUnset
* @param string $var
* @param string $t
* @return string
*/
- public function getPhpCodeUnset($var = '', $t = '')
+ public function getPhpCodeUnset(string $var = '', string $t = '')
{
return "{$t}unset(\${$var});\n";
}
@@ -510,7 +542,7 @@ public function getPhpCodeUnset($var = '', $t = '')
*/
public function getPhpCodeIsDir($var)
{
- return "is_dir({$var})";
+ return "\is_dir({$var})";
}
/**
@@ -521,7 +553,7 @@ public function getPhpCodeIsDir($var)
*/
public function getPhpCodeImplode($left, $right)
{
- return "implode('{$left}', {$right})";
+ return "\implode('{$left}', {$right})";
}
/**
@@ -532,7 +564,7 @@ public function getPhpCodeImplode($left, $right)
*/
public function getPhpCodeExplode($left, $right)
{
- return "explode('{$left}', {$right})";
+ return "\\explode('{$left}', {$right})";
}
/**
@@ -542,7 +574,7 @@ public function getPhpCodeExplode($left, $right)
* @param string $t
* @return string
*/
- public function getPhpCodeChmod($var, $perm = '0777', $t = '')
+ public function getPhpCodeChmod($var, string $perm = '0777', string $t = '')
{
return "{$t}chmod(\${$var}, {$perm});\n";
}
@@ -554,9 +586,9 @@ public function getPhpCodeChmod($var, $perm = '0777', $t = '')
* @param string $t
* @return string
*/
- public function getPhpCodeMkdir($var, $perm = '0777', $t = '')
+ public function getPhpCodeMkdir($var, string $perm = '0777', string $t = '')
{
- return "{$t}mkdir(\${$var}, {$perm});\n";
+ return "{$t}\mkdir(\${$var}, {$perm});\n";
}
/**
@@ -566,24 +598,24 @@ public function getPhpCodeMkdir($var, $perm = '0777', $t = '')
* @param string $t
* @return string
*/
- public function getPhpCodeCopy($file, $newfile = '', $t = '')
+ public function getPhpCodeCopy($file, string $newfile = '', string $t = '')
{
- return "{$t}copy({$file}, {$newfile});\n";
+ return "{$t}\copy({$file}, {$newfile});\n";
}
/**
* @public function getPhpCodeArray
* @param $var
* @param $array
- * @param bool $isParam
+ * @param bool $isParam
*
* @param string $t
* @return string
*/
- public function getPhpCodeArray($var, $array = null, $isParam = false, $t = "\t\t")
+ public function getPhpCodeArray($var, $array = null, bool $isParam = false, string $t = "\t\t")
{
$retArray = [];
- if (is_array($array) && !empty($array)) {
+ if (\is_array($array) && !empty($array)) {
foreach ($array as $k => $v) {
if (is_numeric($k)) {
$retArray[] = $v;
@@ -591,7 +623,7 @@ public function getPhpCodeArray($var, $array = null, $isParam = false, $t = "\t\
$retArray[] = "{$k} => {$v}";
}
}
- $arrayContent = implode(', ', $retArray);
+ $arrayContent = \implode(', ', $retArray);
} else {
$arrayContent = '';
}
@@ -612,18 +644,18 @@ public function getPhpCodeArray($var, $array = null, $isParam = false, $t = "\t\
* @param $type
* @param $left
* @param $right
- * @param bool $isParam
+ * @param bool $isParam
*
* @param string $t
* @return string
*/
- public function getPhpCodeArrayType($var, $type, $left, $right = null, $isParam = false, $t = "\t\t")
+ public function getPhpCodeArrayType($var, $type, $left, $right = null, bool $isParam = false, string $t = "\t\t")
{
$vars = (null != $right) ? "\${$left}, {$right}" : "\${$left}";
if (!$isParam) {
- $ret = "{$t}\${$var}[] = array_{$type}({$vars});\n";
+ $ret = "{$t}\${$var}[] = \array_{$type}({$vars});\n";
} else {
- $ret = "array_{$type}({$vars})";
+ $ret = "\array_{$type}({$vars})";
}
return $ret;
@@ -635,9 +667,9 @@ public function getPhpCodeArrayType($var, $type, $left, $right = null, $isParam
* @param string $t
* @return string
*/
- public function getPhpCodeArrayShift($var, $t = '')
+ public function getPhpCodeArrayShift($var, string $t = '')
{
- return "{$t}array_shift({$var});\n";
+ return "{$t}\array_shift({$var});\n";
}
/**
@@ -648,7 +680,7 @@ public function getPhpCodeArrayShift($var, $t = '')
*/
public function getPhpCodeSprintf($left, $right)
{
- return "sprintf({$left}, {$right})";
+ return "\sprintf({$left}, {$right})";
}
/**
@@ -688,14 +720,14 @@ public function getPhpCodeRawurlencode($var)
* @param $str
* @param $val
* @param string $type
- * @param bool $isParam
+ * @param bool $isParam
*
* @param string $t
* @return string
*/
- public function getPhpCodePregFunzions($var, $exp, $str, $val, $type = 'match', $isParam = false, $t = "\t")
+ public function getPhpCodePregFunzions($var, $exp, $str, $val, string $type = 'match', bool $isParam = false, string $t = "\t")
{
- $pregFunz = "preg_{$type}('";
+ $pregFunz = "\preg_{$type}('";
if (!$isParam) {
$ret = "{$t}\${$var} = {$pregFunz}{$exp}', '{$str}', {$val});\n";
} else {
@@ -712,14 +744,14 @@ public function getPhpCodePregFunzions($var, $exp, $str, $val, $type = 'match',
* @param $str
* @param $value
* @param string $type
- * @param bool $isParam
+ * @param bool $isParam
*
* @param string $t
* @return string
*/
- public function getPhpCodeStrType($left, $var, $str, $value, $type = 'replace', $isParam = false, $t = "\t")
+ public function getPhpCodeStrType($left, $var, $str, $value, string $type = 'replace', bool $isParam = false, string $t = "\t")
{
- $strType = "str_{$type}('";
+ $strType = "\str_{$type}('";
if (!$isParam) {
$ret = "{$t}\${$left} = {$strType}{$var}', '{$str}', {$value});\n";
} else {
@@ -733,17 +765,17 @@ public function getPhpCodeStrType($left, $var, $str, $value, $type = 'replace',
* @public function getPhpCodeStripTags
* @param $left
* @param $value
- * @param bool $isParam
- *
+ * @param bool $isParam
+ * @param string $operator
* @param string $t
* @return string
*/
- public function getPhpCodeStripTags($left, $value, $isParam = false, $t = '')
+ public function getPhpCodeStripTags($left, $value, bool $isParam = false, string $t = '', string $operator = '=')
{
if (!$isParam) {
- $ret = "{$t}\${$left} = strip_tags({$value});\n";
+ $ret = "{$t}\${$left} " . $operator . " \strip_tags({$value});\n";
} else {
- $ret = "strip_tags({$value})";
+ $ret = "\strip_tags({$value})";
}
return $ret;
@@ -752,76 +784,73 @@ public function getPhpCodeStripTags($left, $value, $isParam = false, $t = '')
/**
* @public function getPhpCodeHtmlentities
* @param $entitiesVar
- * @param $entitiesQuote
+ * @param int|string|false $entitiesQuote
* @return string
*/
- public function getPhpCodeHtmlentities($entitiesVar, $entitiesQuote = false)
+ public function getPhpCodeHtmlentities($entitiesVar, int|string|false $entitiesQuote = false)
{
$entitiesVar = (false !== $entitiesQuote) ? $entitiesVar . ', ' . $entitiesQuote : $entitiesVar;
- $entities = "htmlentities({$entitiesVar})";
-
- return $entities;
+ return "htmlentities({$entitiesVar})";
}
/**
* @public function getPhpCodeHtmlspecialchars
* @param $specialVar
- * @param $specialQuote
+ * @param int|string|false $specialQuote
* @return string
*/
- public function getPhpCodeHtmlspecialchars($specialVar, $specialQuote = false)
+ public function getPhpCodeHtmlspecialchars($specialVar, int|string|false $specialQuote = false)
{
$specialVar = (false !== $specialQuote) ? $specialVar . ', ' . $specialQuote : $specialVar;
- $specialchars = "htmlspecialchars({$specialVar})";
-
- return $specialchars;
+ return "htmlspecialchars({$specialVar})";
}
/**
* @public function getPhpCodeNamespace
- * @param $dimensions
+ * @param $dimensions
* @param string $t
* @param string $n
* @return string
*/
- public function getPhpCodeNamespace($dimensions, $t = '', $n = "\n\n")
+ public function getPhpCodeNamespace($dimensions, string $t = '', string $n = "\n\n")
{
- $ret = "\n{$t}namespace ";
+ $ret = "\n{$t}namespace ";
foreach ($dimensions as $key => $dim) {
if ($key > 0) {
- $ucfDim = ucfirst($dim);
- $ret .= "\\{$ucfDim}";
+ $ucfDim = \ucfirst($dim);
+ $ret .= "\\{$ucfDim}";
} else {
$ret .= "{$dim}";
}
}
- $ret .= ";" . $n;
+ $ret .= ';' . $n;
return $ret;
}
/**
* @public function getPhpCodeUseNamespace
- * @param $dimensions
+ * @param $dimensions
* @param string $t
* @param string $n
* @return string
*/
- public function getPhpCodeUseNamespace($dimensions, $t = '', $n = "\n\n")
+ public function getPhpCodeUseNamespace($dimensions, string $t = '', string $n = "\n\n")
{
- $ret = "\n{$t}use ";
+ $ret = "\n{$t}use ";
foreach ($dimensions as $key => $dim) {
if ($key > 0) {
- $ucfDim = ucfirst($dim);
- $ret .= "\\{$ucfDim}";
+ $ucfDim = \ucfirst($dim);
+ $ret .= "\\{$ucfDim}";
} else {
$ret .= "{$dim}";
}
}
- $ret .= ";" . $n;
+ $ret .= ';' . $n;
return $ret;
}
+
/**
* @public function getPhpCodeBlankLine
*
@@ -835,28 +864,27 @@ public function getPhpCodeBlankLine()
/**
* @public function getPhpCodeConstant
*
- * @param $const
- * @param $value
+ * @param $const
+ * @param $value
* @param string $t
* @param string $type
* @return string
*/
- public function getPhpCodeConstant($const, $value, $t = '', $type = 'const')
+ public function getPhpCodeConstant($const, $value, string $t = '', string $type = 'const')
{
- return "{$t}{$type} {$const} = {$value};\n";
+ return "{$t}{$type} {$const} = {$value};\n";
}
/**
* @public function getPhpCodeTriggerError
*
- * @param $msg
- * @param $type
+ * @param $msg
+ * @param $type
* @param string $t
* @return string
*/
- public function getPhpCodeTriggerError($msg, $type, $t ='')
+ public function getPhpCodeTriggerError($msg, $type, string $t = '')
{
- $ret = "{$t}trigger_error($msg, {$type});\n";
- return $ret;
+ return "{$t}\\trigger_error($msg, {$type});\n";
}
}
diff --git a/class/Files/CreateSmartyCode.php b/class/Files/CreateSmartyCode.php
index e2798789..9fee1358 100644
--- a/class/Files/CreateSmartyCode.php
+++ b/class/Files/CreateSmartyCode.php
@@ -1,9 +1,9 @@
-getAttributes($attributes);
- $ret = "{$t}<{{$tag}{$attr}}>{$content}<{/{$tag}}>";
-
- return $ret;
+ return "{$t}<{{$tag}{$attr}}>{$content}<{/{$tag}}>";
}
/**
@@ -81,7 +78,7 @@ public function getSmartyTag($tag = '', $attributes = [], $content = '', $t = ''
*
* @return string
*/
- private function getAttributes($attributes)
+ private function getAttributes(array $attributes)
{
$str = '';
foreach ($attributes as $name => $value) {
@@ -99,7 +96,7 @@ private function getAttributes($attributes)
*
* @return string
*/
- public function getSmartyEmpty($empty = '')
+ public function getSmartyEmpty(string $empty = '')
{
return (string)$empty;
}
@@ -111,7 +108,7 @@ public function getSmartyEmpty($empty = '')
* @param string $n
* @return string
*/
- public function getSmartyComment($comment = '', $t = '', $n = "\n")
+ public function getSmartyComment(string $comment = '', string $t = '', string $n = "\n")
{
return "{$t}<{* {$comment} *}>{$n}";
}
@@ -122,7 +119,7 @@ public function getSmartyComment($comment = '', $t = '', $n = "\n")
* @param string $t
* @return string
*/
- public function getSmartyNoSimbol($noSimbol = '', $t = '')
+ public function getSmartyNoSimbol(string $noSimbol = '', string $t = '')
{
return "{$t}<{{$noSimbol}}>";
}
@@ -132,11 +129,12 @@ public function getSmartyNoSimbol($noSimbol = '', $t = '')
* @param string $language
* @param mixed $const
* @param string $t
+ * @param string $n
* @return string
*/
- public function getSmartyConst($language, $const, $t = '')
+ public function getSmartyConst(string $language, $const, string $t = '', string $n = '')
{
- return "{$t}<{\$smarty.const.{$language}{$const}}>";
+ return "{$t}<{\$smarty.const.{$language}{$const}}>{$n}";
}
/**
@@ -144,11 +142,22 @@ public function getSmartyConst($language, $const, $t = '')
* @param string $var
* @param string $t
* @param string $n
+ * @param string $default
+ * @param string $escape
* @return string
*/
- public function getSmartySingleVar($var, $t = '', $n = "")
+ public function getSmartySingleVar(string $var, string $t = '', string $n = '', string $default = 'false', string $escape = '')
{
- return "{$t}<{\${$var}}>{$n}";
+ $ret = "{$t}<{\${$var}";
+ if ('' !== $default) {
+ $ret .= '|default:' . $default;
+ }
+ if ('' !== $escape) {
+ $ret .= '|escape:' . $escape;
+ }
+ $ret .= "}>{$n}";
+
+ return $ret;
}
/**
@@ -157,11 +166,18 @@ public function getSmartySingleVar($var, $t = '', $n = "")
* @param string $rightVar
* @param string $t
* @param string $n
+ * @param string $default
+ * @param string $escape
* @return string
*/
- public function getSmartyDoubleVar($leftVar, $rightVar, $t = '', $n = "")
+ public function getSmartyDoubleVar(string $leftVar, string $rightVar, string $t = '', string $n = '', string $default = 'false', string $escape = '')
{
- return "{$t}<{\${$leftVar}.{$rightVar}}>{$n}";
+ $ret = "{$t}<{\${$leftVar}.{$rightVar}|default:{$default}";
+ if ('' !== $escape) {
+ $ret .= '|escape:' . $escape;
+ }
+ $ret .= "}>{$n}";
+ return $ret;
}
/**
@@ -169,23 +185,17 @@ public function getSmartyDoubleVar($leftVar, $rightVar, $t = '', $n = "")
* @param $moduleDirname
* @param string $fileName
* @param bool $admin
- *
- * @param bool $q
* @param string $t
* @param string $n
+ * @param string $attributes
* @return string
*/
- public function getSmartyIncludeFile($moduleDirname, $fileName = 'header', $admin = false, $q = false, $t = '', $n = "\n")
+ public function getSmartyIncludeFile($moduleDirname, string $fileName = 'header', bool $admin = false, string $t = '', string $n = "\n", string $attributes = '')
{
- $ret = '';
- if (!$admin && !$q) {
- $ret = "{$t}<{include file='db:{$moduleDirname}_{$fileName}.tpl'}>{$n}";
- } elseif ($admin && !$q) {
- $ret = "{$t}<{include file='db:{$moduleDirname}_admin_{$fileName}.tpl'}>{$n}";
- } elseif (!$admin && $q) {
- $ret = "{$t}<{includeq file='db:{$moduleDirname}_{$fileName}.tpl'}>{$n}";
- } elseif ($admin && $q) {
- $ret = "{$t}<{includeq file='db:{$moduleDirname}_admin_{$fileName}.tpl'}>{$n}";
+ if (!$admin) {
+ $ret = "{$t}<{include file='db:{$moduleDirname}_{$fileName}.tpl' {$attributes}}>{$n}";
+ } else {
+ $ret = "{$t}<{include file='db:{$moduleDirname}_admin_{$fileName}.tpl' {$attributes}}>{$n}";
}
return $ret;
@@ -193,28 +203,29 @@ public function getSmartyIncludeFile($moduleDirname, $fileName = 'header', $admi
/**
* @public function getSmartyIncludeFileListSection
- * @param $moduleDirname
- * @param $fileName
- * @param $tableFieldName
+ * @param $moduleDirname
+ * @param $fileName
+ * @param $itemName
+ * @param $arrayName
* @param string $t
* @param string $n
* @return string
*/
- public function getSmartyIncludeFileListSection($moduleDirname, $fileName, $tableFieldName, $t = '', $n = '')
+ public function getSmartyIncludeFileListSection($moduleDirname, $fileName, $itemName, $arrayName, string $t = '', string $n = '')
{
- return "{$t}<{include file='db:{$moduleDirname}_{$fileName}_list.tpl' {$tableFieldName}=\${$tableFieldName}[i]}>{$n}";
+ return "{$t}<{include file='db:{$moduleDirname}_{$fileName}_list.tpl' {$itemName}=\${$arrayName}[i]}>{$n}";
}
/**
* @public function getSmartyIncludeFileListForeach
- * @param $moduleDirname
- * @param $fileName
- * @param $tableFieldName
+ * @param $moduleDirname
+ * @param $fileName
+ * @param $tableFieldName
* @param string $t
* @param string $n
* @return string
*/
- public function getSmartyIncludeFileListForeach($moduleDirname, $fileName, $tableFieldName, $t = '', $n = '')
+ public function getSmartyIncludeFileListForeach($moduleDirname, $fileName, $tableFieldName, string $t = '', string $n = '')
{
return "{$t}<{include file='db:{$moduleDirname}_{$fileName}_list.tpl' {$tableFieldName}=\${$tableFieldName}}>{$n}";
}
@@ -225,38 +236,52 @@ public function getSmartyIncludeFileListForeach($moduleDirname, $fileName, $tabl
* @param string $operator
* @param string $type
* @param string $contentIf
- * @param mixed $contentElse
- * @param bool $count
- * @param bool $noSimbol
+ * @param mixed $contentElse
+ * @param mixed $count
+ * @param mixed $noSimbol
* @param string $t
* @param string $n
+ * @param bool $split
+ * @param mixed $default
* @return string
*/
- public function getSmartyConditions($condition = '', $operator = '', $type = '', $contentIf = '', $contentElse = false, $count = false, $noSimbol = false, $t = '', $n = "\n")
+ public function getSmartyConditions(string $condition = '', string $operator = '', string $type = '', string $contentIf = '', $contentElse = false, $count = false, $noSimbol = false, string $t = '', string $n = "\n", bool $split = true, $default = 'string')
{
- if (!$contentElse) {
- if (!$count) {
- $ret = "{$t}<{if \${$condition}{$operator}{$type}}>{$n}";
- } elseif (!$noSimbol) {
- $ret = "{$t}<{if {$condition}{$operator}{$type}}>{$n}";
- } else {
- $ret = "{$t}<{if count(\${$condition}){$operator}{$type}}>{$n}";
+ $ns = '';
+ $ts = '';
+ if ($split) {
+ $ns = $n;
+ $ts = $t;
+ }
+ if (!$count) {
+ $ret = "{$t}<{if \${$condition}";
+ if ('string' === $default) {
+ $ret .= "|default:''";
+ } elseif ('bool' === $default) {
+ $ret .= '|default:false';
+ } elseif ('int' === $default) {
+ $ret .= '|default:0';
}
- $ret .= "{$contentIf}";
- $ret .= "{$t}<{/if}>{$n}";
- } else {
- if (!$count) {
- $ret = "{$t}<{if \${$condition}{$operator}{$type}}>{$n}";
- } elseif (!$noSimbol) {
- $ret = "{$t}<{if {$condition}{$operator}{$type}}>{$n}";
- } else {
- $ret = "{$t}<{if count(\${$condition}){$operator}{$type}}>{$n}";
+ $ret .= "{$operator}{$type}}>{$ns}";
+ } elseif (!$noSimbol) {
+ $ret = "{$t}<{if {$condition}";
+ if ('string' === $default) {
+ $ret .= "|default:''";
+ } elseif ('bool' === $default) {
+ $ret .= '|default:false';
+ } elseif ('int' === $default) {
+ $ret .= '|default:0';
}
- $ret .= "{$contentIf}";
- $ret .= "{$t}<{else}>{$n}";
+ $ret .= "{$operator}{$type}}>{$ns}";
+ } else {
+ $ret = "{$t}<{if \${$condition}|count{$operator}{$type}}>{$ns}";
+ }
+ $ret .= "{$contentIf}";
+ if ($contentElse) {
+ $ret .= "{$ts}<{else}>{$ns}";
$ret .= "{$contentElse}";
- $ret .= "{$t}<{/if}>{$n}";
}
+ $ret .= "{$ts}<{/if}>{$n}";
return $ret;
}
@@ -272,7 +297,7 @@ public function getSmartyConditions($condition = '', $operator = '', $type = '',
* @param string $n
* @return string
*/
- public function getSmartyForeach($item = 'item', $from = 'from', $content = 'content', $name = '', $key = '', $t = '', $n = "\n")
+ public function getSmartyForeach(string $item = 'item', string $from = 'from', string $content = 'content', string $name = '', string $key = '', string $t = '', string $n = "\n")
{
$name = '' != $name ? " name={$name}" : '';
$key = '' != $key ? " key={$key}" : '';
@@ -295,7 +320,7 @@ public function getSmartyForeach($item = 'item', $from = 'from', $content = 'con
* @param string $n
* @return string
*/
- public function getSmartyForeachQuery($item = 'item', $from = 'from', $content = 'content', $loop = 'loop', $key = '', $t = '', $n = "\n")
+ public function getSmartyForeachQuery(string $item = 'item', string $from = 'from', string $content = 'content', string $loop = 'loop', string $key = '', string $t = '', string $n = "\n")
{
$loop = '' != $loop ? " loop={$loop}" : '';
$key = '' != $key ? " key={$key}" : '';
@@ -317,7 +342,7 @@ public function getSmartyForeachQuery($item = 'item', $from = 'from', $content =
* @param string $n
* @return string
*/
- public function getSmartySection($name = 'name', $loop = 'loop', $content = 'content', $start = 0, $step = 0, $t = '', $n = "\n")
+ public function getSmartySection(string $name = 'name', string $loop = 'loop', string $content = 'content', int $start = 0, int $step = 0, string $t = '', string $n = "\n")
{
$start = 0 != $start ? " start={$start}" : '';
$step = 0 != $step ? " step={$step}" : '';
diff --git a/class/Files/CreateStructure.php b/class/Files/CreateStructure.php
index e76d75d0..f9a74872 100644
--- a/class/Files/CreateStructure.php
+++ b/class/Files/CreateStructure.php
@@ -1,8 +1,8 @@
-uploadPath = $path;
}
@@ -90,7 +82,7 @@ protected function setUploadPath($path)
/**
* @protected function getUploadPath
*
- * @return string $path
+ * @return string
*/
protected function getUploadPath()
{
@@ -101,7 +93,7 @@ protected function getUploadPath()
* @protected function setModuleName
* @param $moduleName
*/
- protected function setModuleName($moduleName)
+ protected function setModuleName($moduleName): void
{
$this->moduleName = $moduleName;
}
@@ -109,7 +101,7 @@ protected function setModuleName($moduleName)
/**
* @protected function getModuleName
*
- * @return string $moduleName
+ * @return string
*/
protected function getModuleName()
{
@@ -121,14 +113,14 @@ protected function getModuleName()
*
* @param $folderName
*/
- private function setFolderName($folderName)
+ private function setFolderName($folderName): void
{
$this->folderName = $folderName;
}
/**
* @private function getFolderName
- * @return string $folderName
+ * @return string
*/
private function getFolderName()
{
@@ -140,7 +132,7 @@ private function getFolderName()
*
* @param $fileName
*/
- private function setFileName($fileName)
+ private function setFileName($fileName): void
{
$this->fileName = $fileName;
}
@@ -148,7 +140,7 @@ private function setFileName($fileName)
/**
* @private function getFileName
*
- * @return string $fileName
+ * @return string
*/
private function getFileName()
{
@@ -156,20 +148,18 @@ private function getFileName()
}
/**
- * @private function isDir
+ * @public function isDir
*
* @param $dname
*/
- private function isDir($dname)
+ public function isDir($dname): void
{
- if (!is_dir($dname)) {
- if (!mkdir($dname, 0755) && !is_dir($dname)) {
- throw new \RuntimeException(sprintf('Directory "%s" was not created', $dname));
+ if (!\is_dir($dname)) {
+ if (!\mkdir($dname, 0755) && !\is_dir($dname)) {
+ throw new \RuntimeException(\sprintf('Directory "%s" was not created', $dname));
}
- chmod($dname, 0755);
- } else {
- chmod($dname, 0755);
}
+ chmod($dname, 0755);
}
/**
@@ -177,43 +167,43 @@ private function isDir($dname)
*
* @param string $dir
*/
- protected function makeDir($dir)
+ protected function makeDir(string $dir): void
{
- $this->isDir(mb_strtolower(trim($dir)));
+ $this->isDir(\trim($dir));
}
/**
- * @protected function isDirEmpty
+ * function isDirEmpty
*
* @param string $dir
*
- * @return string
+ * @return bool
*/
- public function isDirEmpty($dir)
+ public function isDirEmpty(string $dir): bool
{
- $content = [];
- $handle = opendir($dir);
- while (false !== ($entry = readdir($handle))) {
+ $handle = \opendir($dir);
+ if (false === $handle) {
+ throw new \RuntimeException(\sprintf('Directory "%s" cannot be opened', $dir));
+ }
+ while (false !== ($entry = \readdir($handle))) {
if ('.' !== $entry && '..' !== $entry) {
- $content[] = $entry;
+ \closedir($handle);
+ return false;
}
}
- closedir($handle);
- if (count($content) > 0) {
- return true;
- }
+ \closedir($handle);
- return false;
+ return true;
}
/**
- * @public function addFolderPath
+ * @private function addFolderPath
*
- * @param string $folderName
+ * @param string $folderName
* @param bool|string $fileName
* @return string
*/
- private function addFolderPath($folderName, $fileName = false)
+ private function addFolderPath(string $folderName, $fileName = false): string
{
$this->setFolderName($folderName);
if ($fileName) {
@@ -231,7 +221,7 @@ private function addFolderPath($folderName, $fileName = false)
*
* @param string $dirName
*/
- public function makeDirInModule($dirName)
+ public function makeDirInModule(string $dirName): void
{
$fname = $this->addFolderPath($dirName);
$this->makeDir($fname);
@@ -244,7 +234,7 @@ public function makeDirInModule($dirName)
* @param string $fromFile
* @param string $toFile
*/
- public function makeDirAndCopyFile($folderName, $fromFile, $toFile)
+ public function makeDirAndCopyFile(string $folderName, string $fromFile, string $toFile): void
{
$dname = $this->addFolderPath($folderName);
$this->makeDir($dname);
@@ -258,7 +248,7 @@ public function makeDirAndCopyFile($folderName, $fromFile, $toFile)
* @param string $fromFile
* @param string $toFile
*/
- public function copyFile($folderName, $fromFile, $toFile)
+ public function copyFile(string $folderName, string $fromFile, string $toFile): void
{
$dname = $this->addFolderPath($folderName);
$fname = $this->addFolderPath($folderName, $toFile);
@@ -272,14 +262,15 @@ public function copyFile($folderName, $fromFile, $toFile)
* @param string $fromFile
* @param string $fname
*/
- public function setCopy($dname, $fromFile, $fname)
+ public function setCopy(string $dname, string $fromFile, string $fname): void
{
- if (is_dir($dname)) {
+ if (\is_dir($dname)) {
chmod($dname, 0777);
- copy($fromFile, $fname);
} else {
$this->makeDir($dname);
- copy($fromFile, $fname);
+ }
+ if (!\copy($fromFile, $fname)) {
+ throw new \RuntimeException(\sprintf('Failed to copy "%s" to "%s"', $fromFile, $fname));
}
}
}
diff --git a/class/Files/CreateTableFields.php b/class/Files/CreateTableFields.php
index fa25d71c..ad545c9f 100644
--- a/class/Files/CreateTableFields.php
+++ b/class/Files/CreateTableFields.php
@@ -1,9 +1,9 @@
-add(new \Criteria('table_mid', $mId)); // $mId = module Id
$criteria->setSort($sort);
$criteria->setOrder($order);
- $tables = Tdmcreate\Helper::getInstance()->getHandler('tables')->getObjects($criteria);
+ $tables = Modulebuilder\Helper::getInstance()->getHandler('Tables')->getObjects($criteria);
unset($criteria);
return $tables;
@@ -82,32 +82,32 @@ public function getTableTables($mId, $sort = 'table_id ASC, table_name', $order
*
* @param string $sort
* @param string $order
- * @return mixed
+ * @return array
*/
- public function getTableFields($mId, $tId, $sort = 'field_id ASC, field_name', $order = 'ASC')
+ public function getTableFields($mId, $tId, string $sort = 'field_order ASC, field_id', string $order = 'ASC')
{
$criteria = new \CriteriaCompo();
$criteria->add(new \Criteria('field_mid', $mId)); // $mId = module Id
$criteria->add(new \Criteria('field_tid', $tId)); // $tId = table Id
$criteria->setSort($sort);
$criteria->setOrder($order);
- $fields = Tdmcreate\Helper::getInstance()->getHandler('fields')->getObjects($criteria);
+ $fields = Modulebuilder\Helper::getInstance()->getHandler('Fields')->getObjects($criteria);
unset($criteria);
return $fields;
}
/**
- * @public function getTableFieldElements
+ * @public function getTableFieldelements
*
* @param $mId
* @param $tId
*
* @param string $sort
* @param string $order
- * @return mixed
+ * @return array
*/
- public function getTableFieldElements($mId = null, $tId = null, $sort = 'fieldelement_id ASC, fieldelement_name', $order = 'ASC')
+ public function getTableFieldelements($mId = null, $tId = null, string $sort = 'fieldelement_id ASC, fieldelement_name', string $order = 'ASC')
{
$criteria = new \CriteriaCompo();
if (null != $mId) {
@@ -120,28 +120,28 @@ public function getTableFieldElements($mId = null, $tId = null, $sort = 'fieldel
$criteria->setSort($sort);
$criteria->setOrder($order);
}
- $fieldElements = Tdmcreate\Helper::getInstance()->getHandler('fieldelements')->getObjects($criteria);
+ $fieldElements = Modulebuilder\Helper::getInstance()->getHandler('Fieldelements')->getObjects($criteria);
unset($criteria);
return $fieldElements;
}
/**
- * @public function getTableMoreFiles
+ * @public function getTableMorefiles
*
* @param $mId
*
* @param string $sort
* @param string $order
- * @return mixed
+ * @return array
*/
- public function getTableMoreFiles($mId, $sort = 'file_id ASC, file_name', $order = 'ASC')
+ public function getTableMorefiles($mId, string $sort = 'file_id ASC, file_name', string $order = 'ASC')
{
$criteria = new \CriteriaCompo();
$criteria->add(new \Criteria('file_mid', $mId)); // $mId = module Id
$criteria->setSort($sort);
$criteria->setOrder($order);
- $morefiles = Tdmcreate\Helper::getInstance()->getHandler('morefiles')->getObjects($criteria);
+ $morefiles = Modulebuilder\Helper::getInstance()->getHandler('Morefiles')->getObjects($criteria);
unset($criteria);
return $morefiles;
diff --git a/class/Files/CreateXoopsCode.php b/class/Files/CreateXoopsCode.php
index fe25117a..45820900 100644
--- a/class/Files/CreateXoopsCode.php
+++ b/class/Files/CreateXoopsCode.php
@@ -1,8 +1,8 @@
-getPhpCodeCaseSwitch($cases, $defaultAfterCase, $default, $t . "\t");
+ $pc = Modulebuilder\Files\CreatePhpCode::getInstance();
+ $contentSwitch = $pc->getPhpCodeCaseSwitch($cases, $defaultAfterCase, $t . "\t", $isConst);
- return $pc->getPhpCodeSwitch($op, $contentSwitch, $t);
+ return $pc->getPhpCodeSwitch($op, $contentSwitch, $t, $isString);
}
/**
@@ -71,11 +68,11 @@ public function getXcSwitch($op = '', $cases = [], $defaultAfterCase = false, $d
* @param $var
* @param $value
* @param $interlock
- * @param $t - Indentation
+ * @param string $t - Indentation
*
* @return string
*/
- public function getXcEqualsOperator($var, $value, $interlock = null, $t = '')
+ public function getXcEqualsOperator($var, $value, $interlock = null, string $t = ''): string
{
return "{$t}{$var} {$interlock}= {$value};\n";
}
@@ -85,11 +82,11 @@ public function getXcEqualsOperator($var, $value, $interlock = null, $t = '')
* @param $anchor
* @param $name
* @param $vars
- * @param $close
+ * @param bool $close
*
* @return string
*/
- public function getXcAnchorFunction($anchor, $name, $vars, $close = false)
+ public function getXcAnchorFunction($anchor, $name, $vars, bool $close = false): string
{
$semicolon = false !== $close ? ';' : '';
@@ -101,30 +98,31 @@ public function getXcAnchorFunction($anchor, $name, $vars, $close = false)
* @param $tableName
* @param $fieldName
* @param $var
- * @param $t
+ * @param string $t
* @return string
*/
- public function getXcSetVarObj($tableName, $fieldName, $var, $t = '')
+ public function getXcSetVarObj($tableName, $fieldName, $var, string $t = ''): string
{
return "{$t}\${$tableName}Obj->setVar('{$fieldName}', {$var});\n";
}
/**
* @public function getXcGetVar
- * @param $varLeft
- * @param $handle
- * @param $var
- * @param $isParam
- * @param $t
+ * @param string $varLeft
+ * @param string $handle
+ * @param string $var
+ * @param bool $isParam
+ * @param string $t
*
+ * @param string $format
* @return string
*/
- public function getXcGetVar($varLeft = '', $handle = '', $var = '', $isParam = false, $t = '')
+ public function getXcGetVar(string $varLeft = '', string $handle = '', string $var = '', bool $isParam = false, string $t = '', string $format = ''): string
{
if (!$isParam) {
- $ret = "{$t}\${$varLeft} = \${$handle}->getVar('{$var}');\n";
+ $ret = "{$t}\${$varLeft} = \${$handle}->getVar('{$var}'{$format});\n";
} else {
- $ret = "\${$handle}->getVar('{$var}')";
+ $ret = "\${$handle}->getVar('{$var}'{$format})";
}
return $ret;
@@ -132,14 +130,14 @@ public function getXcGetVar($varLeft = '', $handle = '', $var = '', $isParam = f
/**
* @public function getXcAddItem
- * @param $varLeft
- * @param $paramLeft
- * @param $paramRight
- * @param $t
+ * @param string $varLeft
+ * @param string $paramLeft
+ * @param string $paramRight
+ * @param string $t
*
* @return string
*/
- public function getXcAddItem($varLeft = '', $paramLeft = '', $paramRight = '', $t = '')
+ public function getXcAddItem(string $varLeft = '', string $paramLeft = '', string $paramRight = '', string $t = ''): string
{
return "{$t}\${$varLeft}->addItem({$paramLeft}, {$paramRight});\n";
}
@@ -154,7 +152,7 @@ public function getXcAddItem($varLeft = '', $paramLeft = '', $paramRight = '', $
* @param string $t
* @return string
*/
- public function getXcGetGroupIds($var = '', $anchor = '', $param1 = null, $param2 = null, $param3 = null, $t = '')
+ public function getXcGetGroupIds(string $var = '', string $anchor = '', $param1 = null, $param2 = null, $param3 = null, string $t = ''): string
{
return "{$t}\${$var} = \${$anchor}->getGroupIds({$param1}, {$param2}, {$param3});\n";
}
@@ -169,7 +167,7 @@ public function getXcGetGroupIds($var = '', $anchor = '', $param1 = null, $param
* @param string $t
* @return string
*/
- public function getXcGetItemIds($var = '', $anchor = '', $param1 = null, $param2 = null, $param3 = null, $t = '')
+ public function getXcGetItemIds(string $var = '', string $anchor = '', $param1 = null, $param2 = null, $param3 = null, string $t = ''): string
{
return "{$t}\${$var} = \${$anchor}->getItemIds({$param1}, {$param2}, {$param3});\n";
}
@@ -179,17 +177,26 @@ public function getXcGetItemIds($var = '', $anchor = '', $param1 = null, $param2
* @param $tableName
* @param $tableSoleName
* @param $fieldName
+ * @param string $language
* @param string $t
+ *
* @return string
*/
- public function getXcSetVarTextDateSelect($tableName, $tableSoleName, $fieldName, $t = '')
+ public function getXcSetVarTextDateSelect($tableName, $tableSoleName, $fieldName, string $language, string $t = ''): string
{
- $tf = Tdmcreate\Files\CreateFile::getInstance();
- $rightField = $tf->getRightString($fieldName);
- $ucfRightField = ucfirst($rightField);
- $value = "date_create_from_format(_SHORTDATESTRING, Request::getString('{$fieldName}'))";
- $ret = $this->getXcEqualsOperator("\${$tableSoleName}{$ucfRightField}", $value, null, $t);
- $ret .= $this->getXcSetVarObj($tableName, $fieldName, "\${$tableSoleName}{$ucfRightField}->getTimestamp()", $t);
+ $cf = Modulebuilder\Files\CreateFile::getInstance();
+ $pc = Modulebuilder\Files\CreatePhpCode::getInstance();
+ $rightField = $cf->getRightString($fieldName);
+ $ucfRightField = \ucfirst($rightField);
+ $value = "\DateTime::createFromFormat(\_SHORTDATESTRING, Request::getString('{$fieldName}'))";
+ $ret = $this->getXcEqualsOperator("\${$tableSoleName}{$ucfRightField}Obj", $value, null, $t);
+ $contentIf = $pc->getPhpCodeCommentLine('Get Form', null, $t . "\t");
+ $contentIf .= $this->getXcXoopsTplAssign('error', "{$language}INVALID_DATE", true, $t . "\t");
+ $contentIf .= $this->getXcGetForm('form', $tableName, 'Obj', $t . "\t");
+ $contentIf .= $this->getXcXoopsTplAssign('form', '$form->render()', true, $t . "\t");
+ $contentIf .= $cf->getSimpleString('break;', $t . "\t");
+ $ret .= $pc->getPhpCodeConditions("\${$tableSoleName}{$ucfRightField}Obj", ' === ', 'false', $contentIf,false,$t);
+ $ret .= $this->getXcSetVarObj($tableName, $fieldName, "\${$tableSoleName}{$ucfRightField}Obj->getTimestamp()", $t);
return $ret;
}
@@ -200,18 +207,32 @@ public function getXcSetVarTextDateSelect($tableName, $tableSoleName, $fieldName
* @param $tableSoleName
* @param $fieldName
* @param string $t
+ * @param string $language
* @return string
*/
- public function getXcSetVarDateTime($tableName, $tableSoleName, $fieldName, $t = '')
+ public function getXcSetVarDateTime($tableName, $tableSoleName, $fieldName, string $t = '', string $language = ''): string
{
- $tf = Tdmcreate\Files\CreateFile::getInstance();
+ $tf = Modulebuilder\Files\CreateFile::getInstance();
+ $pc = Modulebuilder\Files\CreatePhpCode::getInstance();
$rightField = $tf->getRightString($fieldName);
- $ucfRightField = ucfirst($rightField);
+ $ucfRightField = \ucfirst($rightField);
$request = "Request::getArray('{$fieldName}')";
$var = "\${$tableSoleName}{$ucfRightField}";
$varArr = "\${$tableSoleName}{$ucfRightField}Arr";
$ret = $this->getXcEqualsOperator($varArr, $request, null, $t);
- $value = "strtotime({$varArr}['date']) + (int){$varArr}['time']";
+
+ $varObj = "\${$tableSoleName}{$ucfRightField}Obj";
+ $contentIf = $pc->getPhpCodeCommentLine('Get Form', null, $t . "\t");
+ $contentIf .= $this->getXcXoopsTplAssign('error', "{$language}INVALID_DATE", true, $t . "\t");
+ $contentIf .= $this->getXcGetForm('form', $tableName, 'Obj', $t . "\t");
+ $contentIf .= $this->getXcXoopsTplAssign('form', '$form->render()', true, $t . "\t");
+ $contentIf .= $tf->getSimpleString('break;', $t . "\t");
+ $ret .= $pc->getPhpCodeConditions("!isset(\${$tableSoleName}{$ucfRightField}Arr['date']) || !isset(\${$tableSoleName}{$ucfRightField}Arr['time'])", '', '', $contentIf,false,$t);
+ $value = "\DateTime::createFromFormat(\_SHORTDATESTRING, {$varArr}['date'])";
+ $ret .= $this->getXcEqualsOperator($varObj, $value, null, $t);
+ $ret .= $pc->getPhpCodeConditions("\${$tableSoleName}{$ucfRightField}Obj", ' === ', 'false', $contentIf,false,$t);
+ $ret .= "{$t}{$varObj}->setTime(0, 0, 0);\n";
+ $value = "{$varObj}->getTimestamp() + (int){$varArr}['time']";
$ret .= $this->getXcEqualsOperator($var, $value, null, $t);
$ret .= $this->getXcSetVarObj($tableName, $fieldName, $var, $t);
@@ -222,24 +243,24 @@ public function getXcSetVarDateTime($tableName, $tableSoleName, $fieldName, $t =
* @public function getXcSetVarCheckBoxOrRadioYN
* @param $tableName
* @param $fieldName
- * @param $t
+ * @param string $t
* @return string
*/
- public function getXcSetVarCheckBoxOrRadioYN($tableName, $fieldName, $t = '')
+ public function getXcSetVarCheckBoxOrRadioYN($tableName, $fieldName, string $t = ''): string
{
- return $this->getXcSetVarObj($tableName, $fieldName, "Request::getInt('{$fieldName}', 0)", $t);
+ return $this->getXcSetVarObj($tableName, $fieldName, "Request::getInt('{$fieldName}')", $t);
}
/**
* @public function getXcMediaUploader
- * @param $var
- * @param $dirPath
- * @param $mimetype
- * @param $maxsize
+ * @param $var
+ * @param $dirPath
+ * @param $mimetype
+ * @param $maxsize
* @param string $t
* @return string
*/
- public function getXcMediaUploader($var, $dirPath, $mimetype, $maxsize, $t = '')
+ public function getXcMediaUploader($var, $dirPath, $mimetype, $maxsize, string $t = ''): string
{
$mimetypes_file = $this->getXcGetConfig($mimetype);
$maxsize_file = $this->getXcGetConfig($maxsize);
@@ -251,13 +272,13 @@ public function getXcMediaUploader($var, $dirPath, $mimetype, $maxsize, $t = '')
/**
* @public function getXcXoopsCaptcha
- * @param $var
- * @param $instance
- * @param $t
+ * @param string $var
+ * @param string $instance
+ * @param string $t
*
* @return string
*/
- public function getXcGetInstance($var = '', $instance = '', $t = '')
+ public function getXcGetInstance(string $var = '', string $instance = '', string $t = ''): string
{
return "{$t}\${$var} = {$instance}::getInstance();\n";
}
@@ -267,7 +288,7 @@ public function getXcGetInstance($var = '', $instance = '', $t = '')
* @param $name
* @return string
*/
- public function getXcGetConfig($name)
+ public function getXcGetConfig($name): string
{
return "\$helper->getConfig('{$name}')";
}
@@ -275,10 +296,10 @@ public function getXcGetConfig($name)
/**
* @public function getXcIdGetVar
* @param $lpFieldName
- * @param $t
+ * @param string $t
* @return string
*/
- public function getXcIdGetVar($lpFieldName, $t = '')
+ public function getXcIdGetVar($lpFieldName, string $t = ''): string
{
return "{$t}\${$lpFieldName}['id'] = \$i;\n";
}
@@ -289,10 +310,10 @@ public function getXcIdGetVar($lpFieldName, $t = '')
* @param $rpFieldName
* @param $tableName
* @param $fieldName
- * @param $t
+ * @param string $t
* @return string
*/
- public function getXcGetVarAll($lpFieldName, $rpFieldName, $tableName, $fieldName, $t = '')
+ public function getXcGetVarAll($lpFieldName, $rpFieldName, $tableName, $fieldName, string $t = ''): string
{
return "{$t}\${$lpFieldName}['{$rpFieldName}'] = \${$tableName}All[\$i]->getVar('{$fieldName}');\n";
}
@@ -304,9 +325,9 @@ public function getXcGetVarAll($lpFieldName, $rpFieldName, $tableName, $fieldNam
* @param string $t
* @return string
*/
- public function getXcHelperGetInstance($moduleDirname, $t = '')
+ public function getXcHelperGetInstance($moduleDirname, string $t = ''): string
{
- $ucfModuleDirname = ucfirst($moduleDirname);
+ $ucfModuleDirname = \ucfirst($moduleDirname);
$ret = "{$t}// Get instance of module\n";
$ret .= "{$t}\$helper = \XoopsModules\\{$ucfModuleDirname}\Helper::getInstance();\n";
@@ -321,9 +342,9 @@ public function getXcHelperGetInstance($moduleDirname, $t = '')
* @param string $t
* @return string
*/
- public function getXcFormatTimeStamp($left, $value, $format = 's', $t = '')
+ public function getXcFormatTimeStamp($left, $value, string $format = 's', string $t = ''): string
{
- return "{$t}\${$left} = formatTimeStamp({$value}, '{$format}');\n";
+ return "{$t}\${$left} = \\formatTimestamp({$value}, '{$format}');\n";
}
/**
@@ -337,11 +358,11 @@ public function getXcFormatTimeStamp($left, $value, $format = 's', $t = '')
* @param string $t
* @return string
*/
- public function getXcTopicGetVar($lpFieldName, $rpFieldName, $tableName, $tableNameTopic, $fieldNameParent, $fieldNameTopic, $t = '')
+ public function getXcTopicGetVar($lpFieldName, $rpFieldName, $tableName, $tableNameTopic, $fieldNameParent, $fieldNameTopic, string $t = ''): string
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
+ $pc = Modulebuilder\Files\CreatePhpCode::getInstance();
$ret = $pc->getPhpCodeCommentLine('Get Var', $fieldNameParent, $t);
- $fieldParent = $this->getXcGetVar('', "\${$tableName}All[\$i]", $fieldNameParent, true, '');
+ $fieldParent = $this->getXcGetVar('', "\${$tableName}All[\$i]", $fieldNameParent, true);
$ret .= $this->getXcHandlerGet($rpFieldName, $fieldParent, '', $tableNameTopic . 'Handler', false, $t);
$ret .= $this->getXcGetVar("\${$lpFieldName}['{$rpFieldName}']", "\${$rpFieldName}", $fieldNameTopic, false, $t);
@@ -359,14 +380,14 @@ public function getXcTopicGetVar($lpFieldName, $rpFieldName, $tableName, $tableN
* @param string $t
* @return string
*/
- public function getXcParentTopicGetVar($lpFieldName, $rpFieldName, $tableName, $tableSoleNameTopic, $tableNameTopic, $fieldNameParent, $t = '')
+ public function getXcParentTopicGetVar($lpFieldName, $rpFieldName, $tableName, $tableSoleNameTopic, $tableNameTopic, $fieldNameParent, string $t = ''): string
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $parentTopic = $pc->getPhpCodeCommentLine('Get', $tableNameTopic . ' Handler', $t . "\t");
- $parentTopic .= $this->getXcHandlerLine($tableNameTopic, $t . "\t");
- $elseGroups = $this->getXcEqualsOperator('$groups', 'XOOPS_GROUP_ANONYMOUS');
- $ret = $pc->getPhpCodeConditions("!isset(\${$tableNameTopic}Handler", '', '', $parentTopic, $elseGroups);
- $ret .= $this->getXcGetVarFromID("\${$lpFieldName}['{$rpFieldName}']", $tableNameTopic, $tableSoleNameTopic, $tableName, $fieldNameParent, $t);
+ $pc = Modulebuilder\Files\CreatePhpCode::getInstance();
+ $parentTopic = $pc->getPhpCodeCommentLine('Get', $tableNameTopic . ' Handler', $t . "\t");
+ $parentTopic .= $this->getXcHandlerLine($tableNameTopic, $t . "\t");
+ $elseGroups = $this->getXcEqualsOperator('$groups', '\XOOPS_GROUP_ANONYMOUS');
+ $ret = $pc->getPhpCodeConditions("!isset(\${$tableNameTopic}Handler", '', '', $parentTopic, $elseGroups);
+ $ret .= $this->getXcGetVarFromID("\${$lpFieldName}['{$rpFieldName}']", $tableNameTopic, $tableSoleNameTopic, $tableName, $fieldNameParent, $t);
return $ret;
}
@@ -381,11 +402,11 @@ public function getXcParentTopicGetVar($lpFieldName, $rpFieldName, $tableName, $
* @param string $t
* @return string
*/
- public function getXcGetVarFromID($left, $anchor, $var, $tableName, $fieldName, $t = '')
+ public function getXcGetVarFromID($left, $anchor, $var, $tableName, $fieldName, string $t = ''): string
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
+ $pc = Modulebuilder\Files\CreatePhpCode::getInstance();
$ret = $pc->getPhpCodeCommentLine('Get Var', $fieldName, $t);
- $getVarFromID = $this->getXcGetVar('', "\${$tableName}All[\$i]", $fieldName, true, '');
+ $getVarFromID = $this->getXcGetVar('', "\${$tableName}All[\$i]", $fieldName, true);
$rightGet = $this->getXcAnchorFunction($anchor . 'Handler', 'get' . $var . 'FromId', $getVarFromID);
$ret .= $this->getXcEqualsOperator($left, $rightGet, null, $t);
@@ -401,15 +422,17 @@ public function getXcGetVarFromID($left, $anchor, $var, $tableName, $fieldName,
* @param string $t
* @return string
*/
+ /*
public function getXcGetVarUploadImage($lpFieldName, $rpFieldName, $tableName, $fieldName, $t = '')
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
+ $pc = Modulebuilder\Files\CreatePhpCode::getInstance();
$ret = $pc->getPhpCodeCommentLine('Get Var', $fieldName, $t);
$ret .= $this->getXcGetVar($fieldName, "\${$tableName}All[\$i]", $fieldName, false, '');
$ret .= $pc->getPhpCodeTernaryOperator("{$lpFieldName}['{$rpFieldName}']", "\${$fieldName}", "\${$fieldName}", "'blank.gif'", $t);
return $ret;
}
+ */
/**
* @public function getXcGetVarUrlFile
@@ -419,7 +442,7 @@ public function getXcGetVarUploadImage($lpFieldName, $rpFieldName, $tableName, $
* @param $fieldName
* @return string
*/
- public function getXcGetVarUrlFile($lpFieldName, $rpFieldName, $tableName, $fieldName)
+ public function getXcGetVarUrlFile($lpFieldName, $rpFieldName, $tableName, $fieldName): string
{
return $this->getXcGetVarAll($lpFieldName, $rpFieldName, $tableName, $fieldName);
}
@@ -433,10 +456,10 @@ public function getXcGetVarUrlFile($lpFieldName, $rpFieldName, $tableName, $fiel
* @param string $t
* @return string
*/
- public function getXcGetVarTextArea($lpFieldName, $rpFieldName, $tableName, $fieldName, $t = '')
+ public function getXcGetVarTextArea($lpFieldName, $rpFieldName, $tableName, $fieldName, string $t = ''): string
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $getVar = $this->getXcGetVar('', "\${$tableName}All[\$i]", $fieldName, true, '');
+ $pc = Modulebuilder\Files\CreatePhpCode::getInstance();
+ $getVar = $this->getXcGetVar('', "\${$tableName}All[\$i]", $fieldName, true);
return $t . $pc->getPhpCodeStripTags("{$lpFieldName}['{$rpFieldName}']", $getVar, false, $t);
}
@@ -450,7 +473,7 @@ public function getXcGetVarTextArea($lpFieldName, $rpFieldName, $tableName, $fie
* @param string $t
* @return string
*/
- public function getXcGetVarSelectUser($lpFieldName, $rpFieldName, $tableName, $fieldName, $t = '')
+ public function getXcGetVarSelectUser($lpFieldName, $rpFieldName, $tableName, $fieldName, string $t = ''): string
{
return "{$t}\${$lpFieldName}['{$rpFieldName}'] = \XoopsUser::getUnameFromId(\${$tableName}All[\$i]->getVar('{$fieldName}'), 's');\n";
}
@@ -464,9 +487,9 @@ public function getXcGetVarSelectUser($lpFieldName, $rpFieldName, $tableName, $f
* @param string $t
* @return string
*/
- public function getXcGetVarTextDateSelect($lpFieldName, $rpFieldName, $tableName, $fieldName, $t = '')
+ public function getXcGetVarTextDateSelect($lpFieldName, $rpFieldName, $tableName, $fieldName, string $t = ''): string
{
- return "{$t}\${$lpFieldName}['{$rpFieldName}'] = formatTimeStamp(\${$tableName}All[\$i]->getVar('{$fieldName}'), 's');\n";
+ return "{$t}\${$lpFieldName}['{$rpFieldName}'] = \\formatTimestamp(\${$tableName}All[\$i]->getVar('{$fieldName}'), 's');\n";
}
/**
@@ -476,7 +499,7 @@ public function getXcGetVarTextDateSelect($lpFieldName, $rpFieldName, $tableName
* @param string $t
* @return string
*/
- public function getXcXoopsOptionTemplateMain($moduleDirname, $tableName, $t = '')
+ public function getXcXoopsOptionTemplateMain($moduleDirname, $tableName, string $t = ''): string
{
return "{$t}\$GLOBALS['xoopsOption']['template_main'] = '{$moduleDirname}_{$tableName}.tpl';\n";
}
@@ -487,30 +510,30 @@ public function getXcXoopsOptionTemplateMain($moduleDirname, $tableName, $t = ''
* @param $tableName
* @return string
*/
- public function getXcUserHeader($moduleDirname, $tableName)
+ public function getXcUserHeader($moduleDirname, $tableName): string
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
+ $pc = Modulebuilder\Files\CreatePhpCode::getInstance();
$ret = $pc->getPhpCodeIncludeDir('__DIR__', 'header');
$ret .= $this->getXcXoopsOptionTemplateMain($moduleDirname, $tableName);
- $ret .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'header', true);
+ $ret .= $pc->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH', 'header', true);
return $ret;
}
/**
* @public function getXcPermissionsHeader
- * @param null
+ *
* @return string
*/
- public function getXcPermissionsHeader()
+ public function getXcPermissionsHeader(): string
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
+ $pc = Modulebuilder\Files\CreatePhpCode::getInstance();
$ret = $pc->getPhpCodeCommentLine('Permission');
- $ret .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/xoopsform/grouppermform', true);
+ $ret .= $pc->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH', 'class/xoopsform/grouppermform', true);
$ret .= $this->getXcXoopsHandler('groupperm');
$groups = $this->getXcEqualsOperator('$groups', '$xoopsUser->getGroups()');
- $elseGroups = $this->getXcEqualsOperator('$groups', 'XOOPS_GROUP_ANONYMOUS');
- $ret .= $pc->getPhpCodeConditions('is_object($xoopsUser)', '', $type = '', $groups, $elseGroups);
+ $elseGroups = $this->getXcEqualsOperator('$groups', '\XOOPS_GROUP_ANONYMOUS');
+ $ret .= $pc->getPhpCodeConditions('\is_object($xoopsUser)', '', '', $groups, $elseGroups);
return $ret;
}
@@ -522,10 +545,10 @@ public function getXcPermissionsHeader()
*
* @return string
*/
- public function getXcGetFieldId($fields)
+ public function getXcGetFieldId($fields): string
{
$fieldId = 'id';
- foreach (array_keys($fields) as $f) {
+ foreach (\array_keys($fields) as $f) {
$fieldName = $fields[$f]->getVar('field_name');
if (0 == $f) {
$fieldId = $fieldName;
@@ -542,10 +565,10 @@ public function getXcGetFieldId($fields)
*
* @return string
*/
- public function getXcGetFieldName($fields)
+ public function getXcGetFieldName($fields): string
{
$fieldName = '';
- foreach (array_keys($fields) as $f) {
+ foreach (\array_keys($fields) as $f) {
$fieldName = $fields[$f]->getVar('field_name');
}
@@ -559,10 +582,10 @@ public function getXcGetFieldName($fields)
*
* @return string
*/
- public function getXcGetFieldParentId($fields)
+ public function getXcGetFieldParentId($fields): string
{
$fieldPid = 'pid';
- foreach (array_keys($fields) as $f) {
+ foreach (\array_keys($fields) as $f) {
$fieldName = $fields[$f]->getVar('field_name');
if (1 == $fields[$f]->getVar('field_parent')) {
$fieldPid = $fieldName;
@@ -581,13 +604,14 @@ public function getXcGetFieldParentId($fields)
* @param $fields
* @return string
*/
- public function getXcUserSaveElements($moduleDirname, $tableName, $tableSoleName, $fields)
+ public function getXcUserSaveElements($moduleDirname, $tableName, $tableSoleName, $fields): string
{
- $axc = Tdmcreate\Files\Admin\AdminXoopsCode::getInstance();
- $ret = '';
- $fieldMain = '';
- $countUploader = 0;
- foreach (array_keys($fields) as $f) {
+ $axc = Modulebuilder\Files\Admin\AdminXoopsCode::getInstance();
+ $ret = '';
+ $fieldMain = '';
+ $countUploader = 0;
+ $language = '\_MA_' . \strtoupper($moduleDirname) . '_';
+ foreach (\array_keys($fields) as $f) {
$fieldName = $fields[$f]->getVar('field_name');
$fieldElement = $fields[$f]->getVar('field_element');
if (1 == $fields[$f]->getVar('field_main')) {
@@ -599,10 +623,10 @@ public function getXcUserSaveElements($moduleDirname, $tableName, $tableSoleName
$ret .= $axc->getAxcSetVarUploadImage($moduleDirname, $tableName, $fieldName, $fieldMain, '', $countUploader);
$countUploader++;
} elseif (14 == $fieldElement) {
- $ret .= $axc->getAxcSetVarUploadFile($moduleDirname, $tableName, $fieldName, '', '', $countUploader);
+ $ret .= $axc->getAxcSetVarUploadFile($moduleDirname, $tableName, $fieldName, false, '', $countUploader);
$countUploader++;
} elseif (15 == $fieldElement) {
- $ret .= $this->getXcSetVarTextDateSelect($tableName, $tableSoleName, $fieldName);
+ $ret .= $this->getXcSetVarTextDateSelect($tableName, $tableSoleName, $fieldName, $language);
} else {
$ret .= $this->getXcSetVarObj($tableName, $fieldName, "\$_POST['{$fieldName}']");
}
@@ -617,20 +641,20 @@ public function getXcUserSaveElements($moduleDirname, $tableName, $tableSoleName
* @param string $var1
* @param string $var2
* @param string $type
- * @param bool $method
* @param string $t
* @return string
*/
- public function getXcXoopsRequest($left = '', $var1 = '', $var2 = '', $type = 'String', $method = false, $t = '')
+ public function getXcXoopsRequest(string $left = '', string $var1 = '', string $var2 = '', string $type = 'String', string $t = ''): string
{
- $ret = '';
- $intVars = ('' != $var2) ? "'{$var1}', {$var2}" : "'{$var1}'";
+ $ret = '';
+ $intVars = ('' != $var2) ? "'{$var1}', {$var2}" : "'{$var1}'";
+ $stringVars = ('' != $var2) ? "'{$var1}', {$var2}" : "'{$var1}'";
if ('String' === $type) {
- $ret .= "{$t}\${$left} = Request::getString('{$var1}', '{$var2}');\n";
+ $ret .= "{$t}\${$left} = Request::getString({$stringVars});\n";
} elseif ('Int' === $type) {
$ret .= "{$t}\${$left} = Request::getInt({$intVars});\n";
- } elseif ('Int' === $type && false !== $method) {
- $ret .= "{$t}\${$left} = Request::getInt({$intVars}, '{$method}');\n";
+ } else {
+ $ret .= "{$t}\${$left} = Request::get{$type}('{$var1}', '{$var2}');\n";
}
return $ret;
@@ -644,12 +668,12 @@ public function getXcXoopsRequest($left = '', $var1 = '', $var2 = '', $type = 'S
* @param string $var
* @param string $groups
* @param string $mid
- * @param bool $isParam
+ * @param bool $isParam
*
* @param string $t
* @return string
*/
- public function getXcAddRight($anchor, $permString = '', $var = '', $groups = '', $mid = '', $isParam = false, $t = '')
+ public function getXcAddRight($anchor, string $permString = '', string $var = '', string $groups = '', string $mid = '', bool $isParam = false, string $t = ''): string
{
if (!$isParam) {
$ret = "{$t}\${$anchor}->addRight('{$permString}', {$var}, {$groups}, {$mid});\n";
@@ -668,12 +692,12 @@ public function getXcAddRight($anchor, $permString = '', $var = '', $groups = ''
* @param string $var
* @param string $groups
* @param string $mid
- * @param bool $isParam
+ * @param bool $isParam
*
* @param string $t
* @return string
*/
- public function getXcCheckRight($anchor, $permString = '', $var = '', $groups = '', $mid = '', $isParam = false, $t = '')
+ public function getXcCheckRight($anchor, string $permString = '', string $var = '', string $groups = '', string $mid = '', bool $isParam = false, string $t = ''): string
{
if (!$isParam) {
$ret = "{$t}{$anchor}->checkRight('{$permString}', {$var}, {$groups}, {$mid});\n";
@@ -696,25 +720,28 @@ public function getXcCheckRight($anchor, $permString = '', $var = '', $groups =
* @param string $t
* @return string
*/
- public function getXcDeleteRight($anchor, $permString = '', $mid = '', $var = '', $isParam = false, $t = '')
+ public function getXcDeleteRight($anchor, string $permString = '', string $mid = '', string $var = '', bool $isParam = false, string $t = ''): string
{
if (!$isParam) {
$ret = "{$t}\${$anchor}->deleteByModule({$mid}, '{$permString}', {$var});\n";
} else {
$ret = "\${$anchor}->deleteByModule({$mid}, '{$permString}', {$var})";
}
+
return $ret;
}
/**
* @public function getXcHandlerLine
- * @param $tableName
+ * @param $tableName
* @param string $t
* @return string
*/
- public function getXcHandlerLine($tableName, $t = '')
+ public function getXcHandlerLine($tableName, string $t = ''): string
{
- return "{$t}\${$tableName}Handler = \$helper->getHandler('{$tableName}');\n";
+ $ucfTableName = \ucfirst($tableName);
+
+ return "{$t}\${$tableName}Handler = \$helper->getHandler('{$ucfTableName}');\n";
}
/**
@@ -725,11 +752,24 @@ public function getXcHandlerLine($tableName, $t = '')
* @param string $t
* @return string
*/
- public function getXcHandlerCreateObj($tableName, $t = '')
+ public function getXcHandlerCreateObj($tableName, string $t = ''): string
{
return "{$t}\${$tableName}Obj = \${$tableName}Handler->create();\n";
}
+ /**
+ * @public function getXcHandlerGetObj
+ *
+ * @param $tableName
+ * @param $ccFieldId
+ * @param string $t
+ * @return string
+ */
+ public function getXcHandlerGetObj($tableName, $ccFieldId, string $t = ''): string
+ {
+ return "{$t}\${$tableName}Obj = \${$tableName}Handler->get(\${$ccFieldId});\n";
+ }
+
/**
* @public function getXcHandlerCountObj
*
@@ -738,28 +778,24 @@ public function getXcHandlerCreateObj($tableName, $t = '')
* @param string $t
* @return string
*/
- public function getXcHandlerCountObj($tableName, $t = '')
+ public function getXcHandlerCountObj($tableName, string $t = ''): string
{
- $ucfTableName = ucfirst($tableName);
- $ret = "{$t}\${$tableName}Count = \${$tableName}Handler->getCount{$ucfTableName}();\n";
-
- return $ret;
+ $ucfTableName = \ucfirst($tableName);
+ return "{$t}\${$tableName}Count = \${$tableName}Handler->getCount{$ucfTableName}();\n";
}
/**
* @public function getXcClearCount
* @param $left
- * @param $anchor
- * @param $params
- * @param $t
+ * @param string $anchor
+ * @param string $params
+ * @param string $t
*
* @return string
*/
- public function getXcHandlerCountClear($left, $anchor = '', $params = '', $t = '')
+ public function getXcHandlerCountClear($left, string $anchor = '', string $params = '', string $t = ''): string
{
- $ret = "{$t}\${$left} = \${$anchor}Handler->getCount({$params});\n";
-
- return $ret;
+ return "{$t}\${$left} = \${$anchor}Handler->getCount({$params});\n";
}
/**
@@ -773,14 +809,12 @@ public function getXcHandlerCountClear($left, $anchor = '', $params = '', $t = '
* @param string $t
* @return string
*/
- public function getXcHandlerAllObj($tableName, $fieldMain = '', $start = '0', $limit = '0', $t = '')
+ public function getXcHandlerAllObj($tableName, string $fieldMain = '', string $start = '0', string $limit = '0', string $t = ''): string
{
- $ucfTableName = ucfirst($tableName);
+ $ucfTableName = \ucfirst($tableName);
$startLimit = ('0' != $limit) ? "{$start}, {$limit}" : '0';
$params = ('' != $fieldMain) ? "{$startLimit}, '{$fieldMain}'" : $startLimit;
- $ret = "{$t}\${$tableName}All = \${$tableName}Handler->getAll{$ucfTableName}({$params});\n";
-
- return $ret;
+ return "{$t}\${$tableName}All = \${$tableName}Handler->getAll{$ucfTableName}({$params});\n";
}
/**
@@ -791,11 +825,9 @@ public function getXcHandlerAllObj($tableName, $fieldMain = '', $start = '0', $l
* @param string $t
* @return string
*/
- public function getXcHandlerAllClear($left, $anchor = '', $params = '', $t = '')
+ public function getXcHandlerAllClear($left, string $anchor = '', string $params = '', string $t = ''): string
{
- $ret = "{$t}\${$left} = \${$anchor}Handler->getAll({$params});\n";
-
- return $ret;
+ return "{$t}\${$left} = \${$anchor}Handler->getAll({$params});\n";
}
/**
@@ -805,12 +837,12 @@ public function getXcHandlerAllClear($left, $anchor = '', $params = '', $t = '')
* @param $var
* @param string $obj
* @param string $handler
- * @param bool $isParam
+ * @param bool $isParam
*
* @param string $t
* @return string
*/
- public function getXcHandlerGet($left, $var, $obj = '', $handler = 'Handler', $isParam = false, $t = '')
+ public function getXcHandlerGet($left, $var, string $obj = '', string $handler = 'Handler', bool $isParam = false, string $t = ''): string
{
if ($isParam) {
$ret = "\${$left}{$handler}->get(\${$var})";
@@ -826,15 +858,14 @@ public function getXcHandlerGet($left, $var, $obj = '', $handler = 'Handler', $i
*
* @param $left
* @param $var
- * @param $obj
- * @param $handler
+ * @param string $obj
+ * @param string $handler
*
* @return string
*/
- public function getXcHandlerInsert($left, $var, $obj = '', $handler = 'Handler')
+ public function getXcHandlerInsert($left, $var, string $obj = '', string $handler = 'Handler'): string
{
return "\${$left}{$handler}->insert(\${$var}{$obj})";
-
}
/**
@@ -846,7 +877,7 @@ public function getXcHandlerInsert($left, $var, $obj = '', $handler = 'Handler')
* @param string $handler
* @return string
*/
- public function getXcHandlerDelete($left, $var, $obj = '', $handler = 'Handler')
+ public function getXcHandlerDelete($left, $var, string $obj = '', string $handler = 'Handler'): string
{
return "\${$left}{$handler}->delete(\${$var}{$obj})";
}
@@ -858,18 +889,19 @@ public function getXcHandlerDelete($left, $var, $obj = '', $handler = 'Handler')
* @param $tableSoleName
*
* @param string $index
- * @param bool $noArray
+ * @param bool $noArray
* @param string $t
+ * @param string $obj
* @return string
*/
- public function getXcGetValues($tableName, $tableSoleName, $index = 'i', $noArray = false, $t = '')
+ public function getXcGetValues($tableName, $tableSoleName, string $index = 'i', bool $noArray = false, string $t = '', string $obj = ''): string
{
$index = '' !== $index ? $index : 'i';
- $ucfTableName = ucfirst($tableName);
+ $ucfTableName = \ucfirst($tableName);
if (!$noArray) {
$ret = "{$t}\${$tableSoleName} = \${$tableName}All[\${$index}]->getValues{$ucfTableName}();\n";
} else {
- $ret = "{$t}\${$tableSoleName} = \${$tableName}->getValues{$ucfTableName}();\n";
+ $ret = "{$t}\${$tableSoleName} = \${$tableName}{$obj}->getValues{$ucfTableName}();\n";
}
return $ret;
@@ -884,13 +916,14 @@ public function getXcGetValues($tableName, $tableSoleName, $index = 'i', $noArra
* @param $fields
* @return string
*/
- public function getXcSetVarsObjects($moduleDirname, $tableName, $tableSoleName, $fields)
+ public function getXcSetVarsObjects($moduleDirname, $tableName, $tableSoleName, $fields): string
{
- $axc = Tdmcreate\Files\Admin\AdminXoopsCode::getInstance();
+ $axc = Modulebuilder\Files\Admin\AdminXoopsCode::getInstance();
$ret = '';
$fieldMain = '';
$countUploader = 0;
- foreach (array_keys($fields) as $f) {
+ $language = '\_MA_' . \strtoupper($moduleDirname) . '_';
+ foreach (\array_keys($fields) as $f) {
$fieldName = $fields[$f]->getVar('field_name');
$fieldElement = $fields[$f]->getVar('field_element');
if (1 == $fields[$f]->getVar('field_main')) {
@@ -915,11 +948,11 @@ public function getXcSetVarsObjects($moduleDirname, $tableName, $tableSoleName,
$countUploader++;
break;
case 14:
- $ret .= $axc->getAxcSetVarUploadFile($moduleDirname, $tableName, $fieldName, false, $countUploader, $fieldMain);
+ $ret .= $axc->getAxcSetVarUploadFile($moduleDirname, $tableName, $fieldName, false, '', $countUploader, $fieldMain);
$countUploader++;
break;
case 15:
- $ret .= $this->getXcSetVarTextDateSelect($tableName, $tableSoleName, $fieldName);
+ $ret .= $this->getXcSetVarTextDateSelect($tableName, $tableSoleName, $fieldName, $language);
break;
default:
$ret .= $this->getXcSetVarObj($tableName, $fieldName, "\$_POST['{$fieldName}']");
@@ -939,13 +972,13 @@ public function getXcSetVarsObjects($moduleDirname, $tableName, $tableSoleName,
* @param string $t
* @return string
*/
- public function getXcSecurity($tableName, $t = '')
+ public function getXcSecurity($tableName, string $t = ''): string
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $securityError = $this->getXcXoopsSecurityErrors();
- $implode = $pc->getPhpCodeImplode(',', $securityError);
- $content = "{$t}\t" . $this->getXcRedirectHeader($tableName, '', 3, $implode, $t);
- $securityCheck = $this->getXcXoopsSecurityCheck();
+ $pc = Modulebuilder\Files\CreatePhpCode::getInstance();
+ $securityError = $this->getXcXoopsSecurityErrors();
+ $implode = $pc->getPhpCodeImplode(',', $securityError);
+ $content = "{$t}\t" . $this->getXcRedirectHeader($tableName, '', 3, $implode, false, $t);
+ $securityCheck = $this->getXcXoopsSecurityCheck();
return $pc->getPhpCodeConditions('!' . $securityCheck, '', '', $content, $t);
}
@@ -957,9 +990,9 @@ public function getXcSecurity($tableName, $t = '')
* @param string $t
* @return string
*/
- public function getXcInsertData($tableName, $language, $t = '')
+ public function getXcInsertData($tableName, $language, string $t = ''): string
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
+ $pc = Modulebuilder\Files\CreatePhpCode::getInstance();
$content = "{$t}\t" . $this->getXcRedirectHeader($tableName, '?op=list', 2, "{$language}FORM_OK");
$handlerInsert = $this->getXcHandlerInsert($tableName, $tableName, 'Obj');
@@ -972,17 +1005,16 @@ public function getXcInsertData($tableName, $language, $t = '')
* @param $options
* @param $numb
* @param $var
- * @param bool $isString
- *
+ * @param bool $isString
* @param string $t
* @return string
*/
- public function getXcRedirectHeader($directory, $options, $numb, $var, $isString = true, $t = '')
+ public function getXcRedirectHeader($directory, $options, $numb, $var, bool $isString = true, string $t = ''): string
{
if (!$isString) {
- $ret = "{$t}redirect_header({$directory}, {$numb}, {$var});\n";
+ $ret = "{$t}\\redirect_header({$directory}, {$numb}, {$var});\n";
} else {
- $ret = "{$t}redirect_header('{$directory}.php{$options}', {$numb}, {$var});\n";
+ $ret = "{$t}\\redirect_header('{$directory}.php{$options}', {$numb}, {$var});\n";
}
return $ret;
@@ -990,7 +1022,6 @@ public function getXcRedirectHeader($directory, $options, $numb, $var, $isString
/**
* @public function getXcXoopsConfirm
- * @param $tableName
* @param $language
* @param $fieldId
* @param $fieldMain
@@ -999,16 +1030,25 @@ public function getXcRedirectHeader($directory, $options, $numb, $var, $isString
* @param string $t
* @return string
*/
- public function getXcXoopsConfirm($tableName, $language, $fieldId, $fieldMain, $options = 'delete', $t = '')
+ public function getXcXoopsConfirm($language, $fieldId, $fieldMain, string $options = 'delete', string $t = ''): string
{
- $stuOptions = mb_strtoupper($options);
- $ccFieldId = Tdmcreate\Files\CreateFile::getInstance()->getCamelCase($fieldId, false, true);
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $array = "array('ok' => 1, '{$fieldId}' => \${$ccFieldId}, 'op' => '{$options}')";
- $server = $pc->getPhpCodeGlobalsVariables('REQUEST_URI', 'SERVER');
- $getVar = $this->getXcGetVar('', $tableName . 'Obj', $fieldMain, true, '');
- $sprintf = $pc->getPhpCodeSprintf($language . 'FORM_SURE_' . $stuOptions, $getVar);
- $ret = "{$t}xoops_confirm({$array}, {$server}, {$sprintf});\n";
+ $stuOptions = \mb_strtoupper($options);
+ $ccFieldId = Modulebuilder\Files\CreateFile::getInstance()->getCamelCase($fieldId, false, true);
+ $pc = Modulebuilder\Files\CreatePhpCode::getInstance();
+ $xc = Modulebuilder\Files\CreateXoopsCode::getInstance();
+
+ $ccFieldMain = Modulebuilder\Files\CreateFile::getInstance()->getCamelCase($fieldMain, false, true);
+
+ $array = "['ok' => 1, '{$fieldId}' => \${$ccFieldId}, 'start' => \$start, 'limit' => \$limit, 'op' => '{$options}']";
+ $server = $pc->getPhpCodeGlobalsVariables('REQUEST_URI', 'SERVER');
+ $sprintf = $pc->getPhpCodeSprintf($language . 'FORM_SURE_' . $stuOptions, "\${$ccFieldMain}");
+ $confirm = 'new Common\Confirm(' . "\n";
+ $confirm .= $t . "\t" . $array . ",\n";
+ $confirm .= $t . "\t" . $server . ",\n";
+ $confirm .= $t . "\t" . $sprintf . ')';
+ $ret = $xc->getXcEqualsOperator('$customConfirm', $confirm, '', $t);
+ $ret .= $xc->getXcEqualsOperator('$form', '$customConfirm->getFormConfirm()', '', $t);
+ $ret .= $xc->getXcXoopsTplAssign('form', '$form->render()', true, $t);
return $ret;
}
@@ -1017,13 +1057,13 @@ public function getXcXoopsConfirm($tableName, $language, $fieldId, $fieldMain, $
* @public function getXcHtmlErrors
*
* @param $tableName
- * @param bool $isParam
+ * @param bool $isParam
* @param string $obj
*
* @param string $t
* @return string
*/
- public function getXcHtmlErrors($tableName, $isParam = false, $obj = 'Obj', $t = '')
+ public function getXcHtmlErrors($tableName, bool $isParam = false, string $obj = 'Obj', string $t = ''): string
{
if ($isParam) {
$ret = "\${$tableName}{$obj}->getHtmlErrors()";
@@ -1044,9 +1084,9 @@ public function getXcHtmlErrors($tableName, $isParam = false, $obj = 'Obj', $t =
* @param string $t
* @return string
*/
- public function getXcGetForm($left, $tableName, $obj = '', $t = '')
+ public function getXcGetForm($left, $tableName, string $obj = '', string $t = ''): string
{
- $ucfTableName = ucfirst($tableName);
+ $ucfTableName = \ucfirst($tableName);
return "{$t}\${$left} = \${$tableName}{$obj}->getForm{$ucfTableName}();\n";
}
@@ -1062,10 +1102,10 @@ public function getXcGetForm($left, $tableName, $obj = '', $t = '')
* @param string $t
* @return string
*/
- public function getTopicGetVar($lpFieldName, $rpFieldName, $tableName, $tableNameTopic, $fieldNameParent, $fieldNameTopic, $t = '')
+ public function getTopicGetVar($lpFieldName, $rpFieldName, $tableName, $tableNameTopic, $fieldNameParent, $fieldNameTopic, string $t = ''): string
{
- $ret = Tdmcreate\Files\CreatePhpCode::getInstance()->getPhpCodeCommentLine('Get Var', $fieldNameParent, $t);
- $paramGet = $this->getXcGetVar('', "\${$tableName}All[\$i]", $fieldNameParent, true, '');
+ $ret = Modulebuilder\Files\CreatePhpCode::getInstance()->getPhpCodeCommentLine('Get Var', $fieldNameParent, $t);
+ $paramGet = $this->getXcGetVar('', "\${$tableName}All[\$i]", $fieldNameParent, true);
$ret .= $this->getXcHandlerGet($rpFieldName, $paramGet, '', $tableNameTopic . 'Handler', false, $t);
$ret .= $this->getXcGetVar("\${$lpFieldName}['{$rpFieldName}']", "\${$rpFieldName}", $fieldNameTopic, false, $t);
@@ -1081,9 +1121,10 @@ public function getTopicGetVar($lpFieldName, $rpFieldName, $tableName, $tableNam
* @param string $t
* @return string
*/
+ /*
public function getUploadImageGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName, $t = '')
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
+ $pc = Modulebuilder\Files\CreatePhpCode::getInstance();
$ret = $pc->getPhpCodeCommentLine('Get Var', $fieldName, $t);
$ret .= $this->getXcGetVar($fieldName, "\${$tableName}All[\$i]", $fieldName, false, '');
$ret .= $pc->getPhpCodeTernaryOperator('uploadImage', "\${$fieldName}", "\${$fieldName}", "'blank.gif'", $t);
@@ -1091,18 +1132,19 @@ public function getUploadImageGetVar($lpFieldName, $rpFieldName, $tableName, $fi
return $ret;
}
+ */
/**
- * @public function getXcSaveFieldId
+ * @public function getXcTableFieldId
*
* @param $fields
*
* @return string
*/
- public function getXcSaveFieldId($fields)
+ public function getXcTableFieldId($fields): string
{
$fieldId = '';
- foreach (array_keys($fields) as $f) {
+ foreach (\array_keys($fields) as $f) {
if (0 == $f) {
$fieldId = $fields[$f]->getVar('field_name');
}
@@ -1112,16 +1154,16 @@ public function getXcSaveFieldId($fields)
}
/**
- * @public function getXcSaveFieldMain
+ * @public function getXcTableFieldMain
*
* @param $fields
*
* @return string
*/
- public function getXcSaveFieldMain($fields)
+ public function getXcTableFieldMain($fields): string
{
$fieldMain = '';
- foreach (array_keys($fields) as $f) {
+ foreach (\array_keys($fields) as $f) {
if (1 == $fields[$f]->getVar('field_main')) {
$fieldMain = $fields[$f]->getVar('field_name');
}
@@ -1141,14 +1183,16 @@ public function getXcSaveFieldMain($fields)
* @param string $t
* @return string
*/
- public function getXcSaveElements($moduleDirname, $tableName, $tableSoleName, $fields, $t = '')
+ public function getXcSaveElements($moduleDirname, $tableName, $tableSoleName, $fields, string $t = ''): string
{
- $axc = Tdmcreate\Files\Admin\AdminXoopsCode::getInstance();
+ $axc = Modulebuilder\Files\Admin\AdminXoopsCode::getInstance();
+ $xc = Modulebuilder\Files\CreateXoopsCode::getInstance();
$ret = '';
$fieldMain = '';
$countUploader = 0;
- foreach (array_keys($fields) as $f) {
-
+ $fieldLines = '';
+ $language = '\_MA_' . \strtoupper($moduleDirname) . '_';
+ foreach (\array_keys($fields) as $f) {
$fieldName = $fields[$f]->getVar('field_name');
$fieldType = $fields[$f]->getVar('field_type');
$fieldElement = $fields[$f]->getVar('field_element');
@@ -1159,44 +1203,45 @@ public function getXcSaveElements($moduleDirname, $tableName, $tableSoleName, $f
switch ($fieldElement) {
case 5:
case 6:
- $ret .= $this->getXcSetVarCheckBoxOrRadioYN($tableName, $fieldName, $t);
+ $fieldLines .= $this->getXcSetVarCheckBoxOrRadioYN($tableName, $fieldName, $t);
break;
case 10:
- $ret .= $axc->getAxcSetVarImageList($tableName, $fieldName, $t, $countUploader);
+ $fieldLines .= $axc->getAxcSetVarImageList($tableName, $fieldName, $t, $countUploader);
$countUploader++;
break;
+ case 14:
case 11:
- $ret .= $axc->getAxcSetVarUploadFile($moduleDirname, $tableName, $fieldName, false, $t, $countUploader, $fieldMain);
+ $fieldLines .= $axc->getAxcSetVarUploadFile($moduleDirname, $tableName, $fieldName, false, $t, $countUploader, $fieldMain);
$countUploader++;
break;
case 12:
- $ret .= $axc->getAxcSetVarUploadFile($moduleDirname, $tableName, $fieldName, true, $t, $countUploader, $fieldMain);
+ $fieldLines .= $axc->getAxcSetVarUploadFile($moduleDirname, $tableName, $fieldName, true, $t, $countUploader, $fieldMain);
$countUploader++;
break;
case 13:
- $ret .= $axc->getAxcSetVarUploadImage($moduleDirname, $tableName, $fieldName, $fieldMain, $t, $countUploader);
- $countUploader++;
- break;
- case 14:
- $ret .= $axc->getAxcSetVarUploadFile($moduleDirname, $tableName, $fieldName, false, $t, $countUploader, $fieldMain);
+ $fieldLines .= $axc->getAxcSetVarUploadImage($moduleDirname, $tableName, $fieldName, $fieldMain, $t, $countUploader);
$countUploader++;
break;
case 15:
- $ret .= $this->getXcSetVarTextDateSelect($tableName, $tableSoleName, $fieldName, $t);
+ $fieldLines .= $this->getXcSetVarTextDateSelect($tableName, $tableSoleName, $fieldName, $language, $t);
break;
case 17:
- $ret .= $axc->getAxcSetVarPassword($tableName, $fieldName, $t);
+ $fieldLines .= $axc->getAxcSetVarPassword($tableName, $fieldName, $t);
$countUploader++;
break;
case 21:
- $ret .= $this->getXcSetVarDateTime($tableName, $tableSoleName, $fieldName, $t);
+ $fieldLines .= $this->getXcSetVarDateTime($tableName, $tableSoleName, $fieldName, $t, $language);
break;
default:
- $ret .= $axc->getAxcSetVarMisc($tableName, $fieldName, $fieldType, $t);
+ $fieldLines .= $axc->getAxcSetVarMisc($tableName, $fieldName, $fieldType, $fieldElement, $t);
break;
}
}
}
+ if ($countUploader > 0) {
+ $ret .= $xc->getXcEqualsOperator('$uploaderErrors', "''", null, $t);
+ }
+ $ret .= $fieldLines;
return $ret;
}
@@ -1206,16 +1251,20 @@ public function getXcSaveElements($moduleDirname, $tableName, $tableSoleName, $f
* @param $tableName
*
* @param string $t
+ * @param string $paramStart
+ * @param string $paramOp
+ * @param string $pageNavTplName
* @return string
*/
- public function getXcPageNav($tableName, $t = '')
+ public function getXcPageNav($tableName, string $t = '', string $paramStart = 'start', string $paramOp = "'op=list&limit=' . \$limit", string $pageNavTplName = ''): string
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $cxc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance();
+ $pc = Modulebuilder\Files\CreatePhpCode::getInstance();
+ $cxc = Modulebuilder\Files\Classes\ClassXoopsCode::getInstance();
$ret = $pc->getPhpCodeCommentLine('Display Navigation', null, $t);
- $condition = $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/pagenav', true, false, 'include', $t . "\t");
- $condition .= $cxc->getClassXoopsPageNav('pagenav', $tableName . 'Count', 'limit', 'start', 'start', "'op=list&limit=' . \$limit", false, $t . "\t");
- $condition .= $this->getXcXoopsTplAssign('pagenav', '$pagenav->renderNav(4)', true, $t . "\t");
+ $condition = $pc->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH', 'class/pagenav', true, false, 'require', $t . "\t");
+ $condition .= $cxc->getClassXoopsPageNav('pagenav', $tableName . 'Count', 'limit', 'start', $paramStart, $paramOp, false, $t . "\t");
+ if ('' === $pageNavTplName) { $pageNavTplName = 'pagenav';}
+ $condition .= $this->getXcXoopsTplAssign($pageNavTplName, '$pagenav->renderNav()', true, $t . "\t");
$ret .= $pc->getPhpCodeConditions("\${$tableName}Count", ' > ', '$limit', $condition, false, $t);
return $ret;
@@ -1227,9 +1276,9 @@ public function getXcPageNav($tableName, $t = '')
* @param string $t
* @return string
*/
- public function getXcGetGlobal($globals, $t = '')
+ public function getXcGetGlobal($globals, string $t = ''): string
{
- $ret = $t . "global ";
+ $ret = $t . 'global ';
$detail = '';
foreach ($globals as $global) {
if ($detail !== '') {
@@ -1237,7 +1286,7 @@ public function getXcGetGlobal($globals, $t = '')
}
$detail .= '$' . $global;
}
- $ret .= $detail . ";\n";
+ $ret .= $detail . ";\n";
return $ret;
}
@@ -1250,7 +1299,7 @@ public function getXcGetGlobal($globals, $t = '')
*
* @return string
*/
- public function getXcCriteriaCompo($var, $t = '')
+ public function getXcCriteriaCompo($var, string $t = ''): string
{
return "{$t}\${$var} = new \CriteriaCompo();\n";
}
@@ -1262,20 +1311,20 @@ public function getXcCriteriaCompo($var, $t = '')
* @param $param1
* @param string $param2
* @param string $param3
- * @param bool $isParam
+ * @param bool $isParam
* @param string $t
*
* @return string
*/
- public function getXcCriteria($var, $param1, $param2 = '', $param3 = '', $isParam = false, $t = '')
+ public function getXcCriteria($var, $param1, string $param2 = '', string $param3 = '', bool $isParam = false, string $t = ''): string
{
$params = ('' != $param2) ? ', ' . $param2 : '';
$params .= ('' != $param3) ? ', ' . $param3 : '';
if (false === $isParam) {
- $ret = "{$t}\${$var} = new \Criteria( {$param1}{$params} );\n";
+ $ret = "{$t}\${$var} = new \Criteria({$param1}{$params});\n";
} else {
- $ret = "new \Criteria( {$param1}{$params} )";
+ $ret = "new \Criteria({$param1}{$params})";
}
return $ret;
@@ -1291,12 +1340,13 @@ public function getXcCriteria($var, $param1, $param2 = '', $param3 = '', $isPara
* @param string $condition
* @return string
*/
- public function getXcCriteriaAdd($var, $param, $t = '', $n = "\n", $condition = '')
+ public function getXcCriteriaAdd($var, $param, string $t = '', string $n = "\n", string $condition = ''): string
{
if ('' !== $condition) {
$condition = ", {$condition}";
}
- return "{$t}\${$var}->add( {$param}{$condition} );{$n}";
+
+ return "{$t}\${$var}->add({$param}{$condition});{$n}";
}
/**
@@ -1309,9 +1359,9 @@ public function getXcCriteriaAdd($var, $param, $t = '', $n = "\n", $condition =
* @param string $n
* @return string
*/
- public function getXcCriteriaSetStart($var, $start, $t = '', $n = "\n")
+ public function getXcCriteriaSetStart($var, $start, string $t = '', string $n = "\n"): string
{
- return "{$t}\${$var}->setStart( {$start} );{$n}";
+ return "{$t}\${$var}->setStart({$start});{$n}";
}
/**
@@ -1324,9 +1374,9 @@ public function getXcCriteriaSetStart($var, $start, $t = '', $n = "\n")
* @param string $n
* @return string
*/
- public function getXcCriteriaSetLimit($var, $limit, $t = '', $n = "\n")
+ public function getXcCriteriaSetLimit($var, $limit, string $t = '', string $n = "\n"): string
{
- return "{$t}\${$var}->setLimit( {$limit} );{$n}";
+ return "{$t}\${$var}->setLimit({$limit});{$n}";
}
/**
@@ -1339,9 +1389,9 @@ public function getXcCriteriaSetLimit($var, $limit, $t = '', $n = "\n")
* @param string $n
* @return string
*/
- public function getXcCriteriaSetSort($var, $sort, $t = '', $n = "\n")
+ public function getXcCriteriaSetSort($var, $sort, string $t = '', string $n = "\n"): string
{
- return "{$t}\${$var}->setSort( {$sort} );{$n}";
+ return "{$t}\${$var}->setSort({$sort});{$n}";
}
/**
@@ -1354,9 +1404,9 @@ public function getXcCriteriaSetSort($var, $sort, $t = '', $n = "\n")
* @param string $n
* @return string
*/
- public function getXcCriteriaSetOrder($var, $order, $t = '', $n = "\n")
+ public function getXcCriteriaSetOrder($var, $order, string $t = '', string $n = "\n"): string
{
- return "{$t}\${$var}->setOrder( {$order} );{$n}";
+ return "{$t}\${$var}->setOrder({$order});{$n}";
}
/*************************************************************/
@@ -1365,37 +1415,36 @@ public function getXcCriteriaSetOrder($var, $order, $t = '', $n = "\n")
/**
* @public function getXcXoopsFormGroupPerm
- * @param $varLeft
- * @param $formTitle
- * @param $moduleId
- * @param $permName
- * @param $permDesc
- * @param $filename
- * @param $t
+ * @param string $varLeft
+ * @param string $formTitle
+ * @param string $moduleId
+ * @param string $permName
+ * @param string $permDesc
+ * @param string $filename
+ * @param string $t
*
* @return string
*/
- public function getXcXoopsFormGroupPerm($varLeft = '', $formTitle = '', $moduleId = '', $permName = '', $permDesc = '', $filename = '', $t = '')
+ public function getXcXoopsFormGroupPerm(string $varLeft = '', string $formTitle = '', string $moduleId = '', string $permName = '', string $permDesc = '', string $filename = '', string $t = ''): string
{
return "{$t}\${$varLeft} = new \XoopsGroupPermForm({$formTitle}, {$moduleId}, {$permName}, {$permDesc}, {$filename});\n";
}
-
/**
* @public function getXoopsFormSelectExtraOptions
* @param string $varSelect
* @param string $caption
* @param string $var
- * @param array $options
- * @param bool $setExtra
+ * @param array $options
+ * @param string $setExtra
*
* @param string $t
* @return string
*/
- public function getXoopsFormSelectExtraOptions($varSelect = '', $caption = '', $var = '', $options = [], $setExtra = true, $t = '')
+ public function getXoopsFormSelectExtraOptions(string $varSelect = '', string $caption = '', string $var = '', array $options = [], string $setExtra = '', string $t = ''): string
{
$ret = "{$t}\${$varSelect} = new \XoopsFormSelect({$caption}, '{$var}', \${$var});\n";
- if (false !== $setExtra) {
+ if ('' !== $setExtra) {
$ret .= "{$t}\${$varSelect}->setExtra('{$setExtra}');\n";
}
foreach ($options as $key => $value) {
@@ -1406,6 +1455,19 @@ public function getXoopsFormSelectExtraOptions($varSelect = '', $caption = '', $
}
+ /*************************************************************/
+ /** special components */
+ /*************************************************************/
+ /**
+ * @public function getXcGetConstants
+ * @param mixed $const
+ * @return string
+ */
+ public function getXcGetConstants($const): string
+ {
+ return "Constants::{$const}";
+ }
+
/*************************************************************/
/** other Xoops components */
/*************************************************************/
@@ -1413,20 +1475,20 @@ public function getXoopsFormSelectExtraOptions($varSelect = '', $caption = '', $
/**
* @public function getXcXoopsCPHeader
- * @param null
+ *
* @return string
*/
- public function getXcXoopsCPHeader()
+ public function getXcXoopsCPHeader(): string
{
return "xoops_cp_header();\n";
}
/**
* @public function getXcXoopsCPFooter
- * @param null
+ *
* @return string
*/
- public function getXcXoopsCPFooter()
+ public function getXcXoopsCPFooter(): string
{
return "xoops_cp_footer();\n";
}
@@ -1434,39 +1496,39 @@ public function getXcXoopsCPFooter()
/**
* @public function getXcXoopsLoad
*
- * @param $var
- * @param $t
+ * @param string $var
+ * @param string $t
* @return string
*/
- public function getXcXoopsLoad($var = '', $t = '')
+ public function getXcXoopsLoad(string $var = '', string $t = ''): string
{
- return "{$t}xoops_load('{$var}');\n";
+ return "{$t}\xoops_load('{$var}');\n";
}
/**
* @public function getXcXoopsLoadLanguage
*
* @param $lang
- * @param $t
- * @param $domain
+ * @param string $t
+ * @param string $domain
*
* @return string
*/
- public function getXcXoopsLoadLanguage($lang, $t = '', $domain = '')
+ public function getXcXoopsLoadLanguage($lang, string $t = '', string $domain = ''): string
{
if ('' === $domain) {
- return "{$t}xoops_loadLanguage('{$lang}');\n";
+ return "{$t}\xoops_loadLanguage('{$lang}');\n";
}
- return "{$t}xoops_loadLanguage('{$lang}', '{$domain}');\n";
+ return "{$t}\xoops_loadLanguage('{$lang}', '{$domain}');\n";
}
/**
* @public function getXcXoopsCaptcha
- * @param $t
+ * @param string $t
* @return string
*/
- public function getXcXoopsCaptcha($t = '')
+ public function getXcXoopsCaptcha(string $t = ''): string
{
return "{$t}\$xoopsCaptcha = \XoopsCaptcha::getInstance();\n";
}
@@ -1475,35 +1537,35 @@ public function getXcXoopsCaptcha($t = '')
* @public function getXcXoopsListImgListArray
* @param $return
* @param $var
- * @param $t
+ * @param string $t
*
* @return string
*/
- public function getXcXoopsListImgListArray($return, $var, $t = '')
+ public function getXcXoopsListImgListArray($return, $var, string $t = ''): string
{
return "{$t}\${$return} = \XoopsLists::getImgListAsArray( {$var} );\n";
}
/**
* @public function getXcXoopsListLangList
- * @param $return
+ * @param $return
* @param string $t
*
* @return string
*/
- public function getXcXoopsListLangList($return, $t = '')
+ public function getXcXoopsListLangList($return, string $t = ''): string
{
return "{$t}\${$return} = \XoopsLists::getLangList();\n";
}
/**
* @public function getXcXoopsListCountryList
- * @param $return
+ * @param $return
* @param string $t
*
* @return string
*/
- public function getXcXoopsListCountryList($return, $t = '')
+ public function getXcXoopsListCountryList($return, string $t = ''): string
{
return "{$t}\${$return} = \XoopsLists::getCountryList();\n";
}
@@ -1516,7 +1578,7 @@ public function getXcXoopsListCountryList($return, $t = '')
*
* @return string
*/
- public function getXcXoopsUserUnameFromId($left, $value, $t = '')
+ public function getXcXoopsUserUnameFromId($left, $value, string $t = ''): string
{
return "{$t}\${$left} = \XoopsUser::getUnameFromId({$value});\n";
}
@@ -1526,14 +1588,18 @@ public function getXcXoopsUserUnameFromId($left, $value, $t = '')
*
* @param $tplString
* @param $phpRender
- * @param bool $leftIsString
- *
+ * @param bool $leftIsString
* @param string $t
+ * @param string $tpl
* @return string
*/
- public function getXcXoopsTplAssign($tplString, $phpRender, $leftIsString = true, $t = '')
+ public function getXcXoopsTplAssign($tplString, $phpRender, bool $leftIsString = true, string $t = '', string $tpl = ''): string
{
$assign = "{$t}\$GLOBALS['xoopsTpl']->assign(";
+ if ('' !== $tpl) {
+ $assign = "{$t}\${$tpl}->assign(";
+ }
+
if (false === $leftIsString) {
$ret = $assign . "{$tplString}, {$phpRender});\n";
} else {
@@ -1552,7 +1618,7 @@ public function getXcXoopsTplAssign($tplString, $phpRender, $leftIsString = true
* @param string $t
* @return string
*/
- public function getXcXoopsTplAppend($tplString, $phpRender, $t = '')
+ public function getXcXoopsTplAppend($tplString, $phpRender, string $t = ''): string
{
return "{$t}\$GLOBALS['xoopsTpl']->append('{$tplString}', {$phpRender});\n";
}
@@ -1566,7 +1632,7 @@ public function getXcXoopsTplAppend($tplString, $phpRender, $t = '')
* @param string $t
* @return string
*/
- public function getXcXoopsTplAppendByRef($tplString, $phpRender, $t = '')
+ public function getXcXoopsTplAppendByRef($tplString, $phpRender, string $t = ''): string
{
return "{$t}\$GLOBALS['xoopsTpl']->appendByRef('{$tplString}', {$phpRender});\n";
}
@@ -1576,10 +1642,10 @@ public function getXcXoopsTplAppendByRef($tplString, $phpRender, $t = '')
*
* @param string $displayTpl
* @param string $t
- * @param bool $usedoublequotes
+ * @param bool $usedoublequotes
* @return string
*/
- public function getXcXoopsTplDisplay($displayTpl = '{$templateMain}', $t = '', $usedoublequotes = true)
+ public function getXcXoopsTplDisplay(string $displayTpl = '{$templateMain}', string $t = '', bool $usedoublequotes = true): string
{
if ($usedoublequotes) {
return "{$t}\$GLOBALS['xoopsTpl']->display(\"db:{$displayTpl}\");\n";
@@ -1593,12 +1659,12 @@ public function getXcXoopsTplDisplay($displayTpl = '{$templateMain}', $t = '', $
*
* @param $directory
* @param $filename
- * @param bool $isParam
+ * @param bool $isParam
*
* @param string $t
* @return string
*/
- public function getXcXoopsPath($directory, $filename, $isParam = false, $t = '')
+ public function getXcXoopsPath($directory, $filename, bool $isParam = false, string $t = ''): string
{
if (!$isParam) {
$ret = "{$t}\$GLOBALS['xoops']->path({$directory}.'/{$filename}.php');\n";
@@ -1614,12 +1680,12 @@ public function getXcXoopsPath($directory, $filename, $isParam = false, $t = '')
*
* @param $left
* @param $string
- * @param bool $isParam
+ * @param bool $isParam
*
* @param string $t
* @return string
*/
- public function getXcXoopsModuleGetInfo($left, $string, $isParam = false, $t = '')
+ public function getXcXoopsModuleGetInfo($left, $string, bool $isParam = false, string $t = ''): string
{
if (!$isParam) {
$ret = "{$t}\${$left} = \$GLOBALS['xoopsModule']->getInfo('{$string}');\n";
@@ -1630,35 +1696,41 @@ public function getXcXoopsModuleGetInfo($left, $string, $isParam = false, $t = '
return $ret;
}
-
/**
* @public function getXcXoThemeAddStylesheet
* @param string $style
*
* @param string $t
+ * @param bool $isString
* @return string
*/
- public function getXcXoThemeAddStylesheet($style = 'style', $t = '')
+ public function getXcXoThemeAddStylesheet(string $style = 'style', string $t = '', bool $isString = true): string
{
- return "{$t}\$GLOBALS['xoTheme']->addStylesheet( \${$style}, null );\n";
+ $ret = "{$t}\$GLOBALS['xoTheme']->addStylesheet(";
+ if ($isString) {
+ $ret .= '$';
+ }
+ $ret .= "{$style}, null);\n";
+
+ return $ret;
}
/**
* @public function getXcXoopsSecurityCheck
- * @param $denial
- * @return bool
+ * @param string $denial
+ * @return string
*/
- public function getXcXoopsSecurityCheck($denial = '')
+ public function getXcXoopsSecurityCheck(string $denial = ''): string
{
return "{$denial}\$GLOBALS['xoopsSecurity']->check()";
}
/**
* @public function getXcXoopsSecurityErrors
- * @param null
+ *
* @return string
*/
- public function getXcXoopsSecurityErrors()
+ public function getXcXoopsSecurityErrors(): string
{
return "\$GLOBALS['xoopsSecurity']->getErrors()";
}
@@ -1670,8 +1742,136 @@ public function getXcXoopsSecurityErrors()
* @param string $n
* @return string
*/
- public function getXcXoopsHandler($left, $t = '', $n = "\n")
+ public function getXcXoopsHandler($left, string $t = '', string $n = "\n"): string
{
- return "{$t}\${$left}Handler = xoops_getHandler('{$left}');{$n}";
+ return "{$t}\${$left}Handler = \xoops_getHandler('{$left}');{$n}";
+ }
+
+
+ /*************************************************************/
+ /** common components for user and admin pages */
+ /*************************************************************/
+
+ /**
+ * @public function getXcCommonPagesEdit
+ * @param $tableName
+ * @param $ccFieldId
+ * @param string $t
+ * @param string $language
+ * @return string
+ */
+ public function getXcCommonPagesEdit($tableName, $ccFieldId, string $t = '', string $language = ''): string
+ {
+ $pc = Modulebuilder\Files\CreatePhpCode::getInstance();
+ $xc = Modulebuilder\Files\CreateXoopsCode::getInstance();
+
+ $ret = $pc->getPhpCodeCommentLine('Get Form', null, "\t\t");
+ $ret .= $xc->getXcHandlerGet($tableName, $ccFieldId, 'Obj', $tableName . 'Handler', false, $t);
+ $tablenameObj = $pc->getPhpCodeIsobject($tableName . 'Obj');
+ $redirectError = $xc->getXcRedirectHeader($tableName, '', '3', "{$language}INVALID_PARAM", true, $t . "\t");
+ $ret .= $pc->getPhpCodeConditions('!' . $tablenameObj, '', '', $redirectError, false, $t);
+ $ret .= $xc->getXcEqualsOperator("\${$tableName}Obj->start", '$start', null, $t);
+ $ret .= $xc->getXcEqualsOperator("\${$tableName}Obj->limit", '$limit', null, $t);
+ $ret .= $xc->getXcGetForm('form', $tableName, 'Obj', $t);
+ $ret .= $xc->getXcXoopsTplAssign('form', '$form->render()', true, $t);
+
+ return $ret;
+ }
+
+ /**
+ * @public function getXcCommonPagesNew
+ * @param $tableName
+ * @param string $t
+ * @return string
+ */
+ public function getXcCommonPagesNew($tableName, string $t = ''): string
+ {
+ $pc = Modulebuilder\Files\CreatePhpCode::getInstance();
+ $xc = Modulebuilder\Files\CreateXoopsCode::getInstance();
+
+ $ret = $pc->getPhpCodeCommentLine('Form Create', null, $t);
+ $ret .= $xc->getXcHandlerCreateObj($tableName, $t);
+ $ret .= $xc->getXcGetForm('form', $tableName, 'Obj', $t);
+ $ret .= $xc->getXcXoopsTplAssign('form', '$form->render()', true, $t);
+
+ return $ret;
+ }
+
+ /**
+ * @public function getXcCommonPagesClone
+ * @param $tableName
+ * @param $ccFieldId
+ * @param string $t
+ * @param string $language
+ * @return string
+ */
+ public function getXcCommonPagesClone($tableName, $ccFieldId, string $t = '', string $language = ''): string
+ {
+ $pc = Modulebuilder\Files\CreatePhpCode::getInstance();
+ $xc = Modulebuilder\Files\CreateXoopsCode::getInstance();
+
+ $ret = $pc->getPhpCodeCommentLine('Get Form', null, "\t\t");
+ $ret .= $xc->getXcHandlerGet($tableName, $ccFieldId . 'Source', 'ObjSource', $tableName . 'Handler', false, $t);
+ $tablenameObj = $pc->getPhpCodeIsobject($tableName . 'ObjSource');
+ $redirectError = $xc->getXcRedirectHeader($tableName, '', '3', "{$language}INVALID_PARAM", true, $t . "\t");
+ $ret .= $pc->getPhpCodeConditions('!' . $tablenameObj, '', '', $redirectError, false, $t);
+ $ret .= $xc->getXcEqualsOperator('$' . $tableName . 'Obj', '$' . $tableName . 'ObjSource->xoopsClone()', null, $t);
+ $ret .= $xc->getXcGetForm('form', $tableName, 'Obj', $t);
+ $ret .= $xc->getXcXoopsTplAssign('form', '$form->render()', true, $t);
+
+ return $ret;
+ }
+
+ /**
+ * @public function getXcCommonPagesDelete
+ * @param $language
+ * @param $tableName
+ * @param $tableSoleName
+ * @param $fieldId
+ * @param $fieldMain
+ * @param $tableNotifications
+ * @param string $t
+ * @param bool $admin
+ * @return string
+ */
+ public function getXcCommonPagesDelete($language, $tableName, $tableSoleName, $fieldId, $fieldMain, $tableNotifications, string $t = '', bool $admin = false): string
+ {
+ $pc = Modulebuilder\Files\CreatePhpCode::getInstance();
+ $xc = Modulebuilder\Files\CreateXoopsCode::getInstance();
+ $cf = Modulebuilder\Files\CreateFile::getInstance();
+
+ $ccFieldId = $cf->getCamelCase($fieldId, false, true);
+ $ccFieldMain = $cf->getCamelCase($fieldMain, false, true);
+
+ $ret = $xc->getXcHandlerGet($tableName, $ccFieldId, 'Obj', $tableName . 'Handler', false, $t);
+ $tablenameObj = $pc->getPhpCodeIsobject($tableName . 'Obj');
+ $redirectError = $xc->getXcRedirectHeader($tableName, '', '3', "{$language}INVALID_PARAM", true, $t . "\t");
+ $ret .= $pc->getPhpCodeConditions('!' . $tablenameObj, '', '', $redirectError, false, $t);
+ $ret .= $xc->getXcGetVar($ccFieldMain, "{$tableName}Obj", $fieldMain, false, $t);
+ $reqOk = "_REQUEST['ok']";
+ $isset = $pc->getPhpCodeIsset($reqOk);
+ $xoopsSecurityCheck = $xc->getXcXoopsSecurityCheck();
+ $xoopsSecurityErrors = $xc->getXcXoopsSecurityErrors();
+ $implode = $pc->getPhpCodeImplode(', ', $xoopsSecurityErrors);
+ $redirectHeaderErrors = $xc->getXcRedirectHeader($tableName, '', '3', $implode, true, $t . "\t\t");
+ $delete = $xc->getXcHandlerDelete($tableName, $tableName, 'Obj');
+ $condition = $pc->getPhpCodeConditions('!' . $xoopsSecurityCheck, '', '', $redirectHeaderErrors, false, $t . "\t");
+ $contInsert = '';
+ if (!$admin && 1 == $tableNotifications) {
+ $contInsert .= $pc->getPhpCodeCommentLine('Event delete notification', null, $t . "\t\t");
+ $contInsert .= $pc->getPhpCodeArray('tags', [], false, $t . "\t\t");
+ $contInsert .= $xc->getXcEqualsOperator("\$tags['ITEM_NAME']", "\${$ccFieldMain}", '', $t . "\t\t");
+ $contInsert .= $xc->getXcXoopsHandler('notification', $t . "\t\t");
+ $contInsert .= $cf->getSimpleString("\$notificationHandler->triggerEvent('global', 0, 'global_delete', \$tags);", $t . "\t\t");
+ $contInsert .= $cf->getSimpleString("\$notificationHandler->triggerEvent('{$tableName}', \${$ccFieldId}, '{$tableSoleName}_delete', \$tags);", $t . "\t\t");
+ }
+ $contInsert .= $xc->getXcRedirectHeader($tableName, '', '3', "{$language}FORM_DELETE_OK", true, $t . "\t\t");
+ $htmlErrors = $xc->getXcHtmlErrors($tableName, true);
+ $internalElse = $xc->getXcXoopsTplAssign('error', $htmlErrors, true, $t . "\t\t");
+ $condition .= $pc->getPhpCodeConditions($delete, '', '', $contInsert, $internalElse, $t . "\t");
+ $mainElse = $xc->getXcXoopsConfirm($language, $fieldId, $fieldMain, 'delete', $t . "\t");
+ $ret .= $pc->getPhpCodeConditions($isset, ' && ', "1 == \${$reqOk}", $condition, $mainElse, $t);
+
+ return $ret;
}
}
diff --git a/class/Files/Docs/DocsChangelog.php b/class/Files/Docs/DocsChangelog.php
index 7199a0cf..458bfe55 100644
--- a/class/Files/Docs/DocsChangelog.php
+++ b/class/Files/Docs/DocsChangelog.php
@@ -1,9 +1,9 @@
-setModule($module);
$this->setFileName($filename);
@@ -68,23 +67,22 @@ public function write($module, $filename)
/**
* @public function render
- * @param null
- * @return bool|string
+ *
+ * @return string
*/
public function render()
{
$module = $this->getModule();
$filename = $this->getFileName();
- $moduleName = $module->getVar('mod_name');
$moduleDirname = $module->getVar('mod_dirname');
$date = date('Y/m/d G:i:s');
$content = <<getVar('mod_version')}
-==============================================================
- - Original release {$moduleDirname} ({$module->getVar('mod_author')})
-EOT;
- $this->create($moduleDirname, 'docs', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ ==============================================================
+ {$module->getVar('mod_version')} [{$date}]
+ ==============================================================
+ - Original release {$moduleDirname} ({$module->getVar('mod_author')})
+ EOT;
+ $this->create($moduleDirname, 'docs', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $this->renderFile();
}
diff --git a/class/Files/Docs/DocsFiles.php b/class/Files/Docs/DocsFiles.php
index c0277b96..82121ec0 100644
--- a/class/Files/Docs/DocsFiles.php
+++ b/class/Files/Docs/DocsFiles.php
@@ -1,9 +1,9 @@
-setModule($module);
$this->setFileName($filename);
@@ -91,14 +82,12 @@ public function write($module, $filename)
public function getChangeLogFile($moduleDirname, $mod_version, $mod_author)
{
$date = date('Y/m/d G:i:s');
- $ret = <<getLangDiffFile($mod_version);
break;
}
- $this->create($moduleDirname, 'docs', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->create($moduleDirname, 'docs', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $this->renderFile();
}
diff --git a/class/Files/Docs/index.php b/class/Files/Docs/index.php
new file mode 100644
index 00000000..e5ee0725
--- /dev/null
+++ b/class/Files/Docs/index.php
@@ -0,0 +1,2 @@
+xc = Modulebuilder\Files\CreateXoopsCode::getInstance();
+ $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance();
}
/**
* @static function getInstance
- * @param null
+ *
* @return IncludeCommentFunctions
*/
public static function getInstance()
@@ -57,11 +67,11 @@ public static function getInstance()
/**
* @public function write
- * @param string $module
+ * @param $module
* @param mixed $table
* @param $filename
*/
- public function write($module, $table, $filename)
+ public function write($module, $table, $filename): void
{
$this->setModule($module);
$this->setTable($table);
@@ -70,42 +80,82 @@ public function write($module, $table, $filename)
/**
* @public function getCommentBody
- * @param string $module
- * @param mixed $table
+ * @param $module
+ * @param $table
* @return string
*/
public function getCommentBody($module, $table)
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
-
- $moduleDirname = $module->getVar('mod_dirname');
- $tableName = $table->getVar('table_name');
- $ucfModuleDirname = ucfirst($moduleDirname);
- $ucfTableName = ucfirst($tableName);
-
- $ret = $pc->getPhpCodeCommentMultiLine(['CommentsUpdate' => '', '' => '', '@param mixed $itemId' => '', '@param mixed $itemNumb' => '', '@return' => 'bool']);
- $func1 = $xc->getXcEqualsOperator('$itemId', '(int)$itemId', '', "\t");
- $func1 .= $xc->getXcEqualsOperator('$itemNumb', '(int)$itemNumb', '', "\t");
- $func1 .= $xc->getXcEqualsOperator('$article', "new {$ucfModuleDirname}{$ucfTableName}(\$itemId)", '', "\t");
- $contIf = $this->getSimpleString('return false;',"\t\t");
- $func1 .= $pc->getPhpCodeConditions('!$article->updateComments($itemNumb)','','',$contIf, false,"\t");
- $func1 .= $this->getSimpleString('return true;',"\t");
- $ret .= $pc->getPhpCodeFunction($moduleDirname . 'CommentsUpdate', '$itemId, $itemNumb', $func1);
- $ret .= $pc->getPhpCodeCommentMultiLine(['CommentsApprove' => '', '' => '', '@param mixed' => '$comment', '@return' => 'bool']);
- $func2 = $pc->getPhpCodeCommentLine('notification mail here','',"\t");
- $func2 .= $pc->getPhpCodeBlankLine();
- $func2 .= $this->getSimpleString('return false;',"\t");
- $func2 .= $pc->getPhpCodeBlankLine();
- $ret .= $pc->getPhpCodeFunction($moduleDirname . 'CommentsApprove', '&$comment', $func2);
+ $moduleDirname = $module->getVar('mod_dirname');
+ $tableName = $table->getVar('table_name');
+ $tableSoleName = $table->getVar('table_solename');
+ $tableFieldName = $table->getVar('table_fieldname');
+ $language = '\_MA_' . strtoupper($moduleDirname) . '_';
+
+ $fieldId = '';
+ $ccFieldId = '';
+ $ccFieldMain = '';
+ $fieldMain = '';
+ $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'));
+ foreach (\array_keys($fields) as $f) {
+ $fieldName = $fields[$f]->getVar('field_name');
+ if (0 == $f) {
+ $fieldId = $fieldName;
+ $ccFieldId = $this->getCamelCase($fieldId, false, true);
+ }
+ if (1 == $fields[$f]->getVar('field_main')) {
+ $fieldMain = $fieldName; // fieldMain = fields parameters main field
+ $ccFieldMain = $this->getCamelCase($fieldMain, false, true);
+ }
+ }
+
+ $t = "\t";
+ $ret = $this->pc->getPhpCodeCommentMultiLine(['CommentsUpdate' => '', '' => '', '@param mixed $itemId' => '', '@param mixed $itemNumb' => '', '@return' => 'bool']);
+ $func1 = $this->xc->getXcHelperGetInstance($moduleDirname, $t);
+ $func1 .= $this->xc->getXcHandlerLine($tableName, $t);
+ $func1 .= $this->xc->getXcEqualsOperator("\${$ccFieldId}", '(int)$itemId', '', $t);
+ $func1 .= $this->xc->getXcHandlerGet($tableName, $ccFieldId, 'Obj', $tableName . 'Handler', false, $t);
+ $tablenameObj = $this->pc->getPhpCodeIsobject($tableName . 'Obj');
+ $redirectError = $this->xc->getXcRedirectHeader($tableName, '', '3', "{$language}INVALID_PARAM", true, $t . "\t");
+ $func1 .= $this->pc->getPhpCodeConditions('!' . $tablenameObj, '', '', $redirectError, false, $t);
+ $func1 .= $this->xc->getXcSetVarObj($tableName, $tableFieldName . '_comments', '(int)$itemNumb', $t);
+ $insert = $this->xc->getXcHandlerInsert($tableName, $tableName, 'Obj');
+ $contIf = $this->getSimpleString('return true;', $t . "\t");
+ $func1 .= $this->pc->getPhpCodeConditions($insert, '', '', $contIf, false, $t);
+ $func1 .= $this->getSimpleString('return false;', $t);
+ $ret .= $this->pc->getPhpCodeFunction($moduleDirname . 'CommentsUpdate', '$itemId, $itemNumb', $func1);
+ $ret .= $this->pc->getPhpCodeCommentMultiLine(['CommentsApprove' => '', '' => '', '@param mixed' => '$comment', '@return' => 'bool']);
+
+ $func2 = $this->pc->getPhpCodeCommentLine('Notification event', '', $t);
+ $func2 .= $this->xc->getXcHelperGetInstance($moduleDirname, $t);
+ $func2 .= $this->xc->getXcHandlerLine($tableName, $t);
+ $func2 .= $this->getSimpleString('$' . $ccFieldId . " = (int)\$comment->getVar('com_itemid');", $t);
+ $func2 .= $this->xc->getXcHandlerGet($tableName, $ccFieldId, 'Obj', $tableName . 'Handler', false, $t);
+ $tablenameObj = $this->pc->getPhpCodeIsobject($tableName . 'Obj');
+ $redirectError = $this->xc->getXcRedirectHeader($tableName, '', '3', "{$language}INVALID_PARAM", true, $t . "\t");
+ $func2 .= $this->pc->getPhpCodeConditions('!' . $tablenameObj, '', '', $redirectError, false, $t);
+ $func2 .= $this->xc->getXcGetVar($ccFieldMain, "{$tableName}Obj", $fieldMain, false, $t);
+
+ $func2 .= $this->pc->getPhpCodeBlankLine();
+ $func2 .= $this->pc->getPhpCodeArray('tags', [], false, $t);
+ $func2 .= $this->xc->getXcEqualsOperator("\$tags['ITEM_NAME']", "\${$ccFieldMain}", '', $t);
+ $url = "\XOOPS_URL . '/modules/{$moduleDirname}/{$tableName}.php?op=show&{$fieldId}=' . \${$ccFieldId}";
+ $func2 .= $this->xc->getXcEqualsOperator("\$tags['ITEM_URL'] ", $url, '', $t);
+ $func2 .= $this->xc->getXcXoopsHandler('notification', $t);
+ $func2 .= $this->pc->getPhpCodeCommentLine('Event modify notification', null, $t);
+ $func2 .= $this->getSimpleString("\$notificationHandler->triggerEvent('global', 0, 'global_comment', \$tags);", $t);
+ $func2 .= $this->getSimpleString("\$notificationHandler->triggerEvent('{$tableName}', \${$ccFieldId}, '{$tableSoleName}_comment', \$tags);", $t);
+ $func2 .= $this->getSimpleString('return true;', $t);
+ $func2 .= $this->pc->getPhpCodeBlankLine();
+ $ret .= $this->pc->getPhpCodeFunction($moduleDirname . 'CommentsApprove', '$comment', $func2);
return $ret;
}
/**
* @public function render
- * @param null
- * @return bool|string
+ *
+ * @return string
*/
public function render()
{
@@ -113,11 +163,11 @@ public function render()
$table = $this->getTable();
$moduleDirname = $module->getVar('mod_dirname');
- $filename = $this->getFileName();
- $content = $this->getHeaderFilesComments($module);
- $content .= $this->getCommentBody($module, $table);
+ $filename = $this->getFileName();
+ $content = $this->getHeaderFilesComments($module);
+ $content .= $this->getCommentBody($module, $table);
- $this->create($moduleDirname, 'include', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->create($moduleDirname, 'include', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $this->renderFile();
}
diff --git a/class/Files/Includes/IncludeComments.php b/class/Files/Includes/IncludeComments.php
index a3fc8ba5..c0e39a4f 100644
--- a/class/Files/Includes/IncludeComments.php
+++ b/class/Files/Includes/IncludeComments.php
@@ -1,9 +1,9 @@
-xc = Modulebuilder\Files\CreateXoopsCode::getInstance();
+ $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance();
}
/**
* @static function getInstance
- * @param null
+ *
* @return IncludeComments
*/
public static function getInstance()
@@ -57,10 +67,10 @@ public static function getInstance()
/**
* @public function write
- * @param string $module
- * @param mixed $table
+ * @param $module
+ * @param mixed $table
*/
- public function write($module, $table)
+ public function write($module, $table): void
{
$this->setModule($module);
$this->setTable($table);
@@ -68,98 +78,55 @@ public function write($module, $table)
/**
* @public function getCommentsIncludes
- * @param string $module
+ * @param $module
* @param string $filename
*
- * @return bool|string
+ * @return string
*/
- public function renderCommentsIncludes($module, $filename)
+ public function renderCommentsIncludes($module, string $filename)
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
$moduleDirname = $module->getVar('mod_dirname');
$content = $this->getHeaderFilesComments($module);
- $content .= $pc->getPhpCodeIncludeDir("__DIR__ . '/../../../mainfile.php'",'',true, true);
- $content .= $pc->getPhpCodeIncludeDir("XOOPS_ROOT_PATH.'/include/{$filename}.php'",'',true, true);
+ $content .= $this->pc->getPhpCodeIncludeDir("\dirname(__DIR__, 2) . '/mainfile.php'",'',true, true);
+ $content .= $this->pc->getPhpCodeIncludeDir("\XOOPS_ROOT_PATH.'/include/{$filename}.php'",'',true, true);
- $this->create($moduleDirname, 'include', $filename . '.php', $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->create($moduleDirname, '', $filename . '.php', $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $this->renderFile();
}
/**
* @public function getCommentsNew
- * @param string $module
+ * @param $module
* @param string $filename
*
- * @return bool|string
+ * @return string
*/
- public function renderCommentsNew($module, $filename)
+ public function renderCommentsNew($module, string $filename)
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
$table = $this->getTable();
- $moduleDirname = mb_strtolower($module->getVar('mod_dirname'));
+ $moduleDirname = \mb_strtolower($module->getVar('mod_dirname'));
$tableName = $table->getVar('table_name');
$fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'));
$fieldMain = '';
- foreach (array_keys($fields) as $f) {
+ foreach (\array_keys($fields) as $f) {
if (1 == $fields[$f]->getVar('field_main')) {
$fieldMain = $fields[$f]->getVar('field_name');
}
}
$content = $this->getHeaderFilesComments($module);
- $content .= $pc->getPhpCodeUseNamespace(['Xmf', 'Request']);
- $content .= $pc->getPhpCodeIncludeDir("__DIR__ . '/../../../mainfile.php'",'',true, true);
- $content .= $pc->getPhpCodeIncludeDir("XOOPS_ROOT_PATH.'/modules/{$moduleDirname}/class/{$tableName}.php'",'',true, true);
- $content .= $xc->getXcXoopsRequest('com_itemid', 'com_itemid', '0', 'Int');
- $contIf = $xc->getXcEqualsOperator("\${$tableName}Handler", "xoops_getModuleHandler('{$tableName}', '{$moduleDirname}')",'',"\t");
- $contIf .= $xc->getXcHandlerGet("{$tableName}", 'com_itemid','Obj', "{$tableName}Handler", false, "\t");
- $contIf .= $xc->getXcGetVar('com_replytitle', "{$tableName}Obj", $fieldMain,false, "\t");
- $contIf .= $pc->getPhpCodeIncludeDir("XOOPS_ROOT_PATH.'/include/{$filename}.php'",'',true, true, '',"\t");
- $content .= $pc->getPhpCodeConditions('$com_itemid',' > ', '0', $contIf);
-
- $this->create($moduleDirname, 'include', $filename . '.php', $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $content .= $this->pc->getPhpCodeUseNamespace(['Xmf', 'Request']);
+ $content .= $this->pc->getPhpCodeIncludeDir("__DIR__ . '/../../../mainfile.php'",'',true, true);
+ $content .= $this->pc->getPhpCodeIncludeDir("\XOOPS_ROOT_PATH.'/modules/{$moduleDirname}/class/{$tableName}.php'",'',true, true);
+ $content .= $this->xc->getXcXoopsRequest('com_itemid', 'com_itemid', '', 'Int');
+ $contIf = $this->xc->getXcEqualsOperator("\${$tableName}Handler", "xoops_getModuleHandler('{$tableName}', '{$moduleDirname}')",'',"\t");
+ $contIf .= $this->xc->getXcHandlerGet("{$tableName}", 'com_itemid','Obj', "{$tableName}Handler", false, "\t");
+ $contIf .= $this->xc->getXcGetVar('com_replytitle', "{$tableName}Obj", $fieldMain,false, "\t");
+ $contIf .= $this->pc->getPhpCodeIncludeDir("\XOOPS_ROOT_PATH.'/include/{$filename}.php'",'',true, true, '',"\t");
+ $content .= $this->pc->getPhpCodeConditions('$com_itemid',' > ', '0', $contIf);
+
+ $this->create($moduleDirname, 'include', $filename . '.php', $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $this->renderFile();
}
-
- /**
- * @public function render
- * @param null
- */
- /*public function render() {
- $module = $this->getModule();
- $table = $this->getTable();
- $filename = $this->getFileName();
- $moduleDirname = $module->getVar('mod_dirname');
-
- $content = $this->getHeaderFilesComments($module, $filename);
- switch($filename) {
- case 'comment_edit.php':
- $content .= $this->getCommentsIncludes('comment_edit');
- $this->create($moduleDirname, 'include', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
- return $this->render();
- break;
- case 'comment_delete.php':
- $content .= $this->getCommentsIncludes('comment_delete');
- $this->create($moduleDirname, 'include', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
- return $this->render();
- break;
- case 'comment_post.php':
- $content .= $this->getCommentsIncludes('comment_post');
- $this->create($moduleDirname, 'include', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
- return $this->render();
- break;
- case 'comment_reply.php':
- $content .= $this->getCommentsIncludes('comment_reply');
- $this->create($moduleDirname, 'include', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
- return $this->render();
- break;
- case 'comment_new.php':
- $content .= $this->getCommentsNew($moduleDirname, 'comment_new');
- $this->create($moduleDirname, 'include', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
- return $this->render();
- break;
- }
- }*/
}
diff --git a/class/Files/Includes/IncludeCommon.php b/class/Files/Includes/IncludeCommon.php
index 105d0956..85a59b21 100644
--- a/class/Files/Includes/IncludeCommon.php
+++ b/class/Files/Includes/IncludeCommon.php
@@ -1,9 +1,9 @@
-xc = Modulebuilder\Files\CreateXoopsCode::getInstance();
+ $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance();
+ $this->hc = Modulebuilder\Files\CreateHtmlCode::getInstance();
}
/**
* @static function getInstance
- * @param null
+ *
* @return IncludeCommon
*/
public static function getInstance()
@@ -57,11 +72,11 @@ public static function getInstance()
/**
* @public function write
- * @param string $module
+ * @param $module
* @param object $table
* @param string $filename
*/
- public function write($module, $table, $filename)
+ public function write($module, object $table, string $filename): void
{
$this->setModule($module);
$this->setTable($table);
@@ -76,9 +91,9 @@ public function write($module, $table, $filename)
*/
private function getCommonDefines($modDirname, $const, $desc)
{
- $stuModDirname = mb_strtoupper($modDirname);
+ $stuModDirname = \mb_strtoupper($modDirname);
- return "define('{$stuModDirname}_{$const}', {$desc});\n";
+ return "\define('{$stuModDirname}_{$const}', {$desc});\n";
}
/**
@@ -86,63 +101,61 @@ private function getCommonDefines($modDirname, $const, $desc)
* @param \XoopsObject $module
* @return string
*/
- private function getCommonCode($module)
+ private function getCommonCode(\XoopsObject $module)
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $hc = Tdmcreate\Files\CreateHtmlCode::getInstance();
- $table = $this->getTable();
$moduleDirname = $module->getVar('mod_dirname');
- $stuModuleDirname = mb_strtoupper($moduleDirname);
+ $stuModuleDirname = \mb_strtoupper($moduleDirname);
$moduleAuthor = $module->getVar('mod_author');
$moduleAuthorWebsiteName = $module->getVar('mod_author_website_name');
$moduleAuthorWebsiteUrl = $module->getVar('mod_author_website_url');
- $moduleAuthorImage = str_replace(' ', '', mb_strtolower($moduleAuthor));
-
- $contIf = $pc->getPhpCodeDefine('XOOPS_ICONS32_PATH', "XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32'", "\t");
- $ret = $pc->getPhpCodeConditions("!defined('XOOPS_ICONS32_PATH')", '','', $contIf, false);
- $contIf = $pc->getPhpCodeDefine('XOOPS_ICONS32_URL', "XOOPS_URL . '/Frameworks/moduleclasses/icons/32'", "\t");
- $ret .= $pc->getPhpCodeConditions("!defined('XOOPS_ICONS32_URL')", '','', $contIf, false);
- $ret .= $this->getCommonDefines($moduleDirname, 'DIRNAME', "'{$moduleDirname}'");
- $ret .= $this->getCommonDefines($moduleDirname, 'PATH', "XOOPS_ROOT_PATH.'/modules/'.{$stuModuleDirname}_DIRNAME");
- $ret .= $this->getCommonDefines($moduleDirname, 'URL', "XOOPS_URL.'/modules/'.{$stuModuleDirname}_DIRNAME");
- $ret .= $this->getCommonDefines($moduleDirname, 'ICONS_PATH', "{$stuModuleDirname}_PATH.'/assets/icons'");
- $ret .= $this->getCommonDefines($moduleDirname, 'ICONS_URL', "{$stuModuleDirname}_URL.'/assets/icons'");
- $ret .= $this->getCommonDefines($moduleDirname, 'IMAGE_PATH', "{$stuModuleDirname}_PATH.'/assets/images'");
- $ret .= $this->getCommonDefines($moduleDirname, 'IMAGE_URL', "{$stuModuleDirname}_URL.'/assets/images'");
- $ret .= $this->getCommonDefines($moduleDirname, 'UPLOAD_PATH', "XOOPS_UPLOAD_PATH.'/'.{$stuModuleDirname}_DIRNAME");
- $ret .= $this->getCommonDefines($moduleDirname, 'UPLOAD_URL', "XOOPS_UPLOAD_URL.'/'.{$stuModuleDirname}_DIRNAME");
-
- $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'));
- $fieldElement = [];
- foreach (array_keys($fields) as $f) {
- $fieldElement[] = $fields[$f]->getVar('field_element');
- }
- $ret .= $this->getCommonDefines($moduleDirname, 'UPLOAD_FILES_PATH', "{$stuModuleDirname}_UPLOAD_PATH.'/files'");
- $ret .= $this->getCommonDefines($moduleDirname, 'UPLOAD_FILES_URL', "{$stuModuleDirname}_UPLOAD_URL.'/files'");
- $ret .= $this->getCommonDefines($moduleDirname, 'UPLOAD_IMAGE_PATH', "{$stuModuleDirname}_UPLOAD_PATH.'/images'");
- $ret .= $this->getCommonDefines($moduleDirname, 'UPLOAD_IMAGE_URL', "{$stuModuleDirname}_UPLOAD_URL.'/images'");
- $ret .= $this->getCommonDefines($moduleDirname, 'UPLOAD_SHOTS_PATH', "{$stuModuleDirname}_UPLOAD_PATH.'/images/shots'");
- $ret .= $this->getCommonDefines($moduleDirname, 'UPLOAD_SHOTS_URL', "{$stuModuleDirname}_UPLOAD_URL.'/images/shots'");
- $ret .= $this->getCommonDefines($moduleDirname, 'ADMIN', "{$stuModuleDirname}_URL . '/admin/index.php'");
- $ret .= $xc->getXcEqualsOperator('$localLogo', "{$stuModuleDirname}_IMAGE_URL . '/{$moduleAuthorImage}_logo.png'");
- $ret .= $pc->getPhpCodeCommentLine('Module Information');
-
- $img = $hc->getHtmlImage('".$localLogo."', $moduleAuthorWebsiteName);
- $anchor = $hc->getHtmlAnchor($moduleAuthorWebsiteUrl, $img, $moduleAuthorWebsiteName, '_blank', '', '', '', "\n");
- $replace = $xc->getXcEqualsOperator('$copyright', '"' . $anchor . '"');
- $ret .= str_replace("\n", '', $replace) . PHP_EOL;
- $ret .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/xoopsrequest', true);
- $ret .= $pc->getPhpCodeIncludeDir("{$stuModuleDirname}_PATH", 'class/helper', true);
- $ret .= $pc->getPhpCodeIncludeDir("{$stuModuleDirname}_PATH", 'include/functions', true);
+ $moduleAuthorImage = \str_replace(' ', '', \mb_strtolower($moduleAuthor));
+
+ $contIf = $this->pc->getPhpCodeDefine('XOOPS_ICONS32_PATH', "\XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32'", "\t");
+ $ret = $this->pc->getPhpCodeConditions("!\defined('XOOPS_ICONS32_PATH')", '', '', $contIf);
+ $contIf = $this->pc->getPhpCodeDefine('XOOPS_ICONS32_URL', "\XOOPS_URL . '/Frameworks/moduleclasses/icons/32'", "\t");
+ $ret .= $this->pc->getPhpCodeConditions("!\defined('XOOPS_ICONS32_URL')", '', '', $contIf);
+ $ret .= $this->getCommonDefines($moduleDirname, 'DIRNAME', "\basename(\dirname(__DIR__))");
+ $ret .= $this->getCommonDefines($moduleDirname, 'PATH', "\XOOPS_ROOT_PATH . '/modules/' . \\{$stuModuleDirname}_DIRNAME");
+ $ret .= $this->getCommonDefines($moduleDirname, 'URL', "\XOOPS_URL . '/modules/' . \\{$stuModuleDirname}_DIRNAME");
+ $ret .= $this->getCommonDefines($moduleDirname, 'ICONS_PATH', "\\{$stuModuleDirname}_PATH . '/assets/icons'");
+ $ret .= $this->getCommonDefines($moduleDirname, 'ICONS_URL', "\\{$stuModuleDirname}_URL . '/assets/icons'");
+ $ret .= $this->getCommonDefines($moduleDirname, 'IMAGE_PATH', "\\{$stuModuleDirname}_PATH . '/assets/images'");
+ $ret .= $this->getCommonDefines($moduleDirname, 'IMAGE_URL', "\\{$stuModuleDirname}_URL . '/assets/images'");
+ $ret .= $this->getCommonDefines($moduleDirname, 'UPLOAD_PATH', "\XOOPS_UPLOAD_PATH . '/' . \\{$stuModuleDirname}_DIRNAME");
+ $ret .= $this->getCommonDefines($moduleDirname, 'UPLOAD_URL', "\XOOPS_UPLOAD_URL . '/' . \\{$stuModuleDirname}_DIRNAME");
+
+ /*
+ if (\is_object($table)) {
+ $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'));
+ $fieldElement = [];
+ foreach (\array_keys($fields) as $f) {
+ $fieldElement[] = $fields[$f]->getVar('field_element');
+ }
+ }*/
+ $ret .= $this->getCommonDefines($moduleDirname, 'UPLOAD_FILES_PATH', "\\{$stuModuleDirname}_UPLOAD_PATH . '/files'");
+ $ret .= $this->getCommonDefines($moduleDirname, 'UPLOAD_FILES_URL', "\\{$stuModuleDirname}_UPLOAD_URL . '/files'");
+ $ret .= $this->getCommonDefines($moduleDirname, 'UPLOAD_IMAGE_PATH', "\\{$stuModuleDirname}_UPLOAD_PATH . '/images'");
+ $ret .= $this->getCommonDefines($moduleDirname, 'UPLOAD_IMAGE_URL', "\\{$stuModuleDirname}_UPLOAD_URL . '/images'");
+ $ret .= $this->getCommonDefines($moduleDirname, 'UPLOAD_SHOTS_PATH', "\\{$stuModuleDirname}_UPLOAD_PATH . '/images/shots'");
+ $ret .= $this->getCommonDefines($moduleDirname, 'UPLOAD_SHOTS_URL', "\\{$stuModuleDirname}_UPLOAD_URL . '/images/shots'");
+ $ret .= $this->getCommonDefines($moduleDirname, 'ADMIN', "\\{$stuModuleDirname}_URL . '/admin/index.php'");
+ $ret .= $this->xc->getXcEqualsOperator('$localLogo', "\\{$stuModuleDirname}_IMAGE_URL . '/{$moduleAuthorImage}_logo.png'");
+ $ret .= $this->pc->getPhpCodeCommentLine('Module Information');
+
+ $img = $this->hc->getHtmlImage('" . $localLogo . "', $moduleAuthorWebsiteName);
+ $anchor = $this->hc->getHtmlAnchor($moduleAuthorWebsiteUrl, $img, $moduleAuthorWebsiteName, '_blank', '', '', '', "\n");
+ $replace = $this->xc->getXcEqualsOperator('$copyright', '"' . $anchor . '"');
+ $ret .= \str_replace("\n", '', $replace) . PHP_EOL;
+ $ret .= $this->pc->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH', 'class/xoopsrequest', true);
+ $ret .= $this->pc->getPhpCodeIncludeDir("\\{$stuModuleDirname}_PATH", 'include/functions', true);
return $ret;
}
/**
* @public function render
- * @param null
- * @return bool|string
+ *
+ * @return string
*/
public function render()
{
@@ -151,7 +164,7 @@ public function render()
$filename = $this->getFileName();
$content = $this->getHeaderFilesComments($module);
$content .= $this->getCommonCode($module);
- $this->create($moduleDirname, 'include', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->create($moduleDirname, 'include', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $this->renderFile();
}
diff --git a/class/Files/Includes/IncludeFunctions.php b/class/Files/Includes/IncludeFunctions.php
index 0c387057..5dc303f7 100644
--- a/class/Files/Includes/IncludeFunctions.php
+++ b/class/Files/Includes/IncludeFunctions.php
@@ -1,9 +1,9 @@
-xc = Modulebuilder\Files\CreateXoopsCode::getInstance();
+ $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance();
}
/**
* @static function getInstance
- * @param null
+ *
* @return IncludeFunctions
*/
public static function getInstance()
@@ -61,7 +71,7 @@ public static function getInstance()
* @param $module
* @param $filename
*/
- public function write($module, $filename)
+ public function write($module, $filename): void
{
$this->setModule($module);
$this->setFileName($filename);
@@ -73,22 +83,19 @@ public function write($module, $filename)
*
* @return string
*/
- private function getFunctionBlock($moduleDirname)
+ private function getFunctionBlock(string $moduleDirname)
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
-
$t = "\t";
- $ret = $pc->getPhpCodeCommentMultiLine(['function' => 'add selected cats to block', '' => '', '@param $cats' => '', '@return' => 'string']);
- $func = $xc->getXcEqualsOperator('$cat_sql', "'('", '', $t);
- $contIf = $xc->getXcEqualsOperator('$cat_sql', "current(\$cats)", '.',$t. "\t");
- $contIf .= $this->getSimpleString("array_shift(\$cats);", $t. "\t");
+ $ret = $this->pc->getPhpCodeCommentMultiLine(['function' => 'add selected cats to block', '' => '', '@param $cats' => '', '@return' => 'string']);
+ $func = $this->xc->getXcEqualsOperator('$cat_sql', "'('", '', $t);
+ $contIf = $this->xc->getXcEqualsOperator('$cat_sql', 'current($cats)', '.', $t . "\t");
+ $contIf .= $this->getSimpleString('array_shift($cats);', $t . "\t");
$contFe = $this->getSimpleString("\$cat_sql .= ',' . \$cat;", $t . "\t\t");
- $contIf .= $pc->getPhpCodeForeach('cats', false,false,'cat', $contFe, $t. "\t");
- $func .= $pc->getPhpCodeConditions('is_array($cats)','','', $contIf, false, $t);
- $func .= $xc->getXcEqualsOperator('$cat_sql', "')'", '.', $t);
- $func .= $this->getSimpleString('return $cat_sql;', $t);
- $ret .= $pc->getPhpCodeFunction("{$moduleDirname}_block_addCatSelect", '$cats', $func);
+ $contIf .= $this->pc->getPhpCodeForeach('cats', false, false, 'cat', $contFe, $t . "\t");
+ $func .= $this->pc->getPhpCodeConditions('\is_array($cats)', '', '', $contIf, false, $t);
+ $func .= $this->xc->getXcEqualsOperator('$cat_sql', "')'", '.', $t);
+ $func .= $this->getSimpleString('return $cat_sql;', $t);
+ $ret .= $this->pc->getPhpCodeFunction("{$moduleDirname}_block_addCatSelect", '$cats', $func);
return $ret;
}
@@ -99,24 +106,25 @@ private function getFunctionBlock($moduleDirname)
*
* @return string
*/
- private function getFunctionGetMyItemIds($moduleDirname)
+ private function getFunctionGetMyItemIds(string $moduleDirname)
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
-
$t = "\t";
- $ret = $pc->getPhpCodeCommentMultiLine(['Get the permissions ids' => '', '' => '', '@param $permtype' => '', '@param $dirname' => '', '@return' => 'mixed $itemIds']);
- $func = $xc->getXcGetGlobal(['xoopsUser'], $t);
- $func .= $xc->getXcEqualsOperator('static $permissions', "[]", '', $t);
+ $ret = $this->pc->getPhpCodeCommentMultiLine(['Get the permissions ids' => '', '' => '', '@param $permtype' => '', '@param $dirname' => '', '@return' => 'mixed $itemIds']);
+ $func = $this->xc->getXcGetGlobal(['xoopsUser'], $t);
+ $func .= $this->xc->getXcEqualsOperator('static $permissions', '[]', '', $t);
$contIf = $this->getSimpleString('return $permissions[$permtype];', $t . "\t");
- $func .= $pc->getPhpCodeConditions('is_array($permissions) && array_key_exists($permtype, $permissions)','','', $contIf, false, $t);
- $func .= $xc->getXcXoopsHandler('module', $t);
- $func .= $xc->getXcEqualsOperator("\${$moduleDirname}Module", '$moduleHandler->getByDirname($dirname)', '', $t);
- $func .= $pc->getPhpCodeTernaryOperator('groups', 'is_object($xoopsUser)', '$xoopsUser->getGroups()', 'XOOPS_GROUP_ANONYMOUS', $t);
- $func .= $xc->getXcXoopsHandler('groupperm', $t);
- $func .= $xc->getXcEqualsOperator('$itemIds', "\$grouppermHandler->getItemIds(\$permtype, \$groups, \${$moduleDirname}Module->getVar('mid'))", '', $t);
- $func .= $this->getSimpleString('return $itemIds;', $t);
- $ret .= $pc->getPhpCodeFunction("{$moduleDirname}GetMyItemIds", '$permtype, $dirname', $func);
+ $func .= $this->pc->getPhpCodeConditions('\is_array($permissions) && \array_key_exists($permtype, $permissions)', '', '', $contIf, false, $t);
+ $func .= $this->xc->getXcXoopsHandler('module', $t);
+ $func .= $this->xc->getXcEqualsOperator("\${$moduleDirname}Module", '$moduleHandler->getByDirname($dirname)', '', $t);
+ $condIf = $this->getSimpleString('return [];', $t . "\t");
+ $func .= $this->pc->getPhpCodeConditions("!\is_object(\${$moduleDirname}Module)", '', '', $condIf, false, $t);
+
+
+ $func .= $this->pc->getPhpCodeTernaryOperator('groups', '\is_object($xoopsUser)', '$xoopsUser->getGroups()', '\XOOPS_GROUP_ANONYMOUS', $t);
+ $func .= $this->xc->getXcXoopsHandler('groupperm', $t);
+ $func .= $this->xc->getXcEqualsOperator('$itemIds', "\$grouppermHandler->getItemIds(\$permtype, \$groups, \${$moduleDirname}Module->getVar('mid'))", '', $t);
+ $func .= $this->getSimpleString('return $itemIds;', $t);
+ $ret .= $this->pc->getPhpCodeFunction("{$moduleDirname}GetMyItemIds", '$permtype, $dirname', $func);
return $ret;
}
@@ -131,45 +139,44 @@ private function getFunctionGetMyItemIds($moduleDirname)
*
* @return string
*/
- private function getFunctionNumbersOfEntries($moduleDirname, $tableMid, $tableId, $tableName)
+ private function getFunctionNumbersOfEntries(string $moduleDirname, $tableMid, $tableId, $tableName)
{
- $fields = $this->getTableFields($tableMid, $tableId);
- foreach (array_keys($fields) as $f) {
+ $fields = $this->getTableFields($tableMid, $tableId);
+ $fieldId = '';
+ foreach (\array_keys($fields) as $f) {
$fieldName = $fields[$f]->getVar('field_name');
if (0 == $f) {
$fieldId = $fieldName; // fieldMain = fields parameters main field
}
}
- $ret = <<getAllChild(\$cid);
- foreach (array_keys(\$entries) as \$i) {
- if (\$entries[\$i]->getVar('{$fieldId}') == \$cid){
- \$count++;
- }
- foreach (array_keys(\$child) as \$j) {
- if (\$entries[\$i]->getVar('{$fieldId}') == \$j){
- \$count++;
+ return <<getAllChild(\$cid);
+ foreach (\array_keys(\$entries) as \$i) {
+ if (\$entries[\$i]->getVar('{$fieldId}') == \$cid){
+ \$count++;
+ }
+ foreach (\array_keys(\$child) as \$j) {
+ if (\$entries[\$i]->getVar('{$fieldId}') == \$j){
+ \$count++;
+ }
+ }
+ }
}
- }
- }
- }
- return \$count;
-}\n
-EOT;
-
- return $ret;
+ return \$count;
+ }\n
+ EOT;
}
/**
@@ -179,28 +186,26 @@ function {$moduleDirname}NumbersOfEntries(\$mytree, \${$tableName}, \$entries, \
*
* @return string
*/
- private function getFunctionMetaKeywords($moduleDirname)
+ private function getFunctionMetaKeywords(string $moduleDirname)
{
- $ret = <<undoHtmlSpecialChars(\$myts->displayTarea(\$content));
- if(isset(\$xoTheme) && is_object(\$xoTheme)) {
- \$xoTheme->addMeta( 'meta', 'keywords', strip_tags(\$content));
- } else { // Compatibility for old Xoops versions
- \$xoopsTpl->assign('xoops_meta_keywords', strip_tags(\$content));
- }
-}\n
-EOT;
-
- return $ret;
+ return <<undoHtmlSpecialChars(\$myts->displayTarea(\$content));
+ if(isset(\$xoTheme) && \is_object(\$xoTheme)) {
+ \$xoTheme->addMeta( 'meta', 'keywords', \strip_tags(\$content));
+ } else { // Compatibility for old Xoops versions
+ \$xoopsTpl->assign('xoops_meta_keywords', \strip_tags(\$content));
+ }
+ }\n
+ EOT;
}
/**
@@ -210,182 +215,168 @@ private function getFunctionMetaKeywords($moduleDirname)
*
* @return string
*/
- private function getFunctionMetaDescription($moduleDirname)
+ private function getFunctionMetaDescription(string $moduleDirname)
{
- $ret = <<undoHtmlSpecialChars(\$myts->displayTarea(\$content));
- if(isset(\$xoTheme) && is_object(\$xoTheme)) {
- \$xoTheme->addMeta( 'meta', 'description', strip_tags(\$content));
- } else { // Compatibility for old Xoops versions
- \$xoopsTpl->assign('xoops_meta_description', strip_tags(\$content));
- }
-}\n
-EOT;
-
- return $ret;
+ return <<undoHtmlSpecialChars(\$myts->displayTarea(\$content));
+ if(isset(\$xoTheme) && \is_object(\$xoTheme)) {
+ \$xoTheme->addMeta( 'meta', 'description', \strip_tags(\$content));
+ } else { // Compatibility for old Xoops versions
+ \$xoopsTpl->assign('xoops_meta_description', \strip_tags(\$content));
+ }
+ }\n
+ EOT;
}
/**
* @private function getRewriteUrl
- *
* @param string $moduleDirname
- * @param string $tableName
*
* @return string
*/
- private function getRewriteUrl($moduleDirname, $tableName)
+ private function getRewriteUrl(string $moduleDirname)
{
- $ucfModuleDirname = ucfirst($moduleDirname);
- $ret = <<getHandler('{$tableName}');
- \$lenght_id = \$helper->getConfig('lenght_id');
- \$rewrite_url = \$helper->getConfig('rewrite_url');
-
- if (\$lenght_id != 0) {
- \$id = \$array['content_id'];
- while (strlen(\$id) < \$lenght_id) {
- \$id = '0' . \$id;
- }
- } else {
- \$id = \$array['content_id'];
- }
-
- if (isset(\$array['topic_alias']) && \$array['topic_alias']) {
- \$topic_name = \$array['topic_alias'];
- } else {
- \$topic_name = {$moduleDirname}_Filter(xoops_getModuleOption('static_name', \$module));
- }
-
- switch (\$rewrite_url) {
-
- case 'none':
- if(\$topic_name) {
- \$topic_name = 'topic=' . \$topic_name . '&';
- }
- \$rewrite_base = '/modules/';
- \$page = 'page=' . \$array['content_alias'];
- return XOOPS_URL . \$rewrite_base . \$module . '/' . \$type . '.php?' . \$topic_name . 'id=' . \$id . '&' . \$page . \$comment;
- break;
-
- case 'rewrite':
- if(\$topic_name) {
- \$topic_name .= '/';
- }
- \$rewrite_base = xoops_getModuleOption('rewrite_mode', \$module);
- \$rewrite_ext = xoops_getModuleOption('rewrite_ext', \$module);
- \$module_name = '';
- if(xoops_getModuleOption('rewrite_name', \$module)) {
- \$module_name = xoops_getModuleOption('rewrite_name', \$module) . '/';
- }
- \$page = \$array['content_alias'];
- \$type .= '/';
- \$id .= '/';
- if (\$type === 'content/') {
- \$type = '';
- }
- if (\$type === 'comment-edit/' || \$type === 'comment-reply/' || \$type === 'comment-delete/') {
- return XOOPS_URL . \$rewrite_base . \$module_name . \$type . \$id . '/';
- }
+ $ucfModuleDirname = \ucfirst($moduleDirname);
+ return <<getConfig('lenght_id');
+ \$rewrite_url = \$helper->getConfig('rewrite_url');
+
+ if (0 != \$lenght_id) {
+ \$id = \$array['content_id'];
+ while (\strlen(\$id) < \$lenght_id) {
+ \$id = '0' . \$id;
+ }
+ } else {
+ \$id = \$array['content_id'];
+ }
- return XOOPS_URL . \$rewrite_base . \$module_name . \$type . \$topic_name . \$id . \$page . \$rewrite_ext;
- break;
+ if (isset(\$array['topic_alias']) && \$array['topic_alias']) {
+ \$topic_name = \$array['topic_alias'];
+ } else {
+ \$topic_name = {$moduleDirname}_Filter(xoops_getModuleOption('static_name', \$module));
+ }
- case 'short':
- if(\$topic_name) {
- \$topic_name .= '/';
- }
- \$rewrite_base = xoops_getModuleOption('rewrite_mode', \$module);
- \$rewrite_ext = xoops_getModuleOption('rewrite_ext', \$module);
- \$module_name = '';
- if(xoops_getModuleOption('rewrite_name', \$module)) {
- \$module_name = xoops_getModuleOption('rewrite_name', \$module) . '/';
- }
- \$page = \$array['content_alias'];
- \$type .= '/';
- if (\$type === 'content/') {
- \$type = '';
- }
- if (\$type === 'comment-edit/' || \$type === 'comment-reply/' || \$type === 'comment-delete/') {
- return XOOPS_URL . \$rewrite_base . \$module_name . \$type . \$id . '/';
+ switch (\$rewrite_url) {
+
+ case 'none':
+ if(\$topic_name) {
+ \$topic_name = 'topic=' . \$topic_name . '&';
+ }
+ \$rewrite_base = '/modules/';
+ \$page = 'page=' . \$array['content_alias'];
+ return \XOOPS_URL . \$rewrite_base . \$module . '/' . \$type . '.php?' . \$topic_name . 'id=' . \$id . '&' . \$page . \$comment;
+ break;
+
+ case 'rewrite':
+ if(\$topic_name) {
+ \$topic_name .= '/';
+ }
+ \$rewrite_base = xoops_getModuleOption('rewrite_mode', \$module);
+ \$rewrite_ext = xoops_getModuleOption('rewrite_ext', \$module);
+ \$module_name = '';
+ if(xoops_getModuleOption('rewrite_name', \$module)) {
+ \$module_name = xoops_getModuleOption('rewrite_name', \$module) . '/';
+ }
+ \$page = \$array['content_alias'];
+ \$type .= '/';
+ \$id .= '/';
+ if ('content/' === \$type) {
+ \$type = '';
+ }
+ if ('comment-edit/' === \$type || 'comment-reply/' === \$type || 'comment-delete/' === \$type) {
+ return \XOOPS_URL . \$rewrite_base . \$module_name . \$type . \$id . '/';
+ }
+
+ return \XOOPS_URL . \$rewrite_base . \$module_name . \$type . \$topic_name . \$id . \$page . \$rewrite_ext;
+ break;
+
+ case 'short':
+ if(\$topic_name) {
+ \$topic_name .= '/';
+ }
+ \$rewrite_base = xoops_getModuleOption('rewrite_mode', \$module);
+ \$rewrite_ext = xoops_getModuleOption('rewrite_ext', \$module);
+ \$module_name = '';
+ if(xoops_getModuleOption('rewrite_name', \$module)) {
+ \$module_name = xoops_getModuleOption('rewrite_name', \$module) . '/';
+ }
+ \$page = \$array['content_alias'];
+ \$type .= '/';
+ if ('content/' === \$type) {
+ \$type = '';
+ }
+ if ('comment-edit/' === \$type || 'comment-reply/' === \$type || 'comment-delete/' === \$type) {
+ return \XOOPS_URL . \$rewrite_base . \$module_name . \$type . \$id . '/';
+ }
+
+ return \XOOPS_URL . \$rewrite_base . \$module_name . \$type . \$topic_name . \$page . \$rewrite_ext;
+ break;
+ }
+ return null;
}
-
- return XOOPS_URL . \$rewrite_base . \$module_name . \$type . \$topic_name . \$page . \$rewrite_ext;
- break;
- }
- return null;
-}
-EOT;
-
- return $ret;
+ EOT;
}
/**
* @private function getRewriteFilter
- *
* @param string $moduleDirname
- * @param string $tableName
*
* @return string
*/
- private function getRewriteFilter($moduleDirname, $tableName)
+ private function getRewriteFilter(string $moduleDirname)
{
- $ucfModuleDirname = ucfirst($moduleDirname);
- $ret = <<getHandler('{$tableName}');
- \$regular_expression = \$helper->getConfig('regular_expression');
-
- \$url = strip_tags(\$url);
- \$url .= preg_replace("`\[.*\]`U", '', \$url);
- \$url .= preg_replace('`&(amp;)?#?[a-z0-9]+;`i', '-', \$url);
- \$url .= htmlentities(\$url, ENT_COMPAT, 'utf-8');
- \$url .= preg_replace("`&([a-z])(acute|uml|circ|grave|ring|cedil|slash|tilde|caron|lig);`i", "\\1", \$url);
- \$url .= preg_replace(array(\$regular_expression, "`[-]+`"), '-', \$url);
- \$url = (\$url == '') ? \$type : strtolower(trim(\$url, '-'));
- return \$url;
-}
-EOT;
-
- return $ret;
+ $ucfModuleDirname = \ucfirst($moduleDirname);
+ return <<getConfig('regular_expression');
+
+ \$url = \strip_tags(\$url);
+ \$url = \preg_replace('`\[.*\]`U', '', \$url);
+ \$url = \preg_replace('`&(amp;)?#?[a-z0-9]+;`i', '-', \$url);
+ \$url = \htmlentities(\$url, ENT_COMPAT, 'utf-8');
+ \$url = \preg_replace('`&([a-z])(acute|uml|circ|grave|ring|cedil|slash|tilde|caron|lig);`i', '$1', \$url);
+ \$url = \preg_replace([\$regular_expression, '`[-]+`'], '-', \$url);
+ \$url = ('' == \$url) ? \$type : \strtolower(\\trim(\$url, '-'));
+ return \$url;
+ }
+ EOT;
}
/**
* @public function render
*
- * @param null
- *
- * @return bool|string
+ * @return string
*/
public function render()
{
@@ -394,10 +385,10 @@ public function render()
$tableId = null;
$tableMid = null;
$tableName = null;
- $tableBlocks = null;
- $tablePermissions = null;
- $tableCategory = null;
- foreach (array_keys($tables) as $i) {
+ $tableBlocks = [];
+ $tablePermissions = [];
+ $tableCategory = [];
+ foreach (\array_keys($tables) as $i) {
$tableId = $tables[$i]->getVar('table_id');
$tableMid = $tables[$i]->getVar('table_mid');
$tableName = $tables[$i]->getVar('table_name');
@@ -408,21 +399,21 @@ public function render()
$filename = $this->getFileName();
$moduleDirname = $module->getVar('mod_dirname');
$content = $this->getHeaderFilesComments($module);
- if (in_array(1, $tableBlocks)) {
+ if (\in_array(1, $tableBlocks)) {
$content .= $this->getFunctionBlock($moduleDirname);
}
- if (in_array(1, $tablePermissions)) {
+ if (\in_array(1, $tablePermissions)) {
$content .= $this->getFunctionGetMyItemIds($moduleDirname);
}
- if (in_array(1, $tableCategory)) {
+ if (\in_array(1, $tableCategory)) {
$content .= $this->getFunctionNumbersOfEntries($moduleDirname, $tableMid, $tableId, $tableName);
}
$content .= $this->getFunctionMetaKeywords($moduleDirname);
$content .= $this->getFunctionMetaDescription($moduleDirname);
- $content .= $this->getRewriteUrl($moduleDirname, $tableName);
- $content .= $this->getRewriteFilter($moduleDirname, $tableName);
+ $content .= $this->getRewriteUrl($moduleDirname);
+ $content .= $this->getRewriteFilter($moduleDirname);
- $this->create($moduleDirname, 'include', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->create($moduleDirname, 'include', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $this->renderFile();
}
diff --git a/class/Files/Includes/IncludeJquery.php b/class/Files/Includes/IncludeJquery.php
index aa4c028d..cd8d8a55 100644
--- a/class/Files/Includes/IncludeJquery.php
+++ b/class/Files/Includes/IncludeJquery.php
@@ -1,9 +1,9 @@
-tdmcfile = Tdmcreate\Files\CreateFile::getInstance();
+ $this->tdmcfile = Modulebuilder\Files\CreateFile::getInstance();
}
/**
* @static function getInstance
- * @param null
+ *
* @return IncludeJquery
*/
public static function getInstance()
@@ -63,10 +62,10 @@ public static function getInstance()
/**
* @public function write
- * @param string $module
+ * @param $module
* @param string $filename
*/
- public function write($module, $filename)
+ public function write($module, string $filename): void
{
$this->setModule($module);
$this->setFileName($filename);
@@ -74,8 +73,8 @@ public function write($module, $filename)
/**
* @public function render
- * @param null
- * @return bool|string
+ *
+ * @return string
*/
public function render()
{
@@ -84,14 +83,14 @@ public function render()
$moduleDirname = $module->getVar('mod_dirname');
//$content = $this->getHeaderFilesComments($module, $filename);
$content = <<<'EOT'
-$(document).ready(function(){
- $( "button, input:button, input:submit, input:file, input:reset" ).css("color","inherit").button();
- $( ".check" ).css("color","#fff").button();
- $( ".radio" ).css("color","#fff").buttonset();
- $( ".toolbar" ).css("color","#000").buttonset();
-});
-EOT;
- $this->tdmcfile->create($moduleDirname, 'assets/js', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $(document).ready(function(){
+ $( "button, input:button, input:submit, input:file, input:reset" ).css("color","inherit").button();
+ $( ".check" ).css("color","#fff").button();
+ $( ".radio" ).css("color","#fff").buttonset();
+ $( ".toolbar" ).css("color","#000").buttonset();
+ });
+ EOT;
+ $this->tdmcfile->create($moduleDirname, 'assets/js', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
}
diff --git a/class/Files/Includes/IncludeNotifications.php b/class/Files/Includes/IncludeNotifications.php
index 36c8981f..5eff8d98 100644
--- a/class/Files/Includes/IncludeNotifications.php
+++ b/class/Files/Includes/IncludeNotifications.php
@@ -1,9 +1,9 @@
-xc = Modulebuilder\Files\CreateXoopsCode::getInstance();
+ $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance();
}
/**
* @static function getInstance
- * @param null
+ *
* @return IncludeNotifications
*/
public static function getInstance()
@@ -57,11 +67,11 @@ public static function getInstance()
/**
* @public function write
- * @param string $module
+ * @param $module
* @param mixed $tables
* @param string $filename
*/
- public function write($module, $tables, $filename)
+ public function write($module, $tables, string $filename): void
{
$this->setModule($module);
$this->setTables($tables);
@@ -74,37 +84,36 @@ public function write($module, $tables, $filename)
*
* @return string
*/
- public function getNotificationsFunction($moduleDirname)
+ public function getNotificationsFunction(string $moduleDirname)
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $stuModuleDirname = mb_strtoupper($moduleDirname);
+ $stuModuleDirname = \mb_strtoupper($moduleDirname);
$tables = $this->getTables();
- $t = "\t";
- $ret = $pc->getPhpCodeCommentMultiLine(['comment' => 'callback functions','' => '', '@param $category' => '', '@param $item_id' => '', '@return' => 'array item|null']);
- $func = $xc->getXcGetGlobal(['xoopsDB'], $t);
- $func .= $pc->getPhpCodeBlankLine();
- $contIf = $pc->getPhpCodeDefine($stuModuleDirname . '_URL',"XOOPS_URL . '/modules/{$moduleDirname}'", $t . "\t");
- $func .= $pc->getPhpCodeConditions("!defined('{$stuModuleDirname}_URL')", '','',$contIf, false, $t);
- $func .= $pc->getPhpCodeBlankLine();
-
- $case[] = $xc->getXcEqualsOperator("\$item['name']", "''",'',$t . "\t\t");
- $case[] = $xc->getXcEqualsOperator("\$item['url'] ", "''",'',$t . "\t\t");
- $case[] = $this->getSimpleString('return $item;', $t . "\t\t");
- $cases = [
+ $t = "\t";
+ $ret = $this->pc->getPhpCodeCommentMultiLine(['comment' => 'callback functions', '' => '', '@param $category' => '', '@param $item_id' => '', '@return' => 'array item|null']);
+ $func = $this->xc->getXcGetGlobal(['xoopsDB'], $t);
+ $func .= $this->pc->getPhpCodeBlankLine();
+ $contIf = $this->pc->getPhpCodeDefine($stuModuleDirname . '_URL', "\XOOPS_URL . '/modules/{$moduleDirname}'", $t . "\t");
+ $func .= $this->pc->getPhpCodeConditions("!\defined('{$stuModuleDirname}_URL')", '', '', $contIf, false, $t);
+ $func .= $this->pc->getPhpCodeBlankLine();
+
+ $func .= $this->xc->getXcEqualsOperator("\$itemId", "(int)\$item_id", '', $t);
+ $case[] = $this->xc->getXcEqualsOperator("\$item['name']", "''", '', $t . "\t\t");
+ $case[] = $this->xc->getXcEqualsOperator("\$item['url'] ", "''", '', $t . "\t\t");
+ $case[] = $this->getSimpleString('return $item;', $t . "\t\t");
+ $cases = [
'global' => $case,
];
- $contentSwitch = $pc->getPhpCodeCaseSwitch($cases, false, false, $t . "\t");
+ $contentSwitch = $this->pc->getPhpCodeCaseSwitch($cases, false, $t . "\t");
unset($case);
- foreach (array_keys($tables) as $i) {
+ foreach (\array_keys($tables) as $i) {
if (1 === (int)$tables[$i]->getVar('table_notifications')) {
$tableName = $tables[$i]->getVar('table_name');
$fieldParent = false;
$fields = $this->getTableFields($tables[$i]->getVar('table_mid'), $tables[$i]->getVar('table_id'));
$fieldId = '';
$fieldMain = '';
- foreach (array_keys($fields) as $f) {
+ foreach (\array_keys($fields) as $f) {
$fieldName = $fields[$f]->getVar('field_name');
if ((0 == $f) && (1 == $tables[$i]->getVar('table_autoincrement'))) {
$fieldId = $fieldName;
@@ -121,36 +130,39 @@ public function getNotificationsFunction($moduleDirname)
} else {
$tableSingle = $tableName;
}
- $case[] = $xc->getXcEqualsOperator('$sql ', "'SELECT {$fieldMain} FROM ' . \$xoopsDB->prefix('{$moduleDirname}_{$tableName}') . ' WHERE {$fieldId} = '. \$item_id",'',$t . "\t\t");
- $case[] = $xc->getXcEqualsOperator('$result ', '$xoopsDB->query($sql)','',$t . "\t\t");
- $case[] = $xc->getXcEqualsOperator('$result_array', '$xoopsDB->fetchArray($result)','',$t . "\t\t");
- $case[] = $xc->getXcEqualsOperator("\$item['name']", "\$result_array['{$fieldMain}']",'',$t . "\t\t");
+ $case[] = $this->xc->getXcEqualsOperator('$sql ', "'SELECT {$fieldMain} FROM ' . \$xoopsDB->prefix('{$moduleDirname}_{$tableName}') . ' WHERE {$fieldId} = '. \$itemId", '', $t . "\t\t");
+ $case[] = $this->xc->getXcEqualsOperator('$result', '$xoopsDB->query($sql)', '', $t . "\t\t");
+ $condIf = $this->getSimpleString('return [];', $t . "\t\t\t");
+ $case[] = $this->pc->getPhpCodeConditions('!$result', '', '', $condIf, false, $t . "\t\t");
+ $case[] = $this->xc->getXcEqualsOperator('$result_array', '$xoopsDB->fetchArray($result)', '', $t . "\t\t");
+ $case[] = $this->pc->getPhpCodeConditions('!$result_array', '', '', $condIf, false, $t . "\t\t");
+ $case[] = $this->xc->getXcEqualsOperator("\$item['name']", "\$result_array['{$fieldMain}']", '', $t . "\t\t");
if ($fieldParent) {
- $case[] = $xc->getXcEqualsOperator("\$item['url'] ", "{$stuModuleDirname}_URL . '/{$tableSingle}.php?{$fieldParent}=' . \$result_array['{$fieldParent}'] . '&{$fieldId}=' . \$item_id",'',$t . "\t\t");
+ $case[] = $this->xc->getXcEqualsOperator("\$item['url'] ", "\\{$stuModuleDirname}_URL . '/{$tableSingle}.php?{$fieldParent}=' . \$result_array['{$fieldParent}'] . '&{$fieldId}=' . \$itemId", '', $t . "\t\t");
} else {
- $case[] = $xc->getXcEqualsOperator("\$item['url'] ", "{$stuModuleDirname}_URL . '/{$tableName}.php?{$fieldId}=' . \$item_id",'',$t . "\t\t");
+ $case[] = $this->xc->getXcEqualsOperator("\$item['url'] ", "\\{$stuModuleDirname}_URL . '/{$tableName}.php?{$fieldId}=' . \$itemId", '', $t . "\t\t");
}
- $case[] = $this->getSimpleString('return $item;', $t . "\t\t");
- $cases = [
+ $case[] = $this->getSimpleString('return $item;', $t . "\t\t");
+ $cases = [
$tableName => $case,
];
- $contentSwitch .= $pc->getPhpCodeCaseSwitch($cases, false, false, $t . "\t");
+ $contentSwitch .= $this->pc->getPhpCodeCaseSwitch($cases, false, $t . "\t");
unset($case);
}
}
- $func .= $pc->getPhpCodeSwitch('category', $contentSwitch, $t);
- $func .= $this->getSimpleString('return null;', $t );
- $ret .= $pc->getPhpCodeFunction("{$moduleDirname}_notify_iteminfo", '$category, $item_id', $func);
+ $func .= $this->pc->getPhpCodeSwitch('category', $contentSwitch, $t);
+ $func .= $this->getSimpleString('return null;', $t);
+ $ret .= $this->pc->getPhpCodeFunction("{$moduleDirname}_notify_iteminfo", '$category, $item_id', $func);
return $ret;
}
/**
* @public function render
- * @param null
- * @return bool|string
+ *
+ * @return string
*/
public function render()
{
@@ -160,7 +172,7 @@ public function render()
$content = $this->getHeaderFilesComments($module);
$content .= $this->getNotificationsFunction($moduleDirname);
- $this->create($moduleDirname, 'include', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->create($moduleDirname, 'include', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $this->renderFile();
}
diff --git a/class/Files/Includes/IncludeSearch.php b/class/Files/Includes/IncludeSearch.php
index 58d4bc16..c9e6fbcc 100644
--- a/class/Files/Includes/IncludeSearch.php
+++ b/class/Files/Includes/IncludeSearch.php
@@ -1,9 +1,9 @@
-tdmcfile = Tdmcreate\Files\CreateFile::getInstance();
+ $this->cf = Modulebuilder\Files\CreateFile::getInstance();
+ $this->xc = Modulebuilder\Files\CreateXoopsCode::getInstance();
+ $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance();
}
/**
* @static function getInstance
- * @param null
+ *
* @return IncludeSearch
*/
public static function getInstance()
@@ -63,11 +72,11 @@ public static function getInstance()
/**
* @public function write
- * @param string $module
+ * @param $module
* @param mixed $tables
* @param string $filename
*/
- public function write($module, $tables, $filename)
+ public function write($module, $tables, string $filename): void
{
$this->setModule($module);
$this->setFileName($filename);
@@ -82,38 +91,40 @@ public function write($module, $tables, $filename)
*/
public function getSearchFunction($moduleDirname)
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
- $ucfModuleDirname = ucfirst($moduleDirname);
+ $ucfModuleDirname = \ucfirst($moduleDirname);
$tables = $this->getTables();
- $t = "\t";
- $ret = $pc->getPhpCodeCommentMultiLine(['search callback functions' => '', '' => '', '@param $queryarray' => '', '@param $andor' => '', '@param $limit' => '', '@param $offset' => '', '@param $userid' => '', '@return' => 'mixed $itemIds']);
- $func = $xc->getXcEqualsOperator('$ret', "[]", '', $t);
- $func .= $xc->getXcGetInstance('helper', "\XoopsModules\\{$ucfModuleDirname}\Helper", $t);
-
- if (is_array($tables)) {
- foreach (array_keys($tables) as $i) {
- if(1 === (int) $tables[$i]->getVar('table_search')) {
+ $t = "\t";
+ $ret = $this->pc->getPhpCodeCommentMultiLine(['search callback functions' => '', '' => '', '@param $queryarray' => '', '@param $andor' => '', '@param $limit' => '', '@param $offset' => '', '@param $userid' => '', '@return' => 'array $itemIds']);
+ $func = $this->xc->getXcEqualsOperator('$ret', '[]', '', $t);
+ $func .= $this->xc->getXcGetInstance('helper', "\XoopsModules\\{$ucfModuleDirname}\Helper", $t);
+
+ if (\is_array($tables)) {
+ foreach (\array_keys($tables) as $i) {
+ if (1 === (int)$tables[$i]->getVar('table_search')) {
$tableId = $tables[$i]->getVar('table_id');
$tableMid = $tables[$i]->getVar('table_mid');
$tableName = $tables[$i]->getVar('table_name');
- $tableFieldname = $tables[$i]->getVar('table_fieldname');
- $func .= $pc->getPhpCodeCommentLine('search in table', $tableName, $t);
- $func .= $pc->getPhpCodeCommentLine('search keywords', '', $t);
- $func .= $xc->getXcEqualsOperator('$elementCount', '0', '', $t);
- $func .= $xc->getXcHandlerLine($tableName, $t);
- $contIf = $xc->getXcEqualsOperator('$elementCount', 'count($queryarray)', '', $t . "\t");
- $func .= $pc->getPhpCodeConditions('is_array($queryarray)', '', '', $contIf, false, $t);
- $contIf = $xc->getXcCriteriaCompo('crKeywords', $t . "\t");
- $for = $xc->getXcCriteriaCompo('crKeyword', $t . "\t\t");
-
- $fields = $this->getTableFields($tableMid, $tableId);
- $fieldId = '';
- $fieldMain = '';
- $fieldDate = '';
+ $func .= $this->pc->getPhpCodeCommentLine('search in table', $tableName, $t);
+ $func .= $this->pc->getPhpCodeCommentLine('search keywords', '', $t);
+ $func .= $this->xc->getXcEqualsOperator('$elementCount', '0', '', $t);
+ $func .= $this->xc->getXcHandlerLine($tableName, $t);
+ $contIf = $this->xc->getXcEqualsOperator('$elementCount', '\count($queryarray)', '', $t . "\t");
+ $func .= $this->pc->getPhpCodeConditions('\is_array($queryarray)', '', '', $contIf, false, $t);
+ $contIf = $this->xc->getXcCriteriaCompo('crKeywords', $t . "\t");
+ $for = $this->xc->getXcCriteriaCompo('crKeyword', $t . "\t\t");
+
+ $fields = $this->getTableFields($tableMid, $tableId);
+ $fieldId = '';
+ $fieldMain = '';
+ $fieldDate = '';
$countField = 0;
- foreach (array_keys($fields) as $f) {
- $fieldName = $fields[$f]->getVar('field_name');
+ $fieldUser = '';
+ foreach (\array_keys($fields) as $f) {
+ $fieldName = $fields[$f]->getVar('field_name');
+ $fieldElement = $fields[$f]->getVar('field_element');
+ if (Modulebuilder\Constants::FIELD_ELE_SELECTUSER == $fieldElement) {
+ $fieldUser = $fieldName;
+ }
if (0 == $f) {
$fieldId = $fieldName;
}
@@ -124,42 +135,46 @@ public function getSearchFunction($moduleDirname)
$fieldDate = $fieldName;
}
if (1 === (int)$fields[$f]->getVar('field_search')) {
- $crit = $xc->getXcCriteria('', "'{$fieldName}'", "'%' . \$queryarray[\$i] . '%'", "'LIKE'", true, $t . "\t");
- $for .= $xc->getXcCriteriaAdd('crKeyword', $crit, $t . "\t\t", "\n", "'OR'");
+ $crit = $this->xc->getXcCriteria('', "'{$fieldName}'", "'%' . \$queryarray[\$i] . '%'", "'LIKE'", true, $t . "\t");
+ $for .= $this->xc->getXcCriteriaAdd('crKeyword', $crit, $t . "\t\t", "\n", "'OR'");
$countField++;
}
}
if ($countField > 0) {
- $for .= $xc->getXcCriteriaAdd('crKeywords', '$crKeyword', $t . "\t\t", "\n", '$andor');
+ $for .= $this->xc->getXcCriteriaAdd('crKeywords', '$crKeyword', $t . "\t\t", "\n", '$andor');
+ }
+ $for .= $this->pc->getPhpCodeUnset('crKeyword', $t . "\t\t");
+ $contIf .= $this->pc->getPhpCodeFor('i', $for, 'elementCount', '0', ' < ', $t . "\t");
+ $func .= $this->pc->getPhpCodeConditions('$elementCount', ' > ', '0', $contIf, false, $t);
+ if ('' !== $fieldUser) {
+ $func .= $this->pc->getPhpCodeCommentLine('search user(s)', '', $t);
+ $contIf = $this->xc->getXcEqualsOperator('$userid', "array_map('\intval', \$userid)", '', $t . "\t");
+ $contIf .= $this->xc->getXcCriteriaCompo('crUser', $t . "\t");
+ $crit = $this->xc->getXcCriteria('', "'{$fieldUser}'", "'(' . \implode(',', \$userid) . ')'", "'IN'", true, $t . "\t");
+ $contIf .= $this->xc->getXcCriteriaAdd('crUser', $crit, $t . "\t", "\n", "'OR'");
+ $contElse = $this->xc->getXcCriteriaCompo('crUser', $t . "\t");
+ $crit = $this->xc->getXcCriteria('', "'{$fieldUser}'", '$userid', '', true, $t . "\t");
+ $contElse .= $this->xc->getXcCriteriaAdd('crUser', $crit, $t . "\t", "\n", "'OR'");
+ $func .= $this->pc->getPhpCodeConditions('$userid && \is_array($userid)', '', '', $contIf, $contElse, $t, 'is_numeric($userid) && $userid > 0');
}
- $for .= $pc->getPhpCodeUnset('crKeyword', $t . "\t\t");
- $contIf .= $pc->getPhpCodeFor( 'i', $for, 'elementCount', '0', ' < ', $t . "\t");
- $func .= $pc->getPhpCodeConditions('$elementCount', ' > ', '0', $contIf, false, $t);
- $func .= $pc->getPhpCodeCommentLine('search user(s)', '', $t);
- $contIf = $xc->getXcEqualsOperator('$userid', "array_map('intval', \$userid)", '', $t . "\t");
- $contIf .= $xc->getXcCriteriaCompo('crUser', $t . "\t");
- $crit = $xc->getXcCriteria('', "'{$tableFieldname}_submitter'", "'(' . implode(',', \$userid) . ')'", "'IN'", true, $t . "\t");
- $contIf .= $xc->getXcCriteriaAdd('crUser', $crit, $t . "\t", "\n", "'OR'");
- $contElse = $xc->getXcCriteriaCompo('crUser', $t . "\t");
- $crit = $xc->getXcCriteria('', "'{$tableFieldname}_submitter'", '$userid', '', true, $t . "\t");
- $contElse .= $xc->getXcCriteriaAdd('crUser', $crit, $t . "\t", "\n", "'OR'");
- $func .= $pc->getPhpCodeConditions('$userid && is_array($userid)', '', '', $contIf, $contElse, $t, 'is_numeric($userid) && $userid > 0');
- $func .= $xc->getXcCriteriaCompo('crSearch', $t);
- $contIf = $xc->getXcCriteriaAdd('crSearch', '$crKeywords', $t . "\t", "\n", "'AND'");
- $cond = $pc->getPhpCodeIsset('crKeywords');
- $func .= $pc->getPhpCodeConditions($cond, '', '', $contIf, false, $t);
- $contIf = $xc->getXcCriteriaAdd('crSearch', '$crUser', $t . "\t", "\n", "'AND'");
- $cond = $pc->getPhpCodeIsset('crUser');
- $func .= $pc->getPhpCodeConditions($cond, '', '', $contIf, false, $t);
- $func .= $xc->getXcCriteriaSetStart( 'crSearch', '$offset', $t);
- $func .= $xc->getXcCriteriaSetLimit( 'crSearch', '$limit', $t);
+ $func .= $this->xc->getXcCriteriaCompo('crSearch', $t);
+ $contIf = $this->xc->getXcCriteriaAdd('crSearch', '$crKeywords', $t . "\t", "\n", "'AND'");
+ $cond = $this->pc->getPhpCodeIsset('crKeywords');
+ $func .= $this->pc->getPhpCodeConditions($cond, '', '', $contIf, false, $t);
+ if ('' !== $fieldUser) {
+ $contIf = $this->xc->getXcCriteriaAdd('crSearch', '$crUser', $t . "\t", "\n", "'AND'");
+ $cond = $this->pc->getPhpCodeIsset('crUser');
+ $func .= $this->pc->getPhpCodeConditions($cond, '', '', $contIf, false, $t);
+ }
+ $func .= $this->xc->getXcCriteriaSetStart('crSearch', '$offset', $t);
+ $func .= $this->xc->getXcCriteriaSetLimit('crSearch', '$limit', $t);
if ('' !== $fieldDate) {
- $func .= $xc->getXcCriteriaSetSort( 'crSearch', "'{$fieldDate}'", $t);
+ $func .= $this->xc->getXcCriteriaSetSort('crSearch', "'{$fieldDate}'", $t);
} else {
- $func .= $xc->getXcCriteriaSetSort( 'crSearch', "'{$fieldId}_date'", $t);
+ $func .= $this->xc->getXcCriteriaSetSort('crSearch', "'{$fieldId}_date'", $t);
}
- $func .= $xc->getXcCriteriaSetOrder( 'crSearch', "'DESC'", $t);
- $func .= $xc->getXcHandlerAllClear($tableName . 'All', $tableName, '$crSearch', $t);
+ $func .= $this->xc->getXcCriteriaSetOrder('crSearch', "'DESC'", $t);
+ $func .= $this->xc->getXcHandlerAllClear($tableName . 'All', $tableName, '$crSearch', $t);
$contentForeach = $t . "\t\$ret[] = [\n";
$contentForeach .= $t . "\t\t'image' => 'assets/icons/16/{$tableName}.png',\n";
$contentForeach .= $t . "\t\t'link' => '{$tableName}.php?op=show&{$fieldId}=' . \${$tableName}All[\$i]->getVar('{$fieldId}'),\n";
@@ -168,39 +183,38 @@ public function getSearchFunction($moduleDirname)
$contentForeach .= $t . "\t\t'time' => \${$tableName}All[\$i]->getVar('{$fieldDate}')\n";
}
$contentForeach .= $t . "\t];\n";
- $func .= $pc->getPhpCodeForeach("{$tableName}All", true, false, 'i', $contentForeach, "\t");
- $func .= $pc->getPhpCodeUnset('crKeywords', $t);
- $func .= $pc->getPhpCodeUnset('crKeyword', $t);
- $func .= $pc->getPhpCodeUnset('crUser', $t);
- $func .= $pc->getPhpCodeUnset('crSearch', $t);
+ $func .= $this->pc->getPhpCodeForeach("{$tableName}All", true, false, 'i', $contentForeach, "\t");
+ $func .= $this->pc->getPhpCodeUnset('crKeywords', $t);
+ $func .= $this->pc->getPhpCodeUnset('crKeyword', $t);
+ $func .= $this->pc->getPhpCodeUnset('crUser', $t);
+ $func .= $this->pc->getPhpCodeUnset('crSearch', $t);
}
- $func .= $pc->getPhpCodeBlankLine();
+ $func .= $this->pc->getPhpCodeBlankLine();
}
}
$func .= $this->getSimpleString('return $ret;', $t);
- $func .= $pc->getPhpCodeBlankLine();
- $ret .= $pc->getPhpCodeFunction("{$moduleDirname}_search", '$queryarray, $andor, $limit, $offset, $userid', $func);
+ $func .= $this->pc->getPhpCodeBlankLine();
+ $ret .= $this->pc->getPhpCodeFunction("{$moduleDirname}_search", '$queryarray, $andor, $limit, $offset, $userid', $func);
return $ret;
}
/**
* @public function render
- * @param null
- * @return bool|string
+ *
+ * @return string
*/
public function render()
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
$module = $this->getModule();
$filename = $this->getFileName();
$moduleDirname = $module->getVar('mod_dirname');
$content = $this->getHeaderFilesComments($module);
- $content .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname]);
+ $content .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname]);
$content .= $this->getSearchFunction($moduleDirname);
- $this->tdmcfile->create($moduleDirname, 'include', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->cf->create($moduleDirname, 'include', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
- return $this->tdmcfile->renderFile();
+ return $this->cf->renderFile();
}
}
diff --git a/class/Files/Includes/index.html b/class/Files/Includes/index.html
deleted file mode 100644
index 2c5cdd3f..00000000
--- a/class/Files/Includes/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/class/Files/Includes/index.php b/class/Files/Includes/index.php
new file mode 100644
index 00000000..e5ee0725
--- /dev/null
+++ b/class/Files/Includes/index.php
@@ -0,0 +1,2 @@
+defines = LanguageDefines::getInstance();
+ $this->ld = LanguageDefines::getInstance();
+ $this->pc = Files\CreatePhpCode::getInstance();
}
/**
* @static function getInstance
- * @param null
+ *
* @return LanguageAdmin
*/
public static function getInstance()
@@ -64,12 +70,12 @@ public static function getInstance()
/**
* @public function write
- * @param string $module
+ * @param $module
* @param $table
- * @param string $tables
+ * @param $tables
* @param string $filename
*/
- public function write($module, $table, $tables, $filename)
+ public function write($module, $table, $tables, string $filename): void
{
$this->setModule($module);
$this->setTable($table);
@@ -80,24 +86,32 @@ public function write($module, $table, $tables, $filename)
/**
* @public function getLanguageAdminIndex
* @param string $language
- * @param string $tables
+ * @param array $tables
* @return string
*/
- public function getLanguageAdminIndex($language, $tables)
+ public function getLanguageAdminIndex(string $language, array $tables)
{
- $pc = Tdmcreate\Files\CreatePhpCode::getInstance();
- $ret = $this->defines->getBlankLine();
- $ret .= $pc->getPhpCodeIncludeDir("'common.php'",'', true, true, 'include');
- $ret .= $this->defines->getBlankLine();
- $ret .= $this->defines->getAboveHeadDefines('Admin Index');
- $ret .= $this->defines->getDefine($language, 'STATISTICS', 'Statistics');
- $ret .= $this->defines->getAboveDefines('There are');
- foreach (array_keys($tables) as $t) {
+ $thereare = '';
+ $tableUser = 0;
+ foreach (\array_keys($tables) as $t) {
+ if (1 == (int)$tables[$t]->getVar('table_user')) {
+ $tableUser = 1;
+ }
$tableName = $tables[$t]->getVar('table_name');
- $stuTableName = mb_strtoupper($tableName);
- $stlTableName = mb_strtolower($tableName);
- $ret .= $this->defines->getDefine($language, "THEREARE_{$stuTableName}", "There are %s {$stlTableName} in the database", true);
+ $stuTableName = \mb_strtoupper($tableName);
+ $stlTableName = \mb_strtolower($tableName);
+ $thereare .= $this->ld->getDefine($language, "THEREARE_{$stuTableName}", "There are %s {$stlTableName} in the database", true);
}
+ $ret = $this->ld->getBlankLine();
+ $ret .= $this->pc->getPhpCodeIncludeDir('__DIR__', 'common', true);
+ if ($tableUser) {
+ $ret .= $this->pc->getPhpCodeIncludeDir('__DIR__', 'main', true);
+ }
+ $ret .= $this->ld->getBlankLine();
+ $ret .= $this->ld->getAboveHeadDefines('Admin Index');
+ $ret .= $this->ld->getDefine($language, 'STATISTICS', 'Statistics');
+ $ret .= $this->ld->getAboveDefines('There are');
+ $ret .= $thereare;
return $ret;
}
@@ -105,39 +119,39 @@ public function getLanguageAdminIndex($language, $tables)
/**
* @public function getLanguageAdminPages
* @param string $language
- * @param string $tables
+ * @param array $tables
* @return string
*/
- public function getLanguageAdminPages($language, $tables)
+ public function getLanguageAdminPages(string $language, array $tables)
{
- $ret = $this->defines->getAboveHeadDefines('Admin Files');
- $ret .= $this->defines->getAboveDefines('There aren\'t');
- foreach (array_keys($tables) as $t) {
+ $ret = $this->ld->getAboveHeadDefines('Admin Files');
+ $ret .= $this->ld->getAboveDefines('There are no');
+ foreach (\array_keys($tables) as $t) {
$tableName = $tables[$t]->getVar('table_name');
- $stuTableName = mb_strtoupper($tableName);
- $stlTableName = mb_strtolower($tableName);
- $ret .= $this->defines->getDefine($language, "THEREARENT_{$stuTableName}", "There aren't {$stlTableName}", true);
+ $stuTableName = \mb_strtoupper($tableName);
+ $stlTableName = \mb_strtolower($tableName);
+ $ret .= $this->ld->getDefine($language, "THEREARENO_{$stuTableName}", "There are no {$stlTableName}", true);
}
- $ret .= $this->defines->getAboveDefines('Save/Delete');
- $ret .= $this->defines->getDefine($language, 'FORM_OK', 'Successfully saved');
- $ret .= $this->defines->getDefine($language, 'FORM_DELETE_OK', 'Successfully deleted');
- $ret .= $this->defines->getDefine($language, 'FORM_SURE_DELETE', "Are you sure to delete: %s ", true);
- $ret .= $this->defines->getDefine($language, 'FORM_SURE_RENEW', "Are you sure to update: %s ", true);
- $ret .= $this->defines->getAboveDefines('Buttons');
-
- foreach (array_keys($tables) as $t) {
+ $ret .= $this->ld->getAboveDefines('Save/Delete');
+ $ret .= $this->ld->getDefine($language, 'FORM_OK', 'Successfully saved');
+ $ret .= $this->ld->getDefine($language, 'FORM_DELETE_OK', 'Successfully deleted');
+ $ret .= $this->ld->getDefine($language, 'FORM_SURE_DELETE', "Are you sure to delete: %s ", true);
+ $ret .= $this->ld->getDefine($language, 'FORM_SURE_RENEW', "Are you sure to update: %s ", true);
+ $ret .= $this->ld->getAboveDefines('Buttons');
+
+ foreach (\array_keys($tables) as $t) {
$tableSoleName = $tables[$t]->getVar('table_solename');
- $stuTableSoleName = mb_strtoupper($tableSoleName);
- $ucfTableSoleName = ucfirst($tableSoleName);
- $ret .= $this->defines->getDefine($language, "ADD_{$stuTableSoleName}", "Add New {$ucfTableSoleName}");
+ $stuTableSoleName = \mb_strtoupper($tableSoleName);
+ $ucfTableSoleName = \ucfirst($tableSoleName);
+ $ret .= $this->ld->getDefine($language, "ADD_{$stuTableSoleName}", "Add New {$ucfTableSoleName}");
}
- $ret .= $this->defines->getAboveDefines('Lists');
+ $ret .= $this->ld->getAboveDefines('Lists');
- foreach (array_keys($tables) as $t) {
+ foreach (\array_keys($tables) as $t) {
$tableName = $tables[$t]->getVar('table_name');
- $stuTableName = mb_strtoupper($tableName);
- $ucfTableName = ucfirst($tableName);
- $ret .= $this->defines->getDefine($language, "{$stuTableName}_LIST", "List of {$ucfTableName}");
+ $stuTableName = \mb_strtoupper($tableName);
+ $ucfTableName = \ucfirst($tableName);
+ $ret .= $this->ld->getDefine($language, "LIST_{$stuTableName}", "List of {$ucfTableName}");
}
return $ret;
@@ -146,105 +160,132 @@ public function getLanguageAdminPages($language, $tables)
/**
* @public function getLanguageAdminClass
* @param string $language
- * @param string $tables
+ * @param array $tables
* @return string
*/
- public function getLanguageAdminClass($language, $tables)
+ public function getLanguageAdminClass(string $language, array $tables)
{
- $ret = $this->defines->getAboveHeadDefines('Admin Classes');
-
- foreach (array_keys($tables) as $t) {
+ $ret = $this->ld->getAboveHeadDefines('Admin Classes');
+ $fieldStatus = 0;
+ $fieldSampleListValue = 0;
+ $tableBroken = 0;
+ foreach (\array_keys($tables) as $t) {
$tableId = $tables[$t]->getVar('table_id');
$tableMid = $tables[$t]->getVar('table_mid');
$tableSoleName = $tables[$t]->getVar('table_solename');
- $ucfTableSoleName = ucfirst($tableSoleName);
+ $tableBroken = $tables[$t]->getVar('table_broken');
+ $ucfTableSoleName = \ucfirst($tableSoleName);
$fields = $this->getTableFields($tableMid, $tableId);
$fieldInForm = 0;
-
- foreach (array_keys($fields) as $f) {
+ foreach (\array_keys($fields) as $f) {
if ($fieldInForm < $fields[$f]->getVar('field_inform')) {
$fieldInForm = $fields[$f]->getVar('field_inform');
}
}
if (1 == $fieldInForm) {
- $ret .= $this->defines->getAboveDefines("{$ucfTableSoleName} add/edit");
- $ret .= $this->defines->getDefine($language, "{$tableSoleName}_ADD", "Add {$ucfTableSoleName}");
- $ret .= $this->defines->getDefine($language, "{$tableSoleName}_EDIT", "Edit {$ucfTableSoleName}");
+ $ret .= $this->ld->getAboveDefines("{$ucfTableSoleName} add/edit");
+ $ret .= $this->ld->getDefine($language, "{$tableSoleName}_ADD", "Add {$ucfTableSoleName}");
+ $ret .= $this->ld->getDefine($language, "{$tableSoleName}_EDIT", "Edit {$ucfTableSoleName}");
}
- $ret .= $this->defines->getAboveDefines("Elements of {$ucfTableSoleName}");
+ $ret .= $this->ld->getAboveDefines("Elements of {$ucfTableSoleName}");
- $fieldStatus = 0;
- $fieldSampleListValue = 0;
- foreach (array_keys($fields) as $f) {
+ foreach (\array_keys($fields) as $f) {
$fieldName = $fields[$f]->getVar('field_name');
$fieldElement = $fields[$f]->getVar('field_element');
-
- $rpFieldName = $this->getRightString($fieldName);
- if ($fieldElement > 16) {
- $fieldElements = Tdmcreate\Helper::getInstance()->getHandler('fieldelements')->get($fieldElement);
+ $rpFieldName = $this->getRightString($fieldName);
+ if ($fieldElement >= Constants::FIRST_FIELDELEMENT_TABLE) {
+ $fieldElements = Helper::getInstance()->getHandler('Fieldelements')->get($fieldElement);
$fieldElementName = $fieldElements->getVar('fieldelement_name');
- $fieldNameDesc = mb_substr($fieldElementName, mb_strrpos($fieldElementName, ':'), mb_strlen($fieldElementName));
- $fieldNameDesc = str_replace(': ', '', $fieldNameDesc);
+ $fieldNameDesc = mb_substr($fieldElementName, \mb_strrpos($fieldElementName, ':'), mb_strlen($fieldElementName));
+ $fieldNameDesc = \str_replace(': ', '', $fieldNameDesc);
} else {
- $fieldNameDesc = false !== mb_strpos($rpFieldName, '_') ? str_replace('_', ' ', ucfirst($rpFieldName)) : ucfirst($rpFieldName);
+ $fieldNameDesc = false !== mb_strpos($rpFieldName, '_') ? \str_replace('_', ' ', \ucfirst($rpFieldName)) : \ucfirst($rpFieldName);
}
-
- $ret .= $this->defines->getDefine($language, $tableSoleName . '_' . $rpFieldName, $fieldNameDesc);
+ $ret .= $this->ld->getDefine($language, $tableSoleName . '_' . $rpFieldName, $fieldNameDesc);
switch ($fieldElement) {
- case 10:
- $ret .= $this->defines->getDefine($language, $tableSoleName . '_' . $rpFieldName . '_UPLOADS', "{$fieldNameDesc} in frameworks images: %s");
+ case Constants::FIELD_ELE_IMAGELIST:
+ $ret .= $this->ld->getDefine($language, $tableSoleName . '_' . $rpFieldName . '_UPLOADS', "{$fieldNameDesc} in frameworks images: %s");
break;
- case 12:
- $ret .= $this->defines->getDefine($language, $tableSoleName . '_' . $rpFieldName . '_UPLOADS', "{$fieldNameDesc} in uploads");
+ case Constants::FIELD_ELE_URLFILE:
+ $ret .= $this->ld->getDefine($language, $tableSoleName . '_' . $rpFieldName . '_UPLOADS', "{$fieldNameDesc} in uploads");
break;
- case 11:
- case 13:
- case 14:
- $ret .= $this->defines->getDefine($language, $tableSoleName . '_' . $rpFieldName . '_UPLOADS', "{$fieldNameDesc} in %s :");
+ case Constants::FIELD_ELE_SELECTFILE:
+ case Constants::FIELD_ELE_UPLOADIMAGE:
+ case Constants::FIELD_ELE_UPLOADFILE:
+ $ret .= $this->ld->getDefine($language, $tableSoleName . '_' . $rpFieldName . '_UPLOADS', "{$fieldNameDesc} in %s :");
break;
- case 16:
+ case Constants::FIELD_ELE_SELECTSTATUS:
$fieldStatus++;
break;
- case 20:
- case 22:
+ case Constants::FIELD_ELE_RADIO:
+ case Constants::FIELD_ELE_SELECTCOMBO:
$fieldSampleListValue++;
break;
+ case Constants::FIELD_ELE_RADIO_ONOFFLINE:
+ $ret .= $this->ld->getDefine($language, $tableSoleName . '_' . $rpFieldName . '_OFFLINE', 'Offline');
+ $ret .= $this->ld->getDefine($language, $tableSoleName . '_' . $rpFieldName . '_ONLINE', 'Online');
+ break;
}
if (16 === (int)$fieldElement) {
$fieldStatus++;
}
- if (20 === (int)$fieldElement || 20 === (int)$fieldElement) {
+ if (20 === (int)$fieldElement || 22 === (int)$fieldElement) {
$fieldSampleListValue++;
}
}
}
- $ret .= $this->defines->getAboveDefines('General');
- $ret .= $this->defines->getDefine($language, 'FORM_UPLOAD', 'Upload file');
- $ret .= $this->defines->getDefine($language, 'FORM_UPLOAD_NEW', 'Upload new file: ');
- $ret .= $this->defines->getDefine($language, 'FORM_UPLOAD_SIZE', 'Max file size: ');
- $ret .= $this->defines->getDefine($language, 'FORM_UPLOAD_SIZE_MB', 'MB');
- $ret .= $this->defines->getDefine($language, 'FORM_UPLOAD_IMG_WIDTH', 'Max image width: ');
- $ret .= $this->defines->getDefine($language, 'FORM_UPLOAD_IMG_HEIGHT', 'Max image height: ');
- $ret .= $this->defines->getDefine($language, 'FORM_IMAGE_PATH', 'Files in %s :');
- $ret .= $this->defines->getDefine($language, 'FORM_ACTION', 'Action');
- $ret .= $this->defines->getDefine($language, 'FORM_EDIT', 'Modification');
- $ret .= $this->defines->getDefine($language, 'FORM_DELETE', 'Clear');
+ $ret .= $this->ld->getAboveDefines('Errors');
+ $ret .= $this->ld->getDefine($language, 'INVALID_DATE', 'Invalid date');
+ $ret .= $this->ld->getDefine($language, 'INVALID_PARAM', 'Invalid parameter');
+ $ret .= $this->ld->getAboveDefines('General');
+ $ret .= $this->ld->getDefine($language, 'FORM_UPLOAD', 'Upload file');
+ $ret .= $this->ld->getDefine($language, 'FORM_UPLOAD_NEW', 'Upload new file: ');
+ $ret .= $this->ld->getDefine($language, 'FORM_UPLOAD_SIZE', 'Max file size: ');
+ $ret .= $this->ld->getDefine($language, 'FORM_UPLOAD_SIZE_MB', 'MB');
+ $ret .= $this->ld->getDefine($language, 'FORM_UPLOAD_IMG_WIDTH', 'Max image width: ');
+ $ret .= $this->ld->getDefine($language, 'FORM_UPLOAD_IMG_HEIGHT', 'Max image height: ');
+ $ret .= $this->ld->getDefine($language, 'FORM_IMAGE_PATH', 'Files in %s :');
+ $ret .= $this->ld->getDefine($language, 'FORM_ACTION', 'Action');
+ $ret .= $this->ld->getDefine($language, 'FORM_EDIT', 'Modification');
+ $ret .= $this->ld->getDefine($language, 'FORM_DELETE', 'Clear');
if ($fieldStatus > 0) {
- $ret .= $this->defines->getAboveDefines('Status');
- $ret .= $this->defines->getDefine($language, 'STATUS_NONE', 'No status');
- $ret .= $this->defines->getDefine($language, 'STATUS_OFFLINE', 'Offline');
- $ret .= $this->defines->getDefine($language, 'STATUS_SUBMITTED', 'Submitted');
- $ret .= $this->defines->getDefine($language, 'STATUS_APPROVED', 'Approved');
+ $ret .= $this->ld->getAboveDefines('Status');
+ $ret .= $this->ld->getDefine($language, 'STATUS_NONE', 'No status');
+ $ret .= $this->ld->getDefine($language, 'STATUS_OFFLINE', 'Offline');
+ $ret .= $this->ld->getDefine($language, 'STATUS_ONLINE', 'Online');
+ $ret .= $this->ld->getDefine($language, 'STATUS_SUBMITTED', 'Submitted');
+ $ret .= $this->ld->getDefine($language, 'STATUS_APPROVED', 'Approved');
+ $ret .= $this->ld->getDefine($language, 'STATUS_BROKEN', 'Broken');
+ }
+ if ($tableBroken > 0) {
+ $ret .= $this->ld->getAboveDefines('Broken');
+ $ret .= $this->ld->getDefine($language, 'BROKEN_RESULT', 'Broken items in table %s');
+ $ret .= $this->ld->getDefine($language, 'BROKEN_NODATA', 'No broken items in table %s');
+ $ret .= $this->ld->getDefine($language, 'BROKEN_TABLE', 'Table');
+ $ret .= $this->ld->getDefine($language, 'BROKEN_KEY', 'Key field');
+ $ret .= $this->ld->getDefine($language, 'BROKEN_KEYVAL', 'Key value');
+ $ret .= $this->ld->getDefine($language, 'BROKEN_MAIN', 'Info main');
}
if ($fieldSampleListValue > 0) {
- $ret .= $this->defines->getAboveDefines('Sample List Values');
- $ret .= $this->defines->getDefine($language, 'LIST_1', 'Sample List Value 1');
- $ret .= $this->defines->getDefine($language, 'LIST_2', 'Sample List Value 2');
- $ret .= $this->defines->getDefine($language, 'LIST_3', 'Sample List Value 3');
+ $ret .= $this->ld->getAboveDefines('Sample List Values');
+ $ret .= $this->ld->getDefine($language, 'LIST_1', 'Sample List Value 1');
+ $ret .= $this->ld->getDefine($language, 'LIST_2', 'Sample List Value 2');
+ $ret .= $this->ld->getDefine($language, 'LIST_3', 'Sample List Value 3');
}
+ $ret .= $this->ld->getAboveDefines('Clone feature');
+ $ret .= $this->ld->getDefine($language, 'CLONE', 'Clone');
+ $ret .= $this->ld->getDefine($language, 'CLONE_DSC', 'Cloning a module has never been this easy! Just type in the name you want for it and hit submit button!');
+ $ret .= $this->ld->getDefine($language, 'CLONE_TITLE', 'Clone %s');
+ $ret .= $this->ld->getDefine($language, 'CLONE_NAME', 'Choose a name for the new module');
+ $ret .= $this->ld->getDefine($language, 'CLONE_NAME_DSC', 'Do not use special characters!
Do not choose an existing module dirname or database table name!'); + $ret .= $this->ld->getDefine($language, 'CLONE_INVALIDNAME', 'ERROR: Invalid module name, please try another one!'); + $ret .= $this->ld->getDefine($language, 'CLONE_EXISTS', 'ERROR: Module name already taken, please try another one!'); + $ret .= $this->ld->getDefine($language, 'CLONE_CONGRAT', 'Congratulations! %s was sucessfully created!
You may want to make changes in language files.'); + $ret .= $this->ld->getDefine($language, 'CLONE_IMAGEFAIL', 'Attention, we failed creating the new module logo. Please consider modifying assets/images/logo_module.png manually!'); + $ret .= $this->ld->getDefine($language, 'CLONE_FAIL', 'Sorry, we failed in creating the new clone. Maybe you need to temporally set write permissions (CHMOD 777) to modules folder and try again.'); return $ret; } @@ -254,22 +295,22 @@ public function getLanguageAdminClass($language, $tables) * @param string $language * @return string */ - public function getLanguageAdminPermissions($language) + public function getLanguageAdminPermissions(string $language) { - $ret = $this->defines->getAboveHeadDefines('Admin Permissions'); - $ret .= $this->defines->getAboveDefines('Permissions'); - $ret .= $this->defines->getDefine($language, 'PERMISSIONS_GLOBAL', 'Permissions global'); - $ret .= $this->defines->getDefine($language, 'PERMISSIONS_GLOBAL_DESC', 'Permissions global to check type of.'); - $ret .= $this->defines->getDefine($language, 'PERMISSIONS_GLOBAL_4', 'Permissions global to approve'); - $ret .= $this->defines->getDefine($language, 'PERMISSIONS_GLOBAL_8', 'Permissions global to submit'); - $ret .= $this->defines->getDefine($language, 'PERMISSIONS_GLOBAL_16', 'Permissions global to view'); - $ret .= $this->defines->getDefine($language, 'PERMISSIONS_APPROVE', 'Permissions to approve'); - $ret .= $this->defines->getDefine($language, 'PERMISSIONS_APPROVE_DESC', 'Permissions to approve'); - $ret .= $this->defines->getDefine($language, 'PERMISSIONS_SUBMIT', 'Permissions to submit'); - $ret .= $this->defines->getDefine($language, 'PERMISSIONS_SUBMIT_DESC', 'Permissions to submit'); - $ret .= $this->defines->getDefine($language, 'PERMISSIONS_VIEW', 'Permissions to view'); - $ret .= $this->defines->getDefine($language, 'PERMISSIONS_VIEW_DESC', 'Permissions to view'); - $ret .= $this->defines->getDefine($language, 'NO_PERMISSIONS_SET', 'No permission set'); + $ret = $this->ld->getAboveHeadDefines('Admin Permissions'); + $ret .= $this->ld->getAboveDefines('Permissions'); + $ret .= $this->ld->getDefine($language, 'PERMISSIONS_GLOBAL', 'Permissions global'); + $ret .= $this->ld->getDefine($language, 'PERMISSIONS_GLOBAL_DESC', 'Permissions global to check type of.'); + $ret .= $this->ld->getDefine($language, 'PERMISSIONS_GLOBAL_4', 'Permissions global to approve'); + $ret .= $this->ld->getDefine($language, 'PERMISSIONS_GLOBAL_8', 'Permissions global to submit'); + $ret .= $this->ld->getDefine($language, 'PERMISSIONS_GLOBAL_16', 'Permissions global to view'); + $ret .= $this->ld->getDefine($language, 'PERMISSIONS_APPROVE', 'Permissions to approve'); + $ret .= $this->ld->getDefine($language, 'PERMISSIONS_APPROVE_DESC', 'Permissions to approve'); + $ret .= $this->ld->getDefine($language, 'PERMISSIONS_SUBMIT', 'Permissions to submit'); + $ret .= $this->ld->getDefine($language, 'PERMISSIONS_SUBMIT_DESC', 'Permissions to submit'); + $ret .= $this->ld->getDefine($language, 'PERMISSIONS_VIEW', 'Permissions to view'); + $ret .= $this->ld->getDefine($language, 'PERMISSIONS_VIEW_DESC', 'Permissions to view'); + $ret .= $this->ld->getDefine($language, 'NO_PERMISSIONS_SET', 'No permission set'); return $ret; } @@ -279,45 +320,48 @@ public function getLanguageAdminPermissions($language) * @param string $language * @return string */ - public function getLanguageAdminFoot($language) + public function getLanguageAdminFoot(string $language) { - $ret = $this->defines->getAboveHeadDefines('Admin Others'); - $ret .= $this->defines->getDefine($language, 'MAINTAINEDBY', ' is maintained by '); - $ret .= $this->defines->getBelowDefines('End'); - $ret .= $this->defines->getBlankLine(); + $ret = $this->ld->getAboveHeadDefines('Admin Others'); + $ret .= $this->ld->getDefine($language, 'ABOUT_MAKE_DONATION', 'Submit'); + $ret .= $this->ld->getDefine($language, 'SUPPORT_FORUM', 'Support Forum'); + $ret .= $this->ld->getDefine($language, 'DONATION_AMOUNT', 'Donation Amount'); + $ret .= $this->ld->getDefine($language, 'MAINTAINEDBY', ' is maintained by '); + $ret .= $this->ld->getBelowDefines('End'); + $ret .= $this->ld->getBlankLine(); return $ret; } /** * @public function render - * @param null - * @return bool|string + * + * @return string */ public function render() { - $module = $this->getModule(); - $tables = $this->getTableTables($module->getVar('mod_id')); + $module = $this->getModule(); + $tables = $this->getTableTables($module->getVar('mod_id')); $tablePermissions = []; - foreach (array_keys($tables) as $t) { + foreach (\array_keys($tables) as $t) { $tablePermissions[] = $tables[$t]->getVar('table_permissions'); } $tables = $this->getTables(); $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); - $language = $this->getLanguage($moduleDirname, 'AM'); + $language = $this->getLanguage($moduleDirname, 'AM', '', false); $content = $this->getHeaderFilesComments($module); - if (is_array($tables)) { + if (\is_array($tables)) { $content .= $this->getLanguageAdminIndex($language, $tables); $content .= $this->getLanguageAdminPages($language, $tables); $content .= $this->getLanguageAdminClass($language, $tables); } - if (in_array(1, $tablePermissions)) { + if (\in_array(1, $tablePermissions)) { $content .= $this->getLanguageAdminPermissions($language); } $content .= $this->getLanguageAdminFoot($language); - $this->create($moduleDirname, 'language/' . $GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'language/' . $GLOBALS['xoopsConfig']['language'], $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/Language/LanguageBlocks.php b/class/Files/Language/LanguageBlocks.php index 65c1e1ee..5873e2ab 100644 --- a/class/Files/Language/LanguageBlocks.php +++ b/class/Files/Language/LanguageBlocks.php @@ -1,9 +1,9 @@ -defines = LanguageDefines::getInstance(); + $this->ld = LanguageDefines::getInstance(); } /** * @static function getInstance - * @param null + * * @return LanguageBlocks */ public static function getInstance() @@ -63,11 +62,11 @@ public static function getInstance() /** * @public function write - * @param string $module + * @param $module * @param mixed $tables * @param string $filename */ - public function write($module, $tables, $filename) + public function write($module, $tables, string $filename): void { $this->setModule($module); $this->setFileName($filename); @@ -80,32 +79,37 @@ public function write($module, $tables, $filename) * * @return string */ - private function getLanguageBlock($language) + private function getLanguageBlock(string $language) { $tables = $this->getTables(); - $ret = $this->defines->getAboveDefines('Admin Edit'); - $ret .= $this->defines->getDefine($language, 'DISPLAY', 'How Many Tables to Display'); - $ret .= $this->defines->getDefine($language, 'TITLE_LENGTH', 'Title Length'); - $ret .= $this->defines->getDefine($language, 'CATTODISPLAY', 'Categories to Display'); - $ret .= $this->defines->getDefine($language, 'ALLCAT', 'All Categories'); - foreach (array_keys($tables) as $t) { + $ret = $this->ld->getAboveDefines('Admin Edit'); + $ret .= $this->ld->getDefine($language, 'DISPLAY', 'How Many Items to Display'); + $ret .= $this->ld->getDefine($language, 'DISPLAY_SPOTLIGHT', "How Many Items to Display (only valid if you select 'all')", true); + $ret .= $this->ld->getDefine($language, 'TITLE_LENGTH', 'Title Length'); + $ret .= $this->ld->getDefine($language, 'CATTODISPLAY', 'Categories to Display'); + $ret .= $this->ld->getDefine($language, 'ALLCAT', 'All Categories'); + foreach (\array_keys($tables) as $t) { if (1 === (int)$tables[$t]->getVar('table_blocks')) { - $tableName = $tables[$t]->getVar('table_name'); - $ucfTableName = ucfirst($tableName); - $ret .= $this->defines->getAboveDefines($ucfTableName); - $fields = $this->getTableFields($tables[$t]->getVar('table_mid'), $tables[$t]->getVar('table_id')); - $stuTableName = mb_strtoupper($tableName); - $ret .= $this->defines->getDefine($language, $stuTableName . '_TO_DISPLAY', $ucfTableName . ' to Display'); - $ret .= $this->defines->getDefine($language, 'ALL_' . $stuTableName, 'All ' . $ucfTableName); - foreach (array_keys($fields) as $f) { + $tableName = $tables[$t]->getVar('table_name'); + $tableSoleName = $tables[$t]->getVar('table_solename'); + $ucfTableName = \ucfirst($tableName); + $ucfTableSoleName = \ucfirst($tableSoleName); + $stuTableName = \mb_strtoupper($tableName); + $stuTableSoleName = \mb_strtoupper($tableSoleName); + $ret .= $this->ld->getAboveDefines($ucfTableName); + $fields = $this->getTableFields($tables[$t]->getVar('table_mid'), $tables[$t]->getVar('table_id')); + $ret .= $this->ld->getDefine($language, $stuTableName . '_TO_DISPLAY', $ucfTableName . ' to Display'); + $ret .= $this->ld->getDefine($language, 'ALL_' . $stuTableName, 'All ' . $ucfTableName); + foreach (\array_keys($fields) as $f) { if (1 === (int)$fields[$f]->getVar('field_block')) { - $fieldName = $fields[$f]->getVar('field_name'); - $stuFieldName = mb_strtoupper($fieldName); - $rpFieldName = $this->getRightString($fieldName); - $fieldNameDesc = ucfirst($rpFieldName); - $ret .= $this->defines->getDefine($language, $stuFieldName, $fieldNameDesc); + $fieldName = $fields[$f]->getVar('field_name'); + $stuFieldName = \mb_strtoupper($fieldName); + $rpFieldName = $this->getRightString($fieldName); + $fieldNameDesc = \ucfirst($rpFieldName); + $ret .= $this->ld->getDefine($language, $stuFieldName, $fieldNameDesc); } } + $ret .= $this->ld->getDefine($language, $stuTableSoleName . '_GOTO', 'Goto ' . $ucfTableSoleName); } } @@ -114,33 +118,33 @@ private function getLanguageBlock($language) /** * @private function getFooter - * @param null + * * @return string */ private function getLanguageFooter() { - $ret = $this->defines->getBelowDefines('End'); - $ret .= $this->defines->getBlankLine(); + $ret = $this->ld->getBelowDefines('End'); + $ret .= $this->ld->getBlankLine(); return $ret; } /** * @public function render - * @param null - * @return bool|string + * + * @return string */ public function render() { $module = $this->getModule(); $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); - $language = $this->getLanguage($moduleDirname, 'MB'); + $language = $this->getLanguage($moduleDirname, 'MB', '', false); $content = $this->getHeaderFilesComments($module); $content .= $this->getLanguageBlock($language); $content .= $this->getLanguageFooter(); - $this->create($moduleDirname, 'language/' . $GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'language/' . $GLOBALS['xoopsConfig']['language'], $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/Language/LanguageDefines.php b/class/Files/Language/LanguageDefines.php index aed1d68e..ed15270f 100644 --- a/class/Files/Language/LanguageDefines.php +++ b/class/Files/Language/LanguageDefines.php @@ -1,8 +1,8 @@ -getPhpCodeDefine("{$language}{$defined}", "\"{$description}\""); @@ -103,7 +101,7 @@ public function getDefine($language, $defined, $description, $usedoubleqoute = f * * @return string */ - public function getBelowDefines($string) + public function getBelowDefines(string $string) { return "// ---------------- {$string} ----------------"; } diff --git a/class/Files/Language/LanguageHelp.php b/class/Files/Language/LanguageHelp.php index a7eb8bf5..be96ba22 100644 --- a/class/Files/Language/LanguageHelp.php +++ b/class/Files/Language/LanguageHelp.php @@ -1,9 +1,9 @@ -defines = LanguageDefines::getInstance(); } /** * @static function getInstance - * @param null + * * @return LanguageHelp */ public static function getInstance() @@ -63,10 +57,10 @@ public static function getInstance() /** * @public function write - * @param string $module + * @param Modulebuilder\Modules $module * @param string $filename */ - public function write($module, $filename) + public function write(Modulebuilder\Modules $module, string $filename): void { $this->setModule($module); $this->setFileName($filename); @@ -74,10 +68,10 @@ public function write($module, $filename) /** * @public function render - * @param null - * @return bool|string + * + * @return string */ - public function render() + public function render(): string { $module = $this->getModule(); $filename = $this->getFileName(); @@ -85,38 +79,41 @@ public function render() $moduleDirname = $module->getVar('mod_dirname'); $language = $GLOBALS['xoopsConfig']['language']; $content = <<
- Help:
- {$moduleName}
-
-
-EOT;
+ Do not choose an existing module dirname or database table name!'); + $ret .= $this->ld->getDefine($language, 'CLONE_INVALIDNAME', 'ERROR: Invalid module name, please try another one!'); + $ret .= $this->ld->getDefine($language, 'CLONE_EXISTS', 'ERROR: Module name already taken, please try another one!'); + $ret .= $this->ld->getDefine($language, 'CLONE_CONGRAT', 'Congratulations! %s was sucessfully created!
You may want to make changes in language files.'); + $ret .= $this->ld->getDefine($language, 'CLONE_IMAGEFAIL', 'Attention, we failed creating the new module logo. Please consider modifying assets/images/logo_module.png manually!'); + $ret .= $this->ld->getDefine($language, 'CLONE_FAIL', 'Sorry, we failed in creating the new clone. Maybe you need to temporally set write permissions (CHMOD 777) to modules folder and try again.'); return $ret; } @@ -254,22 +295,22 @@ public function getLanguageAdminClass($language, $tables) * @param string $language * @return string */ - public function getLanguageAdminPermissions($language) + public function getLanguageAdminPermissions(string $language) { - $ret = $this->defines->getAboveHeadDefines('Admin Permissions'); - $ret .= $this->defines->getAboveDefines('Permissions'); - $ret .= $this->defines->getDefine($language, 'PERMISSIONS_GLOBAL', 'Permissions global'); - $ret .= $this->defines->getDefine($language, 'PERMISSIONS_GLOBAL_DESC', 'Permissions global to check type of.'); - $ret .= $this->defines->getDefine($language, 'PERMISSIONS_GLOBAL_4', 'Permissions global to approve'); - $ret .= $this->defines->getDefine($language, 'PERMISSIONS_GLOBAL_8', 'Permissions global to submit'); - $ret .= $this->defines->getDefine($language, 'PERMISSIONS_GLOBAL_16', 'Permissions global to view'); - $ret .= $this->defines->getDefine($language, 'PERMISSIONS_APPROVE', 'Permissions to approve'); - $ret .= $this->defines->getDefine($language, 'PERMISSIONS_APPROVE_DESC', 'Permissions to approve'); - $ret .= $this->defines->getDefine($language, 'PERMISSIONS_SUBMIT', 'Permissions to submit'); - $ret .= $this->defines->getDefine($language, 'PERMISSIONS_SUBMIT_DESC', 'Permissions to submit'); - $ret .= $this->defines->getDefine($language, 'PERMISSIONS_VIEW', 'Permissions to view'); - $ret .= $this->defines->getDefine($language, 'PERMISSIONS_VIEW_DESC', 'Permissions to view'); - $ret .= $this->defines->getDefine($language, 'NO_PERMISSIONS_SET', 'No permission set'); + $ret = $this->ld->getAboveHeadDefines('Admin Permissions'); + $ret .= $this->ld->getAboveDefines('Permissions'); + $ret .= $this->ld->getDefine($language, 'PERMISSIONS_GLOBAL', 'Permissions global'); + $ret .= $this->ld->getDefine($language, 'PERMISSIONS_GLOBAL_DESC', 'Permissions global to check type of.'); + $ret .= $this->ld->getDefine($language, 'PERMISSIONS_GLOBAL_4', 'Permissions global to approve'); + $ret .= $this->ld->getDefine($language, 'PERMISSIONS_GLOBAL_8', 'Permissions global to submit'); + $ret .= $this->ld->getDefine($language, 'PERMISSIONS_GLOBAL_16', 'Permissions global to view'); + $ret .= $this->ld->getDefine($language, 'PERMISSIONS_APPROVE', 'Permissions to approve'); + $ret .= $this->ld->getDefine($language, 'PERMISSIONS_APPROVE_DESC', 'Permissions to approve'); + $ret .= $this->ld->getDefine($language, 'PERMISSIONS_SUBMIT', 'Permissions to submit'); + $ret .= $this->ld->getDefine($language, 'PERMISSIONS_SUBMIT_DESC', 'Permissions to submit'); + $ret .= $this->ld->getDefine($language, 'PERMISSIONS_VIEW', 'Permissions to view'); + $ret .= $this->ld->getDefine($language, 'PERMISSIONS_VIEW_DESC', 'Permissions to view'); + $ret .= $this->ld->getDefine($language, 'NO_PERMISSIONS_SET', 'No permission set'); return $ret; } @@ -279,45 +320,48 @@ public function getLanguageAdminPermissions($language) * @param string $language * @return string */ - public function getLanguageAdminFoot($language) + public function getLanguageAdminFoot(string $language) { - $ret = $this->defines->getAboveHeadDefines('Admin Others'); - $ret .= $this->defines->getDefine($language, 'MAINTAINEDBY', ' is maintained by '); - $ret .= $this->defines->getBelowDefines('End'); - $ret .= $this->defines->getBlankLine(); + $ret = $this->ld->getAboveHeadDefines('Admin Others'); + $ret .= $this->ld->getDefine($language, 'ABOUT_MAKE_DONATION', 'Submit'); + $ret .= $this->ld->getDefine($language, 'SUPPORT_FORUM', 'Support Forum'); + $ret .= $this->ld->getDefine($language, 'DONATION_AMOUNT', 'Donation Amount'); + $ret .= $this->ld->getDefine($language, 'MAINTAINEDBY', ' is maintained by '); + $ret .= $this->ld->getBelowDefines('End'); + $ret .= $this->ld->getBlankLine(); return $ret; } /** * @public function render - * @param null - * @return bool|string + * + * @return string */ public function render() { - $module = $this->getModule(); - $tables = $this->getTableTables($module->getVar('mod_id')); + $module = $this->getModule(); + $tables = $this->getTableTables($module->getVar('mod_id')); $tablePermissions = []; - foreach (array_keys($tables) as $t) { + foreach (\array_keys($tables) as $t) { $tablePermissions[] = $tables[$t]->getVar('table_permissions'); } $tables = $this->getTables(); $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); - $language = $this->getLanguage($moduleDirname, 'AM'); + $language = $this->getLanguage($moduleDirname, 'AM', '', false); $content = $this->getHeaderFilesComments($module); - if (is_array($tables)) { + if (\is_array($tables)) { $content .= $this->getLanguageAdminIndex($language, $tables); $content .= $this->getLanguageAdminPages($language, $tables); $content .= $this->getLanguageAdminClass($language, $tables); } - if (in_array(1, $tablePermissions)) { + if (\in_array(1, $tablePermissions)) { $content .= $this->getLanguageAdminPermissions($language); } $content .= $this->getLanguageAdminFoot($language); - $this->create($moduleDirname, 'language/' . $GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'language/' . $GLOBALS['xoopsConfig']['language'], $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/Language/LanguageBlocks.php b/class/Files/Language/LanguageBlocks.php index 65c1e1ee..5873e2ab 100644 --- a/class/Files/Language/LanguageBlocks.php +++ b/class/Files/Language/LanguageBlocks.php @@ -1,9 +1,9 @@ -defines = LanguageDefines::getInstance(); + $this->ld = LanguageDefines::getInstance(); } /** * @static function getInstance - * @param null + * * @return LanguageBlocks */ public static function getInstance() @@ -63,11 +62,11 @@ public static function getInstance() /** * @public function write - * @param string $module + * @param $module * @param mixed $tables * @param string $filename */ - public function write($module, $tables, $filename) + public function write($module, $tables, string $filename): void { $this->setModule($module); $this->setFileName($filename); @@ -80,32 +79,37 @@ public function write($module, $tables, $filename) * * @return string */ - private function getLanguageBlock($language) + private function getLanguageBlock(string $language) { $tables = $this->getTables(); - $ret = $this->defines->getAboveDefines('Admin Edit'); - $ret .= $this->defines->getDefine($language, 'DISPLAY', 'How Many Tables to Display'); - $ret .= $this->defines->getDefine($language, 'TITLE_LENGTH', 'Title Length'); - $ret .= $this->defines->getDefine($language, 'CATTODISPLAY', 'Categories to Display'); - $ret .= $this->defines->getDefine($language, 'ALLCAT', 'All Categories'); - foreach (array_keys($tables) as $t) { + $ret = $this->ld->getAboveDefines('Admin Edit'); + $ret .= $this->ld->getDefine($language, 'DISPLAY', 'How Many Items to Display'); + $ret .= $this->ld->getDefine($language, 'DISPLAY_SPOTLIGHT', "How Many Items to Display (only valid if you select 'all')", true); + $ret .= $this->ld->getDefine($language, 'TITLE_LENGTH', 'Title Length'); + $ret .= $this->ld->getDefine($language, 'CATTODISPLAY', 'Categories to Display'); + $ret .= $this->ld->getDefine($language, 'ALLCAT', 'All Categories'); + foreach (\array_keys($tables) as $t) { if (1 === (int)$tables[$t]->getVar('table_blocks')) { - $tableName = $tables[$t]->getVar('table_name'); - $ucfTableName = ucfirst($tableName); - $ret .= $this->defines->getAboveDefines($ucfTableName); - $fields = $this->getTableFields($tables[$t]->getVar('table_mid'), $tables[$t]->getVar('table_id')); - $stuTableName = mb_strtoupper($tableName); - $ret .= $this->defines->getDefine($language, $stuTableName . '_TO_DISPLAY', $ucfTableName . ' to Display'); - $ret .= $this->defines->getDefine($language, 'ALL_' . $stuTableName, 'All ' . $ucfTableName); - foreach (array_keys($fields) as $f) { + $tableName = $tables[$t]->getVar('table_name'); + $tableSoleName = $tables[$t]->getVar('table_solename'); + $ucfTableName = \ucfirst($tableName); + $ucfTableSoleName = \ucfirst($tableSoleName); + $stuTableName = \mb_strtoupper($tableName); + $stuTableSoleName = \mb_strtoupper($tableSoleName); + $ret .= $this->ld->getAboveDefines($ucfTableName); + $fields = $this->getTableFields($tables[$t]->getVar('table_mid'), $tables[$t]->getVar('table_id')); + $ret .= $this->ld->getDefine($language, $stuTableName . '_TO_DISPLAY', $ucfTableName . ' to Display'); + $ret .= $this->ld->getDefine($language, 'ALL_' . $stuTableName, 'All ' . $ucfTableName); + foreach (\array_keys($fields) as $f) { if (1 === (int)$fields[$f]->getVar('field_block')) { - $fieldName = $fields[$f]->getVar('field_name'); - $stuFieldName = mb_strtoupper($fieldName); - $rpFieldName = $this->getRightString($fieldName); - $fieldNameDesc = ucfirst($rpFieldName); - $ret .= $this->defines->getDefine($language, $stuFieldName, $fieldNameDesc); + $fieldName = $fields[$f]->getVar('field_name'); + $stuFieldName = \mb_strtoupper($fieldName); + $rpFieldName = $this->getRightString($fieldName); + $fieldNameDesc = \ucfirst($rpFieldName); + $ret .= $this->ld->getDefine($language, $stuFieldName, $fieldNameDesc); } } + $ret .= $this->ld->getDefine($language, $stuTableSoleName . '_GOTO', 'Goto ' . $ucfTableSoleName); } } @@ -114,33 +118,33 @@ private function getLanguageBlock($language) /** * @private function getFooter - * @param null + * * @return string */ private function getLanguageFooter() { - $ret = $this->defines->getBelowDefines('End'); - $ret .= $this->defines->getBlankLine(); + $ret = $this->ld->getBelowDefines('End'); + $ret .= $this->ld->getBlankLine(); return $ret; } /** * @public function render - * @param null - * @return bool|string + * + * @return string */ public function render() { $module = $this->getModule(); $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); - $language = $this->getLanguage($moduleDirname, 'MB'); + $language = $this->getLanguage($moduleDirname, 'MB', '', false); $content = $this->getHeaderFilesComments($module); $content .= $this->getLanguageBlock($language); $content .= $this->getLanguageFooter(); - $this->create($moduleDirname, 'language/' . $GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'language/' . $GLOBALS['xoopsConfig']['language'], $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/Language/LanguageDefines.php b/class/Files/Language/LanguageDefines.php index aed1d68e..ed15270f 100644 --- a/class/Files/Language/LanguageDefines.php +++ b/class/Files/Language/LanguageDefines.php @@ -1,8 +1,8 @@ -getPhpCodeDefine("{$language}{$defined}", "\"{$description}\""); @@ -103,7 +101,7 @@ public function getDefine($language, $defined, $description, $usedoubleqoute = f * * @return string */ - public function getBelowDefines($string) + public function getBelowDefines(string $string) { return "// ---------------- {$string} ----------------"; } diff --git a/class/Files/Language/LanguageHelp.php b/class/Files/Language/LanguageHelp.php index a7eb8bf5..be96ba22 100644 --- a/class/Files/Language/LanguageHelp.php +++ b/class/Files/Language/LanguageHelp.php @@ -1,9 +1,9 @@ -defines = LanguageDefines::getInstance(); } /** * @static function getInstance - * @param null + * * @return LanguageHelp */ public static function getInstance() @@ -63,10 +57,10 @@ public static function getInstance() /** * @public function write - * @param string $module + * @param Modulebuilder\Modules $module * @param string $filename */ - public function write($module, $filename) + public function write(Modulebuilder\Modules $module, string $filename): void { $this->setModule($module); $this->setFileName($filename); @@ -74,10 +68,10 @@ public function write($module, $filename) /** * @public function render - * @param null - * @return bool|string + * + * @return string */ - public function render() + public function render(): string { $module = $this->getModule(); $filename = $this->getFileName(); @@ -85,38 +79,41 @@ public function render() $moduleDirname = $module->getVar('mod_dirname'); $language = $GLOBALS['xoopsConfig']['language']; $content = <<
Help:
- {$moduleName} 
-
-
- Description
-
- The {$moduleName} module can be used to modules in XOOPS
-
Install/uninstall
-
-No special measures necessary, follow the standard installation process and extract the {$moduleDirname} folder into the ../modules directory. Install the module through Admin -> System Module -> Modules.
-Detailed instructions on installing modules are available in the XOOPS Operations Manual
-
Features
-
- The TDMCreate module continues to expand, to get to the conditions to create modules, more and more sophisticated.
- For this reason, I invite all developers to report and send in svn any changes or additions to this module, so that we can jointly contribute to the development
-
Tutorial
-- You can find a more detailed to this Video Tutorial here -
- -
+ Help:
+ {$moduleName}
+
+
+ EOT;
if ('english' !== $language) {
- $this->create($moduleDirname, 'language/' . $language . '/help', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->create($moduleDirname, 'language/' . $language . '/help', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
+ if (!$this->renderFile()) {
+ throw new \RuntimeException("The {$filename} file in 'language/" . $language . "/help' could not be created.");
+ }
}
- $this->create($moduleDirname, 'language/' . $GLOBALS['xoopsConfig']['language'] . '/help', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->create($moduleDirname, 'language/english/help', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $this->renderFile();
}
diff --git a/class/Files/Language/LanguageMailTpl.php b/class/Files/Language/LanguageMailTpl.php
index e467b1cc..5bc18e34 100644
--- a/class/Files/Language/LanguageMailTpl.php
+++ b/class/Files/Language/LanguageMailTpl.php
@@ -1,9 +1,9 @@
-setModule($module);
+ $this->setTable($table);
$this->setFileName($filename);
}
/**
- * @public function renderFile
- * @return bool|string
+ * @public function getTemplateDummy
+ * @param $tableSoleName
+ * @param $line
+ * @return string
*/
- public function render()
+ public function getTemplateDummy($tableSoleName, $line)
{
- $module = $this->getModule();
- $filename = $this->getFileName();
- $moduleDirname = $module->getVar('mod_dirname');
- $content = <<<'EOT'
-// ---------- Templates Mail Content Dummy ---------- //
-Hello {X_UNAME},
+ $ret = $this->getSimpleString('Hello {X_UNAME},');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('A new ' . $tableSoleName . ' "{ITEM_NAME}" has been added at {X_SITENAME}.');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('You can view this ' . $tableSoleName . ' here:');
+ $ret .= $this->getSimpleString('{ITEM_URL}');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString($line);
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('You are receiving this message because you selected to be notified when a new ' . $tableSoleName . ' is added to our site.');
+ $ret .= $this->getSimpleString('');
+
+ return $ret;
+ }
+
+ /**
+ * @public function getTemplateTableModify
+ * @param $tableSoleName
+ * @param $line
+ * @return string
+ */
+ public function getTemplateTableModify($tableSoleName, $line)
+ {
+ $ret = $this->getSimpleString('Hello {X_UNAME},');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('The ' . $tableSoleName . ' "{ITEM_NAME}" has been modified at {X_SITENAME}.');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('You can view this ' . $tableSoleName . ' here:');
+ $ret .= $this->getSimpleString('{ITEM_URL}');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString($line);
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('You are receiving this message because you selected to be notified when a ' . $tableSoleName . ' is modified on our site.');
-A new story "{STORY_NAME}" has been added at {X_SITENAME}.
+ return $ret;
+ }
-You can view this story here:
-{STORY_URL}
+ /**
+ * @public function getTemplateTableDelete
+ * @param $tableSoleName
+ * @param $line
+ * @return string
+ */
+ public function getTemplateTableDelete($tableSoleName, $line)
+ {
+ $ret = $this->getSimpleString('Hello {X_UNAME},');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('The ' . $tableSoleName . ' "{ITEM_NAME}" has been deleted from {X_SITENAME}.');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString($line);
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('You are receiving this message because you selected to be notified when a ' . $tableSoleName . ' is deleted from our site.');
------------
+ return $ret;
+ }
-You are receiving this message because you selected to be notified when new stories are added to our site.
+ /**
+ * @public function getTemplateTableApprove
+ * @param $tableSoleName
+ * @param $line
+ * @return string
+ */
+ public function getTemplateTableApprove($tableSoleName, $line)
+ {
+ $ret = $this->getSimpleString('Hello {X_UNAME},');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('A new ' . $tableSoleName . ' "{ITEM_NAME}" is waiting for approval at {X_SITENAME}.');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('You can view this ' . $tableSoleName . ' here:');
+ $ret .= $this->getSimpleString('{ITEM_URL}');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString($line);
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('You are receiving this message because you selected to be notified when a ' . $tableSoleName . ' is waitung for approval on our site.');
-If this is an error or you wish not to receive further such notifications, please update your subscriptions by visiting the link below:
-{X_UNSUBSCRIBE_URL}
+ return $ret;
+ }
-Please do not reply to this message.
+ /**
+ * @public function getTemplateTableApprove
+ * @param $tableSoleName
+ * @param $line
+ * @return string
+ */
+ public function getTemplateTableBroken($tableSoleName, $line)
+ {
+ $ret = $this->getSimpleString('Hello {X_UNAME},');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('The ' . $tableSoleName . ' "{ITEM_NAME}" has been notified as broken at {X_SITENAME}.');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('You can view this ' . $tableSoleName . ' here:');
+ $ret .= $this->getSimpleString('{ITEM_URL}');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString($line);
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('You are receiving this message because you selected to be notified when a ' . $tableSoleName . ' is notified as broken on our site.');
+
+ return $ret;
+ }
+
+ /**
+ * @public function getTemplateTableComment
+ * @param $tableSoleName
+ * @param $line
+ * @return string
+ */
+ public function getTemplateTableComment($tableSoleName, $line)
+ {
+ $ret = $this->getSimpleString('Hello {X_UNAME},');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('A comment was published for ' . $tableSoleName . ' "{ITEM_NAME}" at {X_SITENAME}.');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('You can view this comment here:');
+ $ret .= $this->getSimpleString('{ITEM_URL}');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString($line);
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('You are receiving this message because you selected to be notified when a ' . $tableSoleName . ' is modified on our site.');
+
+ return $ret;
+ }
+
+ /**
+ * @public function getTemplateGlobalNew
+ * @param $line
+ * @return string
+ */
+ public function getTemplateGlobalNew($line)
+ {
+ $ret = $this->getSimpleString('Hello {X_UNAME},');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('A new item "{ITEM_NAME}" has been added at {X_SITENAME}.');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('You can view this item here:');
+ $ret .= $this->getSimpleString('{ITEM_URL}');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString($line);
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('You are receiving this message because you selected to be notified when a new item is added to our site.');
+
+ return $ret;
+ }
+
+ /**
+ * @public function getTemplateGlobalModify
+ * @param $line
+ * @return string
+ */
+ public function getTemplateGlobalModify($line)
+ {
+ $ret = $this->getSimpleString('Hello {X_UNAME},');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('The item "{ITEM_NAME}" has been modified at {X_SITENAME}.');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('You can view this item here:');
+ $ret .= $this->getSimpleString('{ITEM_URL}');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString($line);
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('You are receiving this message because you selected to be notified when an item is modified on our site.');
------------
+ return $ret;
+ }
+
+ /**
+ * @public function getTemplateGlobalDelete
+ * @param $line
+ * @return string
+ */
+ public function getTemplateGlobalDelete($line)
+ {
+ $ret = $this->getSimpleString('Hello {X_UNAME},');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('The item "{ITEM_NAME}" has been deleted from {X_SITENAME}.');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString($line);
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('You are receiving this message because you selected to be notified when an item is deleted from our site.');
+
+ return $ret;
+ }
+
+ /**
+ * @public function getTemplateGlobalApprove
+ * @param $line
+ * @return string
+ */
+ public function getTemplateGlobalApprove($line)
+ {
+ $ret = $this->getSimpleString('Hello {X_UNAME},');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('The item "{ITEM_NAME}" is waiting for approval at {X_SITENAME}.');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('You can view this item here:');
+ $ret .= $this->getSimpleString('{ITEM_URL}');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString($line);
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('You are receiving this message because you selected to be notified when an item is waitung for approval on our site.');
+
+ return $ret;
+ }
+
+ /**
+ * @public function getTemplateGlobalBroken
+ * @param $line
+ * @return string
+ */
+ public function getTemplateGlobalBroken($line)
+ {
+ $ret = $this->getSimpleString('Hello {X_UNAME},');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('The item "{ITEM_NAME}" has been notified as broken at {X_SITENAME}.');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('You can view this item here:');
+ $ret .= $this->getSimpleString('{ITEM_URL}');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString($line);
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('You are receiving this message because you selected to be notified when an item is notified as broken on our site.');
+
+ return $ret;
+ }
+
+ /**
+ * @public function getTemplateGlobalNew
+ * @param $line
+ * @return string
+ */
+ public function getTemplateGlobalComment($line)
+ {
+ $ret = $this->getSimpleString('Hello {X_UNAME},');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('A new comment has been added to "{ITEM_NAME}" at {X_SITENAME}.');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('You can view this comment here:');
+ $ret .= $this->getSimpleString('{ITEM_URL}');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString($line);
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('You are receiving this message because you selected to be notified when a new comment is added to an item of our site.');
+
+ return $ret;
+ }
+
+ /**
+ * @public function getTemplateTableApprove
+ * @param $line
+ * @return string
+ */
+ public function getTemplateTableFooter($line)
+ {
+ $ret = $this->getSimpleString('');
+ $ret .= $this->getSimpleString('If this is an error or you wish not to receive further such notifications, please update your subscriptions by visiting the link below:');
+ $ret .= $this->getSimpleString('{X_UNSUBSCRIBE_URL}');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('Please do not reply to this message.');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString($line);
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString('{X_SITENAME} ({X_SITEURL})');
+ $ret .= $this->getSimpleString('webmaster');
+ $ret .= $this->getSimpleString('{X_ADMINMAIL}');
+ $ret .= $this->getSimpleString('');
+ $ret .= $this->getSimpleString($line);
+
+ return $ret;
+ }
+
+ /**
+ * @public function renderFile
+ * @return string
+ */
+ public function render()
+ {
+ $module = $this->getModule();
+ $filename = $this->getFileName();
+ $table = $this->getTable();
+ $moduleDirname = $module->getVar('mod_dirname');
+ $tableSoleName = $table->getVar('table_solename');
+
+ $line = '------------------------------------------------------------------';
+ $content = '';
+ switch ($filename) {
+ case 'category_new_notify.tpl':
+ //$content .= $this->getTemplateCategoryNew('categories', 'CATEGORY', 'CATEGORY', $line);
+ //break;
+ case 'default':
+ default:
+ $content .= $this->getTemplateDummy($tableSoleName, $line);
+ break;
+ case 'global_new_notify.tpl':
+ $content .= $this->getTemplateGlobalNew($line);
+ break;
+ case 'global_modify_notify.tpl':
+ $content .= $this->getTemplateGlobalModify($line);
+ break;
+ case 'global_delete_notify.tpl':
+ $content .= $this->getTemplateGlobalDelete($line);
+ break;
+ case 'global_approve_notify.tpl':
+ $content .= $this->getTemplateGlobalApprove($line);
+ break;
+ case 'global_broken_notify.tpl':
+ $content .= $this->getTemplateGlobalBroken($line);
+ break;
+ case 'global_comment_notify.tpl':
+ $content .= $this->getTemplateGlobalComment($line);
+ break;
+ case $tableSoleName . '_modify_notify.tpl':
+ $content .= $this->getTemplateTableModify($tableSoleName, $line);
+ break;
+ case $tableSoleName . '_delete_notify.tpl':
+ $content .= $this->getTemplateTableDelete($tableSoleName, $line);
+ break;
+ case $tableSoleName . '_approve_notify.tpl':
+ $content .= $this->getTemplateTableApprove($tableSoleName, $line);
+ break;
+ case $tableSoleName . '_broken_notify.tpl':
+ $content .= $this->getTemplateTableBroken($tableSoleName, $line);
+ break;
+ case $tableSoleName . '_comment_notify.tpl':
+ $content .= $this->getTemplateTableComment($tableSoleName, $line);
+ break;
+ }
+ $content .= $this->getTemplateTableFooter($line);
-{X_SITENAME} ({X_SITEURL})
-webmaster
-{X_ADMINMAIL}
-EOT;
- $this->create($moduleDirname, 'language/' . $GLOBALS['xoopsConfig']['language'] . '/mail_template', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->create($moduleDirname, 'language/' . $GLOBALS['xoopsConfig']['language'] . '/mail_template', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED);
return $this->renderFile();
}
diff --git a/class/Files/Language/LanguageMain.php b/class/Files/Language/LanguageMain.php
index 14470505..5bfae901 100644
--- a/class/Files/Language/LanguageMain.php
+++ b/class/Files/Language/LanguageMain.php
@@ -1,9 +1,9 @@
-defines = LanguageDefines::getInstance();
+ $this->ld = LanguageDefines::getInstance();
+ $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance();
}
/**
* @static function getInstance
- * @param null
+ *
* @return LanguageMain
*/
public static function getInstance()
@@ -63,11 +67,11 @@ public static function getInstance()
/**
* @public function write
- * @param string $module
+ * @param $module
* @param mixed $tables
* @param string $filename
*/
- public function write($module, $tables, $filename)
+ public function write($module, $tables, string $filename): void
{
$this->setModule($module);
$this->setFileName($filename);
@@ -76,75 +80,130 @@ public function write($module, $tables, $filename)
/**
* @private function getLanguageMain
- * @param string $module
+ * @param $module
* @param string $language
*
* @return string
*/
- private function getLanguageMain($module, $language)
+ private function getLanguageMain($module, string $language)
{
- /** @var \XoopsModules\Tdmcreate\Utility $utility */
- $utility = new \XoopsModules\Tdmcreate\Utility();
+ $utility = new \XoopsModules\Modulebuilder\Utility();
- $moduleName = $module->getVar('mod_name');
$tables = $this->getTables();
- $ret = $this->defines->getBlankLine();
- $ret .= $this->defines->getAboveHeadDefines('Main');
- $ret .= $this->defines->getDefine($language, 'INDEX', 'Home');
- $ret .= $this->defines->getDefine($language, 'TITLE', (string)$module->getVar('mod_name'));
- $ret .= $this->defines->getDefine($language, 'DESC', (string)$module->getVar('mod_description'));
- $ret .= $this->defines->getDefine(
- $language,
- 'INDEX_DESC',
- "Welcome to the homepage of your new module {$moduleName}!Help:
+ {$moduleName} 
+
+
+ Description
+
+ The {$moduleName} module can be used to modules in XOOPS
+
Install/uninstall
+
+ No special measures necessary, follow the standard installation process and extract the {$moduleDirname} folder into the ../modules directory. Install the module through Admin -> System Module -> Modules.
+ Detailed instructions on installing modules are available in the XOOPS Operations Manual
+
Features
+
+ The ModuleBuilder module continues to expand, to get to the conditions to create modules, more and more sophisticated.
+ For this reason, I invite all developers to report and send in svn any changes or additions to this module, so that we can jointly contribute to the development
+
Tutorial
++ You can find a more detailed to this Video Tutorial here +
+ +-As you can see, you have created a page with a list of links at the top to navigate between the pages of your module. This description is only visible on the homepage of this module, the other pages you will see the content you created when you built this module with the module TDMCreate, and after creating new content in admin of this module. In order to expand this module with other resources, just add the code you need to extend the functionality of the same. The files are grouped by type, from the header to the footer to see how divided the source code.
If you see this message, it is because you have not created content for this module. Once you have created any type of content, you will not see this message.
If you liked the module TDMCreate and thanks to the long process for giving the opportunity to the new module to be created in a moment, consider making a donation to keep the module TDMCreate and make a donation using this button
Thanks!
Use the link below to go to the admin and create content.", - true - ); - $ret .= $this->defines->getDefine($language, 'NO_PDF_LIBRARY', 'Libraries TCPDF not there yet, upload them in root/Frameworks'); - $ret .= $this->defines->getDefine($language, 'NO', 'No'); - $ret .= $this->defines->getAboveHeadDefines('Contents'); + $ret = $this->ld->getBlankLine(); + $ret .= $this->pc->getPhpCodeIncludeDir('__DIR__', 'admin', true); + $ret .= $this->ld->getBlankLine(); + $ret .= $this->ld->getAboveHeadDefines('Main'); + $ret .= $this->ld->getDefine($language, 'HOME', 'Home'); + $ret .= $this->ld->getDefine($language, 'INDEX', 'Overview ' . $module->getVar('mod_name')); + $ret .= $this->ld->getDefine($language, 'TITLE', (string)$module->getVar('mod_name')); + $ret .= $this->ld->getDefine($language, 'DESC', (string)$module->getVar('mod_description')); + $ret .= $this->ld->getDefine($language, 'NO_PDF_LIBRARY', 'Libraries TCPDF not there yet, upload them in root/Frameworks'); + $ret .= $this->ld->getDefine($language, 'NO', 'No'); + $ret .= $this->ld->getDefine($language, 'DETAILS', 'Show details'); + $ret .= $this->ld->getDefine($language, 'BROKEN', 'Notify broken'); + $ret .= $this->ld->getAboveHeadDefines('Contents'); $ucfTableName = ''; - $ucfTableSoleName = ''; - $stuTableSoleName = ''; - $tableSoleName = ''; - foreach (array_keys($tables) as $i) { - $tableName = $tables[$i]->getVar('table_name'); - $tableSoleName = $tables[$i]->getVar('table_solename'); - $stuTableName = mb_strtoupper($tableName); - $stuTableSoleName = mb_strtoupper($tableSoleName); - $ucfTableName = $utility::UcFirstAndToLower($tableName); - $ucfTableSoleName = $utility::UcFirstAndToLower($tableSoleName); - $ret .= $this->defines->getAboveDefines($ucfTableSoleName); - $ret .= $this->defines->getDefine($language, $stuTableSoleName, $ucfTableSoleName); - $ret .= $this->defines->getDefine($language, $stuTableName, $ucfTableName); - $ret .= $this->defines->getDefine($language, "{$stuTableName}_TITLE", "{$ucfTableName} title"); - $ret .= $this->defines->getDefine($language, "{$stuTableName}_DESC", "{$ucfTableName} description"); - $ret .= $this->defines->getAboveDefines("Caption of {$ucfTableSoleName}"); - $fields = $this->getTableFields($tables[$i]->getVar('table_mid'), $tables[$i]->getVar('table_id')); - foreach (array_keys($fields) as $f) { - $fieldName = $fields[$f]->getVar('field_name'); - $rpFieldName = $this->getRightString($fieldName); - $fieldNameDesc = ucfirst($rpFieldName); - $ret .= $this->defines->getDefine($language, $stuTableSoleName . '_' . $rpFieldName, $fieldNameDesc); + $tableSubmit = 0; + $tableBroken = 0; + $tableRate = 0; + $tablePrint = 0; + foreach (\array_keys($tables) as $i) { + if (1 == $tables[$i]->getVar('table_user')) { + $tableName = $tables[$i]->getVar('table_name'); + $tableSoleName = $tables[$i]->getVar('table_solename'); + if (1 === (int)$tables[$i]->getVar('table_submit')) { + $tableSubmit = 1; + } + if (1 === (int)$tables[$i]->getVar('table_broken')) { + $tableBroken = 1; + } + if (1 === (int)$tables[$i]->getVar('table_rate')) { + $tableRate = 1; + } + if (1 === (int)$tables[$i]->getVar('table_print')) { + $tablePrint = 1; + } + $stuTableName = \mb_strtoupper($tableName); + $stuTableSoleName = \mb_strtoupper($tableSoleName); + $ucfTableName = $utility::UcFirstAndToLower($tableName); + $ucfTableSoleName = $utility::UcFirstAndToLower($tableSoleName); + $ret .= $this->ld->getAboveDefines($ucfTableSoleName); + $ret .= $this->ld->getDefine($language, $stuTableSoleName, $ucfTableSoleName); + if (1 === $tableSubmit) { + $ret .= $this->ld->getDefine($language, "{$stuTableSoleName}_ADD", "Add {$ucfTableSoleName}"); + $ret .= $this->ld->getDefine($language, "{$stuTableSoleName}_EDIT", "Edit {$ucfTableSoleName}"); + $ret .= $this->ld->getDefine($language, "{$stuTableSoleName}_DELETE", "Delete {$ucfTableSoleName}"); + $ret .= $this->ld->getDefine($language, "{$stuTableSoleName}_CLONE", "Clone {$ucfTableSoleName}"); + } + $ret .= $this->ld->getDefine($language, "{$stuTableSoleName}_DETAILS", "Details {$ucfTableSoleName}"); + //$ret .= $this->ld->getDefine($language, $stuTableName, $ucfTableName); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_LIST", "List of {$ucfTableName}"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_TITLE", "{$ucfTableName} title"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_DESC", "{$ucfTableName} description"); + + $ret .= $this->ld->getAboveDefines("Caption of {$ucfTableSoleName}"); + $fields = $this->getTableFields($tables[$i]->getVar('table_mid'), $tables[$i]->getVar('table_id')); + foreach (\array_keys($fields) as $f) { + $fieldName = $fields[$f]->getVar('field_name'); + $rpFieldName = $this->getRightString($fieldName); + $fieldNameDesc = \ucfirst($rpFieldName); + $ret .= $this->ld->getDefine($language, $stuTableSoleName . '_' . $rpFieldName, $fieldNameDesc); + } + } + } + $ret .= $this->ld->getDefine($language, 'INDEX_THEREARE', "There are %s {$ucfTableName}"); + $ret .= $this->ld->getDefine($language, 'INDEX_LATEST_LIST', "Last {$module->getVar('mod_name')}"); + if (1 === $tableSubmit) { + $ret .= $this->ld->getAboveDefines('Submit'); + $ret .= $this->ld->getDefine($language, 'SUBMIT', 'Submit'); + $ret .= $this->ld->getDefine($language, 'SAVE', 'Save'); + $ret .= $this->ld->getAboveDefines('Form'); + $ret .= $this->ld->getDefine($language, 'FORM_OK', 'Successfully saved'); + $ret .= $this->ld->getDefine($language, 'FORM_DELETE_OK', 'Successfully deleted'); + $ret .= $this->ld->getDefine($language, 'FORM_SURE_DELETE', "Are you sure to delete: %s ", true); + $ret .= $this->ld->getDefine($language, 'FORM_SURE_RENEW', "Are you sure to update: %s ", true); + if (1 === $tableBroken) { + $ret .= $this->ld->getDefine($language, 'FORM_SURE_BROKEN', "Are you sure to notify as broken: %s ", true); } } - $ret .= $this->defines->getDefine($language, 'INDEX_THEREARE', "There are %s {$ucfTableName}"); - $ret .= $this->defines->getDefine($language, 'INDEX_LATEST_LIST', "Last {$module->getVar('mod_name')}"); - $ret .= $this->defines->getAboveDefines('Submit'); - $ret .= $this->defines->getDefine($language, 'SUBMIT', 'Submit'); - $ret .= $this->defines->getDefine($language, "SUBMIT_{$stuTableSoleName}", "Submit {$ucfTableSoleName}"); - $ret .= $this->defines->getDefine($language, 'SUBMIT_ALLPENDING', "All {$tableSoleName}/script information are posted pending verification."); - $ret .= $this->defines->getDefine($language, 'SUBMIT_DONTABUSE', 'Username and IP are recorded, so please do not abuse the system.'); - $ret .= $this->defines->getDefine($language, 'SUBMIT_ISAPPROVED', "Your {$tableSoleName} has been approved"); - $ret .= $this->defines->getDefine($language, 'SUBMIT_PROPOSER', "Submit a {$tableSoleName}"); - $ret .= $this->defines->getDefine($language, 'SUBMIT_RECEIVED', "We have received your {$tableSoleName} info. Thank you !"); - $ret .= $this->defines->getDefine($language, 'SUBMIT_SUBMITONCE', "Submit your {$tableSoleName}/script only once."); - $ret .= $this->defines->getDefine($language, 'SUBMIT_TAKEDAYS', "This will take many days to see your {$tableSoleName}/script added successfully in our database."); - $ret .= $this->defines->getAboveDefines('Form'); - $ret .= $this->defines->getDefine($language, 'FORM_OK', 'Successfully saved'); - $ret .= $this->defines->getDefine($language, 'FORM_DELETE_OK', 'Successfully deleted'); - $ret .= $this->defines->getDefine($language, 'FORM_SURE_DELETE', "Are you sure to delete: %s ", true); - $ret .= $this->defines->getDefine($language, 'FORM_SURE_RENEW', "Are you sure to update: %s ", true); + if (1 === $tableRate) { + $ret .= $this->ld->getAboveHeadDefines('Ratings'); + $ret .= $this->ld->getDefine($language, 'RATING_CURRENT_1', 'Rating: %c / %m (%t rating totally)'); + $ret .= $this->ld->getDefine($language, 'RATING_CURRENT_X', 'Rating: %c / %m (%t ratings totally)'); + $ret .= $this->ld->getDefine($language, 'RATING_CURRENT_SHORT_1', '%c (%t rating)'); + $ret .= $this->ld->getDefine($language, 'RATING_CURRENT_SHORT_X', '%c (%t ratings)'); + $ret .= $this->ld->getDefine($language, 'RATING1', '1 of 5'); + $ret .= $this->ld->getDefine($language, 'RATING2', '2 of 5'); + $ret .= $this->ld->getDefine($language, 'RATING3', '3 of 5'); + $ret .= $this->ld->getDefine($language, 'RATING4', '4 of 5'); + $ret .= $this->ld->getDefine($language, 'RATING5', '5 of 5'); + $ret .= $this->ld->getDefine($language, 'RATING_10_1', '1 of 10'); + $ret .= $this->ld->getDefine($language, 'RATING_10_2', '2 of 10'); + $ret .= $this->ld->getDefine($language, 'RATING_10_3', '3 of 10'); + $ret .= $this->ld->getDefine($language, 'RATING_10_4', '4 of 10'); + $ret .= $this->ld->getDefine($language, 'RATING_10_5', '5 of 10'); + $ret .= $this->ld->getDefine($language, 'RATING_10_6', '6 of 10'); + $ret .= $this->ld->getDefine($language, 'RATING_10_7', '7 of 10'); + $ret .= $this->ld->getDefine($language, 'RATING_10_8', '8 of 10'); + $ret .= $this->ld->getDefine($language, 'RATING_10_9', '9 of 10'); + $ret .= $this->ld->getDefine($language, 'RATING_10_10', '10 of 10'); + $ret .= $this->ld->getDefine($language, 'RATING_VOTE_BAD', 'Invalid vote'); + $ret .= $this->ld->getDefine($language, 'RATING_VOTE_ALREADY', 'You have already voted'); + $ret .= $this->ld->getDefine($language, 'RATING_VOTE_THANKS', 'Thank you for rating'); + $ret .= $this->ld->getDefine($language, 'RATING_NOPERM', "Sorry, you don't have permission to rate items", true); + $ret .= $this->ld->getDefine($language, 'RATING_LIKE', 'Like'); + $ret .= $this->ld->getDefine($language, 'RATING_DISLIKE', 'Dislike'); + $ret .= $this->ld->getDefine($language, 'RATING_ERROR1', 'Error: update base table failed!'); + } + if (1 === $tablePrint) { + $ret .= $this->ld->getAboveHeadDefines('Print'); + $ret .= $this->ld->getDefine($language, 'PRINT', 'Print'); + } + $ret .= $this->ld->getAboveDefines('Errors'); + $ret .= $this->ld->getDefine($language, 'INVALID_DATE', 'Invalid date'); + $ret .= $this->ld->getDefine($language, 'INVALID_PARAM', 'Invalid parameter'); + return $ret; } @@ -154,32 +213,32 @@ private function getLanguageMain($module, $language) * * @return string */ - private function getLanguageMainFooter($language) + private function getLanguageMainFooter(string $language) { - $ret = $this->defines->getAboveDefines('Admin link'); - $ret .= $this->defines->getDefine($language, 'ADMIN', 'Admin'); - $ret .= $this->defines->getBelowDefines('End'); - $ret .= $this->defines->getBlankLine(); + $ret = $this->ld->getAboveDefines('Admin link'); + $ret .= $this->ld->getDefine($language, 'ADMIN', 'Admin'); + $ret .= $this->ld->getBelowDefines('End'); + $ret .= $this->ld->getBlankLine(); return $ret; } /** * @public function render - * @param null - * @return bool|string + * + * @return string */ public function render() { $module = $this->getModule(); $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); - $language = $this->getLanguage($moduleDirname, 'MA'); + $language = $this->getLanguage($moduleDirname, 'MA', '', false); $content = $this->getHeaderFilesComments($module); $content .= $this->getLanguageMain($module, $language); $content .= $this->getLanguageMainFooter($language); - $this->create($moduleDirname, 'language/' . $GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'language/' . $GLOBALS['xoopsConfig']['language'], $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/Language/LanguageModinfo.php b/class/Files/Language/LanguageModinfo.php index f03725de..2ba32095 100644 --- a/class/Files/Language/LanguageModinfo.php +++ b/class/Files/Language/LanguageModinfo.php @@ -1,9 +1,9 @@ -ld = LanguageDefines::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); } /** * @static function getInstance - * @param null + * * @return LanguageModinfo */ public static function getInstance() @@ -83,14 +93,12 @@ public function write($module, $table, $filename) */ private function getLanguageMain($language, $module) { - $df = LanguageDefines::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $ret = $df->getBlankLine(); - $ret .= $pc->getPhpCodeIncludeDir("'common.php'",'', true, true, 'include'); - $ret .= $df->getBlankLine(); - $ret .= $df->getAboveHeadDefines('Admin Main'); - $ret .= $df->getDefine($language, 'NAME', (string)$module->getVar('mod_name')); - $ret .= $df->getDefine($language, 'DESC', (string)$module->getVar('mod_description')); + $ret = $this->ld->getBlankLine(); + $ret .= $this->pc->getPhpCodeIncludeDir('__DIR__', 'common', true); + $ret .= $this->ld->getBlankLine(); + $ret .= $this->ld->getAboveHeadDefines('Admin Main'); + $ret .= $this->ld->getDefine($language, 'NAME', (string)$module->getVar('mod_name')); + $ret .= $this->ld->getDefine($language, 'DESC', (string)$module->getVar('mod_description')); return $ret; } @@ -105,25 +113,32 @@ private function getLanguageMain($language, $module) */ private function getLanguageMenu($module, $language) { - $df = Tdmcreate\Files\Language\LanguageDefines::getInstance(); $tables = $this->getTableTables($module->getVar('mod_id'), 'table_order'); $menu = 1; - $ret = $df->getAboveHeadDefines('Admin Menu'); - $ret .= $df->getDefine($language, "ADMENU{$menu}", 'Dashboard'); + $ret = $this->ld->getAboveHeadDefines('Admin Menu'); + $ret .= $this->ld->getDefine($language, "ADMENU{$menu}", 'Dashboard'); $tablePermissions = []; - foreach (array_keys($tables) as $i) { + $tableBroken = []; + foreach (\array_keys($tables) as $i) { ++$menu; $tablePermissions[] = $tables[$i]->getVar('table_permissions'); - $ucfTableName = ucfirst($tables[$i]->getVar('table_name')); - $ret .= $df->getDefine($language, "ADMENU{$menu}", $ucfTableName); + $tableBroken[] = $tables[$i]->getVar('table_broken'); + $ucfTableName = \ucfirst($tables[$i]->getVar('table_name')); + $ret .= $this->ld->getDefine($language, "ADMENU{$menu}", $ucfTableName); } - if (in_array(1, $tablePermissions)) { + if (\in_array(1, $tableBroken)) { ++$menu; - $ret .= $df->getDefine($language, "ADMENU{$menu}", 'Permissions'); + $ret .= $this->ld->getDefine($language, "ADMENU{$menu}", 'Broken items'); + } + if (\in_array(1, $tablePermissions)) { + ++$menu; + $ret .= $this->ld->getDefine($language, "ADMENU{$menu}", 'Permissions'); } ++$menu; - $ret .= $df->getDefine($language, "ADMENU{$menu}", 'Feedback'); - $ret .= $df->getDefine($language, 'ABOUT', 'About'); + $ret .= $this->ld->getDefine($language, "ADMENU{$menu}", 'Clone'); + ++$menu; + $ret .= $this->ld->getDefine($language, "ADMENU{$menu}", 'Feedback'); + $ret .= $this->ld->getDefine($language, 'ABOUT', 'About'); unset($menu, $tablePermissions); return $ret; @@ -137,10 +152,9 @@ private function getLanguageMenu($module, $language) */ private function getLanguageAdmin($language) { - $df = LanguageDefines::getInstance(); - $ret = $df->getAboveHeadDefines('Admin Nav'); - $ret .= $df->getDefine($language, 'ADMIN_PAGER', 'Admin pager'); - $ret .= $df->getDefine($language, 'ADMIN_PAGER_DESC', 'Admin per page list'); + $ret = $this->ld->getAboveHeadDefines('Admin Nav'); + $ret .= $this->ld->getDefine($language, 'ADMIN_PAGER', 'Admin pager'); + $ret .= $this->ld->getDefine($language, 'ADMIN_PAGER_DESC', 'Admin per page list'); return $ret; } @@ -152,30 +166,29 @@ private function getLanguageAdmin($language) * * @return string */ - private function getLanguageSubmenu($language, $tables) + private function getLanguageSubmenu($language, array $tables) { - $df = LanguageDefines::getInstance(); - $ret = $df->getAboveDefines('Submenu'); - $ret .= $df->getDefine($language, 'SMNAME1', 'Index page'); - $i = 1; + $ret = $this->ld->getAboveDefines('Submenu'); + $ret .= $this->ld->getDefine($language, 'SMNAME1', 'Index page'); + $i = 2; $tableSubmit = []; $tableSearch = []; - foreach (array_keys($tables) as $t) { + foreach (\array_keys($tables) as $t) { $tableName = $tables[$t]->getVar('table_name'); - $tableSubmit[] = $tables[$t]->getVar('table_submit'); $tableSearch[] = $tables[$t]->getVar('table_search'); - $desc = ucfirst(mb_strtolower($tableName)); + $ucfTablename = \ucfirst(\mb_strtolower($tableName)); if (1 == $tables[$t]->getVar('table_submenu')) { - $ret .= $df->getDefine($language, "SMNAME{$i}", $desc); + $ret .= $this->ld->getDefine($language, "SMNAME{$i}", $ucfTablename); } ++$i; + if (1 == $tables[$t]->getVar('table_submit')) { + $ret .= $this->ld->getDefine($language, "SMNAME{$i}", 'Submit ' . $ucfTablename); + ++$i; + } } - if (in_array(1, $tableSubmit)) { - $ret .= $df->getDefine($language, "SMNAME{$i}", 'Submit'); - ++$i; - } - if (in_array(1, $tableSearch)) { - $ret .= $df->getDefine($language, "SMNAME{$i}", 'Search'); + + if (\in_array(1, $tableSearch)) { + $ret .= $this->ld->getDefine($language, "SMNAME{$i}", 'Search'); } unset($i, $tableSubmit); @@ -189,36 +202,38 @@ private function getLanguageSubmenu($language, $tables) * * @return string */ - private function getLanguageBlocks($tables, $language) + private function getLanguageBlocks(array $tables, $language) { - $df = LanguageDefines::getInstance(); - $ret = $df->getAboveDefines('Blocks'); - foreach (array_keys($tables) as $i) { - $tableName = $tables[$i]->getVar('table_name'); - $stuTableName = mb_strtoupper($tableName); - $tableSoleName = $tables[$i]->getVar('table_solename'); - $stuTableSoleName = mb_strtoupper($tableSoleName); - $ucfTableName = ucfirst($tableName); - $ucfTableSoleName = ucfirst($stuTableSoleName); - - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK", "{$ucfTableName} block"); - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_DESC", "{$ucfTableName} block description"); - if (1 == $tables[$i]->getVar('table_category')) { - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_{$stuTableSoleName}", "{$ucfTableName} block {$ucfTableSoleName}"); - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_{$stuTableSoleName}_DESC", "{$ucfTableName} block {$ucfTableSoleName} description"); - } else { - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_{$stuTableSoleName}", "{$ucfTableName} block {$ucfTableSoleName}"); - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_{$stuTableSoleName}_DESC", "{$ucfTableName} block {$ucfTableSoleName} description"); - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_LAST", "{$ucfTableName} block last"); - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_LAST_DESC", "{$ucfTableName} block last description"); - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_NEW", "{$ucfTableName} block new"); - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_NEW_DESC", "{$ucfTableName} block new description"); - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_HITS", "{$ucfTableName} block hits"); - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_HITS_DESC", "{$ucfTableName} block hits description"); - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_TOP", "{$ucfTableName} block top"); - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_TOP_DESC", "{$ucfTableName} block top description"); - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_RANDOM", "{$ucfTableName} block random"); - $ret .= $df->getDefine($language, "{$stuTableName}_BLOCK_RANDOM_DESC", "{$ucfTableName} block random description"); + $ret = $this->ld->getAboveDefines('Blocks'); + foreach (\array_keys($tables) as $i) { + if (1 == $tables[$i]->getVar('table_blocks')) { + $tableName = $tables[$i]->getVar('table_name'); + $stuTableName = \mb_strtoupper($tableName); + $tableSoleName = $tables[$i]->getVar('table_solename'); + $stuTableSoleName = \mb_strtoupper($tableSoleName); + $ucfTableName = \ucfirst($tableName); + $ucfTableSoleName = \ucfirst($stuTableSoleName); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK", "{$ucfTableName} block"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_DESC", "{$ucfTableName} block description"); + if (1 == $tables[$i]->getVar('table_category')) { + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_{$stuTableSoleName}", "{$ucfTableName} block {$ucfTableSoleName}"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_{$stuTableSoleName}_DESC", "{$ucfTableName} block {$ucfTableSoleName} description"); + } else { + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_{$stuTableSoleName}", "{$ucfTableName} block {$ucfTableSoleName}"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_{$stuTableSoleName}_DESC", "{$ucfTableName} block {$ucfTableSoleName} description"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_LAST", "{$ucfTableName} block last"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_LAST_DESC", "{$ucfTableName} block last description"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_NEW", "{$ucfTableName} block new"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_NEW_DESC", "{$ucfTableName} block new description"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_HITS", "{$ucfTableName} block hits"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_HITS_DESC", "{$ucfTableName} block hits description"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_TOP", "{$ucfTableName} block top"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_TOP_DESC", "{$ucfTableName} block top description"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_RANDOM", "{$ucfTableName} block random"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_RANDOM_DESC", "{$ucfTableName} block random description"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_SPOTLIGHT", "{$ucfTableName} block spotlight"); + $ret .= $this->ld->getDefine($language, "{$stuTableName}_BLOCK_SPOTLIGHT_DESC", "{$ucfTableName} block spotlight description"); + } } } @@ -233,10 +248,9 @@ private function getLanguageBlocks($tables, $language) */ private function getLanguageUser($language) { - $df = LanguageDefines::getInstance(); - $ret = $df->getAboveDefines('User'); - $ret .= $df->getDefine($language, 'USER_PAGER', 'User pager'); - $ret .= $df->getDefine($language, 'USER_PAGER_DESC', 'User per page list'); + $ret = $this->ld->getAboveDefines('User'); + $ret .= $this->ld->getDefine($language, 'USER_PAGER', 'User pager'); + $ret .= $this->ld->getDefine($language, 'USER_PAGER_DESC', 'User per page list'); return $ret; } @@ -250,177 +264,193 @@ private function getLanguageUser($language) */ private function getLanguageConfig($language, $tables) { - $df = LanguageDefines::getInstance(); - $ret = $df->getAboveDefines('Config'); - $fieldImage = false; - $fieldFile = false; - $useTag = false; + $ret = $this->ld->getAboveDefines('Config'); + $fieldImage = false; + $fieldFile = false; + $useTag = false; + $fieldEditor = false; // $usePermissions = false; - foreach (array_keys($tables) as $i) { + foreach (\array_keys($tables) as $i) { $fields = $this->getTableFields($tables[$i]->getVar('table_mid'), $tables[$i]->getVar('table_id')); - foreach (array_keys($fields) as $f) { + foreach (\array_keys($fields) as $f) { $fieldElement = $fields[$f]->getVar('field_element'); + if (3 == $fieldElement) { + $fieldEditor = true; + } if (4 == $fieldElement) { - $fieldName = $fields[$f]->getVar('field_name'); - $rpFieldName = $this->getRightString($fieldName); - $ucfFieldName = ucfirst($rpFieldName); - $stuFieldName = mb_strtoupper($rpFieldName); - $ret .= $df->getDefine($language, 'EDITOR_' . $stuFieldName, 'Editor'); - $ret .= $df->getDefine($language, 'EDITOR_' . $stuFieldName . '_DESC', 'Select the Editor ' . $ucfFieldName . ' to use'); + $fieldEditor = true; + } + if (10 == $fieldElement) { + $fieldImage = true; } if (13 == $fieldElement) { $fieldImage = true; } - if (14 == $fieldElement) { + if (14 == $fieldElement) { $fieldFile = true; } } if (0 != $tables[$i]->getVar('table_tag')) { $useTag = true; } - // if (0 != $tables[$i]->getVar('table_permissions')) {$usePermissions = true;} } - $ret .= $df->getDefine($language, 'KEYWORDS', 'Keywords'); - $ret .= $df->getDefine($language, 'KEYWORDS_DESC', 'Insert here the keywords (separate by comma)'); - /*if (usePermissions) { - $ret .= $df->getDefine($language, "GROUPS", "Groups"); - $ret .= $df->getDefine($language, "GROUPS_DESC", "Groups to have permissions"); - $ret .= $df->getDefine($language, "ADMIN_GROUPS", "Admin Groups"); - $ret .= $df->getDefine($language, "ADMIN_GROUPS_DESC", "Admin Groups to have permissions access"); - }*/ + $ret .= $this->ld->getDefine($language, 'MDESC', 'Meta module description'); + $ret .= $this->ld->getDefine($language, 'MDESC_DESC', 'Insert here module description which should be shown in meta data description'); + $ret .= $this->ld->getDefine($language, 'KEYWORDS', 'Meta keywords'); + $ret .= $this->ld->getDefine($language, 'KEYWORDS_DESC', 'Insert here the keywords (separate by comma) which should be shown in meta data'); + + if ($fieldEditor) { + $ret .= $this->ld->getDefine($language, 'EDITOR_ADMIN', 'Editor admin'); + $ret .= $this->ld->getDefine($language, 'EDITOR_ADMIN_DESC', 'Select the editor which should be used in admin area for text area fields'); + $ret .= $this->ld->getDefine($language, 'EDITOR_USER', 'Editor user'); + $ret .= $this->ld->getDefine($language, 'EDITOR_USER_DESC', 'Select the editor which should be used in user area for text area fields'); + $ret .= $this->ld->getDefine($language, 'EDITOR_MAXCHAR', 'Text max characters'); + $ret .= $this->ld->getDefine($language, 'EDITOR_MAXCHAR_DESC', 'Max characters for showing text of a textarea or editor field as short version'); + } if ($fieldImage || $fieldFile) { - $ret .= $df->getDefine($language, 'SIZE_MB', 'MB'); + $ret .= $this->ld->getDefine($language, 'SIZE_MB', 'MB'); } if ($fieldImage) { - $ret .= $df->getDefine($language, 'MAXSIZE_IMAGE', 'Max size image'); - $ret .= $df->getDefine($language, 'MAXSIZE_IMAGE_DESC', 'Define the max size for uploading images'); - $ret .= $df->getDefine($language, 'MIMETYPES_IMAGE', 'Mime types image'); - $ret .= $df->getDefine($language, 'MIMETYPES_IMAGE_DESC', 'Define the allowed mime types for uploading images'); - $ret .= $df->getDefine($language, 'MAXWIDTH_IMAGE', 'Max width image'); - $ret .= $df->getDefine($language, 'MAXWIDTH_IMAGE_DESC', 'Set the max width which is allowed for uploading images (in pixel)
0 means that images keep original size
If original image is smaller the image will be not enlarged'); - $ret .= $df->getDefine($language, 'MAXHEIGHT_IMAGE', 'Max height image'); - $ret .= $df->getDefine($language, 'MAXHEIGHT_IMAGE_DESC', 'Set the max height which is allowed for uploading images (in pixel)
0 means that images keep original size
If original image is smaller the image will be not enlarged'); - //MB define + $ret .= $this->ld->getDefine($language, 'MAXSIZE_IMAGE', 'Max size image'); + $ret .= $this->ld->getDefine($language, 'MAXSIZE_IMAGE_DESC', 'Define the max size for uploading images'); + $ret .= $this->ld->getDefine($language, 'MIMETYPES_IMAGE', 'Mime types image'); + $ret .= $this->ld->getDefine($language, 'MIMETYPES_IMAGE_DESC', 'Define the allowed mime types for uploading images'); + $ret .= $this->ld->getDefine($language, 'MAXWIDTH_IMAGE', 'Max width image'); + $ret .= $this->ld->getDefine($language, 'MAXWIDTH_IMAGE_DESC', 'Set the max width to which uploaded images should be scaled (in pixel)
0 means, that images keeps the original size.
If an image is smaller than maximum value then the image will be not enlarge, it will be save in original width.'); + $ret .= $this->ld->getDefine($language, 'MAXHEIGHT_IMAGE', 'Max height image'); + $ret .= $this->ld->getDefine($language, 'MAXHEIGHT_IMAGE_DESC', 'Set the max height to which uploaded images should be scaled (in pixel)
0 means, that images keeps the original size.
If an image is smaller than maximum value then the image will be not enlarge, it will be save in original height'); } - if ($fieldFile) { - $ret .= $df->getDefine($language, 'MAXSIZE_FILE', 'Max size file'); - $ret .= $df->getDefine($language, 'MAXSIZE_FILE_DESC', 'Define the max size for uploading files'); - $ret .= $df->getDefine($language, 'MIMETYPES_FILE', 'Mime types file'); - $ret .= $df->getDefine($language, 'MIMETYPES_FILE_DESC', 'Define the allowed mime types for uploading files'); + if ($fieldFile) { + $ret .= $this->ld->getDefine($language, 'MAXSIZE_FILE', 'Max size file'); + $ret .= $this->ld->getDefine($language, 'MAXSIZE_FILE_DESC', 'Define the max size for uploading files'); + $ret .= $this->ld->getDefine($language, 'MIMETYPES_FILE', 'Mime types file'); + $ret .= $this->ld->getDefine($language, 'MIMETYPES_FILE_DESC', 'Define the allowed mime types for uploading files'); } if ($useTag) { - $ret .= $df->getDefine($language, 'USE_TAG', 'Use TAG'); - $ret .= $df->getDefine($language, 'USE_TAG_DESC', 'If you use tag module, check this option to yes'); + $ret .= $this->ld->getDefine($language, 'USE_TAG', 'Use TAG'); + $ret .= $this->ld->getDefine($language, 'USE_TAG_DESC', 'If you use tag module, check this option to yes'); } $getDefinesConf = [ - 'NUMB_COL' => 'Number Columns', - 'NUMB_COL_DESC' => 'Number Columns to View.', - 'DIVIDEBY' => 'Divide By', - 'DIVIDEBY_DESC' => 'Divide by columns number.', - 'TABLE_TYPE' => 'Table Type', - 'TABLE_TYPE_DESC' => 'Table Type is the bootstrap html table.', - 'PANEL_TYPE' => 'Panel Type', - 'PANEL_TYPE_DESC' => 'Panel Type is the bootstrap html div.', - 'IDPAYPAL' => 'Paypal ID', - 'IDPAYPAL_DESC' => 'Insert here your PayPal ID for donactions.', - 'ADVERTISE' => 'Advertisement Code', - 'ADVERTISE_DESC' => 'Insert here the advertisement code', - 'MAINTAINEDBY' => 'Maintained By', - 'MAINTAINEDBY_DESC' => 'Allow url of support site or community', - 'BOOKMARKS' => 'Social Bookmarks', - 'BOOKMARKS_DESC' => 'Show Social Bookmarks in the single page', - 'FACEBOOK_COMMENTS' => 'Facebook comments', - 'FACEBOOK_COMMENTS_DESC' => 'Allow Facebook comments in the single page', - 'DISQUS_COMMENTS' => 'Disqus comments', - 'DISQUS_COMMENTS_DESC' => 'Allow Disqus comments in the single page', + 'NUMB_COL' => 'Number Columns', + 'NUMB_COL_DESC' => 'Number Columns to View', + 'DIVIDEBY' => 'Divide By', + 'DIVIDEBY_DESC' => 'Divide by columns number', + 'TABLE_TYPE' => 'Table Type', + 'TABLE_TYPE_DESC' => 'Table Type is the bootstrap html table', + 'PANEL_TYPE' => 'Panel Type', + 'PANEL_TYPE_DESC' => 'Panel Type is the bootstrap html div', + 'IDPAYPAL' => 'Paypal ID', + 'IDPAYPAL_DESC' => 'Insert here your PayPal ID for donations', + 'SHOW_BREADCRUMBS' => 'Show breadcrumb navigation', + 'SHOW_BREADCRUMBS_DESC' => 'Show breadcrumb navigation which displays the current page in context within the site structure', + 'ADVERTISE' => 'Advertisement Code', + 'ADVERTISE_DESC' => 'Insert here the advertisement code', + 'MAINTAINEDBY' => 'Maintained By', + 'MAINTAINEDBY_DESC' => 'Allow url of support site or community', + 'BOOKMARKS' => 'Social Bookmarks', + 'BOOKMARKS_DESC' => 'Show Social Bookmarks in the single page', + //'FACEBOOK_COMMENTS' => 'Facebook comments', + //'FACEBOOK_COMMENTS_DESC' => 'Allow Facebook comments in the single page', + //'DISQUS_COMMENTS' => 'Disqus comments', + //'DISQUS_COMMENTS_DESC' => 'Allow Disqus comments in the single page', ]; foreach ($getDefinesConf as $defc => $descc) { - $ret .= $df->getDefine($language, $defc, $descc); + $ret .= $this->ld->getDefine($language, $defc, $descc); + } + + return $ret; + } + + /** + * @private function getLanguageNotificationsGlobal + * @param $language + * @param $tableBroken + * @param $tableComment + * @return string + */ + private function getLanguageNotificationsGlobal($language, $tableBroken, $tableComment) + { + $ret = $this->ld->getAboveDefines('Global notifications'); + $getDefinesNotif = [ + 'NOTIFY_GLOBAL' => 'Global notification', + 'NOTIFY_GLOBAL_NEW' => 'Any new item', + 'NOTIFY_GLOBAL_NEW_CAPTION' => 'Notify me about any new item', + 'NOTIFY_GLOBAL_NEW_SUBJECT' => 'Notification about new item', + 'NOTIFY_GLOBAL_MODIFY' => 'Any modified item', + 'NOTIFY_GLOBAL_MODIFY_CAPTION' => 'Notify me about any item modification', + 'NOTIFY_GLOBAL_MODIFY_SUBJECT' => 'Notification about modification', + 'NOTIFY_GLOBAL_DELETE' => 'Any deleted item', + 'NOTIFY_GLOBAL_DELETE_CAPTION' => 'Notify me about any deleted item', + 'NOTIFY_GLOBAL_DELETE_SUBJECT' => 'Notification about deleted item', + 'NOTIFY_GLOBAL_APPROVE' => 'Any item to approve', + 'NOTIFY_GLOBAL_APPROVE_CAPTION' => 'Notify me about any item waiting for approvement', + 'NOTIFY_GLOBAL_APPROVE_SUBJECT' => 'Notification about item waiting for approvement', + //'CATEGORY_NOTIFY' => 'Category notification', + //'CATEGORY_NOTIFY_DESC' => 'Category notification desc', + //'CATEGORY_NOTIFY_CAPTION' => 'Category notification caption', + //'CATEGORY_NOTIFY_SUBJECT' => 'Category notification Subject', + //'CATEGORY_SUBMIT_NOTIFY' => 'Category submit notification', + //'CATEGORY_SUBMIT_NOTIFY_CAPTION' => 'Category submit notification caption', + //'CATEGORY_SUBMIT_NOTIFY_DESC' => 'Category submit notification desc', + //'CATEGORY_SUBMIT_NOTIFY_SUBJECT' => 'Category submit notification subject', + ]; + if ($tableBroken) { + $getDefinesNotif['NOTIFY_GLOBAL_BROKEN'] = 'Any broken item'; + $getDefinesNotif['NOTIFY_GLOBAL_BROKEN_CAPTION'] = 'Notify me about any broken item'; + $getDefinesNotif['NOTIFY_GLOBAL_BROKEN_SUBJECT'] = 'Notification about broken item'; + } + if ($tableComment) { + $getDefinesNotif['NOTIFY_GLOBAL_COMMENT'] = 'Any comments'; + $getDefinesNotif['NOTIFY_GLOBAL_COMMENT_CAPTION'] = 'Notify me about any comment'; + $getDefinesNotif['NOTIFY_GLOBAL_COMMENT_SUBJECT'] = 'Notification about any comment'; + } + foreach ($getDefinesNotif as $defn => $descn) { + $ret .= $this->ld->getDefine($language, $defn, $descn); } return $ret; } /** - * @private function getLanguageNotifications + * @private function getLanguageNotificationsTable * @param $language + * @param $tableName * @param mixed $tableSoleName * + * @param $tableBroken + * @param $tableComment * @return string */ - private function getLanguageNotifications($language, $tableSoleName) + private function getLanguageNotificationsTable($language, $tableName, $tableSoleName, $tableBroken, $tableComment) { - $df = LanguageDefines::getInstance(); - $ret = $df->getAboveDefines('Notifications'); - $stuTableSoleName = mb_strtoupper($tableSoleName); - $ucfTableSoleName = ucfirst($tableSoleName); + $stuTableSoleName = \mb_strtoupper($tableSoleName); + $ucfTableSoleName = \ucfirst($tableSoleName); + $ret = $this->ld->getAboveDefines($ucfTableSoleName . ' notifications'); $getDefinesNotif = [ - 'GLOBAL_NOTIFY' => 'Global notify', - 'GLOBAL_NOTIFY_DESC' => 'Global notify desc', - 'GLOBAL_MODIFY_NOTIFY' => 'Global modify notify', - 'GLOBAL_MODIFY_NOTIFY_CAPTION' => 'Global modify notify caption', - 'GLOBAL_MODIFY_NOTIFY_DESC' => 'Global modify notify desc', - 'GLOBAL_MODIFY_NOTIFY_SUBJECT' => 'Global modify notify subject', - 'GLOBAL_BROKEN_NOTIFY' => 'Global broken notify', - 'GLOBAL_BROKEN_NOTIFY_CAPTION' => 'Global broken notify caption', - 'GLOBAL_BROKEN_NOTIFY_DESC' => 'Global broken notify desc', - 'GLOBAL_BROKEN_NOTIFY_SUBJECT' => 'Global broken notify subject', - 'GLOBAL_SUBMIT_NOTIFY' => 'Global submit notify', - 'GLOBAL_SUBMIT_NOTIFY_CAPTION' => 'Global submit notify caption', - 'GLOBAL_SUBMIT_NOTIFY_DESC' => 'Global submit notify desc', - 'GLOBAL_SUBMIT_NOTIFY_SUBJECT' => 'Global submit notify subject', - 'GLOBAL_NEW_NOTIFY' => 'Global new notify', - 'GLOBAL_NEW_NOTIFY_CAPTION' => 'Global new notify caption', - 'GLOBAL_NEW_NOTIFY_DESC' => 'Global new notify desc', - 'GLOBAL_NEW_NOTIFY_SUBJECT' => 'Global new notify subject', - 'CATEGORY_NOTIFY' => 'Category notify', - 'CATEGORY_NOTIFY_DESC' => 'Category notify desc', - 'CATEGORY_NOTIFY_CAPTION' => 'Category notify caption', - 'CATEGORY_NOTIFY_SUBJECT' => 'Category notify Subject', - 'CATEGORY_SUBMIT_NOTIFY' => 'Category submit notify', - 'CATEGORY_SUBMIT_NOTIFY_CAPTION' => 'Category submit notify caption', - 'CATEGORY_SUBMIT_NOTIFY_DESC' => 'Category submit notify desc', - 'CATEGORY_SUBMIT_NOTIFY_SUBJECT' => 'Category submit notify subject', - $stuTableSoleName . '_NOTIFY' => $ucfTableSoleName . ' notify', - $stuTableSoleName . '_NOTIFY_DESC' => $ucfTableSoleName . ' notify desc', - $stuTableSoleName . '_NOTIFY_CAPTION' => $ucfTableSoleName . ' notify caption', - $stuTableSoleName . '_NOTIFY_SUBJECT' => $ucfTableSoleName . ' notify subject', - 'GLOBAL_NEW_CATEGORY_NOTIFY' => 'Global newcategory notify', - 'GLOBAL_NEW_CATEGORY_NOTIFY_CAPTION' => 'Global newcategory notify caption', - 'GLOBAL_NEW_CATEGORY_NOTIFY_DESC' => 'Global newcategory notify desc', - 'GLOBAL_NEW_CATEGORY_NOTIFY_SUBJECT' => 'Global newcategory notify subject', - 'GLOBAL_' . $stuTableSoleName . '_MODIFY_NOTIFY' => 'Global ' . $tableSoleName . ' modify notify', - 'GLOBAL_' . $stuTableSoleName . '_MODIFY_NOTIFY_CAPTION' => 'Global ' . $tableSoleName . ' modify notify caption', - 'GLOBAL_' . $stuTableSoleName . '_MODIFY_NOTIFY_DESC' => 'Global ' . $tableSoleName . ' modify notify desc', - 'GLOBAL_' . $stuTableSoleName . '_MODIFY_NOTIFY_SUBJECT' => 'Global ' . $tableSoleName . ' modify notify subject', - 'GLOBAL_' . $stuTableSoleName . '_BROKEN_NOTIFY' => 'Global ' . $tableSoleName . ' broken notify', - 'GLOBAL_' . $stuTableSoleName . '_BROKEN_NOTIFY_CAPTION' => 'Global ' . $tableSoleName . ' broken notify caption', - 'GLOBAL_' . $stuTableSoleName . '_BROKEN_NOTIFY_DESC' => 'Global ' . $tableSoleName . ' broken notify desc', - 'GLOBAL_' . $stuTableSoleName . '_BROKEN_NOTIFY_SUBJECT' => 'Global ' . $tableSoleName . ' broken notify subject', - 'GLOBAL_' . $stuTableSoleName . '_SUBMIT_NOTIFY' => 'Global ' . $tableSoleName . ' submit notify', - 'GLOBAL_' . $stuTableSoleName . '_SUBMIT_NOTIFY_CAPTION' => 'Global ' . $tableSoleName . ' submit notify caption', - 'GLOBAL_' . $stuTableSoleName . '_SUBMIT_NOTIFY_DESC' => 'Global ' . $tableSoleName . ' submit notify desc', - 'GLOBAL_' . $stuTableSoleName . '_SUBMIT_NOTIFY_SUBJECT' => 'Global ' . $tableSoleName . ' submit notify subject', - 'GLOBAL_NEW_' . $stuTableSoleName . '_NOTIFY' => 'Global new ' . $tableSoleName . ' notify', - 'GLOBAL_NEW_' . $stuTableSoleName . '_NOTIFY_CAPTION' => 'Global new ' . $tableSoleName . ' notify caption', - 'GLOBAL_NEW_' . $stuTableSoleName . '_NOTIFY_DESC' => 'Global new ' . $tableSoleName . ' notify desc', - 'GLOBAL_NEW_' . $stuTableSoleName . '_NOTIFY_SUBJECT' => 'Global new ' . $tableSoleName . ' notify subject', - 'CATEGORY_' . $stuTableSoleName . '_SUBMIT_NOTIFY' => 'Category ' . $tableSoleName . ' submit notify', - 'CATEGORY_' . $stuTableSoleName . '_SUBMIT_NOTIFY_CAPTION' => 'Category ' . $tableSoleName . ' submit notify caption', - 'CATEGORY_' . $stuTableSoleName . '_SUBMIT_NOTIFY_DESC' => 'Category ' . $tableSoleName . ' submit notify desc', - 'CATEGORY_' . $stuTableSoleName . '_SUBMIT_NOTIFY_SUBJECT' => 'Category ' . $tableSoleName . ' submit notify subject', - 'CATEGORY_NEW_' . $stuTableSoleName . '_NOTIFY' => 'Category new ' . $tableSoleName . ' notify', - 'CATEGORY_NEW_' . $stuTableSoleName . '_NOTIFY_CAPTION' => 'Category new ' . $tableSoleName . ' notify caption', - 'CATEGORY_NEW_' . $stuTableSoleName . '_NOTIFY_DESC' => 'Category new ' . $tableSoleName . ' notify desc', - 'CATEGORY_NEW_' . $stuTableSoleName . '_NOTIFY_SUBJECT' => 'Category new ' . $tableSoleName . ' notify subject', - 'APPROVE_NOTIFY' => $ucfTableSoleName . ' approve notify', - 'APPROVE_NOTIFY_CAPTION' => $ucfTableSoleName . ' approve notify caption', - 'APPROVE_NOTIFY_DESC' => $ucfTableSoleName . ' approve notify desc', - 'APPROVE_NOTIFY_SUBJECT' => $ucfTableSoleName . ' approve notify subject', + 'NOTIFY_' . $stuTableSoleName => $ucfTableSoleName . ' notification', + 'NOTIFY_' . $stuTableSoleName . '_MODIFY' => "{$ucfTableSoleName} modification", + 'NOTIFY_' . $stuTableSoleName . '_MODIFY_CAPTION' => "Notify me about {$tableSoleName} modification", + 'NOTIFY_' . $stuTableSoleName . '_MODIFY_SUBJECT' => 'Notification about modification', + 'NOTIFY_' . $stuTableSoleName . '_DELETE' => "{$ucfTableSoleName} deleted", + 'NOTIFY_' . $stuTableSoleName . '_DELETE_CAPTION' => "Notify me about deleted {$tableName}", + 'NOTIFY_' . $stuTableSoleName . '_DELETE_SUBJECT' => "Notification delete {$tableSoleName}", + 'NOTIFY_' . $stuTableSoleName . '_APPROVE' => "{$ucfTableSoleName} approve", + 'NOTIFY_' . $stuTableSoleName . '_APPROVE_CAPTION' => "Notify me about {$tableName} waiting for approvement", + 'NOTIFY_' . $stuTableSoleName . '_APPROVE_SUBJECT' => "Notification {$tableSoleName} waiting for approvement", ]; + if (1 == $tableBroken) { + $getDefinesNotif['NOTIFY_' . $stuTableSoleName . '_BROKEN'] = "{$ucfTableSoleName} broken"; + $getDefinesNotif['NOTIFY_' . $stuTableSoleName . '_BROKEN_CAPTION'] = "Notify me about broken {$tableSoleName}"; + $getDefinesNotif['NOTIFY_' . $stuTableSoleName . '_BROKEN_SUBJECT'] = "Notification about broken {$tableSoleName}"; + } + if (1 == $tableComment) { + $getDefinesNotif['NOTIFY_' . $stuTableSoleName . '_COMMENT'] = "{$ucfTableSoleName} comment"; + $getDefinesNotif['NOTIFY_' . $stuTableSoleName . '_COMMENT_CAPTION'] = "Notify me about comments for {$tableSoleName}"; + $getDefinesNotif['NOTIFY_' . $stuTableSoleName . '_COMMENT_SUBJECT'] = "Notification about comments for {$tableSoleName}"; + } foreach ($getDefinesNotif as $defn => $descn) { - $ret .= $df->getDefine($language, $defn, $descn); + $ret .= $this->ld->getDefine($language, $defn, $descn); } return $ret; @@ -434,85 +464,123 @@ private function getLanguageNotifications($language, $tableSoleName) */ private function getLanguagePermissionsGroups($language) { - $df = LanguageDefines::getInstance(); - $ret = $df->getAboveDefines('Permissions Groups'); - $ret .= $df->getDefine($language, 'GROUPS', 'Groups access'); - $ret .= $df->getDefine($language, 'GROUPS_DESC', 'Select general access permission for groups.'); - $ret .= $df->getDefine($language, 'ADMIN_GROUPS', 'Admin Group Permissions'); - $ret .= $df->getDefine($language, 'ADMIN_GROUPS_DESC', 'Which groups have access to tools and permissions page'); - $ret .= $df->getDefine($language, 'UPLOAD_GROUPS', 'Upload Group Permissions'); - $ret .= $df->getDefine($language, 'UPLOAD_GROUPS_DESC', 'Which groups have permissions to upload files'); + $ret = $this->ld->getAboveDefines('Permissions Groups'); + $ret .= $this->ld->getDefine($language, 'GROUPS', 'Groups access'); + $ret .= $this->ld->getDefine($language, 'GROUPS_DESC', 'Select general access permission for groups.'); + $ret .= $this->ld->getDefine($language, 'ADMIN_GROUPS', 'Admin Group Permissions'); + $ret .= $this->ld->getDefine($language, 'ADMIN_GROUPS_DESC', 'Which groups have access to tools and permissions page'); + $ret .= $this->ld->getDefine($language, 'UPLOAD_GROUPS', 'Upload Group Permissions'); + $ret .= $this->ld->getDefine($language, 'UPLOAD_GROUPS_DESC', 'Which groups have permissions to upload files'); + + return $ret; + } + + /** + * @private function getLanguagePermissionsGroups + * @param $language + * + * @return string + */ + private function getLanguageRatingbars($language) + { + $ret = $this->ld->getAboveDefines('Rating bars'); + $ret .= $this->ld->getDefine($language, 'RATINGBAR_GROUPS', 'Groups with rating rights'); + $ret .= $this->ld->getDefine($language, 'RATINGBAR_GROUPS_DESC', 'Select groups which should have the right to rate'); + $ret .= $this->ld->getDefine($language, 'RATINGBARS', 'Allow rating'); + $ret .= $this->ld->getDefine($language, 'RATINGBARS_DESC', 'Define whether rating should be possible and which kind of rating should be used'); + $ret .= $this->ld->getDefine($language, 'RATING_NONE', 'Do not use rating'); + $ret .= $this->ld->getDefine($language, 'RATING_5STARS', 'Rating with 5 stars'); + $ret .= $this->ld->getDefine($language, 'RATING_10STARS', 'Rating with 10 stars'); + $ret .= $this->ld->getDefine($language, 'RATING_LIKES', 'Rating with likes and dislikes'); + $ret .= $this->ld->getDefine($language, 'RATING_10NUM', 'Rating with 10 points'); return $ret; } /** * @private function getFooter - * @param null + * * @return string */ private function getLanguageFooter() { - $df = LanguageDefines::getInstance(); - $ret = $df->getBelowDefines('End'); - $ret .= $df->getBlankLine(); + $ret = $this->ld->getBelowDefines('End'); + $ret .= $this->ld->getBlankLine(); return $ret; } /** * @public function render - * @param null - * @return bool|string + * + * @return string */ public function render() { $module = $this->getModule(); $tables = $this->getTableTables($module->getVar('mod_id')); + $filename = $this->getFileName(); + $moduleDirname = $module->getVar('mod_dirname'); + $language = $this->getLanguage($moduleDirname, 'MI', '', false); $tableAdmin = []; $tableUser = []; $tableSubmenu = []; $tableBlocks = []; $tableNotifications = []; $tablePermissions = []; - $tableSoleName = ''; - foreach (array_keys($tables) as $t) { + $notifTable = ''; + $tableBrokens = []; + $tableComments = []; + $tableRate = []; + foreach (\array_keys($tables) as $t) { + $tableName = $tables[$t]->getVar('table_name'); $tableSoleName = $tables[$t]->getVar('table_solename'); $tableAdmin[] = $tables[$t]->getVar('table_admin'); $tableUser[] = $tables[$t]->getVar('table_user'); $tableSubmenu[] = $tables[$t]->getVar('table_submenu'); $tableBlocks[] = $tables[$t]->getVar('table_blocks'); $tableNotifications[] = $tables[$t]->getVar('table_notifications'); + $tableBroken = $tables[$t]->getVar('table_broken'); + $tableBrokens[] = $tables[$t]->getVar('table_broken'); + $tableComment = $tables[$t]->getVar('table_comments'); + $tableComments[] = $tables[$t]->getVar('table_comments'); + $tableRate[] = $tables[$t]->getVar('table_rate'); $tablePermissions[] = $tables[$t]->getVar('table_permissions'); + if (1 === (int)$tables[$t]->getVar('table_notifications')) { + $notifTable .= $this->getLanguageNotificationsTable($language, $tableName, $tableSoleName, $tableBroken, $tableComment); + } } - $filename = $this->getFileName(); - $moduleDirname = $module->getVar('mod_dirname'); - $language = $this->getLanguage($moduleDirname, 'MI'); - $content = $this->getHeaderFilesComments($module); - $content .= $this->getLanguageMain($language, $module); - $content .= $this->getLanguageMenu($module, $language); - if (in_array(1, $tableAdmin)) { + + $content = $this->getHeaderFilesComments($module); + $content .= $this->getLanguageMain($language, $module); + $content .= $this->getLanguageMenu($module, $language); + if (\in_array(1, $tableAdmin)) { $content .= $this->getLanguageAdmin($language); } - if (in_array(1, $tableUser)) { + if (\in_array(1, $tableUser)) { $content .= $this->getLanguageUser($language); } - if (in_array(1, $tableSubmenu)) { + if (\in_array(1, $tableSubmenu)) { $content .= $this->getLanguageSubmenu($language, $tables); } - //if (in_array(1, $tableBlocks)) { - $content .= $this->getLanguageBlocks($tables, $language); - //} + if (\in_array(1, $tableRate)) { + $content .= $this->getLanguageRatingbars($language); + } + + if (\in_array(1, $tableBlocks)) { + $content .= $this->getLanguageBlocks($tables, $language); + } $content .= $this->getLanguageConfig($language, $tables); - if (in_array(1, $tableNotifications)) { - $content .= $this->getLanguageNotifications($language, $tableSoleName); + if (\in_array(1, $tableNotifications)) { + $content .= $this->getLanguageNotificationsGlobal($language, \in_array(1, $tableBrokens, true), \in_array(1, $tableComments)); + $content .= $notifTable; } - if (in_array(1, $tablePermissions)) { + if (\in_array(1, $tablePermissions)) { $content .= $this->getLanguagePermissionsGroups($language); } $content .= $this->getLanguageFooter(); - $this->create($moduleDirname, 'language/' . $GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'language/' . $GLOBALS['xoopsConfig']['language'], $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/Language/index.php b/class/Files/Language/index.php new file mode 100644 index 00000000..e5ee0725 --- /dev/null +++ b/class/Files/Language/index.php @@ -0,0 +1,2 @@ +setModule($module); $this->setFileName($filename); @@ -89,7 +86,7 @@ private function getHeaderSqlComments($moduleName) $arrayServerInfo = [ "# SQL Dump for {$moduleName} module", '# PhpMyAdmin Version: 4.0.4', - '# http://www.phpmyadmin.net', + '# https://www.phpmyadmin.net', '#', "# Host: {$serverName}", "# Generated on: {$date} to {$time}", @@ -113,7 +110,7 @@ private function getHeaderSqlComments($moduleName) * * @return string */ - private function getHeadDatabaseTable($moduleDirname, $tableName, $fieldsNumb) + private function getHeadDatabaseTable($moduleDirname, $tableName, int $fieldsNumb) { $ret = null; $arrayDbTable = [ @@ -138,16 +135,29 @@ private function getHeadDatabaseTable($moduleDirname, $tableName, $fieldsNumb) */ private function getDatabaseTables($module) { - $ret = null; - $moduleDirname = mb_strtolower($module->getVar('mod_dirname')); - $tables = $this->getTableTables($module->getVar('mod_id'), 'table_order ASC, table_id'); - foreach (array_keys($tables) as $t) { + $ret = null; + $moduleDirname = \mb_strtolower($module->getVar('mod_dirname')); + $tables = $this->getTableTables($module->getVar('mod_id'), 'table_order ASC, table_id'); + $tableMid = 0; + $tableId = 0; + $tableName = 0; + $tableAutoincrement = 0; + $fieldsNumb = 0; + $tableRate = 0; + foreach (\array_keys($tables) as $t) { $tableId = $tables[$t]->getVar('table_id'); $tableMid = $tables[$t]->getVar('table_mid'); $tableName = $tables[$t]->getVar('table_name'); $tableAutoincrement = $tables[$t]->getVar('table_autoincrement'); - $fieldsNumb = $tables[$t]->getVar('table_nbfields'); - $ret .= $this->getDatabaseFields($moduleDirname, $tableMid, $tableId, $tableName, $tableAutoincrement, $fieldsNumb); + $fieldsNumb = (int)$tables[$t]->getVar('table_nbfields'); + if (1 === (int)$tables[$t]->getVar('table_rate')) { + $tableRate = 1; + } + $ret .= $this->getDatabaseFields($moduleDirname, $tableMid, $tableId, $tableName, $tableAutoincrement, $fieldsNumb); + } + + if (1 === $tableRate) { + $ret .= $this->getTableRatings($moduleDirname); } return $ret; @@ -166,23 +176,29 @@ private function getDatabaseTables($module) */ private function getDatabaseFields($moduleDirname, $tableMid, $tableId, $tableName, $tableAutoincrement, $fieldsNumb) { - $helper = Tdmcreate\Helper::getInstance(); - $ret = null; - $j = 0; - $comma = []; - $row = []; - //$type = ''; + $helper = Modulebuilder\Helper::getInstance(); + $ret = null; + $j = 0; + $comma = []; + $row = []; + $lenMax = 0; $fieldTypeName = ''; - $fields = $this->getTableFields($tableMid, $tableId, 'field_id ASC, field_name'); - foreach (array_keys($fields) as $f) { + $fields = $this->getTableFields($tableMid, $tableId); + //get max length + foreach (\array_keys($fields) as $f) { + $len = \mb_strlen($fields[$f]->getVar('field_name')); + $lenMax = max($len, $lenMax); + } + //create + foreach (\array_keys($fields) as $f) { // Creation of database table $ret = $this->getHeadDatabaseTable($moduleDirname, $tableName, $fieldsNumb); $fieldName = $fields[$f]->getVar('field_name'); $fieldType = $fields[$f]->getVar('field_type'); - $fieldValue = $fields[$f]->getVar('field_value'); + $fieldValue = \str_replace(''', '', $fields[$f]->getVar('field_value')); //remove single quotes $fieldAttribute = $fields[$f]->getVar('field_attribute'); $fieldNull = $fields[$f]->getVar('field_null'); - $fieldDefault = $fields[$f]->getVar('field_default'); + $fieldDefault = \str_replace(''', '', $fields[$f]->getVar('field_default')); //remove single quotes $fieldKey = $fields[$f]->getVar('field_key'); if ($fieldType > 1) { $fType = $helper->getHandler('Fieldtype')->get($fieldType); @@ -220,14 +236,14 @@ private function getDatabaseFields($moduleDirname, $tableMid, $tableId, $tableNa case 8: $type = $fieldTypeName . '(' . $fieldValue . ')'; if (empty($fieldDefault)) { - $default = "DEFAULT '0.00'"; // From MySQL 5.7 Manual + $default = "DEFAULT '0'"; // From MySQL 5.7 Manual } else { $default = "DEFAULT '{$fieldDefault}'"; } break; case 9: case 10: - $fValues = str_replace(',', "', '", str_replace(' ', '', $fieldValue)); + $fValues = \str_replace(',', "', '", \str_replace(' ', '', $fieldValue)); $type = $fieldTypeName . '(\'' . $fValues . '\')'; // Used with comma separator $default = "DEFAULT '{$fieldDefault}'"; break; @@ -242,16 +258,11 @@ private function getDatabaseFields($moduleDirname, $tableMid, $tableId, $tableNa case 12: $type = $fieldTypeName . '(' . $fieldValue . ')'; if (empty($fieldDefault)) { - $default = "DEFAULT 'http:\\'"; + $default = "DEFAULT 'https:\\'"; } else { $default = "DEFAULT '{$fieldDefault}'"; } break; - case 13: - case 14: - $type = $fieldTypeName . '(' . $fieldValue . ')'; - $default = "DEFAULT '{$fieldDefault}'"; - break; case 15: case 16: case 17: @@ -259,13 +270,6 @@ private function getDatabaseFields($moduleDirname, $tableMid, $tableId, $tableNa $type = $fieldTypeName; $default = null; break; - case 19: - case 20: - case 21: - case 22: - $type = $fieldTypeName . '(' . $fieldValue . ')'; - $default = "DEFAULT '{$fieldDefault}'"; - break; case 23: $type = $fieldTypeName; if (empty($fieldDefault)) { @@ -274,45 +278,48 @@ private function getDatabaseFields($moduleDirname, $tableMid, $tableId, $tableNa $default = "DEFAULT '{$fieldDefault}'"; } break; + case 13: + case 14: + case 22: default: $type = $fieldTypeName . '(' . $fieldValue . ')'; $default = "DEFAULT '{$fieldDefault}'"; break; } if ((0 == $f) && (1 == $tableAutoincrement)) { - $row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, null, 'AUTO_INCREMENT'); + $row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, null, 'AUTO_INCREMENT', $lenMax); $comma[$j] = $this->getKey(2, $fieldName); ++$j; } elseif ((0 == $f) && (0 == $tableAutoincrement)) { - $row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default); + $row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default, null, $lenMax); $comma[$j] = $this->getKey(2, $fieldName); ++$j; } else { if (3 == $fieldKey || 4 == $fieldKey || 5 == $fieldKey || 6 == $fieldKey) { switch ($fieldKey) { case 3: - $row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default); + $row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default, null, $lenMax); $comma[$j] = $this->getKey(3, $fieldName); ++$j; break; case 4: - $row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default); + $row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default, null, $lenMax); $comma[$j] = $this->getKey(4, $fieldName); ++$j; break; case 5: - $row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default); + $row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default, null, $lenMax); $comma[$j] = $this->getKey(5, $fieldName); ++$j; break; case 6: - $row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default); + $row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default, null, $lenMax); $comma[$j] = $this->getKey(6, $fieldName); ++$j; break; } } else { - $row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default); + $row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default, null, $lenMax); } } } @@ -326,7 +333,7 @@ private function getDatabaseFields($moduleDirname, $tableMid, $tableId, $tableNa } } // ================= COMMA CICLE ================= // - $ret .= implode("\n", $row); + $ret .= \implode("\n", $row); unset($j); $ret .= $this->getFootDatabaseTable(); @@ -334,9 +341,32 @@ private function getDatabaseFields($moduleDirname, $tableMid, $tableId, $tableNa } /** - * @private function getFootDatabaseTable + * @private function getDatabaseFields * - * @param null + * @param $moduleDirname + * @return null|string + */ + private function getTableRatings($moduleDirname) + { + $row = []; + $ret = $this->getHeadDatabaseTable($moduleDirname, 'ratings', 6); + $row[] = $this->getFieldRow('rate_id', 'INT(8)', 'UNSIGNED', 'NOT NULL', null, 'AUTO_INCREMENT'); + $row[] = $this->getFieldRow('rate_itemid', 'INT(8)', null, 'NOT NULL', "DEFAULT '0'"); + $row[] = $this->getFieldRow('rate_source', 'INT(8)', null, 'NOT NULL', "DEFAULT '0'"); + $row[] = $this->getFieldRow('rate_value', 'INT(1)', null, 'NOT NULL', "DEFAULT '0'"); + $row[] = $this->getFieldRow('rate_uid', 'INT(8)', null, 'NOT NULL', "DEFAULT '0'"); + $row[] = $this->getFieldRow('rate_ip', 'VARCHAR(60)', null, 'NOT NULL', "DEFAULT ''"); + $row[] = $this->getFieldRow('rate_date', 'INT(8)', null, 'NOT NULL', "DEFAULT '0'"); + $row[] = $this->getKey(2, 'rate_id'); + + $ret .= \implode("\n", $row); + $ret .= $this->getFootDatabaseTable(); + + return $ret; + } + + /** + * @private function getFootDatabaseTable * * @return string */ @@ -354,15 +384,24 @@ private function getFootDatabaseTable() * @param $fieldNull * @param $fieldDefault * @param $autoincrement + * @param int $lenMax * * @return string */ - private function getFieldRow($fieldName, $fieldTypeValue, $fieldAttribute = null, $fieldNull = null, $fieldDefault = null, $autoincrement = null) + private function getFieldRow($fieldName, $fieldTypeValue, $fieldAttribute = null, $fieldNull = null, $fieldDefault = null, $autoincrement = null, int $lenMax = 0) { - $retAutoincrement = " `{$fieldName}` {$fieldTypeValue} {$fieldAttribute} {$fieldNull} {$autoincrement},"; - $retFieldAttribute = " `{$fieldName}` {$fieldTypeValue} {$fieldAttribute} {$fieldNull} {$fieldDefault},"; - $fieldDefault = " `{$fieldName}` {$fieldTypeValue} {$fieldNull} {$fieldDefault},"; - $retShort = " `{$fieldName}` {$fieldTypeValue},"; + $fieldNameMax = " `{$fieldName}`"; + if ($lenMax > 0) { + $fieldNameMax .= \str_repeat(' ', $lenMax - \strlen($fieldName)); + } + $fieldTypeValueMax = $fieldTypeValue; + if (\strlen($fieldTypeValue) < 15) { + $fieldTypeValueMax .= \str_repeat(' ', 15 - \strlen($fieldTypeValue)); + } + $retAutoincrement = $fieldNameMax . " {$fieldTypeValueMax} {$fieldAttribute} {$fieldNull} {$autoincrement},"; + $retFieldAttribute = $fieldNameMax . " {$fieldTypeValueMax} {$fieldAttribute} {$fieldNull} {$fieldDefault},"; + $fieldDefault = $fieldNameMax . " {$fieldTypeValueMax} {$fieldNull} {$fieldDefault},"; + $retShort = $fieldNameMax . " {$fieldTypeValueMax},"; $ret = $retShort; if (null != $autoincrement) { @@ -407,36 +446,21 @@ private function getKey($key, $fieldName) return $ret; } - /** - * @private function getComma - * - * @param $row - * @param $comma - * - * @return string - */ - private function getComma($row, $comma = null) - { - return " {$row}{$comma}"; - } - /** * @public function render * - * @param null - * - * @return bool|string + * @return string */ public function render() { $module = $this->getModule(); $filename = $this->getFileName(); - $moduleName = mb_strtolower($module->getVar('mod_name')); - $moduleDirname = mb_strtolower($module->getVar('mod_dirname')); + $moduleName = \mb_strtolower($module->getVar('mod_name')); + $moduleDirname = \mb_strtolower($module->getVar('mod_dirname')); $content = $this->getHeaderSqlComments($moduleName); $content .= $this->getDatabaseTables($module); - $this->create($moduleDirname, 'sql', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'sql', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/Sql/index.php b/class/Files/Sql/index.php new file mode 100644 index 00000000..e5ee0725 --- /dev/null +++ b/class/Files/Sql/index.php @@ -0,0 +1,2 @@ +hc = Modulebuilder\Files\CreateHtmlCode::getInstance(); + $this->sc = Modulebuilder\Files\CreateSmartyCode::getInstance(); } /** @@ -59,7 +69,7 @@ public static function getInstance() * @param $module * @param $filename */ - public function write($module, $filename) + public function write($module, $filename): void { $this->setModule($module); $this->setFileName($filename); @@ -67,25 +77,23 @@ public function write($module, $filename) /** * @public function render - * @param null - * @return bool|string + * + * @return string */ public function render() { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); $module = $this->getModule(); $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); - $content = $hc->getHtmlComment('Header') . PHP_EOL; - $content .= $sc->getSmartyIncludeFile($moduleDirname, 'header', true, true) . PHP_EOL; - $content .= $hc->getHtmlComment('About Page') . PHP_EOL; - $single = $sc->getSmartySingleVar('about'); - $content .= $hc->getHtmlTag('div', ['class' => 'top'], $single) . PHP_EOL; - $content .= $hc->getHtmlComment('Footer') . PHP_EOL; - $content .= $sc->getSmartyIncludeFile($moduleDirname, 'footer', true, true); + $content = $this->hc->getHtmlComment('Header', '', "\n"); + $content .= $this->sc->getSmartyIncludeFile($moduleDirname, 'header', true) . PHP_EOL; + $content .= $this->hc->getHtmlComment('About Page', '', "\n"); + $single = $this->sc->getSmartySingleVar('about'); + $content .= $this->hc->getHtmlTag('div', ['class' => 'top'], $single) . PHP_EOL; + $content .= $this->hc->getHtmlComment('Footer', '', "\n"); + $content .= $this->sc->getSmartyIncludeFile($moduleDirname, 'footer', true); - $this->create($moduleDirname, 'templates/admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'templates/admin', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/Templates/Admin/TemplatesAdminBroken.php b/class/Files/Templates/Admin/TemplatesAdminBroken.php new file mode 100644 index 00000000..404892d7 --- /dev/null +++ b/class/Files/Templates/Admin/TemplatesAdminBroken.php @@ -0,0 +1,233 @@ +hc = Modulebuilder\Files\CreateHtmlCode::getInstance(); + $this->sc = Modulebuilder\Files\CreateSmartyCode::getInstance(); + } + + /** + * @static function getInstance + * + * @return TemplatesAdminBroken + */ + public static function getInstance() + { + static $instance = false; + if (!$instance) { + $instance = new self(); + } + + return $instance; + } + + /** + * @public function write + * @param $module + * @param $tables + * @param $filename + */ + public function write($module, $tables, $filename): void + { + $this->setModule($module); + $this->setTables($tables); + $this->setFileName($filename); + } + + /** + * @private function getTemplatesAdminBrokenHeader + * @param string $moduleDirname + * @return string + */ + private function getTemplatesAdminBrokenHeader(string $moduleDirname) + { + $ret = $this->hc->getHtmlComment('Header', '', "\n"); + $ret .= $this->sc->getSmartyIncludeFile($moduleDirname, 'header', true, '', "\n\n"); + + return $ret; + } + + /** + * @private function getTemplatesAdminBrokenTableThead + * @param string $language + * @return string + */ + private function getTemplatesAdminBrokenTableThead(string $language) + { + $th = ''; + $lang = $this->sc->getSmartyConst($language, 'BROKEN_TABLE'); + $th .= $this->hc->getHtmlTableHead($lang, 'center', '', "\t\t\t\t"); + $lang = $this->sc->getSmartyConst($language, 'BROKEN_MAIN'); + $th .= $this->hc->getHtmlTableHead($lang, 'center', '', "\t\t\t\t"); + $lang = $this->sc->getSmartyConst($language, 'FORM_ACTION'); + $th .= $this->hc->getHtmlTableHead($lang, 'center width5', '', "\t\t\t\t"); + $tr = $this->hc->getHtmlTableRow($th, 'head', "\t\t" . "\t"); + return $this->hc->getHtmlTableThead($tr, '', "\t\t"); + } + + /** + * @private function getTemplatesAdminBrokenTableTBody + * @param string $tableName + * @param $tableSoleName + * @return string + * @internal param string $language + */ + private function getTemplatesAdminBrokenTableTBody(string $tableName, $tableSoleName) + { + $td = ''; + $doubleKey = $this->sc->getSmartyDoubleVar($tableSoleName, 'key', '', '', "''", "'htmlattr'"); + $doubleVal = $this->sc->getSmartyDoubleVar($tableSoleName, 'keyval', '', '', "''", "'htmlattr'"); + + $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'table', '', '', "''", "'html'"); + $td .= $this->hc->getHtmlTableData($double, 'center', '', "\t\t\t\t"); + $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'main', '', '', "''", "'html'"); + $td .= $this->hc->getHtmlTableData($double, 'center', '', "\t\t\t\t"); + $lang = $this->sc->getSmartyConst('', '_EDIT'); + $src = $this->sc->getSmartyNoSimbol("xoModuleIcons16 'edit.png'"); + $img = $this->hc->getHtmlImage($src, $tableName); + $anchor = $this->hc->getHtmlAnchor($tableName . ".php?op=edit&{$doubleKey}=" . $doubleVal, $img, $lang, '', '', '', "\t\t" . "\t\t\t", "\n"); + $lang = $this->sc->getSmartyConst('', '_DELETE'); + $src = $this->sc->getSmartyNoSimbol("xoModuleIcons16 'delete.png'"); + $img = $this->hc->getHtmlImage($src, $tableName); + $anchor .= $this->hc->getHtmlAnchor($tableName . ".php?op=delete&{$doubleKey}=" . $doubleVal, $img, $lang, '', '', '', "\t\t" . "\t\t\t", "\n"); + $td .= $this->hc->getHtmlTableData($anchor, 'center width5', '', "\t\t\t\t", "\n", true); + $cycle = $this->sc->getSmartyNoSimbol('cycle values=\'odd, even\''); + $tr = $this->hc->getHtmlTableRow($td, $cycle, "\t\t" . "\t"); + $foreach = $this->sc->getSmartyForeach($tableSoleName, $tableName . '_list', $tr, '', '', "\t\t" . "\t"); + return $this->hc->getHtmlTableTbody($foreach, '', "\t\t"); + } + + /** + * @private function getTemplatesAdminBrokenTable + * @param string $tableName + * @param $tableSoleName + * @param string $language + * @return string + */ + private function getTemplatesAdminBrokenTable(string $tableName, $tableSoleName, string $language) + { + $tbody = $this->getTemplatesAdminBrokenTableThead($language); + $tbody .= $this->getTemplatesAdminBrokenTableTBody($tableName, $tableSoleName); + return $this->hc->getHtmlTable($tbody, 'outer', "\t"); + } + + /** + * @private function getTemplatesAdminBrokenList + * @param $table + * @param string $language + * @param string $t + * @return string + */ + private function getTemplatesAdminBrokenList($table, string $language, string $t = '') + { + $tableName = $table->getVar('table_name'); + $tableSoleName = $table->getVar('table_solename'); + $ucfTableName = \ucfirst($tableName); + $double = $this->sc->getSmartySingleVar($tableName . '_result'); + $ret = $this->hc->getHtmlHNumb($double, '3'); + $htmlTable = $this->getTemplatesAdminBrokenTable($tableName, $tableSoleName, $language); + $htmlTable .= $this->hc->getHtmlDiv(' ', 'clear', $t, "\n", false); + $single = $this->sc->getSmartySingleVar('pagenav_' . $tableName, '', '', ''); + $div = $this->hc->getHtmlDiv($single, 'xo-pagenav floatright', $t . "\t", "\n", false); + $div .= $this->hc->getHtmlDiv('', 'clear spacer', $t . "\t", "\n", false); + $htmlTable .= $this->sc->getSmartyConditions('pagenav_' . $tableName, '', '', $div, '', '', '', $t); + $noData = $this->sc->getSmartySingleVar('nodata' . $ucfTableName, $t . "\t\t"); + $src = $this->sc->getSmartyNoSimbol("xoModuleIcons32 'button_ok.png'"); + $noData .= $this->hc->getHtmlImage($src, $tableName, '', '', "\n"); + $div = $this->hc->getHtmlDiv($noData, '', $t . "\t"); + $div .= $this->hc->getHtmlDiv('', 'clear spacer', $t . "\t", "\n", false); + $div .= $this->hc->getHtmlBr(2, '', $t . "\t"); + $contElse = $this->sc->getSmartyConditions('nodata' . $ucfTableName, '', '', $div, false, '', '', $t); + $ret .= $this->sc->getSmartyConditions($tableName . '_count', '', '', $htmlTable, $contElse); + $ret .= $this->hc->getHtmlBr(3); + + return $ret; + } + + /** + * @private function getTemplatesAdminBrokenFooter + * @param string $moduleDirname + * @return string + */ + private function getTemplatesAdminBrokenFooter(string $moduleDirname) + { + $single = $this->sc->getSmartySingleVar('error'); + $strong = $this->hc->getHtmlTag('strong', [], $single, false, '', ''); + $div = $this->hc->getHtmlDiv($strong, 'errorMsg', "\t"); + $ret = $this->sc->getSmartyConditions('error', '', '', $div); + $ret .= $this->hc->getHtmlEmpty('', '', "\n"); + $ret .= $this->hc->getHtmlComment('Footer', '', "\n"); + $ret .= $this->sc->getSmartyIncludeFile($moduleDirname, 'footer', true); + + return $ret; + } + + /** + * @public function render + * + * @return string + */ + public function render() + { + $module = $this->getModule(); + $tables = $this->getTables(); + $filename = $this->getFileName(); + $moduleDirname = $module->getVar('mod_dirname'); + $language = $this->getLanguage($moduleDirname, 'AM', '', false); + $content = $this->getTemplatesAdminBrokenHeader($moduleDirname); + foreach ($tables as $table) { + if (1 === (int)$table->getVar('table_broken')) { + $content .= $this->getTemplatesAdminBrokenList($table, $language, "\t"); + } + } + $content .= $this->getTemplatesAdminBrokenFooter($moduleDirname); + + $this->create($moduleDirname, 'templates/admin', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); + + return $this->renderFile(); + } +} diff --git a/class/Files/Templates/Admin/TemplatesAdminFooter.php b/class/Files/Templates/Admin/TemplatesAdminFooter.php index bc70e4b6..b8b99325 100644 --- a/class/Files/Templates/Admin/TemplatesAdminFooter.php +++ b/class/Files/Templates/Admin/TemplatesAdminFooter.php @@ -1,9 +1,9 @@ -hc = Modulebuilder\Files\CreateHtmlCode::getInstance(); + $this->sc = Modulebuilder\Files\CreateSmartyCode::getInstance(); } /** @@ -56,10 +66,10 @@ public static function getInstance() /** * @public function write - * @param string $module + * @param $module * @param string $filename */ - public function write($module, $filename) + public function write($module, string $filename): void { $this->setModule($module); $this->setFileName($filename); @@ -67,29 +77,27 @@ public function write($module, $filename) /** * @public function render - * @param null - * @return bool|string + * + * @return string */ public function render() { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); $module = $this->getModule(); $filename = $this->getFileName(); $moduleName = $module->getVar('mod_name'); $moduleDirname = $module->getVar('mod_dirname'); $supportName = $module->getVar('mod_support_name'); - $language = $this->getLanguage($moduleDirname, 'AM'); - $singleNoVar = $sc->getSmartyNoSimbol('xoModuleIcons32 xoopsmicrobutton.gif'); - $img = $hc->getHtmlTag('img', ['src' => $singleNoVar, 'alt' => 'XOOPS'], '', true, '',''); - $anchor = $hc->getHtmlTag('a', ['href' => 'https://xoops.org/', 'title' => 'Visit XOOPS', 'target' => '_blank'], $img) ; - $content = $hc->getHtmlTag('div', ['class' => 'center'], "\n\t" . $anchor); - $tree = $hc->getHtmlTag('strong', [], $moduleName, false, '', ''); - $tree .= $sc->getSmartyConst($language, 'MAINTAINEDBY'); - $tree .= $hc->getHtmlTag('a', ['href' => '<{$maintainedby}>', 'title' => 'Visit ' . $supportName, 'class' => 'tooltip', 'rel' => 'external'], $supportName); - $content .= $hc->getHtmlTag('div', ['class' => 'center smallsmall italic pad5'], "\n\t" . $tree); + $language = $this->getLanguage($moduleDirname, 'AM', '', false); + $singleNoVar = $this->sc->getSmartyNoSimbol("xoModuleIcons32 'xoopsmicrobutton.gif'"); + $img = $this->hc->getHtmlTag('img', ['src' => $singleNoVar, 'alt' => 'XOOPS'], '', true, '', ''); + $anchor = $this->hc->getHtmlTag('a', ['href' => 'https://xoops.org/', 'title' => 'Visit XOOPS', 'target' => '_blank', 'rel' => 'noopener noreferrer'], $img); + $content = $this->hc->getHtmlTag('div', ['class' => 'center'], "\n\t" . $anchor); + $tree = $this->hc->getHtmlTag('strong', [], $moduleName, false, '', ''); + $tree .= $this->sc->getSmartyConst($language, 'MAINTAINEDBY'); + $tree .= $this->hc->getHtmlTag('a', ['href' => '<{$maintainedby|default:\'#\'|escape:\'htmlattr\'}>', 'title' => 'Visit ' . $supportName, 'class' => 'tooltip', 'rel' => 'external'], $supportName); + $content .= $this->hc->getHtmlTag('div', ['class' => 'center smallsmall italic pad5'], "\n\t" . $tree); - $this->create($moduleDirname, 'templates/admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'templates/admin', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/Templates/Admin/TemplatesAdminHeader.php b/class/Files/Templates/Admin/TemplatesAdminHeader.php index 74a92b81..c3894506 100644 --- a/class/Files/Templates/Admin/TemplatesAdminHeader.php +++ b/class/Files/Templates/Admin/TemplatesAdminHeader.php @@ -1,9 +1,9 @@ -hc = Modulebuilder\Files\CreateHtmlCode::getInstance(); + $this->sc = Modulebuilder\Files\CreateSmartyCode::getInstance(); } /** @@ -56,10 +66,10 @@ public static function getInstance() /** * @public function write - * @param string $module + * @param $module * @param string $filename */ - public function write($module, $filename) + public function write($module, string $filename): void { $this->setModule($module); $this->setFileName($filename); @@ -67,25 +77,23 @@ public function write($module, $filename) /** * @public function render - * @param null - * @return bool|string + * + * @return string */ public function render() { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); $module = $this->getModule(); $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); - $navigation = $sc->getSmartySingleVar('navigation'); - $due = $hc->getHtmlSpan($navigation, 'left', "\t") ; - $buttons = $sc->getSmartySingleVar('buttons'); - $right = $hc->getHtmlSpan($buttons, 'left', "\t\t", "\n"); - $due .= $sc->getSmartyConditions('buttons', '', '', $right, '', '', '', "\t", "\n"); - $content = $hc->getHtmlDiv($due, 'top'); + $navigation = $this->sc->getSmartySingleVar('navigation'); + $due = $this->hc->getHtmlSpan($navigation, 'left', "\t"); + $buttons = $this->sc->getSmartySingleVar('buttons'); + $right = $this->hc->getHtmlSpan($buttons, 'left', "\t\t"); + $due .= $this->sc->getSmartyConditions('buttons', '', '', $right, '', '', '', "\t"); + $content = $this->hc->getHtmlDiv($due, 'top'); - $this->create($moduleDirname, 'templates/admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'templates/admin', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/Templates/Admin/TemplatesAdminIndex.php b/class/Files/Templates/Admin/TemplatesAdminIndex.php index ac557047..c90934e7 100644 --- a/class/Files/Templates/Admin/TemplatesAdminIndex.php +++ b/class/Files/Templates/Admin/TemplatesAdminIndex.php @@ -1,9 +1,9 @@ -hc = Modulebuilder\Files\CreateHtmlCode::getInstance(); + $this->sc = Modulebuilder\Files\CreateSmartyCode::getInstance(); } /** @@ -56,10 +66,10 @@ public static function getInstance() /** * @public function write - * @param string $module + * @param $module * @param string $filename */ - public function write($module, $filename) + public function write($module, string $filename): void { $this->setModule($module); $this->setFileName($filename); @@ -67,26 +77,24 @@ public function write($module, $filename) /** * @public function render - * @param null - * @return bool|string + * + * @return string */ public function render() { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); $module = $this->getModule(); $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); - $content = $hc->getHtmlComment('Header') . PHP_EOL; - $content .= $sc->getSmartyIncludeFile($moduleDirname, 'header', true, true) . PHP_EOL; - $content .= $hc->getHtmlComment('Index Page') . PHP_EOL; - $single = $sc->getSmartySingleVar('index'); - $content .= $hc->getHtmlTag('div', ['class' => 'top'], $single) . PHP_EOL; - $content .= $hc->getHtmlComment('Footer') . PHP_EOL; - $content .= $sc->getSmartyIncludeFile($moduleDirname, 'footer', true, true); + $content = $this->hc->getHtmlComment('Header', '', "\n"); + $content .= $this->sc->getSmartyIncludeFile($moduleDirname, 'header', true) . PHP_EOL; + $content .= $this->hc->getHtmlComment('Index Page', '', "\n"); + $single = $this->sc->getSmartySingleVar('index'); + $content .= $this->hc->getHtmlTag('div', ['class' => 'top'], $single) . PHP_EOL; + $content .= $this->hc->getHtmlComment('Footer', '', "\n"); + $content .= $this->sc->getSmartyIncludeFile($moduleDirname, 'footer', true); - $this->create($moduleDirname, 'templates/admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'templates/admin', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/Templates/Admin/TemplatesAdminPages.php b/class/Files/Templates/Admin/TemplatesAdminPages.php index b3a6904d..76328a6d 100644 --- a/class/Files/Templates/Admin/TemplatesAdminPages.php +++ b/class/Files/Templates/Admin/TemplatesAdminPages.php @@ -1,9 +1,12 @@ -hc = Modulebuilder\Files\CreateHtmlCode::getInstance(); + $this->sc = Modulebuilder\Files\CreateSmartyCode::getInstance(); } /** * @static function getInstance - * @param null + * * @return TemplatesAdminPages */ public static function getInstance() @@ -57,11 +70,11 @@ public static function getInstance() /** * @public function write - * @param string $module - * @param string $table - * @param $filename + * @param $module + * @param $table + * @param string $filename */ - public function write($module, $table, $filename) + public function write($module, $table, string $filename): void { $this->setModule($module); $this->setTable($table); @@ -73,12 +86,10 @@ public function write($module, $table, $filename) * @param string $moduleDirname * @return string */ - private function getTemplatesAdminPagesHeader($moduleDirname) + private function getTemplatesAdminPagesHeader(string $moduleDirname) { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); - $ret = $hc->getHtmlComment('Header', "\n"); - $ret .= $sc->getSmartyIncludeFile($moduleDirname, 'header', true, '', '', "\n\n"); + $ret = $this->hc->getHtmlComment('Header', '',"\n"); + $ret .= $this->sc->getSmartyIncludeFile($moduleDirname, 'header', true, '', "\n\n"); return $ret; } @@ -87,36 +98,32 @@ private function getTemplatesAdminPagesHeader($moduleDirname) * @private function getTemplatesAdminPagesTableThead * @param $tableSoleName * @param $tableAutoincrement - * @param string $fields + * @param array $fields * @param string $language * @return string */ - private function getTemplatesAdminPagesTableThead($tableSoleName, $tableAutoincrement, $fields, $language) + private function getTemplatesAdminPagesTableThead($tableSoleName, $tableAutoincrement, array $fields, string $language) { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); $th = ''; - $langHeadId = mb_strtoupper($tableSoleName) . '_ID'; + $langHeadId = \mb_strtoupper($tableSoleName) . '_ID'; if (1 == $tableAutoincrement) { - $lang = $sc->getSmartyConst($language, $langHeadId); - $th .= $hc->getHtmlTag('th', ['class' => 'center'], $lang, false, "\t\t\t\t"); + $lang = $this->sc->getSmartyConst($language, $langHeadId); + $th .= $this->hc->getHtmlTag('th', ['class' => 'center'], $lang, false, "\t\t\t\t"); } - foreach (array_keys($fields) as $f) { + foreach (\array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); $rpFieldName = $this->getRightString($fieldName); - $langFieldName = mb_strtoupper($tableSoleName) . '_' . mb_strtoupper($rpFieldName); + $langFieldName = \mb_strtoupper($tableSoleName) . '_' . \mb_strtoupper($rpFieldName); if (1 == $fields[$f]->getVar('field_inlist')) { - $lang = $sc->getSmartyConst($language, $langFieldName); - $th .= $hc->getHtmlTag('th', ['class' => 'center'], $lang, false, "\t\t\t\t"); + $lang = $this->sc->getSmartyConst($language, $langFieldName); + $th .= $this->hc->getHtmlTag('th', ['class' => 'center'], $lang, false, "\t\t\t\t"); } } - $lang = $sc->getSmartyConst($language, 'FORM_ACTION'); - $th .= $hc->getHtmlTag('th', ['class' => 'center width5'], $lang, false, "\t\t\t\t"); - $tr = $hc->getHtmlTableRow($th, 'head', "\t\t\t"); - $ret = $hc->getHtmlTableThead($tr, '', "\t\t"); - - return $ret; + $lang = $this->sc->getSmartyConst($language, 'FORM_ACTION'); + $th .= $this->hc->getHtmlTag('th', ['class' => 'center width5'], $lang, false, "\t\t\t\t"); + $tr = $this->hc->getHtmlTableRow($th, 'head', "\t\t\t"); + return $this->hc->getHtmlTableThead($tr, '', "\t\t"); } /** @@ -125,21 +132,19 @@ private function getTemplatesAdminPagesTableThead($tableSoleName, $tableAutoincr * @param string $tableName * @param $tableSoleName * @param $tableAutoincrement - * @param string $fields + * @param array $fields * @return string * @internal param string $language */ - private function getTemplatesAdminPagesTableTBody($moduleDirname, $tableName, $tableSoleName, $tableAutoincrement, $fields) + private function getTemplatesAdminPagesTableTBody(string $moduleDirname, string $tableName, $tableSoleName, $tableAutoincrement, array $fields) { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); $td = ''; if (1 == $tableAutoincrement) { - $double = $sc->getSmartyDoubleVar($tableSoleName, 'id'); - $td .= $hc->getHtmlTableData($double, 'center', '',"\t\t\t\t"); + $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'id'); + $td .= $this->hc->getHtmlTableData($double, 'center', '',"\t\t\t\t"); } $fieldId = ''; - foreach (array_keys($fields) as $f) { + foreach (\array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); $fieldElement = $fields[$f]->getVar('field_element'); $rpFieldName = $this->getRightString($fieldName); @@ -148,64 +153,83 @@ private function getTemplatesAdminPagesTableTBody($moduleDirname, $tableName, $t } if (1 == $fields[$f]->getVar('field_inlist')) { switch ($fieldElement) { - case 5: - $double = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName); - $src = $sc->getSmartyNoSimbol('xoModuleIcons16') . $double . '.png'; - $img = $hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true,'',''); - $td .= $hc->getHtmlTableData($img, 'center', '',"\t\t\t\t"); + case Constants::FIELD_ELE_TEXTAREA: + case Constants::FIELD_ELE_DHTMLTEXTAREA: + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName . '_short', '', '', "''", "'html'"); + $td .= $this->hc->getHtmlTableData($double, 'center', '',"\t\t\t\t"); + break; + case Constants::FIELD_ELE_CHECKBOX: + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName); + $src = $this->sc->getSmartyNoSimbol('xoModuleIcons16') . $double . '.png'; + $img = $this->hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true,'',''); + $td .= $this->hc->getHtmlTableData($img, 'center', '',"\t\t\t\t"); break; - case 9: + case Constants::FIELD_ELE_COLORPICKER: // This is to be reviewed, as it was initially to style = "backgroung-color: #" // Now with HTML5 is not supported inline style in the parameters of the HTML tag // Old code was ... - $double = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName); + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName); $color = " "; - $td .= $hc->getHtmlTableData($color, 'center', '',"\t\t\t\t"); + $td .= $this->hc->getHtmlTableData($color, 'center', '',"\t\t\t\t"); break; - case 10: - $src = $sc->getSmartyNoSimbol('xoModuleIcons32'); - $src .= $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName); - $img = $hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true,'',''); - $td .= $hc->getHtmlTableData($img, 'center', '',"\t\t\t\t"); + case Constants::FIELD_ELE_IMAGELIST: + $src = $this->sc->getSmartyNoSimbol('xoModuleIcons32'); + $src .= $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName, '', '', "''", "'htmlattr'"); + $img = $this->hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true,'',''); + $td .= $this->hc->getHtmlTableData($img, 'center', '',"\t\t\t\t"); break; - case 13: - $single = $sc->getSmartySingleVar($moduleDirname . '_upload_url'); - $double = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName); - $img = $hc->getHtmlTag('img', ['src' => $single . "/images/{$tableName}/" . $double, 'alt' => $tableName, 'style' => 'max-width:100px'], '', true, '', ''); - $td .= $hc->getHtmlTableData($img, 'center', '',"\t\t\t\t"); + case Constants::FIELD_ELE_UPLOADIMAGE: + $single = $this->sc->getSmartySingleVar($moduleDirname . '_upload_url','','',"''", "'htmlattr'"); + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName,'','',"''", "'htmlattr'"); + $img = $this->hc->getHtmlTag('img', ['src' => $single . "/images/{$tableName}/" . $double, 'alt' => $tableName, 'style' => 'max-width:100px'], '', true, '', ''); + $td .= $this->hc->getHtmlTableData($img, 'center', '',"\t\t\t\t"); break; - case 16: - $double = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName); - $src = $sc->getSmartyNoSimbol('$modPathIcon16') . '/status' . $double . '.png'; - $img = $hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true,'',''); - $td .= $hc->getHtmlTableData($img, 'center', '',"\t\t\t\t"); + case Constants::FIELD_ELE_SELECTSTATUS: + $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'status', '', '', "''", "'html'"); + $src = $this->sc->getSmartyNoSimbol('$modPathIcon16') . 'status' . $double . '.png'; + $imgAlt = $this->sc->getSmartyDoubleVar($tableSoleName, 'status_text', '', '', "''", "'html'"); + $img = $this->hc->getHtmlTag('img', ['src' => $src, 'alt' => $imgAlt, 'title' => $imgAlt], '', true,'',''); + $td .= $this->hc->getHtmlTableData($img, 'center', '',"\t\t\t\t"); + break; + case Constants::FIELD_ELE_RADIOYN: + case Constants::FIELD_ELE_SELECTUSER: + case Constants::FIELD_ELE_DATETIME: + case Constants::FIELD_ELE_RADIO_ONOFFLINE: + case Constants::FIELD_ELE_TEXTDATESELECT: + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName . '_text', '', '', "''", "'html'"); + $td .= $this->hc->getHtmlTableData($double, 'center', '',"\t\t\t\t"); break; default: if (0 != $f) { - $double = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName); - $td .= $hc->getHtmlTableData($double, 'center', '',"\t\t\t\t"); + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName, '', '', "''", "'html'"); + $td .= $this->hc->getHtmlTableData($double, 'center', '',"\t\t\t\t"); } break; } } } - $lang = $sc->getSmartyConst('', '_EDIT'); - $double = $sc->getSmartyDoubleVar($tableSoleName, 'id'); - $src = $sc->getSmartyNoSimbol('xoModuleIcons16 edit.png'); - $img = $hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true,'', ''); - $anchor = $hc->getHtmlTag('a', ['href' => $tableName . ".php?op=edit&{$fieldId}=" . $double, 'title' => $lang], $img, false, "\t\t\t\t\t"); - $lang = $sc->getSmartyConst('', '_DELETE'); - $double = $sc->getSmartyDoubleVar($tableSoleName, 'id'); - $src = $sc->getSmartyNoSimbol('xoModuleIcons16 delete.png'); - $img = $hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true, '', ''); - $anchor .= $hc->getHtmlTag('a', ['href' => $tableName . ".php?op=delete&{$fieldId}=" . $double, 'title' => $lang], $img, false, "\t\t\t\t\t"); - $td .= $hc->getHtmlTag('td', ['class' => 'center width5'], "\n" . $anchor . "\t\t\t\t", false, "\t\t\t\t"); - $cycle = $sc->getSmartyNoSimbol('cycle values=\'odd, even\''); - $tr = $hc->getHtmlTableRow($td, $cycle, "\t\t\t"); - $foreach = $sc->getSmartyForeach($tableSoleName, $tableName . '_list', $tr, '','', "\t\t\t"); - $tbody = $hc->getHtmlTableTbody($foreach,'' , "\t\t"); + $lang = $this->sc->getSmartyConst('', '_EDIT'); + $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'id'); + $src = $this->sc->getSmartyNoSimbol("xoModuleIcons16 'edit.png'"); + $img = $this->hc->getHtmlTag('img', ['src' => $src, 'alt' => $lang . ' ' . $tableName], '', true,'', ''); + $anchor = $this->hc->getHtmlTag('a', ['href' => $tableName . ".php?op=edit&{$fieldId}=" . $double . '&start=<{$start|default:0}>&limit=<{$limit|default:0}>', 'title' => $lang], $img, false, "\t\t\t\t\t"); + $lang = $this->sc->getSmartyConst('', '_CLONE'); + $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'id'); + $src = $this->sc->getSmartyNoSimbol("xoModuleIcons16 'editcopy.png'"); + $img = $this->hc->getHtmlTag('img', ['src' => $src, 'alt' => $lang . ' ' . $tableName], '', true,'', ''); + $anchor .= $this->hc->getHtmlTag('a', ['href' => $tableName . ".php?op=clone&{$fieldId}_source=" . $double, 'title' => $lang], $img, false, "\t\t\t\t\t"); + $lang = $this->sc->getSmartyConst('', '_DELETE'); + $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'id'); + $src = $this->sc->getSmartyNoSimbol("xoModuleIcons16 'delete.png'"); + $img = $this->hc->getHtmlTag('img', ['src' => $src, 'alt' => $lang . ' ' . $tableName], '', true, '', ''); + $anchor .= $this->hc->getHtmlTag('a', ['href' => $tableName . ".php?op=delete&{$fieldId}=" . $double, 'title' => $lang], $img, false, "\t\t\t\t\t"); + $td .= $this->hc->getHtmlTag('td', ['class' => 'center width5'], "\n" . $anchor . "\t\t\t\t", false, "\t\t\t\t"); + $cycle = $this->sc->getSmartyNoSimbol('cycle values=\'odd, even\''); + $tr = $this->hc->getHtmlTableRow($td, $cycle, "\t\t\t"); + $foreach = $this->sc->getSmartyForeach($tableSoleName, $tableName . '_list', $tr, '','', "\t\t\t"); + $tbody = $this->hc->getHtmlTableTbody($foreach,'' , "\t\t"); - return $sc->getSmartyConditions($tableName . '_count', '', '', $tbody, '', false, false, "\t\t"); + return $this->sc->getSmartyConditions($tableName . '_count', '', '', $tbody, '', false, false, "\t\t"); } /** @@ -214,17 +238,16 @@ private function getTemplatesAdminPagesTableTBody($moduleDirname, $tableName, $t * @param string $tableName * @param $tableSoleName * @param $tableAutoincrement - * @param string $fields + * @param $fields * @param string $language * @return string */ - private function getTemplatesAdminPagesTable($moduleDirname, $tableName, $tableSoleName, $tableAutoincrement, $fields, $language) + private function getTemplatesAdminPagesTable(string $moduleDirname, string $tableName, $tableSoleName, $tableAutoincrement, $fields, string $language) { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); $tbody = $this->getTemplatesAdminPagesTableThead($tableSoleName, $tableAutoincrement, $fields, $language); $tbody .= $this->getTemplatesAdminPagesTableTBody($moduleDirname, $tableName, $tableSoleName, $tableAutoincrement, $fields); - return $hc->getHtmlTable($tbody, 'table table-bordered', "\t"); + return $this->hc->getHtmlTable($tbody, 'outer', "\t"); } /** @@ -233,28 +256,26 @@ private function getTemplatesAdminPagesTable($moduleDirname, $tableName, $tableS * @param string $tableName * @param $tableSoleName * @param $tableAutoincrement - * @param string $fields + * @param $fields * @param string $language * @return string */ - private function getTemplatesAdminPages($moduleDirname, $tableName, $tableSoleName, $tableAutoincrement, $fields, $language) + private function getTemplatesAdminPages(string $moduleDirname, string $tableName, $tableSoleName, $tableAutoincrement, $fields, string $language) { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); $htmlTable = $this->getTemplatesAdminPagesTable($moduleDirname, $tableName, $tableSoleName, $tableAutoincrement, $fields, $language); - $htmlTable .= $hc->getHtmlTag('div', ['class' => 'clear'], ' ', false, "\t"); - $single = $sc->getSmartySingleVar('pagenav'); - $div = $hc->getHtmlTag('div', ['class' => 'xo-pagenav floatright'], $single, false, "\t\t"); - $div .= $hc->getHtmlTag('div', ['class' => 'clear spacer'], '', false, "\t\t", "\n"); - $htmlTable .= $sc->getSmartyConditions('pagenav', '', '', $div, '', '', '', "\t" ); - $ifList = $sc->getSmartyConditions($tableName . '_list', '', '', $htmlTable); - $single = $sc->getSmartySingleVar('form', "\t", "\n"); - $ifList .= $sc->getSmartyConditions('form', '', '', $single); - $single = $sc->getSmartySingleVar('error'); - $strong = $hc->getHtmlTag('strong', [], $single, false, '', ''); - $div = $hc->getHtmlTag('div', ['class' => 'errorMsg'], $strong, false, "\t", "\n"); - $ifList .= $sc->getSmartyConditions('error', '', '', $div); - $ifList .= $hc->getHtmlEmpty('', '', "\n");; + $htmlTable .= $this->hc->getHtmlTag('div', ['class' => 'clear'], ' ', false, "\t"); + $single = $this->sc->getSmartySingleVar('pagenav'); + $div = $this->hc->getHtmlTag('div', ['class' => 'xo-pagenav floatright'], $single, false, "\t\t"); + $div .= $this->hc->getHtmlTag('div', ['class' => 'clear spacer'], '', false, "\t\t"); + $htmlTable .= $this->sc->getSmartyConditions('pagenav', '', '', $div, '', '', '', "\t" ); + $ifList = $this->sc->getSmartyConditions($tableName . '_list', '', '', $htmlTable); + $single = $this->sc->getSmartySingleVar('form', "\t", "\n"); + $ifList .= $this->sc->getSmartyConditions('form', '', '', $single); + $single = $this->sc->getSmartySingleVar('error'); + $strong = $this->hc->getHtmlTag('strong', [], $single, false, '', ''); + $div = $this->hc->getHtmlTag('div', ['class' => 'errorMsg'], $strong, false, "\t"); + $ifList .= $this->sc->getSmartyConditions('error', '', '', $div); + $ifList .= $this->hc->getHtmlEmpty('', '', "\n"); return $ifList; } @@ -264,20 +285,18 @@ private function getTemplatesAdminPages($moduleDirname, $tableName, $tableSoleNa * @param string $moduleDirname * @return string */ - private function getTemplatesAdminPagesFooter($moduleDirname) + private function getTemplatesAdminPagesFooter(string $moduleDirname) { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); - $ret = $hc->getHtmlComment('Footer', "\n"); - $ret .= $sc->getSmartyIncludeFile($moduleDirname, 'footer', true); + $ret = $this->hc->getHtmlComment('Footer', '', "\n"); + $ret .= $this->sc->getSmartyIncludeFile($moduleDirname, 'footer', true); return $ret; } /** * @public function render - * @param null - * @return bool|string + * + * @return string */ public function render() { @@ -285,13 +304,13 @@ public function render() $table = $this->getTable(); $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); - $language = $this->getLanguage($moduleDirname, 'AM'); + $language = $this->getLanguage($moduleDirname, 'AM', '', false); $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'), 'field_order'); $content = $this->getTemplatesAdminPagesHeader($moduleDirname); $content .= $this->getTemplatesAdminPages($moduleDirname, $table->getVar('table_name'), $table->getVar('table_solename'), $table->getVar('table_autoincrement'), $fields, $language); $content .= $this->getTemplatesAdminPagesFooter($moduleDirname); - $this->create($moduleDirname, 'templates/admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'templates/admin', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/Templates/Admin/TemplatesAdminPermissions.php b/class/Files/Templates/Admin/TemplatesAdminPermissions.php index 25e09d2c..06ca2611 100644 --- a/class/Files/Templates/Admin/TemplatesAdminPermissions.php +++ b/class/Files/Templates/Admin/TemplatesAdminPermissions.php @@ -1,9 +1,9 @@ -hc = Modulebuilder\Files\CreateHtmlCode::getInstance(); + $this->sc = Modulebuilder\Files\CreateSmartyCode::getInstance(); } /** * @static function getInstance - * @param null + * * @return TemplatesAdminPermissions */ public static function getInstance() @@ -57,10 +67,10 @@ public static function getInstance() /** * @public function write - * @param string $module + * @param $module * @param $filename */ - public function write($module, $filename) + public function write($module, $filename): void { $this->setModule($module); $this->setFileName($filename); @@ -72,25 +82,20 @@ public function write($module, $filename) * * @return string */ - private function getTemplatesAdminPermissionsHeader($moduleDirname) + private function getTemplatesAdminPermissionsHeader(string $moduleDirname) { - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); - - return $sc->getSmartyIncludeFile($moduleDirname, 'header', true, '', '', "\n\n"); + return $this->sc->getSmartyIncludeFile($moduleDirname, 'header', true, '', "\n\n"); } /** * @private function getTemplatesAdminPermissions - * @param null + * * @return string */ private function getTemplatesAdminPermissions() { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); - $form = $sc->getSmartySingleVar('form'); - $ret = $hc->getHtmlTag('div', ['class' => 'spacer'], $form, '', '', "\n\n"); - return $ret; + $form = $this->sc->getSmartySingleVar('form'); + return $this->hc->getHtmlTag('div', ['class' => 'spacer'], $form, false, '', "\n\n"); } /** @@ -99,16 +104,15 @@ private function getTemplatesAdminPermissions() * * @return string */ - private function getTemplatesAdminPermissionsFooter($moduleDirname) + private function getTemplatesAdminPermissionsFooter(string $moduleDirname) { - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); - return $sc->getSmartyIncludeFile($moduleDirname, 'footer', true); + return $this->sc->getSmartyIncludeFile($moduleDirname, 'footer', true); } /** * @public function render - * @param null - * @return bool|string + * + * @return string */ public function render() { @@ -119,7 +123,7 @@ public function render() $content .= $this->getTemplatesAdminPermissions(); $content .= $this->getTemplatesAdminPermissionsFooter($moduleDirname); - $this->create($moduleDirname, 'templates/admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, 'templates/admin', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/Templates/Admin/index.php b/class/Files/Templates/Admin/index.php new file mode 100644 index 00000000..e5ee0725 --- /dev/null +++ b/class/Files/Templates/Admin/index.php @@ -0,0 +1,2 @@ +hc = Modulebuilder\Files\CreateHtmlCode::getInstance(); + $this->sc = Modulebuilder\Files\CreateSmartyCode::getInstance(); + } + + /** + * @static function getInstance + * + * @return TemplatesBlocks + */ + public static function getInstance() + { + static $instance = false; + if (!$instance) { + $instance = new self(); + } + + return $instance; + } + + /** + * @public function write + * @param $module + * @param $table + * @param string $filename + */ + public function write($module, $table, string $filename): void + { + $this->setModule($module); + $this->setTable($table); + $this->setFileName($filename); + } + + /** + * @private function getTemplatesBlocksTableThead + * @param $tableId + * @param $tableMid + * @param string $language + * @param $tableAutoincrement + * @return string + */ + private function getTemplatesBlocksTableThead($tableId, $tableMid, string $language, $tableAutoincrement) + { + $th = ''; + if (1 == $tableAutoincrement) { + $th .= $this->hc->getHtmlTableHead(' ', '', '', "\t\t\t"); + } + $fields = $this->getTableFields($tableMid, $tableId); + foreach (\array_keys($fields) as $f) { + if (1 === (int)$fields[$f]->getVar('field_block')) { + $fieldName = $fields[$f]->getVar('field_name'); + $stuFieldName = \mb_strtoupper($fieldName); + $lang = $this->sc->getSmartyConst($language, $stuFieldName); + $th .= $this->hc->getHtmlTableHead($lang, 'center', '', "\t\t\t"); + } + } + $th .= $this->hc->getHtmlTableHead(' ', '', '', "\t\t\t"); + $tr = $this->hc->getHtmlTableRow($th, 'head', "\t\t"); + + return $this->hc->getHtmlTableThead($tr, '', "\t"); + } + + /** + * @private function getTemplatesBlocksTableTbody + * @param string $moduleDirname + * @param $tableId + * @param $tableMid + * @param $tableName + * @param $tableSoleName + * @param $tableAutoincrement + * @param $language + * @return string + */ + private function getTemplatesBlocksTableTbody(string $moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableAutoincrement, $language) + { + $td = ''; + $fieldId = ''; + $stuTableSoleName = \mb_strtoupper($tableSoleName); + if (1 == $tableAutoincrement) { + $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'id'); + $td .= $this->hc->getHtmlTableData($double, 'center', '', "\t\t\t"); + } + $fields = $this->getTableFields($tableMid, $tableId); + foreach (\array_keys($fields) as $f) { + if (0 == $f) { + $fieldId = $fields[$f]->getVar('field_name'); + } + if (1 === (int)$fields[$f]->getVar('field_block')) { + $fieldName = $fields[$f]->getVar('field_name'); + $fieldElement = $fields[$f]->getVar('field_element'); + $rpFieldName = $this->getRightString($fieldName); + if (1 == $fields[$f]->getVar('field_inlist')) { + switch ($fieldElement) { + case Constants::FIELD_ELE_COLORPICKER: + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName); + $span = $this->hc->getHtmlTag('span', [], $double, false, '', ''); + $td .= $this->hc->getHtmlTableData($span, 'center', '', "\t\t\t"); + break; + case Constants::FIELD_ELE_IMAGELIST: + $src = $this->sc->getSmartyNoSimbol('xoModuleIcons32'); + $src .= $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName, '', '', "''", "'html'"); + $img = $this->hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true, '', ''); + $td .= $this->hc->getHtmlTableData($img, 'center', '', "\t\t\t"); + break; + case Constants::FIELD_ELE_UPLOADIMAGE: + $single = $this->sc->getSmartySingleVar($moduleDirname . '_upload_url', '', '', "''", "'htmlattr'"); + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName, '', '', "''", "'html'"); + $img = $this->hc->getHtmlTag('img', ['src' => $single . "/images/{$tableName}/" . $double, 'alt' => $tableName], '', true, '', ''); + $td .= $this->hc->getHtmlTableData($img, 'center', '', "\t\t\t"); + break; + case Constants::FIELD_ELE_TEXTAREA: + case Constants::FIELD_ELE_DHTMLTEXTAREA: + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName . '_short', '', '', "''", "'html'"); + $td .= $this->hc->getHtmlTableData($double, 'center', '', "\t\t\t"); + break; + case Constants::FIELD_ELE_SELECTSTATUS: + case Constants::FIELD_ELE_RADIOYN: + case Constants::FIELD_ELE_RADIO_ONOFFLINE: + case Constants::FIELD_ELE_SELECTUSER: + case Constants::FIELD_ELE_DATETIME: + case Constants::FIELD_ELE_TEXTDATESELECT: + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName . '_text', '', '', "''", "'html'"); + $td .= $this->hc->getHtmlTableData($double, 'center', '', "\t\t\t"); + break; + default: + if (0 != $f) { + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName, '', '', "''", "'html'"); + $td .= $this->hc->getHtmlTableData($double, 'center', '', "\t\t\t"); + } + break; + } + } + } + } + // TODO: allow edit only for admins + // $lang = $this->sc->getSmartyConst('', '_EDIT'); + // $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'id'); + // $src = $this->sc->getSmartyNoSimbol('xoModuleIcons32 edit.png'); + // $img = $this->hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true, '', ''); + // $anchor = $this->hc->getHtmlTag('a', ['href' => $tableName . ".php?op=edit&{$fieldId}=" . $double, 'title' => $lang], $img, false, "\t\t\t\t"); + // $lang = $this->sc->getSmartyConst('', '_DELETE'); + // $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'id'); + // $src = $this->sc->getSmartyNoSimbol('xoModuleIcons32 delete.png'); + // $img = $this->hc->getHtmlTag('img', ['src' => $src . $double, 'alt' => $tableName], '', true, '', ''); + // $anchor .= $this->hc->getHtmlTag('a', ['href' => $tableName . ".php?op=delete&{$fieldId}=" . $double, 'title' => $lang], $img, false, "\t\t\t\t"); + // $td .= $this->hc->getHtmlTag('td', ['class' => 'center'], "\n" . $anchor . "\t\t\t", false, "\t\t\t"); + $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'id'); + $lang = $this->sc->getSmartyConst($language, $stuTableSoleName . '_GOTO|escape:"htmlattr"'); + $single = $this->sc->getSmartySingleVar($moduleDirname . '_url', '', '', "''", "'htmlattr'"); + $anchor = $this->hc->getHtmlAnchor($single . '/' . $tableName . ".php?op=show&{$fieldId}=" . $double, $lang, $lang); + $td .= $this->hc->getHtmlTableData($anchor, 'center', '', "\t\t\t"); + $cycle = $this->sc->getSmartyNoSimbol('cycle values="odd, even"'); + $tr = $this->hc->getHtmlTableRow($td, $cycle, "\t\t"); + $foreach = $this->sc->getSmartyForeach($tableSoleName, 'block', $tr, '', '', "\t\t"); + $tbody = $this->hc->getHtmlTableTbody($foreach, '', "\t"); + + return $this->sc->getSmartyConditions('block', ' > ', '0', $tbody, false, true, true, "\t"); + } + + /** + * @private function getTemplatesBlocksTfoot + * @return string + */ + private function getTemplatesBlocksTableTfoot() + { + $td = $this->hc->getHtmlTag('td', [], ' ', false, '', ''); + $tr = $this->hc->getHtmlTag('tr', [], $td, false, '', ''); + + return $this->hc->getHtmlTag('tfoot', [], $tr, false, "\t"); + } + + /** + * @private function getTemplatesBlocksTable + * @param string $moduleDirname + * @param $tableId + * @param $tableMid + * @param string $tableName + * @param $tableSoleName + * @param $tableAutoincrement + * @param string $language + * @return string + */ + private function getTemplatesBlocksTable(string $moduleDirname, $tableId, $tableMid, string $tableName, $tableSoleName, $tableAutoincrement, string $language) + { + $tbody = $this->getTemplatesBlocksTableThead($tableId, $tableMid, $language, $tableAutoincrement); + $tbody .= $this->getTemplatesBlocksTableTbody($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableAutoincrement, $language); + $tbody .= $this->getTemplatesBlocksTableTfoot(); + $single = $this->sc->getSmartySingleVar('table_type'); + + return $this->hc->getHtmlTable($tbody, 'table table-responsive table-' . $single); + } + + /** + * @public function render + * + * @return string + */ + public function render() + { + $module = $this->getModule(); + $table = $this->getTable(); + $filename = $this->getFileName(); + $moduleDirname = $module->getVar('mod_dirname'); + $tableId = $table->getVar('table_id'); + $tableMid = $table->getVar('table_mid'); + $tableName = $table->getVar('table_name'); + $tableSoleName = $table->getVar('table_solename'); + $tableAutoincrement = $table->getVar('table_autoincrement'); + $language = $this->getLanguage($moduleDirname, 'MB', '', false); + $content = $this->getTemplatesBlocksTable($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableAutoincrement, $language); + + $this->create($moduleDirname, 'templates/blocks', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); + + return $this->renderFile(); + } +} diff --git a/class/Files/Templates/Blocks/Defstyle/TemplatesBlocksSpotlight.php b/class/Files/Templates/Blocks/Defstyle/TemplatesBlocksSpotlight.php new file mode 100644 index 00000000..36a2d94b --- /dev/null +++ b/class/Files/Templates/Blocks/Defstyle/TemplatesBlocksSpotlight.php @@ -0,0 +1,267 @@ +hc = Modulebuilder\Files\CreateHtmlCode::getInstance(); + $this->sc = Modulebuilder\Files\CreateSmartyCode::getInstance(); + } + + /** + * @static function getInstance + * + * @return false|TemplatesBlocksSpotlight + */ + public static function getInstance() + { + static $instance = false; + if (!$instance) { + $instance = new self(); + } + + return $instance; + } + + /** + * @public function write + * @param $module + * @param $table + * @param string $filename + */ + public function write($module, $table, string $filename) + { + $this->setModule($module); + $this->setTable($table); + $this->setFileName($filename); + } + + /** + * @private function getTemplatesBlocksTableThead + * @param $tableId + * @param $tableMid + * @param string $language + * @param $tableAutoincrement + * @return string + */ + private function getTemplatesBlocksTableThead($tableId, $tableMid, string $language, $tableAutoincrement) + { + $th = ''; + if (1 == $tableAutoincrement) { + $th .= $this->hc->getHtmlTableHead(' ', '', '', "\t\t\t"); + } + $fields = $this->getTableFields($tableMid, $tableId); + foreach (\array_keys($fields) as $f) { + if (1 === (int)$fields[$f]->getVar('field_block')) { + $fieldName = $fields[$f]->getVar('field_name'); + $stuFieldName = \mb_strtoupper($fieldName); + $lang = $this->sc->getSmartyConst($language, $stuFieldName); + $th .= $this->hc->getHtmlTableHead($lang, 'center', '', "\t\t\t"); + } + } + $th .= $this->hc->getHtmlTableHead(' ', '', '', "\t\t\t"); + $tr = $this->hc->getHtmlTableRow($th, 'head', "\t\t"); + + return $this->hc->getHtmlTableThead($tr, '', "\t"); + } + + /** + * @private function getTemplatesBlocksTableTbody + * @param string $moduleDirname + * @param $tableId + * @param $tableMid + * @param $tableName + * @param $tableSoleName + * @param $tableAutoincrement + * @param $language + * @return string + */ + private function getTemplatesBlocksTableTbody(string $moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableAutoincrement, $language) + { + $td = ''; + $fieldId = ''; + $stuTableSoleName = \mb_strtoupper($tableSoleName); + if (1 == $tableAutoincrement) { + $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'id'); + $td .= $this->hc->getHtmlTableData($double, 'center', '', "\t\t\t"); + } + $fields = $this->getTableFields($tableMid, $tableId); + foreach (\array_keys($fields) as $f) { + if (0 == $f) { + $fieldId = $fields[$f]->getVar('field_name'); + } + if (1 === (int)$fields[$f]->getVar('field_block')) { + $fieldName = $fields[$f]->getVar('field_name'); + $fieldElement = $fields[$f]->getVar('field_element'); + $rpFieldName = $this->getRightString($fieldName); + if (1 == $fields[$f]->getVar('field_inlist')) { + switch ($fieldElement) { + case Constants::FIELD_ELE_COLORPICKER: + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName); + $span = $this->hc->getHtmlTag('span', [], $double, false, '', ''); + $td .= $this->hc->getHtmlTableData($span, 'center', '', "\t\t\t"); + break; + case Constants::FIELD_ELE_IMAGELIST: + $src = $this->sc->getSmartyNoSimbol('xoModuleIcons32'); + $src .= $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName); + $img = $this->hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true, '', ''); + $td .= $this->hc->getHtmlTableData($img, 'center', '', "\t\t\t"); + break; + case Constants::FIELD_ELE_UPLOADIMAGE: + $single = $this->sc->getSmartySingleVar($moduleDirname . '_upload_url'); + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName); + $img = $this->hc->getHtmlTag('img', ['src' => $single . "/images/{$tableName}/" . $double, 'alt' => $tableName], '', true, '', ''); + $td .= $this->hc->getHtmlTableData($img, 'center', '', "\t\t\t"); + break; + case Constants::FIELD_ELE_TEXTAREA: + case Constants::FIELD_ELE_DHTMLTEXTAREA: + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName . '_short'); + $td .= $this->hc->getHtmlTableData($double, 'center', '', "\t\t\t"); + break; + case Constants::FIELD_ELE_SELECTSTATUS: + case Constants::FIELD_ELE_RADIOYN: + case Constants::FIELD_ELE_SELECTUSER: + case Constants::FIELD_ELE_DATETIME: + case Constants::FIELD_ELE_TEXTDATESELECT: + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName . '_text'); + $td .= $this->hc->getHtmlTableData($double, 'center', '', "\t\t\t"); + break; + default: + if (0 != $f) { + $double = $this->sc->getSmartyDoubleVar($tableSoleName, $rpFieldName); + $td .= $this->hc->getHtmlTableData($double, 'center', '', "\t\t\t"); + } + break; + } + } + } + } + // TODO: allow edit only for admins + // $lang = $this->sc->getSmartyConst('', '_EDIT'); + // $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'id'); + // $src = $this->sc->getSmartyNoSimbol('xoModuleIcons32 edit.png'); + // $img = $this->hc->getHtmlTag('img', ['src' => $src, 'alt' => $tableName], '', true, '', ''); + // $anchor = $this->hc->getHtmlTag('a', ['href' => $tableName . ".php?op=edit&{$fieldId}=" . $double, 'title' => $lang], $img, false, "\t\t\t\t"); + // $lang = $this->sc->getSmartyConst('', '_DELETE'); + // $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'id'); + // $src = $this->sc->getSmartyNoSimbol('xoModuleIcons32 delete.png'); + // $img = $this->hc->getHtmlTag('img', ['src' => $src . $double, 'alt' => $tableName], '', true, '', ''); + // $anchor .= $this->hc->getHtmlTag('a', ['href' => $tableName . ".php?op=delete&{$fieldId}=" . $double, 'title' => $lang], $img, false, "\t\t\t\t"); + // $td .= $this->hc->getHtmlTag('td', ['class' => 'center'], "\n" . $anchor . "\t\t\t", false, "\t\t\t"); + $double = $this->sc->getSmartyDoubleVar($tableSoleName, 'id'); + $lang = $this->sc->getSmartyConst($language, $stuTableSoleName . '_GOTO'); + $single = $this->sc->getSmartySingleVar($moduleDirname . '_url'); + $anchor = $this->hc->getHtmlAnchor($single . '/' . $tableName . ".php?op=show&{$fieldId}=" . $double, $lang, $lang); + $td .= $this->hc->getHtmlTableData($anchor, 'center', '', "\t\t\t"); + $cycle = $this->sc->getSmartyNoSimbol('cycle values="odd, even"'); + $tr = $this->hc->getHtmlTableRow($td, $cycle, "\t\t"); + $foreach = $this->sc->getSmartyForeach($tableSoleName, 'block', $tr, '','', "\t\t"); + $tbody = $this->hc->getHtmlTableTbody($foreach,'' , "\t"); + + return $this->sc->getSmartyConditions("block|default:0", ' > ', '0', $tbody, false, true, true, "\t"); + } + + /** + * @private function getTemplatesBlocksTfoot + * @return string + */ + private function getTemplatesBlocksTableTfoot() + { + $td = $this->hc->getHtmlTag('td', [], " ", false, '', ''); + $tr = $this->hc->getHtmlTag('tr', [], $td, false, '', ''); + + return $this->hc->getHtmlTag('tfoot', [], $tr, false, "\t"); + } + + /** + * @private function getTemplatesBlocksTable + * @param string $moduleDirname + * @param $tableId + * @param $tableMid + * @param string $tableName + * @param $tableSoleName + * @param $tableAutoincrement + * @param string $language + * @return string + */ + private function getTemplatesBlocksTable(string $moduleDirname, $tableId, $tableMid, string $tableName, $tableSoleName, $tableAutoincrement, string $language) + { + $tbody = $this->getTemplatesBlocksTableThead($tableId, $tableMid, $language, $tableAutoincrement); + $tbody .= $this->getTemplatesBlocksTableTbody($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableAutoincrement, $language); + $tbody .= $this->getTemplatesBlocksTableTfoot(); + $single = $this->sc->getSmartySingleVar('table_type'); + + return $this->hc->getHtmlTable($tbody, 'table table-responsive table-' . $single); + } + + /** + * @public function render + * + * @return string + */ + public function render() + { + $module = $this->getModule(); + $table = $this->getTable(); + $filename = $this->getFileName(); + $moduleDirname = $module->getVar('mod_dirname'); + $tableId = $table->getVar('table_id'); + $tableMid = $table->getVar('table_mid'); + $tableName = $table->getVar('table_name'); + $tableSoleName = $table->getVar('table_solename'); + $tableAutoincrement = $table->getVar('table_autoincrement'); + $language = $this->getLanguage($moduleDirname, 'MB', '', false); + $content = $this->getTemplatesBlocksTable($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableAutoincrement, $language); + + $this->create($moduleDirname, 'templates/blocks', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); + + return $this->renderFile(); + } +} diff --git a/class/Files/Templates/Blocks/Defstyle/index.php b/class/Files/Templates/Blocks/Defstyle/index.php new file mode 100644 index 00000000..e5ee0725 --- /dev/null +++ b/class/Files/Templates/Blocks/Defstyle/index.php @@ -0,0 +1,2 @@ +setModule($module); - $this->setTable($table); - $this->setFileName($filename); - } - - /** - * @private function getTemplatesBlocksTableThead - * @param $tableId - * @param $tableMid - * @param string $language - * @param $tableAutoincrement - * @return string - */ - private function getTemplatesBlocksTableThead($tableId, $tableMid, $language, $tableAutoincrement) - { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); - $th = ''; - if (1 == $tableAutoincrement) { - $th .= $hc->getHtmlTableHead(' ', '', '', "\t\t\t"); - } - $fields = $this->getTableFields($tableMid, $tableId); - foreach (array_keys($fields) as $f) { - if (1 === (int)$fields[$f]->getVar('field_block')) { - $fieldName = $fields[$f]->getVar('field_name'); - $stuFieldName = mb_strtoupper($fieldName); - $lang = $sc->getSmartyConst($language, $stuFieldName); - $th .= $hc->getHtmlTableHead($lang, 'center', '', "\t\t\t"); - } - } - $tr = $hc->getHtmlTableRow($th, 'head', "\t\t"); - - return $hc->getHtmlTableThead($tr, '', "\t"); - } - - /** - * @private function getTemplatesBlocksTableTbody - * @param string $moduleDirname - * @param $tableId - * @param $tableMid - * @param $tableName - * @param $tableSoleName - * @param $tableAutoincrement - * @return string - */ - private function getTemplatesBlocksTableTbody($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableAutoincrement) - { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); - $td = ''; - if (1 == $tableAutoincrement) { - $double = $sc->getSmartyDoubleVar($tableSoleName, 'id'); - $td .= $hc->getHtmlTableData($double, 'center', '', "\t\t\t"); - } - $fields = $this->getTableFields($tableMid, $tableId); - foreach (array_keys($fields) as $f) { - if (1 === (int)$fields[$f]->getVar('field_block')) { - $fieldName = $fields[$f]->getVar('field_name'); - $fieldElement = $fields[$f]->getVar('field_element'); - $rpFieldName = $this->getRightString($fieldName); - if (1 == $fields[$f]->getVar('field_inlist')) { - switch ($fieldElement) { - case 9: - // This is to be reviewed, as it was initially to style = "backgroung-color: #" - // Now with HTML5 is not supported inline style in the parameters of the HTML tag - // Old code was ... - $double = $sc->getSmartyDoubleVar($tableSoleName, $rpFieldName); - $span = $hc->getHtmlTag('span', [], $double); - $td .= $hc->getHtmlTableData($span, 'center', '', "\t\t\t"); - /*$ret .= <<
') . PHP_EOL; + $incl .= $this->sc->getSmartyConditions($tableSoleName . '.count', ' is div by ', '$numb_col', $html, false, false, false, '',"\n", true, false) . PHP_EOL; + $const = $this->sc->getSmartyConst($language, $stuTableName . '_TITLE'); + $div = $this->hc->getHtmlDiv($const, 'panel-heading') . PHP_EOL; + $cont = $this->hc->getHtmlDiv($incl, 'panel panel-body') . PHP_EOL; + $div .= $this->sc->getSmartyForeach($tableSoleName, $tableName, $cont) . PHP_EOL; + $panelType = $this->sc->getSmartySingleVar('panel_type'); + + return $this->hc->getHtmlDiv($div, 'panel panel-' . $panelType) . PHP_EOL; + } + + /** + * @private function getTemplatesUserCategoriesFooter + * @param string $moduleDirname + * + * @return string + */ + private function getTemplatesUserCategoriesFooter(string $moduleDirname): string + { + return $this->sc->getSmartyIncludeFile($moduleDirname, 'footer'); + } + + /** + * @public function render + * @return string + */ + public function render(): string + { + $module = $this->getModule(); + $table = $this->getTable(); + $filename = $this->getFileName(); + $moduleDirname = $module->getVar('mod_dirname'); + $tableName = $table->getVar('table_name'); + $tableSoleName = $table->getVar('table_solename'); + $language = $this->getLanguage($moduleDirname, 'MA', '', false); + $content = $this->getTemplatesUserCategoriesHeader($moduleDirname); + $content .= $this->getTemplatesUserCategoriesPanel($moduleDirname, $tableName, $tableSoleName, $language); + $content .= $this->getTemplatesUserCategoriesFooter($moduleDirname); + + $this->create($moduleDirname, 'templates', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); + + return $this->renderFile(); + } +} diff --git a/class/Files/Templates/user/CategoriesList.php b/class/Files/Templates/User/Defstyle/CategoriesList.php similarity index 61% rename from class/Files/Templates/user/CategoriesList.php rename to class/Files/Templates/User/Defstyle/CategoriesList.php index 88173928..6327fa9a 100644 --- a/class/Files/Templates/user/CategoriesList.php +++ b/class/Files/Templates/User/Defstyle/CategoriesList.php @@ -1,10 +1,9 @@ -hc = Modulebuilder\Files\CreateHtmlCode::getInstance(); + $this->sc = Modulebuilder\Files\CreateSmartyCode::getInstance(); } /** * @static function getInstance - * @param null - * @return User\CategoriesList + * @return bool|CategoriesList */ public static function getInstance() { @@ -58,11 +66,11 @@ public static function getInstance() /** * @public function write - * @param string $module - * @param string $table + * @param $module + * @param $table * @param string $filename */ - public function write($module, $table, $filename) + public function write($module, $table, string $filename): void { $this->setModule($module); $this->setTable($table); @@ -75,12 +83,10 @@ public function write($module, $table, $filename) */ private function getTemplatesUserCategoriesListStartTable() { - $ret = <<
| <{\$list.{$rpFieldName}}> | \n + EOT; } } } $ret .= <<|||||||
|---|---|---|---|---|---|---|---|
 | \n
+ EOT;
break;
case 2:
case 3:
@@ -155,67 +161,64 @@ private function getTemplatesUserCategoriesListTbody($moduleDirname, $table)
$fieldName = $fields[$f]->getVar('field_name');
$rpFieldName = $this->getRightString($fieldName);
$ret .= <<<{\$list.{$rpFieldName}}> | \n + EOT; break; } } } } $ret .= <<||||||
| <{\$list.{$rpFieldName}}> | \n + EOT; } } } $ret .= <<|||||||
| <{\$smarty.const.{$langStuFieldName}}> | \n + EOT; } } $ret .= <<|||
|---|---|---|---|
| \t\t | \n + EOT; break; - case 10: + case Constants::FIELD_ELE_IMAGELIST: $ret .= << | \n
+ EOT;
break;
default:
$ret .= <<<{\$list.{$rpFieldName}}> | \n + EOT; break; } } } $ret .= <<
\n
-EOT;
+ | <{\$smarty.const.{$langStuFieldName}}> | \n + EOT; } } $ret .= <<|||
|---|---|---|---|
| \t\t | \n + EOT; break; case 10: $ret .= << | \n
+ EOT;
break;
default:
$ret .= <<<{\$list.{$rpFieldName}}> | \n + EOT; break; } } } $ret .= <<
\n
-EOT;
+ <{\$smarty.const.{$language}{$stuTableName}_TITLE}>
- <{foreach item={$tableSoleName} from=\${$tableName}}>
-
- <{include file="db:{$moduleDirname}_{$tableName}_list.tpl" {$tableSoleName}=\${$tableSoleName}}>
- <{if \${$tableSoleName}.count is div by \$numb_col}>
-
- <{/if}> -
- <{/foreach}>
-\n
-EOT;*/
- $hc = Tdmcreate\Files\CreateHtmlCode::getInstance();
- $sc = Tdmcreate\Files\CreateSmartyCode::getInstance();
- $incl = $sc->getSmartyIncludeFileListForeach($moduleDirname, $tableName, $tableSoleName) . PHP_EOL;
- $html = $hc->getHtmlEmpty('- <{/if}> -
') . PHP_EOL; - $incl .= $sc->getSmartyConditions($tableSoleName . '.count', ' is div by ', '$numb_col', $html) . PHP_EOL; - $const = $sc->getSmartyConst($language, $stuTableName . '_TITLE'); - $div = $hc->getHtmlDiv($const, 'panel-heading') . PHP_EOL; - $cont = $hc->getHtmlDiv($incl, 'panel panel-body') . PHP_EOL; - $div .= $sc->getSmartyForeach($tableSoleName, $tableName, $cont) . PHP_EOL; - $panelType = $sc->getSmartySingleVar('panel_type'); - - return $hc->getHtmlDiv($div, 'panel panel-' . $panelType) . PHP_EOL; - } - - /** - * @private function getTemplatesUserCategoriesFooter - * @param string $moduleDirname - * - * @return string - */ - private function getTemplatesUserCategoriesFooter($moduleDirname) - { - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); - - return $sc->getSmartyIncludeFile($moduleDirname, 'footer'); - } - - /** - * @public function render - * @return bool|string - */ - public function render() - { - $module = $this->getModule(); - $table = $this->getTable(); - $filename = $this->getFileName(); - $moduleDirname = $module->getVar('mod_dirname'); - $tableName = $table->getVar('table_name'); - $tableSoleName = $table->getVar('table_solename'); - $language = $this->getLanguage($moduleDirname, 'MA'); - $content = $this->getTemplatesUserCategoriesHeader($moduleDirname); - $content .= $this->getTemplatesUserCategoriesPanel($moduleDirname, $tableName, $tableSoleName, $language); - $content .= $this->getTemplatesUserCategoriesFooter($moduleDirname); - - $this->create($moduleDirname, 'templates', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); - - return $this->renderFile(); - } -} diff --git a/class/Files/Templates/user/DisqusComments.php b/class/Files/Templates/user/DisqusComments.php deleted file mode 100644 index 39c3388a..00000000 --- a/class/Files/Templates/user/DisqusComments.php +++ /dev/null @@ -1,97 +0,0 @@ -setModule($module); - $this->setFileName($filename); - } - - /** - * @private function getTemplatesCommentCode - * @param null - * - * @return string - */ - private function getTemplatesCommentCode() - { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - - return $hc->getHtmlEmpty('Please! Enter here your comments code'); - } - - /** - * @public function render - * @return bool|string - */ - public function render() - { - $module = $this->getModule(); - $filename = $this->getFileName(); - $moduleDirname = $module->getVar('mod_dirname'); - $content = $this->getTemplatesCommentCode(); - - $this->create($moduleDirname, 'templates', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); - - return $this->renderFile(); - } -} diff --git a/class/Files/Templates/user/FacebookComments.php b/class/Files/Templates/user/FacebookComments.php deleted file mode 100644 index 30c530d6..00000000 --- a/class/Files/Templates/user/FacebookComments.php +++ /dev/null @@ -1,97 +0,0 @@ -setModule($module); - $this->setFileName($filename); - } - - /** - * @private function getTemplatesCommentCode - * @param null - * - * @return string - */ - private function getTemplatesCommentCode() - { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - - return $hc->getHtmlEmpty('Please! Enter here your comments code'); - } - - /** - * @public function render - * @return bool|string - */ - public function render() - { - $module = $this->getModule(); - $filename = $this->getFileName(); - $moduleDirname = $module->getVar('mod_dirname'); - $content = $this->getTemplatesCommentCode(); - - $this->create($moduleDirname, 'templates', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); - - return $this->renderFile(); - } -} diff --git a/class/Files/Templates/user/Footer.php b/class/Files/Templates/user/Footer.php deleted file mode 100644 index 9ff3e74e..00000000 --- a/class/Files/Templates/user/Footer.php +++ /dev/null @@ -1,145 +0,0 @@ -setModule($module); - $this->setTable($table); - $this->setFileName($filename); - } - - /** - * @public function getTemplateUserFooterFacebookLikeButton - * @param null - * - * @return bool|string - */ - public function getTemplateUserFooterFacebookLikeButton() - { - return ""; - } - - /** - * @public function getTemplateUserFooterFacebookShareButton - * @param null - * - * @return bool|string - */ - public function getTemplateUserFooterFacebookShareButton() - { - return ""; - } - - /** - * @public function render - * @param null - * @return bool|string - */ - private function getTemplateUserFooterContent($moduleDirname, $language) - { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); - $ret = $hc->getHtmlDiv('<{$copyright}>', 'pull-left', '', "\n", false); - $ret .= $hc->getHtmlEmpty("\n"); - $contIf = $hc->getHtmlDiv('<{$pagenav}>', 'pull-right', "\t", "\n", false); - $ret .= $sc->getSmartyConditions('pagenav', ' != ', "''", $contIf); - $ret .= $hc->getHtmlEmpty("
\n"); - $contIf = $hc->getHtmlDiv("<{\$smarty.const.{$language}ADMIN}>", 'text-center bold', "\t", "\n", false); - $ret .= $sc->getSmartyConditions('xoops_isadmin', ' != ', "''", $contIf); - $ret .= $hc->getHtmlEmpty("\n"); - $contIf = $sc->getSmartyIncludeFile('system_comments','flat',false, false,"\t\t\t"); - $contIf .= $this->getSimpleString('<{elseif $comment_mode == "thread"}>',"\t\t"); - $contIf .= $sc->getSmartyIncludeFile('system_comments','thread',false, false,"\t\t\t"); - $contIf .= $this->getSimpleString('<{elseif $comment_mode == "nest"}>',"\t\t"); - $contIf .= $sc->getSmartyIncludeFile('system_comments','nest',false, false,"\t\t\t"); - $contDiv = $sc->getSmartyConditions('comment_mode', ' == ', '"flat"', $contIf, false, '','',"\t\t"); - $contIf = $hc->getHtmlDiv($contDiv, 'pad2 marg2', "\t", "\n", true); - $ret .= $sc->getSmartyConditions('comment_mode', '', '', $contIf); - - return $ret; - } - - - /** - * @public function render - * @param null - * @return bool|string - */ - public function render() - { - $module = $this->getModule(); - $filename = $this->getFileName(); - $moduleDirname = $module->getVar('mod_dirname'); - $language = $this->getLanguage($moduleDirname, 'MA'); - $content = $this->getTemplateUserFooterContent($moduleDirname, $language); - - $this->create($moduleDirname, 'templates', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); - - return $this->renderFile(); - } -} diff --git a/class/Files/Templates/user/Index.php b/class/Files/Templates/user/Index.php deleted file mode 100644 index dd2b12ad..00000000 --- a/class/Files/Templates/user/Index.php +++ /dev/null @@ -1,345 +0,0 @@ -setModule($module); - $this->setTable($table); - $this->setTables($tables); - $this->setFileName($filename); - } - - /** - * @public function getTemplateUserIndexHeader - * @param $moduleDirname - * @return bool|string - */ - public function getTemplateUserIndexHeader($moduleDirname) - { - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); - - return $sc->getSmartyIncludeFile($moduleDirname, 'header') . PHP_EOL; - } - - /** - * @private function getTemplatesUserIndexTable - * @param $moduleDirname - * @param $tableName - * @param $tableSoleName - * @param $language - * @return string - */ - private function getTemplatesUserIndexTable($moduleDirname, $tableName, $tableSoleName, $language) - { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); - $single = $sc->getSmartySingleVar('table_type'); - $table = $this->getTemplatesUserIndexTableThead($tableName, $language); - $table .= $this->getTemplatesUserIndexTableTBody($moduleDirname, $tableName, $tableSoleName); - - return $hc->getHtmlTable($table, 'table table-' . $single) . PHP_EOL; - } - - /** - * @private function getTemplatesUserIndexThead - * @param string $language - * @param $tableName - * @return string - */ - private function getTemplatesUserIndexTableThead($tableName, $language) - { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); - $stuTableName = mb_strtoupper($tableName); - $lang = $sc->getSmartyConst($language, $stuTableName); - $col = $sc->getSmartySingleVar('numb_col'); - $th = $hc->getHtmlTableHead($lang, '', $col) . PHP_EOL; - $tr = $hc->getHtmlTableRow($th, 'head') . PHP_EOL; - - return $hc->getHtmlTableThead($tr) . PHP_EOL; - } - - /** - * @private function getTemplatesUserIndexTbody - * @param $moduleDirname - * @param $tableName - * @param $tableSoleName - * @return string - */ - private function getTemplatesUserIndexTableTBody($moduleDirname, $tableName, $tableSoleName) - { - $hc = Tdmcreate\Files\CreateHtmlCode::getInstance(); - $sc = Tdmcreate\Files\CreateSmartyCode::getInstance(); - $type = $sc->getSmartySingleVar('panel_type'); - $include = $sc->getSmartyIncludeFileListForeach($moduleDirname, $tableName, $tableSoleName); - $div = $hc->getHtmlDiv($include, 'panel panel-' . $type); - $cont = $hc->getHtmlTableData($div) . PHP_EOL; - $html = $hc->getHtmlEmpty('
| <{\$smarty.const.{$language}TITLE}> - <{\$smarty.const.{$language}DESC}> | -
|---|
| - | -
| <{\$adv}> |
-
-
-
-
-<{/if}>\n
-EOT;
- $hc = Tdmcreate\Files\CreateHtmlCode::getInstance();
- $sc = Tdmcreate\Files\CreateSmartyCode::getInstance();
- $single = $sc->getSmartySingleVar('table_type');
- $table = $this->getTemplatesUserIndexTableThead($tableName, $language);
- $table .= $this->getTemplatesUserIndexTableTBody($moduleDirname, $tableName, $tableSoleName);
- $table .= $hc->getHtmlTable($table, 'table table-' . $single) . PHP_EOL;
- $div = $hc->getHtmlDiv($table, 'table-responsive') . PHP_EOL;
-
- return $ret/*$sc->getSmartyConditions($tableName, ' > ', '0', $div, false, true)*/ . PHP_EOL;
- }
-
- /**
- * @public function getTemplateUserIndexTable
- * @param $moduleDirname
- * @param $tableName
- * @param $tableSoleName
- * @param $language
- * @return bool|string
- */
- public function getTemplateUserIndexTable($moduleDirname, $tableName, $tableSoleName, $language)
- {
- $ret = <<| <{\$smarty.const.{$language}{$stuTableName}}> | -
|---|
| - <{include file="db:{$moduleDirname}_{$tableName}_list.tpl" {$tableSoleName}=\${$tableSoleName}}> - | - <{if \${$tableSoleName}.count is div by \$numb_col}> -
| <{\$lang_thereare}> | -
<{\$smarty.const.{$language}INDEX_LATEST_LIST}>
- | - <{include file="db:{$moduleDirname}_{$tableName}_list.tpl" {$tableSoleName}=\${$tableName}[i]}> - | - <{if \${$tableName}[i].count is div by \$divideby}> -
<{$pdfoutput}>
-EOT;
-
- return $ret;
- }
-
- /**
- * @public function render
- * @param null
- * @return bool|string
- */
- public function render()
- {
- $module = $this->getModule();
- $filename = $this->getFileName();
- $moduleDirname = $module->getVar('mod_dirname');
- $content = $this->getTemplatesUserPdfBody();
-
- $this->create($moduleDirname, 'templates', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
-
- return $this->renderFile();
- }
-}
diff --git a/class/Files/Templates/user/Rss.php b/class/Files/Templates/user/Rss.php
deleted file mode 100644
index 444b0c8e..00000000
--- a/class/Files/Templates/user/Rss.php
+++ /dev/null
@@ -1,132 +0,0 @@
-setModule($module);
- $this->setFileName($filename);
- }
-
- /**
- * @private function getTemplatesUserRssXml
- * @param null
- * @return string
- */
- private function getTemplatesUserRssXml()
- {
- $ret = <<\n
-EOT;
- break;
- default:
- $ret .= <<';\n\t\t\t\$error = true;\n", false, $t); - - $ret .= $xc->getXcSaveElements($moduleDirname, $tableName, $tableSoleName, $fields, $t); - - $condElse = $pc->getPhpCodeCommentLine('Insert Data', null, $t . "\t"); - $insert = $xc->getXcHandlerInsert($tableName, $tableName, 'Obj'); - $redirctHeader = $xc->getXcRedirectHeader('index', '', '2', "{$language}FORM_OK", true, $t . "\t\t"); - $condElse .= $pc->getPhpCodeConditions($insert, '', '', $redirctHeader, false, $t . "\t"); - $assigne = $xc->getXcXoopsTplAssign('error_message', '$errorMessage', true, $t . "\t"); - $ret .= $pc->getPhpCodeConditions('$error', ' === ', 'true', $assigne, $condElse, $t); - - $ret .= $pc->getPhpCodeCommentLine('Get Form Error', null, $t); - $ret .= $xc->getXcXoopsTplAssign('error', "\${$tableName}Obj->getHtmlErrors()", true, $t); - $ret .= $xc->getXcGetForm('form', $tableName, 'Obj', $t); - $ret .= $xc->getXcXoopsTplAssign('form', '$form->display()', true, $t); - - return $ret; - } - - /** - * @private function getUserSubmitSwitch - * @param $moduleDirname - * @param $tableName - * @param $tableSoleName - * @param $language - * @return bool|string - */ - private function getUserBrokenSwitch($moduleDirname, $tableName, $tableSoleName, $language) - { - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $table = $this->getTable(); - $tableId = $table->getVar('table_id'); - $tableMid = $table->getVar('table_mid'); - $fields = $this->getTableFields($tableMid, $tableId); - $cases = [ - 'form' => [$this->getUserBrokenForm($tableName, $language, "\t\t")], - 'save' => [$this->getUserBrokenSave($moduleDirname, $fields, $tableName, $tableSoleName, $language, "\t\t")], - ]; - - return $xc->getXcSwitch('op', $cases, true, false); - } - - /** - * @public function render - * @param null - * @return bool|string - */ - public function render() - { - $module = $this->getModule(); - $table = $this->getTable(); - $filename = $this->getFileName(); - $moduleDirname = $module->getVar('mod_dirname'); - $tableId = $table->getVar('table_id'); - $tableMid = $table->getVar('table_mid'); - $tableName = $table->getVar('table_name'); - $tableSoleName = $table->getVar('table_solename'); - $fields = $this->getTableFields($tableMid, $tableId); - $language = $this->getLanguage($moduleDirname, 'MA'); - $content = $this->getHeaderFilesComments($module); - $content .= $this->getUserBrokenHeader($moduleDirname, $fields); - $content .= $this->getUserBrokenSwitch($moduleDirname, $tableName, $tableSoleName, $language); - $content .= $this->getInclude('footer'); - - $this->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); - - return $this->renderFile(); - } -} diff --git a/class/Files/User/UserFooter.php b/class/Files/User/UserFooter.php index 17659e54..1532ebce 100644 --- a/class/Files/User/UserFooter.php +++ b/class/Files/User/UserFooter.php @@ -1,9 +1,9 @@ -xc = Modulebuilder\Files\CreateXoopsCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); + $this->uxc = Modulebuilder\Files\User\UserXoopsCode::getInstance(); } /** * @static function getInstance - * @param null * @return UserFooter */ public static function getInstance() @@ -57,10 +71,10 @@ public static function getInstance() /** * @public function write - * @param string $module + * @param $module * @param string $filename */ - public function write($module, $filename) + public function write($module, string $filename): void { $this->setModule($module); $this->setFileName($filename); @@ -69,43 +83,51 @@ public function write($module, $filename) /** * @private function getUserFooter * @param $moduleDirname + * @param $language * * @return string */ - private function getUserFooter($moduleDirname) + private function getUserFooter($moduleDirname, $language) { - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $stuModuleDirname = mb_strtoupper($moduleDirname); - $xoBreadcrumbs = $xc->getXcXoopsTplAssign('xoBreadcrumbs', '$xoBreadcrumbs', true, "\t"); - $ret = $pc->getPhpCodeConditions('count($xoBreadcrumbs)', ' > ', '1', $xoBreadcrumbs); - $ret .= $xc->getXcXoopsTplAssign('adv', "\$helper->getConfig('advertise')"); - $ret .= $pc->getPhpCodeCommentLine(); - $ret .= $xc->getXcXoopsTplAssign('bookmarks', "\$helper->getConfig('bookmarks')"); - $ret .= $xc->getXcXoopsTplAssign('fbcomments', "\$helper->getConfig('fbcomments')"); - $ret .= $pc->getPhpCodeCommentLine(); - $ret .= $xc->getXcXoopsTplAssign('admin', "{$stuModuleDirname}_ADMIN"); - $ret .= $xc->getXcXoopsTplAssign('copyright', '$copyright'); - $ret .= $pc->getPhpCodeCommentLine(); - $ret .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'footer', true); + $stuModuleDirname = \mb_strtoupper($moduleDirname); + $xoBreadcrumbs = $this->xc->getXcXoopsTplAssign('xoBreadcrumbs', '$xoBreadcrumbs', true, "\t"); + $config = $this->xc->getXcGetConfig('show_breadcrumbs'); + $ret = $this->pc->getPhpCodeConditions($config . ' && \count($xoBreadcrumbs) > 0', '', '', $xoBreadcrumbs); + $ret .= $this->xc->getXcXoopsTplAssign('adv', "\$helper->getConfig('advertise')"); + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->xc->getXcXoopsTplAssign('bookmarks', "\$helper->getConfig('bookmarks')"); + $ret .= $this->xc->getXcXoopsTplAssign('fbcomments', "\$helper->getConfig('fbcomments')"); + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->xc->getXcXoopsTplAssign('admin', "\\{$stuModuleDirname}_ADMIN"); + $ret .= $this->xc->getXcXoopsTplAssign('copyright', '$copyright'); + $ret .= $this->pc->getPhpCodeCommentLine('Meta description'); + $ret .= $this->uxc->getUserMetaDesc($moduleDirname); + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->pc->getPhpCodeCommentLine('Paths'); + $ret .= $this->xc->getXcXoopsTplAssign('xoops_mpageurl', "\\{$stuModuleDirname}_URL.'/index.php'"); + $ret .= $this->xc->getXcXoopsTplAssign('xoops_icons32_url', '\XOOPS_ICONS32_URL'); + $ret .= $this->xc->getXcXoopsTplAssign("{$moduleDirname}_url", "\\{$stuModuleDirname}_URL"); + $ret .= $this->xc->getXcXoopsTplAssign("{$moduleDirname}_upload_url", "\\{$stuModuleDirname}_UPLOAD_URL"); + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->pc->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH', 'footer', true); return $ret; } /** * @public function render - * @param null - * @return bool|string + * @return string */ public function render() { $module = $this->getModule(); $moduleDirname = $module->getVar('mod_dirname'); + $language = $this->getLanguage($moduleDirname, 'MA'); $filename = $this->getFileName(); $content = $this->getHeaderFilesComments($module); - $content .= $this->getUserFooter($moduleDirname); + $content .= $this->getUserFooter($moduleDirname, $language); - $this->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, '/', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/User/UserHeader.php b/class/Files/User/UserHeader.php index 8c48bf11..da25d5e1 100644 --- a/class/Files/User/UserHeader.php +++ b/class/Files/User/UserHeader.php @@ -1,9 +1,9 @@ -xc = Modulebuilder\Files\CreateXoopsCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); } /** * @static function getInstance - * @param null * @return UserHeader */ public static function getInstance() @@ -57,12 +66,12 @@ public static function getInstance() /** * @public function write - * @param string $module + * @param $module * @param mixed $table * @param array $tables * @param string $filename */ - public function write($module, $table, $tables, $filename) + public function write($module, $table, array $tables, string $filename): void { $this->setModule($module); $this->setTable($table); @@ -78,57 +87,55 @@ public function write($module, $table, $tables, $filename) */ private function getUserHeader($moduleDirname) { - $stuModuleDirname = mb_strtoupper($moduleDirname); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $uxc = UserXoopsCode::getInstance(); - $ret = $pc->getPhpCodeIncludeDir('dirname(dirname(__DIR__))', 'mainfile'); - $ret .= $pc->getPhpCodeIncludeDir('__DIR__', 'include/common'); - $ret .= $xc->getXcEqualsOperator('$moduleDirName', 'basename(__DIR__)'); - $language = $this->getLanguage($moduleDirname, 'MA'); - $ret .= $uxc->getUserBreadcrumbsHeaderFile($moduleDirname, $language); - - $table = $this->getTable(); - $tables = $this->getTables(); - if (is_object($table) && '' != $table->getVar('table_name')) { - $ret .= $xc->getXcHelperGetInstance($moduleDirname); - } - if (is_array($tables)) { - foreach (array_keys($tables) as $i) { + $stuModuleDirname = \mb_strtoupper($moduleDirname); + $tables = $this->getTables(); + + $ret = $this->pc->getPhpCodeIncludeDir('\dirname(__DIR__, 2)', 'mainfile'); + $ret .= $this->pc->getPhpCodeIncludeDir('__DIR__', 'include/common'); + $ret .= $this->xc->getXcEqualsOperator('$moduleDirName', '\basename(__DIR__)'); + $ret .= $this->pc->getPhpCodeCommentLine('Breadcrumbs'); + $ret .= $this->pc->getPhpCodeArray('xoBreadcrumbs', null, false, ''); + $ret .= $this->xc->getXcHelperGetInstance($moduleDirname); + $permissions = 0; + $ratings = 0; + if (\is_array($tables)) { + foreach (\array_keys($tables) as $i) { $tableName = $tables[$i]->getVar('table_name'); - $ret .= $xc->getXcHandlerLine($tableName); + $ret .= $this->xc->getXcHandlerLine($tableName); + if (1 == $tables[$i]->getVar('table_permissions')) { + $permissions = 1; + } + if (1 == $tables[$i]->getVar('table_rate')) { + $ratings = 1; + } } } - $ret .= $pc->getPhpCodeCommentLine('Permission'); - $ret .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/xoopsform/grouppermform', true); - $ret .= $xc->getXcXoopsHandler('groupperm'); - - $condIf = $xc->getXcEqualsOperator('$groups ', '$xoopsUser->getGroups()', null, "\t"); - $condElse = $xc->getXcEqualsOperator('$groups ', 'XOOPS_GROUP_ANONYMOUS', null, "\t"); - - $ret .= $pc->getPhpCodeConditions('is_object($xoopsUser)', '', '', $condIf, $condElse); - $ret .= $pc->getPhpCodeCommentLine(); - $ret .= $xc->getXcEqualsOperator('$myts', 'MyTextSanitizer::getInstance()'); - $ret .= $pc->getPhpCodeCommentLine('Default Css Style'); - $ret .= $xc->getXcEqualsOperator('$style', "{$stuModuleDirname}_URL . '/assets/css/style.css'"); - $ret .= $pc->getPhpCodeConditions('!file_exists($style)', '', '', "\treturn false;\n"); - $ret .= $pc->getPhpCodeCommentLine('Smarty Default'); - $ret .= $xc->getXcXoopsModuleGetInfo('sysPathIcon16', 'sysicons16'); - $ret .= $xc->getXcXoopsModuleGetInfo('sysPathIcon32', 'sysicons32'); - $ret .= $xc->getXcXoopsModuleGetInfo('pathModuleAdmin', 'dirmoduleadmin'); - $ret .= $xc->getXcXoopsModuleGetInfo('modPathIcon16', 'modicons16'); - $ret .= $xc->getXcXoopsModuleGetInfo('modPathIcon32', 'modicons16'); - $ret .= $pc->getPhpCodeCommentLine('Load Languages'); - $ret .= $xc->getXcXoopsLoadLanguage('main'); - $ret .= $xc->getXcXoopsLoadLanguage('modinfo'); + if (1 == $permissions) { + $ret .= $this->xc->getXcHandlerLine('permissions'); + } + if (1 == $ratings) { + $ret .= $this->xc->getXcHandlerLine('ratings'); + } + $ret .= $this->pc->getPhpCodeCommentLine(); + $ret .= $this->xc->getXcEqualsOperator('$myts', 'MyTextSanitizer::getInstance()'); + $ret .= $this->pc->getPhpCodeCommentLine('Default Css Style'); + $ret .= $this->xc->getXcEqualsOperator('$style', "\\{$stuModuleDirname}_URL . '/assets/css/style.css'"); + $ret .= $this->pc->getPhpCodeCommentLine('Smarty Default'); + $ret .= $this->xc->getXcXoopsModuleGetInfo('sysPathIcon16', 'sysicons16'); + $ret .= $this->xc->getXcXoopsModuleGetInfo('sysPathIcon32', 'sysicons32'); + $ret .= $this->xc->getXcXoopsModuleGetInfo('pathModuleAdmin', 'dirmoduleadmin'); + $ret .= $this->xc->getXcXoopsModuleGetInfo('modPathIcon16', 'modicons16'); + $ret .= $this->xc->getXcXoopsModuleGetInfo('modPathIcon32', 'modicons16'); + $ret .= $this->pc->getPhpCodeCommentLine('Load Languages'); + $ret .= $this->xc->getXcXoopsLoadLanguage('main'); + $ret .= $this->xc->getXcXoopsLoadLanguage('modinfo'); return $ret; } /** * @public function render - * @param null - * @return bool|string + * @return string */ public function render() { @@ -138,7 +145,7 @@ public function render() $content = $this->getHeaderFilesComments($module); $content .= $this->getUserHeader($moduleDirname); - $this->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, '/', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/User/UserIndex.php b/class/Files/User/UserIndex.php index e9346d3f..36e77fcc 100644 --- a/class/Files/User/UserIndex.php +++ b/class/Files/User/UserIndex.php @@ -1,9 +1,9 @@ -xc = Modulebuilder\Files\CreateXoopsCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); + $this->uxc = Modulebuilder\Files\User\UserXoopsCode::getInstance(); } /** * @static function getInstance - * @param null * @return UserIndex */ public static function getInstance() @@ -57,11 +71,11 @@ public static function getInstance() /** * @public function write - * @param string $module + * @param $module * @param $table * @param string $filename */ - public function write($module, $table, $filename) + public function write($module, $table, string $filename) { $this->setModule($module); $this->setTable($table); @@ -69,22 +83,22 @@ public function write($module, $table, $filename) } /** - * @private function getTemplateHeaderFile + * @private function getUserIndexHeader + * @param $language * @param $moduleDirname * * @return string */ - private function getTemplateHeaderFile($moduleDirname) + private function getUserIndexHeader($language, $moduleDirname) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $uxc = UserXoopsCode::getInstance(); - $ret = $this->getInclude(); - $ret .= $uxc->getUserTplMain($moduleDirname); - $ret .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'header', true); - $ret .= $pc->getPhpCodeCommentLine('Define Stylesheet'); - $ret .= $xc->getXcXoThemeAddStylesheet(); - $ret .= $pc->getPhpCodeArray('keywords', null, false, ''); + $ret = $this->getRequire(); + $ret .= $this->uxc->getUserTplMain($moduleDirname); + $ret .= $this->pc->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH', 'header', true); + $ret .= $this->pc->getPhpCodeCommentLine('Define Stylesheet'); + $ret .= $this->xc->getXcXoThemeAddStylesheet(); + $ret .= $this->pc->getPhpCodeCommentLine('Keywords'); + $ret .= $this->pc->getPhpCodeArray('keywords', null, false, ''); + $ret .= $this->uxc->getUserBreadcrumbs($language); return $ret; } @@ -103,32 +117,30 @@ private function getBodyCategoriesIndex($tableMid, $tableId, $tableName, $tableS // Fields $fields = $this->getTableFields($tableMid, $tableId); $fieldParentId = []; - foreach (array_keys($fields) as $f) { + foreach (\array_keys($fields) as $f) { $fieldParentId[] = $fields[$f]->getVar('field_parent'); } $ret = ''; - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - if (in_array(1, $fieldParentId)) { - $ret .= $xc->getXcHandlerCountObj($tableName); - $ret .= $pc->getPhpCodeCommentLine('If there are ', $tableName); + if (\in_array(1, $fieldParentId)) { + $ret .= $this->xc->getXcHandlerCountObj($tableName); + $ret .= $this->pc->getPhpCodeCommentLine('If there are ', $tableName); $ret .= $this->getSimpleString('$count = 1;'); - $contentIf = $xc->getXcHandlerAllObj($tableName, '', 0, 0, "\t"); - $contentIf .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/tree', true, false, 'include', "\t"); + $contentIf = $this->xc->getXcHandlerAllObj($tableName, '', '0', '0', "\t"); + $contentIf .= $this->pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/tree', true, false, 'require', "\t"); //$contentIf .= $cc->getClassXoopsObjectTree('mytree', $tableName, $fieldId, $fieldParent, "\t"); - $contentIf .= $pc->getPhpCodeArray($tableName, "\t"); - $foreach = $xc->getXcGetValues($tableName, $tableSoleName . 'Values', $tableFieldname, false, "\t\t"); - $foreach .= $pc->getPhpCodeArray('acount', ["'count'", '$count']); - $foreach .= $pc->getPhpCodeArrayType($tableName, 'merge', $tableSoleName . 'Values', '$acount'); + $contentIf .= $this->pc->getPhpCodeArray($tableName, "\t"); + $foreach = $this->xc->getXcGetValues($tableName.'aaa', $tableSoleName.'bbb' . 'Values', $tableFieldname, false, "\t\t"); + $foreach .= $this->pc->getPhpCodeArray('acount', ["'count'", '$count']); + $foreach .= $this->pc->getPhpCodeArrayType($tableName, 'merge', $tableSoleName . 'Values', '$acount'); $foreach .= $this->getSimpleString('++$count;', "\t\t"); - $contentIf .= $pc->getPhpCodeForeach("{$tableName}All", true, false, $tableFieldname, $foreach, "\t"); - $contentIf .= $xc->getXcXoopsTplAssign($tableName, '$' . $tableName, true, "\t"); - $contentIf .= $pc->getPhpCodeUnset($tableName, "\t"); - $getConfig = $xc->getXcGetConfig('numb_col'); - $contentIf .= $xc->getXcXoopsTplAssign('numb_col', $getConfig, true, "\t"); - $ret .= $pc->getPhpCodeConditions("\${$tableName}Count", ' > ', '0', $contentIf, false); - $ret .= $pc->getPhpCodeUnset('count'); + $contentIf .= $this->pc->getPhpCodeForeach("{$tableName}All", true, false, $tableFieldname, $foreach, "\t"); + $contentIf .= $this->xc->getXcXoopsTplAssign($tableName, '$' . $tableName, true, "\t"); + $contentIf .= $this->pc->getPhpCodeUnset($tableName, "\t"); + $getConfig = $this->xc->getXcGetConfig('numb_col'); + $contentIf .= $this->xc->getXcXoopsTplAssign('numb_col', $getConfig, true, "\t"); + $ret .= $this->pc->getPhpCodeConditions("\${$tableName}Count", ' > ', '0', $contentIf); + $ret .= $this->pc->getPhpCodeUnset('count'); } unset($fieldParentId); @@ -137,61 +149,54 @@ private function getBodyCategoriesIndex($tableMid, $tableId, $tableName, $tableS /** * @private function getBodyPagesIndex - * @param $moduleDirname * @param $tableName - * @param $tableSoleName * @param $language + * @param $tableMid + * @param $tableId * @return string */ - private function getBodyPagesIndex($moduleDirname, $tableName, $tableSoleName, $language) + private function getBodyPagesIndex($tableName, $language, $tableMid, $tableId) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $stuModuleDirname = mb_strtoupper($moduleDirname); - $ucfTableName = ucfirst($tableName); - $ret = $pc->getPhpCodeCommentLine(); - $ret .= $xc->getXcXoopsTplAssign('xoops_icons32_url', 'XOOPS_ICONS32_URL'); - $ret .= $xc->getXcXoopsTplAssign("{$moduleDirname}_url", "{$stuModuleDirname}_URL"); - $ret .= $pc->getPhpCodeCommentLine(); - $ret .= $xc->getXcHandlerCountObj($tableName); - $ret .= $xc->getXcXoopsTplAssign($tableName . 'Count', "\${$tableName}Count"); - $ret .= $this->getSimpleString('$count = 1;'); - $condIf = $xc->getXcXoopsRequest('start', 'start', '0', 'Int', false, "\t"); - $userpager = $xc->getXcGetConfig('userpager'); - $condIf .= $xc->getXcXoopsRequest('limit', 'limit', $userpager, 'Int', false, "\t"); - $condIf .= $xc->getXcHandlerAllObj($tableName, '', '$start', '$limit', "\t"); - $condIf .= $pc->getPhpCodeCommentLine('Get All', $ucfTableName, "\t"); - $condIf .= $pc->getPhpCodeArray($tableName, null, false, "\t"); - $foreach = $xc->getXcGetValues($tableName, $tableSoleName, 'i', false, "\t\t"); - $foreach .= $pc->getPhpCodeArray('acount', ["'count'", '$count']); - $foreach .= $pc->getPhpCodeArrayType($tableName, 'merge', $tableSoleName, '$acount'); - $table = $this->getTable(); + $ucfTableName = \ucfirst($tableName); + $fields = $this->getTableFields($tableMid, $tableId); + + $ret = $this->pc->getPhpCodeCommentLine('Tables'); + $ret .= $this->xc->getXcHandlerCountObj($tableName); + $ret .= $this->xc->getXcXoopsTplAssign($tableName . 'Count', "\${$tableName}Count"); + //$ret .= $this->getSimpleString('$count = 1;'); + $condIf = $this->xc->getXcXoopsRequest('start', 'start', '', 'Int', "\t"); + $userpager = $this->xc->getXcGetConfig('userpager'); + $condIf .= $this->xc->getXcXoopsRequest('limit', 'limit', $userpager, 'Int', "\t"); + $condIf .= $this->xc->getXcHandlerAllObj($tableName, '', '$start', '$limit', "\t"); + $condIf .= $this->pc->getPhpCodeCommentLine('Get All', $ucfTableName, "\t"); + $condIf .= $this->pc->getPhpCodeArray($tableName . '_list', null, false, "\t"); + $foreach = $this->xc->getXcGetValues($tableName, $tableName . '_list[]', 'i', false, "\t\t"); + //$foreach .= $this->pc->getPhpCodeArray('acount', ["'count'", '$count']); + //$foreach .= $this->pc->getPhpCodeArrayType($tableName . '_list', 'merge', $tableSoleName . '_list', '$acount'); // Fields - $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); $fieldMain = ''; - foreach (array_keys($fields) as $f) { + foreach (\array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); if (1 == $fields[$f]->getVar('field_main')) { $fieldMain = $fieldName; // fieldMain = fields parameters main field } } - $foreach .= $xc->getXcGetVar('keywords[]', "{$tableName}All[\$i]", $fieldMain, false, "\t\t"); - $foreach .= $this->getSimpleString('++$count;', "\t\t"); - $condIf .= $pc->getPhpCodeForeach("{$tableName}All", true, false, 'i', $foreach, "\t"); - $condIf .= $xc->getXcXoopsTplAssign($tableName, '$' . $tableName, true, "\t"); - $condIf .= $pc->getPhpCodeUnset($tableName, "\t"); - $condIf .= $xc->getXcPageNav($tableName, "\t"); - $thereare = $pc->getPhpCodeSprintf("{$language}INDEX_THEREARE", "\${$tableName}Count"); - $condIf .= $xc->getXcXoopsTplAssign('lang_thereare', $thereare, true, "\t"); - $divideby = $xc->getXcGetConfig('divideby'); - $condIf .= $xc->getXcXoopsTplAssign('divideby', $divideby, true, "\t"); - $numb_col = $xc->getXcGetConfig('numb_col'); - $condIf .= $xc->getXcXoopsTplAssign('numb_col', $numb_col, true, "\t"); - - $ret .= $pc->getPhpCodeConditions("\${$tableName}Count", ' > ', '0', $condIf); - $ret .= $pc->getPhpCodeUnset('count'); - $tableType = $xc->getXcGetConfig('table_type'); - $ret .= $xc->getXcXoopsTplAssign('table_type', $tableType); + $foreach .= $this->xc->getXcGetVar('keywords[]', "{$tableName}All[\$i]", $fieldMain, false, "\t\t"); + //$foreach .= $this->getSimpleString('++$count;', "\t\t"); + $condIf .= $this->pc->getPhpCodeForeach("{$tableName}All", true, false, 'i', $foreach, "\t"); + $condIf .= $this->xc->getXcXoopsTplAssign($tableName . '_list', '$' . $tableName . '_list', true, "\t"); + $condIf .= $this->pc->getPhpCodeUnset($tableName, "\t"); + $condIf .= $this->xc->getXcPageNav($tableName, "\t"); + $thereare = $this->pc->getPhpCodeSprintf("{$language}INDEX_THEREARE", "\${$tableName}Count"); + $condIf .= $this->xc->getXcXoopsTplAssign('lang_thereare', $thereare, true, "\t"); + $divideby = $this->xc->getXcGetConfig('divideby'); + $condIf .= $this->xc->getXcXoopsTplAssign('divideby', $divideby, true, "\t"); + $numb_col = $this->xc->getXcGetConfig('numb_col'); + $condIf .= $this->xc->getXcXoopsTplAssign('numb_col', $numb_col, true, "\t"); + $ret .= $this->pc->getPhpCodeConditions("\${$tableName}Count", ' > ', '0', $condIf); + //$ret .= $this->pc->getPhpCodeUnset('count'); + $tableType = $this->xc->getXcGetConfig('table_type'); + $ret .= $this->xc->getXcXoopsTplAssign('table_type', $tableType); return $ret; } @@ -199,66 +204,55 @@ private function getBodyPagesIndex($moduleDirname, $tableName, $tableSoleName, $ /** * @private function getUserPagesFooter * @param $moduleDirname - * @param $language + * * @return string */ - private function getUserIndexFooter($moduleDirname, $language) + private function getUserIndexFooter($moduleDirname) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $uxc = UserXoopsCode::getInstance(); - $stuModuleDirname = mb_strtoupper($moduleDirname); - $ret = $pc->getPhpCodeCommentLine('Breadcrumbs'); - $ret .= $uxc->getUserBreadcrumbs($language); - $ret .= $pc->getPhpCodeCommentLine('Keywords'); - $ret .= $uxc->getUserMetaKeywords($moduleDirname); - $ret .= $pc->getPhpCodeUnset('keywords'); - $ret .= $pc->getPhpCodeCommentLine('Description'); - $ret .= $uxc->getUserMetaDesc($moduleDirname, $language); - $ret .= $xc->getXcXoopsTplAssign('xoops_mpageurl', "{$stuModuleDirname}_URL.'/index.php'"); - $ret .= $xc->getXcXoopsTplAssign('xoops_icons32_url', 'XOOPS_ICONS32_URL'); - $ret .= $xc->getXcXoopsTplAssign("{$moduleDirname}_upload_url", "{$stuModuleDirname}_UPLOAD_URL"); - $ret .= $this->getInclude('footer'); + $ret = $this->pc->getPhpCodeCommentLine('Meta keywords'); + $ret .= $this->uxc->getUserMetaKeywords($moduleDirname); + $ret .= $this->pc->getPhpCodeUnset('keywords'); + $ret .= $this->getRequire('footer'); return $ret; } /** * @public function render - * @param null - * @return bool|string + * @return string */ public function render() { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); $module = $this->getModule(); $tables = $this->getTableTables($module->getVar('mod_id'), 'table_order'); $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); $language = $this->getLanguage($moduleDirname, 'MA'); - $content = $this->getHeaderFilesComments($module, null); - $content .= $pc->getPhpCodeUseNamespace(['Xmf', 'Request'], '', ''); - $content .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', ''); - $content .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']); - $content .= $this->getTemplateHeaderFile($moduleDirname); - foreach (array_keys($tables) as $t) { - $tableId = $tables[$t]->getVar('table_id'); - $tableMid = $tables[$t]->getVar('table_mid'); - $tableName = $tables[$t]->getVar('table_name'); - $tableSoleName = $tables[$t]->getVar('table_solename'); - $tableCategory[] = $tables[$t]->getVar('table_category'); - $tableFieldname = $tables[$t]->getVar('table_fieldname'); - $tableIndex[] = $tables[$t]->getVar('table_index'); - if (in_array(1, $tableCategory, true) && in_array(1, $tableIndex)) { + + $content = $this->getHeaderFilesComments($module); + $content .= $this->pc->getPhpCodeUseNamespace(['Xmf', 'Request'], '', ''); + $content .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', ''); + $content .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']); + $content .= $this->getUserIndexHeader($language, $moduleDirname); + + foreach (\array_keys($tables) as $t) { + $tableId = $tables[$t]->getVar('table_id'); + $tableMid = $tables[$t]->getVar('table_mid'); + $tableName = $tables[$t]->getVar('table_name'); + $tableSoleName = $tables[$t]->getVar('table_solename'); + $tableCategory = $tables[$t]->getVar('table_category'); + $tableFieldname = $tables[$t]->getVar('table_fieldname'); + $tableIndex = $tables[$t]->getVar('table_index'); + if (1 == $tableCategory && 1 == $tableIndex) { $content .= $this->getBodyCategoriesIndex($tableMid, $tableId, $tableName, $tableSoleName, $tableFieldname); } - if (in_array(0, $tableCategory, true) && in_array(1, $tableIndex)) { - $content .= $this->getBodyPagesIndex($moduleDirname, $tableName, $tableSoleName, $language); + if (0 == $tableCategory && 1 == $tableIndex) { + $content .= $this->getBodyPagesIndex($tableName, $language, $tableMid, $tableId); } } - $content .= $this->getUserIndexFooter($moduleDirname, $language); + $content .= $this->getUserIndexFooter($moduleDirname); - $this->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, '/', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/User/UserListTag.php b/class/Files/User/UserListTag.php index 34b2c732..d88699a3 100644 --- a/class/Files/User/UserListTag.php +++ b/class/Files/User/UserListTag.php @@ -1,9 +1,9 @@ -pc = Tdmcreate\Files\CreatePhpCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); } /** * @static function getInstance - * @param null * @return UserListTag */ public static function getInstance() @@ -63,10 +61,10 @@ public static function getInstance() /** * @public function write - * @param string $module + * @param $module * @param string $filename */ - public function write($module, $filename) + public function write($module, string $filename): void { $this->setModule($module); $this->setFileName($filename); @@ -74,21 +72,19 @@ public function write($module, $filename) /** * @public function getUserListTag - * @param null * @return string */ public function getUserListTag() { - $ret = $this->getInclude(); - $ret .= $this->pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'modules/tag/list.tag'); + $ret = $this->getRequire(); + $ret .= $this->pc->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH', 'modules/tag/list.tag'); return $ret; } /** * @public function render - * @param null - * @return bool|string + * @return string */ public function render() { @@ -98,7 +94,7 @@ public function render() $content = $this->getHeaderFilesComments($module); $content .= $this->getUserListTag(); - $this->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, '/', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/User/UserNotificationUpdate.php b/class/Files/User/UserNotificationUpdate.php index f6d6fbf2..a494d813 100644 --- a/class/Files/User/UserNotificationUpdate.php +++ b/class/Files/User/UserNotificationUpdate.php @@ -1,9 +1,9 @@ -pc = Tdmcreate\Files\CreatePhpCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); } /** * @static function getInstance - * @param null * @return UserNotificationUpdate */ public static function getInstance() @@ -63,10 +61,10 @@ public static function getInstance() /** * @public function write - * @param string $module + * @param $module * @param string $filename */ - public function write($module, $filename) + public function write($module, string $filename): void { $this->setModule($module); $this->setFileName($filename); @@ -74,8 +72,7 @@ public function write($module, $filename) /** * @public function render - * @param null - * @return bool|string + * @return string */ public function render() { @@ -83,10 +80,10 @@ public function render() $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); $content = $this->getHeaderFilesComments($module); - $content .= $this->pc->getPhpCodeIncludeDir('dirname(dirname(__DIR__))', 'mainfile'); - $content .= $this->pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'include/notification_update'); + $content .= $this->pc->getPhpCodeIncludeDir('\dirname(__DIR__, 2)', 'mainfile'); + $content .= $this->pc->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH', 'include/notification_update'); - $this->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, '/', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/User/UserPages.php b/class/Files/User/UserPages.php index 5525f51d..74b2b211 100644 --- a/class/Files/User/UserPages.php +++ b/class/Files/User/UserPages.php @@ -1,9 +1,12 @@ -xc = Modulebuilder\Files\CreateXoopsCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); + $this->uxc = Modulebuilder\Files\User\UserXoopsCode::getInstance(); } /** * @static function getInstance - * @param null * @return UserPages */ public static function getInstance() @@ -73,81 +90,480 @@ public function write($module, $table, $filename) * @param $moduleDirname * @param $tableName * @param $fieldId + * @param $tablePermissions + * @param $language * @return string */ - private function getUserPagesHeader($moduleDirname, $tableName, $fieldId) + private function getUserPagesHeader($moduleDirname, $tableName, $fieldId, $tablePermissions, $language) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $uxc = UserXoopsCode::getInstance(); - $ccFieldId = $this->getCamelCase($fieldId, false, true); - $ret = $pc->getPhpCodeUseNamespace(['Xmf', 'Request'], '', ''); - $ret .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', ''); - $ret .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']); - $ret .= $this->getInclude(); - $ret .= $uxc->getUserTplMain($moduleDirname, $tableName); - $ret .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'header', true); - $ret .= $pc->getPhpCodeBlankLine(); - $ret .= $xc->getXcXoopsRequest('op', 'op', 'list', 'String'); - $ret .= $xc->getXcXoopsRequest($ccFieldId, $fieldId, '0', 'Int'); - $ret .= $xc->getXcXoopsRequest('start', 'start', '0', 'Int'); - $userpager = $xc->getXcGetConfig('userpager'); - $ret .= $xc->getXcXoopsRequest('limit', 'limit', $userpager, 'Int'); - $ret .= $pc->getPhpCodeBlankLine(); - $ret .= $pc->getPhpCodeCommentLine('Define Stylesheet'); - $ret .= $xc->getXcXoThemeAddStylesheet(); + $ccFieldId = $this->getCamelCase($fieldId, false, true); + + $ret = $this->pc->getPhpCodeUseNamespace(['Xmf', 'Request'], '', ''); + $ret .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', ''); + $ret .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants'], '', ''); + $ret .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Common']); + $ret .= $this->getRequire(); + $ret .= $this->uxc->getUserTplMain($moduleDirname, $tableName); + $ret .= $this->pc->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH', 'header', true); + $ret .= $this->pc->getPhpCodeBlankLine(); + $leftLen = \strlen($ccFieldId); + $leftOp = 'op'; + $leftField = $ccFieldId; + $leftStart = 'start'; + $leftLimit = 'limit'; + if ($leftLen > 5) { + $leftOp .= \str_repeat(' ', $leftLen - 2); + $leftStart .= \str_repeat(' ', $leftLen - 5); + $leftLimit .= \str_repeat(' ', $leftLen - 5); + } else { + $leftOp .= \str_repeat(' ', 3); + if (\strlen($ccFieldId) < 5) { + $leftField .= \str_repeat(' ', 5 - $leftLen); + } + } + $ret .= $this->xc->getXcXoopsRequest($leftOp, 'op', 'list', 'Cmd'); + $ret .= $this->xc->getXcXoopsRequest($leftField, $fieldId, '', 'Int'); + $ret .= $this->xc->getXcXoopsRequest($leftStart, 'start', '', 'Int'); + $userpager = $this->xc->getXcGetConfig('userpager'); + $ret .= $this->xc->getXcXoopsRequest($leftLimit, 'limit', $userpager, 'Int'); + $ret .= $this->xc->getXcXoopsTplAssign('start', '$start'); + $ret .= $this->xc->getXcXoopsTplAssign('limit', '$limit'); + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->pc->getPhpCodeCommentLine('Define Stylesheet'); + $ret .= $this->xc->getXcXoThemeAddStylesheet(); + $ret .= $this->pc->getPhpCodeCommentLine('Keywords'); + $ret .= $this->pc->getPhpCodeArray('keywords', null, false, ''); + $ret .= $this->uxc->getUserBreadcrumbs($language, 'index', '', 'index.php'); + $ret .= $this->pc->getPhpCodeCommentLine('Permissions'); + if (1 == $tablePermissions) { + $ret .= $this->xc->getXcEqualsOperator('$permEdit', '$permissionsHandler->getPermGlobalSubmit()'); + $ret .= $this->xc->getXcXoopsTplAssign('permEdit', '$permEdit'); + } + $ret .= $this->xc->getXcXoopsTplAssign('showItem', "\${$ccFieldId} > 0"); + $ret .= $this->pc->getPhpCodeBlankLine(); return $ret; } /** - * @private function getUserPages + * @private function getUserPagesList * @param $moduleDirname * @param $tableName * @param $fieldId * @param $fieldMain + * @param $tableRate + * @param $fieldReads + * @param $language + * @param string $t * @return string */ - private function getUserPages($moduleDirname, $tableName, $fieldId, $fieldMain) + private function getUserPagesList($moduleDirname, $tableName, $fieldId, $fieldMain, $tableRate, $fieldReads, $language, string $t = '') { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $stuModuleDirname = mb_strtoupper($moduleDirname); - $ucfTableName = ucfirst($tableName); + $ucfTableName = \ucfirst($tableName); + $stuTableName = \mb_strtoupper($tableName); $ccFieldId = $this->getCamelCase($fieldId, false, true); + $ccFieldMain = $this->getCamelCase($fieldMain, false, true); + $ccFieldReads = $this->getCamelCase($fieldReads, false, true); + $stuModuleDirname = \mb_strtoupper($moduleDirname); + + $ret = $this->uxc->getUserBreadcrumbs($language, $tableName, 'list', '', $t); + if ($tableRate) { + $varRate = '$ratingbars'; + $ret .= $this->xc->getXcEqualsOperator($varRate, '(int)' . $this->xc->getXcGetConfig('ratingbars'),'', $t); + $contIf = $this->xc->getXcXoThemeAddStylesheet("\\{$stuModuleDirname}_URL . '/assets/css/rating.css'", $t . "\t", false); + $contIf .= $this->xc->getXcXoopsTplAssign('rating', $varRate, true, $t . "\t"); + $contIf .= $this->xc->getXcXoopsTplAssign('rating_5stars', "(Constants::RATING_5STARS === {$varRate})", true, $t . "\t"); + $contIf .= $this->xc->getXcXoopsTplAssign('rating_10stars', "(Constants::RATING_10STARS === {$varRate})", true, $t . "\t"); + $contIf .= $this->xc->getXcXoopsTplAssign('rating_10num', "(Constants::RATING_10NUM === {$varRate})", true, $t . "\t"); + $contIf .= $this->xc->getXcXoopsTplAssign('rating_likes', "(Constants::RATING_LIKES === {$varRate})", true, $t . "\t"); + $contIf .= $this->xc->getXcXoopsTplAssign('itemid', "'{$fieldId}'", true, $t . "\t"); + $contIf .= $this->xc->getXcXoopsTplAssign($moduleDirname . '_icon_url_16', "\\{$stuModuleDirname}_URL . '/' . \$modPathIcon16", true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions($varRate, ' > ', '0', $contIf, false, $t); + } + $critName = 'cr' . $ucfTableName; + $ret .= $this->xc->getXcCriteriaCompo($critName, $t); + $crit = $this->xc->getXcCriteria('', "'{$fieldId}'", "\${$ccFieldId}",'',true); + $contIf = $this->xc->getXcCriteriaAdd($critName, $crit, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions("\${$ccFieldId}", ' > ', '0', $contIf, false, $t); + $ret .= $this->xc->getXcHandlerCountClear($tableName . 'Count', $tableName, '$' . $critName, $t); + $ret .= $this->xc->getXcXoopsTplAssign($tableName . 'Count', "\${$tableName}Count", true, $t); + $contIf = $this->xc->getXcCriteriaSetStart($critName, '$start', $t . "\t"); + $contIf .= $this->xc->getXcCriteriaSetLimit($critName, '$limit', $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions("\${$ccFieldId}", ' === ', '0', $contIf, false, $t); + $ret .= $this->xc->getXcHandlerAllClear($tableName . 'All', $tableName, '$' . $critName, $t); + $condIf = $this->pc->getPhpCodeArray($tableName . 'List', null, false, $t . "\t"); + $condIf .= $this->xc->getXcEqualsOperator("\${$ccFieldMain}", "''",'', $t . "\t"); + $condIf .= $this->pc->getPhpCodeCommentLine('Get All', $ucfTableName, $t . "\t"); + $foreach = $this->xc->getXcGetValues($tableName, $tableName . 'List' . '[$i]', 'i', false, $t . "\t\t"); + $foreach .= $this->xc->getXcGetVar($ccFieldMain, "{$tableName}All[\$i]", $fieldMain, false, $t . "\t\t"); + $foreach .= $this->xc->getXcEqualsOperator('$keywords[$i]', "\${$ccFieldMain}",'', $t . "\t\t"); + if ($tableRate) { + $itemId = $this->xc->getXcGetVar($ccFieldId, "{$tableName}All[\$i]", $fieldId, true); + $const = $this->xc->getXcGetConstants('TABLE_' . $stuTableName); + $foreach .= $this->xc->getXcEqualsOperator("\${$tableName}List[\$i]['rating']", "\$ratingsHandler->getItemRating({$itemId}, {$const})",'', $t . "\t\t"); + $foreach .= $this->xc->getXcEqualsOperator("\${$tableName}List[\$i]['rating_source']", "{$const}",'', $t . "\t\t"); + $foreach .= $this->xc->getXcEqualsOperator("\$token", "\$GLOBALS['xoopsSecurity']->createToken()",'', $t . "\t\t"); + $foreach .= $this->xc->getXcXoopsTplAssign('xoops_token', '$token', true, $t . "\t\t"); + } + $condIf .= $this->pc->getPhpCodeForeach("{$tableName}All", true, false, 'i', $foreach, $t . "\t"); + $condIf .= $this->xc->getXcXoopsTplAssign($tableName . '_list', "\${$tableName}List", true, $t . "\t"); + $condIf .= $this->pc->getPhpCodeUnset($tableName . 'List', $t . "\t"); + $condIf .= $this->xc->getXcPageNav($tableName, $t . "\t"); + $config = $this->xc->getXcGetConfig('table_type'); + $condIf .= $this->xc->getXcXoopsTplAssign('table_type', $config, true, $t . "\t"); + $config = $this->xc->getXcGetConfig('panel_type'); + $condIf .= $this->xc->getXcXoopsTplAssign('panel_type', $config, true, $t . "\t"); + $divideby = $this->xc->getXcGetConfig('divideby'); + $condIf .= $this->xc->getXcXoopsTplAssign('divideby', $divideby, true, $t . "\t"); + $numbCol = $this->xc->getXcGetConfig('numb_col'); + $condIf .= $this->xc->getXcXoopsTplAssign('numb_col', $numbCol, true, $t . "\t"); + $stripTags = $this->pc->getPhpCodeStripTags('', "\${$ccFieldMain} . ' - ' . " . "\$GLOBALS['xoopsModule']->getVar('name')", true); + $condIf2 = $this->xc->getXcXoopsTplAssign('xoops_pagetitle', $stripTags, true, $t . "\t\t"); + $condIf .= $this->pc->getPhpCodeConditions("'show' == \$op && '' != \${$ccFieldMain}", '', '', $condIf2, false, $t . "\t"); + + if ('' !== $fieldReads) { + $redirectError = $this->xc->getXcRedirectHeader($tableName, '', '3', "{$language}INVALID_PARAM", true, $t . "\t\t\t"); + $condIf3 = $this->pc->getPhpCodeConditions('0 === $' . $ccFieldId, '', '', $redirectError, false, $t . "\t\t"); + + $condIf3 .= $this->xc->getXcHandlerGetObj($tableName, $ccFieldId, $t . "\t\t"); + + $getVar = $this->xc->getXcGetVar('', "{$tableName}Obj", $fieldReads, true); + + $tablenameObj = $this->pc->getPhpCodeIsobject($tableName . 'Obj'); + $condIf3 .= $this->pc->getPhpCodeConditions('!' . $tablenameObj, '', '', $redirectError, false, $t . "\t\t"); + + + + $condIf3 .= $this->xc->getXcEqualsOperator("\${$ccFieldReads}", '(int)' . $getVar . ' + 1', false, $t . "\t\t"); + $condIf3 .= $this->xc->getXcSetVarObj($tableName, $fieldReads, "\${$ccFieldReads}", $t . "\t\t"); + $condIf3 .= $this->pc->getPhpCodeCommentLine('Insert Data', null, $t . "\t\t"); + $insert = $this->xc->getXcHandlerInsert($tableName, $tableName, 'Obj'); + $condIf3 .= $this->getSimpleString($insert .';',$t . "\t\t"); + //$contentInsert = $this->xc->getXcRedirectHeader("'{$tableName}.php?op=list&{$fieldId}=' . \${$ccFieldId}", '', '5', "\${$tableName}Obj->getHtmlErrors()", false, $t . "\t\t\t"); + //$condIf3 .= $this->pc->getPhpCodeConditions('!' . $insert, '', '', $contentInsert, false, $t . "\t\t"); + $condIf .= $this->pc->getPhpCodeConditions("'show' == \$op", '', '', $condIf3, false, $t . "\t"); + } - $t = "\t"; - $ret = $pc->getPhpCodeBlankLine(); - $ret .= $xc->getXcXoopsTplAssign('xoops_icons32_url', 'XOOPS_ICONS32_URL'); - $ret .= $xc->getXcXoopsTplAssign("{$moduleDirname}_url", "{$stuModuleDirname}_URL"); - $ret .= $pc->getPhpCodeBlankLine(); - $critName = 'cr' . $ucfTableName; - $ret .= $xc->getXcCriteriaCompo($critName); - $crit = $xc->getXcCriteria('', "'{$fieldId}'", "\${$ccFieldId}",'',true); - $contIf = $xc->getXcCriteriaAdd($critName, $crit, "\t"); - $ret .= $pc->getPhpCodeConditions("\${$ccFieldId}", ' > ', '0', $contIf); - $ret .= $xc->getXcHandlerCountClear($tableName . 'Count', $tableName, '$' . $critName); - $ret .= $xc->getXcXoopsTplAssign($tableName . 'Count', "\${$tableName}Count"); - $ret .= $xc->getXcCriteriaSetStart($critName, '$start'); - $ret .= $xc->getXcCriteriaSetLimit($critName, '$limit'); - $ret .= $xc->getXcHandlerAllClear($tableName . 'All', $tableName, '$' . $critName); - $ret .= $pc->getPhpCodeArray('keywords', null, false, ''); - $condIf = $pc->getPhpCodeArray($tableName, null, false, $t); - $condIf .= $pc->getPhpCodeCommentLine('Get All', $ucfTableName, $t); - $foreach = $xc->getXcGetValues($tableName, $tableName . '[]', 'i', false, $t . "\t"); - $foreach .= $xc->getXcGetVar('keywords[]', "{$tableName}All[\$i]", $fieldMain, false, $t . "\t"); - $condIf .= $pc->getPhpCodeForeach("{$tableName}All", true, false, 'i', $foreach, $t); - $condIf .= $xc->getXcXoopsTplAssign($tableName, "\${$tableName}", true, $t); - $condIf .= $pc->getPhpCodeUnset($tableName, $t); - $condIf .= $xc->getXcPageNav($tableName, $t); - $tableType = $xc->getXcGetConfig('table_type'); - $condIf .= $xc->getXcXoopsTplAssign('type', $tableType, true, $t); - $divideby = $xc->getXcGetConfig('divideby'); - $condIf .= $xc->getXcXoopsTplAssign('divideby', $divideby, true, $t); - $numbCol = $xc->getXcGetConfig('numb_col'); - $condIf .= $xc->getXcXoopsTplAssign('numb_col', $numbCol, true, $t); - - $ret .= $pc->getPhpCodeConditions("\${$tableName}Count", ' > ', '0', $condIf); + $ret .= $this->pc->getPhpCodeConditions("\${$tableName}Count", ' > ', '0', $condIf, false, $t); + + return $ret; + } + + /** + * @public function getUserSubmitSave + * @param string $moduleDirname + * @param $fields + * @param string $tableName + * @param $tableSoleName + * @param $tablePermissions + * @param $tableNotifications + * @param $language + * @param string $t + * @return string + */ + public function getUserPagesSave(string $moduleDirname, $fields, string $tableName, $tableSoleName, $tablePermissions, $tableNotifications, $language, string $t = '') + { + $ucfTableName = \ucfirst($tableName); + $countUploader = 0; + $fieldId = ''; + $ccFieldId = ''; + $fieldMain = ''; + $fieldStatus = ''; + $ucfFieldId = ''; + $ccFieldMain = ''; + $ccFieldStatus = ''; + foreach (\array_keys($fields) as $f) { + $fieldName = $fields[$f]->getVar('field_name'); + if (0 == $f) { + $fieldId = $fieldName; + $ccFieldId = $this->getCamelCase($fieldId, false, true); + $ucfFieldId = \ucfirst($ccFieldId); + } + if ($fields[$f]->getVar('field_element') >= Constants::FIELD_ELE_IMAGELIST && $fields[$f]->getVar('field_element') <= Constants::FIELD_ELE_UPLOADFILE) { + $countUploader++; + } + if (1 == $fields[$f]->getVar('field_main')) { + $fieldMain = $fieldName; // fieldMain = fields parameters main field + $ccFieldMain = $this->getCamelCase($fieldMain, false, true); + } + if ($fields[$f]->getVar('field_element') == Constants::FIELD_ELE_SELECTSTATUS) { + $fieldStatus = $fieldName; + $ccFieldStatus = $this->getCamelCase($fieldStatus, false, true); + } + } + + $ret = $this->pc->getPhpCodeCommentLine('Security Check', '', $t); + $xoopsSecurityCheck = $this->xc->getXcXoopsSecurityCheck(); + $securityError = $this->xc->getXcXoopsSecurityErrors(); + $implode = $this->pc->getPhpCodeImplode(',', $securityError); + $redirectError = $this->xc->getXcRedirectHeader($tableName, '', '3', $implode, true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions('!' . $xoopsSecurityCheck, '', '', $redirectError, false, $t); + + if (1 == $tablePermissions) { + $ret .= $this->pc->getPhpCodeCommentLine('Check permissions', '', $t); + $contIf = $this->xc->getXcRedirectHeader($tableName, '?op=list', 3, '\_NOPERM', true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions('!$permissionsHandler->getPermGlobalSubmit()', '', '', $contIf, false, $t); + } + $getObj = $this->xc->getXcHandlerGetObj($tableName, $ccFieldId, $t . "\t"); + $createObj = $this->xc->getXcHandlerCreateObj($tableName, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions("\${$ccFieldId}", ' > ', '0', $getObj, $createObj, $t); + $tablenameObj = $this->pc->getPhpCodeIsobject($tableName . 'Obj'); + $redirectError = $this->xc->getXcRedirectHeader($tableName, '', '3', "{$language}INVALID_PARAM", true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions('!' . $tablenameObj, '', '', $redirectError, false, $t); + $ret .= $this->xc->getXcSaveElements($moduleDirname, $tableName, $tableSoleName, $fields, $t); + $ret .= $this->pc->getPhpCodeCommentLine('Insert Data', null, $t); + $insert = $this->xc->getXcHandlerInsert($tableName, $tableName, 'Obj'); + + $contentInsert = ''; + if (1 == $tableNotifications || $countUploader > 0) { + $contentInsert .= $this->pc->getPhpCodeTernaryOperator("new{$ucfFieldId}", "\${$ccFieldId} > 0", "\${$ccFieldId}", "\${$tableName}Obj->getNewInsertedId{$ucfTableName}()", $t . "\t"); + } + + if (1 == $tablePermissions) { + $contentInsert .= $this->xc->getXcXoopsHandler('groupperm', $t . "\t"); + $contentInsert .= $this->xc->getXcEqualsOperator('$mid', "\$GLOBALS['xoopsModule']->getVar('mid')", null, $t . "\t"); + $contentInsert .= $this->getPermissionsSave($moduleDirname, $ucfFieldId,'view_' . $tableName); + $contentInsert .= $this->getPermissionsSave($moduleDirname, $ucfFieldId, 'submit_' . $tableName); + $contentInsert .= $this->getPermissionsSave($moduleDirname, $ucfFieldId, 'approve_' . $tableName); + } + + if (1 == $tableNotifications) { + $contentInsert .= $this->pc->getPhpCodeCommentLine('Handle notification', null, $t . "\t"); + $contentInsert .= $this->xc->getXcGetVar($ccFieldMain, "{$tableName}Obj", $fieldMain, false, $t. "\t"); + if ('' !== $fieldStatus) { + $contentInsert .= $this->xc->getXcGetVar($ccFieldStatus, "{$tableName}Obj", $fieldStatus, false, $t . "\t"); + } + $contentInsert .= $this->pc->getPhpCodeArray('tags', [], false, $t . "\t"); + $contentInsert .= $this->xc->getXcEqualsOperator("\$tags['ITEM_NAME']", "\${$ccFieldMain}", '', $t . "\t"); + $url = "\XOOPS_URL . '/modules/{$moduleDirname}/{$tableName}.php?op=show&{$fieldId}=' . \$new{$ucfFieldId}"; + + + + $contentInsert .= $this->xc->getXcEqualsOperator("\$tags['ITEM_URL'] ", $url, '', $t . "\t"); + $contentInsert .= $this->xc->getXcXoopsHandler('notification', $t . "\t"); + if ('' === $fieldStatus) { + $not2If = $this->pc->getPhpCodeCommentLine('Event modify notification', null, $t . "\t\t"); + $not2If .= $this->getSimpleString("\$notificationHandler->triggerEvent('global', 0, 'global_modify', \$tags);", $t . "\t\t"); + $not2If .= $this->getSimpleString("\$notificationHandler->triggerEvent('{$tableName}', \$new{$ucfFieldId}, '{$tableSoleName}_modify', \$tags);", $t . "\t\t"); + $not2Else = $this->pc->getPhpCodeCommentLine('Event new notification', null, $t . "\t\t"); + $not2Else .= $this->getSimpleString("\$notificationHandler->triggerEvent('global', 0, 'global_new', \$tags);", $t . "\t\t"); + //$not2Else .= $this->getSimpleString("\$notificationHandler->triggerEvent('{$tableName}', \$new{$ucfFieldId}, '{$tableSoleName}_new', \$tags);", $t . "\t\t"); + $not1Else = $this->pc->getPhpCodeConditions("\${$ccFieldId}", ' > ', '0', $not2If, $not2Else, $t . "\t"); + $contentInsert .= $not1Else; + } else { + $not1If = $this->pc->getPhpCodeCommentLine('Event approve notification', null, $t . "\t\t"); + $not1If .= $this->getSimpleString("\$notificationHandler->triggerEvent('global', 0, 'global_approve', \$tags);", $t . "\t\t"); + $not1If .= $this->getSimpleString("\$notificationHandler->triggerEvent('{$tableName}', \$new{$ucfFieldId}, '{$tableSoleName}_approve', \$tags);", $t . "\t\t"); + $not2If = $this->pc->getPhpCodeCommentLine('Event modify notification', null, $t . "\t\t\t"); + $not2If .= $this->getSimpleString("\$notificationHandler->triggerEvent('global', 0, 'global_modify', \$tags);", $t . "\t\t\t"); + $not2If .= $this->getSimpleString("\$notificationHandler->triggerEvent('{$tableName}', \$new{$ucfFieldId}, '{$tableSoleName}_modify', \$tags);", $t . "\t\t\t"); + $not2Else = $this->pc->getPhpCodeCommentLine('Event new notification', null, $t . "\t\t\t"); + $not2Else .= $this->getSimpleString("\$notificationHandler->triggerEvent('global', 0, 'global_new', \$tags);", $t . "\t\t\t"); + $not1Else = $this->pc->getPhpCodeConditions("\${$ccFieldId}", ' > ', '0', $not2If, $not2Else, $t . "\t\t"); + $contentInsert .= $this->pc->getPhpCodeConditions("\${$ccFieldStatus}", ' == ', $this->xc->getXcGetConstants('STATUS_APPROVED'), $not1If, $not1Else, $t . "\t"); + } + } + + $contentInsert .= $this->pc->getPhpCodeCommentLine('redirect after insert', null, $t . "\t"); + if ($countUploader > 0) { + $errIf = $this->xc->getXcRedirectHeader("'{$tableName}.php?op=edit&{$fieldId}=' . \$new{$ucfFieldId}", '', '5', '$uploaderErrors', false, $t . "\t\t"); + $errElse = $this->xc->getXcRedirectHeader("'{$tableName}.php?op=list&start=' . \$start . '&limit=' . \$limit", '', '2', "{$language}FORM_OK", false, $t . "\t\t"); + $confirmOk = $this->pc->getPhpCodeConditions('$uploaderErrors', ' !== ', "''", $errIf, $errElse, $t . "\t"); + } else { + $confirmOk = $this->xc->getXcRedirectHeader("'{$tableName}.php?op=list&start=' . \$start . '&limit=' . \$limit", '', '2', "{$language}FORM_OK", false, $t . "\t\t"); + } + $contentInsert .= $confirmOk; + $ret .= $this->pc->getPhpCodeConditions($insert, '', '', $contentInsert, false, $t); + + $ret .= $this->pc->getPhpCodeCommentLine('Get Form Error', null, $t); + $ret .= $this->xc->getXcXoopsTplAssign('error', "\${$tableName}Obj->getHtmlErrors()", true, $t); + $ret .= $this->xc->getXcGetForm('form', $tableName, 'Obj', $t); + $ret .= $this->xc->getXcXoopsTplAssign('form', '$form->render()', true, $t); + + return $ret; + } + + /** + * @private function getPermissionsSave + * @param $moduleDirname + * @param $ucfFieldId + * @param string $perm + * + * @return string + */ + private function getPermissionsSave($moduleDirname, $ucfFieldId, string $perm = 'view') + { + $ret = $this->pc->getPhpCodeCommentLine('Permission to', $perm, "\t\t\t"); + $ret .= $this->xc->getXcDeleteRight('grouppermHandler', "{$moduleDirname}_{$perm}", '$mid', "\$new{$ucfFieldId}", false, "\t\t\t"); + $content = $this->xc->getXcAddRight('grouppermHandler', "{$moduleDirname}_{$perm}", "\$new{$ucfFieldId}", '$onegroupId', '$mid', false, "\t\t\t\t\t"); + $foreach = $this->pc->getPhpCodeForeach("_POST['groups_{$perm}']", false, false, 'onegroupId', $content, "\t\t\t\t"); + $ret .= $this->pc->getPhpCodeConditions("isset(\$_POST['groups_{$perm}'])", '', '', $foreach, false, "\t\t\t"); + + return $ret; + } + + /** + * @public function getUserPagesNew + * @param $tableName + * @param $tableSoleName + * @param $tablePermissions + * @param $language + * @param string $t + * @return string + */ + public function getUserPagesNew($tableName, $tableSoleName, $tablePermissions, $language, string $t = '') + { + $ret = $this->uxc->getUserBreadcrumbs($language, $tableSoleName, 'add', '', $t); + if (1 == $tablePermissions) { + $ret .= $this->pc->getPhpCodeCommentLine('Check permissions', '', $t); + $contIf = $this->xc->getXcRedirectHeader($tableName, '?op=list', 3, '\_NOPERM', true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions('!$permissionsHandler->getPermGlobalSubmit()', '', '', $contIf, false, $t); + } + $ret .= $this->xc->getXcCommonPagesNew($tableName, $t); + + return $ret; + } + + /** + * @public function getUserPagesEdit + * @param $tableName + * @param $tableSoleName + * @param $tablePermissions + * @param $fieldId + * @param $language + * @param string $t + * @return string + */ + public function getUserPagesEdit($tableName, $tableSoleName, $tablePermissions, $fieldId, $language, string $t = '') + { + $ret = $this->uxc->getUserBreadcrumbs($language, $tableSoleName, 'edit', '', $t); + $ccFieldId = $this->getCamelCase($fieldId, false, true); + if (1 == $tablePermissions) { + $ret .= $this->pc->getPhpCodeCommentLine('Check permissions', '', $t); + $contIf = $this->xc->getXcRedirectHeader($tableName, '?op=list', 3, '\_NOPERM', true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions('!$permissionsHandler->getPermGlobalSubmit()', '', '', $contIf, false, $t); + } + $ret .= $this->pc->getPhpCodeCommentLine('Check params', '', $t); + $contIf = $this->xc->getXcRedirectHeader($tableName, '?op=list', 3, "{$language}INVALID_PARAM", true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions("\${$ccFieldId}", ' == ', '0', $contIf, false, $t); + $ret .= $this->xc->getXcCommonPagesEdit($tableName, $ccFieldId, $t, $language); + + return $ret; + } + + /** + * @public function getUserPagesClone + * @param $tableName + * @param $tableSoleName + * @param $tablePermissions + * @param $fieldId + * @param $language + * @param string $t + * @return string + */ + public function getUserPagesClone($tableName, $tableSoleName, $tablePermissions, $fieldId, $language, string $t = '') + { + $ret = $this->uxc->getUserBreadcrumbs($language, $tableSoleName, 'clone', '', $t); + $ccFieldId = $this->getCamelCase($fieldId, false, true); + if (1 == $tablePermissions) { + $ret .= $this->pc->getPhpCodeCommentLine('Check permissions', '', $t); + $contIf = $this->xc->getXcRedirectHeader($tableName, '?op=list', 3, '\_NOPERM', true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions('!$permissionsHandler->getPermGlobalSubmit()', '', '', $contIf, false, $t); + } + $ret .= $this->pc->getPhpCodeCommentLine('Request source', '', $t); + $ret .= $this->xc->getXcXoopsRequest($ccFieldId . 'Source', $fieldId . '_source', '', 'Int', $t); + $ret .= $this->pc->getPhpCodeCommentLine('Check params', '', $t); + $contIf = $this->xc->getXcRedirectHeader($tableName, '?op=list', 3, "{$language}INVALID_PARAM", true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions("\${$ccFieldId}Source", ' == ', '0', $contIf, false, $t); + $ret .= $this->xc->getXcCommonPagesClone($tableName, $ccFieldId, $t, $language); + + return $ret; + } + + /** + * @private function getUserPagesDelete + * @param $tableName + * @param $tableSoleName + * @param $tablePermissions + * @param $language + * @param $fieldId + * @param $fieldMain + * @param $tableNotifications + * @param string $t + * @return string + */ + private function getUserPagesDelete($tableName, $tableSoleName, $tablePermissions, $language, $fieldId, $fieldMain, $tableNotifications, string $t = '') + { + $ret = $this->uxc->getUserBreadcrumbs($language, $tableSoleName, 'delete', '', $t); + $ccFieldId = $this->getCamelCase($fieldId, false, true); + if (1 == $tablePermissions) { + $ret .= $this->pc->getPhpCodeCommentLine('Check permissions', '', $t); + $contIf = $this->xc->getXcRedirectHeader($tableName, '?op=list', 3, '\_NOPERM', true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions('!$permissionsHandler->getPermGlobalSubmit()', '', '', $contIf, false, $t); + } + $ret .= $this->pc->getPhpCodeCommentLine('Check params', '', $t); + $contIf = $this->xc->getXcRedirectHeader($tableName, '?op=list', 3, "{$language}INVALID_PARAM", true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions("\${$ccFieldId}", ' == ', '0', $contIf, false, $t); + $ret .= $this->xc->getXcCommonPagesDelete($language, $tableName, $tableSoleName, $fieldId, $fieldMain, $tableNotifications, $t); + + return $ret; + } + + /** + * @private function getUserPagesBroken + * @param $language + * @param $moduleDirname + * @param $tableName + * @param $tableSoleName + * @param $fieldId + * @param $fieldStatus + * @param $fieldMain + * @param $tableNotifications + * @param string $t + * @return string + */ + private function getUserPagesBroken($language, $moduleDirname, $tableName, $tableSoleName, $fieldId, $fieldStatus, $fieldMain, $tableNotifications, string $t = '') + { + $ccFieldId = $this->getCamelCase($fieldId, false, true); + $ccFieldMain = $this->getCamelCase($fieldMain, false, true); + $ret = $this->uxc->getUserBreadcrumbs($language, '', 'broken', '', $t); + $ret .= $this->pc->getPhpCodeCommentLine('Check params', '', $t); + $contIf = $this->xc->getXcRedirectHeader($tableName, '?op=list', 3, "{$language}INVALID_PARAM", true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions("\${$ccFieldId}", ' == ', '0', $contIf, false, $t); + + $ret .= $this->xc->getXcHandlerGet($tableName, $ccFieldId, 'Obj', $tableName . 'Handler', false, $t); + $tablenameObj = $this->pc->getPhpCodeIsobject($tableName . 'Obj'); + $redirectError = $this->xc->getXcRedirectHeader($tableName, '', '3', "{$language}INVALID_PARAM", true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions('!' . $tablenameObj, '', '', $redirectError, false, $t); + $ret .= $this->xc->getXcGetVar($ccFieldMain, "{$tableName}Obj", $fieldMain, false, $t); + $reqOk = "_REQUEST['ok']"; + $isset = $this->pc->getPhpCodeIsset($reqOk); + $xoopsSecurityCheck = $this->xc->getXcXoopsSecurityCheck(); + $xoopsSecurityErrors = $this->xc->getXcXoopsSecurityErrors(); + $implode = $this->pc->getPhpCodeImplode(', ', $xoopsSecurityErrors); + $redirectHeaderErrors = $this->xc->getXcRedirectHeader($tableName, '', '3', $implode, true, $t . "\t\t"); + $insert = $this->xc->getXcHandlerInsert($tableName, $tableName, 'Obj'); + $condition = $this->pc->getPhpCodeConditions('!' . $xoopsSecurityCheck, '', '', $redirectHeaderErrors, false, $t . "\t"); + $constant = $this->xc->getXcGetConstants('STATUS_BROKEN'); + $condition .= $this->xc->getXcSetVarObj($tableName, $fieldStatus, $constant, $t . "\t"); + + $contInsert = ''; + if (1 == $tableNotifications) { + $contInsert .= $this->pc->getPhpCodeCommentLine('Event broken notification', null, $t . "\t\t"); + $contInsert .= $this->pc->getPhpCodeArray('tags', [], false, $t . "\t\t"); + $contInsert .= $this->xc->getXcEqualsOperator("\$tags['ITEM_NAME']", "\${$ccFieldMain}", '', $t . "\t\t"); + $url = "\XOOPS_URL . '/modules/{$moduleDirname}/{$tableName}.php?op=show&{$fieldId}=' . \${$ccFieldId}"; + $contInsert .= $this->xc->getXcEqualsOperator("\$tags['ITEM_URL'] ", $url, '', $t . "\t\t"); + $contInsert .= $this->xc->getXcXoopsHandler('notification', $t . "\t\t"); + $contInsert .= $this->getSimpleString("\$notificationHandler->triggerEvent('global', 0, 'global_broken', \$tags);", $t . "\t\t"); + $contInsert .= $this->getSimpleString("\$notificationHandler->triggerEvent('{$tableName}', \${$ccFieldId}, '{$tableSoleName}_broken', \$tags);", $t . "\t\t"); + } + $contInsert .= $this->xc->getXcRedirectHeader("'{$tableName}.php?op=list&start=' . \$start . '&limit=' . \$limit", '', '2', "{$language}FORM_OK", false, $t . "\t\t"); + $htmlErrors = $this->xc->getXcHtmlErrors($tableName, true); + $internalElse = $this->xc->getXcXoopsTplAssign('error', $htmlErrors, true, $t . "\t\t"); + $condition .= $this->pc->getPhpCodeConditions($insert, '', '', $contInsert, $internalElse, $t . "\t"); + $mainElse = $this->xc->getXcXoopsConfirm($language, $fieldId, $fieldMain, 'broken', $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions($isset, ' && ', "1 == \${$reqOk}", $condition, $mainElse, $t); return $ret; } @@ -155,67 +571,114 @@ private function getUserPages($moduleDirname, $tableName, $fieldId, $fieldMain) /** * @private function getUserPagesFooter * @param $moduleDirname - * @param $tableName - * @param $language + * @param $tableComments * * @return string */ - private function getUserPagesFooter($moduleDirname, $tableName, $language) + private function getUserPagesFooter($moduleDirname, $tableComments) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $uxc = UserXoopsCode::getInstance(); - $stuModuleDirname = mb_strtoupper($moduleDirname); - $stuTableName = mb_strtoupper($tableName); - $ret = $pc->getPhpCodeBlankLine(); - $ret .= $pc->getPhpCodeCommentLine('Breadcrumbs'); - $ret .= $uxc->getUserBreadcrumbs($language, $stuTableName); - $ret .= $pc->getPhpCodeBlankLine(); - $ret .= $pc->getPhpCodeCommentLine('Keywords'); - $ret .= $uxc->getUserMetaKeywords($moduleDirname); - $ret .= $pc->getPhpCodeUnset('keywords'); - $ret .= $pc->getPhpCodeBlankLine(); - $ret .= $pc->getPhpCodeCommentLine('Description'); - $ret .= $uxc->getUserMetaDesc($moduleDirname, $language, $stuTableName); - $ret .= $xc->getXcXoopsTplAssign('xoops_mpageurl', "{$stuModuleDirname}_URL.'/{$tableName}.php'"); - $ret .= $xc->getXcXoopsTplAssign("{$moduleDirname}_upload_url", "{$stuModuleDirname}_UPLOAD_URL"); - $ret .= $this->getInclude('footer'); + $ret = $this->pc->getPhpCodeBlankLine(); + $ret .= $this->pc->getPhpCodeCommentLine('Meta keywords'); + $ret .= $this->uxc->getUserMetaKeywords($moduleDirname); + $ret .= $this->pc->getPhpCodeUnset('keywords'); + if (1 == $tableComments) { + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->pc->getPhpCodeCommentLine('View comments'); + $ret .= $this->pc->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH', 'include/comment_view', true); + } + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->getRequire('footer'); return $ret; } + /** + * @private function getUserPagesSwitch + * @param $moduleDirname + * @param $tableId + * @param $tableMid + * @param $tableName + * @param $tableSoleName + * @param $tableSubmit + * @param $tablePermissions + * @param $tableBroken + * @param $fieldId + * @param $fieldMain + * @param $fieldStatus + * @param $tableNotifications + * @param $tableRate + * @param $fieldReads + * @param $language + * @return string + */ + private function getUserPagesSwitch($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableSubmit, $tablePermissions, $tableBroken, $fieldId, $fieldMain, $fieldStatus, $tableNotifications, $tableRate, $fieldReads, $language) + { + $fields = $this->getTableFields($tableMid, $tableId); + $cases['show'] = []; + $cases['list'] = [$this->getUserPagesList($moduleDirname, $tableName, $fieldId, $fieldMain, $tableRate, $fieldReads, $language, "\t\t")]; + if (1 == $tableSubmit) { + $cases['save'] = [$this->getUserPagesSave($moduleDirname, $fields, $tableName, $tableSoleName, $tablePermissions, $tableNotifications, $language, "\t\t")]; + $cases['new'] = [$this->getUserPagesNew($tableName, $tableSoleName, $tablePermissions, $language, "\t\t")]; + $cases['edit'] = [$this->getUserPagesEdit($tableName, $tableSoleName, $tablePermissions, $fieldId, $language, "\t\t")]; + $cases['clone'] = [$this->getUserPagesClone($tableName, $tableSoleName, $tablePermissions, $fieldId, $language, "\t\t")]; + $cases['delete'] = [$this->getUserPagesDelete($tableName, $tableSoleName, $tablePermissions, $language, $fieldId, $fieldMain, $tableNotifications, "\t\t")]; + } + if (1 == $tableBroken) { + $cases['broken'] = [$this->getUserPagesBroken($language, $moduleDirname, $tableName, $tableSoleName, $fieldId, $fieldStatus, $fieldMain, $tableNotifications, "\t\t")]; + } + + return $this->xc->getXcSwitch('op', $cases, true); + } + /** * @public function render - * @param null - * @return bool|string + * @return string */ public function render() { - $module = $this->getModule(); - $table = $this->getTable(); - $tableName = $table->getVar('table_name'); - $filename = $this->getFileName(); - $moduleDirname = $module->getVar('mod_dirname'); - $language = $this->getLanguage($moduleDirname, 'MA'); + $module = $this->getModule(); + $table = $this->getTable(); + $tableId = $table->getVar('table_id'); + $tableMid = $table->getVar('table_mid'); + $tableName = $table->getVar('table_name'); + $tableSubmit = $table->getVar('table_submit'); + $tablePermissions = $table->getVar('table_permissions'); + $tableSoleName = $table->getVar('table_solename'); + $tableBroken = $table->getVar('table_broken'); + $tableNotifications = $table->getVar('table_notifications'); + $tableComments = $table->getVar('table_comments'); + $tableRate = $table->getVar('table_rate'); + $filename = $this->getFileName(); + $moduleDirname = $module->getVar('mod_dirname'); + $language = $this->getLanguage($moduleDirname, 'MA'); + // Fields - $fieldId = ''; - $fieldMain = ''; + $fieldId = ''; + $fieldMain = ''; + $fieldStatus = ''; + $fieldReads = ''; $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); - foreach (array_keys($fields) as $f) { + foreach (\array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); if (0 == $f) { $fieldId = $fieldName; } if (1 == $fields[$f]->getVar('field_main')) { - $fieldMain = $fieldName; // fieldMain = fields parameters main field + $fieldMain = $fieldName; // fields parameters main field + } + if (Constants::FIELD_ELE_SELECTSTATUS == $fields[$f]->getVar('field_element')) { + $fieldStatus = $fieldName; // fields for status + } + if (Constants::FIELD_ELE_TEXTREADS == $fields[$f]->getVar('field_element')) { + $fieldReads = $fieldName; // fields for count reads } } - $content = $this->getHeaderFilesComments($module); - $content .= $this->getUserPagesHeader($moduleDirname, $tableName, $fieldId); - $content .= $this->getUserPages($moduleDirname, $tableName, $fieldId, $fieldMain); - $content .= $this->getUserPagesFooter($moduleDirname, $tableName, $language); + $content = $this->getHeaderFilesComments($module); + $content .= $this->getUserPagesHeader($moduleDirname, $tableName, $fieldId, $tablePermissions, $language); + $content .= $this->getUserPagesSwitch($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableSubmit, $tablePermissions, $tableBroken, $fieldId, $fieldMain, $fieldStatus, $tableNotifications, $tableRate, $fieldReads, $language); + $content .= $this->getUserPagesFooter($moduleDirname, $tableComments); - $this->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, '/', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/User/UserPdf.php b/class/Files/User/UserPdf.php index d653e90a..b38f7b7d 100644 --- a/class/Files/User/UserPdf.php +++ b/class/Files/User/UserPdf.php @@ -1,9 +1,12 @@ -xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $this->pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $this->uxc = UserXoopsCode::getInstance(); + $this->xc = Modulebuilder\Files\CreateXoopsCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); + $this->cf = Modulebuilder\Files\CreateFile::getInstance(); } /** * @static function getInstance - * @param null * @return UserPdf */ public static function getInstance() @@ -75,11 +74,11 @@ public static function getInstance() /** * @public function write - * @param string $module + * @param $module * @param mixed $table * @param string $filename */ - public function write($module, $table, $filename) + public function write($module, $table, string $filename): void { $this->setModule($module); $this->setTable($table); @@ -96,20 +95,34 @@ public function write($module, $table, $filename) */ private function getUserPdfHeader($moduleDirname, $tableName, $fields, $language) { - $fieldId = $this->xc->getXcSaveFieldId($fields); + $fieldId = $this->xc->getXcTableFieldId($fields); $ccFieldId = $this->getCamelCase($fieldId, false, true); $ret = $this->pc->getPhpCodeUseNamespace(['Xmf', 'Request'], '', ''); $ret .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', ''); $ret .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']); - $ret .= $this->getInclude(); - $fileExist = $this->pc->getPhpCodeFileExists("\$tcpdf = XOOPS_ROOT_PATH.'/Frameworks/tcpdf/tcpdf.php'"); - $requireOnce = $this->pc->getPhpCodeIncludeDir('$tcpdf', '', true, true, 'require', "\t"); - $ret .= $this->xc->getXcXoopsRequest($ccFieldId, $fieldId, '', 'Int'); - $redirectHeader = $this->xc->getXcRedirectHeader($tableName, '', $numb = '2', "{$language}NO_PDF_LIBRARY", true, "\t"); + $ret .= $this->getRequire(); + $ret .= $this->pc->getPhpCodeIncludeDir("\XOOPS_ROOT_PATH . '/header.php'", '', true, true); + $ret .= $this->xc->getXcEqualsOperator('$tcpdf', "\XOOPS_ROOT_PATH.'/Frameworks/tcpdf/'"); + $fileExist = $this->pc->getPhpCodeFileExists("\$tcpdf . 'tcpdf.php'"); + $requireOnce = $this->pc->getPhpCodeIncludeDir("\$tcpdf . 'tcpdf.php'", '', true, true, 'require', "\t"); + $redirectHeader = $this->xc->getXcRedirectHeader($tableName, '', '2', "{$language}NO_PDF_LIBRARY", true, "\t"); $ret .= $this->pc->getPhpCodeConditions($fileExist, '', '', $requireOnce, $redirectHeader); + $ret .= $this->pc->getPhpCodeIncludeDir("\$tcpdf . 'config/tcpdf_config.php'", '', true, true); + $ret .= $this->pc->getPhpCodeCommentLine('Get new template'); + $ret .= $this->pc->getPhpCodeIncludeDir("\XOOPS_ROOT_PATH . '/class/template.php'", '', true, true); + $ret .= $this->xc->getXcEqualsOperator('$pdfTpl', 'new \XoopsTpl()'); + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->pc->getPhpCodeCommentLine('Get requests'); + $ret .= $this->xc->getXcXoopsRequest($ccFieldId, $fieldId, '', 'Int'); $ret .= $this->pc->getPhpCodeCommentLine('Get Instance of Handler'); $ret .= $this->xc->getXcHandlerLine($tableName); - //$ret .= $this->xc->getXcGetVar($tableName, 'this', $fieldId, false, ''); + $ret .= $this->xc->getXcHandlerGetObj($tableName, $ccFieldId); + $tablenameObj = $this->pc->getPhpCodeIsobject($tableName . 'Obj'); + $redirectError = $this->xc->getXcRedirectHeader($tableName, '', '3', "{$language}INVALID_PARAM", true, "\t"); + $ret .= $this->pc->getPhpCodeConditions('!' . $tablenameObj, '', '', $redirectError); + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->xc->getXcEqualsOperator('$myts', 'MyTextSanitizer::getInstance()'); + $ret .= $this->cf->getSimpleString("\$pdfTpl->assign('" . $moduleDirname . "_upload_url', \\" . strtoupper($moduleDirname) . '_UPLOAD_URL);'); $ret .= $this->pc->getPhpCodeBlankLine(); return $ret; @@ -119,84 +132,129 @@ private function getUserPdfHeader($moduleDirname, $tableName, $fields, $language * @public function getAdminPagesList * @param $moduleDirname * @param $tableName + * @param $tableSolename * @param $fields + * @param $tablePermissions * @return string */ - public function getUserPdfTcpdf($moduleDirname, $tableName, $fields) + public function getUserPdfTcpdf($moduleDirname, $tableName, $tableSolename, $fields, $tablePermissions) { - $stuModuleDirname = mb_strtoupper($moduleDirname); - $ret = ''; - foreach (array_keys($fields) as $f) { + $stuModuleDirname = \mb_strtoupper($moduleDirname); + + $fieldId = $this->xc->getXcTableFieldId($fields); + $ccFieldId = $this->getCamelCase($fieldId, false, true); + $fieldMain = $this->xc->getXcTableFieldMain($fields); + + $ret = ''; + if (1 === $tablePermissions) { + $ret .= $this->pc->getPhpCodeCommentLine('Check permissions'); + $ret .= $this->getSimpleString('$currentuid = 0;'); + $condIf = $this->getSimpleString('$currentuid = $xoopsUser->uid();', "\t"); + $ret .= $this->pc->getPhpCodeConditions('isset($xoopsUser) && \is_object($xoopsUser)', '', '', $condIf); + $ret .= $this->xc->getXcXoopsHandler('groupperm'); + $ret .= $this->xc->getXcXoopsHandler('member'); + $condIf = $this->getSimpleString('$my_group_ids = [\XOOPS_GROUP_ANONYMOUS];', "\t"); + $condElse = $this->getSimpleString('$my_group_ids = $memberHandler->getGroupsByUser($currentuid);', "\t"); + $ret .= $this->pc->getPhpCodeConditions('0', ' === ', '$currentuid', $condIf, $condElse); + $gperm = $this->xc->getXcCheckRight('!$grouppermHandler', "{$moduleDirname}_view_{$tableName}", "\${$ccFieldId}", '$my_group_ids', "\$GLOBALS['xoopsModule']->getVar('mid')", true); + $ret .= $this->pc->getPhpCodeCommentLine('Verify permissions'); + $noPerm = $this->xc->getXcRedirectHeader("\\{$stuModuleDirname}_URL . '/index.php'", '', '3', '\_NOPERM', false, "\t"); + $noPerm .= $this->getSimpleString('exit();', "\t"); + $ret .= $this->pc->getPhpCodeConditions($gperm, '', '', $noPerm); + } + $ret .= $this->pc->getPhpCodeCommentLine('Set defaults'); + $ret .= $this->xc->getXcEqualsOperator('$pdfFilename', "'$tableName.pdf'"); + $ret .= $this->xc->getXcEqualsOperator('$content ', "''"); + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->pc->getPhpCodeCommentLine('Read data from table and create pdfData'); + + $titleFound = false; + foreach (\array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); $fieldDefault = $fields[$f]->getVar('field_default'); $fieldElement = $fields[$f]->getVar('field_element'); - $getVar = $this->xc->getXcGetVar('', $tableName . 'Handler', $fieldName, true); + $getVar = $this->xc->getXcGetVar('', $tableName . 'Obj', $fieldName, true); switch ($fieldElement) { - case 2: + case Constants::FIELD_ELE_TEXT: if (false !== mb_strpos($fieldName, 'title') || false !== mb_strpos($fieldName, 'name') && '' == $fieldDefault) { - $ret .= $this->pc->getPhpCodeStripTags("pdfData['title'] ", $getVar); + $ret .= $this->pc->getPhpCodeStripTags("pdfData['title'] ", $getVar); + $ret .= $this->pc->getPhpCodeStripTags("pdfData['subject'] ", $getVar); + $titleFound = true; } break; - case 3: - case 4: - $ret .= $this->pc->getPhpCodeStripTags("pdfData['content']", $getVar); + case Constants::FIELD_ELE_TEXTAREA: + case Constants::FIELD_ELE_DHTMLTEXTAREA: + $ret .= $this->pc->getPhpCodeStripTags('content', $getVar, false, '', '.='); break; - case 8: - $ret .= $this->xc->getXcXoopsUserUnameFromId("pdfData['author'] ", $getVar); + case Constants::FIELD_ELE_SELECTUSER: + $ret .= $this->xc->getXcXoopsUserUnameFromId("pdfData['author'] ", $getVar); break; - case 15: - $ret .= $this->xc->getXcFormatTimeStamp("pdfData['date'] ", $getVar); + case Constants::FIELD_ELE_TEXTDATESELECT: + $ret .= $this->xc->getXcFormatTimeStamp("pdfData['date'] ", $getVar); break; } } + if (!$titleFound) { + $getVar = $this->xc->getXcGetVar('', $tableName . 'Obj', $fieldMain, true); + $ret .= $this->xc->getXcEqualsOperator("\$pdfData['title'] ", $getVar); + $ret .= $this->xc->getXcEqualsOperator("\$pdfData['subject'] ", $getVar); + } + $ret .= $this->xc->getXcEqualsOperator("\$pdfData['content'] ", '$myts->undoHtmlSpecialChars($content)'); + $ret .= $this->xc->getXcEqualsOperator("\$pdfData['fontname']", 'PDF_FONT_NAME_MAIN'); + $ret .= $this->xc->getXcEqualsOperator("\$pdfData['fontsize']", 'PDF_FONT_SIZE_MAIN'); + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->pc->getPhpCodeCommentLine('Get Config'); + $ret .= $this->xc->getXcEqualsOperator("\$pdfData['creator'] ", "\$GLOBALS['xoopsConfig']['sitename']"); + //$ret .= $this->xc->getXcEqualsOperator("\$pdfData['subject'] ", "\$GLOBALS['xoopsConfig']['slogan']"); + $ret .= $this->xc->getXcEqualsOperator("\$pdfData['keywords'] ", "\$helper->getConfig('keywords')"); + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->pc->getPhpCodeCommentLine('Defines'); + $ret .= $this->pc->getPhpCodeDefine("{$stuModuleDirname}_CREATOR", "\$pdfData['creator']"); + $ret .= $this->pc->getPhpCodeDefine("{$stuModuleDirname}_AUTHOR", "\$pdfData['author']"); + $ret .= $this->pc->getPhpCodeDefine("{$stuModuleDirname}_HEADER_TITLE", "\$pdfData['title']"); + $ret .= $this->pc->getPhpCodeDefine("{$stuModuleDirname}_HEADER_STRING", "\$pdfData['subject']"); + $ret .= $this->pc->getPhpCodeDefine("{$stuModuleDirname}_HEADER_LOGO", "'logo.gif'"); + $ret .= $this->pc->getPhpCodeDefine("{$stuModuleDirname}_IMAGES_PATH", "\XOOPS_ROOT_PATH.'/images/'"); + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->pc->getPhpCodeCommentLine('Assign customs tpl fields'); + $ret .= $this->xc->getXcXoopsTplAssign('content_header', "'$tableName'", true, '', 'pdfTpl'); + $ret .= $this->xc->getXcGetValues($tableName, $tableSolename, '', true, '', 'Obj'); + $ret .= $this->xc->getXcXoopsTplAssign($tableSolename, '$' .$tableSolename, true, '', 'pdfTpl'); + $ret .= $this->pc->getPhpCodeBlankLine(); - $ret .= $this->pc->getPhpCodeCommentLine('Get Config'); - $ret .= $this->xc->getXcEqualsOperator("\$pdfData['creator'] ", "\$GLOBALS['xoopsConfig']['xoops_sitename']"); - $ret .= $this->xc->getXcEqualsOperator("\$pdfData['subject'] ", "\$GLOBALS['xoopsConfig']['slogan']"); - $ret .= $this->xc->getXcEqualsOperator("\$pdfData['keywords'] ", "\$GLOBALS['xoopsConfig']['keywords']"); - $ret .= $this->pc->getPhpCodeCommentLine('Defines'); - $ret .= $this->pc->getPhpCodeDefine("{$stuModuleDirname}_CREATOR", "\$pdfData['creator']"); - $ret .= $this->pc->getPhpCodeDefine("{$stuModuleDirname}_AUTHOR", "\$pdfData['author']"); - $ret .= $this->pc->getPhpCodeDefine("{$stuModuleDirname}_HEADER_TITLE", "\$pdfData['title']"); - $ret .= $this->pc->getPhpCodeDefine("{$stuModuleDirname}_HEADER_STRING", "\$pdfData['subject']"); - $ret .= $this->pc->getPhpCodeDefine("{$stuModuleDirname}_HEADER_LOGO", "'logo.gif'"); - $ret .= $this->pc->getPhpCodeDefine("{$stuModuleDirname}_IMAGES_PATH", "XOOPS_ROOT_PATH.'/images/'"); - $ret .= $this->xc->getXcEqualsOperator('$myts', 'MyTextSanitizer::getInstance()'); - $ret .= $this->xc->getXcEqualsOperator('$content', "''"); - $ret .= $this->xc->getXcEqualsOperator('$content', "\$myts->undoHtmlSpecialChars(\$pdfData['content'])", '.'); - $ret .= $this->xc->getXcEqualsOperator('$content', '$myts->displayTarea($content)'); + $ret .= $this->pc->getPhpCodeCommentLine('Create pdf'); $ret .= $this->xc->getXcEqualsOperator('$pdf', 'new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, _CHARSET, false)'); - $ret .= $this->xc->getXcEqualsOperator('$title', "\$myts->undoHtmlSpecialChars(\$pdfData['title'])"); - $ret .= $this->xc->getXcEqualsOperator('$keywords', "\$myts->undoHtmlSpecialChars(\$pdfData['keywords'])"); - $ret .= $this->xc->getXcEqualsOperator("\$pdfData['fontsize']", '12'); - $ret .= $this->pc->getPhpCodeCommentLine('For schinese'); - $ifLang = $this->getSimpleString("\$pdf->SetFont('gbsn00lp', '', \$pdfData['fontsize']);", "\t"); - $elseLang = $this->getSimpleString("\$pdf->SetFont(\$pdfData['fontname'], '', \$pdfData['fontsize']);", "\t"); - $ret .= $this->pc->getPhpCodeConditions('_LANGCODE', ' == ', "'cn'", $ifLang, $elseLang); + $ret .= $this->pc->getPhpCodeCommentLine('Remove/add default header/footer'); + $ret .= $this->getSimpleString('$pdf->setPrintHeader(false);'); + $ret .= $this->getSimpleString('$pdf->setPrintFooter(true);'); $ret .= $this->pc->getPhpCodeCommentLine('Set document information'); $ret .= $this->getSimpleString("\$pdf->SetCreator(\$pdfData['creator']);"); $ret .= $this->getSimpleString("\$pdf->SetAuthor(\$pdfData['author']);"); - $ret .= $this->getSimpleString('$pdf->SetTitle($title);'); - $ret .= $this->getSimpleString('$pdf->SetKeywords($keywords);'); + $ret .= $this->getSimpleString("\$pdf->SetTitle(\$pdfData['title']);"); + $ret .= $this->getSimpleString("\$pdf->SetKeywords(\$pdfData['keywords']);"); $ret .= $this->pc->getPhpCodeCommentLine('Set default header data'); - $ret .= $this->getSimpleString("\$pdf->SetHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, {$stuModuleDirname}_HEADER_TITLE, {$stuModuleDirname}_HEADER_STRING);"); + $ret .= $this->getSimpleString("\$pdf->setHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, {$stuModuleDirname}_HEADER_TITLE, {$stuModuleDirname}_HEADER_STRING);"); $ret .= $this->pc->getPhpCodeCommentLine('Set margins'); $ret .= $this->getSimpleString('$pdf->SetMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP + 10, PDF_MARGIN_RIGHT);'); $ret .= $this->pc->getPhpCodeCommentLine('Set auto page breaks'); $ret .= $this->getSimpleString('$pdf->SetAutoPageBreak(true, PDF_MARGIN_BOTTOM);'); - $ret .= $this->getSimpleString('$pdf->SetHeaderMargin(PDF_MARGIN_HEADER);'); - $ret .= $this->getSimpleString('$pdf->SetFooterMargin(PDF_MARGIN_FOOTER);'); + $ret .= $this->getSimpleString('$pdf->setHeaderMargin(PDF_MARGIN_HEADER);'); + $ret .= $this->getSimpleString('$pdf->setFooterMargin(PDF_MARGIN_FOOTER);'); $ret .= $this->getSimpleString('$pdf->setImageScale(PDF_IMAGE_SCALE_RATIO); //set image scale factor'); - $ifLang = $this->getSimpleString("\$pdf->setHeaderFont(array('gbsn00lp', '', \$pdfData['fontsize']));", "\t"); - $ifLang .= $this->getSimpleString("\$pdf->setFooterFont(array('gbsn00lp', '', \$pdfData['fontsize']));", "\t"); - $elseLang = $this->getSimpleString("\$pdf->setHeaderFont(array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN));", "\t"); - $elseLang .= $this->getSimpleString("\$pdf->setFooterFont(array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));", "\t"); + $ret .= $this->pc->getPhpCodeCommentLine('For chinese'); + $ifLang = $this->getSimpleString("\$pdf->setHeaderFont(['gbsn00lp', '', \$pdfData['fontsize']]);", "\t"); + $ifLang .= $this->getSimpleString("\$pdf->SetFont('gbsn00lp', '', \$pdfData['fontsize']);", "\t"); + $ifLang .= $this->getSimpleString("\$pdf->setFooterFont(['gbsn00lp', '', \$pdfData['fontsize']]);", "\t"); + $elseLang = $this->getSimpleString("\$pdf->setHeaderFont([PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN]);", "\t"); + $elseLang .= $this->getSimpleString("\$pdf->SetFont(\$pdfData['fontname'], '', \$pdfData['fontsize']);", "\t"); + $elseLang .= $this->getSimpleString("\$pdf->setFooterFont([PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA]);", "\t"); $ret .= $this->pc->getPhpCodeConditions('_LANGCODE', ' == ', "'cn'", $ifLang, $elseLang); $ret .= $this->pc->getPhpCodeCommentLine('Set some language-dependent strings (optional)'); - $ret .= $this->xc->getXcEqualsOperator('$lang', "XOOPS_ROOT_PATH.'/Frameworks/tcpdf/lang/eng.php'"); - $fileExist = $this->pc->getPhpCodeFileExists('$lang'); - $contIf = $this->pc->getPhpCodeIncludeDir('$lang', '', true, true, 'require', "\t"); - $contIf .= $this->getSimpleString('$pdf->setLanguageArray($lang);', "\t"); + $ret .= $this->xc->getXcEqualsOperator('$langFile', "\XOOPS_ROOT_PATH.'/Frameworks/tcpdf/lang/eng.php'"); + $fileExist = $this->pc->getPhpCodeFileExists('$langFile'); + $contIf = $this->pc->getPhpCodeIncludeDir('$langFile', '', true, true, 'require', "\t"); + $contIfInt = $this->getSimpleString('$pdf->setLanguageArray($l);', "\t\t"); + $contIf .= $this->pc->getPhpCodeConditions('isset($l) && \is_array($l)', '', '', $contIfInt, false, "\t"); $ret .= $this->pc->getPhpCodeConditions("@{$fileExist}", '', '', $contIf); return $ret; @@ -212,41 +270,40 @@ public function getUserPdfTcpdf($moduleDirname, $tableName, $fields) */ private function getUserPdfFooter($moduleDirname, $tableName) { - $ret = $this->pc->getPhpCodeCommentLine('Initialize document'); - $ret .= $this->getSimpleString('$pdf->AliasNbPages();'); - $ret .= $this->pc->getPhpCodeCommentLine('Add Page document'); + $ret = $this->pc->getPhpCodeCommentLine('Add Page document'); $ret .= $this->getSimpleString('$pdf->AddPage();'); - $ret .= $this->getSimpleString("\$pdf->writeHTMLCell(\$w=0, \$h=0, \$x='', \$y='', \$content, \$border=0, \$ln=1, \$fill=0, \$reseth=true, \$align='', \$autopadding=true);"); - $ret .= $this->pc->getPhpCodeCommentLine('Pdf Filename'); $ret .= $this->pc->getPhpCodeCommentLine('Output'); - $ret .= $this->xc->getXcXoopsTplAssign('pdfoutput', "\$pdf->Output('{$tableName}.pdf', 'I')"); - $ret .= $this->xc->getXcXoopsTplDisplay($moduleDirname . '_pdf.tpl', '', false); + $ret .= $this->xc->getXcEqualsOperator('$template_path', '\\' . \mb_strtoupper($moduleDirname) . "_PATH . '/templates/" . $moduleDirname . '_' . $tableName . "_pdf.tpl'"); + $ret .= $this->xc->getXcEqualsOperator('$content', '$pdfTpl->fetch($template_path)'); + $ret .= $this->getSimpleString("\$pdf->writeHTMLCell(\$w=0, \$h=0, \$x='', \$y='', \$content, \$border=0, \$ln=1, \$fill=0, \$reseth=true, \$align='', \$autopadding=true);"); + $ret .= $this->getSimpleString("\$pdf->Output(\$pdfFilename, 'I');"); return $ret; } /** * @public function render - * @param null - * @return bool|string + * @return string */ public function render() { - $module = $this->getModule(); - $table = $this->getTable(); - $filename = $this->getFileName(); - $moduleDirname = $module->getVar('mod_dirname'); - $tableId = $table->getVar('table_id'); - $tableMid = $table->getVar('table_mid'); - $tableName = $table->getVar('table_name'); - $fields = $this->getTableFields($tableMid, $tableId); - $language = $this->getLanguage($moduleDirname, 'MA'); - $content = $this->getHeaderFilesComments($module); - $content .= $this->getUserPdfHeader($moduleDirname, $tableName, $fields, $language); - $content .= $this->getUserPdfTcpdf($moduleDirname, $tableName, $fields); - $content .= $this->getUserPdfFooter($moduleDirname, $tableName); - - $this->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $module = $this->getModule(); + $table = $this->getTable(); + $filename = $this->getFileName(); + $moduleDirname = $module->getVar('mod_dirname'); + $tableId = $table->getVar('table_id'); + $tableMid = $table->getVar('table_mid'); + $tableName = $table->getVar('table_name'); + $tableSolename = $table->getVar('table_solename'); + $tablePermissions = (int)$table->getVar('table_permissions'); + $fields = $this->getTableFields($tableMid, $tableId); + $language = $this->getLanguage($moduleDirname, 'MA'); + $content = $this->getHeaderFilesComments($module); + $content .= $this->getUserPdfHeader($moduleDirname, $tableName, $fields, $language); + $content .= $this->getUserPdfTcpdf($moduleDirname, $tableName, $tableSolename, $fields, $tablePermissions); + $content .= $this->getUserPdfFooter($moduleDirname, $tableName); + + $this->create($moduleDirname, '/', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/User/UserPrint.php b/class/Files/User/UserPrint.php index 8b960d70..75a30cc4 100644 --- a/class/Files/User/UserPrint.php +++ b/class/Files/User/UserPrint.php @@ -1,9 +1,9 @@ -xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $this->pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $this->uxc = UserXoopsCode::getInstance(); + $this->xc = Modulebuilder\Files\CreateXoopsCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); } /** * @static function getInstance - * @param null * @return UserPrint */ public static function getInstance() @@ -75,11 +66,11 @@ public static function getInstance() /** * @public function write - * @param string $module + * @param $module * @param mixed $table * @param string $filename */ - public function write($module, $table, $filename) + public function write($module, $table, string $filename): void { $this->setModule($module); $this->setTable($table); @@ -93,18 +84,19 @@ public function write($module, $table, $filename) * * @return string */ - public function getUserPrint($moduleDirname, $language) + public function getUserPrint(string $moduleDirname, string $language, int $tablePermissions) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $stuModuleDirname = mb_strtoupper($moduleDirname); + $stuModuleDirname = \mb_strtoupper($moduleDirname); $table = $this->getTable(); $tableName = $table->getVar('table_name'); $tableSoleName = $table->getVar('table_solename'); $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); + $fieldId = ''; $fieldMain = ''; + $fieldName = ''; $ucfFieldName = ''; - foreach (array_keys($fields) as $f) { + foreach (\array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); if ((0 == $f) && (1 == $this->table->getVar('table_autoincrement'))) { $fieldId = $fieldName; @@ -113,19 +105,19 @@ public function getUserPrint($moduleDirname, $language) $fieldMain = $fieldName; // fieldMain = fields parameters main field } } - $ucfFieldName = ucfirst($fieldName); + $ucfFieldName = \ucfirst($fieldName); } $ccFieldId = $this->getCamelCase($fieldId, false, true); - $stuLpFieldName = mb_strtoupper($ccFieldId); - $ret = $pc->getPhpCodeUseNamespace(['Xmf', 'Request'], '', ''); - $ret .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', ''); - $ret .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']); - $ret .= $this->getInclude(); + $ret = $this->pc->getPhpCodeUseNamespace(['Xmf', 'Request'], '', ''); + $ret .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', ''); + $ret .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']); + $ret .= $this->getRequire(); + $ret .= $this->pc->getPhpCodeIncludeDir("\XOOPS_ROOT_PATH . '/header.php'", '', true, true); $ret .= $this->xc->getXcXoopsRequest($ccFieldId, (string)$fieldId, '', 'Int'); $ret .= $this->pc->getPhpCodeCommentLine('Define Stylesheet'); $ret .= $this->xc->getXcXoThemeAddStylesheet(); - $redirectHeader = $this->xc->getXcRedirectHeader("{$stuModuleDirname}_URL . '/index.php'", '', '2', "{$language}NO{$stuLpFieldName}", false, "\t"); - $ret .= $this->pc->getPhpCodeConditions("empty(\${$ccFieldId})", '', '', $redirectHeader); + $redirectHeader = $this->xc->getXcRedirectHeader("\\{$stuModuleDirname}_URL . '/index.php'", '', '2', "{$language}INVALID_PARAM", false, "\t"); + $ret .= $this->pc->getPhpCodeConditions("\${$ccFieldId}", ' == ', '0', $redirectHeader); $ret .= $this->pc->getPhpCodeCommentLine('Get Instance of Handler'); $ret .= $this->xc->getXcHandlerLine($tableName); @@ -134,56 +126,70 @@ public function getUserPrint($moduleDirname, $language) if (false !== mb_strpos($fieldName, 'published')) { $ret .= $this->pc->getPhpCodeCommentLine('Not yet', $fieldName); $redirectHeader .= $this->getSimpleString('exit();'); - $ret .= $this->pc->getPhpCodeConditions("\${$tableName}Handler->getVar('{$fieldName}') == 0 || \${$tableName}Handler->getVar('{$fieldName}') > time()", '', '', $redirectHeader); + $ret .= $this->pc->getPhpCodeConditions("\${$tableName}Handler->getVar('{$fieldName}') == 0 || \${$tableName}Handler->getVar('{$fieldName}') > \time()", '', '', $redirectHeader); } if (false !== mb_strpos($fieldName, 'expired')) { $ret .= $this->pc->getPhpCodeCommentLine('Expired', $ucfFieldName); $redirectHeader .= $this->getSimpleString('exit();'); - $ret .= $this->pc->getPhpCodeConditions("\${$tableName}Handler->getVar('{$fieldName}') != 0 && \${$tableName}Handler->getVar('{$fieldName}') < time()", '', '', $redirectHeader); + $ret .= $this->pc->getPhpCodeConditions("\${$tableName}Handler->getVar('{$fieldName}') != 0 && \${$tableName}Handler->getVar('{$fieldName}') < \time()", '', '', $redirectHeader); } if (false !== mb_strpos($fieldName, 'date')) { $ret .= $this->pc->getPhpCodeCommentLine('Date', $ucfFieldName); $redirectHeader .= $this->getSimpleString('exit();'); - $ret .= $this->pc->getPhpCodeConditions("\${$tableName}Handler->getVar('{$fieldName}') != 0 && \${$tableName}Handler->getVar('{$fieldName}') < time()", '', '', $redirectHeader); + $ret .= $this->pc->getPhpCodeConditions("\${$tableName}Handler->getVar('{$fieldName}') != 0 && \${$tableName}Handler->getVar('{$fieldName}') < \time()", '', '', $redirectHeader); } if (false !== mb_strpos($fieldName, 'time')) { $ret .= $this->pc->getPhpCodeCommentLine('Time', $ucfFieldName); $redirectHeader .= $this->getSimpleString('exit();'); - $ret .= $this->pc->getPhpCodeConditions("\${$tableName}Handler->getVar('{$fieldName}') != 0 && \${$tableName}Handler->getVar('{$fieldName}') < time()", '', '', $redirectHeader); + $ret .= $this->pc->getPhpCodeConditions("\${$tableName}Handler->getVar('{$fieldName}') != 0 && \${$tableName}Handler->getVar('{$fieldName}') < \time()", '', '', $redirectHeader); + } + $ret .= $this->xc->getXcHandlerGet($tableName . 'Obj', $ccFieldId, '', $tableName . 'Handler'); + $tablenameObj = $this->pc->getPhpCodeIsobject($tableName . 'Obj'); + $redirectError = $this->xc->getXcRedirectHeader($tableName, '', '3', "{$language}INVALID_PARAM", true, "\t"); + $ret .= $this->pc->getPhpCodeConditions('!' . $tablenameObj, '', '', $redirectError); + if (1 === $tablePermissions) { + $ret .= $this->getSimpleString('$currentuid = 0;'); + $condIf = $this->getSimpleString('$currentuid = $xoopsUser->uid();', "\t"); + $ret .= $this->pc->getPhpCodeConditions('isset($xoopsUser) && \is_object($xoopsUser)', '', '', $condIf); + $ret .= $this->xc->getXcXoopsHandler('groupperm'); + $ret .= $this->xc->getXcXoopsHandler('member'); + $condIf = $this->getSimpleString('$my_group_ids = [\XOOPS_GROUP_ANONYMOUS];', "\t"); + $condElse = $this->getSimpleString('$my_group_ids = $memberHandler->getGroupsByUser($currentuid);', "\t"); + $ret .= $this->pc->getPhpCodeConditions('0', ' === ', '$currentuid', $condIf, $condElse); + $gperm = $this->xc->getXcCheckRight('!$grouppermHandler', "{$moduleDirname}_view_{$tableName}", "\${$tableName}Obj->getVar('{$fieldId}')", '$my_group_ids', "\$GLOBALS['xoopsModule']->getVar('mid')", true); + $ret .= $this->pc->getPhpCodeCommentLine('Verify permissions'); + $noPerm = $this->xc->getXcRedirectHeader("\\{$stuModuleDirname}_URL . '/index.php'", '', '3', '\_NOPERM', false, "\t"); + $noPerm .= $this->getSimpleString('exit();', "\t"); + $ret .= $this->pc->getPhpCodeConditions($gperm, '', '', $noPerm); } - $ret .= $this->xc->getXcHandlerGet($tableName, $ccFieldId, '', $tableName . 'Handler',false); - $gperm = $this->xc->getXcCheckRight('!$grouppermHandler', "{$moduleDirname}_view", "\${$ccFieldId}->getVar('{$fieldId}')", '$groups', "\$GLOBALS['xoopsModule']->getVar('mid')", true); - $ret .= $this->pc->getPhpCodeCommentLine('Verify permissions'); - $noPerm = $this->xc->getXcRedirectHeader("{$stuModuleDirname}_URL . '/index.php'", '', '3', '_NOPERM', false, "\t"); - $noPerm .= $this->getSimpleString('exit();', "\t"); - $ret .= $this->pc->getPhpCodeConditions($gperm, '', '', $noPerm); - $ret .= $this->xc->getXcGetValues($tableName, $tableSoleName, '', true); - $contentForeach = $this->xc->getXcXoopsTplAppend('"{$k}"', '$v', "\t"); - $ret .= $this->pc->getPhpCodeForeach($tableSoleName, false, 'k', 'v', $contentForeach); + $ret .= $this->xc->getXcGetValues($tableName, $tableSoleName . 'List', '', true, '', 'Obj'); + $ret .= $this->xc->getXcXoopsTplAppend($tableName . '_list', '$' . $tableSoleName . 'List'); + $ret .= $this->pc->getPhpCodeBlankLine(); $ret .= $this->xc->getXcXoopsTplAssign('xoops_sitename', "\$GLOBALS['xoopsConfig']['sitename']"); - $getVar = $this->xc->getXcGetVar('', $tableSoleName, $fieldMain, true); - $stripTags = $this->pc->getPhpCodeStripTags('', $getVar . ' - ' . "{$language}PRINT" . ' - ' . "\$GLOBALS['xoopsModule']->name()", true); + $getVar = $this->xc->getXcGetVar('', $tableName . 'Obj', $fieldMain, true); + $stripTags = $this->pc->getPhpCodeStripTags('', $getVar . " . ' - ' . " . "{$language}PRINT" . " . ' - ' . " . "\$GLOBALS['xoopsModule']->getVar('name')", true); $ret .= $this->xc->getXcXoopsTplAssign('xoops_pagetitle', $stripTags); - $ret .= $this->xc->getXcXoopsTplDisplay($tableName . '_print.tpl', '', false); + $ret .= $this->xc->getXcXoopsTplDisplay($moduleDirname . '_' . $tableName . '_print.tpl', '', false); return $ret; } /** * @public function render - * @param null - * @return bool|string + * @return string */ public function render() { - $module = $this->getModule(); - $filename = $this->getFileName(); - $moduleDirname = $module->getVar('mod_dirname'); - $language = $this->getLanguage($moduleDirname, 'MA'); - $content = $this->getHeaderFilesComments($module); - $content .= $this->getUserPrint($moduleDirname, $language); - - $this->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $module = $this->getModule(); + $filename = $this->getFileName(); + $table = $this->getTable(); + $tablePermissions = (int)$table->getVar('table_permissions'); + $moduleDirname = $module->getVar('mod_dirname'); + $language = $this->getLanguage($moduleDirname, 'MA'); + $content = $this->getHeaderFilesComments($module); + $content .= $this->getUserPrint($moduleDirname, $language, $tablePermissions); + + $this->create($moduleDirname, '/', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/User/UserRate.php b/class/Files/User/UserRate.php index db1af079..85861d08 100644 --- a/class/Files/User/UserRate.php +++ b/class/Files/User/UserRate.php @@ -1,9 +1,9 @@ -xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $this->pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $this->uxc = UserXoopsCode::getInstance(); + $this->xc = Modulebuilder\Files\CreateXoopsCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); } /** * @static function getInstance * - * @param null * * @return UserRate */ @@ -79,14 +69,14 @@ public static function getInstance() /** * @public function write - * @param string $module - * @param mixed $table + * @param $module + * @param $tables * @param string $filename */ - public function write($module, $table, $filename) + public function write($module, $tables, string $filename) { $this->setModule($module); - $this->setTable($table); + $this->setTables($tables); $this->setFileName($filename); } @@ -94,148 +84,227 @@ public function write($module, $table, $filename) * @private function getUserRateHeader * * @param $moduleDirname - * @param $tableName - * * @return string */ - public function getUserRateHeader($moduleDirname, $tableName) + public function getUserRateHeader($moduleDirname) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $ret = $pc->getPhpCodeUseNamespace(['Xmf', 'Request'], '', ''); - $ret .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', ''); - $ret .= $pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']); - $ret .= $this->getInclude(); - $ret .= $this->xc->getXcXoopsRequest('op', 'op', 'form'); - $ret .= $this->xc->getXcXoopsRequest('lid', 'lid', '', 'Int'); - $ret .= $this->uxc->getUserTplMain($moduleDirname, $tableName); - $ret .= $this->pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'header', true); - $ret .= $this->pc->getPhpCodeCommentLine('Define Stylesheet'); - $ret .= $this->xc->getXcXoThemeAddStylesheet(); + $ret = $this->pc->getPhpCodeUseNamespace(['Xmf', 'Request'], '', ''); + $ret .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname], '', ''); + $ret .= $this->pc->getPhpCodeUseNamespace(['XoopsModules', $moduleDirname, 'Constants']); + $ret .= $this->getRequire(); + $ret .= $this->xc->getXcXoopsRequest('op', 'op', 'list', 'Cmd'); + $ret .= $this->xc->getXcXoopsRequest('source', 'source', '', 'Int'); return $ret; } /** * @private function getUserRateSwitch - * @param $moduleDirname - * @param $tableId - * @param $tableMid - * @param $tableName - * @param $tableSoleName - * @param $tableAutoincrement + * @param $tables * @param $language + * @param $moduleDirname * @return string */ - private function getUserRateSwitch($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableAutoincrement, $language) + private function getUserRateSwitch($tables, $language, $moduleDirname) { - $fields = $this->getTableFields($tableMid, $tableId); + $t = "\t\t"; $cases = [ - 'form' => [$this->getUserRateForm($tableName, $language)], - 'save' => [$this->getUserRateSave($moduleDirname, $fields, $tableName, $tableSoleName, $tableAutoincrement, $language)], + 'list' => [$this->getUserRateDefault( $t)], + 'save' => [$this->getUserRateSave($tables, $language, $t, $moduleDirname)], ]; - return $this->xc->getXcSwitch('op', $cases, true, false, "\t"); + return $this->xc->getXcSwitch('op', $cases, true); } /** * @public function getAdminPagesList - * @param $tableName - * @param $language - * + * @param string $t * @return string */ - public function getUserRateForm($tableName, $language) + public function getUserRateDefault(string $t = '') { - $ret = $this->pc->getPhpCodeCommentLine('Navigation'); - $ret .= $this->xc->getXcEqualsOperator('$navigation', "{$language}RATE", null, "\t\t"); - $ret .= $this->xc->getXcXoopsTplAssign('navigation', '$navigation', true, "\t\t"); - $ret .= $this->pc->getPhpCodeCommentLine('Title of page', null, "\t\t"); - $ret .= $this->xc->getXcEqualsOperator('$title', "{$language}RATE . ' - '", null, "\t\t"); - $ret .= $this->xc->getXcEqualsOperator('$title', "\$GLOBALS['xoopsModule']->name()", '.', "\t\t"); - $ret .= $this->xc->getXcXoopsTplAssign('xoops_pagetitle', '$title', true, "\t\t"); - $ret .= $this->pc->getPhpCodeCommentLine('Description', null, "\t\t"); - $ret .= $this->uxc->getUserAddMeta('description', $language, 'RATE', "\t\t"); - $ret .= $this->pc->getPhpCodeCommentLine('Form Create', null, "\t\t"); - $ret .= $this->xc->getXcHandlerCreateObj($tableName, "\t\t"); - $ret .= $this->xc->getXcGetForm('form', $tableName, 'Obj', "\t\t"); - $ret .= $this->xc->getXcXoopsTplAssign('form', '$form->render()', true, "\t\t"); + $ret = $this->pc->getPhpCodeCommentLine('default should not happen','', $t); + $ret .= $this->xc->getXcRedirectHeader('index', '', '3', '\_NOPERM', true, $t); return $ret; } /** * @public function getUserRateSave - * @param $moduleDirname - * @param $fields - * @param $tableName - * @param $tableSoleName - * @param $tableAutoincrement + * @param $tables * @param $language + * @param $t + * @param $moduleDirname * @return string */ - public function getUserRateSave($moduleDirname, $fields, $tableName, $tableSoleName, $tableAutoincrement, $language) + public function getUserRateSave($tables, $language, $t, $moduleDirname) { - $ret = $this->pc->getPhpCodeCommentLine('Security Check'); + $ret = $this->pc->getPhpCodeCommentLine('Security Check', '', $t); $xoopsSecurityCheck = $this->xc->getXcXoopsSecurityCheck(); $securityError = $this->xc->getXcXoopsSecurityErrors(); $implode = $this->pc->getPhpCodeImplode(',', $securityError); - $redirectError = $this->xc->getXcRedirectHeader($tableName, '', '3', $implode, true, "\t\t\t"); - $ret .= $this->pc->getPhpCodeConditions($xoopsSecurityCheck, '', '', $redirectError, false, "\t\t"); - $ret .= $this->xc->getXcHandlerCreateObj($tableName, "\t\t"); + $redirectError = $this->xc->getXcRedirectHeader('index', '', '3', $implode, true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions('!' . $xoopsSecurityCheck, '', '', $redirectError, false, $t); + + $ret .= $this->xc->getXcXoopsRequest('rating', 'rating', '', 'Int', $t); + $ret .= $this->xc->getXcEqualsOperator('$itemid', '0','', $t); + $ret .= $this->xc->getXcEqualsOperator('$redir ', "\Xmf\Request::getString('HTTP_REFERER', '', 'SERVER')",'', $t); + foreach ($tables as $table) { + $tableName = $table->getVar('table_name'); + $stuTableName = \mb_strtoupper($tableName); + if (1 == $table->getVar('table_rate')) { + $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); + $fieldId = ''; + foreach (\array_keys($fields) as $f) { + if (0 == $f) { + $fieldId = $fields[$f]->getVar('field_name'); + } + } + $contIf = $this->xc->getXcXoopsRequest('itemid', $fieldId, '', 'Int', $t . "\t"); + $contIf .= $this->xc->getXcEqualsOperator('$redir', "'{$tableName}.php?op=show&{$fieldId}=' . \$itemid",'', $t . "\t"); + $const = $this->xc->getXcGetConstants('TABLE_' . $stuTableName); + $ret .= $this->pc->getPhpCodeConditions('$source', ' === ', $const, $contIf, false, $t); + } + } + $redirectError = $this->xc->getXcRedirectHeader('$redir', '', '3', "{$language}INVALID_PARAM", false, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions('(int)$itemid', ' === ', '0', $redirectError, false, $t); - $ret .= $this->xc->getXcSaveElements($moduleDirname, $tableName, $tableSoleName, $fields, "\t\t"); + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->pc->getPhpCodeCommentLine('Check permissions', '', $t); + $ret .= $this->xc->getXcEqualsOperator('$rate_allowed', 'false','', $t); + $xUser = $this->pc->getPhpCodeGlobals('xoopsUser'); + $ret .= $this->pc->getPhpCodeTernaryOperator('groups', '(isset(' . $xUser . ') && \is_object(' . $xUser . '))', $xUser . '->getGroups()', '[\XOOPS_GROUP_ANONYMOUS]', "\t\t"); + $contIf = $this->xc->getXcEqualsOperator('$rate_allowed', 'true','', $t . "\t\t"); + $contIf .= $this->getSimpleString('break;', $t . "\t\t"); + $cond = '\XOOPS_GROUP_ADMIN == $group || \in_array($group, $helper->getConfig(\'ratingbar_groups\'))'; + $contFe = $this->pc->getPhpCodeConditions($cond, '', '', $contIf, false, $t . "\t"); + $ret .= $this->pc->getPhpCodeForeach('groups', false, false, 'group', $contFe, $t); + $contIf = $this->xc->getXcRedirectHeader('index', '', '3', $language . 'RATING_NOPERM', true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions('!$rate_allowed', '', '', $contIf, false, $t); - $ret .= $this->pc->getPhpCodeCommentLine('Insert Data', null, "\t\t"); - $insert = $this->xc->getXcHandlerInsert($tableName, $tableName, 'Obj', true); - $confirmOk = $this->xc->getXcRedirectHeader('index', '', '2', "{$language}FORM_OK", true, "\t\t\t"); - $ret .= $this->pc->getPhpCodeConditions($insert, '', '', $confirmOk, false, "\t\t"); + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->pc->getPhpCodeCommentLine('Check rating value', null, $t); + $cases = []; + $contIf = $this->xc->getXcRedirectHeader('index', '', '3', $language . 'RATING_VOTE_BAD', true, $t . "\t\t"); + $contIf .= $this->getSimpleString('exit;', $t . "\t\t"); + $const = $this->xc->getXcGetConstants('RATING_NONE'); + $cases[$const] = [$contIf]; + $contIf = $this->xc->getXcRedirectHeader('index', '', '3', $language . 'RATING_VOTE_BAD', true, $t . "\t\t\t"); + $contIf .= $this->getSimpleString('exit;', $t . "\t\t\t"); + $const = $this->xc->getXcGetConstants('RATING_LIKES'); + $cases[$const] = [$this->pc->getPhpCodeConditions('!\in_array($rating, [-1, 1], true)', '', '', $contIf, false, $t . "\t\t")]; + $const = $this->xc->getXcGetConstants('RATING_5STARS'); + $cases[$const] = [$this->pc->getPhpCodeConditions('$rating > 5 || $rating < 1', '', '', $contIf, false, $t . "\t\t")]; + $const = $this->xc->getXcGetConstants('RATING_10STARS'); + $cases[$const] = ''; + $const = $this->xc->getXcGetConstants('RATING_10NUM'); + $cases[$const] = [$this->pc->getPhpCodeConditions('$rating > 10 || $rating < 1', '', '', $contIf, false, $t . "\t\t")]; + $config = '(int)' . $this->xc->getXcGetConfig('ratingbars'); + $ret .= $this->xc->getXcSwitch($config, $cases, true, $t, false, true); - $ret .= $this->pc->getPhpCodeCommentLine('Get Form Error', null, "\t\t"); - $ret .= $this->xc->getXcXoopsTplAssign('error', "\${$tableName}Obj->getHtmlErrors()", true, "\t\t"); - $ret .= $this->xc->getXcGetForm('form', $tableName, 'Obj', "\t\t"); - $ret .= $this->xc->getXcXoopsTplAssign('form', '$form->display()', true, "\t\t"); + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->pc->getPhpCodeCommentLine('Get existing rating', null, $t); + $ret .= $this->xc->getXcEqualsOperator('$itemrating', '$ratingsHandler->getItemRating($itemid, $source)','', $t); + + $ret .= $this->pc->getPhpCodeBlankLine(); + $ret .= $this->pc->getPhpCodeCommentLine('Set data rating', null, $t); + $contIf = $this->pc->getPhpCodeCommentLine('If yo want to avoid revoting then activate next line', null, $t . "\t"); + $contIf .= $t . "\t//" . $this->xc->getXcRedirectHeader('index', '', '3', $language . 'RATING_VOTE_BAD'); + $contIf .= $this->xc->getXcHandlerGet('ratings', "itemrating['id']",'Obj', 'ratingsHandler', false, $t . "\t"); + $contElse = $this->xc->getXcHandlerCreateObj('ratings', $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions("\$itemrating['voted']", '', '', $contIf, $contElse, $t); + $ret .= $this->xc->getXcSetVarObj('ratings', 'rate_source', '$source', $t); + $ret .= $this->xc->getXcSetVarObj('ratings', 'rate_itemid', '$itemid', $t); + $ret .= $this->xc->getXcSetVarObj('ratings', 'rate_value', '$rating', $t); + $ret .= $this->xc->getXcSetVarObj('ratings', 'rate_uid', "\$itemrating['uid']", $t); + $ret .= $this->xc->getXcSetVarObj('ratings', 'rate_ip', "\$itemrating['ip']", $t); + $ret .= $this->xc->getXcSetVarObj('ratings', 'rate_date', '\time()', $t); + $ret .= $this->pc->getPhpCodeCommentLine('Insert Data', null, $t); + $insert = $this->xc->getXcHandlerInsert('ratings', 'ratings', 'Obj'); + $contIf = $this->pc->getPhpCodeUnset('ratingsObj', $t . "\t"); + + $contIf .= $this->pc->getPhpCodeCommentLine('Calc average rating value', null, $t . "\t"); + foreach ($tables as $table) { + $tableName = $table->getVar('table_name'); + $stuTableName = \mb_strtoupper($tableName); + if (1 == $table->getVar('table_rate')) { + $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); + $fieldId = ''; + $fieldRatings = ''; + $fieldVotes = ''; + foreach (\array_keys($fields) as $f) { + if (0 == $f) { + $fieldId = $fields[$f]->getVar('field_name'); + } + $fieldElement = $fields[$f]->getVar('field_element'); + if($fieldElement == Modulebuilder\Constants::FIELD_ELE_TEXTRATINGS) { + $fieldRatings = $fields[$f]->getVar('field_name'); + } + if($fieldElement == Modulebuilder\Constants::FIELD_ELE_TEXTVOTES) { + $fieldVotes = $fields[$f]->getVar('field_name'); + } + } + $sql = $this->getSimpleString("\$sql = '", $t . "\t\t"); + $sql .= $this->getSimpleString("UPDATE ' . \$GLOBALS['xoopsDB']->prefix('" . $moduleDirname . '_' . $tableName . "') . ' t", $t . "\t\t\t"); + $sql .= $this->getSimpleString('LEFT JOIN (', $t . "\t\t\t"); + $sql .= $this->getSimpleString('SELECT', $t . "\t\t\t\t"); + $sql .= $this->getSimpleString('rate_itemid, rate_source, COUNT(*) AS votes, ROUND(AVG(rate_value), 2) AS avg_rating', $t . "\t\t\t\t\t"); + $sql .= $this->getSimpleString("FROM ' . \$GLOBALS['xoopsDB']->prefix('{$moduleDirname}_ratings') . '", $t . "\t\t\t\t"); + $sql .= $this->getSimpleString('GROUP BY rate_itemid, rate_source', $t . "\t\t\t\t"); + $sql .= $this->getSimpleString(") r ON r.rate_itemid = t." . $fieldId . " and r.rate_source = ' . \$source . '", $t . "\t\t\t"); + $sql .= $this->getSimpleString('SET', $t . "\t\t\t"); + $sql .= $this->getSimpleString('t.' . $fieldVotes . ' = COALESCE(r.votes, 0),', $t . "\t\t\t\t"); + $sql .= $this->getSimpleString('t.' . $fieldRatings . ' = COALESCE(r.avg_rating, 0)', $t . "\t\t\t\t"); + $sql .= $this->getSimpleString("WHERE t." . $fieldId . " = ' . \$itemid;", $t . "\t\t\t"); + $contIfInt = $sql; + + $insertInt = "\$GLOBALS['xoopsDB']->queryF(\$sql)"; + + $insertOK = $this->xc->getXcRedirectHeader('$redir', '', '2', "{$language}RATING_VOTE_THANKS", false, $t . "\t\t\t"); + $insertErr = $this->xc->getXcRedirectHeader($tableName, '', '3', "{$language}RATING_ERROR1", true, $t . "\t\t\t"); + $contIfInt .= $this->pc->getPhpCodeConditions($insertInt, '', '', $insertOK, $insertErr, $t. "\t\t"); + $contIfInt .= $this->pc->getPhpCodeUnset($tableName . 'Obj', $t . "\t\t"); + $const = $this->xc->getXcGetConstants('TABLE_' . $stuTableName); + $contIf .= $this->pc->getPhpCodeConditions('$source', ' === ', $const, $contIfInt, false, $t . "\t"); + } + } + + $contIf .= $this->pc->getPhpCodeBlankLine(); + $contIf .= $this->xc->getXcRedirectHeader('index', '', '2', "{$language}INVALID_PARAM", true, $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions($insert, '', '', $contIf, false, $t); + + $ret .= $this->pc->getPhpCodeCommentLine('Get Error', null, $t); + $ret .= $this->getSimpleString("echo 'Error: ' . \$ratingsObj->getHtmlErrors();", $t); return $ret; } /** * @public function getUserRateFooter - * @param $moduleDirname - * @param $language * @return string */ - public function getUserRateFooter($moduleDirname, $language) + public function getUserRateFooter() { - $ret = $this->pc->getPhpCodeCommentLine('Breadcrumbs'); - $ret .= $this->uxc->getUserBreadcrumbs('RATE', $language); - $ret .= $this->getInclude('footer'); - - return $ret; + return $this->getRequire('footer'); } /** * @public function render - * @param null - * @return bool|string + * @return string */ public function render() { $module = $this->getModule(); - $table = $this->getTable(); + $tables = $this->getTables(); $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); - $tableId = $table->getVar('table_id'); - $tableMid = $table->getVar('table_mid'); - $tableName = $table->getVar('table_name'); - $tableSoleName = $table->getVar('table_solename'); - $tableAutoincrement = $table->getVar('table_autoincrement'); $language = $this->getLanguage($moduleDirname, 'MA'); $content = $this->getHeaderFilesComments($module); - //$content .= $this->getUserRateHeader($moduleDirname, $tableName); - //$content .= $this->getUserRateSwitch($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableAutoincrement, $language); - //$content .= $this->getUserRateFooter($moduleDirname, $language); + $content .= $this->getUserRateHeader($moduleDirname); + $content .= $this->getUserRateSwitch($tables, $language, $moduleDirname); + $content .= $this->getUserRateFooter(); - $this->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + $this->create($moduleDirname, '/', $filename, $content, \_AM_MODULEBUILDER_FILE_CREATED, \_AM_MODULEBUILDER_FILE_NOTCREATED); return $this->renderFile(); } diff --git a/class/Files/User/UserRss.php b/class/Files/User/UserRss.php index d640e913..14a32bad 100644 --- a/class/Files/User/UserRss.php +++ b/class/Files/User/UserRss.php @@ -1,9 +1,9 @@ -xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $this->pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $this->uxc = UserXoopsCode::getInstance(); + $this->pc = Modulebuilder\Files\CreatePhpCode::getInstance(); } /** * @static function getInstance - * @param null * @return UserRss */ public static function getInstance() @@ -75,11 +61,11 @@ public static function getInstance() /** * @public function write - * @param string $module + * @param $module * @param mixed $table * @param string $filename */ - public function write($module, $table, $filename) + public function write($module, $table, string $filename): void { $this->setModule($module); $this->setTable($table); @@ -91,13 +77,15 @@ public function write($module, $table, $filename) * @param string $moduleDirname * @return string */ - public function getUserRss($moduleDirname) + public function getUserRss(string $moduleDirname) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); $table = $this->getTable(); $tableName = $table->getVar('table_name'); + $fppf = ''; + $fpmf = ''; + $fieldId = ''; $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); - foreach (array_keys($fields) as $f) { + foreach (\array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); $fieldMain[] = $fields[$f]->getVar('field_main'); $fieldParent[] = $fields[$f]->getVar('field_parent'); @@ -105,115 +93,116 @@ public function getUserRss($moduleDirname) if (0 == $f) { $fieldId = $fieldName; } - if (in_array(1, $fieldMain)) { + if (\in_array(1, $fieldMain)) { $fpmf = $fieldName; } - if (in_array(1, $fieldParent)) { + if (\in_array(1, $fieldParent)) { $fppf = $fieldName; } else { $fppf = 'cid'; } } - $ret = $pc->getPhpCodeUseNamespace(['Xmf', 'Request']); - $ret .= $this->getInclude(); + $ret = $this->pc->getPhpCodeUseNamespace(['Xmf', 'Request']); + $ret .= $this->getRequire(); $ret .= <<
' . \$uploader->getErrors()", '.', $t . "\t\t"); + $ifelse .= $this->pc->getPhpCodeConditions('$uploader->upload()', '', '', $contIf, $contElseInt, $t . "\t"); + $contElseExt = $this->xc->getXcSetVarObj($tableName, $fieldName, "Request::getString('{$fieldName}')", $t . "\t"); - $ret .= $pc->getPhpCodeConditions($fetchMedia, '', '', $ifelse, $contElseExt, $t); + $ret .= $this->pc->getPhpCodeConditions($fetchMedia, '', '', $ifelse, $contElseExt, $t); return $ret; } @@ -205,54 +225,51 @@ public function getAxcSetVarImageList($tableName, $fieldName, $t = '', $countUpl * @param string $fieldName * @param $fieldMain * @param string $t - * @param int $countUploader + * @param int $countUploader * @return string */ - public function getAxcSetVarUploadImage($moduleDirname, $tableName, $fieldName, $fieldMain, $t = '', $countUploader = 0) + public function getAxcSetVarUploadImage(string $moduleDirname, string $tableName, string $fieldName, $fieldMain, string $t = '', int $countUploader = 0) { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $stuModuleDirname = mb_strtoupper($moduleDirname); - $ucfModuleDirname = ucfirst($moduleDirname); - $ret = $pc->getPhpCodeCommentLine('Set Var', $fieldName, $t); - $ret .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/uploader', true, false, '', $t); - $file = $pc->getPhpCodeGlobalsVariables($fieldName, 'FILES') . "['name']"; - $ret .= $xc->getXcEqualsOperator('$filename ', $file, null, $t); - $mimetype = $pc->getPhpCodeGlobalsVariables($fieldName, 'FILES') . "['type']"; - $ret .= $xc->getXcEqualsOperator('$imgMimetype ', $mimetype, null, $t); - $ret .= $xc->getXcEqualsOperator('$imgNameDef ', "Request::getString('{$fieldMain}')", null, $t); - $ret .= $xc->getXcEqualsOperator('$uploaderErrors', "''", null, $t); - $xUploadImage = "{$stuModuleDirname}_UPLOAD_IMAGE_PATH"; - $ret .= $xc->getXcMediaUploader('uploader', $xUploadImage . " . '/{$tableName}/'", 'mimetypes_image', 'maxsize_image', $t); - $post = $pc->getPhpCodeGlobalsVariables('xoops_upload_file', 'POST') . '[' . $countUploader . ']'; + $stuModuleDirname = \mb_strtoupper($moduleDirname); + + $ret = $this->pc->getPhpCodeCommentLine('Set Var', $fieldName, $t); + $condIf = $this->pc->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH', 'class/uploader', true, false, '', $t . "\t"); + $file = $this->pc->getPhpCodeGlobalsVariables($fieldName, 'FILES') . "['name']"; + $ret .= $this->xc->getXcEqualsOperator('$filename', $file, null, $t); + $mimetype = $this->pc->getPhpCodeGlobalsVariables($fieldName, 'FILES') . "['type']"; + $condIf .= $this->xc->getXcEqualsOperator('$imgMimetype ', $mimetype, null, $t . "\t"); + $condIf .= $this->xc->getXcEqualsOperator('$imgNameDef ', "Request::getString('{$fieldMain}')", null, $t . "\t"); + $xUploadImage = "\\{$stuModuleDirname}_UPLOAD_IMAGE_PATH"; + $condIf .= $this->xc->getXcMediaUploader('uploader', $xUploadImage . " . '/{$tableName}/'", 'mimetypes_image', 'maxsize_image', $t . "\t"); + $isset = "isset(\$_POST['xoops_upload_file'][" . $countUploader . '])'; + $post = $this->pc->getPhpCodeGlobalsVariables('xoops_upload_file', 'POST') . '[' . $countUploader . ']'; $fetchMedia = $this->getAxcFetchMedia('uploader', $post); - $expr = '/^.+\.([^.]+)$/sU'; - $ifelse = $pc->getPhpCodePregFunzions('extension', $expr, '', "\$filename", 'replace', false, $t . "\t"); - $ifelse .= $t . "\t\$imgName = str_replace(' ', '', \$imgNameDef) . '.' . \$extension;\n"; - $ifelse .= $this->getAxcSetPrefix('uploader', '$imgName', $t . "\t") . ";\n"; - $ifelse .= $t . "\t{$fetchMedia};\n"; - $contElseInt = $xc->getXcEqualsOperator('$savedFilename', '$uploader->getSavedFileName()', null, $t . "\t\t"); - $config = $xc->getXcGetConfig('maxwidth_image'); - $contElseInt .= $xc->getXcEqualsOperator('$maxwidth ', "(int){$config}", null, $t . "\t\t"); - $config = $xc->getXcGetConfig('maxheight_image'); - $contElseInt .= $xc->getXcEqualsOperator('$maxheight', "(int){$config}", null, $t . "\t\t"); - $resizer = $pc->getPhpCodeCommentLine('Resize image', '', $t . "\t\t\t"); - $resizer .= $xc->getXcEqualsOperator('$imgHandler ', "new {$ucfModuleDirname}\Common\Resizer()", null, $t . "\t\t\t"); - $resizer .= $xc->getXcEqualsOperator('$imgHandler->sourceFile ', $xUploadImage . " . '/{$tableName}/' . \$savedFilename", null, $t . "\t\t\t"); - $resizer .= $xc->getXcEqualsOperator('$imgHandler->endFile ', $xUploadImage . " . '/{$tableName}/' . \$savedFilename", null, $t . "\t\t\t"); - $resizer .= $xc->getXcEqualsOperator('$imgHandler->imageMimetype', '$imgMimetype', null, $t . "\t\t\t"); - $resizer .= $xc->getXcEqualsOperator('$imgHandler->maxWidth ', '$maxwidth', null, $t . "\t\t\t"); - $resizer .= $xc->getXcEqualsOperator('$imgHandler->maxHeight ', '$maxheight', null, $t . "\t\t\t"); - $resizer .= $xc->getXcEqualsOperator('$result ', '$imgHandler->resizeImage()', null, $t . "\t\t\t"); - $contElseInt .= $pc->getPhpCodeConditions('$maxwidth > 0 && $maxheight > 0', '', '', $resizer, false, $t . "\t\t"); - $contElseInt .= $xc->getXcSetVarObj($tableName, $fieldName, '$savedFilename', $t . "\t\t"); - $contIf = $xc->getXcEqualsOperator('$uploaderErrors', '$uploader->getErrors()', null, $t . "\t\t"); - $ifelse .= $pc->getPhpCodeConditions('!$uploader->upload()', '', '', $contIf, $contElseInt, $t . "\t"); - $ifelseExt = $xc->getXcEqualsOperator('$uploaderErrors', '$uploader->getErrors()', null, $t . "\t\t"); - $contElseExt = $pc->getPhpCodeConditions("\$filename", ' > ', "''", $ifelseExt, false, $t . "\t"); - $contElseExt .= $xc->getXcSetVarObj($tableName, $fieldName, "Request::getString('{$fieldName}')", $t . "\t"); - - $ret .= $pc->getPhpCodeConditions($fetchMedia, '', '', $ifelse, $contElseExt, $t); + $ifelse = $this->xc->getXcEqualsOperator('$extension', '\pathinfo($filename, \PATHINFO_EXTENSION)',null, $t . "\t\t"); + $ifelse .= $this->xc->getXcEqualsOperator('$imgName', "\str_replace(' ', '', \$imgNameDef) . '.' . \$extension", null,$t . "\t\t"); + $ifelse .= $this->getAxcSetPrefix('uploader', '$imgName', $t . "\t\t") . ";\n"; + $contIf = $this->xc->getXcEqualsOperator('$savedFilename', '$uploader->getSavedFileName()', null, $t . "\t\t\t"); + $config = $this->xc->getXcGetConfig('maxwidth_image'); + $contIf .= $this->xc->getXcEqualsOperator('$maxwidth ', "(int){$config}", null, $t . "\t\t\t"); + $config = $this->xc->getXcGetConfig('maxheight_image'); + $contIf .= $this->xc->getXcEqualsOperator('$maxheight', "(int){$config}", null, $t . "\t\t\t"); + $resizer = $this->pc->getPhpCodeCommentLine('Resize image', '', $t . "\t\t\t"); + $resizer .= $this->xc->getXcEqualsOperator('$imgHandler ', "new Common\Resizer()", null, $t . "\t\t\t\t"); + $resizer .= $this->xc->getXcEqualsOperator('$imgHandler->sourceFile ', $xUploadImage . " . '/{$tableName}/' . \$savedFilename", null, $t . "\t\t\t\t"); + $resizer .= $this->xc->getXcEqualsOperator('$imgHandler->endFile ', $xUploadImage . " . '/{$tableName}/' . \$savedFilename", null, $t . "\t\t\t\t"); + $resizer .= $this->xc->getXcEqualsOperator('$imgHandler->imageMimetype', '$imgMimetype', null, $t . "\t\t\t\t"); + $resizer .= $this->xc->getXcEqualsOperator('$imgHandler->maxWidth ', '$maxwidth', null, $t . "\t\t\t\t"); + $resizer .= $this->xc->getXcEqualsOperator('$imgHandler->maxHeight ', '$maxheight', null, $t . "\t\t\t\t"); + $resizer .= $this->xc->getXcEqualsOperator('$result ', '$imgHandler->resizeImage()', null, $t . "\t\t\t\t"); + $contIf .= $this->pc->getPhpCodeConditions('$maxwidth > 0 && $maxheight > 0', '', '', $resizer, false, $t . "\t\t\t"); + $contIf .= $this->xc->getXcSetVarObj($tableName, $fieldName, '$savedFilename', $t . "\t\t\t"); + $contElseInt = $this->xc->getXcEqualsOperator('$uploaderErrors', "'
' . \$uploader->getErrors()", '.', $t . "\t\t\t"); + $ifelse .= $this->pc->getPhpCodeConditions('$uploader->upload()', '', '', $contIf, $contElseInt, $t . "\t\t"); + $ifelseExt = $this->xc->getXcEqualsOperator('$uploaderErrors', "'
' . \$uploader->getErrors()", '.', $t . "\t\t\t"); + $contElseExt = $this->pc->getPhpCodeConditions('$filename', ' > ', "''", $ifelseExt, false, $t . "\t\t"); + $contElseExt .= $this->xc->getXcSetVarObj($tableName, $fieldName, "Request::getString('{$fieldName}')", $t . "\t\t"); + $condIf .= $this->pc->getPhpCodeConditions($isset . ' && ' . $fetchMedia, '', '', $ifelse, $contElseExt, $t . "\t"); + $condElse = $this->xc->getXcSetVarObj($tableName, $fieldName, "Request::getString('{$fieldName}')", $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions("'' !== (string)\$filename", '', '', $condIf, $condElse, $t); return $ret; } @@ -262,18 +279,16 @@ public function getAxcSetVarUploadImage($moduleDirname, $tableName, $fieldName, * @param $moduleDirname * @param $tableName * @param $fieldName - * @param bool $formatUrl + * @param bool $formatUrl * @param string $t - * @param int $countUploader + * @param int $countUploader * @param string $fieldMain * @return string */ - public function getAxcSetVarUploadFile($moduleDirname, $tableName, $fieldName, $formatUrl = false, $t = '', $countUploader = 0, $fieldMain = '') + public function getAxcSetVarUploadFile($moduleDirname, $tableName, $fieldName, bool $formatUrl = false, string $t = '', int $countUploader = 0, string $fieldMain = '') { - $stuModuleDirname = mb_strtoupper($moduleDirname); - $ret = $this->getAxcSetVarImageFile($stuModuleDirname . '_UPLOAD_FILES_PATH', $tableName, $fieldName, $formatUrl, $t, $countUploader, $fieldMain, 'mimetypes_file', 'maxsize_file'); - - return $ret; + $stuModuleDirname = \mb_strtoupper($moduleDirname); + return $this->getAxcSetVarImageFile('\\' . $stuModuleDirname . '_UPLOAD_FILES_PATH', $tableName, $fieldName, $formatUrl, $t, $countUploader, $fieldMain, 'mimetypes_file', 'maxsize_file'); } /** @@ -289,38 +304,45 @@ public function getAxcSetVarUploadFile($moduleDirname, $tableName, $fieldName, $ * @param string $maxsize * @return string */ - private function getAxcSetVarImageFile($dirname, $tableName, $fieldName, $formatUrl = false, $t = '', $countUploader = 0, $fieldMain = '', $mimetype = 'mimetypes_image', $maxsize = 'maxsize_image') + private function getAxcSetVarImageFile($dirname, $tableName, $fieldName, bool $formatUrl = false, string $t = '', int $countUploader = 0, string $fieldMain = '', string $mimetype = 'mimetypes_image', string $maxsize = 'maxsize_image') { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); $ret = ''; $files = ''; - $contIf = ''; + + $rpFieldName = '$' . $this->cf->getCamelCase($fieldName, false, true); if ($formatUrl) { - $ret .= $xc->getXcSetVarObj($tableName, $fieldName, "formatUrl(\$_REQUEST['{$fieldName}'])", $t); + $ret .= $this->xc->getXcEqualsOperator($rpFieldName, "formatURL((string)(\$_REQUEST['{$fieldName}'] ?? ''))", null, $t); } - $ret .= $pc->getPhpCodeCommentLine('Set Var', $fieldName, $t); - $ret .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/uploader', true, false, '', $t); - $file = $pc->getPhpCodeGlobalsVariables($fieldName, 'FILES') . "['name']"; - $ret .= $xc->getXcEqualsOperator('$filename ', $file, null, $t); - $ret .= $xc->getXcEqualsOperator('$imgNameDef ', "Request::getString('{$fieldMain}')", null, $t); - $ret .= $xc->getXcMediaUploader('uploader', $dirname . " . '/{$tableName}{$files}/'", $mimetype, $maxsize, $t); - $post = $pc->getPhpCodeGlobalsVariables('xoops_upload_file', 'POST') . '[' . $countUploader . ']'; + $ret .= $this->pc->getPhpCodeCommentLine('Set Var', $fieldName, $t); + $file = $this->pc->getPhpCodeGlobalsVariables($fieldName, 'FILES') . "['name']"; + $ret .= $this->xc->getXcEqualsOperator('$filename', $file, null, $t); + $condIf = $this->pc->getPhpCodeIncludeDir('\XOOPS_ROOT_PATH', 'class/uploader', true, false, '', $t . "\t"); + $condIf .= $this->xc->getXcEqualsOperator('$imgNameDef', "Request::getString('{$fieldMain}')", null, $t . "\t"); + $condIf .= $this->xc->getXcMediaUploader('uploader', $dirname . " . '/{$tableName}{$files}/'", $mimetype, $maxsize, $t . "\t"); + $isset = "isset(\$_POST['xoops_upload_file'][" . $countUploader . '])'; + $post = $this->pc->getPhpCodeGlobalsVariables('xoops_upload_file', 'POST') . '[' . $countUploader . ']'; $fetchMedia = $this->getAxcFetchMedia('uploader', $post); - $expr = '/^.+\.([^.]+)$/sU'; - $ifelse = $pc->getPhpCodePregFunzions('extension', $expr, '', "\$filename", 'replace', false, $t . "\t"); - $ifelse .= $t . "\t\$imgName = str_replace(' ', '', \$imgNameDef) . '.' . \$extension;\n"; - $ifelse .= $this->getAxcSetPrefix('uploader', '$imgName', $t . "\t") . ";\n"; - $ifelse .= $t . "\t{$fetchMedia};\n"; - $contElseInt = $xc->getXcSetVarObj($tableName, $fieldName, '$uploader->getSavedFileName()', $t . "\t\t"); - $contIf .= $xc->getXcEqualsOperator('$errors', '$uploader->getErrors()', null, $t . "\t\t"); - $ifelse .= $pc->getPhpCodeConditions('!$uploader->upload()', '', '', $contIf, $contElseInt, $t . "\t"); - $ifelseExt = $xc->getXcEqualsOperator('$uploaderErrors', '$uploader->getErrors()', null, $t . "\t\t"); - $contElseExt = $pc->getPhpCodeConditions("\$filename", ' > ', "''", $ifelseExt, false, $t . "\t"); - $contElseExt .= $xc->getXcSetVarObj($tableName, $fieldName, "Request::getString('{$fieldName}')", $t . "\t"); - - $ret .= $pc->getPhpCodeConditions($fetchMedia, '', '', $ifelse, $contElseExt, $t); + $ifelse = $this->xc->getXcEqualsOperator('$extension', '\pathinfo($filename, \PATHINFO_EXTENSION)',null, $t . "\t\t"); + $ifelse .= $this->xc->getXcEqualsOperator('$imgName', "\str_replace(' ', '', \$imgNameDef) . '.' . \$extension", null,$t . "\t\t"); + $ifelse .= $this->getAxcSetPrefix('uploader', '$imgName', $t . "\t\t") . ";\n"; + $contIf = $this->xc->getXcSetVarObj($tableName, $fieldName, '$uploader->getSavedFileName()', $t . "\t\t\t"); + $contElseInt = $this->xc->getXcEqualsOperator('$uploaderErrors', "'
' . \$uploader->getErrors()", '.', $t . "\t\t\t"); + $ifelse .= $this->pc->getPhpCodeConditions('$uploader->upload()', '', '', $contIf, $contElseInt, $t . "\t\t"); + $ifelseExt = $this->xc->getXcEqualsOperator('$uploaderErrors', "'
' . \$uploader->getErrors()", '.', $t . "\t\t\t"); + $contElseExt = $this->pc->getPhpCodeConditions('$filename', ' > ', "''", $ifelseExt, false, $t . "\t\t"); + if ($formatUrl) { + $contElseExt .= $this->xc->getXcSetVarObj($tableName, $fieldName, $rpFieldName, $t . "\t\t"); + } else { + $contElseExt .= $this->xc->getXcSetVarObj($tableName, $fieldName, "Request::getString('{$fieldName}')", $t . "\t\t"); + } + $condIf.= $this->pc->getPhpCodeConditions($isset . ' && ' . $fetchMedia, '', '', $ifelse, $contElseExt, $t . "\t"); + if ($formatUrl) { + $condElse= $this->xc->getXcSetVarObj($tableName, $fieldName, $rpFieldName, $t . "\t"); + } else { + $condElse = $this->xc->getXcSetVarObj($tableName, $fieldName, "Request::getString('{$fieldName}')", $t . "\t"); + } + $ret .= $this->pc->getPhpCodeConditions("'' !== (string)\$filename", '', '', $condIf, $condElse, $t); return $ret; } @@ -332,42 +354,39 @@ private function getAxcSetVarImageFile($dirname, $tableName, $fieldName, $format * @param string $t * @return string */ - public function getAxcSetVarPassword($tableName, $fieldName, $t = '') + public function getAxcSetVarPassword($tableName, $fieldName, string $t = '') { - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $cf = Tdmcreate\Files\CreateFile::getInstance(); + $cf = Modulebuilder\Files\CreateFile::getInstance(); $ccFieldId = $cf->getCamelCase($fieldName, false, true); - $ret = $xc->getXcEqualsOperator("\${$ccFieldId}", "Request::getString('{$fieldName}', '')", '',$t); - $contIf = $xc->getXcSetVarObj($tableName, $fieldName, "password_hash(\${$ccFieldId}, PASSWORD_DEFAULT)", $t . "\t"); - $ret .= $pc->getPhpCodeConditions("''", ' !== ', "\${$ccFieldId}",$contIf, false, $t); + $ret = $this->xc->getXcEqualsOperator("\${$ccFieldId}", "Request::getString('{$fieldName}')", '',$t); + $contIf = $this->xc->getXcSetVarObj($tableName, $fieldName, "password_hash(\${$ccFieldId}, PASSWORD_DEFAULT)", $t . "\t"); + $ret .= $this->pc->getPhpCodeConditions("\${$ccFieldId}", ' !== ', "''", $contIf, false, $t); return $ret; } - /** * @public function getAxcSetVarMisc * @param $tableName * @param $fieldName * @param $fieldType + * @param $fieldElement * @param string $t * @return string */ - public function getAxcSetVarMisc($tableName, $fieldName, $fieldType, $t = '') + public function getAxcSetVarMisc($tableName, $fieldName, $fieldType, $fieldElement, string $t = '') { - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); switch ((int)$fieldType){ case 2: case 3: case 4: case 5: - $ret = $xc->getXcSetVarObj($tableName, $fieldName, "Request::getInt('{$fieldName}', 0)", $t); + $ret = $this->xc->getXcSetVarObj($tableName, $fieldName, "Request::getInt('{$fieldName}')", $t); break; case 6: case 7: case 8: - $ret = $xc->getXcSetVarObj($tableName, $fieldName, "Request::getFloat('{$fieldName}', 0)", $t); + $ret = $this->xc->getXcSetVarObj($tableName, $fieldName, "Request::getFloat('{$fieldName}')", $t); break; case 13: case 14: @@ -375,12 +394,16 @@ public function getAxcSetVarMisc($tableName, $fieldName, $fieldType, $t = '') case 16: case 17: case 18: - $ret = $xc->getXcSetVarObj($tableName, $fieldName, "Request::getString('{$fieldName}', '')", $t); + if ((int)$fieldElement == 4) { + $ret = $this->xc->getXcSetVarObj($tableName, $fieldName, "Request::getText('{$fieldName}')", $t); + } else { + $ret = $this->xc->getXcSetVarObj($tableName, $fieldName, "Request::getString('{$fieldName}')", $t); + } break; case 0: default: //TODO: should be finally - $ret = $xc->getXcSetVarObj($tableName, $fieldName, "\$_POST['{$fieldName}']", $t); + $ret = $this->xc->getXcSetVarObj($tableName, $fieldName, "\$_POST['{$fieldName}']", $t); break; } @@ -396,7 +419,7 @@ public function getAxcSetVarMisc($tableName, $fieldName, $fieldType, $t = '') * @param string $t * @return string */ - public function getAxcFetchMedia($anchor, $var, $t = '') + public function getAxcFetchMedia($anchor, $var, string $t = '') { return "{$t}\${$anchor}->fetchMedia({$var})"; } @@ -410,42 +433,8 @@ public function getAxcFetchMedia($anchor, $var, $t = '') * @param string $t * @return string */ - public function getAxcSetPrefix($anchor, $var, $t = '') + public function getAxcSetPrefix($anchor, $var, string $t = '') { return "{$t}\${$anchor}->setPrefix({$var})"; } - - /** - * @public function getAdminCodeCaseDelete - * @param $language - * @param $tableName - * @param $fieldId - * @param $fieldMain - * @param string $t - * @return string - */ - public function getAdminCodeCaseDelete($language, $tableName, $fieldId, $fieldMain, $t = '') - { - $pc = Tdmcreate\Files\CreatePhpCode::getInstance(); - $xc = Tdmcreate\Files\CreateXoopsCode::getInstance(); - $cf = Tdmcreate\Files\CreateFile::getInstance(); - $ccFieldId = $cf->getCamelCase($fieldId, false, true); - $ret = $xc->getXcHandlerGet($tableName, $ccFieldId, 'Obj', $tableName . 'Handler', '', $t); - $reqOk = "_REQUEST['ok']"; - $isset = $pc->getPhpCodeIsset($reqOk); - $xoopsSecurityCheck = $xc->getXcXoopsSecurityCheck(); - $xoopsSecurityErrors = $xc->getXcXoopsSecurityErrors(); - $implode = $pc->getPhpCodeImplode(', ', $xoopsSecurityErrors); - $redirectHeaderErrors = $xc->getXcRedirectHeader($tableName, '', '3', $implode, true, $t . "\t\t"); - $delete = $xc->getXcHandlerDelete($tableName, $tableName, 'Obj', 'Handler'); - $condition = $pc->getPhpCodeConditions('!' . $xoopsSecurityCheck, '', '', $redirectHeaderErrors, false, $t . "\t"); - $redirectHeaderLanguage = $xc->getXcRedirectHeader($tableName, '', '3', "{$language}FORM_DELETE_OK", true, $t . "\t\t"); - $htmlErrors = $xc->getXcHtmlErrors($tableName, true); - $internalElse = $xc->getXcXoopsTplAssign('error', $htmlErrors, true, $t . "\t\t"); - $condition .= $pc->getPhpCodeConditions($delete, '', '', $redirectHeaderLanguage, $internalElse, $t . "\t"); - $mainElse = $xc->getXcXoopsConfirm($tableName, $language, $fieldId, $fieldMain, 'delete', $t . "\t"); - $ret .= $pc->getPhpCodeConditions($isset, ' && ', "1 == \${$reqOk}", $condition, $mainElse, $t); - - return $ret; - } } diff --git a/class/Files/index.php b/class/Files/index.php new file mode 100644 index 00000000..e5ee0725 --- /dev/null +++ b/class/Files/index.php @@ -0,0 +1,2 @@ + - * */ class FormRadio extends \XoopsFormRadio { @@ -32,8 +31,8 @@ public function render() { $ret = ''; $ele_name = $this->getName(); - $ele_title = $this->getTitle(); - $ele_value = $this->getValue(); + $ele_title = (string)$this->getTitle(); + $ele_value = (string)$this->getValue(); $ele_options = $this->getOptions(); $ele_extra = $this->getExtra(); $ele_delimeter = empty($this->columns) ? $this->getDelimeter() : ''; @@ -42,6 +41,12 @@ public function render() } $i = 0; $id_ele = 0; + if ('' != $ele_title) { + $ele_title = htmlspecialchars($ele_title, ENT_QUOTES); + } + if ('' != $ele_value) { + $ele_value = htmlspecialchars($ele_value, ENT_QUOTES); + } foreach ($ele_options as $value => $name) { ++$id_ele; if (!empty($this->columns)) { @@ -50,11 +55,11 @@ public function render() } $ret .= '
' . NWLINE;
$ret .= '
- ' . NWLINE;
foreach ($this->getElements() as $ele) {
- if ($ele instanceof Tdmcreate\Form\FormTab) {
+ if ($ele instanceof Modulebuilder\Form\FormTab) {
$ret .= '
- ' . $ele->getCaption() . ' ' . NWLINE; } } @@ -81,10 +81,9 @@ public function render() $extras = []; foreach ($this->getElements() as $ele) { - /* @var \XoopsFormElement $ele */ if (!$ele->isHidden()) { - if (!$ele instanceof Tdmcreate\Form\FormRaw) { - if ($ele instanceof Tdmcreate\Form\FormTab) { + if (!$ele instanceof Modulebuilder\Form\FormRaw) { + if ($ele instanceof Modulebuilder\Form\FormTab) { $ret .= '
- Change file permission, content or just delete an unused file from your XOOPS site.
- Change file permission, content or just delete an unused file from your XOOPS site.
- Change file permission, content or just delete an unused file from your XOOPS site. +
<{$clresult.define}> <{if $clresult.first}>(<{$clresult.first}>)<{/if}>
+ <{/foreach}>
+ -
-
<{$item.title}> - <{$item.link}> -<{$item.description}> -<{$item.pubdate}> -<{$item.guid}> -
- <{/foreach}>
- - <{$smarty.const._MA_MYMODULE_SUBMIT_SUBMITONCE}> -
- <{$smarty.const._MA_MYMODULE_SUBMIT_ALLPENDING}> -
- <{$smarty.const._MA_MYMODULE_SUBMIT_DONTABUSE}> -
- <{$smarty.const._MA_MYMODULE_SUBMIT_TAKEDAYS}> -
' . NWLINE;
$ret .= '' . NWLINE;
$ret .= $ele->render();
diff --git a/class/Form/SimpleForm.php b/class/Form/SimpleForm.php
index 2b9f7bb7..6f48230a 100644
--- a/class/Form/SimpleForm.php
+++ b/class/Form/SimpleForm.php
@@ -1,6 +1,6 @@
-
- *
*/
defined('XOOPS_ROOT_PATH') || die('Restricted access');
@@ -52,7 +51,7 @@ public function render()
//$ret = ($this->getTitle() ? '
(<{$item.rating.likes}>)
(<{$item.rating.dislikes}>)| <{$smarty.const._AM_MODULEBUILDER_BUILDING_FILES}> | +<{$smarty.const._AM_MODULEBUILDER_BUILDING_SUCCESS}> | +<{$smarty.const._AM_MODULEBUILDER_BUILDING_FAILED}> | +|||
|---|---|---|---|---|---|
| <{$smarty.const._AM_MODULEBUILDER_OK_ARCHITECTURE}> | + |
+ + <{else}> + | <{$smarty.const._AM_MODULEBUILDER_NOTOK_ARCHITECTURE}> | ++ |  |
+ <{/if}>
+
| <{$build.list}> | + |
+ + <{else}> + | <{$build.list}> | ++ | |
+ <{/if}>
+
| <{$building_directory}> | +|||||
+<{else}> + <{if $checkResults|default:''}> +
<{$smarty.const._AM_MODULEBUILDER_BUILDING_CHECK_RESULT}>
+<{$smarty.const._AM_MODULEBUILDER_BUILDING_CHECK_FOUND}>
+ <{foreach item=check from=$checkResults}> +
<{$check.info}>
<{$smarty.const._AM_MODULEBUILDER_BUILDING_CHECK_SOLVE}>
+
------------------------------------------------------------------------------------------------------------------
+ 
<{$smarty.const._AM_MODULEBUILDER_BUILDING_CHECK_ERROR_DESC}>
<{$smarty.const._AM_MODULEBUILDER_BUILDING_CHECK_WARNING_DESC}>
+
<{$smarty.const._AM_MODULEBUILDER_BUILDING_CHECK_RESULT}>
+<{$smarty.const._AM_MODULEBUILDER_BUILDING_CHECK_NOERRORS}>
| <{$smarty.const._AM_MODULEBUILDER_DEVTOOLS}> | +|
|---|---|
+ <{$smarty.const._AM_MODULEBUILDER_DEVTOOLS_FQ}>+<{$fq_desc}> + |
+ <{$fq_form}> | +
+ <{$smarty.const._AM_MODULEBUILDER_DEVTOOLS_CL}>+<{$smarty.const._AM_MODULEBUILDER_DEVTOOLS_CL_DESC}> + |
+ <{$cl_form}> | +
+ <{$smarty.const._AM_MODULEBUILDER_DEVTOOLS_TAB}>+<{$tab_desc}> + |
+ <{$tab_form}> | +
+ <{$smarty.const._AM_MODULEBUILDER_DEVTOOLS_RP}>+<{$rp_desc}> + |
+ <{$rp_form}> | +
+
+<{/if}>
+<{if $error|default:''}>
+
+
+
+ <{$smarty.const._AM_MODULEBUILDER_DEVTOOLS_CL_RESULTS}>
+
+
+ <{foreach item=clresultfile from=$clresults key=key}>
+ <{$smarty.const._AM_MODULEBUILDER_DEVTOOLS_CL_RESULT_LEGEND}>
+
+ 
+ <{$smarty.const._AM_MODULEBUILDER_DEVTOOLS_CL_RESULT_SUCCESS}> <{$smarty.const._AM_MODULEBUILDER_DEVTOOLS_CL_RESULT_SUCCESS_DESCR}>
+
+ 
+ <{$smarty.const._AM_MODULEBUILDER_DEVTOOLS_CL_RESULT_FAILED}>
+
<{$smarty.const._AM_MODULEBUILDER_DEVTOOLS_CL_FILE}> <{$key}>
+-
+ <{foreach item=clresult from=$clresultfile}>
+
+ <{$error}>
+
+<{/if}>
+
+
+<{include file="db:modulebuilder_footer.tpl"}>
diff --git a/templates/admin/tdmcreate_fields.tpl b/templates/admin/modulebuilder_fields.tpl
similarity index 62%
rename from templates/admin/tdmcreate_fields.tpl
rename to templates/admin/modulebuilder_fields.tpl
index 410f8013..b10b1bc6 100644
--- a/templates/admin/tdmcreate_fields.tpl
+++ b/templates/admin/modulebuilder_fields.tpl
@@ -1,24 +1,24 @@
-<{includeq file="db:tdmcreate_header.tpl"}>
+<{include file="db:modulebuilder_header.tpl"}>
-<{if $tables_list}>
+<{if $tables_list|default:''}>
| <{$smarty.const._AM_TDMCREATE_ID_LIST}> | -<{$smarty.const._AM_TDMCREATE_NAME_LIST}> | -<{$smarty.const._AM_TDMCREATE_IMAGE_LIST}> | -<{$smarty.const._AM_TDMCREATE_NBFIELDS_LIST}> | -<{$smarty.const._AM_TDMCREATE_PARENT_LIST}> | -<{$smarty.const._AM_TDMCREATE_INLIST_LIST}> | -<{$smarty.const._AM_TDMCREATE_INFORM_LIST}> | -<{$smarty.const._AM_TDMCREATE_ADMIN_LIST}> | -<{$smarty.const._AM_TDMCREATE_USER_LIST}> | -<{$smarty.const._AM_TDMCREATE_BLOCK_LIST}> | -<{$smarty.const._AM_TDMCREATE_MAIN_LIST}> | -<{$smarty.const._AM_TDMCREATE_SEARCH_LIST}> | -<{$smarty.const._AM_TDMCREATE_REQUIRED_LIST}> | -<{$smarty.const._AM_TDMCREATE_FORMACTION}> | +<{$smarty.const._AM_MODULEBUILDER_ID}> | +<{$smarty.const._AM_MODULEBUILDER_NAME}> | +<{$smarty.const._AM_MODULEBUILDER_IMAGE}> | +<{$smarty.const._AM_MODULEBUILDER_NBFIELDS}> | +<{$smarty.const._AM_MODULEBUILDER_PARENT}> | +<{$smarty.const._AM_MODULEBUILDER_INLIST}> | +<{$smarty.const._AM_MODULEBUILDER_INFORM}> | +<{$smarty.const._AM_MODULEBUILDER_ADMIN}> | +<{$smarty.const._AM_MODULEBUILDER_USER}> | +<{$smarty.const._AM_MODULEBUILDER_BLOCK}> | +<{$smarty.const._AM_MODULEBUILDER_MAIN}> | +<{$smarty.const._AM_MODULEBUILDER_SEARCH}> | +<{$smarty.const._AM_MODULEBUILDER_REQUIRED}> | +<{$smarty.const._AM_MODULEBUILDER_FORMACTION}> |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
(<{$table.lid}>)
- 
+
|
- |
- <{$table.nbfields}> | - |
- |
- |
- |
- |
- |
- |
- |
- |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
-
- 
+
+ 
-
- 
+
+ 
-
- 
+
+ 
|
||||||
| <{includeq file="db:tdmcreate_fields_item.tpl" table=$table}> | +<{include file="db:modulebuilder_fields_item.tpl" table=$table}> | ||||||||||||||||||||||||||
-
+
+
<{$pagenav}>
<{/if}>
<{/if}>
-<{if $error}>
+<{if $error|default:''}>
<{$error}>
<{/if}>
-<{if $form}>
+<{if $form|default:''}>
<{$form}>
<{/if}>
-<{*<{includeq file="db:tdmcreate_footer.tpl"}>*}>
+<{*<{include file="db:modulebuilder_footer.tpl"}>*}>
diff --git a/templates/admin/tdmcreate_fields_item.tpl b/templates/admin/modulebuilder_fields_item.tpl
similarity index 77%
rename from templates/admin/tdmcreate_fields_item.tpl
rename to templates/admin/modulebuilder_fields_item.tpl
index 41d95c0a..bcfeb3d2 100644
--- a/templates/admin/tdmcreate_fields_item.tpl
+++ b/templates/admin/modulebuilder_fields_item.tpl
@@ -3,70 +3,70 @@
<{foreach item=field from=$table.fields key=field_id}>
<{if $field.id > 0}>
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$field.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$field.name}>">
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$field.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$field.name}>">
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$field.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$field.name}>">
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$field.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$field.name}>">
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$field.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$field.name}>">
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$field.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$field.name}>">
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$field.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$field.name}>">
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$field.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$field.name}>">
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$field.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$field.name}>">
+
- 
+ 
+
- <{$maintained}>
- <{$smarty.const._AM_TDMCREATE_SUPPORT_FORUM}>
+ <{$smarty.const._AM_MODULEBUILDER_SUPPORT_FORUM}>
diff --git a/templates/admin/modulebuilder_header.tpl b/templates/admin/modulebuilder_header.tpl
new file mode 100644
index 00000000..b872c0fc
--- /dev/null
+++ b/templates/admin/modulebuilder_header.tpl
@@ -0,0 +1,8 @@
+
+ <{$navigation|default:''}>
+ <{if $buttons|default:''}><{$buttons}> <{/if}>
+
+
diff --git a/templates/admin/modulebuilder_index.tpl b/templates/admin/modulebuilder_index.tpl
new file mode 100644
index 00000000..42048d22
--- /dev/null
+++ b/templates/admin/modulebuilder_index.tpl
@@ -0,0 +1,6 @@
+
+<{include file="db:modulebuilder_header.tpl"}>
+
+<{$index|default:''}>
+
+<{*<{include file="db:modulebuilder_footer.tpl"}>*}>
diff --git a/templates/admin/tdmcreate_modules.tpl b/templates/admin/modulebuilder_modules.tpl
similarity index 66%
rename from templates/admin/tdmcreate_modules.tpl
rename to templates/admin/modulebuilder_modules.tpl
index b64f0e9c..7f02ca9b 100644
--- a/templates/admin/tdmcreate_modules.tpl
+++ b/templates/admin/modulebuilder_modules.tpl
@@ -1,109 +1,115 @@
-<{includeq file="db:tdmcreate_header.tpl"}>
+<{include file="db:modulebuilder_header.tpl"}>
-<{if $modules_list}>
+<{if $modules_list|default:''}>
| <{$smarty.const._AM_TDMCREATE_MODULE_ID}> | -<{$smarty.const._AM_TDMCREATE_MODULE_NAME}> | -<{$smarty.const._AM_TDMCREATE_MODULE_VERSION}> | -<{$smarty.const._AM_TDMCREATE_MODULE_IMAGE}> | -<{$smarty.const._AM_TDMCREATE_MODULE_RELEASE}> | -<{$smarty.const._AM_TDMCREATE_MODULE_STATUS}> | -<{$smarty.const._AM_TDMCREATE_MODULE_ADMIN_LIST}> | -<{$smarty.const._AM_TDMCREATE_MODULE_USER_LIST}> | -<{$smarty.const._AM_TDMCREATE_MODULE_BLOCKS_LIST}> | -<{$smarty.const._AM_TDMCREATE_MODULE_SEARCH_LIST}> | -<{$smarty.const._AM_TDMCREATE_MODULE_COMMENTS_LIST}> | -<{$smarty.const._AM_TDMCREATE_MODULE_NOTIFICATIONS_LIST}> | -<{$smarty.const._AM_TDMCREATE_MODULE_PERMISSIONS_LIST}> | -<{$smarty.const._AM_TDMCREATE_FORMACTION}> | +<{$smarty.const._AM_MODULEBUILDER_MODULE_ID}> | +<{$smarty.const._AM_MODULEBUILDER_MODULE_NAME}> | +<{$smarty.const._AM_MODULEBUILDER_MODULE_VERSION}> | +<{$smarty.const._AM_MODULEBUILDER_MODULE_IMAGE}> | +<{$smarty.const._AM_MODULEBUILDER_MODULE_RELEASE}> | +<{$smarty.const._AM_MODULEBUILDER_MODULE_STATUS}> | +<{$smarty.const._AM_MODULEBUILDER_ADMIN}> | +<{$smarty.const._AM_MODULEBUILDER_USER}> | +<{$smarty.const._AM_MODULEBUILDER_BLOCKS}> | +<{$smarty.const._AM_MODULEBUILDER_SEARCH}> | +<{$smarty.const._AM_MODULEBUILDER_COMMENTS}> | +<{$smarty.const._AM_MODULEBUILDER_NOTIFICATIONS}> | +<{$smarty.const._AM_MODULEBUILDER_PERMISSIONS}> | +<{$smarty.const._AM_MODULEBUILDER_FORMACTION}> |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| <{$module.id}> | <{$module.name}> | <{$module.version}> | -<{$module.release}> | <{$module.status}> | -
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$module.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$module.name}>">
|
- 
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$module.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$module.name}>">
|
- 
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$module.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$module.name}>">
|
- 
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$module.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$module.name}>">
|
- 
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$module.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$module.name}>">
|
- 
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$module.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$module.name}>">
|
- 
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$module.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$module.name}>">
|
-
-
+
-
-
- 
+
+
+ 
+
+ 
|
-
+
+
<{$pagenav}>
<{/if}>
<{else}>
- <{if $form}>
+ <{if $form|default:''}>
<{$form}>
<{/if}>
<{/if}>
-<{if $error}>
+
+<{if $error|default:''}>
<{$error}>
<{/if}>
+
+<{if $tables_list|default:''}>
+ <{foreach item=table from=$tables_list}>
+ <{$table}>
+ <{/foreach}> +<{/if}> -<{includeq file="db:tdmcreate_footer.tpl"}> +<{include file="db:modulebuilder_footer.tpl"}> diff --git a/templates/admin/tdmcreate_morefiles.tpl b/templates/admin/modulebuilder_morefiles.tpl similarity index 52% rename from templates/admin/tdmcreate_morefiles.tpl rename to templates/admin/modulebuilder_morefiles.tpl index b00d3ac3..2c10b3df 100644 --- a/templates/admin/tdmcreate_morefiles.tpl +++ b/templates/admin/modulebuilder_morefiles.tpl @@ -1,52 +1,56 @@ -<{includeq file="db:tdmcreate_header.tpl"}> +<{include file="db:modulebuilder_header.tpl"}> -<{if $files_list}> +<{if $files_list|default:''}>| <{$smarty.const._AM_TDMCREATE_FILE_ID}> | -<{$smarty.const._AM_TDMCREATE_FILE_MID_LIST}> | -<{$smarty.const._AM_TDMCREATE_FILE_INFOLDER_LIST}> | -<{$smarty.const._AM_TDMCREATE_FILE_NAME_LIST}> | -<{$smarty.const._AM_TDMCREATE_FILE_EXTENSION_LIST}> | -<{$smarty.const._AM_TDMCREATE_FORM_ACTION}> | +<{$smarty.const._AM_MODULEBUILDER_FILE_ID}> | +<{$smarty.const._AM_MODULEBUILDER_FILE_MID_LIST}> | +<{$smarty.const._AM_MODULEBUILDER_FILE_TYPE_LIST}> | +<{$smarty.const._AM_MODULEBUILDER_FILE_INFOLDER_LIST}> | +<{$smarty.const._AM_MODULEBUILDER_FILE_NAME_LIST}> | +<{$smarty.const._AM_MODULEBUILDER_FILE_EXTENSION_LIST}> | +<{$smarty.const._AM_MODULEBUILDER_FILE_UPLOAD_LIST}> | +<{$smarty.const._AM_MODULEBUILDER_FORM_ACTION}> |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| <{$file.id}> | <{$file.mid}> | +<{$file.type}> | <{$file.infolder}> | <{$file.name}> | <{$file.extension}> | +<{$file.upload}> |
-
+
-
+
|
-
+
+
<{$pagenav}>
<{/if}>
<{else}>
- <{if $form}>
+ <{if $form|default:''}>
<{$form}>
<{/if}>
<{/if}>
-<{if $error}>
+<{if $error|default:''}>
<{$error}>
<{/if}>
-<{includeq file="db:tdmcreate_footer.tpl"}>
+<{include file="db:modulebuilder_footer.tpl"}>
diff --git a/templates/admin/modulebuilder_settings.tpl b/templates/admin/modulebuilder_settings.tpl
new file mode 100644
index 00000000..e453b942
--- /dev/null
+++ b/templates/admin/modulebuilder_settings.tpl
@@ -0,0 +1,73 @@
+
+<{include file="db:modulebuilder_header.tpl"}>
+
+<{if $settings_list|default:''}>
+
+ +
+ +
<{$pagenav}>
+
+ <{/if}>
+<{else}>
+
+ <{if $form|default:''}>
+ <{$form}>
+ <{/if}>
+<{/if}>
+<{if $error|default:''}>
+
+ <{$error}>
+
+<{/if}>
+
+<{include file="db:modulebuilder_footer.tpl"}>
diff --git a/templates/admin/tdmcreate_tables.tpl b/templates/admin/modulebuilder_tables.tpl
similarity index 72%
rename from templates/admin/tdmcreate_tables.tpl
rename to templates/admin/modulebuilder_tables.tpl
index 42af045a..603659d6 100644
--- a/templates/admin/tdmcreate_tables.tpl
+++ b/templates/admin/modulebuilder_tables.tpl
@@ -1,23 +1,23 @@
-<{includeq file="db:tdmcreate_header.tpl"}>
+<{include file="db:modulebuilder_header.tpl"}>
-<{if $modules_list}>
+<{if $modules_list|default:''}>
| <{$smarty.const._AM_TDMCREATE_MODULE_ID}> | -<{$smarty.const._AM_TDMCREATE_MODULE_NAME_LIST}> | -<{$smarty.const._AM_TDMCREATE_MODULE_IMAGE_LIST}> | -<{$smarty.const._AM_TDMCREATE_MODULE_NBFIELDS_LIST}> | -<{$smarty.const._AM_TDMCREATE_MODULE_ADMIN_LIST}> | -<{$smarty.const._AM_TDMCREATE_MODULE_USER_LIST}> | -<{$smarty.const._AM_TDMCREATE_MODULE_BLOCKS_LIST}> | -<{$smarty.const._AM_TDMCREATE_MODULE_SUBMENU_LIST}> | -<{$smarty.const._AM_TDMCREATE_MODULE_SEARCH_LIST}> | -<{$smarty.const._AM_TDMCREATE_MODULE_COMMENTS_LIST}> | -<{$smarty.const._AM_TDMCREATE_MODULE_NOTIFICATIONS_LIST}> | -<{$smarty.const._AM_TDMCREATE_MODULE_PERMISSIONS_LIST}> | -<{$smarty.const._AM_TDMCREATE_FORMACTION}> | +<{$smarty.const._AM_MODULEBUILDER_MODULE_ID}> | +<{$smarty.const._AM_MODULEBUILDER_NAME}> | +<{$smarty.const._AM_MODULEBUILDER_IMAGE}> | +<{$smarty.const._AM_MODULEBUILDER_FIELDS}> | +<{$smarty.const._AM_MODULEBUILDER_ADMIN}> | +<{$smarty.const._AM_MODULEBUILDER_USER}> | +<{$smarty.const._AM_MODULEBUILDER_BLOCKS}> | +<{$smarty.const._AM_MODULEBUILDER_SUBMENU}> | +<{$smarty.const._AM_MODULEBUILDER_SEARCH}> | +<{$smarty.const._AM_MODULEBUILDER_COMMENTS}> | +<{$smarty.const._AM_MODULEBUILDER_NOTIFICATIONS}> | +<{$smarty.const._AM_MODULEBUILDER_PERMISSIONS}> | +<{$smarty.const._AM_MODULEBUILDER_FORMACTION}> |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| (<{$module.id}>)
-
+
|
<{$module.name}> | - |
- |
+
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$module.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$module.name}>">
|
-
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$module.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$module.name}>">
|
-
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$module.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$module.name}>">
|
-  |
- |
+
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$module.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$module.name}>">
|
-
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$module.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$module.name}>">
|
-
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$module.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$module.name}>">
|
-
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$module.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$module.name}>">
|
-
+
-
+
- 
+ 
-
+
|
||||||||||||
| <{includeq file="db:tdmcreate_tables_item.tpl" module=$module}> | +<{include file="db:modulebuilder_tables_item.tpl" module=$module}> | ||||||||||||||||||||||||
-
+
+
<{$pagenav}>
<{/if}>
<{/if}>
-<{if $error}>
+<{if $error|default:''}>
<{$error}>
<{/if}>
-<{if $form}>
+<{if $form|default:''}>
<{$form}>
<{/if}>
-<{includeq file="db:tdmcreate_footer.tpl"}>
+<{include file="db:modulebuilder_footer.tpl"}>
+
+
diff --git a/templates/admin/tdmcreate_tables_item.tpl b/templates/admin/modulebuilder_tables_item.tpl
similarity index 77%
rename from templates/admin/tdmcreate_tables_item.tpl
rename to templates/admin/modulebuilder_tables_item.tpl
index fcb55e3c..c585da22 100644
--- a/templates/admin/tdmcreate_tables_item.tpl
+++ b/templates/admin/modulebuilder_tables_item.tpl
@@ -3,74 +3,74 @@
<{foreach item=table from=$module.tables key=table_id}>
<{if $table.id > 0}>
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$table.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$table.name}>">
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$table.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$table.name}>">
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$table.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$table.name}>">
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$table.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$table.name}>">
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$table.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$table.name}>">
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$table.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$table.name}>">
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$table.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$table.name}>">
+ alt="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$table.name}>"
+ title="<{$smarty.const._AM_MODULEBUILDER_CHANGE_DISPLAY}> <{$table.name}>">
+
- 
+
-
+
<{$about}>
-
-<{includeq file="db:tdmcreate_footer.tpl"}>
\ No newline at end of file
diff --git a/templates/admin/tdmcreate_addfiles.tpl b/templates/admin/tdmcreate_addfiles.tpl
deleted file mode 100644
index e4c85852..00000000
--- a/templates/admin/tdmcreate_addfiles.tpl
+++ /dev/null
@@ -1,52 +0,0 @@
-
-<{includeq file="db:tdmcreate_header.tpl"}>
-
-<{if $files_list}>
- | <{$smarty.const._AM_TDMCREATE_FILE_ID}> | -<{$smarty.const._AM_TDMCREATE_FILE_MID_LIST}> | -<{$smarty.const._AM_TDMCREATE_FILE_NAME_LIST}> | -<{$smarty.const._AM_TDMCREATE_FILE_EXTENSION_LIST}> | -<{$smarty.const._AM_TDMCREATE_FILE_INFOLDER_LIST}> | -<{$smarty.const._AM_TDMCREATE_FORM_ACTION}> | -
|---|---|---|---|---|---|
| <{$file.id}> | -<{$file.mid}> | -<{$file.name}> | -<{$file.extension}> | -<{$file.infolder}> | -
-
-
-
-
-
-
- |
-
-
- -
<{$pagenav}>
-
- <{/if}>
-<{else}>
-
- <{if $form}>
- <{$form}>
- <{/if}>
-<{/if}>
-<{if $error}>
-
- <{$error}>
-
-<{/if}>
-
-<{includeq file="db:tdmcreate_footer.tpl"}>
diff --git a/templates/admin/tdmcreate_addmymodule.tpl b/templates/admin/tdmcreate_addmymodule.tpl
deleted file mode 100644
index 863c5492..00000000
--- a/templates/admin/tdmcreate_addmymodule.tpl
+++ /dev/null
@@ -1,52 +0,0 @@
-
-<{includeq file="db:tdmcreate_header.tpl"}>
-
-<{if $mymodule_list}>
- | <{$smarty.const._AM_TDMCREATE_FILE_ID}> | -<{$smarty.const._AM_TDMCREATE_FILE_MID_LIST}> | -<{$smarty.const._AM_TDMCREATE_FILE_NAME_LIST}> | -<{$smarty.const._AM_TDMCREATE_FILE_EXTENSION_LIST}> | -<{$smarty.const._AM_TDMCREATE_FILE_INFOLDER_LIST}> | -<{$smarty.const._AM_TDMCREATE_FORM_ACTION}> | -
|---|---|---|---|---|---|
| <{$file.id}> | -<{$file.mid}> | -<{$file.name}> | -<{$file.extension}> | -<{$file.infolder}> | -
-
-
-
-
-
-
- |
-
-
- -
<{$pagenav}>
-
- <{/if}>
-<{else}>
-
- <{if $form}>
- <{$form}>
- <{/if}>
-<{/if}>
-<{if $error}>
-
- <{$error}>
-
-<{/if}>
-
-<{includeq file="db:tdmcreate_footer.tpl"}>
diff --git a/templates/admin/tdmcreate_building.tpl b/templates/admin/tdmcreate_building.tpl
deleted file mode 100644
index 8dd4d56b..00000000
--- a/templates/admin/tdmcreate_building.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-
-<{includeq file="db:tdmcreate_header.tpl"}>
-
--<{if $building_directory}> -
| <{$smarty.const._AM_TDMCREATE_BUILDING_FILES}> | -<{$smarty.const._AM_TDMCREATE_BUILDING_SUCCESS}> | -<{$smarty.const._AM_TDMCREATE_BUILDING_FAILED}> | -|||
|---|---|---|---|---|---|
| <{$smarty.const._AM_TDMCREATE_OK_ARCHITECTURE}> | - |
- - <{else}> - | <{$smarty.const._AM_TDMCREATE_NOTOK_ARCHITECTURE}> | -- |  |
- <{/if}>
-
| <{$build.list}> | - |
- - <{else}> - | <{$build.list}> | -- | |
- <{/if}>
-
| <{$building_directory}> | -|||||
-<{else}> - <{if $form}> - <{$form}> - <{/if}> -<{/if}> - -<{includeq file="db:tdmcreate_footer.tpl"}> diff --git a/templates/admin/tdmcreate_header.tpl b/templates/admin/tdmcreate_header.tpl deleted file mode 100644 index 398ca24d..00000000 --- a/templates/admin/tdmcreate_header.tpl +++ /dev/null @@ -1,8 +0,0 @@ -
- <{$navigation}>
- <{if $buttons}><{$buttons}> <{/if}>
-
-
diff --git a/templates/admin/tdmcreate_index.tpl b/templates/admin/tdmcreate_index.tpl
deleted file mode 100644
index c00ced9f..00000000
--- a/templates/admin/tdmcreate_index.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-<{includeq file="db:tdmcreate_header.tpl"}>
-
-<{$index}>
-
-<{*<{includeq file="db:tdmcreate_footer.tpl"}>*}>
diff --git a/templates/admin/tdmcreate_moremymodule.tpl b/templates/admin/tdmcreate_moremymodule.tpl
deleted file mode 100644
index 76f06cb5..00000000
--- a/templates/admin/tdmcreate_moremymodule.tpl
+++ /dev/null
@@ -1,52 +0,0 @@
-
-<{includeq file="db:tdmcreate_header.tpl"}>
-
-<{if $mymodule_list}>
- | <{$smarty.const._AM_TDMCREATE_FILE_ID}> | -<{$smarty.const._AM_TDMCREATE_FILE_MID_LIST}> | -<{$smarty.const._AM_TDMCREATE_FILE_INFOLDER_LIST}> | -<{$smarty.const._AM_TDMCREATE_FILE_NAME_LIST}> | -<{$smarty.const._AM_TDMCREATE_FILE_EXTENSION_LIST}> | -<{$smarty.const._AM_TDMCREATE_FORM_ACTION}> | -
|---|---|---|---|---|---|
| <{$file.id}> | -<{$file.mid}> | -<{$file.infolder}> | -<{$file.name}> | -<{$file.extension}> | -
-
-
-
-
-
-
- |
-
-
- -
<{$pagenav}>
-
- <{/if}>
-<{else}>
-
- <{if $form}>
- <{$form}>
- <{/if}>
-<{/if}>
-<{if $error}>
-
- <{$error}>
-
-<{/if}>
-
-<{includeq file="db:tdmcreate_footer.tpl"}>
diff --git a/templates/admin/tdmcreate_settings.tpl b/templates/admin/tdmcreate_settings.tpl
deleted file mode 100644
index 62ee6448..00000000
--- a/templates/admin/tdmcreate_settings.tpl
+++ /dev/null
@@ -1,63 +0,0 @@
-
-<{includeq file="db:tdmcreate_header.tpl"}>
-
-<{if $settings_list}>
-
- -
- -
<{$pagenav}>
-
- <{/if}>
-<{else}>
-
- <{if $form}>
- <{$form}>
- <{/if}>
-<{/if}>
-<{if $error}>
-
- <{$error}>
-
-<{/if}>
-
-<{includeq file="db:tdmcreate_footer.tpl"}>
diff --git a/templates/index.html b/templates/index.html
deleted file mode 100644
index 74b6f45c..00000000
--- a/templates/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/templates/index.php b/templates/index.php
new file mode 100644
index 00000000..e5ee0725
--- /dev/null
+++ b/templates/index.php
@@ -0,0 +1,2 @@
+history.go(-1);
\ No newline at end of file
diff --git a/testdata/english/index.php b/testdata/english/index.php
new file mode 100644
index 00000000..e5ee0725
--- /dev/null
+++ b/testdata/english/index.php
@@ -0,0 +1,2 @@
+history.go(-1);
\ No newline at end of file
diff --git a/testdata/german/Exports-2020-04-15-08-25-04/tdmcreate_fieldattributes.yml b/testdata/german/Exports-2020-04-15-08-25-04/tdmcreate_fieldattributes.yml
deleted file mode 100644
index aba8a4b2..00000000
--- a/testdata/german/Exports-2020-04-15-08-25-04/tdmcreate_fieldattributes.yml
+++ /dev/null
@@ -1,20 +0,0 @@
--
- fieldattribute_id: '1'
- fieldattribute_name: ...
- fieldattribute_value: ''
--
- fieldattribute_id: '2'
- fieldattribute_name: BINARY
- fieldattribute_value: BINARY
--
- fieldattribute_id: '3'
- fieldattribute_name: UNSIGNED
- fieldattribute_value: UNSIGNED
--
- fieldattribute_id: '4'
- fieldattribute_name: UNSIGNED_ZEROFILL
- fieldattribute_value: UNSIGNED_ZEROFILL
--
- fieldattribute_id: '5'
- fieldattribute_name: CURRENT_TIMESTAMP
- fieldattribute_value: CURRENT_TIMESTAMP
diff --git a/testdata/german/Exports-2020-04-15-08-25-04/tdmcreate_fieldelements.yml b/testdata/german/Exports-2020-04-15-08-25-04/tdmcreate_fieldelements.yml
deleted file mode 100644
index e2c0b7dd..00000000
--- a/testdata/german/Exports-2020-04-15-08-25-04/tdmcreate_fieldelements.yml
+++ /dev/null
@@ -1,108 +0,0 @@
--
- fieldelement_id: '1'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: ...
- fieldelement_value: ''
--
- fieldelement_id: '2'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: Text
- fieldelement_value: XoopsFormText
--
- fieldelement_id: '3'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: TextArea
- fieldelement_value: XoopsFormTextArea
--
- fieldelement_id: '4'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: DhtmlTextArea
- fieldelement_value: XoopsFormDhtmlTextArea
--
- fieldelement_id: '5'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: CheckBox
- fieldelement_value: XoopsFormCheckBox
--
- fieldelement_id: '6'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: RadioYN
- fieldelement_value: XoopsFormRadioYN
--
- fieldelement_id: '7'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: SelectBox
- fieldelement_value: XoopsFormSelect
--
- fieldelement_id: '8'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: SelectUser
- fieldelement_value: XoopsFormSelectUser
--
- fieldelement_id: '9'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: ColorPicker
- fieldelement_value: XoopsFormColorPicker
--
- fieldelement_id: '10'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: ImageList
- fieldelement_value: XoopsFormImageList
--
- fieldelement_id: '11'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: SelectFile
- fieldelement_value: XoopsFormSelectFile
--
- fieldelement_id: '12'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: UrlFile
- fieldelement_value: XoopsFormUrlFile
--
- fieldelement_id: '13'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: UploadImage
- fieldelement_value: XoopsFormUploadImage
--
- fieldelement_id: '14'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: UploadFile
- fieldelement_value: XoopsFormUploadFile
--
- fieldelement_id: '15'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: TextDateSelect
- fieldelement_value: XoopsFormTextDateSelect
--
- fieldelement_id: '16'
- fieldelement_mid: '1'
- fieldelement_tid: '1'
- fieldelement_name: 'Table : Categories'
- fieldelement_value: XoopsFormTables-Categories
--
- fieldelement_id: '17'
- fieldelement_mid: '1'
- fieldelement_tid: '2'
- fieldelement_name: 'Table : Articles'
- fieldelement_value: XoopsFormTables-Articles
--
- fieldelement_id: '18'
- fieldelement_mid: '1'
- fieldelement_tid: '3'
- fieldelement_name: 'Table : Miscfields'
- fieldelement_value: XoopsFormTables-Miscfields
diff --git a/testdata/german/Exports-2020-04-15-08-25-04/tdmcreate_fieldkey.yml b/testdata/german/Exports-2020-04-15-08-25-04/tdmcreate_fieldkey.yml
deleted file mode 100644
index 1f967fae..00000000
--- a/testdata/german/Exports-2020-04-15-08-25-04/tdmcreate_fieldkey.yml
+++ /dev/null
@@ -1,24 +0,0 @@
--
- fieldkey_id: '1'
- fieldkey_name: ...
- fieldkey_value: ''
--
- fieldkey_id: '2'
- fieldkey_name: PRIMARY
- fieldkey_value: PRIMARY
--
- fieldkey_id: '3'
- fieldkey_name: UNIQUE
- fieldkey_value: UNIQUE
--
- fieldkey_id: '4'
- fieldkey_name: KEY
- fieldkey_value: KEY
--
- fieldkey_id: '5'
- fieldkey_name: INDEX
- fieldkey_value: INDEX
--
- fieldkey_id: '6'
- fieldkey_name: FULLTEXT
- fieldkey_value: FULLTEXT
diff --git a/testdata/german/Exports-2020-04-15-08-25-04/tdmcreate_fieldnull.yml b/testdata/german/Exports-2020-04-15-08-25-04/tdmcreate_fieldnull.yml
deleted file mode 100644
index 2ca74967..00000000
--- a/testdata/german/Exports-2020-04-15-08-25-04/tdmcreate_fieldnull.yml
+++ /dev/null
@@ -1,12 +0,0 @@
--
- fieldnull_id: '1'
- fieldnull_name: ...
- fieldnull_value: ''
--
- fieldnull_id: '2'
- fieldnull_name: 'NOT NULL'
- fieldnull_value: 'NOT NULL'
--
- fieldnull_id: '3'
- fieldnull_name: 'NULL'
- fieldnull_value: 'NULL'
diff --git a/testdata/german/Exports-2020-04-15-08-25-04/tdmcreate_fieldtype.yml b/testdata/german/Exports-2020-04-15-08-25-04/tdmcreate_fieldtype.yml
deleted file mode 100644
index d08e73c6..00000000
--- a/testdata/german/Exports-2020-04-15-08-25-04/tdmcreate_fieldtype.yml
+++ /dev/null
@@ -1,92 +0,0 @@
--
- fieldtype_id: '1'
- fieldtype_name: ...
- fieldtype_value: ''
--
- fieldtype_id: '2'
- fieldtype_name: INT
- fieldtype_value: INT
--
- fieldtype_id: '3'
- fieldtype_name: TINYINT
- fieldtype_value: TINYINT
--
- fieldtype_id: '4'
- fieldtype_name: MEDIUMINT
- fieldtype_value: MEDIUMINT
--
- fieldtype_id: '5'
- fieldtype_name: SMALLINT
- fieldtype_value: SMALLINT
--
- fieldtype_id: '6'
- fieldtype_name: FLOAT
- fieldtype_value: FLOAT
--
- fieldtype_id: '7'
- fieldtype_name: DOUBLE
- fieldtype_value: DOUBLE
--
- fieldtype_id: '8'
- fieldtype_name: DECIMAL
- fieldtype_value: DECIMAL
--
- fieldtype_id: '9'
- fieldtype_name: SET
- fieldtype_value: SET
--
- fieldtype_id: '10'
- fieldtype_name: ENUM
- fieldtype_value: ENUM
--
- fieldtype_id: '11'
- fieldtype_name: EMAIL
- fieldtype_value: EMAIL
--
- fieldtype_id: '12'
- fieldtype_name: URL
- fieldtype_value: URL
--
- fieldtype_id: '13'
- fieldtype_name: CHAR
- fieldtype_value: CHAR
--
- fieldtype_id: '14'
- fieldtype_name: VARCHAR
- fieldtype_value: VARCHAR
--
- fieldtype_id: '15'
- fieldtype_name: TEXT
- fieldtype_value: TEXT
--
- fieldtype_id: '16'
- fieldtype_name: TINYTEXT
- fieldtype_value: TINYTEXT
--
- fieldtype_id: '17'
- fieldtype_name: MEDIUMTEXT
- fieldtype_value: MEDIUMTEXT
--
- fieldtype_id: '18'
- fieldtype_name: LONGTEXT
- fieldtype_value: LONGTEXT
--
- fieldtype_id: '19'
- fieldtype_name: DATE
- fieldtype_value: DATE
--
- fieldtype_id: '20'
- fieldtype_name: DATETIME
- fieldtype_value: DATETIME
--
- fieldtype_id: '21'
- fieldtype_name: TIMESTAMP
- fieldtype_value: TIMESTAMP
--
- fieldtype_id: '22'
- fieldtype_name: TIME
- fieldtype_value: TIME
--
- fieldtype_id: '23'
- fieldtype_name: YEAR
- fieldtype_value: YEAR
diff --git a/testdata/german/Exports-2020-04-15-08-25-04/tdmcreate_languages.yml b/testdata/german/Exports-2020-04-15-08-25-04/tdmcreate_languages.yml
deleted file mode 100644
index f7bcb871..00000000
--- a/testdata/german/Exports-2020-04-15-08-25-04/tdmcreate_languages.yml
+++ /dev/null
@@ -1 +0,0 @@
-{ }
\ No newline at end of file
diff --git a/testdata/german/Exports-2020-04-15-08-25-04/tdmcreate_morefiles.yml b/testdata/german/Exports-2020-04-15-08-25-04/tdmcreate_morefiles.yml
deleted file mode 100644
index f7bcb871..00000000
--- a/testdata/german/Exports-2020-04-15-08-25-04/tdmcreate_morefiles.yml
+++ /dev/null
@@ -1 +0,0 @@
-{ }
\ No newline at end of file
diff --git a/testdata/german/Exports-2020-04-15-08-25-04/tdmcreate_settings.yml b/testdata/german/Exports-2020-04-15-08-25-04/tdmcreate_settings.yml
deleted file mode 100644
index e188e0f1..00000000
--- a/testdata/german/Exports-2020-04-15-08-25-04/tdmcreate_settings.yml
+++ /dev/null
@@ -1,41 +0,0 @@
--
- set_id: '1'
- set_name: 'My Module'
- set_dirname: mymoduledirname
- set_version: '1.0'
- set_since: '1.0'
- set_min_php: '7.0'
- set_min_xoops: 2.5.9
- set_min_admin: '1.2'
- set_min_mysql: '5.6'
- set_description: 'This module is for doing following...'
- set_author: 'TDM XOOPS'
- set_author_mail: info@email.com
- set_author_website_url: 'http://xoops.org'
- set_author_website_name: 'XOOPS Project'
- set_credits: 'XOOPS Development Team'
- set_license: 'GPL 2.0 or later'
- set_release_info: release_info
- set_release_file: 'release_info file'
- set_manual: 'link to manual file'
- set_manual_file: install.txt
- set_image: empty.png
- set_demo_site_url: 'https://xoops.org'
- set_demo_site_name: 'XOOPS Demo Site'
- set_support_url: 'https://xoops.org/modules/newbb'
- set_support_name: 'Support Forum'
- set_website_url: www.xoops.org
- set_website_name: 'XOOPS Project'
- set_release: '2017-12-02'
- set_status: 'Beta 1'
- set_admin: '1'
- set_user: '1'
- set_blocks: '1'
- set_search: '0'
- set_comments: '0'
- set_notifications: '0'
- set_permissions: '0'
- set_inroot_copy: '0'
- set_donations: 6KJ7RW5DR3VTJ
- set_subversion: '13070'
- set_type: '1'
diff --git a/testdata/german/index.html b/testdata/german/index.html
deleted file mode 100644
index 74b6f45c..00000000
--- a/testdata/german/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/testdata/german/tdmcreate_fieldattributes.yml b/testdata/german/tdmcreate_fieldattributes.yml
deleted file mode 100644
index aba8a4b2..00000000
--- a/testdata/german/tdmcreate_fieldattributes.yml
+++ /dev/null
@@ -1,20 +0,0 @@
--
- fieldattribute_id: '1'
- fieldattribute_name: ...
- fieldattribute_value: ''
--
- fieldattribute_id: '2'
- fieldattribute_name: BINARY
- fieldattribute_value: BINARY
--
- fieldattribute_id: '3'
- fieldattribute_name: UNSIGNED
- fieldattribute_value: UNSIGNED
--
- fieldattribute_id: '4'
- fieldattribute_name: UNSIGNED_ZEROFILL
- fieldattribute_value: UNSIGNED_ZEROFILL
--
- fieldattribute_id: '5'
- fieldattribute_name: CURRENT_TIMESTAMP
- fieldattribute_value: CURRENT_TIMESTAMP
diff --git a/testdata/german/tdmcreate_fieldelements.yml b/testdata/german/tdmcreate_fieldelements.yml
deleted file mode 100644
index b20d20b9..00000000
--- a/testdata/german/tdmcreate_fieldelements.yml
+++ /dev/null
@@ -1,225 +0,0 @@
--
- fieldelement_id: '1'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: ...
- fieldelement_value: ''
- fieldelement_sort: '0'
- fieldelement_deftype: '0'
- fieldelement_defvalue: '0'
--
- fieldelement_id: '2'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: Text
- fieldelement_value: XoopsFormText
- fieldelement_sort: '1'
- fieldelement_deftype: '14'
- fieldelement_defvalue: '255'
--
- fieldelement_id: '3'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: TextArea
- fieldelement_value: XoopsFormTextArea
- fieldelement_sort: '2'
- fieldelement_deftype: '15'
- fieldelement_defvalue: '0'
--
- fieldelement_id: '4'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: DhtmlTextArea
- fieldelement_value: XoopsFormDhtmlTextArea
- fieldelement_sort: '3'
- fieldelement_deftype: '15'
- fieldelement_defvalue: '0'
--
- fieldelement_id: '5'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: CheckBox
- fieldelement_value: XoopsFormCheckBox
- fieldelement_sort: '4'
- fieldelement_deftype: '2'
- fieldelement_defvalue: '10'
--
- fieldelement_id: '6'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: RadioYN
- fieldelement_value: XoopsFormRadioYN
- fieldelement_sort: '6'
- fieldelement_deftype: '2'
- fieldelement_defvalue: '1'
--
- fieldelement_id: '7'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: SelectBox
- fieldelement_value: XoopsFormSelect
- fieldelement_sort: '7'
- fieldelement_deftype: '2'
- fieldelement_defvalue: '10'
--
- fieldelement_id: '8'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: SelectUser
- fieldelement_value: XoopsFormSelectUser
- fieldelement_sort: '9'
- fieldelement_deftype: '2'
- fieldelement_defvalue: '10'
--
- fieldelement_id: '9'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: ColorPicker
- fieldelement_value: XoopsFormColorPicker
- fieldelement_sort: '19'
- fieldelement_deftype: '14'
- fieldelement_defvalue: '7'
--
- fieldelement_id: '10'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: ImageList
- fieldelement_value: XoopsFormImageList
- fieldelement_sort: '13'
- fieldelement_deftype: '14'
- fieldelement_defvalue: '255'
--
- fieldelement_id: '11'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: SelectFile
- fieldelement_value: XoopsFormSelectFile
- fieldelement_sort: '10'
- fieldelement_deftype: '14'
- fieldelement_defvalue: '255'
--
- fieldelement_id: '12'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: UrlFile
- fieldelement_value: XoopsFormUrlFile
- fieldelement_sort: '16'
- fieldelement_deftype: '14'
- fieldelement_defvalue: '255'
--
- fieldelement_id: '13'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: UploadImage
- fieldelement_value: XoopsFormUploadImage
- fieldelement_sort: '14'
- fieldelement_deftype: '14'
- fieldelement_defvalue: '255'
--
- fieldelement_id: '14'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: UploadFile
- fieldelement_value: XoopsFormUploadFile
- fieldelement_sort: '15'
- fieldelement_deftype: '14'
- fieldelement_defvalue: '255'
--
- fieldelement_id: '15'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: TextDateSelect
- fieldelement_value: XoopsFormTextDateSelect
- fieldelement_sort: '17'
- fieldelement_deftype: '2'
- fieldelement_defvalue: '10'
--
- fieldelement_id: '16'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: SelectStatus
- fieldelement_value: XoopsFormSelectStatus
- fieldelement_sort: '20'
- fieldelement_deftype: '2'
- fieldelement_defvalue: '1'
--
- fieldelement_id: '17'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: Password
- fieldelement_value: XoopsFormPassword
- fieldelement_sort: '21'
- fieldelement_deftype: '14'
- fieldelement_defvalue: '255'
--
- fieldelement_id: '18'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: SelectCountry
- fieldelement_value: XoopsFormSelectCountry
- fieldelement_sort: '11'
- fieldelement_deftype: '14'
- fieldelement_defvalue: '3'
--
- fieldelement_id: '19'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: SelectLang
- fieldelement_value: XoopsFormSelectLang
- fieldelement_sort: '12'
- fieldelement_deftype: '14'
- fieldelement_defvalue: '100'
--
- fieldelement_id: '20'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: Radio
- fieldelement_value: XoopsFormRadio
- fieldelement_sort: '5'
- fieldelement_deftype: '2'
- fieldelement_defvalue: '10'
--
- fieldelement_id: '21'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: DateTime
- fieldelement_value: XoopsFormDateTime
- fieldelement_sort: '18'
- fieldelement_deftype: '2'
- fieldelement_defvalue: '10'
--
- fieldelement_id: '22'
- fieldelement_mid: '0'
- fieldelement_tid: '0'
- fieldelement_name: SelectCombo
- fieldelement_value: XoopsFormSelectCombo
- fieldelement_sort: '8'
- fieldelement_deftype: '2'
- fieldelement_defvalue: '10'
--
- fieldelement_id: '23'
- fieldelement_mid: '1'
- fieldelement_tid: '3'
- fieldelement_name: 'Table : Testfields'
- fieldelement_value: XoopsFormTables-Testfields
- fieldelement_sort: '0'
- fieldelement_deftype: '2'
- fieldelement_defvalue: '10'
--
- fieldelement_id: '24'
- fieldelement_mid: '1'
- fieldelement_tid: '1'
- fieldelement_name: 'Table : Categories'
- fieldelement_value: XoopsFormTables-Categories
- fieldelement_sort: '0'
- fieldelement_deftype: '2'
- fieldelement_defvalue: '10'
--
- fieldelement_id: '25'
- fieldelement_mid: '1'
- fieldelement_tid: '2'
- fieldelement_name: 'Table : Articles'
- fieldelement_value: XoopsFormTables-Articles
- fieldelement_sort: '0'
- fieldelement_deftype: '2'
- fieldelement_defvalue: '10'
diff --git a/testdata/german/tdmcreate_fieldkey.yml b/testdata/german/tdmcreate_fieldkey.yml
deleted file mode 100644
index 1f967fae..00000000
--- a/testdata/german/tdmcreate_fieldkey.yml
+++ /dev/null
@@ -1,24 +0,0 @@
--
- fieldkey_id: '1'
- fieldkey_name: ...
- fieldkey_value: ''
--
- fieldkey_id: '2'
- fieldkey_name: PRIMARY
- fieldkey_value: PRIMARY
--
- fieldkey_id: '3'
- fieldkey_name: UNIQUE
- fieldkey_value: UNIQUE
--
- fieldkey_id: '4'
- fieldkey_name: KEY
- fieldkey_value: KEY
--
- fieldkey_id: '5'
- fieldkey_name: INDEX
- fieldkey_value: INDEX
--
- fieldkey_id: '6'
- fieldkey_name: FULLTEXT
- fieldkey_value: FULLTEXT
diff --git a/testdata/german/tdmcreate_fieldnull.yml b/testdata/german/tdmcreate_fieldnull.yml
deleted file mode 100644
index 2ca74967..00000000
--- a/testdata/german/tdmcreate_fieldnull.yml
+++ /dev/null
@@ -1,12 +0,0 @@
--
- fieldnull_id: '1'
- fieldnull_name: ...
- fieldnull_value: ''
--
- fieldnull_id: '2'
- fieldnull_name: 'NOT NULL'
- fieldnull_value: 'NOT NULL'
--
- fieldnull_id: '3'
- fieldnull_name: 'NULL'
- fieldnull_value: 'NULL'
diff --git a/testdata/german/tdmcreate_fields.yml b/testdata/german/tdmcreate_fields.yml
deleted file mode 100644
index b9ada263..00000000
--- a/testdata/german/tdmcreate_fields.yml
+++ /dev/null
@@ -1,900 +0,0 @@
--
- field_id: '1'
- field_mid: '1'
- field_tid: '1'
- field_order: '1'
- field_name: cat_id
- field_type: '2'
- field_value: '8'
- field_attribute: '3'
- field_null: '2'
- field_default: ''
- field_key: '2'
- field_element: ''
- field_parent: '0'
- field_admin: '0'
- field_inlist: '0'
- field_inform: '0'
- field_user: '0'
- field_thead: '0'
- field_tbody: '0'
- field_tfoot: '0'
- field_block: '0'
- field_main: '0'
- field_search: '0'
- field_required: '0'
--
- field_id: '2'
- field_mid: '1'
- field_tid: '1'
- field_order: '2'
- field_name: cat_name
- field_type: '14'
- field_value: '200'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '2'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '0'
- field_thead: '0'
- field_tbody: '0'
- field_tfoot: '0'
- field_block: '0'
- field_main: '1'
- field_search: '0'
- field_required: '1'
--
- field_id: '3'
- field_mid: '1'
- field_tid: '1'
- field_order: '3'
- field_name: cat_logo
- field_type: '14'
- field_value: '200'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '13'
- field_parent: '0'
- field_admin: '0'
- field_inlist: '0'
- field_inform: '0'
- field_user: '0'
- field_thead: '0'
- field_tbody: '0'
- field_tfoot: '0'
- field_block: '0'
- field_main: '0'
- field_search: '0'
- field_required: '0'
--
- field_id: '4'
- field_mid: '1'
- field_tid: '1'
- field_order: '4'
- field_name: cat_created
- field_type: '2'
- field_value: '10'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '15'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '0'
- field_thead: '0'
- field_tbody: '0'
- field_tfoot: '0'
- field_block: '0'
- field_main: '0'
- field_search: '0'
- field_required: '1'
--
- field_id: '5'
- field_mid: '1'
- field_tid: '1'
- field_order: '5'
- field_name: cat_submitter
- field_type: '2'
- field_value: '8'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '8'
- field_parent: '0'
- field_admin: '0'
- field_inlist: '0'
- field_inform: '0'
- field_user: '0'
- field_thead: '0'
- field_tbody: '0'
- field_tfoot: '0'
- field_block: '0'
- field_main: '0'
- field_search: '0'
- field_required: '0'
--
- field_id: '6'
- field_mid: '1'
- field_tid: '2'
- field_order: '1'
- field_name: art_id
- field_type: '2'
- field_value: '8'
- field_attribute: '3'
- field_null: '2'
- field_default: ''
- field_key: '2'
- field_element: ''
- field_parent: '0'
- field_admin: '0'
- field_inlist: '0'
- field_inform: '0'
- field_user: '0'
- field_thead: '0'
- field_tbody: '0'
- field_tfoot: '0'
- field_block: '0'
- field_main: '0'
- field_search: '0'
- field_required: '0'
--
- field_id: '7'
- field_mid: '1'
- field_tid: '2'
- field_order: '2'
- field_name: art_cat
- field_type: '2'
- field_value: '8'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '24'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '1'
- field_thead: '1'
- field_tbody: '1'
- field_tfoot: '1'
- field_block: '1'
- field_main: '0'
- field_search: '1'
- field_required: '1'
--
- field_id: '8'
- field_mid: '1'
- field_tid: '2'
- field_order: '3'
- field_name: art_title
- field_type: '14'
- field_value: '200'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '2'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '1'
- field_thead: '1'
- field_tbody: '1'
- field_tfoot: '1'
- field_block: '1'
- field_main: '1'
- field_search: '1'
- field_required: '1'
--
- field_id: '9'
- field_mid: '1'
- field_tid: '2'
- field_order: '4'
- field_name: art_descr
- field_type: '17'
- field_value: ''
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '4'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '1'
- field_thead: '1'
- field_tbody: '1'
- field_tfoot: '1'
- field_block: '1'
- field_main: '0'
- field_search: '1'
- field_required: '1'
--
- field_id: '10'
- field_mid: '1'
- field_tid: '2'
- field_order: '5'
- field_name: art_img
- field_type: '14'
- field_value: '200'
- field_attribute: '1'
- field_null: '3'
- field_default: ''''''
- field_key: '1'
- field_element: '13'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '1'
- field_thead: '1'
- field_tbody: '1'
- field_tfoot: '1'
- field_block: '1'
- field_main: '0'
- field_search: '0'
- field_required: '0'
--
- field_id: '11'
- field_mid: '1'
- field_tid: '2'
- field_order: '6'
- field_name: art_online
- field_type: '3'
- field_value: '1'
- field_attribute: '1'
- field_null: '2'
- field_default: '0'
- field_key: '1'
- field_element: '6'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '0'
- field_thead: '0'
- field_tbody: '0'
- field_tfoot: '0'
- field_block: '0'
- field_main: '0'
- field_search: '0'
- field_required: '1'
--
- field_id: '12'
- field_mid: '1'
- field_tid: '2'
- field_order: '7'
- field_name: art_file
- field_type: '14'
- field_value: '200'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '14'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '1'
- field_thead: '1'
- field_tbody: '1'
- field_tfoot: '1'
- field_block: '1'
- field_main: '0'
- field_search: '0'
- field_required: '0'
--
- field_id: '13'
- field_mid: '1'
- field_tid: '2'
- field_order: '8'
- field_name: art_created
- field_type: '2'
- field_value: '10'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '15'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '1'
- field_thead: '1'
- field_tbody: '1'
- field_tfoot: '1'
- field_block: '1'
- field_main: '0'
- field_search: '0'
- field_required: '0'
--
- field_id: '14'
- field_mid: '1'
- field_tid: '2'
- field_order: '9'
- field_name: art_submitter
- field_type: '2'
- field_value: '10'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '8'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '1'
- field_thead: '1'
- field_tbody: '1'
- field_tfoot: '1'
- field_block: '1'
- field_main: '0'
- field_search: '0'
- field_required: '0'
--
- field_id: '15'
- field_mid: '1'
- field_tid: '3'
- field_order: '1'
- field_name: tf_id
- field_type: '2'
- field_value: '8'
- field_attribute: '3'
- field_null: '2'
- field_default: ''
- field_key: '2'
- field_element: ''
- field_parent: '0'
- field_admin: '0'
- field_inlist: '0'
- field_inform: '0'
- field_user: '0'
- field_thead: '0'
- field_tbody: '0'
- field_tfoot: '0'
- field_block: '0'
- field_main: '0'
- field_search: '0'
- field_required: '0'
--
- field_id: '16'
- field_mid: '1'
- field_tid: '3'
- field_order: '2'
- field_name: tf_text
- field_type: '14'
- field_value: '255'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '2'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '1'
- field_thead: '0'
- field_tbody: '1'
- field_tfoot: '0'
- field_block: '0'
- field_main: '1'
- field_search: '1'
- field_required: '0'
--
- field_id: '17'
- field_mid: '1'
- field_tid: '3'
- field_order: '3'
- field_name: tf_textarea
- field_type: '15'
- field_value: '0'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '3'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '1'
- field_thead: '0'
- field_tbody: '1'
- field_tfoot: '0'
- field_block: '0'
- field_main: '0'
- field_search: '1'
- field_required: '0'
--
- field_id: '18'
- field_mid: '1'
- field_tid: '3'
- field_order: '4'
- field_name: tf_dhtml
- field_type: '15'
- field_value: '0'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '4'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '1'
- field_thead: '0'
- field_tbody: '1'
- field_tfoot: '0'
- field_block: '0'
- field_main: '0'
- field_search: '0'
- field_required: '0'
--
- field_id: '19'
- field_mid: '1'
- field_tid: '3'
- field_order: '5'
- field_name: tf_checkbox
- field_type: '2'
- field_value: '10'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '5'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '1'
- field_thead: '0'
- field_tbody: '1'
- field_tfoot: '0'
- field_block: '0'
- field_main: '0'
- field_search: '0'
- field_required: '0'
--
- field_id: '20'
- field_mid: '1'
- field_tid: '3'
- field_order: '6'
- field_name: tf_yesno
- field_type: '2'
- field_value: '1'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '6'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '1'
- field_thead: '0'
- field_tbody: '1'
- field_tfoot: '0'
- field_block: '0'
- field_main: '0'
- field_search: '0'
- field_required: '0'
--
- field_id: '21'
- field_mid: '1'
- field_tid: '3'
- field_order: '7'
- field_name: tf_selectbox
- field_type: '2'
- field_value: '10'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '7'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '1'
- field_thead: '0'
- field_tbody: '1'
- field_tfoot: '0'
- field_block: '0'
- field_main: '0'
- field_search: '0'
- field_required: '0'
--
- field_id: '22'
- field_mid: '1'
- field_tid: '3'
- field_order: '8'
- field_name: tf_user
- field_type: '2'
- field_value: '10'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '8'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '1'
- field_thead: '0'
- field_tbody: '1'
- field_tfoot: '0'
- field_block: '0'
- field_main: '0'
- field_search: '0'
- field_required: '0'
--
- field_id: '23'
- field_mid: '1'
- field_tid: '3'
- field_order: '9'
- field_name: tf_color
- field_type: '14'
- field_value: '7'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '9'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '1'
- field_thead: '0'
- field_tbody: '1'
- field_tfoot: '0'
- field_block: '0'
- field_main: '0'
- field_search: '0'
- field_required: '0'
--
- field_id: '24'
- field_mid: '1'
- field_tid: '3'
- field_order: '10'
- field_name: tf_imagelist
- field_type: '14'
- field_value: '255'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '10'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '1'
- field_thead: '0'
- field_tbody: '1'
- field_tfoot: '0'
- field_block: '0'
- field_main: '0'
- field_search: '0'
- field_required: '0'
--
- field_id: '25'
- field_mid: '1'
- field_tid: '3'
- field_order: '11'
- field_name: tf_urlfile
- field_type: '14'
- field_value: '255'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '12'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '1'
- field_thead: '0'
- field_tbody: '1'
- field_tfoot: '0'
- field_block: '0'
- field_main: '0'
- field_search: '0'
- field_required: '0'
--
- field_id: '26'
- field_mid: '1'
- field_tid: '3'
- field_order: '12'
- field_name: tf_uplimage
- field_type: '14'
- field_value: '255'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '13'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '1'
- field_thead: '0'
- field_tbody: '1'
- field_tfoot: '0'
- field_block: '0'
- field_main: '0'
- field_search: '0'
- field_required: '0'
--
- field_id: '27'
- field_mid: '1'
- field_tid: '3'
- field_order: '13'
- field_name: tf_uplfile
- field_type: '14'
- field_value: '255'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '14'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '1'
- field_thead: '0'
- field_tbody: '1'
- field_tfoot: '0'
- field_block: '0'
- field_main: '0'
- field_search: '0'
- field_required: '0'
--
- field_id: '28'
- field_mid: '1'
- field_tid: '3'
- field_order: '14'
- field_name: tf_textdateselect
- field_type: '2'
- field_value: '10'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '15'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '1'
- field_thead: '0'
- field_tbody: '1'
- field_tfoot: '0'
- field_block: '0'
- field_main: '0'
- field_search: '0'
- field_required: '0'
--
- field_id: '29'
- field_mid: '1'
- field_tid: '3'
- field_order: '15'
- field_name: tf_selectfile
- field_type: '14'
- field_value: '255'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '11'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '1'
- field_thead: '0'
- field_tbody: '1'
- field_tfoot: '0'
- field_block: '0'
- field_main: '0'
- field_search: '0'
- field_required: '0'
--
- field_id: '30'
- field_mid: '1'
- field_tid: '3'
- field_order: '16'
- field_name: tf_password
- field_type: '14'
- field_value: '255'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '17'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '0'
- field_thead: '0'
- field_tbody: '0'
- field_tfoot: '0'
- field_block: '0'
- field_main: '0'
- field_search: '0'
- field_required: '0'
--
- field_id: '31'
- field_mid: '1'
- field_tid: '3'
- field_order: '17'
- field_name: tf_country_list
- field_type: '14'
- field_value: '3'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '18'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '1'
- field_thead: '0'
- field_tbody: '1'
- field_tfoot: '0'
- field_block: '0'
- field_main: '0'
- field_search: '0'
- field_required: '0'
--
- field_id: '32'
- field_mid: '1'
- field_tid: '3'
- field_order: '18'
- field_name: tf_language
- field_type: '14'
- field_value: '100'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '19'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '0'
- field_thead: '0'
- field_tbody: '0'
- field_tfoot: '0'
- field_block: '0'
- field_main: '0'
- field_search: '0'
- field_required: '0'
--
- field_id: '33'
- field_mid: '1'
- field_tid: '3'
- field_order: '19'
- field_name: tf_radio
- field_type: '2'
- field_value: '10'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '20'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '1'
- field_thead: '0'
- field_tbody: '1'
- field_tfoot: '0'
- field_block: '0'
- field_main: '0'
- field_search: '0'
- field_required: '0'
--
- field_id: '34'
- field_mid: '1'
- field_tid: '3'
- field_order: '20'
- field_name: tf_status
- field_type: '2'
- field_value: '1'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '16'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '1'
- field_thead: '0'
- field_tbody: '1'
- field_tfoot: '0'
- field_block: '0'
- field_main: '0'
- field_search: '0'
- field_required: '1'
--
- field_id: '35'
- field_mid: '1'
- field_tid: '3'
- field_order: '21'
- field_name: tf_datetime
- field_type: '2'
- field_value: '10'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '21'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '1'
- field_thead: '0'
- field_tbody: '1'
- field_tfoot: '0'
- field_block: '0'
- field_main: '0'
- field_search: '0'
- field_required: '0'
--
- field_id: '36'
- field_mid: '1'
- field_tid: '3'
- field_order: '22'
- field_name: tf_combobox
- field_type: '2'
- field_value: '10'
- field_attribute: '1'
- field_null: '2'
- field_default: ''
- field_key: '1'
- field_element: '22'
- field_parent: '0'
- field_admin: '1'
- field_inlist: '1'
- field_inform: '1'
- field_user: '1'
- field_thead: '0'
- field_tbody: '1'
- field_tfoot: '0'
- field_block: '0'
- field_main: '0'
- field_search: '0'
- field_required: '0'
diff --git a/testdata/german/tdmcreate_fieldtype.yml b/testdata/german/tdmcreate_fieldtype.yml
deleted file mode 100644
index d08e73c6..00000000
--- a/testdata/german/tdmcreate_fieldtype.yml
+++ /dev/null
@@ -1,92 +0,0 @@
--
- fieldtype_id: '1'
- fieldtype_name: ...
- fieldtype_value: ''
--
- fieldtype_id: '2'
- fieldtype_name: INT
- fieldtype_value: INT
--
- fieldtype_id: '3'
- fieldtype_name: TINYINT
- fieldtype_value: TINYINT
--
- fieldtype_id: '4'
- fieldtype_name: MEDIUMINT
- fieldtype_value: MEDIUMINT
--
- fieldtype_id: '5'
- fieldtype_name: SMALLINT
- fieldtype_value: SMALLINT
--
- fieldtype_id: '6'
- fieldtype_name: FLOAT
- fieldtype_value: FLOAT
--
- fieldtype_id: '7'
- fieldtype_name: DOUBLE
- fieldtype_value: DOUBLE
--
- fieldtype_id: '8'
- fieldtype_name: DECIMAL
- fieldtype_value: DECIMAL
--
- fieldtype_id: '9'
- fieldtype_name: SET
- fieldtype_value: SET
--
- fieldtype_id: '10'
- fieldtype_name: ENUM
- fieldtype_value: ENUM
--
- fieldtype_id: '11'
- fieldtype_name: EMAIL
- fieldtype_value: EMAIL
--
- fieldtype_id: '12'
- fieldtype_name: URL
- fieldtype_value: URL
--
- fieldtype_id: '13'
- fieldtype_name: CHAR
- fieldtype_value: CHAR
--
- fieldtype_id: '14'
- fieldtype_name: VARCHAR
- fieldtype_value: VARCHAR
--
- fieldtype_id: '15'
- fieldtype_name: TEXT
- fieldtype_value: TEXT
--
- fieldtype_id: '16'
- fieldtype_name: TINYTEXT
- fieldtype_value: TINYTEXT
--
- fieldtype_id: '17'
- fieldtype_name: MEDIUMTEXT
- fieldtype_value: MEDIUMTEXT
--
- fieldtype_id: '18'
- fieldtype_name: LONGTEXT
- fieldtype_value: LONGTEXT
--
- fieldtype_id: '19'
- fieldtype_name: DATE
- fieldtype_value: DATE
--
- fieldtype_id: '20'
- fieldtype_name: DATETIME
- fieldtype_value: DATETIME
--
- fieldtype_id: '21'
- fieldtype_name: TIMESTAMP
- fieldtype_value: TIMESTAMP
--
- fieldtype_id: '22'
- fieldtype_name: TIME
- fieldtype_value: TIME
--
- fieldtype_id: '23'
- fieldtype_name: YEAR
- fieldtype_value: YEAR
diff --git a/testdata/german/tdmcreate_languages.yml b/testdata/german/tdmcreate_languages.yml
deleted file mode 100644
index f7bcb871..00000000
--- a/testdata/german/tdmcreate_languages.yml
+++ /dev/null
@@ -1 +0,0 @@
-{ }
\ No newline at end of file
diff --git a/testdata/german/tdmcreate_modules.yml b/testdata/german/tdmcreate_modules.yml
deleted file mode 100644
index d5903e60..00000000
--- a/testdata/german/tdmcreate_modules.yml
+++ /dev/null
@@ -1,40 +0,0 @@
--
- mod_id: '1'
- mod_name: 'My Module 3'
- mod_dirname: mymodule3
- mod_version: '1.0'
- mod_since: '1.0'
- mod_min_php: '7.0'
- mod_min_xoops: 2.5.9
- mod_min_admin: '1.2'
- mod_min_mysql: '5.6'
- mod_description: 'This module is for doing following...'
- mod_author: 'TDM XOOPS'
- mod_author_mail: info@email.com
- mod_author_website_url: 'http://xoops.org'
- mod_author_website_name: 'XOOPS Project'
- mod_credits: 'XOOPS Development Team'
- mod_license: 'GPL 2.0 or later'
- mod_release_info: release_info
- mod_release_file: 'release_info file'
- mod_manual: 'link to manual file'
- mod_manual_file: install.txt
- mod_image: MyModule_logo.png
- mod_demo_site_url: 'https://xoops.org'
- mod_demo_site_name: 'XOOPS Demo Site'
- mod_support_url: 'https://xoops.org/modules/newbb'
- mod_support_name: 'Support Forum'
- mod_website_url: www.xoops.org
- mod_website_name: 'XOOPS Project'
- mod_release: '2017-12-02'
- mod_status: 'Beta 1'
- mod_admin: '1'
- mod_user: '1'
- mod_blocks: '1'
- mod_search: '1'
- mod_comments: '1'
- mod_notifications: '1'
- mod_permissions: '1'
- mod_inroot_copy: '1'
- mod_donations: 6KJ7RW5DR3VTJ
- mod_subversion: '13070'
diff --git a/testdata/german/tdmcreate_morefiles.yml b/testdata/german/tdmcreate_morefiles.yml
deleted file mode 100644
index f7bcb871..00000000
--- a/testdata/german/tdmcreate_morefiles.yml
+++ /dev/null
@@ -1 +0,0 @@
-{ }
\ No newline at end of file
diff --git a/testdata/german/tdmcreate_settings.yml b/testdata/german/tdmcreate_settings.yml
deleted file mode 100644
index e188e0f1..00000000
--- a/testdata/german/tdmcreate_settings.yml
+++ /dev/null
@@ -1,41 +0,0 @@
--
- set_id: '1'
- set_name: 'My Module'
- set_dirname: mymoduledirname
- set_version: '1.0'
- set_since: '1.0'
- set_min_php: '7.0'
- set_min_xoops: 2.5.9
- set_min_admin: '1.2'
- set_min_mysql: '5.6'
- set_description: 'This module is for doing following...'
- set_author: 'TDM XOOPS'
- set_author_mail: info@email.com
- set_author_website_url: 'http://xoops.org'
- set_author_website_name: 'XOOPS Project'
- set_credits: 'XOOPS Development Team'
- set_license: 'GPL 2.0 or later'
- set_release_info: release_info
- set_release_file: 'release_info file'
- set_manual: 'link to manual file'
- set_manual_file: install.txt
- set_image: empty.png
- set_demo_site_url: 'https://xoops.org'
- set_demo_site_name: 'XOOPS Demo Site'
- set_support_url: 'https://xoops.org/modules/newbb'
- set_support_name: 'Support Forum'
- set_website_url: www.xoops.org
- set_website_name: 'XOOPS Project'
- set_release: '2017-12-02'
- set_status: 'Beta 1'
- set_admin: '1'
- set_user: '1'
- set_blocks: '1'
- set_search: '0'
- set_comments: '0'
- set_notifications: '0'
- set_permissions: '0'
- set_inroot_copy: '0'
- set_donations: 6KJ7RW5DR3VTJ
- set_subversion: '13070'
- set_type: '1'
diff --git a/testdata/german/tdmcreate_tables.yml b/testdata/german/tdmcreate_tables.yml
deleted file mode 100644
index 97b84f71..00000000
--- a/testdata/german/tdmcreate_tables.yml
+++ /dev/null
@@ -1,90 +0,0 @@
--
- table_id: '1'
- table_mid: '1'
- table_category: '1'
- table_name: categories
- table_solename: category
- table_fieldname: cat
- table_nbfields: '5'
- table_order: '1'
- table_image: category.png
- table_autoincrement: '1'
- table_install: '1'
- table_index: '0'
- table_blocks: '0'
- table_admin: '1'
- table_user: '0'
- table_submenu: '0'
- table_submit: '0'
- table_tag: '0'
- table_broken: '0'
- table_search: '0'
- table_comments: '0'
- table_notifications: '0'
- table_permissions: '0'
- table_rate: '0'
- table_print: '0'
- table_pdf: '0'
- table_rss: '0'
- table_single: '0'
- table_visit: '0'
--
- table_id: '2'
- table_mid: '1'
- table_category: '0'
- table_name: articles
- table_solename: article
- table_fieldname: art
- table_nbfields: '9'
- table_order: '1'
- table_image: penguin.png
- table_autoincrement: '1'
- table_install: '1'
- table_index: '1'
- table_blocks: '1'
- table_admin: '1'
- table_user: '1'
- table_submenu: '1'
- table_submit: '1'
- table_tag: '1'
- table_broken: '1'
- table_search: '1'
- table_comments: '1'
- table_notifications: '1'
- table_permissions: '1'
- table_rate: '1'
- table_print: '1'
- table_pdf: '1'
- table_rss: '1'
- table_single: '1'
- table_visit: '1'
--
- table_id: '3'
- table_mid: '1'
- table_category: '0'
- table_name: testfields
- table_solename: testfield
- table_fieldname: tf
- table_nbfields: '22'
- table_order: '1'
- table_image: alert.png
- table_autoincrement: '1'
- table_install: '1'
- table_index: '1'
- table_blocks: '1'
- table_admin: '1'
- table_user: '1'
- table_submenu: '1'
- table_submit: '1'
- table_tag: '1'
- table_broken: '1'
- table_search: '1'
- table_comments: '1'
- table_notifications: '1'
- table_permissions: '1'
- table_rate: '1'
- table_print: '1'
- table_pdf: '1'
- table_rss: '1'
- table_single: '1'
- table_visit: '1'
diff --git a/testdata/images/empty.png b/testdata/images/empty.png
new file mode 100644
index 00000000..21052bd6
Binary files /dev/null and b/testdata/images/empty.png differ
diff --git a/testdata/images/index.html b/testdata/images/index.html
deleted file mode 100644
index 74b6f45c..00000000
--- a/testdata/images/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/testdata/images/index.php b/testdata/images/index.php
new file mode 100644
index 00000000..e5ee0725
--- /dev/null
+++ b/testdata/images/index.php
@@ -0,0 +1,2 @@
+history.go(-1);
\ No newline at end of file
diff --git a/testdata/images/modules/index.php b/testdata/images/modules/index.php
new file mode 100644
index 00000000..e5ee0725
--- /dev/null
+++ b/testdata/images/modules/index.php
@@ -0,0 +1,2 @@
+history.go(-1);
\ No newline at end of file
diff --git a/testdata/images/tables/index.php b/testdata/images/tables/index.php
new file mode 100644
index 00000000..e5ee0725
--- /dev/null
+++ b/testdata/images/tables/index.php
@@ -0,0 +1,2 @@
+history.go(-1);
\ No newline at end of file
diff --git a/testdata/index.php b/testdata/index.php
index 72fb343c..b1883375 100644
--- a/testdata/index.php
+++ b/testdata/index.php
@@ -1,4 +1,5 @@
-loadLanguage('common');
switch ($op) {
case 'load':
- if (\Xmf\Request::hasVar('ok', 'REQUEST') && 1 == $_REQUEST['ok']) {
+ if (Request::hasVar('ok', 'REQUEST') && 1 === Request::getInt('ok')) {
if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header('../admin/index.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ \redirect_header($helper->url('admin/index.php'), 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
loadSampleData();
} else {
xoops_cp_header();
- xoops_confirm(['ok' => 1, 'op' => 'load'], 'index.php', sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'ADD_SAMPLEDATA_OK')), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
+ xoops_confirm(['ok' => 1, 'op' => 'load'], 'index.php', \constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_CONFIRM'), \constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'));
xoops_cp_footer();
}
break;
case 'save':
saveSampleData();
break;
+ case 'clear':
+ if (Request::hasVar('ok', 'REQUEST') && 1 === Request::getInt('ok')) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($helper->url('admin/index.php'), 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+ clearSampleData();
+ } else {
+ xoops_cp_header();
+ xoops_confirm(['ok' => 1, 'op' => 'clear'], 'index.php', constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA'), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'));
+ xoops_cp_footer();
+ }
+ break;
}
// XMF TableLoad for SAMPLE data
-function loadSampleData()
+function loadSampleData(): void
{
global $xoopsConfig;
+ $moduleDirName = \basename(\dirname(__DIR__));
+ $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
- $moduleDirName = basename(dirname(__DIR__));
- $moduleDirNameUpper = mb_strtoupper($moduleDirName);
-
- $utility = new Tdmcreate\Utility();
- $configurator = new Common\Configurator();
+ $utility = new Utility();
+ $configurator = new Configurator();
$tables = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getInfo('tables');
$language = 'english/';
- if (is_dir(__DIR__ . '/' . $xoopsConfig['language'])) {
+ if (\is_dir(__DIR__ . '/' . $xoopsConfig['language'])) {
$language = $xoopsConfig['language'] . '/';
}
+ // load module tables
foreach ($tables as $table) {
- $tabledata = \Xmf\Yaml::readWrapped($language . $table . '.yml');
- if (is_array($tabledata)) {
- \Xmf\Database\TableLoad::truncateTable($table);
- \Xmf\Database\TableLoad::loadTableFromArray($table, $tabledata);
+ $tabledata = Yaml::readWrapped($language . $table . '.yml');
+ TableLoad::truncateTable($table);
+ TableLoad::loadTableFromArray($table, $tabledata);
}
-}
+
+ // load permissions
+ $table = 'group_permission';
+ $tabledata = Yaml::readWrapped($language . $table . '.yml');
+ $mid = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getVar('mid');
+ loadTableFromArrayWithReplace($table, $tabledata, 'gperm_modid', $mid);
+
// --- COPY test folder files ---------------
- if (is_array($configurator->copyTestFolders) && count($configurator->copyTestFolders) > 0) {
- // $file = __DIR__ . '/../testdata/images/';
- foreach (array_keys($configurator->copyTestFolders) as $i) {
+ if (\is_array($configurator->copyTestFolders) && \count($configurator->copyTestFolders) > 0) {
+ // $file = dirname(__DIR__) . '/testdata/images/';
+ foreach (\array_keys($configurator->copyTestFolders) as $i) {
$src = $configurator->copyTestFolders[$i][0];
$dest = $configurator->copyTestFolders[$i][1];
$utility::rcopy($src, $dest);
}
}
- redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'SAMPLEDATA_SUCCESS'));
+ \redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_SUCCESS'));
}
-function saveSampleData()
+function saveSampleData(): void
{
global $xoopsConfig;
-
- $configurator = new Common\Configurator();
-
- $moduleDirName = basename(dirname(__DIR__));
- $moduleDirNameUpper = mb_strtoupper($moduleDirName);
-
- $tables = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getInfo('tables');
-
- $language = 'english/';
- if (is_dir(__DIR__ . '/' . $xoopsConfig['language'])) {
- $language = $xoopsConfig['language'] . '/';
- }
-
- $languageFolder = __DIR__ . '/' . $language;
- if (!file_exists($languageFolder . '/')) {
- Utility::createFolder($languageFolder . '/');
+ $moduleDirName = \basename(\dirname(__DIR__));
+ $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+ $helper = Helper::getInstance();
+ $tables = $helper->getModule()->getInfo('tables');
+
+ $languageFolder = __DIR__ . '/' . $xoopsConfig['language'];
+ if (!\file_exists($languageFolder . '/')) {
+ Utility::createFolder($languageFolder . '/');
}
$exportFolder = $languageFolder . '/Exports-' . date('Y-m-d-H-i-s') . '/';
Utility::createFolder($exportFolder);
+ // save module tables
foreach ($tables as $table) {
- \Xmf\Database\TableLoad::saveTableToYamlFile($table, $exportFolder . $table . '.yml');
- }
-
- // --- COPY test folder files ---------------
- if (is_array($configurator->copyTestFolders) && count($configurator->copyTestFolders) > 0) {
- foreach (array_keys($configurator->copyTestFolders) as $i) {
- $src = $configurator->copyTestFolders[$i][1];
- $dest = $configurator->copyTestFolders[$i][0];
- Utility::rcopy($src, $dest);
- }
+ TableLoad::saveTableToYamlFile($table, $exportFolder . $table . '.yml');
}
- redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'SAMPLEDATA_SUCCESS'));
+
+ // save permissions
+ $criteria = new \CriteriaCompo();
+ $criteria->add(new \Criteria('gperm_modid', $helper->getModule()->getVar('mid')));
+ $skipColumns[] = 'gperm_id';
+ TableLoad::saveTableToYamlFile('group_permission', $exportFolder . 'group_permission.yml', $criteria, $skipColumns);
+ unset($criteria);
+
+ \redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA_SUCCESS'));
}
-function exportSchema()
+function exportSchema(): void
{
- $moduleDirName = basename(dirname(__DIR__));
- $moduleDirNameUpper = mb_strtoupper($moduleDirName);
+ $moduleDirName = \basename(\dirname(__DIR__));
+ $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
try {
// TODO set exportSchema
- // $migrate = new Tdmcreate\Migrate($moduleDirName);
+ // $migrate = new Migrate($moduleDirName);
// $migrate->saveCurrentSchema();
//
// redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_SUCCESS'));
- }
- catch (\Exception $e) {
+ } catch (\Throwable $e) {
exit(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_ERROR'));
}
+}
+
+/**
+ * loadTableFromArrayWithReplace
+ *
+ * @param string $table value with should be used insead of original value of $search
+ *
+ * @param array $data array of rows to insert
+ * Each element of the outer array represents a single table row.
+ * Each row is an associative array in 'column' => 'value' format.
+ * @param string $search name of column for which the value should be replaced
+ * @param $replace
+ * @return int number of rows inserted
+ */
+function loadTableFromArrayWithReplace(string $table, array $data, string $search, $replace)
+{
+ /** @var \XoopsMySQLDatabase $db */
+ $db = \XoopsDatabaseFactory::getDatabaseConnection();
+
+ $prefixedTable = $db->prefix($table);
+ $count = 0;
+
+ $sql = 'DELETE FROM ' . $prefixedTable . ' WHERE `' . $search . '`=' . $db->quote($replace);
+
+ $result = $db->queryF($sql);
+
+ if ($result) {
+ foreach ($data as $row) {
+ $insertInto = 'INSERT INTO ' . $prefixedTable . ' (';
+ $valueClause = ' VALUES (';
+ $first = true;
+ foreach ($row as $column => $value) {
+ if ($first) {
+ $first = false;
+ } else {
+ $insertInto .= ', ';
+ $valueClause .= ', ';
+ }
+
+ $insertInto .= $column;
+ if ($search === $column) {
+ $valueClause .= $db->quote($replace);
+ } else {
+ $valueClause .= $db->quote($value);
+ }
+ }
+ $sql = $insertInto . ') ' . $valueClause . ')';
+
+ $result = $db->queryF($sql);
+ if (false !== $result) {
+ ++$count;
+ }
+ }
+ }
+
+ return $count;
+}
+
+function clearSampleData(): void
+{
+ $moduleDirName = \basename(\dirname(__DIR__));
+ $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+ $helper = Helper::getInstance();
+ // Load language files
+ $helper->loadLanguage('common');
+ $tables = $helper->getModule()->getInfo('tables');
+ // truncate module tables
+ foreach ($tables as $table) {
+ \Xmf\Database\TableLoad::truncateTable($table);
+ }
+ redirect_header($helper->url('admin/index.php'), 1, constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA_OK'));
}
diff --git a/testdata/mymodule/admin/about.php b/testdata/mymodule/admin/about.php
deleted file mode 100644
index 3282ba28..00000000
--- a/testdata/mymodule/admin/about.php
+++ /dev/null
@@ -1,26 +0,0 @@
- - Website:', $fb_content); //clean line break from dhtmltextarea - - $title = constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SEND_FOR') . $GLOBALS['xoopsModule']->getVar('dirname'); - $body = constant('CO_' . $moduleDirNameUpper . '_' . 'FB_NAME') . ': ' . $your_name . '
'; - $body .= constant('CO_' . $moduleDirNameUpper . '_' . 'FB_MAIL') . ': ' . $your_mail . '
'; - $body .= constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SITE') . ': ' . $your_site . '
'; - $body .= constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE') . ': ' . $fb_type . '
'; - $body .= constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_CONTENT') . ':
'; - $body .= $fb_content; - $xoopsMailer = xoops_getMailer(); - $xoopsMailer->useMail(); - $xoopsMailer->setToEmails($GLOBALS['xoopsModule']->getInfo('author_mail')); - $xoopsMailer->setFromEmail($your_mail); - $xoopsMailer->setFromName($your_name); - $xoopsMailer->setSubject($title); - $xoopsMailer->multimailer->isHTML(true); - $xoopsMailer->setBody($body); - $ret = $xoopsMailer->send(); - if ($ret) { - redirect_header('index.php', 3, constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SEND_SUCCESS')); - } - - // show form with content again - $feedback->name = $your_name; - $feedback->email = $your_mail; - $feedback->site = $your_site; - $feedback->type = $fb_type; - $feedback->content = $fb_content; - echo '
-
';
- $form = $feedback->getFormFeedback();
- $form->display();
-
- break;
-}
-require __DIR__ . '/footer.php';
diff --git a/testdata/mymodule/admin/footer.php b/testdata/mymodule/admin/footer.php
deleted file mode 100644
index 0737385d..00000000
--- a/testdata/mymodule/admin/footer.php
+++ /dev/null
@@ -1,27 +0,0 @@
- - Website:' . constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SEND_ERROR') . '
-"; - $form .= _MB_MYMODULE_TITLE_LENGTH." :
"; - array_shift($options); - array_shift($options); - array_shift($options); - $criteria = new \CriteriaCompo(); - $criteria->add(new \Criteria('art_id', 0, '!=')); - $criteria->setSort('art_id'); - $criteria->setOrder('ASC'); - $articlesAll = $articlesHandler->getAll($criteria); - unset($criteria); - $form .= _MB_MYMODULE_ARTICLES_TO_DISPLAY."
'; - return $form; -} \ No newline at end of file diff --git a/testdata/mymodule/blocks/index.html b/testdata/mymodule/blocks/index.html deleted file mode 100644 index 74b6f45c..00000000 --- a/testdata/mymodule/blocks/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/testdata/mymodule/broken.php b/testdata/mymodule/broken.php deleted file mode 100644 index 0e3e26f0..00000000 --- a/testdata/mymodule/broken.php +++ /dev/null @@ -1,132 +0,0 @@ - - Website:
'; - $error = true; - } - $articlesObj->setVar('art_cat', Request::getInt('art_cat', 0)); - $articlesObj->setVar('art_title', Request::getString('art_title', '')); - $articlesObj->setVar('art_descr', Request::getString('art_descr', '')); - // Set Var art_img - include_once XOOPS_ROOT_PATH . '/class/uploader.php'; - $uploader = new \XoopsMediaUploader(MYMODULE_UPLOAD_IMAGE_PATH . '/articles/', - $helper->getConfig('mimetypes'), - $helper->getConfig('maxsize'), null, null); - if($uploader->fetchMedia($_POST['xoops_upload_file'][0])) { - $extension = preg_replace('/^.+\.([^.]+)$/sU', '', $_FILES['attachedfile']['name']); - $imgName = str_replace(' ', '', Request::getString('art_title')) . '.' . $extension; - $uploader->setPrefix($imgName); - $uploader->fetchMedia($_POST['xoops_upload_file'][0]); - if(!$uploader->upload()) { - $errors = $uploader->getErrors(); - redirect_header('javascript:history.go(-1).php', 3, $errors); - } else { - $articlesObj->setVar('art_img', $uploader->getSavedFileName()); - } - } else { - $articlesObj->setVar('art_img', Request::getString('art_img')); - } - $articlesObj->setVar('art_online', Request::getInt('art_online', 0)); - // Set Var art_file - include_once XOOPS_ROOT_PATH . '/class/uploader.php'; - $uploader = new \XoopsMediaUploader(MYMODULE_UPLOAD_FILES_PATH . '/articles/', - $helper->getConfig('mimetypes'), - $helper->getConfig('maxsize'), null, null); - if($uploader->fetchMedia($_POST['xoops_upload_file'][1])) { - $extension = preg_replace('/^.+\.([^.]+)$/sU', '', $_FILES['art_file']['name']); - $imgName = str_replace(' ', '', Request::getString('art_title')) . '.' . $extension; - $uploader->setPrefix($imgName); - $uploader->fetchMedia($_POST['xoops_upload_file'][1]); - if(!$uploader->upload()) { - $errors = $uploader->getErrors(); - redirect_header('javascript:history.go(-1).php', 3, $errors); - } else { - $articlesObj->setVar('art_file', $uploader->getSavedFileName()); - } - } else { - $articlesObj->setVar('art_file', Request::getString('art_file')); - } - $articleCreated = date_create_from_format(_SHORTDATESTRING, $_POST['art_created']); - $articlesObj->setVar('art_created', $articleCreated->getTimestamp()); - $articlesObj->setVar('art_submitter', Request::getInt('art_submitter', 0)); - if($error === true) { - $GLOBALS['xoopsTpl']->assign('error_message', $errorMessage); - } else { - // Insert Data - if($articles1->insert($articlesObj)) { - redirect_header('index.php', 2, _MA_MYMODULE_FORM_OK); - } - } - // Get Form Error - $GLOBALS['xoopsTpl']->assign('error', $articlesObj->getHtmlErrors()); - $form = $articlesObj->getFormArticles(); - $GLOBALS['xoopsTpl']->assign('form', $form->display()); - - break; -} -require __DIR__ . '/footer.php'; diff --git a/testdata/mymodule/class/Articles.php b/testdata/mymodule/class/Articles.php deleted file mode 100644 index 7eb22a19..00000000 --- a/testdata/mymodule/class/Articles.php +++ /dev/null @@ -1,215 +0,0 @@ - - Website:
' ); - $imageSelect = new \XoopsFormSelect( sprintf(_AM_MYMODULE_FORM_IMAGE_PATH, ".{$imageDirectory}/"), 'art_img', $artImg, 5); - $imageArray = \XoopsLists::getImgListAsArray( XOOPS_ROOT_PATH . $imageDirectory ); - foreach($imageArray as $image1) { - $imageSelect->addOption("{$image1}", $image1); - } - $imageSelect->setExtra("onchange='showImgSelected(\"image1\", \"art_img\", \"".$imageDirectory."\", \"\", \"".XOOPS_URL."\")'"); - $imageTray->addElement($imageSelect, false); - $imageTray->addElement(new \XoopsFormLabel('', "
' ); - if(!$this->isNew()) { - $fileUploadTray->addElement(new \XoopsFormLabel(_AM_MYMODULE_FORM_UPLOAD_FILE_ARTICLES, $artFile)); - } - $fileUploadTray->addElement(new \XoopsFormFile( '', 'art_file', $helper->getConfig('maxsize') )); - $form->addElement($fileUploadTray); - } else { - $form->addElement(new \XoopsFormHidden( 'art_file', $artFile )); - } - // Form Text Date Select ArtCreated - $artCreated = $this->isNew() ? 0 : $this->getVar('art_created'); - $form->addElement(new \XoopsFormTextDateSelect( _AM_MYMODULE_ARTICLE_CREATED, 'art_created', '', $artCreated )); - // Form Select User ArtSubmitter - $form->addElement(new \XoopsFormSelectUser( _AM_MYMODULE_ARTICLE_SUBMITTER, 'art_submitter', false, $this->getVar('art_submitter') )); - // To Save - $form->addElement(new \XoopsFormHidden('op', 'save')); - $form->addElement(new \XoopsFormButtonTray('', _SUBMIT, 'submit', '', false)); - return $form; - } - - /** - * Get Values - * @param null $keys - * @param null $format - * @param null$maxDepth - * @return array - */ - public function getValuesArticles($keys = null, $format = null, $maxDepth = null) - { - $helper = \XoopsModules\Mymodule\Helper::getInstance(); - $ret = $this->getValues($keys, $format, $maxDepth); - $ret['id'] = $this->getVar('art_id'); - $categories = $helper->getHandler('categories'); - $categoriesObj = $categories->get($this->getVar('art_cat')); - $ret['cat'] = $categoriesObj->getVar('cat_name'); - $ret['title'] = $this->getVar('art_title'); - $ret['descr'] = strip_tags($this->getVar('art_descr')); - $ret['img'] = $this->getVar('art_img'); - $ret['online'] = $this->getVar('art_online'); - $ret['file'] = $this->getVar('art_file'); - $ret['created'] = formatTimeStamp($this->getVar('art_created'), 's'); - $ret['submitter'] = \XoopsUser::getUnameFromId($this->getVar('art_submitter')); - return $ret; - } - - /** - * Returns an array representation of the object - * - * @return array - */ - public function toArrayArticles() - { - $ret = []; - $vars = $this->getVars(); - foreach(array_keys($vars) as $var) { - $ret[$var] = $this->getVar('"{$var}"'); - } - return $ret; - } -} diff --git a/testdata/mymodule/class/Articleshandler.php b/testdata/mymodule/class/Articleshandler.php deleted file mode 100644 index 8271f875..00000000 --- a/testdata/mymodule/class/Articleshandler.php +++ /dev/null @@ -1,124 +0,0 @@ - - Website:
'; - - return $html; - } -} diff --git a/testdata/mymodule/class/Common/index.html b/testdata/mymodule/class/Common/index.html deleted file mode 100644 index 74b6f45c..00000000 --- a/testdata/mymodule/class/Common/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/testdata/mymodule/class/Constants.php b/testdata/mymodule/class/Constants.php deleted file mode 100644 index 082d585d..00000000 --- a/testdata/mymodule/class/Constants.php +++ /dev/null @@ -1,39 +0,0 @@ - - Website:
![. _EDIT .](" . $pathIcon16 . "/edit.png)
",
- 'delete' => "![" . _DELETE . "](" . $pathIcon16 . "/delete.png)
",
- 'clone' => "![" . _CLONE . "](" . $pathIcon16 . "/editcopy.png)
",
- 'preview' => "![" . _PREVIEW . "](" . $pathIcon16 . "/view.png)
",
- 'print' => "![" . _CLONE . "](" . $pathIcon16 . "/printer.png)
",
- 'pdf' => "![" . _CLONE . "](" . $pathIcon16 . "/pdf.png)
",
- 'add' => "![" . _ADD . "](" . $pathIcon16 . "/add.png)
",
- '0' => "![" . 0 . "](" . $pathIcon16 . "/0.png)
",
- '1' => "![" . 1 . "](" . $pathIcon16 . "/1.png)
",
- ],
- ];
-}
diff --git a/testdata/mymodule/config/index.html b/testdata/mymodule/config/index.html
deleted file mode 100644
index 74b6f45c..00000000
--- a/testdata/mymodule/config/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/testdata/mymodule/config/paths.php b/testdata/mymodule/config/paths.php
deleted file mode 100644
index 2ff95a2c..00000000
--- a/testdata/mymodule/config/paths.php
+++ /dev/null
@@ -1,25 +0,0 @@
- mb_strtoupper($moduleDirName) . ' PathConfigurator',
- 'paths' => [
- 'dirname' => $moduleDirName,
- 'admin' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
- 'modPath' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
- 'modUrl' => XOOPS_URL . '/modules/' . $moduleDirName,
- 'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
- 'uploadUrl' => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
- ],
- 'uploadFolders' => [
- XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
- //XOOPS_UPLOAD_PATH . '/flags'
- ],
- ];
-}
diff --git a/testdata/mymodule/docs/changelog.txt b/testdata/mymodule/docs/changelog.txt
deleted file mode 100644
index ab0b7744..00000000
--- a/testdata/mymodule/docs/changelog.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-==============================================================
-Change Log for My Module - 2020/04/07 18:14:42 Version 1.0
-==============================================================
- - Original release mymodule (TDM XOOPS)
\ No newline at end of file
diff --git a/testdata/mymodule/docs/credits.txt b/testdata/mymodule/docs/credits.txt
deleted file mode 100644
index bf06b0ab..00000000
--- a/testdata/mymodule/docs/credits.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Read Me First
-=============
-
-Originally created by the TDM Team.
-
-Modified by Timgno (http://www.txmodxoops.org)
-
-Contributors: Mamba (https://xoops.org), Goffy (German Xoops)
-
-Included ideas for Logo Generator from Trabis (Publisher module) and Suin (Koins module)
\ No newline at end of file
diff --git a/testdata/mymodule/docs/index.html b/testdata/mymodule/docs/index.html
deleted file mode 100644
index 74b6f45c..00000000
--- a/testdata/mymodule/docs/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/testdata/mymodule/docs/install.txt b/testdata/mymodule/docs/install.txt
deleted file mode 100644
index 469bfd3a..00000000
--- a/testdata/mymodule/docs/install.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Read Me First
-=============
-
-Install just like another XOOPS module
\ No newline at end of file
diff --git a/testdata/mymodule/docs/lang.diff b/testdata/mymodule/docs/lang.diff
deleted file mode 100644
index 233be6a5..00000000
--- a/testdata/mymodule/docs/lang.diff
+++ /dev/null
@@ -1,7 +0,0 @@
-Legend :
-+ Added
-- Removed
-* Modified
-
-To see the differences of language files, see the language folder
-+ file name update language 1:59 to 1.91
\ No newline at end of file
diff --git a/testdata/mymodule/docs/license.txt b/testdata/mymodule/docs/license.txt
deleted file mode 100644
index aac9317c..00000000
--- a/testdata/mymodule/docs/license.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-End User License Agreement for Xoops Modules
-
-IMPORTANT NOTICE Read and understand this License
-Agreement carefully before installing and using this Software.
-It contains extremely important information.
-
-BY USING THIS SOFTWARE IN ANY WAY YOU ACKNOWLEDGE
-THAT YOU HAVE READ, UNDERSTAND AND AGREE TO THE
-TERMS OF THIS AGREEMENT. IF YOU DO NOT AGREE TO
-THESE TERMS, DO NOT USE THIS SOFTWARE IN ANY WAY,
-AND PROMPTLY RETURN IT OR DELETE ANY COPIES OF
-THIS SOFTWARE IN YOUR POSSESSION.
-
-LICENSE GRANT the copyright holder grants you a non-exclusive
-license to use this software, and any associated documentation
-("The Software"), as indicated herein.
-
-You may install and use the Software on two computers for your use
-only.
-
-RESTRICTIONS You MAY NOT: (a) sell or distribute this Software
-package without prior written approval (b) cause or permit reverse
-engineering, disassembly, decompilation or alteration of this
-Software; (c) remove any product identification, copyright notices,
-or other notices or proprietary restrictions from this Software;
-
-TERM: This License is effective until terminated. You may terminate
-it at any time by destroying the Software, together with all copies
-thereof. This License will also terminate if you fail to comply with any
-term or condition of this Agreement. Upon such termination, you
-agree to destroy the Software, together with all copies thereof.
-
-COPYRIGHT/OWNERSHIP This Software and its source
-code are proprietary products of Pablo Software Solutions
-and are protected by copyright, trade secret and other intellectual
-property laws.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
-HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-This software was created to be free of defects and is designed to
-function on PC computers only. While this software has been tested
-and proven to run accurately, in the unlikely event of any user or
-computer incompatibility issues, the end user assumes complete
-liability of usage. This software contains no adware, scumware or
-spyware. The maker of this software does not support any
-questionable forms of use where this software could be misused in
-any way.
-
-http://www.txmodxoops.org
-https://xoops.org
diff --git a/testdata/mymodule/docs/readme.txt b/testdata/mymodule/docs/readme.txt
deleted file mode 100644
index 62b1640e..00000000
--- a/testdata/mymodule/docs/readme.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Read Me First
-=============
-
-Please make sure that you download the XOOPS Icon Set, and upload it to uploads/images directory
-Read the table in admin help for the accurate description of the functionality of this module
-
-Using the new class xoopsrequest.php
-
-Version of xoops
-----------------
-TDMCreate is a module that create other basic modules for CMS Xoops.
-
-Tested with xoops 2.5.7, you can not use it with earlier versions, unless because you do not fit some core files in the background and after some tests.
-
-Now that is ahead xoops versions, and goes to 2.6.0, you should download xoops 2.5.7 and use with this latest version.
-
-Therefore recommended not to use TDMCreate 1.91, with previous versions, to xoops 2.5.7
\ No newline at end of file
diff --git a/testdata/mymodule/footer.php b/testdata/mymodule/footer.php
deleted file mode 100644
index 9055fd3d..00000000
--- a/testdata/mymodule/footer.php
+++ /dev/null
@@ -1,33 +0,0 @@
- - Website:' . $sql); - - return false; - } - $ret = []; - while (false !== ($myrow = $xoopsDB->fetchArray($result))) { - $ret[] = $myrow; - } - if (!empty($ret)) { - $module->setErrors("'tpl_refid_module_set_file_type' unique index is exist. Note: check 'tplfile' table to be sure this index is UNIQUE because XOOPS CORE need it."); - - return true; - } - $sql = 'ALTER TABLE ' . $xoopsDB->prefix('tplfile') . ' ADD UNIQUE tpl_refid_module_set_file_type ( tpl_refid, tpl_module, tpl_tplset, tpl_file, tpl_type )'; - if (!$result = $xoopsDB->queryF($sql)) { - xoops_error($xoopsDB->error() . '
' . $sql); - $module->setErrors("'tpl_refid_module_set_file_type' unique index is not added to 'tplfile' table. Warning: do not use XOOPS until you add this unique index."); - - return false; - } - - return true; -} - -// irmtfan bug fix: solve templates duplicate issue - -/** - * @param $module - * - * @return bool - */ -function mymodule_check_db($module) -{ - $ret = true; - //insert here code for database check - - return $ret; -} diff --git a/testdata/mymodule/include/xoops_version.inc.php b/testdata/mymodule/include/xoops_version.inc.php deleted file mode 100644 index 2148041d..00000000 --- a/testdata/mymodule/include/xoops_version.inc.php +++ /dev/null @@ -1,40 +0,0 @@ - - Website:
- Help:
- My Module
-
-
\ No newline at end of file
diff --git a/testdata/mymodule/language/english/help/index.html b/testdata/mymodule/language/english/help/index.html
deleted file mode 100644
index 74b6f45c..00000000
--- a/testdata/mymodule/language/english/help/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/testdata/mymodule/language/english/index.html b/testdata/mymodule/language/english/index.html
deleted file mode 100644
index 74b6f45c..00000000
--- a/testdata/mymodule/language/english/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/testdata/mymodule/language/english/mail_template/category_new_notify.tpl b/testdata/mymodule/language/english/mail_template/category_new_notify.tpl
deleted file mode 100644
index 15071a28..00000000
--- a/testdata/mymodule/language/english/mail_template/category_new_notify.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-// ---------- Templates Mail Content Dummy ---------- //
-Hello {X_UNAME},
-
-A new story "{STORY_NAME}" has been added at {X_SITENAME}.
-
-You can view this story here:
-{STORY_URL}
-
------------
-
-You are receiving this message because you selected to be notified when new stories are added to our site.
-
-If this is an error or you wish not to receive further such notifications, please update your subscriptions by visiting the link below:
-{X_UNSUBSCRIBE_URL}
-
-Please do not reply to this message.
-
------------
-
-{X_SITENAME} ({X_SITEURL})
-webmaster
-{X_ADMINMAIL}
\ No newline at end of file
diff --git a/testdata/mymodule/language/english/mail_template/index.html b/testdata/mymodule/language/english/mail_template/index.html
deleted file mode 100644
index 74b6f45c..00000000
--- a/testdata/mymodule/language/english/mail_template/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/testdata/mymodule/language/english/main.php b/testdata/mymodule/language/english/main.php
deleted file mode 100644
index dad194dd..00000000
--- a/testdata/mymodule/language/english/main.php
+++ /dev/null
@@ -1,77 +0,0 @@
- - Website:Help:
- My Module
-
-
- Description
-
- The My Module module can be used to modules in XOOPS
-
Install/uninstall
-
-No special measures necessary, follow the standard installation process and extract the mymodule folder into the ../modules directory. Install the module through Admin -> System Module -> Modules.
-Detailed instructions on installing modules are available in the XOOPS Operations Manual
-
Features
-
- The TDMCreate module continues to expand, to get to the conditions to create modules, more and more sophisticated.
- For this reason, I invite all developers to report and send in svn any changes or additions to this module, so that we can jointly contribute to the development
-
Tutorial
-- You can find a more detailed to this Video Tutorial here -
- --As you can see, you have created a page with a list of links at the top to navigate between the pages of your module. This description is only visible on the homepage of this module, the other pages you will see the content you created when you built this module with the module TDMCreate, and after creating new content in admin of this module. In order to expand this module with other resources, just add the code you need to extend the functionality of the same. The files are grouped by type, from the header to the footer to see how divided the source code.
If you see this message, it is because you have not created content for this module. Once you have created any type of content, you will not see this message.
If you liked the module TDMCreate and thanks to the long process for giving the opportunity to the new module to be created in a moment, consider making a donation to keep the module TDMCreate and make a donation using this button
Thanks!
Use the link below to go to the admin and create content."); -define('_MA_MYMODULE_NO_PDF_LIBRARY', 'Libraries TCPDF not there yet, upload them in root/Frameworks'); -define('_MA_MYMODULE_NO', 'No'); -// ---------------- Contents ---------------- -// Category -define('_MA_MYMODULE_CATEGORY', 'Category'); -define('_MA_MYMODULE_CATEGORIES', 'Categories'); -define('_MA_MYMODULE_CATEGORIES_TITLE', 'Categories title'); -define('_MA_MYMODULE_CATEGORIES_DESC', 'Categories description'); -// Caption of Category -define('_MA_MYMODULE_CATEGORY_ID', 'Id'); -define('_MA_MYMODULE_CATEGORY_NAME', 'Name'); -define('_MA_MYMODULE_CATEGORY_LOGO', 'Logo'); -define('_MA_MYMODULE_CATEGORY_CREATED', 'Created'); -define('_MA_MYMODULE_CATEGORY_SUBMITTER', 'Submitter'); -// Article -define('_MA_MYMODULE_ARTICLE', 'Article'); -define('_MA_MYMODULE_ARTICLES', 'Articles'); -define('_MA_MYMODULE_ARTICLES_TITLE', 'Articles title'); -define('_MA_MYMODULE_ARTICLES_DESC', 'Articles description'); -// Caption of Article -define('_MA_MYMODULE_ARTICLE_ID', 'Id'); -define('_MA_MYMODULE_ARTICLE_CAT', 'Cat'); -define('_MA_MYMODULE_ARTICLE_TITLE', 'Title'); -define('_MA_MYMODULE_ARTICLE_DESCR', 'Descr'); -define('_MA_MYMODULE_ARTICLE_IMG', 'Img'); -define('_MA_MYMODULE_ARTICLE_ONLINE', 'Online'); -define('_MA_MYMODULE_ARTICLE_FILE', 'File'); -define('_MA_MYMODULE_ARTICLE_CREATED', 'Created'); -define('_MA_MYMODULE_ARTICLE_SUBMITTER', 'Submitter'); -define('_MA_MYMODULE_INDEX_THEREARE', 'There are %s Articles'); -define('_MA_MYMODULE_INDEX_LATEST_LIST', 'Last My Module'); -// Submit -define('_MA_MYMODULE_SUBMIT', 'Submit'); -define('_MA_MYMODULE_SUBMIT_ARTICLE', 'Submit Article'); -define('_MA_MYMODULE_SUBMIT_ALLPENDING', 'All article/script information are posted pending verification.'); -define('_MA_MYMODULE_SUBMIT_DONTABUSE', 'Username and IP are recorded, so please do not abuse the system.'); -define('_MA_MYMODULE_SUBMIT_ISAPPROVED', 'Your article has been approved'); -define('_MA_MYMODULE_SUBMIT_PROPOSER', 'Submit a article'); -define('_MA_MYMODULE_SUBMIT_RECEIVED', 'We have received your article info. Thank you !'); -define('_MA_MYMODULE_SUBMIT_SUBMITONCE', 'Submit your article/script only once.'); -define('_MA_MYMODULE_SUBMIT_TAKEDAYS', 'This will take many days to see your article/script added successfully in our database.'); -// Form -define('_MA_MYMODULE_FORM_OK', 'Successfully saved'); -define('_MA_MYMODULE_FORM_DELETE_OK', 'Successfully deleted'); -define('_MA_MYMODULE_FORM_SURE_DELETE', "Are you sure to delete: %s "); -define('_MA_MYMODULE_FORM_SURE_RENEW', "Are you sure to update: %s "); -// Admin link -define('_MA_MYMODULE_ADMIN', 'Admin'); -// ---------------- End ---------------- diff --git a/testdata/mymodule/language/english/modinfo.php b/testdata/mymodule/language/english/modinfo.php deleted file mode 100644 index ea3ce177..00000000 --- a/testdata/mymodule/language/english/modinfo.php +++ /dev/null @@ -1,166 +0,0 @@ - - Website:
- Help:
- My Module
-
-
\ No newline at end of file
diff --git a/testdata/mymodule/language/german/help/index.html b/testdata/mymodule/language/german/help/index.html
deleted file mode 100644
index 74b6f45c..00000000
--- a/testdata/mymodule/language/german/help/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/testdata/mymodule/language/german/index.html b/testdata/mymodule/language/german/index.html
deleted file mode 100644
index 74b6f45c..00000000
--- a/testdata/mymodule/language/german/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/testdata/mymodule/language/german/mail_template/category_new_notify.tpl b/testdata/mymodule/language/german/mail_template/category_new_notify.tpl
deleted file mode 100644
index 15071a28..00000000
--- a/testdata/mymodule/language/german/mail_template/category_new_notify.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-// ---------- Templates Mail Content Dummy ---------- //
-Hello {X_UNAME},
-
-A new story "{STORY_NAME}" has been added at {X_SITENAME}.
-
-You can view this story here:
-{STORY_URL}
-
------------
-
-You are receiving this message because you selected to be notified when new stories are added to our site.
-
-If this is an error or you wish not to receive further such notifications, please update your subscriptions by visiting the link below:
-{X_UNSUBSCRIBE_URL}
-
-Please do not reply to this message.
-
------------
-
-{X_SITENAME} ({X_SITEURL})
-webmaster
-{X_ADMINMAIL}
\ No newline at end of file
diff --git a/testdata/mymodule/language/german/mail_template/index.html b/testdata/mymodule/language/german/mail_template/index.html
deleted file mode 100644
index 74b6f45c..00000000
--- a/testdata/mymodule/language/german/mail_template/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/testdata/mymodule/language/german/main.php b/testdata/mymodule/language/german/main.php
deleted file mode 100644
index dad194dd..00000000
--- a/testdata/mymodule/language/german/main.php
+++ /dev/null
@@ -1,77 +0,0 @@
- - Website:Help:
- My Module
-
-
- Description
-
- The My Module module can be used to modules in XOOPS
-
Install/uninstall
-
-No special measures necessary, follow the standard installation process and extract the mymodule folder into the ../modules directory. Install the module through Admin -> System Module -> Modules.
-Detailed instructions on installing modules are available in the XOOPS Operations Manual
-
Features
-
- The TDMCreate module continues to expand, to get to the conditions to create modules, more and more sophisticated.
- For this reason, I invite all developers to report and send in svn any changes or additions to this module, so that we can jointly contribute to the development
-
Tutorial
-- You can find a more detailed to this Video Tutorial here -
- --As you can see, you have created a page with a list of links at the top to navigate between the pages of your module. This description is only visible on the homepage of this module, the other pages you will see the content you created when you built this module with the module TDMCreate, and after creating new content in admin of this module. In order to expand this module with other resources, just add the code you need to extend the functionality of the same. The files are grouped by type, from the header to the footer to see how divided the source code.
If you see this message, it is because you have not created content for this module. Once you have created any type of content, you will not see this message.
If you liked the module TDMCreate and thanks to the long process for giving the opportunity to the new module to be created in a moment, consider making a donation to keep the module TDMCreate and make a donation using this button
Thanks!
Use the link below to go to the admin and create content."); -define('_MA_MYMODULE_NO_PDF_LIBRARY', 'Libraries TCPDF not there yet, upload them in root/Frameworks'); -define('_MA_MYMODULE_NO', 'No'); -// ---------------- Contents ---------------- -// Category -define('_MA_MYMODULE_CATEGORY', 'Category'); -define('_MA_MYMODULE_CATEGORIES', 'Categories'); -define('_MA_MYMODULE_CATEGORIES_TITLE', 'Categories title'); -define('_MA_MYMODULE_CATEGORIES_DESC', 'Categories description'); -// Caption of Category -define('_MA_MYMODULE_CATEGORY_ID', 'Id'); -define('_MA_MYMODULE_CATEGORY_NAME', 'Name'); -define('_MA_MYMODULE_CATEGORY_LOGO', 'Logo'); -define('_MA_MYMODULE_CATEGORY_CREATED', 'Created'); -define('_MA_MYMODULE_CATEGORY_SUBMITTER', 'Submitter'); -// Article -define('_MA_MYMODULE_ARTICLE', 'Article'); -define('_MA_MYMODULE_ARTICLES', 'Articles'); -define('_MA_MYMODULE_ARTICLES_TITLE', 'Articles title'); -define('_MA_MYMODULE_ARTICLES_DESC', 'Articles description'); -// Caption of Article -define('_MA_MYMODULE_ARTICLE_ID', 'Id'); -define('_MA_MYMODULE_ARTICLE_CAT', 'Cat'); -define('_MA_MYMODULE_ARTICLE_TITLE', 'Title'); -define('_MA_MYMODULE_ARTICLE_DESCR', 'Descr'); -define('_MA_MYMODULE_ARTICLE_IMG', 'Img'); -define('_MA_MYMODULE_ARTICLE_ONLINE', 'Online'); -define('_MA_MYMODULE_ARTICLE_FILE', 'File'); -define('_MA_MYMODULE_ARTICLE_CREATED', 'Created'); -define('_MA_MYMODULE_ARTICLE_SUBMITTER', 'Submitter'); -define('_MA_MYMODULE_INDEX_THEREARE', 'There are %s Articles'); -define('_MA_MYMODULE_INDEX_LATEST_LIST', 'Last My Module'); -// Submit -define('_MA_MYMODULE_SUBMIT', 'Submit'); -define('_MA_MYMODULE_SUBMIT_ARTICLE', 'Submit Article'); -define('_MA_MYMODULE_SUBMIT_ALLPENDING', 'All article/script information are posted pending verification.'); -define('_MA_MYMODULE_SUBMIT_DONTABUSE', 'Username and IP are recorded, so please do not abuse the system.'); -define('_MA_MYMODULE_SUBMIT_ISAPPROVED', 'Your article has been approved'); -define('_MA_MYMODULE_SUBMIT_PROPOSER', 'Submit a article'); -define('_MA_MYMODULE_SUBMIT_RECEIVED', 'We have received your article info. Thank you !'); -define('_MA_MYMODULE_SUBMIT_SUBMITONCE', 'Submit your article/script only once.'); -define('_MA_MYMODULE_SUBMIT_TAKEDAYS', 'This will take many days to see your article/script added successfully in our database.'); -// Form -define('_MA_MYMODULE_FORM_OK', 'Successfully saved'); -define('_MA_MYMODULE_FORM_DELETE_OK', 'Successfully deleted'); -define('_MA_MYMODULE_FORM_SURE_DELETE', "Are you sure to delete: %s "); -define('_MA_MYMODULE_FORM_SURE_RENEW', "Are you sure to update: %s "); -// Admin link -define('_MA_MYMODULE_ADMIN', 'Admin'); -// ---------------- End ---------------- diff --git a/testdata/mymodule/language/german/modinfo.php b/testdata/mymodule/language/german/modinfo.php deleted file mode 100644 index ea3ce177..00000000 --- a/testdata/mymodule/language/german/modinfo.php +++ /dev/null @@ -1,166 +0,0 @@ - - Website:
<{$about}>
-
-
-<{includeq file='db:mymodule_admin_footer.tpl'}>
diff --git a/testdata/mymodule/templates/admin/mymodule_admin_articles.tpl b/testdata/mymodule/templates/admin/mymodule_admin_articles.tpl
deleted file mode 100644
index 3e8d5e32..00000000
--- a/testdata/mymodule/templates/admin/mymodule_admin_articles.tpl
+++ /dev/null
@@ -1,56 +0,0 @@
-
-<{include file='db:mymodule_admin_header.tpl'}>
-
-<{if $articles_list}>
- | <{$smarty.const._AM_MYMODULE_ARTICLE_ID}> | -<{$smarty.const._AM_MYMODULE_ARTICLE_CAT}> | -<{$smarty.const._AM_MYMODULE_ARTICLE_TITLE}> | -<{$smarty.const._AM_MYMODULE_ARTICLE_DESCR}> | -<{$smarty.const._AM_MYMODULE_ARTICLE_IMG}> | -<{$smarty.const._AM_MYMODULE_ARTICLE_ONLINE}> | -<{$smarty.const._AM_MYMODULE_ARTICLE_FILE}> | -<{$smarty.const._AM_MYMODULE_ARTICLE_CREATED}> | -<{$smarty.const._AM_MYMODULE_ARTICLE_SUBMITTER}> | -<{$smarty.const._AM_MYMODULE_FORM_ACTION}> | -
|---|---|---|---|---|---|---|---|---|---|
| <{$article.id}> | -<{$article.cat}> | -<{$article.title}> | -<{$article.descr}> | - |
- <{$article.online}> | -<{$article.file}> | -<{$article.created}> | -<{$article.submitter}> | -
-
-
- |
-
<{$pagenav}>
-
- <{/if}>
-<{/if}>
-<{if $form}>
- <{$form}>
-<{/if}>
-<{if $error}>
- <{$error}>
-<{/if}>
-
-
-<{include file='db:mymodule_admin_footer.tpl'}>
diff --git a/testdata/mymodule/templates/admin/mymodule_admin_categories.tpl b/testdata/mymodule/templates/admin/mymodule_admin_categories.tpl
deleted file mode 100644
index d4d2cd1a..00000000
--- a/testdata/mymodule/templates/admin/mymodule_admin_categories.tpl
+++ /dev/null
@@ -1,44 +0,0 @@
-
-<{include file='db:mymodule_admin_header.tpl'}>
-
-<{if $categories_list}>
- | <{$smarty.const._AM_MYMODULE_CATEGORY_ID}> | -<{$smarty.const._AM_MYMODULE_CATEGORY_NAME}> | -<{$smarty.const._AM_MYMODULE_CATEGORY_CREATED}> | -<{$smarty.const._AM_MYMODULE_FORM_ACTION}> | -
|---|---|---|---|
| <{$category.id}> | -<{$category.name}> | -<{$category.created}> | -
-
-
- |
-
<{$pagenav}>
-
- <{/if}>
-<{/if}>
-<{if $form}>
- <{$form}>
-<{/if}>
-<{if $error}>
- <{$error}>
-<{/if}>
-
-
-<{include file='db:mymodule_admin_footer.tpl'}>
diff --git a/testdata/mymodule/templates/admin/mymodule_admin_footer.tpl b/testdata/mymodule/templates/admin/mymodule_admin_footer.tpl
deleted file mode 100644
index f1c4d56a..00000000
--- a/testdata/mymodule/templates/admin/mymodule_admin_footer.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
- My Module<{$smarty.const._AM_MYMODULE_MAINTAINEDBY}>Support Forum
-
diff --git a/testdata/mymodule/templates/admin/mymodule_admin_header.tpl b/testdata/mymodule/templates/admin/mymodule_admin_header.tpl
deleted file mode 100644
index 95b90868..00000000
--- a/testdata/mymodule/templates/admin/mymodule_admin_header.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-
- <{$navigation}>
- <{if $buttons}>
- <{$buttons}>
- <{/if}>
-
diff --git a/testdata/mymodule/templates/admin/mymodule_admin_index.tpl b/testdata/mymodule/templates/admin/mymodule_admin_index.tpl
deleted file mode 100644
index ef033e60..00000000
--- a/testdata/mymodule/templates/admin/mymodule_admin_index.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-
-<{includeq file='db:mymodule_admin_header.tpl'}>
-
-
-<{$index}>
-
-
-<{includeq file='db:mymodule_admin_footer.tpl'}>
diff --git a/testdata/mymodule/templates/admin/mymodule_admin_permissions.tpl b/testdata/mymodule/templates/admin/mymodule_admin_permissions.tpl
deleted file mode 100644
index 243244be..00000000
--- a/testdata/mymodule/templates/admin/mymodule_admin_permissions.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<{include file='db:mymodule_admin_header.tpl'}>
-
-<{$form}>
-
-<{include file='db:mymodule_admin_footer.tpl'}>
diff --git a/testdata/mymodule/templates/blocks/index.html b/testdata/mymodule/templates/blocks/index.html
deleted file mode 100644
index 74b6f45c..00000000
--- a/testdata/mymodule/templates/blocks/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/testdata/mymodule/templates/blocks/mymodule_block_articles.tpl b/testdata/mymodule/templates/blocks/mymodule_block_articles.tpl
deleted file mode 100644
index f175d749..00000000
--- a/testdata/mymodule/templates/blocks/mymodule_block_articles.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-| <{$smarty.const._MB_MYMODULE_ART_ID}> | -<{$smarty.const._MB_MYMODULE_ART_CAT}> | -<{$smarty.const._MB_MYMODULE_ART_TITLE}> | -<{$smarty.const._MB_MYMODULE_ART_DESCR}> | -<{$smarty.const._MB_MYMODULE_ART_IMG}> | -<{$smarty.const._MB_MYMODULE_ART_ONLINE}> | -<{$smarty.const._MB_MYMODULE_ART_FILE}> | -<{$smarty.const._MB_MYMODULE_ART_CREATED}> | -<{$smarty.const._MB_MYMODULE_ART_SUBMITTER}> | -|
|---|---|---|---|---|---|---|---|---|---|
| <{$article.id}> | -<{$article.cat}> | -<{$article.title}> | -<{$article.descr}> | - |
- <{$article.online}> | -<{$article.file}> | -<{$article.created}> | -<{$article.submitter}> | -
- 
- 
- |
-
-
-
-
-
-<{/if}>
-
-<{include file='db:mymodule_footer.tpl'}>
diff --git a/testdata/mymodule/templates/mymodule_articles_cat.tpl b/testdata/mymodule/templates/mymodule_articles_cat.tpl
deleted file mode 100644
index 115942ad..00000000
--- a/testdata/mymodule/templates/mymodule_articles_cat.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<{include file='db:mymodule_header.tpl'}>
-
-| <{$smarty.const._MA_MYMODULE_ARTICLES_TITLE}> | -
|---|
|
-
- <{include file='db:mymodule_articles_list.tpl' article=$article}>
-
- |
- <{if $article.count is div by $divideby}>
-
-
-
-<{include file='db:mymodule_footer.tpl'}>
diff --git a/testdata/mymodule/templates/mymodule_articles_cat_list.tpl b/testdata/mymodule/templates/mymodule_articles_cat_list.tpl
deleted file mode 100644
index 9fc1a67c..00000000
--- a/testdata/mymodule/templates/mymodule_articles_cat_list.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-
-<{$smarty.const._MA_MYMODULE_ARTICLES_TITLE}>
-
-<{foreach item=article from=$articles}>
-
-<{include file='db:mymodule_articles_list.tpl' article=$article}>
-<{if $article.count is div by $numb_col}>
-
-<{/if}> - -
-
-<{/foreach}>
-
--<{/if}> - -
-
-
-
-<{$article.cat}>
-
-<{$article.title}>
-
-<{$article.descr}>
-
-
-
-<{$article.file}>
-
-<{$article.created}>
-
-<{$article.submitter}>
-
-
-
diff --git a/testdata/mymodule/templates/mymodule_articles_list.tpl b/testdata/mymodule/templates/mymodule_articles_list.tpl
deleted file mode 100644
index dff78ecd..00000000
--- a/testdata/mymodule/templates/mymodule_articles_list.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-<{$article.file}>
-
-<{$article.created}>
-
-<{$article.submitter}>
-
-
-
-<{$article.submitter}>
-
- <{$article.cat}>
- <{$article.title}>
- <{$article.descr}>
-
- <{$article.file}>
- <{$article.created}>
- <{$article.submitter}>
-
-
- <{$article.file}>
- <{$article.created}>
- <{$article.submitter}>
-
- <{$smarty.const._MA_MYMODULE_ARTICLE_CAT}>: <{$article.cat}>
- <{$smarty.const._MA_MYMODULE_ARTICLE_TITLE}>: <{$article.title}>
- <{$smarty.const._MA_MYMODULE_ARTICLE_DESCR}>: <{$article.descr}>
- <{$smarty.const._MA_MYMODULE_ARTICLE_IMG}>: <{$article.img}>
- <{$smarty.const._MA_MYMODULE_ARTICLE_FILE}>: <{$article.file}>
- <{$smarty.const._MA_MYMODULE_ARTICLE_CREATED}>: <{$article.created}>
- <{$smarty.const._MA_MYMODULE_ARTICLE_SUBMITTER}>: <{$article.submitter}>
-
diff --git a/testdata/mymodule/templates/mymodule_breadcrumbs.tpl b/testdata/mymodule/templates/mymodule_breadcrumbs.tpl
deleted file mode 100644
index 2290b814..00000000
--- a/testdata/mymodule/templates/mymodule_breadcrumbs.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-
diff --git a/testdata/mymodule/templates/mymodule_broken.tpl b/testdata/mymodule/templates/mymodule_broken.tpl
deleted file mode 100644
index 0fdf0fd7..00000000
--- a/testdata/mymodule/templates/mymodule_broken.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-<{include file='db:mymodule_header.tpl'}>
-| <{$smarty.const._MA_MYMODULE_ART_ID}> | -<{$smarty.const._MA_MYMODULE_ART_CAT}> | -<{$smarty.const._MA_MYMODULE_ART_TITLE}> | -<{$smarty.const._MA_MYMODULE_ART_DESCR}> | -<{$smarty.const._MA_MYMODULE_ART_IMG}> | -<{$smarty.const._MA_MYMODULE_ART_ONLINE}> | -<{$smarty.const._MA_MYMODULE_ART_FILE}> | -<{$smarty.const._MA_MYMODULE_ART_CREATED}> | -<{$smarty.const._MA_MYMODULE_ART_SUBMITTER}> | -
|---|---|---|---|---|---|---|---|---|
| <{$article.id}> | -<{$article.cat}> | -<{$article.title}> | -<{$article.descr}> | - |
- <{$article.online}> | -<{$article.file}> | -<{$article.created}> | -<{$article.submitter}> | -
<{$copyright}>
-<{if $pagenav != ''}>
- <{$pagenav}>
-<{/if}>
--<{if $xoops_isadmin}> -
-<{/if}> -
- <{if $comment_mode == "flat"}>
- <{include file="db:system_comments_flat.tpl"}>
- <{elseif $comment_mode == "thread"}>
- <{include file="db:system_comments_thread.tpl"}>
- <{elseif $comment_mode == "nest"}>
- <{include file="db:system_comments_nest.tpl"}>
- <{/if}>
-
-
--<{include file='db:system_notification_select.tpl'}> \ No newline at end of file diff --git a/testdata/mymodule/templates/mymodule_header.tpl b/testdata/mymodule/templates/mymodule_header.tpl deleted file mode 100644 index 7c52f1b3..00000000 --- a/testdata/mymodule/templates/mymodule_header.tpl +++ /dev/null @@ -1,5 +0,0 @@ -<{includeq file='db:mymodule_breadcrumbs.tpl'}> - -<{if $ads != ''}> -
<{$ads}>
-<{/if}>
diff --git a/testdata/mymodule/templates/mymodule_index.tpl b/testdata/mymodule/templates/mymodule_index.tpl
deleted file mode 100644
index 5ed665ae..00000000
--- a/testdata/mymodule/templates/mymodule_index.tpl
+++ /dev/null
@@ -1,79 +0,0 @@
-<{include file='db:mymodule_header.tpl'}>
-
-<{if $articlesCount == 0}>
-| <{$smarty.const._MA_MYMODULE_TITLE}> - <{$smarty.const._MA_MYMODULE_DESC}> | -
|---|
|
-
- <{$smarty.const._MA_MYMODULE_INDEX_DESC}>
- |
-
| <{$adv}> |
-
-
-
-
-<{/if}>
-
-<{if $articlesCount > 0}>
-
- | <{$smarty.const._MA_MYMODULE_ARTICLES}> | -
|---|
| - <{include file="db:mymodule_articles_list.tpl" article=$article}> - | - <{if $article.count is div by $numb_col}> -
| <{$lang_thereare}> | -
<{$smarty.const._MA_MYMODULE_INDEX_LATEST_LIST}>
- | - <{include file="db:mymodule_articles_list.tpl" article=$articles[i]}> - | - <{if $articles[i].count is div by $divideby}> -
<{$pdfoutput}>
\ No newline at end of file
diff --git a/testdata/mymodule/templates/mymodule_print.tpl b/testdata/mymodule/templates/mymodule_print.tpl
deleted file mode 100644
index f55e8c7f..00000000
--- a/testdata/mymodule/templates/mymodule_print.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-<{include file="db:mymodule_header.tpl"}>
-| <{$smarty.const._MA_MYMODULE_ART_ID}> | -<{$smarty.const._MA_MYMODULE_ART_CAT}> | -<{$smarty.const._MA_MYMODULE_ART_TITLE}> | -<{$smarty.const._MA_MYMODULE_ART_DESCR}> | -<{$smarty.const._MA_MYMODULE_ART_IMG}> | -<{$smarty.const._MA_MYMODULE_ART_ONLINE}> | -<{$smarty.const._MA_MYMODULE_ART_FILE}> | -<{$smarty.const._MA_MYMODULE_ART_CREATED}> | -<{$smarty.const._MA_MYMODULE_ART_SUBMITTER}> | -
|---|---|---|---|---|---|---|---|---|
| <{$list.id}> | -<{$list.cat}> | -<{$list.title}> | -<{$list.descr}> | - |
- <{$list.online}> | -<{$list.file}> | -<{$list.created}> | -<{$list.submitter}> | -
| <{$smarty.const._MA_MYMODULE_ART_ID}> | -<{$smarty.const._MA_MYMODULE_ART_CAT}> | -<{$smarty.const._MA_MYMODULE_ART_TITLE}> | -<{$smarty.const._MA_MYMODULE_ART_DESCR}> | -<{$smarty.const._MA_MYMODULE_ART_IMG}> | -<{$smarty.const._MA_MYMODULE_ART_ONLINE}> | -<{$smarty.const._MA_MYMODULE_ART_FILE}> | -<{$smarty.const._MA_MYMODULE_ART_CREATED}> | -<{$smarty.const._MA_MYMODULE_ART_SUBMITTER}> | -
|---|---|---|---|---|---|---|---|---|
| <{$list.id}> | -<{$list.cat}> | -<{$list.title}> | -<{$list.descr}> | - |
- <{$list.online}> | -<{$list.file}> | -<{$list.created}> | -<{$list.submitter}> | -
-
-
-<{include file='db:mymodule_footer.tpl'}>
diff --git a/testdata/mymodule/templates/mymodule_submit.tpl b/testdata/mymodule/templates/mymodule_submit.tpl
deleted file mode 100644
index 85b9a9ce..00000000
--- a/testdata/mymodule/templates/mymodule_submit.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<{include file='db:mymodule_header.tpl'}>
-
-
-
-
-
- Services Panels
-
-
-<{if $message_error != ''}>
- -
-
<{$message_error}>
-<{/if}>
-
- <{$form}>
-
-
-<{include file='db:mymodule_footer.tpl'}>
diff --git a/testdata/mymodule/testdata/english/index.html b/testdata/mymodule/testdata/english/index.html
deleted file mode 100644
index 74b6f45c..00000000
--- a/testdata/mymodule/testdata/english/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/testdata/mymodule/testdata/images/blank.gif b/testdata/mymodule/testdata/images/blank.gif
deleted file mode 100644
index 3a469695..00000000
Binary files a/testdata/mymodule/testdata/images/blank.gif and /dev/null differ
diff --git a/testdata/mymodule/testdata/images/blank.png b/testdata/mymodule/testdata/images/blank.png
deleted file mode 100644
index e1ee728a..00000000
Binary files a/testdata/mymodule/testdata/images/blank.png and /dev/null differ
diff --git a/testdata/mymodule/testdata/images/index.html b/testdata/mymodule/testdata/images/index.html
deleted file mode 100644
index 74b6f45c..00000000
--- a/testdata/mymodule/testdata/images/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/testdata/mymodule/testdata/index.html b/testdata/mymodule/testdata/index.html
deleted file mode 100644
index 74b6f45c..00000000
--- a/testdata/mymodule/testdata/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/testdata/mymodule/testdata/index.php b/testdata/mymodule/testdata/index.php
deleted file mode 100644
index 2379c0af..00000000
--- a/testdata/mymodule/testdata/index.php
+++ /dev/null
@@ -1,137 +0,0 @@
-loadLanguage('common');
-
-switch ($op) {
- case 'load':
- if (\Xmf\Request::hasVar('ok', 'REQUEST') && 1 == $_REQUEST['ok']) {
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header('../admin/index.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
- }
- loadSampleData();
- } else {
- xoops_cp_header();
- xoops_confirm(['ok' => 1, 'op' => 'load'], 'index.php', sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'ADD_SAMPLEDATA_OK')), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
- xoops_cp_footer();
- }
- break;
- case 'save':
- saveSampleData();
- break;
-}
-
-// XMF TableLoad for SAMPLE data
-
-function loadSampleData()
-{
- global $xoopsConfig;
-
- $moduleDirName = basename(dirname(__DIR__));
- $moduleDirNameUpper = mb_strtoupper($moduleDirName);
-
- $utility = new Mymodule\Utility();
- $configurator = new Common\Configurator();
-
- $tables = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getInfo('tables');
-
- $language = 'english/';
- if (is_dir(__DIR__ . '/' . $xoopsConfig['language'])) {
- $language = $xoopsConfig['language'] . '/';
- }
-
- foreach ($tables as $table) {
- $tabledata = \Xmf\Yaml::readWrapped($language . $table . '.yml');
- \Xmf\Database\TableLoad::truncateTable($table);
- \Xmf\Database\TableLoad::loadTableFromArray($table, $tabledata);
- }
-
- // --- COPY test folder files ---------------
- if (is_array($configurator->copyTestFolders) && count($configurator->copyTestFolders) > 0) {
- // $file = __DIR__ . '/../testdata/images/';
- foreach (array_keys($configurator->copyTestFolders) as $i) {
- $src = $configurator->copyTestFolders[$i][0];
- $dest = $configurator->copyTestFolders[$i][1];
- $utility::rcopy($src, $dest);
- }
- }
- redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'SAMPLEDATA_SUCCESS'));
-}
-
-function saveSampleData()
-{
- global $xoopsConfig;
-
- $configurator = new Common\Configurator();
-
- $moduleDirName = basename(dirname(__DIR__));
- $moduleDirNameUpper = mb_strtoupper($moduleDirName);
-
- $tables = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getInfo('tables');
-
- $languageFolder = __DIR__ . '/' . $xoopsConfig['language'];
- if (!file_exists($languageFolder . '/')) {
- Utility::createFolder($languageFolder . '/');
- }
- $exportFolder = $languageFolder . '/Exports-' . date('Y-m-d-H-i-s') . '/';
- Utility::createFolder($exportFolder);
-
- foreach ($tables as $table) {
- \Xmf\Database\TableLoad::saveTableToYamlFile($table, $exportFolder . $table . '.yml');
- }
-
- // --- COPY test folder files ---------------
- if (is_array($configurator->copyTestFolders) && count($configurator->copyTestFolders) > 0) {
- foreach (array_keys($configurator->copyTestFolders) as $i) {
- $src = $configurator->copyTestFolders[$i][1];
- $dest = $configurator->copyTestFolders[$i][0];
- Utility::rcopy($src, $dest);
- }
- }
- redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'SAMPLEDATA_SUCCESS'));
-}
-
-function exportSchema()
-{
- $moduleDirName = basename(dirname(__DIR__));
- $moduleDirNameUpper = mb_strtoupper($moduleDirName);
-
- try {
- // TODO set exportSchema
- // $migrate = new Mymodule\Migrate($moduleDirName);
- // $migrate->saveCurrentSchema();
- //
- // redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_SUCCESS'));
- }
- catch (\Exception $e) {
- exit(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_ERROR'));
- }
-
-}
diff --git a/testdata/mymodule/view.tag.php b/testdata/mymodule/view.tag.php
deleted file mode 100644
index 1978fa38..00000000
--- a/testdata/mymodule/view.tag.php
+++ /dev/null
@@ -1,23 +0,0 @@
- - Website:', $fb_content); //clean line break from dhtmltextarea - - $title = constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SEND_FOR') . $GLOBALS['xoopsModule']->getVar('dirname'); - $body = constant('CO_' . $moduleDirNameUpper . '_' . 'FB_NAME') . ': ' . $your_name . '
'; - $body .= constant('CO_' . $moduleDirNameUpper . '_' . 'FB_MAIL') . ': ' . $your_mail . '
'; - $body .= constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SITE') . ': ' . $your_site . '
'; - $body .= constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE') . ': ' . $fb_type . '
'; - $body .= constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_CONTENT') . ':
'; - $body .= $fb_content; - $xoopsMailer = xoops_getMailer(); - $xoopsMailer->useMail(); - $xoopsMailer->setToEmails($GLOBALS['xoopsModule']->getInfo('author_mail')); - $xoopsMailer->setFromEmail($your_mail); - $xoopsMailer->setFromName($your_name); - $xoopsMailer->setSubject($title); - $xoopsMailer->multimailer->isHTML(true); - $xoopsMailer->setBody($body); - $ret = $xoopsMailer->send(); - if ($ret) { - redirect_header('index.php', 3, constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SEND_SUCCESS')); - } - - // show form with content again - $feedback->name = $your_name; - $feedback->email = $your_mail; - $feedback->site = $your_site; - $feedback->type = $fb_type; - $feedback->content = $fb_content; - echo '
-
';
- $form = $feedback->getFormFeedback();
- $form->display();
-
- break;
-}
-require __DIR__ . '/footer.php';
diff --git a/testdata/mymodule2/admin/footer.php b/testdata/mymodule2/admin/footer.php
deleted file mode 100644
index 206b9534..00000000
--- a/testdata/mymodule2/admin/footer.php
+++ /dev/null
@@ -1,27 +0,0 @@
- - Website:' . constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SEND_ERROR') . '
-"; - $form .= _MB_MYMODULE2_TITLE_LENGTH." :
"; - array_shift($options); - array_shift($options); - array_shift($options); - $criteria = new \CriteriaCompo(); - $criteria->add(new \Criteria('art_id', 0, '!=')); - $criteria->setSort('art_id'); - $criteria->setOrder('ASC'); - $articlesAll = $articlesHandler->getAll($criteria); - unset($criteria); - $form .= _MB_MYMODULE2_ARTICLES_TO_DISPLAY."
'; - return $form; -} \ No newline at end of file diff --git a/testdata/mymodule2/blocks/index.html b/testdata/mymodule2/blocks/index.html deleted file mode 100644 index 74b6f45c..00000000 --- a/testdata/mymodule2/blocks/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/testdata/mymodule2/blocks/testfields.php b/testdata/mymodule2/blocks/testfields.php deleted file mode 100644 index 4ba09e58..00000000 --- a/testdata/mymodule2/blocks/testfields.php +++ /dev/null @@ -1,115 +0,0 @@ - - Website:
"; - $form .= _MB_MYMODULE2_TITLE_LENGTH." :
"; - array_shift($options); - array_shift($options); - array_shift($options); - $criteria = new \CriteriaCompo(); - $criteria->add(new \Criteria('tf_id', 0, '!=')); - $criteria->setSort('tf_id'); - $criteria->setOrder('ASC'); - $testfieldsAll = $testfieldsHandler->getAll($criteria); - unset($criteria); - $form .= _MB_MYMODULE2_TESTFIELDS_TO_DISPLAY."
'; - return $form; -} \ No newline at end of file diff --git a/testdata/mymodule2/broken.php b/testdata/mymodule2/broken.php deleted file mode 100644 index 527fc2b2..00000000 --- a/testdata/mymodule2/broken.php +++ /dev/null @@ -1,223 +0,0 @@ - - Website:
'; - $error = true; - } - $testfieldsObj->setVar('tf_text', Request::getString('tf_text', '')); - $testfieldsObj->setVar('tf_textarea', Request::getString('tf_textarea', '')); - $testfieldsObj->setVar('tf_dhtml', Request::getString('tf_dhtml', '')); - $testfieldsObj->setVar('tf_checkbox', Request::getInt('tf_checkbox', 0)); - $testfieldsObj->setVar('tf_yesno', Request::getInt('tf_yesno', 0)); - $testfieldsObj->setVar('tf_selectbox', Request::getString('tf_selectbox', '')); - $testfieldsObj->setVar('tf_user', Request::getInt('tf_user', 0)); - $testfieldsObj->setVar('tf_color', Request::getString('tf_color', '')); - // Set Var tf_imagelist - include_once XOOPS_ROOT_PATH . '/class/uploader.php'; - $uploader = new \XoopsMediaUploader(XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32', - $helper->getConfig('mimetypes_image'), - $helper->getConfig('maxsize_image'), null, null); - if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) { - //$uploader->setPrefix(tf_imagelist_); - //$uploader->fetchMedia($_POST['xoops_upload_file'][0]); - if (!$uploader->upload()) { - $errors = $uploader->getErrors(); - redirect_header('javascript:history.go(-1).php', 3, $errors); - } else { - $testfieldsObj->setVar('tf_imagelist', $uploader->getSavedFileName()); - } - } else { - $testfieldsObj->setVar('tf_imagelist', Request::getString('tf_imagelist')); - } - $testfieldsObj->setVar('tf_urlfile', formatUrl($_REQUEST['tf_urlfile'])); - // Set Var tf_urlfile - include_once XOOPS_ROOT_PATH . '/class/uploader.php'; - $filename = $_FILES['tf_urlfile']['name']; - $imgNameDef = Request::getString('tf_text'); - $uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/testfields/', - $helper->getConfig('mimetypes_file'), - $helper->getConfig('maxsize_file'), null, null); - if ($uploader->fetchMedia($_POST['xoops_upload_file'][1])) { - $extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename); - $imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension; - $uploader->setPrefix($imgName); - $uploader->fetchMedia($_POST['xoops_upload_file'][1]); - if (!$uploader->upload()) { - $errors = $uploader->getErrors(); - } else { - $testfieldsObj->setVar('tf_urlfile', $uploader->getSavedFileName()); - } - } else { - if ($filename > '') { - $uploaderErrors = $uploader->getErrors(); - } - $testfieldsObj->setVar('tf_urlfile', Request::getString('tf_urlfile')); - } - // Set Var tf_uplimage - include_once XOOPS_ROOT_PATH . '/class/uploader.php'; - $filename = $_FILES['tf_uplimage']['name']; - $imgMimetype = $_FILES['tf_uplimage']['type']; - $imgNameDef = Request::getString('tf_text'); - $uploaderErrors = ''; - $uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_IMAGE_PATH . '/testfields/', - $helper->getConfig('mimetypes_image'), - $helper->getConfig('maxsize_image'), null, null); - if ($uploader->fetchMedia($_POST['xoops_upload_file'][2])) { - $extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename); - $imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension; - $uploader->setPrefix($imgName); - $uploader->fetchMedia($_POST['xoops_upload_file'][2]); - if (!$uploader->upload()) { - $uploaderErrors = $uploader->getErrors(); - } else { - $savedFilename = $uploader->getSavedFileName(); - $maxwidth = (int)$helper->getConfig('maxwidth_image'); - $maxheight = (int)$helper->getConfig('maxheight_image'); - if ($maxwidth > 0 && $maxheight > 0) { - // Resize image - $imgHandler = new Mymodule2\Common\Resizer(); - $imgHandler->sourceFile = MYMODULE2_UPLOAD_IMAGE_PATH . '/testfields/' . $savedFilename; - $imgHandler->endFile = MYMODULE2_UPLOAD_IMAGE_PATH . '/testfields/' . $savedFilename; - $imgHandler->imageMimetype = $imgMimetype; - $imgHandler->maxWidth = $maxwidth; - $imgHandler->maxHeight = $maxheight; - $result = $imgHandler->resizeImage(); - } - $testfieldsObj->setVar('tf_uplimage', $savedFilename); - } - } else { - if ($filename > '') { - $uploaderErrors = $uploader->getErrors(); - } - $testfieldsObj->setVar('tf_uplimage', Request::getString('tf_uplimage')); - } - // Set Var tf_uplfile - include_once XOOPS_ROOT_PATH . '/class/uploader.php'; - $filename = $_FILES['tf_uplfile']['name']; - $imgNameDef = Request::getString('tf_text'); - $uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/testfields/', - $helper->getConfig('mimetypes_file'), - $helper->getConfig('maxsize_file'), null, null); - if ($uploader->fetchMedia($_POST['xoops_upload_file'][3])) { - $extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename); - $imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension; - $uploader->setPrefix($imgName); - $uploader->fetchMedia($_POST['xoops_upload_file'][3]); - if (!$uploader->upload()) { - $errors = $uploader->getErrors(); - } else { - $testfieldsObj->setVar('tf_uplfile', $uploader->getSavedFileName()); - } - } else { - if ($filename > '') { - $uploaderErrors = $uploader->getErrors(); - } - $testfieldsObj->setVar('tf_uplfile', Request::getString('tf_uplfile')); - } - $testfieldTextdateselect = date_create_from_format(_SHORTDATESTRING, Request::getString('tf_textdateselect')); - $testfieldsObj->setVar('tf_textdateselect', $testfieldTextdateselect->getTimestamp()); - // Set Var tf_selectfile - include_once XOOPS_ROOT_PATH . '/class/uploader.php'; - $filename = $_FILES['tf_selectfile']['name']; - $imgNameDef = Request::getString('tf_text'); - $uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/testfields/', - $helper->getConfig('mimetypes_file'), - $helper->getConfig('maxsize_file'), null, null); - if ($uploader->fetchMedia($_POST['xoops_upload_file'][4])) { - $extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename); - $imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension; - $uploader->setPrefix($imgName); - $uploader->fetchMedia($_POST['xoops_upload_file'][4]); - if (!$uploader->upload()) { - $errors = $uploader->getErrors(); - } else { - $testfieldsObj->setVar('tf_selectfile', $uploader->getSavedFileName()); - } - } else { - if ($filename > '') { - $uploaderErrors = $uploader->getErrors(); - } - $testfieldsObj->setVar('tf_selectfile', Request::getString('tf_selectfile')); - } - $testfieldsObj->setVar('tf_status', Request::getInt('tf_status', 0)); - if ($error === true) { - $GLOBALS['xoopsTpl']->assign('error_message', $errorMessage); - } else { - // Insert Data - if ($testfields1->insert($testfieldsObj)) { - redirect_header('index.php', 2, _MA_MYMODULE2_FORM_OK); - } - } - // Get Form Error - $GLOBALS['xoopsTpl']->assign('error', $testfieldsObj->getHtmlErrors()); - $form = $testfieldsObj->getFormTestfields(); - $GLOBALS['xoopsTpl']->assign('form', $form->display()); - - break; -} -require __DIR__ . '/footer.php'; diff --git a/testdata/mymodule2/class/Articles.php b/testdata/mymodule2/class/Articles.php deleted file mode 100644 index fe955a44..00000000 --- a/testdata/mymodule2/class/Articles.php +++ /dev/null @@ -1,255 +0,0 @@ - - Website:
' ); - $imageSelect = new \XoopsFormSelect( sprintf(_AM_MYMODULE2_ARTICLE_IMG_UPLOADS, ".{$imageDirectory}/"), 'art_img', $artImg, 5); - $imageArray = \XoopsLists::getImgListAsArray( XOOPS_ROOT_PATH . $imageDirectory ); - foreach($imageArray as $image1) { - $imageSelect->addOption("{$image1}", $image1); - } - $imageSelect->setExtra("onchange='showImgSelected(\"imglabel_art_img\", \"art_img\", \"".$imageDirectory."\", \"\", \"".XOOPS_URL."\")'"); - $imageTray->addElement($imageSelect, false); - $imageTray->addElement(new \XoopsFormLabel('', "
' . _AM_MYMODULE2_FORM_UPLOAD_NEW, 'art_img', $maxsize )); - $imageTray->addElement(new \XoopsFormLabel(_AM_MYMODULE2_FORM_UPLOAD_SIZE, ($maxsize / 1048576) . ' ' . _AM_MYMODULE2_FORM_UPLOAD_SIZE_MB)); - $imageTray->addElement(new \XoopsFormLabel(_AM_MYMODULE2_FORM_UPLOAD_IMG_WIDTH, $helper->getConfig('maxwidth_image') . ' px')); - $imageTray->addElement(new \XoopsFormLabel(_AM_MYMODULE2_FORM_UPLOAD_IMG_HEIGHT, $helper->getConfig('maxheight_image') . ' px')); - } else { - $imageTray->addElement(new \XoopsFormHidden( 'art_img', $artImg )); - } - $form->addElement($imageTray, ); - // Form Select Articles - $artStatusSelect = new \XoopsFormSelect( _AM_MYMODULE2_ARTICLE_STATUS, 'art_status', $this->getVar('art_status')); - $artStatusSelect->addOption(Constants::STATUS_NONE, _AM_MYMODULE2_STATUS_NONE); - $artStatusSelect->addOption(Constants::STATUS_OFFLINE, _AM_MYMODULE2_STATUS_OFFLINE); - $artStatusSelect->addOption(Constants::STATUS_SUBMITTED, _AM_MYMODULE2_STATUS_SUBMITTED); - $artStatusSelect->addOption(Constants::STATUS_APPROVED, _AM_MYMODULE2_STATUS_APPROVED); - $form->addElement($artStatusSelect, true); - // Form File ArtFile - $artFile = $this->isNew() ? '' : $this->getVar('art_file'); - if ($permissionUpload) { - $fileUploadTray = new \XoopsFormElementTray(_AM_MYMODULE2_ARTICLE_FILE, '
' ); - $fileDirectory = '/uploads/mymodule2/files/articles'; - if (!$this->isNew()) { - $fileUploadTray->addElement(new \XoopsFormLabel(sprintf(_AM_MYMODULE2_ARTICLE_FILE_UPLOADS, ".{$fileDirectory}/"), $artFile)); - } - $maxsize = $helper->getConfig('maxsize_file'); - $fileUploadTray->addElement(new \XoopsFormFile( '', 'art_file', $maxsize )); - $fileUploadTray->addElement(new \XoopsFormLabel(_AM_MYMODULE2_FORM_UPLOAD_SIZE, ($maxsize / 1048576) . ' ' . _AM_MYMODULE2_FORM_UPLOAD_SIZE_MB)); - $form->addElement($fileUploadTray, ); - } else { - $form->addElement(new \XoopsFormHidden( 'art_file', $artFile )); - } - // Form Text Date Select ArtCreated - $artCreated = $this->isNew() ? 0 : $this->getVar('art_created'); - $form->addElement(new \XoopsFormTextDateSelect( _AM_MYMODULE2_ARTICLE_CREATED, 'art_created', '', $artCreated )); - // Form Select User ArtSubmitter - $form->addElement(new \XoopsFormSelectUser( _AM_MYMODULE2_ARTICLE_SUBMITTER, 'art_submitter', false, $this->getVar('art_submitter') )); - // Permissions - $memberHandler = xoops_getHandler('member'); - $groupList = $memberHandler->getGroupList(); - $grouppermHandler = xoops_getHandler('groupperm'); - $fullList[] = array_keys($groupList); - if (!$this->isNew()) { - $groupsIdsApprove = $grouppermHandler->getGroupIds('mymodule2_approve_articles', $this->getVar('art_id'), $GLOBALS['xoopsModule']->getVar('mid')); - $groupsIdsApprove[] = array_values($groupsIdsApprove); - $groupsCanApproveCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_APPROVE, 'groups_approve_articles[]', $groupsIdsApprove); - $groupsIdsSubmit = $grouppermHandler->getGroupIds('mymodule2_submit_articles', $this->getVar('art_id'), $GLOBALS['xoopsModule']->getVar('mid')); - $groupsIdsSubmit[] = array_values($groupsIdsSubmit); - $groupsCanSubmitCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_SUBMIT, 'groups_submit_articles[]', $groupsIdsSubmit); - $groupsIdsView = $grouppermHandler->getGroupIds('mymodule2_view_articles', $this->getVar('art_id'), $GLOBALS['xoopsModule']->getVar('mid')); - $groupsIdsView[] = array_values($groupsIdsView); - $groupsCanViewCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_VIEW, 'groups_view_articles[]', $groupsIdsView); - } else { - $groupsCanApproveCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_APPROVE, 'groups_approve_articles[]', $fullList); - $groupsCanSubmitCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_SUBMIT, 'groups_submit_articles[]', $fullList); - $groupsCanViewCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_VIEW, 'groups_view_articles[]', $fullList); - } - // To Approve - $groupsCanApproveCheckbox->addOptionArray($groupList); - $form->addElement($groupsCanApproveCheckbox); - // To Submit - $groupsCanSubmitCheckbox->addOptionArray($groupList); - $form->addElement($groupsCanSubmitCheckbox); - // To View - $groupsCanViewCheckbox->addOptionArray($groupList); - $form->addElement($groupsCanViewCheckbox); - // To Save - $form->addElement(new \XoopsFormHidden('op', 'save')); - $form->addElement(new \XoopsFormButtonTray('', _SUBMIT, 'submit', '', false)); - return $form; - } - - /** - * Get Values - * @param null $keys - * @param null $format - * @param null$maxDepth - * @return array - */ - public function getValuesArticles($keys = null, $format = null, $maxDepth = null) - { - $helper = \XoopsModules\Mymodule2\Helper::getInstance(); - $ret = $this->getValues($keys, $format, $maxDepth); - $ret['id'] = $this->getVar('art_id'); - $categories = $helper->getHandler('categories'); - $categoriesObj = $categories->get($this->getVar('art_cat')); - $ret['cat'] = $categoriesObj->getVar('cat_name'); - $ret['title'] = $this->getVar('art_title'); - $ret['descr'] = strip_tags($this->getVar('art_descr')); - $ret['img'] = $this->getVar('art_img'); - $ret['status'] = $this->getVar('art_status'); - $ret['file'] = $this->getVar('art_file'); - $ret['created'] = formatTimeStamp($this->getVar('art_created'), 's'); - $ret['submitter'] = \XoopsUser::getUnameFromId($this->getVar('art_submitter')); - return $ret; - } - - /** - * Returns an array representation of the object - * - * @return array - */ - public function toArrayArticles() - { - $ret = []; - $vars = $this->getVars(); - foreach(array_keys($vars) as $var) { - $ret[$var] = $this->getVar('"{$var}"'); - } - return $ret; - } -} diff --git a/testdata/mymodule2/class/Articleshandler.php b/testdata/mymodule2/class/Articleshandler.php deleted file mode 100644 index 80263e68..00000000 --- a/testdata/mymodule2/class/Articleshandler.php +++ /dev/null @@ -1,124 +0,0 @@ - - Website:
'; - } - } - - /** - * @param $file - * @param $folder - * @return bool - */ - public static function copyFile($file, $folder) - { - return copy($file, $folder); - } - - /** - * @param $src - * @param $dst - */ - public static function recurseCopy($src, $dst) - { - $dir = opendir($src); - // @mkdir($dst); - if (!@mkdir($dst) && !is_dir($dst)) { - throw new \RuntimeException('The directory ' . $dst . ' could not be created.'); - } - while (false !== ($file = readdir($dir))) { - if (('.' !== $file) && ('..' !== $file)) { - if (is_dir($src . '/' . $file)) { - self::recurseCopy($src . '/' . $file, $dst . '/' . $file); - } else { - copy($src . '/' . $file, $dst . '/' . $file); - } - } - } - closedir($dir); - } - - /** - * Copy a file, or recursively copy a folder and its contents - * @param string $source Source path - * @param string $dest Destination path - * @return bool Returns true on success, false on failure - * @author Aidan Lister
'; - - return $html; - } -} diff --git a/testdata/mymodule2/class/Common/VersionChecks.php b/testdata/mymodule2/class/Common/VersionChecks.php deleted file mode 100644 index ab175822..00000000 --- a/testdata/mymodule2/class/Common/VersionChecks.php +++ /dev/null @@ -1,144 +0,0 @@ - - */ -trait VersionChecks -{ - /** - * Verifies XOOPS version meets minimum requirements for this module - * @static - * - * @param null|string $requiredVer - * @return bool true if meets requirements, false if not - */ - public static function checkVerXoops(\XoopsModule $module = null, $requiredVer = null) - { - $moduleDirName = basename(dirname(dirname(__DIR__))); - $moduleDirNameUpper = mb_strtoupper($moduleDirName); - if (null === $module) { - $module = \XoopsModule::getByDirname($moduleDirName); - } - xoops_loadLanguage('admin', $moduleDirName); - xoops_loadLanguage('common', $moduleDirName); - - //check for minimum XOOPS version - $currentVer = mb_substr(XOOPS_VERSION, 6); // get the numeric part of string - if (null === $requiredVer) { - $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string - } - $success = true; - - if (version_compare($currentVer, $requiredVer, '<')) { - $success = false; - $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer)); - } - - return $success; - } - - /** - * Verifies PHP version meets minimum requirements for this module - * @static - * - * @return bool true if meets requirements, false if not - */ - public static function checkVerPhp(\XoopsModule $module = null) - { - $moduleDirName = basename(dirname(dirname(__DIR__))); - $moduleDirNameUpper = mb_strtoupper($moduleDirName); - if (null === $module) { - $module = \XoopsModule::getByDirname($moduleDirName); - } - xoops_loadLanguage('admin', $moduleDirName); - // check for minimum PHP version - $success = true; - - $verNum = PHP_VERSION; - $reqVer = &$module->getInfo('min_php'); - - if (false !== $reqVer && '' !== $reqVer) { - if (version_compare($verNum, $reqVer, '<')) { - $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum)); - $success = false; - } - } - - return $success; - } - - /** - * compares current module version with latest GitHub release - * @static - * @param \Xmf\Module\Helper $helper - * @param string|null $source - * @param string|null $default - * - * @return string|array info about the latest module version, if newer - */ - public static function checkVerModule($helper, $source = 'github', $default = 'master') - { - $moduleDirName = basename(dirname(dirname(__DIR__))); - $moduleDirNameUpper = mb_strtoupper($moduleDirName); - $update = ''; - $repository = 'XoopsModules25x/' . $moduleDirName; - // $repository = 'XoopsModules25x/publisher'; //for testing only - $ret = ''; - $infoReleasesUrl = "https://api.github.com/repos/$repository/releases"; - if ('github' === $source) { - if (function_exists('curl_init') && false !== ($curlHandle = curl_init())) { - curl_setopt($curlHandle, CURLOPT_URL, $infoReleasesUrl); - curl_setopt($curlHandle, CURLOPT_RETURNTRANSFER, true); - curl_setopt($curlHandle, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curlHandle, CURLOPT_HTTPHEADER, ["User-Agent:Publisher\r\n"]); - $curlReturn = curl_exec($curlHandle); - if (false === $curlReturn) { - trigger_error(curl_error($curlHandle)); - } elseif (mb_strpos($curlReturn, 'Not Found')) { - trigger_error('Repository Not Found: ' . $infoReleasesUrl); - } else { - $file = json_decode($curlReturn, false); - $latestVersionLink = sprintf("https://github.com/$repository/archive/%s.zip", $file ? reset($file)->tag_name : $default); - $latestVersion = $file[0]->tag_name; - $prerelease = $file[0]->prerelease; - if ('master' !== $latestVersionLink) { - $update = constant('CO_' . $moduleDirNameUpper . '_' . 'NEW_VERSION') . $latestVersion; - } - //"PHP-standardized" version - $latestVersion = mb_strtolower($latestVersion); - if (false !== mb_strpos($latestVersion, 'final')) { - $latestVersion = str_replace('_', '', mb_strtolower($latestVersion)); - $latestVersion = str_replace('final', '', mb_strtolower($latestVersion)); - } - $moduleVersion = ($helper->getModule()->getInfo('version') . '_' . $helper->getModule()->getInfo('module_status')); - //"PHP-standardized" version - $moduleVersion = str_replace(' ', '', mb_strtolower($moduleVersion)); - // $moduleVersion = '1.0'; //for testing only - // $moduleDirName = 'publisher'; //for testing only - if (!$prerelease && version_compare($moduleVersion, $latestVersion, '<')) { - $ret = []; - $ret[] = $update; - $ret[] = $latestVersionLink; - } - } - curl_close($curlHandle); - } - } - - return $ret; - } -} diff --git a/testdata/mymodule2/class/Common/index.html b/testdata/mymodule2/class/Common/index.html deleted file mode 100644 index 74b6f45c..00000000 --- a/testdata/mymodule2/class/Common/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/testdata/mymodule2/class/Constants.php b/testdata/mymodule2/class/Constants.php deleted file mode 100644 index 40f54536..00000000 --- a/testdata/mymodule2/class/Constants.php +++ /dev/null @@ -1,44 +0,0 @@ - - Website:
' ); - $imageSelect = new \XoopsFormSelect( sprintf(_AM_MYMODULE2_TESTFIELD_IMAGELIST_UPLOADS, ".{$imageDirectory}/"), 'tf_imagelist', $tfImagelist, 5); - $imageArray = \XoopsLists::getImgListAsArray( XOOPS_ROOT_PATH . $imageDirectory ); - foreach($imageArray as $image1) { - $imageSelect->addOption("{$image1}", $image1); - } - $imageSelect->setExtra("onchange='showImgSelected(\"imglabel_tf_imagelist\", \"tf_imagelist\", \"".$imageDirectory."\", \"\", \"".XOOPS_URL."\")'"); - $imageTray->addElement($imageSelect, false); - $imageTray->addElement(new \XoopsFormLabel('', "
' ); - $fileSelectTray->addElement(new \XoopsFormFile( _AM_MYMODULE2_FORM_UPLOAD_NEW, 'tf_imagelist', $helper->getConfig('maxsize_image') )); - $fileSelectTray->addElement(new \XoopsFormLabel('')); - $imageTray->addElement($fileSelectTray); - $form->addElement($imageTray); - // Form Url Text File TfUrlfile - $formUrlFile = new \XoopsFormElementTray(_AM_MYMODULE2_TESTFIELD_URLFILE, '
' ); - $formUrl = $this->isNew() ? '' : $this->getVar('tf_urlfile'); - $formText = new \XoopsFormText( _AM_MYMODULE2_TESTFIELD_URLFILE_UPLOADS, 'tf_urlfile', 75, 255, $formUrl ); - $formUrlFile->addElement($formText); - $formUrlFile->addElement(new \XoopsFormFile( _AM_MYMODULE2_FORM_UPLOAD, 'tf_urlfile', $helper->getConfig('maxsize_file') )); - $form->addElement($formUrlFile); - // Form Image TfUplimage - // Form Image TfUplimage: Select Uploaded Image - $getTfUplimage = $this->getVar('tf_uplimage'); - $tfUplimage = $getTfUplimage ? $getTfUplimage : 'blank.gif'; - $imageDirectory = '/uploads/mymodule2/images/testfields'; - $imageTray = new \XoopsFormElementTray(_AM_MYMODULE2_TESTFIELD_UPLIMAGE, '
' ); - $imageSelect = new \XoopsFormSelect( sprintf(_AM_MYMODULE2_TESTFIELD_UPLIMAGE_UPLOADS, ".{$imageDirectory}/"), 'tf_uplimage', $tfUplimage, 5); - $imageArray = \XoopsLists::getImgListAsArray( XOOPS_ROOT_PATH . $imageDirectory ); - foreach($imageArray as $image1) { - $imageSelect->addOption("{$image1}", $image1); - } - $imageSelect->setExtra("onchange='showImgSelected(\"imglabel_tf_uplimage\", \"tf_uplimage\", \"".$imageDirectory."\", \"\", \"".XOOPS_URL."\")'"); - $imageTray->addElement($imageSelect, false); - $imageTray->addElement(new \XoopsFormLabel('', "
' . _AM_MYMODULE2_FORM_UPLOAD_NEW, 'tf_uplimage', $maxsize )); - $imageTray->addElement(new \XoopsFormLabel(_AM_MYMODULE2_FORM_UPLOAD_SIZE, ($maxsize / 1048576) . ' ' . _AM_MYMODULE2_FORM_UPLOAD_SIZE_MB)); - $imageTray->addElement(new \XoopsFormLabel(_AM_MYMODULE2_FORM_UPLOAD_IMG_WIDTH, $helper->getConfig('maxwidth_image') . ' px')); - $imageTray->addElement(new \XoopsFormLabel(_AM_MYMODULE2_FORM_UPLOAD_IMG_HEIGHT, $helper->getConfig('maxheight_image') . ' px')); - } else { - $imageTray->addElement(new \XoopsFormHidden( 'tf_uplimage', $tfUplimage )); - } - $form->addElement($imageTray, ); - // Form File TfUplfile - $tfUplfile = $this->isNew() ? '' : $this->getVar('tf_uplfile'); - if ($permissionUpload) { - $fileUploadTray = new \XoopsFormElementTray(_AM_MYMODULE2_TESTFIELD_UPLFILE, '
' ); - $fileDirectory = '/uploads/mymodule2/files/testfields'; - if (!$this->isNew()) { - $fileUploadTray->addElement(new \XoopsFormLabel(sprintf(_AM_MYMODULE2_TESTFIELD_UPLFILE_UPLOADS, ".{$fileDirectory}/"), $tfUplfile)); - } - $maxsize = $helper->getConfig('maxsize_file'); - $fileUploadTray->addElement(new \XoopsFormFile( '', 'tf_uplfile', $maxsize )); - $fileUploadTray->addElement(new \XoopsFormLabel(_AM_MYMODULE2_FORM_UPLOAD_SIZE, ($maxsize / 1048576) . ' ' . _AM_MYMODULE2_FORM_UPLOAD_SIZE_MB)); - $form->addElement($fileUploadTray, ); - } else { - $form->addElement(new \XoopsFormHidden( 'tf_uplfile', $tfUplfile )); - } - // Form Text Date Select TfTextdateselect - $tfTextdateselect = $this->isNew() ? 0 : $this->getVar('tf_textdateselect'); - $form->addElement(new \XoopsFormTextDateSelect( _AM_MYMODULE2_TESTFIELD_TEXTDATESELECT, 'tf_textdateselect', '', $tfTextdateselect )); - // Form File TfSelectfile - // Form File TfSelectfile: Select Uploaded File - $getTfSelectfile = $this->getVar('tf_selectfile'); - $tfSelectfile = $getTfSelectfile ? $getTfSelectfile : 'blank.gif'; - $fileDirectory = '/uploads/mymodule2/files/testfields'; - $fileTray = new \XoopsFormElementTray(_AM_MYMODULE2_TESTFIELD_SELECTFILE, '
' ); - $fileSelect = new \XoopsFormSelect( sprintf(_AM_MYMODULE2_TESTFIELD_SELECTFILE_UPLOADS, ".{$fileDirectory}/"), 'tf_selectfile', $tfSelectfile, 5); - $fileArray = \XoopsLists::getImgListAsArray( XOOPS_ROOT_PATH . $fileDirectory ); - foreach($fileArray as $file1) { - $fileSelect->addOption("{$file1}", $file1); - } - $fileTray->addElement($fileSelect, false); - // Form File TfSelectfile: Upload new file - if ($permissionUpload) { - $maxsize = $helper->getConfig('maxsize_file'); - $fileTray->addElement(new \XoopsFormFile( '
' . _AM_MYMODULE2_FORM_UPLOAD_NEW, 'tf_selectfile', $maxsize )); - $fileTray->addElement(new \XoopsFormLabel(_AM_MYMODULE2_FORM_UPLOAD_SIZE, ($maxsize / 1048576) . ' ' . _AM_MYMODULE2_FORM_UPLOAD_SIZE_MB)); - } else { - $fileTray->addElement(new \XoopsFormHidden( 'tf_selectfile', $tfSelectfile )); - } - $form->addElement($fileTray, ); - // Form Select Testfields - $tfStatusSelect = new \XoopsFormSelect( _AM_MYMODULE2_TESTFIELD_STATUS, 'tf_status', $this->getVar('tf_status')); - $tfStatusSelect->addOption(Constants::STATUS_NONE, _AM_MYMODULE2_STATUS_NONE); - $tfStatusSelect->addOption(Constants::STATUS_OFFLINE, _AM_MYMODULE2_STATUS_OFFLINE); - $tfStatusSelect->addOption(Constants::STATUS_SUBMITTED, _AM_MYMODULE2_STATUS_SUBMITTED); - $tfStatusSelect->addOption(Constants::STATUS_APPROVED, _AM_MYMODULE2_STATUS_APPROVED); - $form->addElement($tfStatusSelect); - // Permissions - $memberHandler = xoops_getHandler('member'); - $groupList = $memberHandler->getGroupList(); - $grouppermHandler = xoops_getHandler('groupperm'); - $fullList[] = array_keys($groupList); - if (!$this->isNew()) { - $groupsIdsApprove = $grouppermHandler->getGroupIds('mymodule2_approve_testfields', $this->getVar('tf_id'), $GLOBALS['xoopsModule']->getVar('mid')); - $groupsIdsApprove[] = array_values($groupsIdsApprove); - $groupsCanApproveCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_APPROVE, 'groups_approve_testfields[]', $groupsIdsApprove); - $groupsIdsSubmit = $grouppermHandler->getGroupIds('mymodule2_submit_testfields', $this->getVar('tf_id'), $GLOBALS['xoopsModule']->getVar('mid')); - $groupsIdsSubmit[] = array_values($groupsIdsSubmit); - $groupsCanSubmitCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_SUBMIT, 'groups_submit_testfields[]', $groupsIdsSubmit); - $groupsIdsView = $grouppermHandler->getGroupIds('mymodule2_view_testfields', $this->getVar('tf_id'), $GLOBALS['xoopsModule']->getVar('mid')); - $groupsIdsView[] = array_values($groupsIdsView); - $groupsCanViewCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_VIEW, 'groups_view_testfields[]', $groupsIdsView); - } else { - $groupsCanApproveCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_APPROVE, 'groups_approve_testfields[]', $fullList); - $groupsCanSubmitCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_SUBMIT, 'groups_submit_testfields[]', $fullList); - $groupsCanViewCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_VIEW, 'groups_view_testfields[]', $fullList); - } - // To Approve - $groupsCanApproveCheckbox->addOptionArray($groupList); - $form->addElement($groupsCanApproveCheckbox); - // To Submit - $groupsCanSubmitCheckbox->addOptionArray($groupList); - $form->addElement($groupsCanSubmitCheckbox); - // To View - $groupsCanViewCheckbox->addOptionArray($groupList); - $form->addElement($groupsCanViewCheckbox); - // To Save - $form->addElement(new \XoopsFormHidden('op', 'save')); - $form->addElement(new \XoopsFormButtonTray('', _SUBMIT, 'submit', '', false)); - return $form; - } - - /** - * Get Values - * @param null $keys - * @param null $format - * @param null$maxDepth - * @return array - */ - public function getValuesTestfields($keys = null, $format = null, $maxDepth = null) - { - $helper = \XoopsModules\Mymodule2\Helper::getInstance(); - $ret = $this->getValues($keys, $format, $maxDepth); - $ret['id'] = $this->getVar('tf_id'); - $ret['text'] = $this->getVar('tf_text'); - $ret['textarea'] = strip_tags($this->getVar('tf_textarea')); - $ret['dhtml'] = strip_tags($this->getVar('tf_dhtml')); - $ret['checkbox'] = $this->getVar('tf_checkbox'); - $ret['yesno'] = $this->getVar('tf_yesno'); - $ret['yesno_text'] = (int)$this->getVar('tf_yesno') > 0 ? _YES : _NO; - $ret['selectbox'] = $this->getVar('tf_selectbox'); - $ret['user'] = \XoopsUser::getUnameFromId($this->getVar('tf_user')); - $ret['color'] = $this->getVar('tf_color'); - $ret['imagelist'] = $this->getVar('tf_imagelist'); - $ret['urlfile'] = $this->getVar('tf_urlfile'); - $ret['uplimage'] = $this->getVar('tf_uplimage'); - $ret['uplfile'] = $this->getVar('tf_uplfile'); - $ret['textdateselect'] = formatTimeStamp($this->getVar('tf_textdateselect'), 's'); - $ret['selectfile'] = $this->getVar('tf_selectfile'); - $ret['status'] = $this->getVar('tf_status'); - return $ret; - } - - /** - * Returns an array representation of the object - * - * @return array - */ - public function toArrayTestfields() - { - $ret = []; - $vars = $this->getVars(); - foreach(array_keys($vars) as $var) { - $ret[$var] = $this->getVar('"{$var}"'); - } - return $ret; - } -} diff --git a/testdata/mymodule2/class/Testfieldshandler.php b/testdata/mymodule2/class/Testfieldshandler.php deleted file mode 100644 index 07b01e5b..00000000 --- a/testdata/mymodule2/class/Testfieldshandler.php +++ /dev/null @@ -1,124 +0,0 @@ - - Website:
",
- 'delete' => "",
- 'clone' => "",
- 'preview' => "",
- 'print' => "",
- 'pdf' => "",
- 'add' => "",
- '0' => "",
- '1' => "",
- ],
- ];
-}
diff --git a/testdata/mymodule2/config/index.html b/testdata/mymodule2/config/index.html
deleted file mode 100644
index 74b6f45c..00000000
--- a/testdata/mymodule2/config/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/testdata/mymodule2/config/paths.php b/testdata/mymodule2/config/paths.php
deleted file mode 100644
index 2ff95a2c..00000000
--- a/testdata/mymodule2/config/paths.php
+++ /dev/null
@@ -1,25 +0,0 @@
- mb_strtoupper($moduleDirName) . ' PathConfigurator',
- 'paths' => [
- 'dirname' => $moduleDirName,
- 'admin' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
- 'modPath' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
- 'modUrl' => XOOPS_URL . '/modules/' . $moduleDirName,
- 'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
- 'uploadUrl' => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
- ],
- 'uploadFolders' => [
- XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
- //XOOPS_UPLOAD_PATH . '/flags'
- ],
- ];
-}
diff --git a/testdata/mymodule2/docs/changelog.txt b/testdata/mymodule2/docs/changelog.txt
deleted file mode 100644
index 8ed56037..00000000
--- a/testdata/mymodule2/docs/changelog.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-==============================================================
-Change Log for My Module 2 - 2020/04/16 20:35:36 Version 1.0
-==============================================================
- - Original release mymodule2 (TDM XOOPS)
\ No newline at end of file
diff --git a/testdata/mymodule2/docs/credits.txt b/testdata/mymodule2/docs/credits.txt
deleted file mode 100644
index bf06b0ab..00000000
--- a/testdata/mymodule2/docs/credits.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Read Me First
-=============
-
-Originally created by the TDM Team.
-
-Modified by Timgno (http://www.txmodxoops.org)
-
-Contributors: Mamba (https://xoops.org), Goffy (German Xoops)
-
-Included ideas for Logo Generator from Trabis (Publisher module) and Suin (Koins module)
\ No newline at end of file
diff --git a/testdata/mymodule2/docs/index.html b/testdata/mymodule2/docs/index.html
deleted file mode 100644
index 74b6f45c..00000000
--- a/testdata/mymodule2/docs/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/testdata/mymodule2/docs/install.txt b/testdata/mymodule2/docs/install.txt
deleted file mode 100644
index 469bfd3a..00000000
--- a/testdata/mymodule2/docs/install.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Read Me First
-=============
-
-Install just like another XOOPS module
\ No newline at end of file
diff --git a/testdata/mymodule2/docs/lang.diff b/testdata/mymodule2/docs/lang.diff
deleted file mode 100644
index 233be6a5..00000000
--- a/testdata/mymodule2/docs/lang.diff
+++ /dev/null
@@ -1,7 +0,0 @@
-Legend :
-+ Added
-- Removed
-* Modified
-
-To see the differences of language files, see the language folder
-+ file name update language 1:59 to 1.91
\ No newline at end of file
diff --git a/testdata/mymodule2/docs/license.txt b/testdata/mymodule2/docs/license.txt
deleted file mode 100644
index aac9317c..00000000
--- a/testdata/mymodule2/docs/license.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-End User License Agreement for Xoops Modules
-
-IMPORTANT NOTICE Read and understand this License
-Agreement carefully before installing and using this Software.
-It contains extremely important information.
-
-BY USING THIS SOFTWARE IN ANY WAY YOU ACKNOWLEDGE
-THAT YOU HAVE READ, UNDERSTAND AND AGREE TO THE
-TERMS OF THIS AGREEMENT. IF YOU DO NOT AGREE TO
-THESE TERMS, DO NOT USE THIS SOFTWARE IN ANY WAY,
-AND PROMPTLY RETURN IT OR DELETE ANY COPIES OF
-THIS SOFTWARE IN YOUR POSSESSION.
-
-LICENSE GRANT the copyright holder grants you a non-exclusive
-license to use this software, and any associated documentation
-("The Software"), as indicated herein.
-
-You may install and use the Software on two computers for your use
-only.
-
-RESTRICTIONS You MAY NOT: (a) sell or distribute this Software
-package without prior written approval (b) cause or permit reverse
-engineering, disassembly, decompilation or alteration of this
-Software; (c) remove any product identification, copyright notices,
-or other notices or proprietary restrictions from this Software;
-
-TERM: This License is effective until terminated. You may terminate
-it at any time by destroying the Software, together with all copies
-thereof. This License will also terminate if you fail to comply with any
-term or condition of this Agreement. Upon such termination, you
-agree to destroy the Software, together with all copies thereof.
-
-COPYRIGHT/OWNERSHIP This Software and its source
-code are proprietary products of Pablo Software Solutions
-and are protected by copyright, trade secret and other intellectual
-property laws.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
-HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-This software was created to be free of defects and is designed to
-function on PC computers only. While this software has been tested
-and proven to run accurately, in the unlikely event of any user or
-computer incompatibility issues, the end user assumes complete
-liability of usage. This software contains no adware, scumware or
-spyware. The maker of this software does not support any
-questionable forms of use where this software could be misused in
-any way.
-
-http://www.txmodxoops.org
-https://xoops.org
diff --git a/testdata/mymodule2/docs/readme.txt b/testdata/mymodule2/docs/readme.txt
deleted file mode 100644
index 62b1640e..00000000
--- a/testdata/mymodule2/docs/readme.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Read Me First
-=============
-
-Please make sure that you download the XOOPS Icon Set, and upload it to uploads/images directory
-Read the table in admin help for the accurate description of the functionality of this module
-
-Using the new class xoopsrequest.php
-
-Version of xoops
-----------------
-TDMCreate is a module that create other basic modules for CMS Xoops.
-
-Tested with xoops 2.5.7, you can not use it with earlier versions, unless because you do not fit some core files in the background and after some tests.
-
-Now that is ahead xoops versions, and goes to 2.6.0, you should download xoops 2.5.7 and use with this latest version.
-
-Therefore recommended not to use TDMCreate 1.91, with previous versions, to xoops 2.5.7
\ No newline at end of file
diff --git a/testdata/mymodule2/footer.php b/testdata/mymodule2/footer.php
deleted file mode 100644
index 25e72135..00000000
--- a/testdata/mymodule2/footer.php
+++ /dev/null
@@ -1,33 +0,0 @@
- - Website:' . $sql); - - return false; - } - $ret = []; - while (false !== ($myrow = $xoopsDB->fetchArray($result))) { - $ret[] = $myrow; - } - if (!empty($ret)) { - $module->setErrors("'tpl_refid_module_set_file_type' unique index is exist. Note: check 'tplfile' table to be sure this index is UNIQUE because XOOPS CORE need it."); - - return true; - } - $sql = 'ALTER TABLE ' . $xoopsDB->prefix('tplfile') . ' ADD UNIQUE tpl_refid_module_set_file_type ( tpl_refid, tpl_module, tpl_tplset, tpl_file, tpl_type )'; - if (!$result = $xoopsDB->queryF($sql)) { - xoops_error($xoopsDB->error() . '
' . $sql); - $module->setErrors("'tpl_refid_module_set_file_type' unique index is not added to 'tplfile' table. Warning: do not use XOOPS until you add this unique index."); - - return false; - } - - return true; -} - -// irmtfan bug fix: solve templates duplicate issue - -/** - * @param $module - * - * @return bool - */ -function mymodule2_check_db($module) -{ - $ret = true; - //insert here code for database check - - /* - // Example: update table (add new field) - $table = $GLOBALS['xoopsDB']->prefix('mymodule2_images'); - $field = 'img_exif'; - $check = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `' . $table . "` LIKE '" . $field . "'"); - $numRows = $GLOBALS['xoopsDB']->getRowsNum($check); - if (!$numRows) { - $sql = "ALTER TABLE `$table` ADD `$field` TEXT NULL AFTER `img_state`;"; - if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) { - xoops_error($GLOBALS['xoopsDB']->error() . '
' . $sql); - $module->setErrors("Error when adding '$field' to table '$table'."); - $ret = false; - } - } - - // Example: create new table - $table = $GLOBALS['xoopsDB']->prefix('mymodule2_categories'); - $check = $GLOBALS['xoopsDB']->queryF("SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='$table'"); - $numRows = $GLOBALS['xoopsDB']->getRowsNum($check); - if (!$numRows) { - // create new table 'mymodule2_categories' - $sql = "CREATE TABLE `$table` ( - `cat_id` INT(8) UNSIGNED NOT NULL AUTO_INCREMENT, - `cat_text` VARCHAR(100) NOT NULL DEFAULT '', - `cat_date` INT(8) NOT NULL DEFAULT '0', - `cat_submitter` INT(8) NOT NULL DEFAULT '0', - PRIMARY KEY (`cat_id`) - ) ENGINE=InnoDB;"; - if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) { - xoops_error($GLOBALS['xoopsDB']->error() . '
' . $sql); - $module->setErrors("Error when creating table '$table'."); - $ret = false; - } - } - */ - return $ret; -} diff --git a/testdata/mymodule2/include/xoops_version.inc.php b/testdata/mymodule2/include/xoops_version.inc.php deleted file mode 100644 index d9c76190..00000000 --- a/testdata/mymodule2/include/xoops_version.inc.php +++ /dev/null @@ -1,40 +0,0 @@ - - Website:
- Help:
- My Module 2
-
-
\ No newline at end of file
diff --git a/testdata/mymodule2/language/english/help/index.html b/testdata/mymodule2/language/english/help/index.html
deleted file mode 100644
index 74b6f45c..00000000
--- a/testdata/mymodule2/language/english/help/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/testdata/mymodule2/language/english/index.html b/testdata/mymodule2/language/english/index.html
deleted file mode 100644
index 74b6f45c..00000000
--- a/testdata/mymodule2/language/english/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/testdata/mymodule2/language/english/mail_template/category_new_notify.tpl b/testdata/mymodule2/language/english/mail_template/category_new_notify.tpl
deleted file mode 100644
index 15071a28..00000000
--- a/testdata/mymodule2/language/english/mail_template/category_new_notify.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-// ---------- Templates Mail Content Dummy ---------- //
-Hello {X_UNAME},
-
-A new story "{STORY_NAME}" has been added at {X_SITENAME}.
-
-You can view this story here:
-{STORY_URL}
-
------------
-
-You are receiving this message because you selected to be notified when new stories are added to our site.
-
-If this is an error or you wish not to receive further such notifications, please update your subscriptions by visiting the link below:
-{X_UNSUBSCRIBE_URL}
-
-Please do not reply to this message.
-
------------
-
-{X_SITENAME} ({X_SITEURL})
-webmaster
-{X_ADMINMAIL}
\ No newline at end of file
diff --git a/testdata/mymodule2/language/english/mail_template/index.html b/testdata/mymodule2/language/english/mail_template/index.html
deleted file mode 100644
index 74b6f45c..00000000
--- a/testdata/mymodule2/language/english/mail_template/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/testdata/mymodule2/language/english/main.php b/testdata/mymodule2/language/english/main.php
deleted file mode 100644
index be3faabc..00000000
--- a/testdata/mymodule2/language/english/main.php
+++ /dev/null
@@ -1,99 +0,0 @@
- - Website:Help:
- My Module 2
-
-
- Description
-
- The My Module 2 module can be used to modules in XOOPS
-
Install/uninstall
-
-No special measures necessary, follow the standard installation process and extract the mymodule2 folder into the ../modules directory. Install the module through Admin -> System Module -> Modules.
-Detailed instructions on installing modules are available in the XOOPS Operations Manual
-
Features
-
- The TDMCreate module continues to expand, to get to the conditions to create modules, more and more sophisticated.
- For this reason, I invite all developers to report and send in svn any changes or additions to this module, so that we can jointly contribute to the development
-
Tutorial
-- You can find a more detailed to this Video Tutorial here -
- --As you can see, you have created a page with a list of links at the top to navigate between the pages of your module. This description is only visible on the homepage of this module, the other pages you will see the content you created when you built this module with the module TDMCreate, and after creating new content in admin of this module. In order to expand this module with other resources, just add the code you need to extend the functionality of the same. The files are grouped by type, from the header to the footer to see how divided the source code.
If you see this message, it is because you have not created content for this module. Once you have created any type of content, you will not see this message.
If you liked the module TDMCreate and thanks to the long process for giving the opportunity to the new module to be created in a moment, consider making a donation to keep the module TDMCreate and make a donation using this button
Thanks!
Use the link below to go to the admin and create content."); -define('_MA_MYMODULE2_NO_PDF_LIBRARY', 'Libraries TCPDF not there yet, upload them in root/Frameworks'); -define('_MA_MYMODULE2_NO', 'No'); -// ---------------- Contents ---------------- -// Category -define('_MA_MYMODULE2_CATEGORY', 'Category'); -define('_MA_MYMODULE2_CATEGORIES', 'Categories'); -define('_MA_MYMODULE2_CATEGORIES_TITLE', 'Categories title'); -define('_MA_MYMODULE2_CATEGORIES_DESC', 'Categories description'); -// Caption of Category -define('_MA_MYMODULE2_CATEGORY_ID', 'Id'); -define('_MA_MYMODULE2_CATEGORY_NAME', 'Name'); -define('_MA_MYMODULE2_CATEGORY_LOGO', 'Logo'); -define('_MA_MYMODULE2_CATEGORY_CREATED', 'Created'); -define('_MA_MYMODULE2_CATEGORY_SUBMITTER', 'Submitter'); -// Article -define('_MA_MYMODULE2_ARTICLE', 'Article'); -define('_MA_MYMODULE2_ARTICLES', 'Articles'); -define('_MA_MYMODULE2_ARTICLES_TITLE', 'Articles title'); -define('_MA_MYMODULE2_ARTICLES_DESC', 'Articles description'); -// Caption of Article -define('_MA_MYMODULE2_ARTICLE_ID', 'Id'); -define('_MA_MYMODULE2_ARTICLE_CAT', 'Cat'); -define('_MA_MYMODULE2_ARTICLE_TITLE', 'Title'); -define('_MA_MYMODULE2_ARTICLE_DESCR', 'Descr'); -define('_MA_MYMODULE2_ARTICLE_IMG', 'Img'); -define('_MA_MYMODULE2_ARTICLE_STATUS', 'Status'); -define('_MA_MYMODULE2_ARTICLE_FILE', 'File'); -define('_MA_MYMODULE2_ARTICLE_CREATED', 'Created'); -define('_MA_MYMODULE2_ARTICLE_SUBMITTER', 'Submitter'); -// Testfield -define('_MA_MYMODULE2_TESTFIELD', 'Testfield'); -define('_MA_MYMODULE2_TESTFIELDS', 'Testfields'); -define('_MA_MYMODULE2_TESTFIELDS_TITLE', 'Testfields title'); -define('_MA_MYMODULE2_TESTFIELDS_DESC', 'Testfields description'); -// Caption of Testfield -define('_MA_MYMODULE2_TESTFIELD_ID', 'Id'); -define('_MA_MYMODULE2_TESTFIELD_TEXT', 'Text'); -define('_MA_MYMODULE2_TESTFIELD_TEXTAREA', 'Textarea'); -define('_MA_MYMODULE2_TESTFIELD_DHTML', 'Dhtml'); -define('_MA_MYMODULE2_TESTFIELD_CHECKBOX', 'Checkbox'); -define('_MA_MYMODULE2_TESTFIELD_YESNO', 'Yesno'); -define('_MA_MYMODULE2_TESTFIELD_SELECTBOX', 'Selectbox'); -define('_MA_MYMODULE2_TESTFIELD_USER', 'User'); -define('_MA_MYMODULE2_TESTFIELD_COLOR', 'Color'); -define('_MA_MYMODULE2_TESTFIELD_IMAGELIST', 'Imagelist'); -define('_MA_MYMODULE2_TESTFIELD_URLFILE', 'Urlfile'); -define('_MA_MYMODULE2_TESTFIELD_UPLIMAGE', 'Uplimage'); -define('_MA_MYMODULE2_TESTFIELD_UPLFILE', 'Uplfile'); -define('_MA_MYMODULE2_TESTFIELD_TEXTDATESELECT', 'Textdateselect'); -define('_MA_MYMODULE2_TESTFIELD_SELECTFILE', 'Selectfile'); -define('_MA_MYMODULE2_TESTFIELD_STATUS', 'Status'); -define('_MA_MYMODULE2_INDEX_THEREARE', 'There are %s Testfields'); -define('_MA_MYMODULE2_INDEX_LATEST_LIST', 'Last My Module 2'); -// Submit -define('_MA_MYMODULE2_SUBMIT', 'Submit'); -define('_MA_MYMODULE2_SUBMIT_TESTFIELD', 'Submit Testfield'); -define('_MA_MYMODULE2_SUBMIT_ALLPENDING', 'All testfield/script information are posted pending verification.'); -define('_MA_MYMODULE2_SUBMIT_DONTABUSE', 'Username and IP are recorded, so please do not abuse the system.'); -define('_MA_MYMODULE2_SUBMIT_ISAPPROVED', 'Your testfield has been approved'); -define('_MA_MYMODULE2_SUBMIT_PROPOSER', 'Submit a testfield'); -define('_MA_MYMODULE2_SUBMIT_RECEIVED', 'We have received your testfield info. Thank you !'); -define('_MA_MYMODULE2_SUBMIT_SUBMITONCE', 'Submit your testfield/script only once.'); -define('_MA_MYMODULE2_SUBMIT_TAKEDAYS', 'This will take many days to see your testfield/script added successfully in our database.'); -// Form -define('_MA_MYMODULE2_FORM_OK', 'Successfully saved'); -define('_MA_MYMODULE2_FORM_DELETE_OK', 'Successfully deleted'); -define('_MA_MYMODULE2_FORM_SURE_DELETE', "Are you sure to delete: %s "); -define('_MA_MYMODULE2_FORM_SURE_RENEW', "Are you sure to update: %s "); -// Admin link -define('_MA_MYMODULE2_ADMIN', 'Admin'); -// ---------------- End ---------------- diff --git a/testdata/mymodule2/language/english/modinfo.php b/testdata/mymodule2/language/english/modinfo.php deleted file mode 100644 index 3eb020f3..00000000 --- a/testdata/mymodule2/language/english/modinfo.php +++ /dev/null @@ -1,193 +0,0 @@ - - Website:
0 means that images keep original size
If original image is smaller the image will be not enlarged'); -define('_MI_MYMODULE2_MAXHEIGHT_IMAGE', 'Max height image'); -define('_MI_MYMODULE2_MAXHEIGHT_IMAGE_DESC', 'Set the max height which is allowed for uploading images (in pixel)
0 means that images keep original size
If original image is smaller the image will be not enlarged'); -define('_MI_MYMODULE2_MAXSIZE_FILE', 'Max size file'); -define('_MI_MYMODULE2_MAXSIZE_FILE_DESC', 'Define the max size for uploading files'); -define('_MI_MYMODULE2_MIMETYPES_FILE', 'Mime types file'); -define('_MI_MYMODULE2_MIMETYPES_FILE_DESC', 'Define the allowed mime types for uploading files'); -define('_MI_MYMODULE2_USE_TAG', 'Use TAG'); -define('_MI_MYMODULE2_USE_TAG_DESC', 'If you use tag module, check this option to yes'); -define('_MI_MYMODULE2_NUMB_COL', 'Number Columns'); -define('_MI_MYMODULE2_NUMB_COL_DESC', 'Number Columns to View.'); -define('_MI_MYMODULE2_DIVIDEBY', 'Divide By'); -define('_MI_MYMODULE2_DIVIDEBY_DESC', 'Divide by columns number.'); -define('_MI_MYMODULE2_TABLE_TYPE', 'Table Type'); -define('_MI_MYMODULE2_TABLE_TYPE_DESC', 'Table Type is the bootstrap html table.'); -define('_MI_MYMODULE2_PANEL_TYPE', 'Panel Type'); -define('_MI_MYMODULE2_PANEL_TYPE_DESC', 'Panel Type is the bootstrap html div.'); -define('_MI_MYMODULE2_IDPAYPAL', 'Paypal ID'); -define('_MI_MYMODULE2_IDPAYPAL_DESC', 'Insert here your PayPal ID for donactions.'); -define('_MI_MYMODULE2_ADVERTISE', 'Advertisement Code'); -define('_MI_MYMODULE2_ADVERTISE_DESC', 'Insert here the advertisement code'); -define('_MI_MYMODULE2_MAINTAINEDBY', 'Maintained By'); -define('_MI_MYMODULE2_MAINTAINEDBY_DESC', 'Allow url of support site or community'); -define('_MI_MYMODULE2_BOOKMARKS', 'Social Bookmarks'); -define('_MI_MYMODULE2_BOOKMARKS_DESC', 'Show Social Bookmarks in the single page'); -define('_MI_MYMODULE2_FACEBOOK_COMMENTS', 'Facebook comments'); -define('_MI_MYMODULE2_FACEBOOK_COMMENTS_DESC', 'Allow Facebook comments in the single page'); -define('_MI_MYMODULE2_DISQUS_COMMENTS', 'Disqus comments'); -define('_MI_MYMODULE2_DISQUS_COMMENTS_DESC', 'Allow Disqus comments in the single page'); -// Notifications -define('_MI_MYMODULE2_GLOBAL_NOTIFY', 'Global notify'); -define('_MI_MYMODULE2_GLOBAL_NOTIFY_DESC', 'Global notify desc'); -define('_MI_MYMODULE2_GLOBAL_MODIFY_NOTIFY', 'Global modify notify'); -define('_MI_MYMODULE2_GLOBAL_MODIFY_NOTIFY_CAPTION', 'Global modify notify caption'); -define('_MI_MYMODULE2_GLOBAL_MODIFY_NOTIFY_DESC', 'Global modify notify desc'); -define('_MI_MYMODULE2_GLOBAL_MODIFY_NOTIFY_SUBJECT', 'Global modify notify subject'); -define('_MI_MYMODULE2_GLOBAL_BROKEN_NOTIFY', 'Global broken notify'); -define('_MI_MYMODULE2_GLOBAL_BROKEN_NOTIFY_CAPTION', 'Global broken notify caption'); -define('_MI_MYMODULE2_GLOBAL_BROKEN_NOTIFY_DESC', 'Global broken notify desc'); -define('_MI_MYMODULE2_GLOBAL_BROKEN_NOTIFY_SUBJECT', 'Global broken notify subject'); -define('_MI_MYMODULE2_GLOBAL_SUBMIT_NOTIFY', 'Global submit notify'); -define('_MI_MYMODULE2_GLOBAL_SUBMIT_NOTIFY_CAPTION', 'Global submit notify caption'); -define('_MI_MYMODULE2_GLOBAL_SUBMIT_NOTIFY_DESC', 'Global submit notify desc'); -define('_MI_MYMODULE2_GLOBAL_SUBMIT_NOTIFY_SUBJECT', 'Global submit notify subject'); -define('_MI_MYMODULE2_GLOBAL_NEW_NOTIFY', 'Global new notify'); -define('_MI_MYMODULE2_GLOBAL_NEW_NOTIFY_CAPTION', 'Global new notify caption'); -define('_MI_MYMODULE2_GLOBAL_NEW_NOTIFY_DESC', 'Global new notify desc'); -define('_MI_MYMODULE2_GLOBAL_NEW_NOTIFY_SUBJECT', 'Global new notify subject'); -define('_MI_MYMODULE2_CATEGORY_NOTIFY', 'Category notify'); -define('_MI_MYMODULE2_CATEGORY_NOTIFY_DESC', 'Category notify desc'); -define('_MI_MYMODULE2_CATEGORY_NOTIFY_CAPTION', 'Category notify caption'); -define('_MI_MYMODULE2_CATEGORY_NOTIFY_SUBJECT', 'Category notify Subject'); -define('_MI_MYMODULE2_CATEGORY_SUBMIT_NOTIFY', 'Category submit notify'); -define('_MI_MYMODULE2_CATEGORY_SUBMIT_NOTIFY_CAPTION', 'Category submit notify caption'); -define('_MI_MYMODULE2_CATEGORY_SUBMIT_NOTIFY_DESC', 'Category submit notify desc'); -define('_MI_MYMODULE2_CATEGORY_SUBMIT_NOTIFY_SUBJECT', 'Category submit notify subject'); -define('_MI_MYMODULE2_TESTFIELD_NOTIFY', 'Testfield notify'); -define('_MI_MYMODULE2_TESTFIELD_NOTIFY_DESC', 'Testfield notify desc'); -define('_MI_MYMODULE2_TESTFIELD_NOTIFY_CAPTION', 'Testfield notify caption'); -define('_MI_MYMODULE2_TESTFIELD_NOTIFY_SUBJECT', 'Testfield notify subject'); -define('_MI_MYMODULE2_GLOBAL_NEW_CATEGORY_NOTIFY', 'Global newcategory notify'); -define('_MI_MYMODULE2_GLOBAL_NEW_CATEGORY_NOTIFY_CAPTION', 'Global newcategory notify caption'); -define('_MI_MYMODULE2_GLOBAL_NEW_CATEGORY_NOTIFY_DESC', 'Global newcategory notify desc'); -define('_MI_MYMODULE2_GLOBAL_NEW_CATEGORY_NOTIFY_SUBJECT', 'Global newcategory notify subject'); -define('_MI_MYMODULE2_GLOBAL_TESTFIELD_MODIFY_NOTIFY', 'Global testfield modify notify'); -define('_MI_MYMODULE2_GLOBAL_TESTFIELD_MODIFY_NOTIFY_CAPTION', 'Global testfield modify notify caption'); -define('_MI_MYMODULE2_GLOBAL_TESTFIELD_MODIFY_NOTIFY_DESC', 'Global testfield modify notify desc'); -define('_MI_MYMODULE2_GLOBAL_TESTFIELD_MODIFY_NOTIFY_SUBJECT', 'Global testfield modify notify subject'); -define('_MI_MYMODULE2_GLOBAL_TESTFIELD_BROKEN_NOTIFY', 'Global testfield broken notify'); -define('_MI_MYMODULE2_GLOBAL_TESTFIELD_BROKEN_NOTIFY_CAPTION', 'Global testfield broken notify caption'); -define('_MI_MYMODULE2_GLOBAL_TESTFIELD_BROKEN_NOTIFY_DESC', 'Global testfield broken notify desc'); -define('_MI_MYMODULE2_GLOBAL_TESTFIELD_BROKEN_NOTIFY_SUBJECT', 'Global testfield broken notify subject'); -define('_MI_MYMODULE2_GLOBAL_TESTFIELD_SUBMIT_NOTIFY', 'Global testfield submit notify'); -define('_MI_MYMODULE2_GLOBAL_TESTFIELD_SUBMIT_NOTIFY_CAPTION', 'Global testfield submit notify caption'); -define('_MI_MYMODULE2_GLOBAL_TESTFIELD_SUBMIT_NOTIFY_DESC', 'Global testfield submit notify desc'); -define('_MI_MYMODULE2_GLOBAL_TESTFIELD_SUBMIT_NOTIFY_SUBJECT', 'Global testfield submit notify subject'); -define('_MI_MYMODULE2_GLOBAL_NEW_TESTFIELD_NOTIFY', 'Global new testfield notify'); -define('_MI_MYMODULE2_GLOBAL_NEW_TESTFIELD_NOTIFY_CAPTION', 'Global new testfield notify caption'); -define('_MI_MYMODULE2_GLOBAL_NEW_TESTFIELD_NOTIFY_DESC', 'Global new testfield notify desc'); -define('_MI_MYMODULE2_GLOBAL_NEW_TESTFIELD_NOTIFY_SUBJECT', 'Global new testfield notify subject'); -define('_MI_MYMODULE2_CATEGORY_TESTFIELD_SUBMIT_NOTIFY', 'Category testfield submit notify'); -define('_MI_MYMODULE2_CATEGORY_TESTFIELD_SUBMIT_NOTIFY_CAPTION', 'Category testfield submit notify caption'); -define('_MI_MYMODULE2_CATEGORY_TESTFIELD_SUBMIT_NOTIFY_DESC', 'Category testfield submit notify desc'); -define('_MI_MYMODULE2_CATEGORY_TESTFIELD_SUBMIT_NOTIFY_SUBJECT', 'Category testfield submit notify subject'); -define('_MI_MYMODULE2_CATEGORY_NEW_TESTFIELD_NOTIFY', 'Category new testfield notify'); -define('_MI_MYMODULE2_CATEGORY_NEW_TESTFIELD_NOTIFY_CAPTION', 'Category new testfield notify caption'); -define('_MI_MYMODULE2_CATEGORY_NEW_TESTFIELD_NOTIFY_DESC', 'Category new testfield notify desc'); -define('_MI_MYMODULE2_CATEGORY_NEW_TESTFIELD_NOTIFY_SUBJECT', 'Category new testfield notify subject'); -define('_MI_MYMODULE2_APPROVE_NOTIFY', 'Testfield approve notify'); -define('_MI_MYMODULE2_APPROVE_NOTIFY_CAPTION', 'Testfield approve notify caption'); -define('_MI_MYMODULE2_APPROVE_NOTIFY_DESC', 'Testfield approve notify desc'); -define('_MI_MYMODULE2_APPROVE_NOTIFY_SUBJECT', 'Testfield approve notify subject'); -// Permissions Groups -define('_MI_MYMODULE2_GROUPS', 'Groups access'); -define('_MI_MYMODULE2_GROUPS_DESC', 'Select general access permission for groups.'); -define('_MI_MYMODULE2_ADMIN_GROUPS', 'Admin Group Permissions'); -define('_MI_MYMODULE2_ADMIN_GROUPS_DESC', 'Which groups have access to tools and permissions page'); -define('_MI_MYMODULE2_UPLOAD_GROUPS', 'Upload Group Permissions'); -define('_MI_MYMODULE2_UPLOAD_GROUPS_DESC', 'Which groups have permissions to upload files'); -// ---------------- End ---------------- diff --git a/testdata/mymodule2/language/german/admin.php b/testdata/mymodule2/language/german/admin.php deleted file mode 100644 index 35b082cb..00000000 --- a/testdata/mymodule2/language/german/admin.php +++ /dev/null @@ -1,132 +0,0 @@ - - Website: