Merge changes from 3.0, clean up files in views & crypsis

build/build.xml

@@ -103,13 +103,17 @@
 			<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 todir="${tmp_dir}/packages/lib_kunena" overwrite="true">
+			<fileset dir="${project_dir}/libraries/kunena"/>
+		</copy>
+		<copy todir="${tmp_dir}/packages/plg_system_kunena" overwrite="true">
+			<fileset dir="${project_dir}/plugins/plg_system_kunena"/>
+		</copy>
+		<copy todir="${tmp_dir}/packages/plg_quickicon_kunena" overwrite="true">
+			<fileset dir="${project_dir}/plugins/plg_quickicon_kunena"/>
+		</copy>
+		<copy todir="${tmp_dir}/packages/kunena_media" overwrite="true">
+			<fileset dir="${project_dir}/media/kunena"/>
 		</copy>
 		<copy todir="${tmp_dir}/packages/com_kunena">
 			<fileset dir="${project_dir}/${kunena.admin}">
@@ -131,16 +135,26 @@
 		<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"/>
+		<copy todir="${tmp_dir}/packages/lib_kunena" overwrite="true" filtering="true">
+			<fileset dir="${project_dir}/libraries/kunena">
+				<include name="forum/forum.php"/>
+				<include name="**/*.xml"/>
+			</fileset>
+		</copy>
+		<copy todir="${tmp_dir}/packages/plg_system_kunena" overwrite="true" filtering="true">
+			<fileset dir="${project_dir}/plugins/plg_system_kunena">
+				<include name="**/*.xml"/>
+			</fileset>
+		</copy>
+		<copy todir="${tmp_dir}/packages/plg_quickicon_kunena" overwrite="true" filtering="true">
+			<fileset dir="${project_dir}/plugins/plg_quickicon_kunena">
+				<include name="**/*.xml"/>
+			</fileset>
+		</copy>
+		<copy todir="${tmp_dir}/packages/kunena_media" overwrite="true" filtering="true">
+			<fileset dir="${project_dir}/media/kunena">
 				<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}">

components/com_kunena/admin/install/plugins/plg_kunena_alphauserpoints/activity.php

@@ -72,8 +72,8 @@ public function onAfterThankyou($target, $actor, $message) {
 		$infoTargetUser = (JText::_ ( 'COM_KUNENA_THANKYOU_GOT' ).': ' . KunenaFactory::getUser($target)->username );
 		$infoRootUser = ( JText::_ ( 'COM_KUNENA_THANKYOU_SAID' ).': ' . KunenaFactory::getUser($actor)->username );
 		if ( $this->_checkPermissions($message) ) {
-			$auptarget = AlphaUserPointsHelper::getAnyUserReferreID( $target );
-			$aupactor = AlphaUserPointsHelper::getAnyUserReferreID( $actor );
+			$auptarget = AlphaUserPointsHelper::getAnyUserReferreID( $actor );
+			$aupactor = AlphaUserPointsHelper::getAnyUserReferreID( $target );
 
 			$ruleName = 'plgaup_kunena_message_thankyou';
 

components/com_kunena/site/template/crypsis/kunena_tmpl_crypsis.xml

@@ -11,13 +11,17 @@
 	<license>GNU/GPL</license>
 	<description>COM_KUNENA_TEMPLATE_CRYPSIS_DESC</description>
 	<files>
-		<filename>index.html</filename>
+		<filename>config.xml</filename>
+		<filename>mapping.php</filename>
+		<filename>README.md</filename>
 		<filename>template.php</filename>
-		<filename>kunena_tmpl_crypsis.xml</filename>
-		<folder>css</folder>
 		<folder>html</folder>
 		<folder>images</folder>
-		<folder>js</folder>
+        <folder>js</folder>
+		<folder>language</folder>
+		<folder>layouts</folder>
+		<folder>less</folder>
 		<folder>media</folder>
+		<folder>pages</folder>
 	</files>
-</extension>
+</extension>

components/com_kunena/site/template/crypsis/layouts/credits/README.md

@@ -0,0 +1,3 @@
+# Credits
+
+Displays Kunena team credits.

components/com_kunena/site/template/crypsis/layouts/empty/README.md

@@ -0,0 +1,4 @@
+# Empty
+
+Empty template file which can be used for debugging purposes for example when layout isn't showing up.
+This can happen for example when user doesn't have permissions to display content in the layout.

components/com_kunena/site/template/crypsis/layouts/search/README.md

@@ -0,0 +1,9 @@
+# Search
+
+Search related layouts.
+
+Available layouts for the search are:
+
+* Search/Button - Displays simple search form.
+* Search/Form - Displays advanced search form.
+* Search/Results - Displays search results.