xoops-svn Mailing List for XOOPS Web Application System (Page 34)

The world's leading content management systems (CMS) written in PHP

Brought to you by: angelorocha, beckmi, cesag, irmtfan, and 3 others

xoops-svn — All SVN commits will be posted to this ML

You can subscribe to this list here.

2012	Jan	Feb (214)	Mar (139)	Apr (198)	May (187)	Jun (151)	Jul (210)	Aug (169)	Sep (58)	Oct (53)	Nov (54)	Dec (301)
2013	Jan (348)	Feb (178)	Mar (219)	Apr (154)	May (117)	Jun (194)	Jul (61)	Aug (132)	Sep (121)	Oct (110)	Nov (11)	Dec (18)
2014	Jan (34)	Feb (50)	Mar (82)	Apr (98)	May (39)	Jun (111)	Jul (67)	Aug (36)	Sep (33)	Oct (26)	Nov (53)	Dec (44)
2015	Jan (29)	Feb (47)	Mar (25)	Apr (19)	May (23)	Jun (20)	Jul (49)	Aug (7)	Sep (10)	Oct (10)	Nov (4)	Dec (25)
2016	Jan (8)	Feb (7)	Mar (1)	Apr	May (3)	Jun	Jul (1)	Aug (2)	Sep	Oct	Nov (7)	Dec (5)
2017	Jan (4)	Feb	Mar	Apr	May (15)	Jun	Jul (18)	Aug (24)	Sep	Oct (14)	Nov	Dec
2018	Jan	Feb (22)	Mar	Apr (11)	May (1)	Jun (17)	Jul (2)	Aug (2)	Sep	Oct (6)	Nov (5)	Dec
2019	Jan	Feb	Mar	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (2)
2025	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (2)	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 32 33 34 35 36 .. 181 > >> (Page 34 of 181)

[xoops-svn] SF.net SVN: xoops-svn:[12542] XoopsModules/TDMCreate/branches/timgno/1.91/ TDMCreate/include/common.php

From: <txm...@us...> - 2014-05-20 18:39:30

Revision: 12542
          http://sourceforge.net/p/xoops/svn/12542
Author:   txmodxoops
Date:     2014-05-20 18:39:28 +0000 (Tue, 20 May 2014)
Log Message:
-----------


Modified Paths:
--------------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php	2014-05-20 18:20:21 UTC (rev 12541)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php	2014-05-20 18:39:28 UTC (rev 12542)
@@ -52,7 +52,7 @@
 include_once TDMC_PATH . $cf .'admin_pages.php';
 include_once TDMC_PATH . $cf .'admin_permissions.php';
 include_once TDMC_PATH . $cf .'admin_templates.php';
-include_once TDMC_PATH . $cf .'blocks_pages.php';
+include_once TDMC_PATH . $cf .'blocks_files.php';
 include_once TDMC_PATH . $cf .'blocks_templates.php';
 include_once TDMC_PATH . $cf .'class_files.php';
 include_once TDMC_PATH . $cf .'css_styles.php';

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

From: <txm...@us...> - 2014-05-20 18:20:27

Revision: 12541
          http://sourceforge.net/p/xoops/svn/12541
Author:   txmodxoops
Date:     2014-05-20 18:20:21 +0000 (Tue, 20 May 2014)
Log Message:
-----------


Modified Paths:
--------------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_about.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_footer.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_header.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_index.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_menu.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_pages.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_permissions.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_templates.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/blocks_files.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/blocks_templates.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/class_files.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/css_styles.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/docs_files.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/file.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_comments.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_common.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_functions.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_install.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_jquery.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_notifications.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_search.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_admin.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_blocks.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_main.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_modinfo.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/sql_files.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/structure.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates_footer.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates_header.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates_index.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user_footer.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user_header.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user_index.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user_pages.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user_templates.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user_xoopsversion.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/functions.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_about.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_about.php	2014-05-19 23:23:50 UTC (rev 12540)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_about.php	2014-05-20 18:20:21 UTC (rev 12541)
@@ -66,7 +66,7 @@
 echo \$adminMenu->renderAbout('$module_donations', false);
 include 'footer.php';  
 EOT;
-		$this->tdmcfile->create($module_name, 'admin', null, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_footer.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_footer.php	2014-05-19 23:23:50 UTC (rev 12540)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_footer.php	2014-05-20 18:20:21 UTC (rev 12541)
@@ -70,7 +70,7 @@
             <a href='{$support_url}' title='Visit {$support_name}' class='tooltip' rel='external'>{$support_name}</a></div>";
 xoops_cp_footer();  
 EOT;
-		$this->tdmcfile->create($module_name, 'admin', null, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_header.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_header.php	2014-05-19 23:23:50 UTC (rev 12540)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_header.php	2014-05-20 18:20:21 UTC (rev 12541)
@@ -129,7 +129,7 @@
 xoops_cp_header();
 \$adminMenu = new ModuleAdmin();	
 EOT;
-		$this->tdmcfile->create($module_name, 'admin', null, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_index.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_index.php	2014-05-19 23:23:50 UTC (rev 12540)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_index.php	2014-05-20 18:20:21 UTC (rev 12541)
@@ -29,6 +29,10 @@
 	/*
 	* @var string
 	*/
+	private $table = null;
+	/*
+	* @var string
+	*/
 	private $tables = null;
 	/*
 	*  @public function constructor
@@ -101,7 +105,7 @@
 echo \$adminMenu->renderIndex();
 include_once 'footer.php';
 EOT;
-		$this->tdmcfile->create($module_name, 'admin', null, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_menu.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_menu.php	2014-05-19 23:23:50 UTC (rev 12540)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_menu.php	2014-05-20 18:20:21 UTC (rev 12541)
@@ -117,7 +117,7 @@
 EOT;
 		unset( $menu );
 		
-		$this->tdmcfile->create($module_name, 'admin', null, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_pages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_pages.php	2014-05-19 23:23:50 UTC (rev 12540)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_pages.php	2014-05-20 18:20:21 UTC (rev 12541)
@@ -27,16 +27,41 @@
 	*/
 	private $tdmcfile = null;
 	/*
+	* @var string
+	*/
+	private $table = null;
+	/*
+	* @var string
+	*/
+	private $tables = null;
+	/*
 	*  @public function constructor
 	*  @param string $module
+	*  @param mixed $table
 	*  @param string $filename
 	*/
-	public function __construct($module, $table, $filename) {    
+	public function __construct($module, $table, $tables, $filename) {    
 		$this->tdmcfile = TDMCreateFile::getInstance();
 		$this->setModule($module);
-		$this->setTable($table);
+		//$this->setTable($table);
 		$this->setFileName($filename);
+		$this->table = $table;
+		$this->tables = $tables;
 	}	
+	/*
+	*  @static function &getInstance
+	*  @param string $module
+	*  @param mixed $table
+	*  @param string $filename
+	*/
+	public static function &getInstance($module, $table, $tables, $filename)
+    {
+        static $instance = false;
+        if (!$instance) {
+            $instance = new self($module, $table, $tables, $filename);
+        }
+        return $instance;
+    }	
 	
 	/*
 	*  @public function getAdminPagesHeader
@@ -45,7 +70,7 @@
 	*/
 	public function getAdminPagesHeader($mod_name, $table_name) {  
 		
-		$ret .= <<<EOT
+		$ret = <<<EOT
 \ninclude_once 'header.php';
 //It recovered the value of argument op in URL$
 \$op = {$mod_name}_CleanVars(\$_REQUEST, 'op', 'list', 'string');
@@ -64,7 +89,7 @@
 	*/
 	public function getAdminPagesList($table_name, $language) {  
 		$stu_table_name = strtoupper($table_name);
-		$ret .= <<<EOT
+		$ret = <<<EOT
     case 'list': 
     default:  
 		\$limit = xoops_getModuleOption('adminpager');
@@ -98,7 +123,7 @@
 	*/
 	public function getAdminPagesNew($table_name, $language) {  
 		$stu_table_name = strtoupper($table_name);
-		$ret .= <<<EOT
+		$ret = <<<EOT
 	case 'new':          
         \$adminMenu->addItemButton({$language}_{$stu_table_name}_LIST, '{$table_name}.php', 'list');
         echo \$adminMenu->renderButton();
@@ -118,7 +143,7 @@
 	*/
 	public function getAdminPagesSave($table_name, $language) {  
 		$stu_table_name = strtoupper($table_name);
-		$ret .= <<<EOT
+		$ret = <<<EOT
 	case 'save':
 		if ( !\$GLOBALS['xoopsSecurity']->check() ) {
            redirect_header('{$table_name}.php', 3, implode(',', \$GLOBALS['xoopsSecurity']->getErrors()));
@@ -172,7 +197,7 @@
 	*/
 	public function getAdminPagesEdit($table_name, $language) {  
 		$stu_table_name = strtoupper($table_name);
-		$ret .= <<<EOT
+		$ret = <<<EOT
 	case 'edit':
         \$adminMenu->addItemButton({$language}_ADD_{$stu_table_name}, '{$table_name}.php?op=new', 'add');
 		\$adminMenu->addItemButton({$language}_{$stu_table_name}_LIST, '{$table_name}.php', 'list');
@@ -192,7 +217,7 @@
 	*/
 	public function getAdminPagesDelete($table_name, $language) {  
 		
-		$ret .= <<<EOT
+		$ret = <<<EOT
 	case 'delete':
 		\${$table_name}_obj =& \${$table_name}Handler->get(\$_REQUEST['{$fpif}']);
 		if (isset(\$_REQUEST['ok']) && \$_REQUEST['ok'] == 1) {
@@ -217,7 +242,7 @@
 	*  @param null
 	*/
 	public function getAdminPagesFooter() { 		
-		$ret .= <<<EOT
+		$ret = <<<EOT
 \n}
 include_once 'footer.php';
 EOT;
@@ -231,7 +256,7 @@
 	public function render() {    
         $module = $this->getModule();
 		$module_name = $module->getVar('mod_name');
-		$table_name = $this->getTable()->getVar('table_name');
+		$table_name = $this->table->getVar('table_name');
 		$filename = $this->getFileName();
 		$language = $this->getLanguage($module_name, 'AM');
 		$content = $this->getHeaderFilesComments($module, $filename);
@@ -241,7 +266,8 @@
 		$content .=	$this->getAdminPagesEdit($table_name, $language);
 		$content .=	$this->getAdminPagesDelete($table_name, $language);
 		$content .= $this->getAdminPagesFooter();
-		$this->tdmcfile->create($module_name, 'admin', null, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		//
+		$this->tdmcfile->create($module_name, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

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-05-19 23:23:50 UTC (rev 12540)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_permissions.php	2014-05-20 18:20:21 UTC (rev 12541)
@@ -31,10 +31,6 @@
 	*/
 	private $table = null;
 	/*
-	* @var string
-	*/
-	private $tables = null;
-	/*
 	*  @public function constructor
 	*  @param string $module
 	*  @param string $filename
@@ -68,7 +64,8 @@
         $module = $this->getModule();
 		//$table = $this->getTable();
 		$filename = $this->getFileName();
-		$module_name = $module->getVar('mod_name');		
+		$module_name = $module->getVar('mod_name');	
+        $table_name = $this->table->getVar('table_name');			
 		$language = $this->getLanguage($module_name, 'AM');
 		$content = $this->getHeaderFilesComments($module, $filename);
 		$content .= <<<EOT
@@ -157,7 +154,7 @@
 unset(\$permform);
 include_once 'footer.php';
 EOT;
-		$this->tdmcfile->create($module_name, 'admin', null, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_templates.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_templates.php	2014-05-19 23:23:50 UTC (rev 12540)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_templates.php	2014-05-20 18:20:21 UTC (rev 12541)
@@ -62,7 +62,7 @@
 		$module_name = $module->getVar('mod_name');
 		$language = $this->getLanguage($module_name, 'AM');	
 		$content = 'Under Construction';
-		$this->tdmcfile->create($module_name, 'templates', 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'templates/admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php	2014-05-19 23:23:50 UTC (rev 12540)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php	2014-05-20 18:20:21 UTC (rev 12541)
@@ -160,56 +160,89 @@
 	*/
 	public function createBuildingFiles( $module, $table, $tables, $fields )
 	{	
+		$upload_module_folder = $this->upload_path.'/'.strtolower($module->geVar('mod_name'));
 		$ret = array();
 		// Admin Aboutr File 
-		$adminAbout = AdminAbout::getInstance($module, 'about.php');		
+		$adminAbout = AdminAbout::getInstance($module, 'about.php');	
+		$ret[] = $adminAbout->render();	
 		// Admin Footer File 
-		$adminFooter = AdminFooter::getInstance($module, 'footer.php');		
+		$adminFooter = AdminFooter::getInstance($module, 'footer.php');	
+		$ret[] = $adminFooter->render();	
 		// Admin Header File 
 		$adminHeader = AdminHeader::getInstance($module, $table, $tables, 'header.php');
+		$ret[] = $adminHeader->render();
 		// Admin Index File
 		$adminIndex = AdminIndex::getInstance($module, $table, $tables, 'index.php');
+		$ret[] = $adminIndex->render();
 		// Admin Menu File
 		$adminMenu = AdminMenu::getInstance($module, $table, $tables, 'menu.php');
+		$ret[] = $adminMenu->render();
 		// Admin Permissions File
-		$adminPermissions = AdminPermissions::getInstance($module, $tables, 'permissions.php');
+		$adminPermissions = AdminPermissions::getInstance($module, $table, 'permissions.php');
+		$ret[] = $adminPermissions->render();	
 		// Admin Styles File
-		$cssStyles = CssStyles::getInstance($module, 'style.css');		
+		$cssStyles = CssStyles::getInstance($module, 'style.css');	
+		$ret[] = $cssStyles->render();	
 		// Admin Common File
 		$includeCommon = IncludeCommon::getInstance($module, 'common.php');
+		$ret[] = $includeCommon->render();
 		// Admin Functions File
 		$includeFunctions = IncludeFunctions::getInstance($module, 'functions.php');
+		$ret[] = $includeFunctions->render();
 		// Admin Install File
 		$includeInstall = IncludeInstall::getInstance($module, $table, $tables, $fields, 'install.php');
-		
-		$ret[] = $adminAbout->render();
-		$ret[] = $adminFooter->render();
-		$ret[] = $adminHeader->render();
-		$ret[] = $adminIndex->render();
-		$ret[] = $adminMenu->render();		
-		$ret[] = $cssStyles->render();
-		$ret[] = $includeCommon->render();
-		$ret[] = $includeFunctions->render();
-		$ret[] = $includeInstall->render();
-		
+		$ret[] = $includeInstall->render();		
+		// Multiple files
 		foreach (array_keys($tables) as $i)
 		{			
 			$table_name = $tables[$i]->getVar('table_name');
 			// Admin Pages File
-			$adminPages = AdminPages::getInstance($module, $tables, $table_name.'.php');
+			$adminPages = AdminPages::getInstance($module, $table, $tables, $table_name.'.php');
 			$ret[] = $adminPages->render();
 			// Admin Templates File
 			$adminTemplates = AdminTemplates::getInstance($module, $tables, $table_name.'.tpl');
 			$ret[] = $adminTemplates->render();
+			// Blocks Files
+			$blocksFiles = BlocksFiles::getInstance($module, $table, $table_name.'.php');
+			$ret[] = $blocksFiles->render();
+			// Blocks Templates File
+			$blocksTemplates = BlocksTemplates::getInstance($module, $table, $tables, $table_name.'.tpl');
+			$ret[] = $blocksTemplates->render();
+			// Class Files
+			$classFiles = ClassFiles::getInstance($module, $table, $tables, $table_name.'.php');
+			$ret[] = $classFiles->render();
 			// User Pages File
 			$userPages = UserPages::getInstance($module, $table, $table_name.'.php');
 			$ret[] = $userPages->render();
 			// User Templates File
 			$userTemplates = UserTemplates::getInstance($module, $table, $table_name.'.tpl');
 			$ret[] = $userTemplates->render();			
-		}		
-		//$ret[] = array($admin_pages, $admin_templates, $user_pages, $user_templates);
-		
+		}
+		// Language Admin File 
+		$languageAdmin = LanguageAdmin::getInstance($module, $table, $tables, 'admin.php');	
+		$ret[] = $languageAdmin->render();	
+		// Language Blocks File 
+		$languageBlocks = LanguageBlocks::getInstance($module, $table, $tables, 'blocks.php');
+		$ret[] = $languageBlocks->render();
+		// Language Main File
+		$languageMain = LanguageMain::getInstance($module, $table, $tables, 'main.php');
+		$ret[] = $languageMain->render();
+		// Language Modinfo File 
+		$languageModinfo = LanguageModinfo::getInstance($module, $table, $tables, 'modinfo.php');	
+		$ret[] = $languageModinfo->render();				
+		// User Footer File 
+		$userFooter = UserFooter::getInstance($module, 'footer.php');	
+		$ret[] = $userFooter->render();	
+		// User Header File 
+		$userHeader = UserHeader::getInstance($module, 'header.php');
+		$ret[] = $userHeader->render();
+		// User Index File
+		$userIndex = UserIndex::getInstance($module, $table, 'index.php');
+		$ret[] = $userIndex->render();
+		// User Xoops Version File
+		$userXoopsVersion = UserXoopsVersion::getInstance($module, $table, $tables, 'xoops_version.php');
+		$ret[] = $userXoopsVersion->render();
+				
 		return $ret;		 
 	}	
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/blocks_files.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/blocks_files.php	2014-05-19 23:23:50 UTC (rev 12540)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/blocks_files.php	2014-05-20 18:20:21 UTC (rev 12541)
@@ -16,7 +16,7 @@
  * @package         tdmcreate
  * @since           2.5.0
  * @author          Txmod Xoops http://www.txmodxoops.org
- * @version         $Id: blocks_files.php 12258 2014-01-02 09:33:29Z timgno $
+ * @version         $Id: blocks_pages.php 12258 2014-01-02 09:33:29Z timgno $
  */
 defined('XOOPS_ROOT_PATH') or die('Restricted access');
 
@@ -27,16 +27,22 @@
 	*/
 	private $tdmcfile = null;
 	/*
+	* @var string
+	*/
+	private $table = null;
+	/*
 	*  @public function constructor
 	*  @param string $module
-	*  @param string $file_name
+	*  @param mixed $table
+	*  @param string $filename
 	*/
-	public function __construct($module, $table, $file_name) {    
+	public function __construct($module, $table, $filename) {    
 		$this->tdmcfile = TDMCreateFile::getInstance();
 		$this->setModule($module);
-		$this->setTable($table);		
-		$this->setFileName($file_name);
-	}
+		//$this->setTable($table);
+		$this->setFileName($filename);
+		$this->table = $table;
+	}	
 	/*
 	*  @static function &getInstance
 	*  @param string $module
@@ -55,7 +61,11 @@
 	*  @public function getBlocksShow
 	*  @param null
 	*/
-	public function getBlocksShow() {    
+	public function getBlocksShow($module) {		
+		$mod_name = $module->getVar('mod_name');
+		$mod_name_lowercase = strtolower($mod_name);
+		$table_name = $this->table->getVar('table_name');
+		$table_fieldname = $this->table->getVar('table_fieldname');
 		$ret = <<<EOT
 \ninclude_once XOOPS_ROOT_PATH.'/modules/{$mod_name}/include/functions.php';	
 function b_{$mod_name_lowercase}_{$table_name}_show(\$options) 
@@ -74,7 +84,7 @@
 	array_shift(\$options);
 	array_shift(\$options);	
 EOT;
-		if ( $table_category == 1 ) {
+		if ( $this->table->getVar('table_category') == 1 ) {
 			$ret .= <<<EOT
 	\n\tif (!(count(\$options) == 1 && \$options[0] == 0)) {
 		\$criteria->add(new Criteria('{$table_fieldname}_category', {$mod_name}_block_addCatSelect(\$options), 'IN'));
@@ -122,7 +132,12 @@
 	*  @public function getBlocksEdit
 	*  @param null
 	*/
-	public function getBlocksEdit() {    
+	public function getBlocksEdit($module) {    
+		$mod_name = $module->getVar('mod_name');
+		$mod_name_lowercase = strtolower($mod_name);
+		$table_name = $this->table->getVar('table_name');
+		$table_fieldname = $this->table->getVar('table_fieldname');
+		
 		for ($i = 0; $i < $nb_fields; $i++)
 		{	    
 			$structure_fields = explode(':', $fields[$i]);
@@ -141,7 +156,7 @@
 {
 EOT;
 	
-		if ( $table_category == 1 ) {
+		if ( $this->table->getVar('table_category') == 1 ) {
 		$ret .=<<<EOT
 	\ninclude_once XOOPS_ROOT_PATH.'/modules/{$mod_name}/class/category.php';
 	
@@ -191,9 +206,9 @@
 		$filename = $this->getFileName();
 		$language = $this->getLanguage($module_name, 'MB');
 		$content = $this->getHeaderFilesComments($module, $filename);
-		$content .= $this->getBlocksShow();
-		$content .= $this->getBlocksEdit();
-		$this->tdmcfile->create($module_name, 'blocks', null, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$content .= $this->getBlocksShow($module);
+		$content .= $this->getBlocksEdit($module);
+		$this->tdmcfile->create($module_name, 'blocks', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/blocks_templates.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/blocks_templates.php	2014-05-19 23:23:50 UTC (rev 12540)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/blocks_templates.php	2014-05-20 18:20:21 UTC (rev 12541)
@@ -20,30 +20,55 @@
  */
 defined('XOOPS_ROOT_PATH') or die('Restricted access');
 
-class Blocks extends HtmlSmartyCodes
+class BlocksTemplates extends HtmlSmartyCodes
 {
 	/*
 	* @var string
 	*/
 	private $tdmcfile = null;
 	/*
+	* @var string
+	*/
+	private $table = null;
+	/*
+	* @var string
+	*/
+	private $tables = null;
+	/*
 	*  @public function constructor
 	*  @param string $module
-	*  @param string $file_name
+	*  @param mixed $table
+	*  @param string $filename
 	*/
-	public function __construct($module, $table, $file_name) {    
+	public function __construct($module, $table, $tables, $filename) {    
 		$this->tdmcfile = TDMCreateFile::getInstance();
 		$this->setModule($module);
-		$this->setTable($table);
-		$this->setFileName($file_name);
+		//$this->setTable($table);
+		$this->setFileName($filename);
+		$this->table = $table;
+		$this->tables = $tables;
 	}	
 	/*
+	*  @static function &getInstance
+	*  @param string $module
+	*  @param mixed $table
+	*  @param string $filename
+	*/
+	public static function &getInstance($module, $table, $tables, $filename)
+    {
+        static $instance = false;
+        if (!$instance) {
+            $instance = new self($module, $table, $tables, $filename);
+        }
+        return $instance;
+    }
+	/*
 	*  @public function render
 	*  @param null
 	*/
 	public function render() {    
 		$module = $this->getModule();
-		$table_nbfields = $this->getTable()->getVar('table_nbfields');
+		$table_nbfields = $this->table->getVar('table_nbfields');
 		$fields = $this->getFields();
 		$filename = $this->getFileName();
 		$module_name = $module->getVar('mod_name');
@@ -79,7 +104,7 @@
 	<{/foreach}>
 </table>	
 EOT;
-		$this->tdmcfile->create($module_name, 'templates/', 'blocks', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'templates/blocks', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

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-05-19 23:23:50 UTC (rev 12540)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/class_files.php	2014-05-20 18:20:21 UTC (rev 12541)
@@ -27,17 +27,27 @@
 	*/
 	private $tdmcfile = null;
 	/*
+	* @var string
+	*/
+	private $table = null;
+	/*
+	* @var string
+	*/
+	private $tables = null;
+	/*
 	*  @public function constructor
 	*  @param string $module
-	*  @param string $table
-	*  @param string $file_name
+	*  @param mixed $table
+	*  @param string $filename
 	*/
-	public function __construct($module, $table, $file_name) {    
+	public function __construct($module, $table, $tables, $filename) {    
 		$this->tdmcfile = TDMCreateFile::getInstance();
 		$this->setModule($module);
-		$this->setTable($table);
-		$this->setFileName($file_name);
-	}
+		//$this->setTable($table);
+		$this->setFileName($filename);
+		$this->table = $table;
+		$this->tables = $tables;
+	}	
 	/*
 	*  @static function &getInstance
 	*  @param string $module
@@ -150,9 +160,9 @@
 	*  @public function getHeadFunctionForm
 	*  @param string $form
 	*/
-	public function getHeadFunctionForm($elements_form) {    
-		$lang_add = $this->getLanguage('AM', 'ADD');
-		$lang_edit = $this->getLanguage('AM', 'EDIT');
+	public function getHeadFunctionForm($module_name, $elements_form) {    
+		$lang_add = $this->getLanguage($module_name, 'AM', 'ADD');
+		$lang_edit = $this->getLanguage($module_name, 'AM', 'EDIT');
 		$ret = <<<EOT
 	/*
 	 * Get form
@@ -180,9 +190,9 @@
 	*  @param string $fpif
 	*/
 	public function getPermissionsInFunctionForm($module_name, $fpif) {    
-		$perm_approve = $this->getLanguage('AM', 'PERMISSIONS_APPROVE');
-		$perm_submit = $this->getLanguage('AM', 'PERMISSIONS_SUBMIT');
-		$perm_view = $this->getLanguage('AM', 'PERMISSIONS_VIEW');
+		$perm_approve = $this->getLanguage($module_name, 'AM', 'PERMISSIONS_APPROVE');
+		$perm_submit = $this->getLanguage($module_name, 'AM', 'PERMISSIONS_SUBMIT');
+		$perm_view = $this->getLanguage($module_name, 'AM', 'PERMISSIONS_VIEW');
 		$ret = <<<EOT
 		\n//permissions
 		\$member_handler = & xoops_gethandler ( 'member' );
@@ -267,11 +277,11 @@
 	*/
 	public function render() {    
 		$module = $this->getModule();
-		$table_nbfields = $this->getTable()->getVar('table_nbfields');
-		$table_name = $this->getTable()->getVar('table_name');
+		$table_nbfields = $this->table->getVar('table_nbfields');
+		$table_name = $this->table->getVar('table_name');
 		$fields = $this->getFields();
 		$filename = $this->getFileName();
-		$module_name = $module->getVar('module_name');
+		$module_name = $module->getVar('mod_name');
 		$initvar = $this->getInitVars($table_nbfields, $fields);
 		
 		for ($i = 0; $i < $table_nbfields; $i++) {
@@ -284,13 +294,16 @@
 			}
 		}
 		
+		$elements_form = '/* -------------  Here function elements form ---------------------- */';
+		
 		$content = $this->getHeaderFilesComments($module, $filename);
 		$content .= $this->getHeadClass($module_name, $table_name, $initvar);
-		$content .= $this->getHeadFunctionForm(/*$form*/);
+		$content .= $this->getHeadFunctionForm($module_name, $elements_form);
 		$content .= $this->getPermissionsInFunctionForm($module_name, $fpif);
 		$content .= $this->getFootFunctionForm();
 		$content .= $this->getClassHandler($module_name, $table_name, $fpif, $fpmf);
-		$this->tdmcfile->create($module_name, 'class', null, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		
+		$this->tdmcfile->create($module_name, 'class', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/css_styles.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/css_styles.php	2014-05-19 23:23:50 UTC (rev 12540)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/css_styles.php	2014-05-20 18:20:21 UTC (rev 12541)
@@ -88,7 +88,7 @@
    list-style-image: none;
 }
 EOT;
-		$this->tdmcfile->create($module_name, 'css', null, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'css', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/docs_files.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/docs_files.php	2014-05-19 23:23:50 UTC (rev 12540)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/docs_files.php	2014-05-20 18:20:21 UTC (rev 12541)
@@ -152,7 +152,7 @@
 				$content = $this->getLangDiffFile($mod_version);
 			break;
 		}
-		$this->tdmcfile->create($module_name, 'docs', null, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'docs', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/file.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/file.php	2014-05-19 23:23:50 UTC (rev 12540)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/file.php	2014-05-20 18:20:21 UTC (rev 12541)
@@ -22,7 +22,8 @@
 
 require_once 'abstractfiles.php';
 xoops_load('XoopsFile');
-class TDMCreateFile extends TDMCreateAbstractFiles {	
+class TDMCreateFile extends TDMCreateAbstractFiles 
+{	
 	/*
 	* @var string
 	*/
@@ -71,19 +72,12 @@
     private $upload_path = null;
 
     /**
-     * "subdir" attribute of the files
+     * "folder_name" attribute of the files
      *
      * @var string
      */
-    private $subdir = null;	
-	
-	/**
-     * "subsubdir" attribute of the files
-     *
-     * @var string
-     */
-    private $subsubdir = null;	
-	
+    private $folder_name = null;		
+		
 	/*
 	* @var string
 	*/
@@ -133,7 +127,7 @@
 	*  @param mixed $notcreated
 	*  @param string $mode
 	*/
-	public function create($module_name, $subdir = null, $subsubdir = null, $filename, $content = '', $created = false, $notcreated = false, $mode = 'w+') {  		
+	public function create($module_name, $subdir = null, $filename, $content = '', $created = false, $notcreated = false, $mode = 'w+') {  		
 		$this->setFileName($filename);
 		$this->created = $created;
 		$this->notcreated = $notcreated;		
@@ -142,12 +136,9 @@
 		if(!empty($content) && is_string($content)) {
 			$this->setContent($content);
 		}	
-        if((!empty($subdir) || $subdir != null) && is_string($subdir)) {
+        if(isset($subdir) && is_string($subdir)) {
 			$this->setSubDir($subdir);
-		}
-		if((!empty($subsubdir) || $subsubdir != null) && is_string($subsubdir)) {
-			$this->setSubSubDir($subsubdir);
-		}
+		}		
 	}
 	
 	/*
@@ -168,10 +159,10 @@
 		
 	/*
 	*  @private function setModulePath
-	*  @param string $folder_name
+	*  @param string $module_name
 	*/
-	private function setModulePath($folder_name) {
-        $this->upload_path = TDMC_UPLOAD_MODULES_PATH . DIRECTORY_SEPARATOR . $folder_name;
+	private function setModulePath($module_name) {
+        $this->upload_path = TDMC_UPLOAD_MODULES_PATH . DIRECTORY_SEPARATOR . strtolower($module_name);
     }
 	
 	/*
@@ -196,23 +187,7 @@
 	*/
 	private function getSubDir() {
         return $this->subdir;
-    }
-	
-	/*
-	*  @private function setSubSubDir
-	*  @param string $subdir
-	*/
-	private function setSubSubDir($subsubdir) {
-        $this->subsubdir = $subsubdir;
-    }
-	
-	/*
-	*  @private function getSubSubDir
-	*  @param null
-	*/
-	private function getSubSubDir() {
-        return $this->subsubdir;
-    }
+    }	
 
 	/**
      * public function setFileName
@@ -237,8 +212,8 @@
      */
     public function setTable($table) {        
 		$this->table = null;
-		if (is_object($table)) {
-			$this->table = $table;
+		if (!is_object($table) || ($table instanceof TDMCreateTables)) {
+			$this->table = (object)$table;
 		} elseif (is_array($table)) {
             $this->table[] = $table;
         }
@@ -251,12 +226,12 @@
 	public function getTable() {   		 
 		if (is_array($this->table)) {
             $ret = array();
-            foreach ($this->table as $table) {
+            foreach($this->table as $table) {
                 $ret[] = $table;
             }
             return $ret;
-        } else {
-			return $this->table;
+        } elseif (!is_object($this->table)) {
+			return (object)$this->table;
 		} 
 	}
 	
@@ -266,7 +241,7 @@
      */
     public function setFields($fields) {
         $this->fields = null;
-		if (is_object($fields)) {
+		if (is_object($fields) || ($fields instanceof TDMCreateFields)) {
 			$this->fields = $fields;
 		} elseif (is_array($fields)) {
             $this->fields[] = $fields;
@@ -340,17 +315,15 @@
 	*  @public function getUploadPath
 	*  @param null
 	*/
-    private function getUploadPath() {
+    private function getUploadPath() {		
 		if ($this->getSubDir() != null) {
 			$ret = $this->getModulePath() . DIRECTORY_SEPARATOR . $this->getSubDir();
-		} elseif ($this->getSubSubDir() != null) {
-            $ret = $this->getModulePath() . DIRECTORY_SEPARATOR . $this->getSubDir() . DIRECTORY_SEPARATOR . $this->getSubSubDir();
-        } else {
+		} else {
             $ret = $this->getModulePath();
-        }
+        } 
         return $ret;
-    }	
-	
+    }
+    	
 	/*
 	*  @private function getCreated
 	*  @param null
@@ -390,7 +363,7 @@
 	*  @param string $postfix
 	*/
 	public function getLanguage($module_name, $prefix = '', $postfix = '') {  
-        $lang = '_' . $prefix . '_' . $module_name;
+        $lang = '_' . $prefix . '_' . strtoupper($module_name);
 		if(!empty($postfix) || $postfix != '_') {	
 			$ret = $lang . '_' . $postfix;
 		} elseif($postfix == '_') {
@@ -457,13 +430,14 @@
 		$created = $this->getCreated();
 		$notcreated = $this->getNotCreated();
 		$folder_name = $this->getFolderName();
+		$mode = $this->getMode();
 		$ret = '';		
 		if(!$this->xoopsfile->__construct($path, true)) {
 			// Force to create file if not exist
-			if($this->xoopsfile->open($this->getMode(), true)) {				
+			if($this->xoopsfile->open($mode, true)) {				
 				if($this->xoopsfile->writable($path)) {				
 					// Integration of the content in the file
-					if (!$this->xoopsfile->write($this->getContent(), $this->getMode(), true)) {
+					if (!$this->xoopsfile->write($this->getContent(), $mode, true)) {
 						$ret .= sprintf($notcreated, $filename, $folder_name);
 						//$GLOBALS['xoopsTpl']->assign('notcreated', sprintf($notcreated, $filename, $folder_name));
 						exit();					

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_comments.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_comments.php	2014-05-19 23:23:50 UTC (rev 12540)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_comments.php	2014-05-20 18:20:21 UTC (rev 12541)
@@ -117,7 +117,7 @@
 				$content .= $this->getCommentsNew($module_name, $table_name, $fpmf);				
 			break;
 		}		
-		$this->tdmcfile->create($module_name, 'include', null, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'include', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_common.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_common.php	2014-05-19 23:23:50 UTC (rev 12540)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_common.php	2014-05-20 18:20:21 UTC (rev 12541)
@@ -98,7 +98,7 @@
 		$filename = $this->getFileName();		
 		$content = $this->getHeaderFilesComments($module, $filename);
 		$content .= $this->getCommonCode($module);
-		$this->tdmcfile->create($module_name, 'include', null, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'include', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_functions.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_functions.php	2014-05-19 23:23:50 UTC (rev 12540)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_functions.php	2014-05-20 18:20:21 UTC (rev 12541)
@@ -154,7 +154,7 @@
 		$content .= $this->getFunctionMetaKeywords($module_name);
 		$content .= $this->getFunctionMetaDescription($module_name);
 
-		$this->tdmcfile->create($module_name, 'include', null, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'include', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_install.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_install.php	2014-05-19 23:23:50 UTC (rev 12540)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_install.php	2014-05-20 18:20:21 UTC (rev 12541)
@@ -146,7 +146,7 @@
 				}
 			}
 		}
-		$this->tdmcfile->create($module_name, 'include', null, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'include', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_jquery.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_jquery.php	2014-05-19 23:23:50 UTC (rev 12540)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_jquery.php	2014-05-20 18:20:21 UTC (rev 12541)
@@ -59,7 +59,7 @@
 		$path = $this->getLocalPath();
 		$module = $this->getModule();		
 		$filename = $this->getFileName();
-		$module_name = $module->getVar('module_name');	
+		$module_name = $module->getVar('mod_name');	
 		$content = $this->getHeaderFilesComments($module, $filename);
 		$content .= <<<EOT
 $(document).ready(function(){
@@ -69,7 +69,7 @@
 	$( ".toolbar" ).css("color","#000").buttonset();       
 });
 EOT;
-		$this->tdmcfile->create($module_name, 'include', null, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'include', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_notifications.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_notifications.php	2014-05-19 23:23:50 UTC (rev 12540)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_notifications.php	2014-05-20 18:20:21 UTC (rev 12541)
@@ -63,7 +63,7 @@
 		$table = $this->getTable();        		
 		$fields = $this->getFields();
 		$filename = $this->getFileName();
-		$module_name = $module->getVar('module_name');
+		$module_name = $module->getVar('mod_name');
         $table_name = $table->getVar('table_name');
 		$table_nbfields = $table->getVar('table_nbfields');	
 		
@@ -128,7 +128,7 @@
 	}
 }
 EOT;
-		$this->tdmcfile->create($module_name, 'include', null, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'include', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_search.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_search.php	2014-05-19 23:23:50 UTC (rev 12540)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_search.php	2014-05-20 18:20:21 UTC (rev 12541)
@@ -62,7 +62,7 @@
 		$table = $this->getTable();        		
 		$fields = $this->getFields();
 		$filename = $this->getFileName();
-		$module_name = $module->getVar('module_name');
+		$module_name = $module->getVar('mod_name');
         $table_name = $table->getVar('table_name');
 		$table_fieldname = $table->getVar('table_fieldname');
 		$table_nbfields = $table->getVar('table_nbfields');
@@ -122,7 +122,7 @@
 		\$i++;
 	}
 EOT;
-		$this->tdmcfile->create($module_name, 'include', null, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'include', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_admin.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_admin.php	2014-05-19 23:23:50 UTC (rev 12540)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_admin.php	2014-05-20 18:20:21 UTC (rev 12541)
@@ -27,52 +27,61 @@
 	*/
 	private $tdmcfile = null;
 	/*
+	* @var string
+	*/
+	private $table = null;
+	/*
+	* @var string
+	*/
+	private $tables = null;
+	/*
 	*  @public function constructor
 	*  @param string $module
 	*  @param mixed $table
 	*  @param string $filename
 	*/
-	public function __construct($module, $table, $filename) {    
+	public function __construct($module, $table, $tables, $filename) {    
 		$this->tdmcfile = TDMCreateFile::getInstance();
 		$this->setModule($module);
-		$this->setTable($table);
+		//$this->setTable($table);
 		$this->setFileName($filename);
+		$this->table = $table;
+		$this->tables = $tables;
 	}	
-	
 	/*
 	*  @static function &getInstance
 	*  @param string $module
 	*  @param mixed $table
 	*  @param string $filename
 	*/
-	public static function &getInstance($module, $table, $filename)
+	public static function &getInstance($module, $table, $tables, $filename)
     {
         static $instance = false;
         if (!$instance) {
-            $instance = new self($module, $table, $filename);
+            $instance = new self($module, $table, $tables, $filename);
         }
         return $instance;
-    } 	
+    }	
 	/*
 	*  @public function render
 	*  @param null
 	*/
 	public function render() {    
 		$module = $this->getModule();
-		$table = $this->getTable();        		
+		//$table = $this->getTable();        		
 		$fields = $this->getFields();
 		$filename = $this->getFileName();
-		$module_name = $module->getVar('module_name');
-        $table_name = $table->getVar('table_name');
+		$module_name = $module->getVar('mod_name');
+        $table_name = $this->table->getVar('table_name');
 		
 		$language = $this->getLanguage($module_name, 'AM', '_');
 		$content = $this->getHeaderFilesComments($module, $filename);
 		$content .= <<<EOT
 \n//Admin
 EOT;
-		foreach (array_keys($table) as $i)
+		foreach (array_keys($this->tables) as $i)
 		{
-			$table_name = $table[$i]->getVar('table_name');
+			$table_name = $this->tables[$i]->getVar('table_name');
 			$stu_table_name = strtoupper($table_name);
 			$table_name_nohs = strtolower($table_name);
 			$content .= <<<EOT
@@ -80,7 +89,7 @@
 \ndefine('{$language}{$stu_table_name}', "There are <span class='bold'>%s</span> {$table_name_nohs} in the database");
 EOT;
 		}
-		$this->tdmcfile->create($module_name, 'language', $GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'language/'.$GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

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-05-19 23:23:50 UTC (rev 12540)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_blocks.php	2014-05-20 18:20:21 UTC (rev 12541)
@@ -27,15 +27,26 @@
 	*/
 	private $tdmcfile = null;
 	/*
+	* @var string
+	*/
+	private $table = null;
+	/*
+	* @var string
+	*/
+	private $tables = null;
+	/*
 	*  @public function constructor
 	*  @param string $module
-	*  @param string $file_name
+	*  @param mixed $table
+	*  @param string $filename
 	*/
-	public function __construct($module, $table, $file_name) {    
+	public function __construct($module, $table, $tables, $filename) {    
 		$this->tdmcfile = TDMCreateFile::getInstance();
 		$this->setModule($module);
-		$this->setTable($table);
-		$this->setFileName($file_name);
+		//$this->setTable($table);
+		$this->setFileName($filename);
+		$this->table = $table;
+		$this->tables = $tables;
 	}	
 	/*
 	*  @static function &getInstance
@@ -43,28 +54,28 @@
 	*  @param mixed $table
 	*  @param string $filename
 	*/
-	public static function &getInstance($module, $table, $filename)
+	public static function &getInstance($module, $table, $tables, $filename)
     {
         static $instance = false;
         if (!$instance) {
-            $instance = new self($module, $table, $filename);
+            $instance = new self($module, $table, $tables, $filename);
         }
         return $instance;
-    } 
+    }
 	/*
 	*  @public function render
 	*  @param null
 	*/
 	public function render() {    
 		$module = $this->getModule();
-		$table = $this->getTable();        		
+		//$table = $this->getTable();        		
 		$fields = $this->getFields();
 		$filename = $this->getFileName();
-		$module_name = $module->getVar('module_name');
-        $table_name = $table->getVar('table_name');
-		$table_fieldname = $table->getVar('table_fieldname');
-		$table_nbfields = $table->getVar('table_nbfields');
-		$language = $this->getLanguage('MB', '_');
+		$module_name = $module->getVar('mod_name');
+        $table_name = $this->table->getVar('table_name');
+		$table_fieldname = $this->table->getVar('table_fieldname');
+		$table_nbfields = $this->table->getVar('table_nbfields');
+		$language = $this->getLanguage($module_name, 'MB', '_');
 		$content = $this->getHeaderFilesComments($module, $filename);
 		$content .= <<<EOT
 \n// Main
@@ -73,12 +84,12 @@
 define('{$language}CATTODISPLAY', "Categories to Display");
 define('{$language}ALLCAT', "All Categories");
 EOT;
-		foreach (array_keys($table) as $i) 
+		foreach (array_keys($this->tables) as $i) 
 		{
-			$table_name = $table[$i]->getVar('table_name');
-			$table_fieldname = $table[$i]->getVar('table_fieldname');			
+			$table_name = $this->tables[$i]->getVar('table_name');
+			$table_fieldname = $this->tables[$i]->getVar('table_fieldname');			
 			$nb_caracteres = strlen($table_fieldname);
-			$table_blocks = $table[$i]->getVar('table_blocks');
+			$table_blocks = $this->tables[$i]->getVar('table_blocks');
 			$language1 = $language.strtoupper($table_fieldname);			
 			
 			for($j = 0; $j < $table_nbfields; $j++)
@@ -95,7 +106,7 @@
 EOT;
 			}	
 		}
-		$this->tdmcfile->create($module_name, 'language', $GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'language/'.$GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_main.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_main.php	2014-05-19 23:23:50 UTC (rev 12540)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_main.php	2014-05-20 18:20:21 UTC (rev 12541)
@@ -27,27 +27,38 @@
 	*/
 	private $tdmcfile = null;
 	/*
+	* @var string
+	*/
+	private $table = null;
+	/*
+	* @var string
+	*/
+	private $tables = null;
+	/*
 	*  @public function constructor
 	*  @param string $module
-	*  @param string $file_name
+	*  @param mixed $table
+	*  @param string $filename
 	*/
-	public function __construct($module, $table, $file_name) {    
+	public function __construct($module, $table, $tables, $filename) {    
 		$this->tdmcfile = TDMCreateFile::getInstance();
 		$this->setModule($module);
-		$this->setTable($table);
-		$this->setFileName($file_name);
-	}
+		//$this->setTable($table);
+		$this->setFileName($filename);
+		$this->table = $table;
+		$this->tables = $tables;
+	}	
 	/*
 	*  @static function &getInstance
 	*  @param string $module
 	*  @param mixed $table
 	*  @param string $filename
 	*/
-	public static function &getInstance($module, $table, $filename)
+	public static function &getInstance($module, $table, $tables, $filename)
     {
         static $instance = false;
         if (!$instance) {
-            $instance = new self($module, $table, $filename);
+            $instance = new self($module, $table, $tables, $filename);
         }
         return $instance;
     }	
@@ -57,28 +68,30 @@
 	*/
 	public function render() {    
 		$module = $this->getModule();
-		$table = $this->getTable();        		
+		//$table = $this->getTable();        		
 		$fields = $this->getFields();
 		$filename = $this->getFileName();
-		$module_name = $module->getVar('module_name');
-        $table_name = $table->getVar('table_name');
-		$table_fieldname = $table->getVar('table_fieldname');
-		$table_nbfields = $table->getVar('table_nbfields');
+		$module_name = $module->getVar('mod_name');
+		$module_description = $module->getVar('mod_description');
+        $table_name = $this->table->getVar('table_name');
+		$table_fieldname = $this->table->getVar('table_fieldname');
+		$table_nbfields = $this->table->getVar('table_nbfields');
+		$ucf_mod_name = ucfirst($module_name);
 		$language = $this->getLanguage($module_name, 'MI', '_');
 		$content = $this->getHeaderFilesComments($module, $filename);
 		$content .= <<<EOT
 \n// Main
 define('{$language}INDEX', "Home");
 define('{$language}TITLE', "{$ucf_mod_name}");
-define('{$language}DESC', "{$mod_desc}");
-define('{$language}INDEX_DESC', "{$mod_desc}");
+define('{$language}DESC', "{$module_description}");
+define('{$language}INDEX_DESC', "{$module_description}");
 EOT;
-		foreach (array_keys($table) as $i) 
+		foreach (array_keys($this->tables) as $i) 
 		{
-			$table_name = $table[$i]->getVar('table_name');
-			$table_fieldname = $table[$i]->getVar('table_fieldname');			
+			$table_name = $this->tables[$i]->getVar('table_name');
+			$table_fieldname = $this->tables[$i]->getVar('table_fieldname');			
 			$nb_caracteres = strlen($table_fieldname);
-			$table_blocks = $table[$i]->getVar('table_blocks');
+			$table_blocks = $this->tables[$i]->getVar('table_blocks');
 			$lng_stu_table_name = $language.strtoupper($table_name);
 			$ucf_table_name = UcFirstAndToLower($table_name);
 			$content .= <<<EOT
@@ -102,7 +115,7 @@
 		$content .= <<<EOT
 \n\ndefine('{$language}ADMIN', "Admin");
 EOT;
-		$this->tdmcfile->create($module_name, 'language', $GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'language/'.$GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_modinfo.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_modinfo.php	2014-05-19 23:23:50 UTC (rev 12540)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_modinfo.php	2014-05-20 18:20:21 UTC (rev 12541)
@@ -26,17 +26,27 @@
 	* @var string
 	*/
 	private $tdmcfile = null;
-	
 	/*
+	* @var string
+	*/
+	private $table = null;
+	/*
+	* @var string
+	*/
+	private $tables = null;
+	/*
 	*  @public function constructor
 	*  @param string $module
-	*  @param string $file_name
+	*  @param mixed $table
+	*  @param string $filename
 	*/
-	public function __construct($module, $table, $file_name) {    
+	public function __construct($module, $table, $tables, $filename) {    
 		$this->tdmcfile = TDMCreateFile::getInstance();
 		$this->setModule($module);
-		$this->setTable($table);
-		$this->setFileName($file_name);
+		//$this->setTable($table);
+		$this->setFileName($filename);
+		$this->table = $table;
+		$this->tables = $tables;
 	}	
 	/*
 	*  @static function &getInstance
@@ -44,11 +54,11 @@
 	*  @param mixed $table
 	*  @param string $filename
 	*/
-	public static function &getInstance($module, $table, $filename)
+	public static function &getInstance($module, $table, $tables, $filename)
     {
         static $instance = false;
         if (!$instance) {
-            $instance = new self($module, $table, $filename);
+            $instance = new self($module, $table, $tables, $filename);
         }
         return $instance;
     }
@@ -58,34 +68,37 @@
 	*/
 	public function render() {    
 		$module = $this->getModule();
-		$table = $this->getTable();        		
+		//$table = $this->getTable();        		
 		$fields = $this->getFields();
 		$filename = $this->getFileName();
-		$module_name = $module->getVar('module_name');
-        $table_name = $table->getVar('table_name');
-		$table_fieldname = $table->getVar('table_fieldname');
-		$table_nbfields = $table->getVar('table_nbfields');
-		$table_notifications = $table->getVar('table_notifications');
+		$module_name = $module->getVar('mod_name');
+		$module_description = $module->getVar('mod_description');
+        $table_name = $this->table->getVar('table_name');
+		$table_fieldname = $this->table->getVar('table_fieldname');
+		$table_nbfields = $this->table->getVar('table_nbfields');
+		$table_image = $this->table->getVar('table_image');
+		$table_permissions = $this->table->getVar('table_permissions');
 		$language = $this->getLanguage($module_name, 'MI', '_');
 		$content = $this->getHeaderFilesComments($module, $filename);
+		$menu = 1;
 		$content .= <<<EOT
 \n// Admin
 define('{$language}NAME', "{$module_name}");
-define('{$language}DESC', "{$description}");
+define('{$language}DESC', "{$module_description}");
 //Menu
 define('{$language}ADMENU{$menu}', "Home");
 EOT;
-		$menu = 0;
-		foreach (array_keys($table) as $i) 
+		
+		foreach (array_keys($this->tables) as $i) 
 		{   
 			$menu++;
-			$table_name = str_replace('_', ' ', $table[$i]->getVar('table_name'));
+			$table_name = str_replace('_', ' ', $this->tables[$i]->getVar('table_name'));
 			$table_name = ucfirst($table_name);
 			$content .= <<<EOT
 \ndefine('{$language}ADMENU{$menu}', "{$table_name}");
 EOT;
 		}
-		if ( $this->permissions != false ) {
+		if ( $table_permissions != 0 ) {
 			$menu++;
 			$content .= <<<EOT
 \ndefine('{$language}ADMENU{$menu}', "Permissions");
@@ -99,12 +112,12 @@
 		$content .= <<<EOT
 \n//Blocks
 EOT;
-		foreach (array_keys($table) as $i) 
+		foreach (array_keys($this->tables) as $i) 
 		{	
-			$table_name = $table[$i]->getVar('table_name');
+			$table_name = $this->tables[$i]->getVar('table_name');
 			$language1 = $language.strtoupper($table_name).'';
 			$table_name = str_replace("_", " ", ucfirst($table_name));
-			if ( $table[$i]->getVar('table_blocks') == 1 ) {
+			if ( $this->tables[$i]->getVar('table_blocks') == 1 ) {
 			$content .= <<<EOT
 \ndefine('{$language1}BLOCK', "{$table_name} block");
 EOT;
@@ -144,7 +157,7 @@
 define('{$language}FBCOMMENTS', "Facebook comments");
 define('{$language}FBCOMMENTS_DESC', "Allow Facebook comments in the form");
 EOT;
-		if ( $table_notifications == 1 ) 
+		if ( $this->table->getVar('table_notifications') == 1 ) 
 		{
 			$content .= <<<EOT
 \n// Notifications
@@ -188,7 +201,7 @@
 define('{$language}FILE_APPROVE_NOTIFY_SUBJECT', "Allow Facebook comments in the form");
 EOT;
 		}	
-		if ( $this->permissions != false ) {
+		if ( $table_permissions != 0 ) {
 			$content .= <<<EOT
 \n// Permissions Groups
 define('{$language}GROUPS', "Groups access");
@@ -197,7 +210,7 @@
 define('{$language}ADMINGROUPS_DESC', "Which groups have access to tools and permissions page");
 EOT;
 		}
-		$this->tdmcfile->create($module_name, 'language', $GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CR...
 
[truncated message content]

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

From: <txm...@us...> - 2014-05-19 23:23:54

Revision: 12540
          http://sourceforge.net/p/xoops/svn/12540
Author:   txmodxoops
Date:     2014-05-19 23:23:50 +0000 (Mon, 19 May 2014)
Log Message:
-----------
Fix bugs

Work in progress

Modified Paths:
--------------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_templates.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/file.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_admin.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_blocks.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_main.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_modinfo.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user_pages.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user_templates.php

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_templates.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_templates.php	2014-05-19 18:53:24 UTC (rev 12539)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_templates.php	2014-05-19 23:23:50 UTC (rev 12540)
@@ -62,7 +62,7 @@
 		$module_name = $module->getVar('mod_name');
 		$language = $this->getLanguage($module_name, 'AM');	
 		$content = 'Under Construction';
-		$this->tdmcfile->create($module_name, 'templates/', 'admin' $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'templates', 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php	2014-05-19 18:53:24 UTC (rev 12539)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php	2014-05-19 23:23:50 UTC (rev 12540)
@@ -182,8 +182,18 @@
 		// Admin Install File
 		$includeInstall = IncludeInstall::getInstance($module, $table, $tables, $fields, 'install.php');
 		
+		$ret[] = $adminAbout->render();
+		$ret[] = $adminFooter->render();
+		$ret[] = $adminHeader->render();
+		$ret[] = $adminIndex->render();
+		$ret[] = $adminMenu->render();		
+		$ret[] = $cssStyles->render();
+		$ret[] = $includeCommon->render();
+		$ret[] = $includeFunctions->render();
+		$ret[] = $includeInstall->render();
+		
 		foreach (array_keys($tables) as $i)
-		{
+		{			
 			$table_name = $tables[$i]->getVar('table_name');
 			// Admin Pages File
 			$adminPages = AdminPages::getInstance($module, $tables, $table_name.'.php');
@@ -192,22 +202,14 @@
 			$adminTemplates = AdminTemplates::getInstance($module, $tables, $table_name.'.tpl');
 			$ret[] = $adminTemplates->render();
 			// User Pages File
-			$userPages = UserPages::getInstance($module, $tables, $table_name.'.php');
+			$userPages = UserPages::getInstance($module, $table, $table_name.'.php');
 			$ret[] = $userPages->render();
 			// User Templates File
-			$adminTemplates = AdminTemplates::getInstance($module, $tables, $table_name.'.tpl');
-			$ret[] = $adminTemplates->render();
+			$userTemplates = UserTemplates::getInstance($module, $table, $table_name.'.tpl');
+			$ret[] = $userTemplates->render();			
 		}		
+		//$ret[] = array($admin_pages, $admin_templates, $user_pages, $user_templates);
 		
-		$ret[] = $adminAbout->render();
-		$ret[] = $adminFooter->render();
-		$ret[] = $adminHeader->render();
-		$ret[] = $adminIndex->render();
-		$ret[] = $adminMenu->render();		
-		$ret[] = $cssStyles->render();
-		$ret[] = $includeCommon->render();
-		$ret[] = $includeFunctions->render();
-		$ret[] = $includeInstall->render();
 		return $ret;		 
 	}	
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/file.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/file.php	2014-05-19 18:53:24 UTC (rev 12539)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/file.php	2014-05-19 23:23:50 UTC (rev 12540)
@@ -146,7 +146,7 @@
 			$this->setSubDir($subdir);
 		}
 		if((!empty($subsubdir) || $subsubdir != null) && is_string($subsubdir)) {
-			$this->setSubSubDir($subdir);
+			$this->setSubSubDir($subsubdir);
 		}
 	}
 	
@@ -338,12 +338,12 @@
 
     /* 
 	*  @public function getUploadPath
-	*  @param mixed $subdir
+	*  @param null
 	*/
     private function getUploadPath() {
 		if ($this->getSubDir() != null) {
 			$ret = $this->getModulePath() . DIRECTORY_SEPARATOR . $this->getSubDir();
-		} elseif (strrpos($this->getSubDir(), '/') ) {
+		} elseif ($this->getSubSubDir() != null) {
             $ret = $this->getModulePath() . DIRECTORY_SEPARATOR . $this->getSubDir() . DIRECTORY_SEPARATOR . $this->getSubSubDir();
         } else {
             $ret = $this->getModulePath();

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_admin.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_admin.php	2014-05-19 18:53:24 UTC (rev 12539)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_admin.php	2014-05-19 23:23:50 UTC (rev 12540)
@@ -65,7 +65,7 @@
 		$module_name = $module->getVar('module_name');
         $table_name = $table->getVar('table_name');
 		
-		$language = $this->getLanguage('AM', '_');
+		$language = $this->getLanguage($module_name, 'AM', '_');
 		$content = $this->getHeaderFilesComments($module, $filename);
 		$content .= <<<EOT
 \n//Admin
@@ -80,7 +80,7 @@
 \ndefine('{$language}{$stu_table_name}', "There are <span class='bold'>%s</span> {$table_name_nohs} in the database");
 EOT;
 		}
-		$this->tdmcfile->create($module_name, 'language/', $GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'language', $GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

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-05-19 18:53:24 UTC (rev 12539)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_blocks.php	2014-05-19 23:23:50 UTC (rev 12540)
@@ -56,7 +56,6 @@
 	*  @param null
 	*/
 	public function render() {    
-		$path = $this->getLocalPath('language');
 		$module = $this->getModule();
 		$table = $this->getTable();        		
 		$fields = $this->getFields();
@@ -96,7 +95,7 @@
 EOT;
 			}	
 		}
-		$this->tdmcfile->create($module_name, 'language/', $GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'language', $GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_main.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_main.php	2014-05-19 18:53:24 UTC (rev 12539)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_main.php	2014-05-19 23:23:50 UTC (rev 12540)
@@ -56,7 +56,6 @@
 	*  @param null
 	*/
 	public function render() {    
-		$path = $this->getLocalPath('language');
 		$module = $this->getModule();
 		$table = $this->getTable();        		
 		$fields = $this->getFields();
@@ -65,7 +64,7 @@
         $table_name = $table->getVar('table_name');
 		$table_fieldname = $table->getVar('table_fieldname');
 		$table_nbfields = $table->getVar('table_nbfields');
-		$language = $this->getLanguage('MI', '_');
+		$language = $this->getLanguage($module_name, 'MI', '_');
 		$content = $this->getHeaderFilesComments($module, $filename);
 		$content .= <<<EOT
 \n// Main
@@ -80,7 +79,7 @@
 			$table_fieldname = $table[$i]->getVar('table_fieldname');			
 			$nb_caracteres = strlen($table_fieldname);
 			$table_blocks = $table[$i]->getVar('table_blocks');
-			$lng_stu_table_name = $language.'_'.strtoupper($table_name);
+			$lng_stu_table_name = $language.strtoupper($table_name);
 			$ucf_table_name = UcFirstAndToLower($table_name);
 			$content .= <<<EOT
 \n\ndefine('{$lng_stu_table_name}', "{$ucf_table_name}");
@@ -103,7 +102,7 @@
 		$content .= <<<EOT
 \n\ndefine('{$language}ADMIN', "Admin");
 EOT;
-		$this->tdmcfile->create($module_name, 'language/', $GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'language', $GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_modinfo.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_modinfo.php	2014-05-19 18:53:24 UTC (rev 12539)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_modinfo.php	2014-05-19 23:23:50 UTC (rev 12540)
@@ -57,7 +57,6 @@
 	*  @param null
 	*/
 	public function render() {    
-		$path = $this->getLocalPath('language');
 		$module = $this->getModule();
 		$table = $this->getTable();        		
 		$fields = $this->getFields();
@@ -67,7 +66,7 @@
 		$table_fieldname = $table->getVar('table_fieldname');
 		$table_nbfields = $table->getVar('table_nbfields');
 		$table_notifications = $table->getVar('table_notifications');
-		$language = $this->getLanguage('MI', '_');
+		$language = $this->getLanguage($module_name, 'MI', '_');
 		$content = $this->getHeaderFilesComments($module, $filename);
 		$content .= <<<EOT
 \n// Admin
@@ -198,7 +197,7 @@
 define('{$language}ADMINGROUPS_DESC', "Which groups have access to tools and permissions page");
 EOT;
 		}
-		$this->tdmcfile->create($module_name, 'language/', $GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'language', $GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user_pages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user_pages.php	2014-05-19 18:53:24 UTC (rev 12539)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user_pages.php	2014-05-19 23:23:50 UTC (rev 12540)
@@ -27,6 +27,10 @@
 	*/
 	private $tdmcfile = null;
 	/*
+	* @var string
+	*/
+	private $table = null;
+	/*
 	*  @public function constructor
 	*  @param string $module
 	*  @param string $file_name
@@ -34,8 +38,10 @@
 	public function __construct($module, $table, $file_name) {    
 		$this->tdmcfile = TDMCreateFile::getInstance();
 		$this->setModule($module);
-		$this->setTable($table);
+		//$this->setTable($table);
 		$this->setFileName($file_name);
+		$this->table = $table;
+		//$this->tables = $tables;
 	}	
 	/*
 	*  @static function &getInstance
@@ -56,14 +62,13 @@
 	*  @param null
 	*/
 	public function render() {    
-		$path = $this->getLocalPath();
 		$module = $this->getModule();
-		$table = $this->getTable();        		
+		//$table = $this->getTable();        		
 		$fields = $this->getFields();
 		$filename = $this->getFileName();
 		$module_name = $module->getVar('module_name');
-		$table_name = $table->getVar('table_name');
-		$table_nbfields = $table->getVar('table_nbfields');
+		$table_name = $this->table->getVar('table_name');
+		$table_nbfields = $this->table->getVar('table_nbfields');
 		$stu_mod_name = strtoupper($module_name);	 
 		$language = $this->getLanguage($module_name, 'MA', '_');			
 		$content = $this->getHeaderFilesComments($module, $filename);	

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user_templates.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user_templates.php	2014-05-19 18:53:24 UTC (rev 12539)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user_templates.php	2014-05-19 23:23:50 UTC (rev 12540)
@@ -27,6 +27,10 @@
 	*/
 	private $tdmcfile = null;
 	/*
+	* @var string
+	*/
+	private $table = null;
+	/*
 	*  @public function constructor
 	*  @param string $module
 	*  @param string $file_name
@@ -34,8 +38,10 @@
 	public function __construct($module, $table, $file_name) {    
 		$this->tdmcfile = TDMCreateFile::getInstance();
 		$this->setModule($module);
-		$this->setTable($table);
+		//$this->setTable($table);
 		$this->setFileName($file_name);
+		$this->table = $table;
+		//$this->tables = $tables;
 	}		
 	/*
 	*  @static function &getInstance
@@ -57,13 +63,13 @@
 	*/
 	public function render() {    
 		$module = $this->getModule();
-		$table = $this->getTable();        		
+		//$table = $this->getTable();        		
 		$fields = $this->getFields();
 		$filename = $this->getFileName();
 		$module_name = $module->getVar('module_name');
-		$table_name = $table->getVar('table_name');
-		$table_fieldname = $table->getVar('table_fieldname');
-		$table_nbfields = $table->getVar('table_nbfields');
+		$table_name = $this->table->getVar('table_name');
+		$table_fieldname = $this->table->getVar('table_fieldname');
+		$table_nbfields = $this->table->getVar('table_nbfields');
 		$stu_module_name = strtoupper($module_name);	 
 		$language = $this->getLanguage($module_name, 'MA', '_');			
 		$content = $this->getHeaderFilesComments($module, $filename);		
@@ -118,7 +124,7 @@
 		$content .= <<<EOT
 <{include file="db:{$module_name}_footer.html"}>
 EOT;
-		$this->tdmcfile->create($module_name, null, null, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'templates', null, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

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

From: <txm...@us...> - 2014-05-19 18:53:29

Revision: 12539
          http://sourceforge.net/p/xoops/svn/12539
Author:   txmodxoops
Date:     2014-05-19 18:53:24 +0000 (Mon, 19 May 2014)
Log Message:
-----------
Fix bug

Possibilities to create same files

Work in progress

Modified Paths:
--------------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/building.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fieldattributes.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fieldelements.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fieldkey.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fieldnull.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fieldtype.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_about.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_footer.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_header.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_index.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_menu.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_pages.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_permissions.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_templates.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/blocks_files.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/blocks_templates.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/class_files.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/css_styles.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/docs_files.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/file.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/htmlsmartycodes.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_comments.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_common.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_functions.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_install.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_jquery.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_notifications.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_search.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_admin.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_blocks.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_main.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_modinfo.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/structure.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates_footer.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates_header.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates_index.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user_footer.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user_header.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user_index.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user_pages.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user_templates.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user_xoopsversion.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tables.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/functions.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/js/functions.js
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/sql/mysql.sql
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/building.tpl
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/fields.tpl
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/modules.tpl
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tables.tpl
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php

Added Paths:
-----------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/sql_files.php

Removed Paths:
-------------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/sql_file.php

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php	2014-05-19 15:22:07 UTC (rev 12538)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php	2014-05-19 18:53:24 UTC (rev 12539)
@@ -32,7 +32,28 @@
 } else {
     $tables =& $tablesHandler;
 }
+//
+$mod_id = $modules->getVar('mod_id');
 $mod_name = $modules->getVar('mod_name');
+//Name of tables
+$criteria = new CriteriaCompo();
+if (isset($mod_id)) {
+	$criteria->add(new Criteria('table_mid', $mod_id));
+} else {
+	$criteria->add(new Criteria('table_mid', $mod_name));
+}
+$tables_arr = $tablesHandler->getAll($criteria);
+
+$table_id = $tables->getVar('table_id');
+$table_name = $tables->getVar('table_name');
+$criteria_fields = new CriteriaCompo();
+if (isset($table_id)) {
+	$criteria_fields->add(new Criteria('field_tid', $table_id));
+} else {
+	$criteria_fields->add(new Criteria('field_tid', $table_name));
+}
+$fields = $fieldsHandler->getAll($criteria_fields);
+//
 $from_dir = TDMC_UPLOAD_MODULES_PATH.'/'.strtolower($mod_name);
 $to_dir = XOOPS_ROOT_PATH.'/modules/'.strtolower($mod_name);
 switch ($op) {
@@ -43,29 +64,32 @@
 		TDMCreate_clearDir($from_dir);
 		// Clear repertory of new module if there are in root/modules
 		TDMCreate_clearDir($to_dir);
-		// Debut
-		/************************************************/
-		/*Structure*/
-		/************************************************/		
+		// Structure			
 		include_once TDMC_PATH . '/class/files/architecture.php';
 		$handler = TDMCreateArchitecture::getInstance();
 		$handler->getPath( TDMC_PATH );
 		$handler->getUploadPath( TDMC_UPLOAD_PATH );
+		// Creation of the structure of folders and files
 		$base_architecture = $handler->createBaseFoldersFiles( $modules );
 		if($base_architecture !== false) { 
 			$GLOBALS['xoopsTpl']->assign('base_architecture', true);			
 		} else {
 			$GLOBALS['xoopsTpl']->assign('base_architecture', false);
-		}/**/
-		//$builds = array();
-		$building_files = $handler->createBuildingFiles( $modules, $tables );
-		/*foreach($building_files as $key => $value) {$builds
-			$builds['list'] = $key;*/
-			$GLOBALS['xoopsTpl']->assign('builds', $building_files);
-		//}
-		$mod_name = 'uploads/tdmcreate/modules/' . str_replace(' ', '', strtolower($mod_name));
-        // Creation of the structure of folders and files
-		$GLOBALS['xoopsTpl']->assign('build_list', '<b>Under new construction</b> - Temporary build only folders of this selected module "'.$mod_name.'/"');
+		}
+		// Get files
+		$builds = array();
+		$files = $handler->createBuildingFiles( $modules, $tables, $tables_arr, $fields );
+		foreach($files as $file) {
+			if($file) {
+				$builds['created'] = $file;
+			} else {
+				$builds['notcreated'] = $file;
+			}				
+			$GLOBALS['xoopsTpl']->append('builds', $builds);
+		}
+		// Directory to saved all files        
+		$GLOBALS['xoopsTpl']->assign('building_directory', sprintf(_AM_TDMCREATE_BUILDING_DIRECTORY, str_replace(' ', '', strtolower($mod_name))));
+		// Copy this module in root modules
 		if ( $modules->getVar('mod_inroot_copy') == 1 ) {	
 			TDMCreate_copyr($from_dir, $to_dir);
         }

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php	2014-05-19 15:22:07 UTC (rev 12538)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php	2014-05-19 18:53:24 UTC (rev 12539)
@@ -46,7 +46,8 @@
     case 'list': 
     default:
         $start = TDMCreateRequest::getInt('start', 0);
-        $limit = TDMCreateRequest::getInt('limit', $tdmcreate->getConfig('fields_adminpager'));		
+		$limit = TDMCreateRequest::getInt('limit', $tdmcreate->getConfig('tables_adminpager'));
+        //$limit = TDMCreateRequest::getInt('limit', $tdmcreate->getConfig('fields_adminpager'));		
 		// Define main template
 		$template_main = 'fields.tpl';
 		$GLOBALS['xoTheme']->addStylesheet( 'modules/TDMCreate/css/admin/style.css' );
@@ -59,6 +60,7 @@
 		$GLOBALS['xoopsTpl']->assign('tdmc_icons_url', TDMC_ICONS_URL);
 		$GLOBALS['xoopsTpl']->assign('tdmc_upload_url', TDMC_UPLOAD_URL);
 		$GLOBALS['xoopsTpl']->assign('modPathIcon16', $modPathIcon16);
+		$GLOBALS['xoopsTpl']->assign('sysPathIcon32', $sysPathIcon32);
 		// Redirect if there aren't modules
 		$nb_modules = $modulesHandler->getCount();
 		if ( $nb_modules == 0 ) {
@@ -160,7 +162,7 @@
 		if ( !$GLOBALS['xoopsSecurity']->check() ) {
             redirect_header('fields.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
         } 
-		$fieldelement_fid = $field_id = TDMCreateRequest::getInt('fieldelement_fid');
+		$fieldelement_fid = TDMCreateRequest::getInt('fieldelement_fid');
 		//
 		if (isset($field_id)) {
 			$obj =& $fieldsHandler->get($field_id);
@@ -171,12 +173,13 @@
 			$obj =& $fieldsHandler->create();
 			$objfieldelement =& $fieldelementsHandler->create();
 		}
+		//		
 		if ($field_numb > 0) {
 			for( $i = 1; $i <= $field_numb; $i++ ) {	
 				//			
 				$obj->setVar( 'field_mid', $field_mid );
 				$obj->setVar( 'field_tid', $field_tid );								
-				$obj->setVar( 'field_numb', $field_numb );
+				$obj->setVar( 'field_numb', (isset($_POST['field_numb'][$i]) ? $_POST['field_numb'][$i] : 0) );
 				$obj->setVar( 'field_name', (isset($_POST['field_name'][$i]) ? $_POST['field_name'][$i] : '') );
 				$obj->setVar( 'field_type', (isset($_POST['field_type'][$i]) ? $_POST['field_type'][$i] : '') ); 
 				$obj->setVar( 'field_value', (isset($_POST['field_value'][$i]) ? $_POST['field_value'][$i] : '') );
@@ -198,15 +201,19 @@
                 $fieldsHandler->insert($obj);					
 			}				
 		}
-		$objfieldelement->setVar( 'fieldelement_name', 'Table : '.$_REQUEST['table_name'] );
-		$objfieldelement->setVar( 'fieldelement_value', 'XoopsFormTables-'.$_REQUEST['table_name'] );
+		$objfieldelement->setVar( 'fieldelement_mid', $field_mid );
+		$objfieldelement->setVar( 'fieldelement_tid', $field_tid );
+		$objfieldelement->setVar( 'fieldelement_name', 'Table : '.ucfirst($table_name) );
+		$objfieldelement->setVar( 'fieldelement_value', 'XoopsFormTables-'.ucfirst($table_name) );
 		// Insert new table name
-		$fieldelementsHandler->insert($objfieldelement);
+		if (!$fieldelementsHandler->insert($objfieldelement) ) {
+			$GLOBALS['xoopsTpl']->assign('error', $objfieldelement->getHtmlErrors() . ' Field element');
+		}
 		//
 		if ($obj->isNew()) {		    
-			redirect_header('fields.php', 2, sprintf(_AM_TDMCREATE_FIELD_FORM_SAVED_OK, $_REQUEST['table_name']));
+			redirect_header('fields.php', 2, sprintf(_AM_TDMCREATE_FIELD_FORM_SAVED_OK, $table_name));
 		} else {
-			redirect_header('fields.php', 2, sprintf(_AM_TDMCREATE_FIELD_FORM_UPDATED_OK, $_REQUEST['table_name']));
+			redirect_header('fields.php', 2, sprintf(_AM_TDMCREATE_FIELD_FORM_UPDATED_OK, $table_name));
 		}
         //
 		$GLOBALS['xoopsTpl']->assign('error', $obj->getHtmlErrors()); 		      
@@ -251,7 +258,7 @@
 
     case 'drag':        
         $side = TDMCreate_CleanVars( $_POST, 'field_id', 0, 'int' );
-        if ( $block_id > 0 ) {
+        if ( $field_id > 0 ) {
             $fieldsObj = $fieldsHandler->get( $field_id );
             $fieldsObj->setVar('field_id', $side);
             if (!$fieldsHandler->insert( $fieldsObj )) {
@@ -278,7 +285,7 @@
         exit;
     break;	
 	
-	case 'toggle':
+	case 'display':
         if (isset($_GET['field_tid'])) {
             if (isset($_GET['field_parent'])) {
                 $fld_parent = intval($_GET['field_parent']);                

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php	2014-05-19 15:22:07 UTC (rev 12538)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php	2014-05-19 18:53:24 UTC (rev 12539)
@@ -39,6 +39,8 @@
 		$GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton());  
 		$GLOBALS['xoopsTpl']->assign('tdmc_url', TDMC_URL);
 		$GLOBALS['xoopsTpl']->assign('tdmc_upload_imgmod_url', TDMC_UPLOAD_IMGMOD_URL);
+		$GLOBALS['xoopsTpl']->assign('modPathIcon16', $modPathIcon16);
+		$GLOBALS['xoopsTpl']->assign('sysPathIcon32', $sysPathIcon32);
 		$criteria = new CriteriaCompo();
 		$criteria->setSort('mod_id ASC, mod_name');
 		$criteria->setOrder('ASC');
@@ -195,45 +197,35 @@
 		}
 	break;
 
-	case 'toggle':
-        if (isset($_GET['mod_id'])) {
-            if (isset($_GET['mod_admin'])) {
-                $madmin = intval($_GET['mod_admin']);                
-				$mod_admin = ($madmin == 1) ? 0 : 1;
-				$obj =& $modulesHandler->get($mod_id);
+	case 'display':
+        $mod_admin = TDMCreateRequest::getInt('mod_admin');
+		$mod_user = TDMCreateRequest::getInt('mod_user');
+		$mod_search = TDMCreateRequest::getInt('mod_search');
+		$mod_comments = TDMCreateRequest::getInt('mod_comments');
+		$mod_notifications = TDMCreateRequest::getInt('mod_notifications');
+		$mod_permissions = TDMCreateRequest::getInt('mod_permissions');	
+		
+		if ( $mod_id > 0 ) {          
+			$obj =& $modulesHandler->get($mod_id);
+            if(isset($mod_adminm)) {
 				$obj->setVar('mod_admin', $mod_admin);
-            } elseif (isset($_GET['mod_user'])) {
-                $muser = intval($_GET['mod_user']);                
-				$mod_user = ($muser == 1) ? 0 : 1;
-				$obj =& $modulesHandler->get($mod_id);
+			} elseif(isset($mod_user)) {
 				$obj->setVar('mod_user', $mod_user);
-            } elseif (isset($_GET['mod_search'])) {
-                $msearch = intval($_GET['mod_search']);                
-				$mod_search = ($msearch == 1) ? 0 : 1;
-				$obj =& $modulesHandler->get($mod_id);
+			} elseif(isset($mod_search)) {
 				$obj->setVar('mod_search', $mod_search);
-            } elseif (isset($_GET['mod_comments'])) {
-                $mcomments = intval($_GET['mod_comments']);                
-				$mod_comments = ($mcomments == 1) ? 0 : 1;
-				$obj =& $modulesHandler->get($mod_id);
+			} elseif(isset($mod_comments)) {
 				$obj->setVar('mod_comments', $mod_comments);
-            } elseif (isset($_GET['mod_notifications'])) {
-                $mnotifications = intval($_GET['mod_notifications']);                
-				$mod_notifications = ($mnotifications == 1) ? 0 : 1;
-				$obj =& $modulesHandler->get($mod_id);
+			} elseif(isset($mod_notifications)) {
 				$obj->setVar('mod_notifications', $mod_notifications);
-            } elseif (isset($_GET['mod_permissions'])) {
-                $mpermissions = intval($_GET['mod_permissions']);                
-				$mod_permissions = ($mpermissions == 1) ? 0 : 1;
-				$obj =& $modulesHandler->get($mod_id);
+			} elseif(isset($mod_permissions)) {
 				$obj->setVar('mod_permissions', $mod_permissions);
-            }
+			}
 			if ($modulesHandler->insert($obj, true)) {
 				redirect_header('modules.php', 1, _AM_TDMCREATE_TOGGLE_SUCCESS);
 			} else {
 				redirect_header('modules.php', 1, _AM_TDMCREATE_TOGGLE_FAILED);
 			}
-        }
+        }		
     break;
 }
 include 'footer.php';
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php	2014-05-19 15:22:07 UTC (rev 12538)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php	2014-05-19 18:53:24 UTC (rev 12539)
@@ -34,7 +34,8 @@
 	case 'list': 
 	default: 
 		$start = TDMCreateRequest::getInt('start', 0);
-        $limit = TDMCreateRequest::getInt('limit', $tdmcreate->getConfig('tables_adminpager'));
+        $limit = TDMCreateRequest::getInt('limit', $tdmcreate->getConfig('modules_adminpager'));
+        //$limit = TDMCreateRequest::getInt('limit', $tdmcreate->getConfig('tables_adminpager'));
 		// Define main template
 		$template_main = 'tables.tpl';
 		$GLOBALS['xoTheme']->addStylesheet( 'modules/TDMCreate/css/admin/style.css' );
@@ -97,7 +98,7 @@
 						$table['id'] = $t;
 						$table['lid'] = $lid;
 						$table['mid'] = $tables_arr[$t]->getVar('table_mid');
-						$table['name'] = $tables_arr[$t]->getVar('table_name');					
+						$table['name'] = ucfirst($tables_arr[$t]->getVar('table_name'));					
 						$table['image'] = $tables_arr[$t]->getVar('table_image');	
 						$table['nbfields'] = $tables_arr[$t]->getVar('table_nbfields');	
 						$table['blocks'] = $tables_arr[$t]->getVar('table_blocks');						
@@ -236,55 +237,41 @@
 		}
 	break;
 
-    case 'toggle':
-        if (isset($_GET['table_id'])) {
-            if (isset($_GET['table_blocks'])) {
-                $tbl_blocks = intval($_GET['table_blocks']);                
-				$table_blocks = ($tbl_blocks == 1) ? 0 : 1;
-				$obj =& $tablesHandler->get($table_id);
+    case 'display':
+		$table_blocks = TDMCreateRequest::getInt('table_blocks');
+		$table_admin = TDMCreateRequest::getInt('table_admin');
+		$table_user = TDMCreateRequest::getInt('table_user');
+		$table_submenu = TDMCreateRequest::getInt('table_submenu');
+		$table_search = TDMCreateRequest::getInt('table_search');
+		$table_comments = TDMCreateRequest::getInt('table_comments');
+		$table_notifications = TDMCreateRequest::getInt('table_notifications');
+		$table_permissions = TDMCreateRequest::getInt('table_permissions');	
+		
+		if ( $table_id > 0 ) {          
+			$obj =& $tablesHandler->get($table_id);
+            if(isset($table_blocks)) {			
 				$obj->setVar('table_blocks', $table_blocks);
-            } elseif (isset($_GET['table_admin'])) {
-                $tbl_admin = intval($_GET['table_admin']);                
-				$table_admin = ($tbl_admin == 1) ? 0 : 1;
-				$obj =& $tablesHandler->get($table_id);
+			} elseif(isset($table_adminm)) {			
 				$obj->setVar('table_admin', $table_admin);
-            } elseif (isset($_GET['table_user'])) {
-                $tbl_user = intval($_GET['table_user']);                
-				$table_user = ($tbl_user == 1) ? 0 : 1;
-				$obj =& $tablesHandler->get($table_id);
+			} elseif(isset($table_user)) {
 				$obj->setVar('table_user', $table_user);
-            } elseif (isset($_GET['table_submenu'])) {
-                $tbl_submenu = intval($_GET['table_submenu']);                
-				$table_submenu = ($tbl_submenu == 1) ? 0 : 1;
-				$obj =& $tablesHandler->get($table_id);
+			} elseif(isset($table_submenu)) {
 				$obj->setVar('table_submenu', $table_submenu);
-            } elseif (isset($_GET['table_search'])) {
-                $tbl_search = intval($_GET['table_search']);                
-				$table_search = ($tbl_search == 1) ? 0 : 1;
-				$obj =& $tablesHandler->get($table_id);
+			} elseif(isset($table_search)) {
 				$obj->setVar('table_search', $table_search);
-            } elseif (isset($_GET['table_comments'])) {
-                $tbl_comments = intval($_GET['table_comments']);                
-				$table_comments = ($tbl_comments == 1) ? 0 : 1;
-				$obj =& $tablesHandler->get($table_id);
+			} elseif(isset($table_comments)) {
 				$obj->setVar('table_comments', $table_comments);
-            } elseif (isset($_GET['table_notifications'])) {
-                $tbl_notifications = intval($_GET['table_notifications']);                
-				$table_notifications = ($tbl_notifications == 1) ? 0 : 1;
-				$obj =& $tablesHandler->get($table_id);
+			} elseif(isset($table_notifications)) {
 				$obj->setVar('table_notifications', $table_notifications);
-            } elseif (isset($_GET['table_permissions'])) {
-                $tbl_permissions = intval($_GET['table_permissions']);                
-				$table_permissions = ($tbl_permissions == 1) ? 0 : 1;
-				$obj =& $tablesHandler->get($table_id);
+			} elseif(isset($table_permissions)) {
 				$obj->setVar('table_permissions', $table_permissions);
-            }
+			}
 			if ($tablesHandler->insert($obj, true)) {
-				redirect_header('tables.php', 1, _AM_TDMCREATE_TOGGLE_SUCCESS);
+				redirect_header('modules.php', 1, _AM_TDMCREATE_TOGGLE_SUCCESS);
 			} else {
-				redirect_header('tables.php', 1, _AM_TDMCREATE_TOGGLE_FAILED);
+				redirect_header('modules.php', 1, _AM_TDMCREATE_TOGGLE_FAILED);
 			}
-        }
+        }	
     break;	
 }
 include 'footer.php';
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/building.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/building.php	2014-05-19 15:22:07 UTC (rev 12538)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/building.php	2014-05-19 18:53:24 UTC (rev 12539)
@@ -65,7 +65,7 @@
         $form->addElement($mod_select, true);
 
         $form->addElement(new XoopsFormHidden('op', 'build'));
-        $form->addElement(new XoopsFormButton(_REQUIRED.' <span class="red bold">*</span>', 'submit', _SUBMIT, 'submit'));
+        $form->addElement(new XoopsFormButton(_REQUIRED.' <sup class="red bold">*</sup>', 'submit', _SUBMIT, 'submit'));
         return $form;
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fieldattributes.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fieldattributes.php	2014-05-19 15:22:07 UTC (rev 12538)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fieldattributes.php	2014-05-19 18:53:24 UTC (rev 12539)
@@ -16,31 +16,34 @@
  * @package         tdmcreate
  * @since           2.5.5
  * @author          Txmod Xoops <su...@tx...>
- * @version         $Id: 1.59 fieldattributes.php 11297 2013-03-24 10:58:10Z timgno $
+ * @version         $Id: 1.91 fieldattributes.php 11297 2014-05-14 10:58:10Z timgno $
  */
-if (!defined('XOOPS_ROOT_PATH')) { die("XOOPS root path not defined"); }
-
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+/*
+*  @Class TDMCreateFieldattributes
+*  @extends XoopsObject 
+*/
 class TDMCreateFieldattributes extends XoopsObject
 { 
-	//Constructor
-	function __construct()
+	/*
+	*  @public function constructor class
+	*  @param null
+	*/
+	public function __construct()
 	{
-		$this->XoopsObject();		
-        $this->initVar('fieldattribute_value', XOBJ_DTYPE_TXTBOX);		
-		$this->initVar('fieldattribute_name', XOBJ_DTYPE_TXTBOX);	       		
+		$this->XoopsObject();	
+		$this->initVar('fieldattribute_name', XOBJ_DTYPE_TXTBOX);	
+        $this->initVar('fieldattribute_value', XOBJ_DTYPE_TXTBOX);			       		
 	}
-	
-	//Constructor
-	function TDMCreateFieldattributes()
-    {
-        $this->__construct();
-    }	
 }
-
+/*
+*  @Class TDMCreateFieldattributesHandler
+*  @extends XoopsPersistableObjectHandler
+*/
 class TDMCreateFieldattributesHandler extends XoopsPersistableObjectHandler 
 {
     function __construct(&$db) 
     {
-        parent::__construct($db, 'mod_tdmcreate_fieldattributes', 'tdmcreatefieldattributes', 'fieldattribute_value', 'fieldattribute_name');
+        parent::__construct($db, 'mod_tdmcreate_fieldattributes', 'tdmcreatefieldattributes', 'fieldattribute_name', 'fieldattribute_value');
     }
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fieldelements.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fieldelements.php	2014-05-19 15:22:07 UTC (rev 12538)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fieldelements.php	2014-05-19 18:53:24 UTC (rev 12539)
@@ -17,10 +17,8 @@
  * @since           2.5.5
  * @author          Txmod Xoops <su...@tx...>
  * @version         $Id: 1.91 fieldelements.php 11297 2014-03-24 09:11:10Z timgno $
- */
- 
+ */ 
 defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
 /*
 *  @Class TDMCreateFieldElements
 *  @extends XoopsObject 
@@ -33,7 +31,10 @@
 	*/
 	public function __construct()
 	{		
-		$this->initVar('fieldelement_fid', XOBJ_DTYPE_INT);   
+		$this->XoopsObject();
+		$this->initVar('fieldelement_id', XOBJ_DTYPE_INT);
+        $this->initVar('fieldelement_mid', XOBJ_DTYPE_INT);	
+        $this->initVar('fieldelement_tid', XOBJ_DTYPE_INT);			
 		$this->initVar('fieldelement_name', XOBJ_DTYPE_TXTBOX);     
 		$this->initVar('fieldelement_value', XOBJ_DTYPE_TXTBOX);		
 	}
@@ -75,6 +76,6 @@
 	*/
 	public function __construct(&$db) 
     {
-        parent::__construct($db, 'mod_tdmcreate_fieldelements', 'tdmcreatefieldelements', 'fieldelement_fid', 'fieldelement_name');
+        parent::__construct($db, 'mod_tdmcreate_fieldelements', 'tdmcreatefieldelements', 'fieldelement_id', 'fieldelement_name');
     }
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fieldkey.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fieldkey.php	2014-05-19 15:22:07 UTC (rev 12538)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fieldkey.php	2014-05-19 18:53:24 UTC (rev 12539)
@@ -16,30 +16,34 @@
  * @package         tdmcreate
  * @since           2.5.5
  * @author          Txmod Xoops <su...@tx...>
- * @version         $Id: 1.59 fieldkey.php 11297 2013-03-24 10:58:10Z timgno $
+ * @version         $Id: 1.91 fieldkey.php 11297 2014-05-14 10:58:10Z timgno $
  */
-if (!defined('XOOPS_ROOT_PATH')) { die("XOOPS root path not defined"); }
-
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+/*
+*  @Class TDMCreateFieldkey
+*  @extends XoopsObject 
+*/
 class TDMCreateFieldkey extends XoopsObject
 { 
-	//Constructor
-	function __construct()
+	/*
+	*  @public function constructor class
+	*  @param null
+	*/
+	public function __construct()
 	{
 		$this->XoopsObject();
-		$this->initVar('fieldkey_value', XOBJ_DTYPE_TXTBOX);		
-		$this->initVar('fieldkey_name', XOBJ_DTYPE_TXTBOX);		
+		$this->initVar('fieldkey_name', XOBJ_DTYPE_TXTBOX);	
+		$this->initVar('fieldkey_value', XOBJ_DTYPE_TXTBOX);			
 	}
-	
-	//Constructor
-	function TDMCreateFieldkey()
-    {
-        $this->__construct();
-    }	
 }
+/*
+*  @Class TDMCreateFieldkeyHandler
+*  @extends XoopsPersistableObjectHandler
+*/
 class TDMCreateFieldkeyHandler extends XoopsPersistableObjectHandler 
 {
     function __construct(&$db) 
     {
-        parent::__construct($db, 'mod_tdmcreate_fieldkey', 'tdmcreatefieldkey', 'fieldkey_value', 'fieldkey_name');
+        parent::__construct($db, 'mod_tdmcreate_fieldkey', 'tdmcreatefieldkey', 'fieldkey_name', 'fieldkey_value');
     }
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fieldnull.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fieldnull.php	2014-05-19 15:22:07 UTC (rev 12538)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fieldnull.php	2014-05-19 18:53:24 UTC (rev 12539)
@@ -16,31 +16,34 @@
  * @package         tdmcreate
  * @since           2.5.5
  * @author          Txmod Xoops <su...@tx...>
- * @version         $Id: 1.59 fieldnull.php 11297 2013-03-24 10:58:10Z timgno $
+ * @version         $Id: 1.91 fieldnull.php 11297 2014-05-14 10:58:10Z timgno $
  */
-if (!defined('XOOPS_ROOT_PATH')) { die("XOOPS root path not defined"); }
-
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+/*
+*  @Class TDMCreateFieldnull
+*  @extends XoopsObject 
+*/
 class TDMCreateFieldnull extends XoopsObject
 { 
-	//Constructor
-	function __construct()
+	/*
+	*  @public function constructor class
+	*  @param null
+	*/
+	public function __construct()
 	{
-		$this->XoopsObject();
+		$this->XoopsObject();		
+		$this->initVar('fieldnull_name', XOBJ_DTYPE_TXTBOX);	
 		$this->initVar('fieldnull_value', XOBJ_DTYPE_TXTBOX);		
-		$this->initVar('fieldnull_name', XOBJ_DTYPE_TXTBOX);		
 	}
-	
-	//Constructor
-	function TDMCreateFieldnull()
-    {
-        $this->__construct();
-    }	
 }
-
+/*
+*  @Class TDMCreateFieldnullHandler
+*  @extends XoopsPersistableObjectHandler
+*/
 class TDMCreateFieldnullHandler extends XoopsPersistableObjectHandler 
 {
     function __construct(&$db) 
     {
-        parent::__construct($db, 'mod_tdmcreate_fieldnull', 'tdmcreatefieldnull', 'fieldnull_value', 'fieldnull_name');
+        parent::__construct($db, 'mod_tdmcreate_fieldnull', 'tdmcreatefieldnull', 'fieldnull_name', 'fieldnull_value');
     }
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php	2014-05-19 15:22:07 UTC (rev 12538)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php	2014-05-19 18:53:24 UTC (rev 12539)
@@ -140,17 +140,8 @@
 		$form->addElement(new TDMCreateFormLabel('</tr></thead>'));	
 		$form->addElement(new TDMCreateFormLabel('<tbody>'));
 				
-		$obj = $fieldsHandler->getObjects(null);
-		
-		// Get the list of fields
-		$criteria = new CriteriaCompo();
-		$criteria->add(new Criteria('field_mid', $field_mid));
-		$criteria->add(new Criteria('field_tid', $field_tid));
-		$criteria->setSort('field_id ASC, field_name');
-		$criteria->setOrder('ASC');	
-		$fields_arr = $fieldsHandler->getAll($criteria);
-		unset($criteria);
-			
+		$obj = $fieldsHandler->getObjects(null);		
+					
 		$class = '';
 		for($i = 1; $i <= $field_numb; $i++)
 		{
@@ -190,27 +181,20 @@
 			$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_key_select->render().'</td>'));
 			// Field Void
 			$table_autoincrement = $this->tdmcreate->getHandler('tables')->get($f_tid);
-			if( ($i == 1) && ($table_autoincrement->getVar('table_autoincrement') == 1)/**/)  {				
+			if( ($i == 1) && ($table_autoincrement->getVar('table_autoincrement') == 1))  {				
 				$form->addElement(new TDMCreateFormLabel('<td>&nbsp;</td></tr>'));
 			} else {				
 				// Box header row				
 				$parameters_tray = new XoopsFormElementTray('', '<br />');		
-				// Field Elements				
+				// Field Elements	
+				$criteria_element = new CriteriaCompo();				
+				$criteria_element->add(new Criteria('fieldelement_tid', 0));					
+                $criteria_table = new CriteriaCompo();	
+				$criteria_table->add(new Criteria('fieldelement_mid', $field_mid));			
 				$field_elements_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_ELEMENT_NAME, 'field_element['.$i.']', $this->getVar('field_element'));			    
-					$field_elements_select->addOptionArray($fieldelementsHandler->getList());										
-					$criteria = new CriteriaCompo(new Criteria('table_id', $f_tid));
-					$criteria->add(new Criteria('table_mid', $f_mid));					
-					$criteria->setSort('table_name');
-					$criteria->setOrder('ASC');
-					$table_arr = $tablesHandler->getAll($criteria);
-					unset($criteria);
-					foreach (array_keys($table_arr) as $xft_other) 
-					{                                  
-						$form_table_name = $table_arr[$xft_other]->getVar('table_name');
-						if ( $xft_other[$i] == 'XoopsFormTables-'.$form_table_name ) {								
-							$field_elements_select->addOption('XoopsFormTables-'.$form_table_name, 'Table : '.$form_table_name);						
-						}													
-					}
+					$field_elements_select->addOptionArray($fieldelementsHandler->getList($criteria_element));
+					$field_elements_select->addOptionArray($fieldelementsHandler->getList($criteria_table));
+                    unset($criteria_element); unset($criteria_table);					
 					$parameters_tray->addElement($field_elements_select);
 								
 				$field_parent = $isNew ? ( $i == 1 ? 1 : 0 ) : $this->getVar('field_parent');
@@ -330,9 +314,9 @@
      *
      * @return mixed reference to the {@link TDMCreateFields} object
      */
-    public function &get($id)
+    public function &get($id = null, $fields = null)
     {        
-		return parent::get($id);
+		return parent::get($id, $fields);
     }
 
 	/**

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fieldtype.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fieldtype.php	2014-05-19 15:22:07 UTC (rev 12538)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fieldtype.php	2014-05-19 18:53:24 UTC (rev 12539)
@@ -16,30 +16,34 @@
  * @package         tdmcreate
  * @since           2.5.5
  * @author          Txmod Xoops <su...@tx...>
- * @version         $Id: 1.59 fieldtype.php 11297 2013-03-24 10:58:10Z timgno $
+ * @version         $Id: 1.91 fieldtype.php 11297 2014-05-14 10:58:10Z timgno $
  */
-if (!defined('XOOPS_ROOT_PATH')) { die("XOOPS root path not defined"); }
-
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+/*
+*  @Class TDMCreateFieldtype
+*  @extends XoopsObject 
+*/
 class TDMCreateFieldtype extends XoopsObject
 { 
-	//Constructor
-	function __construct()
+	/*
+	*  @public function constructor class
+	*  @param null
+	*/
+	public function __construct()
 	{
-		$this->XoopsObject();
-        $this->initVar('fieldtype_value', XOBJ_DTYPE_TXTBOX);		
-		$this->initVar('fieldtype_name', XOBJ_DTYPE_TXTBOX);		
+		$this->XoopsObject();        		
+		$this->initVar('fieldtype_name', XOBJ_DTYPE_TXTBOX);
+		$this->initVar('fieldtype_value', XOBJ_DTYPE_TXTBOX);		
 	}
-	
-	//Constructor
-	function TDMCreateFieldtype()
-    {
-        $this->__construct();
-    }	
 }
+/*
+*  @Class TDMCreateFieldtypeHandler
+*  @extends XoopsPersistableObjectHandler
+*/
 class TDMCreateFieldtypeHandler extends XoopsPersistableObjectHandler 
 {
     function __construct(&$db) 
     {
-        parent::__construct($db, 'mod_tdmcreate_fieldtype', 'tdmcreatefieldtype', 'fieldtype_value', 'fieldtype_name');
+        parent::__construct($db, 'mod_tdmcreate_fieldtype', 'tdmcreatefieldtype', 'fieldtype_name', 'fieldtype_value');
     }
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_about.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_about.php	2014-05-19 15:22:07 UTC (rev 12538)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_about.php	2014-05-19 18:53:24 UTC (rev 12539)
@@ -29,7 +29,7 @@
 	
 	/*
 	*  @public function constructor
-	*  @param string $modules
+	*  @param string $module
 	*  @param string $filename
 	*/
 	public function __construct($module, $filename) {    
@@ -39,7 +39,8 @@
 	}
 	/*
 	*  @static function &getInstance
-	*  @param null
+	*  @param string $module
+	*  @param string $filename
 	*/
 	public static function &getInstance($module, $filename)
     {
@@ -65,7 +66,7 @@
 echo \$adminMenu->renderAbout('$module_donations', false);
 include 'footer.php';  
 EOT;
-		$this->tdmcfile->create($module_name, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'admin', null, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_footer.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_footer.php	2014-05-19 15:22:07 UTC (rev 12538)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_footer.php	2014-05-19 18:53:24 UTC (rev 12539)
@@ -39,7 +39,8 @@
 	}
 	/*
 	*  @static function &getInstance
-	*  @param null
+	*  @param string $module
+	*  @param string $filename
 	*/
 	public static function &getInstance($module, $filename)
     {
@@ -69,7 +70,7 @@
             <a href='{$support_url}' title='Visit {$support_name}' class='tooltip' rel='external'>{$support_name}</a></div>";
 xoops_cp_footer();  
 EOT;
-		$this->tdmcfile->create($module_name, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'admin', null, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_header.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_header.php	2014-05-19 15:22:07 UTC (rev 12538)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_header.php	2014-05-19 18:53:24 UTC (rev 12539)
@@ -27,25 +27,38 @@
 	*/
 	private $tdmcfile = null;
 	/*
+	* @var string
+	*/
+	private $table = null;
+	/*
+	* @var string
+	*/
+	private $tables = null;
+	/*
 	*  @public function constructor
 	*  @param string $module
-	*  @param string $file_name
+	*  @param mixed $table
+	*  @param string $filename
 	*/
-	public function __construct($module, $table, $file_name) {    
+	public function __construct($module, $table, $tables, $filename) {    
 		$this->tdmcfile = TDMCreateFile::getInstance();
 		$this->setModule($module);
-		$this->setTable($table);
-		$this->setFileName($file_name);
+		//$this->setTable($table);
+		$this->setFileName($filename);
+		$this->table = $table;
+		$this->tables = $tables;
 	}
 	/*
 	*  @static function &getInstance
-	*  @param null
+	*  @param string $module
+	*  @param mixed $table
+	*  @param string $filename
 	*/
-	public static function &getInstance($module, $table, $file_name)
+	public static function &getInstance($module, $table, $tables, $filename)
     {
         static $instance = false;
         if (!$instance) {
-            $instance = new self($module, $table, $file_name);
+            $instance = new self($module, $table, $tables, $filename);
         }
         return $instance;
     }	
@@ -57,7 +70,7 @@
 		$module = $this->getModule();
 		$filename = $this->getFileName();
 		$module_name = $module->getVar('mod_name');
-		$table = $this->getTable();
+		//$table = $this->getTable();
 		$stl_mod_name = strtolower($module_name);
 		$ucfmod_name = ucfirst($module_name);		
 		$language = $this->getLanguage('AM');
@@ -68,7 +81,7 @@
 include_once \$thisPath.'/include/common.php';
 include_once \$thisPath.'/include/functions.php';
 EOT;
-		if ( $table->getVar('table_name') != '' ) {
+		if ( $this->table->getVar('table_name') != '' ) {
 			$content .= <<<EOT
 \ninclude_once \$thisPath.'/class/helper.php';
 // Get instance
@@ -85,9 +98,9 @@
 \$modPathIcon16 = \$xoopsModule->getInfo('modicons16');
 \$modPathIcon32 = \$xoopsModule->getInfo('modicons32');\n
 EOT;
-		foreach (array_keys($table) as $i)
+		foreach (array_keys($this->tables) as $i)
 		{
-			$table_name = $table[$i]->getVar('table_name');
+			$table_name = $this->tables[$i]->getVar('table_name');
 			$content .= '$'.$table_name.'Handler =& xoops_getModuleHandler(\''.$table_name. '\', $thisModule);'.PHP_EOL;
 		}
 		$content .=<<<EOT
@@ -116,7 +129,7 @@
 xoops_cp_header();
 \$adminMenu = new ModuleAdmin();	
 EOT;
-		$this->tdmcfile->create($module_name, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'admin', null, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_index.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_index.php	2014-05-19 15:22:07 UTC (rev 12538)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_index.php	2014-05-19 18:53:24 UTC (rev 12539)
@@ -27,26 +27,34 @@
 	*/
 	private $tdmcfile = null;
 	/*
+	* @var string
+	*/
+	private $tables = null;
+	/*
 	*  @public function constructor
 	*  @param string $module
 	*  @param mixed $table
-	*  @param string $file_name
+	*  @param string $filename
 	*/
-	public function __construct($module, $table, $file_name) {    
+	public function __construct($module, $table, $tables, $filename) {    
 		$this->tdmcfile = TDMCreateFile::getInstance();
 		$this->setModule($module);
-		$this->setTable($table);
-		$this->setFileName($file_name);
+		//$this->setTable($table);
+		$this->setFileName($filename);
+		$this->table = $table;
+		$this->tables = $tables;
 	}	
 	/*
 	*  @static function &getInstance
-	*  @param null
+	*  @param string $module
+	*  @param mixed $table
+	*  @param string $filename
 	*/
-	public static function &getInstance($module, $table, $file_name)
+	public static function &getInstance($module, $table, $tables, $filename)
     {
         static $instance = false;
         if (!$instance) {
-            $instance = new self($module, $table, $file_name);
+            $instance = new self($module, $table, $tables, $filename);
         }
         return $instance;
     }
@@ -55,20 +63,19 @@
 	*  @param null
 	*/
 	public function render() {    
-		$path = $this->getLocalPath('admin');
-        $module = $this->getModule();
-		$table = $this->getTable();
+		$module = $this->getModule();
 		$filename = $this->getFileName();
-		$module_name = $module->getVar('mod_name');		
-		$language = $this->getLanguage('AM');
+        //$table = $this->getTable();		
+		$module_name = strtolower($module->getVar('mod_name'));
+		$language = $this->getLanguage($module_name, 'AM');
 		$language_thereare = $this->getLanguage('AM', 'THEREARE_');
 		$content = $this->getHeaderFilesComments($module, $filename);
 		$content .= <<<EOT
 \ninclude_once 'header.php';
 EOT;
-		foreach (array_keys($table) as $i)
+		foreach (array_keys($this->tables) as $i)
 		{
-			$table_name = $table[$i]->getVar('table_name');
+			$table_name = $this->tables[$i]->getVar('table_name');
 			$content .= <<<EOT
 \n//count "total {$table_name}"
 \$total_{$table_name} = \${$table_name}Handler->getCount();
@@ -78,9 +85,9 @@
 \n// InfoBox Statistics
 \$adminMenu->addInfoBox({$language}STATISTICS);
 EOT;
-		foreach (array_keys($table) as $i)
+		foreach (array_keys($this->tables) as $i)
 		{
-			$table_name = $table[$i]->getVar('table_name');
+			$table_name = $this->tables[$i]->getVar('table_name');
 			$ta_stutable_name = $language_thereare.strtoupper($table_name);
 			$content .= <<<EOT
 \n// InfoBox {$table_name}
@@ -94,7 +101,7 @@
 echo \$adminMenu->renderIndex();
 include_once 'footer.php';
 EOT;
-		$this->tdmcfile->create($path, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'admin', null, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_menu.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_menu.php	2014-05-19 15:22:07 UTC (rev 12538)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_menu.php	2014-05-19 18:53:24 UTC (rev 12539)
@@ -27,31 +27,50 @@
 	*/
 	private $tdmcfile = null;
 	/*
-	* @var bool
+	* @var string
 	*/
-	private $permissions = false;
+	private $table = null;
 	/*
+	* @var string
+	*/
+	private $tables = null;
+	/*
 	*  @public function constructor
 	*  @param string $module
 	*  @param string $file_name
 	*/
-	public function __construct($module, $table, $file_name, $permissions = false) {    
+	public function __construct($module, $table, $tables, $filename) {    
 		$this->tdmcfile = TDMCreateFile::getInstance();
 		$this->setModule($module);
-		$this->setTable($table);
-		$this->setFileName($file_name);
-		$this->permissions = $permissions;
-	}		
+		//$this->setTable($table);
+		$this->setFileName($filename);
+		$this->table = $table;
+		$this->tables = $tables;
+	}
+    /*
+	*  @static function &getInstance
+	*  @param string $module
+	*  @param mixed $table
+	*  @param string $filename
+	*/
+	public static function &getInstance($module, $table, $tables, $filename)
+    {
+        static $instance = false;
+        if (!$instance) {
+            $instance = new self($module, $table, $tables, $filename);
+        }
+        return $instance;
+    }		
 	/*
 	*  @public function render
 	*  @param null
 	*/
 	public function render() {    
-        $path = $this->getLocalPath('admin');
         $module = $this->getModule();
-		$table = $this->getTable();
+		$module_name = $module->getVar('mod_name');
+		//$table = $this->getTable();
 		$filename = $this->getFileName();
-		$language = $this->getLanguage('MI', 'ADMENU');
+		$language = $this->getLanguage($module_name, 'MI', 'ADMENU');
 		$menu = 1;
 		$content = $this->getHeaderFilesComments($module, $filename);
 		$content .= <<<EOT
@@ -59,28 +78,28 @@
 \$module_handler =& xoops_gethandler('module');
 \$xoopsModule =& XoopsModule::getByDirname(\$dirname);
 \$moduleInfo =& \$module_handler->get(\$xoopsModule->getVar('mid'));
-\$pathIcon32 = \$moduleInfo->getInfo('sysicons32');
+\$sysPathIcon32 = \$moduleInfo->getInfo('sysicons32');
 \$adminmenu = array(); 
 \$i = 1;
 \$adminmenu[\$i]['title'] = {$language}{$menu};
 \$adminmenu[\$i]['link'] = 'admin/index.php';
-\$adminmenu[\$i]['icon'] = \$pathIcon32.'/home.png';
+\$adminmenu[\$i]['icon'] = \$sysPathIcon32.'/home.png';
 \$i++;
 EOT;
-		foreach (array_keys($table) as $i)
+		foreach (array_keys($this->tables) as $i)
 		{		
-			if ( $table[$i]->getVar('table_admin') == 1 ) 
+			if ( $this->tables[$i]->getVar('table_admin') == 1 ) 
 			{   
 			    $menu++;
 				$content .= <<<EOT
 \n\$adminmenu[\$i]['title'] = {$language}{$menu};
-\$adminmenu[\$i]['link'] = 'admin/{$table[$i]->getVar('table_name')}.php';
-\$adminmenu[\$i]['icon'] = \$pathIcon32.'/{$table[$i]->getVar('table_image')}';
+\$adminmenu[\$i]['link'] = 'admin/{$this->tables[$i]->getVar('table_name')}.php';
+\$adminmenu[\$i]['icon'] = \$sysPathIcon32.'/{$this->tables[$i]->getVar('table_image')}';
 \$i++;
 EOT;
 			}
 		}
-		if( $this->permissions != false ) {
+		if( $this->table->getVar('table_permissions') == 1 ) {
 			$menu++;
 			$content .= <<<EOT
 \n\$adminmenu[\$i]['title'] = {$language}{$menu};
@@ -98,7 +117,7 @@
 EOT;
 		unset( $menu );
 		
-		$this->tdmcfile->create($path, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'admin', null, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_pages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_pages.php	2014-05-19 15:22:07 UTC (rev 12538)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_pages.php	2014-05-19 18:53:24 UTC (rev 12539)
@@ -29,13 +29,13 @@
 	/*
 	*  @public function constructor
 	*  @param string $module
-	*  @param string $file_name
+	*  @param string $filename
 	*/
-	public function __construct($module, $table, $file_name) {    
+	public function __construct($module, $table, $filename) {    
 		$this->tdmcfile = TDMCreateFile::getInstance();
 		$this->setModule($module);
 		$this->setTable($table);
-		$this->setFileName($file_name);
+		$this->setFileName($filename);
 	}	
 	
 	/*
@@ -229,12 +229,11 @@
 	*  @param null
 	*/
 	public function render() {    
-		$path = $this->getLocalPath('admin');
         $module = $this->getModule();
 		$module_name = $module->getVar('mod_name');
 		$table_name = $this->getTable()->getVar('table_name');
 		$filename = $this->getFileName();
-		$language = $this->getLanguage('AM');
+		$language = $this->getLanguage($module_name, 'AM');
 		$content = $this->getHeaderFilesComments($module, $filename);
 		$content .=	$this->getAdminPagesHeader($module_name, $table_name);
 		$content .=	$this->getAdminPagesNew($table_name, $language);
@@ -242,7 +241,7 @@
 		$content .=	$this->getAdminPagesEdit($table_name, $language);
 		$content .=	$this->getAdminPagesDelete($table_name, $language);
 		$content .= $this->getAdminPagesFooter();
-		$this->tdmcfile->create($path, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'admin', null, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

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-05-19 15:22:07 UTC (rev 12538)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_permissions.php	2014-05-19 18:53:24 UTC (rev 12539)
@@ -27,27 +27,49 @@
 	*/
 	private $tdmcfile = null;
 	/*
+	* @var string
+	*/
+	private $table = null;
+	/*
+	* @var string
+	*/
+	private $tables = null;
+	/*
 	*  @public function constructor
 	*  @param string $module
-	*  @param string $file_name
+	*  @param string $filename
 	*/
-	public function __construct($module, $table, $file_name) {    
+	public function __construct($module, $table, $filename) {    
 		$this->tdmcfile = TDMCreateFile::getInstance();
 		$this->setModule($module);
-		$this->setTable($table);
-		$this->setFileName($file_name);
-	}	
+		//$this->setTable($table);
+		$this->setFileName($filename);
+		$this->table = $table;
+	}
 	/*
+	*  @static function &getInstance
+	*  @param string $module
+	*  @param mixed $table
+	*  @param string $filename
+	*/
+	public static function &getInstance($module, $table, $filename)
+    {
+        static $instance = false;
+        if (!$instance) {
+            $instance = new self($module, $table, $filename);
+        }
+        return $instance;
+    }	
+	/*
 	*  @public function render
 	*  @param null
 	*/
 	public function render() {    
-		$path = $this->getLocalPath('admin');
         $module = $this->getModule();
-		$table = $this->getTable();
+		//$table = $this->getTable();
 		$filename = $this->getFileName();
 		$module_name = $module->getVar('mod_name');		
-		$language = $this->getLanguage('AM');
+		$language = $this->getLanguage($module_name, 'AM');
 		$content = $this->getHeaderFilesComments($module, $filename);
 		$content .= <<<EOT
 \ninclude_once 'header.php';
@@ -135,7 +157,7 @@
 unset(\$permform);
 include_once 'footer.php';
 EOT;
-		$this->tdmcfile->create($path, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'admin', null, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_templates.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_templates.php	2014-05-19 15:22:07 UTC (rev 12538)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_templates.php	2014-05-19 18:53:24 UTC (rev 12539)
@@ -19,7 +19,7 @@
  * @version         $Id: admin_templates.php 12258 2014-01-02 09:33:29Z timgno $
  */
 defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
+require_once 'htmlsmartycodes.php';
 class AdminTemplates extends HtmlSmartyCodes
 {	
 	/*
@@ -30,23 +30,39 @@
 	*  @public function constructor
 	*  @param string $module
 	*  @param mixed $table
-	*  @param string $file_name
+	*  @param string $filename
 	*/
-	public function __construct($module, $table, $file_name) {    
+	public function __construct($module, $table, $filename) {    
 		$this->tdmcfile = TDMCreateFile::getInstance();
 		$this->setModule($module);
 		$this->setTable($table);		
-		$this->setFileName($file_name);	
-	}	
+		$this->setFileName($filename);	
+	}
 	/*
+	*  @static function &getInstance
+	*  @param string $module
+	*  @param mixed $table
+	*  @param string $filename
+	*/
+	public static function &getInstance($module, $table, $filename)
+    {
+        static $instance = false;
+        if (!$instance) {
+            $instance = new self($module, $table, $filename);
+        }
+        return $instance;
+    }	
+	/*
 	*  @public function render
 	*  @param null
 	*/
 	public function render() {	
-		$path = $this->getLocalPath('admin');
+		$module = $this->getModule();
 		$filename = $this->getFileName();
-		$language = $this->getLanguage('AM');	
-		$this->tdmcfile->create($path, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$module_name = $module->getVar('mod_name');
+		$language = $this->getLanguage($module_name, 'AM');	
+		$content = 'Under Construction';
+		$this->tdmcfile->create($module_name, 'templates/', 'admin' $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php	2014-05-19 15:22:07 UTC (rev 12538)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php	2014-05-19 18:53:24 UTC (rev 12539)
@@ -20,15 +20,10 @@
  */
 defined('XOOPS_ROOT_PATH') or die('Restricted access');
 require_once 'structure.php';
-require_once 'file.php';
-require_once 'admin_about.php';
-require_once 'admin_footer.php';
-require_once 'admin_header.php';
-require_once 'admin_index.php';
-require_once 'admin_menu.php';
-require_once 'css_styles.php';
-require_once 'include_functions.php';/**/
-class TDMCreateArchitecture
+include_once TDMC_PATH . '/include/functions.php';
+spl_autoload_register('TDMCreate_autoload');
+
+class TDMCreateArchitecture extends TDMCreateStructure
 {	
 	/*
 	* @var mixed
@@ -53,20 +48,8 @@
 	public function __construct() {		
 		$this->tdmcreate = TDMCreate::getInstance();
 		$this->structure = TDMCreateStructure::getInstance();
-	}
+	}	
 	/*
-	*  @private 'magic method' function __autoload classes
-	*  @param string $class_name
-	*/
-	protected function __autoload($class_name) {
-		$filename = $class_name . '.php';
-		if (is_readable($filename)) { 
-			include_once $filename; 
-			return true; 
-		} 
-		return false; 
-	}
-	/*
 	*  @static function &getInstance
 	*  @param null
 	*/
@@ -175,44 +158,56 @@
 	*  @param string $module
     *  @param string $table	
 	*/
-	public function createBuildingFiles( $module, $table )
+	public function createBuildingFiles( $module, $table, $tables, $fields )
 	{	
-		$ret = '';
+		$ret = array();
 		// Admin Aboutr File 
-		$adminAbout = AdminAbout::getInstance($module, 'about.php');
-		$admin_about = $adminAbout->render();
+		$adminAbout = AdminAbout::getInstance($module, 'about.php');		
 		// Admin Footer File 
-		$adminFooter = AdminFooter::getInstance($module, 'footer.php');
-		$admin_footer = $adminFooter->render();
+		$adminFooter = AdminFooter::getInstance($module, 'footer.php');		
 		// Admin Header File 
-		//$adminHeader = AdminHeader::getInstance($module, $table, 'header.php');
+		$adminHeader = AdminHeader::getInstance($module, $table, $tables, 'header.php');
 		// Admin Index File
-		//$adminIndex = AdminIndex::getInstance($module, $table, 'index.php');
+		$adminIndex = AdminIndex::getInstance($module, $table, $tables, 'index.php');
 		// Admin Menu File
-		//$adminMenu = AdminMenu::getInstance($module, $table, 'menu.php');
+		$adminMenu = AdminMenu::getInstance($module, $table, $tables, 'menu.php');
+		// Admin Permissions File
+		$adminPermissions = AdminPermissions::getInstance($module, $tables, 'permissions.php');
 		// Admin Styles File
-		$cssStyles = CssStyles::getInstance($module, 'style.css');
+		$cssStyles = CssStyles::getInstance($module, 'style.css');		
+		// Admin Common File
+		$includeCommon = IncludeCommon::getInstance($module, 'common.php');
 		// Admin Functions File
 		$includeFunctions = IncludeFunctions::getInstance($module, 'functions.php');
+		// Admin Install File
+		$includeInstall = IncludeInstall::getInstance($module, $table, $tables, $fields, 'install.php');
 		
-		/*foreach (array_keys($tables_arr) as $i)
+		foreach (array_keys($tables) as $i)
 		{
-			
-		}*/
-		return array('admin_about' => $admin_about, 'admin_footer' => $admin_footer,//return $ret;
-		             //'admin_header' => $adminHeader->render(), 'admin_index' => $adminIndex->render(),
-                     //'admin_menu' => $adminMenu->render(), 'admin_footer' => $adminFooter->render(), 
-					 //'admin_footer' => $adminFooter->render(), 'admin_footer' => $adminFooter->render(), 
-                     //'admin_footer' => $adminFooter->render(), 'admin_footer' => $adminFooter->render(),
-                     //'admin_footer' => $adminFooter->render(), 'admin_footer' => $adminFooter->render(), 
-                     //'admin_footer' => $adminFooter->render(), 'admin_footer' => $adminFooter->render(), 
-                     //'admin_footer' => $adminFooter->render(), 'admin_footer' => $adminFooter->render(), 
-                     //'admin_footer' => $adminFooter->render(), 'admin_footer' => $adminFooter->render(), 
-                     //'admin_footer' => $adminFooter->render(), 'admin_footer' => $adminFooter->render(), 
-                     //'admin_footer' => $adminFooter->render(), 'admin_footer' => $adminFooter->render(), 
-                     //'admin_footer' => $adminFooter->render(), 'admin_footer' => $adminFooter->render(), 
-                     //'admin_footer' => $adminFooter->render(), 'admin_footer' => $adminFooter->render(), 
-                     //'admin_footer' => $adminFooter->render(), 'admin_footer' => $adminFooter->render(), 
-                    'css_style' => $cssStyles->render()/* , 'include_functions' => $includeFunctions->render()*/); 					 
+			$table_name = $tables[$i]->getVar('table_name');
+			// Admin Pages File
+			$adminPages = AdminPages::getInstance($module, $tables, $table_name.'.php');
+			$ret[] = $adminPages->render();
+			// Admin Templates File
+			$adminTemplates = AdminTemplates::getInstance($module, $tables, $table_name.'.tpl');
+			$ret[] = $adminTemplates->render();
+			// User Pages File
+			$userPages = UserPag...
 
[truncated message content]

[xoops-svn] SF.net SVN: xoops-svn:[12538] XoopsCore/branches/2.5.x/2.5.7/htdocs/ xoops_lib/modules/protector

From: <be...@us...> - 2014-05-19 15:22:11

Revision: 12538
          http://sourceforge.net/p/xoops/svn/12538
Author:   beckmi
Date:     2014-05-19 15:22:07 +0000 (Mon, 19 May 2014)
Log Message:
-----------
UTF-8 conversion

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/CHANGES
    XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/CHANGES_OLD
    XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/MEMO_ja
    XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/README
    XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/TODO

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/CHANGES
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/CHANGES	2014-05-19 14:19:33 UTC (rev 12537)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/CHANGES	2014-05-19 15:22:07 UTC (rev 12538)
@@ -208,210 +208,210 @@
 
 [/xlang:en][xlang:ja]
 
-ﾂ｡ﾃｼﾃ甘堕ｹﾂｹﾃ催ｺﾃ偲ｲ
+●変更履歴
 
-3.0ﾂｰﾃ環ｹﾃ淞､ﾃ仰､ﾃ・､ﾂ､ﾂ､ﾃ・､ﾃ蹴EADMEﾃ・｢ﾂ､ﾃ仰ｰﾃ愿・ｰ
+3.0以降についてはREADME内に移動
 
 2.57 (2006/07/17)
-- ﾂ･ﾃ猟･ﾃｬﾂ･ﾃ閉･ﾂ｣ﾂ･ﾃδ･ﾂｯﾂ･ﾂｹﾂ･ﾃ楪･ﾃ債｡ﾂｼﾂ･ﾂｸﾂ･ﾃ｣ﾂ､ﾃ篠･ﾃ青･ﾃδ･ﾂｯﾂ･ﾂ｢ﾂ･ﾃδ･ﾃ猟､ﾃ③LOBﾂ､ﾃ篠ｽﾃｨﾃ催ｽﾂ､ﾂｬﾂ､ﾂｪﾂ､ﾂｫﾂ､ﾂｷﾂ､ﾂｫﾂ､ﾃδ､ﾂｿﾂ､ﾃ篠､ﾃｲﾂｽﾂ､ﾃﾂｵ (thx fbs777)
-- ﾂ､ﾂ､ﾂ､ﾂｯﾂ､ﾃ・､ﾂｫﾂｽﾃ青､ﾃ・､ﾂ､ﾂ､ﾃｫNoticeﾂ､ﾃｲﾂｽﾂ､ﾃﾂｵ
-- gticket2 ﾂ､ﾃ仰ｹﾂｹﾂｿﾂｷ
-- onInstallﾂｽﾃｨﾃ催ｽﾂ､ﾃｲﾂ､ﾃ､ﾂ､ﾃ｡ﾂ､ﾂｿ (2.57a)
+- プレフィックスマネージャのバックアップでBLOBの処理がおかしかったのを修正 (thx fbs777)
+- いくつか出ているNoticeを修正
+- gticket2 に更新
+- onInstall処理をやめた (2.57a)
 
 2.56 (2006/03/30)
-- ﾂ･ﾂｳﾂ･ﾃｳﾂ･ﾃ閉･ﾂ｣ﾂ･ﾂｰﾂ､ﾂｬﾂｼﾃｨﾂ､ﾃｬﾂ､ﾃ環､ﾂ､ﾂ､ﾃ按､ﾂｭﾂ､ﾃ篠･ﾂｨﾂ･ﾃｩﾂ｡ﾂｼﾂｽﾃｨﾃ催ｽﾂ､ﾃｲﾂｶﾂｯﾃﾂｩﾂｽﾂｪﾃ篠ｻﾂ､ﾃ凝甘堕ｹﾂｹﾂ､ﾂｷﾂ､ﾂｿ
-- common.phpﾂ､ﾃｲﾃ・可､ﾃ淞ｹﾃｾﾂ､ﾃ楪､ﾃ環､ﾂ､ﾂ･ﾃ｢ﾂ･ﾂｸﾂ･ﾃ･ﾂ｡ﾂｼﾂ･ﾃｫﾂ､ﾃ仰､ﾃ・､ﾂ､ﾂ､ﾃ・､ﾃ｢ﾂ｡ﾂ｢DOS/CRAWLERﾂｽﾃｨﾃ催ｽﾂ､ﾃ仰､ﾂｫﾂ､ﾂｫﾂ､ﾃｩﾂ､ﾃ環､ﾂ､ﾃﾃ淌・ｪﾂ､ﾃｲﾃ債ｭﾂｸﾃｺﾂ､ﾃ仰､ﾂｷﾂ､ﾂｿ
+- コンフィグが取れないときのエラー処理を強制終了に変更した
+- common.phpを読み込まないモジュールについても、DOS/CRAWLER処理にかからない設定を有効にした
 
 2.55 (2006/02/11)
-- ﾃ環｣ﾂｿﾃｴﾂ､ﾃ・ﾂ､ﾂｬﾃつｸﾂｺﾃ淞､ﾂｹﾂ､ﾃｫﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃ・､ﾃ｢ﾂ｡ﾂ｢.tar.gzﾂ､ﾃﾂ､ﾂｱﾂ､ﾃ湘・個､ﾂｹﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ仰ｽﾂ､ﾃﾂｵ (thx gusagi)
-- mymenuﾂ､ﾃ仰､ﾂｪﾂ､ﾂｱﾂ､ﾃｫXoopsCube 2.1ﾂ､ﾃ按､ﾃ篠ｸﾃ淞ｴﾂｹﾃﾂｭﾃ古､ﾃづｪﾂｲﾃｲﾂｾﾃ・
-- ﾂ･ﾂｹﾂ･ﾃ堋･ﾂ､ﾂ･ﾃｳﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂｹﾂｹﾂｿﾂｷ (thx bezoops)
+- 複数の.が存在するファイルでも、.tar.gzだけは通すように修正 (thx gusagi)
+- mymenuにおけるXoopsCube 2.1との互換性問題解消
+- スペイン語ファイル更新 (thx bezoops)
 
 2.54 (2005/12/08)
-- PREFIXﾂ･ﾃ楪･ﾃ債｡ﾂｼﾂ･ﾂｸﾂ･ﾃ｣ﾂ､ﾃ輝REFIXﾃ凝ｨﾂ､ﾃ篠･ﾃ青･ﾃδ･ﾂｯﾂ･ﾂ｢ﾂ･ﾃδ･ﾃ猟ｵﾂ｡ﾃ・ｽﾂ､ﾃｲﾂ､ﾃ・､ﾂｱﾂ､ﾂｿ (ﾂ､ﾃ楪､ﾃﾂｼﾃつｸﾂｳﾃε環ｳﾂｬﾂ､ﾃ・､ﾂｹ!)
-- ﾃ環｣ﾂｿﾃｴﾂ､ﾃ・ﾂ､ﾂｬﾃつｸﾂｺﾃ淞､ﾂｹﾂ､ﾃｫﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂ･ﾂ｢ﾂ･ﾃδ･ﾃ猟･ﾃｭﾂ｡ﾂｼﾂ･ﾃ可ｽﾃ静催ｨﾂ､ﾃ環､ﾂ､ﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ凝甘堕ｹﾂｹ (Apacheﾂ､ﾃ篠ｻﾃ・催催づ青ｺﾃｶ)
-- ﾂ･ﾃ鳴･ﾃｩﾂ･ﾂｸﾂ･ﾃｫﾂ･ﾃ敖･ﾃｫﾂ･ﾃ按･ﾂｬﾂ･ﾃｫﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃ篠ｹﾂｹﾂｿﾂｷ (thx Izzy)
-- ﾂｵﾂｶﾃ・ｵﾂｲﾃｨﾃ・ｼﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ･ﾃ・･ﾂｧﾂ･ﾃδ･ﾂｫﾂ｡ﾂｼﾂ､ﾂｬopen_basedirﾃﾂｩﾂｸﾃつ､ﾃ仰､ﾃ陳､ﾃδ､ﾂｫﾂ､ﾂｫﾂ､ﾃδ､ﾃ・､ﾂ､ﾂ､ﾂｿﾂ､ﾃ篠､ﾃｲﾂｽﾂ､ﾃﾂｵ (thx stefan88) - 2.54a
-- ﾂｳﾃ・ｼﾃｯﾃﾃ淌・ｪﾂ､ﾃ篠ｽﾃｩﾂｴﾃｼﾃε債､ﾃｲﾂ､ﾂ､ﾂ､ﾂｯﾂ､ﾃ・､ﾂｫﾂ､ﾃ按｡ﾂ｢ﾂ･ﾃ可･ﾂｭﾂ･ﾃ･ﾂ･ﾃ｡ﾂ･ﾃｳﾂ･ﾃ按､ﾃ篠ｽﾂ､ﾃﾂｵ - 2.54a
+- PREFIXマネージャにPREFIX毎のバックアップ機能をつけた (まだ実験段階です!)
+- 複数の.が存在するファイルをアップロード出来ないように変更 (Apacheの仕様対策)
+- ブラジルポルトガル語ファイルの更新 (thx Izzy)
+- 偽装画像ファイルチェッカーがopen_basedir制限にひっかかっていたのを修正 (thx stefan88) - 2.54a
+- 各種設定の初期値をいくつかと、ドキュメントの修正 - 2.54a
 
 2.53 (2005/11/30)
- - ﾂｵﾂｶﾃ・ｵﾂｲﾃｨﾃ・ｼﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ･ﾂ｢ﾂ･ﾃδ･ﾃ猟･ﾃｭﾂ｡ﾂｼﾂ･ﾃ可､ﾃ仰､ﾃｨﾂ､ﾃｫIEﾂ､ﾃ珊SSﾃづ青ｺﾃｶﾂ･ﾂｳﾂ｡ﾂｼﾂ･ﾃ可､ﾃ偲・可ｲﾃ・
- - ﾂ･ﾃ・｡ﾂｼﾂ･ﾂｿﾂ･ﾃ卍｡ﾂｼﾂ･ﾂｹﾂ､ﾂｬbusyﾂｻﾃｾﾂ､ﾃ輝ath Disclosureﾂ､ﾃ按､ﾃ環､ﾃδ､ﾃ・､ﾂ､ﾂ､ﾂｿﾃ古､ﾃづｪﾂ､ﾃｲﾂｲﾃｾﾃ・ｱ
- - Noticeﾂ､ﾃｲﾃ按ｯﾃﾂｸﾂ､ﾂｷﾂ､ﾃ・､ﾂ､ﾂ､ﾂｿﾂ､ﾂ､ﾂ､ﾂｯﾂ､ﾃ・､ﾂｫﾂ､ﾃ篠･ﾃ淞･ﾂｹﾂ､ﾃｲﾂｽﾂ､ﾃﾂｵ
- - ﾂｴﾃ嘉催ｽﾂｲﾃｨﾃ古個､ﾂｬ XOOPS 2.2.3 ﾂ､ﾃ・･ﾂｨﾂ･ﾃｩﾂ｡ﾂｼﾂ､ﾃｲﾂｵﾂｯﾂ､ﾂｳﾂ､ﾂｷﾂ､ﾃ・､ﾂ､ﾂ､ﾂｿﾂｸﾃ淞ｴﾂｹﾃﾂｭﾃ古､ﾃづｪﾂ､ﾃ篠ｲﾃｾﾃ・ｱ
- - ﾂ･ﾃ可･ﾂｭﾂ･ﾃ･ﾂ･ﾃ｡ﾂ･ﾃｳﾂ･ﾃ按､ﾃｲdocsﾂ･ﾃ・･ﾂ｣ﾂ･ﾃｬﾂ･ﾂｯﾂ･ﾃ按･ﾃｪﾂ､ﾃ仰ｰﾃ愿・ｰ (ﾂ･ﾃ可･ﾂｭﾂ･ﾃ･ﾂ･ﾃ｡ﾂ･ﾃｳﾂ･ﾃ按､ﾂｫﾂ､ﾃｩﾂ､ﾃ篠･ﾃ青｡ﾂｼﾂ･ﾂｸﾂ･ﾃｧﾂ･ﾃｳﾃ渉ｳﾂｱﾃ古凝可ｻﾃ淞｡ﾃ・
+ - 偽装画像ファイルアップロードによるIEのXSS対策コードの追加
+ - データベースがbusy時にPath Disclosureとなっていた問題を改善
+ - Noticeを発生していたいくつかのミスを修正
+ - 管理画面が XOOPS 2.2.3 でエラーを起こしていた互換性問題の改善
+ - ドキュメントをdocsディレクトリに移動 (ドキュメントからのバージョン漏洩防止）
  - updated mymenu into 0.15a
- - PHP_SELF/PATH_INFO XSSﾃづ青ｺﾃｶﾂ､ﾃｲﾂ､ﾃ｢ﾂ､ﾂｦﾂｾﾂｯﾂ､ﾂｷﾂｴﾃ仰､ﾂｯﾂ､ﾂｷﾂ､ﾂｿﾂ｡ﾃ環ｶﾂｯﾃﾂｩﾂｽﾂｪﾃ篠ｻﾂ､ﾂｫﾂ､ﾃｩurlencodeﾃ・ｪﾃ・ｶﾂ､ﾃ仰｡ﾃ・
- - ﾂ･ﾃ｢ﾂ･ﾂｸﾂ･ﾃ･ﾂ｡ﾂｼﾂ･ﾃｫﾂ･ﾂ｢ﾂ･ﾂ､ﾂ･ﾂｳﾂ･ﾃｳﾂ､ﾃ偲甘堕ｹﾂｹ (thx Argon)
- - ﾂ･ﾃ敖｡ﾂｼﾂ･ﾃｩﾂ･ﾃｳﾂ･ﾃ可ｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃ篠ｹﾂｹﾂｿﾂｷ (thx Tomasz)
- - ﾂ･ﾃ閉･ﾃｩﾂ･ﾃｳﾂ･ﾂｹﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃ篠ｹﾂｹﾂｿﾂｷ (thx marco)
- - ﾂ･ﾂ､ﾂ･ﾂｿﾂ･ﾃｪﾂ･ﾂ｢ﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃ篠ｹﾂｹﾂｿﾂｷ (thx Defkon1)
- - zipﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃ篠･ﾃ堕･ﾃδ･ﾂｱﾂ｡ﾂｼﾂ･ﾂｸﾂ･ﾃ淞･ﾂｹﾂ､ﾃｲﾂｽﾂ､ﾃﾂｵ (thx Dave_L) 2.53a
+ - PHP_SELF/PATH_INFO XSS対策をもう少し緩くした（強制終了からurlencode相当に）
+ - モジュールアイコンの変更 (thx Argon)
+ - ポーランド語ファイルの更新 (thx Tomasz)
+ - フランス語ファイルの更新 (thx marco)
+ - イタリア語ファイルの更新 (thx Defkon1)
+ - zipファイルのパッケージミスを修正 (thx Dave_L) 2.53a
 
 2.52 (2005/8/27)
- - WordPressﾂ･ﾃ｢ﾂ･ﾂｸﾂ･ﾃ･ﾂ｡ﾂｼﾂ･ﾃｫﾃ・ｹﾂ､ﾃ仰､ﾃ・､ﾂ､ﾂ､ﾃ・､ﾃ｢ﾂ｡ﾂ｢xmlrpc.phpﾂｵﾂ｡ﾃ・ｽﾂ､ﾃｲﾃ個ｵﾂｸﾃｺﾂｲﾂｽﾂ､ﾂｹﾂ､ﾃｫﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ仰ｻﾃ・催催甘堕ｹﾂｹ
- - xmlrpc ﾂｹﾂｶﾂｷﾃ｢ﾂ､ﾃ仰､ﾃ・､ﾂ､ﾂ､ﾃ・､ﾃ篠･ﾃｭﾂ･ﾂｰﾂ､ﾂｬﾂｽﾃ・環｣ﾂｽﾃ静偲渉､ﾂｵﾂ､ﾃｬﾂ､ﾃ環､ﾂ､ﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ仰ｻﾃ・催催甘堕ｹﾂｹ
- - ﾂ･ﾃｭﾂ･ﾂｷﾂ･ﾂ｢ﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾃ・可ｲﾃ・(thx Sergey)
+ - WordPressモジュール等についても、xmlrpc.php機能を無効化するように仕様変更
+ - xmlrpc 攻撃についてのログが重複出力されないように仕様変更
+ - ロシア語ファイル追加 (thx Sergey)
 
 2.51 (2005/8/24)
- - ﾂ･ﾂｻﾂ･ﾃδ･ﾂｷﾂ･ﾃｧﾂ･ﾃｳﾂ･ﾃ渉･ﾂ､ﾂ･ﾂｸﾂ･ﾃ｣ﾂ･ﾃδ･ﾂｯﾃづ青ｺﾃｶﾂ､ﾃ・｡ﾂ｢IPﾂ･ﾃ楪･ﾂｹﾂ･ﾂｯﾂ､ﾃｲﾂｻﾃ佚・ｪﾂ､ﾃ・､ﾂｭﾂ､ﾃｫﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ仰､ﾂｷﾂ､ﾂｿ
- - session.use_trans_sid ﾂ､ﾃ仰､ﾃ・､ﾂ､ﾂ､ﾃ・､ﾃ偲εｭﾂｰﾃ閉ｽﾃｱﾂ､ﾂｭﾃ・可ｲﾃ・
- - PHP_SELF XSS ﾃづ青ｺﾃｶﾂ･ﾂｳﾂ｡ﾂｼﾂ･ﾃ可､ﾃ篠ｲﾃｾﾃ・ｱ
- - ﾂ･ﾃ閉･ﾃｩﾂ･ﾃｳﾂ･ﾂｹﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂｹﾂｹﾂｿﾂｷ (thx HEMON)
+ - セッションハイジャック対策で、IPマスクを指定できるようにした
+ - session.use_trans_sid についての注意書き追加
+ - PHP_SELF XSS 対策コードの改善
+ - フランス語ファイル更新 (thx HEMON)
 
-2.50 ﾃﾂｵﾂｼﾂｰﾃ暗・(2005/8/22)
- - PHP_SELF XSS ﾃづ青ｺﾃｶﾂ･ﾂｳﾂ｡ﾂｼﾂ･ﾃ嘉・可ｲﾃ・
- - ﾂ･ﾃ鳴･ﾃｩﾂ･ﾂｸﾂ･ﾃｫﾂ･ﾃ敖･ﾃｫﾂ･ﾃ按･ﾂｬﾂ･ﾃｫﾂｸﾃｬﾂ｡ﾂｦﾂ･ﾂｹﾂ･ﾃ堋･ﾂ､ﾂ･ﾃｳﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂｹﾂｹﾂｿﾂｷ (thx Yuji)
+2.50 正式版 (2005/8/22)
+ - PHP_SELF XSS 対策コード追加
+ - ブラジルポルトガル語・スペイン語ファイルを更新 (thx Yuji)
 
 2.50 beta2 (2005/7/31)
- - "2.0.9.2ﾂ､ﾃ篠ｷﾃｪ"ﾂ､ﾃ按､ﾂ､ﾂ､ﾂｦY/Nﾂ､ﾃ偲ﾃ淌・ｪﾂｹﾃﾃ古慊､ﾃｲﾂ｡ﾂ｢ﾃ・ｪﾃづｲﾂｼﾂｰﾂ､ﾃ・ﾂｵﾂ｡ﾃ・ｽﾃ個ｵﾂｸﾃｺﾂｲﾂｽ"ﾂ､ﾃ凝甘堕ｹﾂｹﾂ､ﾂｷﾂ､ﾂｿ
- - ﾂ･ﾃｭﾂ･ﾂｰﾂｴﾃ嘉催ｽﾂ､ﾃ・･ﾃ堋｡ﾂｼﾂ･ﾂｸﾂ､ﾂ｢ﾂ､ﾂｿﾂ､ﾃｪﾂ､ﾃ偲可ｽﾂｼﾂｨﾂｷﾃｯﾂｿﾃｴﾂ､ﾃｲﾃ甘堕ｹﾂｹﾂ､ﾃ・､ﾂｭﾂ､ﾃｫﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ仰､ﾂｷﾂ､ﾂｿ
- - ﾃ暗凝づ偲εｦﾂｹﾃｱﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂｹﾂｹﾂｿﾂｷ (thx Kikuchi)
- - ﾂ･ﾃ鳴･ﾃｩﾂ･ﾂｸﾂ･ﾃｫﾂ･ﾃ敖･ﾃｫﾂ･ﾃ按･ﾂｬﾂ･ﾃｫﾂｸﾃｬﾂ｡ﾂｦﾂ･ﾂｹﾂ･ﾃ堋･ﾂ､ﾂ･ﾃｳﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂｹﾂｹﾂｿﾂｷ (thx Yuji)
+ - "2.0.9.2の穴"というY/Nの設定項目を、選択式の"機能無効化"に変更した
+ - ログ管理でページあたりの表示件数を変更できるようにした
+ - 繁体中国語ファイルを更新 (thx Kikuchi)
+ - ブラジルポルトガル語・スペイン語ファイルを更新 (thx Yuji)
 
 2.50 beta1 (2005/7/22)
- - ﾂ｡ﾃ縫oS/Crawlerﾂ･ﾃ・･ﾂｧﾂ･ﾃδ･ﾂｯﾂ､ﾃｲﾂ･ﾂｹﾂ･ﾂｭﾂ･ﾃδ･ﾃ猟､ﾂｹﾂ､ﾃｫﾂ･ﾃ｢ﾂ･ﾂｸﾂ･ﾃ･ﾂ｡ﾂｼﾂ･ﾃｫﾂ｡ﾃ猟､ﾃ按､ﾂ､ﾂ､ﾂｦﾂ･ﾂｪﾂ･ﾃ猟･ﾂｷﾂ･ﾃｧﾂ･ﾃｳﾂ､ﾃ偲・可ｲﾃ・
- - indexﾂ､ﾃｲﾂ､ﾃ・､ﾂｱﾃ仰ｺﾂ､ﾃｬﾂ､ﾃ・､ﾂ､ﾂ､ﾂｿﾂ･ﾃ閉･ﾂ｣ﾂ｡ﾂｼﾂ･ﾃｫﾂ･ﾃ可､ﾃ仰､ﾂ｢ﾂ､ﾃｩﾂ､ﾂｿﾂ､ﾃ｡ﾂ､ﾃ・ndexﾃ嘉陛債ｿ
- - ﾂ｡ﾃ鳴ｿﾂｮﾃ催堕､ﾂｹﾂ､ﾃｫIPﾂ･ﾂ｢ﾂ･ﾃ可･ﾃｬﾂ･ﾂｹﾂ｡ﾃ猟･ﾂｪﾂ･ﾃ猟･ﾂｷﾂ･ﾃｧﾂ･ﾃｳﾂ､ﾃ偲・可ｲﾃ・
- - ﾂ･ﾃ堕･ﾂｹﾂ･ﾃｯﾂ｡ﾂｼﾂ･ﾃ嘉・ｭﾃ・ｶﾂ､ﾂｿﾂ､ﾃｪﾃ甘ｽﾂｼﾂｰﾂ､ﾃ伉､ﾃ偲づ青ｹﾂｳﾂｺﾃｶﾃ・可ｲﾃ・
+ - 「DoS/Crawlerチェックをスキップするモジュール」というオプションの追加
+ - indexをつけ忘れていたフィールドにあらためてindex付与
+ - 「信用するIPアドレス」オプションの追加
+ - パスワード総当たり方式への対抗策追加
 
-2.40 ﾃﾂｵﾂｼﾂｰﾃ暗・(2005/7/21)
- - criteria attack ﾂ､ﾃ伉､ﾃ偲づ青ｺﾃｶﾂ･ﾂｳﾂ｡ﾂｼﾂ･ﾃ嘉・可ｲﾃ・(xoops <= 2.0.10*ﾃ催・
- - ﾂ･ﾂ､ﾂ･ﾂｿﾂ･ﾃｪﾂ･ﾂ｢ﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂｹﾂｹﾂｿﾂｷ (thx Defkon1)
- - ﾂ･ﾃ閉･ﾂ｣ﾂ･ﾃｳﾂ･ﾃｩﾂ･ﾃｳﾂ･ﾃ可ｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾃ・可ｲﾃ・(thx kokko)
- - ﾂ･ﾃ敖｡ﾂｼﾂ･ﾃｩﾂ･ﾃｳﾂ･ﾃ可ｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾃ・可ｲﾃ・(thx Tomasz)
+2.40 正式版 (2005/7/21)
+ - criteria attack への対策コード追加 (xoops <= 2.0.10*用)
+ - イタリア語ファイル更新 (thx Defkon1)
+ - フィンランド語ファイル追加 (thx kokko)
+ - ポーランド語ファイル追加 (thx Tomasz)
 
 2.40RC2 (2005/4/4)
- - ﾂ･ﾃ｢ﾂ･ﾂｸﾂ･ﾃ･ﾂ｡ﾂｼﾂ･ﾃｫﾂ･ﾂ｢ﾂ･ﾃδ･ﾃ猟･ﾃ・｡ﾂｼﾂ･ﾃ按ｻﾃｾﾂ､ﾃ仰･ﾃ鳴･ﾃｭﾂ･ﾃδ･ﾂｯﾂ､ﾃｲﾂｺﾃｯﾂｽﾃｼﾂ､ﾂｹﾂ､ﾃｫﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ仰､ﾂｷﾂ､ﾂｿ (thx Dava_L)
- - ﾂ･ﾃ鳴･ﾃｩﾂ･ﾂｸﾂ･ﾃｫﾂ･ﾃ敖･ﾃｫﾂ･ﾃ按･ﾂｬﾂ･ﾃｫﾂｸﾃｬﾂ｡ﾂｦﾂ･ﾂｹﾂ･ﾃ堋･ﾂ､ﾂ･ﾃｳﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂｹﾂｹﾂｿﾂｷ (thx Yuji)
+ - モジュールアップデート時にブロックを削除するようにした (thx Dava_L)
+ - ブラジルポルトガル語・スペイン語ファイルを更新 (thx Yuji)
 
 2.40RC (2005/3/31)
- - ﾂ･ﾃ鳴･ﾃｭﾂ･ﾃδ･ﾂｯﾂ､ﾃ・､ﾃ篠･ﾃ・･ﾂｧﾂ･ﾃδ･ﾂｯﾂ､ﾃ偲・ｴﾃ・・
- - ﾃ・ｰﾂｺﾃｮﾂ･ﾃ・･ﾂｧﾂ･ﾃδ･ﾂｯﾃ催繕RIﾂ､ﾃ篠ｽﾂ､ﾃﾂｵ (thx satanas)
- - *check.inc.phpﾂ､ﾂｬﾂｸﾃｺﾂ､ﾂ､ﾂ､ﾃ・､ﾂ､ﾂ､ﾃｫﾂ､ﾂｫﾂ､ﾃ可､ﾂｦﾂ､ﾂｫﾂ､ﾃ篠･ﾃ・･ﾂｧﾂ･ﾃδ･ﾂｯﾃ甘ｽﾃ仰｡ﾂ､ﾃｲﾂｽﾂ､ﾃﾂｵ (thx peter & Dave_L)
- - IPﾂｵﾃｱﾃ暗敖ｲﾃｲﾂｽﾃｼﾂ･ﾃ堕･ﾂｹﾂ･ﾃｯﾂ｡ﾂｼﾂ･ﾃ可､ﾃ篠ｼﾂｫﾃ・ｰﾂ･ﾃ渉･ﾃδ･ﾂｷﾂ･ﾃ･ﾂｲﾂｽ
- - ﾂ｡ﾃ鳴ｵﾂｿﾂ､ﾃｯﾂ､ﾂｷﾂ､ﾂ､ﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂｻﾃ佚・ｪﾂ､ﾃ篠ｶﾃ伉ｻﾃ淞｡ﾃ猟､ﾃｲﾂ｡ﾂ｢GETﾂ､ﾃﾂ､ﾂｱﾂ､ﾃｲﾃづ青ｾﾃ敖､ﾃ仰､ﾂｹﾂ､ﾃｫﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ仰､ﾂｷﾂ､ﾂｿ
+ - ブロックでのチェックの全廃
+ - 動作チェック用URIの修正 (thx satanas)
+ - *check.inc.phpが効いているかどうかのチェック方法を修正 (thx peter & Dave_L)
+ - IP拒否解除パスワードの自動ハッシュ化
+ - 「疑わしいファイル指定の禁止」を、GETだけを対象にするようにした
 
 2.38 (2005/3/18)
- - DoSﾃづ青ｺﾃｶﾂ､ﾃ環､ﾃ可､ﾃ・｡ﾂ｢.htaccess DENYﾂ､ﾃｲﾂｻﾃ按､ﾂｦﾂｾﾃｬﾂｹﾃｧﾂ｡ﾂ｢ﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾂｬﾂｲﾃｵﾂ､ﾃｬﾂ､ﾂｿﾂｻﾃｾﾂ､ﾃ篠･ﾃｭﾂ｡ﾂｼﾂ･ﾃｫﾂ･ﾃ青･ﾃδ･ﾂｯﾃ・可ｲﾃ・
- - ﾂ･ﾂ､ﾂ･ﾂｿﾂ･ﾃｪﾂ･ﾂ｢ﾂｸﾃｬﾂｸﾃﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃ篠ｹﾂｹﾂｿﾂｷ (thx Defkon1)
+ - DoS対策などで、.htaccess DENYを使う場合、ファイルが壊れた時のロールバック追加
+ - イタリア語言語ファイルの更新 (thx Defkon1)
 
 2.37 (2005/3/9)
- - prefix manager ﾂ､ﾃ⑤Bﾃ個ｾﾂ､ﾃ篠･ﾂｯﾂ･ﾂｪﾂ｡ﾂｼﾂ･ﾃ・･ﾂ｣ﾂ･ﾃｳﾂ･ﾂｰﾃ仰ｺﾂ､ﾃｬﾂ､ﾃｲﾂｽﾂ､ﾃﾂｵ (thx king76)
- - Null-byte ﾂ､ﾃ｢ﾂ｡ﾂ｢quite ﾂ､ﾃ・ｾﾃδ､ﾂｨﾂ､ﾃｫﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ・
+ - prefix manager でDB名のクオーティング忘れを修正 (thx king76)
+ - Null-byte も、quite で消えるように
 
 2.36 (2005/3/9)
- - ﾂｶﾃ伉ｻﾃ淞ｳﾃ暗・･ﾂｻﾃ陳､ﾃ凝按ｴﾂ､ﾂｱﾂ､ﾂｬﾂ､ﾂ｢ﾂ､ﾃδ､ﾂｿﾂ､ﾃ篠､ﾃｲﾂｽﾂ､ﾃﾂｵ
+ - 禁止拡張子に抜けがあったのを修正
 
 2.35 (2005/3/5)
  - updated myblocksadmin 0.27 & mymenu 0.12
- - ﾂ･ﾃｭﾂ･ﾂｰﾂ･ﾃｬﾂ･ﾃ卍･ﾃｫﾂ､ﾃ偲・ｳﾃ・ｾﾂ｡ﾃ環ｾﾃ慊､ﾂｷﾂ､ﾂｯﾂ､ﾃ舟EMOﾂｻﾂｲﾂｾﾃ按｡ﾃ・
- - ﾂｰﾃｬﾂｻﾃｾﾃ・ｪﾂ､ﾃ凝・ｴﾃづ篠､ﾃ偲・ｰﾂｺﾃｮﾂ､ﾃｲOffﾂ､ﾃ仰､ﾂｹﾂ､ﾃｫﾂ･ﾂｪﾂ･ﾃ猟･ﾂｷﾂ･ﾃｧﾂ･ﾃｳﾂ､ﾃｲﾂ､ﾃ・､ﾂｱﾂ､ﾂｿ (thx Dave_L)
- - ﾃ暗凝づ偲εｦﾂｹﾃｱﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂｹﾂｹﾂｿﾂｷ (thx Kikuchi)
- - ﾂ･ﾃ閉･ﾃｩﾂ･ﾃｳﾂ･ﾂｹﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂｹﾂｹﾂｿﾂｷ (thx HEMON) 2.35a
- - ﾂ･ﾃ鳴･ﾃｩﾂ･ﾂｸﾂ･ﾃｫﾂ･ﾃ敖･ﾃｫﾂ･ﾃ按･ﾂｬﾂ･ﾃｫﾂｸﾃｬﾂ｡ﾂｦﾂ･ﾂｹﾂ･ﾃ堋･ﾂ､ﾂ･ﾃｳﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂｹﾂｹﾂｿﾂｷ (thx Yuji) 2.35a
+ - ログレベルの導入（詳しくはMEMO参照）
+ - 一時的に全体の動作をOffにするオプションをつけた (thx Dave_L)
+ - 繁体中国語ファイルを更新 (thx Kikuchi)
+ - フランス語ファイルを更新 (thx HEMON) 2.35a
+ - ブラジルポルトガル語・スペイン語ファイルを更新 (thx Yuji) 2.35a
 
 2.34 (2005/2/18)
- - ﾂ･ﾂｻﾂ･ﾃδ･ﾂｷﾂ･ﾃｧﾂ･ﾃｳﾂ･ﾃ渉･ﾂ､ﾂ･ﾂｸﾂ･ﾃ｣ﾂ･ﾃδ･ﾂｯﾃづ青ｺﾃｶﾂ､ﾃ・･ﾂｲﾂ･ﾂｹﾂ･ﾃ按､ﾃ篠ｽﾃｨﾃ催ｽﾂ､ﾃｲﾂｴﾃ鳴ｰﾃ｣ﾂ､ﾃδ､ﾃ・､ﾂ､ﾂ､ﾂｿﾂ､ﾃ篠､ﾃｲﾂｽﾂ､ﾃﾂｵ (thx blues)
- - ﾃ・ε・ｪﾂ･ﾃ堕･ﾂｿﾂ｡ﾂｼﾂ･ﾃｳﾃ凝可ｸﾃｦﾂ､ﾃ・ｶﾂｯﾃﾂｩﾂｽﾂｪﾃ篠ｻﾂ､ﾂｹﾂ､ﾃｫﾂｾﾃｬﾂｹﾃｧﾂ､ﾃ篠･ﾃ｡ﾂ･ﾃδ･ﾂｻﾂ｡ﾂｼﾂ･ﾂｸﾂ､ﾃｲﾂｽﾂ､ﾃﾂｵ (thx suin)
- - DoSﾂｷﾃ湘凝可ｸﾃｦﾂ､ﾃ・｡ﾂ｢.htaccess ﾂ､ﾃ・DENY FROM ﾂ､ﾃｲﾂｽﾃｱﾂ､ﾂｭﾂｹﾃｾﾂ､ﾃﾂ､ﾃ按､ﾂ､ﾂ､ﾂｦﾂ･ﾂｪﾂ･ﾃ猟･ﾂｷﾂ･ﾃｧﾂ･ﾃｳﾂ､ﾃｲﾂｼﾃつｸﾂｳﾃ・ｪﾂ､ﾃ凝・可ｲﾃ・
+ - セッションハイジャック対策でゲストの処理を間違っていたのを修正 (thx blues)
+ - 特定パターン防御で強制終了する場合のメッセージを修正 (thx suin)
+ - DoS系防御で、.htaccess に DENY FROM を書き込むというオプションを実験的に追加
 
 2.33 (2005/2/11)
- - ﾂ｡ﾃ鳴ｵﾂｿﾂ､ﾃｯﾂ､ﾂｷﾂ､ﾂ､ﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂｻﾃ佚・ｪﾂ｡ﾃ猟､ﾃ・個ｵﾂｸﾃつ､ﾃ・.ﾂ､ﾂｬﾃ・ｽﾂ､ﾂｨﾂ､ﾃｫﾂ･ﾂｳﾂ｡ﾂｼﾂ･ﾃ可､ﾃｲﾂｽﾂ､ﾃﾂｵ (thx mayor)
- - ﾂ･ﾃ・･ﾂｱﾂ･ﾃδ･ﾃ按･ﾂｷﾂ･ﾂｹﾂ･ﾃ・･ﾃﾂ､ﾂｫﾂ､ﾃｩIPﾂ･ﾃ・･ﾂｧﾂ･ﾃδ･ﾂｯﾂ､ﾃｲﾃ・督ｽﾃｼ
+ - 「疑わしいファイル指定」で無限に .が増えるコードを修正 (thx mayor)
+ - チケットシステムからIPチェックを排除
 
 2.32 (2005/2/1)
- - ﾃ個ｵﾂｸﾃｺﾂｲﾂｽﾂ､ﾂｷﾂ､ﾃ・､ﾂ､ﾂ､ﾂｿMySQL/ﾂ･ﾃ鳴･ﾃｭﾂ･ﾃδ･ﾂｯﾂ･ﾃ・･ﾃ青･ﾃδ･ﾂｰﾂ､ﾃｲﾂ･ﾃ・･ﾂｧﾂ･ﾃδ･ﾂｯﾂ､ﾂｫﾂ､ﾂｱﾂ､ﾃ・､ﾂｫﾂ､ﾃｩﾃ・個､ﾂｹﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ仰､ﾂｷﾂ､ﾂｿ (thx jseymour)
+ - 無効化していたMySQL/ブロックデバッグをチェックかけてから通すようにした (thx jseymour)
 
 2.31 (2005/1/30)
- - ﾂ･ﾃ｢ﾂ･ﾂｸﾂ･ﾃ･ﾂ｡ﾂｼﾂ･ﾃｫﾃ・｢ﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂ･ﾃｫﾂ｡ﾂｼﾂ･ﾃ按･ﾂｳﾂ･ﾃｳﾂ･ﾃ按･ﾃｭﾂ｡ﾂｼﾂ･ﾃｩﾂ､ﾃ按ｸﾃｭﾃ・ｧﾂｼﾂｱﾂ､ﾂｹﾂ､ﾃｫﾃ古､ﾃづｪﾂ､ﾃ篠ｲﾃｲﾂｷﾃｨ (thx nobunobu)
- - IISﾂｸﾃ淞ｴﾂｹﾃﾂｭﾂ､ﾃ篠ｲﾃｾﾃ・ｱ (thx okuhiki)
- - ﾂ･ﾃ閉･ﾃｩﾂ･ﾃｳﾂ･ﾂｹﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂｹﾂｹﾂｿﾂｷ (thx HMN)  (2.31a)
- - ﾂ･ﾃ可･ﾂ､ﾂ･ﾃ・ｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾃ・可ｲﾃ・(thx Rene)  (2.31b)
+ - モジュール内ファイルをルートコントローラと誤認識する問題の解決 (thx nobunobu)
+ - IIS互換性の改善 (thx okuhiki)
+ - フランス語ファイル更新 (thx HMN)  (2.31a)
+ - ドイツ語ファイルを追加 (thx Rene)  (2.31b)
 
-2.30 ﾂ･ﾃｪﾂ･ﾃｪﾂ｡ﾂｼﾂ･ﾂｹﾃ暗・(2005/1/30)
- - ﾂ､ﾂ､ﾂ､ﾂｯﾂ､ﾃ・､ﾂｫﾂ､ﾃ篠･ﾃ・･ﾃ閉･ﾂｩﾂ･ﾃｫﾂ･ﾃ暗ﾃ淌・ｪﾃε債､ﾃｲﾃ甘堕ｹﾂｹﾂ､ﾂｷﾂ､ﾂｿ
- - ﾂ･ﾂ､ﾂ･ﾂｿﾂ･ﾃｪﾂ･ﾂ｢ﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂｹﾂｹﾂｿﾂｷ (thx Defkon1)
- - ﾂ･ﾃ鳴･ﾃｩﾂ･ﾂｸﾂ･ﾃｫﾂ･ﾃ敖･ﾃｫﾂ･ﾃ按･ﾂｬﾂ･ﾃｫﾂｸﾃｬﾂ｡ﾂｦﾂ･ﾂｹﾂ･ﾃ堋･ﾂ､ﾂ･ﾃｳﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂｹﾂｹﾂｿﾂｷ (thx Marcelo Yuji Himoro)
- - ﾂ･ﾂｪﾂ･ﾃｩﾂ･ﾃｳﾂ･ﾃﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾃ・可ｲﾃ・(thx Dirk Louwers)
+2.30 リリース版 (2005/1/30)
+ - いくつかのデフォルト設定値を変更した
+ - イタリア語ファイル更新 (thx Defkon1)
+ - ブラジルポルトガル語・スペイン語ファイルを更新 (thx Marcelo Yuji Himoro)
+ - オランダ語ファイルを追加 (thx Dirk Louwers)
 
 2.30RC5 (2005/1/22)
- - ﾂｺﾃ卍､ﾂｫﾂ､ﾃ閣ypoﾂ､ﾃ篠ｽﾂ､ﾃﾂｵ (ﾂ､ﾂｵﾂ､ﾃ崢､ﾃ可ｽﾃ・催猟､ﾃ・､ﾃ渉､ﾃ環､ﾂ､ﾂ､ﾃ篠､ﾃ・､ﾂ｢ﾂ､ﾃｯﾂ､ﾃ・､ﾃ・ｾﾃ･ﾂｽﾃｱﾂ､ﾂｭﾂ､ﾂｹﾂ､ﾃｫﾃ可ｬﾃ催猟､ﾃ渉､ﾂ｢ﾂ､ﾃｪﾂ､ﾃ楪､ﾂｻﾂ､ﾃｳ)
- - ﾂ･ﾂ､ﾂ･ﾂｿﾂ･ﾃｪﾂ･ﾂ｢ﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂｹﾂｹﾂｿﾂｷ (thx Defkon1)
+ - 細かなtypoの修正 (さほど重要ではないのであわてて上書きする必要はありません)
+ - イタリア語ファイル更新 (thx Defkon1)
 
 2.30RC4 (2005/1/21)
- - postcheck.inc.php ﾂ､ﾃ仰､ﾂｪﾂ､ﾂ､ﾂ､ﾃ・｡ﾂ｢nocommonﾂｾﾃｵﾃづ鳴､ﾃ篠･ﾂｨﾂ･ﾃｩﾂ｡ﾂｼﾂ､ﾃｲFix (thx dendeke)
+ - postcheck.inc.php において、nocommon状態のエラーをFix (thx dendeke)
 
 2.30RC3 (2005/1/21)
- - ﾂ･ﾃ個･ﾃｫﾂ･ﾃ青･ﾂ､ﾂ･ﾃ暗環ｸﾂｻﾃｺﾃ偲ｳﾂ､ﾃ伉､ﾃ偲づ青ｺﾃｶﾂ､ﾃｲﾂ｡ﾂ｢ﾂｶﾂｯﾃﾂｩﾂｽﾂｪﾃ篠ｻﾂ､ﾂｫﾂ､ﾃｩﾂ･ﾂｵﾂ･ﾃ仰･ﾂｿﾂ･ﾂ､ﾂ･ﾂｺﾂ､ﾃ凝甘堕ｹﾂｹ
- - PREFIX ﾂ･ﾃ楪･ﾃ債｡ﾂｼﾂ･ﾂｸﾂ･ﾃ｣ﾂ､ﾃ偲暗ｹﾃ・ｴﾃﾂｰ
- - ﾂ･ﾃ閉･ﾃｩﾂ･ﾃｳﾂ･ﾂｹﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾃ・可ｲﾃ・(thx HMN)
- - ﾂ･ﾂ､ﾂ･ﾂｿﾂ･ﾃｪﾂ･ﾂ｢ﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾃ・可ｲﾃ・(thx Defkon1)
+ - ヌルバイト文字列への対策を、強制終了からサニタイズに変更
+ - PREFIX マネージャの微調整
+ - フランス語ファイルを追加 (thx HMN)
+ - イタリア語ファイルを追加 (thx Defkon1)
 
 2.30RC2 (2005/1/20)
- - PREFIX ﾂ･ﾃ楪･ﾃ債｡ﾂｼﾂ･ﾂｸﾂ･ﾃ｣ﾂ､ﾃ篠ｽﾂ､ﾃﾂｵ
+ - PREFIX マネージャの修正
 
 2.30RC (2005/1/19)
- - PREFIX ﾂ･ﾃ楪･ﾃ債｡ﾂｼﾂ･ﾂｸﾂ･ﾃ｣ﾂ､ﾃ篠ｺﾃｮﾃﾂｮ
- - 2.0.9.2ﾂｸﾃ・債ｭﾂｷﾃｪﾂ､ﾃ伉､ﾃ偲づ青ｱﾃｾ (Special thx to zx team!)
- - ﾂ･ﾃ個･ﾃｫﾂ･ﾃ青･ﾂ､ﾂ･ﾃ暗環ｸﾂｻﾃｺﾃ偲ｳﾂ､ﾃ伉､ﾃ偲づ青ｺﾃｶ
- - ﾂ･ﾃ・･ﾂ｣ﾂ･ﾃｬﾂ･ﾂｯﾂ･ﾃ按･ﾃｪﾃ・個､ﾃｪﾂ･ﾃ・･ﾂｧﾂ･ﾃδ･ﾂｯﾂ､ﾂｬﾂｴﾃ・､ﾂｫﾂ､ﾃδ､ﾂｿﾂ､ﾃ篠､ﾃｲﾂｲﾃｾﾃ・ｱ (thx minahito)
- - ﾂ･ﾂｻﾂ･ﾃδ･ﾂｷﾂ･ﾃｧﾂ･ﾃｳﾂ･ﾃ渉･ﾂ､ﾂ･ﾂｸﾂ･ﾃ｣ﾂ･ﾃδ･ﾂｯﾃづ青ｺﾃｶﾂ､ﾃ偲・可ｲﾃ・
- - postcheck.inc.php ﾂ､ﾃ偲・可ｲﾃ・(ﾂ･ﾃ堕･ﾃδ･ﾃ・､ﾃ偲・ｶﾂ､ﾃ・甘ｽﾂ､ﾂｬﾃ甘堕､ﾃｯﾂ､ﾃδ､ﾃ・､ﾂ､ﾂ､ﾃ楪､ﾂｹﾂ｡ﾃ・
- - ﾃ甘堕ｿﾃｴﾂｱﾃｸﾃﾃｷﾂ｡ﾂｦSQL Injectionﾂ｣ﾂｲﾂｼﾃｯﾂ､ﾃ偲ﾃ淌・ｪﾃ甘ｽﾃ仰｡ﾂ､ﾃｲﾃ甘堕ｹﾂｹ
+ - PREFIX マネージャの作成
+ - 2.0.9.2固有穴への対応 (Special thx to zx team!)
+ - ヌルバイト文字列への対策
+ - ディレクトリ遡りチェックが甘かったのを改善 (thx minahito)
+ - セッションハイジャック対策の追加
+ - postcheck.inc.php の追加 (パッチの当て方が変わっています）
+ - 変数汚染・SQL Injection２種の設定方法を変更
 
-2.22 (2005/1/4) (ﾂ､ﾂｽﾂ､ﾃｳﾂ､ﾃ環､ﾃ仰ｽﾃ・催猟､ﾂｸﾂ､ﾃ｣ﾂ､ﾃ環､ﾂ､ﾂｽﾂ､ﾃﾂｵﾂ､ﾃ・､ﾂｹ)
- - check_dos_attack_* ﾂ､ﾃ仰､ﾂｪﾂ､ﾂｱﾂ､ﾃｫtypoﾂｽﾂ､ﾃﾂｵ (thx Mithrandir)
- - IISﾂ､ﾃﾂ､ﾃ・EQUEST_URIﾂ､ﾂｬﾂｼﾃｨﾃ・ﾂ､ﾃ・､ﾂｭﾂ､ﾃ環､ﾂ､ﾂ､ﾂｳﾂ､ﾃ按､ﾃ伉､ﾃ偲づ青ｱﾃｾ
+2.22 (2005/1/4) (そんなに重要じゃない修正です)
+ - check_dos_attack_* におけるtypo修正 (thx Mithrandir)
+ - IISだとREQUEST_URIが取得できないことへの対応
  - updated myblocksadmin 0.22 & mymenu 0.07
 
 2.21 (2004/12/31)
- - ﾃ甘堕ｿﾃｴﾂｱﾃｸﾃﾃｷﾂ､ﾃ篠･ﾃ・･ﾂｧﾂ･ﾃδ･ﾂｯﾃ渉ｳﾂ､ﾃｬﾂｽﾂ､ﾃﾂｵ (thx onokazu)
+ - 変数汚染のチェック漏れ修正 (thx onokazu)
 
 2.20 (2004/12/27)
- - ﾃ甘堕ｿﾃｴﾂｱﾃｸﾃﾃｷﾂ､ﾃ篠･ﾃ・･ﾂｧﾂ･ﾃδ･ﾂｯﾃ渉ｳﾂ､ﾃｬﾂｽﾂ､ﾃﾂｵ(thx JM2)
- - HTTP_*_VARS ﾂ､ﾃ使lobalﾂｻﾃ佚・ｪﾃ仰ｺﾂ､ﾃｬﾂｽﾂ､ﾃﾂｵ
- - ﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂｻﾃ佚・ｪﾃ・個､ﾃｪﾂ､ﾃｲﾂ･ﾃｭﾂ･ﾂｰﾂｵﾂｭﾃ渉ｿﾂ､ﾂｹﾂ､ﾃｫﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ仰､ﾂｷﾂ､ﾂｿ
- - ﾂ･ﾃ鳴･ﾃｩﾂ･ﾂｸﾂ･ﾃｫﾂ･ﾃ敖･ﾃｫﾂ･ﾃ按･ﾂｬﾂ･ﾃｫﾂｸﾃｬﾂ｡ﾂｦﾂ･ﾂｹﾂ･ﾃ堋･ﾂ､ﾂ･ﾃｳﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂｹﾂｹﾂｿﾂｷ (thx Marcelo Yuji Himoro)
- - ﾃ暗凝づ偲εｦﾂｹﾃｱﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂｹﾂｹﾂｿﾂｷ (thx Kikuchi)
+ - 変数汚染のチェック漏れ修正(thx JM2)
+ - HTTP_*_VARS のglobal指定忘れ修正
+ - ファイル指定遡りをログ記録するようにした
+ - ブラジルポルトガル語・スペイン語ファイルを更新 (thx Marcelo Yuji Himoro)
+ - 繁体中国語ファイルを更新 (thx Kikuchi)
 
 2.20RC3 (2004/12/18)
- - ﾂ｡ﾃ鳴ｵﾂｿﾂ､ﾃｯﾂ､ﾂｷﾂ､ﾂ､ﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂｻﾃ佚・ｪﾂ､ﾃｲﾂｶﾃ伉ｻﾃ淞､ﾂｹﾂ､ﾃｫﾂ｡ﾃ猟･ﾂｪﾂ･ﾃ猟･ﾂｷﾂ･ﾃｧﾂ･ﾃｳﾂ､ﾃ偲・可ｲﾃ・(thx JM2)
- - ﾂ･ﾂｹﾂ･ﾃ堋･ﾂ､ﾂ･ﾃｳﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾃ・可ｲﾃ・(thx Marcelo Yuji Himoro)
+ - 「疑わしいファイル指定を禁止する」オプションの追加 (thx JM2)
+ - スペイン語ファイルを追加 (thx Marcelo Yuji Himoro)
 
 2.20RC2 (2004/12/16)
  - updated myblocksadmin (0.12) & mymenu (0.06)
- - ﾂ･ﾃ鳴･ﾃｩﾂ･ﾂｸﾂ･ﾃｫﾂ･ﾃ敖･ﾃｫﾂ･ﾃ按･ﾂｬﾂ･ﾃｫﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂｹﾂｹﾂｿﾂｷ (thx Marcelo Yuji Himoro)
+ - ブラジルポルトガル語ファイルを更新 (thx Marcelo Yuji Himoro)
 
 2.20RC (2004/12/15)
- - HTTP_*_VARSﾂ､ﾃ偲・堕ｻﾃ・(PHP5ﾃ催・
- - ﾂ･ﾃｬﾂ･ﾂｹﾂ･ﾂｭﾂ･ﾃ･ﾂ｡ﾂｼﾂｵﾂ｡ﾃ・ｽﾂ､ﾃ偲・可ｲﾃ・
- - ﾂ･ﾂｨﾂ｡ﾂｼﾂ･ﾂｸﾂ･ﾂｧﾂ･ﾃｳﾂ･ﾃ按､ﾃ｢ﾂｵﾂｭﾃ渉ｿﾂ､ﾂｹﾂ､ﾃｫﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ凝甘堕ｹﾂｹ
- - Anti-DoSﾂ､ﾃ篠･ﾃｫﾂ｡ﾂｼﾂ･ﾃ・･ﾃｳﾂ､ﾃｲﾂ､ﾃ楪､ﾃｫﾂ､ﾃ楪､ﾃｫﾂｽﾃｱﾂｴﾂｹﾂ､ﾂｨ
- - F5ﾂ･ﾂ｢ﾂ･ﾂｿﾂ･ﾃδ･ﾂｯﾂ｡ﾂｦﾂ･ﾂｯﾂ･ﾃｭﾂ｡ﾂｼﾂ･ﾃｩﾂ｡ﾂｼﾂ｡ﾂｦﾂｴﾂｿﾂｷﾃ楪､ﾂｹﾂ､ﾃ卍､ﾂｭﾂ･ﾂｵﾂ｡ﾂｼﾂ･ﾃ・･ﾂｨﾂ･ﾃｳﾂ･ﾂｸﾂ･ﾃｳﾂ､ﾃ・｡ﾂ｢ﾂ､ﾂｽﾂ､ﾃｬﾂ､ﾂｾﾂ､ﾃｬﾂｽﾃｨﾃ催ｽﾃ環ｬﾂ､ﾂｱﾂ､ﾂｷﾂ､ﾂｿ
- - ﾂｶﾂｯﾃﾂｩintvalﾂ､ﾂｬﾃ・崚偲ｳﾂ､ﾃ凝づ青､ﾂｷﾂ､ﾃ・､ﾃ｢ﾂｹﾃ板､ﾃｯﾂ､ﾃｬﾂ､ﾃ・､ﾂｷﾂ､ﾃ楪､ﾃδ､ﾃ・､ﾂ､ﾂ､ﾂｿﾂ､ﾃ篠､ﾃｲﾂｽﾂ､ﾃﾂｵ
- - UNIONﾃ按ｯﾂｸﾂｫﾂ･ﾃ堕･ﾂｿﾂ｡ﾂｼﾂ･ﾃｳﾂ､ﾃ凝按ｴﾂ､ﾂｱﾂ､ﾂｬﾂ､ﾂ｢ﾂ､ﾃδ､ﾂｿﾂ､ﾃ篠､ﾃｲﾂｽﾂ､ﾃﾂｵ
+ - HTTP_*_VARSの廃止 (PHP5用)
+ - レスキュー機能の追加
+ - エージェントも記録するように変更
+ - Anti-DoSのルーチンをまるまる書換え
+ - F5アタック・クローラー・歓迎すべきサーチエンジンで、それぞれ処理分けした
+ - 強制intvalが配列に対しても行われてしまっていたのを修正
+ - UNION発見パターンに抜けがあったのを修正
 
 2.11 (2004/9/30)
- - typo ﾂ､ﾂｬﾂ､ﾂ､ﾂ､ﾂｯﾂ､ﾃ・､ﾂｫﾂ､ﾂ｢ﾂ､ﾃδ､ﾂｿﾂ､ﾃ篠､ﾃ・ｽﾂ､ﾃﾂｵ
+ - typo がいくつかあったので修正
 
 2.10a (2004/9/27)
- - ﾂ･ﾃ鳴･ﾃｩﾂ･ﾂｸﾂ･ﾃｫﾂ･ﾃ敖･ﾃｫﾂ･ﾃ按･ﾂｬﾂ･ﾃｫﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂｹﾂｹﾂｿﾂｷ (thx Marcelo Yuji Himoro)
+ - ブラジルポルトガル語ファイルを更新 (thx Marcelo Yuji Himoro)
 
 2.10 (2004/9/22)
- - ﾂ･ﾂ｢ﾂ･ﾃδ･ﾃ猟･ﾃｭﾂ｡ﾂｼﾂ･ﾃ可･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃ篠ｳﾃ暗・･ﾂｻﾃ陳･ﾃ・･ﾂｧﾂ･ﾃδ･ﾂｯﾂ､ﾃｲﾃ・可ｲﾃ・
- - SQL Injectionﾂ､ﾂｬﾂ､ﾃｩﾂ､ﾃ淞､ﾃ篠･ﾂｵﾂ･ﾃ仰･ﾂｿﾂ･ﾂ､ﾂ･ﾂｺﾂ､ﾃｲﾂ｡ﾂ｢ﾃ・ｪﾃづｲﾂｲﾃ・・ｽﾂ､ﾃ按､ﾂｷﾂ､ﾂｿ
- - ﾂ･ﾂｻﾂ･ﾂｭﾂ･ﾃ･ﾂ･ﾃｪﾂ･ﾃ・･ﾂ｣ﾂ･ﾂｬﾂ･ﾂ､ﾂ･ﾃ可､ﾃｲﾃ・可ｲﾃ・
- - 2ﾂｲﾃ閉ｽﾃｪﾂ､ﾂ｢ﾂ､ﾃδ､ﾂｿ short tag ﾂ､ﾃｲﾃ・卍､ﾂｷﾂ､ﾂｿ (thx t_miyabi)
- - ﾃ暗凝づ偲εｦﾂｹﾃｱﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾃ・可ｲﾃ・(thx Kikuchi)
+ - アップロードファイルの拡張子チェックを追加
+ - SQL Injectionがらみのサニタイズを、選択可能とした
+ - セキュリティガイドを追加
+ - 2箇所あった short tag を潰した (thx t_miyabi)
+ - 繁体中国語ファイルを追加 (thx Kikuchi)
 
 2.01 (2004/9/11)
- - ﾃ甘堕ｿﾃｴﾂｱﾃｸﾃﾃｷﾂ･ﾃ・･ﾂｧﾂ･ﾃδ･ﾂｯﾂ､ﾃ・つｭﾂ､ﾃｪﾂ､ﾃ環､ﾂｫﾂ､ﾃδ､ﾂｿﾂ､ﾃ篠､ﾃｲﾃ・可ｲﾃ・
- - ﾂ･ﾃ鳴･ﾃｩﾂ･ﾂｸﾂ･ﾃｫﾂ､ﾃ篠･ﾃ敖･ﾃｫﾂ･ﾃ按･ﾂｬﾂ･ﾃｫﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂｹﾂｹﾂｿﾂｷ (thx Marcelo Yuji Himoro)
+ - 変数汚染チェックで足りなかったのを追加
+ - ブラジルのポルトガル語ファイルを更新 (thx Marcelo Yuji Himoro)
 
 2.0  (2004/9/10)
- - Xoops Protector ﾂ､ﾃ按､ﾂｷﾂ､ﾃ・､ﾃ篠ｺﾃ・ｽﾃｩﾂ､ﾃ篠･ﾃｪﾂ･ﾃｪﾂ｡ﾂｼﾂ･ﾂｹ
+ - Xoops Protector としての最初のリリース
 
 
 
-[/xlang:ja]
+[/xlang:ja]
\ No newline at end of file

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/CHANGES_OLD
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/CHANGES_OLD	2014-05-19 14:19:33 UTC (rev 12537)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/CHANGES_OLD	2014-05-19 15:22:07 UTC (rev 12538)
@@ -208,209 +208,209 @@
 
 [/xlang:en][xlang:ja]
 
-ﾂ｡ﾃｼﾃ甘堕ｹﾂｹﾃ催ｺﾃ偲ｲ
+●変更履歴
 
-3.0ﾂｰﾃ環ｹﾃ淞､ﾃ仰､ﾃ・､ﾂ､ﾂ､ﾃ・､ﾃ蹴EADMEﾃ・｢ﾂ､ﾃ仰ｰﾃ愿・ｰ
+3.0以降についてはREADME内に移動
 
 2.57 (2006/07/17)
-- ﾂ･ﾃ猟･ﾃｬﾂ･ﾃ閉･ﾂ｣ﾂ･ﾃδ･ﾂｯﾂ･ﾂｹﾂ･ﾃ楪･ﾃ債｡ﾂｼﾂ･ﾂｸﾂ･ﾃ｣ﾂ､ﾃ篠･ﾃ青･ﾃδ･ﾂｯﾂ･ﾂ｢ﾂ･ﾃδ･ﾃ猟､ﾃ③LOBﾂ､ﾃ篠ｽﾃｨﾃ催ｽﾂ､ﾂｬﾂ､ﾂｪﾂ､ﾂｫﾂ､ﾂｷﾂ､ﾂｫﾂ､ﾃδ､ﾂｿﾂ､ﾃ篠､ﾃｲﾂｽﾂ､ﾃﾂｵ (thx fbs777)
-- ﾂ､ﾂ､ﾂ､ﾂｯﾂ､ﾃ・､ﾂｫﾂｽﾃ青､ﾃ・､ﾂ､ﾂ､ﾃｫNoticeﾂ､ﾃｲﾂｽﾂ､ﾃﾂｵ
-- gticket2 ﾂ､ﾃ仰ｹﾂｹﾂｿﾂｷ
-- onInstallﾂｽﾃｨﾃ催ｽﾂ､ﾃｲﾂ､ﾃ､ﾂ､ﾃ｡ﾂ､ﾂｿ (2.57a)
+- プレフィックスマネージャのバックアップでBLOBの処理がおかしかったのを修正 (thx fbs777)
+- いくつか出ているNoticeを修正
+- gticket2 に更新
+- onInstall処理をやめた (2.57a)
 
 2.56 (2006/03/30)
-- ﾂ･ﾂｳﾂ･ﾃｳﾂ･ﾃ閉･ﾂ｣ﾂ･ﾂｰﾂ､ﾂｬﾂｼﾃｨﾂ､ﾃｬﾂ､ﾃ環､ﾂ､ﾂ､ﾃ按､ﾂｭﾂ､ﾃ篠･ﾂｨﾂ･ﾃｩﾂ｡ﾂｼﾂｽﾃｨﾃ催ｽﾂ､ﾃｲﾂｶﾂｯﾃﾂｩﾂｽﾂｪﾃ篠ｻﾂ､ﾃ凝甘堕ｹﾂｹﾂ､ﾂｷﾂ､ﾂｿ
-- common.phpﾂ､ﾃｲﾃ・可､ﾃ淞ｹﾃｾﾂ､ﾃ楪､ﾃ環､ﾂ､ﾂ･ﾃ｢ﾂ･ﾂｸﾂ･ﾃ･ﾂ｡ﾂｼﾂ･ﾃｫﾂ､ﾃ仰､ﾃ・､ﾂ､ﾂ､ﾃ・､ﾃ｢ﾂ｡ﾂ｢DOS/CRAWLERﾂｽﾃｨﾃ催ｽﾂ､ﾃ仰､ﾂｫﾂ､ﾂｫﾂ､ﾃｩﾂ､ﾃ環､ﾂ､ﾃﾃ淌・ｪﾂ､ﾃｲﾃ債ｭﾂｸﾃｺﾂ､ﾃ仰､ﾂｷﾂ､ﾂｿ
+- コンフィグが取れないときのエラー処理を強制終了に変更した
+- common.phpを読み込まないモジュールについても、DOS/CRAWLER処理にかからない設定を有効にした
 
 2.55 (2006/02/11)
-- ﾃ環｣ﾂｿﾃｴﾂ､ﾃ・ﾂ､ﾂｬﾃつｸﾂｺﾃ淞､ﾂｹﾂ､ﾃｫﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃ・､ﾃ｢ﾂ｡ﾂ｢.tar.gzﾂ､ﾃﾂ､ﾂｱﾂ､ﾃ湘・個､ﾂｹﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ仰ｽﾂ､ﾃﾂｵ (thx gusagi)
-- mymenuﾂ､ﾃ仰､ﾂｪﾂ､ﾂｱﾂ､ﾃｫXoopsCube 2.1ﾂ､ﾃ按､ﾃ篠ｸﾃ淞ｴﾂｹﾃﾂｭﾃ古､ﾃづｪﾂｲﾃｲﾂｾﾃ・
-- ﾂ･ﾂｹﾂ･ﾃ堋･ﾂ､ﾂ･ﾃｳﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂｹﾂｹﾂｿﾂｷ (thx bezoops)
+- 複数の.が存在するファイルでも、.tar.gzだけは通すように修正 (thx gusagi)
+- mymenuにおけるXoopsCube 2.1との互換性問題解消
+- スペイン語ファイル更新 (thx bezoops)
 
 2.54 (2005/12/08)
-- PREFIXﾂ･ﾃ楪･ﾃ債｡ﾂｼﾂ･ﾂｸﾂ･ﾃ｣ﾂ､ﾃ輝REFIXﾃ凝ｨﾂ､ﾃ篠･ﾃ青･ﾃδ･ﾂｯﾂ･ﾂ｢ﾂ･ﾃδ･ﾃ猟ｵﾂ｡ﾃ・ｽﾂ､ﾃｲﾂ､ﾃ・､ﾂｱﾂ､ﾂｿ (ﾂ､ﾃ楪､ﾃﾂｼﾃつｸﾂｳﾃε環ｳﾂｬﾂ､ﾃ・､ﾂｹ!)
-- ﾃ環｣ﾂｿﾃｴﾂ､ﾃ・ﾂ､ﾂｬﾃつｸﾂｺﾃ淞､ﾂｹﾂ､ﾃｫﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂ･ﾂ｢ﾂ･ﾃδ･ﾃ猟･ﾃｭﾂ｡ﾂｼﾂ･ﾃ可ｽﾃ静催ｨﾂ､ﾃ環､ﾂ､ﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ凝甘堕ｹﾂｹ (Apacheﾂ､ﾃ篠ｻﾃ・催催づ青ｺﾃｶ)
-- ﾂ･ﾃ鳴･ﾃｩﾂ･ﾂｸﾂ･ﾃｫﾂ･ﾃ敖･ﾃｫﾂ･ﾃ按･ﾂｬﾂ･ﾃｫﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃ篠ｹﾂｹﾂｿﾂｷ (thx Izzy)
-- ﾂｵﾂｶﾃ・ｵﾂｲﾃｨﾃ・ｼﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ･ﾃ・･ﾂｧﾂ･ﾃδ･ﾂｫﾂ｡ﾂｼﾂ､ﾂｬopen_basedirﾃﾂｩﾂｸﾃつ､ﾃ仰､ﾃ陳､ﾃδ､ﾂｫﾂ､ﾂｫﾂ､ﾃδ､ﾃ・､ﾂ､ﾂ､ﾂｿﾂ､ﾃ篠､ﾃｲﾂｽﾂ､ﾃﾂｵ (thx stefan88) - 2.54a
-- ﾂｳﾃ・ｼﾃｯﾃﾃ淌・ｪﾂ､ﾃ篠ｽﾃｩﾂｴﾃｼﾃε債､ﾃｲﾂ､ﾂ､ﾂ､ﾂｯﾂ､ﾃ・､ﾂｫﾂ､ﾃ按｡ﾂ｢ﾂ･ﾃ可･ﾂｭﾂ･ﾃ･ﾂ･ﾃ｡ﾂ･ﾃｳﾂ･ﾃ按､ﾃ篠ｽﾂ､ﾃﾂｵ - 2.54a
+- PREFIXマネージャにPREFIX毎のバックアップ機能をつけた (まだ実験段階です!)
+- 複数の.が存在するファイルをアップロード出来ないように変更 (Apacheの仕様対策)
+- ブラジルポルトガル語ファイルの更新 (thx Izzy)
+- 偽装画像ファイルチェッカーがopen_basedir制限にひっかかっていたのを修正 (thx stefan88) - 2.54a
+- 各種設定の初期値をいくつかと、ドキュメントの修正 - 2.54a
 
 2.53 (2005/11/30)
- - ﾂｵﾂｶﾃ・ｵﾂｲﾃｨﾃ・ｼﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ･ﾂ｢ﾂ･ﾃδ･ﾃ猟･ﾃｭﾂ｡ﾂｼﾂ･ﾃ可､ﾃ仰､ﾃｨﾂ､ﾃｫIEﾂ､ﾃ珊SSﾃづ青ｺﾃｶﾂ･ﾂｳﾂ｡ﾂｼﾂ･ﾃ可､ﾃ偲・可ｲﾃ・
- - ﾂ･ﾃ・｡ﾂｼﾂ･ﾂｿﾂ･ﾃ卍｡ﾂｼﾂ･ﾂｹﾂ､ﾂｬbusyﾂｻﾃｾﾂ､ﾃ輝ath Disclosureﾂ､ﾃ按､ﾃ環､ﾃδ､ﾃ・､ﾂ､ﾂ､ﾂｿﾃ古､ﾃづｪﾂ､ﾃｲﾂｲﾃｾﾃ・ｱ
- - Noticeﾂ､ﾃｲﾃ按ｯﾃﾂｸﾂ､ﾂｷﾂ､ﾃ・､ﾂ､ﾂ､ﾂｿﾂ､ﾂ､ﾂ､ﾂｯﾂ､ﾃ・､ﾂｫﾂ､ﾃ篠･ﾃ淞･ﾂｹﾂ､ﾃｲﾂｽﾂ､ﾃﾂｵ
- - ﾂｴﾃ嘉催ｽﾂｲﾃｨﾃ古個､ﾂｬ XOOPS 2.2.3 ﾂ､ﾃ・･ﾂｨﾂ･ﾃｩﾂ｡ﾂｼﾂ､ﾃｲﾂｵﾂｯﾂ､ﾂｳﾂ､ﾂｷﾂ､ﾃ・､ﾂ､ﾂ､ﾂｿﾂｸﾃ淞ｴﾂｹﾃﾂｭﾃ古､ﾃづｪﾂ､ﾃ篠ｲﾃｾﾃ・ｱ
- - ﾂ･ﾃ可･ﾂｭﾂ･ﾃ･ﾂ･ﾃ｡ﾂ･ﾃｳﾂ･ﾃ按､ﾃｲdocsﾂ･ﾃ・･ﾂ｣ﾂ･ﾃｬﾂ･ﾂｯﾂ･ﾃ按･ﾃｪﾂ､ﾃ仰ｰﾃ愿・ｰ (ﾂ･ﾃ可･ﾂｭﾂ･ﾃ･ﾂ･ﾃ｡ﾂ･ﾃｳﾂ･ﾃ按､ﾂｫﾂ､ﾃｩﾂ､ﾃ篠･ﾃ青｡ﾂｼﾂ･ﾂｸﾂ･ﾃｧﾂ･ﾃｳﾃ渉ｳﾂｱﾃ古凝可ｻﾃ淞｡ﾃ・
+ - 偽装画像ファイルアップロードによるIEのXSS対策コードの追加
+ - データベースがbusy時にPath Disclosureとなっていた問題を改善
+ - Noticeを発生していたいくつかのミスを修正
+ - 管理画面が XOOPS 2.2.3 でエラーを起こしていた互換性問題の改善
+ - ドキュメントをdocsディレクトリに移動 (ドキュメントからのバージョン漏洩防止）
  - updated mymenu into 0.15a
- - PHP_SELF/PATH_INFO XSSﾃづ青ｺﾃｶﾂ､ﾃｲﾂ､ﾃ｢ﾂ､ﾂｦﾂｾﾂｯﾂ､ﾂｷﾂｴﾃ仰､ﾂｯﾂ､ﾂｷﾂ､ﾂｿﾂ｡ﾃ環ｶﾂｯﾃﾂｩﾂｽﾂｪﾃ篠ｻﾂ､ﾂｫﾂ､ﾃｩurlencodeﾃ・ｪﾃ・ｶﾂ､ﾃ仰｡ﾃ・
- - ﾂ･ﾃ｢ﾂ･ﾂｸﾂ･ﾃ･ﾂ｡ﾂｼﾂ･ﾃｫﾂ･ﾂ｢ﾂ･ﾂ､ﾂ･ﾂｳﾂ･ﾃｳﾂ､ﾃ偲甘堕ｹﾂｹ (thx Argon)
- - ﾂ･ﾃ敖｡ﾂｼﾂ･ﾃｩﾂ･ﾃｳﾂ･ﾃ可ｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃ篠ｹﾂｹﾂｿﾂｷ (thx Tomasz)
- - ﾂ･ﾃ閉･ﾃｩﾂ･ﾃｳﾂ･ﾂｹﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃ篠ｹﾂｹﾂｿﾂｷ (thx marco)
- - ﾂ･ﾂ､ﾂ･ﾂｿﾂ･ﾃｪﾂ･ﾂ｢ﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃ篠ｹﾂｹﾂｿﾂｷ (thx Defkon1)
- - zipﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃ篠･ﾃ堕･ﾃδ･ﾂｱﾂ｡ﾂｼﾂ･ﾂｸﾂ･ﾃ淞･ﾂｹﾂ､ﾃｲﾂｽﾂ､ﾃﾂｵ (thx Dave_L) 2.53a
+ - PHP_SELF/PATH_INFO XSS対策をもう少し緩くした（強制終了からurlencode相当に）
+ - モジュールアイコンの変更 (thx Argon)
+ - ポーランド語ファイルの更新 (thx Tomasz)
+ - フランス語ファイルの更新 (thx marco)
+ - イタリア語ファイルの更新 (thx Defkon1)
+ - zipファイルのパッケージミスを修正 (thx Dave_L) 2.53a
 
 2.52 (2005/8/27)
- - WordPressﾂ･ﾃ｢ﾂ･ﾂｸﾂ･ﾃ･ﾂ｡ﾂｼﾂ･ﾃｫﾃ・ｹﾂ､ﾃ仰､ﾃ・､ﾂ､ﾂ､ﾃ・､ﾃ｢ﾂ｡ﾂ｢xmlrpc.phpﾂｵﾂ｡ﾃ・ｽﾂ､ﾃｲﾃ個ｵﾂｸﾃｺﾂｲﾂｽﾂ､ﾂｹﾂ､ﾃｫﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ仰ｻﾃ・催催甘堕ｹﾂｹ
- - xmlrpc ﾂｹﾂｶﾂｷﾃ｢ﾂ､ﾃ仰､ﾃ・､ﾂ､ﾂ､ﾃ・､ﾃ篠･ﾃｭﾂ･ﾂｰﾂ､ﾂｬﾂｽﾃ・環｣ﾂｽﾃ静偲渉､ﾂｵﾂ､ﾃｬﾂ､ﾃ環､ﾂ､ﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ仰ｻﾃ・催催甘堕ｹﾂｹ
- - ﾂ･ﾃｭﾂ･ﾂｷﾂ･ﾂ｢ﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾃ・可ｲﾃ・(thx Sergey)
+ - WordPressモジュール等についても、xmlrpc.php機能を無効化するように仕様変更
+ - xmlrpc 攻撃についてのログが重複出力されないように仕様変更
+ - ロシア語ファイル追加 (thx Sergey)
 
 2.51 (2005/8/24)
- - ﾂ･ﾂｻﾂ･ﾃδ･ﾂｷﾂ･ﾃｧﾂ･ﾃｳﾂ･ﾃ渉･ﾂ､ﾂ･ﾂｸﾂ･ﾃ｣ﾂ･ﾃδ･ﾂｯﾃづ青ｺﾃｶﾂ､ﾃ・｡ﾂ｢IPﾂ･ﾃ楪･ﾂｹﾂ･ﾂｯﾂ､ﾃｲﾂｻﾃ佚・ｪﾂ､ﾃ・､ﾂｭﾂ､ﾃｫﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ仰､ﾂｷﾂ､ﾂｿ
- - session.use_trans_sid ﾂ､ﾃ仰､ﾃ・､ﾂ､ﾂ､ﾃ・､ﾃ偲εｭﾂｰﾃ閉ｽﾃｱﾂ､ﾂｭﾃ・可ｲﾃ・
- - PHP_SELF XSS ﾃづ青ｺﾃｶﾂ･ﾂｳﾂ｡ﾂｼﾂ･ﾃ可､ﾃ篠ｲﾃｾﾃ・ｱ
- - ﾂ･ﾃ閉･ﾃｩﾂ･ﾃｳﾂ･ﾂｹﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂｹﾂｹﾂｿﾂｷ (thx HEMON)
+ - セッションハイジャック対策で、IPマスクを指定できるようにした
+ - session.use_trans_sid についての注意書き追加
+ - PHP_SELF XSS 対策コードの改善
+ - フランス語ファイル更新 (thx HEMON)
 
-2.50 ﾃﾂｵﾂｼﾂｰﾃ暗・(2005/8/22)
- - PHP_SELF XSS ﾃづ青ｺﾃｶﾂ･ﾂｳﾂ｡ﾂｼﾂ･ﾃ嘉・可ｲﾃ・
- - ﾂ･ﾃ鳴･ﾃｩﾂ･ﾂｸﾂ･ﾃｫﾂ･ﾃ敖･ﾃｫﾂ･ﾃ按･ﾂｬﾂ･ﾃｫﾂｸﾃｬﾂ｡ﾂｦﾂ･ﾂｹﾂ･ﾃ堋･ﾂ､ﾂ･ﾃｳﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂｹﾂｹﾂｿﾂｷ (thx Yuji)
+2.50 正式版 (2005/8/22)
+ - PHP_SELF XSS 対策コード追加
+ - ブラジルポルトガル語・スペイン語ファイルを更新 (thx Yuji)
 
 2.50 beta2 (2005/7/31)
- - "2.0.9.2ﾂ､ﾃ篠ｷﾃｪ"ﾂ､ﾃ按､ﾂ､ﾂ､ﾂｦY/Nﾂ､ﾃ偲ﾃ淌・ｪﾂｹﾃﾃ古慊､ﾃｲﾂ｡ﾂ｢ﾃ・ｪﾃづｲﾂｼﾂｰﾂ､ﾃ・ﾂｵﾂ｡ﾃ・ｽﾃ個ｵﾂｸﾃｺﾂｲﾂｽ"ﾂ､ﾃ凝甘堕ｹﾂｹﾂ､ﾂｷﾂ､ﾂｿ
- - ﾂ･ﾃｭﾂ･ﾂｰﾂｴﾃ嘉催ｽﾂ､ﾃ・･ﾃ堋｡ﾂｼﾂ･ﾂｸﾂ､ﾂ｢ﾂ､ﾂｿﾂ､ﾃｪﾂ､ﾃ偲可ｽﾂｼﾂｨﾂｷﾃｯﾂｿﾃｴﾂ､ﾃｲﾃ甘堕ｹﾂｹﾂ､ﾃ・､ﾂｭﾂ､ﾃｫﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ仰､ﾂｷﾂ､ﾂｿ
- - ﾃ暗凝づ偲εｦﾂｹﾃｱﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂｹﾂｹﾂｿﾂｷ (thx Kikuchi)
- - ﾂ･ﾃ鳴･ﾃｩﾂ･ﾂｸﾂ･ﾃｫﾂ･ﾃ敖･ﾃｫﾂ･ﾃ按･ﾂｬﾂ･ﾃｫﾂｸﾃｬﾂ｡ﾂｦﾂ･ﾂｹﾂ･ﾃ堋･ﾂ､ﾂ･ﾃｳﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂｹﾂｹﾂｿﾂｷ (thx Yuji)
+ - "2.0.9.2の穴"というY/Nの設定項目を、選択式の"機能無効化"に変更した
+ - ログ管理でページあたりの表示件数を変更できるようにした
+ - 繁体中国語ファイルを更新 (thx Kikuchi)
+ - ブラジルポルトガル語・スペイン語ファイルを更新 (thx Yuji)
 
 2.50 beta1 (2005/7/22)
- - ﾂ｡ﾃ縫oS/Crawlerﾂ･ﾃ・･ﾂｧﾂ･ﾃδ･ﾂｯﾂ､ﾃｲﾂ･ﾂｹﾂ･ﾂｭﾂ･ﾃδ･ﾃ猟､ﾂｹﾂ､ﾃｫﾂ･ﾃ｢ﾂ･ﾂｸﾂ･ﾃ･ﾂ｡ﾂｼﾂ･ﾃｫﾂ｡ﾃ猟､ﾃ按､ﾂ､ﾂ､ﾂｦﾂ･ﾂｪﾂ･ﾃ猟･ﾂｷﾂ･ﾃｧﾂ･ﾃｳﾂ､ﾃ偲・可ｲﾃ・
- - indexﾂ､ﾃｲﾂ､ﾃ・､ﾂｱﾃ仰ｺﾂ､ﾃｬﾂ､ﾃ・､ﾂ､ﾂ､ﾂｿﾂ･ﾃ閉･ﾂ｣ﾂ｡ﾂｼﾂ･ﾃｫﾂ･ﾃ可､ﾃ仰､ﾂ｢ﾂ､ﾃｩﾂ､ﾂｿﾂ､ﾃ｡ﾂ､ﾃ・ndexﾃ嘉陛債ｿ
- - ﾂ｡ﾃ鳴ｿﾂｮﾃ催堕､ﾂｹﾂ､ﾃｫIPﾂ･ﾂ｢ﾂ･ﾃ可･ﾃｬﾂ･ﾂｹﾂ｡ﾃ猟･ﾂｪﾂ･ﾃ猟･ﾂｷﾂ･ﾃｧﾂ･ﾃｳﾂ､ﾃ偲・可ｲﾃ・
- - ﾂ･ﾃ堕･ﾂｹﾂ･ﾃｯﾂ｡ﾂｼﾂ･ﾃ嘉・ｭﾃ・ｶﾂ､ﾂｿﾂ､ﾃｪﾃ甘ｽﾂｼﾂｰﾂ､ﾃ伉､ﾃ偲づ青ｹﾂｳﾂｺﾃｶﾃ・可ｲﾃ・
+ - 「DoS/Crawlerチェックをスキップするモジュール」というオプションの追加
+ - indexをつけ忘れていたフィールドにあらためてindex付与
+ - 「信用するIPアドレス」オプションの追加
+ - パスワード総当たり方式への対抗策追加
 
-2.40 ﾃﾂｵﾂｼﾂｰﾃ暗・(2005/7/21)
- - criteria attack ﾂ､ﾃ伉､ﾃ偲づ青ｺﾃｶﾂ･ﾂｳﾂ｡ﾂｼﾂ･ﾃ嘉・可ｲﾃ・(xoops <= 2.0.10*ﾃ催・
- - ﾂ･ﾂ､ﾂ･ﾂｿﾂ･ﾃｪﾂ･ﾂ｢ﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂｹﾂｹﾂｿﾂｷ (thx Defkon1)
- - ﾂ･ﾃ閉･ﾂ｣ﾂ･ﾃｳﾂ･ﾃｩﾂ･ﾃｳﾂ･ﾃ可ｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾃ・可ｲﾃ・(thx kokko)
- - ﾂ･ﾃ敖｡ﾂｼﾂ･ﾃｩﾂ･ﾃｳﾂ･ﾃ可ｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾃ・可ｲﾃ・(thx Tomasz)
+2.40 正式版 (2005/7/21)
+ - criteria attack への対策コード追加 (xoops <= 2.0.10*用)
+ - イタリア語ファイル更新 (thx Defkon1)
+ - フィンランド語ファイル追加 (thx kokko)
+ - ポーランド語ファイル追加 (thx Tomasz)
 
 2.40RC2 (2005/4/4)
- - ﾂ･ﾃ｢ﾂ･ﾂｸﾂ･ﾃ･ﾂ｡ﾂｼﾂ･ﾃｫﾂ･ﾂ｢ﾂ･ﾃδ･ﾃ猟･ﾃ・｡ﾂｼﾂ･ﾃ按ｻﾃｾﾂ､ﾃ仰･ﾃ鳴･ﾃｭﾂ･ﾃδ･ﾂｯﾂ､ﾃｲﾂｺﾃｯﾂｽﾃｼﾂ､ﾂｹﾂ､ﾃｫﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ仰､ﾂｷﾂ､ﾂｿ (thx Dava_L)
- - ﾂ･ﾃ鳴･ﾃｩﾂ･ﾂｸﾂ･ﾃｫﾂ･ﾃ敖･ﾃｫﾂ･ﾃ按･ﾂｬﾂ･ﾃｫﾂｸﾃｬﾂ｡ﾂｦﾂ･ﾂｹﾂ･ﾃ堋･ﾂ､ﾂ･ﾃｳﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂｹﾂｹﾂｿﾂｷ (thx Yuji)
+ - モジュールアップデート時にブロックを削除するようにした (thx Dava_L)
+ - ブラジルポルトガル語・スペイン語ファイルを更新 (thx Yuji)
 
 2.40RC (2005/3/31)
- - ﾂ･ﾃ鳴･ﾃｭﾂ･ﾃδ･ﾂｯﾂ､ﾃ・､ﾃ篠･ﾃ・･ﾂｧﾂ･ﾃδ･ﾂｯﾂ､ﾃ偲・ｴﾃ・・
- - ﾃ・ｰﾂｺﾃｮﾂ･ﾃ・･ﾂｧﾂ･ﾃδ･ﾂｯﾃ催繕RIﾂ､ﾃ篠ｽﾂ､ﾃﾂｵ (thx satanas)
- - *check.inc.phpﾂ､ﾂｬﾂｸﾃｺﾂ､ﾂ､ﾂ､ﾃ・､ﾂ､ﾂ､ﾃｫﾂ､ﾂｫﾂ､ﾃ可､ﾂｦﾂ､ﾂｫﾂ､ﾃ篠･ﾃ・･ﾂｧﾂ･ﾃδ･ﾂｯﾃ甘ｽﾃ仰｡ﾂ､ﾃｲﾂｽﾂ､ﾃﾂｵ (thx peter & Dave_L)
- - IPﾂｵﾃｱﾃ暗敖ｲﾃｲﾂｽﾃｼﾂ･ﾃ堕･ﾂｹﾂ･ﾃｯﾂ｡ﾂｼﾂ･ﾃ可､ﾃ篠ｼﾂｫﾃ・ｰﾂ･ﾃ渉･ﾃδ･ﾂｷﾂ･ﾃ･ﾂｲﾂｽ
- - ﾂ｡ﾃ鳴ｵﾂｿﾂ､ﾃｯﾂ､ﾂｷﾂ､ﾂ､ﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂｻﾃ佚・ｪﾂ､ﾃ篠ｶﾃ伉ｻﾃ淞｡ﾃ猟､ﾃｲﾂ｡ﾂ｢GETﾂ､ﾃﾂ､ﾂｱﾂ､ﾃｲﾃづ青ｾﾃ敖､ﾃ仰､ﾂｹﾂ､ﾃｫﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ仰､ﾂｷﾂ､ﾂｿ
+ - ブロックでのチェックの全廃
+ - 動作チェック用URIの修正 (thx satanas)
+ - *check.inc.phpが効いているかどうかのチェック方法を修正 (thx peter & Dave_L)
+ - IP拒否解除パスワードの自動ハッシュ化
+ - 「疑わしいファイル指定の禁止」を、GETだけを対象にするようにした
 
 2.38 (2005/3/18)
- - DoSﾃづ青ｺﾃｶﾂ､ﾃ環､ﾃ可､ﾃ・｡ﾂ｢.htaccess DENYﾂ､ﾃｲﾂｻﾃ按､ﾂｦﾂｾﾃｬﾂｹﾃｧﾂ｡ﾂ｢ﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾂｬﾂｲﾃｵﾂ､ﾃｬﾂ､ﾂｿﾂｻﾃｾﾂ､ﾃ篠･ﾃｭﾂ｡ﾂｼﾂ･ﾃｫﾂ･ﾃ青･ﾃδ･ﾂｯﾃ・可ｲﾃ・
- - ﾂ･ﾂ､ﾂ･ﾂｿﾂ･ﾃｪﾂ･ﾂ｢ﾂｸﾃｬﾂｸﾃﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃ篠ｹﾂｹﾂｿﾂｷ (thx Defkon1)
+ - DoS対策などで、.htaccess DENYを使う場合、ファイルが壊れた時のロールバック追加
+ - イタリア語言語ファイルの更新 (thx Defkon1)
 
 2.37 (2005/3/9)
- - prefix manager ﾂ､ﾃ⑤Bﾃ個ｾﾂ､ﾃ篠･ﾂｯﾂ･ﾂｪﾂ｡ﾂｼﾂ･ﾃ・･ﾂ｣ﾂ･ﾃｳﾂ･ﾂｰﾃ仰ｺﾂ､ﾃｬﾂ､ﾃｲﾂｽﾂ､ﾃﾂｵ (thx king76)
- - Null-byte ﾂ､ﾃ｢ﾂ｡ﾂ｢quite ﾂ､ﾃ・ｾﾃδ､ﾂｨﾂ､ﾃｫﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ・
+ - prefix manager でDB名のクオーティング忘れを修正 (thx king76)
+ - Null-byte も、quite で消えるように
 
 2.36 (2005/3/9)
- - ﾂｶﾃ伉ｻﾃ淞ｳﾃ暗・･ﾂｻﾃ陳､ﾃ凝按ｴﾂ､ﾂｱﾂ､ﾂｬﾂ､ﾂ｢ﾂ､ﾃδ､ﾂｿﾂ､ﾃ篠､ﾃｲﾂｽﾂ､ﾃﾂｵ
+ - 禁止拡張子に抜けがあったのを修正
 
 2.35 (2005/3/5)
  - updated myblocksadmin 0.27 & mymenu 0.12
- - ﾂ･ﾃｭﾂ･ﾂｰﾂ･ﾃｬﾂ･ﾃ卍･ﾃｫﾂ､ﾃ偲・ｳﾃ・ｾﾂ｡ﾃ環ｾﾃ慊､ﾂｷﾂ､ﾂｯﾂ､ﾃ舟EMOﾂｻﾂｲﾂｾﾃ按｡ﾃ・
- - ﾂｰﾃｬﾂｻﾃｾﾃ・ｪﾂ､ﾃ凝・ｴﾃづ篠､ﾃ偲・ｰﾂｺﾃｮﾂ､ﾃｲOffﾂ､ﾃ仰､ﾂｹﾂ､ﾃｫﾂ･ﾂｪﾂ･ﾃ猟･ﾂｷﾂ･ﾃｧﾂ･ﾃｳﾂ､ﾃｲﾂ､ﾃ・､ﾂｱﾂ､ﾂｿ (thx Dave_L)
- - ﾃ暗凝づ偲εｦﾂｹﾃｱﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂｹﾂｹﾂｿﾂｷ (thx Kikuchi)
- - ﾂ･ﾃ閉･ﾃｩﾂ･ﾃｳﾂ･ﾂｹﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂｹﾂｹﾂｿﾂｷ (thx HEMON) 2.35a
- - ﾂ･ﾃ鳴･ﾃｩﾂ･ﾂｸﾂ･ﾃｫﾂ･ﾃ敖･ﾃｫﾂ･ﾃ按･ﾂｬﾂ･ﾃｫﾂｸﾃｬﾂ｡ﾂｦﾂ･ﾂｹﾂ･ﾃ堋･ﾂ､ﾂ･ﾃｳﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂｹﾂｹﾂｿﾂｷ (thx Yuji) 2.35a
+ - ログレベルの導入（詳しくはMEMO参照）
+ - 一時的に全体の動作をOffにするオプションをつけた (thx Dave_L)
+ - 繁体中国語ファイルを更新 (thx Kikuchi)
+ - フランス語ファイルを更新 (thx HEMON) 2.35a
+ - ブラジルポルトガル語・スペイン語ファイルを更新 (thx Yuji) 2.35a
 
 2.34 (2005/2/18)
- - ﾂ･ﾂｻﾂ･ﾃδ･ﾂｷﾂ･ﾃｧﾂ･ﾃｳﾂ･ﾃ渉･ﾂ､ﾂ･ﾂｸﾂ･ﾃ｣ﾂ･ﾃδ･ﾂｯﾃづ青ｺﾃｶﾂ､ﾃ・･ﾂｲﾂ･ﾂｹﾂ･ﾃ按､ﾃ篠ｽﾃｨﾃ催ｽﾂ､ﾃｲﾂｴﾃ鳴ｰﾃ｣ﾂ､ﾃδ､ﾃ・､ﾂ､ﾂ､ﾂｿﾂ､ﾃ篠､ﾃｲﾂｽﾂ､ﾃﾂｵ (thx blues)
- - ﾃ・ε・ｪﾂ･ﾃ堕･ﾂｿﾂ｡ﾂｼﾂ･ﾃｳﾃ凝可ｸﾃｦﾂ､ﾃ・ｶﾂｯﾃﾂｩﾂｽﾂｪﾃ篠ｻﾂ､ﾂｹﾂ､ﾃｫﾂｾﾃｬﾂｹﾃｧﾂ､ﾃ篠･ﾃ｡ﾂ･ﾃδ･ﾂｻﾂ｡ﾂｼﾂ･ﾂｸﾂ､ﾃｲﾂｽﾂ､ﾃﾂｵ (thx suin)
- - DoSﾂｷﾃ湘凝可ｸﾃｦﾂ､ﾃ・｡ﾂ｢.htaccess ﾂ､ﾃ・DENY FROM ﾂ､ﾃｲﾂｽﾃｱﾂ､ﾂｭﾂｹﾃｾﾂ､ﾃﾂ､ﾃ按､ﾂ､ﾂ､ﾂｦﾂ･ﾂｪﾂ･ﾃ猟･ﾂｷﾂ･ﾃｧﾂ･ﾃｳﾂ､ﾃｲﾂｼﾃつｸﾂｳﾃ・ｪﾂ､ﾃ凝・可ｲﾃ・
+ - セッションハイジャック対策でゲストの処理を間違っていたのを修正 (thx blues)
+ - 特定パターン防御で強制終了する場合のメッセージを修正 (thx suin)
+ - DoS系防御で、.htaccess に DENY FROM を書き込むというオプションを実験的に追加
 
 2.33 (2005/2/11)
- - ﾂ｡ﾃ鳴ｵﾂｿﾂ､ﾃｯﾂ､ﾂｷﾂ､ﾂ､ﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂｻﾃ佚・ｪﾂ｡ﾃ猟､ﾃ・個ｵﾂｸﾃつ､ﾃ・.ﾂ､ﾂｬﾃ・ｽﾂ､ﾂｨﾂ､ﾃｫﾂ･ﾂｳﾂ｡ﾂｼﾂ･ﾃ可､ﾃｲﾂｽﾂ､ﾃﾂｵ (thx mayor)
- - ﾂ･ﾃ・･ﾂｱﾂ･ﾃδ･ﾃ按･ﾂｷﾂ･ﾂｹﾂ･ﾃ・･ﾃﾂ､ﾂｫﾂ､ﾃｩIPﾂ･ﾃ・･ﾂｧﾂ･ﾃδ･ﾂｯﾂ､ﾃｲﾃ・督ｽﾃｼ
+ - 「疑わしいファイル指定」で無限に .が増えるコードを修正 (thx mayor)
+ - チケットシステムからIPチェックを排除
 
 2.32 (2005/2/1)
- - ﾃ個ｵﾂｸﾃｺﾂｲﾂｽﾂ､ﾂｷﾂ､ﾃ・､ﾂ､ﾂ､ﾂｿMySQL/ﾂ･ﾃ鳴･ﾃｭﾂ･ﾃδ･ﾂｯﾂ･ﾃ・･ﾃ青･ﾃδ･ﾂｰﾂ､ﾃｲﾂ･ﾃ・･ﾂｧﾂ･ﾃδ･ﾂｯﾂ､ﾂｫﾂ､ﾂｱﾂ､ﾃ・､ﾂｫﾂ､ﾃｩﾃ・個､ﾂｹﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ仰､ﾂｷﾂ､ﾂｿ (thx jseymour)
+ - 無効化していたMySQL/ブロックデバッグをチェックかけてから通すようにした (thx jseymour)
 
 2.31 (2005/1/30)
- - ﾂ･ﾃ｢ﾂ･ﾂｸﾂ･ﾃ･ﾂ｡ﾂｼﾂ･ﾃｫﾃ・｢ﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂ･ﾃｫﾂ｡ﾂｼﾂ･ﾃ按･ﾂｳﾂ･ﾃｳﾂ･ﾃ按･ﾃｭﾂ｡ﾂｼﾂ･ﾃｩﾂ､ﾃ按ｸﾃｭﾃ・ｧﾂｼﾂｱﾂ､ﾂｹﾂ､ﾃｫﾃ古､ﾃづｪﾂ､ﾃ篠ｲﾃｲﾂｷﾃｨ (thx nobunobu)
- - IISﾂｸﾃ淞ｴﾂｹﾃﾂｭﾂ､ﾃ篠ｲﾃｾﾃ・ｱ (thx okuhiki)
- - ﾂ･ﾃ閉･ﾃｩﾂ･ﾃｳﾂ･ﾂｹﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂｹﾂｹﾂｿﾂｷ (thx HMN)  (2.31a)
- - ﾂ･ﾃ可･ﾂ､ﾂ･ﾃ・ｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾃ・可ｲﾃ・(thx Rene)  (2.31b)
+ - モジュール内ファイルをルートコントローラと誤認識する問題の解決 (thx nobunobu)
+ - IIS互換性の改善 (thx okuhiki)
+ - フランス語ファイル更新 (thx HMN)  (2.31a)
+ - ドイツ語ファイルを追加 (thx Rene)  (2.31b)
 
-2.30 ﾂ･ﾃｪﾂ･ﾃｪﾂ｡ﾂｼﾂ･ﾂｹﾃ暗・(2005/1/30)
- - ﾂ､ﾂ､ﾂ､ﾂｯﾂ､ﾃ・､ﾂｫﾂ､ﾃ篠･ﾃ・･ﾃ閉･ﾂｩﾂ･ﾃｫﾂ･ﾃ暗ﾃ淌・ｪﾃε債､ﾃｲﾃ甘堕ｹﾂｹﾂ､ﾂｷﾂ､ﾂｿ
- - ﾂ･ﾂ､ﾂ･ﾂｿﾂ･ﾃｪﾂ･ﾂ｢ﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂｹﾂｹﾂｿﾂｷ (thx Defkon1)
- - ﾂ･ﾃ鳴･ﾃｩﾂ･ﾂｸﾂ･ﾃｫﾂ･ﾃ敖･ﾃｫﾂ･ﾃ按･ﾂｬﾂ･ﾃｫﾂｸﾃｬﾂ｡ﾂｦﾂ･ﾂｹﾂ･ﾃ堋･ﾂ､ﾂ･ﾃｳﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂｹﾂｹﾂｿﾂｷ (thx Marcelo Yuji Himoro)
- - ﾂ･ﾂｪﾂ･ﾃｩﾂ･ﾃｳﾂ･ﾃﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾃ・可ｲﾃ・(thx Dirk Louwers)
+2.30 リリース版 (2005/1/30)
+ - いくつかのデフォルト設定値を変更した
+ - イタリア語ファイル更新 (thx Defkon1)
+ - ブラジルポルトガル語・スペイン語ファイルを更新 (thx Marcelo Yuji Himoro)
+ - オランダ語ファイルを追加 (thx Dirk Louwers)
 
 2.30RC5 (2005/1/22)
- - ﾂｺﾃ卍､ﾂｫﾂ､ﾃ閣ypoﾂ､ﾃ篠ｽﾂ､ﾃﾂｵ (ﾂ､ﾂｵﾂ､ﾃ崢､ﾃ可ｽﾃ・催猟､ﾃ・､ﾃ渉､ﾃ環､ﾂ､ﾂ､ﾃ篠､ﾃ・､ﾂ｢ﾂ､ﾃｯﾂ､ﾃ・､ﾃ・ｾﾃ･ﾂｽﾃｱﾂ､ﾂｭﾂ､ﾂｹﾂ､ﾃｫﾃ可ｬﾃ催猟､ﾃ渉､ﾂ｢ﾂ､ﾃｪﾂ､ﾃ楪､ﾂｻﾂ､ﾃｳ)
- - ﾂ･ﾂ､ﾂ･ﾂｿﾂ･ﾃｪﾂ･ﾂ｢ﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂｹﾂｹﾂｿﾂｷ (thx Defkon1)
+ - 細かなtypoの修正 (さほど重要ではないのであわてて上書きする必要はありません)
+ - イタリア語ファイル更新 (thx Defkon1)
 
 2.30RC4 (2005/1/21)
- - postcheck.inc.php ﾂ､ﾃ仰､ﾂｪﾂ､ﾂ､ﾂ､ﾃ・｡ﾂ｢nocommonﾂｾﾃｵﾃづ鳴､ﾃ篠･ﾂｨﾂ･ﾃｩﾂ｡ﾂｼﾂ､ﾃｲFix (thx dendeke)
+ - postcheck.inc.php において、nocommon状態のエラーをFix (thx dendeke)
 
 2.30RC3 (2005/1/21)
- - ﾂ･ﾃ個･ﾃｫﾂ･ﾃ青･ﾂ､ﾂ･ﾃ暗環ｸﾂｻﾃｺﾃ偲ｳﾂ､ﾃ伉､ﾃ偲づ青ｺﾃｶﾂ､ﾃｲﾂ｡ﾂ｢ﾂｶﾂｯﾃﾂｩﾂｽﾂｪﾃ篠ｻﾂ､ﾂｫﾂ､ﾃｩﾂ･ﾂｵﾂ･ﾃ仰･ﾂｿﾂ･ﾂ､ﾂ･ﾂｺﾂ､ﾃ凝甘堕ｹﾂｹ
- - PREFIX ﾂ･ﾃ楪･ﾃ債｡ﾂｼﾂ･ﾂｸﾂ･ﾃ｣ﾂ､ﾃ偲暗ｹﾃ・ｴﾃﾂｰ
- - ﾂ･ﾃ閉･ﾃｩﾂ･ﾃｳﾂ･ﾂｹﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾃ・可ｲﾃ・(thx HMN)
- - ﾂ･ﾂ､ﾂ･ﾂｿﾂ･ﾃｪﾂ･ﾂ｢ﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾃ・可ｲﾃ・(thx Defkon1)
+ - ヌルバイト文字列への対策を、強制終了からサニタイズに変更
+ - PREFIX マネージャの微調整
+ - フランス語ファイルを追加 (thx HMN)
+ - イタリア語ファイルを追加 (thx Defkon1)
 
 2.30RC2 (2005/1/20)
- - PREFIX ﾂ･ﾃ楪･ﾃ債｡ﾂｼﾂ･ﾂｸﾂ･ﾃ｣ﾂ､ﾃ篠ｽﾂ､ﾃﾂｵ
+ - PREFIX マネージャの修正
 
 2.30RC (2005/1/19)
- - PREFIX ﾂ･ﾃ楪･ﾃ債｡ﾂｼﾂ･ﾂｸﾂ･ﾃ｣ﾂ､ﾃ篠ｺﾃｮﾃﾂｮ
- - 2.0.9.2ﾂｸﾃ・債ｭﾂｷﾃｪﾂ､ﾃ伉､ﾃ偲づ青ｱﾃｾ (Special thx to zx team!)
- - ﾂ･ﾃ個･ﾃｫﾂ･ﾃ青･ﾂ､ﾂ･ﾃ暗環ｸﾂｻﾃｺﾃ偲ｳﾂ､ﾃ伉､ﾃ偲づ青ｺﾃｶ
- - ﾂ･ﾃ・･ﾂ｣ﾂ･ﾃｬﾂ･ﾂｯﾂ･ﾃ按･ﾃｪﾃ・個､ﾃｪﾂ･ﾃ・･ﾂｧﾂ･ﾃδ･ﾂｯﾂ､ﾂｬﾂｴﾃ・､ﾂｫﾂ､ﾃδ､ﾂｿﾂ､ﾃ篠､ﾃｲﾂｲﾃｾﾃ・ｱ (thx minahito)
- - ﾂ･ﾂｻﾂ･ﾃδ･ﾂｷﾂ･ﾃｧﾂ･ﾃｳﾂ･ﾃ渉･ﾂ､ﾂ･ﾂｸﾂ･ﾃ｣ﾂ･ﾃδ･ﾂｯﾃづ青ｺﾃｶﾂ､ﾃ偲・可ｲﾃ・
- - postcheck.inc.php ﾂ､ﾃ偲・可ｲﾃ・(ﾂ･ﾃ堕･ﾃδ･ﾃ・､ﾃ偲・ｶﾂ､ﾃ・甘ｽﾂ､ﾂｬﾃ甘堕､ﾃｯﾂ､ﾃδ､ﾃ・､ﾂ､ﾂ､ﾃ楪､ﾂｹﾂ｡ﾃ・
- - ﾃ甘堕ｿﾃｴﾂｱﾃｸﾃﾃｷﾂ｡ﾂｦSQL Injectionﾂ｣ﾂｲﾂｼﾃｯﾂ､ﾃ偲ﾃ淌・ｪﾃ甘ｽﾃ仰｡ﾂ､ﾃｲﾃ甘堕ｹﾂｹ
+ - PREFIX マネージャの作成
+ - 2.0.9.2固有穴への対応 (Special thx to zx team!)
+ - ヌルバイト文字列への対策
+ - ディレクトリ遡りチェックが甘かったのを改善 (thx minahito)
+ - セッションハイジャック対策の追加
+ - postcheck.inc.php の追加 (パッチの当て方が変わっています）
+ - 変数汚染・SQL Injection２種の設定方法を変更
 
-2.22 (2005/1/4) (ﾂ､ﾂｽﾂ､ﾃｳﾂ､ﾃ環､ﾃ仰ｽﾃ・催猟､ﾂｸﾂ､ﾃ｣ﾂ､ﾃ環､ﾂ､ﾂｽﾂ､ﾃﾂｵﾂ､ﾃ・､ﾂｹ)
- - check_dos_attack_* ﾂ､ﾃ仰､ﾂｪﾂ､ﾂｱﾂ､ﾃｫtypoﾂｽﾂ､ﾃﾂｵ (thx Mithrandir)
- - IISﾂ､ﾃﾂ､ﾃ・EQUEST_URIﾂ､ﾂｬﾂｼﾃｨﾃ・ﾂ､ﾃ・､ﾂｭﾂ､ﾃ環､ﾂ､ﾂ､ﾂｳﾂ､ﾃ按､ﾃ伉､ﾃ偲づ青ｱﾃｾ
+2.22 (2005/1/4) (そんなに重要じゃない修正です)
+ - check_dos_attack_* におけるtypo修正 (thx Mithrandir)
+ - IISだとREQUEST_URIが取得できないことへの対応
  - updated myblocksadmin 0.22 & mymenu 0.07
 
 2.21 (2004/12/31)
- - ﾃ甘堕ｿﾃｴﾂｱﾃｸﾃﾃｷﾂ､ﾃ篠･ﾃ・･ﾂｧﾂ･ﾃδ･ﾂｯﾃ渉ｳﾂ､ﾃｬﾂｽﾂ､ﾃﾂｵ (thx onokazu)
+ - 変数汚染のチェック漏れ修正 (thx onokazu)
 
 2.20 (2004/12/27)
- - ﾃ甘堕ｿﾃｴﾂｱﾃｸﾃﾃｷﾂ､ﾃ篠･ﾃ・･ﾂｧﾂ･ﾃδ･ﾂｯﾃ渉ｳﾂ､ﾃｬﾂｽﾂ､ﾃﾂｵ(thx JM2)
- - HTTP_*_VARS ﾂ､ﾃ使lobalﾂｻﾃ佚・ｪﾃ仰ｺﾂ､ﾃｬﾂｽﾂ､ﾃﾂｵ
- - ﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂｻﾃ佚・ｪﾃ・個､ﾃｪﾂ､ﾃｲﾂ･ﾃｭﾂ･ﾂｰﾂｵﾂｭﾃ渉ｿﾂ､ﾂｹﾂ､ﾃｫﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ仰､ﾂｷﾂ､ﾂｿ
- - ﾂ･ﾃ鳴･ﾃｩﾂ･ﾂｸﾂ･ﾃｫﾂ･ﾃ敖･ﾃｫﾂ･ﾃ按･ﾂｬﾂ･ﾃｫﾂｸﾃｬﾂ｡ﾂｦﾂ･ﾂｹﾂ･ﾃ堋･ﾂ､ﾂ･ﾃｳﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂｹﾂｹﾂｿﾂｷ (thx Marcelo Yuji Himoro)
- - ﾃ暗凝づ偲εｦﾂｹﾃｱﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂｹﾂｹﾂｿﾂｷ (thx Kikuchi)
+ - 変数汚染のチェック漏れ修正(thx JM2)
+ - HTTP_*_VARS のglobal指定忘れ修正
+ - ファイル指定遡りをログ記録するようにした
+ - ブラジルポルトガル語・スペイン語ファイルを更新 (thx Marcelo Yuji Himoro)
+ - 繁体中国語ファイルを更新 (thx Kikuchi)
 
 2.20RC3 (2004/12/18)
- - ﾂ｡ﾃ鳴ｵﾂｿﾂ､ﾃｯﾂ､ﾂｷﾂ､ﾂ､ﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂｻﾃ佚・ｪﾂ､ﾃｲﾂｶﾃ伉ｻﾃ淞､ﾂｹﾂ､ﾃｫﾂ｡ﾃ猟･ﾂｪﾂ･ﾃ猟･ﾂｷﾂ･ﾃｧﾂ･ﾃｳﾂ､ﾃ偲・可ｲﾃ・(thx JM2)
- - ﾂ･ﾂｹﾂ･ﾃ堋･ﾂ､ﾂ･ﾃｳﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾃ・可ｲﾃ・(thx Marcelo Yuji Himoro)
+ - 「疑わしいファイル指定を禁止する」オプションの追加 (thx JM2)
+ - スペイン語ファイルを追加 (thx Marcelo Yuji Himoro)
 
 2.20RC2 (2004/12/16)
  - updated myblocksadmin (0.12) & mymenu (0.06)
- - ﾂ･ﾃ鳴･ﾃｩﾂ･ﾂｸﾂ･ﾃｫﾂ･ﾃ敖･ﾃｫﾂ･ﾃ按･ﾂｬﾂ･ﾃｫﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂｹﾂｹﾂｿﾂｷ (thx Marcelo Yuji Himoro)
+ - ブラジルポルトガル語ファイルを更新 (thx Marcelo Yuji Himoro)
 
 2.20RC (2004/12/15)
- - HTTP_*_VARSﾂ､ﾃ偲・堕ｻﾃ・(PHP5ﾃ催・
- - ﾂ･ﾃｬﾂ･ﾂｹﾂ･ﾂｭﾂ･ﾃ･ﾂ｡ﾂｼﾂｵﾂ｡ﾃ・ｽﾂ､ﾃ偲・可ｲﾃ・
- - ﾂ･ﾂｨﾂ｡ﾂｼﾂ･ﾂｸﾂ･ﾂｧﾂ･ﾃｳﾂ･ﾃ按､ﾃ｢ﾂｵﾂｭﾃ渉ｿﾂ､ﾂｹﾂ､ﾃｫﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ凝甘堕ｹﾂｹ
- - Anti-DoSﾂ､ﾃ篠･ﾃｫﾂ｡ﾂｼﾂ･ﾃ・･ﾃｳﾂ､ﾃｲﾂ､ﾃ楪､ﾃｫﾂ､ﾃ楪､ﾃｫﾂｽﾃｱﾂｴﾂｹﾂ､ﾂｨ
- - F5ﾂ･ﾂ｢ﾂ･ﾂｿﾂ･ﾃδ･ﾂｯﾂ｡ﾂｦﾂ･ﾂｯﾂ･ﾃｭﾂ｡ﾂｼﾂ･ﾃｩﾂ｡ﾂｼﾂ｡ﾂｦﾂｴﾂｿﾂｷﾃ楪､ﾂｹﾂ､ﾃ卍､ﾂｭﾂ･ﾂｵﾂ｡ﾂｼﾂ･ﾃ・･ﾂｨﾂ･ﾃｳﾂ･ﾂｸﾂ･ﾃｳﾂ､ﾃ・｡ﾂ｢ﾂ､ﾂｽﾂ､ﾃｬﾂ､ﾂｾﾂ､ﾃｬﾂｽﾃｨﾃ催ｽﾃ環ｬﾂ､ﾂｱﾂ､ﾂｷﾂ､ﾂｿ
- - ﾂｶﾂｯﾃﾂｩintvalﾂ､ﾂｬﾃ・崚偲ｳﾂ､ﾃ凝づ青､ﾂｷﾂ､ﾃ・､ﾃ｢ﾂｹﾃ板､ﾃｯﾂ､ﾃｬﾂ､ﾃ・､ﾂｷﾂ､ﾃ楪､ﾃδ､ﾃ・､ﾂ､ﾂ､ﾂｿﾂ､ﾃ篠､ﾃｲﾂｽﾂ､ﾃﾂｵ
- - UNIONﾃ按ｯﾂｸﾂｫﾂ･ﾃ堕･ﾂｿﾂ｡ﾂｼﾂ･ﾃｳﾂ､ﾃ凝按ｴﾂ､ﾂｱﾂ､ﾂｬﾂ､ﾂ｢ﾂ､ﾃδ､ﾂｿﾂ､ﾃ篠､ﾃｲﾂｽﾂ､ﾃﾂｵ
+ - HTTP_*_VARSの廃止 (PHP5用)
+ - レスキュー機能の追加
+ - エージェントも記録するように変更
+ - Anti-DoSのルーチンをまるまる書換え
+ - F5アタック・クローラー・歓迎すべきサーチエンジンで、それぞれ処理分けした
+ - 強制intvalが配列に対しても行われてしまっていたのを修正
+ - UNION発見パターンに抜けがあったのを修正
 
 2.11 (2004/9/30)
- - typo ﾂ､ﾂｬﾂ､ﾂ､ﾂ､ﾂｯﾂ､ﾃ・､ﾂｫﾂ､ﾂ｢ﾂ､ﾃδ､ﾂｿﾂ､ﾃ篠､ﾃ・ｽﾂ､ﾃﾂｵ
+ - typo がいくつかあったので修正
 
 2.10a (2004/9/27)
- - ﾂ･ﾃ鳴･ﾃｩﾂ･ﾂｸﾂ･ﾃｫﾂ･ﾃ敖･ﾃｫﾂ･ﾃ按･ﾂｬﾂ･ﾃｫﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂｹﾂｹﾂｿﾂｷ (thx Marcelo Yuji Himoro)
+ - ブラジルポルトガル語ファイルを更新 (thx Marcelo Yuji Himoro)
 
 2.10 (2004/9/22)
- - ﾂ･ﾂ｢ﾂ･ﾃδ･ﾃ猟･ﾃｭﾂ｡ﾂｼﾂ･ﾃ可･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃ篠ｳﾃ暗・･ﾂｻﾃ陳･ﾃ・･ﾂｧﾂ･ﾃδ･ﾂｯﾂ､ﾃｲﾃ・可ｲﾃ・
- - SQL Injectionﾂ､ﾂｬﾂ､ﾃｩﾂ､ﾃ淞､ﾃ篠･ﾂｵﾂ･ﾃ仰･ﾂｿﾂ･ﾂ､ﾂ･ﾂｺﾂ､ﾃｲﾂ｡ﾂ｢ﾃ・ｪﾃづｲﾂｲﾃ・・ｽﾂ､ﾃ按､ﾂｷﾂ､ﾂｿ
- - ﾂ･ﾂｻﾂ･ﾂｭﾂ･ﾃ･ﾂ･ﾃｪﾂ･ﾃ・･ﾂ｣ﾂ･ﾂｬﾂ･ﾂ､ﾂ･ﾃ可､ﾃｲﾃ・可ｲﾃ・
- - 2ﾂｲﾃ閉ｽﾃｪﾂ､ﾂ｢ﾂ､ﾃδ､ﾂｿ short tag ﾂ､ﾃｲﾃ・卍､ﾂｷﾂ､ﾂｿ (thx t_miyabi)
- - ﾃ暗凝づ偲εｦﾂｹﾃｱﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾃ・可ｲﾃ・(thx Kikuchi)
+ - アップロードファイルの拡張子チェックを追加
+ - SQL Injectionがらみのサニタイズを、選択可能とした
+ - セキュリティガイドを追加
+ - 2箇所あった short tag を潰した (thx t_miyabi)
+ - 繁体中国語ファイルを追加 (thx Kikuchi)
 
 2.01 (2004/9/11)
- - ﾃ甘堕ｿﾃｴﾂｱﾃｸﾃﾃｷﾂ･ﾃ・･ﾂｧﾂ･ﾃδ･ﾂｯﾂ､ﾃ・つｭﾂ､ﾃｪﾂ､ﾃ環､ﾂｫﾂ､ﾃδ､ﾂｿﾂ､ﾃ篠､ﾃｲﾃ・可ｲﾃ・
- - ﾂ･ﾃ鳴･ﾃｩﾂ･ﾂｸﾂ･ﾃｫﾂ､ﾃ篠･ﾃ敖･ﾃｫﾂ･ﾃ按･ﾂｬﾂ･ﾃｫﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂｹﾂｹﾂｿﾂｷ (thx Marcelo Yuji Himoro)
+ - 変数汚染チェックで足りなかったのを追加
+ - ブラジルのポルトガル語ファイルを更新 (thx Marcelo Yuji Himoro)
 
 2.0  (2004/9/10)
- - Xoops Protector ﾂ､ﾃ按､ﾂｷﾂ､ﾃ・､ﾃ篠ｺﾃ・ｽﾃｩﾂ､ﾃ篠･ﾃｪﾂ･ﾃｪﾂ｡ﾂｼﾂ･ﾂｹ
+ - Xoops Protector としての最初のリリース
 
 
 

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/MEMO_ja
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/MEMO_ja	2014-05-19 14:19:33 UTC (rev 12537)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/MEMO_ja	2014-05-19 15:22:07 UTC (rev 12538)
@@ -1,86 +1,86 @@
-｡ﾊ､ｳ､ﾎ･皈筅ﾏ､ﾀ､､､ﾖｸﾅ､､､ﾎ､ﾇ｡｢､｢､ﾆ､ﾋ､ﾊ､熙ﾞ､ｻ､｣､ｴ､皃ﾊ､ｵ､､｡ﾋ
+（このメモはだいぶ古いので、あてになりません。ごめんなさい）
 
 
-｡・ｴﾂﾎ､ﾎ･ﾕ･悅ｼ
+●全体のフロー
 
 -(front-end).php
  --mainfile.php
    ---modules/protector/include/precheck.inc.php
-   ---include/common.php  (､ｳ､ｳ､ﾇｽ鬢皃ﾆ･譯ｼ･ｶ｡ｼ･ｻ･ﾃ･ｷ･逾ｬﾄ･､鬢・・ﾋ
+   ---include/common.php  (ここで初めてユーザーセッションが張られる）
    ---modules/protector/include/postcheck.inc.php
  --header.php
    x ---modules/protector/blocks/protector_block.php (deleted)
 ...
 
-mainfile.php ､ﾘ､ﾎ･ﾑ･ﾃ･ﾁ､ｬﾁｴ､ﾆ
+mainfile.php へのパッチが全て
 
 
 
-｡魵nti-DoS､ﾎｽ靉･ﾕ･悅ｼ
+●Anti-DoSの処理フロー
 
-｡ｦprecheck.inc.php
+・precheck.inc.php
 
-､ｳ､ｳ､ﾇ､ﾎｽ靉､ﾏ､ﾊ､ｯ､ﾊ､ﾃ､ｿ｡｣
+ここでの処理はなくなった。
 
-｡ｦpostcheck.inc.php
+・postcheck.inc.php
 
-$protector->check_dos_attack() ､ﾎｸﾆ､ﾓｽﾐ､ｷ
+$protector->check_dos_attack() の呼び出し
 
-ﾃ豼ﾈ｡ｧ
-  protector_access ･ﾆ｡ｼ･ﾖ･・ﾎ･ｬ･ﾙ･ｳ･・
-  ﾆｱｰ・P､ｫ､鯣ｱｰ・RI､ﾘ､ﾎｹ篷ﾑﾅﾙ･｢･ｯ･ｻ･ｹ･ﾁ･ｧ･ﾃ･ｯ (F5 Attack)
-   > protector_access ･ﾆ｡ｼ･ﾖ･・ﾘ､ﾎ･・ｳ｡ｼ･ﾉﾄﾉｲﾃ (DELAYED INSERT)
-   > protector_access ﾆ筅ﾎﾆｱｰ・P･・ｳ｡ｼ･ﾉ､ﾇﾄ网ﾇ､・ﾊｬﾀ隍ﾋｱ荀ﾐ､ｹ｡ﾊ､ｳ､ﾎｽ靉｡｢､爨ｷ､擎ｭｱﾆｶﾁ､ｬ､｢､熙ｽ､ｦ､ﾋｻﾗ､ｨ､・ﾎ､ﾇ｡｢､ﾈ､熙｢､ｨ､ｺｳｰ､ｷ､ﾆ､ﾟ､・ﾋ
-   > preferences ､ﾇｻﾘﾄ熙ｵ､・ｿｽ靉､ﾔ､ﾃ､ﾆfalse､ﾖ､ｹ
-   > banIP ､篦ｨｺﾂ､ﾋbad_ips､ﾋﾅﾐﾏｿ､ｹ､・
-   > exit ､ﾀ､ｱ､ﾏ｡｢exit; ､ｹ､・ｰ､ﾋ｡｢･愠ｰｵｭﾏｿ
-  USER_AGENT ･ﾁ･ｧ･ﾃ･ｯ
-   > ｴｿｷﾞ､ｹ､ﾙ､ｭUSER_AGENT､ﾊ､鬘｢ｲｿ､篆靉､ｷ､ﾊ､､､ﾇOK､ﾈ､ｹ､・
-   > USER_AGENT､ｾｾﾎ､ｹ､・ｭｰﾕ､｢､・ot､ﾘ､ﾎﾂﾐｺﾏｺ｣ｸ螟ﾎｲﾝﾂ・
-  ﾆｱｰ・P､ｫ､鯱ﾍ｡ｹ､ﾊURI､ﾘ､ﾎｹ篷ﾑﾅﾙ･｢･ｯ･ｻ･ｹ･ﾁ･ｧ･ﾃ･ｯ ｡ﾊ･皈｢･ﾉｼｽｸ･ﾜ･ﾃ･ﾈﾅﾋ
-  protector_access ･ﾆ｡ｼ･ﾖ･・ﾘ､ﾎ･・ｳ｡ｼ･ﾉﾄﾉｲﾃ (DELAYED INSERT)
-   > preferences ､ﾇｻﾘﾄ熙ｵ､・ｿｽ靉､ﾔ､ﾃ､ﾆfalse､ﾖ､ｹ
-   > banIP ､篦ｨｺﾂ､ﾋbad_ips､ﾋﾅﾐﾏｿ､ｹ､・
-   > exit ､ﾀ､ｱ､ﾏ｡｢exit; ､ｹ､・ｰ､ﾋ｡｢･愠ｰｵｭﾏｿ
-  ､､､ｺ､・ﾋ､箋ｺﾅｷ､ﾊ､ｱ､・ﾐOK｡｣
+中身：
+  protector_access テーブルのガベコレ
+  同一IPから同一URIへの高頻度アクセスチェック (F5 Attack)
+   > protector_access テーブルへのレコード追加 (DELAYED INSERT)
+   > protector_access 内の同一IPレコードを最低でも5分先に延ばす（この処理、むしろ悪影響がありそうに思えるので、とりあえず外してみる）
+   > preferences で指定された処理を行ってfalseを返す
+   > banIP も即座にbad_ipsに登録する
+   > exit だけは、exit; する前に、ログ記録
+  USER_AGENT チェック
+   > 歓迎すべきUSER_AGENTなら、何も処理しないでOKとする
+   > USER_AGENTを詐称する悪意あるbotへの対策は今後の課題
+  同一IPから様々なURIへの高頻度アクセスチェック （メアド収集ボット等）
+  protector_access テーブルへのレコード追加 (DELAYED INSERT)
+   > preferences で指定された処理を行ってfalseを返す
+   > banIP も即座にbad_ipsに登録する
+   > exit だけは、exit; する前に、ログ記録
+  いずれにも該当しなければOK。
 
-ﾊﾖ､・ﾍ､ｬfalse､ﾊ､鬘｢･愠ｰｵｭﾏｿ
-､ｳ､ｳ､ﾇ､ﾏ｡｢purge() ｽ靉､ﾊ､ﾉ､ﾏ､ｷ､ﾊ､､
+返り値がfalseなら、ログ記録
+ここでは、purge() 処理などはしない
 
 
-｡ｦpreferences ､ﾇｻﾘﾄ熙ﾇ､ｭ､・靉
+・preferences で指定できる処理
 
-none   ｲｿ､篦ﾐｹｳｽ霤ﾖ､ﾏ､ﾈ､鬢ﾊ､､｡｣･愠ｰｵｭﾏｿ､ﾀ､ｱｹﾔ､ｦ
-sleep  5ﾉﾃｿﾀ､ｱsleep()､ｹ､・｣Apache､膊ySQL､ﾎﾉ魎ﾙ､､荀ｹ､ﾀ､ｱ､ｫ､筅ｷ､・ｺｺ｣､ﾏﾈ萓ｩ
-exit   ﾂｨｺﾂ､ﾋexit､ｹ､・
-banip  xoopsConfig ､ﾎ bad_ips ､ﾋﾅﾐﾏｿ
-htaccess .htaccess､ﾋDENY FROM､ﾈ､ｷ､ﾆｽｭｹ､爍｣uploads/.htaccess.bak､ｬ･ﾐ･ﾃ･ｯ･｢･ﾃ･ﾗ･ﾕ･｡･､･・ﾇ｡｢･ﾐ･ﾃ･ｯ･｢･ﾃ･ﾗ､ｬ､ﾊ､ｯ､ﾆ｡｢.htaccess､ｬ､｢､・ﾐｼｫﾆｰｺ鋿ｮ｡｣ｵﾕ､ﾋ｡｢.htaccess､ﾎﾃ豼ﾈ､ｬ､ﾊ､ｯ､ﾆ･ﾐ･ﾃ･ｯ･｢･ﾃ･ﾗ､ｬ､｢､・・遉ﾏ｡｢･ﾐ･ﾃ･ｯ･｢･ﾃ･ﾗ､ｫ､鮨ｭﾌ皃ｹ｡｣uploads/､ﾏﾄﾌｾ・ﾎ･ﾑ｡ｼ･ﾟ･ﾃ･ｷ･逾ﾇﾌ萃熙ﾊ､､､ｬ｡｢.htaccess､ﾀ､ｱ､ﾏ｡｢ﾌﾀｼｨﾅｪ､ﾋｽｸ｢ｸﾂ､ｿ､ｨ､・ｬﾍﾗ､｢､遙｣
+none   何も対抗処置はとらない。ログ記録だけ行う
+sleep  5秒数だけsleep()する。ApacheやMySQLの負荷を増やすだけかもしれず今は非推奨
+exit   即座にexitする
+banip  xoopsConfig の bad_ips に登録
+htaccess .htaccessにDENY FROMとして書き込む。uploads/.htaccess.bakがバックアップファイルで、バックアップがなくて、.htaccessがあれば自動作成。逆に、.htaccessの中身がなくてバックアップがある場合は、バックアップから書き戻す。uploads/は通常のパーミッションで問題ないが、.htaccessだけは、明示的に書込権限を与える必要あり。
 
 
 
-｡・ﾔﾀｵ･ﾕ･｡･､･・｢･ﾃ･ﾗ･悅ｼ･ﾉﾂﾐｺ・
+●不正ファイルアップロード対策
 
-precheck ､ﾎ､ﾟ､ﾇｹﾔ､ｦ｡｣
+precheck のみで行う。
 
-･ﾇ･ﾕ･ｩ･・ﾈ､ﾇON｡｣
+デフォルトでON。
 
-$_FILES ､ｺ､ｷ｡｢
+$_FILES を走査し、
 /(\.php|\.phtml|\.phtm|\.php3|\.php4|\.cgi|\.pl|\.asp)$/i
-､ﾈ､､､ｦ･ﾑ･ｿ｡ｼ･ﾋｹ酖ﾗ､ｹ､・ﾕ･｡･､･・ｾ､ｬ､｢､ﾃ､ｿ､鬘｢ﾂｨｺﾂ､ﾋpurge()
+というパターンに合致するファイル名があったら、即座にpurge()
 
-B-Wiki､ﾇｼｫｺ鈆ｽ･ﾕ･ﾈ､ｫ､ｹ､・ﾊ､ﾉ｡｢php･ﾕ･｡･､･・ｺﾉﾕ､ｹ､・ﾑﾅﾓ､ﾇ､ﾏ｡｢､ｳ､ﾎｵ｡ﾇｽ､FF､ﾋ､ｹ､・ｾ､ﾊ､､､ﾀ､惕ｦ｡｣
+B-Wikiで自作ソフトを公開するなど、phpファイルを添付する用途では、この機能をOFFにする他ないだろう。
 
-･筵ｸ･蝪ｼ･・ｦ､ﾇ｡｢mainfile.php ｸﾆ､ﾓｽﾐ､ｷﾁｰ､ﾋ PROTECTOR_SKIP_FILESCHECKER ､・ﾁ､ｹ､・ｳ､ﾈ､ﾇ､筍｢､ｳ､ﾎ･ﾁ･ｧ･ﾃ･ｯ､ﾏ･ｹ･ｭ･ﾃ･ﾗ､ﾇ､ｭ､・｣B-Wiki､ﾊ､ﾉ､ｬﾂﾐｱ､ｷ､ﾆ､ｯ､・・ﾈｴｷ､､｡｣
+モジュール側で、mainfile.php 呼び出し前に PROTECTOR_SKIP_FILESCHECKER を定義することでも、このチェックはスキップできる。B-Wikiなどが対応してくれると嬉しい。
 
 
 
-｡・ｷ･ｹ･ﾆ･猝ﾑｿﾐｺ・
+●システム変数汚染対策
 
-precheck ､ﾎ､ﾟ､ﾇｹﾔ､ｦ｡｣
+precheck のみで行う。
 
-ｸｫ､ﾄ､ｫ､ﾃ､ｿｻ､ﾎ･ﾇ･ﾕ･ｩ･・ﾈﾆｰｺ釥ﾏ｡｢exit｡｣
+見つかった時のデフォルト動作は、exit。
 
-$_POST, $_GET, $_COOKIE ､・ｫ｡ｼ･ｷ･ﾋﾁｺ､ｷ｡｢
+$_POST, $_GET, $_COOKIE をリカーシヴに走査し、
 
 'GLOBALS'
 '_SESSION'
@@ -103,131 +103,131 @@
 'xoopsModule'
 'xoopsModuleConfig'
 
-､ﾎ･､･ﾇ･ﾃ･ｯ･ｹ､ｬﾌｵ､､､ｫ､ｴ､ﾙ､・｣
+のインデックスが無いかを調べる。
 
-､ｳ､ﾎ･ﾁ･ｧ･ﾃ･ｯ､ﾏ｡｢･ｳ･ｹ･ﾈ･鬣ｯ･ｿ､ﾇｹﾔ､ｦ
+このチェックは、コンストラクタで行う
 
-precheck ､ﾇｸｫ､ﾄ､ｫ､ﾃ､ﾆ｡｢､ｫ､ﾄ｡｢ban_ip ｻﾘﾄ熙ﾊ､鬘｢､ﾈ､熙｢､ｨ､ｺGET､ﾈPOST､ﾀ､ｱｶﾋ､ｷ､ﾆ｡｢bad_ipﾅﾐﾏｿﾍｽﾌ｣postcheck､ﾎｻ､ﾋ｡｢ﾊﾝｸ鈆ｰ･・ｼ･ﾗ､ﾇ､ﾊ､ｱ､・ﾐban｡｣
+precheck で見つかって、かつ、ban_ip 指定なら、とりあえずGETとPOSTだけ空にして、bad_ip登録予約。postcheckの時に、保護グループでなければban。
 
-ﾂｨｺﾂ､ﾋﾂﾐｱ､ﾇ､ｭ､・｢､ﾈ､､､ｦﾅﾀ､ﾇ｡｢ﾉ眛ﾌ､ﾋ｡｢exit ､ｬﾎﾉ､､､ﾈｻﾗ､・・・｣
+即座に対応できる、という点で、普通に、exit が良いと思われる。
 
 
 
-｡・筵ｸ･蝪ｼ･・ﾑID､ﾎ XSS , SQL Injection ﾂﾐｺ・
+●モジュール用IDの XSS , SQL Injection 対策
 
-precheck ､ﾎ､ﾟ｡｣
+precheck のみ。
 
-$_POST, $_GET, $_COOKIE ､ｺ､ｷ｡｢･､･ﾇ･ﾃ･ｯ･ｹ､ｬ 'id' ､ﾇｽｪ､・ﾃ､ﾆ｡｢､ｫ､ﾄ｡｢ﾇﾛﾎﾇ､ﾏ､ﾊ､､ﾊﾑｿﾋ､ﾄ､､､ﾆ､ﾏ｡｢intval() ､ｫ､ｱ､・
+$_POST, $_GET, $_COOKIE を走査し、インデックスが 'id' で終わって、かつ、配列ではない変数については、intval() をかける
 
-･ﾇ･ﾕ･ｩ･・ﾈ､ﾇ､ﾏOFF｡｣
+デフォルトではOFF。
 
 
 
-｡・QL Injectionﾂﾐｺﾎ｣ｲ･ﾑ･ｿ｡ｼ･・
+●SQL Injection対策の２パターン
 
-postcheck ､ﾎ､ﾟ｡｣common.php ､ﾎｸ螟ﾇ､筍｢､ﾛ､ﾜﾌ萃熙ﾊ､ｫ､惕ｦ｡｢､ﾈ､､､ｦﾈｽﾃﾇ｡｣
+postcheck のみ。common.php の後でも、ほぼ問題なかろう、という判断。
 
-$_POST, $_GET, $_COOKIE ､ﾆｵ｢ﾅｪ､ﾋﾁｺ､ｷ｡｢ﾃ豼ﾈ､ﾋ｡｢UNION ､ﾞ､ｿ､ﾏｸﾉﾎｩ､ｷ､ｿ /* ､ｬﾌｵ､､､ｫ､ﾁ･ｧ･ﾃ･ｯ､ｹ､・
+$_POST, $_GET, $_COOKIE を再帰的に走査し、中身に、UNION または孤立した /* が無いかをチェックする
 
-｡ﾊｸﾉﾎｩ､ｷ､ｿ/* ､ﾈ､ﾏ｡｢ﾂﾐ､ﾋ､ﾊ､・*/ ､ﾎ､ﾊ､､ /* ､ﾎ､ｳ､ﾈ｡｣SQL Injection､ﾋ､ｪ､､､ﾆ｡｢ﾉﾑﾈﾋ､ﾋｻﾈ､・・・ﾋ
+（孤立した/* とは、対になる */ のない /* のこと。SQL Injectionにおいて、頻繁に使われる）
 
-ｸｫ､ﾄ､ｫ､ﾃ､ｿｾ・遉ﾎ･｢･ｯ･ｷ･逾ﾏ､ｽ､・ｾ､・ｴﾃﾊｳｬﾁｪ､ﾙ､・
+見つかった場合のアクションはそれぞれ４段階選べる
 
-｡ｦｲｿ､筅ｷ､ﾊ､､
+・何もしない
 
-｡ｦbit0 ｶｯﾀｩｽ､ﾀｵ ｡ﾊ･ﾇ･ﾕ･ｩ･・ﾈ｡ﾋ
-  UNION ､ﾊ､鬘｢UNI-ON ､ﾈﾊｬｲｹ､・
-  /* ､ﾊ､鬘｢ｺﾇｸ螟ﾋ */ ､ﾕﾍｿ､ｹ､・
+・bit0 強制修正 （デフォルト）
+  UNION なら、UNI-ON と分解する
+  /* なら、最後に */ を付与する
 
-｡ｦbit1 ｽｪﾎｻ
-  ｸﾉﾎｩ､ｷ､ｿ /* ､ﾏﾉ眛ﾌ､ﾋｽ､ｷ､ﾆ､､､ﾆ､箍ﾕｳｰ､ﾈﾎﾉ､ｯ､｢､・ﾑ･ｿ｡ｼ･ﾊ､ﾎ､ﾇ｡｢ｷﾇｼｨﾈﾄ､ﾊ､ﾉ､ﾇﾅ・ﾆ､ｷ､ｿﾅﾓﾃｼ｡｢ｿｿ､ﾃﾇ靂ﾌ､ﾈ､､､ｦ､ﾎ､ﾏ｡｢､ﾁ､遉ﾃ､ﾈ･ﾓ･ﾃ･ｯ･熙ｷ､ﾆ､ｷ､ﾞ､ｦ､ﾀ､惕ｦ｡｣
+・bit1 終了
+  孤立した /* は普通に書込をしていても意外と良くあるパターンなので、掲示板などで投稿した途端、真っ白画面というのは、ちょっとビックリしてしまうだろう。
 
-｡ｦbit2 bad_ip ﾅﾐﾏｿ
-  ｽｪﾎｻ､ﾇ､ｵ､ｨ､筵ﾓ･ﾃ･ｯ･熙ｹ､・ﾎ､ﾋ｡｢､ｳ､・ﾏ､ｵ､ｹ､ｬ､ﾋ､荀熙ｹ､ｮ､ｫ｡｣
+・bit2 bad_ip 登録
+  終了でさえもビックリするのに、これはさすがにやりすぎか。
 
 
 
-｡・ｿ､・ｷ､､･ﾕ･｡･､･・ﾘﾄ熙ﾎｶﾘｻﾟ
+●疑わしいファイル指定の禁止
 
-precheck ､ﾇ､ﾎ､ﾟｹﾔ､ｦ｡｣
+precheck でのみ行う。
 
-･ﾕ･｡･､･・ｾ､ET､ﾇﾄｾﾀﾜｻﾘﾄ熙ｹ､・､ﾋ｡｢､ﾄ､､･ﾁ･ｧ･ﾃ･ｯ､ｺ､・ﾆ･ﾇ･｣･・ｯ･ﾈ･熙ﾌ､鬢・・ｳ､ﾈ､ﾉ､ｰ｡｣
+ファイル名をGETで直接指定する時に、ついチェックを忘れてディレクトリを遡られることを防ぐ。
 
-･ﾕ･｡･､･・ﾑ･ｹ､ﾏ､ｫ､ﾊ､熙ﾎｸｷﾌｩﾀｭ､ﾗｵ皃ｹ､・ﾎ､ﾇ｡｢ｰﾕｳｰ､ﾈ･ﾑ･ｿ｡ｼ･ﾏｹﾊ､・・ﾄ｡ﾄ､ﾈｻﾗ､ﾃ､ﾆ､､､ｿ､ｬ｡｢､ｽ､ｦ､ﾇ､筅ﾊ､ｵ､ｽ､ｦ｡｣
+ファイルパスはかなりの厳密性を要求するので、意外とパターンは絞れる……と思っていたが、そうでもなさそう。
 
-､ﾈ､熙｢､ｨ､ｺ｡｢･ﾇ･｣･・ｯ･ﾈ･熙ﾌ､・ｿ､皃ﾋ､ﾏ｡｢../ ､ｫ､魑ｫｻﾏ､ｹ､・ｫ｡｢../../ ､ﾈ､､､ｦ･ﾑ･ｿ｡ｼ･ﾞ､猖ｬﾍﾗ､ｬﾀ萃ﾐ､ﾋﾉｬﾍﾗ､ﾊ､ﾎ､ﾇ｡｢､ｽ､ｦ､､､ｦ･ﾑ･ｿ｡ｼ･｡ﾃﾎ､ﾈ､ｷ､ｿ｡｣
+とりあえず、ディレクトリを遡るためには、../ から開始するか、../../ というパターンを含む必要が絶対に必要なので、そういうパターン検知とした。
 
-､筅ﾁ､惕｢･ﾌ･・ﾐ･､･ﾈﾂﾐｺﾏﾉｬﾍﾗ｡｣
+もちろん、ヌルバイト対策は必要。
 
-･ﾇ･ﾕ･ｩ･・ﾈ､ﾇON｡｣
+デフォルトでON。
 
-2.3x ､ﾞ､ﾇ､ﾏ｡｢POST､ﾋ､ﾄ､､､ﾆ､篁ﾔ､ﾃ､ﾆ､､､ｿ､ｬ｡｢POST､ﾋ､ﾄ､､､ﾆﾁﾌ､・ﾁ･ｧ･ﾃ･ｯ､ｬﾉｬﾍﾗ､ﾊ､ﾎ､ﾏ｡｢2.0.9.2､ﾞ､ﾇ､ﾎ･ｳ･｢ｷ熙ﾀ､ｱ､ﾀ､惕ｦ､ｫ､鬘｢､ｽ､ﾁ､鬢ﾋｰﾜﾆｰ､ｷ､ｿ｡｣
+2.3x までは、POSTについても行っていたが、POSTについて遡りチェックが必要なのは、2.0.9.2までのコア穴だけだろうから、そちらに移動した。
 
 
 
-｡・ﾌ･・ﾐ･､･ﾈﾂﾐｺ・
+●ヌルバイト対策
 
-･ｳ･ｹ･ﾈ･鬣ｯ･ｿ､ﾇｹﾔ､ｦ｡｣｡ﾊﾍﾗ､ｹ､・ﾋprecheck｡ﾋ
+コンストラクタで行う。（要するにprecheck）
 
-･・ｯ･ｨ･ｹ･ﾈﾊｸｻ昀ﾋ \0 ､ｬ､｢､・ﾈ｡｢ｳﾆｼ・ﾁ･ｧ･ﾃ･ｯ､ｬﾍｭｸ妤ﾋｸ妤ｫ､ﾊ､､｡｣
-､筅ﾈ､筅ﾈ｡｢\0 ､ｬﾂｸｺﾟ､ｹ､・ｳ､ﾈｼｫﾂﾎ､ｪ､ｫ､ｷ､､､ﾎ､ﾇ｡｢･・ｫ｡ｼ･ｷ･ﾋ･ﾁ･ｧ･ﾃ･ｯ､ｷ､ﾆ｡｢
-ｸｫ､ﾄ､ｫ､ﾃ､ｿｾ・遉ﾏ｡｢･ｹ･ﾚ｡ｼ･ｹ､ﾋﾊﾑｴｹ､ｹ､・｣
+リクエスト文字列に \0 があると、各種チェックが有効に効かない。
+もともと、\0 が存在すること自体おかしいので、リカーシヴにチェックして、
+見つかった場合は、スペースに変換する。
 
-･ﾇ･ﾕ･ｩ･・ﾈ､ﾇON｡｣
+デフォルトでON。
 
 
 
-｡・ｻ･ﾃ･ｷ･逾ﾏ･､･ｸ･罕ﾃ･ｯﾂﾐｺ・
+●セッションハイジャック対策
 
-postcheck ､ﾎ､ﾟ｡｣
+postcheck のみ。
 
-･ｻ･ﾃ･ｷ･逾ﾇIP､､ﾁ｡｢ﾆｱｰ・ｻ･ﾃ･ｷ･逾ﾇｰﾛ､ﾊ､・P･｢･ｯ･ｻ･ｹ､ｬﾍ隍ｿｻﾅﾀ､ﾇ･・
-･ｰ･｢･ｦ･ﾈ､ｵ､ｻ､・｣
+セッションでIPを持ち、同一セッションで異なるIPアクセスが来た時点でロ
+グアウトさせる。
 
-､ｿ､ﾀ､ｷ｡｢･ﾗ･愠ｯ･ｷ､ﾎ･悅ｼ･ﾉ･ﾐ･鬣ｹ｡ｦｲ､ﾎﾆﾅｲｽ｡ｦｷﾈﾂﾓ･｢･ｯ･ｻ･ｹ､ﾊ､ﾉ､ﾇ､ﾏ｡｢
-･｢･ｯ･ｻ･ｹﾋ隍ﾋIP･｢･ﾉ･・ｹ､ｬﾊﾑ､・・ｳ､ﾈ､ﾏﾎﾉ､ｯ､｢､・ﾎ､ﾇ｡｢､ﾈ､熙｢､ｨ､ｺ､ﾏ･ｰ･・ｼ
-･ﾗﾋ隍ﾎﾂﾐｱ､ﾈ､ｷ､ｿ｡｣
+ただし、プロクシのロードバランス・回線の二重化・携帯アクセスなどでは、
+アクセス毎にIPアドレスが変わることは良くあるので、とりあえずはグルー
+プ毎の対応とした。
 
-ｴﾉﾍｼﾔ･ｰ･・ｼ･ﾗ､ﾀ､ｱ｡｢IP･ﾁ･ｧ･ﾃ･ｯ､ｭｸ妤ﾋ､ｹ､・ﾎ､ｬ｡｢ｰ・ﾖ･ﾐ･鬣ｹ､ｬ､ﾈ､・ﾆ
-､､､・ﾈ､ﾏｻﾗ､ｦ｡｣｡ﾊ･ﾇ･ﾕ･ｩ･・ﾈ､筅ｽ､ｦ､ﾊ､ﾃ､ﾆ､､､・ﾋ
+管理者グループだけ、IPチェックを有効にするのが、一番バランスがとれて
+いるとは思う。（デフォルトもそうなっている）
 
 
 
-｡・OOPS･ｳ･｢･ﾐ｡ｼ･ｸ･逾ﾇﾍｭ､ﾎｷ熙ﾕ､ｵ､ｮ
+●XOOPSコアバージョン固有の穴ふさぎ
 
-､ﾈ､熙｢､ｨ､ｺ｡｢2.0.9.2 ､ﾇｸｫ､ﾄ､ｫ､ﾃ､ｿｷ熙｢Protectorﾅｪｼ・｡､ﾇｺﾉ､､､ﾇ､ﾟ､ｿ｡｣
-ｰ・｡｢2.4､ｫ､鬢ﾏ｡｢･ﾇ･ﾕ･ｩ･・ﾈ､ff､ﾈ､ｷ､ﾆ､､､・｣
+とりあえず、2.0.9.2 で見つかった穴を、Protector的手法で塞いでみた。
+一応、2.4からは、デフォルトをoffとしている。
 
 
 
-｡・ﾝIP･・ｹ･ﾈ､ﾋｺﾜ､ﾃ､ﾆ､ｷ､ﾞ､ﾃ､ｿｻ､ﾎｵﾟｺﾑｺ・
+●拒否IPリストに載ってしまった時の救済策
 
 XOOPS_URL/modules/protector/admin/rescue.php
-､ﾇ｡｢､｢､鬢ｫ､ｸ､眤ﾟﾄ熙ｷ､ﾆ､ｪ､､､ｿ･ﾑ･ｹ･・ｼ･ﾉ､ﾎﾏ､ｹ､・ﾐ｡｢IPｵﾝ､ｽ､ﾎ､筅ﾎ､貪ﾇ､ｹ､・
+で、あらかじめ設定しておいたパスワードを入力すれば、IP拒否そのものを中断する
 
-､ｿ､ﾀ､ｷ｡｢､ｳ､ﾎ･ﾑ･ｹ･・ｼ･ﾉ､ﾏ､｢､鬢ｫ､ｸ､眤ﾟﾄ熙ｷ､ﾆ､ｪ､ｯﾉｬﾍﾗ､ｬ､｢､・｣
-ｽ魘・ﾖ｡ﾊ･ﾑ･ｹ･・ｼ･ﾉ､ｬｶｸｻ奛ﾋ､ﾎｾ・遑｢､ｳ､ﾎｵﾟｺﾑｺﾏﾌｵｸ妤ﾈ､ﾊ､・｣
+ただし、このパスワードはあらかじめ設定しておく必要がある。
+初期状態（パスワードが空文字）の場合、この救済策は無効となる。
 
-precheck ､ﾇ｡｢､ｳ､ﾎﾃﾍ､ｫ､ﾆ｡｢md5ｲｽ､ｵ､・ﾆ､､､ﾊ､､､ﾊ､鬘｢ｶｯﾀｩﾅｪ､ﾋmd5･ﾏ･ﾃ･ｷ･螟ﾈ､ﾃ､ｿ､筅ﾎ､ﾋﾃﾖ､ｭｴｹ､ｨ､・｣､ｽ､ﾎﾈｽﾃﾇｴ爨ﾏｺﾇｽ鬢ﾎ｣ｳﾊｸｻ妤ｬ'*=*'､ﾇ､｢､・ｫ､ﾉ､ｦ､ｫ｡｣､ﾈ､ﾇ､筅ﾊ､､ﾊﾋ｡､ﾇ､｢､・ｳ､ﾈ､ﾏｼｫｳﾐ､ｷ､ﾆ､､､・ﾎ､ﾇﾆﾍ､ﾃｹ､ﾞ､ﾊ､､､ﾇ､ｯ､ﾀ､ｵ､､ :-)
+precheck で、この値を見て、md5化されていないなら、強制的にmd5ハッシュをとったものに置き換える。その判断基準は最初の３文字が'*=*'であるかどうか。とんでもない方法であることは自覚しているので突っ込まないでください :-)
 
-｡ﾊ､ﾇ､筍｢ｰﾕｳｰ､ﾈﾎﾉ､､ﾊﾋ｡､ｫ､筍ﾋ
+（でも、意外と良い方法かも）
 
 
 
 
-｡・愠ｰ･・ﾙ･・ﾊｻﾃﾄ遙ﾋ
+●ログレベル（暫定）
 
-･ﾓ･ﾃ･ﾈ､ﾇﾂﾐｱ
+ビットで対応
 --------------------------------
-1:   ｴ昤ｱﾅﾙ､ﾎｹ筅､､筅ﾎ｡ﾊ･ﾇ･ﾕ･ｩ･・ﾈ｡ﾋ
+1:   危険度の高いもの（デフォルト）
      CONTAMI, UPLOAD
      BruteForce, xmlrpc, CRITERIA,
      misc debug, misc smilies, edituser avatar choose, findusersh
-     DBLayerTrap､ﾋ､隍・QL Injectionｸ｡ｽﾐ
+     DBLayerTrapによるSQL Injection検出
 -------------------------------- Quiet
 16:  DoS, CRAWLER
 32:  NullByte, ISOCOM, UNION
 -------------------------------- quiet
-64:  ../ ､ﾇ､ﾎﾁﾌ､・
+64:  ../ での遡り
 128: SPAM
--------------------------------- full
\ No newline at end of file
+-------------------------------- full

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/README
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/README	2014-05-19 14:19:33 UTC (rev 12537)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/README	2014-05-19 15:22:07 UTC (rev 12538)
@@ -115,7 +115,9 @@
 
 = Using filter-plugin =
 
-You can try filter-plugins in XOOPS_TRUST_PATH/modules/protector/filters_disabled/ just by copying them into filters_enabled.
+You can try filter-plugins in XOOPS_TRUST_PATH/modules/protector/filters_byconfig/ just by copying them into filters_enabled.
+Since XOOPS_TRUST_PATH can be shared by multi-sites, you may want to set a filter enabled for a site but disabled for the other site.
+If you want to turn a filter on for a specific site, input the name of the filter into Protector's preferences.
 Of course, you can make filter-plugins as you like because it is easy to create.
 
 Here is an introduction for filter-plugins in this archive.
@@ -163,15 +165,33 @@
 
 Of course, I welcome if each core teams adpot the patches as HEAD :-)
 
-minahito, marcan, and phppp BEST REGARDS!
+The latest version of these cores are ready for this feature:
 
+- XCL2.1.x
+- ImpressCMS 1.x
 
+Thank you minahito and marcan!
+
+
 = CHANGES =
 
+3.50 beta (2009/11/17)
+- modified filters can be turned on/off by preferences of Protector
+- moved filters under filters_disabled/ into filters_byconfig/
+- added manipulation checker against ftp worms or silent raiders
+
+3.41 (2009/11/17)
+- fixed some swf/swc files are confused often
+- added language files
+-- polish_utf8 (thx jagi)
+
 3.40 (2009/09/16)
 - numbered as a STABLE version
 - renamed from "Xoops Protector" to "Protector" simply
 - modified module icons for some forked cores (thx rene)
+- modified postcommon_post_need_multibyte with func_overload (thx orange) 3.40a
+- updated language files
+-- spanish (thx Colossus) 3.40b
 
 3.36 beta (2009/08/27)
 - updated HTMLPurifier into 4.0.0
@@ -374,47 +394,47 @@
 
 [/xlang:en][xlang:ja]
 
-ﾂ｡ﾃｼﾃ催猟ｻﾃ・
+●要旨
 
-Protector ﾂ､ﾃ渉｡ﾂ｢XOOPS2ﾂ･ﾃ卍｡ﾂｼﾂ･ﾂｹﾂ､ﾃ篠ｳﾃ・ｼﾃｯCMSﾂ､ﾃｲﾃ催債｡ﾂｹﾂ､ﾃ環ｰﾂｭﾂｰﾃ閉､ﾂ｢ﾂ､ﾃｫﾂｹﾂｶﾂｷﾃ｢ﾂ､ﾂｫﾂ､ﾃｩﾂｼﾃｩﾂ､ﾃｫﾂ､ﾂｿﾂ､ﾃ｡ﾂ､ﾃ篠･ﾃ｢ﾂ･ﾂｸﾂ･ﾃ･ﾂ｡ﾂｼﾂ･ﾃｫﾂ､ﾃ・､ﾂｹﾂ｡ﾂ｣
+Protector は、XOOPS2ベースの各種CMSを様々な悪意ある攻撃から守るためのモジュールです。
 
-ﾂ､ﾂｳﾂ､ﾃ篠･ﾃ｢ﾂ･ﾂｸﾂ･ﾃ･ﾂ｡ﾂｼﾂ･ﾃｫﾂ､ﾃ・､ﾃ渉｡ﾂ｢ﾂｰﾃ環ｲﾂｼﾂ､ﾃ篠ｹﾂｶﾂｷﾃ｢ﾂ､ﾃｲﾃ凝可､ﾂｮﾂ､ﾃ楪､ﾂｹﾂ｡ﾂ｣
+このモジュールでは、以下の攻撃を防ぎます。
 
 - DoS
-- ﾂｰﾂｭﾂｰﾃ閉､ﾂ｢ﾂ､ﾃｫﾂ･ﾂｯﾂ･ﾃｭﾂ｡ﾂｼﾂ･ﾃｩﾂ｡ﾂｼﾂ｡ﾃ環･ﾃ｡ﾂ｡ﾂｼﾂ･ﾃｫﾂｼﾃｽﾂｽﾂｸﾂ･ﾃ慊･ﾃδ･ﾃ按､ﾃ環､ﾃ可｡ﾃ・
+- 悪意あるクローラー（メール収集ボットなど）
 - SQL Injection
-- XSS ﾂ｡ﾃ環､ﾃ按､ﾂ､ﾂ､ﾃδ､ﾃ・､ﾃ｢ﾂ｡ﾂ｢ﾃ・ｴﾂ､ﾃ・､ﾃ・､ﾃ渉､ﾂ｢ﾂ､ﾃｪﾂ､ﾃ楪､ﾂｻﾂ､ﾃｳﾂ｡ﾃ・
-- ﾂ･ﾂｷﾂ･ﾂｹﾂ･ﾃ・･ﾃﾂ･ﾂｰﾂ･ﾃｭﾂ｡ﾂｼﾂ･ﾃ青･ﾃｫﾃ甘堕ｿﾃｴﾂｱﾃｸﾃﾃｷ
-- ﾂ･ﾂｻﾂ･ﾃδ･ﾂｷﾂ･ﾃｧﾂ･ﾃｳﾂ･ﾃ渉･ﾂ､ﾂ･ﾂｸﾂ･ﾃ｣ﾂ･ﾃδ･ﾂｯ
-- ﾂ･ﾃ個･ﾃｫﾂ･ﾃ青･ﾂ､ﾂ･ﾃ按ｹﾂｶﾂｷﾃ｢
-- ﾂ･ﾃ・･ﾂ｣ﾂ･ﾃｬﾂ･ﾂｯﾂ･ﾃ按･ﾃｪﾃ・個､ﾃｪﾂｹﾂｶﾂｷﾃ｢
-- ﾂ､ﾂ､ﾂ､ﾂｯﾂ､ﾃ・､ﾂｫﾂ､ﾃ篠ｴﾃｭﾂｸﾂｱﾂ､ﾃ海SRF (XOOPS 2.0.9.2ﾂｰﾃ環ｲﾂｼﾂ､ﾃ凝つｸﾂｺﾃ淞､ﾂｹﾂ､ﾃｫﾂ､ﾃ｢ﾂ､ﾃ・
-- Brute Force ﾂ｡ﾃ環･ﾃ堕･ﾂｹﾂ･ﾃｯﾂ｡ﾂｼﾂ･ﾃ嘉・ｭﾃ・ｶﾂ､ﾂｿﾂ､ﾃｪﾂ｡ﾃ・
-- ﾂｳﾃ暗・･ﾂｻﾃ陳ｵﾂｶﾃ・ｵﾂｲﾃｨﾃ・ｼﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ･ﾂ｢ﾂ･ﾃδ･ﾃ猟･ﾃｭﾂ｡ﾂｼﾂ･ﾃ・(ﾂ､ﾂｹﾂ､ﾃ環､ﾃｯﾂ､ﾃ・｡ﾂ｢IE Content-Type XSS)
-- ﾂｼﾃつｹﾃ板ｲﾃ・・ｽﾂ､ﾃ環･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂ･ﾂ｢ﾂ･ﾃδ･ﾃ猟･ﾃｭﾂ｡ﾂｼﾂ･ﾃ可､ﾂｹﾂ､ﾃｫﾂｹﾂｶﾂｷﾃ｢
-- XMLRPCﾂｴﾃ佚渉｢
-- ﾂ･ﾂｳﾂ･ﾃ｡ﾂ･ﾃｳﾂ･ﾃ・PAM/ﾂ･ﾃ按･ﾃｩﾂ･ﾃδ･ﾂｯﾂ･ﾃ青･ﾃδ･ﾂｯSPAMﾃ・ｹﾂ｡ﾂ｢ﾂ､ﾂ｢ﾂ､ﾃｩﾂ､ﾃｦﾂ､ﾃｫSPAM
+- XSS （といっても、全てではありません）
+- システムグローバル変数汚染
+- セッションハイジャック
+- ヌルバイト攻撃
+- ディレクトリ遡り攻撃
+- いくつかの危険なCSRF (XOOPS 2.0.9.2以下に存在するもの)
+- Brute Force （パスワード総当たり）
+- 拡張子偽装画像ファイルアップロード (すなわち、IE Content-Type XSS)
+- 実行可能なファイルをアップロードする攻撃
+- XMLRPC関連
+- コメントSPAM/トラックバックSPAM等、あらゆるSPAM
 
-ﾂ､ﾂｳﾂ､ﾃｬﾂ､ﾃｩﾂ､ﾃ篠ｹﾂｶﾂｷﾃ｢ﾂ､ﾂｫﾂ､ﾃｩﾂ､ﾂ｢ﾂ､ﾃ環､ﾂｿﾂ､ﾃ珊OOPS2ﾂ･ﾃ卍｡ﾂｼﾂ･ﾂｹCMSﾂ､ﾃｲﾂｼﾃｩﾂ､ﾃｪﾂ｡ﾂ｢ﾂ･ﾃｭﾂ･ﾂｰﾂ､ﾃ仰ｵﾂｭﾃ渉ｿﾂ､ﾂｷﾂ､ﾃ楪､ﾂｹﾂ｡ﾂ｣
+これらの攻撃からあなたのXOOPS2ベースCMSを守り、ログに記録します。
 
-ﾂ､ﾂｿﾂ､ﾃﾂ､ﾂｷﾂ｡ﾂ｢ﾂ､ﾂｳﾂ､ﾃ篠･ﾃ｢ﾂ･ﾂｸﾂ･ﾃ･ﾂ｡ﾂｼﾂ･ﾃｫﾂ､ﾃ渉､ﾂ｢ﾂ､ﾂｯﾂ､ﾃ楪､ﾃ・｡ﾂ｢ﾂｺﾃ・づｧﾂｸﾃｸﾃ古ｳﾂｿﾃｴﾃ・ｪﾂ､ﾃ甘凝可ｸﾃｦﾂ､ﾂｷﾂ､ﾂｫﾂｹﾃ板､ﾂ､ﾂ､ﾃ楪､ﾂｻﾂ､ﾃｳﾂ｡ﾂ｣
-ﾂｰﾃｬﾃ嘉ｴﾂ､ﾃ・rdﾂ･ﾃ堕｡ﾂｼﾂ･ﾃ・･ﾂ｣ﾂ･ﾃ｢ﾂ･ﾂｸﾂ･ﾃ･ﾂ｡ﾂｼﾂ･ﾃｫﾂ､ﾃ仰ｸﾂｫﾂ､ﾃｩﾂ､ﾃｬﾂ､ﾃｫﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ環ｷﾃｪﾂ､ﾃ篠ｰﾃｬﾃ嘉ｴﾂ､ﾃ湘凝可､ﾂｲﾂ､ﾃｫﾂ､ﾂｫﾂ､ﾃ｢ﾂ､ﾂｷﾂ､ﾃｬﾂ､ﾃ楪､ﾂｻﾂ､ﾃｳﾂ､ﾂｬﾂ｡ﾂ｢ﾂ､ﾂｹﾂ､ﾃ卍､ﾃ・､ﾃ篠ｷﾃｪﾂ､ﾃｲﾃ凝可､ﾂｮﾂ､ﾂｭﾂ､ﾃｫﾂ､ﾃ｢ﾂ､ﾃ篠､ﾃ・､ﾃ渉､ﾃ環､ﾂｯﾂ｡ﾂ｢ﾂｲﾃ｡ﾂｿﾂｮﾂ､ﾃ渉ｶﾃ佚環ｪﾂ､ﾃ・､ﾂｹﾂ｡ﾂ｣
+ただし、このモジュールはあくまで、最大公約数的な防御しか行いません。
+一部の3rdパーティモジュールに見られるような穴の一部は防げるかもしれませんが、すべての穴を防ぎきるものではなく、過信は禁物です。
 
-ﾂ､ﾂｽﾂ､ﾃ篠ｸﾃつｳﾂｦﾂ､ﾃ渉ｾﾂｵﾃε篠､ﾃ篠ｾﾃ･ﾂ､ﾃ・｡ﾂ｢ﾂ､ﾂｹﾂ､ﾃ卍､ﾃ・､ﾃ珊OOPS2ﾂ･ﾃ卍｡ﾂｼﾂ･ﾂｹCMSﾂ･ﾃｦﾂ｡ﾂｼﾂ･ﾂｶﾂ｡ﾂｼﾂ､ﾃ凝づ青､ﾂｷﾂ､ﾃ・｡ﾂ｢ﾂ･ﾂ､ﾂ･ﾃｳﾂ･ﾂｹﾂ･ﾃ按｡ﾂｼﾂ･ﾃｫﾂ､ﾃｲ[color=ff0000][b]ﾂｶﾂｯﾂ､ﾂｯ[/b][/color]ﾂ､ﾂｪﾂｴﾂｫﾂ､ﾃ｡ﾂ､ﾂｷﾂ､ﾃ楪､ﾂｹﾂ｡ﾂ｣
+その限界は承知の上で、すべてのXOOPS2ベースCMSユーザーに対して、インストールを[color=ff0000][b]強く[/b][/color]お勧めします。
 
 
 
-ﾂ｡ﾃｼﾃ催ｸﾃ催妥甘ｽﾃ仰｡
+●利用方法
 
-ﾂ･ﾂ､ﾂ･ﾃｳﾂ･ﾂｹﾂ･ﾃ按｡ﾂｼﾂ･ﾃｫﾂ､ﾃ仰､ﾃ渉｡ﾂ｢XOOPS_TRUST_PATHﾂ､ﾃ偲ﾃ淌・ｪﾂ､ﾂｬﾃ可ｬﾃ催猟､ﾃ・､ﾂｹﾂ｡ﾂ｣
+インストールには、XOOPS_TRUST_PATHの設定が必要です。
 
-ﾂ･ﾂ｢ﾂ｡ﾂｼﾂ･ﾂｫﾂ･ﾂ､ﾂ･ﾃ鳴､ﾃ刺tmlﾃ・｢ﾂ､ﾃｲﾂ｡ﾂ｢XOOPS_ROOT_PATHﾃつｦﾂ､ﾃ仰･ﾂｳﾂ･ﾃ板｡ﾂｼﾂ､ﾂｷﾂ｡ﾂ｢ﾂ･ﾂ｢ﾂ｡ﾂｼﾂ･ﾂｫﾂ･ﾂ､ﾂ･ﾃ鳴､ﾃ支oops_trust_pathﾃ・｢ﾂ､ﾃｲﾂ｡ﾂ｢XOOPS_TRUST_PATHﾃつｦﾂ､ﾃ仰･ﾂｳﾂ･ﾃ板｡ﾂｼﾂ､ﾂｷﾂ､ﾃ楪､ﾂｹﾂ｡ﾂ｣
+アーカイブのhtml内を、XOOPS_ROOT_PATH側にコピーし、アーカイブのxoops_trust_path内を、XOOPS_TRUST_PATH側にコピーします。
 
-ﾂ･ﾃ｢ﾂ･ﾂｸﾂ･ﾃ･ﾂ｡ﾂｼﾂ･ﾃｫﾂｴﾃ嘉催ｽﾂ､ﾂｫﾂ､ﾃｩﾂ･ﾂ､ﾂ･ﾃｳﾂ･ﾂｹﾂ･ﾃ按｡ﾂｼﾂ･ﾃｫﾂ､ﾃ・､ﾂｭﾂ､ﾃｬﾂ､ﾃ青｡ﾂ｢ﾃﾂｵﾂ､ﾂｷﾂ､ﾂｯﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾂｬﾃε鳴､ﾂｱﾂ､ﾃ・､ﾂ､ﾂ､ﾃ楪､ﾂｹﾂ｡ﾂ｣
+モジュール管理からインストールできれば、正しくファイルが置けています。
 
-ﾂ､ﾂｿﾂ､ﾃﾂ｡ﾂ｢ﾂ､ﾂｽﾂ､ﾃｬﾂ､ﾃﾂ､ﾂｱﾂ､ﾃ・､ﾃ渉､ﾃ楪､ﾃδ､ﾂｿﾂ､ﾂｯﾃ・ｰﾂｺﾃｮﾂ､ﾂｷﾂ､ﾃ・､ﾂ､ﾂ､ﾃ楪､ﾂｻﾂ､ﾃｳﾂ､ﾃ篠､ﾃ・｡ﾂ｢mainfile.php ﾂ､ﾂｫﾂ､ﾃｩﾂ､ﾃ｢ﾂｸﾃ・､ﾃ督ｽﾃ青､ﾂｹﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ仰､ﾂｹﾂ､ﾃｫﾂ､ﾂｳﾂ､ﾃ按､ﾂｬﾃﾃ､ﾃづ静可ｬﾃ催猟ｾﾃｲﾂｷﾃｯﾂ､ﾃ・､ﾂｹﾂ｡ﾂ｣
+ただ、それだけではまったく動作していませんので、mainfile.php からも呼び出すようにすることが絶対必要条件です。
 
-Protector ﾂ､ﾃｲﾂ･ﾂ､ﾂ･ﾃｳﾂ･ﾂｹﾂ･ﾃ按｡ﾂｼﾂ･ﾃｫﾂｸﾃ･ﾂ｡ﾂ｢ﾂ､ﾂｪﾂｻﾃ按､ﾂ､ﾂ､ﾃ珊OOPS2ﾂ･ﾃ卍｡ﾂｼﾂ･ﾂｹCMSﾂ､ﾃ・mainfile.php ﾂ､ﾃ篠ｰﾃｬﾃ暗鳴ｲﾂｼﾂ､ﾃ篠､ﾂ｢ﾂ､ﾂｿﾂ､ﾃｪﾂ､ﾃ・
+Protector をインストール後、お使いのXOOPS2ベースCMSの mainfile.php の一番下のあたりに
 [code]
 	[color=ff0000]include XOOPS_TRUST_PATH.'/modules/protector/include/precheck.inc.php' ;[/color]
 	if (!isset($xoopsOption['nocommon']) [color=0000ff]&& XOOPS_ROOT_PATH != ''[/color] ) {
@@ -422,21 +442,21 @@
 	}
 	[color=ff0000]include XOOPS_TRUST_PATH.'/modules/protector/include/postcheck.inc.php' ;[/color]
 [/code]
-ﾂ､ﾃ按｡ﾂ｢ﾃﾃ鳴､ﾂｯﾂ､ﾃ環､ﾃδ､ﾃ・､ﾂ､ﾂ､ﾃｫﾂ｣ﾂｲﾂｹﾃ板､ﾃｲﾃ・可ｲﾃδ､ﾂｷﾂ､ﾃ・ｲﾂｼﾂ､ﾂｵﾂ､ﾂ､ﾂ｡ﾂ｣
+と、赤くなっている２行を追加して下さい。
 
-ﾃﾃ・ｿﾂｧﾂ､ﾃ偲嘉ｴﾃ環ｬﾂ､ﾃ渉｡ﾂ｢ﾂｺﾃ・ｽﾃｩﾂ､ﾃ仰･ﾂ､ﾂ･ﾃｳﾂ･ﾂｹﾂ･ﾃ按｡ﾂｼﾂ･ﾃｫﾂ､ﾂｷﾂ､ﾂｿﾂｻﾃｾﾂ､ﾃ篠･ﾃ青｡ﾂｼﾂ･ﾂｸﾂ･ﾃｧﾂ･ﾃｳﾂ､ﾃ仰､ﾃｨﾂ､ﾃδ､ﾃ・ｰﾃ崢､ﾃ環､ﾃｪﾂ､ﾃ楪､ﾂｹﾂ､ﾂｬﾂ｡ﾂ｢ﾂｰﾃ｣ﾂ､ﾃδ､ﾃ・､ﾂ､ﾂ､ﾃ・､ﾃ｢ﾂｵﾂ､ﾂ､ﾃ仰､ﾂｷﾂ､ﾃ環､ﾂｯﾂ､ﾃ・ｷﾃｫﾂｹﾂｽﾂ､ﾃ・､ﾂｹﾂ｡ﾂ｣
+青色の部分は、最初にインストールした時のバージョンによって異なりますが、違っていても気にしなくて結構です。
 
-ﾂ･ﾃ青｡ﾂｼﾂ･ﾂｸﾂ･ﾃｧﾂ･ﾃｳ3ﾂ､ﾂｫﾂ､ﾃｩﾂ｡ﾂ｢ﾂ･ﾂｷﾂ･ﾂｹﾂ･ﾃ・･ﾃﾂ･ﾃ｢ﾂ･ﾂｸﾂ･ﾃ･ﾂ｡ﾂｼﾂ･ﾃｫﾃ債ｳﾃ催ｨﾂ､ﾃ鯖Pﾂ･ﾂ｢ﾂ･ﾂｯﾂ･ﾂｻﾂ･ﾂｹﾂｵﾃｱﾃ暗敖､ﾃ湘催ｸﾃ催堕､ﾂｷﾂ､ﾃ環､ﾂｯﾂ､ﾃ環､ﾃｪﾂ､ﾃ楪､ﾂｷﾂ､ﾂｿﾂ｡ﾂ｣XOOPS_TRUST_PATH/modules/protector/configs ﾂ､ﾃｲﾂｽﾃｱﾂｹﾃｾﾂｵﾃｶﾂｲﾃ・､ﾂｷﾂ､ﾃ・､ﾂｯﾂ､ﾃﾂ､ﾂｵﾂ､ﾂ､ﾂ｡ﾂ｣Protectorﾂ､ﾂｬﾂｵﾃｱﾃ暗扞Pﾂ､ﾃｲﾂｼﾂｫﾃ・ｰﾃ・静渉ｿﾂ､ﾂｹﾂ､ﾃｫﾂｾﾃｬﾂｹﾃｧﾂ｡ﾂ｢ﾂ､ﾂｳﾂ､ﾂｳﾂ､ﾃ仰ｵﾂｭﾂｽﾃ陳､ﾂｹﾂ､ﾃｫﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ仰､ﾃ環､ﾃｪﾂ､ﾃ楪､ﾂｹﾂ｡ﾂ｣
+バージョン3から、システムモジュール由来のIPアクセス拒否は利用しなくなりました。XOOPS_TRUST_PATH/modules/protector/configs を書込許可してください。Protectorが拒否IPを自動登録する場合、ここに記述するようになります。
 
-ﾂ､ﾃ｢ﾂ､ﾂｷﾂ｡ﾂ｢ﾂ､ﾃ環､ﾃｳﾂ､ﾃｩﾂ､ﾂｫﾂ､ﾃ偲催ｽﾃ債ｳﾂ､ﾃ・｡ﾂ｢ﾂｼﾂｫﾃ環ｬﾂｼﾂｫﾂｿﾃ按､ﾂｬIPﾂｵﾃｱﾃ暗敖･ﾃｪﾂ･ﾂｹﾂ･ﾃ按､ﾃ仰ｺﾃ慊､ﾃδ､ﾃ・､ﾂｷﾂ､ﾃ楪､ﾃδ､ﾂｿﾂｾﾃｬﾂｹﾃｧﾂ｡ﾂ｢ﾂ･ﾃ青｡ﾂｼﾂ･ﾂｸﾂ･ﾃｧﾂ･ﾃｳ2ﾂ､ﾃ楪､ﾃ・､ﾃ渉･ﾃｬﾂ･ﾂｹﾂ･ﾂｭﾂ･ﾃ･ﾂ｡ﾂｼﾂ･ﾃ堕･ﾂｹﾂ･ﾃｯﾂ｡ﾂｼﾂ･ﾃ可､ﾃｲﾃ催ｸﾃ催堕､ﾂｷﾂ､ﾃ・､ﾂ､ﾂ､ﾃ楪､ﾂｷﾂ､ﾂｿﾂ､ﾂｬﾂ｡ﾂ｢ﾂ･ﾃ青｡ﾂｼﾂ･ﾂｸﾂ･ﾃｧﾂ･ﾃｳ3ﾂ､ﾂｫﾂ､ﾃｩﾂ､ﾃ渉｡ﾂ｢FTPﾃ・ｹﾂ､ﾃ・XOOPS_TRUST_PATH/modules/protector/configs ﾃ・｢ﾂ､ﾃ篠･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾃ甘板ｽﾂｸﾂ､ﾃ楪､ﾂｿﾂ､ﾃ渉ｺﾃｯﾂｽﾃｼﾂ､ﾂｷﾂ､ﾃ・､ﾂｯﾂ､ﾃﾂ､ﾂｵﾂ､ﾂ､ﾂ｡ﾂ｣
+もし、なんらかの理由で、自分自身がIP拒否リストに載ってしまった場合、バージョン2まではレスキューパスワードを利用していましたが、バージョン3からは、FTP等で XOOPS_TRUST_PATH/modules/protector/configs 内のファイルを編集または削除してください。
 
-2.34ﾂ､ﾂｫﾂ､ﾃｩﾂ｡ﾂ｢ﾂｼﾃつｸﾂｳﾃ・ｪﾂ､ﾃ仰｡ﾂ｢.htaccessﾂ､ﾃ仰､ﾃｨﾂ､ﾃｫDoSﾃ凝可ｸﾃｦﾂ､ﾃ按､ﾂ､ﾂ､ﾂｦﾂ･ﾂｪﾂ･ﾃ猟･ﾂｷﾂ･ﾃｧﾂ･ﾃｳﾂ､ﾃｲﾃ・可ｲﾃδ､ﾂｷﾂ､ﾃ楪､ﾂｷﾂ､ﾂｿﾂ｡ﾂ｣ﾂ､ﾂｳﾂ､ﾃｬﾂ､ﾃｲﾃ催ｸﾃ催堕､ﾂｹﾂ､ﾃｫﾂｾﾃｬﾂｹﾃｧﾂ｡ﾂ｢XOOPS_ROOT_PATHﾂ､ﾃ仰､ﾂ｢ﾂ､ﾃｫ.htaccessﾂ､ﾃｲﾂｽﾃｱﾂｹﾃｾﾂｲﾃ・・ｽﾂ､ﾃ按､ﾂｹﾂ､ﾃｫﾃ可ｬﾃ催猟､ﾂｬﾂ､ﾂ｢ﾂ､ﾃｪﾂ､ﾃ楪､ﾂｹﾂ｡ﾂ｣ﾃ・ｳﾃ・ｾﾂ､ﾂｹﾂ､ﾃｫﾂｺﾃ敖､ﾃ仰､ﾃ渉｡ﾂ｢.htaccessﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾂｬﾂｽﾃｱﾂｹﾃｾﾂｲﾃ・・ｽﾂ､ﾃ・､ﾂ｢ﾂ､ﾃｫﾂ｡ﾂ｢ﾂ､ﾃ按､ﾂ､ﾂ､ﾂｦﾂ･ﾃｪﾂ･ﾂｹﾂ･ﾂｯﾂ､ﾃ暗暗ｦﾂｳﾃ督､ﾂｷﾂ､ﾃ・ｲﾂｼﾂ､ﾂｵﾂ､ﾂ､ﾂ｡ﾂ｣
+2.34から、実験的に、.htaccessによるDoS防御というオプションを追加しました。これを利用する場合、XOOPS_ROOT_PATHにある.htaccessを書込可能とする必要があります。導入する際には、.htaccessファイルが書込可能である、というリスクと比較して下さい。
 
 
-ﾂ｡ﾃｼXOOPS Cube Legacy 2.1ﾂ､ﾃ伉､ﾃ篠･ﾂ､ﾂ･ﾃｳﾂ･ﾂｹﾂ･ﾃ按｡ﾂｼﾂ･ﾃｫ
+●XOOPS Cube Legacy 2.1へのインストール
 
-ﾃ・εε環ｰﾃ｣ﾂ､ﾂ､ﾂ､ﾃ渉､ﾂ｢ﾂ､ﾃｪﾂ､ﾃ楪､ﾂｻﾂ､ﾃｳﾂ｡ﾂ｣
-mainfile.php ﾂ､ﾃ篠ｽﾃｱﾂ､ﾂｭﾂｴﾂｹﾂ､ﾂｨﾂ･ﾃ敖･ﾂ､ﾂ･ﾃｳﾂ･ﾃ按､ﾃ篠ｼﾃｾﾃ甘閉､ﾂｬﾂｰﾃ｣ﾂ､ﾂｦﾂ､ﾃ篠､ﾃ・｡ﾂ｢ﾂ･ﾃ堕･ﾃδ･ﾃ・､ﾃｲﾃ・ｶﾂ､ﾃ・､ﾂｿﾂｸﾃ･ﾂ､ﾃｲﾂｼﾂｨﾂ､ﾂｷﾂ､ﾃ・､ﾂｪﾂ､ﾂｭﾂ､ﾃ楪､ﾂｹﾂ｡ﾂ｣
+特段違いはありません。
+mainfile.php の書き換えポイントの周辺が違うので、パッチを当てた後を示しておきます。
 [code]
     if (!defined('_LEGACY_PREVENT_LOAD_CORE_') && XOOPS_ROOT_PATH != '') {
         include XOOPS_TRUST_PATH.'/modules/protector/include/precheck.inc.php' ;
@@ -449,301 +469,311 @@
 [/code]
 
 
-ﾂ｡ﾃｼImpressCMSﾂ､ﾃ伉､ﾃ篠･ﾂ､ﾂ･ﾃｳﾂ･ﾂｹﾂ･ﾃ按｡ﾂｼﾂ･ﾃｫ
+●ImpressCMSへのインストール
 
-mainfile.php ﾂ､ﾃ伉､ﾃ篠･ﾃ堕･ﾃδ･ﾃ・､ﾃ湘可ｬﾃ催猟､ﾂ｢ﾂ､ﾃｪﾂ､ﾃ楪､ﾂｻﾂ､ﾃｳﾂ｡ﾂ｣
-ﾂ･ﾂ｢ﾂ｡ﾂｼﾂ･ﾂｫﾂ･ﾂ､ﾂ･ﾃ鳴､ﾃ・extras/ImpressCMS/preload/protector.php ﾂ､ﾃｲﾂ｡ﾂ｢ﾂ､ﾂｴﾃ催ｸﾃ催妥εｦﾂ､ﾃ鯖mpressCMSﾂ､ﾃ姿reloadﾂ･ﾃ閉･ﾂｩﾂ･ﾃｫﾂ･ﾃﾂ､ﾃ仰･ﾂｳﾂ･ﾃ板｡ﾂｼﾂ､ﾂｷﾂ､ﾃ・､ﾂｯﾂ､ﾃﾂ､ﾂｵﾂ､ﾂ､ﾂ｡ﾂ｣
+mainfile.php へのパッチは必要ありません。
+アーカイブの extras/ImpressCMS/preload/protector.php を、ご利用中のImpressCMSのpreloadフォルダにコピーしてください。
 
-preloadﾂ､ﾃｲﾃ・ｳﾂｶﾂ｡ﾂ､ﾂｷﾂ､ﾃ・､ﾂｯﾂ､ﾃｬﾂ､ﾂｿvaughanﾂ､ﾃ仰ｴﾂｶﾂｼﾃ閉､ﾂｷﾂ､ﾃ楪､ﾂｹﾂ｡ﾂ｣
+preloadを提供してくれたvaughanに感謝します。
 
 
-ﾂ｡ﾃｼﾂ･ﾃ青｡ﾂｼﾂ･ﾂｸﾂ･ﾃｧﾂ･ﾃｳ2ﾂ､ﾂｫﾂ､ﾃｩﾂ､ﾃ篠･ﾃ青｡ﾂｼﾂ･ﾂｸﾂ･ﾃｧﾂ･ﾃｳﾂ･ﾂ｢ﾂ･ﾃδ･ﾃ・
+●バージョン2からのバージョンアップ
 
-ﾂ､ﾃ楪､ﾂｺﾂ｡ﾂ｢mainfile.php ﾂ､ﾂｫﾂ､ﾃｩﾂ｡ﾂ｢Protectorﾂ､ﾃ仰ｴﾃ伉､ﾂｹﾂ､ﾃｫﾂｹﾃ板､ﾃｲﾂｺﾃｯﾂｽﾃｼﾂ､ﾂｷﾂ､ﾃ・､ﾂｯﾂ､ﾃﾂ､ﾂｵﾂ､ﾂ､ﾂ｡ﾂ｣
+まず、mainfile.php から、Protectorに関する行を削除してください。
 
-ﾂｼﾂ｡ﾂ､ﾃ仰｡ﾂ｢ﾂ､ﾂ､ﾂ､ﾃδ､ﾂｿﾂ､ﾃｳXOOPS_ROOT_PATH/modules/protector/ ﾃ・｢ﾂ､ﾃ篠･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾃ・ｴﾂ､ﾃ・ｺﾃｯﾂｽﾃｼﾂ､ﾂｷﾂ､ﾃ楪､ﾂｹﾂ｡ﾂ｣
+次に、いったんXOOPS_ROOT_PATH/modules/protector/ 内のファイルを全て削除します。
 
-ﾂ､ﾂｹﾂ､ﾂｰﾂ､ﾃ仰｡ﾂ｢ﾂ･ﾂ､ﾂ･ﾃｳﾂ･ﾂｹﾂ･ﾃ按｡ﾂｼﾂ･ﾃｫﾂ､ﾃ暗・ｱﾃ催債､ﾃ凝・ｴﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂ･ﾂ｢ﾂ･ﾃδ･ﾃ猟･ﾃｭﾂ｡ﾂｼﾂ･ﾃ可､ﾂｷﾂ､ﾃ楪､ﾂｹﾂ｡ﾂ｣
+すぐに、インストールと同様に全ファイルをアップロードします。
 
-ﾂｴﾃ嘉催ｽﾂｲﾃｨﾃ古個､ﾂｫﾂ､ﾃｩﾂ･ﾃ｢ﾂ･ﾂｸﾂ･ﾃ･ﾂ｡ﾂｼﾂ･ﾃｫﾂｴﾃ嘉催ｽﾂ､ﾃ凝・ｾﾂ､ﾃδ､ﾃ・｡ﾂ｢Protectorﾂ･ﾃ｢ﾂ･ﾂｸﾂ･ﾃ･ﾂ｡ﾂｼﾂ･ﾃｫﾂ､ﾃｲﾂ･ﾂ｢ﾂ･ﾃδ･ﾃ猟･ﾃ・｡ﾂｼﾂ･ﾃ按､ﾂｷﾂ､ﾃ楪､ﾂｹﾂ｡ﾂ｣
+管理画面からモジュール管理に入って、Protectorモジュールをアップデートします。
 
-ﾂｺﾃ・ｸﾃ･ﾂ､ﾃ仰｡ﾂ｢ﾂｺﾃ・・卍｡ﾂ｢mainfile.phpﾂ､ﾃｲﾃ甘板ｽﾂｸﾂ､ﾂｷﾂ｡ﾂ｢precheckﾂ､ﾂｪﾂ､ﾃｨﾂ､ﾃ菟ostcheckﾂ､ﾃｲﾃ債ｭﾂｸﾃｺﾂ､ﾃ仰､ﾂｷﾂ､ﾃ・､ﾂｯﾂ､ﾃﾂ､ﾂｵﾂ､ﾂ､ﾂ｡ﾂ｣ﾂ･ﾃ青｡ﾂｼﾂ･ﾂｸﾂ･ﾃｧﾂ･ﾃｳ2ﾂ､ﾃ・､ﾃ渉｡ﾂ｢XOOPS_ROOT_PATH ﾂ､ﾃ按､ﾃ環､ﾃδ､ﾃ・､ﾂ､ﾂ､ﾂｿﾃ嘉ｴﾃ環ｬﾂ､ﾂｬﾂ｡ﾂ｢ﾂ･ﾃ青｡ﾂｼﾂ･ﾂｸﾂ･ﾃｧﾂ･ﾃｳ3ﾂ､ﾃ・､ﾃ渉｡ﾂ｢XOOPS_TRUST_PATH ﾂ､ﾃ按､ﾃ環､ﾃδ､ﾃ・､ﾂ､ﾂ､ﾃｫﾂ､ﾂｳﾂ､ﾃ按､ﾃ凝εｭﾂｰﾃ閉､ﾂｬﾃ可ｬﾃ催猟､ﾃ・､ﾂｹﾂ｡ﾂ｣
+最後に、再度、mainfile.phpを編集し、precheckおよびpostcheckを有効にしてください。バージョン2では、XOOPS_ROOT_PATH となっていた部分が、バージョン3では、XOOPS_TRUST_PATH となっていることに注意が必要です。
 
 
-ﾂ｡ﾃｼﾂ･ﾃ閉･ﾂ｣ﾂ･ﾃｫﾂ･ﾂｿﾂ｡ﾂｼﾂ･ﾃ猟･ﾃｩﾂ･ﾂｰﾂ･ﾂ､ﾂ･ﾃｳﾂ､ﾃ偲催ｸﾃ催・
+●フィルタープラグインの利用
 
-V3ﾂ､ﾂｫﾂ､ﾃｩﾂ｡ﾂ｢XOOPS_TRUST_PATH/modules/protector/filters_enabled/ ﾂ､ﾃ仰･ﾃ閉･ﾂ｣ﾂ･ﾃｫﾂ･ﾂｿﾂ｡ﾂｼﾂ･ﾃ猟･ﾃｩﾂ･ﾂｰﾂ･ﾂ､ﾂ･ﾃｳﾂ､ﾃｲﾂｳﾃ甘・ｼﾂ､ﾂｹﾂ､ﾃｫﾂ､ﾂｳﾂ､ﾃ按､ﾃ・｡ﾂ｢ﾃ・可ｲﾃδ･ﾃ・･ﾂｧﾂ･ﾃδ･ﾂｯﾂ､ﾃ､ﾃ・可ｲﾃδ･ﾃ｡ﾂ･ﾃδ･ﾂｻﾂ｡ﾂｼﾂ･ﾂｸﾂ｡ﾂｦﾂ･ﾃｭﾂ･ﾂｮﾂ･ﾃｳﾂ･ﾂｰﾂ､ﾃ環､ﾃ可､ﾂｬﾂ､ﾃ・､ﾂｭﾂ､ﾃｫﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ仰､ﾃ環､ﾃｪﾂ､ﾃ楪､ﾂｷﾂ､ﾂｿﾂ｡ﾂ｣ﾂｺﾃｮﾃﾂｮﾂ､ﾃ､ﾂｲﾃｾﾃつ､ﾂ､ﾃ｢ﾂｴﾃ甘δｱﾂ､ﾃ環､ﾃ渉､ﾂｺﾂ､ﾃ・､ﾂｹﾂ｡ﾂ｣
+V3から、XOOPS_TRUST_PATH/modules/protector/filters_enabled/ にフィルタープラグインを格納することで、追加チェックや追加メッセージ・ロギングなどができるようになりました。作成や改造も簡単なはずです。
 
-ﾂ､ﾂｳﾂ､ﾃ篠･ﾂ｢ﾂ｡ﾂｼﾂ･ﾂｫﾂ･ﾂ､ﾂ･ﾃ姪・｢ﾂ､ﾃ仰･ﾃ・･ﾃ閉･ﾂｩﾂ･ﾃｫﾂ･ﾃ按､ﾃ・催堕ｰﾃ閉､ﾂｵﾂ､ﾃｬﾂ､ﾃ・､ﾂ､ﾂ､ﾃｫﾂ･ﾃ閉･ﾂ｣ﾂ･ﾃｫﾂ･ﾂｿﾂ｡ﾂｼﾂ･ﾃ猟･ﾃｩﾂ･ﾂｰﾂ･ﾂ､ﾂ･ﾃｳﾂ､ﾃ篠､ﾂｦﾂ､ﾃ・ｰﾃｬﾃ暗古・ｪﾂ､ﾃ環､ﾃ｢ﾂ､ﾃ篠､ﾃｲﾂｾﾃ陳ｲﾃｰﾂ､ﾂｷﾂ､ﾃ楪､ﾂｹﾂ｡ﾂ｣
+このアーカイブ内にデフォルトで用意されているフィルタープラグインのうち一般的なものを紹介します。
 
 - postcommon_post_deny_by_rbl.php
-ﾂ･ﾂｹﾂ･ﾃ堕･ﾃﾃづ青ｺﾃｶﾃ催堕｡ﾂ｣
-RBLﾂ､ﾃｲﾃ催ｸﾃ催堕､ﾂｷﾂ､ﾃ・OSTﾂ､ﾃｲﾂ､ﾃ渉､ﾃ債､ﾃ楪､ﾂｹﾂ｡ﾂ｣
-RBLﾂ､ﾃ凝・静渉ｿﾂ､ﾂｵﾂ､ﾃｬﾂ､ﾂｿIPﾂ､ﾂｫﾂ､ﾃｩﾂ､ﾃ偲・ｪﾂｹﾃ・､ﾃ渉､ﾂｹﾂ､ﾃ卍､ﾃ・PAMﾂ､ﾃﾂ､ﾃ暗按ｽﾃ・ｪﾂ､ﾂｷﾂ､ﾃ楪､ﾂｹﾂ｡ﾂ｣ﾃ古､ﾂ､ﾂ､ﾂｹﾃｧﾂ､ﾃｯﾂ､ﾂｻﾂ､ﾂｬﾃ・ｾﾂ､ﾃｫﾂ､ﾂｿﾂ､ﾃ｡ﾂ｡ﾂ｢ﾃ・ｪﾂｹﾃ・ｻﾃｾﾂ､ﾃ篠ｽﾃｨﾃ催ｽﾂ､ﾂｬﾂ､ﾃ､ﾂ､ﾃ､ﾂｽﾃ・､ﾂｯﾂ､ﾃ環､ﾃｫﾂ､ﾂｫﾂ､ﾃ｢ﾂ､ﾂｷﾂ､ﾃｬﾂ､ﾃ楪､ﾂｻﾂ､ﾃｳﾂ｡ﾂ｣ﾂ｡ﾃ甘・δ､ﾃ気hatﾂ､ﾃ環､ﾃ可､ﾃ・､ﾃ渉ｱﾃ・ｶﾃ・､ﾂｬﾂ､ﾂ｢ﾂ､ﾃｫﾂ､ﾂｫﾂ､ﾃ｢ﾂ｡ﾃ・
+スパム対策用。
+RBLを利用してPOSTをはねます。
+RBLに登録されたIPからの投稿はすべてSPAMだと判定します。問い合わせが入るため、投稿時の処理がやや重くなるかもしれません。（特にChatなどでは影響があるかも）
 
 - postcommon_post_deny_by_httpbl.php
-ﾂ･ﾂｹﾂ･ﾃ堕･ﾃﾃづ青ｺﾃｶﾃ催堕｡ﾂ｣
-http:BLﾂ､ﾃｲﾃ催ｸﾃ催堕､ﾂｷﾂ､ﾃ・OSTﾂ､ﾃｲﾂ､ﾃ渉､ﾃ債､ﾃ楪､ﾂｹﾂ｡ﾂ｣
-ﾃ催ｸﾃ催堕､ﾂｹﾂ､ﾃｫﾃ・ｰﾂ､ﾃ仰｡ﾂ｢ﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾃｲﾂ･ﾂｨﾂ･ﾃ・･ﾂ｣ﾂ･ﾂｿﾂ､ﾃ・ｳﾂｫﾂ､ﾂ､ﾂ､ﾃ・｡ﾂ｢
+スパム対策用。
+http:BLを利用してPOSTをはねます。
+利用する前に、ファイルをエディタで開いて、
 define( 'PROTECTOR_HTTPBL_KEY' , '............' ) ;
-ﾂ､ﾂｳﾂ､ﾃ篠ｹﾃ板､ﾃｲﾂｽﾃｱﾂ､ﾂｭﾂｴﾂｹﾂ､ﾂｨﾂ､ﾃ楪､ﾂｹﾂ｡ﾂ｣HTTPBL_KEYﾂ､ﾃ渉｡ﾂ｢http://www.projecthoneypot.org/ ﾂ､ﾂｫﾂ､ﾃｩﾂｼﾃｨﾃ・ﾂ､ﾂｷﾂ､ﾃ・､ﾂｯﾂ､ﾃﾂ､ﾂｵﾂ､ﾂ､ﾂ｡ﾂ｣
+この行を書き換えます。HTTPBL_KEYは、http://www.projecthoneypot.org/ から取得してください。
 
 -postcommon_post_need_multibyte.php
-ﾂ･ﾂｹﾂ･ﾃ堕･ﾃﾃづ青ｺﾃｶﾃ催堕｡ﾂ｣
-ﾃ・ｪﾂｹﾃ・､ﾃ凝・ｼﾃ凝慊ｸﾃｬﾂ､ﾂｬﾂｴﾃ楪､ﾃ楪､ﾃｬﾂ､ﾃ・､ﾂ､ﾂ､ﾃｫﾂ､ﾂｳﾂ､ﾃ按､ﾃｲﾃ催猟ｵﾃ｡ﾂ､ﾂｹﾂ､ﾃｫﾂ･ﾃ猟･ﾃｩﾂ･ﾂｰﾂ･ﾂ､ﾂ･ﾃｳﾂ｡ﾂ｣
-ﾃ・ｼﾃ凝慊ｸﾃｬﾂ､ﾂｬﾂ｣ﾂｱﾃ環ｸﾂｻﾃｺﾂ､ﾃ｢ﾂｴﾃ楪､ﾃ楪､ﾃｬﾂ､ﾃ・､ﾂ､ﾂ､ﾃ環､ﾂ､100byteﾂｰﾃ環ｾﾃ･ﾂ､ﾃ偲環ｸﾂｻﾃｺﾃ偲ｳﾂ､ﾂｬﾂ､ﾂ｢ﾂ､ﾃδ､ﾂｿﾂ､ﾃｩSPAMﾂ､ﾃﾂ､ﾃ暗按ｽﾃ・ｪﾂ､ﾂｷﾂ､ﾃ楪､ﾂｹﾂ｡ﾂ｣
+スパム対策用。
+投稿に日本語が含まれていることを要求するプラグイン。
+日本語が１文字も含まれていない100byte以上の文字列があったらSPAMだと判定します。
 
 -postcommon_post_htmlpurify4guest.php
-ﾂ･ﾂｲﾂ･ﾂｹﾂ･ﾃ按､ﾃ仰､ﾃｨﾂ､ﾃｫPOSTﾂ･ﾃ・｡ﾂｼﾂ･ﾂｿﾂ､ﾂｹﾂ､ﾃ卍､ﾃ・､ﾃ仰､ﾃ・､ﾂ､ﾂ､ﾃ・｡ﾂ｢HTMLPurifierﾂ､ﾃｲﾃ・個ｲﾃ｡ﾂ､ﾂｵﾂ､ﾂｻﾂ､ﾃｫﾂ･ﾃ閉･ﾂ｣ﾂ･ﾃｫﾂ･ﾂｿﾂ｡ﾂｼﾂ､ﾃ・､ﾂｹﾂ｡ﾂ｣
-ﾂ･ﾂｲﾂ･ﾂｹﾂ･ﾃ按､ﾃ稀TMLﾂ､ﾃｲﾂｵﾃｶﾂｲﾃ・､ﾂｷﾂ､ﾃ・､ﾂ､ﾂ､ﾃｫﾂｾﾃｬﾂｹﾃｧﾂ､ﾃ・､ﾃ湘債ｭﾂｸﾃｺﾂ､ﾃ仰､ﾂｹﾂ､ﾃｫﾂ､ﾂｳﾂ､ﾃ按､ﾃｲﾂｶﾂｯﾂ､ﾂｯﾂ､ﾂｪﾂｴﾂｫﾂ､ﾃ｡ﾂ､ﾂｷﾂ､ﾃ楪､ﾂｹﾂ｡ﾂ｣
+ゲストによるPOSTデータすべてについて、HTMLPurifierを通過させるフィルターです。
+ゲストにHTMLを許可している場合では有効にすることを強くお勧めします。
 
 -postcommon_register_insert_js_check.php
-ﾂ･ﾃｭﾂ･ﾃ慊･ﾃδ･ﾃ按､ﾃ仰､ﾃｨﾂ､ﾃｫﾂ･ﾃｦﾂ｡ﾂｼﾂ･ﾂｶﾃ・静渉ｿﾂ､ﾃｲﾃ凝可､ﾂｰﾂ･ﾃ猟･ﾃｩﾂ･ﾂｰﾂ･ﾂ､ﾂ･ﾃｳﾂ｡ﾂ｣
-ﾃ・静渉ｿﾂ､ﾂｷﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ按､ﾂｹﾂ､ﾃｫﾂ･ﾃｦﾂ｡ﾂｼﾂ･ﾂｶﾂ､ﾃ篠･ﾃ鳴･ﾃｩﾂ･ﾂｦﾂ･ﾂｶﾂ､ﾃ⑪avaScriptﾂ､ﾂｬﾃ・ｰﾂｺﾃｮﾂ､ﾂｷﾂ､ﾃ・､ﾂ､ﾂ､ﾃｫﾃ可ｬﾃ催猟､ﾂｬﾂ､ﾂ｢ﾂ､ﾃｪﾂ､ﾃ楪､ﾂｹﾂ｡ﾂ｣
+ロボットによるユーザ登録を防ぐプラグイン。
+登録しようとするユーザのブラウザでJavaScriptが動作している必要があります。
 
 -bruteforce_overrun_message.php
-ﾂ･ﾃ堕･ﾂｹﾂ･ﾃｯﾂ｡ﾂｼﾂ･ﾃ可､ﾃｲﾂｻﾃ佚・ｪﾂｲﾃｳﾂｿﾃｴﾂｰﾃ環ｾﾃ･ﾂｴﾃ鳴ｰﾃ｣ﾂ､ﾂｨﾂ､ﾂｿﾂｻﾃｾﾂ､ﾃ篠･ﾃ｡ﾂ･ﾃδ･ﾂｻﾂ｡ﾂｼﾂ･ﾂｸﾂ､ﾃｲﾂｻﾃ佚・ｪﾂ､ﾂｷﾂ､ﾃ楪､ﾂｹﾂ｡ﾂ｣*_message.php ﾂ､ﾃ按､ﾂ､ﾂ､ﾂｦﾂ･ﾃ閉･ﾂ｣ﾂ･ﾃｫﾂ･ﾂｿﾂ｡ﾂｼﾂ･ﾃ猟･ﾃｩﾂ･ﾂｰﾂ･ﾂ､ﾂ･ﾃｳﾂ､ﾃ渉､ﾂ､ﾂ､ﾂｺﾂ､ﾃｬﾂ､ﾃ｢ﾂ｡ﾂ｢ﾂ･ﾃ｡ﾂ･ﾃδ･ﾂｻﾂ｡ﾂｼﾂ･ﾂｸﾂ､ﾃｲﾂｻﾃ佚・ｪﾂ､ﾂｹﾂ､ﾃｫﾂ･ﾂｿﾂ･ﾂ､ﾂ･ﾃ猟､ﾃ篠･ﾃ閉･ﾂ｣ﾂ･ﾃｫﾂ･ﾂｿﾂ｡ﾂｼﾂ､ﾃ・､ﾂｹﾂ｡ﾂ｣
+パスワードを指定回数以上間違えた時のメッセージを指定します。*_message.php というフィルタープラグインはいずれも、メッセージを指定するタイプのフィルターです。
 
 -precommon_bwlimit_errorlog.php
-ﾂｲﾃ｡ﾃ嘉ｩﾂｲﾃ凖凝可ｻﾃ淞ｵﾂ｡ﾃ・ｽﾂ､ﾂｬﾃ・ｯﾂ､ﾂ､ﾂ､ﾂｿﾂｻﾃｾﾂ､ﾃ仰｡ﾂ｢ﾂ､ﾂｽﾂ､ﾃ篠ｻﾃ敖､ﾃｲApacheﾂ､ﾃ篠･ﾂｨﾂ･ﾃｩﾂ｡ﾂｼﾂ･ﾃｭﾂ･ﾂｰﾂ､ﾃ仰ｵﾂｭﾃ渉ｿﾂ､ﾂｷﾂ､ﾃ楪､ﾂｹﾂ｡ﾂ｣
-*_errorlog.php ﾂ､ﾃ按､ﾂ､ﾂ､ﾂｦﾂ･ﾃ閉･ﾂ｣ﾂ･ﾃｫﾂ･ﾂｿﾂ｡ﾂｼﾂ･ﾃ猟･ﾃｩﾂ･ﾂｰﾂ･ﾂ､ﾂ･ﾃｳﾂ､ﾃ渉､ﾂ､ﾂ､ﾂｺﾂ､ﾃｬﾂ､ﾃ｢ﾂ｡ﾂ｢ﾂ･ﾂｨﾂ･ﾃｩﾂ｡ﾂｼﾂ･ﾃｭﾂ･ﾂｰﾂ､ﾃ仰ｵﾂｭﾃ渉ｿﾂ､ﾂｹﾂ､ﾃｫﾂ･ﾂｿﾂ･ﾂ､ﾂ･ﾃ猟､ﾃ篠･ﾃ閉･ﾂ｣ﾂ･ﾃｫﾂ･ﾂｿﾂ｡ﾂｼﾂ､ﾃ・､ﾂｹﾂ｡ﾂ｣
+過負荷防止機能が働いた時に、その旨をApacheのエラーログに記録します。
+*_errorlog.php というフィルタープラグインはいずれも、エラーログに記録するタイプのフィルターです。
 
 
-ﾂ､ﾂ､ﾂ､ﾂｺﾂ､ﾃｬﾂ､ﾃ｢ﾂ｡ﾂ｢XOOPS_TRUST_PATH/modules/protector/filters_disabled/ ﾂ､ﾃ凝ε鳴､ﾂ､ﾂ､ﾃ・､ﾂ｢ﾂ､ﾃｫﾂ､ﾃ篠､ﾃ・｡ﾂ｢ﾃ可ｬﾃ催猟､ﾃ仰ｱﾃｾﾂ､ﾂｸﾂ､ﾃ・｡ﾂ｢filters_enabled ﾂ､ﾃ仰･ﾂｳﾂ･ﾃ板｡ﾂｼﾂ､ﾂｷﾂ､ﾃ・､ﾂｯﾂ､ﾃﾂ､ﾂｵﾂ､ﾂ､ﾂ｡ﾂ｣
+いずれも、XOOPS_TRUST_PATH/modules/protector/filters_byconfig/ に置いてあるので、必要に応じて、filters_enabled にコピーしてください。
+XOOPS_TRUST_PATHは、複数サイトに利用出来る仕様なので、あるフィルターをサイトによって使い分けたいケースもあるでしょう。
+その場合は、Protectorの一般設定に、利用したいフィルター名を記述してください。もちろん、記述のないサイトでは有効化されません。
 
 
-ﾂ｡ﾃｼ3.3ﾂ､ﾂｫﾂ､ﾃｩﾂ､ﾃ篠ｿﾂｷﾂｵﾂ｡ﾃ・ｽ: DBﾂ･ﾃｬﾂ･ﾂ､ﾂ･ﾃ､ﾂ｡ﾂｼﾂ･ﾃ按･ﾃｩﾂ･ﾃδ･ﾃ預nti-SQL-Injection
+●3.3からの新機能: DBレイヤートラップanti-SQL-Injection
 
-Protector-3.3ﾂｰﾃ環ｹﾃ淞｡ﾂ｢ﾂ･ﾃ・｡ﾂｼﾂ･ﾂｿﾂ･ﾃ卍｡ﾂｼﾂ･ﾂｹﾂ･ﾃｬﾂ･ﾂ､ﾂ･ﾃ､ﾂ｡ﾂｼﾂ､ﾃｲﾂｾﾃｨﾂ､ﾃδｼﾃｨﾂ､ﾃδ､ﾃ・｡ﾂ｢ﾃ・ｰﾃ・ｪﾂ､ﾃ慨QL Injectionﾃづ青ｺﾃｶﾂ､ﾃｲﾂ､ﾂｹﾂ､ﾃｫﾂｵﾂ｡ﾃ・ｽﾂ､ﾃｲﾃ・可ｲﾃδ､ﾂｷﾂ､ﾃ楪､ﾂｷﾂ､ﾂｿﾂ｡ﾂ｣ﾂ､ﾂｳﾂ､ﾃｬﾂ､ﾃ仰､ﾃｨﾂ､ﾃδ､ﾃ・｡ﾂ｢ﾂ､ﾃ崢､ﾃ按､ﾃｳﾂ､ﾃ可､ﾃ惨QL Injectionﾃﾃ按ｼﾃ･ﾃﾂｭﾂ､ﾃ湘個ｵﾂｳﾂｲﾂｲﾂｽﾂ､ﾃ・､ﾂｭﾂ､ﾃｫﾂｵﾂ､ﾂ､ﾂｬﾂ､ﾂｷﾂ､ﾃ楪､ﾂｹﾂ｡ﾂ｣ﾂ｡ﾃ環､ﾃｯﾂ､ﾂｶﾂ､ﾃ按ｷﾃｪﾂ､ﾃｲﾂｶﾃｵﾂ､ﾂｱﾂ､ﾃｫﾂ､ﾃ・､ﾃ｢ﾂ､ﾃｪﾂ､ﾃ環､ﾃｩﾂ､ﾂ､ﾂ､ﾂｯﾂ､ﾃｩﾂ､ﾃ・､ﾃ｢ﾂｼﾃｪﾂ､ﾃ渉､ﾂ｢ﾂ､ﾃｫﾂ､ﾃ篠､ﾃ・｡ﾂ｢ﾃ甘敖ｾﾃ堋､ﾃ渉､ﾂｷﾂ､ﾃ楪､ﾂｻﾂ､ﾃｳﾂ｡ﾃ・
+Protector-3.3以降、データベースレイヤーを乗っ取って、動的なSQL Injection対策をする機能を追加しました。これによって、ほとんどのSQL Injection脆弱性は無害化できる気がします。（わざと穴を空けるつもりならいくらでも手はあるので、保証はしません）
 
-ﾂ､ﾂｳﾂ､ﾃｬﾂ､ﾃｲﾃ債ｭﾂｸﾃｺﾂ､ﾃ仰､ﾂｹﾂ､ﾃｫﾂ､ﾂｿﾂ､ﾃ｡ﾂ､ﾃ仰､ﾃ渉｡ﾂ｢ﾂｸﾂｶﾃ催ｽﾃ・ｪﾂ､ﾃ仰･ﾃ・｡ﾂｼﾂ･ﾂｿﾂ･ﾃ卍｡ﾂｼﾂ･ﾂｹﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂｯﾂ･ﾃ按･ﾃｪﾂ･ﾂｯﾂ･ﾃｩﾂ･ﾂｹﾂ､ﾃ仰･ﾃ堕･ﾃδ･ﾃ・､ﾃｲﾃ・ｶﾂ､ﾃ・､ﾃｫﾃ可ｬﾃ催猟､ﾂｬﾂ､ﾂ｢ﾂ､ﾃｪﾂ､ﾃ楪､ﾂｹﾂ｡ﾂ｣
+これを有効にするためには、原理的にデータベースファクトリクラスにパッチを当てる必要があります。
 
-patches/ ﾂ･ﾃ閉･ﾂｩﾂ･ﾃｫﾂ･ﾃﾂ､ﾃ仰｡ﾂ｢ﾂｳﾃ・･ﾂｳﾂ･ﾂ｢ﾃ催堕､ﾃ篠･ﾃ堕･ﾃδ･ﾃ・ｺﾃ堕･ﾃ・｡ﾂｼﾂ･ﾂｿﾂ･ﾃ卍｡ﾂｼﾂ･ﾂｹﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂｯﾂ･ﾃ按･ﾃｪﾂ･ﾂｯﾂ･ﾃｩﾂ･ﾂｹﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂ､ﾂｬﾃ催堕ｰﾃ閉､ﾂｵﾂ､ﾃｬﾂ､ﾃ・､ﾂ､ﾂ､ﾃｫﾂ､ﾃ篠､ﾃ・｡ﾂ｢ﾂ､ﾂｳﾂ､ﾃ篠ｵﾂ｡ﾃ・ｽﾂ､ﾃｲﾃ催ｸﾃ催堕､ﾂｷﾂ､ﾂｿﾂ､ﾂ､ﾂｾﾃｬﾂｹﾃｧﾂ､ﾃ仰､ﾃ渉｡ﾂ｢ﾂ､ﾂｳﾂ､ﾃｬﾂ､ﾃ・ｾﾃ･ﾂｽﾃｱﾂ､ﾂｭﾂ､ﾂｷﾂ､ﾃ・､ﾂｯﾂ､ﾃﾂ､ﾂｵﾂ､ﾂ､ﾂ｡ﾂ｣
+patches/ フォルダに、各コア用のパッチ済データベースファクトリクラスファイルが用意されているので、この機能を利用したい場合には、これで上書きしてください。
 
-ﾂ､ﾃ｢ﾂ､ﾃ・､ﾃｭﾂ､ﾃｳﾂ｡ﾂ｢ﾂｳﾃ・･ﾂｳﾂ･ﾂ｢ﾂ･ﾃ・｡ﾂｼﾂ･ﾃﾂ､ﾂｬﾃﾃ堕ｶﾃ凝・ｪﾂ､ﾃ仰､ﾂｳﾂ､ﾃ篠･ﾃ堕･ﾃδ･ﾃ・､ﾃｲHEADﾂ､ﾃ仰ｺﾃ偲催堕､ﾂｷﾂ､ﾃ・､ﾂｯﾂ､ﾃｬﾂ､ﾃｫﾂ､ﾃ篠､ﾂｬﾂ･ﾃ卍･ﾂｹﾂ･ﾃ按､ﾃﾂ､ﾃ按ｹﾃ債､ﾂｨﾂ､ﾃ・､ﾂ､ﾂ､ﾃ楪､ﾂｹﾂ｡ﾂ｣ﾂ･ﾃ堕･ﾃδ･ﾃ・､ﾃ仰､ﾃ・､ﾂ､ﾂ､ﾃ・､ﾃ｢ﾂ｡ﾂ｢ﾂ､ﾃ環､ﾃｫﾂ､ﾃ卍､ﾂｯﾂｺﾃ偲催堕､ﾂｷﾂ､ﾃ､ﾂ､ﾂｹﾂ､ﾂ､ﾂｷﾃ・､ﾃ仰､ﾂｷﾂ､ﾂｿﾂ､ﾃ・､ﾃ｢ﾂ､ﾃｪﾂ､ﾃ・､ﾂｹﾂ｡ﾂ｣
+もちろん、各コアチームが積極的にこのパッチをHEADに採用してくれるのがベストだと考えています。パッチについても、なるべく採用しやすい形にしたつもりです。
 
-minahitoﾂ､ﾂｵﾂ､ﾃｳﾂ｡ﾂ｢marcanﾂ､ﾂｵﾂ､ﾃｳﾂ｡ﾂ｢phpppﾂ､ﾂｵﾂ､ﾃｳﾂ｡ﾂ｢ﾂ､ﾃｨﾂ､ﾃｭﾂ､ﾂｷﾂ､ﾂｯﾂ｡ﾂｪ
+なお、以下のコアの最新版は、この機能のパッチが最初から当たっています。（対応ありがとうございます）
 
+- XCL2.1.x
+- ImpressCMS 1.x
 
-ﾂ｡ﾃｼﾃ甘堕ｹﾂｹﾃ催ｺﾃ偲ｲ
 
+●変更履歴
+
+3.50 beta (2009/11/17)
+- 各サイトのProtector一般設定でフィルターのON/OFFをコントロール可能とした
+- filters_disabled に収まっていたフィルターをfilters_byconfigへ移動した
+- FTPワームや第三者によるサイト改ざんチェッカーを新設した
+
+3.41 (2009/11/17)
+- swfファイルのファイルタイプ誤認に対応
+- 言語ファイル追加
+-- polish_utf8 (thx jagi)
+
 3.40 (2009/09/16)
-- ﾂｰﾃづ・ｪﾃ暗・､ﾃ按､ﾂｷﾂ､ﾃ・暗鳴ｹﾃｦﾂ､ﾃｲﾂｿﾂｶﾂ､ﾃｪﾃ・ｾﾂ､ﾂｷﾂ､ﾂｿ
-- "Xoops Protector" ﾂ､ﾃ按､ﾂ､ﾂ､ﾂｦﾃ個ｾﾃ・ｰﾂ､ﾃｲﾂ､ﾃ､ﾂ､ﾃ｡ﾂ､ﾃ・･ﾂｷﾂ･ﾃｳﾂ･ﾃ猟･ﾃｫﾂ､ﾃ・"Protector" ﾂ､ﾃ伉､ﾃ暗甘堕ｹﾂｹﾂ､ﾂｷﾂ､ﾂｿ
-- ImpressCMSﾂ､ﾂｪﾂ､ﾃｨﾂ､ﾃ店CLﾃづ青ｱﾃｾﾂ･ﾂ｢ﾂ･ﾂ､ﾂ･ﾂｳﾂ･ﾃｳﾂ､ﾃｲﾃ催堕ｰﾃ閉､ﾂｷﾂ､ﾂｿ (thx rene)
+- 安定版として番号を振り直した
+- "Xoops Protector" という名前をやめてシンプルに "Protector" へと変更した
+- ImpressCMSおよびXCL対応アイコンを用意した (thx rene)
+- 一部環境でのpostcommon_post_need_multibyteの動作不良に対応 (thx orange) 3.40a
+- 言語ファイル更新
+-- spanish (thx Colossus) 3.40b
 
 3.36 beta (2009/08/27)
-- HTMLPurifier ﾂ､ﾃｲ 4.0.0 ﾂ､ﾃ仰ｹﾂｹﾂｿﾂｷ
-- ﾂ･ﾃ閉･ﾂ｣ﾂ･ﾃｫﾂ･ﾂｿﾂ｡ﾂｼﾃ・可ｲﾃ・
--- postcommon_post_htmlpurify4everyone.php (POSTﾂ､ﾂｬﾂｾﾃｯﾂ､ﾃ稀TMLPurifierﾂ､ﾃｲﾃ・個ｲﾃ｡ﾂ､ﾂｹﾂ､ﾃｫ)
--- postcommon_post_register_moratorium.php (ﾃ・静渉ｿﾃ・ｾﾂｸﾃ･ﾂ､ﾃ散RLﾃ嘉陛・ｪﾂｹﾃ・､ﾃｲﾂｶﾃ伉ｻﾃ淞､ﾂｹﾂ､ﾃｫ) 3.36a
-- ﾂｸﾃﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂｹﾂｹﾂｿﾂｷ
+- HTMLPurifier を 4.0.0 に更新
+- フィルター追加
+-- postcommon_post_htmlpurify4everyone.php (POSTが常にHTMLPurifierを通過する)
+-- postcommon_post_register_moratorium.php (登録直後のURL付投稿を禁止する) 3.36a
+- 言語ファイル更新
 -- persian (thx voltan) 3.36a
 
 3.35 beta (2009/08/13)
-- ImpressCMSﾃ・ｹﾂ､ﾃ㍊odinfo.phpﾂ､ﾂｬﾂｾﾃｯﾂ､ﾃ仰ｱﾃ堕ｸﾃｬﾂ､ﾃ仰､ﾃ環､ﾃδ､ﾃ・､ﾂ､ﾂ､ﾂｿﾂ､ﾃ篠､ﾃｲﾂｽﾂ､ﾃﾂｵ (thx Phoenyx)
-- DBLT-ASIﾂ､ﾃ篠･ﾂｳﾂ･ﾃ｡ﾂ･ﾃｳﾂ･ﾃ按､ﾃ凝づ青､ﾂｹﾂ､ﾃｫﾃ・ｰﾂｺﾃｮﾂ､ﾃｲﾂ･ﾃｪﾂ･ﾂｯﾂ･ﾂｨﾂ･ﾂｹﾂ･ﾃ按､ﾂｫﾂ､ﾃｩﾃ按ｽﾃε・､ﾂｹﾂ､ﾃｫﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ仰ｽﾂ､ﾃﾂｵﾂ､ﾂｷﾂ､ﾂｿ
-- ﾂ･ﾃ｢ﾂ･ﾂｸﾂ･ﾃ･ﾂ｡ﾂｼﾂ･ﾃｫﾂ･ﾃ｡ﾂ･ﾃｳﾂ･ﾃ・･ﾃ環｡ﾂｼﾂ､ﾃ篠､ﾂｿﾂ､ﾃ｡ﾂ､ﾃ仰｡ﾂ｢Protectorﾂ､ﾃ偲・ｰﾂｺﾃｮﾂ･ﾃ｢ﾂ｡ﾂｼﾂ･ﾃ可､ﾃｲﾃε篠､ﾃｫﾂ､ﾂｿﾂ､ﾃ｡ﾂ､ﾃ偲・ｪﾂｿﾃｴﾂ､ﾃｲﾃ・ｪﾂｵﾃ・､ﾂｷﾂ､ﾂｿ
+- ImpressCMS等でmodinfo.phpが常に英語になっていたのを修正 (thx Phoenyx)
+- DBLT-ASIのコメントに対する動作をリクエストから判断するように修正した
+- モジュールメンテナーのために、Protectorの動作モードを知るための定数を定義した
 -- PROTECTOR_ENABLED_ANTI_SQL_INJECTION
 -- PROTECTOR_ENABLED_ANTI_XSS
-- ﾂｸﾃﾂｸﾃｬﾂ･ﾃ閉･ﾂ｡ﾂ･ﾂ､ﾂ･ﾃｫﾂｹﾂｹﾂｿﾂｷ
+- 言語ファイル更新
 -- arabic (thx Onasre) 3.35a
 
 3.34 beta (2009/07/06)
-- DBﾂ･ﾃｬﾂ･ﾂ､ﾂ･ﾃ､ﾂ｡ﾂｼﾂ･ﾃ按･ﾃｩﾂ･ﾃδ･ﾃ預nti-SQL-Injection(DBLT-ASI)ﾂ､ﾃ篠･ﾂｳﾂ･ﾃ｡ﾂ･ﾃｳﾂ･ﾃ按､ﾃ凝づ青､ﾂｹﾂ､ﾃｫﾃ・ｰﾂｺﾃｮﾂ､ﾃｲﾂｴﾃ凝湘つ､ﾂｷﾂ､ﾂｿ
-- DBﾂ･ﾃｬﾂ･ﾂ､ﾂ･ﾃ､ﾂ｡ﾂｼﾂ･ﾃ按･ﾃｩﾂ･ﾃδ･ﾃ猟､ﾂｬﾂｾﾃｯﾂ､ﾃ軌Nﾂ､ﾃ仰､ﾃ環､ﾃδ､ﾃ・､ﾂｷﾂ､ﾃ楪､ﾂｦﾂｴﾃ・ｶﾂｭﾂ､ﾃ凝づ青ｱﾃｾﾂ､ﾂｹﾂ､ﾃｫﾂ･ﾂｪﾂ･ﾃ猟･ﾂｷﾂ･ﾃｧﾂ･ﾃｳﾂ､ﾃ偲・可ｲﾃ・
+- DBレイヤートラップanti-SQL-Injection(DBLT-ASI)のコメントに対する動作を緩和した
+- DBレイヤートラップが常にONになってしまう環境に対応するオプションの追加
 
 3.33 beta (2009/04/03)
-- PHP_SELFﾂ､ﾃ､PATH_INFOﾂ､ﾃ偲・δｼﾃｬﾃ環ｸﾂｻﾃｺﾂｶﾂｯﾃﾂｩﾃ甘堕ｴﾂｹﾂ､ﾃｲﾂ､ﾃ､ﾂ､ﾃ｡ﾂ､ﾂｿ (thx nao-pon)
-- PHP_SELFﾂ､ﾃ｢ﾃづｧﾂ､ﾂｭﾂ､ﾃ環ｻﾂｱanti-XSSﾂ､ﾃ偲づ青ｾﾃ敖､ﾃ仰ｲﾃδ､ﾂｨﾂ､ﾂｿ
-- PROTECTOR_VERSION ﾃ・ｪﾂｿﾃｴﾂ､ﾃ・｡ﾂ｢Protectorﾂ､ﾃ篠･ﾃ青｡ﾂｼﾂ･ﾂｸﾂ･ﾃｧﾂ･ﾃｳﾂ､ﾃｲﾂｳﾃ偲・ｧﾂ､ﾃ・､ﾂｭﾂ､ﾃｫﾂ､ﾃｨﾂ､ﾂｦﾂ､ﾃ仰､ﾂｷﾂ､ﾂｿ
-- ImpressCMS ﾂ､ﾃ伉､ﾃ篠･ﾂ､ﾂ･ﾃｳﾂ･ﾂｹﾂ･ﾃ按｡ﾂｼﾂ･ﾃｫﾃ甘ｽﾃ仰｡ﾂ､ﾃ､HTMLPurifierﾂ､ﾃ偲・ｬﾃ催堕､ﾃｲﾂｲﾃｾﾃ・ｱﾂ､ﾂｷﾂ､ﾂｿ (thx vaughan)
-- F5Attackﾂ､ﾃ､ﾂ･ﾂｯﾂ･ﾃｭﾂ｡ﾂｼﾂ･ﾃｩﾂ｡ﾂｼﾂ､ﾃ・｡ﾃ鳴･ﾃｭﾂ･ﾂｰﾂ､ﾃ篠､ﾃ淞｡ﾃ猟､ﾃ篠ｽﾃｨﾃ催ｽﾂ､ﾂｬﾂ､ﾂｪﾂ､ﾂｫﾂ､ﾂｷﾂ､ﾂｫﾂ､ﾃδ､ﾂｿﾂ､ﾃ篠､ﾃｲﾂｽﾂ､ﾃﾂｵ (thx ChaF...
 
[truncated message content]

[xoops-svn] SF.net SVN: xoops-svn:[12537] XoopsCore/branches/2.5.x/2.5.7/htdocs

From: <be...@us...> - 2014-05-19 14:19:40

Revision: 12537
          http://sourceforge.net/p/xoops/svn/12537
Author:   beckmi
Date:     2014-05-19 14:19:33 +0000 (Mon, 19 May 2014)
Log Message:
-----------
Few code cosmetic changes

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_ads.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_ldap.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_provisionning.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_xoops.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/authfactory.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/apc.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/file.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/memcache.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/model.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/xcache.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/xoopscache.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.image.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.recaptcha.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.text.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/image.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/recaptcha.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/text.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/xoopscaptcha.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/commentrenderer.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/criteria.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/database.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/databasefactory.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/mysqldatabase.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/sqlutility.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/downloader.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/errorhandler.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/file/file.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/file/xoopsfile.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger/render.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger/xoopslogger.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger_render.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mail/xoopsmultimailer.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mimetypes.inc.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/joint.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/read.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/stats.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/sync.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/write.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/xoopsmodel.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/module.errorhandler.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/pagenav.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/preload.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Smarty.class.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.rm_auto.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/tardownloader.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/template.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/censor/censor.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/censor/config.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/config.custom.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/config.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/flash/config.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/flash/flash.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/iframe/iframe.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/config.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/image.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/li/li.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/mms/mms.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/mp3/mp3.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/rtsp/rtsp.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/syntaxhighlight/config.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/textfilter/config.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/textfilter/textfilter.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/ul/ul.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/wiki/config.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/wiki/wiki.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/wmp/wmp.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme_blocks.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/tree.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/uploader.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/userutility.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/utility/xoopsutility.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rpc/bloggerapi.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rpc/metaweblogapi.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rpc/movabletypeapi.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rpc/xmlrpcparser.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rpc/xoopsapi.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rss/xmlrss2parser.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/themesetparser.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsblock.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopscomments.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/sampleform.inc.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/xoopseditor.inc.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/xoopseditor.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/form.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formbutton.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formbuttontray.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcaptcha.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcheckbox.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcolorpicker.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdatetime.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdhtmltextarea.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formeditor.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelement.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelementtray.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formfile.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formhidden.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formhiddentoken.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formlabel.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formpassword.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formradioyn.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselect.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselectcheckgroup.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselectcountry.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselecteditor.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselectgroup.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselectlang.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselectmatchoption.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselecttheme.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselecttimezone.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselectuser.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formtext.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formtextarea.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formtextdateselect.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/grouppermform.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/simpleform.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/tableform.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/themeform.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopskernel.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsload.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopslocal.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsmailer.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsmodule.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsobject.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopssecurity.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopstree.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsuser.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/zipdownloader.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/footer.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/header.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/checklogin.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_constants.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_new.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_post.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_reply.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/commentform.inc.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/defines.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.encoding.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.legacy.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/license.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/mimetypes.inc.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/notification_constants.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/notification_functions.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/notification_select.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/old_functions.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/registerform.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/searchform.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/site-closed.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/version.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/xoops13_header.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/xoopscodes.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/xoopslocal.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/license.dist.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/avatar.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/block.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/blockinstance.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/comment.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/config.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/configcategory.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/configitem.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/configoption.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/group.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/groupperm.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/handlerregistry.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/image.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/imagecategory.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/imageset.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/imagesetimg.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/member.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/module.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/notification.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/object.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/online.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/privmessage.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/session.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/tplfile.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/tplset.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/user.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/formdhtmltextarea.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/locale.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/logger.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/xoopsmailerlocal.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/preloads/core.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/preloads/system.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/preloads/core.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/preloads/core.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/tplsets/jquery.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/users/jquery.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/avatar.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/banner.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/bannerclient.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/bannerfinish.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/block.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/blocklinkmodule.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/group.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/maintenance.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/menu.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/smilies.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/userrank.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/users.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/menu.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/preloads/core.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/xoops_and_module_changes/class/pagenav.php

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -18,7 +18,7 @@
  * @version         $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  *

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_ads.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_ads.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_ads.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -18,7 +18,7 @@
  * @version $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  *

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_ldap.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_ldap.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_ldap.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author              Pierre-Eric MENUET <pe...@fr...>
  * @version             $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  *

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_provisionning.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_provisionning.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_provisionning.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Pierre-Eric MENUET <pe...@fr...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  *

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_xoops.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_xoops.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_xoops.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -18,7 +18,7 @@
  * @version $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  *

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/authfactory.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/authfactory.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/authfactory.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -18,7 +18,7 @@
  * @version         $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  *

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/apc.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/apc.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/apc.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * APC storage engine for cache.

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/file.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/file.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/file.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * File Storage engine for cache

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/memcache.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/memcache.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/memcache.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -18,7 +18,7 @@
  * @version         $Id$
 
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Memcache storage engine for cache

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/model.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/model.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/model.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Database Storage engine for cache

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/xcache.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/xcache.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/xcache.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Xcache storage engine for cache.

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/xoopscache.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/xoopscache.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/xoopscache.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Caching for CakePHP.

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.image.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.image.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.image.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -20,7 +20,7 @@
  * @version         $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 return $config = array(
     'num_chars' => 6,  // Maximum characters

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -18,7 +18,7 @@
  * @version         $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * This keeping config in files has really got to stop. If we can't actually put these into

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.recaptcha.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.recaptcha.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.recaptcha.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -18,7 +18,7 @@
  * @version         $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 return $config = array(
     'private_key' => 'YourPrivateApiKey',

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.text.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.text.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.text.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -18,7 +18,7 @@
  * @version         $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 return $config = array(
     'num_chars' => 6,  // Maximum characters

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/image.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/image.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/image.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -19,7 +19,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Class XoopsCaptchaImage

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/recaptcha.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/recaptcha.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/recaptcha.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -18,7 +18,7 @@
  * @version         $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Class XoopsCaptchaRecaptcha

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/text.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/text.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/text.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Class XoopsCaptchaText

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/xoopscaptcha.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/xoopscaptcha.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/xoopscaptcha.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -19,7 +19,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Class XoopsCaptcha

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/commentrenderer.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/commentrenderer.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/commentrenderer.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -18,7 +18,7 @@
  * @version         $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Display comments

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/criteria.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/criteria.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/criteria.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -19,7 +19,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * A criteria (grammar?) for a database query.

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/database.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/database.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/database.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -18,7 +18,7 @@
  * @version         $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * make sure this is only included once!

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/databasefactory.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/databasefactory.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/databasefactory.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -15,7 +15,7 @@
  * @subpackage      database
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * XoopsDatabaseFactory

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/mysqldatabase.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/mysqldatabase.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/mysqldatabase.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Kazumi Ono <on...@xo...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  *

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/sqlutility.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/sqlutility.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/sqlutility.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @version         $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * provide some utility methods for databases

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/downloader.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/downloader.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/downloader.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @version         $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Sends non HTML files through a http socket

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/errorhandler.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/errorhandler.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/errorhandler.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @deprecated
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 xoops_loadLanguage('errors');
 

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/file/file.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/file/file.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/file/file.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Convenience class for reading, writing and appending to files.

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/file/xoopsfile.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/file/xoopsfile.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/file/xoopsfile.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author      Taiwen Jiang <ph...@us...>
  * @version     $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * XoopsFile

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger/render.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger/render.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger/render.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -20,7 +20,7 @@
  *
  * @todo            Not well written, just keep as it is. Refactored in 3.0
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 $ret = '';
 if ($mode == 'popup') {

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger/xoopslogger.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger/xoopslogger.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger/xoopslogger.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -21,7 +21,7 @@
  *
  * @todo            Not well written, just keep as it is. Refactored in 3.0
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Collects information for a page request

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -18,7 +18,7 @@
  * @deprecated
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * this file is for backward compatibility only

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger_render.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger_render.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger_render.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -18,7 +18,7 @@
  * @deprecated
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * this file is for backward compatibility only

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mail/xoopsmultimailer.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mail/xoopsmultimailer.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mail/xoopsmultimailer.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -26,7 +26,7 @@
  * @author Jochen Büînagel <jb...@bu...>
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 /**
  * load the base class
  */

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mimetypes.inc.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mimetypes.inc.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mimetypes.inc.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -15,7 +15,7 @@
  * $Id$
  * @deprecated
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 $GLOBALS['xoopsLogger']->addDeprecated("'/class/mimetypes.inc.php' is deprecated, use '/include/mimetypes.inc.php' directly.");
 

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/joint.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/joint.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/joint.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Object joint handler class.

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/read.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/read.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/read.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Object render handler class.

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/stats.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/stats.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/stats.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Object stats handler class.

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/sync.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/sync.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/sync.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Object synchronization handler class.

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/write.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/write.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/write.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Object write handler class.

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/xoopsmodel.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/xoopsmodel.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/xoopsmodel.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 include_once XOOPS_ROOT_PATH . '/kernel/object.php';
 /**

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/module.errorhandler.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/module.errorhandler.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/module.errorhandler.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -18,7 +18,7 @@
  * @deprecated
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 $GLOBALS['xoopsLogger']->addDeprecated("'/class/module.errorhandler.php' is deprecated since XOOPS 2.5.4, please create your own error messages instead.");
 

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/pagenav.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/pagenav.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/pagenav.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @version     $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Class XoopsPageNav

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/preload.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/preload.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/preload.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -23,7 +23,7 @@
  * XOOPS preload implemented in XOOPS is different from methods defined in this class, thus module developers are advised to be careful if you use current preload methods
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 XoopsLoad::load('XoopsLists');
 XoopsLoad::load('XoopsCache');

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Smarty.class.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Smarty.class.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Smarty.class.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -1726,7 +1726,7 @@
     }
 
     /**
-     * get a concrete filename for automatically created content
+     * get a concrete filename for automagically created content
      *
      * @param string $auto_base
      * @param string $auto_source

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.rm_auto.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.rm_auto.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.rm_auto.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -6,7 +6,7 @@
  */
 
 /**
- * delete an automatically created file by name and id
+ * delete an automagically created file by name and id
  *
  * @param string $auto_base
  * @param string $auto_source

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/tardownloader.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/tardownloader.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/tardownloader.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -16,7 +16,7 @@
  * @author      Kazumi Ono (http://www.myweb.ne.jp/, http://jp.xoops.org/)
  * @version     $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * base class

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/template.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/template.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/template.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -19,7 +19,7 @@
  * @version         $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 /**
  * Base class: Smarty template engine
  */

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/censor/censor.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/censor/censor.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/censor/censor.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Replaces banned words in a string with their replacements or terminate current request

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/censor/config.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/censor/config.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/censor/config.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 return $config = array(
     "censor_terminate" => false, //set to true if you want to trigger an error page

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/config.custom.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/config.custom.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/config.custom.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 return $config = array(
     // Filters XSS scripts on display of text

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/config.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/config.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/config.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 return $config = array(
     "extensions" => array(

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/flash/config.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/flash/config.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/flash/config.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 return $config = array(
     'detect_dimension' => 1);

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/flash/flash.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/flash/flash.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/flash/flash.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Class MytsFlash

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/iframe/iframe.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/iframe/iframe.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/iframe/iframe.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Class MytsIframe

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/config.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/config.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/config.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 return $config = array(
     // Click to open an image in a new window in full size using CaricaFoto

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/image.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/image.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/image.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 global $xoopsConfig;
 include_once $GLOBALS['xoops']->path('language/' . $xoopsConfig['language'] . '/misc.php');
 

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/li/li.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/li/li.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/li/li.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -18,7 +18,7 @@
  * @version         $Id$
  * @deprecated
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Class MytsLi

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/mms/mms.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/mms/mms.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/mms/mms.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Class MytsMms

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/mp3/mp3.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/mp3/mp3.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/mp3/mp3.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Class MytsMp3

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/rtsp/rtsp.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/rtsp/rtsp.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/rtsp/rtsp.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Class MytsRtsp

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/syntaxhighlight/config.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/syntaxhighlight/config.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/syntaxhighlight/config.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 return $config = array(
     'highlight' => 'php',// Source code highlight: '' - disable; 'php' - php highlight; 'geshi' - geshi highlight

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Class MytsSyntaxhighlight

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/textfilter/config.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/textfilter/config.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/textfilter/config.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 return $config = array(
     'tags' => array(),  // Tags to be filtered out

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/textfilter/textfilter.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/textfilter/textfilter.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/textfilter/textfilter.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Filter out possible malicious text

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/ul/ul.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/ul/ul.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/ul/ul.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -18,7 +18,7 @@
  * @version         $Id$
  * @deprecated
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Class MytsUl

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/wiki/config.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/wiki/config.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/wiki/config.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 return $config = array(
     'link' => XOOPS_URL . "/modules/mediawiki/?title=%s",// The link to wiki module

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/wiki/wiki.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/wiki/wiki.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/wiki/wiki.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -20,7 +20,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Class MytsWiki

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/wmp/wmp.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/wmp/wmp.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/wmp/wmp.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @author          Taiwen Jiang <ph...@us...>
  * @version         $Id$
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Class MytsWmp

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -19,7 +19,7 @@
  * @version         $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * xos_opal_ThemeFactory

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme_blocks.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme_blocks.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme_blocks.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -20,7 +20,7 @@
 /**
  * This file cannot be requested directly
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 include_once $GLOBALS['xoops']->path('class/xoopsblock.php');
 include_once $GLOBALS['xoops']->path('class/template.php');

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/tree.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/tree.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/tree.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @version     $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * A tree structures with {@link XoopsObject}s as nodes

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/uploader.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/uploader.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/uploader.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -18,7 +18,7 @@
  * @version     $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 
 /**

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/userutility.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/userutility.php	2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/userutility.php	2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
  * @version         $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * XoopsUserUtility

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/utility/xoopsutility.php
==========...
 
[truncated message content]

[xoops-svn] SF.net SVN: xoops-svn:[12536] XoopsCore/branches/2.5.x/2.5.7/htdocs/modules

From: <be...@us...> - 2014-05-19 07:28:58

Revision: 12536
          http://sourceforge.net/p/xoops/svn/12536
Author:   beckmi
Date:     2014-05-19 07:28:51 +0000 (Mon, 19 May 2014)
Log Message:
-----------
added update routine to delete .html templates (slider84)

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/menu.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/docs/changelog.txt
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/include/update.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/preloads/core.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/preloads/system.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/docs/changelog.txt
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/header.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/update.php

Added Paths:
-----------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/css/style.css

Removed Paths:
-------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/style.css

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/menu.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/menu.php	2014-05-16 16:51:21 UTC (rev 12535)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/menu.php	2014-05-19 07:28:51 UTC (rev 12536)
@@ -17,7 +17,7 @@
  * @version         $Id$
  */
 
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
 
 $path = dirname(dirname(dirname(dirname(__FILE__))));
 include_once $path . '/mainfile.php';

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/docs/changelog.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/docs/changelog.txt	2014-05-16 16:51:21 UTC (rev 12535)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/docs/changelog.txt	2014-05-19 07:28:51 UTC (rev 12536)
@@ -2,6 +2,7 @@
 -------------------
 - moved all images, CSS, and JS files to /assets (mamba)
 - renamed .html Smarty templates to .tpl (mamba)
+- added routine to delete .html templates (slider84)
 
 Version 1.09
 -------------------

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/include/update.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/include/update.php	2014-05-16 16:51:21 UTC (rev 12535)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/include/update.php	2014-05-19 07:28:51 UTC (rev 12536)
@@ -21,19 +21,29 @@
 {
 
     if ($oldversion <= 100) {
-    GLOBAL $xoopsDB;
-    // Check pm table version
-    $sql = "SHOW COLUMNS FROM " . $xoopsDB->prefix("priv_msgs");
-    if (!$result = $xoopsDB->queryF($sql)) {
-        return false;
+        GLOBAL $xoopsDB;
+        // Check pm table version
+        $sql = "SHOW COLUMNS FROM " . $xoopsDB->prefix("priv_msgs");
+        if (!$result = $xoopsDB->queryF($sql)) {
+            return false;
+        }
+        // Migrate from existent pm module
+        if (($rows = $xoopsDB->getRowsNum($result)) == 12) {
+            return true;
+        } elseif ($rows == 8) {
+            return $xoopsDB->queryFromFile(XOOPS_ROOT_PATH . "/modules/" . $module->getVar('dirname', 'n') . "/sql/mysql.upgrade.sql");
+        } else {
+            return false;
+        }
     }
-    // Migrate from existent pm module
-    if ( ($rows = $xoopsDB->getRowsNum($result)) == 12) {
-        return true;
-    } elseif ($rows == 8) {
-        return $xoopsDB->queryFromFile(XOOPS_ROOT_PATH . "/modules/" . $module->getVar('dirname', 'n') . "/sql/mysql.upgrade.sql");
-    } else {
-        return false;
+    // remove old html template files
+    $template_directory = XOOPS_ROOT_PATH . "/modules/" . $module->getVar('dirname', 'n') . "/templates/";
+    $template_list      = array_diff(scandir($template_directory), array('..', '.'));
+    foreach ($template_list as $k => $v) {
+        $fileinfo = new SplFileInfo($template_directory . $v);
+        if ($fileinfo->getExtension() == 'html' && $fileinfo->getFilename() != 'index.html') {
+            @unlink($template_directory . $v);
+        }
     }
-    }
+    return null;
 }

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/preloads/core.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/preloads/core.php	2014-05-16 16:51:21 UTC (rev 12535)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/preloads/core.php	2014-05-19 07:28:51 UTC (rev 12536)
@@ -17,7 +17,7 @@
  * @version         $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+// defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * PM core preloads

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/preloads/system.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/preloads/system.php	2014-05-16 16:51:21 UTC (rev 12535)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/preloads/system.php	2014-05-19 07:28:51 UTC (rev 12536)
@@ -17,7 +17,7 @@
  * @version         $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+// defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * PM system preloads

Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/css/style.css
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/css/style.css	                        (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/assets/css/style.css	2014-05-19 07:28:51 UTC (rev 12536)
@@ -0,0 +1,13 @@
+.breadcrumbs { font-size: 1.2em;  padding: 10px 2px;}
+.breadcrumbs span { border: 0;  padding: 0 2px;}
+.breadcrumbs .item {}
+.breadcrumbs .delimiter { font-size: 1.2em;}
+.register-steps { font-size: 1.2em;  padding: 5px 2px;}
+.register-steps span {  border: 0;  padding: 0 2px;}
+.register-steps .current { font-weight: bold; text-decoration: underline;}
+.register-steps .delimiter { font-size: 1.2em;}
+table.profile-form  { width: 90%;}
+.profile-form td.head { width: 20%;}
+.profile-list-category table { width: 80%; margin: 10px 5px;}
+.profile-list-category td.head { width: 20%;}
+.profile-list-activity { width: 90%; padding: 5px;}
\ No newline at end of file

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/docs/changelog.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/docs/changelog.txt	2014-05-16 16:51:21 UTC (rev 12535)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/docs/changelog.txt	2014-05-19 07:28:51 UTC (rev 12536)
@@ -3,6 +3,7 @@
 - moved all images, CSS, and JS files to /assets (mamba)
 - renamed .html Smarty templates to .tpl (mamba)
 - fixed missing .tpl (cesag/slider84)
+- added routine to delete .html templates (slider84)
 
 1.64 Final
 --------------------------------------

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/header.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/header.php	2014-05-16 16:51:21 UTC (rev 12535)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/header.php	2014-05-19 07:28:51 UTC (rev 12536)
@@ -20,7 +20,7 @@
 
 $xoopsOption['pagetype'] = 'user';
 include dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'mainfile.php';
-$xoopsOption['xoops_module_header'] = '<link rel="stylesheet" type="text/css" href="templates/style.css" />';
+$xoopsOption['xoops_module_header'] = '<link rel="stylesheet" type="text/css" href="assets/css/style.css" />';
 
 $xoBreadcrumbs = array();
 $xoBreadcrumbs[] = array("title" => $GLOBALS['xoopsModule']->getVar('name'), "link" => XOOPS_URL . "/modules/" . $GLOBALS['xoopsModule']->getVar('dirname', 'n') . '/');

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/update.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/update.php	2014-05-16 16:51:21 UTC (rev 12535)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/update.php	2014-05-19 07:28:51 UTC (rev 12536)
@@ -106,6 +106,17 @@
         $GLOBALS['xoopsDB']->queryF("UPDATE `" . $GLOBALS['xoopsDB']->prefix("profile_field") . "` SET `field_valuetype`=1 WHERE `field_name`='umode'");
     }
 
+
+// remove old html template files
+    $template_directory = XOOPS_ROOT_PATH . "/modules/" . $module->getVar('dirname', 'n') . "/templates/";
+    $template_list      = array_diff(scandir($template_directory), array('..', '.'));
+    foreach ($template_list as $k => $v) {
+        $fileinfo = new SplFileInfo($template_directory . $v);
+        if ($fileinfo->getExtension() == 'html' && $fileinfo->getFilename() != 'index.html') {
+            @unlink($template_directory . $v);
+        }
+    }
+
     $profile_handler =& xoops_getModuleHandler("profile", $module->getVar('dirname', 'n') );
     $profile_handler->cleanOrphan($GLOBALS['xoopsDB']->prefix("users"), "uid", "profile_id");
     $field_handler =& xoops_getModuleHandler('field', $module->getVar('dirname', 'n') );

Deleted: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/style.css
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/style.css	2014-05-16 16:51:21 UTC (rev 12535)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/style.css	2014-05-19 07:28:51 UTC (rev 12536)
@@ -1,13 +0,0 @@
-.breadcrumbs { font-size: 1.2em;  padding: 10px 2px;}
-.breadcrumbs span { border: 0;  padding: 0 2px;}
-.breadcrumbs .item {}
-.breadcrumbs .delimiter { font-size: 1.2em;}
-.register-steps { font-size: 1.2em;  padding: 5px 2px;}
-.register-steps span {  border: 0;  padding: 0 2px;}
-.register-steps .current { font-weight: bold; text-decoration: underline;}
-.register-steps .delimiter { font-size: 1.2em;}
-table.profile-form  { width: 90%;}
-.profile-form td.head { width: 20%;}
-.profile-list-category table { width: 80%; margin: 10px 5px;}
-.profile-list-category td.head { width: 20%;}
-.profile-list-activity { width: 90%; padding: 5px;}
\ No newline at end of file

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

From: <txm...@us...> - 2014-05-16 16:51:25

Revision: 12535
          http://sourceforge.net/p/xoops/svn/12535
Author:   txmodxoops
Date:     2014-05-16 16:51:21 +0000 (Fri, 16 May 2014)
Log Message:
-----------
Tested with sahi for new module, table, fields

It still needs to add another code, before an official test

Updated - Work in progress

Modified Paths:
--------------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/sql/mysql.sql
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/sql/mysql.sql
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/sql/mysql.sql	2014-05-16 14:20:30 UTC (rev 12534)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/sql/mysql.sql	2014-05-16 16:51:21 UTC (rev 12535)
@@ -37,7 +37,7 @@
   `mod_donations` varchar(50) NOT NULL default '',
   `mod_subversion` varchar(10) NOT NULL default '',
   PRIMARY KEY (`mod_id`),
-  KEY `mod_name` (`mod_name`)
+  UNIQUE KEY `mod_name` (`mod_name`)
 ) ENGINE=MyISAM;
 
 

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php	2014-05-16 14:20:30 UTC (rev 12534)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php	2014-05-16 16:51:21 UTC (rev 12535)
@@ -413,5 +413,5 @@
 $modversion['config'][$i]['description'] = "";
 $modversion['config'][$i]['formtype'] = "textbox";
 $modversion['config'][$i]['valuetype'] = "text";
-$modversion['config'][$i]['default'] = '12520';
+$modversion['config'][$i]['default'] = '12534';
 unset($i);
\ No newline at end of file

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

From: <txm...@us...> - 2014-05-16 14:20:35

Revision: 12534
          http://sourceforge.net/p/xoops/svn/12534
Author:   txmodxoops
Date:     2014-05-16 14:20:30 +0000 (Fri, 16 May 2014)
Log Message:
-----------
Fixed bugs

Added class/files/admin_about.php file.php

Work in progress

Modified Paths:
--------------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fieldelements.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/abstractfiles.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_footer.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_header.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_index.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/css_styles.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/file.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_functions.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/modules.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/functions.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/js/functions.js
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/building.tpl
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/fields.tpl
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/modules.tpl
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tables.tpl

Added Paths:
-----------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_about.php

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php	2014-05-14 20:51:54 UTC (rev 12533)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php	2014-05-16 14:20:30 UTC (rev 12534)
@@ -26,6 +26,12 @@
 } else {
     $modules =& $modulesHandler;
 }
+$tname = TDMCreate_CleanVars( $_REQUEST, 'table_name', '', 'string' );
+if ( $tname ) {
+    $tables =& $tablesHandler->get( $tname );
+} else {
+    $tables =& $tablesHandler;
+}
 $mod_name = $modules->getVar('mod_name');
 $from_dir = TDMC_UPLOAD_MODULES_PATH.'/'.strtolower($mod_name);
 $to_dir = XOOPS_ROOT_PATH.'/modules/'.strtolower($mod_name);
@@ -45,17 +51,23 @@
 		$handler = TDMCreateArchitecture::getInstance();
 		$handler->getPath( TDMC_PATH );
 		$handler->getUploadPath( TDMC_UPLOAD_PATH );
-		$base_architecture = $handler->getArchitectureFiles( $modules );
-		/*if($base_architecture !== false) { */
-			$GLOBALS['xoopsTpl']->assign('base_architecture', $base_architecture);
-		/*} else {
+		$base_architecture = $handler->createBaseFoldersFiles( $modules );
+		if($base_architecture !== false) { 
+			$GLOBALS['xoopsTpl']->assign('base_architecture', true);			
+		} else {
 			$GLOBALS['xoopsTpl']->assign('base_architecture', false);
-		}*/
+		}/**/
+		//$builds = array();
+		$building_files = $handler->createBuildingFiles( $modules, $tables );
+		/*foreach($building_files as $key => $value) {$builds
+			$builds['list'] = $key;*/
+			$GLOBALS['xoopsTpl']->assign('builds', $building_files);
+		//}
 		$mod_name = 'uploads/tdmcreate/modules/' . str_replace(' ', '', strtolower($mod_name));
         // Creation of the structure of folders and files
-		$GLOBALS['xoopsTpl']->assign('build_list', 'Under new construction - Temporary build only folders of this selected module "'.$mod_name.'/"');
-		if ( $modules->getVar('mod_install') == 1 ) {	
-			copyInRootModules($from_dir, $to_dir);
+		$GLOBALS['xoopsTpl']->assign('build_list', '<b>Under new construction</b> - Temporary build only folders of this selected module "'.$mod_name.'/"');
+		if ( $modules->getVar('mod_inroot_copy') == 1 ) {	
+			TDMCreate_copyr($from_dir, $to_dir);
         }
 	break;
 	

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php	2014-05-14 20:51:54 UTC (rev 12533)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php	2014-05-16 14:20:30 UTC (rev 12534)
@@ -22,20 +22,21 @@
 // Recovered value of arguments op in the URL $ 
 $op = TDMCreateRequest::getString('op', 'list');
 // Get table Variables
-$table_id = TDMCreate_CleanVars($_REQUEST, 'table_id');
+/*$table_id = TDMCreate_CleanVars($_REQUEST, 'table_id');
 $table_mid = TDMCreate_CleanVars($_REQUEST, 'table_mid');
 $table_nbfields = TDMCreate_CleanVars($_REQUEST, 'table_nbfields');
-/*$table_id = TDMCreateRequest::getInt('table_id');
+$table_id = TDMCreateRequest::getInt('table_id');
 $table_mid = TDMCreateRequest::getInt('table_mid');
-$table_nbfields = TDMCreateRequest::getInt('table_nbfields');*/
+$table_nbfields = TDMCreateRequest::getInt('table_nbfields');
 // Get field Variables
-$field_id = TDMCreate_CleanVars($_REQUEST, 'field_id');
+$field_id = TDMCreate_CleanVars($_REQUEST, 'field_id');*/
+$table_name = TDMCreate_CleanVars($_REQUEST, 'table_name', '', 'string');
 $field_mid = TDMCreate_CleanVars($_REQUEST, 'field_mid');
 $field_tid = TDMCreate_CleanVars($_REQUEST, 'field_tid');
 $field_numb = TDMCreate_CleanVars($_REQUEST, 'field_numb');
 $field_name = TDMCreate_CleanVars($_REQUEST, 'field_name', '', 'string');
-/*$field_id = TDMCreateRequest::getInt('field_id');
-$field_mid = TDMCreateRequest::getInt('field_mid');
+$field_id = TDMCreateRequest::getInt('field_id');
+/*$field_mid = TDMCreateRequest::getInt('field_mid');
 $field_tid = TDMCreateRequest::getInt('field_tid');
 $field_numb = TDMCreateRequest::getInt('field_numb');
 $field_name = TDMCreateRequest::getString('field_name', ''); */       
@@ -72,8 +73,8 @@
         unset($nb_tables);		
 		// Get the list of tables
 		$criteria = new CriteriaCompo();
-		$criteria->add(new Criteria('table_mid', $table_mid));
-		$criteria->add(new Criteria('table_id', $table_id));
+		$criteria->add(new Criteria('table_mid', $field_mid));
+		$criteria->add(new Criteria('table_id', $field_tid));
 		$criteria->setSort('table_id ASC, table_name');
 		$criteria->setOrder('ASC');	
 		$nb_tables = $tablesHandler->getCount($criteria);
@@ -82,25 +83,27 @@
 		if ($nb_tables > 0) 
 		{	
 			foreach (array_keys($tables_arr) as $t) 
-			{				
+			{	
+				// Display tables list
 				$table['id'] = $t;				
-				$table['name'] = ucfirst($tables_arr[$t]->getVar('table_name'));					
+				$table['mid'] = $tables_arr[$t]->getVar('table_mid');
+                $table['name'] = ucfirst($tables_arr[$t]->getVar('table_name'));				
 				$table['image'] = $tables_arr[$t]->getVar('table_image');	
 				$table['nbfields'] = $tables_arr[$t]->getVar('table_nbfields');	
 				$table['blocks'] = $tables_arr[$t]->getVar('table_blocks');						
 				$table['admin'] = $tables_arr[$t]->getVar('table_admin');	
 				$table['user'] = $tables_arr[$t]->getVar('table_user');					
 				$table['search'] = $tables_arr[$t]->getVar('table_search');									
-                // Get the list of tables
+                // Get the list of fields
 				$criteria = new CriteriaCompo();
-				$criteria->add(new Criteria('field_mid', $table_mid));
+				$criteria->add(new Criteria('field_mid', $field_mid));
 				$criteria->add(new Criteria('field_tid', $t));
 				$criteria->setSort('field_id ASC, field_name');
 				$criteria->setOrder('ASC');	
 				$nb_fields = $fieldsHandler->getCount($criteria);
 				$fields_arr = $fieldsHandler->getAll($criteria);
 				unset($criteria);
-				// Display tables list
+				// Display fields list
 				$fields = array();
 				$lid = 1;
 				if ( $nb_fields > 0 ) 
@@ -157,15 +160,20 @@
 		if ( !$GLOBALS['xoopsSecurity']->check() ) {
             redirect_header('fields.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
         } 
+		$fieldelement_fid = $field_id = TDMCreateRequest::getInt('fieldelement_fid');
 		//
-        if (isset($field_id)) {
+		if (isset($field_id)) {
 			$obj =& $fieldsHandler->get($field_id);
+			if (isset($fieldelement_fid)) {
+				$objfieldelement =& $fieldelementsHandler->get($fieldelement_fid);
+			}
 		} else {
 			$obj =& $fieldsHandler->create();
-		}		
-		//
+			$objfieldelement =& $fieldelementsHandler->create();
+		}
 		if ($field_numb > 0) {
-			for( $i = 1; $i <= $field_numb; $i++ ) {				
+			for( $i = 1; $i <= $field_numb; $i++ ) {	
+				//			
 				$obj->setVar( 'field_mid', $field_mid );
 				$obj->setVar( 'field_tid', $field_tid );								
 				$obj->setVar( 'field_numb', $field_numb );
@@ -190,6 +198,10 @@
                 $fieldsHandler->insert($obj);					
 			}				
 		}
+		$objfieldelement->setVar( 'fieldelement_name', 'Table : '.$_REQUEST['table_name'] );
+		$objfieldelement->setVar( 'fieldelement_value', 'XoopsFormTables-'.$_REQUEST['table_name'] );
+		// Insert new table name
+		$fieldelementsHandler->insert($objfieldelement);
 		//
 		if ($obj->isNew()) {		    
 			redirect_header('fields.php', 2, sprintf(_AM_TDMCREATE_FIELD_FORM_SAVED_OK, $_REQUEST['table_name']));
@@ -209,11 +221,32 @@
 		$adminMenu->addItemButton(_AM_TDMCREATE_ADD_TABLE, 'tables.php?op=new', 'add');
 		$adminMenu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php', 'list');
 		$adminMenu->addItemButton(_AM_TDMCREATE_FIELDS_LIST, 'fields.php', 'list');           
-		$GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton());
+		$GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton());		
 		
 		$obj = $fieldsHandler->get( $field_id );        		
 		$form = $obj->getForm($field_mid, $field_tid, $field_numb);
 		$GLOBALS['xoopsTpl']->assign('form', $form->render());
+		
+		// Get the list of fields
+		$criteria = new CriteriaCompo();
+		$criteria->add(new Criteria('field_mid', $field_mid));
+		$criteria->add(new Criteria('field_tid', $field_tid));
+		$criteria->setSort('field_id ASC, field_name');
+		$criteria->setOrder('ASC');	
+		$nb_fields = $fieldsHandler->getCount($criteria);
+		$fields_arr = $fieldsHandler->getAll($criteria);
+		unset($criteria);
+		if ( $nb_fields > 0 ) 
+		{ 	
+			foreach (array_keys($fields_arr) as $f) 
+			{	
+				$field_id = $fields_arr[$f]->getVar('field_id');
+				var_dump($field_id);
+			}
+		}
+		var_dump($field_mid);
+		var_dump($field_tid);
+		var_dump($field_numb);
 	break;
 
     case 'drag':        

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php	2014-05-14 20:51:54 UTC (rev 12533)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php	2014-05-16 14:20:30 UTC (rev 12534)
@@ -32,6 +32,7 @@
         $limit = TDMCreateRequest::getInt('limit', $tdmcreate->getConfig('modules_adminpager'));
 	    // Define main template
         $template_main = 'modules.tpl'; 
+		$GLOBALS['xoTheme']->addScript('modules/TDMCreate/js/functions.js');
 		$GLOBALS['xoTheme']->addStylesheet( 'modules/TDMCreate/css/admin/style.css' );
         $GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('modules.php'));
 		$adminMenu->addItemButton(_AM_TDMCREATE_ADD_MODULE, 'modules.php?op=new', 'add');            
@@ -197,33 +198,33 @@
 	case 'toggle':
         if (isset($_GET['mod_id'])) {
             if (isset($_GET['mod_admin'])) {
-                $mod_admin = intval($_GET['mod_admin']);                
-				$mod_admin = ($mod_admin == 1) ? 0 : 1;
+                $madmin = intval($_GET['mod_admin']);                
+				$mod_admin = ($madmin == 1) ? 0 : 1;
 				$obj =& $modulesHandler->get($mod_id);
 				$obj->setVar('mod_admin', $mod_admin);
             } elseif (isset($_GET['mod_user'])) {
-                $mod_user = intval($_GET['mod_user']);                
-				$mod_user = ($mod_user == 1) ? 0 : 1;
+                $muser = intval($_GET['mod_user']);                
+				$mod_user = ($muser == 1) ? 0 : 1;
 				$obj =& $modulesHandler->get($mod_id);
 				$obj->setVar('mod_user', $mod_user);
             } elseif (isset($_GET['mod_search'])) {
-                $mod_search = intval($_GET['mod_search']);                
-				$mod_search = ($mod_search == 1) ? 0 : 1;
+                $msearch = intval($_GET['mod_search']);                
+				$mod_search = ($msearch == 1) ? 0 : 1;
 				$obj =& $modulesHandler->get($mod_id);
 				$obj->setVar('mod_search', $mod_search);
             } elseif (isset($_GET['mod_comments'])) {
-                $mod_comments = intval($_GET['mod_comments']);                
-				$mod_comments = ($mod_comments == 1) ? 0 : 1;
+                $mcomments = intval($_GET['mod_comments']);                
+				$mod_comments = ($mcomments == 1) ? 0 : 1;
 				$obj =& $modulesHandler->get($mod_id);
 				$obj->setVar('mod_comments', $mod_comments);
             } elseif (isset($_GET['mod_notifications'])) {
-                $mod_notifications = intval($_GET['mod_notifications']);                
-				$mod_notifications = ($mod_notifications == 1) ? 0 : 1;
+                $mnotifications = intval($_GET['mod_notifications']);                
+				$mod_notifications = ($mnotifications == 1) ? 0 : 1;
 				$obj =& $modulesHandler->get($mod_id);
 				$obj->setVar('mod_notifications', $mod_notifications);
             } elseif (isset($_GET['mod_permissions'])) {
-                $mod_permissions = intval($_GET['mod_permissions']);                
-				$mod_permissions = ($mod_permissions == 1) ? 0 : 1;
+                $mpermissions = intval($_GET['mod_permissions']);                
+				$mod_permissions = ($mpermissions == 1) ? 0 : 1;
 				$obj =& $modulesHandler->get($mod_id);
 				$obj->setVar('mod_permissions', $mod_permissions);
             }

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php	2014-05-14 20:51:54 UTC (rev 12533)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php	2014-05-16 14:20:30 UTC (rev 12534)
@@ -171,7 +171,7 @@
 													   $tdmcreate->getConfig('maxsize'), null, null);
 		if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
 			$extension = preg_replace( '/^.+\.([^.]+)$/sU' , '\\1' , $_FILES['table_image']['name']);
-			$name_img = $_GET['table_name'].'.'.$extension;
+			$name_img = $_POST['table_name'].'.'.$extension;
 			$uploader->setPrefix($name_img);			
 			$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
 			if (!$uploader->upload()) {

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fieldelements.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fieldelements.php	2014-05-14 20:51:54 UTC (rev 12533)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fieldelements.php	2014-05-16 14:20:30 UTC (rev 12534)
@@ -32,11 +32,10 @@
 	*  @param null
 	*/
 	public function __construct()
-	{
-		$this->htmltable = TDMCreateHtmlTable::getInstance();
-		$this->initVar('fieldelement_fid', XOBJ_DTYPE_INT);        
+	{		
+		$this->initVar('fieldelement_fid', XOBJ_DTYPE_INT);   
+		$this->initVar('fieldelement_name', XOBJ_DTYPE_TXTBOX);     
 		$this->initVar('fieldelement_value', XOBJ_DTYPE_TXTBOX);		
-		$this->initVar('fieldelement_name', XOBJ_DTYPE_TXTBOX);
 	}
 	
 	/**

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php	2014-05-14 20:51:54 UTC (rev 12533)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php	2014-05-16 14:20:30 UTC (rev 12534)
@@ -142,22 +142,35 @@
 				
 		$obj = $fieldsHandler->getObjects(null);
 		
+		// Get the list of fields
+		$criteria = new CriteriaCompo();
+		$criteria->add(new Criteria('field_mid', $field_mid));
+		$criteria->add(new Criteria('field_tid', $field_tid));
+		$criteria->setSort('field_id ASC, field_name');
+		$criteria->setOrder('ASC');	
+		$fields_arr = $fieldsHandler->getAll($criteria);
+		unset($criteria);
+			
 		$class = '';
 		for($i = 1; $i <= $field_numb; $i++)
 		{
+		    $form->addElement(new XoopsFormHidden('field_id['.$i.']', $i));	
+			$form->addElement(new XoopsFormHidden('field_mid', $field_mid));
+			$form->addElement(new XoopsFormHidden('field_tid', $field_tid));
+
 			$class = ($class == 'even') ? 'odd' : 'even';            			
 			$form->addElement(new TDMCreateFormLabel('<tr class="'.$class.'">'));
-            // Index ID
+			// Index ID
 			$form->addElement(new TDMCreateFormLabel('<td class="center">'.$i.'</td>'));
-         	// Field Name
+			// Field Name
 			$this_field_name = $isNew ? (!empty($f_name) ? $f_name . '_' : '') : $this->getVar('field_name');
 			$field_name = new XoopsFormText(_AM_TDMCREATE_FIELD_NAME, 'field_name['.$i.']', 15, 255, $this_field_name);			
 			$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_name->render().'</td>'));
 			// Field Type			
 			$fieldtype_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_type['.$i.']', $this->getVar('field_type'));
-            $fieldtype_select->addOptionArray($fieldtypeHandler->getList()); 
+			$fieldtype_select->addOptionArray($fieldtypeHandler->getList()); 
 			$form->addElement(new TDMCreateFormLabel('<td class="center">'.$fieldtype_select->render().'</td>'));
-            // Field Value			
+			// Field Value			
 			$field_value = new XoopsFormText(_AM_TDMCREATE_FIELD_VALUE, 'field_value['.$i.']', 5, 20, $this->getVar('field_value'));
 			$form->addElement(new TDMCreateFormLabel('<td class="center">'.$field_value->render().'</td>'));
 			// Field Attributes						
@@ -181,10 +194,10 @@
 				$form->addElement(new TDMCreateFormLabel('<td>&nbsp;</td></tr>'));
 			} else {				
 				// Box header row				
-                $parameters_tray = new XoopsFormElementTray('', '<br />');		
+				$parameters_tray = new XoopsFormElementTray('', '<br />');		
 				// Field Elements				
 				$field_elements_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_ELEMENT_NAME, 'field_element['.$i.']', $this->getVar('field_element'));			    
-				    $field_elements_select->addOptionArray($fieldelementsHandler->getList());										
+					$field_elements_select->addOptionArray($fieldelementsHandler->getList());										
 					$criteria = new CriteriaCompo(new Criteria('table_id', $f_tid));
 					$criteria->add(new Criteria('table_mid', $f_mid));					
 					$criteria->setSort('table_name');
@@ -199,10 +212,10 @@
 						}													
 					}
 					$parameters_tray->addElement($field_elements_select);
-                				
-				$field_parent = $isNew ? ( $i == 1 ) : $this->getVar('field_parent');
-					$check_field_parent = new XoopsFormRadio(' ', 'field_parent', $field_parent);
-					$check_field_parent->addOption('', _AM_TDMCREATE_FIELD_PARENT );
+								
+				$field_parent = $isNew ? ( $i == 1 ? 1 : 0 ) : $this->getVar('field_parent');
+					$check_field_parent = new XoopsFormCheckBox(' ', 'field_parent', $field_parent);
+					$check_field_parent->addOption($i, _AM_TDMCREATE_FIELD_PARENT );
 					$parameters_tray->addElement($check_field_parent);
 					
 				$field_inlist = $isNew ? 0 : $this->getVar('field_inlist');
@@ -230,7 +243,7 @@
 					$check_field_block->addOption(1, _AM_TDMCREATE_FIELD_BLOCK);
 					$parameters_tray->addElement($check_field_block);
 
-				$field_main = $isNew ? ( $i == 1 ) : $this->getVar('field_main');
+				$field_main = $isNew ? ( $i == 1 ? 1 : 0 ) : $this->getVar('field_main');
 					$check_field_main = new XoopsFormRadio('', 'field_main', $field_main);
 					$check_field_main->addOption('', _AM_TDMCREATE_FIELD_MAINFIELD );
 					$parameters_tray->addElement($check_field_main);
@@ -246,12 +259,9 @@
 					$parameters_tray->addElement($check_field_required);
 
 				$form->addElement(new TDMCreateFormLabel('<td>'.$parameters_tray->render().'</td></tr>'));
-			}				
-			$form->addElement(new XoopsFormHidden('field_id['.$i.']', $i));	
-			$form->addElement(new XoopsFormHidden('field_mid', $field_mid));
-			$form->addElement(new XoopsFormHidden('field_tid', $field_tid)); 			
+			}					 			
 		}				
-				
+	
 		$form->addElement(new TDMCreateFormLabel('</tbody>'));
 		$form->addElement(new TDMCreateFormLabel('<tfoot><tr>'));
 		$form_hidden = new XoopsFormHidden('op', 'save');
@@ -323,7 +333,18 @@
     public function &get($id)
     {        
 		return parent::get($id);
-    }	
+    }
+
+	/**
+     * get IDs of objects matching a condition
+     *
+     * @param object $criteria {@link CriteriaElement} to match
+     * @return array of object IDs
+     */
+    function &getIds($criteria)
+    {
+        return parent::getIds($criteria);
+    }
 		
 	/**
      * insert a new field in the database

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/abstractfiles.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/abstractfiles.php	2014-05-14 20:51:54 UTC (rev 12533)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/abstractfiles.php	2014-05-16 14:20:30 UTC (rev 12534)
@@ -16,7 +16,7 @@
  * @package         tdmcreate
  * @since           2.5.0
  * @author          Txmod Xoops http://www.txmodxoops.org
- * @version         $Id: headerfiles.php 12258 2014-01-02 09:33:29Z timgno $
+ * @version         $Id: abstractfiles.php 12258 2014-01-02 09:33:29Z timgno $
  */
 
 defined('XOOPS_ROOT_PATH') or die('Restricted access');
@@ -69,21 +69,12 @@
     private $folder = null;
 	
 	/**
-     * "file_name" attribute of the files
+     * "filename" attribute of the files
      *
      * @var mixed
      */
-    private $file_name = null;
-
-    /**
-     * Generates output for the files.
-     *
-     * This method is abstract and must be overwritten by the child classes.
-     *
-     * @abstract
-     */
-    abstract function render();
-
+    private $filename = null;
+    
     /*
 	*  @public function getHeader
 	*  @param string $path
@@ -91,231 +82,21 @@
 	*  @param string $folder
 	*  @param string $file_name
 	*/
-	public function getHeader($path, $module, $folder, $file_name) {    
+	public function getHeader($path, $module, $folder, $filename) {    
 		$this->path = $path;
 		$this->folder = $folder;
 		$this->module = $module;
-		$this->file_name = $file_name;
-		$ret = $this->path . DIRECTORY_SEPARATOR . $this->module . DIRECTORY_SEPARATOR . $this->folder . DIRECTORY_SEPARATOR . $this->file_name;
+		$this->filename = $filename;
+		$ret = $this->path . DIRECTORY_SEPARATOR . $this->module . DIRECTORY_SEPARATOR . $this->folder . DIRECTORY_SEPARATOR . $this->filename;
 		return $ret;
-	}
+	}		
 	
-	/*
-	*  @private function setPath
-	*  @param string $path
-	*/
-	private function setPath($path) {
-        $this->path = $path;
-    }
-	
-	/*
-	*  @private function getPath
-	*  @param null
-	*/
-	private function getPath() {
-        return $this->path;
-    }
-	
-	/*
-	*  @public function getLocalPath
-	*  @param mixed $subdir
-	*/
-    public function getLocalPath($subdir = false)
-    {
-		if ($subdir) {
-			$ret = $this->getUploadPath() . DIRECTORY_SEPARATOR . $this->getModuleName() . DIRECTORY_SEPARATOR . $subdir;
-		} else {
-            $ret = $this->getUploadPath() . DIRECTORY_SEPARATOR . $this->getModuleName();
-        }
-        return $ret;
-    }
-	
-	/*
-	*  @private function setUploadPath
-	*  @param string $upload_path
-	*/
-	private function setUploadPath($upload_path) {
-        $this->upload_path = $upload_path;
-    }
-	
-	/*
-	*  @public function getUploadPath
-	*  @param null
-	*/
-    public function getUploadPath()
-    {
-        return $this->upload_path;
-    }
-
-	/**
-     * public function setFileName
-     * @param mixed $module
+    /**
+     * Generates output for the files.
+     *
+     * This method is abstract and must be overwritten by the child classes.
+     *
+     * @abstract
      */
-    public function setModule($module)
-    {
-        $this->module = $module;
-    }
-	
-	/*
-	*  @public function getModule
-	*  @param null
-	*/
-    public function getModule()
-    {
-        return $this->module;
-    }	
-	
-	/**
-     * public function setFileName
-     * @param mixed $file_name
-     */
-    public function setFileName($file_name)
-    {
-        $this->file_name = $file_name;
-    }
-	
-	/*
-	*  @public function getFileName
-	*  @param null
-	*/
-    public function getFileName()
-    {
-        return $this->file_name;
-    }	
-	
-	/*
-	*  @public function getModuleName
-	*  @param null
-	*/
-	public function getModuleName() {    
-		$ret = $this->module->getVar('mod_name');
-		return $ret;
-	}
-	
-	/**
-     * public function setTable
-     * @param mixed $table
-     */
-    public function setTable($table)
-    {
-        if (is_array($table)) {
-            foreach($table as $t) {
-                $this->table[] = $t;
-            }
-        } elseif (is_array($this->table)) {
-            $this->table[] = $table;
-        } else {
-            $this->table = $table;
-        }
-    }
-	
-	/*
-	*  @public function getTable
-	*  @param null
-	*/
-	public function getTable() {   		 
-		if (is_array($this->table)) {
-            $ret = array();
-            foreach ($this->table as $table) {
-                $ret[] = $table;
-            }
-            return $ret;
-        }
-	}
-	
-	/**
-     * @public function setFields
-     * @param mixed $fields
-     */
-    public function setFields($fields)
-    {
-        if (is_array($fields)) {
-            foreach($fields as $f) {
-                $this->fields[] = $f;
-            }
-        } elseif (is_array($this->fields)) {
-            $this->fields[] = $fields;
-        } else {
-            $this->fields = $fields;
-        }
-    }
-	
-	/*
-	*  @public function getFields
-	*  @param null
-	*/
-	public function getFields() {   		 
-		if (is_array($this->fields)) {
-            $ret = array();
-            foreach ($this->fields as $fields) {
-                $ret[] = $fields;
-            }
-            return $ret;
-        } 
-	}
-	
-	/*
-	*  @public function getLanguage
-	*  @param string $prefix
-	*  @param string $postfix
-	*/
-	public function getLanguage($prefix = '', $postfix = '') {  
-        $lang = '_' . $prefix . '_' . strtoupper($this->module->getVar('mod_name'));
-		if(!empty($postfix) || $postfix != '_') {	
-			$ret = $lang . '_' . $postfix;
-		} elseif($postfix == '_') {
-			$ret = $lang . '_';
-		} else {
-			$ret = $lang;
-		}		
-		return $ret;
-	}
-	
-	/*
-	*  @public function getHeaderFilesComments
-	*  @param string $module
-	*  @param string $file_name
-	*/
-	public function getHeaderFilesComments($module, $file_name) {    
-		$this->module = $module;
-		$this->file_name = $file_name;
-		
-		$mod_name = $this->module->getVar('mod_name');
-		$mod_version = $this->module->getVar('mod_version');
-		$mod_since = $this->module->getVar('mod_since');
-		$mod_min_xoops = $this->module->getVar('mod_min_xoops');
-		$mod_author = $this->module->getVar('mod_author');
-		$mod_credits = $this->module->getVar('mod_credits');
-		$mod_author_mail = $this->module->getVar('mod_author_mail');
-		$mod_author_website_url = $this->module->getVar('mod_author_website_url');
-		$mod_license = $this->module->getVar('mod_license');  
-		$mod_subversion = $this->module->getVar('mod_subversion');
-		$date = date('D Y/m/d G:i:s');
-		$package = strtolower($mod_name);
-
-		$ret = <<<EOT
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-*/
-/**
- * {$mod_name} module for xoops
- *
- * @copyright       The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license         {$mod_license}
- * @package         {$package}
- * @since           {$mod_since}
- * @min_xoops       {$mod_min_xoops}
- * @author          {$mod_author} <{$mod_author_mail}> - <{$mod_author_website_url}>
- * @version         \$Id: {$mod_version} {$file_name} {$mod_subversion} {$date}Z {$mod_credits} \$
- */\n
-EOT;
-		return $ret;
-	}	
+    public function render() {}
 }
\ No newline at end of file

Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_about.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_about.php	                        (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_about.php	2014-05-16 14:20:30 UTC (rev 12534)
@@ -0,0 +1,71 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * tdmcreate module
+ *
+ * @copyright       The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license         GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package         tdmcreate
+ * @since           2.5.0
+ * @author          Txmod Xoops http://www.txmodxoops.org
+ * @version         $Id: 1.91 admin_about.php 12258 2014-01-02 09:33:29Z timgno $
+ */
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+class AdminAbout extends TDMCreateFile
+{	
+	/*
+	* @var string
+	*/
+	private $tdmcfile = null;
+	
+	/*
+	*  @public function constructor
+	*  @param string $modules
+	*  @param string $filename
+	*/
+	public function __construct($module, $filename) {    
+		$this->tdmcfile = TDMCreateFile::getInstance();
+		$this->setModule($module);
+		$this->setFileName($filename);
+	}
+	/*
+	*  @static function &getInstance
+	*  @param null
+	*/
+	public static function &getInstance($module, $filename)
+    {
+        static $instance = false;
+        if (!$instance) {
+            $instance = new self($module, $filename);
+        }
+        return $instance;
+    }
+	/*
+	*  @public function render
+	*  @param null
+	*/
+	public function render() { 		
+		$module = $this->getModule();
+		$filename = $this->getFileName();
+		$module_name = strtolower($module->getVar('mod_name'));
+        $module_donations = $module->getVar('mod_donations');			
+		$content = $this->getHeaderFilesComments($module, $filename);
+		$content .= <<<EOT
+include 'header.php';
+echo \$adminMenu->addNavigation('about.php');
+echo \$adminMenu->renderAbout('$module_donations', false);
+include 'footer.php';  
+EOT;
+		$this->tdmcfile->create($module_name, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		return $this->tdmcfile->renderFile();
+	}
+}
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_footer.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_footer.php	2014-05-14 20:51:54 UTC (rev 12533)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_footer.php	2014-05-16 14:20:30 UTC (rev 12534)
@@ -16,7 +16,7 @@
  * @package         tdmcreate
  * @since           2.5.0
  * @author          Txmod Xoops http://www.txmodxoops.org
- * @version         $Id: admin_footer.php 12258 2014-01-02 09:33:29Z timgno $
+ * @version         $Id: 1.91 admin_footer.php 12258 2014-01-02 09:33:29Z timgno $
  */
 defined('XOOPS_ROOT_PATH') or die('Restricted access');
 
@@ -26,26 +26,40 @@
 	* @var string
 	*/
 	private $tdmcfile = null;
+	
 	/*
 	*  @public function constructor
 	*  @param string $modules
+	*  @param string $filename
 	*/
-	public function __construct($module, $file_name) {    
+	public function __construct($module, $filename) {    
 		$this->tdmcfile = TDMCreateFile::getInstance();
 		$this->setModule($module);
-		$this->setFileName($file_name);
-	}	
+		$this->setFileName($filename);
+	}
 	/*
+	*  @static function &getInstance
+	*  @param null
+	*/
+	public static function &getInstance($module, $filename)
+    {
+        static $instance = false;
+        if (!$instance) {
+            $instance = new self($module, $filename);
+        }
+        return $instance;
+    }
+	/*
 	*  @public function render
 	*  @param null
 	*/
-	public function render() {    
-		$path = $this->getLocalPath('admin');
+	public function render() { 		
 		$module = $this->getModule();
 		$filename = $this->getFileName();
+		$module_name = strtolower($module->getVar('mod_name'));
 		$support_name = $module->getVar('mod_support_name');
 		$support_url = $module->getVar('mod_support_url');
-		$language = $this->getLanguage('AM');
+		$language = $this->getLanguage($module_name, 'AM');
 		$content = $this->getHeaderFilesComments($module, $filename);
 		$content .= <<<EOT
 \necho "<div class='center'><a href='http://www.xoops.org' title='Visit XOOPS' target='_blank'>
@@ -55,7 +69,7 @@
             <a href='{$support_url}' title='Visit {$support_name}' class='tooltip' rel='external'>{$support_name}</a></div>";
 xoops_cp_footer();  
 EOT;
-		$this->tdmcfile->create($path, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_header.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_header.php	2014-05-14 20:51:54 UTC (rev 12533)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_header.php	2014-05-16 14:20:30 UTC (rev 12534)
@@ -36,19 +36,30 @@
 		$this->setModule($module);
 		$this->setTable($table);
 		$this->setFileName($file_name);
-	}	
+	}
 	/*
+	*  @static function &getInstance
+	*  @param null
+	*/
+	public static function &getInstance($module, $table, $file_name)
+    {
+        static $instance = false;
+        if (!$instance) {
+            $instance = new self($module, $table, $file_name);
+        }
+        return $instance;
+    }	
+	/*
 	*  @public function render
 	*  @param null
 	*/
 	public function render() {    
-		$path = $this->getLocalPath('admin');
 		$module = $this->getModule();
 		$filename = $this->getFileName();
 		$module_name = $module->getVar('mod_name');
+		$table = $this->getTable();
 		$stl_mod_name = strtolower($module_name);
-		$ucfmod_name = ucfirst($module_name);
-		
+		$ucfmod_name = ucfirst($module_name);		
 		$language = $this->getLanguage('AM');
 		$content = $this->getHeaderFilesComments($module, $filename);
 		$content .= <<<EOT
@@ -57,7 +68,7 @@
 include_once \$thisPath.'/include/common.php';
 include_once \$thisPath.'/include/functions.php';
 EOT;
-		if ( $this->getTable()->getVar('table_name') != '' ) {
+		if ( $table->getVar('table_name') != '' ) {
 			$content .= <<<EOT
 \ninclude_once \$thisPath.'/class/helper.php';
 // Get instance
@@ -74,9 +85,9 @@
 \$modPathIcon16 = \$xoopsModule->getInfo('modicons16');
 \$modPathIcon32 = \$xoopsModule->getInfo('modicons32');\n
 EOT;
-		foreach (array_keys($this->table) as $i)
+		foreach (array_keys($table) as $i)
 		{
-			$table_name = $this->table[$i]->getVar('table_name');
+			$table_name = $table[$i]->getVar('table_name');
 			$content .= '$'.$table_name.'Handler =& xoops_getModuleHandler(\''.$table_name. '\', $thisModule);'.PHP_EOL;
 		}
 		$content .=<<<EOT
@@ -105,7 +116,7 @@
 xoops_cp_header();
 \$adminMenu = new ModuleAdmin();	
 EOT;
-		$this->tdmcfile->create($path, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_index.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_index.php	2014-05-14 20:51:54 UTC (rev 12533)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin_index.php	2014-05-16 14:20:30 UTC (rev 12534)
@@ -39,6 +39,18 @@
 		$this->setFileName($file_name);
 	}	
 	/*
+	*  @static function &getInstance
+	*  @param null
+	*/
+	public static function &getInstance($module, $table, $file_name)
+    {
+        static $instance = false;
+        if (!$instance) {
+            $instance = new self($module, $table, $file_name);
+        }
+        return $instance;
+    }
+	/*
 	*  @public function render
 	*  @param null
 	*/

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php	2014-05-14 20:51:54 UTC (rev 12533)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php	2014-05-16 14:20:30 UTC (rev 12534)
@@ -20,11 +20,23 @@
  */
 defined('XOOPS_ROOT_PATH') or die('Restricted access');
 require_once 'structure.php';
+require_once 'file.php';
+require_once 'admin_about.php';
+require_once 'admin_footer.php';
+require_once 'admin_header.php';
+require_once 'admin_index.php';
+require_once 'admin_menu.php';
+require_once 'css_styles.php';
+require_once 'include_functions.php';/**/
 class TDMCreateArchitecture
 {	
 	/*
 	* @var mixed
 	*/
+	private $tdmcreate = null;
+	/*
+	* @var mixed
+	*/
 	private $structure = null;
 	/*
 	* @var mixed
@@ -39,20 +51,21 @@
 	*  @param null
 	*/
 	public function __construct() {		
+		$this->tdmcreate = TDMCreate::getInstance();
 		$this->structure = TDMCreateStructure::getInstance();
 	}
 	/*
 	*  @private 'magic method' function __autoload classes
 	*  @param string $class_name
 	*/
-	private function __autoload($class_name) {
-		$filename = './'. $class_name . '.php';
-		if (file_exists($filename)) { 
+	protected function __autoload($class_name) {
+		$filename = $class_name . '.php';
+		if (is_readable($filename)) { 
 			include_once $filename; 
 			return true; 
 		} 
 		return false; 
-	}	
+	}
 	/*
 	*  @static function &getInstance
 	*  @param null
@@ -80,10 +93,10 @@
 		$this->upload_path = $path;
 	} 
 	/* 
-	*  @public function getArchitectureFiles
+	*  @public function createBaseFoldersFiles
 	*  @param string $module                              
 	*/
-	public function getArchitectureFiles( $module )
+	public function createBaseFoldersFiles( $module )
 	{	
 		$indexFile = $this->path.'/index.html';	
 		$docs_folder = $this->path.'/docs';
@@ -158,11 +171,48 @@
 	}	
 	
 	/* 
-	*  @public function getBuildingFiles
-	*  @param string $module                              
+	*  @public function createBuildingFiles
+	*  @param string $module
+    *  @param string $table	
 	*/
-	public function getBuildingFiles( $module, $table )
+	public function createBuildingFiles( $module, $table )
 	{	
-		//spl_autoload_register('__autoload');
+		$ret = '';
+		// Admin Aboutr File 
+		$adminAbout = AdminAbout::getInstance($module, 'about.php');
+		$admin_about = $adminAbout->render();
+		// Admin Footer File 
+		$adminFooter = AdminFooter::getInstance($module, 'footer.php');
+		$admin_footer = $adminFooter->render();
+		// Admin Header File 
+		//$adminHeader = AdminHeader::getInstance($module, $table, 'header.php');
+		// Admin Index File
+		//$adminIndex = AdminIndex::getInstance($module, $table, 'index.php');
+		// Admin Menu File
+		//$adminMenu = AdminMenu::getInstance($module, $table, 'menu.php');
+		// Admin Styles File
+		$cssStyles = CssStyles::getInstance($module, 'style.css');
+		// Admin Functions File
+		$includeFunctions = IncludeFunctions::getInstance($module, 'functions.php');
+		
+		/*foreach (array_keys($tables_arr) as $i)
+		{
+			
+		}*/
+		return array('admin_about' => $admin_about, 'admin_footer' => $admin_footer,//return $ret;
+		             //'admin_header' => $adminHeader->render(), 'admin_index' => $adminIndex->render(),
+                     //'admin_menu' => $adminMenu->render(), 'admin_footer' => $adminFooter->render(), 
+					 //'admin_footer' => $adminFooter->render(), 'admin_footer' => $adminFooter->render(), 
+                     //'admin_footer' => $adminFooter->render(), 'admin_footer' => $adminFooter->render(),
+                     //'admin_footer' => $adminFooter->render(), 'admin_footer' => $adminFooter->render(), 
+                     //'admin_footer' => $adminFooter->render(), 'admin_footer' => $adminFooter->render(), 
+                     //'admin_footer' => $adminFooter->render(), 'admin_footer' => $adminFooter->render(), 
+                     //'admin_footer' => $adminFooter->render(), 'admin_footer' => $adminFooter->render(), 
+                     //'admin_footer' => $adminFooter->render(), 'admin_footer' => $adminFooter->render(), 
+                     //'admin_footer' => $adminFooter->render(), 'admin_footer' => $adminFooter->render(), 
+                     //'admin_footer' => $adminFooter->render(), 'admin_footer' => $adminFooter->render(), 
+                     //'admin_footer' => $adminFooter->render(), 'admin_footer' => $adminFooter->render(), 
+                     //'admin_footer' => $adminFooter->render(), 'admin_footer' => $adminFooter->render(), 
+                    'css_style' => $cssStyles->render()/* , 'include_functions' => $includeFunctions->render()*/); 					 
 	}	
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/css_styles.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/css_styles.php	2014-05-14 20:51:54 UTC (rev 12533)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/css_styles.php	2014-05-16 14:20:30 UTC (rev 12534)
@@ -16,7 +16,7 @@
  * @package         tdmcreate
  * @since           2.5.0
  * @author          Txmod Xoops http://www.txmodxoops.org
- * @version         $Id: css_styles.php 12258 2014-01-02 09:33:29Z timgno $
+ * @version         $Id: 1.91 css_styles.php 12258 2014-01-02 09:33:29Z timgno $
  */
 defined('XOOPS_ROOT_PATH') or die('Restricted access');
 
@@ -29,23 +29,37 @@
 	/*
 	*  @public function constructor
 	*  @param string $module
-	*  @param string $file_name
+	*  @param string $filename
 	*/
-	public function __construct($module, $file_name) {    
+	public function __construct($module, $filename) {    
 		$this->tdmcfile = TDMCreateFile::getInstance();
 		$this->setModule($module);
-		$this->setFileName($file_name);
-	}	
+		$this->setFileName($filename);
+	}
+
 	/*
+	*  @static function &getInstance
+	*  @param null
+	*/
+	public static function &getInstance($module, $filename)
+    {
+        static $instance = false;
+        if (!$instance) {
+            $instance = new self($module, $filename);
+        }
+        return $instance;
+    }
+	
+	/*
 	*  @public function render
 	*  @param null
 	*/
 	public function render() {    
-		$path = $this->getLocalPath('css');
         $module = $this->getModule();
 		$filename = $this->getFileName();
-		$module_name = $module->getVar('mod_name');
-		$content <<<EOT
+		$module_name = strtolower($module->getVar('mod_name'));
+		$content = $this->getHeaderFilesComments($module, $filename);
+		$content .= <<<EOT
 table {
    margin: 0;
 }
@@ -73,9 +87,8 @@
    list-style-type: none;
    list-style-image: none;
 }
-
 EOT;
-		$this->tdmcfile->create($path, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, $filename, $content, 'css', _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/file.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/file.php	2014-05-14 20:51:54 UTC (rev 12533)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/file.php	2014-05-16 14:20:30 UTC (rev 12534)
@@ -20,13 +20,49 @@
  */
 defined('XOOPS_ROOT_PATH') or die('Restricted access');
 
-class TDMCreateFile extends TDMCreateAbstractFiles
-{	
+require_once 'abstractfiles.php';
+xoops_load('XoopsFile');
+class TDMCreateFile extends TDMCreateAbstractFiles {	
 	/*
 	* @var string
 	*/
-	private $xoopsfile = null;	
+	private $xoopsfile = null;
+
+    /**
+     * "module" attribute of the files
+     *
+     * @var mixed
+     */
+    private $module = null;
+
+    /**
+     * "filename" attribute of the files
+     *
+     * @var mixed
+     */
+    private $filename = null;
+
+    /**
+     * "path" attribute of the files
+     *
+     * @var string
+     */
+    private $path = null;
 	
+	/**
+     * "upload_path" attribute of the files
+     *
+     * @var string
+     */
+    private $upload_path = null;
+
+    /**
+     * "subdir" attribute of the files
+     *
+     * @var string
+     */
+    private $subdir = null;	
+	
 	/*
 	* @var string
 	*/
@@ -68,23 +104,170 @@
     }
 	
 	/*
-	*  @public function constructor
+	*  @public function create
+	*  @param string $module_name
+	*  @param string $filename
 	*  @param string $content
+	*  @param mixed $created
+	*  @param mixed $notcreated
+	*  @param string $mode
 	*/
-	public function create($path, $file_name, $content = '', $created = false, $notcreated = false, $mode = 'w+') {  		
-		$this->setFileName($file_name);
+	public function create($module_name, $subdir = null, $filename, $content = '', $created = false, $notcreated = false, $mode = 'w+') {  		
+		$this->setFileName($filename);
 		$this->created = $created;
 		$this->notcreated = $notcreated;		
 		$this->setMode($mode);
-		if(isset($path)){
-			$this->setUploadPath($path);
-		}
-		if(!empty($content) && is_string($content)){
+		$this->setModulePath($module_name);
+		if(!empty($content) && is_string($content)) {
 			$this->setContent($content);
+		}	
+        if((!empty($subdir) || $subdir != null) && is_string($subdir)) {
+			$this->setSubDir($subdir);
 		}		
-	}	
+	}
 	
 	/*
+	*  @private function setPath
+	*  @param string $folder_name
+	*/
+	private function setPath($folder_name) {
+        $this->path = TDMC_PATH . DIRECTORY_SEPARATOR . $folder_name;
+    }
+	
+	/*
+	*  @private function getPath
+	*  @param null
+	*/
+	private function getPath() {
+        return $this->path;
+    }	
+		
+	/*
+	*  @private function setModulePath
+	*  @param string $folder_name
+	*/
+	private function setModulePath($folder_name) {
+        $this->upload_path = TDMC_UPLOAD_MODULES_PATH . DIRECTORY_SEPARATOR . $folder_name;
+    }
+	
+	/*
+	*  @private function getModulePath
+	*  @param null
+	*/
+    private function getModulePath() {
+        return $this->upload_path;
+    }
+	
+	/*
+	*  @private function setSubDir
+	*  @param string $subdir
+	*/
+	private function setSubDir($subdir) {
+        $this->subdir = $subdir;
+    }
+	
+	/*
+	*  @private function getSubDir
+	*  @param null
+	*/
+	private function getSubDir() {
+        return $this->subdir;
+    }
+
+	/**
+     * public function setFileName
+     * @param mixed $module
+     */
+    public function setModule($module) {
+        $this->module = $module;
+    }
+	
+	/*
+	*  @public function getModule
+	*  @param null
+	*/
+    public function getModule()
+    {
+        return $this->module;
+    }
+	
+	/**
+     * public function setTable
+     * @param mixed $table
+     */
+    public function setTable($table) {
+        if (is_array($table)) {
+            foreach($table as $t) {
+                $this->table[] = $t;
+            }
+        } elseif (is_array($this->table)) {
+            $this->table[] = $table;
+        } else {
+            $this->table = $table;
+        }
+    }
+	
+	/*
+	*  @public function getTable
+	*  @param null
+	*/
+	public function getTable() {   		 
+		if (is_array($this->table)) {
+            $ret = array();
+            foreach ($this->table as $table) {
+                $ret[] = $table;
+            }
+            return $ret;
+        }
+	}
+	
+	/**
+     * @public function setFields
+     * @param mixed $fields
+     */
+    public function setFields($fields) {
+        if (is_array($fields)) {
+            foreach($fields as $f) {
+                $this->fields[] = $f;
+            }
+        } elseif (is_array($this->fields)) {
+            $this->fields[] = $fields;
+        } else {
+            $this->fields = $fields;
+        }
+    }
+	
+	/*
+	*  @public function getFields
+	*  @param null
+	*/
+	public function getFields() {   		 
+		if (is_array($this->fields)) {
+            $ret = array();
+            foreach ($this->fields as $fields) {
+                $ret[] = $fields;
+            }
+            return $ret;
+        } 
+	}
+	
+	/**
+     * public function setFileName
+     * @param mixed $file_name
+     */
+    public function setFileName($filename) {
+        $this->filename = $filename;
+    }
+	
+	/*
+	*  @public function getFileName
+	*  @param null
+	*/
+    public function getFileName() {
+        return $this->filename;
+    }
+	
+	/*
 	*  @private function setContent
 	*  @param string $content
 	*/
@@ -105,7 +288,7 @@
 	*  @param null
 	*/
 	private function getFolderName() {
-        $path = $this->path();
+        $path = $this->getUploadPath();
 		if(strrpos($path, '/'))  
 		{       
 			$str = strrpos($path, '/'); 
@@ -113,6 +296,19 @@
 				return substr($path, $str + 1, strlen($path));
 			} 
 		}		
+    }
+
+    /* 
+	*  @public function getUploadPath
+	*  @param mixed $subdir
+	*/
+    private function getUploadPath() {
+		if ($this->getSubDir() != null) {
+			$ret = $this->getModulePath() . DIRECTORY_SEPARATOR . $this->getSubDir();
+		} else {
+            $ret = $this->getModulePath();
+        }
+        return $ret;
     }	
 	
 	/*
@@ -148,31 +344,96 @@
     }
 	
 	/*
+	*  @public function getLanguage
+	*  @param string $prefix
+	*  @param string $postfix
+	*/
+	public function getLanguage($module_name, $prefix = '', $postfix = '') {  
+        $lang = '_' . $prefix . '_' . $module_name;
+		if(!empty($postfix) || $postfix != '_') {	
+			$ret = $lang . '_' . $postfix;
+		} elseif($postfix == '_') {
+			$ret = $lang . '_';
+		} else {
+			$ret = $lang;
+		}		
+		return $ret;
+	}
+	
+	/*
+	*  @public function getHeaderFilesComments
+	*  @param string $module
+	*  @param string $file_name
+	*/
+	public function getHeaderFilesComments($module, $filename) {    
+				
+		$mod_name = $module->getVar('mod_name');
+		$mod_version = $module->getVar('mod_version');
+		$mod_since = $module->getVar('mod_since');
+		$mod_min_xoops = $module->getVar('mod_min_xoops');
+		$mod_author = $module->getVar('mod_author');
+		$mod_credits = $module->getVar('mod_credits');
+		$mod_author_mail = $module->getVar('mod_author_mail');
+		$mod_author_website_url = $module->getVar('mod_author_website_url');
+		$mod_license = $module->getVar('mod_license');  
+		$mod_subversion = $module->getVar('mod_subversion');
+		$date = date('D Y/m/d G:i:s');
+		$package = strtolower($mod_name);
+
+		$ret = <<<EOT
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+/**
+ * {$mod_name} module for xoops
+ *
+ * @copyright       The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license         {$mod_license}
+ * @package         {$package}
+ * @since           {$mod_since}
+ * @min_xoops       {$mod_min_xoops}
+ * @author          {$mod_author} <{$mod_author_mail}> - <{$mod_author_website_url}>
+ * @version         \$Id: {$mod_version} {$filename} {$mod_subversion} {$date}Z {$mod_credits} \$
+ */\n
+EOT;
+		return $ret;
+	}
+	
+	/*
 	*  @public function renderFile
 	*  @param null
 	*/	
-	public function renderFile() {
-		$path = $this->getPath();
+	public function renderFile() {		
+		$filename = $this->getFileName();
+		$path = $this->getUploadPath() . DIRECTORY_SEPARATOR . $filename;		
+		$created = $this->getCreated();
+		$notcreated = $this->getNotCreated();
 		$folder_name = $this->getFolderName();
-		$file_name = $this->getFileName();
-		$created = $this->getCreated();
-		$notcreated = $this->getNotCreated();		
-		$this->xoopsfile->__construct($path, true);
-		// Integration of the content of file		
-		if($this->xoopsfile->open($this->getMode()) == false) {
-            $GLOBALS['xoopsTpl']->assign('notcreated', sprintf($notcreated, $file_name, $folder_name));
-			return false;
-		}
-		if($this->xoopsfile->is_writable($path)) {
-			if ($this->xoopsfile->write($this->getContent()) == false) {
-				$GLOBALS['xoopsTpl']->assign('notcreated', sprintf($notcreated, $file_name, $folder_name));			 
-				exit;
+		// Force to create file if not exist
+		if(!$this->xoopsfile->exists()) {						
+			if(!$this->xoopsfile->__construct($path, true)) {
+				// Which mode to open the file
+				if($this->xoopsfile->open($this->getMode()) == false) {
+					$GLOBALS['xoopsTpl']->assign('notcreated', sprintf($notcreated, $filename, $folder_name));
+				}
+				// Integration of the content in the file
+				if ($this->xoopsfile->write($this->getContent()) == false) {
+					$GLOBALS['xoopsTpl']->assign('notcreated', sprintf($notcreated, $filename, $folder_name));
+                    exit();					
+				}						
+			} else {
+				// Created
+				$GLOBALS['xoopsTpl']->assign('created', sprintf($created, $filename, $folder_name));
 			}
-			$GLOBALS['xoopsTpl']->assign('created', sprintf($created, $file_name, $folder_name));   
-			$this->xoopsfile->close();
-		} else {
-			$GLOBALS['xoopsTpl']->assign('notcreated', sprintf($notcreated, $file_name, $folder_name));
 		}
-		return $GLOBALS['xoopsTpl']->fetch("db:tdmcreate_building.html");	
+		$this->xoopsfile->close();
+		return $GLOBALS['xoopsTpl']->fetch('db:building.tpl');	
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_functions.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_functions.php	2014-05-14 20:51:54 UTC (rev 12533)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include_functions.php	2014-05-16 14:20:30 UTC (rev 12534)
@@ -16,7 +16,7 @@
  * @package         tdmcreate
  * @since           2.5.0
  * @author          Txmod Xoops http://www.txmodxoops.org
- * @version         $Id: include_functions.php 12258 2014-01-02 09:33:29Z timgno $
+ * @version         $Id: 1.91 include_functions.php 12258 2014-01-02 09:33:29Z timgno $
  */
 defined('XOOPS_ROOT_PATH') or die('Restricted access');
 
@@ -29,13 +29,26 @@
 	/*
 	*  @public function constructor
 	*  @param string $module
-	*  @param string $file_name
+	*  @param string $filename
 	*/
-	public function __construct($module, $file_name) {    
+	public function __construct($module, $filename) {    
 		$this->tdmcfile = TDMCreateFile::getInstance();
 		$this->setModule($module);
-		$this->setFileName($file_name);
+		$this->setFileName($filename);
 	}
+	
+	/*
+	*  @static function &getInstance
+	*  @param null
+	*/
+	public static function &getInstance($module, $filename)
+    {
+        static $instance = false;
+        if (!$instance) {
+            $instance = new self($module, $filename);
+        }
+        return $instance;
+    }
 
 	/*
 	*  @public function getFunctionBlock
@@ -133,16 +146,16 @@
 	*  @param null
 	*/
 	public function render() {    
-		$path = $this->getLocalPath('include');
 		$module = $this->getModule();
 		$filename = $this->getFileName();
+		$module_name = strtolower($module->getVar('mod_name'));
 		$content = $this->getHeaderFilesComments($module, $filename);
 		$content .= $this->getFunctionBlock($module_name);
 		$content .= $this->getFunctionCleanVars($module_name);
 		$content .= $this->getFunctionMetaKeywords($module_name);
 		$content .= $this->getFunctionMetaDescription($module_name);
 
-		$this->tdmcfile->create($path, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+		$this->tdmcfile->create($module_name, $filename, $content, 'include', _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}
 }
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/modules.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/modules.php	2014-05-14 20:51:54 UTC (rev 12533)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/modules.php	2014-05-16 14:20:30 UTC (rev 12534)
@@ -111,7 +111,7 @@
 	*/
 	public function getForm($action = false)
     {
-		global $pathIcon32;
+		global $sysPathIcon32;
 		
         if ($action === false) {
             $action = $_SERVER['REQUEST_URI'];
@@ -186,9 +186,9 @@
 
 		//---------- START LOGO GENERATOR -----------------    
 		$tables_img = $this->getVar('table_image') ? $this->getVar('table_image') : 'about.png';
-		 if(is_dir($pathIcon32)){
-			$uploadirectory = $pathIcon32; 
-			$imgpath = sprintf(_AM_TDMCREATE_FORMIMAGE_PATH, "./{$pathIcon32}");
+		 if(is_dir($sysPathIcon32)){
+			$uploadirectory = $sysPathIcon32; 
+			$imgpath = sprintf(_AM_TDMCREATE_FORMIMAGE_PATH, "./{$sysPathIcon32}");
 		} else {
 			$uploadirectory = "/uploads/".$GLOBALS['xoopsModule']->dirname()."/images/tables";
 			$imgpath = sprintf(_AM_TDMCREATE_FORMIMAGE_PATH, "./uploads/".$GLOBALS['xoopsModule']->dirname()."/images/tables");

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/functions.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/functions.php	2014-05-14 20:51:54 UTC (rev 12533)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/functions.php	2014-05-16 14:20:30 UTC (rev 12534)
@@ -36,27 +36,26 @@
 }
 
 function TDMCreate_clearDir($folder) {
-	$opening=@opendir($folder);
+	$opening = @opendir($folder);
 	if (!$opening) return;
-	while($fields=readdir($opening)) {
-		if ($fields == '.' || $fields == '..') continue;
-		if (is_dir($folder."/".$fields)) {
-			$r=TDMCreate_clearDir($folder."/".$fields);
+	while($file = readdir($opening)) {
+		if ($file == '.' || $file == '..') continue;
+		if (is_dir($folder."/".$file)) {
+			$r = TDMCreate_clearDir($folder."/".$file);
 			if (!$r) return false;
-		}
-		else {
-			$r=@unlink($folder."/".$fields);
+		} else {
+			$r = @unlink($folder."/".$file);
 			if (!$r) return false;
 		}
 	}
 	closedir($opening);
-	$r=@rmdir($folder);
+	$r = @rmdir($folder);
 	if (!$r) return false;
 	return true;
 }
 
 /**
- * Copy a fields, or a folder and its contents
+ * Copy a file, or a folder and its contents
  *
  * @author      Aidan Li...
 
[truncated message content]

[xoops-svn] SF.net SVN: xoops-svn:[12533] XoopsCore/branches/2.5.x/2.5.7/htdocs/class/ xoopsform/formdatetime.php

From: <rgr...@us...> - 2014-05-14 20:51:57

Revision: 12533
          http://sourceforge.net/p/xoops/svn/12533
Author:   rgriffith
Date:     2014-05-14 20:51:54 +0000 (Wed, 14 May 2014)
Log Message:
-----------
Honor showtime parameter

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdatetime.php

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdatetime.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdatetime.php	2014-05-14 19:38:33 UTC (rev 12532)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdatetime.php	2014-05-14 20:51:54 UTC (rev 12533)
@@ -45,17 +45,23 @@
         $value = ($value > 0) ? $value : time();
         $datetime = getDate($value);
         $this->addElement(new XoopsFormTextDateSelect('', $name . '[date]', $size, $value, $showtime));
-        $timearray = array();
-        for ($i = 0; $i < 24; $i ++) {
-            for ($j = 0; $j < 60; $j = $j + 10) {
-                $key = ($i * 3600) + ($j * 60);
-                $timearray[$key] = ($j != 0) ? $i . ':' . $j : $i . ':0' . $j;
+
+        if ($showtime) {
+            $timearray = array();
+            for ($i = 0; $i < 24; $i++) {
+                for ($j = 0; $j < 60; $j = $j + 10) {
+                    $key = ($i * 3600) + ($j * 60);
+                    $timearray[$key] = ($j != 0) ? $i . ':' . $j : $i . ':0' . $j;
+                }
             }
+            ksort($timearray);
+
+            $timeselect = new XoopsFormSelect('', $name . '[time]', $datetime['hours'] * 3600 + 600 * ceil($datetime['minutes'] / 10));
+            $timeselect->addOptionArray($timearray);
+            $this->addElement($timeselect);
+        } else {
+            $this->addElement(new XoopsFormHidden($name . '[time]', 0));
         }
-        ksort($timearray);
 
-        $timeselect = new XoopsFormSelect('', $name . '[time]', $datetime['hours'] * 3600 + 600 * ceil($datetime['minutes'] / 10));
-        $timeselect->addOptionArray($timearray);
-        $this->addElement($timeselect);
     }
 }

[xoops-svn] SF.net SVN: xoops-svn:[12532] XoopsCore/branches/2.5.x/2.5.7/docs/changelog .250.txt

From: <be...@us...> - 2014-05-14 19:38:36

Revision: 12532
          http://sourceforge.net/p/xoops/svn/12532
Author:   beckmi
Date:     2014-05-14 19:38:33 +0000 (Wed, 14 May 2014)
Log Message:
-----------
Updating Changelog

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt

Modified: XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt	2014-05-14 19:30:52 UTC (rev 12531)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt	2014-05-14 19:38:33 UTC (rev 12532)
@@ -10,6 +10,8 @@
 - renamed .html Smarty templates to .tpl in modules Profile and PM (mamba)
 - corrected English typos (cesag)
 - added missing .php file extension (AngeloRocha/Zyspec/rgriffith)
+- deprecated destoryVars($var) in object.php (cesag/rgriffith)
+- update phpmailer translation array to include all keys, and remove reassignment of $PHPMAILER_LANG as array() (cesag/rgriffith)
 
 Updated:
  - TinyMCE to 3.5.11 (mamba)

[xoops-svn] SF.net SVN: xoops-svn:[12531] XoopsCore/branches/2.5.x/2.5.7/htdocs/class/ mail/phpmailer/language/phpmailer.lang-en.php

From: <rgr...@us...> - 2014-05-14 19:30:57

Revision: 12531
          http://sourceforge.net/p/xoops/svn/12531
Author:   rgriffith
Date:     2014-05-14 19:30:52 +0000 (Wed, 14 May 2014)
Log Message:
-----------
Update phpmailer translation array to include all keys, and remove reassignment of $PHPMAILER_LANG as array()

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mail/phpmailer/language/phpmailer.lang-en.php

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mail/phpmailer/language/phpmailer.lang-en.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mail/phpmailer/language/phpmailer.lang-en.php	2014-05-14 19:27:35 UTC (rev 12530)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mail/phpmailer/language/phpmailer.lang-en.php	2014-05-14 19:30:52 UTC (rev 12531)
@@ -4,19 +4,20 @@
  * English Version
  */
 
-$PHPMAILER_LANG = array();
-
-$PHPMAILER_LANG["provide_address"] = 'You must provide at least one ' .
-                                     'recipient email address.';
-$PHPMAILER_LANG["mailer_not_supported"] = ' mailer is not supported.';
-$PHPMAILER_LANG["execute"] = 'Could not execute: ';
-$PHPMAILER_LANG["instantiate"] = 'Could not instantiate mail function.';
-$PHPMAILER_LANG["authenticate"] = 'SMTP Error: Could not authenticate.';
-$PHPMAILER_LANG["from_failed"] = 'The following From address failed: ';
-$PHPMAILER_LANG["recipients_failed"] = 'SMTP Error: The following ' .
-                                       'recipients failed: ';
-$PHPMAILER_LANG["data_not_accepted"] = 'SMTP Error: Data not accepted.';
-$PHPMAILER_LANG["connect_host"] = 'SMTP Error: Could not connect to SMTP host.';
-$PHPMAILER_LANG["file_access"] = 'Could not access file: ';
-$PHPMAILER_LANG["file_open"] = 'File Error: Could not open file: ';
-$PHPMAILER_LANG["encoding"] = 'Unknown encoding: ';
+$PHPMAILER_LANG['provide_address'] = 'You must provide at least one recipient email address.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer is not supported.';
+$PHPMAILER_LANG['execute'] = 'Could not execute: ';
+$PHPMAILER_LANG['instantiate'] = 'Could not instantiate mail function.';
+$PHPMAILER_LANG['authenticate'] = 'SMTP Error: Could not authenticate.';
+$PHPMAILER_LANG['from_failed'] = 'The following From address failed: ';
+$PHPMAILER_LANG['recipients_failed'] = 'SMTP Error: The following recipients failed: ';
+$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Error: Data not accepted.';
+$PHPMAILER_LANG['connect_host'] = 'SMTP Error: Could not connect to SMTP host.';
+$PHPMAILER_LANG['file_access'] = 'Could not access file: ';
+$PHPMAILER_LANG['file_open'] = 'File Error: Could not open file: ';
+$PHPMAILER_LANG['encoding'] = 'Unknown encoding: ';
+$PHPMAILER_LANG['signing'] = 'Signing Error: ';
+$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+$PHPMAILER_LANG['empty_message'] = 'Message body empty';
+$PHPMAILER_LANG['invalid_address'] = 'Invalid address';
+$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: ';

[xoops-svn] SF.net SVN: xoops-svn:[12530] XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/ object.php

From: <rgr...@us...> - 2014-05-14 19:27:39

Revision: 12530
          http://sourceforge.net/p/xoops/svn/12530
Author:   rgriffith
Date:     2014-05-14 19:27:35 +0000 (Wed, 14 May 2014)
Log Message:
-----------
Add a destroyVars() method and deprecate destoryVars()

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/object.php

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/object.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/object.php	2014-05-13 09:47:33 UTC (rev 12529)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/object.php	2014-05-14 19:27:35 UTC (rev 12530)
@@ -295,7 +295,7 @@
      *
      * @return bool
      */
-    function destoryVars($var)
+    function destroyVars($var)
     {
         if (empty($var)) {
             return true;
@@ -312,6 +312,15 @@
     }
 
     /**
+     * @deprecated use destroyVars() instead
+     */
+    function destoryVars($var)
+    {
+        return $this->destroyVars($var);
+    }
+
+
+    /**
      * Assign values to multiple variables in a batch
      *
      * Meant for a CGI contenxt:

[xoops-svn] SF.net SVN: xoops-svn:[12529] XoopsModules

From: <be...@us...> - 2014-05-13 09:47:37

Revision: 12529
          http://sourceforge.net/p/xoops/svn/12529
Author:   beckmi
Date:     2014-05-13 09:47:33 +0000 (Tue, 13 May 2014)
Log Message:
-----------
removing "default" for text fields

Modified Paths:
--------------
    XoopsModules/dms/releases/1.91/sql/mysql.sql
    XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-restructure.sql
    XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-searchindex.sql
    XoopsModules/mediawiki/trunk/mediawiki/maintenance/mysql5/tables.sql
    XoopsModules/mediawiki/trunk/mediawiki/maintenance/tables.sql
    XoopsModules/modulepacks/basicmodulepack/trunk/modules/xoopsheadline/sql/mysql.sql
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/sql/mysql.sql
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/sql/mysql.sql
    XoopsModules/mytube/releases/1.04/mytube/sql/xoopstube.sql
    XoopsModules/umfrage/trunk/umfrage/sql/mysql.sql
    XoopsModules/wfdownloads/branches/luciorota/wfdownloads/sql/wfdownloads.sql
    XoopsModules/wfdownloads/branches/mamba/wfdownloads/sql/mysql.sql
    XoopsModules/wfdownloads/trunk/wfdownloads/sql/mysql.sql
    XoopsModules/wflink/trunk/htdocs/modules/wflinks/sql/wflinks.sql
    XoopsModules/xoalbum/trunk/xoalbum/sql/mysql.sql
    XoopsModules/xoopsheadline/branches/ZySpec/xoopsheadline/sql/mysql.sql
    XoopsModules/xoopsheadline/trunk/xoopsheadline/sql/mysql.sql
    XoopsModules/xoopspoll/branches/zyspec/sql/mysql.sql
    XoopsModules/xoopstube/trunk/xoopstube/sql/xoopstube.sql

Modified: XoopsModules/dms/releases/1.91/sql/mysql.sql
===================================================================
--- XoopsModules/dms/releases/1.91/sql/mysql.sql	2014-05-12 14:20:13 UTC (rev 12528)
+++ XoopsModules/dms/releases/1.91/sql/mysql.sql	2014-05-13 09:47:33 UTC (rev 12529)
@@ -247,7 +247,7 @@
 CREATE TABLE dms_object_version_comments (
   row_id bigint(14) unsigned NOT NULL auto_increment,
   dov_row_id bigint(14) unsigned NOT NULL default '0',
-  comment text NOT NULL default '',
+  comment text NOT NULL,
   PRIMARY KEY (row_id)
 ) TYPE=MyISAM;
 
@@ -373,7 +373,7 @@
 CREATE TABLE dms_groups (
   group_id bigint(14) unsigned NOT NULL auto_increment,
   group_name varchar(50) NOT NULL default '',
-  group_description text NOT NULL default '',
+  group_description text NOT NULL,
   group_type varchar(10) NOT NULL default 'PERMS',
   PRIMARY KEY (group_id)
 ) TYPE=MyISAM;

Modified: XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-restructure.sql
===================================================================
--- XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-restructure.sql	2014-05-12 14:20:13 UTC (rev 12528)
+++ XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-restructure.sql	2014-05-13 09:47:33 UTC (rev 12529)
@@ -51,7 +51,7 @@
 --
 -- CREATE TABLE /*$wgDBprefix*/text (
 --   old_id int(8) unsigned NOT NULL auto_increment,
---   old_text mediumtext NOT NULL default '',
+--   old_text mediumtext NOT NULL,
 --   old_flags tinyblob NOT NULL default '',
 --   
 --   PRIMARY KEY old_id (old_id)

Modified: XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-searchindex.sql
===================================================================
--- XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-searchindex.sql	2014-05-12 14:20:13 UTC (rev 12528)
+++ XoopsModules/mediawiki/trunk/mediawiki/maintenance/archives/patch-searchindex.sql	2014-05-13 09:47:33 UTC (rev 12529)
@@ -15,7 +15,7 @@
   si_title varchar(255) NOT NULL default '',
   
   -- Munged version of body text
-  si_text mediumtext NOT NULL default '',
+  si_text mediumtext NOT NULL,
   
   UNIQUE KEY (si_page)
 

Modified: XoopsModules/mediawiki/trunk/mediawiki/maintenance/mysql5/tables.sql
===================================================================
--- XoopsModules/mediawiki/trunk/mediawiki/maintenance/mysql5/tables.sql	2014-05-12 14:20:13 UTC (rev 12528)
+++ XoopsModules/mediawiki/trunk/mediawiki/maintenance/mysql5/tables.sql	2014-05-13 09:47:33 UTC (rev 12529)
@@ -89,7 +89,7 @@
   
   -- Note: email should be restricted, not public info.
   -- Same with passwords.
-  user_email tinytext NOT NULL default '',
+  user_email tinytext NOT NULL,
   
   -- Newline-separated list of name=value defining the user
   -- preferences
@@ -862,7 +862,7 @@
   si_title varchar(255) NOT NULL default '',
   
   -- Munged version of body text
-  si_text mediumtext NOT NULL default '',
+  si_text mediumtext NOT NULL,
   
   UNIQUE KEY (si_page),
   FULLTEXT si_title (si_title),

Modified: XoopsModules/mediawiki/trunk/mediawiki/maintenance/tables.sql
===================================================================
--- XoopsModules/mediawiki/trunk/mediawiki/maintenance/tables.sql	2014-05-12 14:20:13 UTC (rev 12528)
+++ XoopsModules/mediawiki/trunk/mediawiki/maintenance/tables.sql	2014-05-13 09:47:33 UTC (rev 12529)
@@ -76,7 +76,7 @@
   
   -- Note: email should be restricted, not public info.
   -- Same with passwords.
-  user_email tinytext NOT NULL default '',
+  user_email tinytext NOT NULL,
   
   -- Newline-separated list of name=value defining the user
   -- preferences
@@ -848,7 +848,7 @@
   si_title varchar(255) NOT NULL default '',
   
   -- Munged version of body text
-  si_text mediumtext NOT NULL default '',
+  si_text mediumtext NOT NULL,
   
   UNIQUE KEY (si_page),
   FULLTEXT si_title (si_title),

Modified: XoopsModules/modulepacks/basicmodulepack/trunk/modules/xoopsheadline/sql/mysql.sql
===================================================================
--- XoopsModules/modulepacks/basicmodulepack/trunk/modules/xoopsheadline/sql/mysql.sql	2014-05-12 14:20:13 UTC (rev 12528)
+++ XoopsModules/modulepacks/basicmodulepack/trunk/modules/xoopsheadline/sql/mysql.sql	2014-05-13 09:47:33 UTC (rev 12529)
@@ -13,7 +13,7 @@
   headline_mainmax tinyint(2) unsigned NOT NULL default '10',
   headline_blockimg tinyint(1) unsigned NOT NULL default '0',
   headline_blockmax tinyint(2) unsigned NOT NULL default '10',
-  headline_xml text NOT NULL default '',
+  headline_xml text NOT NULL,
   headline_updated int(10) NOT NULL default'0',
   PRIMARY KEY  (headline_id)
 ) ENGINE=MyISAM;

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/sql/mysql.sql
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/sql/mysql.sql	2014-05-12 14:20:13 UTC (rev 12528)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopsheadline/sql/mysql.sql	2014-05-13 09:47:33 UTC (rev 12529)
@@ -13,7 +13,7 @@
   headline_mainmax tinyint(2) unsigned NOT NULL default '10',
   headline_blockimg tinyint(1) unsigned NOT NULL default '0',
   headline_blockmax tinyint(2) unsigned NOT NULL default '10',
-  headline_xml text NOT NULL default '',
+  headline_xml text NOT NULL,
   headline_updated int(10) NOT NULL default'0',
   PRIMARY KEY  (headline_id)
 ) ENGINE=MyISAM;

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/sql/mysql.sql
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/sql/mysql.sql	2014-05-12 14:20:13 UTC (rev 12528)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/xoopspoll/sql/mysql.sql	2014-05-13 09:47:33 UTC (rev 12529)
@@ -21,7 +21,7 @@
 CREATE TABLE mod_xoopspoll_desc (
   poll_id mediumint(8) unsigned NOT null auto_increment,
   question varchar(255) NOT null default '',
-  description tinytext NOT null default '',
+  description tinytext NOT NULL,
   user_id int(5) unsigned NOT null default '0',
   start_time int(10) unsigned NOT null default '0',
   end_time int(10) unsigned NOT null default '0',

Modified: XoopsModules/mytube/releases/1.04/mytube/sql/xoopstube.sql
===================================================================
--- XoopsModules/mytube/releases/1.04/mytube/sql/xoopstube.sql	2014-05-12 14:20:13 UTC (rev 12528)
+++ XoopsModules/mytube/releases/1.04/mytube/sql/xoopstube.sql	2014-05-13 09:47:33 UTC (rev 12529)
@@ -114,8 +114,8 @@
   `vidrating` tinyint(1) NOT NULL default '0',
   `time` varchar(7) NOT NULL default '0:00:00',
   `keywords` varchar(255) NOT NULL default '',
-  `item_tag` text NOT NULL default '',
-  `picurl` text NOT NULL default '',
+  `item_tag` text NOT NULL,
+  `picurl` text NOT NULL,
   PRIMARY KEY  (`requestid`)
 ) ENGINE=MyISAM COMMENT='MyTube by McDonald' AUTO_INCREMENT=1 ;
 
@@ -149,8 +149,8 @@
   `vidrating` tinyint(1) NOT NULL default '0',
   `time` varchar(7) NOT NULL default '0:00:00',
   `keywords` varchar(255) NOT NULL default '',
-  `item_tag` text NOT NULL default '',
-  `picurl` text NOT NULL default '',
+  `item_tag` text NOT NULL,
+  `picurl` text NOT NULL,
   PRIMARY KEY  (`lid`),
   KEY `cid` (`cid`),
   KEY `status` (`status`),

Modified: XoopsModules/umfrage/trunk/umfrage/sql/mysql.sql
===================================================================
--- XoopsModules/umfrage/trunk/umfrage/sql/mysql.sql	2014-05-12 14:20:13 UTC (rev 12528)
+++ XoopsModules/umfrage/trunk/umfrage/sql/mysql.sql	2014-05-13 09:47:33 UTC (rev 12529)
@@ -27,7 +27,7 @@
 CREATE TABLE umfrage_desc (
   poll_id mediumint(8) unsigned NOT NULL auto_increment,
   question varchar(255) NOT NULL default '',
-  description tinytext NOT NULL default '',
+  description tinytext NOT NULL,
   user_id int(5) unsigned NOT NULL default '0',
   start_time int(10) unsigned NOT NULL default '0',
   end_time int(10) unsigned NOT NULL default '0',

Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/sql/wfdownloads.sql
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/sql/wfdownloads.sql	2014-05-12 14:20:13 UTC (rev 12528)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/sql/wfdownloads.sql	2014-05-13 09:47:33 UTC (rev 12529)
@@ -32,7 +32,7 @@
     pid int(5) unsigned NOT NULL default '0',
     title varchar(255) NOT NULL default '',
     imgurl varchar(255) NOT NULL default '',
-    description text NOT NULL default '',
+    description text NOT NULL,
     total int(11) NOT NULL default '0',
     summary text NOT NULL,
     spotlighttop int(11) NOT NULL default '0',

Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/sql/mysql.sql
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/sql/mysql.sql	2014-05-12 14:20:13 UTC (rev 12528)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/sql/mysql.sql	2014-05-13 09:47:33 UTC (rev 12529)
@@ -32,7 +32,7 @@
     pid int(5) unsigned NOT NULL default '0',
     title varchar(255) NOT NULL default '',
     imgurl varchar(255) NOT NULL default '',
-    description text NOT NULL default '',
+    description text NOT NULL,
     total int(11) NOT NULL default '0',
     summary text NOT NULL,
     spotlighttop int(11) NOT NULL default '0',
@@ -101,7 +101,7 @@
     ipaddress varchar(120) NOT NULL default '0',
     notifypub int(1) NOT NULL default '0',
     formulize_idreq int(5) NOT NULL default '0',
-    screenshots text NOT NULL default '',
+    screenshots text NOT NULL,
     dohtml tinyint(1) NOT NULL default '0',
     dosmiley tinyint(1) NOT NULL default '1',
     doxcode tinyint(1) NOT NULL default '1',

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/sql/mysql.sql
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/sql/mysql.sql	2014-05-12 14:20:13 UTC (rev 12528)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/sql/mysql.sql	2014-05-13 09:47:33 UTC (rev 12529)
@@ -32,7 +32,7 @@
     pid int(5) unsigned NOT NULL default '0',
     title varchar(255) NOT NULL default '',
     imgurl varchar(255) NOT NULL default '',
-    description text NOT NULL default '',
+    description text NOT NULL,
     total int(11) NOT NULL default '0',
     summary text NOT NULL,
     spotlighttop int(11) NOT NULL default '0',
@@ -101,7 +101,7 @@
     ipaddress varchar(120) NOT NULL default '0',
     notifypub int(1) NOT NULL default '0',
     formulize_idreq int(5) NOT NULL default '0',
-    screenshots text NOT NULL default '',
+    screenshots text NOT NULL,
     dohtml tinyint(1) NOT NULL default '0',
     dosmiley tinyint(1) NOT NULL default '1',
     doxcode tinyint(1) NOT NULL default '1',

Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/sql/wflinks.sql
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/sql/wflinks.sql	2014-05-12 14:20:13 UTC (rev 12528)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/sql/wflinks.sql	2014-05-13 09:47:33 UTC (rev 12529)
@@ -167,7 +167,7 @@
   `requestdate` int(11) NOT NULL default '0',
   `urlrating` tinyint(1) NOT NULL default '0',
   `country` varchar(5) NOT NULL default '',
-  `keywords` text NOT NULL default '',
+  `keywords` text NOT NULL,
   `item_tag` text NOT NULL,
   `googlemap` text NOT NULL,
   `yahoomap` text NOT NULL,

Modified: XoopsModules/xoalbum/trunk/xoalbum/sql/mysql.sql
===================================================================
--- XoopsModules/xoalbum/trunk/xoalbum/sql/mysql.sql	2014-05-12 14:20:13 UTC (rev 12528)
+++ XoopsModules/xoalbum/trunk/xoalbum/sql/mysql.sql	2014-05-13 09:47:33 UTC (rev 12529)
@@ -1,54 +1,58 @@
-CREATE TABLE `album_album` (
-  `album_id` int(8) NOT NULL auto_increment,
-  `cat_id` smallint(6) NOT NULL,
-  `uid` int(8) NOT NULL,
-  `album_name` varchar(64) NOT NULL,
-  `album_desc` varchar(255) NOT NULL,
-  `album_total` smallint(6) NOT NULL,
-  `album_cover` varchar(255) NOT NULL,
-  `album_views` smallint(6) NOT NULL,
-  `album_status` tinyint(1) NOT NULL,
-  `album_dateline` int(10) NOT NULL,
-  PRIMARY KEY  (`album_id`),
+CREATE TABLE `album` (
+  `album_id`       INT(8)       NOT NULL AUTO_INCREMENT,
+  `cat_id`         SMALLINT(6)  NOT NULL,
+  `uid`            INT(8)       NOT NULL,
+  `album_name`     VARCHAR(64)  NOT NULL,
+  `album_desc`     VARCHAR(255) NOT NULL,
+  `album_total`    SMALLINT(6)  NOT NULL,
+  `album_cover`    VARCHAR(255) NOT NULL,
+  `album_views`    SMALLINT(6)  NOT NULL,
+  `album_status`   TINYINT(1)   NOT NULL,
+  `album_dateline` INT(10)      NOT NULL,
+  PRIMARY KEY (`album_id`),
   KEY `cat_id` (`cat_id`),
   KEY `uid` (`uid`)
-) ENGINE=MyISAM ;
+)
+  ENGINE =MyISAM;
 
-CREATE TABLE `album_category` (
-  `cat_id` smallint(6) NOT NULL auto_increment,
-  `cat_name` varchar(32) NOT NULL,
-  `cat_total` int(8) NOT NULL,
-  `cat_order` smallint(6) NOT NULL,
-  `cat_dateline` int(10) NOT NULL,
-  PRIMARY KEY  (`cat_id`)
-) ENGINE=MyISAM ;
+CREATE TABLE `category` (
+  `cat_id`       SMALLINT(6) NOT NULL AUTO_INCREMENT,
+  `cat_name`     VARCHAR(32) NOT NULL,
+  `cat_total`    INT(8)      NOT NULL,
+  `cat_order`    SMALLINT(6) NOT NULL,
+  `cat_dateline` INT(10)     NOT NULL,
+  PRIMARY KEY (`cat_id`)
+)
+  ENGINE =MyISAM;
 
-CREATE TABLE `album_grid` (
-  `grid_id` int(8) NOT NULL auto_increment,
-  `uid` int(8) NOT NULL,
-  `pic_id` int(8) NOT NULL,
-  `grid_title` varchar(120) NOT NULL,
-  `grid_data` varchar(255) NOT NULL,
-  `grid_date` int(10) NOT NULL,
-  PRIMARY KEY  (`grid_id`),
-  KEY `uid` (`uid`,`pic_id`)
-) ENGINE=MyISAM ;
+CREATE TABLE `grid` (
+  `grid_id`    INT(8)       NOT NULL AUTO_INCREMENT,
+  `uid`        INT(8)       NOT NULL,
+  `pic_id`     INT(8)       NOT NULL,
+  `grid_title` VARCHAR(120) NOT NULL,
+  `grid_data`  VARCHAR(255) NOT NULL,
+  `grid_date`  INT(10)      NOT NULL,
+  PRIMARY KEY (`grid_id`),
+  KEY `uid` (`uid`, `pic_id`)
+)
+  ENGINE =MyISAM;
 
-CREATE TABLE `album_picture` (
-  `pic_id` int(8) NOT NULL auto_increment,
-  `uid` int(8) NOT NULL,
-  `album_id` int(8) NOT NULL,
-  `pic_name` varchar(32) NOT NULL,
-  `pic_desc` varchar(255) NOT NULL,
-  `pic_filename` varchar(255) NOT NULL,
-  `pic_filetype` varchar(64) NOT NULL,
-  `pic_thumbfirst` varchar(255) NOT NULL,
-  `pic_thumbsecond` varchar(255) NOT NULL,
-  `pic_size` int(8) NOT NULL,
-  `pic_dateline` int(10) NOT NULL,
-  `pic_comments` smallint(6) NOT NULL,
-  `pic_downloads` smallint(6) NOT NULL,
-  PRIMARY KEY  (`pic_id`),
+CREATE TABLE `picture` (
+  `pic_id`          INT(8)       NOT NULL AUTO_INCREMENT,
+  `uid`             INT(8)       NOT NULL,
+  `album_id`        INT(8)       NOT NULL,
+  `pic_name`        VARCHAR(32)  NOT NULL,
+  `pic_desc`        VARCHAR(255) NOT NULL,
+  `pic_filename`    VARCHAR(255) NOT NULL,
+  `pic_filetype`    VARCHAR(64)  NOT NULL,
+  `pic_thumbfirst`  VARCHAR(255) NOT NULL,
+  `pic_thumbsecond` VARCHAR(255) NOT NULL,
+  `pic_size`        INT(8)       NOT NULL,
+  `pic_dateline`    INT(10)      NOT NULL,
+  `pic_comments`    SMALLINT(6)  NOT NULL,
+  `pic_downloads`   SMALLINT(6)  NOT NULL,
+  PRIMARY KEY (`pic_id`),
   KEY `album_id` (`album_id`),
   KEY `uid` (`uid`)
-) ENGINE=MyISAM;
\ No newline at end of file
+)
+  ENGINE =MyISAM;

Modified: XoopsModules/xoopsheadline/branches/ZySpec/xoopsheadline/sql/mysql.sql
===================================================================
--- XoopsModules/xoopsheadline/branches/ZySpec/xoopsheadline/sql/mysql.sql	2014-05-12 14:20:13 UTC (rev 12528)
+++ XoopsModules/xoopsheadline/branches/ZySpec/xoopsheadline/sql/mysql.sql	2014-05-13 09:47:33 UTC (rev 12529)
@@ -13,7 +13,7 @@
   headline_mainmax tinyint(2) unsigned NOT NULL default '10',
   headline_blockimg tinyint(1) unsigned NOT NULL default '0',
   headline_blockmax tinyint(2) unsigned NOT NULL default '10',
-  headline_xml text NOT NULL default '',
+  headline_xml text NOT NULL,
   headline_updated int(10) NOT NULL default'0',
   PRIMARY KEY  (headline_id)
 ) ENGINE=MyISAM;

Modified: XoopsModules/xoopsheadline/trunk/xoopsheadline/sql/mysql.sql
===================================================================
--- XoopsModules/xoopsheadline/trunk/xoopsheadline/sql/mysql.sql	2014-05-12 14:20:13 UTC (rev 12528)
+++ XoopsModules/xoopsheadline/trunk/xoopsheadline/sql/mysql.sql	2014-05-13 09:47:33 UTC (rev 12529)
@@ -13,7 +13,7 @@
   headline_mainmax tinyint(2) unsigned NOT NULL default '10',
   headline_blockimg tinyint(1) unsigned NOT NULL default '0',
   headline_blockmax tinyint(2) unsigned NOT NULL default '10',
-  headline_xml text NOT NULL default '',
+  headline_xml text NOT NULL,
   headline_updated int(10) NOT NULL default'0',
   PRIMARY KEY  (headline_id)
 ) ENGINE=MyISAM;

Modified: XoopsModules/xoopspoll/branches/zyspec/sql/mysql.sql
===================================================================
--- XoopsModules/xoopspoll/branches/zyspec/sql/mysql.sql	2014-05-12 14:20:13 UTC (rev 12528)
+++ XoopsModules/xoopspoll/branches/zyspec/sql/mysql.sql	2014-05-13 09:47:33 UTC (rev 12529)
@@ -21,7 +21,7 @@
 CREATE TABLE mod_xoopspoll_desc (
   poll_id mediumint(8) unsigned NOT null auto_increment,
   question varchar(255) NOT null default '',
-  description tinytext NOT null default '',
+  description tinytext NOT NULL,
   user_id int(5) unsigned NOT null default '0',
   start_time int(10) unsigned NOT null default '0',
   end_time int(10) unsigned NOT null default '0',

Modified: XoopsModules/xoopstube/trunk/xoopstube/sql/xoopstube.sql
===================================================================
--- XoopsModules/xoopstube/trunk/xoopstube/sql/xoopstube.sql	2014-05-12 14:20:13 UTC (rev 12528)
+++ XoopsModules/xoopstube/trunk/xoopstube/sql/xoopstube.sql	2014-05-13 09:47:33 UTC (rev 12529)
@@ -114,8 +114,8 @@
   `vidrating` tinyint(1) NOT NULL default '0',
   `time` varchar(7) NOT NULL default '0:00:00',
   `keywords` varchar(255) NOT NULL default '',
-  `item_tag` text NOT NULL default '',
-  `picurl` text NOT NULL default '',
+  `item_tag` text NOT NULL,
+  `picurl` text NOT NULL,
   PRIMARY KEY  (`requestid`)
 ) ENGINE=MyISAM COMMENT='XoopsTube by McDonald' AUTO_INCREMENT=1 ;
 
@@ -149,8 +149,8 @@
   `vidrating` tinyint(1) NOT NULL default '0',
   `time` varchar(7) NOT NULL default '0:00:00',
   `keywords` varchar(255) NOT NULL default '',
-  `item_tag` text NOT NULL default '',
-  `picurl` text NOT NULL default '',
+  `item_tag` text NOT NULL,
+  `picurl` text NOT NULL,
   PRIMARY KEY  (`lid`),
   KEY `cid` (`cid`),
   KEY `status` (`status`),

[xoops-svn] SF.net SVN: xoops-svn:[12528] XoopsCore/branches/2.5.x/2.5.7/htdocs/install

From: <rgr...@us...> - 2014-05-12 14:20:16

Revision: 12528
          http://sourceforge.net/p/xoops/svn/12528
Author:   rgriffith
Date:     2014-05-12 14:20:13 +0000 (Mon, 12 May 2014)
Log Message:
-----------
Correct PHP version requirement. Remove mainfile.php from file permission list.

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/config.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/welcome.php

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/config.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/config.php	2014-05-11 10:42:07 UTC (rev 12527)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/config.php	2014-05-12 14:20:13 UTC (rev 12528)
@@ -40,17 +40,26 @@
 
 // extension_loaded
 $configs['extensions'] = array(
-    'mbstring'  => array('MBString', sprintf( PHP_EXTENSION, CHAR_ENCODING ) ),
-    'iconv'     => array('Iconv', sprintf( PHP_EXTENSION, ICONV_CONVERSION) ),
-    'xml'       => array('XML', sprintf( PHP_EXTENSION, XML_PARSING) ),
-    'zlib'      => array('Zlib', sprintf( PHP_EXTENSION, ZLIB_COMPRESSION) ),
-    'gd'        => array(( function_exists('gd_info') && $gdlib = @gd_info()) ? 'GD ' . $gdlib['GD Version'] : '', sprintf( PHP_EXTENSION, IMAGE_FUNCTIONS) ),
-    'exif'      => array('Exif', sprintf( PHP_EXTENSION, IMAGE_METAS) ),
-    'filter'    => array('Filter', sprintf( PHP_EXTENSION, FILTER_FUNCTIONS) ),
+    'mbstring'  => array('MBString', sprintf(PHP_EXTENSION, CHAR_ENCODING)),
+    'iconv'     => array('Iconv', sprintf(PHP_EXTENSION, ICONV_CONVERSION)),
+    'xml'       => array('XML', sprintf(PHP_EXTENSION, XML_PARSING)),
+    'zlib'      => array('Zlib', sprintf(PHP_EXTENSION, ZLIB_COMPRESSION)),
+    'gd'        => array((function_exists('gd_info') && $gdlib = @gd_info()) ? 'GD ' . $gdlib['GD Version'] : '', sprintf(PHP_EXTENSION, IMAGE_FUNCTIONS)),
+    'exif'      => array('Exif', sprintf(PHP_EXTENSION, IMAGE_METAS)),
+    'filter'    => array('Filter', sprintf(PHP_EXTENSION, FILTER_FUNCTIONS)),
 );
 
 // Writable files and directories
-$configs['writable'] = array('uploads/', 'uploads/avatars/', 'uploads/images/', 'uploads/ranks/', 'uploads/smilies/','xoops_lib/modules/protector/configs/', 'mainfile.php', 'include/license.php');
+$configs['writable'] = array(
+    'uploads/',
+    'uploads/avatars/',
+    'uploads/images/',
+    'uploads/ranks/',
+    'uploads/smilies/',
+    'xoops_lib/modules/protector/configs/',
+    //'mainfile.php',
+    'include/license.php',
+);
 
 // Modules to be installed by default
 $configs['modules'] = array();

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/welcome.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/welcome.php	2014-05-11 10:42:07 UTC (rev 12527)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/welcome.php	2014-05-12 14:20:13 UTC (rev 12528)
@@ -19,7 +19,7 @@
 <h3>Requirements</h3>
 <ul>
     <li>WWW Server (<a href="http://www.apache.org/" rel="external">Apache</a>, IIS, Roxen, etc)</li>
-    <li><a href="http://www.php.net/" rel="external">PHP</a> 5.2 or higher </li>
+    <li><a href="http://www.php.net/" rel="external">PHP</a> 5.3.7 or higher </li>
     <li><a href="http://www.mysql.com/" rel="external">MySQL</a> 5.1 or higher </li>
 </ul>
 <h3>Before you install</h3>

[xoops-svn] SF.net SVN: xoops-svn:[12527] XoopsModules/TDMCreate/branches/timgno

From: <txm...@us...> - 2014-05-11 10:42:12

Revision: 12527
          http://sourceforge.net/p/xoops/svn/12527
Author:   txmodxoops
Date:     2014-05-11 10:42:07 +0000 (Sun, 11 May 2014)
Log Message:
-----------
Renamed folder from 1.381 to 1.38.1

Added Paths:
-----------
    XoopsModules/TDMCreate/branches/timgno/1.38.1/

Removed Paths:
-------------
    XoopsModules/TDMCreate/branches/timgno/1.381/

[xoops-svn] SF.net SVN: xoops-svn:[12526] XoopsCore/branches/2.5.x/2.5.7/docs/changelog .250.txt

From: <be...@us...> - 2014-05-10 09:31:07

Revision: 12526
          http://sourceforge.net/p/xoops/svn/12526
Author:   beckmi
Date:     2014-05-10 09:31:04 +0000 (Sat, 10 May 2014)
Log Message:
-----------
Updating changelog

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt

Modified: XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt	2014-05-10 09:29:33 UTC (rev 12525)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt	2014-05-10 09:31:04 UTC (rev 12526)
@@ -11,6 +11,8 @@
 - corrected English typos (cesag)
 - added missing .php file extension (AngeloRocha/Zyspec/rgriffith)
 
+Updated:
+ - TinyMCE to 3.5.11 (mamba)
 
 ===============================
 2014/04/06: Version 2.5.7 RC 1

[xoops-svn] SF.net SVN: xoops-svn:[12525] ThirdParty/xoopseditor/trunk/htdocs/class/ xoopseditor/tinymce4/tinymce

From: <be...@us...> - 2014-05-10 09:29:37

Revision: 12525
          http://sourceforge.net/p/xoops/svn/12525
Author:   beckmi
Date:     2014-05-10 09:29:33 +0000 (Sat, 10 May 2014)
Log Message:
-----------
Updating to TinyMCE 4.0.26

Modified Paths:
--------------
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/changelog.txt
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/autolink/plugin.min.js
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/autoresize/plugin.min.js
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/charmap/plugin.min.js
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/emoticons/plugin.min.js
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/example/plugin.min.js
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/image/plugin.min.js
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/importcss/plugin.min.js
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/link/plugin.min.js
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/lists/plugin.min.js
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/media/plugin.min.js
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/paste/plugin.min.js
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/preview/plugin.min.js
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/spellchecker/plugin.min.js
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/table/plugin.min.js
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/textcolor/plugin.min.js
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/skins/lightgray/fonts/tinymce-small.eot
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/skins/lightgray/fonts/tinymce-small.svg
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/skins/lightgray/fonts/tinymce-small.ttf
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/skins/lightgray/fonts/tinymce-small.woff
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/skins/lightgray/fonts/tinymce.eot
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/skins/lightgray/fonts/tinymce.svg
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/skins/lightgray/fonts/tinymce.ttf
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/skins/lightgray/fonts/tinymce.woff
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/skins/lightgray/skin.ie7.min.css
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/skins/lightgray/skin.min.css
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/themes/modern/theme.min.js
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/tinymce.min.js

Added Paths:
-----------
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/example/dialog.html
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/skins/lightgray/fonts/tinymce-small.dev.svg
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/skins/lightgray/fonts/tinymce.dev.svg

Removed Paths:
-------------
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/skins/lightgray/img/wline.gif

Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/changelog.txt
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/changelog.txt	2014-05-10 09:24:13 UTC (rev 12524)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/changelog.txt	2014-05-10 09:29:33 UTC (rev 12525)
@@ -1,3 +1,77 @@
+Version 4.0.26 (2014-05-06)
+	Fixed bug in media plugin where changing existing url did not use media regex patterns to create protocol neutral url.
+	Fixed bug where selection wasn't properly restored on IE 11 due to a browser bug with Element.contains.
+Version 4.0.25 (2014-04-30)
+	Fixed bug where it wasn't possible to submit forms with editor instances on WebKit/Blink.
+Version 4.0.24 (2014-04-30)
+	Added new event_root setting for inline editors. Lets you bind all editor events on a parent container.
+	Fixed bug where show/hide/isHidden didn't work properly for inline editor instances.
+	Fixed bug where preview plugin dialog didn't handle relative urls properly.
+	Fixed bug where the autolink plugin would remove the trailing space after an inserted link.
+	Fixed bug in paste plugin where pasting in a page with scrollbars would scroll to top of page in webkit browsers.
+	Fixed bug where the paste plugin on WebKit would remove styles from pasted source code with style attributes.
+	Fixed so image_list/link_list can be a function that allows custom async calls to populate these lists.
+Version 4.0.23 (2014-04-24)
+	Added isSameOrigin method to tinymce.util.URI it handles default protocol port numbers better. Patch contributed by Matt Whelan.
+	Fixed bug where IE 11 would add br elements to the end of the editor body element each time it was shown/hidden.
+	Fixed bug where the autolink plugin would produce an index out of range exception for some very specific HTML.
+	Fixed bug where the charmap plugin wouldn't properly insert non breaking space characters when selected.
+	Fixed bug where pasting from Excel 2011 on Mac didn't produce a proper table when using the paste plugin.
+	Fixed bug where drag/dropping inside a table wouldn't properly end the table cell selection.
+	Fixed bug where drag/dropping images within tables on Safari on Mac wouldn't work properly.
+	Fixed bug where editors couldn't be re-initialized if they where externally destroyed.
+	Fixed bug where inline editors would produce a range index exception when clicking on buttons like bold.
+	Fixed bug where the preview plugin wouldn't properly handle non encoded upper UTF-8 characters.
+	Fixed so document.currentScript is used when detecting the current script location. Patch contributed by Mickael Desgranges.
+	Fixed issue with the paste_webkit_styles option so is disabled by default since it might produce a lot of extra styles.
+Version 4.0.22 (2014-04-16)
+	Added lastLevel to BeforeAddUndo level event so it's easier to block undo level creation based.
+	Fixed so multiple list elements can be indented properly. Patch contributed by Dan Villiom Podlaski Christiansen.
+	Fixed bug where the selection would be at the wrong location sometimes for inline editor instances.
+	Fixed bug where drag/dropping content into an inline editor would fail on WebKit/Blink.
+	Fixed bug where table grid wouldn't work properly when the UI was rendered in for RTL mode.
+	Fixed bug where range normalization wouldn't handle mixed contentEditable nodes properly.
+	Fixed so the media plugin doesn't override the existing element rules you now need to manually whitelist non standard attributes.
+	Fixed so old language packs get properly loaded when the new longer language code format is used.
+	Fixed so all track changes junk such as comments, deletes etc gets removed when pasting from Word.
+	Fixed so non image data urls is blocked by default since they might contain scripts.
+	Fixed so it's possible to import styles from the current page stylesheets into an inline editor by using the importcss_file_filter.
+	Fixed bug where the spellchecker plugin wouldn't add undo levels for each suggestion replacement.
+	Reworked the default spellchecker RPC API to match the new PHP Spellchecker package. Fallback documented in the TinyMCE docs.
+Version 4.0.21 (2014-04-01)
+	Added new getCssText method to formatter to get the preview css text value for a format to be used in UI.
+	Added new table_grid option that allows you to disable the table grid and use a dialog.
+	Added new image_description, image_dimensions options to image plugin. Patch contributed by Pat O'Neill.
+	Added new media_alt_source, media_poster, media_dimensions options to media plugin. Patch contributed by Pat O'Neill.
+	Added new ability to specify high/low dpi versions custom button images for retina displays.
+	Added new getWindows method to WindowManager makes it easier to control the currently opened windows.
+	Added new paste_webkit_styles option to paste plugin to control the styles that gets retained on WebKit.
+	Added preview of classes for the selectboxes used by the link_class_list/image_class_list options.
+	Added support for Sauce Labs browser testing using the new saucelabs-tests build target.
+	Added title input field to link dialog for a11y reasons can be disabled by using the link_title option.
+	Fixed so the toolbar option handles an array as input for multiple toolbar rows.
+	Fixed so the editor renders in XHTML mode apparently some people still use this rendering mode.
+	Fixed so icons gets rendered better on Firefox on Mac OS X by applying -moz-osx-font-smoothing.
+	Fixed so the auto detected external media sources produced protocol relative urls. Patch contributed by Pat O'Neill.
+	Fixed so it's possible to update the text of a button after it's been rendered to page DOM.
+	Fixed bug where iOS 7.1 Safari would open linked when images where inserted into links.
+	Fixed bug where IE 11 would scroll to the top of inline editable elements when applying formatting.
+	Fixed bug where tabindex on elements within the editor contents would cause issues on some browsers.
+	Fixed bug where link text wouldn't be properly updated in gecko if you changed an existing link.
+	Fixed bug where it wasn't possible to close dialogs with the escape key if the focus was inside a textbox.
+	Fixed bug where Gecko wouldn't paste rich text contents from Word or other similar word processors.
+	Fixed bug where binding events after the control had been rendered could fail to produce a valid delegate.
+	Fixed bug where IE 8 would throw and error when removing editors with a cross domain content_css setting.
+	Fixed bug where IE 9 wouldn't be able to select text after an editor instance with caret focus was removed.
+	Fixed bug where the autoresize plugin wouldn't resize the editor if you inserted huge images.
+	Fixed bug where multiple calls to the same init would produce extra editor instances.
+	Fixed bug where fullscreen toggle while having the autoresize plugin enabled wouldn't produce scrollbars.
+	Fixed so screen readers use a dialog instead of the grid for inserting tables.
+	Fixed so Office 365 Word contents gets filtered the same way as content from desktop Office.
+	Fixed so it's possible to override the root container for UI elements defaults to document.body.
+	Fixed bug where tabIndex is set to -1 on inline editable elements. It now keeps the existing tabIndex intact.
+	Fixed issue where the UndoManager transact method couldn't be nested since it only had one lock.
+	Fixed issue where headings/heading where labeled incorrectly as headers/header.
 Version 4.0.20 (2014-03-18)
 	Fixed so all unit tests can be executed in a headless phantomjs instance for CI testing.
 	Fixed so directionality setting gets applied to the preview dialog as well as the editor body element.

Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/autolink/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/autolink/plugin.min.js	2014-05-10 09:24:13 UTC (rev 12524)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/autolink/plugin.min.js	2014-05-10 09:29:33 UTC (rev 12525)
@@ -1 +1 @@
-tinymce.PluginManager.add("autolink",function(t){function e(t){o(t,-1,"(",!0)}function n(t){o(t,0,"",!0)}function i(t){o(t,-1,"",!1)}function o(t,e,n){var i,o,r,s,d,a,f,l,c;if(i=t.selection.getRng(!0).cloneRange(),i.startOffset<5){if(l=i.endContainer.previousSibling,!l){if(!i.endContainer.firstChild||!i.endContainer.firstChild.nextSibling)return;l=i.endContainer.firstChild.nextSibling}if(c=l.length,i.setStart(l,c),i.setEnd(l,c),i.endOffset<5)return;o=i.endOffset,s=l}else{if(s=i.endContainer,3!=s.nodeType&&s.firstChild){for(;3!=s.nodeType&&s.firstChild;)s=s.firstChild;3==s.nodeType&&(i.setStart(s,0),i.setEnd(s,s.nodeValue.length))}o=1==i.endOffset?2:i.endOffset-1-e}r=o;do i.setStart(s,o>=2?o-2:0),i.setEnd(s,o>=1?o-1:0),o-=1;while(" "!=i.toString()&&""!==i.toString()&&160!=i.toString().charCodeAt(0)&&o-2>=0&&i.toString()!=n);if(i.toString()==n||160==i.toString().charCodeAt(0)?(i.setStart(s,o),i.setEnd(s,r),o+=1):0===i.startOffset?(i.setStart(s,0),i.setEnd(s,r)):(i.setStart(s,o),i.setEnd(s,r)),a=i.toString(),"."==a.charAt(a.length-1)&&i.setEnd(s,r-1),a=i.toString(),f=a.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|(?:mailto:)?[A-Z0-9._%+\-]+@)(.+)$/i),f&&("www."==f[1]?f[1]="http://www.":/@$/.test(f[1])&&!/^mailto:/.test(f[1])&&(f[1]="mailto:"+f[1]),d=t.selection.getBookmark(),t.selection.setRng(i),t.execCommand("createlink",!1,f[1]+f[2]),t.selection.moveToBookmark(d),t.nodeChanged(),tinymce.Env.webkit)){t.selection.collapse(!1);var g=Math.min(s.length,r+1);i.setStart(s,g),i.setEnd(s,g),t.selection.setRng(i)}}var r;return t.on("keydown",function(e){return 13==e.keyCode?i(t):void 0}),tinymce.Env.ie?void t.on("focus",function(){if(!r){r=!0;try{t.execCommand("AutoUrlDetect",!1,!0)}catch(e){}}}):(t.on("keypress",function(n){return 41==n.which?e(t):void 0}),void t.on("keyup",function(e){return 32==e.keyCode?n(t):void 0}))});
\ No newline at end of file
+tinymce.PluginManager.add("autolink",function(t){function n(t){o(t,-1,"(",!0)}function e(t){o(t,0,"",!0)}function i(t){o(t,-1,"",!1)}function o(t,n,e){function i(t,n){if(0>n&&(n=0),3==t.nodeType){var e=t.data.length;n>e&&(n=e)}return n}function o(t,n){f.setStart(t,i(t,n))}function r(t,n){f.setEnd(t,i(t,n))}var f,d,a,s,c,l,u,g,h;if(f=t.selection.getRng(!0).cloneRange(),f.startOffset<5){if(g=f.endContainer.previousSibling,!g){if(!f.endContainer.firstChild||!f.endContainer.firstChild.nextSibling)return;g=f.endContainer.firstChild.nextSibling}if(h=g.length,o(g,h),r(g,h),f.endOffset<5)return;d=f.endOffset,s=g}else{if(s=f.endContainer,3!=s.nodeType&&s.firstChild){for(;3!=s.nodeType&&s.firstChild;)s=s.firstChild;3==s.nodeType&&(o(s,0),r(s,s.nodeValue.length))}d=1==f.endOffset?2:f.endOffset-1-n}a=d;do o(s,d>=2?d-2:0),r(s,d>=1?d-1:0),d-=1;while(" "!=f.toString()&&""!==f.toString()&&160!=f.toString().charCodeAt(0)&&d-2>=0&&f.toString()!=e);f.toString()==e||160==f.toString().charCodeAt(0)?(o(s,d),r(s,a),d+=1):0===f.startOffset?(o(s,0),r(s,a)):(o(s,d),r(s,a)),l=f.toString(),"."==l.charAt(l.length-1)&&r(s,a-1),l=f.toString(),u=l.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|(?:mailto:)?[A-Z0-9._%+\-]+@)(.+)$/i),u&&("www."==u[1]?u[1]="http://www.":/@$/.test(u[1])&&!/^mailto:/.test(u[1])&&(u[1]="mailto:"+u[1]),c=t.selection.getBookmark(),t.selection.setRng(f),t.execCommand("createlink",!1,u[1]+u[2]),t.selection.moveToBookmark(c),t.nodeChanged())}var r;return t.on("keydown",function(n){return 13==n.keyCode?i(t):void 0}),tinymce.Env.ie?void t.on("focus",function(){if(!r){r=!0;try{t.execCommand("AutoUrlDetect",!1,!0)}catch(n){}}}):(t.on("keypress",function(e){return 41==e.keyCode?n(t):void 0}),void t.on("keyup",function(n){return 32==n.keyCode?e(t):void 0}))});
\ No newline at end of file

Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/autoresize/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/autoresize/plugin.min.js	2014-05-10 09:24:13 UTC (rev 12524)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/autoresize/plugin.min.js	2014-05-10 09:29:33 UTC (rev 12525)
@@ -1 +1 @@
-tinymce.PluginManager.add("autoresize",function(e){function t(i){var a,s,g,r,m,u,l,h,_=tinymce.DOM;s=e.getDoc(),s&&(g=s.body,r=s.documentElement,m=n.autoresize_min_height,!g||i&&"setcontent"===i.type&&i.initial||e.plugins.fullscreen&&e.plugins.fullscreen.isFullscreen()||(l=e.dom.getStyle(g,"margin-top",!0),h=e.dom.getStyle(g,"margin-bottom",!0),u=g.offsetHeight+parseInt(l,10)+parseInt(h,10),(isNaN(u)||0>=u)&&(u=tinymce.Env.ie?g.scrollHeight:tinymce.Env.webkit&&0===g.clientHeight?0:g.offsetHeight),u>n.autoresize_min_height&&(m=u),n.autoresize_max_height&&u>n.autoresize_max_height?(m=n.autoresize_max_height,g.style.overflowY="auto",r.style.overflowY="auto"):(g.style.overflowY="hidden",r.style.overflowY="hidden",g.scrollTop=0),m!==o&&(a=m-o,_.setStyle(_.get(e.id+"_ifr"),"height",m+"px"),o=m,tinymce.isWebKit&&0>a&&t(i))))}function i(e,n,o){setTimeout(function(){t({}),e--?i(e,n,o):o&&o()},n)}var n=e.settings,o=0;e.settings.inline||(n.autoresize_min_height=parseInt(e.getParam("autoresize_min_height",e.getElement().offsetHeight),10),n.autoresize_max_height=parseInt(e.getParam("autoresize_max_height",0),10),e.on("init",function(){var t=e.getParam("autoresize_overflow_padding",1);e.dom.setStyles(e.getBody(),{paddingBottom:e.getParam("autoresize_bottom_margin",50),paddingLeft:t,paddingRight:t})}),e.on("change setcontent paste keyup",t),e.getParam("autoresize_on_init",!0)&&e.on("init",function(){i(20,100,function(){i(5,1e3)})}),e.addCommand("mceAutoResize",t))});
\ No newline at end of file
+tinymce.PluginManager.add("autoresize",function(e){function t(){return e.plugins.fullscreen&&e.plugins.fullscreen.isFullscreen()}function i(n){var s,r,g,u,l,m,h,d,f=tinymce.DOM;if(r=e.getDoc()){if(g=r.body,u=r.documentElement,l=o.autoresize_min_height,!g||n&&"setcontent"===n.type&&n.initial||t())return void(g&&u&&(g.style.overflowY="auto",u.style.overflowY="auto"));h=e.dom.getStyle(g,"margin-top",!0),d=e.dom.getStyle(g,"margin-bottom",!0),m=g.offsetHeight+parseInt(h,10)+parseInt(d,10),(isNaN(m)||0>=m)&&(m=tinymce.Env.ie?g.scrollHeight:tinymce.Env.webkit&&0===g.clientHeight?0:g.offsetHeight),m>o.autoresize_min_height&&(l=m),o.autoresize_max_height&&m>o.autoresize_max_height?(l=o.autoresize_max_height,g.style.overflowY="auto",u.style.overflowY="auto"):(g.style.overflowY="hidden",u.style.overflowY="hidden",g.scrollTop=0),l!==a&&(s=l-a,f.setStyle(f.get(e.id+"_ifr"),"height",l+"px"),a=l,tinymce.isWebKit&&0>s&&i(n))}}function n(e,t,o){setTimeout(function(){i({}),e--?n(e,t,o):o&&o()},t)}var o=e.settings,a=0;e.settings.inline||(o.autoresize_min_height=parseInt(e.getParam("autoresize_min_height",e.getElement().offsetHeight),10),o.autoresize_max_height=parseInt(e.getParam("autoresize_max_height",0),10),e.on("init",function(){var t=e.getParam("autoresize_overflow_padding",1);e.dom.setStyles(e.getBody(),{paddingBottom:e.getParam("autoresize_bottom_margin",50),paddingLeft:t,paddingRight:t})}),e.on("nodechange setcontent keyup FullscreenStateChanged",i),e.getParam("autoresize_on_init",!0)&&e.on("init",function(){n(20,100,function(){n(5,1e3)})}),e.addCommand("mceAutoResize",i))});
\ No newline at end of file

Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/charmap/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/charmap/plugin.min.js	2014-05-10 09:24:13 UTC (rev 12524)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/charmap/plugin.min.js	2014-05-10 09:29:33 UTC (rev 12525)
@@ -1 +1 @@
-tinymce.PluginManager.add("charmap",function(e){function a(){function a(e){for(;e;){if("TD"==e.nodeName)return e;e=e.parentNode}}var i,r,o,n;i='<table role="presentation" cellspacing="0" class="mce-charmap"><tbody>';var l=25;for(o=0;10>o;o++){for(i+="<tr>",r=0;l>r;r++){var s=t[o*l+r];i+='<td title="'+s[1]+'"><div tabindex="-1" title="'+s[1]+'" role="button">'+(s?String.fromCharCode(parseInt(s[0],10)):"&nbsp;")+"</div></td>"}i+="</tr>"}i+="</tbody></table>";var c={type:"container",html:i,onclick:function(a){var t=a.target;/^(TD|DIV)$/.test(t.nodeName)&&(e.execCommand("mceInsertContent",!1,tinymce.trim(t.innerText||t.textContent)),a.ctrlKey||n.close())},onmouseover:function(e){var t=a(e.target);t&&n.find("#preview").text(t.firstChild.firstChild.data)}};n=e.windowManager.open({title:"Special character",spacing:10,padding:10,items:[c,{type:"label",name:"preview",text:" ",style:"font-size: 40px; text-align: center",border:1,minWidth:100,minHeight:80}],buttons:[{text:"Close",onclick:function(){n.close()}}]})}var t=[["160","no-break space"],["38","ampersand"],["34","quotation mark"],["162","cent sign"],["8364","euro sign"],["163","pound sign"],["165","yen sign"],["169","copyright sign"],["174","registered sign"],["8482","trade mark sign"],["8240","per mille sign"],["181","micro sign"],["183","middle dot"],["8226","bullet"],["8230","three dot leader"],["8242","minutes / feet"],["8243","seconds / inches"],["167","section sign"],["182","paragraph sign"],["223","sharp s / ess-zed"],["8249","single left-pointing angle quotation mark"],["8250","single right-pointing angle quotation mark"],["171","left pointing guillemet"],["187","right pointing guillemet"],["8216","left single quotation mark"],["8217","right single quotation mark"],["8220","left double quotation mark"],["8221","right double quotation mark"],["8218","single low-9 quotation mark"],["8222","double low-9 quotation mark"],["60","less-than sign"],["62","greater-than sign"],["8804","less-than or equal to"],["8805","greater-than or equal to"],["8211","en dash"],["8212","em dash"],["175","macron"],["8254","overline"],["164","currency sign"],["166","broken bar"],["168","diaeresis"],["161","inverted exclamation mark"],["191","turned question mark"],["710","circumflex accent"],["732","small tilde"],["176","degree sign"],["8722","minus sign"],["177","plus-minus sign"],["247","division sign"],["8260","fraction slash"],["215","multiplication sign"],["185","superscript one"],["178","superscript two"],["179","superscript three"],["188","fraction one quarter"],["189","fraction one half"],["190","fraction three quarters"],["402","function / florin"],["8747","integral"],["8721","n-ary sumation"],["8734","infinity"],["8730","square root"],["8764","similar to"],["8773","approximately equal to"],["8776","almost equal to"],["8800","not equal to"],["8801","identical to"],["8712","element of"],["8713","not an element of"],["8715","contains as member"],["8719","n-ary product"],["8743","logical and"],["8744","logical or"],["172","not sign"],["8745","intersection"],["8746","union"],["8706","partial differential"],["8704","for all"],["8707","there exists"],["8709","diameter"],["8711","backward difference"],["8727","asterisk operator"],["8733","proportional to"],["8736","angle"],["180","acute accent"],["184","cedilla"],["170","feminine ordinal indicator"],["186","masculine ordinal indicator"],["8224","dagger"],["8225","double dagger"],["192","A - grave"],["193","A - acute"],["194","A - circumflex"],["195","A - tilde"],["196","A - diaeresis"],["197","A - ring above"],["198","ligature AE"],["199","C - cedilla"],["200","E - grave"],["201","E - acute"],["202","E - circumflex"],["203","E - diaeresis"],["204","I - grave"],["205","I - acute"],["206","I - circumflex"],["207","I - diaeresis"],["208","ETH"],["209","N - tilde"],["210","O - grave"],["211","O - acute"],["212","O - circumflex"],["213","O - tilde"],["214","O - diaeresis"],["216","O - slash"],["338","ligature OE"],["352","S - caron"],["217","U - grave"],["218","U - acute"],["219","U - circumflex"],["220","U - diaeresis"],["221","Y - acute"],["376","Y - diaeresis"],["222","THORN"],["224","a - grave"],["225","a - acute"],["226","a - circumflex"],["227","a - tilde"],["228","a - diaeresis"],["229","a - ring above"],["230","ligature ae"],["231","c - cedilla"],["232","e - grave"],["233","e - acute"],["234","e - circumflex"],["235","e - diaeresis"],["236","i - grave"],["237","i - acute"],["238","i - circumflex"],["239","i - diaeresis"],["240","eth"],["241","n - tilde"],["242","o - grave"],["243","o - acute"],["244","o - circumflex"],["245","o - tilde"],["246","o - diaeresis"],["248","o slash"],["339","ligature oe"],["353","s - caron"],["249","u - grave"],["250","u - acute"],["251","u - circumflex"],["252","u - diaeresis"],["253","y - acute"],["254","thorn"],["255","y - diaeresis"],["913","Alpha"],["914","Beta"],["915","Gamma"],["916","Delta"],["917","Epsilon"],["918","Zeta"],["919","Eta"],["920","Theta"],["921","Iota"],["922","Kappa"],["923","Lambda"],["924","Mu"],["925","Nu"],["926","Xi"],["927","Omicron"],["928","Pi"],["929","Rho"],["931","Sigma"],["932","Tau"],["933","Upsilon"],["934","Phi"],["935","Chi"],["936","Psi"],["937","Omega"],["945","alpha"],["946","beta"],["947","gamma"],["948","delta"],["949","epsilon"],["950","zeta"],["951","eta"],["952","theta"],["953","iota"],["954","kappa"],["955","lambda"],["956","mu"],["957","nu"],["958","xi"],["959","omicron"],["960","pi"],["961","rho"],["962","final sigma"],["963","sigma"],["964","tau"],["965","upsilon"],["966","phi"],["967","chi"],["968","psi"],["969","omega"],["8501","alef symbol"],["982","pi symbol"],["8476","real part symbol"],["978","upsilon - hook symbol"],["8472","Weierstrass p"],["8465","imaginary part"],["8592","leftwards arrow"],["8593","upwards arrow"],["8594","rightwards arrow"],["8595","downwards arrow"],["8596","left right arrow"],["8629","carriage return"],["8656","leftwards double arrow"],["8657","upwards double arrow"],["8658","rightwards double arrow"],["8659","downwards double arrow"],["8660","left right double arrow"],["8756","therefore"],["8834","subset of"],["8835","superset of"],["8836","not a subset of"],["8838","subset of or equal to"],["8839","superset of or equal to"],["8853","circled plus"],["8855","circled times"],["8869","perpendicular"],["8901","dot operator"],["8968","left ceiling"],["8969","right ceiling"],["8970","left floor"],["8971","right floor"],["9001","left-pointing angle bracket"],["9002","right-pointing angle bracket"],["9674","lozenge"],["9824","black spade suit"],["9827","black club suit"],["9829","black heart suit"],["9830","black diamond suit"],["8194","en space"],["8195","em space"],["8201","thin space"],["8204","zero width non-joiner"],["8205","zero width joiner"],["8206","left-to-right mark"],["8207","right-to-left mark"],["173","soft hyphen"]];e.addButton("charmap",{icon:"charmap",tooltip:"Special character",onclick:a}),e.addMenuItem("charmap",{icon:"charmap",text:"Special character",onclick:a,context:"insert"})});
\ No newline at end of file
+tinymce.PluginManager.add("charmap",function(e){function a(){function a(e){for(;e;){if("TD"==e.nodeName)return e;e=e.parentNode}}var t,r,o,n;t='<table role="presentation" cellspacing="0" class="mce-charmap"><tbody>';var l=25;for(o=0;10>o;o++){for(t+="<tr>",r=0;l>r;r++){var s=i[o*l+r];t+='<td title="'+s[1]+'"><div tabindex="-1" title="'+s[1]+'" role="button">'+(s?String.fromCharCode(parseInt(s[0],10)):"&nbsp;")+"</div></td>"}t+="</tr>"}t+="</tbody></table>";var c={type:"container",html:t,onclick:function(a){var i=a.target;"TD"==i.tagName&&(i=i.firstChild),"DIV"==i.tagName&&(e.execCommand("mceInsertContent",!1,i.firstChild.data),a.ctrlKey||n.close())},onmouseover:function(e){var i=a(e.target);i&&n.find("#preview").text(i.firstChild.firstChild.data)}};n=e.windowManager.open({title:"Special character",spacing:10,padding:10,items:[c,{type:"label",name:"preview",text:" ",style:"font-size: 40px; text-align: center",border:1,minWidth:100,minHeight:80}],buttons:[{text:"Close",onclick:function(){n.close()}}]})}var i=[["160","no-break space"],["38","ampersand"],["34","quotation mark"],["162","cent sign"],["8364","euro sign"],["163","pound sign"],["165","yen sign"],["169","copyright sign"],["174","registered sign"],["8482","trade mark sign"],["8240","per mille sign"],["181","micro sign"],["183","middle dot"],["8226","bullet"],["8230","three dot leader"],["8242","minutes / feet"],["8243","seconds / inches"],["167","section sign"],["182","paragraph sign"],["223","sharp s / ess-zed"],["8249","single left-pointing angle quotation mark"],["8250","single right-pointing angle quotation mark"],["171","left pointing guillemet"],["187","right pointing guillemet"],["8216","left single quotation mark"],["8217","right single quotation mark"],["8220","left double quotation mark"],["8221","right double quotation mark"],["8218","single low-9 quotation mark"],["8222","double low-9 quotation mark"],["60","less-than sign"],["62","greater-than sign"],["8804","less-than or equal to"],["8805","greater-than or equal to"],["8211","en dash"],["8212","em dash"],["175","macron"],["8254","overline"],["164","currency sign"],["166","broken bar"],["168","diaeresis"],["161","inverted exclamation mark"],["191","turned question mark"],["710","circumflex accent"],["732","small tilde"],["176","degree sign"],["8722","minus sign"],["177","plus-minus sign"],["247","division sign"],["8260","fraction slash"],["215","multiplication sign"],["185","superscript one"],["178","superscript two"],["179","superscript three"],["188","fraction one quarter"],["189","fraction one half"],["190","fraction three quarters"],["402","function / florin"],["8747","integral"],["8721","n-ary sumation"],["8734","infinity"],["8730","square root"],["8764","similar to"],["8773","approximately equal to"],["8776","almost equal to"],["8800","not equal to"],["8801","identical to"],["8712","element of"],["8713","not an element of"],["8715","contains as member"],["8719","n-ary product"],["8743","logical and"],["8744","logical or"],["172","not sign"],["8745","intersection"],["8746","union"],["8706","partial differential"],["8704","for all"],["8707","there exists"],["8709","diameter"],["8711","backward difference"],["8727","asterisk operator"],["8733","proportional to"],["8736","angle"],["180","acute accent"],["184","cedilla"],["170","feminine ordinal indicator"],["186","masculine ordinal indicator"],["8224","dagger"],["8225","double dagger"],["192","A - grave"],["193","A - acute"],["194","A - circumflex"],["195","A - tilde"],["196","A - diaeresis"],["197","A - ring above"],["198","ligature AE"],["199","C - cedilla"],["200","E - grave"],["201","E - acute"],["202","E - circumflex"],["203","E - diaeresis"],["204","I - grave"],["205","I - acute"],["206","I - circumflex"],["207","I - diaeresis"],["208","ETH"],["209","N - tilde"],["210","O - grave"],["211","O - acute"],["212","O - circumflex"],["213","O - tilde"],["214","O - diaeresis"],["216","O - slash"],["338","ligature OE"],["352","S - caron"],["217","U - grave"],["218","U - acute"],["219","U - circumflex"],["220","U - diaeresis"],["221","Y - acute"],["376","Y - diaeresis"],["222","THORN"],["224","a - grave"],["225","a - acute"],["226","a - circumflex"],["227","a - tilde"],["228","a - diaeresis"],["229","a - ring above"],["230","ligature ae"],["231","c - cedilla"],["232","e - grave"],["233","e - acute"],["234","e - circumflex"],["235","e - diaeresis"],["236","i - grave"],["237","i - acute"],["238","i - circumflex"],["239","i - diaeresis"],["240","eth"],["241","n - tilde"],["242","o - grave"],["243","o - acute"],["244","o - circumflex"],["245","o - tilde"],["246","o - diaeresis"],["248","o slash"],["339","ligature oe"],["353","s - caron"],["249","u - grave"],["250","u - acute"],["251","u - circumflex"],["252","u - diaeresis"],["253","y - acute"],["254","thorn"],["255","y - diaeresis"],["913","Alpha"],["914","Beta"],["915","Gamma"],["916","Delta"],["917","Epsilon"],["918","Zeta"],["919","Eta"],["920","Theta"],["921","Iota"],["922","Kappa"],["923","Lambda"],["924","Mu"],["925","Nu"],["926","Xi"],["927","Omicron"],["928","Pi"],["929","Rho"],["931","Sigma"],["932","Tau"],["933","Upsilon"],["934","Phi"],["935","Chi"],["936","Psi"],["937","Omega"],["945","alpha"],["946","beta"],["947","gamma"],["948","delta"],["949","epsilon"],["950","zeta"],["951","eta"],["952","theta"],["953","iota"],["954","kappa"],["955","lambda"],["956","mu"],["957","nu"],["958","xi"],["959","omicron"],["960","pi"],["961","rho"],["962","final sigma"],["963","sigma"],["964","tau"],["965","upsilon"],["966","phi"],["967","chi"],["968","psi"],["969","omega"],["8501","alef symbol"],["982","pi symbol"],["8476","real part symbol"],["978","upsilon - hook symbol"],["8472","Weierstrass p"],["8465","imaginary part"],["8592","leftwards arrow"],["8593","upwards arrow"],["8594","rightwards arrow"],["8595","downwards arrow"],["8596","left right arrow"],["8629","carriage return"],["8656","leftwards double arrow"],["8657","upwards double arrow"],["8658","rightwards double arrow"],["8659","downwards double arrow"],["8660","left right double arrow"],["8756","therefore"],["8834","subset of"],["8835","superset of"],["8836","not a subset of"],["8838","subset of or equal to"],["8839","superset of or equal to"],["8853","circled plus"],["8855","circled times"],["8869","perpendicular"],["8901","dot operator"],["8968","left ceiling"],["8969","right ceiling"],["8970","left floor"],["8971","right floor"],["9001","left-pointing angle bracket"],["9002","right-pointing angle bracket"],["9674","lozenge"],["9824","black spade suit"],["9827","black club suit"],["9829","black heart suit"],["9830","black diamond suit"],["8194","en space"],["8195","em space"],["8201","thin space"],["8204","zero width non-joiner"],["8205","zero width joiner"],["8206","left-to-right mark"],["8207","right-to-left mark"],["173","soft hyphen"]];e.addButton("charmap",{icon:"charmap",tooltip:"Special character",onclick:a}),e.addMenuItem("charmap",{icon:"charmap",text:"Special character",onclick:a,context:"insert"})});
\ No newline at end of file

Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/emoticons/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/emoticons/plugin.min.js	2014-05-10 09:24:13 UTC (rev 12524)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/emoticons/plugin.min.js	2014-05-10 09:29:33 UTC (rev 12525)
@@ -1 +1 @@
-tinymce.PluginManager.add("emoticons",function(t,e){function a(){var t;return t='<table role="list" class="mce-grid">',tinymce.each(i,function(a){t+="<tr>",tinymce.each(a,function(a){var i=e+"/img/smiley-"+a+".gif";t+='<td><a href="#" data-mce-url="'+i+'" data-mce-alt="'+a+'" tabindex="-1"role="option" aria-label="'+a+'"><img src="'+i+'" style="width: 18px; height: 18px" role="presentation"></a></td>'}),t+="</tr>"}),t+="</table>"}var i=[["cool","cry","embarassed","foot-in-mouth"],["frown","innocent","kiss","laughing"],["money-mouth","sealed","smile","surprised"],["tongue-out","undecided","wink","yell"]];t.addButton("emoticons",{type:"panelbutton",panel:{role:"application",autohide:!0,html:a,onclick:function(e){var a=t.dom.getParent(e.target,"a");a&&(t.insertContent('<img src="'+a.getAttribute("data-mce-url")+'" alt="'+a.getAttribute("data-mce-alt")+'" />'),this.hide())}},tooltip:"Emoticons"})});
\ No newline at end of file
+tinymce.PluginManager.add("emoticons",function(t,e){function a(){var t;return t='<table role="list" class="mce-grid">',tinymce.each(i,function(a){t+="<tr>",tinymce.each(a,function(a){var i=e+"/img/smiley-"+a+".gif";t+='<td><a href="#" data-mce-url="'+i+'" data-mce-alt="'+a+'" tabindex="-1" role="option" aria-label="'+a+'"><img src="'+i+'" style="width: 18px; height: 18px" role="presentation" /></a></td>'}),t+="</tr>"}),t+="</table>"}var i=[["cool","cry","embarassed","foot-in-mouth"],["frown","innocent","kiss","laughing"],["money-mouth","sealed","smile","surprised"],["tongue-out","undecided","wink","yell"]];t.addButton("emoticons",{type:"panelbutton",panel:{role:"application",autohide:!0,html:a,onclick:function(e){var a=t.dom.getParent(e.target,"a");a&&(t.insertContent('<img src="'+a.getAttribute("data-mce-url")+'" alt="'+a.getAttribute("data-mce-alt")+'" />'),this.hide())}},tooltip:"Emoticons"})});
\ No newline at end of file

Added: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/example/dialog.html
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/example/dialog.html	                        (rev 0)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/example/dialog.html	2014-05-10 09:29:33 UTC (rev 12525)
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+<body>
+	<h3>Custom dialog</h3>
+	Input some text: <input id="content">
+	<button onclick="top.tinymce.activeEditor.windowManager.getWindows()[0].close();">Close window</button>
+</body>
+</html>
\ No newline at end of file

Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/example/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/example/plugin.min.js	2014-05-10 09:24:13 UTC (rev 12524)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/example/plugin.min.js	2014-05-10 09:29:33 UTC (rev 12525)
@@ -1 +1 @@
-tinymce.PluginManager.add("example",function(t){t.addButton("example",{text:"My button",icon:!1,onclick:function(){t.windowManager.open({title:"Example plugin",body:[{type:"textbox",name:"title",label:"Title"}],onsubmit:function(e){t.insertContent("Title: "+e.data.title)}})}}),t.addMenuItem("example",{text:"Example plugin",context:"tools",onclick:function(){t.windowManager.open({title:"TinyMCE site",url:"http://www.tinymce.com",width:800,height:600,buttons:[{text:"Close",onclick:"close"}]})}})});
\ No newline at end of file
+tinymce.PluginManager.add("example",function(t,e){t.addButton("example",{text:"My button",icon:!1,onclick:function(){t.windowManager.open({title:"Example plugin",body:[{type:"textbox",name:"title",label:"Title"}],onsubmit:function(e){t.insertContent("Title: "+e.data.title)}})}}),t.addMenuItem("example",{text:"Example plugin",context:"tools",onclick:function(){t.windowManager.open({title:"TinyMCE site",url:e+"/dialog.html",width:600,height:400,buttons:[{text:"Insert",onclick:function(){var e=t.windowManager.getWindows()[0];t.insertContent(e.getContentWindow().document.getElementById("content").value),e.close()}},{text:"Close",onclick:"close"}]})}})});
\ No newline at end of file

Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/image/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/image/plugin.min.js	2014-05-10 09:24:13 UTC (rev 12524)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/image/plugin.min.js	2014-05-10 09:29:33 UTC (rev 12525)
@@ -1 +1 @@
-tinymce.PluginManager.add("image",function(e){function t(e,t){function i(e,i){n.parentNode&&n.parentNode.removeChild(n),t({width:e,height:i})}var n=document.createElement("img");n.onload=function(){i(n.clientWidth,n.clientHeight)},n.onerror=function(){i()};var a=n.style;a.visibility="hidden",a.position="fixed",a.bottom=a.left=0,a.width=a.height="auto",document.body.appendChild(n),n.src=e}function i(t){return function(){var i=e.settings.image_list;"string"==typeof i?tinymce.util.XHR.send({url:i,success:function(e){t(tinymce.util.JSON.parse(e))}}):t(i)}}function n(i){function n(t,i,n){var a,l=[];return tinymce.each(e.settings[t]||n,function(e){var t={text:e.text||e.title,value:e.value};l.push(t),(p[i]===e.value||!a&&e.selected)&&(a=t)}),a&&!p[i]&&(p[i]=a.value,a.selected=!0),l}function a(){var t=[{text:"None",value:""}];return tinymce.each(i,function(i){t.push({text:i.text||i.title,value:e.convertURL(i.value||i.url,"src"),menu:i.menu})}),t}function l(){var e,t,i,n;e=d.find("#width")[0],t=d.find("#height")[0],i=e.value(),n=t.value(),d.find("#constrain")[0].checked()&&u&&h&&i&&n&&(u!=i?(n=Math.round(i/u*n),t.value(n)):(i=Math.round(n/h*i),e.value(i))),u=i,h=n}function o(){function t(t){function i(){t.onload=t.onerror=null,e.selection.select(t),e.nodeChanged()}t.onload=function(){p.width||p.height||y.setAttribs(t,{width:t.clientWidth,height:t.clientHeight}),i()},t.onerror=i}c(),l(),p=tinymce.extend(p,d.toJSON()),""===p.width&&(p.width=null),""===p.height&&(p.height=null),""===p.style&&(p.style=null),p={src:p.src,alt:p.alt,width:p.width,height:p.height,style:p.style,"class":p["class"]},p["class"]||delete p["class"],e.undoManager.transact(function(){return p.src?(f?y.setAttribs(f,p):(p.id="__mcenew",e.focus(),e.selection.setContent(y.createHTML("img",p)),f=y.get("__mcenew"),y.setAttrib(f,"id",null)),void t(f)):void(f&&(y.remove(f),e.focus(),e.nodeChanged()))})}function r(e){return e&&(e=e.replace(/px$/,"")),e}function s(){g&&g.value(e.convertURL(this.value(),"src")),t(this.value(),function(e){e.width&&e.height&&(u=e.width,h=e.height,d.find("#width").value(u),d.find("#height").value(h))})}function c(){function t(e){return e.length>0&&/^[0-9]+$/.test(e)&&(e+="px"),e}if(e.settings.image_advtab){var i=d.toJSON(),n=y.parseStyle(i.style);delete n.margin,n["margin-top"]=n["margin-bottom"]=t(i.vspace),n["margin-left"]=n["margin-right"]=t(i.hspace),n["border-width"]=t(i.border),d.find("#style").value(y.serializeStyle(y.parseStyle(y.serializeStyle(n))))}}var d,u,h,g,m,p={},y=e.dom,f=e.selection.getNode();u=y.getAttrib(f,"width"),h=y.getAttrib(f,"height"),"IMG"!=f.nodeName||f.getAttribute("data-mce-object")||f.getAttribute("data-mce-placeholder")?f=null:p={src:y.getAttrib(f,"src"),alt:y.getAttrib(f,"alt"),"class":y.getAttrib(f,"class"),width:u,height:h},i&&(g={type:"listbox",label:"Image list",values:a(),value:p.src&&e.convertURL(p.src,"src"),onselect:function(e){var t=d.find("#alt");(!t.value()||e.lastControl&&t.value()==e.lastControl.text())&&t.value(e.control.text()),d.find("#src").value(e.control.value())},onPostRender:function(){g=this}}),e.settings.image_class_list&&(m={name:"class",type:"listbox",label:"Class",values:n("image_class_list","class")});var b=[{name:"src",type:"filepicker",filetype:"image",label:"Source",autofocus:!0,onchange:s},g,{name:"alt",type:"textbox",label:"Image description"},{type:"container",label:"Dimensions",layout:"flex",direction:"row",align:"center",spacing:5,items:[{name:"width",type:"textbox",maxLength:5,size:3,onchange:l,ariaLabel:"Width"},{type:"label",text:"x"},{name:"height",type:"textbox",maxLength:5,size:3,onchange:l,ariaLabel:"Height"},{name:"constrain",type:"checkbox",checked:!0,text:"Constrain proportions"}]},m];e.settings.image_advtab?(f&&(p.hspace=r(f.style.marginLeft||f.style.marginRight),p.vspace=r(f.style.marginTop||f.style.marginBottom),p.border=r(f.style.borderWidth),p.style=e.dom.serializeStyle(e.dom.parseStyle(e.dom.getAttrib(f,"style")))),d=e.windowManager.open({title:"Insert/edit image",data:p,bodyType:"tabpanel",body:[{title:"General",type:"form",items:b},{title:"Advanced",type:"form",pack:"start",items:[{label:"Style",name:"style",type:"textbox"},{type:"form",layout:"grid",packV:"start",columns:2,padding:0,alignH:["left","right"],defaults:{type:"textbox",maxWidth:50,onchange:c},items:[{label:"Vertical space",name:"vspace"},{label:"Horizontal space",name:"hspace"},{label:"Border",name:"border"}]}]}],onSubmit:o})):d=e.windowManager.open({title:"Insert/edit image",data:p,body:b,onSubmit:o})}e.addButton("image",{icon:"image",tooltip:"Insert/edit image",onclick:i(n),stateSelector:"img:not([data-mce-object],[data-mce-placeholder])"}),e.addMenuItem("image",{icon:"image",text:"Insert image",onclick:i(n),context:"insert",prependToContext:!0})});
\ No newline at end of file
+tinymce.PluginManager.add("image",function(e){function t(e,t){function i(e,i){n.parentNode&&n.parentNode.removeChild(n),t({width:e,height:i})}var n=document.createElement("img");n.onload=function(){i(n.clientWidth,n.clientHeight)},n.onerror=function(){i()};var a=n.style;a.visibility="hidden",a.position="fixed",a.bottom=a.left=0,a.width=a.height="auto",document.body.appendChild(n),n.src=e}function i(t){return tinymce.each(t,function(t){t.textStyle=function(){return e.formatter.getCssText({inline:"img",classes:[t.value]})}}),t}function n(t){return function(){var i=e.settings.image_list;"string"==typeof i?tinymce.util.XHR.send({url:i,success:function(e){t(tinymce.util.JSON.parse(e))}}):"function"==typeof i?i(t):t(i)}}function a(n){function a(t,i,n){var a,l=[];return tinymce.each(e.settings[t]||n,function(e){var t={text:e.text||e.title,value:e.value};l.push(t),(f[i]===e.value||!a&&e.selected)&&(a=t)}),a&&!f[i]&&(f[i]=a.value,a.selected=!0),l}function l(){var t=[{text:"None",value:""}];return tinymce.each(n,function(i){t.push({text:i.text||i.title,value:e.convertURL(i.value||i.url,"src"),menu:i.menu})}),t}function o(){var e,t,i,n;e=u.find("#width")[0],t=u.find("#height")[0],i=e.value(),n=t.value(),u.find("#constrain")[0].checked()&&g&&h&&i&&n&&(g!=i?(n=Math.round(i/g*n),t.value(n)):(i=Math.round(n/h*i),e.value(i))),g=i,h=n}function s(){function t(t){function i(){t.onload=t.onerror=null,e.selection.select(t),e.nodeChanged()}t.onload=function(){f.width||f.height||y.setAttribs(t,{width:t.clientWidth,height:t.clientHeight}),i()},t.onerror=i}d(),o(),f=tinymce.extend(f,u.toJSON()),f.alt||(f.alt=""),""===f.width&&(f.width=null),""===f.height&&(f.height=null),f.style||(f.style=null),f={src:f.src,alt:f.alt,width:f.width,height:f.height,style:f.style,"class":f["class"]},f["class"]||delete f["class"],e.undoManager.transact(function(){return f.src?(v?y.setAttribs(v,f):(f.id="__mcenew",e.focus(),e.selection.setContent(y.createHTML("img",f)),v=y.get("__mcenew"),y.setAttrib(v,"id",null)),void t(v)):void(v&&(y.remove(v),e.focus(),e.nodeChanged()))})}function r(e){return e&&(e=e.replace(/px$/,"")),e}function c(){m&&m.value(e.convertURL(this.value(),"src")),t(this.value(),function(e){e.width&&e.height&&(g=e.width,h=e.height,u.find("#width").value(g),u.find("#height").value(h))})}function d(){function t(e){return e.length>0&&/^[0-9]+$/.test(e)&&(e+="px"),e}if(e.settings.image_advtab){var i=u.toJSON(),n=y.parseStyle(i.style);delete n.margin,n["margin-top"]=n["margin-bottom"]=t(i.vspace),n["margin-left"]=n["margin-right"]=t(i.hspace),n["border-width"]=t(i.border),u.find("#style").value(y.serializeStyle(y.parseStyle(y.serializeStyle(n))))}}var u,g,h,m,p,f={},y=e.dom,v=e.selection.getNode();g=y.getAttrib(v,"width"),h=y.getAttrib(v,"height"),"IMG"!=v.nodeName||v.getAttribute("data-mce-object")||v.getAttribute("data-mce-placeholder")?v=null:f={src:y.getAttrib(v,"src"),alt:y.getAttrib(v,"alt"),"class":y.getAttrib(v,"class"),width:g,height:h},n&&(m={type:"listbox",label:"Image list",values:l(),value:f.src&&e.convertURL(f.src,"src"),onselect:function(e){var t=u.find("#alt");(!t.value()||e.lastControl&&t.value()==e.lastControl.text())&&t.value(e.control.text()),u.find("#src").value(e.control.value())},onPostRender:function(){m=this}}),e.settings.image_class_list&&(p={name:"class",type:"listbox",label:"Class",values:i(a("image_class_list","class"))});var b=[{name:"src",type:"filepicker",filetype:"image",label:"Source",autofocus:!0,onchange:c},m];e.settings.image_description!==!1&&b.push({name:"alt",type:"textbox",label:"Image description"}),e.settings.image_dimensions!==!1&&b.push({type:"container",label:"Dimensions",layout:"flex",direction:"row",align:"center",spacing:5,items:[{name:"width",type:"textbox",maxLength:5,size:3,onchange:o,ariaLabel:"Width"},{type:"label",text:"x"},{name:"height",type:"textbox",maxLength:5,size:3,onchange:o,ariaLabel:"Height"},{name:"constrain",type:"checkbox",checked:!0,text:"Constrain proportions"}]}),b.push(p),e.settings.image_advtab?(v&&(f.hspace=r(v.style.marginLeft||v.style.marginRight),f.vspace=r(v.style.marginTop||v.style.marginBottom),f.border=r(v.style.borderWidth),f.style=e.dom.serializeStyle(e.dom.parseStyle(e.dom.getAttrib(v,"style")))),u=e.windowManager.open({title:"Insert/edit image",data:f,bodyType:"tabpanel",body:[{title:"General",type:"form",items:b},{title:"Advanced",type:"form",pack:"start",items:[{label:"Style",name:"style",type:"textbox"},{type:"form",layout:"grid",packV:"start",columns:2,padding:0,alignH:["left","right"],defaults:{type:"textbox",maxWidth:50,onchange:d},items:[{label:"Vertical space",name:"vspace"},{label:"Horizontal space",name:"hspace"},{label:"Border",name:"border"}]}]}],onSubmit:s})):u=e.windowManager.open({title:"Insert/edit image",data:f,body:b,onSubmit:s})}e.addButton("image",{icon:"image",tooltip:"Insert/edit image",onclick:n(a),stateSelector:"img:not([data-mce-object],[data-mce-placeholder])"}),e.addMenuItem("image",{icon:"image",text:"Insert image",onclick:n(a),context:"insert",prependToContext:!0})});
\ No newline at end of file

Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/importcss/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/importcss/plugin.min.js	2014-05-10 09:24:13 UTC (rev 12524)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/importcss/plugin.min.js	2014-05-10 09:29:33 UTC (rev 12525)
@@ -1 +1 @@
-tinymce.PluginManager.add("importcss",function(t){function e(t){return"string"==typeof t?function(e){return-1!==e.indexOf(t)}:t instanceof RegExp?function(e){return t.test(e)}:t}function n(e,n){function i(t,e){var o,l=t.href;if((e||c[l])&&(!n||n(l))){s(t.imports,function(t){i(t,!0)});try{o=t.cssRules||t.rules}catch(a){}s(o,function(t){t.styleSheet?i(t.styleSheet,!0):t.selectorText&&s(t.selectorText.split(","),function(t){r.push(tinymce.trim(t))})})}}var r=[],c={};s(t.contentCSS,function(t){c[t]=!0});try{s(e.styleSheets,function(t){i(t)})}catch(o){}return r}function i(e){var n,i=/^(?:([a-z0-9\-_]+))?(\.[a-z0-9_\-\.]+)$/i.exec(e);if(i){var r=i[1],s=i[2].substr(1).split(".").join(" "),c=tinymce.makeMap("a,img");return i[1]?(n={title:e},t.schema.getTextBlockElements()[r]?n.block=r:t.schema.getBlockElements()[r]||c[r.toLowerCase()]?n.selector=r:n.inline=r):i[2]&&(n={inline:"span",title:e.substr(1),classes:s}),t.settings.importcss_merge_classes!==!1?n.classes=s:n.attributes={"class":s},n}}var r=this,s=tinymce.each;t.on("renderFormatsMenu",function(c){var o=t.settings,l={},a=o.importcss_selector_converter||i,m=e(o.importcss_selector_filter);t.settings.importcss_append||c.control.items().remove();var f=[];tinymce.each(o.importcss_groups,function(t){t=tinymce.extend({},t),t.filter=e(t.filter),f.push(t)}),s(n(t.getDoc(),e(o.importcss_file_filter)),function(e){if(-1===e.indexOf(".mce-")&&!l[e]&&(!m||m(e))){var n,i=a.call(r,e);if(i){var s=i.name||tinymce.DOM.uniqueId();if(f)for(var o=0;o<f.length;o++)if(!f[o].filter||f[o].filter(e)){f[o].item||(f[o].item={text:f[o].title,menu:[]}),n=f[o].item.menu;break}t.formatter.register(s,i);var u=tinymce.extend({},c.control.settings.itemDefaults,{text:i.title,format:s});n?n.push(u):c.control.add(u)}l[e]=!0}}),s(f,function(t){c.control.add(t.item)}),c.control.renderNew()}),r.convertSelectorToFormat=i});
\ No newline at end of file
+tinymce.PluginManager.add("importcss",function(t){function e(t){return"string"==typeof t?function(e){return-1!==e.indexOf(t)}:t instanceof RegExp?function(e){return t.test(e)}:t}function n(e,n){function i(t,e){var c,o=t.href;if(o&&n(o,e)){s(t.imports,function(t){i(t,!0)});try{c=t.cssRules||t.rules}catch(a){}s(c,function(t){t.styleSheet?i(t.styleSheet,!0):t.selectorText&&s(t.selectorText.split(","),function(t){r.push(tinymce.trim(t))})})}}var r=[],c={};s(t.contentCSS,function(t){c[t]=!0}),n||(n=function(t,e){return e||c[t]});try{s(e.styleSheets,function(t){i(t)})}catch(o){}return r}function i(e){var n,i=/^(?:([a-z0-9\-_]+))?(\.[a-z0-9_\-\.]+)$/i.exec(e);if(i){var r=i[1],s=i[2].substr(1).split(".").join(" "),c=tinymce.makeMap("a,img");return i[1]?(n={title:e},t.schema.getTextBlockElements()[r]?n.block=r:t.schema.getBlockElements()[r]||c[r.toLowerCase()]?n.selector=r:n.inline=r):i[2]&&(n={inline:"span",title:e.substr(1),classes:s}),t.settings.importcss_merge_classes!==!1?n.classes=s:n.attributes={"class":s},n}}var r=this,s=tinymce.each;t.on("renderFormatsMenu",function(c){var o=t.settings,a={},l=o.importcss_selector_converter||i,f=e(o.importcss_selector_filter),m=c.control;t.settings.importcss_append||m.items().remove();var u=[];tinymce.each(o.importcss_groups,function(t){t=tinymce.extend({},t),t.filter=e(t.filter),u.push(t)}),s(n(c.doc||t.getDoc(),e(o.importcss_file_filter)),function(e){if(-1===e.indexOf(".mce-")&&!a[e]&&(!f||f(e))){var n,i=l.call(r,e);if(i){var s=i.name||tinymce.DOM.uniqueId();if(u)for(var c=0;c<u.length;c++)if(!u[c].filter||u[c].filter(e)){u[c].item||(u[c].item={text:u[c].title,menu:[]}),n=u[c].item.menu;break}t.formatter.register(s,i);var o=tinymce.extend({},m.settings.itemDefaults,{text:i.title,format:s});n?n.push(o):m.add(o)}a[e]=!0}}),s(u,function(t){m.add(t.item)}),c.control.renderNew()}),r.convertSelectorToFormat=i});
\ No newline at end of file

Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/link/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/link/plugin.min.js	2014-05-10 09:24:13 UTC (rev 12524)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/link/plugin.min.js	2014-05-10 09:29:33 UTC (rev 12525)
@@ -1 +1 @@
-tinymce.PluginManager.add("link",function(e){function t(t){return function(){var n=e.settings.link_list;"string"==typeof n?tinymce.util.XHR.send({url:n,success:function(e){t(tinymce.util.JSON.parse(e))}}):t(n)}}function n(t){function n(e){var t=f.find("#text");(!t.value()||e.lastControl&&t.value()==e.lastControl.text())&&t.value(e.control.text()),f.find("#href").value(e.control.value())}function l(){var n=[{text:"None",value:""}];return tinymce.each(t,function(t){n.push({text:t.text||t.title,value:e.convertURL(t.value||t.url,"href"),menu:t.menu})}),n}function i(t,n,l){var i,a=[];return tinymce.each(e.settings[t]||l,function(e){var t={text:e.text||e.title,value:e.value};a.push(t),(p[n]===e.value||!i&&e.selected)&&(i=t)}),i&&!p[n]&&(p[n]=i.value,i.selected=!0),a}function a(t){var l=[];return tinymce.each(e.dom.select("a:not([href])"),function(e){var n=e.name||e.id;n&&l.push({text:n,value:"#"+n,selected:-1!=t.indexOf("#"+n)})}),l.length?(l.unshift({text:"None",value:""}),{name:"anchor",type:"listbox",label:"Anchors",values:l,onselect:n}):void 0}function r(){v&&v.value(e.convertURL(this.value(),"href")),!c&&0===p.text.length&&d&&this.parent().parent().find("#text")[0].value(this.value())}function o(e){var t=k.getContent();if(/</.test(t)&&(!/^<a [^>]+>[^<]+<\/a>$/.test(t)||-1==t.indexOf("href=")))return!1;if(e){var n,l=e.childNodes;if(0===l.length)return!1;for(n=l.length-1;n>=0;n--)if(3!=l[n].nodeType)return!1}return!0}var s,u,c,f,d,h,v,x,g,m,p={},k=e.selection,y=e.dom;s=k.getNode(),u=y.getParent(s,"a[href]"),d=o(),p.text=c=u?u.innerText||u.textContent:k.getContent({format:"text"}),p.href=u?y.getAttrib(u,"href"):"",p.target=u?y.getAttrib(u,"target"):e.settings.default_link_target||null,p.rel=u?y.getAttrib(u,"rel"):null,p["class"]=u?y.getAttrib(u,"class"):null,d&&(h={name:"text",type:"textbox",size:40,label:"Text to display",onchange:function(){p.text=this.value()}}),t&&(v={type:"listbox",label:"Link list",values:l(),onselect:n,value:e.convertURL(p.href,"href"),onPostRender:function(){v=this}}),e.settings.target_list!==!1&&(g={name:"target",type:"listbox",label:"Target",values:i("target_list","target",[{text:"None",value:""},{text:"New window",value:"_blank"}])}),e.settings.rel_list&&(x={name:"rel",type:"listbox",label:"Rel",values:i("rel_list","rel",[{text:"None",value:""}])}),e.settings.link_class_list&&(m={name:"class",type:"listbox",label:"Class",values:i("link_class_list","class")}),f=e.windowManager.open({title:"Insert link",data:p,body:[{name:"href",type:"filepicker",filetype:"file",size:40,autofocus:!0,label:"Url",onchange:r,onkeyup:r},h,a(p.href),v,x,g,m],onSubmit:function(t){function n(t,n){var l=e.selection.getRng();window.setTimeout(function(){e.windowManager.confirm(t,function(t){e.selection.setRng(l),n(t)})},0)}function l(){u?(e.focus(),d&&p.text!=c&&(u.innerText=p.text),y.setAttribs(u,{href:i,target:p.target?p.target:null,rel:p.rel?p.rel:null,"class":p["class"]?p["class"]:null}),k.select(u),e.undoManager.add()):d?e.insertContent(y.createHTML("a",{href:i,target:p.target?p.target:null,rel:p.rel?p.rel:null,"class":p["class"]?p["class"]:null},y.encode(p.text))):e.execCommand("mceInsertLink",!1,{href:i,target:p.target,rel:p.rel?p.rel:null})}var i;return p=tinymce.extend(p,t.data),(i=p.href)?i.indexOf("@")>0&&-1==i.indexOf("//")&&-1==i.indexOf("mailto:")?void n("The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",function(e){e&&(i="mailto:"+i),l()}):/^\s*www\./i.test(i)?void n("The URL you entered seems to be an external link. Do you want to add the required http:// prefix?",function(e){e&&(i="http://"+i),l()}):void l():void e.execCommand("unlink")}})}e.addButton("link",{icon:"link",tooltip:"Insert/edit link",shortcut:"Ctrl+K",onclick:t(n),stateSelector:"a[href]"}),e.addButton("unlink",{icon:"unlink",tooltip:"Remove link",cmd:"unlink",stateSelector:"a[href]"}),e.addShortcut("Ctrl+K","",t(n)),this.showDialog=n,e.addMenuItem("link",{icon:"link",text:"Insert link",shortcut:"Ctrl+K",onclick:t(n),stateSelector:"a[href]",context:"insert",prependToContext:!0})});
\ No newline at end of file
+tinymce.PluginManager.add("link",function(t){function e(e){return function(){var n=t.settings.link_list;"string"==typeof n?tinymce.util.XHR.send({url:n,success:function(t){e(tinymce.util.JSON.parse(t))}}):"function"==typeof n?n(e):e(n)}}function n(e){function n(t){var e=d.find("#text");(!e.value()||t.lastControl&&e.value()==t.lastControl.text())&&e.value(t.control.text()),d.find("#href").value(t.control.value())}function l(){var n=[{text:"None",value:""}];return tinymce.each(e,function(e){n.push({text:e.text||e.title,value:t.convertURL(e.value||e.url,"href"),menu:e.menu})}),n}function i(e){return tinymce.each(e,function(e){e.textStyle=function(){return t.formatter.getCssText({inline:"a",classes:[e.value]})}}),e}function a(e,n,l){var i,a=[];return tinymce.each(t.settings[e]||l,function(t){var e={text:t.text||t.title,value:t.value};a.push(e),(b[n]===t.value||!i&&t.selected)&&(i=e)}),i&&!b[n]&&(b[n]=i.value,i.selected=!0),a}function r(e){var l=[];return tinymce.each(t.dom.select("a:not([href])"),function(t){var n=t.name||t.id;n&&l.push({text:n,value:"#"+n,selected:-1!=e.indexOf("#"+n)})}),l.length?(l.unshift({text:"None",value:""}),{name:"anchor",type:"listbox",label:"Anchors",values:l,onselect:n}):void 0}function o(){h&&h.value(t.convertURL(this.value(),"href")),!f&&0===b.text.length&&x&&this.parent().parent().find("#text")[0].value(this.value())}function s(t){var e=k.getContent();if(/</.test(e)&&(!/^<a [^>]+>[^<]+<\/a>$/.test(e)||-1==e.indexOf("href=")))return!1;if(t){var n,l=t.childNodes;if(0===l.length)return!1;for(n=l.length-1;n>=0;n--)if(3!=l[n].nodeType)return!1}return!0}var u,c,f,d,x,v,h,g,m,p,y,b={},k=t.selection,w=t.dom;u=k.getNode(),c=w.getParent(u,"a[href]"),x=s(),b.text=f=c?c.innerText||c.textContent:k.getContent({format:"text"}),b.href=c?w.getAttrib(c,"href"):"",b.target=c?w.getAttrib(c,"target"):t.settings.default_link_target||null,b.rel=c?w.getAttrib(c,"rel"):null,b["class"]=c?w.getAttrib(c,"class"):null,b.title=c?w.getAttrib(c,"title"):"",x&&(v={name:"text",type:"textbox",size:40,label:"Text to display",onchange:function(){b.text=this.value()}}),e&&(h={type:"listbox",label:"Link list",values:l(),onselect:n,value:t.convertURL(b.href,"href"),onPostRender:function(){h=this}}),t.settings.target_list!==!1&&(...
 
[truncated message content]

[xoops-svn] SF.net SVN: xoops-svn:[12524] ThirdParty/xoopseditor/trunk/htdocs/class/ xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins

From: <be...@us...> - 2014-05-10 09:24:16

Revision: 12524
          http://sourceforge.net/p/xoops/svn/12524
Author:   beckmi
Date:     2014-05-10 09:24:13 +0000 (Sat, 10 May 2014)
Log Message:
-----------
source code cosmetic changes

Modified Paths:
--------------
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagemanager.php
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/xoopsmlcontent.php

Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php	2014-05-10 09:18:31 UTC (rev 12523)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php	2014-05-10 09:24:13 UTC (rev 12524)
@@ -13,10 +13,9 @@
  * @version         $Id$
  */
 
-
 // load mainfile.php - start
 $current_path = dirname(__FILE__);
-if ( DIRECTORY_SEPARATOR != "/" ) {
+if (DIRECTORY_SEPARATOR != "/") {
     $current_path = str_replace( DIRECTORY_SEPARATOR, "/", $current_path);
 }
 $xoops_root_path = substr($current_path, 0, strpos(strtolower($current_path), "/class/xoopseditor/tinymce/"));
@@ -49,7 +48,7 @@
 
 $myts =& MyTextSanitizer::getInstance();
 
-if ( $admin && $op == 'SmilesAdd' ) {
+if ($admin && $op == 'SmilesAdd') {
     if (!$GLOBALS['xoopsSecurity']->check()) {
         redirect_header($current_file, 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
     }
@@ -110,7 +109,7 @@
 <body>
 
 <?php
-if ( !$_SESSION['XoopsEmotions'] && !$admin) {
+if (!$_SESSION['XoopsEmotions'] && !$admin) {
     echo "<div class='xoopsEmotions'>";
     echo "<div>{#xoopsemotions_dlg.error_noemotions}</div>";
     echo "</div>";
@@ -136,21 +135,21 @@
 <div class="panel_wrapper">
     <div id="emotionsbrowser_panel" class="panel current" style="overflow:auto;">
         <?php
-        if ( $smiles = $_SESSION['XoopsEmotions'] ) {
+        if ($smiles = $_SESSION['XoopsEmotions']) {
             echo "<div><strong>" . _MSC_CLICKASMILIE . "</strong></div>";
             echo "<div class='xoopsEmotions'>";
             $count = count($smiles);
 
             for ($i = 0; $i < $count; $i++) {
-                if ( $op == '' ) {
-                    if ( $smiles[$i]['display'] ) {
+                if ($op == '') {
+                    if ($smiles[$i]['display']) {
                         echo '<img class="xoopsEmotions" onclick="XoopsemotionsDialog.insert(this);" src="' . XOOPS_UPLOAD_URL . '/' . $smiles[$i]['smile_url'] . '" alt="' . $myts->htmlspecialchars($smiles[$i]['emotion']) . '" title="' . $myts->htmlspecialchars($smiles[$i]['emotion']) . '" />';
                     }
                 } else {
                     echo '<img class="xoopsEmotions" onclick="XoopsemotionsDialog.insert(this);" src="' . XOOPS_UPLOAD_URL . '/' . $smiles[$i]['smile_url'] . '" alt="' . $myts->htmlspecialchars($smiles[$i]['emotion']) . '" title="' . $myts->htmlspecialchars($smiles[$i]['emotion']) . '" />';
                 }
             }
-            if ( $op == '' ) {
+            if ($op == '') {
                 echo '<div class="xoopsEmotions">';
                 echo '<a class="xoopsEmotions" href="' . $current_file . '?op=' . _MORE . '">' . _MORE . '</a>';
                 echo '</div>';
@@ -195,4 +194,4 @@
     </div>
 
 </div>
-<?php xoops_footer(); ?>
\ No newline at end of file
+<?php xoops_footer(); ?>

Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php	2014-05-10 09:18:31 UTC (rev 12523)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php	2014-05-10 09:24:13 UTC (rev 12524)
@@ -15,7 +15,7 @@
 
 // load mainfile.php
 $current_path = dirname(__FILE__);
-if ( DIRECTORY_SEPARATOR != "/" ) {
+if (DIRECTORY_SEPARATOR != "/") {
     $current_path = str_replace( DIRECTORY_SEPARATOR, "/", $current_path);
 }
 $xoops_root_path = substr($current_path, 0, strpos(strtolower($current_path), "/class/xoopseditor/tinymce/"));
@@ -27,7 +27,7 @@
  */
 $op = "list"; // default
 if (isset($_POST)) {
-    foreach ( $_POST as $k => $v ) {
+    foreach ($_POST as $k => $v) {
         ${$k} = $v;
     }
 }
@@ -39,7 +39,6 @@
 xoops_loadLanguage("admin", "system");
 xoops_loadLanguage("/admin/images", "system");
 
-
 // include
 xoops_load( "xoopsformloader" );
 xoops_load( "xoopsmodule" );
@@ -63,7 +62,6 @@
 $catreadcount = count($catreadlist);        // count readable categories
 $catwritecount = count($catwritelist);      // count writable categories
 
-
 // check/set parameters - start
 if (!isset($_REQUEST["target"])) {
     exit();
@@ -87,15 +85,13 @@
     $imgcat_id = intval($_GET["imgcat_id"]);
 }
 
-if(isset($imgcat_id)) {
+if (isset($imgcat_id)) {
     $imgcat_id = intval($imgcat_id);
 }
 $target = htmlspecialchars($target);
 
-
 if ( ($isadmin) || ($catreadcount > 0) || ($catwritecount > 0) ) {
 
-
     // Save Image modification - start
     if ( !empty($_POST["op"]) && $op == "save" ) {
         if (!$GLOBALS["xoopsSecurity"]->check()) {
@@ -346,7 +342,6 @@
     }
     // Delete categorie - end
 
-
 // ************************* NOT USED ************************************
    // Confirm delete file - start
    if ( !empty($_GET["op"]) && $op == "delfile" ) {
@@ -402,7 +397,7 @@
 echo '<div class="tabs">';
 echo '<ul>';
 echo '<li id="imagebrowser_tab" class="current"><span><a href="javascript:mcTabs.displayTab(\'imagebrowser_tab\',\'imagebrowser_panel\');" onmousedown="return false;">';
-if ( $op == 'listimg' ) {
+if ($op == 'listimg') {
     echo '{#xoopsimagebrowser_dlg.tab_listimages}';
 } else {
     echo '{#xoopsimagebrowser_dlg.tab_listcategories}';
@@ -411,7 +406,7 @@
 if (!empty($catwritelist)) {
     echo '<li id="loadimage_tab"><span><a href="javascript:mcTabs.displayTab(\'loadimage_tab\',\'loadimage_panel\');" onmousedown="return false;">{#xoopsimagebrowser_dlg.tab_loadimage}</a></span></li>';
 }
-if ( $isadmin ) {
+if ($isadmin) {
     echo '<li id="createcategory_tab"><span><a href="javascript:mcTabs.displayTab(\'createcategory_tab\',\'createcategory_panel\');" onmousedown="return false;">{#xoopsimagebrowser_dlg.tab_createcategory}</a></span></li>';
 }
 echo '</ul>';
@@ -503,7 +498,7 @@
             echo '<td class="odd">'.$images[$i]->getVar('image_mimetype').'</td>';
             echo '</tr>';
 
-            if ( $catwritelist ) {
+            if ($catwritelist) {
                 echo '<tr>';
                 echo '<td class="head">'._IMAGECAT.'</td>';
                 echo '<td class="even">';
@@ -538,7 +533,7 @@
                 $nav = new XoopsPageNav($imgcount, 20, $start, 'start', 'op=listimg&amp;target='.$target.'&amp;imgcat_id='.$imgcat_id);
                 echo '<div text-align="right">'.$nav->renderNav().'</div>';
             }
-            if ( $catwritelist ) {
+            if ($catwritelist) {
                 echo '<input type="hidden" name="op" value="save" />'.$GLOBALS['xoopsSecurity']->getTokenHTML().'<input type="submit" name="submit" value="'._SUBMIT.'" />';
                 echo '</form>';
             }
@@ -608,7 +603,7 @@
     //create Image - end
 
     //create Category - start
-    if ( $isadmin ) {
+    if ($isadmin) {
         echo '<div id="createcategory_panel" class="panel" style="overflow:auto;">';
         $form = new XoopsThemeForm(_MD_ADDIMGCAT, 'imagecat_form', ''.$current_file.'?target='.$target.'', 'post', true);
         $form->addElement(new XoopsFormText(_MD_IMGCATNAME, 'imgcat_name', 50, 255), true);
@@ -634,4 +629,3 @@
 
 echo '</div>';
 xoops_footer();
-?>
\ No newline at end of file

Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagemanager.php
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagemanager.php	2014-05-10 09:18:31 UTC (rev 12523)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagemanager.php	2014-05-10 09:24:13 UTC (rev 12524)
@@ -15,7 +15,7 @@
 
 // load mainfile.php
 $current_path = dirname(__FILE__);
-if ( DIRECTORY_SEPARATOR != "/" ) {
+if (DIRECTORY_SEPARATOR != "/") {
     $current_path = str_replace( DIRECTORY_SEPARATOR, "/", $current_path);
 }
 $xoops_root_path = substr($current_path, 0, strpos(strtolower($current_path), "/class/xoopseditor/tinymce/"));
@@ -301,12 +301,19 @@
 </html>
 
 <?php
+/**
+ * @param string $inputname
+ * @param bool   $canbrowse
+ *
+ * @return string
+ */
 function imageBrowser( $inputname = "src", $canbrowse = false ) {
     $html = "";
-    if ( $canbrowse ) {
+    if ($canbrowse) {
         $html = "<img title=\"{#xoopsimagebrowser.desc}\" class=\"xoopsimagebrowser\" src=\"img/xoopsimagemanager.png\"
                 onclick=\"javascript:XoopsImageBrowser('" . $inputname . "');\" />\n";
     }
+
     return $html;
 }
-?>
\ No newline at end of file
+?>

Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/xoopsmlcontent.php
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/xoopsmlcontent.php	2014-05-10 09:18:31 UTC (rev 12523)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/xoopsmlcontent.php	2014-05-10 09:24:13 UTC (rev 12524)
@@ -15,7 +15,7 @@
 
 // load mainfile.php - start
 $current_path = dirname(__FILE__);
-if ( DIRECTORY_SEPARATOR != "/" ) {
+if (DIRECTORY_SEPARATOR != "/") {
     $current_path = str_replace( DIRECTORY_SEPARATOR, "/", $current_path);
 }
 $xoops_root_path = substr($current_path, 0, strpos(strtolower($current_path), "/class/xoopseditor/tinymce/"));
@@ -41,7 +41,7 @@
             $content .= '<select name="mlanguages" id="mlanguages">';
             $content .= '<option value="">{#xoopsmlcontent_dlg.sellang}</option>';
             if ( is_array($lang_list)&&count( $lang_list ) > 0 ) {
-                foreach( array_keys($lang_list) as $lang_name ) {
+                foreach ( array_keys($lang_list) as $lang_name ) {
                     $lang =& $lang_list[$lang_name];
                     $content .= '<option value="' . $lang['base']->getVar('lang_code') . '">' . $lang['base']->getVar('lang_name') . '</option>';
                 }
@@ -54,7 +54,7 @@
 
             $content .= '<select name="mlanguages" id="mlanguages">';
             $content .= '<option value="">{#xoopsmlcontent_dlg.sellang}</option>';
-            foreach( $easiestml_langs as $l => $lang ) {
+            foreach ($easiestml_langs as $l => $lang) {
                 $content .= '<option value="'.$lang.'">'.$langnames[$l].'</option>' ;
             }
             $content .= '</select>';
@@ -114,7 +114,6 @@
                 </tr>
             </table>
 
-
             <div class="mceActionPanel floatright">
                 <input type="submit" id="insert" name="insert" value="{#insert}" onclick="XoopsmlcontentDialog.insertMLC();return false;"/>
                 <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
@@ -123,4 +122,4 @@
     </div>
 </form>
 </body>
-</html>
\ No newline at end of file
+</html>

[xoops-svn] SF.net SVN: xoops-svn:[12523] XoopsCore/branches/2.5.x/2.5.7/htdocs/class/ xoopseditor/tinymce/tinymce

From: <be...@us...> - 2014-05-10 09:18:36

Revision: 12523
          http://sourceforge.net/p/xoops/svn/12523
Author:   beckmi
Date:     2014-05-10 09:18:31 +0000 (Sat, 10 May 2014)
Log Message:
-----------
Updating to TinyMCE 3.5.11

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/changelog.txt
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/tiny_mce.js

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/changelog.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/changelog.txt	2014-05-10 09:13:56 UTC (rev 12522)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/changelog.txt	2014-05-10 09:18:31 UTC (rev 12523)
@@ -1,3 +1,7 @@
+Version 3.5.11 (2014-05-08)
+	Fixed bug in paste plugin word import with lists that have strikethrough on numbers.
+	Fixed bug in word count plugin where characters with diacritical marks were split as seperate words.
+	Fixed bug in IE 11 where the selection of images would fail when they where at the end of blocks.
 Version 3.5.10 (2013-10-24)
 	Fixed bug where dialogs using inlinepopups plugin would display incorrectly sometimes
 	Fixed bug in paste plugin word import that was removing type from lists

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js	2014-05-10 09:13:56 UTC (rev 12522)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js	2014-05-10 09:18:31 UTC (rev 12523)
@@ -1 +1 @@
-(function(){var c=tinymce.each,a={paste_auto_cleanup_on_paste:true,paste_enable_default_filters:true,paste_block_drop:false,paste_retain_style_properties:"none",paste_strip_class_attributes:"mso",paste_remove_spans:false,paste_remove_styles:false,paste_remove_styles_if_webkit:true,paste_convert_middot_lists:true,paste_convert_headers_to_strong:false,paste_dialog_width:"450",paste_dialog_height:"400",paste_max_consecutive_linebreaks:2,paste_text_use_dialog:false,paste_text_sticky:false,paste_text_sticky_default:false,paste_text_notifyalways:false,paste_text_linebreaktype:"combined",paste_text_replacements:[[/\u2026/g,"..."],[/[\x93\x94\u201c\u201d]/g,'"'],[/[\x60\x91\x92\u2018\u2019]/g,"'"]]};function b(d,e){return d.getParam(e,a[e])}tinymce.create("tinymce.plugins.PastePlugin",{init:function(d,e){var f=this;f.editor=d;f.url=e;f.onPreProcess=new tinymce.util.Dispatcher(f);f.onPostProcess=new tinymce.util.Dispatcher(f);f.onPreProcess.add(f._preProcess);f.onPostProcess.add(f._postProcess);f.onPreProcess.add(function(i,j){d.execCallback("paste_preprocess",i,j)});f.onPostProcess.add(function(i,j){d.execCallback("paste_postprocess",i,j)});d.onKeyDown.addToTop(function(i,j){if(((tinymce.isMac?j.metaKey:j.ctrlKey)&&j.keyCode==86)||(j.shiftKey&&j.keyCode==45)){return false}});d.pasteAsPlainText=b(d,"paste_text_sticky_default");function h(l,j){var k=d.dom,i;f.onPreProcess.dispatch(f,l);l.node=k.create("div",0,l.content);if(tinymce.isGecko){i=d.selection.getRng(true);if(i.startContainer==i.endContainer&&i.startContainer.nodeType==3){if(l.node.childNodes.length===1&&/^(p|h[1-6]|pre)$/i.test(l.node.firstChild.nodeName)&&l.content.indexOf("__MCE_ITEM__")===-1){k.remove(l.node.firstChild,true)}}}f.onPostProcess.dispatch(f,l);l.content=d.serializer.serialize(l.node,{getInner:1,forced_root_block:""});if((!j)&&(d.pasteAsPlainText)){f._insertPlainText(l.content);if(!b(d,"paste_text_sticky")){d.pasteAsPlainText=false;d.controlManager.setActive("pastetext",false)}}else{f._insert(l.content)}}d.addCommand("mceInsertClipboardContent",function(i,j){h(j,true)});if(!b(d,"paste_text_use_dialog")){d.addCommand("mcePasteText",function(j,i){var k=tinymce.util.Cookie;d.pasteAsPlainText=!d.pasteAsPlainText;d.controlManager.setActive("pastetext",d.pasteAsPlainText);if((d.pasteAsPlainText)&&(!k.get("tinymcePasteText"))){if(b(d,"paste_text_sticky")){d.windowManager.alert(d.translate("paste.plaintext_mode_sticky"))}else{d.windowManager.alert(d.translate("paste.plaintext_mode"))}if(!b(d,"paste_text_notifyalways")){k.set("tinymcePasteText","1",new Date(new Date().getFullYear()+1,12,31))}}})}d.addButton("pastetext",{title:"paste.paste_text_desc",cmd:"mcePasteText"});d.addButton("selectall",{title:"paste.selectall_desc",cmd:"selectall"});function g(s){var l,p,j,t,k=d.selection,o=d.dom,q=d.getBody(),i,r;if(s.clipboardData||o.doc.dataTransfer){r=(s.clipboardData||o.doc.dataTransfer).getData("Text");if(d.pasteAsPlainText){s.preventDefault();h({content:o.encode(r).replace(/\r?\n/g,"<br />")});return}}if(o.get("_mcePaste")){return}l=o.add(q,"div",{id:"_mcePaste","class":"mcePaste","data-mce-bogus":"1"},"\uFEFF\uFEFF");if(q!=d.getDoc().body){i=o.getPos(d.selection.getStart(),q).y}else{i=q.scrollTop+o.getViewPort(d.getWin()).y}o.setStyles(l,{position:"absolute",left:tinymce.isGecko?-40:0,top:i-25,width:1,height:1,overflow:"hidden"});if(tinymce.isIE){t=k.getRng();j=o.doc.body.createTextRange();j.moveToElementText(l);j.execCommand("Paste");o.remove(l);if(l.innerHTML==="\uFEFF\uFEFF"){d.execCommand("mcePasteWord");s.preventDefault();return}k.setRng(t);k.setContent("");setTimeout(function(){h({content:l.innerHTML})},0);return tinymce.dom.Event.cancel(s)}else{function m(n){n.preventDefault()}o.bind(d.getDoc(),"mousedown",m);o.bind(d.getDoc(),"keydown",m);p=d.selection.getRng();l=l.firstChild;j=d.getDoc().createRange();j.setStart(l,0);j.setEnd(l,2);k.setRng(j);window.setTimeout(function(){var u="",n;if(!o.select("div.mcePaste > div.mcePaste").length){n=o.select("div.mcePaste");c(n,function(w){var v=w.firstChild;if(v&&v.nodeName=="DIV"&&v.style.marginTop&&v.style.backgroundColor){o.remove(v,1)}c(o.select("span.Apple-style-span",w),function(x){o.remove(x,1)});c(o.select("br[data-mce-bogus]",w),function(x){o.remove(x)});if(w.parentNode.className!="mcePaste"){u+=w.innerHTML}})}else{u="<p>"+o.encode(r).replace(/\r?\n\r?\n/g,"</p><p>").replace(/\r?\n/g,"<br />")+"</p>"}c(o.select("div.mcePaste"),function(v){o.remove(v)});if(p){k.setRng(p)}h({content:u});o.unbind(d.getDoc(),"mousedown",m);o.unbind(d.getDoc(),"keydown",m)},0)}}if(b(d,"paste_auto_cleanup_on_paste")){if(tinymce.isOpera||/Firefox\/2/.test(navigator.userAgent)){d.onKeyDown.addToTop(function(i,j){if(((tinymce.isMac?j.metaKey:j.ctrlKey)&&j.keyCode==86)||(j.shiftKey&&j.keyCode==45)){g(j)}})}else{d.onPaste.addToTop(function(i,j){return g(j)})}}d.onInit.add(function(){d.controlManager.setActive("pastetext",d.pasteAsPlainText);if(b(d,"paste_block_drop")){d.dom.bind(d.getBody(),["dragend","dragover","draggesture","dragdrop","drop","drag"],function(i){i.preventDefault();i.stopPropagation();return false})}});f._legacySupport()},getInfo:function(){return{longname:"Paste text/word",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_preProcess:function(g,e){var k=this.editor,j=e.content,p=tinymce.grep,n=tinymce.explode,f=tinymce.trim,l,i;function d(h){c(h,function(o){if(o.constructor==RegExp){j=j.replace(o,"")}else{j=j.replace(o[0],o[1])}})}if(k.settings.paste_enable_default_filters==false){return}if(tinymce.isIE&&document.documentMode>=9&&/<(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)/.test(e.content)){d([[/(?:<br>&nbsp;[\s\r\n]+|<br>)*(<\/?(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)[^>]*>)(?:<br>&nbsp;[\s\r\n]+|<br>)*/g,"$1"]]);d([[/<br><br>/g,"<BR><BR>"],[/<br>/g," "],[/<BR><BR>/g,"<br>"]])}if(/class="?Mso|style="[^"]*\bmso-|w:WordDocument/i.test(j)||e.wordContent){e.wordContent=true;d([/^\s*(&nbsp;)+/gi,/(&nbsp;|<br[^>]*>)+\s*$/gi]);if(b(k,"paste_convert_headers_to_strong")){j=j.replace(/<p [^>]*class="?MsoHeading"?[^>]*>(.*?)<\/p>/gi,"<p><strong>$1</strong></p>")}if(b(k,"paste_convert_middot_lists")){d([[/<!--\[if !supportLists\]-->/gi,"$&__MCE_ITEM__"],[/(<span[^>]+(?:mso-list:|:\s*symbol)[^>]+>)/gi,"$1__MCE_ITEM__"],[/(<p[^>]+(?:MsoListParagraph)[^>]+>)/gi,"$1__MCE_ITEM__"]])}d([/<!--[\s\S]+?-->/gi,/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,[/<(\/?)s>/gi,"<$1strike>"],[/&nbsp;/gi,"\u00a0"]]);do{l=j.length;j=j.replace(/(<?!(ol|ul)[^>]*\s)(?:id|name|language|type|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi,"$1");j=j.replace(/(<(ol|ul)[^>]*\s)(?:id|name|language|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi,"$1")}while(l!=j.length);if(b(k,"paste_retain_style_properties").replace(/^none$/i,"").length==0){j=j.replace(/<\/?span[^>]*>/gi,"")}else{d([[/<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi,function(o,h){return(h.length>0)?h.replace(/./," ").slice(Math.floor(h.length/2)).split("").join("\u00a0"):""}],[/(<[a-z][^>]*)\sstyle="([^"]*)"/gi,function(t,h,r){var u=[],o=0,q=n(f(r).replace(/&quot;/gi,"'"),";");c(q,function(s){var w,y,z=n(s,":");function x(A){return A+((A!=="0")&&(/\d$/.test(A)))?"px":""}if(z.length==2){w=z[0].toLowerCase();y=z[1].toLowerCase();switch(w){case"mso-padding-alt":case"mso-padding-top-alt":case"mso-padding-right-alt":case"mso-padding-bottom-alt":case"mso-padding-left-alt":case"mso-margin-alt":case"mso-margin-top-alt":case"mso-margin-right-alt":case"mso-margin-bottom-alt":case"mso-margin-left-alt":case"mso-table-layout-alt":case"mso-height":case"mso-width":case"mso-vertical-align-alt":u[o++]=w.replace(/^mso-|-alt$/g,"")+":"+x(y);return;case"horiz-align":u[o++]="text-align:"+y;return;case"vert-align":u[o++]="vertical-align:"+y;return;case"font-color":case"mso-foreground":u[o++]="color:"+y;return;case"mso-background":case"mso-highlight":u[o++]="background:"+y;return;case"mso-default-height":u[o++]="min-height:"+x(y);return;case"mso-default-width":u[o++]="min-width:"+x(y);return;case"mso-padding-between-alt":u[o++]="border-collapse:separate;border-spacing:"+x(y);return;case"text-line-through":if((y=="single")||(y=="double")){u[o++]="text-decoration:line-through"}return;case"mso-zero-height":if(y=="yes"){u[o++]="display:none"}return}if(/^(mso|column|font-emph|lang|layout|line-break|list-image|nav|panose|punct|row|ruby|sep|size|src|tab-|table-border|text-(?!align|decor|indent|trans)|top-bar|version|vnd|word-break)/.test(w)){return}u[o++]=w+":"+z[1]}});if(o>0){return h+' style="'+u.join(";")+'"'}else{return h}}]])}}if(b(k,"paste_convert_headers_to_strong")){d([[/<h[1-6][^>]*>/gi,"<p><strong>"],[/<\/h[1-6][^>]*>/gi,"</strong></p>"]])}d([[/Version:[\d.]+\nStartHTML:\d+\nEndHTML:\d+\nStartFragment:\d+\nEndFragment:\d+/gi,""]]);i=b(k,"paste_strip_class_attributes");if(i!=="none"){function m(q,o){if(i==="all"){return""}var h=p(n(o.replace(/^(["'])(.*)\1$/,"$2")," "),function(r){return(/^(?!mso)/i.test(r))});return h.length?' class="'+h.join(" ")+'"':""}j=j.replace(/ class="([^"]+)"/gi,m);j=j.replace(/ class=([\-\w]+)/gi,m)}if(b(k,"paste_remove_spans")){j=j.replace(/<\/?span[^>]*>/gi,"")}e.content=j},_postProcess:function(g,i){var f=this,e=f.editor,h=e.dom,d;if(e.settings.paste_enable_default_filters==false){return}if(i.wordContent){c(h.select("a",i.node),function(j){if(!j.href||j.href.indexOf("#_Toc")!=-1){h.remove(j,1)}});if(b(e,"paste_convert_middot_lists")){f._convertLists(g,i)}d=b(e,"paste_retain_style_properties");if((tinymce.is(d,"string"))&&(d!=="all")&&(d!=="*")){d=tinymce.explode(d.replace(/^none$/i,""));c(h.select("*",i.node),function(m){var n={},k=0,l,o,j;if(d){for(l=0;l<d.length;l++){o=d[l];j=h.getStyle(m,o);if(j){n[o]=j;k++}}}h.setAttrib(m,"style","");if(d&&k>0){h.setStyles(m,n)}else{if(m.nodeName=="SPAN"&&!m.className){h.remove(m,true)}}})}}if(b(e,"paste_remove_styles")||(b(e,"paste_remove_styles_if_webkit")&&tinymce.isWebKit)){c(h.select("*[style]",i.node),function(j){j.removeAttribute("style");j.removeAttribute("data-mce-style")})}else{if(tinymce.isWebKit){c(h.select("*",i.node),function(j){j.removeAttribute("data-mce-style")})}}},_convertLists:function(g,e){var i=g.editor.dom,h,l,d=-1,f,m=[],k,j;c(i.select("p",e.node),function(t){var q,u="",s,r,n,o;for(q=t.firstChild;q&&q.nodeType==3;q=q.nextSibling){u+=q.nodeValue}u=t.innerHTML.replace(/<\/?\w+[^>]*>/gi,"").replace(/&nbsp;/g,"\u00a0");if(/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*\u00a0*/.test(u)){s="ul"}if(/^__MCE_ITEM__\s*\w+\.\s*\u00a0+/.test(u)){s="ol"}if(s){f=parseFloat(t.style.marginLeft||0);if(f>d){m.push(f)}if(!h||s!=k){h=i.create(s);i.insertAfter(h,t)}else{if(f>d){h=l.appendChild(i.create(s))}else{if(f<d){n=tinymce.inArray(m,f);o=i.getParents(h.parentNode,s);h=o[o.length-1-n]||h}}}c(i.select("span",t),function(v){var p=v.innerHTML.replace(/<\/?\w+[^>]*>/gi,"");if(s=="ul"&&/^__MCE_ITEM__[\u2022\u00b7\u00a7\u00d8o\u25CF]/.test(p)){i.remove(v)}else{if(/^__MCE_ITEM__[\s\S]*\w+\.(&nbsp;|\u00a0)*\s*/.test(p)){i.remove(v)}}});r=t.innerHTML;if(s=="ul"){r=t.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*(&nbsp;|\u00a0)+\s*/,"")}else{r=t.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^\s*\w+\.(&nbsp;|\u00a0)+\s*/,"")}l=h.appendChild(i.create("li",0,r));i.remove(t);d=f;k=s}else{h=d=0}});j=e.node.innerHTML;if(j.indexOf("__MCE_ITEM__")!=-1){e.node.innerHTML=j.replace(/__MCE_ITEM__/g,"")}},_insert:function(f,d){var e=this.editor,g=e.selection.getRng();if(!e.selection.isCollapsed()&&g.startContainer!=g.endContainer){e.getDoc().execCommand("Delete",false,null)}e.execCommand("mceInsertContent",false,f,{skip_undo:d})},_insertPlainText:function(j){var h=this.editor,f=b(h,"paste_text_linebreaktype"),k=b(h,"paste_text_replacements"),g=tinymce.is;function e(m){c(m,function(n){if(n.constructor==RegExp){j=j.replace(n,"")}else{j=j.replace(n[0],n[1])}})}if((typeof(j)==="string")&&(j.length>0)){if(/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(j)){e([/[\n\r]+/g])}else{e([/\r+/g])}e([[/<\/(?:p|h[1-6]|ul|ol|dl|table|div|blockquote|fieldset|pre|address|center)>/gi,"\n\n"],[/<br[^>]*>|<\/tr>/gi,"\n"],[/<\/t[dh]>\s*<t[dh][^>]*>/gi,"\t"],/<[a-z!\/?][^>]*>/gi,[/&nbsp;/gi," "],[/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi,"$1"]]);var d=Number(b(h,"paste_max_consecutive_linebreaks"));if(d>-1){var l=new RegExp("\n{"+(d+1)+",}","g");var i="";while(i.length<d){i+="\n"}e([[l,i]])}j=h.dom.decode(tinymce.html.Entities.encodeRaw(j));if(g(k,"array")){e(k)}else{if(g(k,"string")){e(new RegExp(k,"gi"))}}if(f=="none"){e([[/\n+/g," "]])}else{if(f=="br"){e([[/\n/g,"<br />"]])}else{if(f=="p"){e([[/\n+/g,"</p><p>"],[/^(.*<\/p>)(<p>)$/,"<p>$1"]])}else{e([[/\n\n/g,"</p><p>"],[/^(.*<\/p>)(<p>)$/,"<p>$1"],[/\n/g,"<br />"]])}}}h.execCommand("mceInsertContent",false,j)}},_legacySupport:function(){var e=this,d=e.editor;d.addCommand("mcePasteWord",function(){d.windowManager.open({file:e.url+"/pasteword.htm",width:parseInt(b(d,"paste_dialog_width")),height:parseInt(b(d,"paste_dialog_height")),inline:1})});if(b(d,"paste_text_use_dialog")){d.addCommand("mcePasteText",function(){d.windowManager.open({file:e.url+"/pastetext.htm",width:parseInt(b(d,"paste_dialog_width")),height:parseInt(b(d,"paste_dialog_height")),inline:1})})}d.addButton("pasteword",{title:"paste.paste_word_desc",cmd:"mcePasteWord"})}});tinymce.PluginManager.add("paste",tinymce.plugins.PastePlugin)})();
\ No newline at end of file
+(function(){var c=tinymce.each,a={paste_auto_cleanup_on_paste:true,paste_enable_default_filters:true,paste_block_drop:false,paste_retain_style_properties:"none",paste_strip_class_attributes:"mso",paste_remove_spans:false,paste_remove_styles:false,paste_remove_styles_if_webkit:true,paste_convert_middot_lists:true,paste_convert_headers_to_strong:false,paste_dialog_width:"450",paste_dialog_height:"400",paste_max_consecutive_linebreaks:2,paste_text_use_dialog:false,paste_text_sticky:false,paste_text_sticky_default:false,paste_text_notifyalways:false,paste_text_linebreaktype:"combined",paste_text_replacements:[[/\u2026/g,"..."],[/[\x93\x94\u201c\u201d]/g,'"'],[/[\x60\x91\x92\u2018\u2019]/g,"'"]]};function b(d,e){return d.getParam(e,a[e])}tinymce.create("tinymce.plugins.PastePlugin",{init:function(d,e){var f=this;f.editor=d;f.url=e;f.onPreProcess=new tinymce.util.Dispatcher(f);f.onPostProcess=new tinymce.util.Dispatcher(f);f.onPreProcess.add(f._preProcess);f.onPostProcess.add(f._postProcess);f.onPreProcess.add(function(i,j){d.execCallback("paste_preprocess",i,j)});f.onPostProcess.add(function(i,j){d.execCallback("paste_postprocess",i,j)});d.onKeyDown.addToTop(function(i,j){if(((tinymce.isMac?j.metaKey:j.ctrlKey)&&j.keyCode==86)||(j.shiftKey&&j.keyCode==45)){return false}});d.pasteAsPlainText=b(d,"paste_text_sticky_default");function h(l,j){var k=d.dom,i;f.onPreProcess.dispatch(f,l);l.node=k.create("div",0,l.content);if(tinymce.isGecko){i=d.selection.getRng(true);if(i.startContainer==i.endContainer&&i.startContainer.nodeType==3){if(l.node.childNodes.length===1&&/^(p|h[1-6]|pre)$/i.test(l.node.firstChild.nodeName)&&l.content.indexOf("__MCE_ITEM__")===-1){k.remove(l.node.firstChild,true)}}}f.onPostProcess.dispatch(f,l);l.content=d.serializer.serialize(l.node,{getInner:1,forced_root_block:""});if((!j)&&(d.pasteAsPlainText)){f._insertPlainText(l.content);if(!b(d,"paste_text_sticky")){d.pasteAsPlainText=false;d.controlManager.setActive("pastetext",false)}}else{f._insert(l.content)}}d.addCommand("mceInsertClipboardContent",function(i,j){h(j,true)});if(!b(d,"paste_text_use_dialog")){d.addCommand("mcePasteText",function(j,i){var k=tinymce.util.Cookie;d.pasteAsPlainText=!d.pasteAsPlainText;d.controlManager.setActive("pastetext",d.pasteAsPlainText);if((d.pasteAsPlainText)&&(!k.get("tinymcePasteText"))){if(b(d,"paste_text_sticky")){d.windowManager.alert(d.translate("paste.plaintext_mode_sticky"))}else{d.windowManager.alert(d.translate("paste.plaintext_mode"))}if(!b(d,"paste_text_notifyalways")){k.set("tinymcePasteText","1",new Date(new Date().getFullYear()+1,12,31))}}})}d.addButton("pastetext",{title:"paste.paste_text_desc",cmd:"mcePasteText"});d.addButton("selectall",{title:"paste.selectall_desc",cmd:"selectall"});function g(s){var l,p,j,t,k=d.selection,o=d.dom,q=d.getBody(),i,r;if(s.clipboardData||o.doc.dataTransfer){r=(s.clipboardData||o.doc.dataTransfer).getData("Text");if(d.pasteAsPlainText){s.preventDefault();h({content:o.encode(r).replace(/\r?\n/g,"<br />")});return}}if(o.get("_mcePaste")){return}l=o.add(q,"div",{id:"_mcePaste","class":"mcePaste","data-mce-bogus":"1"},"\uFEFF\uFEFF");if(q!=d.getDoc().body){i=o.getPos(d.selection.getStart(),q).y}else{i=q.scrollTop+o.getViewPort(d.getWin()).y}o.setStyles(l,{position:"absolute",left:tinymce.isGecko?-40:0,top:i-25,width:1,height:1,overflow:"hidden"});if(tinymce.isIE){t=k.getRng();j=o.doc.body.createTextRange();j.moveToElementText(l);j.execCommand("Paste");o.remove(l);if(l.innerHTML==="\uFEFF\uFEFF"){d.execCommand("mcePasteWord");s.preventDefault();return}k.setRng(t);k.setContent("");setTimeout(function(){h({content:l.innerHTML})},0);return tinymce.dom.Event.cancel(s)}else{function m(n){n.preventDefault()}o.bind(d.getDoc(),"mousedown",m);o.bind(d.getDoc(),"keydown",m);p=d.selection.getRng();l=l.firstChild;j=d.getDoc().createRange();j.setStart(l,0);j.setEnd(l,2);k.setRng(j);window.setTimeout(function(){var u="",n;if(!o.select("div.mcePaste > div.mcePaste").length){n=o.select("div.mcePaste");c(n,function(w){var v=w.firstChild;if(v&&v.nodeName=="DIV"&&v.style.marginTop&&v.style.backgroundColor){o.remove(v,1)}c(o.select("span.Apple-style-span",w),function(x){o.remove(x,1)});c(o.select("br[data-mce-bogus]",w),function(x){o.remove(x)});if(w.parentNode.className!="mcePaste"){u+=w.innerHTML}})}else{u="<p>"+o.encode(r).replace(/\r?\n\r?\n/g,"</p><p>").replace(/\r?\n/g,"<br />")+"</p>"}c(o.select("div.mcePaste"),function(v){o.remove(v)});if(p){k.setRng(p)}h({content:u});o.unbind(d.getDoc(),"mousedown",m);o.unbind(d.getDoc(),"keydown",m)},0)}}if(b(d,"paste_auto_cleanup_on_paste")){if(tinymce.isOpera||/Firefox\/2/.test(navigator.userAgent)){d.onKeyDown.addToTop(function(i,j){if(((tinymce.isMac?j.metaKey:j.ctrlKey)&&j.keyCode==86)||(j.shiftKey&&j.keyCode==45)){g(j)}})}else{d.onPaste.addToTop(function(i,j){return g(j)})}}d.onInit.add(function(){d.controlManager.setActive("pastetext",d.pasteAsPlainText);if(b(d,"paste_block_drop")){d.dom.bind(d.getBody(),["dragend","dragover","draggesture","dragdrop","drop","drag"],function(i){i.preventDefault();i.stopPropagation();return false})}});f._legacySupport()},getInfo:function(){return{longname:"Paste text/word",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_preProcess:function(g,e){var k=this.editor,j=e.content,p=tinymce.grep,n=tinymce.explode,f=tinymce.trim,l,i;function d(h){c(h,function(o){if(o.constructor==RegExp){j=j.replace(o,"")}else{j=j.replace(o[0],o[1])}})}if(k.settings.paste_enable_default_filters==false){return}if(tinymce.isIE&&document.documentMode>=9&&/<(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)/.test(e.content)){d([[/(?:<br>&nbsp;[\s\r\n]+|<br>)*(<\/?(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)[^>]*>)(?:<br>&nbsp;[\s\r\n]+|<br>)*/g,"$1"]]);d([[/<br><br>/g,"<BR><BR>"],[/<br>/g," "],[/<BR><BR>/g,"<br>"]])}if(/class="?Mso|style="[^"]*\bmso-|w:WordDocument/i.test(j)||e.wordContent){e.wordContent=true;d([/^\s*(&nbsp;)+/gi,/(&nbsp;|<br[^>]*>)+\s*$/gi]);if(b(k,"paste_convert_headers_to_strong")){j=j.replace(/<p [^>]*class="?MsoHeading"?[^>]*>(.*?)<\/p>/gi,"<p><strong>$1</strong></p>")}if(b(k,"paste_convert_middot_lists")){d([[/<!--\[if !supportLists\]-->/gi,"$&__MCE_ITEM__"],[/(<span[^>]+(?:mso-list:|:\s*symbol)[^>]+>)/gi,"$1__MCE_ITEM__"],[/(<p[^>]+(?:MsoListParagraph)[^>]+>)/gi,"$1__MCE_ITEM__"]])}d([/<!--[\s\S]+?-->/gi,/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,[/<(\/?)s>/gi,"<$1strike>"],[/&nbsp;/gi,"\u00a0"]]);do{l=j.length;j=j.replace(/(<?!(ol|ul)[^>]*\s)(?:id|name|language|type|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi,"$1");j=j.replace(/(<(ol|ul)[^>]*\s)(?:id|name|language|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi,"$1")}while(l!=j.length);if(b(k,"paste_retain_style_properties").replace(/^none$/i,"").length==0){j=j.replace(/<\/?span[^>]*>/gi,"")}else{d([[/<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi,function(o,h){return(h.length>0)?h.replace(/./," ").slice(Math.floor(h.length/2)).split("").join("\u00a0"):""}],[/(<[a-z][^>]*)\sstyle="([^"]*)"/gi,function(t,h,r){var u=[],o=0,q=n(f(r).replace(/&quot;/gi,"'"),";");c(q,function(s){var w,y,z=n(s,":");function x(A){return A+((A!=="0")&&(/\d$/.test(A)))?"px":""}if(z.length==2){w=z[0].toLowerCase();y=z[1].toLowerCase();switch(w){case"mso-padding-alt":case"mso-padding-top-alt":case"mso-padding-right-alt":case"mso-padding-bottom-alt":case"mso-padding-left-alt":case"mso-margin-alt":case"mso-margin-top-alt":case"mso-margin-right-alt":case"mso-margin-bottom-alt":case"mso-margin-left-alt":case"mso-table-layout-alt":case"mso-height":case"mso-width":case"mso-vertical-align-alt":u[o++]=w.replace(/^mso-|-alt$/g,"")+":"+x(y);return;case"horiz-align":u[o++]="text-align:"+y;return;case"vert-align":u[o++]="vertical-align:"+y;return;case"font-color":case"mso-foreground":u[o++]="color:"+y;return;case"mso-background":case"mso-highlight":u[o++]="background:"+y;return;case"mso-default-height":u[o++]="min-height:"+x(y);return;case"mso-default-width":u[o++]="min-width:"+x(y);return;case"mso-padding-between-alt":u[o++]="border-collapse:separate;border-spacing:"+x(y);return;case"text-line-through":if((y=="single")||(y=="double")){u[o++]="text-decoration:line-through"}return;case"mso-zero-height":if(y=="yes"){u[o++]="display:none"}return}if(/^(mso|column|font-emph|lang|layout|line-break|list-image|nav|panose|punct|row|ruby|sep|size|src|tab-|table-border|text-(?!align|decor|indent|trans)|top-bar|version|vnd|word-break)/.test(w)){return}u[o++]=w+":"+z[1]}});if(o>0){return h+' style="'+u.join(";")+'"'}else{return h}}]])}}if(b(k,"paste_convert_headers_to_strong")){d([[/<h[1-6][^>]*>/gi,"<p><strong>"],[/<\/h[1-6][^>]*>/gi,"</strong></p>"]])}d([[/Version:[\d.]+\nStartHTML:\d+\nEndHTML:\d+\nStartFragment:\d+\nEndFragment:\d+/gi,""]]);i=b(k,"paste_strip_class_attributes");if(i!=="none"){function m(q,o){if(i==="all"){return""}var h=p(n(o.replace(/^(["'])(.*)\1$/,"$2")," "),function(r){return(/^(?!mso)/i.test(r))});return h.length?' class="'+h.join(" ")+'"':""}j=j.replace(/ class="([^"]+)"/gi,m);j=j.replace(/ class=([\-\w]+)/gi,m)}if(b(k,"paste_remove_spans")){j=j.replace(/<\/?span[^>]*>/gi,"")}e.content=j},_postProcess:function(g,i){var f=this,e=f.editor,h=e.dom,d;if(e.settings.paste_enable_default_filters==false){return}if(i.wordContent){c(h.select("a",i.node),function(j){if(!j.href||j.href.indexOf("#_Toc")!=-1){h.remove(j,1)}});if(b(e,"paste_convert_middot_lists")){f._convertLists(g,i)}d=b(e,"paste_retain_style_properties");if((tinymce.is(d,"string"))&&(d!=="all")&&(d!=="*")){d=tinymce.explode(d.replace(/^none$/i,""));c(h.select("*",i.node),function(m){var n={},k=0,l,o,j;if(d){for(l=0;l<d.length;l++){o=d[l];j=h.getStyle(m,o);if(j){n[o]=j;k++}}}h.setAttrib(m,"style","");if(d&&k>0){h.setStyles(m,n)}else{if(m.nodeName=="SPAN"&&!m.className){h.remove(m,true)}}})}}if(b(e,"paste_remove_styles")||(b(e,"paste_remove_styles_if_webkit")&&tinymce.isWebKit)){c(h.select("*[style]",i.node),function(j){j.removeAttribute("style");j.removeAttribute("data-mce-style")})}else{if(tinymce.isWebKit){c(h.select("*",i.node),function(j){j.removeAttribute("data-mce-style")})}}},_convertLists:function(g,e){var i=g.editor.dom,h,l,d=-1,f,m=[],k,j;c(i.select("p",e.node),function(t){var q,u="",s,r,n,o;for(q=t.firstChild;q&&q.nodeType==3;q=q.nextSibling){u+=q.nodeValue}u=t.innerHTML.replace(/<\/?\w+[^>]*>/gi,"").replace(/&nbsp;/g,"\u00a0");if(/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*\u00a0*/.test(u)){s="ul"}if(/^__MCE_ITEM__\s*\w+\.\s*\u00a0+/.test(u)){s="ol"}if(s){f=parseFloat(t.style.marginLeft||0);if(f>d){m.push(f)}if(!h||s!=k){h=i.create(s);i.insertAfter(h,t)}else{if(f>d){h=l.appendChild(i.create(s))}else{if(f<d){n=tinymce.inArray(m,f);o=i.getParents(h.parentNode,s);h=o[o.length-1-n]||h}}}c(i.select("span",t),function(v){var p=v.innerHTML.replace(/<\/?\w+[^>]*>/gi,"");if(s=="ul"&&/^__MCE_ITEM__[\u2022\u00b7\u00a7\u00d8o\u25CF]/.test(p)){i.remove(v)}else{if(/^__MCE_ITEM__[\s\S]*\w+\.(&nbsp;|\u00a0)*\s*/.test(p)){i.remove(v)}}});r=t.innerHTML;if(s=="ul"){r=t.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*(&nbsp;|\u00a0)+\s*/,"")}else{r=t.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^\s*[\w|'<'|'>']+\.(&nbsp;|\u00a0)+\s*/,"")}l=h.appendChild(i.create("li",0,r));i.remove(t);d=f;k=s}else{h=d=0}});j=e.node.innerHTML;if(j.indexOf("__MCE_ITEM__")!=-1){e.node.innerHTML=j.replace(/__MCE_ITEM__/g,"")}},_insert:function(f,d){var e=this.editor,g=e.selection.getRng();if(!e.selection.isCollapsed()&&g.startContainer!=g.endContainer){e.getDoc().execCommand("Delete",false,null)}e.execCommand("mceInsertContent",false,f,{skip_undo:d})},_insertPlainText:function(j){var h=this.editor,f=b(h,"paste_text_linebreaktype"),k=b(h,"paste_text_replacements"),g=tinymce.is;function e(m){c(m,function(n){if(n.constructor==RegExp){j=j.replace(n,"")}else{j=j.replace(n[0],n[1])}})}if((typeof(j)==="string")&&(j.length>0)){if(/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(j)){e([/[\n\r]+/g])}else{e([/\r+/g])}e([[/<\/(?:p|h[1-6]|ul|ol|dl|table|div|blockquote|fieldset|pre|address|center)>/gi,"\n\n"],[/<br[^>]*>|<\/tr>/gi,"\n"],[/<\/t[dh]>\s*<t[dh][^>]*>/gi,"\t"],/<[a-z!\/?][^>]*>/gi,[/&nbsp;/gi," "],[/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi,"$1"]]);var d=Number(b(h,"paste_max_consecutive_linebreaks"));if(d>-1){var l=new RegExp("\n{"+(d+1)+",}","g");var i="";while(i.length<d){i+="\n"}e([[l,i]])}j=h.dom.decode(tinymce.html.Entities.encodeRaw(j));if(g(k,"array")){e(k)}else{if(g(k,"string")){e(new RegExp(k,"gi"))}}if(f=="none"){e([[/\n+/g," "]])}else{if(f=="br"){e([[/\n/g,"<br />"]])}else{if(f=="p"){e([[/\n+/g,"</p><p>"],[/^(.*<\/p>)(<p>)$/,"<p>$1"]])}else{e([[/\n\n/g,"</p><p>"],[/^(.*<\/p>)(<p>)$/,"<p>$1"],[/\n/g,"<br />"]])}}}h.execCommand("mceInsertContent",false,j)}},_legacySupport:function(){var e=this,d=e.editor;d.addCommand("mcePasteWord",function(){d.windowManager.open({file:e.url+"/pasteword.htm",width:parseInt(b(d,"paste_dialog_width")),height:parseInt(b(d,"paste_dialog_height")),inline:1})});if(b(d,"paste_text_use_dialog")){d.addCommand("mcePasteText",function(){d.windowManager.open({file:e.url+"/pastetext.htm",width:parseInt(b(d,"paste_dialog_width")),height:parseInt(b(d,"paste_dialog_height")),inline:1})})}d.addButton("pasteword",{title:"paste.paste_word_desc",cmd:"mcePasteWord"})}});tinymce.PluginManager.add("paste",tinymce.plugins.PastePlugin)})();
\ No newline at end of file

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js	2014-05-10 09:13:56 UTC (rev 12522)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js	2014-05-10 09:18:31 UTC (rev 12523)
@@ -93,6 +93,10 @@
 
 						if (b) {
 							r.moveEnd("character", -(rs.length)); // Otherwise will loop forever
+						} else {
+							// to avoid looping for ever in MSIE 9/10 when just
+							// changing the case
+							r.moveStart("character", rs.length);
 						}
 					}
 

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js	2014-05-10 09:13:56 UTC (rev 12522)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js	2014-05-10 09:18:31 UTC (rev 12523)
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.WordCount",{block:0,id:null,countre:null,cleanre:null,init:function(c,d){var e=this,f=0,g=tinymce.VK;e.countre=c.getParam("wordcount_countregex",/[\w\u2019\'-]+/g);e.cleanre=c.getParam("wordcount_cleanregex",/[0-9.(),;:!?%#$?\'\"_+=\\\/-]*/g);e.update_rate=c.getParam("wordcount_update_rate",2000);e.update_on_delete=c.getParam("wordcount_update_on_delete",false);e.id=c.id+"-word-count";c.onPostRender.add(function(i,h){var j,k;k=i.getParam("wordcount_target_id");if(!k){j=tinymce.DOM.get(i.id+"_path_row");if(j){tinymce.DOM.add(j.parentNode,"div",{style:"float: right"},i.getLang("wordcount.words","Words: ")+'<span id="'+e.id+'">0</span>')}}else{tinymce.DOM.add(k,"span",{},'<span id="'+e.id+'">0</span>')}});c.onInit.add(function(h){h.selection.onSetContent.add(function(){e._count(h)});e._count(h)});c.onSetContent.add(function(h){e._count(h)});function b(h){return h!==f&&(h===g.ENTER||f===g.SPACEBAR||a(f))}function a(h){return h===g.DELETE||h===g.BACKSPACE}c.onKeyUp.add(function(h,i){if(b(i.keyCode)||e.update_on_delete&&a(i.keyCode)){e._count(h)}f=i.keyCode})},_getCount:function(c){var a=0;var b=c.getContent({format:"raw"});if(b){b=b.replace(/\.\.\./g," ");b=b.replace(/<.[^<>]*?>/g," ").replace(/&nbsp;|&#160;/gi," ");b=b.replace(/(\w+)(&.+?;)+(\w+)/,"$1$3").replace(/&.+?;/g," ");b=b.replace(this.cleanre,"");var d=b.match(this.countre);if(d){a=d.length}}return a},_count:function(a){var b=this;if(b.block){return}b.block=1;setTimeout(function(){if(!a.destroyed){var c=b._getCount(a);tinymce.DOM.setHTML(b.id,c.toString());setTimeout(function(){b.block=0},b.update_rate)}},1)},getInfo:function(){return{longname:"Word Count plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("wordcount",tinymce.plugins.WordCount)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.WordCount",{block:0,id:null,countre:null,cleanre:null,init:function(c,d){var e=this,f=0,g=tinymce.VK;e.countre=c.getParam("wordcount_countregex",/[\w\u2019\u00co-\u00ff^\uc397^u00f7\'-]+/g);e.cleanre=c.getParam("wordcount_cleanregex",/[0-9.(),;:!?%#$?\'\"_+=\\\/-]*/g);e.update_rate=c.getParam("wordcount_update_rate",2000);e.update_on_delete=c.getParam("wordcount_update_on_delete",false);e.id=c.id+"-word-count";c.onPostRender.add(function(i,h){var j,k;k=i.getParam("wordcount_target_id");if(!k){j=tinymce.DOM.get(i.id+"_path_row");if(j){tinymce.DOM.add(j.parentNode,"div",{style:"float: right"},i.getLang("wordcount.words","Words: ")+'<span id="'+e.id+'">0</span>')}}else{tinymce.DOM.add(k,"span",{},'<span id="'+e.id+'">0</span>')}});c.onInit.add(function(h){h.selection.onSetContent.add(function(){e._count(h)});e._count(h)});c.onSetContent.add(function(h){e._count(h)});function b(h){return h!==f&&(h===g.ENTER||f===g.SPACEBAR||a(f))}function a(h){return h===g.DELETE||h===g.BACKSPACE}c.onKeyUp.add(function(h,i){if(b(i.keyCode)||e.update_on_delete&&a(i.keyCode)){e._count(h)}f=i.keyCode})},_getCount:function(c){var a=0;var b=c.getContent({format:"raw"});if(b){b=b.replace(/\.\.\./g," ");b=b.replace(/<.[^<>]*?>/g," ").replace(/&nbsp;|&#160;/gi," ");b=b.replace(/(\w+)(&.+?;)+(\w+)/,"$1$3").replace(/&.+?;/g," ");b=b.replace(this.cleanre,"");var d=b.match(this.countre);if(d){a=d.length}}return a},_count:function(a){var b=this;if(b.block){return}b.block=1;setTimeout(function(){if(!a.destroyed){var c=b._getCount(a);tinymce.DOM.setHTML(b.id,c.toString());setTimeout(function(){b.block=0},b.update_rate)}},1)},getInfo:function(){return{longname:"Word Count plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("wordcount",tinymce.plugins.WordCount)})();
\ No newline at end of file

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/tiny_mce.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/tiny_mce.js	2014-05-10 09:13:56 UTC (rev 12522)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/tiny_mce.js	2014-05-10 09:18:31 UTC (rev 12523)
@@ -1 +1 @@

@@ Diff output truncated at 100000 characters. @@

[xoops-svn] SF.net SVN: xoops-svn:[12522] ThirdParty/xoopseditor/trunk/htdocs/class/ xoopseditor/tinymce/tinymce

From: <be...@us...> - 2014-05-10 09:14:00

Revision: 12522
          http://sourceforge.net/p/xoops/svn/12522
Author:   beckmi
Date:     2014-05-10 09:13:56 +0000 (Sat, 10 May 2014)
Log Message:
-----------
Updating to TinyMCE 3.5.11

Modified Paths:
--------------
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/changelog.txt
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js
    ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/tiny_mce.js

Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/changelog.txt
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/changelog.txt	2014-05-08 12:08:54 UTC (rev 12521)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/changelog.txt	2014-05-10 09:13:56 UTC (rev 12522)
@@ -1,3 +1,7 @@
+Version 3.5.11 (2014-05-08)
+	Fixed bug in paste plugin word import with lists that have strikethrough on numbers.
+	Fixed bug in word count plugin where characters with diacritical marks were split as seperate words.
+	Fixed bug in IE 11 where the selection of images would fail when they where at the end of blocks.
 Version 3.5.10 (2013-10-24)
 	Fixed bug where dialogs using inlinepopups plugin would display incorrectly sometimes
 	Fixed bug in paste plugin word import that was removing type from lists

Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js	2014-05-08 12:08:54 UTC (rev 12521)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js	2014-05-10 09:13:56 UTC (rev 12522)
@@ -1 +1 @@
-(function(){var c=tinymce.each,a={paste_auto_cleanup_on_paste:true,paste_enable_default_filters:true,paste_block_drop:false,paste_retain_style_properties:"none",paste_strip_class_attributes:"mso",paste_remove_spans:false,paste_remove_styles:false,paste_remove_styles_if_webkit:true,paste_convert_middot_lists:true,paste_convert_headers_to_strong:false,paste_dialog_width:"450",paste_dialog_height:"400",paste_max_consecutive_linebreaks:2,paste_text_use_dialog:false,paste_text_sticky:false,paste_text_sticky_default:false,paste_text_notifyalways:false,paste_text_linebreaktype:"combined",paste_text_replacements:[[/\u2026/g,"..."],[/[\x93\x94\u201c\u201d]/g,'"'],[/[\x60\x91\x92\u2018\u2019]/g,"'"]]};function b(d,e){return d.getParam(e,a[e])}tinymce.create("tinymce.plugins.PastePlugin",{init:function(d,e){var f=this;f.editor=d;f.url=e;f.onPreProcess=new tinymce.util.Dispatcher(f);f.onPostProcess=new tinymce.util.Dispatcher(f);f.onPreProcess.add(f._preProcess);f.onPostProcess.add(f._postProcess);f.onPreProcess.add(function(i,j){d.execCallback("paste_preprocess",i,j)});f.onPostProcess.add(function(i,j){d.execCallback("paste_postprocess",i,j)});d.onKeyDown.addToTop(function(i,j){if(((tinymce.isMac?j.metaKey:j.ctrlKey)&&j.keyCode==86)||(j.shiftKey&&j.keyCode==45)){return false}});d.pasteAsPlainText=b(d,"paste_text_sticky_default");function h(l,j){var k=d.dom,i;f.onPreProcess.dispatch(f,l);l.node=k.create("div",0,l.content);if(tinymce.isGecko){i=d.selection.getRng(true);if(i.startContainer==i.endContainer&&i.startContainer.nodeType==3){if(l.node.childNodes.length===1&&/^(p|h[1-6]|pre)$/i.test(l.node.firstChild.nodeName)&&l.content.indexOf("__MCE_ITEM__")===-1){k.remove(l.node.firstChild,true)}}}f.onPostProcess.dispatch(f,l);l.content=d.serializer.serialize(l.node,{getInner:1,forced_root_block:""});if((!j)&&(d.pasteAsPlainText)){f._insertPlainText(l.content);if(!b(d,"paste_text_sticky")){d.pasteAsPlainText=false;d.controlManager.setActive("pastetext",false)}}else{f._insert(l.content)}}d.addCommand("mceInsertClipboardContent",function(i,j){h(j,true)});if(!b(d,"paste_text_use_dialog")){d.addCommand("mcePasteText",function(j,i){var k=tinymce.util.Cookie;d.pasteAsPlainText=!d.pasteAsPlainText;d.controlManager.setActive("pastetext",d.pasteAsPlainText);if((d.pasteAsPlainText)&&(!k.get("tinymcePasteText"))){if(b(d,"paste_text_sticky")){d.windowManager.alert(d.translate("paste.plaintext_mode_sticky"))}else{d.windowManager.alert(d.translate("paste.plaintext_mode"))}if(!b(d,"paste_text_notifyalways")){k.set("tinymcePasteText","1",new Date(new Date().getFullYear()+1,12,31))}}})}d.addButton("pastetext",{title:"paste.paste_text_desc",cmd:"mcePasteText"});d.addButton("selectall",{title:"paste.selectall_desc",cmd:"selectall"});function g(s){var l,p,j,t,k=d.selection,o=d.dom,q=d.getBody(),i,r;if(s.clipboardData||o.doc.dataTransfer){r=(s.clipboardData||o.doc.dataTransfer).getData("Text");if(d.pasteAsPlainText){s.preventDefault();h({content:o.encode(r).replace(/\r?\n/g,"<br />")});return}}if(o.get("_mcePaste")){return}l=o.add(q,"div",{id:"_mcePaste","class":"mcePaste","data-mce-bogus":"1"},"\uFEFF\uFEFF");if(q!=d.getDoc().body){i=o.getPos(d.selection.getStart(),q).y}else{i=q.scrollTop+o.getViewPort(d.getWin()).y}o.setStyles(l,{position:"absolute",left:tinymce.isGecko?-40:0,top:i-25,width:1,height:1,overflow:"hidden"});if(tinymce.isIE){t=k.getRng();j=o.doc.body.createTextRange();j.moveToElementText(l);j.execCommand("Paste");o.remove(l);if(l.innerHTML==="\uFEFF\uFEFF"){d.execCommand("mcePasteWord");s.preventDefault();return}k.setRng(t);k.setContent("");setTimeout(function(){h({content:l.innerHTML})},0);return tinymce.dom.Event.cancel(s)}else{function m(n){n.preventDefault()}o.bind(d.getDoc(),"mousedown",m);o.bind(d.getDoc(),"keydown",m);p=d.selection.getRng();l=l.firstChild;j=d.getDoc().createRange();j.setStart(l,0);j.setEnd(l,2);k.setRng(j);window.setTimeout(function(){var u="",n;if(!o.select("div.mcePaste > div.mcePaste").length){n=o.select("div.mcePaste");c(n,function(w){var v=w.firstChild;if(v&&v.nodeName=="DIV"&&v.style.marginTop&&v.style.backgroundColor){o.remove(v,1)}c(o.select("span.Apple-style-span",w),function(x){o.remove(x,1)});c(o.select("br[data-mce-bogus]",w),function(x){o.remove(x)});if(w.parentNode.className!="mcePaste"){u+=w.innerHTML}})}else{u="<p>"+o.encode(r).replace(/\r?\n\r?\n/g,"</p><p>").replace(/\r?\n/g,"<br />")+"</p>"}c(o.select("div.mcePaste"),function(v){o.remove(v)});if(p){k.setRng(p)}h({content:u});o.unbind(d.getDoc(),"mousedown",m);o.unbind(d.getDoc(),"keydown",m)},0)}}if(b(d,"paste_auto_cleanup_on_paste")){if(tinymce.isOpera||/Firefox\/2/.test(navigator.userAgent)){d.onKeyDown.addToTop(function(i,j){if(((tinymce.isMac?j.metaKey:j.ctrlKey)&&j.keyCode==86)||(j.shiftKey&&j.keyCode==45)){g(j)}})}else{d.onPaste.addToTop(function(i,j){return g(j)})}}d.onInit.add(function(){d.controlManager.setActive("pastetext",d.pasteAsPlainText);if(b(d,"paste_block_drop")){d.dom.bind(d.getBody(),["dragend","dragover","draggesture","dragdrop","drop","drag"],function(i){i.preventDefault();i.stopPropagation();return false})}});f._legacySupport()},getInfo:function(){return{longname:"Paste text/word",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_preProcess:function(g,e){var k=this.editor,j=e.content,p=tinymce.grep,n=tinymce.explode,f=tinymce.trim,l,i;function d(h){c(h,function(o){if(o.constructor==RegExp){j=j.replace(o,"")}else{j=j.replace(o[0],o[1])}})}if(k.settings.paste_enable_default_filters==false){return}if(tinymce.isIE&&document.documentMode>=9&&/<(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)/.test(e.content)){d([[/(?:<br>&nbsp;[\s\r\n]+|<br>)*(<\/?(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)[^>]*>)(?:<br>&nbsp;[\s\r\n]+|<br>)*/g,"$1"]]);d([[/<br><br>/g,"<BR><BR>"],[/<br>/g," "],[/<BR><BR>/g,"<br>"]])}if(/class="?Mso|style="[^"]*\bmso-|w:WordDocument/i.test(j)||e.wordContent){e.wordContent=true;d([/^\s*(&nbsp;)+/gi,/(&nbsp;|<br[^>]*>)+\s*$/gi]);if(b(k,"paste_convert_headers_to_strong")){j=j.replace(/<p [^>]*class="?MsoHeading"?[^>]*>(.*?)<\/p>/gi,"<p><strong>$1</strong></p>")}if(b(k,"paste_convert_middot_lists")){d([[/<!--\[if !supportLists\]-->/gi,"$&__MCE_ITEM__"],[/(<span[^>]+(?:mso-list:|:\s*symbol)[^>]+>)/gi,"$1__MCE_ITEM__"],[/(<p[^>]+(?:MsoListParagraph)[^>]+>)/gi,"$1__MCE_ITEM__"]])}d([/<!--[\s\S]+?-->/gi,/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,[/<(\/?)s>/gi,"<$1strike>"],[/&nbsp;/gi,"\u00a0"]]);do{l=j.length;j=j.replace(/(<?!(ol|ul)[^>]*\s)(?:id|name|language|type|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi,"$1");j=j.replace(/(<(ol|ul)[^>]*\s)(?:id|name|language|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi,"$1")}while(l!=j.length);if(b(k,"paste_retain_style_properties").replace(/^none$/i,"").length==0){j=j.replace(/<\/?span[^>]*>/gi,"")}else{d([[/<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi,function(o,h){return(h.length>0)?h.replace(/./," ").slice(Math.floor(h.length/2)).split("").join("\u00a0"):""}],[/(<[a-z][^>]*)\sstyle="([^"]*)"/gi,function(t,h,r){var u=[],o=0,q=n(f(r).replace(/&quot;/gi,"'"),";");c(q,function(s){var w,y,z=n(s,":");function x(A){return A+((A!=="0")&&(/\d$/.test(A)))?"px":""}if(z.length==2){w=z[0].toLowerCase();y=z[1].toLowerCase();switch(w){case"mso-padding-alt":case"mso-padding-top-alt":case"mso-padding-right-alt":case"mso-padding-bottom-alt":case"mso-padding-left-alt":case"mso-margin-alt":case"mso-margin-top-alt":case"mso-margin-right-alt":case"mso-margin-bottom-alt":case"mso-margin-left-alt":case"mso-table-layout-alt":case"mso-height":case"mso-width":case"mso-vertical-align-alt":u[o++]=w.replace(/^mso-|-alt$/g,"")+":"+x(y);return;case"horiz-align":u[o++]="text-align:"+y;return;case"vert-align":u[o++]="vertical-align:"+y;return;case"font-color":case"mso-foreground":u[o++]="color:"+y;return;case"mso-background":case"mso-highlight":u[o++]="background:"+y;return;case"mso-default-height":u[o++]="min-height:"+x(y);return;case"mso-default-width":u[o++]="min-width:"+x(y);return;case"mso-padding-between-alt":u[o++]="border-collapse:separate;border-spacing:"+x(y);return;case"text-line-through":if((y=="single")||(y=="double")){u[o++]="text-decoration:line-through"}return;case"mso-zero-height":if(y=="yes"){u[o++]="display:none"}return}if(/^(mso|column|font-emph|lang|layout|line-break|list-image|nav|panose|punct|row|ruby|sep|size|src|tab-|table-border|text-(?!align|decor|indent|trans)|top-bar|version|vnd|word-break)/.test(w)){return}u[o++]=w+":"+z[1]}});if(o>0){return h+' style="'+u.join(";")+'"'}else{return h}}]])}}if(b(k,"paste_convert_headers_to_strong")){d([[/<h[1-6][^>]*>/gi,"<p><strong>"],[/<\/h[1-6][^>]*>/gi,"</strong></p>"]])}d([[/Version:[\d.]+\nStartHTML:\d+\nEndHTML:\d+\nStartFragment:\d+\nEndFragment:\d+/gi,""]]);i=b(k,"paste_strip_class_attributes");if(i!=="none"){function m(q,o){if(i==="all"){return""}var h=p(n(o.replace(/^(["'])(.*)\1$/,"$2")," "),function(r){return(/^(?!mso)/i.test(r))});return h.length?' class="'+h.join(" ")+'"':""}j=j.replace(/ class="([^"]+)"/gi,m);j=j.replace(/ class=([\-\w]+)/gi,m)}if(b(k,"paste_remove_spans")){j=j.replace(/<\/?span[^>]*>/gi,"")}e.content=j},_postProcess:function(g,i){var f=this,e=f.editor,h=e.dom,d;if(e.settings.paste_enable_default_filters==false){return}if(i.wordContent){c(h.select("a",i.node),function(j){if(!j.href||j.href.indexOf("#_Toc")!=-1){h.remove(j,1)}});if(b(e,"paste_convert_middot_lists")){f._convertLists(g,i)}d=b(e,"paste_retain_style_properties");if((tinymce.is(d,"string"))&&(d!=="all")&&(d!=="*")){d=tinymce.explode(d.replace(/^none$/i,""));c(h.select("*",i.node),function(m){var n={},k=0,l,o,j;if(d){for(l=0;l<d.length;l++){o=d[l];j=h.getStyle(m,o);if(j){n[o]=j;k++}}}h.setAttrib(m,"style","");if(d&&k>0){h.setStyles(m,n)}else{if(m.nodeName=="SPAN"&&!m.className){h.remove(m,true)}}})}}if(b(e,"paste_remove_styles")||(b(e,"paste_remove_styles_if_webkit")&&tinymce.isWebKit)){c(h.select("*[style]",i.node),function(j){j.removeAttribute("style");j.removeAttribute("data-mce-style")})}else{if(tinymce.isWebKit){c(h.select("*",i.node),function(j){j.removeAttribute("data-mce-style")})}}},_convertLists:function(g,e){var i=g.editor.dom,h,l,d=-1,f,m=[],k,j;c(i.select("p",e.node),function(t){var q,u="",s,r,n,o;for(q=t.firstChild;q&&q.nodeType==3;q=q.nextSibling){u+=q.nodeValue}u=t.innerHTML.replace(/<\/?\w+[^>]*>/gi,"").replace(/&nbsp;/g,"\u00a0");if(/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*\u00a0*/.test(u)){s="ul"}if(/^__MCE_ITEM__\s*\w+\.\s*\u00a0+/.test(u)){s="ol"}if(s){f=parseFloat(t.style.marginLeft||0);if(f>d){m.push(f)}if(!h||s!=k){h=i.create(s);i.insertAfter(h,t)}else{if(f>d){h=l.appendChild(i.create(s))}else{if(f<d){n=tinymce.inArray(m,f);o=i.getParents(h.parentNode,s);h=o[o.length-1-n]||h}}}c(i.select("span",t),function(v){var p=v.innerHTML.replace(/<\/?\w+[^>]*>/gi,"");if(s=="ul"&&/^__MCE_ITEM__[\u2022\u00b7\u00a7\u00d8o\u25CF]/.test(p)){i.remove(v)}else{if(/^__MCE_ITEM__[\s\S]*\w+\.(&nbsp;|\u00a0)*\s*/.test(p)){i.remove(v)}}});r=t.innerHTML;if(s=="ul"){r=t.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*(&nbsp;|\u00a0)+\s*/,"")}else{r=t.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^\s*\w+\.(&nbsp;|\u00a0)+\s*/,"")}l=h.appendChild(i.create("li",0,r));i.remove(t);d=f;k=s}else{h=d=0}});j=e.node.innerHTML;if(j.indexOf("__MCE_ITEM__")!=-1){e.node.innerHTML=j.replace(/__MCE_ITEM__/g,"")}},_insert:function(f,d){var e=this.editor,g=e.selection.getRng();if(!e.selection.isCollapsed()&&g.startContainer!=g.endContainer){e.getDoc().execCommand("Delete",false,null)}e.execCommand("mceInsertContent",false,f,{skip_undo:d})},_insertPlainText:function(j){var h=this.editor,f=b(h,"paste_text_linebreaktype"),k=b(h,"paste_text_replacements"),g=tinymce.is;function e(m){c(m,function(n){if(n.constructor==RegExp){j=j.replace(n,"")}else{j=j.replace(n[0],n[1])}})}if((typeof(j)==="string")&&(j.length>0)){if(/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(j)){e([/[\n\r]+/g])}else{e([/\r+/g])}e([[/<\/(?:p|h[1-6]|ul|ol|dl|table|div|blockquote|fieldset|pre|address|center)>/gi,"\n\n"],[/<br[^>]*>|<\/tr>/gi,"\n"],[/<\/t[dh]>\s*<t[dh][^>]*>/gi,"\t"],/<[a-z!\/?][^>]*>/gi,[/&nbsp;/gi," "],[/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi,"$1"]]);var d=Number(b(h,"paste_max_consecutive_linebreaks"));if(d>-1){var l=new RegExp("\n{"+(d+1)+",}","g");var i="";while(i.length<d){i+="\n"}e([[l,i]])}j=h.dom.decode(tinymce.html.Entities.encodeRaw(j));if(g(k,"array")){e(k)}else{if(g(k,"string")){e(new RegExp(k,"gi"))}}if(f=="none"){e([[/\n+/g," "]])}else{if(f=="br"){e([[/\n/g,"<br />"]])}else{if(f=="p"){e([[/\n+/g,"</p><p>"],[/^(.*<\/p>)(<p>)$/,"<p>$1"]])}else{e([[/\n\n/g,"</p><p>"],[/^(.*<\/p>)(<p>)$/,"<p>$1"],[/\n/g,"<br />"]])}}}h.execCommand("mceInsertContent",false,j)}},_legacySupport:function(){var e=this,d=e.editor;d.addCommand("mcePasteWord",function(){d.windowManager.open({file:e.url+"/pasteword.htm",width:parseInt(b(d,"paste_dialog_width")),height:parseInt(b(d,"paste_dialog_height")),inline:1})});if(b(d,"paste_text_use_dialog")){d.addCommand("mcePasteText",function(){d.windowManager.open({file:e.url+"/pastetext.htm",width:parseInt(b(d,"paste_dialog_width")),height:parseInt(b(d,"paste_dialog_height")),inline:1})})}d.addButton("pasteword",{title:"paste.paste_word_desc",cmd:"mcePasteWord"})}});tinymce.PluginManager.add("paste",tinymce.plugins.PastePlugin)})();
\ No newline at end of file
+(function(){var c=tinymce.each,a={paste_auto_cleanup_on_paste:true,paste_enable_default_filters:true,paste_block_drop:false,paste_retain_style_properties:"none",paste_strip_class_attributes:"mso",paste_remove_spans:false,paste_remove_styles:false,paste_remove_styles_if_webkit:true,paste_convert_middot_lists:true,paste_convert_headers_to_strong:false,paste_dialog_width:"450",paste_dialog_height:"400",paste_max_consecutive_linebreaks:2,paste_text_use_dialog:false,paste_text_sticky:false,paste_text_sticky_default:false,paste_text_notifyalways:false,paste_text_linebreaktype:"combined",paste_text_replacements:[[/\u2026/g,"..."],[/[\x93\x94\u201c\u201d]/g,'"'],[/[\x60\x91\x92\u2018\u2019]/g,"'"]]};function b(d,e){return d.getParam(e,a[e])}tinymce.create("tinymce.plugins.PastePlugin",{init:function(d,e){var f=this;f.editor=d;f.url=e;f.onPreProcess=new tinymce.util.Dispatcher(f);f.onPostProcess=new tinymce.util.Dispatcher(f);f.onPreProcess.add(f._preProcess);f.onPostProcess.add(f._postProcess);f.onPreProcess.add(function(i,j){d.execCallback("paste_preprocess",i,j)});f.onPostProcess.add(function(i,j){d.execCallback("paste_postprocess",i,j)});d.onKeyDown.addToTop(function(i,j){if(((tinymce.isMac?j.metaKey:j.ctrlKey)&&j.keyCode==86)||(j.shiftKey&&j.keyCode==45)){return false}});d.pasteAsPlainText=b(d,"paste_text_sticky_default");function h(l,j){var k=d.dom,i;f.onPreProcess.dispatch(f,l);l.node=k.create("div",0,l.content);if(tinymce.isGecko){i=d.selection.getRng(true);if(i.startContainer==i.endContainer&&i.startContainer.nodeType==3){if(l.node.childNodes.length===1&&/^(p|h[1-6]|pre)$/i.test(l.node.firstChild.nodeName)&&l.content.indexOf("__MCE_ITEM__")===-1){k.remove(l.node.firstChild,true)}}}f.onPostProcess.dispatch(f,l);l.content=d.serializer.serialize(l.node,{getInner:1,forced_root_block:""});if((!j)&&(d.pasteAsPlainText)){f._insertPlainText(l.content);if(!b(d,"paste_text_sticky")){d.pasteAsPlainText=false;d.controlManager.setActive("pastetext",false)}}else{f._insert(l.content)}}d.addCommand("mceInsertClipboardContent",function(i,j){h(j,true)});if(!b(d,"paste_text_use_dialog")){d.addCommand("mcePasteText",function(j,i){var k=tinymce.util.Cookie;d.pasteAsPlainText=!d.pasteAsPlainText;d.controlManager.setActive("pastetext",d.pasteAsPlainText);if((d.pasteAsPlainText)&&(!k.get("tinymcePasteText"))){if(b(d,"paste_text_sticky")){d.windowManager.alert(d.translate("paste.plaintext_mode_sticky"))}else{d.windowManager.alert(d.translate("paste.plaintext_mode"))}if(!b(d,"paste_text_notifyalways")){k.set("tinymcePasteText","1",new Date(new Date().getFullYear()+1,12,31))}}})}d.addButton("pastetext",{title:"paste.paste_text_desc",cmd:"mcePasteText"});d.addButton("selectall",{title:"paste.selectall_desc",cmd:"selectall"});function g(s){var l,p,j,t,k=d.selection,o=d.dom,q=d.getBody(),i,r;if(s.clipboardData||o.doc.dataTransfer){r=(s.clipboardData||o.doc.dataTransfer).getData("Text");if(d.pasteAsPlainText){s.preventDefault();h({content:o.encode(r).replace(/\r?\n/g,"<br />")});return}}if(o.get("_mcePaste")){return}l=o.add(q,"div",{id:"_mcePaste","class":"mcePaste","data-mce-bogus":"1"},"\uFEFF\uFEFF");if(q!=d.getDoc().body){i=o.getPos(d.selection.getStart(),q).y}else{i=q.scrollTop+o.getViewPort(d.getWin()).y}o.setStyles(l,{position:"absolute",left:tinymce.isGecko?-40:0,top:i-25,width:1,height:1,overflow:"hidden"});if(tinymce.isIE){t=k.getRng();j=o.doc.body.createTextRange();j.moveToElementText(l);j.execCommand("Paste");o.remove(l);if(l.innerHTML==="\uFEFF\uFEFF"){d.execCommand("mcePasteWord");s.preventDefault();return}k.setRng(t);k.setContent("");setTimeout(function(){h({content:l.innerHTML})},0);return tinymce.dom.Event.cancel(s)}else{function m(n){n.preventDefault()}o.bind(d.getDoc(),"mousedown",m);o.bind(d.getDoc(),"keydown",m);p=d.selection.getRng();l=l.firstChild;j=d.getDoc().createRange();j.setStart(l,0);j.setEnd(l,2);k.setRng(j);window.setTimeout(function(){var u="",n;if(!o.select("div.mcePaste > div.mcePaste").length){n=o.select("div.mcePaste");c(n,function(w){var v=w.firstChild;if(v&&v.nodeName=="DIV"&&v.style.marginTop&&v.style.backgroundColor){o.remove(v,1)}c(o.select("span.Apple-style-span",w),function(x){o.remove(x,1)});c(o.select("br[data-mce-bogus]",w),function(x){o.remove(x)});if(w.parentNode.className!="mcePaste"){u+=w.innerHTML}})}else{u="<p>"+o.encode(r).replace(/\r?\n\r?\n/g,"</p><p>").replace(/\r?\n/g,"<br />")+"</p>"}c(o.select("div.mcePaste"),function(v){o.remove(v)});if(p){k.setRng(p)}h({content:u});o.unbind(d.getDoc(),"mousedown",m);o.unbind(d.getDoc(),"keydown",m)},0)}}if(b(d,"paste_auto_cleanup_on_paste")){if(tinymce.isOpera||/Firefox\/2/.test(navigator.userAgent)){d.onKeyDown.addToTop(function(i,j){if(((tinymce.isMac?j.metaKey:j.ctrlKey)&&j.keyCode==86)||(j.shiftKey&&j.keyCode==45)){g(j)}})}else{d.onPaste.addToTop(function(i,j){return g(j)})}}d.onInit.add(function(){d.controlManager.setActive("pastetext",d.pasteAsPlainText);if(b(d,"paste_block_drop")){d.dom.bind(d.getBody(),["dragend","dragover","draggesture","dragdrop","drop","drag"],function(i){i.preventDefault();i.stopPropagation();return false})}});f._legacySupport()},getInfo:function(){return{longname:"Paste text/word",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_preProcess:function(g,e){var k=this.editor,j=e.content,p=tinymce.grep,n=tinymce.explode,f=tinymce.trim,l,i;function d(h){c(h,function(o){if(o.constructor==RegExp){j=j.replace(o,"")}else{j=j.replace(o[0],o[1])}})}if(k.settings.paste_enable_default_filters==false){return}if(tinymce.isIE&&document.documentMode>=9&&/<(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)/.test(e.content)){d([[/(?:<br>&nbsp;[\s\r\n]+|<br>)*(<\/?(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)[^>]*>)(?:<br>&nbsp;[\s\r\n]+|<br>)*/g,"$1"]]);d([[/<br><br>/g,"<BR><BR>"],[/<br>/g," "],[/<BR><BR>/g,"<br>"]])}if(/class="?Mso|style="[^"]*\bmso-|w:WordDocument/i.test(j)||e.wordContent){e.wordContent=true;d([/^\s*(&nbsp;)+/gi,/(&nbsp;|<br[^>]*>)+\s*$/gi]);if(b(k,"paste_convert_headers_to_strong")){j=j.replace(/<p [^>]*class="?MsoHeading"?[^>]*>(.*?)<\/p>/gi,"<p><strong>$1</strong></p>")}if(b(k,"paste_convert_middot_lists")){d([[/<!--\[if !supportLists\]-->/gi,"$&__MCE_ITEM__"],[/(<span[^>]+(?:mso-list:|:\s*symbol)[^>]+>)/gi,"$1__MCE_ITEM__"],[/(<p[^>]+(?:MsoListParagraph)[^>]+>)/gi,"$1__MCE_ITEM__"]])}d([/<!--[\s\S]+?-->/gi,/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,[/<(\/?)s>/gi,"<$1strike>"],[/&nbsp;/gi,"\u00a0"]]);do{l=j.length;j=j.replace(/(<?!(ol|ul)[^>]*\s)(?:id|name|language|type|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi,"$1");j=j.replace(/(<(ol|ul)[^>]*\s)(?:id|name|language|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi,"$1")}while(l!=j.length);if(b(k,"paste_retain_style_properties").replace(/^none$/i,"").length==0){j=j.replace(/<\/?span[^>]*>/gi,"")}else{d([[/<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi,function(o,h){return(h.length>0)?h.replace(/./," ").slice(Math.floor(h.length/2)).split("").join("\u00a0"):""}],[/(<[a-z][^>]*)\sstyle="([^"]*)"/gi,function(t,h,r){var u=[],o=0,q=n(f(r).replace(/&quot;/gi,"'"),";");c(q,function(s){var w,y,z=n(s,":");function x(A){return A+((A!=="0")&&(/\d$/.test(A)))?"px":""}if(z.length==2){w=z[0].toLowerCase();y=z[1].toLowerCase();switch(w){case"mso-padding-alt":case"mso-padding-top-alt":case"mso-padding-right-alt":case"mso-padding-bottom-alt":case"mso-padding-left-alt":case"mso-margin-alt":case"mso-margin-top-alt":case"mso-margin-right-alt":case"mso-margin-bottom-alt":case"mso-margin-left-alt":case"mso-table-layout-alt":case"mso-height":case"mso-width":case"mso-vertical-align-alt":u[o++]=w.replace(/^mso-|-alt$/g,"")+":"+x(y);return;case"horiz-align":u[o++]="text-align:"+y;return;case"vert-align":u[o++]="vertical-align:"+y;return;case"font-color":case"mso-foreground":u[o++]="color:"+y;return;case"mso-background":case"mso-highlight":u[o++]="background:"+y;return;case"mso-default-height":u[o++]="min-height:"+x(y);return;case"mso-default-width":u[o++]="min-width:"+x(y);return;case"mso-padding-between-alt":u[o++]="border-collapse:separate;border-spacing:"+x(y);return;case"text-line-through":if((y=="single")||(y=="double")){u[o++]="text-decoration:line-through"}return;case"mso-zero-height":if(y=="yes"){u[o++]="display:none"}return}if(/^(mso|column|font-emph|lang|layout|line-break|list-image|nav|panose|punct|row|ruby|sep|size|src|tab-|table-border|text-(?!align|decor|indent|trans)|top-bar|version|vnd|word-break)/.test(w)){return}u[o++]=w+":"+z[1]}});if(o>0){return h+' style="'+u.join(";")+'"'}else{return h}}]])}}if(b(k,"paste_convert_headers_to_strong")){d([[/<h[1-6][^>]*>/gi,"<p><strong>"],[/<\/h[1-6][^>]*>/gi,"</strong></p>"]])}d([[/Version:[\d.]+\nStartHTML:\d+\nEndHTML:\d+\nStartFragment:\d+\nEndFragment:\d+/gi,""]]);i=b(k,"paste_strip_class_attributes");if(i!=="none"){function m(q,o){if(i==="all"){return""}var h=p(n(o.replace(/^(["'])(.*)\1$/,"$2")," "),function(r){return(/^(?!mso)/i.test(r))});return h.length?' class="'+h.join(" ")+'"':""}j=j.replace(/ class="([^"]+)"/gi,m);j=j.replace(/ class=([\-\w]+)/gi,m)}if(b(k,"paste_remove_spans")){j=j.replace(/<\/?span[^>]*>/gi,"")}e.content=j},_postProcess:function(g,i){var f=this,e=f.editor,h=e.dom,d;if(e.settings.paste_enable_default_filters==false){return}if(i.wordContent){c(h.select("a",i.node),function(j){if(!j.href||j.href.indexOf("#_Toc")!=-1){h.remove(j,1)}});if(b(e,"paste_convert_middot_lists")){f._convertLists(g,i)}d=b(e,"paste_retain_style_properties");if((tinymce.is(d,"string"))&&(d!=="all")&&(d!=="*")){d=tinymce.explode(d.replace(/^none$/i,""));c(h.select("*",i.node),function(m){var n={},k=0,l,o,j;if(d){for(l=0;l<d.length;l++){o=d[l];j=h.getStyle(m,o);if(j){n[o]=j;k++}}}h.setAttrib(m,"style","");if(d&&k>0){h.setStyles(m,n)}else{if(m.nodeName=="SPAN"&&!m.className){h.remove(m,true)}}})}}if(b(e,"paste_remove_styles")||(b(e,"paste_remove_styles_if_webkit")&&tinymce.isWebKit)){c(h.select("*[style]",i.node),function(j){j.removeAttribute("style");j.removeAttribute("data-mce-style")})}else{if(tinymce.isWebKit){c(h.select("*",i.node),function(j){j.removeAttribute("data-mce-style")})}}},_convertLists:function(g,e){var i=g.editor.dom,h,l,d=-1,f,m=[],k,j;c(i.select("p",e.node),function(t){var q,u="",s,r,n,o;for(q=t.firstChild;q&&q.nodeType==3;q=q.nextSibling){u+=q.nodeValue}u=t.innerHTML.replace(/<\/?\w+[^>]*>/gi,"").replace(/&nbsp;/g,"\u00a0");if(/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*\u00a0*/.test(u)){s="ul"}if(/^__MCE_ITEM__\s*\w+\.\s*\u00a0+/.test(u)){s="ol"}if(s){f=parseFloat(t.style.marginLeft||0);if(f>d){m.push(f)}if(!h||s!=k){h=i.create(s);i.insertAfter(h,t)}else{if(f>d){h=l.appendChild(i.create(s))}else{if(f<d){n=tinymce.inArray(m,f);o=i.getParents(h.parentNode,s);h=o[o.length-1-n]||h}}}c(i.select("span",t),function(v){var p=v.innerHTML.replace(/<\/?\w+[^>]*>/gi,"");if(s=="ul"&&/^__MCE_ITEM__[\u2022\u00b7\u00a7\u00d8o\u25CF]/.test(p)){i.remove(v)}else{if(/^__MCE_ITEM__[\s\S]*\w+\.(&nbsp;|\u00a0)*\s*/.test(p)){i.remove(v)}}});r=t.innerHTML;if(s=="ul"){r=t.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*(&nbsp;|\u00a0)+\s*/,"")}else{r=t.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^\s*[\w|'<'|'>']+\.(&nbsp;|\u00a0)+\s*/,"")}l=h.appendChild(i.create("li",0,r));i.remove(t);d=f;k=s}else{h=d=0}});j=e.node.innerHTML;if(j.indexOf("__MCE_ITEM__")!=-1){e.node.innerHTML=j.replace(/__MCE_ITEM__/g,"")}},_insert:function(f,d){var e=this.editor,g=e.selection.getRng();if(!e.selection.isCollapsed()&&g.startContainer!=g.endContainer){e.getDoc().execCommand("Delete",false,null)}e.execCommand("mceInsertContent",false,f,{skip_undo:d})},_insertPlainText:function(j){var h=this.editor,f=b(h,"paste_text_linebreaktype"),k=b(h,"paste_text_replacements"),g=tinymce.is;function e(m){c(m,function(n){if(n.constructor==RegExp){j=j.replace(n,"")}else{j=j.replace(n[0],n[1])}})}if((typeof(j)==="string")&&(j.length>0)){if(/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(j)){e([/[\n\r]+/g])}else{e([/\r+/g])}e([[/<\/(?:p|h[1-6]|ul|ol|dl|table|div|blockquote|fieldset|pre|address|center)>/gi,"\n\n"],[/<br[^>]*>|<\/tr>/gi,"\n"],[/<\/t[dh]>\s*<t[dh][^>]*>/gi,"\t"],/<[a-z!\/?][^>]*>/gi,[/&nbsp;/gi," "],[/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi,"$1"]]);var d=Number(b(h,"paste_max_consecutive_linebreaks"));if(d>-1){var l=new RegExp("\n{"+(d+1)+",}","g");var i="";while(i.length<d){i+="\n"}e([[l,i]])}j=h.dom.decode(tinymce.html.Entities.encodeRaw(j));if(g(k,"array")){e(k)}else{if(g(k,"string")){e(new RegExp(k,"gi"))}}if(f=="none"){e([[/\n+/g," "]])}else{if(f=="br"){e([[/\n/g,"<br />"]])}else{if(f=="p"){e([[/\n+/g,"</p><p>"],[/^(.*<\/p>)(<p>)$/,"<p>$1"]])}else{e([[/\n\n/g,"</p><p>"],[/^(.*<\/p>)(<p>)$/,"<p>$1"],[/\n/g,"<br />"]])}}}h.execCommand("mceInsertContent",false,j)}},_legacySupport:function(){var e=this,d=e.editor;d.addCommand("mcePasteWord",function(){d.windowManager.open({file:e.url+"/pasteword.htm",width:parseInt(b(d,"paste_dialog_width")),height:parseInt(b(d,"paste_dialog_height")),inline:1})});if(b(d,"paste_text_use_dialog")){d.addCommand("mcePasteText",function(){d.windowManager.open({file:e.url+"/pastetext.htm",width:parseInt(b(d,"paste_dialog_width")),height:parseInt(b(d,"paste_dialog_height")),inline:1})})}d.addButton("pasteword",{title:"paste.paste_word_desc",cmd:"mcePasteWord"})}});tinymce.PluginManager.add("paste",tinymce.plugins.PastePlugin)})();
\ No newline at end of file

Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js	2014-05-08 12:08:54 UTC (rev 12521)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js	2014-05-10 09:13:56 UTC (rev 12522)
@@ -93,6 +93,10 @@
 
 						if (b) {
 							r.moveEnd("character", -(rs.length)); // Otherwise will loop forever
+						} else {
+							// to avoid looping for ever in MSIE 9/10 when just
+							// changing the case
+							r.moveStart("character", rs.length);
 						}
 					}
 

Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js	2014-05-08 12:08:54 UTC (rev 12521)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js	2014-05-10 09:13:56 UTC (rev 12522)
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.WordCount",{block:0,id:null,countre:null,cleanre:null,init:function(c,d){var e=this,f=0,g=tinymce.VK;e.countre=c.getParam("wordcount_countregex",/[\w\u2019\'-]+/g);e.cleanre=c.getParam("wordcount_cleanregex",/[0-9.(),;:!?%#$?\'\"_+=\\\/-]*/g);e.update_rate=c.getParam("wordcount_update_rate",2000);e.update_on_delete=c.getParam("wordcount_update_on_delete",false);e.id=c.id+"-word-count";c.onPostRender.add(function(i,h){var j,k;k=i.getParam("wordcount_target_id");if(!k){j=tinymce.DOM.get(i.id+"_path_row");if(j){tinymce.DOM.add(j.parentNode,"div",{style:"float: right"},i.getLang("wordcount.words","Words: ")+'<span id="'+e.id+'">0</span>')}}else{tinymce.DOM.add(k,"span",{},'<span id="'+e.id+'">0</span>')}});c.onInit.add(function(h){h.selection.onSetContent.add(function(){e._count(h)});e._count(h)});c.onSetContent.add(function(h){e._count(h)});function b(h){return h!==f&&(h===g.ENTER||f===g.SPACEBAR||a(f))}function a(h){return h===g.DELETE||h===g.BACKSPACE}c.onKeyUp.add(function(h,i){if(b(i.keyCode)||e.update_on_delete&&a(i.keyCode)){e._count(h)}f=i.keyCode})},_getCount:function(c){var a=0;var b=c.getContent({format:"raw"});if(b){b=b.replace(/\.\.\./g," ");b=b.replace(/<.[^<>]*?>/g," ").replace(/&nbsp;|&#160;/gi," ");b=b.replace(/(\w+)(&.+?;)+(\w+)/,"$1$3").replace(/&.+?;/g," ");b=b.replace(this.cleanre,"");var d=b.match(this.countre);if(d){a=d.length}}return a},_count:function(a){var b=this;if(b.block){return}b.block=1;setTimeout(function(){if(!a.destroyed){var c=b._getCount(a);tinymce.DOM.setHTML(b.id,c.toString());setTimeout(function(){b.block=0},b.update_rate)}},1)},getInfo:function(){return{longname:"Word Count plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("wordcount",tinymce.plugins.WordCount)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.WordCount",{block:0,id:null,countre:null,cleanre:null,init:function(c,d){var e=this,f=0,g=tinymce.VK;e.countre=c.getParam("wordcount_countregex",/[\w\u2019\u00co-\u00ff^\uc397^u00f7\'-]+/g);e.cleanre=c.getParam("wordcount_cleanregex",/[0-9.(),;:!?%#$?\'\"_+=\\\/-]*/g);e.update_rate=c.getParam("wordcount_update_rate",2000);e.update_on_delete=c.getParam("wordcount_update_on_delete",false);e.id=c.id+"-word-count";c.onPostRender.add(function(i,h){var j,k;k=i.getParam("wordcount_target_id");if(!k){j=tinymce.DOM.get(i.id+"_path_row");if(j){tinymce.DOM.add(j.parentNode,"div",{style:"float: right"},i.getLang("wordcount.words","Words: ")+'<span id="'+e.id+'">0</span>')}}else{tinymce.DOM.add(k,"span",{},'<span id="'+e.id+'">0</span>')}});c.onInit.add(function(h){h.selection.onSetContent.add(function(){e._count(h)});e._count(h)});c.onSetContent.add(function(h){e._count(h)});function b(h){return h!==f&&(h===g.ENTER||f===g.SPACEBAR||a(f))}function a(h){return h===g.DELETE||h===g.BACKSPACE}c.onKeyUp.add(function(h,i){if(b(i.keyCode)||e.update_on_delete&&a(i.keyCode)){e._count(h)}f=i.keyCode})},_getCount:function(c){var a=0;var b=c.getContent({format:"raw"});if(b){b=b.replace(/\.\.\./g," ");b=b.replace(/<.[^<>]*?>/g," ").replace(/&nbsp;|&#160;/gi," ");b=b.replace(/(\w+)(&.+?;)+(\w+)/,"$1$3").replace(/&.+?;/g," ");b=b.replace(this.cleanre,"");var d=b.match(this.countre);if(d){a=d.length}}return a},_count:function(a){var b=this;if(b.block){return}b.block=1;setTimeout(function(){if(!a.destroyed){var c=b._getCount(a);tinymce.DOM.setHTML(b.id,c.toString());setTimeout(function(){b.block=0},b.update_rate)}},1)},getInfo:function(){return{longname:"Word Count plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("wordcount",tinymce.plugins.WordCount)})();
\ No newline at end of file

Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/tiny_mce.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/tiny_mce.js	2014-05-08 12:08:54 UTC (rev 12521)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/tiny_mce.js	2014-05-10 09:13:56 UTC (rev 12522)
@@ -1 +1 @@

@@ Diff output truncated at 100000 characters. @@

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

From: <txm...@us...> - 2014-05-08 12:08:58

Revision: 12521
          http://sourceforge.net/p/xoops/svn/12521
Author:   txmodxoops
Date:     2014-05-08 12:08:54 +0000 (Thu, 08 May 2014)
Log Message:
-----------
Updated - Work in progress

Modified Paths:
--------------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/header.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/menu.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/modules.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/css/admin/style.css
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/js/fields.js
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/js/functions.js
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/sql/mysql.sql
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/fields.tpl
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/modules.tpl
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tables.tpl
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php

Added Paths:
-----------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/html/
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/html/index.html
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/html/simplelabel.php

Removed Paths:
-------------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/simplelabel.php

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php	2014-05-05 12:45:22 UTC (rev 12520)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php	2014-05-08 12:08:54 UTC (rev 12521)
@@ -20,18 +20,14 @@
  */
 include 'header.php';
 // Recovered value of arguments op in the URL $ 
-//$op = TDMCreate_CleanVars($_REQUEST, 'op', 'list', 'string');
-//$tdmcreate = TDMCreate::getInstance();
 $op = TDMCreateRequest::getString('op', 'list');
 // Get table Variables
 $table_id = TDMCreate_CleanVars($_REQUEST, 'table_id');
 $table_mid = TDMCreate_CleanVars($_REQUEST, 'table_mid');
 $table_nbfields = TDMCreate_CleanVars($_REQUEST, 'table_nbfields');
-$table_fieldname = TDMCreate_CleanVars($_REQUEST, 'table_fieldname', '', 'string');
 /*$table_id = TDMCreateRequest::getInt('table_id');
 $table_mid = TDMCreateRequest::getInt('table_mid');
-$table_nbfields = TDMCreateRequest::getInt('table_nbfields');
-$table_fieldname = TDMCreateRequest::getString('table_fieldname', '');*/
+$table_nbfields = TDMCreateRequest::getInt('table_nbfields');*/
 // Get field Variables
 $field_id = TDMCreate_CleanVars($_REQUEST, 'field_id');
 $field_mid = TDMCreate_CleanVars($_REQUEST, 'field_mid');
@@ -48,21 +44,20 @@
 {   
     case 'list': 
     default:
-	    //$limit = $GLOBALS['xoopsModuleConfig']['fields_adminpager'];
-		//$start = TDMCreate_CleanVars($_REQUEST, 'start', 0);  
         $start = TDMCreateRequest::getInt('start', 0);
         $limit = TDMCreateRequest::getInt('limit', $tdmcreate->getConfig('fields_adminpager'));		
 		// Define main template
 		$template_main = 'fields.tpl';
 		$GLOBALS['xoTheme']->addStylesheet( 'modules/TDMCreate/css/admin/style.css' );
 		$GLOBALS['xoTheme']->addScript('modules/TDMCreate/js/functions.js');
+		$GLOBALS['xoTheme']->addScript('modules/TDMCreate/js/fields.js');
 		$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('fields.php'));
 		$adminMenu->addItemButton(_AM_TDMCREATE_ADD_TABLE, 'tables.php?op=new', 'add');            
 		$GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton()); 
 		$GLOBALS['xoopsTpl']->assign('tdmc_url', TDMC_URL);
 		$GLOBALS['xoopsTpl']->assign('tdmc_icons_url', TDMC_ICONS_URL);
 		$GLOBALS['xoopsTpl']->assign('tdmc_upload_url', TDMC_UPLOAD_URL);
-		$GLOBALS['xoopsTpl']->assign('pathIcon32', $pathIcon32);
+		$GLOBALS['xoopsTpl']->assign('modPathIcon16', $modPathIcon16);
 		// Redirect if there aren't modules
 		$nb_modules = $modulesHandler->getCount();
 		if ( $nb_modules == 0 ) {
@@ -170,8 +165,7 @@
 		}		
 		//
 		if ($field_numb > 0) {
-			for( $i = 1; $i <= $field_numb; $i++ ) {								
-				
+			for( $i = 1; $i <= $field_numb; $i++ ) {				
 				$obj->setVar( 'field_mid', $field_mid );
 				$obj->setVar( 'field_tid', $field_tid );								
 				$obj->setVar( 'field_numb', $field_numb );
@@ -183,6 +177,7 @@
 				$obj->setVar( 'field_default', (isset($_POST['field_default'][$i]) ? $_POST['field_default'][$i] : '') ); 
 				$obj->setVar( 'field_key', (isset($_POST['field_key'][$i]) ? $_POST['field_key'][$i] : '') ); 									
 				$obj->setVar( 'field_element', (isset($_POST['field_element'][$i]) ? $_POST['field_element'][$i] : '') );                    
+				$obj->setVar( 'field_parent', (($i == isset($_REQUEST['field_parent'])) ? '1' : '0') );
 				$obj->setVar( 'field_inlist', ((isset($_REQUEST['field_inlist'][$i]) == 1) ? '1' : '0') );
 				$obj->setVar( 'field_inform', ((isset($_REQUEST['field_inform'][$i]) == 1) ? '1' : '0') );
 				$obj->setVar( 'field_admin', ((isset($_REQUEST['field_admin'][$i]) == 1) ? '1' : '0') );
@@ -191,7 +186,7 @@
 				$obj->setVar( 'field_main', (($i == isset($_REQUEST['field_main'])) ? '1' : '0') ); 
 				$obj->setVar( 'field_search',  ((isset($_REQUEST['field_search'][$i]) == 1) ? '1' : '0') ); 
 				$obj->setVar( 'field_required', ((isset($_REQUEST['field_required'][$i]) == 1) ? '1' : '0') );		
-				
+				// Insert Data
                 $fieldsHandler->insert($obj);					
 			}				
 		}
@@ -209,17 +204,46 @@
 	
 	case 'edit':
 		// Define main template
-		$template_main = 'tables.tpl';
+		$template_main = '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');
 		$adminMenu->addItemButton(_AM_TDMCREATE_FIELDS_LIST, 'fields.php', 'list');           
 		$GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton());
 		
-		$obj = $fieldsHandler->get($field_tid);        		
+		$obj = $fieldsHandler->get( $field_id );        		
 		$form = $obj->getForm($field_mid, $field_tid, $field_numb);
 		$GLOBALS['xoopsTpl']->assign('form', $form->render());
-	break;	
+	break;
+
+    case 'drag':        
+        $side = TDMCreate_CleanVars( $_POST, 'field_id', 0, 'int' );
+        if ( $block_id > 0 ) {
+            $fieldsObj = $fieldsHandler->get( $field_id );
+            $fieldsObj->setVar('field_id', $side);
+            if (!$fieldsHandler->insert( $fieldsObj )) {
+                redirect_header('fields.php', 5, _AM_TDMCREATE_FIELD_SIDE_ERROR);
+            }
+        }
+    break;
+
+    case 'order':        
+        if ( isset($_POST['field_id'] ) ) {
+            $i = 0;
+            foreach($_POST['field_id'] as $order) {
+                if( $order > 0 ) {
+                    $fieldsObj = $fieldsHandler->get( $order );
+                    $fieldsObj->setVar('field_id', $i);
+                    if (!$fieldsHandler->insert( $fieldsObj )) {
+                        redirect_header('fields.php', 5, _AM_TDMCREATE_FIELD_ORDER_ERROR);
+                    }
+                    $i++;
+                }
+            }
+			unset($i);
+        }
+        exit;
+    break;	
 	
 	case 'toggle':
         if (isset($_GET['field_tid'])) {

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/header.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/header.php	2014-05-05 12:45:22 UTC (rev 12520)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/header.php	2014-05-08 12:08:54 UTC (rev 12521)
@@ -24,13 +24,15 @@
 //include_once 'includes.php';
 //
 $thisDirname = $GLOBALS['xoopsModule']->getVar('dirname');
-//
-$pathIcon16 = '../' . $xoopsModule->getInfo('icons16');
-$pathIcon32 = '../' . $xoopsModule->getInfo('icons32');
+// Link System Icons
+$sysPathIcon16 = '../' . $xoopsModule->getInfo('sysicons16');
+$sysPathIcon32 = '../' . $xoopsModule->getInfo('sysicons32');
+// Link Local Icons
+$modPathIcon16 = $xoopsModule->getInfo('modicons16');
+$modPathIcon32 = $xoopsModule->getInfo('modicons32');
 $pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
-
+// TDMCreate Instance
 $tdmcreate = TDMCreate::getInstance();
-
 // Get class handler
 $modulesHandler =& $tdmcreate->getHandler('modules');
 $tablesHandler =& $tdmcreate->getHandler('tables');
@@ -46,10 +48,13 @@
 	include_once(XOOPS_ROOT_PATH."/class/template.php");
 	$xoopsTpl = new XoopsTpl();
 }
-//
-$GLOBALS['xoopsTpl']->assign('pathIcon16', $pathIcon16);
-$GLOBALS['xoopsTpl']->assign('pathIcon32', $pathIcon32);
-//Load languages
+// System Icons
+$GLOBALS['xoopsTpl']->assign('sysPathIcon16', $sysPathIcon16);
+$GLOBALS['xoopsTpl']->assign('sysPathIcon32', $sysPathIcon32);
+// Local Icons
+$GLOBALS['xoopsTpl']->assign('modPathIcon16', $modPathIcon16);
+$GLOBALS['xoopsTpl']->assign('modPathIcon32', $modPathIcon32);
+// Load languages
 xoops_loadLanguage('admin', $thisDirname);
 xoops_loadLanguage('modinfo', $thisDirname);
 xoops_loadLanguage('main', $thisDirname);

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/menu.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/menu.php	2014-05-05 12:45:22 UTC (rev 12520)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/menu.php	2014-05-08 12:08:54 UTC (rev 12521)
@@ -21,12 +21,12 @@
 $module_handler =& xoops_gethandler('module');
 $xoopsModule =& XoopsModule::getByDirname('TDMCreate');
 $moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
-$pathIcon32 = $moduleInfo->getInfo('icons32');
+$sysPathIcon32 = $moduleInfo->getInfo('sysicons32');
 $adminmenu = array();
 $i = 1;
 $adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU1;
 $adminmenu[$i]['link'] = 'admin/index.php';
-$adminmenu[$i]['icon'] = $pathIcon32.'/home.png';
+$adminmenu[$i]['icon'] = $sysPathIcon32.'/home.png';
 $i++;
 $adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU2;
 $adminmenu[$i]['link'] = 'admin/modules.php';
@@ -46,5 +46,5 @@
 $i++;
 $adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU6;
 $adminmenu[$i]['link'] = 'admin/about.php';
-$adminmenu[$i]['icon'] = $pathIcon32.'/about.png';
+$adminmenu[$i]['icon'] = $sysPathIcon32.'/about.png';
 unset($i);
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php	2014-05-05 12:45:22 UTC (rev 12520)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php	2014-05-08 12:08:54 UTC (rev 12521)
@@ -20,9 +20,6 @@
  */
 include 'header.php';
 // Recovered value of argument op in the URL $ 
-//$op = TDMCreate_CleanVars($_REQUEST, 'op', 'list', 'string');
-//$mod_id = TDMCreate_CleanVars($_REQUEST, 'mod_id');
-$tdmcreate = TDMCreate::getInstance();
 $op = TDMCreateRequest::getString('op', 'list');
 //
 $mod_id = TDMCreateRequest::getInt('mod_id');
@@ -30,9 +27,7 @@
 switch ($op)
 {   
     case 'list': 
-    default: 		
-		//$limit = $GLOBALS['xoopsModuleConfig']['modules_adminpager'];
-		//$start = TDMCreate_CleanVars($_REQUEST, 'start', 0);
+    default:		
 		$start = TDMCreateRequest::getInt('start', 0);
         $limit = TDMCreateRequest::getInt('limit', $tdmcreate->getConfig('modules_adminpager'));
 	    // Define main template
@@ -46,7 +41,7 @@
 		$criteria = new CriteriaCompo();
 		$criteria->setSort('mod_id ASC, mod_name');
 		$criteria->setOrder('ASC');
-		$nb_modules = $modulesHandler->getCount();		
+		$nb_modules = $modulesHandler->getCount( $criteria );		
 		$mods_arr = $modulesHandler->getAll( $criteria );
 		unset($criteria); 
 		// Redirect if there aren't modules
@@ -54,10 +49,8 @@
 			redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES );
 		}
 		// Display modules list
-		if ($nb_modules > 0) 
-		{            						
-			foreach (array_keys($mods_arr) as $i) 
-			{				
+		if ( $nb_modules > 0 ) {            						
+			foreach (array_keys($mods_arr) as $i) {				
 				$mod['id'] = $i;
                 $mod['name'] = $mods_arr[$i]->getVar('mod_name');	
 				$mod['version'] = $mods_arr[$i]->getVar('mod_version');	
@@ -130,7 +123,7 @@
 																	$tdmcreate->getConfig('maxsize'), null, null);
 		if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
 		    $extension = preg_replace( '/^.+\.([^.]+)$/sU' , '\\1' , $_FILES['attachedfile']['name']);
-            $name_img = $_GET['mod_name'].'_slogo.'.$extension;
+            $name_img = strtolower($_POST['mod_name']).'_slogo.'.$extension;
 			$uploader->setPrefix($name_img);
 			$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
 			if (!$uploader->upload()) {
@@ -152,8 +145,7 @@
 							'mod_release' => $_POST['mod_release'], 
 							'mod_status' => $_POST['mod_status'],
 							'mod_admin' => (($_REQUEST['mod_admin'] == 1) ? '1' : '0'),
-							'mod_user' => (($_REQUEST['mod_user'] == 1) ? '1' : '0'),
-							'mod_submenu' => (($_REQUEST['mod_submenu'] == 1) ? '1' : '0'),
+							'mod_user' => (($_REQUEST['mod_user'] == 1) ? '1' : '0'),							
 							'mod_search' => (($_REQUEST['mod_search'] == 1) ? '1' : '0'),
 							'mod_comments' => (($_REQUEST['mod_comments'] == 1) ? '1' : '0'),
 							'mod_notifications' => (($_REQUEST['mod_notifications'] == 1) ? '1' : '0'),

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php	2014-05-05 12:45:22 UTC (rev 12520)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php	2014-05-08 12:08:54 UTC (rev 12521)
@@ -20,16 +20,8 @@
 */
 include 'header.php';
 // Recovered value of arguments op in the URL $ 
-//$op = TDMCreate_CleanVars($_REQUEST, 'op', 'list', 'string');
-//$tdmcreate = TDMCreate::getInstance();
 $op = TDMCreateRequest::getString('op', 'list');
 //
-/*$mod_id = TDMCreate_CleanVars($_REQUEST, 'mod_id');
-$table_id = TDMCreate_CleanVars($_REQUEST, 'table_id');
-$table_mid = TDMCreate_CleanVars($_REQUEST, 'table_mid');
-$table_nbfields = TDMCreate_CleanVars($_REQUEST, 'table_nbfields');
-$table_fieldname = TDMCreate_CleanVars($_REQUEST, 'table_fieldname', '', 'string');*/
-//
 $mod_id = TDMCreateRequest::getInt('mod_id');
 //
 $table_id = TDMCreateRequest::getInt('table_id');
@@ -41,8 +33,6 @@
 {   
 	case 'list': 
 	default: 
-		//$limit = $GLOBALS['xoopsModuleConfig']['tables_adminpager'];
-		//$start = TDMCreate_CleanVars($_REQUEST, 'start', 0);   
 		$start = TDMCreateRequest::getInt('start', 0);
         $limit = TDMCreateRequest::getInt('limit', $tdmcreate->getConfig('tables_adminpager'));
 		// Define main template
@@ -56,7 +46,8 @@
 		$GLOBALS['xoopsTpl']->assign('tdmc_icons_url', TDMC_ICONS_URL);
 		$GLOBALS['xoopsTpl']->assign('tdmc_upload_imgmod_url', TDMC_UPLOAD_IMGMOD_URL);
         //$GLOBALS['xoopsTpl']->assign('tdmc_upload_imgtab_url', TDMC_UPLOAD_IMGTAB_URL);
-		$GLOBALS['xoopsTpl']->assign('pathIcon32', $pathIcon32);
+		$GLOBALS['xoopsTpl']->assign('modPathIcon16', $modPathIcon16);
+		$GLOBALS['xoopsTpl']->assign('sysPathIcon32', $sysPathIcon32);
 		// Get the list of modules
 		$criteria = new CriteriaCompo();
 		$criteria->setSort('mod_id ASC, mod_name');
@@ -69,6 +60,7 @@
 		$mods_arr = $modulesHandler->getAll($criteria);
 		unset($criteria);	
         $nb_tables = $tablesHandler->getObjects(null);
+		// Redirect if there aren't tables
 		if ($nb_tables == 0)  {
 			redirect_header('tables.php?op=new', 2, _AM_TDMCREATE_NOTTABLES );
 		} 	
@@ -163,7 +155,7 @@
 		{
 			if( ($table_name_search[$t]->getVar('table_name') === $_POST['table_name']) &&
 				($table_name_search[$t]->getVar('table_mid') === $table_mid)) {
-				redirect_header('tables.php?op=new', 8, sprintf(_AM_TDMCREATE_ERROR_TABLE_NAME_EXIST, $_POST['table_name']));
+				redirect_header('tables.php?op=new', 10, sprintf(_AM_TDMCREATE_ERROR_TABLE_NAME_EXIST, $_POST['table_name']));
 			}
 		}		
 		// Form save tables
@@ -174,11 +166,7 @@
 							'table_fieldname' => $table_fieldname));
 		//Form table_image	
 		include_once XOOPS_ROOT_PATH.'/class/uploader.php';
-		if(is_dir($pathIcon32)){
-			$uploaddir = $pathIcon32;
-		}else{
-			$uploaddir = TDMC_UPLOAD_PATH.'/images/tables';
-		}		
+		$uploaddir = is_dir($sysPathIcon32) ? $sysPathIcon32 : TDMC_UPLOAD_IMGTAB_PATH;			
 		$uploader = new XoopsMediaUploader($uploaddir, $tdmcreate->getConfig('mimetypes'), 
 													   $tdmcreate->getConfig('maxsize'), null, null);
 		if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php	2014-05-05 12:45:22 UTC (rev 12520)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php	2014-05-08 12:08:54 UTC (rev 12521)
@@ -19,7 +19,7 @@
  * @version         $Id: 1.91 fields.php 12258 2014-01-02 09:33:29Z timgno $
  */
 defined('XOOPS_ROOT_PATH') or die('Restricted access');
-require_once 'simplelabel.php';
+require_once 'html/simplelabel.php';
 require_once 'form/themeform.php';
 /*
 *  @Class TDMCreateFields
@@ -117,7 +117,7 @@
 		$form->setExtra('enctype="multipart/form-data"');			
 
 		$tablesHandler = $this->tdmcreate->getHandler('tables');
-		//$fieldsHandler = $this->tdmcreate->getHandler('fields');
+		$fieldsHandler = $this->tdmcreate->getHandler('fields');
 		$fieldelementsHandler =& $this->tdmcreate->getHandler('fieldelements');	
 		$fieldtypeHandler =& $this->tdmcreate->getHandler('fieldtype');
 		$fieldattrsHandler =& $this->tdmcreate->getHandler('fieldattributes');
@@ -140,11 +140,11 @@
 		$form->addElement(new TDMCreateFormLabel('</tr></thead>'));	
 		$form->addElement(new TDMCreateFormLabel('<tbody>'));
 				
-		//$fields = $fieldsHandler->getObjects(null);
+		$obj = $fieldsHandler->getObjects(null);
 		
 		$class = '';
 		for($i = 1; $i <= $field_numb; $i++)
-		{		
+		{
 			$class = ($class == 'even') ? 'odd' : 'even';            			
 			$form->addElement(new TDMCreateFormLabel('<tr class="'.$class.'">'));
             // Index ID
@@ -200,59 +200,58 @@
 					}
 					$parameters_tray->addElement($field_elements_select);
                 				
-				$field_parent = $this->isNew() ? ( $i == 1 ) : $this->getVar('field_parent');
-					$check_field_parent = new XoopsFormCheckBox(' ', 'field_parent', $field_parent);
-					$check_field_parent->addOption(1, _AM_TDMCREATE_FIELD_PARENT );
+				$field_parent = $isNew ? ( $i == 1 ) : $this->getVar('field_parent');
+					$check_field_parent = new XoopsFormRadio(' ', 'field_parent', $field_parent);
+					$check_field_parent->addOption('', _AM_TDMCREATE_FIELD_PARENT );
 					$parameters_tray->addElement($check_field_parent);
 					
-				$field_inlist = $this->isNew() ? 0 : $this->getVar('field_inlist');
+				$field_inlist = $isNew ? 0 : $this->getVar('field_inlist');
 					$check_field_inlist = new XoopsFormCheckBox(' ', 'field_inlist['.$i.']', $field_inlist);
 					$check_field_inlist->addOption(1, _AM_TDMCREATE_FIELD_INLIST);
 					$parameters_tray->addElement($check_field_inlist);
 				
-				$field_inform = $this->isNew() ? 0 : $this->getVar('field_inform');
+				$field_inform = $isNew ? 0 : $this->getVar('field_inform');
 					$check_field_inform = new XoopsFormCheckBox(' ', 'field_inform['.$i.']', $field_inform);
 					$check_field_inform->addOption(1, _AM_TDMCREATE_FIELD_INFORM);
 					$parameters_tray->addElement($check_field_inform);
 
-				$field_admin = $this->isNew() ? 0 : $this->getVar('field_admin');
+				$field_admin = $isNew ? 0 : $this->getVar('field_admin');
 					$check_field_admin = new XoopsFormCheckBox(' ', 'field_admin['.$i.']', $field_admin);
 					$check_field_admin->addOption(1, _AM_TDMCREATE_FIELD_ADMIN);
 					$parameters_tray->addElement($check_field_admin);
 
-				$field_user = $this->isNew() ? 0 : $this->getVar('field_user');
+				$field_user = $isNew ? 0 : $this->getVar('field_user');
 					$check_field_user = new XoopsFormCheckBox(' ', 'field_user['.$i.']', $field_user);
 					$check_field_user->addOption(1, _AM_TDMCREATE_FIELD_USER);
 					$parameters_tray->addElement($check_field_user);
 
-				$field_block = $this->isNew() ? 0 : $this->getVar('field_block');
+				$field_block = $isNew ? 0 : $this->getVar('field_block');
 					$check_field_block = new XoopsFormCheckBox('', 'field_block['.$i.']', $field_block);
 					$check_field_block->addOption(1, _AM_TDMCREATE_FIELD_BLOCK);
 					$parameters_tray->addElement($check_field_block);
 
-				$field_main = $this->isNew() ? ( $i == 1 ) : $this->getVar('field_main');
+				$field_main = $isNew ? ( $i == 1 ) : $this->getVar('field_main');
 					$check_field_main = new XoopsFormRadio('', 'field_main', $field_main);
 					$check_field_main->addOption('', _AM_TDMCREATE_FIELD_MAINFIELD );
 					$parameters_tray->addElement($check_field_main);
 
-				$field_search = $this->isNew() ? 0 : $this->getVar('field_search');
+				$field_search = $isNew ? 0 : $this->getVar('field_search');
 					$check_field_search = new XoopsFormCheckBox(' ', 'field_search['.$i.']', $field_search);
 					$check_field_search->addOption(1, _AM_TDMCREATE_FIELD_SEARCH);	
 					$parameters_tray->addElement($check_field_search);					
 
-				$field_required = $this->isNew() ? 0 : $this->getVar('field_required');
+				$field_required = $isNew ? 0 : $this->getVar('field_required');
 					$check_field_required = new XoopsFormCheckBox(' ', 'field_required['.$i.']', $field_required);
 					$check_field_required->addOption(1, _AM_TDMCREATE_FIELD_REQUIRED);
 					$parameters_tray->addElement($check_field_required);
 
 				$form->addElement(new TDMCreateFormLabel('<td>'.$parameters_tray->render().'</td></tr>'));
 			}				
-			$form->addElement(new XoopsFormHidden('field_id['.$i.']', $i));		
-		}
+			$form->addElement(new XoopsFormHidden('field_id['.$i.']', $i));	
+			$form->addElement(new XoopsFormHidden('field_mid', $field_mid));
+			$form->addElement(new XoopsFormHidden('field_tid', $field_tid)); 			
+		}				
 				
-		$form->addElement(new XoopsFormHidden('field_mid', $field_mid));
-		$form->addElement(new XoopsFormHidden('field_tid', $field_tid)); 
-        $form->addElement(new XoopsFormHidden('field_numb', $field_numb));		
 		$form->addElement(new TDMCreateFormLabel('</tbody>'));
 		$form->addElement(new TDMCreateFormLabel('<tfoot><tr>'));
 		$form_hidden = new XoopsFormHidden('op', 'save');
@@ -317,22 +316,15 @@
     /**
      * retrieve a field
      *
-     * @param int $id tid
+     * @param int $id field id
      *
      * @return mixed reference to the {@link TDMCreateFields} object
      */
     public function &get($id)
     {        
-        $criteria = new Criteria('field_id', $id );
-		if ($this->getCount($criteria) > 0)	{
-			$obj = $this->getObjects($criteria, false, false );
-			return $obj[0]['field_id'];
-		} else {
-			return parent::get($tid);
-		}	
-		return false;	
-    }
-	
+		return parent::get($id);
+    }	
+		
 	/**
      * insert a new field in the database
      *
@@ -347,84 +339,8 @@
             return false;
         }        
         return true;
-    }
-	
-	/**
-     * delete fields matching a set of conditions
-     *
-     * @param object $criteria {@link CriteriaElement}
-     *
-     * @return bool FALSE if deletion failed
-     */
-    public function deleteAll($criteria = null)
-    {
-        //todo resource consuming, use get list instead?
-        $fields = $this->getObjects($criteria);
-        foreach ($fields as $field) {
-            $this->delete($field);
-        }
-        return true;
-    }
-
-    /**
-     * @param $field_tid
-     *
-     * @return bool
-     */
-    public function updateAll($field_tid)
-    {
-		$criteria = new Criteria('field_tid', $field_tid);		
-        if ($this->updateAll($criteria)) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-	
-	/**
-     * get all the fields that match the supplied parameters
-     *
-     * @param   $side     
-     * @param   $tableid    tableid (can be an array)
-     * @param   $orderby    order of the fields
-     * @returns             array of field objects
-     */
-    public function getAllFieldsByTable($table_mid, $asobject = true, $side = null, $orderby = "f.field_mid, f.field_tid")
-    {        
-        $ret = array();
-        if (!$asobject) {
-            $sql = 'SELECT f.field_mid, f.field_tid ';
-        } else {
-            $sql = 'SELECT f.* ';
-        }
-        $sql .= "FROM " . $this->db->prefix("mod_tdmcreaterate_fields") . " f LEFT JOIN " . $this->db->prefix("mod_tdmcreaterate_tables") . " t ON f.field_tid=t.table_id WHERE  table_mid = ".$table_mid;
-        if (is_array($tableid)) {
-            $sql .= " AND (t.table_id=" . $tableid[0] . "";            
-            $sql .= ")";
-        } else {
-            $sql .= " AND t.table_id=" . $tableid . "";
-        }        
-        if (isset($side)) {
-            // get both sides in sidebox? (some themes need this)
-            $side = "f.field_side=" . $side;
-            $sql .= " AND " . $side;
-        }          	
-        $sql .= " ORDER BY $orderby";
-        $result = $this->db->query($sql);
-        $added = array();
-        while ($myrow = $this->db->fetchArray($result)) {
-            if (!in_array($myrow['field_id'], $added)) {
-                if (!$asobject) {
-                    $ret[] = $myrow['field_id'];
-                } else {
-                    $ret[] = new TDMCreateFields($myrow);
-                }
-                array_push($added, $myrow['field_id']);
-            }
-        }
-        return $ret;
-    }
-	
+    }	
+		
 	/*
 	*  @public function getFieldModuleId
 	*  @param integer $field_id

Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/html/index.html
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/html/index.html	                        (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/html/index.html	2014-05-08 12:08:54 UTC (rev 12521)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file

Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/html/simplelabel.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/html/simplelabel.php	                        (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/html/simplelabel.php	2014-05-08 12:08:54 UTC (rev 12521)
@@ -0,0 +1,47 @@
+<?php
+/**
+ * XOOPS form element
+ *
+ * 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.
+ *
+ * @copyright       The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license         GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package         kernel
+ * @subpackage      form
+ * @since           2.0.0
+ * @author          Kazumi Ono (AKA onokazu) http://www.myweb.ne.jp/, http://jp.xoops.org/
+ * @version         $Id: simplelabel.php 12562 2014-04-03 10:57:12Z timgno $
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+/**
+ * A text label
+ */
+class TDMCreateFormLabel extends XoopsFormElement
+{
+    /**
+     * Constructor
+     *
+     * @param string $caption
+     */
+    function TDMCreateFormLabel($caption = '')
+    {
+        $this->setCaption($caption);
+    }
+
+    /**
+     * Prepare HTML for output
+     *
+     * @return string
+     */
+    function render()
+    {
+        return $this->getCaption();
+    }
+}
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/modules.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/modules.php	2014-05-05 12:45:22 UTC (rev 12520)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/modules.php	2014-05-08 12:08:54 UTC (rev 12521)
@@ -116,7 +116,8 @@
         if ($action === false) {
             $action = $_SERVER['REQUEST_URI'];
         }
-        $title = $this->isNew() ? sprintf(_AM_TDMCREATE_MODULE_ADD) : sprintf(_AM_TDMCREATE_MODULE_EDIT);
+        $isNew = $this->isNew();
+		$title = $isNew ? sprintf(_AM_TDMCREATE_MODULE_ADD) : sprintf(_AM_TDMCREATE_MODULE_EDIT);
 
         include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
 
@@ -144,25 +145,26 @@
 		// Author
 		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_AUTHOR, 'mod_author', 50, 255, $this->getVar('mod_author')), true);
 		$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_LICENSE, 'mod_license', 50, 255, $this->getVar('mod_license')), true);
-		$mod_admin = $this->isNew() ? $this->tdmcreate->getConfig('display_admin') : $this->getVar('mod_admin');
+		$mod_admin = $isNew ? $this->tdmcreate->getConfig('display_admin') : $this->getVar('mod_admin');
 		$form->addElement(new XoopsFormRadioYN(_AM_TDMCREATE_MODULE_ADMIN, 'mod_admin', $mod_admin, _YES, _NO));
-		$mod_user = $this->isNew() ? $this->tdmcreate->getConfig('display_user') : $this->getVar('mod_user');
+		$mod_user = $isNew ? $this->tdmcreate->getConfig('display_user') : $this->getVar('mod_user');
 		$form->addElement(new XoopsFormRadioYN(_AM_TDMCREATE_MODULE_USER, 'mod_user', $mod_user, _YES, _NO));
-		$mod_search = $this->isNew() ? $this->tdmcreate->getConfig('active_search') : $this->getVar('mod_search');
+		$mod_search = $isNew ? $this->tdmcreate->getConfig('active_search') : $this->getVar('mod_search');
 		$form->addElement(new XoopsFormRadioYN(_AM_TDMCREATE_MODULE_SEARCH, 'mod_search', $mod_search, _YES, _NO));
-		$mod_comments = $this->isNew() ? $this->tdmcreate->getConfig('active_comments') : $this->getVar('mod_comments');
+		$mod_comments = $isNew ? $this->tdmcreate->getConfig('active_comments') : $this->getVar('mod_comments');
 		$form->addElement(new XoopsFormRadioYN(_AM_TDMCREATE_MODULE_COMMENTS, 'mod_comments', $mod_comments, _YES, _NO));
 		
-		$mod_notifications = $this->isNew() ? $this->tdmcreate->getConfig('active_notifications') : $this->getVar('mod_notifications');
+		$mod_notifications = $isNew ? $this->tdmcreate->getConfig('active_notifications') : $this->getVar('mod_notifications');
 		$form->addElement(new XoopsFormRadioYN(_AM_TDMCREATE_MODULE_NOTIFICATIONS, 'mod_notifications', $mod_notifications, _YES, _NO));
 		
-		$mod_permissions = $this->isNew() ? $this->tdmcreate->getConfig('active_permissions') : $this->getVar('mod_permissions');
+		$mod_permissions = $isNew ? $this->tdmcreate->getConfig('active_permissions') : $this->getVar('mod_permissions');
 		$form->addElement(new XoopsFormRadioYN(_AM_TDMCREATE_MODULE_PERMISSIONS, 'mod_permissions', $mod_permissions, _YES, _NO));
 		
-		$mod_inroot_copy = $this->isNew() ? $this->tdmcreate->getConfig('inroot_copy') : $this->getVar('mod_inroot_copy');
+		$mod_inroot_copy = $isNew ? $this->tdmcreate->getConfig('inroot_copy') : $this->getVar('mod_inroot_copy');
 		$form->addElement(new XoopsFormRadioYN(_AM_TDMCREATE_MODULE_INROOT_MODULES_COPY, 'mod_inroot_copy', $mod_inroot_copy, _YES, _NO));
 		
-		$mod_image = $this->getVar('mod_image') ? $this->getVar('mod_image') : 'empty.png';
+		$this_image = $this->getVar('mod_image');
+		$mod_image = $this_image ? $this_image : 'empty.png';
 		
 		$uploadirectory = 'uploads/'.$GLOBALS['xoopsModule']->dirname().'/images/modules';
 		$imgtray = new XoopsFormElementTray(_AM_TDMCREATE_MODULE_IMAGE, '<br />');

Deleted: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/simplelabel.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/simplelabel.php	2014-05-05 12:45:22 UTC (rev 12520)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/simplelabel.php	2014-05-08 12:08:54 UTC (rev 12521)
@@ -1,47 +0,0 @@
-<?php
-/**
- * XOOPS form element
- *
- * 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.
- *
- * @copyright       The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license         GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @package         kernel
- * @subpackage      form
- * @since           2.0.0
- * @author          Kazumi Ono (AKA onokazu) http://www.myweb.ne.jp/, http://jp.xoops.org/
- * @version         $Id: simplelabel.php 12562 2014-04-03 10:57:12Z timgno $
- */
-
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
-/**
- * A text label
- */
-class TDMCreateFormLabel extends XoopsFormElement
-{
-    /**
-     * Constructor
-     *
-     * @param string $caption
-     */
-    function TDMCreateFormLabel($caption = '')
-    {
-        $this->setCaption($caption);
-    }
-
-    /**
-     * Prepare HTML for output
-     *
-     * @return string
-     */
-    function render()
-    {
-        return $this->getCaption();
-    }
-}
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/css/admin/style.css
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/css/admin/style.css	2014-05-05 12:45:22 UTC (rev 12520)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/css/admin/style.css	2014-05-08 12:08:54 UTC (rev 12521)
@@ -19,6 +19,8 @@
  * @version         $Id: style.css 12258 2014-01-02 09:33:29Z timgno $
  */
 
+table { margin: 0; padding: 0; }
+
 tr.modules td {
   margin: 0;
   padding: 5px;
@@ -45,6 +47,9 @@
   vertical-align: middle;
 }
 
+/*#show_rows { margin: 0; padding: 0; width: 60%; }*/
+#sortable tr { margin: 0 3px 3px 3px; padding: 0.4em; padding-left: 1.5em; font-size: 1.1em; height: 16px; }
+
 .toggleChild {
    display: none;
 }

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php	2014-05-05 12:45:22 UTC (rev 12520)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php	2014-05-08 12:08:54 UTC (rev 12521)
@@ -38,7 +38,7 @@
 define('TDMC_UPLOAD_IMGMOD_URL', TDMC_UPLOAD_URL . '/images/modules' );
 define('TDMC_UPLOAD_IMGTAB_PATH', TDMC_UPLOAD_PATH . '/images/tables' );
 define('TDMC_UPLOAD_IMGTAB_URL', TDMC_UPLOAD_URL . '/images/tables' );
-
+//
 include_once TDMC_PATH . '/class/helper.php';
 include_once TDMC_PATH . '/class/request.php';
 include_once TDMC_PATH . '/class/session.php';
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/js/fields.js
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/js/fields.js	2014-05-05 12:45:22 UTC (rev 12520)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/js/fields.js	2014-05-08 12:08:54 UTC (rev 12521)
@@ -1,51 +1,18 @@
 // Jquery function for side fields
-$(document).ready(
-	function(){
+$(document).ready( function() {
 		// Controls Drag & Drop
-		$('.tdmc-fieldsection').sortable({
-				accept: 'tdmc-field',
-				cancel: '.tdmc-fieldname',
-				items: '.tdmc-field',
-				connectWith: '.tdmc-fieldsection',
+		$('#sortable tbody tr.sort').sortable({					
 				update: function(event, ui) {
                     var list = $(this).sortable( 'serialize');
                     $.post( 'fields.php?op=order', list );
                 },
-				receive: function(event, ui) {
-                    var side = $(this).attr('side');
+				receive: function(event, ui) {                    
                     var field_id = $(ui.item).attr('field_id');
-                    var list = $(this).sortable( 'serialize');
-                    
-                    $.post( 'fields.php', { op: 'drag', field_id: field_id, side: side } );
-                    
-                    $.post( 'fields.php?op=order', list );
-                      
+                    var list = $(this).sortable( 'serialize');                    
+                    $.post( 'fields.php', { op: 'drag', field_id: field_id } );                    
+                    $.post( 'fields.php?op=order', list );                      
                 }
 			}
-		);
-		$(".tdmc-fieldsection").disableSelection();
-		
-		$('.tdmc-fieldhide').sortable({
-				accept: 'tdmc-field',
-				cancel: '.tdmc-fieldname',
-				items: '.tdmc-field',
-				connectWith: '.tdmc-fieldsection'/*,
-				update: function(event, ui) {
-                    var list = $(this).sortable( 'serialize');
-                    $.post( 'fields.php?op=order', list );
-                },
-				receive: function(event, ui) {
-                    var side = $(this).attr('side');
-                    var field_id = $(ui.item).attr('field_id');
-                    var list = $(this).sortable( 'serialize');
-                    
-                    $.post( 'fields.php', { op: 'drag', field_id: field_id, side: side } );
-                    
-                    $.post( 'fields.php?op=order', list );
-                      
-                }*/
-			}
-		);
-		$(".tdmc-fieldhide").disableSelection();
-	}
+		).disableSelection();			
+	}	
 );
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/js/functions.js
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/js/functions.js	2014-05-05 12:45:22 UTC (rev 12520)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/js/functions.js	2014-05-08 12:08:54 UTC (rev 12521)
@@ -87,4 +87,25 @@
 	$('tr.toggleMain td:nth-child(1) img').click(function () {
         $(this).closest('tr.toggleMain').nextUntil('tr.toggleMain').toggle();
     });	
-});
\ No newline at end of file
+});
+
+function tdmcreate_setStatus( data, img, file ) {
+    // Post request
+    $.post( file, data ,
+    function(reponse, textStatus) {
+        if (textStatus=='success') {
+			$('img#'+img).hide();
+			$('#loading_'+img).show();
+			setTimeout(function(){
+				$('#loading_'+img).hide();
+				$('img#'+img).fadeIn('fast');
+			}, 500);
+            // Change image src
+            if ($('img#'+img).attr("src") == IMG_ON) {
+                $('img#'+img).attr("src",IMG_OFF);
+            } else {
+                $('img#'+img).attr("src",IMG_ON);
+            }
+        }
+    });
+}
\ No newline at end of file

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php	2014-05-05 12:45:22 UTC (rev 12520)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php	2014-05-08 12:08:54 UTC (rev 12521)
@@ -233,7 +233,7 @@
 define('_AM_TDMCREATE_MODULES_ACTIVE_COMMENTS', "Enable comments");
 define('_AM_TDMCREATE_MODULES_ACTIVE_NOTIFICATIONS', "Enable notifications");
 define('_AM_TDMCREATE_MODULES_ACTIVE_PERMISSIONS', "Enable Permissions");
-define('_AM_TDMCREATE_MODULES_INROOT_INSTALL', "Install this module directly in root/modules?");
+define('_AM_TDMCREATE_MODULE_INROOT_MODULES_COPY', "Copy of this module directly in root/modules?");
 define('_AM_TDMCREATE_MODULES_PAYPAL_BUTTON', "Paypal Button");
 define('_AM_TDMCREATE_MODULES_SUBVERSION', "Subversion");
 

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/sql/mysql.sql
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/sql/mysql.sql	2014-05-05 12:45:22 UTC (rev 12520)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/sql/mysql.sql	2014-05-08 12:08:54 UTC (rev 12521)
@@ -33,7 +33,7 @@
   `mod_comments` tinyint(1) unsigned NOT NULL default '0',
   `mod_notifications` tinyint(1) unsigned NOT NULL default '0',
   `mod_permissions` tinyint(1) unsigned NOT NULL default '0',
-  `mod_install` tinyint(1) unsigned NOT NULL default '0',
+  `mod_inroot_copy` tinyint(1) unsigned NOT NULL default '0',
   `mod_donations` varchar(50) NOT NULL default '',
   `mod_subversion` varchar(10) NOT NULL default '',
   PRIMARY KEY (`mod_id`),

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/fields.tpl
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/fields.tpl	2014-05-05 12:45:22 UTC (rev 12520)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/fields.tpl	2014-05-08 12:08:54 UTC (rev 12521)
@@ -2,7 +2,7 @@
 <{includeq file="db:header.tpl"}>
 <!-- Display tables list -->
 <{if $tables_list}>
-   <table id='show_rows' width='100%' cellspacing='1' class='outer'>
+   <table id='sortable' class='outer width100'>
      <thead>
        <tr>
 	 <th class='center'><{$smarty.const._AM_TDMCREATE_ID_LIST}></th>
@@ -24,21 +24,21 @@
        <tbody>
          <{foreach item=table from=$tables_list}>
              <tr id="table<{$table.id}>" class="fields toggleMain">
-    	        <td class='center bold width5'>(<{$table.id}>)
-                    <a href="#" title="Toggle"><img class="imageToggle" src="<{$tdmc_icons_url}>/16/toggle.png" alt="Toggle" /></a>
+    	        <td class='center bold width5'>&#40;<{$table.id}>&#41;
+                    <a href="#" title="Toggle"><img class="imageToggle" src="<{$modPathIcon16}>/toggle.png" alt="Toggle" /></a>
                 </td>
                 <td class='center'><u class='bold'><{$table.name}></u></td>
-                <td class='center'><img src="<{$pathIcon32}>/<{$table.image}>" alt="<{$table.name}>" height="30" /></td>
+                <td class='center'><img src="<{xoModuleIcons32}><{$table.image}>" alt="<{$table.name}>" height="30" /></td>
     	        <td class='center bold'><{$table.nbfields}></td>
-    	        <td class='center'><img src="<{$tdmc_icons_url}>/16/nb_fields.png" /></td>
-                <td class='center'><img src="<{$tdmc_icons_url}>/16/nb_fields.png" /></td>
-                <td class='center'><img src="<{$tdmc_icons_url}>/16/nb_fields.png" /></td>
-                <td class='center'><img src="<{$tdmc_icons_url}>/16/nb_fields.png" /></td>
-                <td class='center'><img src="<{$tdmc_icons_url}>/16/nb_fields.png" /></td>
-                <td class='center'><img src="<{$tdmc_icons_url}>/16/nb_fields.png" /></td>
-                <td class='center'><img src="<{$tdmc_icons_url}>/16/nb_fields.png" /></td>
-                <td class='center'><img src="<{$tdmc_icons_url}>/16/nb_fields.png" /></td>
-                <td class='center'><img src="<{$tdmc_icons_url}>/16/nb_fields.png" /></td>
+    	        <td class='center'><img src="<{$modPathIcon16}>/nb_fields.png" /></td>
+                <td class='center'><img src="<{$modPathIcon16}>/nb_fields.png" /></td>
+                <td class='center'><img src="<{$modPathIcon16}>/nb_fields.png" /></td>
+                <td class='center'><img src="<{$modPathIcon16}>/nb_fields.png" /></td>
+                <td class='center'><img src="<{$modPathIcon16}>/nb_fields.png" /></td>
+                <td class='center'><img src="<{$modPathIcon16}>/nb_fields.png" /></td>
+                <td class='center'><img src="<{$modPathIcon16}>/nb_fields.png" /></td>
+                <td class='center'><img src="<{$modPathIcon16}>/nb_fields.png" /></td>
+                <td class='center'><img src="<{$modPathIcon16}>/nb_fields.png" /></td>
     	        <td class='xo-actions txtcenter width6'>
 		    <a href="tables.php?op=edit&amp;table_id=<{$table.id}>" title="<{$smarty.const._AM_TDMCREATE_EDIT_TABLE}>">
                        <img src="<{xoModuleIcons16 edit.png}>" alt="<{$smarty.const._AM_TDMCREATE_EDIT_TABLE}>" />
@@ -52,11 +52,11 @@
     	        </td>
              </tr>
              <{foreach item=field from=$table.fields}>
-               <tr class="<{cycle values='even,odd'}> toggleChild">
-    	        <td class='center'><{$field.lid}>&nbsp;<img class="move" src="<{$tdmc_icons_url}>/16/drag.png" alt="<{$field.name}>" /></td>
+               <tr class="<{cycle values='even,odd'}> sort toggleChild">
+    	        <td class='center'>&#91;<{$field.lid}>&#93;&nbsp;<img class="move" src="<{$modPathIcon16}>/drag.png" alt="<{$field.name}>" /></td>
                 <td class='center'><{$field.name}></td>
-                <td class='center'><img src="<{$tdmc_icons_url}>/16/tables.png" alt="Empty" /></td>
-                <td class='center'><img src="<{$tdmc_icons_url}>/16/tables.png" alt="Empty" /></td>
+                <td class='center'><img src="<{$modPathIcon16}>/tables.png" alt="Empty" /></td>
+                <td class='center'><img src="<{$modPathIcon16}>/tables.png" alt="Empty" /></td>
                 <td class='center'>                   
                   <a href="fields.php?op=toggle&amp;field_parent=<{$field.parent}>&amp;field_id=<{$field.id}>" title="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>">
                     <img src="<{xoModuleIcons16}><{$field.parent}>.png" alt="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>" />
@@ -102,7 +102,7 @@
                     <img src="<{xoModuleIcons16}><{$field.required}>.png" alt="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>" />
                   </a>
                 </td>
-                <td class='center'><img src="<{$tdmc_icons_url}>/16/left_right.png" alt="Empty" /></td>
+                <td class='center'><img src="<{$modPathIcon16}>/left_right.png" alt="Empty" /></td>
                </tr>
             <{/foreach}>
          <{/foreach}>

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/modules.tpl
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/modules.tpl	2014-05-05 12:45:22 UTC (rev 12520)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/modules.tpl	2014-05-08 12:08:54 UTC (rev 12521)
@@ -2,7 +2,7 @@
 <{includeq file="db:header.tpl"}>
 <!-- Display modules list -->
 <{if $modules_list}>
-   <table width='100%' cellspacing='1' class='outer'>
+   <table class='outer width100'>
      <tr>
 	 <th class='center'><{$smarty.const._AM_TDMCREATE_MODULE_ID}></th>
 	 <th class='center'><{$smarty.const._AM_TDMCREATE_MODULE_NAME}></th>

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tables.tpl
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tables.tpl	2014-05-05 12:45:22 UTC (rev 12520)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tables.tpl	2014-05-08 12:08:54 UTC (rev 12521)
@@ -2,7 +2,7 @@
 <{includeq file="db:header.tpl"}>
 <!-- Display modules list -->
 <{if $modules_list}>    
-   <table id='show_rows' width='100%' cellspacing='1' class='outer'>
+   <table class='outer width100'>
      <thead>
        <tr>
 	 <th class='center'><{$smarty.const._AM_TDMCREATE_MODULE_ID}></th>
@@ -23,13 +23,13 @@
      <tbody>
      <{foreach item=module from=$modules_list}>
          <tr id="module<{$module.id}>" class="tables toggleMain">
-	    <td class='center bold width5'>(<{$module.id}>)
-                <a href="#" title="Toggle"><img class="imageToggle" src="<{$tdmc_icons_url}>/16/toggle.png" alt="Toggle" /></a>
+	    <td class='center bold width5'>&#40;<{$module.id}>&#41;
+                <a href="#" title="Toggle"><img class="imageToggle" src="<{$modPathIcon16}>/toggle.png" alt="Toggle" /></a>
             </td>
             <td class='center bold green'><{$module.name}></td>
-            <td class='center'><img src="<{$tdmc_upload_imgmod_url}>/<{$module.image}>" height="35" /></td>
-	    <td class='center'><img src="<{$tdmc_icons_url}>/16/nb_fields.png" height="16" /></td>
-	    <td class='center'><img src="<{$tdmc_icons_url}>/16/blocks.png" height="16" /></td>
+            <td class='center'><img src="<{$tdmc_upload_imgmod_url}>/<{$module.image}>" alt="" height="35" /></td>
+	    <td class='center'><img src="<{$modPathIcon16}>/nb_fields.png" alt="16" /></td>
+	    <td class='center'><img src="<{$modPathIcon16}>/blocks.png" alt="16" /></td>
 	    <td class='center'>
                 <a href="modules.php?op=toggle&amp;mod_admin=<{$module.admin}>&amp;mod_id=<{$module.id}>" title="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>">
                     <img src="<{xoModuleIcons16}><{$module.admin}>.png" alt="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>" />
@@ -72,7 +72,7 @@
          </tr>  
          <{foreach item=table from=$module.tables}>
              <tr id="table<{$table.id}>" class="<{cycle values='even,odd'}> toggleChild">
-    	        <td class='center'><{$table.lid}></td>
+    	        <td class='center'>&#91;<{$table.lid}>&#93;</td>
                 <td class='center'><{$table.name}></td>
                 <td class='center'><img src="<{xoModuleIcons32}><{$table.image}>" alt="<{$table.name}>" height="30" /></td>
                 <td class='center'><{$table.nbfields}></td>
@@ -121,7 +121,7 @@
                        <img src="<{xoModuleIcons16 edit.png}>" alt="<{$smarty.const._EDIT}>" />
                     </a>
                     <a href="fields.php?op=edit&amp;field_mid=<{$table.mid}>&amp;field_tid=<{$table.id}>&amp;field_numb=<{$table.nbfields}>" title="<{$smarty.const._EDIT}>">
-                       <img src="<{$tdmc_url}>/images/icons/16/editfields.png" alt="<{$smarty.const._EDIT}>" />
+                       <img src="<{$modPathIcon16}>/editfields.png" alt="<{$smarty.const._EDIT}>" />
                     </a>
                     <a href="tables.php?op=delete&amp;table_id=<{$table.id}>" title="<{$smarty.const._DELETE}>">
                        <img src="<{xoModuleIcons16 delete.png}>" alt="<{$smarty.const._DELETE}>" />

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php	2014-05-05 12:45:22 UTC (rev 12520)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php	2014-05-08 12:08:54 UTC (rev 12521)
@@ -39,8 +39,11 @@
 $modversion['dirname'] = "{$dirname}";
 
 $modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin';
-$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
-$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
+$modversion['sysicons16'] = '../../Frameworks/moduleclasses/icons/16';
+$modversion['sysicons32'] = '../../Frameworks/moduleclasses/icons/32';
+// Local icons
+$modversion['modicons16'] = XOOPS_URL . '/modules/'.$dirname.'/images/icons/16';
+$modversion['modicons32'] = XOOPS_URL . '/modules/'.$dirname.'/images/icons/32';
 
 $modversion['targetdir'] = XOOPS_ROOT_PATH . "/modules/{$dirname}/modules/";
 
@@ -410,5 +413,5 @@
 $modversion['config'][$i]['description'] = "";
 $modversion['config'][$i]['formtype'] = "textbox";
 $modversion['config'][$i]['valuetype'] = "text";
-$modversion['config'][$i]['default'] = '12512';
+$modversion['config'][$i]['default'] = '12520';
 unset($i);
\ No newline at end of file

[xoops-svn] SF.net SVN: xoops-svn:[12520] XoopsCore/branches/2.5.x/2.5.7

From: <be...@us...> - 2014-05-05 12:45:26

Revision: 12520
          http://sourceforge.net/p/xoops/svn/12520
Author:   beckmi
Date:     2014-05-05 12:45:22 +0000 (Mon, 05 May 2014)
Log Message:
-----------
- fixed missing .tpl in Profile (cesag/slider84)

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/menu.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/category.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/field.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/profile.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/regstep.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/visibility.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/docs/changelog.txt
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/forms.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/preloads/core.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_avatar.tpl
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_changepass.tpl
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_editprofile.tpl
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_email.tpl
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_register.tpl
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_results.tpl
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_search.tpl
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_userinfo.tpl
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/userinfo.php

Modified: XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt	2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt	2014-05-05 12:45:22 UTC (rev 12520)
@@ -6,8 +6,12 @@
 - updated XoopsMediaUploader to use system memory values from php.ini, and to offer random file names (mamba/luciorota/zyspec)
 - added .tpl to XoopsList's getHtmlListAsArray (wizanda)
 - updating xBootstrap (voltan, Angelo Rocha)
-- correcting typos (cesag)
+- moved all images, CSS, and JS files to /assets in modules Profile and PM (mamba)
+- renamed .html Smarty templates to .tpl in modules Profile and PM (mamba)
+- corrected English typos (cesag)
+- added missing .php file extension (AngeloRocha/Zyspec/rgriffith)
 
+
 ===============================
 2014/04/06: Version 2.5.7 RC 1
 ===============================

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/menu.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/menu.php	2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/menu.php	2014-05-05 12:45:22 UTC (rev 12520)
@@ -18,7 +18,7 @@
  * @version         $Id$
  */
 
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
 
 $path = dirname(dirname(dirname(dirname(__FILE__))));
 include_once $path . '/mainfile.php';

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/category.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/category.php	2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/category.php	2014-05-05 12:45:22 UTC (rev 12520)
@@ -18,7 +18,7 @@
  * @version         $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined");
+// defined('XOOPS_ROOT_PATH') || die("XOOPS root path not defined");
 
 /**
  * @package kernel

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/field.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/field.php	2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/field.php	2014-05-05 12:45:22 UTC (rev 12520)
@@ -18,7 +18,7 @@
  * @version         $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined");
+// defined('XOOPS_ROOT_PATH') || die("XOOPS root path not defined");
 
 /**
  * @package kernel

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/profile.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/profile.php	2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/profile.php	2014-05-05 12:45:22 UTC (rev 12520)
@@ -18,7 +18,7 @@
  * @version         $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined");
+// defined('XOOPS_ROOT_PATH') || die("XOOPS root path not defined");
 
 /**
  * @package kernel

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/regstep.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/regstep.php	2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/regstep.php	2014-05-05 12:45:22 UTC (rev 12520)
@@ -18,7 +18,7 @@
  * @version         $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined");
+// defined('XOOPS_ROOT_PATH') || die("XOOPS root path not defined");
 
 /**
  * Class ProfileRegstep

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/visibility.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/visibility.php	2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/visibility.php	2014-05-05 12:45:22 UTC (rev 12520)
@@ -18,7 +18,7 @@
  * @version         $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined");
+// defined('XOOPS_ROOT_PATH') || die("XOOPS root path not defined");
 
 /**
  * Class ProfileVisibility

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/docs/changelog.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/docs/changelog.txt	2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/docs/changelog.txt	2014-05-05 12:45:22 UTC (rev 12520)
@@ -2,6 +2,7 @@
 --------------------------------------
 - moved all images, CSS, and JS files to /assets (mamba)
 - renamed .html Smarty templates to .tpl (mamba)
+- fixed missing .tpl (cesag/slider84)
 
 1.64 Final
 --------------------------------------

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/forms.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/forms.php	2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/forms.php	2014-05-05 12:45:22 UTC (rev 12520)
@@ -18,7 +18,7 @@
  * @version         $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined");
+// defined('XOOPS_ROOT_PATH') || die("XOOPS root path not defined");
 
 /**
  * Get {@link XoopsThemeForm} for adding/editing fields

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/preloads/core.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/preloads/core.php	2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/preloads/core.php	2014-05-05 12:45:22 UTC (rev 12520)
@@ -17,7 +17,7 @@
  * @version         $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+// defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 /**
  * Profile core preloads

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_avatar.tpl
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_avatar.tpl	2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_avatar.tpl	2014-05-05 12:45:22 UTC (rev 12520)
@@ -1,4 +1,4 @@
-<{includeq file="db:profile_breadcrumbs.html"}>
+<{includeq file="db:profile_breadcrumbs.tpl"}>
 
 <{if $old_avatar}>
     <div class="pad10 center">

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_changepass.tpl
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_changepass.tpl	2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_changepass.tpl	2014-05-05 12:45:22 UTC (rev 12520)
@@ -1,3 +1,3 @@
-<{includeq file="db:profile_breadcrumbs.html"}>
+<{includeq file="db:profile_breadcrumbs.tpl"}>
 
-<{includeq file="db:profile_form.html" xoForm=$form}>
+<{includeq file="db:profile_form.tpl" xoForm=$form}>

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_editprofile.tpl
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_editprofile.tpl	2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_editprofile.tpl	2014-05-05 12:45:22 UTC (rev 12520)
@@ -1,4 +1,4 @@
-<{includeq file="db:profile_breadcrumbs.html"}>
+<{includeq file="db:profile_breadcrumbs.tpl"}>
 
 
 <{if $stop}>
@@ -6,4 +6,4 @@
     <br class='clear'/>
 <{/if}>
 
-<{includeq file="db:profile_form.html" xoForm=$userinfo}>
+<{includeq file="db:profile_form.tpl" xoForm=$userinfo}>

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_email.tpl
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_email.tpl	2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_email.tpl	2014-05-05 12:45:22 UTC (rev 12520)
@@ -1,3 +1,3 @@
-<{includeq file="db:profile_breadcrumbs.html"}>
+<{includeq file="db:profile_breadcrumbs.tpl"}>
 
-<{includeq file="db:profile_form.html" xoForm=$emailform}>
+<{includeq file="db:profile_form.tpl" xoForm=$emailform}>

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_register.tpl
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_register.tpl	2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_register.tpl	2014-05-05 12:45:22 UTC (rev 12520)
@@ -1,4 +1,4 @@
-<{includeq file="db:profile_breadcrumbs.html"}>
+<{includeq file="db:profile_breadcrumbs.tpl"}>
 
 <{if $steps|@count > 1 AND $current_step >= 0}>
     <div class='register-steps'>
@@ -30,7 +30,7 @@
 
 <{if $regform}>
     <h3><{$regform.title}></h3>
-    <{includeq file="db:profile_form.html" xoForm=$regform}>
+    <{includeq file="db:profile_form.tpl" xoForm=$regform}>
 <{elseif $finish}>
     <h1><{$finish}></h1>
     <{if $finish_message}><p><{$finish_message}></p><{/if}>
@@ -42,4 +42,4 @@
     <input type='hidden' name="pass" id="pass" value="<{$finish_pass}>">
     </form>
     <{/if}>
-<{/if}>
\ No newline at end of file
+<{/if}>

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_results.tpl
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_results.tpl	2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_results.tpl	2014-05-05 12:45:22 UTC (rev 12520)
@@ -1,4 +1,4 @@
-<{includeq file="db:profile_breadcrumbs.html"}>
+<{includeq file="db:profile_breadcrumbs.tpl"}>
 <div>( <{$total_users}> )</div>
 <{if $users}>
     <table>
@@ -21,4 +21,4 @@
     <div class="errorMsg">
         <{$smarty.const._PROFILE_MA_NOUSERSFOUND}>
     </div>
-<{/if}>
\ No newline at end of file
+<{/if}>

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_search.tpl
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_search.tpl	2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_search.tpl	2014-05-05 12:45:22 UTC (rev 12520)
@@ -1,3 +1,3 @@
-<{includeq file="db:profile_breadcrumbs.html"}>
+<{includeq file="db:profile_breadcrumbs.tpl"}>
 <div>( <{$total_users}> )</div>
-<{includeq file="db:profile_form.html" xoForm=$searchform}>
+<{includeq file="db:profile_form.tpl" xoForm=$searchform}>

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_userinfo.tpl
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_userinfo.tpl	2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_userinfo.tpl	2014-05-05 12:45:22 UTC (rev 12520)
@@ -1,4 +1,4 @@
-<{includeq file="db:profile_breadcrumbs.html"}>
+<{includeq file="db:profile_breadcrumbs.tpl"}>
 
 <div>
     <{if $avatar}>
@@ -100,4 +100,4 @@
     <{/foreach}>
     <!-- end module search results loop -->
 </div>    
-<{/if}>
\ No newline at end of file
+<{/if}>

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/userinfo.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/userinfo.php	2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/userinfo.php	2014-05-05 12:45:22 UTC (rev 12520)
@@ -106,7 +106,7 @@
         //disable cache
         $GLOBALS['xoopsConfig']['module_cache'][$GLOBALS['xoopsModule']->getVar('mid')] = 0;
     }
-    $xoopsOption['template_main'] = 'profile_userinfo.html';
+    $xoopsOption['template_main'] = 'profile_userinfo.tpl';
     include $GLOBALS['xoops']->path('header.php');
     $GLOBALS['xoopsTpl']->assign('user_ownpage', false);
 }

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

From: <txm...@us...> - 2014-05-03 14:15:02

Revision: 12519
          http://sourceforge.net/p/xoops/svn/12519
Author:   txmodxoops
Date:     2014-05-03 14:14:55 +0000 (Sat, 03 May 2014)
Log Message:
-----------
Fix bug in building.php

Merged extension .html to .tpl in templates files

Toggle in list for parameters of fields

Work in progress

Modified Paths:
--------------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/css/admin/style.css
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/fields.tpl
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/modules.tpl
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tables.tpl

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php	2014-05-02 03:24:32 UTC (rev 12518)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php	2014-05-03 14:14:55 UTC (rev 12519)
@@ -31,7 +31,7 @@
 $to_dir = XOOPS_ROOT_PATH.'/modules/'.strtolower($mod_name);
 switch ($op) {
 	case 'build':		 
-		$template_main = 'tdmcreate_building.html';	
+		$template_main = 'building.tpl';	
 		$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('building.php'));
 		// Clear repertory of new module if there are
 		TDMCreate_clearDir($from_dir);
@@ -61,7 +61,7 @@
 	
 	case 'default':
 	default:
-		$template_main = 'tdmcreate_building.html';	
+		$template_main = 'building.tpl';	
 		$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('building.php'));	
 		// Redirect if there aren't modules
 		$nb_modules = $modulesHandler->getCount();

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php	2014-05-02 03:24:32 UTC (rev 12518)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php	2014-05-03 14:14:55 UTC (rev 12519)
@@ -16,7 +16,7 @@
  * @package         tdmcreate
  * @since           2.5.0
  * @author          Txmod Xoops http://www.txmodxoops.org
- * @version         $Id: fields.php 12258 2014-01-02 09:33:29Z timgno $
+ * @version         $Id: 1.91 fields.php 12258 2014-01-02 09:33:29Z timgno $
  */
 include 'header.php';
 // Recovered value of arguments op in the URL $ 
@@ -88,19 +88,14 @@
 		{	
 			foreach (array_keys($tables_arr) as $t) 
 			{				
-				$table['id'] = $t;
-				$table['mid'] = $tables_arr[$t]->getVar('table_mid');
+				$table['id'] = $t;				
 				$table['name'] = ucfirst($tables_arr[$t]->getVar('table_name'));					
 				$table['image'] = $tables_arr[$t]->getVar('table_image');	
 				$table['nbfields'] = $tables_arr[$t]->getVar('table_nbfields');	
 				$table['blocks'] = $tables_arr[$t]->getVar('table_blocks');						
 				$table['admin'] = $tables_arr[$t]->getVar('table_admin');	
-				$table['user'] = $tables_arr[$t]->getVar('table_user');	
-				$table['submenu'] = $tables_arr[$t]->getVar('table_submenu');	
-				$table['search'] = $tables_arr[$t]->getVar('table_search');				
-				$table['comments'] = $tables_arr[$t]->getVar('table_comments');	
-				$table['notifications'] = $tables_arr[$t]->getVar('table_notifications');	
-				$table['permissions'] = $tables_arr[$t]->getVar('table_permissions');				
+				$table['user'] = $tables_arr[$t]->getVar('table_user');					
+				$table['search'] = $tables_arr[$t]->getVar('table_search');									
                 // Get the list of tables
 				$criteria = new CriteriaCompo();
 				$criteria->add(new Criteria('field_mid', $table_mid));
@@ -112,18 +107,29 @@
 				unset($criteria);
 				// Display tables list
 				$fields = array();
+				$lid = 1;
 				if ( $nb_fields > 0 ) 
 				{ 	
 					foreach (array_keys($fields_arr) as $f) 
 					{	
 						$field['id'] = $f;
-						$field['mid'] = $fields_arr[$f]->getVar('field_mid');
-						$field['tid'] = $fields_arr[$f]->getVar('field_tid');
-						$field['name'] = str_replace('_', ' ', ucfirst($fields_arr[$f]->getVar('field_name')));						
+						$field['lid'] = $lid;
+						$field['name'] = str_replace('_', ' ', ucfirst($fields_arr[$f]->getVar('field_name')));
+						$field['parent'] = $fields_arr[$f]->getVar('field_parent');
+						$field['inlist'] = $fields_arr[$f]->getVar('field_inlist');
+						$field['inform'] = $fields_arr[$f]->getVar('field_inform');
+						$field['admin'] = $fields_arr[$f]->getVar('field_admin');	
+						$field['user'] = $fields_arr[$f]->getVar('field_user');
+						$field['block'] = $fields_arr[$f]->getVar('field_block');
+						$field['main'] = $fields_arr[$f]->getVar('field_main');
+						$field['search'] = $fields_arr[$f]->getVar('field_search');
+						$field['required'] = $fields_arr[$f]->getVar('field_required');
 						$fields[] = $field;
-						unset($field);					
+						unset($field);	
+                        $lid++;						
 					}									
 				} 
+				unset($lid);
 				$table['fields'] = $fields;	    			
 				$GLOBALS['xoopsTpl']->append('tables_list', $table);                
 				unset($table);				
@@ -210,55 +216,60 @@
 		$adminMenu->addItemButton(_AM_TDMCREATE_FIELDS_LIST, 'fields.php', 'list');           
 		$GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton());
 		
-		$obj = $fieldsHandler->get($field_id);        		
+		$obj = $fieldsHandler->get($field_tid);        		
 		$form = $obj->getForm($field_mid, $field_tid, $field_numb);
 		$GLOBALS['xoopsTpl']->assign('form', $form->render());
 	break;	
 	
 	case 'toggle':
-        if (isset($_GET['table_id'])) {
-            if (isset($_GET['table_blocks'])) {
-                $tbl_blocks = intval($_GET['table_blocks']);                
-				$table_blocks = ($tbl_blocks == 1) ? 0 : 1;
-				$obj =& $tablesHandler->get($table_id);
-				$obj->setVar('table_blocks', $table_blocks);
-            } elseif (isset($_GET['table_admin'])) {
-                $tbl_admin = intval($_GET['table_admin']);                
-				$table_admin = ($tbl_admin == 1) ? 0 : 1;
-				$obj =& $tablesHandler->get($table_id);
-				$obj->setVar('table_admin', $table_admin);
-            } elseif (isset($_GET['table_user'])) {
-                $tbl_user = intval($_GET['table_user']);                
-				$table_user = ($tbl_user == 1) ? 0 : 1;
-				$obj =& $tablesHandler->get($table_id);
-				$obj->setVar('table_user', $table_user);
-            } elseif (isset($_GET['table_submenu'])) {
-                $tbl_submenu = intval($_GET['table_submenu']);                
-				$table_submenu = ($tbl_submenu == 1) ? 0 : 1;
-				$obj =& $tablesHandler->get($table_id);
-				$obj->setVar('table_submenu', $table_submenu);
-            } elseif (isset($_GET['table_search'])) {
-                $tbl_search = intval($_GET['table_search']);                
-				$table_search = ($tbl_search == 1) ? 0 : 1;
-				$obj =& $tablesHandler->get($table_id);
-				$obj->setVar('table_search', $table_search);
-            } elseif (isset($_GET['table_comments'])) {
-                $tbl_comments = intval($_GET['table_comments']);                
-				$table_comments = ($tbl_comments == 1) ? 0 : 1;
-				$obj =& $tablesHandler->get($table_id);
-				$obj->setVar('table_comments', $table_comments);
-            } elseif (isset($_GET['table_notifications'])) {
-                $tbl_notifications = intval($_GET['table_notifications']);                
-				$table_notifications = ($tbl_notifications == 1) ? 0 : 1;
-				$obj =& $tablesHandler->get($table_id);
-				$obj->setVar('table_notifications', $table_notifications);
-            } elseif (isset($_GET['table_permissions'])) {
-                $tbl_permissions = intval($_GET['table_permissions']);                
-				$table_permissions = ($tbl_permissions == 1) ? 0 : 1;
-				$obj =& $tablesHandler->get($table_id);
-				$obj->setVar('table_permissions', $table_permissions);
+        if (isset($_GET['field_tid'])) {
+            if (isset($_GET['field_parent'])) {
+                $fld_parent = intval($_GET['field_parent']);                
+				$field_parent = ($fld_parent == 1) ? 0 : 1;
+				$obj =& $fieldsHandler->get($field_id);
+				$obj->setVar('field_parent', $field_parent);
+            } elseif (isset($_GET['field_inlist'])) {
+                $fld_inlist = intval($_GET['field_inlist']);                
+				$field_inlist = ($fld_inlist == 1) ? 0 : 1;
+				$obj =& $fieldsHandler->get($field_id);
+				$obj->setVar('field_inlist', $field_inlist);
+            } elseif (isset($_GET['field_inform'])) {
+                $fld_inform = intval($_GET['field_inform']);                
+				$field_inform = ($fld_inform == 1) ? 0 : 1;
+				$obj =& $fieldsHandler->get($field_id);
+				$obj->setVar('field_inform', $field_inform);
+            } elseif (isset($_GET['field_admin'])) {
+                $fld_admin = intval($_GET['field_admin']);                
+				$field_admin = ($fld_admin == 1) ? 0 : 1;
+				$obj =& $fieldsHandler->get($field_id);
+				$obj->setVar('field_admin', $field_admin);
+            } elseif (isset($_GET['field_user'])) {
+                $fld_user = intval($_GET['field_user']);                
+				$field_user = ($fld_user == 1) ? 0 : 1;
+				$obj =& $fieldsHandler->get($field_id);
+				$obj->setVar('field_user', $field_user);
+            } elseif (isset($_GET['field_block'])) {
+                $fld_block = intval($_GET['field_block']);                
+				$field_block = ($fld_block == 1) ? 0 : 1;
+				$obj =& $fieldsHandler->get($field_id);
+				$obj->setVar('field_block', $field_block);
+            } elseif (isset($_GET['field_main'])) {
+                $fld_main = intval($_GET['field_main']);                
+				$field_main = ($fld_main == 1) ? 0 : 1;
+				$obj =& $fieldsHandler->get($field_id);
+				$obj->setVar('field_main', $field_main);
+            } elseif (isset($_GET['field_search'])) {
+                $fld_search = intval($_GET['field_search']);                
+				$field_search = ($fld_search == 1) ? 0 : 1;
+				$obj =& $fieldsHandler->get($field_id);
+				$obj->setVar('field_search', $field_search);
+            } elseif (isset($_GET['field_required'])) {
+                $fld_required = intval($_GET['field_required']);                
+				$field_required = ($fld_required == 1) ? 0 : 1;
+				$obj =& $fieldsHandler->get($field_id);
+				$obj->setVar('field_required', $field_required);
             }
-			if ($tablesHandler->insert($obj, true)) {
+			if ($fieldsHandler->insert($obj, true)) {
 				redirect_header('fields.php', 1, _AM_TDMCREATE_TOGGLE_SUCCESS);
 			} else {
 				redirect_header('fields.php', 1, _AM_TDMCREATE_TOGGLE_FAILED);

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php	2014-05-02 03:24:32 UTC (rev 12518)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/tables.php	2014-05-03 14:14:55 UTC (rev 12519)
@@ -97,11 +97,13 @@
 				unset($criteria);
 				// Display tables list
 				$tables = array();
+				$lid = 1;
 				if ( $nb_tables > 0 ) 
 				{ 	
 					foreach (array_keys($tables_arr) as $t) 
 					{	
 						$table['id'] = $t;
+						$table['lid'] = $lid;
 						$table['mid'] = $tables_arr[$t]->getVar('table_mid');
 						$table['name'] = $tables_arr[$t]->getVar('table_name');					
 						$table['image'] = $tables_arr[$t]->getVar('table_image');	
@@ -116,8 +118,10 @@
 						$table['permissions'] = $tables_arr[$t]->getVar('table_permissions');
 						$tables[] = $table;
 						unset($table);					
+						$lid++;						
 					}									
 				} 
+				unset($lid);
 				$mod['tables'] = $tables;	    			
 				$GLOBALS['xoopsTpl']->append('modules_list', $mod);                
 				unset($mod);

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php	2014-05-02 03:24:32 UTC (rev 12518)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php	2014-05-03 14:14:55 UTC (rev 12519)
@@ -200,6 +200,11 @@
 					}
 					$parameters_tray->addElement($field_elements_select);
                 				
+				$field_parent = $this->isNew() ? ( $i == 1 ) : $this->getVar('field_parent');
+					$check_field_parent = new XoopsFormCheckBox(' ', 'field_parent', $field_parent);
+					$check_field_parent->addOption(1, _AM_TDMCREATE_FIELD_PARENT );
+					$parameters_tray->addElement($check_field_parent);
+					
 				$field_inlist = $this->isNew() ? 0 : $this->getVar('field_inlist');
 					$check_field_inlist = new XoopsFormCheckBox(' ', 'field_inlist['.$i.']', $field_inlist);
 					$check_field_inlist->addOption(1, _AM_TDMCREATE_FIELD_INLIST);
@@ -225,10 +230,10 @@
 					$check_field_block->addOption(1, _AM_TDMCREATE_FIELD_BLOCK);
 					$parameters_tray->addElement($check_field_block);
 
-				$field_mnfield = $this->isNew() ? ( $i == 1 ) : $this->getVar('field_main');
-					$field_main = new XoopsFormRadio('', 'field_main', $field_mnfield);
-					$field_main->addOption( '', _AM_TDMCREATE_FIELD_MAINFIELD );
-					$parameters_tray->addElement($field_main);
+				$field_main = $this->isNew() ? ( $i == 1 ) : $this->getVar('field_main');
+					$check_field_main = new XoopsFormRadio('', 'field_main', $field_main);
+					$check_field_main->addOption('', _AM_TDMCREATE_FIELD_MAINFIELD );
+					$parameters_tray->addElement($check_field_main);
 
 				$field_search = $this->isNew() ? 0 : $this->getVar('field_search');
 					$check_field_search = new XoopsFormCheckBox(' ', 'field_search['.$i.']', $field_search);
@@ -312,13 +317,20 @@
     /**
      * retrieve a field
      *
-     * @param int $id field_id
+     * @param int $id tid
      *
      * @return mixed reference to the {@link TDMCreateFields} object
      */
     public function &get($id)
-    {
-        return parent::get($id);   
+    {        
+        $criteria = new Criteria('field_id', $id );
+		if ($this->getCount($criteria) > 0)	{
+			$obj = $this->getObjects($criteria, false, false );
+			return $obj[0]['field_id'];
+		} else {
+			return parent::get($tid);
+		}	
+		return false;	
     }
 	
 	/**

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/css/admin/style.css
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/css/admin/style.css	2014-05-02 03:24:32 UTC (rev 12518)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/css/admin/style.css	2014-05-03 14:14:55 UTC (rev 12519)
@@ -24,6 +24,7 @@
   padding: 5px;
   border-bottom: 1px solid #ccc;  
   background-color:rgba(200,110,20,0.3);
+  vertical-align: middle;
 }
 
 tr.tables td {
@@ -32,6 +33,7 @@
   padding: 5px;
   border-bottom: 1px solid #ccc;  
   background-color:rgba(230,130,100,0.3);
+  vertical-align: middle;
 }
 
 tr.fields td {
@@ -40,6 +42,7 @@
   padding: 5px;
   border-bottom: 1px solid #ccc;  
   background-color:rgba(0,255,0,0.3);
+  vertical-align: middle;
 }
 
 .toggleChild {
@@ -51,6 +54,22 @@
    height: 16px;
 }
 
+.even { 	
+	border-bottom: 1px solid #ccc;
+	background-color: #cdcdcd; 
+	color: inherit;
+	padding: 5px; 
+	vertical-align: middle;
+}
+
+.odd { 
+	border-bottom: 1px solid #ccc;	 
+	background-color: #dcdcdc; 
+	color: inherit; 
+	padding: 5px;
+	vertical-align: middle;
+}
+
 .move { cursor: move; }
 .width6{ width:	6%; }
 

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php	2014-05-02 03:24:32 UTC (rev 12518)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php	2014-05-03 14:14:55 UTC (rev 12519)
@@ -184,6 +184,20 @@
 define('_AM_TDMCREATE_FIELD_REQUIRED', "Field: Required");
 define('_AM_TDMCREATE_ADMIN_SUBMIT', "Send");
 
+define('_AM_TDMCREATE_ID_LIST', "Id");
+define('_AM_TDMCREATE_NAME_LIST', "Name");
+define('_AM_TDMCREATE_IMAGE_LIST', "Image");
+define('_AM_TDMCREATE_NBFIELDS_LIST', "Fields");
+define('_AM_TDMCREATE_PARENT_LIST', "Parent");
+define('_AM_TDMCREATE_INLIST_LIST', "Inlist");
+define('_AM_TDMCREATE_INFORM_LIST', "Inform");
+define('_AM_TDMCREATE_ADMIN_LIST', "Admin");
+define('_AM_TDMCREATE_USER_LIST', "User");	 
+define('_AM_TDMCREATE_BLOCK_LIST', "Block");
+define('_AM_TDMCREATE_MAIN_LIST', "Main");
+define('_AM_TDMCREATE_SEARCH_LIST', "Search");
+define('_AM_TDMCREATE_REQUIRED_LIST', "Required");
+
 //Modules.php
 //Form
 define('_AM_TDMCREATE_MODULES_ADD', "Add a new module");
@@ -334,6 +348,7 @@
 define('_AM_TDMCREATE_TOGGLE_SUCCESS', "Successfully Changed Display");
 define('_AM_TDMCREATE_TOGGLE_FAILED', "Changing Display Failed");
 define('_AM_TDMCREATE_ERROR_TABLE_NAME_EXIST', "<b class='red big'>WARNING</b>: The table <b class='big red'>%s</b> exists for this module, create a new one with a different name");
+define('_AM_TDMCREATE_FIELD_PARENT', "Field: Is parent");
 define('_AM_TDMCREATE_FIELD_INLIST', "Admin: Visible in list");
 define('_AM_TDMCREATE_FIELD_INFORM', "Admin: Visible in form");
 define('_AM_TDMCREATE_TABLE_MODSELOPT', "Select a Module");

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/fields.tpl
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/fields.tpl	2014-05-02 03:24:32 UTC (rev 12518)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/fields.tpl	2014-05-03 14:14:55 UTC (rev 12519)
@@ -5,70 +5,40 @@
    <table id='show_rows' width='100%' cellspacing='1' class='outer'>
      <thead>
        <tr>
-	 <th class='center'><{$smarty.const._AM_TDMCREATE_TABLE_ID}></th>
-	 <th class='center'><{$smarty.const._AM_TDMCREATE_TABLE_NAME_LIST}></th>
-	 <th class='center'><{$smarty.const._AM_TDMCREATE_TABLE_IMAGE_LIST}></th>
-	 <th class='center'><{$smarty.const._AM_TDMCREATE_TABLE_NBFIELDS_LIST}></th>
-	 <th class='center'><{$smarty.const._AM_TDMCREATE_TABLE_BLOCKS_LIST}></th>
-	 <th class='center'><{$smarty.const._AM_TDMCREATE_TABLE_ADMIN_LIST}></th>
-	 <th class='center'><{$smarty.const._AM_TDMCREATE_TABLE_USER_LIST}></th>
-	 <th class='center'><{$smarty.const._AM_TDMCREATE_TABLE_SUBMENU_LIST}></th>
-	 <th class='center'><{$smarty.const._AM_TDMCREATE_TABLE_SEARCH_LIST}></th>
-	 <th class='center'><{$smarty.const._AM_TDMCREATE_TABLE_COMMENTS_LIST}></th>
-         <th class='center'><{$smarty.const._AM_TDMCREATE_TABLE_NOTIFICATIONS_LIST}></th>
-         <th class='center'><{$smarty.const._AM_TDMCREATE_TABLE_PERMISSIONS_LIST}></th>
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_ID_LIST}></th>
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_NAME_LIST}></th>
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_IMAGE_LIST}></th>
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_NBFIELDS_LIST}></th>
+         <th class='center'><{$smarty.const._AM_TDMCREATE_PARENT_LIST}></th>
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_INLIST_LIST}></th>
+         <th class='center'><{$smarty.const._AM_TDMCREATE_INFORM_LIST}></th>
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_ADMIN_LIST}></th>
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_USER_LIST}></th>	 
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_BLOCK_LIST}></th>
+         <th class='center'><{$smarty.const._AM_TDMCREATE_MAIN_LIST}></th>
+         <th class='center'><{$smarty.const._AM_TDMCREATE_SEARCH_LIST}></th>
+	 <th class='center'><{$smarty.const._AM_TDMCREATE_REQUIRED_LIST}></th>         
 	 <th class='center width6'><{$smarty.const._AM_TDMCREATE_FORMACTION}></th>
        </tr>
      </thead>
        <tbody>
          <{foreach item=table from=$tables_list}>
              <tr id="table<{$table.id}>" class="fields toggleMain">
-    	        <td class='center'><{$table.id}><br />
+    	        <td class='center bold width5'>(<{$table.id}>)
                     <a href="#" title="Toggle"><img class="imageToggle" src="<{$tdmc_icons_url}>/16/toggle.png" alt="Toggle" /></a>
                 </td>
-                <td class='center'><u><{$table.name}></u></td>
+                <td class='center'><u class='bold'><{$table.name}></u></td>
                 <td class='center'><img src="<{$pathIcon32}>/<{$table.image}>" alt="<{$table.name}>" height="30" /></td>
-    	        <td class='center'><{$table.nbfields}></td>
-    	        <td class='center'>
-                  <a href="fields.php?op=toggle&amp;table_blocks=<{$table.blocks}>&amp;table_id=<{$table.id}>" title="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>">
-                    <img src="<{xoModuleIcons16}><{$table.blocks}>.png" alt="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>" />
-                  </a>
-                </td>
-                <td class='center'>
-                  <a href="fields.php?op=toggle&amp;table_admin=<{$table.admin}>&amp;table_id=<{$table.id}>" title="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>">
-                    <img src="<{xoModuleIcons16}><{$table.admin}>.png" alt="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>" />
-                  </a>
-                </td>
-                <td class='center'>
-                  <a href="fields.php?op=toggle&amp;table_user=<{$table.user}>&amp;table_id=<{$table.id}>" title="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>">
-                    <img src="<{xoModuleIcons16}><{$table.user}>.png" alt="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>" />
-                  </a>
-                </td>
-                <td class='center'>
-                  <a href="fields.php?op=toggle&amp;table_submenu=<{$table.submenu}>&amp;table_id=<{$table.id}>" title="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>">
-                    <img src="<{xoModuleIcons16}><{$table.submenu}>.png" alt="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>" />
-                  </a>
-                </td>
-                <td class='center'>
-                  <a href="fields.php?op=toggle&amp;table_search=<{$table.search}>&amp;table_id=<{$table.id}>" title="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>">
-                    <img src="<{xoModuleIcons16}><{$table.search}>.png" alt="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>" />
-                  </a>
-                </td>
-                <td class='center'>
-                  <a href="fields.php?op=toggle&amp;table_comments=<{$table.comments}>&amp;table_id=<{$table.id}>" title="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>">
-                    <img src="<{xoModuleIcons16}><{$table.comments}>.png" alt="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>" />
-                  </a>
-                </td>
-                <td class='center'>
-                  <a href="fields.php?op=toggle&amp;table_notifications=<{$table.notifications}>&amp;table_id=<{$table.id}>" title="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>">
-                    <img src="<{xoModuleIcons16}><{$table.notifications}>.png" alt="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>" />
-                  </a>
-                </td>
-                <td class='center'>
-                  <a href="fields.php?op=toggle&amp;table_permissions=<{$table.permissions}>&amp;table_id=<{$table.id}>" title="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>">
-                    <img src="<{xoModuleIcons16}><{$table.permissions}>.png" alt="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>" />
-                  </a>
-                </td>
+    	        <td class='center bold'><{$table.nbfields}></td>
+    	        <td class='center'><img src="<{$tdmc_icons_url}>/16/nb_fields.png" /></td>
+                <td class='center'><img src="<{$tdmc_icons_url}>/16/nb_fields.png" /></td>
+                <td class='center'><img src="<{$tdmc_icons_url}>/16/nb_fields.png" /></td>
+                <td class='center'><img src="<{$tdmc_icons_url}>/16/nb_fields.png" /></td>
+                <td class='center'><img src="<{$tdmc_icons_url}>/16/nb_fields.png" /></td>
+                <td class='center'><img src="<{$tdmc_icons_url}>/16/nb_fields.png" /></td>
+                <td class='center'><img src="<{$tdmc_icons_url}>/16/nb_fields.png" /></td>
+                <td class='center'><img src="<{$tdmc_icons_url}>/16/nb_fields.png" /></td>
+                <td class='center'><img src="<{$tdmc_icons_url}>/16/nb_fields.png" /></td>
     	        <td class='xo-actions txtcenter width6'>
 		    <a href="tables.php?op=edit&amp;table_id=<{$table.id}>" title="<{$smarty.const._AM_TDMCREATE_EDIT_TABLE}>">
                        <img src="<{xoModuleIcons16 edit.png}>" alt="<{$smarty.const._AM_TDMCREATE_EDIT_TABLE}>" />
@@ -83,9 +53,56 @@
              </tr>
              <{foreach item=field from=$table.fields}>
                <tr class="<{cycle values='even,odd'}> toggleChild">
-    	        <td class='center'><{$field.id}>&nbsp;<img class="move" src="<{$tdmc_icons_url}>/16/drag.png" alt="<{$field.name}>" /></td>
+    	        <td class='center'><{$field.lid}>&nbsp;<img class="move" src="<{$tdmc_icons_url}>/16/drag.png" alt="<{$field.name}>" /></td>
                 <td class='center'><{$field.name}></td>
-                <td class='center' colspan="11">&nbsp;</td>
+                <td class='center'><img src="<{$tdmc_icons_url}>/16/tables.png" alt="Empty" /></td>
+                <td class='center'><img src="<{$tdmc_icons_url}>/16/tables.png" alt="Empty" /></td>
+                <td class='center'>                   
+                  <a href="fields.php?op=toggle&amp;field_parent=<{$field.parent}>&amp;field_id=<{$field.id}>" title="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>">
+                    <img src="<{xoModuleIcons16}><{$field.parent}>.png" alt="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>" />
+                  </a>
+                </td>                
+				<td class='center'>                   
+                  <a href="fields.php?op=toggle&amp;field_inlist=<{$field.inlist}>&amp;field_id=<{$field.id}>" title="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>">
+                    <img src="<{xoModuleIcons16}><{$field.inlist}>.png" alt="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>" />
+                  </a>
+                </td>                
+				<td class='center'>                   
+                  <a href="fields.php?op=toggle&amp;field_inform=<{$field.inform}>&amp;field_id=<{$field.id}>" title="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>">
+                    <img src="<{xoModuleIcons16}><{$field.inform}>.png" alt="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>" />
+                  </a>
+                </td>                
+				<td class='center'>                   
+                  <a href="fields.php?op=toggle&amp;field_admin=<{$field.admin}>&amp;field_id=<{$field.id}>" title="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>">
+                    <img src="<{xoModuleIcons16}><{$field.admin}>.png" alt="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>" />
+                  </a>
+                </td>                
+				<td class='center'>                   
+                  <a href="fields.php?op=toggle&amp;field_user=<{$field.user}>&amp;field_id=<{$field.id}>" title="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>">
+                    <img src="<{xoModuleIcons16}><{$field.user}>.png" alt="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>" />
+                  </a>
+                </td>                
+				<td class='center'>                   
+                  <a href="fields.php?op=toggle&amp;field_block=<{$field.block}>&amp;field_id=<{$field.id}>" title="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>">
+                    <img src="<{xoModuleIcons16}><{$field.block}>.png" alt="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>" />
+                  </a>
+                </td>                
+				<td class='center'>                   
+                  <a href="fields.php?op=toggle&amp;field_main=<{$field.main}>&amp;field_id=<{$field.id}>" title="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>">
+                    <img src="<{xoModuleIcons16}><{$field.main}>.png" alt="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>" />
+                  </a>
+                </td>                
+				<td class='center'>                   
+                  <a href="fields.php?op=toggle&amp;field_search=<{$field.search}>&amp;field_id=<{$field.id}>" title="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>">
+                    <img src="<{xoModuleIcons16}><{$field.search}>.png" alt="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>" />
+                  </a>
+                </td>                
+				<td class='center'>                   
+                  <a href="fields.php?op=toggle&amp;field_required=<{$field.required}>&amp;field_id=<{$field.id}>" title="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>">
+                    <img src="<{xoModuleIcons16}><{$field.required}>.png" alt="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>" />
+                  </a>
+                </td>
+                <td class='center'><img src="<{$tdmc_icons_url}>/16/left_right.png" alt="Empty" /></td>
                </tr>
             <{/foreach}>
          <{/foreach}>

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/modules.tpl
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/modules.tpl	2014-05-02 03:24:32 UTC (rev 12518)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/modules.tpl	2014-05-03 14:14:55 UTC (rev 12519)
@@ -20,8 +20,8 @@
      </tr>
      <{foreach item=module from=$modules_list}>
          <tr id="module<{$module.id}>" class="modules">
-	    <td class='center'><{$module.id}></td>
-            <td class='center'><{$module.name}></td>
+	    <td class='center bold'><{$module.id}></td>
+            <td class='center bold green'><{$module.name}></td>
 	    <td class='center'><{$module.version}></td>
             <td class='center'><img src="<{$tdmc_upload_imgmod_url}>/<{$module.image}>" height="35" /></td>
 	    <td class='center'><{$module.release}></td>

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tables.tpl
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tables.tpl	2014-05-02 03:24:32 UTC (rev 12518)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/templates/admin/tables.tpl	2014-05-03 14:14:55 UTC (rev 12519)
@@ -23,13 +23,13 @@
      <tbody>
      <{foreach item=module from=$modules_list}>
          <tr id="module<{$module.id}>" class="tables toggleMain">
-	    <td class='center'><{$module.id}><br />
+	    <td class='center bold width5'>(<{$module.id}>)
                 <a href="#" title="Toggle"><img class="imageToggle" src="<{$tdmc_icons_url}>/16/toggle.png" alt="Toggle" /></a>
             </td>
-            <td class='center'><{$module.name}></td>
+            <td class='center bold green'><{$module.name}></td>
             <td class='center'><img src="<{$tdmc_upload_imgmod_url}>/<{$module.image}>" height="35" /></td>
-	    <td class='center'><img src="<{$tdmc_url}>/images/icons/16/nb_fields.png" height="16" /></td>
-	    <td class='center'><img src="<{$tdmc_url}>/images/icons/16/blocks.png" height="16" /></td>
+	    <td class='center'><img src="<{$tdmc_icons_url}>/16/nb_fields.png" height="16" /></td>
+	    <td class='center'><img src="<{$tdmc_icons_url}>/16/blocks.png" height="16" /></td>
 	    <td class='center'>
                 <a href="modules.php?op=toggle&amp;mod_admin=<{$module.admin}>&amp;mod_id=<{$module.id}>" title="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>">
                     <img src="<{xoModuleIcons16}><{$module.admin}>.png" alt="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>" />
@@ -40,7 +40,7 @@
                     <img src="<{xoModuleIcons16}><{$module.user}>.png" alt="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>" />
                 </a>
             </td>
-            <td class='center'><img src="<{$tdmc_url}>/images/icons/16/submenu.png" alt="Submenu" title="Submenu" /></td>
+            <td class='center'><img src="<{$tdmc_icons_url}>/16/submenu.png" alt="Submenu" title="Submenu" /></td>
             <td class='center'>
                 <a href="modules.php?op=toggle&amp;mod_search=<{$module.search}>&amp;mod_id=<{$module.id}>" title="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>">
                     <img src="<{xoModuleIcons16}><{$module.search}>.png" alt="<{$smarty.const._AM_TDMCREATE_TOGGLE_CHANGE_DISPLAY}>" />
@@ -72,7 +72,7 @@
          </tr>  
          <{foreach item=table from=$module.tables}>
              <tr id="table<{$table.id}>" class="<{cycle values='even,odd'}> toggleChild">
-    	        <td class='center'><{$table.id}></td>
+    	        <td class='center'><{$table.lid}></td>
                 <td class='center'><{$table.name}></td>
                 <td class='center'><img src="<{xoModuleIcons32}><{$table.image}>" alt="<{$table.name}>" height="30" /></td>
                 <td class='center'><{$table.nbfields}></td>

[xoops-svn] SF.net SVN: xoops-svn:[12518] XoopsCore/branches/2.5.x/2.5.7/htdocs/include /comment_post.php

From: <rgr...@us...> - 2014-05-02 03:24:36

Revision: 12518
          http://sourceforge.net/p/xoops/svn/12518
Author:   rgriffith
Date:     2014-05-02 03:24:32 +0000 (Fri, 02 May 2014)
Log Message:
-----------
Correct file name issue as reported by AngeloRocha ans Zyspec.

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_post.php

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_post.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_post.php	2014-05-01 16:22:45 UTC (rev 12517)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_post.php	2014-05-02 03:24:32 UTC (rev 12518)
@@ -462,7 +462,7 @@
             if (!isset($purge_comment_post_results)) {
                 include_once $GLOBALS['xoops']->path('header.php');
                 xoops_error($comment->getHtmlErrors());
-                include_once $GLOBALS['xoops']->path('footer');
+                include_once $GLOBALS['xoops']->path('footer.php');
             } else {
                 $comment_post_results = $comment->getErrors();
             }

8 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 32 33 34 35 36 .. 181 > >> (Page 34 of 181)