updated manifest to work with Joomla 2.5+

techjoomla · Jul 16, 2014 · ad94624 · ad94624
1 parent 444b97d
commit ad94624
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 89 deletions.
diff --git a/code/admin/api.xml b/code/admin/api.xml
diff --git a/code/admin/views/keys/tmpl/default.php b/code/admin/views/keys/tmpl/default.php
@@ -13,14 +13,14 @@
 <table cellpadding='4' cellspacing='0' border='0' width='100%' class='adminlist'>
 	<thead>
 		<tr>
-			<th width="20">#</th>
+			<th width="20" align="left">#</th>
 			<th width="20">&nbsp;</th>
-			<th width="30"><?php echo JHTML::_('grid.sort',   JText::_('COM_API_ID'), 'k.id', $this->model->getState('filter.order_dir'), $this->model->getState('filter.order') ); ?></th>
-			<th><?php echo JHTML::_('grid.sort',   JText::_('COM_API_DOMAIN'), 'k.domain', $this->model->getState('filter.order_dir'), $this->model->getState('filter.order') ); ?></th>
-			</th>
-			<th><?php echo JHTML::_('grid.sort',   JText::_('COM_API_USER'), 'u.name', $this->model->getState('filter.order_dir'), $this->model->getState('filter.order') ); ?></th>
-			<th><?php echo JText::_('COM_API_KEY');?></th>
-			<th><?php echo JHTML::_('grid.sort',   JText::_('COM_API_PUBLISHED'), 'k.published', $this->model->getState('filter.order_dir'), $this->model->getState('filter.order') ); ?></th>
+			<th align="left"><?php echo JHTML::_('grid.sort',   JText::_('COM_API_USER'), 'u.name', $this->model->getState('filter.order_dir'), $this->model->getState('filter.order') ); ?></th>
+			<th width="30" align="left"><?php echo JHTML::_('grid.sort',   JText::_('COM_API_ID'), 'k.id', $this->model->getState('filter.order_dir'), $this->model->getState('filter.order') ); ?></th>
+			<th align="left"><?php echo JHTML::_('grid.sort',   JText::_('COM_API_DOMAIN'), 'k.domain', $this->model->getState('filter.order_dir'), $this->model->getState('filter.order') ); ?></th>
+
+			<th align="left"><?php echo JText::_('COM_API_KEY');?></th>
+			<th align="left"><?php echo JHTML::_('grid.sort',   JText::_('COM_API_PUBLISHED'), 'k.published', $this->model->getState('filter.order_dir'), $this->model->getState('filter.order') ); ?></th>
 		</tr>
 	</thead>
 	<tbody>
@@ -33,13 +33,14 @@
 		<tr class="<?php echo $class;?>">
 			<td><?php echo $this->pagination->getRowOffset($i);?></td>
 			<td><?php echo $row->checked;?></td>
+			<td><?php echo $row->name." (".$row->username.")"; ?></td>
 			<td><?php echo $row->id; ?></td>
 			<td>
 				<a href="<?php echo $row->admin_link;?>">
 					<?php echo $row->domain; ?>
 				</a>
 			</td>
-			<td><?php echo $row->name." (".$row->username.")"; ?></td>
+
 			<td><?php echo $row->hash;?></td>
 			<td><?php echo $row->published_html; ?></td>
 		</tr>

diff --git a/code/api.xml b/code/api.xml
@@ -1,21 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<install type="component" version="1.5" method="upgrade">
+<extension type="component" version="2.5.0" method="upgrade">
 	<name>API</name>
 	<version>1.0</version>
     <creationDate>November 2011</creationDate>
-    <author>Reportoise</author>
-    <authorEmail>support@reportoise.com</authorEmail>
-    <authorUrl>http://www.reportoise.com</authorUrl>
-    <copyright>2011 Reportoise</copyright>
+    <author>Techjoomla</author>
+    <authorEmail>contact@techjoomla.com</authorEmail>
+    <authorUrl>http://techjoomla.com</authorUrl>
+    <copyright>2011 Techjoomla</copyright>
     <license>GNU General Public License v2</license>
     <description>
 		<![CDATA[
-		<p><h2>Reportoise - Generic Api framework for Joomla to be used with the mobile app</h2></p>
-		Reportoise is an extensible reporting app for Android & iPhone. We're supporting Virtuemart, redSHOP, Tienda & Social Ads at the moment. <br />
-		Visit <a href="http://www.reportoise.com" target="_blank">reportoise.com</a> for more information
+		<p><h2>Generic Api framework for Joomla</h2></p>
 		]]>
 	</description>
-    <installfile>install.api.php</installfile>
 
 	<install>
         <sql>
@@ -26,7 +23,6 @@
 	<files folder="site">
         <file>api.php</file>
         <file>LICENSE.php</file>
-        <file>router.php</file>
         <file>index.html</file>
 		<folder>assets</folder>
         <folder>controllers</folder>
@@ -50,20 +46,16 @@
 			<filename>index.html</filename>
 			<filename>LICENSE.php</filename>
 			<filename>install.mysql.sql</filename>
+			<folder>models</folder>
+			<folder>views</folder>
 			<folder>controllers</folder>
 			<folder>elements</folder>
 	        <folder>helpers</folder>
-			<folder>views</folder>
     	</files>
 
 		<languages folder="admin">
 			<language tag="en-GB">language/en-GB/en-GB.com_api.ini</language>
 			<language tag="en-GB">language/en-GB/en-GB.com_api.sys.ini</language>
 		</languages>
 	</administration>
-</install>
-
-
-
-
-
+</extension>
diff --git a/code/site/libraries/plugin.php b/code/site/libraries/plugin.php
@@ -441,13 +441,11 @@ protected function _handleMultiDimensions($key, $value, &$xml) {
 	}
 
 	/**
-	 * method used for get logged use object
+	 * Method to get current logged in API user
+	 * @return JUser
 	 */
-
 	public function getUser()
 	{
 		return $this->user;
 	}
-
-
 }