Fix Kunena#1535 Update Kunena Repository Directory Structure, Kunena#…

…1536 Broken GIT install

.gitignore

@@ -1,9 +1,8 @@
 .buildpath
 .project
 .settings
-components/com_kunena/template/**/params.ini
 .externalToolBuilders/build.kunena.2.0.launch
-/build
 .idea/
-
-/components/com_kunena/template/crypsis/css/kunena.css
+build/tmp
+components/com_kunena/site/template/**/params.ini
+components/com_kunena/site/template/crypsis/css/kunena.css

build/build.xml

@@ -35,8 +35,8 @@
 		<not><isset property="build_dir" /></not>
 	</condition>
 	<property file="build.config.ini" />
-	<property name="kunena.site" value="components/com_kunena" />
-	<property name="kunena.admin" value="administrator/components/com_kunena" />
+	<property name="kunena.site" value="components/com_kunena/site" />
+	<property name="kunena.admin" value="components/com_kunena/admin" />
 	<property name="kunena.media" value="media/kunena" />
 
 	<target name="dist" depends="mkdir,archive_old,init,build,minify,copy,info,cleanup" />
@@ -103,6 +103,14 @@
 			<istrue value="${cfg.bz2}" />
 		</condition>
 
+		<copy todir="${tmp_dir}/packages">
+			<fileset dir="${project_dir}" />
+			<firstmatchmapper>
+				<mapper type="regexp" from="^libraries/(.*)$$" to="lib_\1"/>
+				<mapper type="regexp" from="^media/([^/]*)/(.*)$$" to="\1_media/\2"/>
+				<mapper type="glob" from="plugins/*" to="*"/>
+			</firstmatchmapper>
+		</copy>
 		<copy todir="${tmp_dir}/packages/com_kunena">
 			<fileset dir="${project_dir}/${kunena.admin}">
 				<exclude name="language/**"/>
@@ -123,9 +131,19 @@
 		<filter token="kunenaversionname" value="${xml.versionname}" />
 
 		<!-- Add version information to all xml files and forum.php -->
+		<copy todir="${tmp_dir}/packages" overwrite="true" filtering="true">
+			<fileset dir="${project_dir}">
+				<include name="libraries/kunena/forum/forum.php"/>
+				<include name="**/*.xml"/>
+			</fileset>
+			<firstmatchmapper>
+				<mapper type="regexp" from="^libraries/(.*)$$" to="lib_\1"/>
+				<mapper type="regexp" from="^media/([^/]*)/(.*)$$" to="\1_media/\2"/>
+				<mapper type="glob" from="plugins/*" to="*"/>
+			</firstmatchmapper>
+		</copy>
 		<copy todir="${tmp_dir}/packages/com_kunena" overwrite="true" filtering="true">
 			<fileset dir="${project_dir}/${kunena.admin}">
-				<include name="libraries/forum/forum.php"/>
 				<include name="**/*.xml"/>
 				<include name="language/index.html"/>
 				<exclude name="language/**/*.xml"/>
@@ -141,27 +159,7 @@
 
 		<!-- Remove Mirage & Crypsis template -->
 		<delete dir="${tmp_dir}/packages/com_kunena/site/template/mirage" />
-        <delete dir="${tmp_dir}/packages/com_kunena/site/template/crypsis" />
-
-		<!-- Move libraries -->
-		<move todir="${tmp_dir}/libraries">
-			<fileset dir="${tmp_dir}/packages/com_kunena/libraries" />
-		</move>
-
-		<!-- Move system plugin -->
-		<move todir="${tmp_dir}/plg_system_kunena">
-			<fileset dir="${tmp_dir}/packages/com_kunena/install/plugins/plg_system_kunena" />
-		</move>
-
-		<!-- Move system plugin -->
-		<move todir="${tmp_dir}/plg_quickicon_kunena">
-			<fileset dir="${tmp_dir}/packages/com_kunena/install/plugins/plg_quickicon_kunena" />
-		</move>
-
-		<!-- Move media files -->
-		<move todir="${tmp_dir}/media">
-			<fileset dir="${tmp_dir}/packages/com_kunena/media/kunena" />
-		</move>
+		<delete dir="${tmp_dir}/packages/com_kunena/site/template/crypsis" />
 
 		<!-- Move files needed by the installer -->
 		<copy file="${project_dir}/pkg_kunena.xml" todir="${build_dir}" overwrite="true" filtering="true" />
@@ -193,7 +191,7 @@
 			<include name="**/*.css" />
 			<exclude name="template/mirage/css/*.css" />
 		</yui-compressor>
-		<yui-compressor warn="false" munge="true" charset="UTF-8" fromdir="${tmp_dir}/media/js" todir="${tmp_dir}/media/js">
+		<yui-compressor warn="false" munge="true" charset="UTF-8" fromdir="${tmp_dir}/packages/kunena_media/js" todir="${tmp_dir}/packages/kunena_media/js">
 			<include name="**/*.js" />
 		</yui-compressor>
 	</target>
@@ -333,11 +331,11 @@
 		<language tag="zh-CN" />
 		<language tag="zh-TW" />
 
-		<archive destfile="${build_dir}/packages/plg_system_kunena${str.version}" basedir="${tmp_dir}/plg_system_kunena" />
-		<archive destfile="${build_dir}/packages/plg_quickicon_kunena${str.version}" basedir="${tmp_dir}/plg_quickicon_kunena" />
-		<archive destfile="${build_dir}/packages/lib_kunena${str.version}" basedir="${tmp_dir}/libraries" />
+		<archive destfile="${build_dir}/packages/plg_system_kunena${str.version}" basedir="${tmp_dir}/packages/plg_system_kunena" />
+		<archive destfile="${build_dir}/packages/plg_quickicon_kunena${str.version}" basedir="${tmp_dir}/packages/plg_quickicon_kunena" />
+		<archive destfile="${build_dir}/packages/lib_kunena${str.version}" basedir="${tmp_dir}/packages/lib_kunena" />
 		<archive destfile="${build_dir}/packages/com_kunena${str.version}" basedir="${tmp_dir}/packages/com_kunena" />
-		<archive destfile="${build_dir}/packages/kunena_media${str.version}" basedir="${tmp_dir}/media" />
+		<archive destfile="${build_dir}/packages/kunena_media${str.version}" basedir="${tmp_dir}/packages/kunena_media" />
 		<archive destfile="${str.destfile}" basedir="${build_dir}" />
 		<archive destfile="${str.destlangfile}" basedir="${tmp_dir}/languages_extra" />
 	</target>

administrator/components/com_kunena/api.php → components/com_kunena/admin/api.php

@@ -16,12 +16,10 @@
 define ( 'KUNENA_PROFILER', 0 );
 
 // Component name amd database prefix
-define ( 'KUNENA_COMPONENT_NAME', basename ( dirname ( __FILE__ ) ) );
+define ( 'KUNENA_COMPONENT_NAME', 'com_kunena' );
+define ( 'KUNENA_COMPONENT_LOCATION', 'components' );
 define ( 'KUNENA_NAME', substr ( KUNENA_COMPONENT_NAME, 4 ) );
 
-// Component location
-define ( 'KUNENA_COMPONENT_LOCATION', basename ( dirname ( dirname ( __FILE__ ) ) ) );
-
 // Component paths
 define ( 'KPATH_COMPONENT_RELATIVE', KUNENA_COMPONENT_LOCATION . '/' . KUNENA_COMPONENT_NAME );
 define ( 'KPATH_SITE', JPATH_ROOT .'/'. KPATH_COMPONENT_RELATIVE );

administrator/components/com_kunena/controllers/rank.php → components/com_kunena/admin/controllers/rank.php

@@ -10,7 +10,7 @@
  **/
 defined ( '_JEXEC' ) or die ();
 
-require_once __DIR__.'/ranks.php';
+require_once __DIR__ . '/ranks.php';
 
 /**
  * Kunena Rank Controller

administrator/components/com_kunena/controllers/smiley.php → components/com_kunena/admin/controllers/smiley.php

@@ -10,7 +10,7 @@
  **/
 defined ( '_JEXEC' ) or die ();
 
-require_once __DIR__.'/smilies.php';
+require_once __DIR__ . '/smilies.php';
 
 /**
  * Kunena Smiley Controller

administrator/components/com_kunena/controllers/user.php → components/com_kunena/admin/controllers/user.php

@@ -10,7 +10,7 @@
  **/
 defined ( '_JEXEC' ) or die ();
 
-require_once __DIR__.'/users.php';
+require_once __DIR__ . '/users.php';
 
 /**
  * Kunena User Controller

administrator/components/com_kunena/install/controller.php → components/com_kunena/admin/install/controller.php

@@ -21,7 +21,7 @@ class KunenaControllerInstall extends JControllerLegacy {
 
 	public function __construct() {
 		parent::__construct ();
-		require_once __DIR__.'/model.php';
+		require_once __DIR__ . '/model.php';
 		$this->model = $this->getModel ( 'Install' );
 		$this->step = $this->model->getStep ();
 		$this->steps = $this->model->getSteps ();
@@ -96,7 +96,7 @@ public function run() {
 
 		$this->status = $this->model->getStatus();
 		ob_start();
-		include __DIR__.'/tmpl/install.php';
+		include __DIR__ . '/tmpl/install.php';
 		$log = ob_get_contents();
 		ob_end_clean();
 

administrator/components/com_kunena/install/model.php → components/com_kunena/admin/install/model.php

@@ -446,7 +446,7 @@ public function stepPrepare() {
 		}
 		$this->setVersion($version);
 
-		require_once KUNENA_INSTALLER_PATH.'/schema.php';
+		require_once KUNENA_INSTALLER_PATH . '/schema.php';
 		$schema = new KunenaModelSchema();
 		$results[] = $schema->updateSchemaTable('kunena_version');
 
@@ -657,7 +657,7 @@ public function installDatabase() {
 		static $tables = null;
 		if ($schema === null) {
 			// Run only once: get table creation SQL and existing tables
-			require_once KUNENA_INSTALLER_PATH.'/schema.php';
+			require_once KUNENA_INSTALLER_PATH . '/schema.php';
 			$schema = new KunenaModelSchema();
 			$create = $schema->getCreateSQL();
 			$tables = $this->listTables ( 'kunena_', true );
@@ -836,7 +836,7 @@ function processUpgradeXMLNode($action)
 	}
 
 	public function installSampleData() {
-		require_once ( KUNENA_INSTALLER_PATH.'/sql/install/php/sampledata.php' );
+		require_once(KUNENA_INSTALLER_PATH . '/sql/install/php/sampledata.php');
 		if (installSampleData ())
 			$this->addStatus ( JText::_('COM_KUNENA_INSTALL_SAMPLEDATA'), true );
 		return true;

administrator/components/com_kunena/install/plugins/plg_kunena_comprofiler/access.php → components/com_kunena/admin/install/plugins/plg_kunena_comprofiler/access.php

@@ -10,7 +10,7 @@
  **/
 defined ( '_JEXEC' ) or die ();
 
-require_once dirname(__FILE__).'/integration.php';
+require_once dirname(__FILE__) . '/integration.php';
 
 /**
  * Kunena Access Control for CommunityBuilder

administrator/components/com_kunena/install/plugins/plg_kunena_comprofiler/activity.php → components/com_kunena/admin/install/plugins/plg_kunena_comprofiler/activity.php

@@ -10,7 +10,7 @@
  **/
 defined ( '_JEXEC' ) or die ();
 
-require_once dirname(__FILE__).'/integration.php';
+require_once dirname(__FILE__) . '/integration.php';
 
 class KunenaActivityComprofiler extends KunenaActivity {
 	protected $params = null;

administrator/components/com_kunena/install/plugins/plg_kunena_comprofiler/profile.php → components/com_kunena/admin/install/plugins/plg_kunena_comprofiler/profile.php

@@ -10,7 +10,7 @@
  **/
 defined ( '_JEXEC' ) or die ();
 
-require_once dirname(__FILE__).'/integration.php';
+require_once dirname(__FILE__) . '/integration.php';
 
 class KunenaProfileComprofiler extends KunenaProfile {
 	protected $params = null;

administrator/components/com_kunena/install/plugins/plg_kunena_gravatar/avatar.php → components/com_kunena/admin/install/plugins/plg_kunena_gravatar/avatar.php

@@ -16,7 +16,7 @@ class KunenaAvatarGravatar extends KunenaAvatar {
 
 	public function __construct($params) {
 		$this->params = $params;
-		require_once dirname ( __FILE__ ) . '/gravatar.php';
+		require_once dirname(__FILE__) . '/gravatar.php';
 	}
 
 	public function getEditURL() {