[xoops-svn] SF.net SVN: xoops-svn:[12566] XoopsModules/TDMCreate/branches/timgno/1.91/ TDMCreate/class/files

[<txm...@us...>]

Revision: 12566
          http://sourceforge.net/p/xoops/svn/12566
Author:   txmodxoops
Date:     2014-06-05 20:34:13 +0000 (Thu, 05 Jun 2014)
Log Message:
-----------


Modified Paths:
--------------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_permissions.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/class_files.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_blocks.php

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_permissions.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_permissions.php	2014-06-05 15:12:37 UTC (rev 12565)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_permissions.php	2014-06-05 20:34:13 UTC (rev 12566)
@@ -29,17 +29,14 @@
 	/*
 	* @var string
 	*/
-	private $tables = null;
+	private $tables = null;	
 	/*
-	* @var string
-	*/
-	private $fields = null;
-	/*
 	*  @public function constructor
 	*  @param null
 	*/
 	public function __construct() {    
-		$this->tdmcfile = TDMCreateFile::getInstance();		
+		$this->tdmcfile = TDMCreateFile::getInstance();	
+		$this->tdmcreate = TDMCreate::getInstance();
 	}
 	/*
 	*  @static function &getInstance
@@ -60,11 +57,10 @@
 	*  @param mixed $tables
 	*  @param string $filename
 	*/
-	public function write($module, $tables, $fields, $filename) {    
+	public function write($module, $tables, $filename) {    
 		$this->setModule($module);
 		$this->setFileName($filename);
 		$this->tables = $tables;
-		$this->fields = $fields;
 	}
 	/*
 	*  @public function render
@@ -155,19 +151,24 @@
         $table_permissions = ''; $table_name = '';
 		foreach(array_keys($this->tables) as $t) 
 		{
+			$table_id = $this->tables[$t]->getVar('table_id');
 			$table_permissions = $this->tables[$t]->getVar('table_permissions');
 			if($table_permissions == 1) {
 				$table_name = $this->tables[$t]->getVar('table_name');
 			}			
 		}
 		$fpif = ''; $fpmf = '';
-		foreach(array_keys($this->fields) as $f) 
+		$criteria_fields = new CriteriaCompo();
+		$criteria_fields->add(new Criteria('field_tid', $table_id));
+		$fields_all = $this->tdmcreate->getHandler('fields')->getObjects($criteria_fields);
+		unset($criteria_fields);		
+		foreach(array_keys($fields_all) as $f)
 		{
 			if($f == 1) {
-				$fpif = $this->fields[$f]->getVar('field_name');
+				$fpif = $fields_all[$f]->getVar('field_name');
 			}
-			if($this->fields[$f]->getVar('field_main') == 1) {
-				$fpmf = $this->fields[$f]->getVar('field_name');
+			if($fields_all[$f]->getVar('field_main') == 1) {
+				$fpmf = $fields_all[$f]->getVar('field_name');
 			}
 		}
 		$ret = <<<PRM

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/class_files.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/class_files.php	2014-06-05 15:12:37 UTC (rev 12565)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/class_files.php	2014-06-05 20:34:13 UTC (rev 12566)
@@ -201,7 +201,7 @@
 		$perm_submit = $this->getLanguage($module_name, 'AM', 'PERMISSIONS_SUBMIT');
 		$perm_view = $this->getLanguage($module_name, 'AM', 'PERMISSIONS_VIEW');
 		$ret = <<<EOT
-		\n//permissions
+		//permissions
 		\$member_handler = & xoops_gethandler ( 'member' );
 		\$group_list = &\$member_handler->getGroupList();
 		\$gperm_handler = &xoops_gethandler ( 'groupperm' );

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_blocks.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_blocks.php	2014-06-05 15:12:37 UTC (rev 12565)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_blocks.php	2014-06-05 20:34:13 UTC (rev 12566)
@@ -33,17 +33,14 @@
 	/*
 	* @var string
 	*/
-	private $tables = null;
+	private $tables = null;	
 	/*
-	* @var string
-	*/
-	private $fields = null;
-	/*
 	*  @public function constructor
 	*  @param null
 	*/
 	public function __construct() {    
 		$this->tdmcfile = TDMCreateFile::getInstance();
+		$this->tdmcreate = TDMCreate::getInstance();
 	}	
 	/*
 	*  @static function &getInstance
@@ -65,12 +62,11 @@
 	*  @param string $fields
 	*  @param string $filename
 	*/
-	public function write($module, $table, $tables, $fields, $filename) {    
+	public function write($module, $table, $tables, $filename) {    
 		$this->setModule($module);
 		$this->setFileName($filename);
 		$this->table = $table;
 		$this->tables = $tables;
-		$this->fields = $fields;
 	}
 	/*
 	*  @public function render
@@ -96,15 +92,20 @@
 EOT;
 		foreach (array_keys($this->tables) as $i) 
 		{
+			$table_id = $this->tables[$i]->getVar('table_id');
 			$table_name = $this->tables[$i]->getVar('table_name');
 			$table_fieldname = $this->tables[$i]->getVar('table_fieldname');			
 			$nb_caracteres = strlen($table_fieldname);
 			$table_blocks = $this->tables[$i]->getVar('table_blocks');
 			$language1 = $language.strtoupper($table_fieldname);			
 			$fpif = '';
-			foreach (array_keys($this->fields) as $f) 
+			$criteria_fields = new CriteriaCompo();
+			$criteria_fields->add(new Criteria('field_tid', $table_id));
+			$fields_all = $this->tdmcreate->getHandler('fields')->getObjects($criteria_fields);
+			unset($criteria_fields);
+			foreach (array_keys($fields_all) as $f) 
 			{	
-				$field_name = $this->fields[$f]->getVar('field_name');
+				$field_name = $fields_all[$f]->getVar('field_name');
                 if($f == 1) {
 					$fpif = $field_name;
 				}