Index: branches/1.3.x/admin_templates/img/icons/icon46_custom.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/1.3.x/admin_templates/img/icons/icon46_custom.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/1.3.x/install/upgrades.php
===================================================================
--- branches/1.3.x/install/upgrades.php	(revision 15895)
+++ branches/1.3.x/install/upgrades.php	(revision 15896)
@@ -1,62 +1,64 @@
 <?php
 /**
 * @version	$Id$
 * @package	Custom
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	$upgrade_class = 'CustomUpgrades';
 
 	/**
 	 * Class, that holds all upgrade scripts for "Custom" module
 	 *
 	 */
 	class CustomUpgrades extends kUpgradeHelper {
 
 		public function __construct()
 		{
 			parent::__construct();
 
 			$this->dependencies = Array (
 				'1.0.0' => Array ('Core' => '5.0.0'),
 				'1.0.1' => Array ('Core' => '5.0.1'),
 				'1.0.2-B1' => Array ('Core' => '5.0.2-B1'),
 				'1.0.2-B2' => Array ('Core' => '5.0.2-B2'),
 				'1.0.2-RC1' => Array ('Core' => '5.0.2-RC1'),
 				'1.0.2' => Array ('Core' => '5.0.2'),
 				'1.0.3-B1' => Array ('Core' => '5.0.3-B1'),
 				'1.0.3-RC1' => Array ('Core' => '5.0.3-RC1'),
 				'1.0.3' => Array ('Core' => '5.0.3'),
 				'1.0.4-B1' => Array ('Core' => '5.0.4-B1'),
 				'1.0.4' => Array ('Core' => '5.0.4'),
 				'1.1.0-B1' => Array ('Core' => '5.1.0-B1'),
 				'1.1.0-B2' => Array ('Core' => '5.1.0-B2'),
 				'1.1.0-RC1' => Array ('Core' => '5.1.0-RC1'),
 				'1.1.0' => Array ('Core' => '5.1.0'),
 				'1.1.1-B1' => Array ('Core' => '5.1.1-B1'),
 				'1.1.1-RC1' => Array ('Core' => '5.1.1-RC1'),
 				'1.1.1' => Array ('Core' => '5.1.1'),
 				'1.1.2-B1' => Array ('Core' => '5.1.2-B1'),
 				'1.1.2-RC1' => Array ('Core' => '5.1.2-RC1'),
 				'1.1.2' => Array ('Core' => '5.1.2'),
 				'1.1.3-B1' => Array ('Core' => '5.1.3-B1'),
 				'1.1.3-B2' => Array ('Core' => '5.1.3-B2'),
 				'1.1.3' => Array ('Core' => '5.1.3'),
 				'1.2.0-B1' => Array ('Core' => '5.2.0-B1'),
 				'1.2.0-B2' => Array ('Core' => '5.2.0-B2'),
 				'1.2.0-B3' => Array ('Core' => '5.2.0-B3'),
 				'1.2.0-RC1' => Array ('Core' => '5.2.0-RC1'),
 				'1.2.0' => Array ('Core' => '5.2.0'),
 				'1.2.1-B1' => Array ('Core' => '5.2.1-B1'),
+				'1.2.1-B2' => Array ('Core' => '5.2.1-B2'),
+				'1.2.1-RC1' => Array ('Core' => '5.2.1-RC1'),
 			);
 		}
 	}
Index: branches/1.3.x/install/upgrades.sql
===================================================================
--- branches/1.3.x/install/upgrades.sql	(revision 15895)
+++ branches/1.3.x/install/upgrades.sql	(revision 15896)
@@ -1,63 +1,70 @@
 # ===== v 1.0.0 =====
 
 # ===== v 1.0.1 =====
 UPDATE Modules SET LoadOrder = 10 WHERE `Name` = 'Custom';
 
 # ===== v 1.0.2-B1 =====
 ALTER TABLE Widgets CHANGE CreatedOn CreatedOn INT(11) NULL DEFAULT NULL;
 UPDATE Modules SET TemplatePath = 'custom/' WHERE Name = 'Custom';
 
 # ===== v 1.0.2-B2 =====
 
 # ===== v 1.0.2-RC1 =====
 
 # ===== v 1.0.2 =====
 
 # ===== v 1.0.3-B1 =====
 
 # ===== v 1.0.3-RC1 =====
 
 # ===== v 1.0.3 =====
 
 # ===== v 1.0.4-B1 =====
 
 # ===== v 1.0.4 =====
 
 # ===== v 1.1.0-B1 =====
 UPDATE Modules SET Path = 'modules/custom/' WHERE `Name` = 'Custom';
 
 # ===== v 1.1.0-B2 =====
 
 # ===== v 1.1.0-RC1 =====
 
 # ===== v 1.1.0 =====
 
 # ===== v 1.1.1-B1 =====
 
 # ===== v 1.1.1-RC1 =====
 
 # ===== v 1.1.1 =====
 
 # ===== v 1.1.2-B1 =====
 
 # ===== v 1.1.2-RC1 =====
 
 # ===== v 1.1.2 =====
 
 # ===== v 1.1.3-B1 =====
 
 # ===== v 1.1.3-B2 =====
 
 # ===== v 1.1.3 =====
 
 # ===== v 1.2.0-B1 =====
 
 # ===== v 1.2.0-B2 =====
 
 # ===== v 1.2.0-B3 =====
 
 # ===== v 1.2.0-RC1 =====
 
 # ===== v 1.2.0 =====
 
 # ===== v 1.2.1-B1 =====
+
+# ===== v 1.2.1-B2 =====
+UPDATE Modules
+SET ClassNamespace = 'Intechnic\\InPortal\\Modules\\Custom'
+WHERE `Name` = 'Custom';
+
+# ===== v 1.2.1-RC1 =====
Index: branches/1.3.x/install/english.lang
===================================================================
--- branches/1.3.x/install/english.lang	(revision 15895)
+++ branches/1.3.x/install/english.lang	(revision 15896)
@@ -1,17 +1,21 @@
-<LANGUAGES Version="5">
-	<LANGUAGE Encoding="base64" PackName="English" LocalName="English" DateFormat="m/d/Y" TimeFormat="g:i A" InputDateFormat="m/d/Y" InputTimeFormat="g:i:s A" DecimalPoint="." ThousandSep="," Charset="utf-8" UnitSystem="2" Locale="en-US" UserDocsUrl="http://docs.in-portal.org/eng/index.php">
+<?xml version="1.0" encoding="utf-8"?>
+<LANGUAGES Version="6">
+	<LANGUAGE Encoding="base64" PackName="English" LocalName="English" DateFormat="m/d/Y" ShortDateFormat="m/d" TimeFormat="g:i A" ShortTimeFormat="g:i A" InputDateFormat="m/d/Y" InputTimeFormat="g:i:s A" DecimalPoint="." ThousandSep="," UnitSystem="2" Locale="en-US" UserDocsUrl="http://docs.in-portal.org/eng/index.php">
+		<EMAILDESIGNS>
+			<HTML>JGJvZHkNCjxici8+PGJyLz4NCg0KU2luY2VyZWx5LDxici8+PGJyLz4NCg0KV2Vic2l0ZSBhZG1pbmlzdHJhdGlvbi4NCg0KPCEtLSMjIDxpbnAyOmVtYWlsLWxvZ19JdGVtTGluayB0ZW1wbGF0ZT0icGxhdGZvcm0vbXlfYWNjb3VudC9lbWFpbCIvPiAjIy0tPg==</HTML>
+		</EMAILDESIGNS>
 		<PHRASES>
 			<PHRASE Label="la_fld_DataFile" Module="Custom" Type="1">RGF0YSBmaWxl</PHRASE>
 			<PHRASE Label="la_fld_Good" Module="Custom" Type="1" Column="R29vZA==">R29vZA==</PHRASE>
 			<PHRASE Label="la_opt_Custom" Module="Custom" Type="1">Q3VzdG9t</PHRASE>
 			<PHRASE Label="la_opt_Default" Module="Custom" Type="1">RGVmYXVsdA==</PHRASE>
 			<PHRASE Label="la_tab_Widgets" Module="Custom" Type="1">V2lkZ2V0cw==</PHRASE>
 			<PHRASE Label="la_title_AddingWidget" Module="Custom" Type="1">QWRkaW5nIFdpZGdldA==</PHRASE>
 			<PHRASE Label="la_title_EditingWidget" Module="Custom" Type="1">RWRpdGluZyBXaWRnZXQ=</PHRASE>
 			<PHRASE Label="la_title_In-Custom" Module="Custom" Type="1">Q3VzdG9t</PHRASE>
 			<PHRASE Label="la_title_NewWidget" Module="Custom" Type="1">TmV3IFdpZGdldA==</PHRASE>
 			<PHRASE Label="la_title_Widgets" Module="Custom" Type="1">V2lkZ2V0cw==</PHRASE>
 			<PHRASE Label="la_ToolTip_NewWidget" Module="Custom" Type="1">TmV3IFdpZGdldA==</PHRASE>
 		</PHRASES>
 	</LANGUAGE>
 </LANGUAGES>
\ No newline at end of file
Index: branches/1.3.x/install/install_data.sql
===================================================================
--- branches/1.3.x/install/install_data.sql	(revision 15895)
+++ branches/1.3.x/install/install_data.sql	(revision 15896)
@@ -1,7 +1,7 @@
 INSERT INTO Permissions VALUES(DEFAULT, 'custom.view', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES(DEFAULT, 'custom:widgets.delete', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES(DEFAULT, 'custom:widgets.edit', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES(DEFAULT, 'custom:widgets.add', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES(DEFAULT, 'custom:widgets.view', 11, 1, 1, 0);
 
-INSERT INTO Modules VALUES ('Custom', 'modules/custom/', 'custom-sections', DEFAULT, 1, 10, 'custom/', 0, NULL, NULL);
+INSERT INTO Modules VALUES ('Custom', 'modules/custom/', 'Intechnic\\InPortal\\Modules\\Custom', 'custom-sections', DEFAULT, 1, 10, 'custom/', 0, NULL, NULL);
Index: branches/1.3.x/install.php
===================================================================
--- branches/1.3.x/install.php	(revision 15895)
+++ branches/1.3.x/install.php	(revision 15896)
@@ -1,32 +1,38 @@
 <?php
-	$module_folder = 'modules/custom';
+$module_folder = 'modules/custom';
 
-	if (!defined('IS_INSTALL')) {
-		// separate module install
-		define('IS_INSTALL', 1);
-		define('ADMIN', 1);
-		define('FULL_PATH', realpath(dirname(__FILE__) . '/../..') );
+if ( !defined('IS_INSTALL') ) {
+	// separate module install
+	define('IS_INSTALL', 1);
+	define('ADMIN', 1);
+	define('FULL_PATH', realpath(dirname(__FILE__) . '/../..'));
 
-		include_once(FULL_PATH . '/core/kernel/startup.php');
-		require_once FULL_PATH . '/core/install/install_toolkit.php';
+	include_once(FULL_PATH . '/core/kernel/startup.php');
+	require_once FULL_PATH . '/core/install/install_toolkit.php';
 
-		$toolkit = new kInstallToolkit();
-	}
-	else {
-		// install, using installation wizard
-		$toolkit =& $this->toolkit;
-		/* @var $toolkit kInstallToolkit */
-	}
-
-	$application =& kApplication::Instance();
-	$application->Init();
+	$constants_file = FULL_PATH . '/' . $module_folder . '/constants.php';
 
-	if ($application->RecallVar('user_id') != USER_ROOT) {
-		die('restricted access!');
+	if ( file_exists($constants_file) ) {
+		require_once $constants_file;
 	}
 
-	$toolkit->RunSQL('/' . $module_folder  .'/install/install_schema.sql');
-	$toolkit->RunSQL('/' . $module_folder  .'/install/install_data.sql');
-	$toolkit->ImportLanguage('/' . $module_folder  .'/install/english');
+	$toolkit = new kInstallToolkit();
+}
+else {
+	// install, using installation wizard
+	$toolkit =& $this->toolkit;
+	/* @var $toolkit kInstallToolkit */
+}
+
+$application =& kApplication::Instance();
+$application->Init();
+
+if ( $application->RecallVar('user_id') != USER_ROOT ) {
+	die('restricted access!');
+}
+
+$toolkit->RunSQL('/' . $module_folder . '/install/install_schema.sql');
+$toolkit->RunSQL('/' . $module_folder . '/install/install_data.sql');
+$toolkit->ImportLanguage('/' . $module_folder . '/install/english');
 
-	$toolkit->finalizeModuleInstall($module_folder, false);
\ No newline at end of file
+$toolkit->finalizeModuleInstall($module_folder, false);
\ No newline at end of file
Index: branches/1.3.x
===================================================================
--- branches/1.3.x	(revision 15895)
+++ branches/1.3.x	(revision 15896)

Property changes on: branches/1.3.x
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /modules/custom/branches/1.2.x:r15633-15895