Clear chace before compiling

txmodxoops · May 23, 2015 · 70de646 · 70de646
1 parent 967897e
commit 70de646
Show file tree

Hide file tree

Showing 56 changed files with 3,388 additions and 547 deletions.
diff --git a/admin/building.php b/admin/building.php
@@ -22,10 +22,17 @@
 $op        = XoopsRequest::getString('op', 'default');
 $mid       = XoopsRequest::getInt('mod_id');
 $moduleObj = $tdmcreate->getHandler('modules')->get($mid);
+// Clear cache
+$cacheFile1 = TDMC_CLASSES_PATH . '/cache/classpaths.cache';
+$cacheFile2 = TDMC_CLASSES_PATH . '/files/cache/classpaths.cache';
+if (file_exists($cacheFile1) && file_exists($cacheFile2)) {
+	unlink($cacheFile1);
+	unlink($cacheFile2);
+}
 // Switch option
 switch ($op) {
     case 'build':
-        $template_main = 'tdmcreate_building.tpl';
+        $templateMain = 'tdmcreate_building.tpl';
         $GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('building.php'));
         // Get var module dirname
         $moduleDirname = $moduleObj->getVar('mod_dirname');
@@ -72,7 +79,7 @@
 
     case 'default':
     default:
-        $template_main = 'tdmcreate_building.tpl';
+        $templateMain = 'tdmcreate_building.tpl';
         $GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('building.php'));
         // Redirect if there aren't modules
         $nbModules = $tdmcreate->getHandler('modules')->getCount();

diff --git a/admin/fields.php b/admin/fields.php
@@ -34,7 +34,7 @@
         $start = XoopsRequest::getInt('start', 0);
 		$limit = XoopsRequest::getInt('limit', $tdmcreate->getConfig('tables_adminpager'));
 		// Define main template
-		$template_main = 'tdmcreate_fields.tpl';
+		$templateMain = 'tdmcreate_fields.tpl';
 		$GLOBALS['xoTheme']->addStylesheet( 'modules/tdmcreate/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');
@@ -143,7 +143,7 @@
 
     case 'new': 
 		// Define main template
-		$template_main = 'tdmcreate_fields.tpl';
+		$templateMain = 'tdmcreate_fields.tpl';
 		$GLOBALS['xoTheme']->addStylesheet( 'modules/tdmcreate/assets/css/admin/style.css' );
 		$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('fields.php'));
 		$adminMenu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php', 'list'); 
@@ -227,7 +227,7 @@
 
 	case 'edit':
 		// Define main template
-		$template_main = 'tdmcreate_fields.tpl';
+		$templateMain = 'tdmcreate_fields.tpl';
 		$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('fields.php'));
 		$adminMenu->addItemButton(_AM_TDMCREATE_ADD_TABLE, 'tables.php?op=new', 'add');
 		$adminMenu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php', 'list');

diff --git a/admin/footer.php b/admin/footer.php
@@ -19,7 +19,7 @@
  * @version         $Id: footer.php 12207 2013-10-23 02:46:52Z beckmi $
  */
 $GLOBALS['xoopsTpl']->assign('module_name', $GLOBALS['xoopsModule']->getVar('name'));
-if (isset($template_main)) {
-    $GLOBALS['xoopsTpl']->display("db:{$template_main}");
+if (isset($templateMain)) {
+    $GLOBALS['xoopsTpl']->display("db:{$templateMain}");
 }
 xoops_cp_footer();
diff --git a/admin/index.php b/admin/index.php
@@ -24,7 +24,7 @@
 $count_tables  = $tdmcreate->getHandler('tables')->getCount($criteria);
 $count_fields  = $tdmcreate->getHandler('fields')->getCount($criteria);
 unset($criteria);
-$template_main = 'tdmcreate_index.tpl';
+$templateMain = 'tdmcreate_index.tpl';
 $adminMenu->addInfoBox(_AM_TDMCREATE_ADMIN_NUMMODULES);
 $adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>' . _AM_TDMCREATE_THEREARE_NUMMODULES . '</label>', $count_modules, 'Green');
 $adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>' . _AM_TDMCREATE_THEREARE_NUMTABLES . '</label>', $count_tables, 'Orange');

diff --git a/admin/modules.php b/admin/modules.php
@@ -30,7 +30,7 @@
         $start = XoopsRequest::getInt('start', 0);
         $limit = XoopsRequest::getInt('limit', $tdmcreate->getConfig('modules_adminpager'));
         // Define main template
-        $template_main = 'tdmcreate_modules.tpl';
+        $templateMain = 'tdmcreate_modules.tpl';
         $GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/functions.js');
         $GLOBALS['xoTheme']->addStylesheet('modules/tdmcreate/assets/css/admin/style.css');
         $GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('modules.php'));
@@ -83,7 +83,7 @@
 
     case 'new':
         // Define main template
-        $template_main = 'tdmcreate_modules.tpl';
+        $templateMain = 'tdmcreate_modules.tpl';
         $GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/functions.js');
         $GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('modules.php'));
         $adminMenu->addItemButton(_AM_TDMCREATE_MODULES_LIST, 'modules.php', 'list');
@@ -177,7 +177,7 @@
 
     case 'edit':
         // Define main template
-        $template_main = 'tdmcreate_modules.tpl';
+        $templateMain = 'tdmcreate_modules.tpl';
         $GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/functions.js');
         $GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('modules.php'));
         $adminMenu->addItemButton(_AM_TDMCREATE_ADD_MODULE, 'modules.php?op=new', 'add');

diff --git a/admin/settings.php b/admin/settings.php
@@ -22,25 +22,25 @@
 // Recovered value of argument op in the URL $
 $op = XoopsRequest::getString('op', 'edit');
 //
-$modId = XoopsRequest::getInt('set_id');
+$setId = XoopsRequest::getInt('set_id');
 //
 switch ($op) {
     case 'edit':
     default:
         // Define main template
-        $template_main = 'tdmcreate_settings.tpl';
+        $templateMain = 'tdmcreate_settings.tpl';
         $GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('settings.php'));
-        $settingsObj = $tdmcreate->getHandler('settings')->get($modId);
-        $form       = $settingsObj->getForm();
+        $settingsObj = $tdmcreate->getHandler('settings')->get($setId);
+        $form        = $settingsObj->getForm();
         $GLOBALS['xoopsTpl']->assign('form', $form->render());
         break;
 
     case 'save':
         if (!$GLOBALS['xoopsSecurity']->check()) {
             redirect_header('settings.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
         }
-		if (isset($modId)) {
-            $settingsObj =& $tdmcreate->getHandler('settings')->get($modId);
+		if (isset($setId)) {
+            $settingsObj =& $tdmcreate->getHandler('settings')->get($setId);
         } 
         $moduleDirname = preg_replace('/[^a-zA-Z0-9]\s+/', '', strtolower($_POST['set_dirname']));
         //Form module save

diff --git a/admin/tables.php b/admin/tables.php
@@ -36,7 +36,7 @@
         $start = XoopsRequest::getInt('start', 0);
         $limit = XoopsRequest::getInt('limit', $tdmcreate->getConfig('modules_adminpager'));
         // Define main template
-        $template_main = 'tdmcreate_tables.tpl';
+        $templateMain = 'tdmcreate_tables.tpl';
         $GLOBALS['xoTheme']->addStylesheet('modules/tdmcreate/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');
@@ -132,7 +132,7 @@
 
     case 'new':
         // Define main template
-        $template_main = 'tdmcreate_tables.tpl';
+        $templateMain = 'tdmcreate_tables.tpl';
         $GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('tables.php'));
         $adminMenu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php', 'list');
         $GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton());
@@ -230,7 +230,7 @@
 
     case 'edit':
         // Define main template
-        $template_main = 'tdmcreate_tables.tpl';
+        $templateMain = 'tdmcreate_tables.tpl';
         $GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('tables.php'));
         $adminMenu->addItemButton(_AM_TDMCREATE_ADD_TABLE, 'tables.php?op=new', 'add');
         $adminMenu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php?op=list', 'list');

diff --git a/class/files/TDMCreateArchitecture.php b/class/files/TDMCreateArchitecture.php
@@ -31,6 +31,7 @@ class TDMCreateArchitecture extends TDMCreateStructure
     * @var mixed
     */
     private $tdmcreate;
+
     /*
     * @var mixed
     */
@@ -46,6 +47,7 @@ class TDMCreateArchitecture extends TDMCreateStructure
     public function __construct()
     {
         $this->tdmcreate = TDMCreateHelper::getInstance();
+		$this->tdmcfile  = TDMCreateFile::getInstance();
         $this->structure = TDMCreateStructure::getInstance();
         $this->structure->setUploadPath(TDMC_UPLOAD_REPOSITORY_PATH);
     }
@@ -80,10 +82,7 @@ public function createBaseFoldersFiles($module)
         $modId    = $module->getVar('mod_id');
         $language = $GLOBALS['xoopsConfig']['language'];
         // Id of tables
-        $criteria = new CriteriaCompo();
-        $criteria->add(new Criteria('table_mid', $modId));		
-        $tables = $this->tdmcreate->getHandler('tables')->getObjects($criteria);
-        unset($criteria);
+        $tables = $this->tdmcfile->getTableTables($modId);
         //
         $table = null;
         foreach (array_keys($tables) as $t) {
@@ -96,6 +95,8 @@ public function createBaseFoldersFiles($module)
         }
         //
         $indexFile       = XOOPS_UPLOAD_PATH . '/index.html';
+		$cache1          = TDMC_CLASSES_PATH . '/cache';
+		$cache2          = TDMC_CLASSES_PATH . '/files/cache';
         $stlModuleAuthor = str_replace(' ', '', strtolower($module->getVar('mod_author')));
         $this->structure->setModuleName($module->getVar('mod_dirname'));
         $uploadPath = $this->structure->getUploadPath();
@@ -173,6 +174,8 @@ public function createBaseFoldersFiles($module)
         $this->structure->makeDirAndCopyFile('language/english', $indexFile, 'index.html');
         // Creation of "language/english/help" folder and index.html file
         $this->structure->makeDirAndCopyFile('language/english/help', $indexFile, 'index.html');
+		// Creation of "preloads" folder and index.html file
+        $this->structure->makeDirAndCopyFile('preloads', $indexFile, 'index.html');
         if (1 == $module->getVar('mod_admin')) {
             // Creation of "templates" folder and index.html file
             $this->structure->makeDirAndCopyFile('templates', $indexFile, 'index.html');
@@ -210,16 +213,11 @@ public function createBaseFoldersFiles($module)
     public function createFilesToBuilding($module)
     {
         // Module
-        $modId               = $module->getVar('mod_id');
-        $moduleDirname       = $module->getVar('mod_dirname');
-        $icon32              = 'assets/icons/32';
-        // Id of tables
-        $criteria = new CriteriaCompo();
-        $criteria->add(new Criteria('table_mid', $modId));
-		$criteria->setSort('table_order');
-        $tables = $this->tdmcreate->getHandler('tables')->getObjects($criteria);
-        unset($criteria);
-        $ret = array();
+        $modId          = $module->getVar('mod_id');
+        $moduleDirname  = $module->getVar('mod_dirname');
+        $icon32         = 'assets/icons/32';
+        $tables 		= $this->tdmcfile->getTableTables($modId);
+        $ret 			= array();
         //
         $table = array();
         foreach (array_keys($tables) as $t) {
@@ -353,7 +351,7 @@ public function createFilesToBuilding($module)
 			if (1 == $table->getVar('table_permissions')) {
 				// Admin Permissions File
 				$adminPermissions = AdminPermissions::getInstance();
-				$adminPermissions->write($module, $tables, 'permissions.php');
+				$adminPermissions->write($module, $table, $tables, 'permissions.php');
 				$ret[] = $adminPermissions->render();
 				// Templates Admin Permissions File
 				$adminTemplatesPermissions = TemplatesAdminPermissions::getInstance();
@@ -447,18 +445,90 @@ public function createFilesToBuilding($module)
                 $userNotificationUpdate = UserNotificationUpdate::getInstance();
                 $userNotificationUpdate->write($module, 'notification_update.php');
                 $ret[] = $userNotificationUpdate->render();
+            }
+			// User Broken File
+            if ((1 == $table->getVar('table_broken'))) {
+                $userBroken = UserBroken::getInstance();
+                $userBroken->write($module, $table, 'broken.php');
+                $ret[] = $userBroken->render();
+				// User Templates Broken File
+                $userTemplatesBroken = TemplatesUserBroken::getInstance();
+                $userTemplatesBroken->write($module, $table);
+                $ret[] = $userTemplatesBroken->renderFile($moduleDirname . '_broken.tpl');
+            }
+			// User Pdf File
+            if ((1 == $table->getVar('table_pdf'))) {
+                $userPdf = UserPrint::getInstance();
+                $userPdf->write($module, $table, 'pdf.php');
+                $ret[] = $userPdf->render();
+				// User Templates Pdf File
+                $userTemplatesPdf = TemplatesUserPdf::getInstance();
+                $userTemplatesPdf->write($module, $table);
+                $ret[] = $userTemplatesPdf->renderFile($moduleDirname . '_pdf.tpl');
             }
 			// User Print File
             if ((1 == $table->getVar('table_print'))) {
                 $userPrint = UserPrint::getInstance();
                 $userPrint->write($module, $table, 'print.php');
                 $ret[] = $userPrint->render();
+				// User Templates Print File
+                $userTemplatesPrint = TemplatesUserPrint::getInstance();
+                $userTemplatesPrint->write($module, $table);
+                $ret[] = $userTemplatesPrint->renderFile($moduleDirname . '_print.tpl');
+            }
+			// User Rate File
+            if ((1 == $table->getVar('table_rate'))) {
+                $userRate = UserRate::getInstance();
+                $userRate->write($module, $table, 'rate.php');
+                $ret[] = $userRate->render();
+				// User Templates Rate File
+                $userTemplatesRate = TemplatesUserRate::getInstance();
+                $userTemplatesRate->write($module, $table);
+                $ret[] = $userTemplatesRate->renderFile($moduleDirname . '_rate.tpl');
             }
 			// User Rss File
             if ((1 == $table->getVar('table_rss'))) {
                 $userRss = UserRss::getInstance();
                 $userRss->write($module, $table, 'rss.php');
                 $ret[] = $userRss->render();
+				// User Templates Rss File
+                $userTemplatesRss = TemplatesUserRss::getInstance();
+                $userTemplatesRss->write($module, $table);
+                $ret[] = $userTemplatesRss->renderFile($moduleDirname . '_rss.tpl');
+            }
+			// User Single File
+            if ((1 == $table->getVar('table_single'))) {
+                $userSingle = UserSingle::getInstance();
+                $userSingle->write($module, $table, 'single.php');
+                $ret[] = $userSingle->render();
+				// User Templates Single File
+                $userTemplatesSingle = TemplatesUserSingle::getInstance();
+                $userTemplatesSingle->write($module, $table);
+                $ret[] = $userTemplatesSingle->renderFile($moduleDirname . '_single.tpl');
+            }
+			// User Submit File
+            if ((1 == $table->getVar('table_submit'))) {
+                $userSubmit = UserSubmit::getInstance();
+                $userSubmit->write($module, $table, 'submit.php');
+                $ret[] = $userSubmit->render();
+				// User Templates Submit File
+                $userTemplatesSubmit = TemplatesUserSubmit::getInstance();
+                $userTemplatesSubmit->write($module, $table);
+                $ret[] = $userTemplatesSubmit->renderFile($moduleDirname . '_submit.tpl');
+            }// User Visit File
+            if ((1 == $table->getVar('table_visit'))) {
+                $userVisit = UserVisit::getInstance();
+                $userVisit->write($module, $table, 'visit.php');
+                $ret[] = $userVisit->render();
+            }
+			// User Tag Files
+            if ((1 == $table->getVar('table_tag'))) {
+                $userListTag = UserListTag::getInstance();
+                $userListTag->write($module, 'list.tag.php');
+                $ret[] = $userListTag->render();
+				$userViewTag = UserViewTag::getInstance();
+                $userViewTag->write($module, 'view.tag.php');
+                $ret[] = $userViewTag->render();
             }
             // User Index File
             $userIndex = UserIndex::getInstance();

diff --git a/class/files/TDMCreateTableFields.php b/class/files/TDMCreateTableFields.php
@@ -32,16 +32,34 @@ public function __construct()
     {
         $this->tdmcreate = TDMCreateHelper::getInstance();
     }
+
+	/**
+     *  @public function getTableTables
+     *  @param  $mId
+     *  @return mixed
+     */
+    public function getTableTables($mId)
+    {
+        $criteria = new CriteriaCompo();
+        $criteria->add(new Criteria('table_mid', $mId)); // $mId = module Id
+		$criteria->setSort('table_order');
+        $tables = $this->tdmcreate->getHandler('tables')->getObjects($criteria);
+        unset($criteria);
+
+        return $tables;
+    }
 
     /**
      *  @public function getTableFields
-     *  @param $tableId
+     *  @param $mId
+	 *  @param $tId
      *  @return mixed
      */
-    public function getTableFields($tableId)
+    public function getTableFields($mId, $tId)
     {
         $criteria = new CriteriaCompo();
-        $criteria->add(new Criteria('field_tid', $tableId));
+        $criteria->add(new Criteria('field_mid', $mId)); // $mId = module Id
+		$criteria->add(new Criteria('field_tid', $tId)); // $tId = table Id
 		$criteria->setSort('field_order');
         $fields = $this->tdmcreate->getHandler('fields')->getObjects($criteria);
         unset($criteria);

diff --git a/class/files/admin/AdminAbout.php b/class/files/admin/AdminAbout.php
@@ -85,7 +85,7 @@ public function render()
         $content         = $this->getHeaderFilesComments($module, $filename);
         $content .= <<<EOT
 include  __DIR__ . '/header.php';
-\$template_main = '{$moduleDirname}_admin_about.tpl';
+\$templateMain = '{$moduleDirname}_admin_about.tpl';
 \$GLOBALS['xoopsTpl']->assign('navigation', \$adminMenu->addNavigation('about.php'));
 \$GLOBALS['xoopsTpl']->assign('about', \$adminMenu->renderAbout('{$moduleDonations}', false));
 include  __DIR__ . '/footer.php';

diff --git a/class/files/admin/AdminFooter.php b/class/files/admin/AdminFooter.php
@@ -84,7 +84,7 @@ public function render()
         $moduleDirname = $module->getVar('mod_dirname');
         $content       = $this->getHeaderFilesComments($module, $filename);
         $content .= <<<EOT
-if ( isset(\$template_main)  ) {
+if ( isset(\$templateMain)  ) {
     \$GLOBALS['xoopsTpl']->display("db:{\$templateMain}");
 }
 xoops_cp_footer();

diff --git a/class/files/admin/AdminObjects.php b/class/files/admin/AdminObjects.php
@@ -301,8 +301,7 @@ public function getUploadImageGetVar($lpFieldName, $rpFieldName, $tableName, $fi
         $ret = <<<EOT
 \t\t\t\t// Get Var {$fieldName}
 \t\t\t\t\${$fieldName} = \${$tableName}All[\$i]->getVar('{$fieldName}');
-\t\t\t\t\$upload_image = \${$fieldName} ? \${$fieldName} : 'blank.gif';
-\t\t\t\t\${$lpFieldName}['{$rpFieldName}'] = \$upload_image;\n
+\t\t\t\t\${$lpFieldName}['{$rpFieldName}'] = \${$fieldName} ? \${$fieldName} : 'blank.gif';\n
 EOT;
         return $ret;
     }