[Piwik-svn] r159 - in trunk: modules/API plugins/API plugins/UsersManager/templates

[svnmaster at piwik.org]

Author: matt
Date: 2008-01-14 04:00:40 +0100 (Mon, 14 Jan 2008)
New Revision: 159

Modified:
   trunk/modules/API/Proxy.php
   trunk/modules/API/Request.php
   trunk/plugins/API/Controller.php
   trunk/plugins/UsersManager/templates/UsersManager.tpl
Log:
Working on doc

Modified: trunk/modules/API/Proxy.php
===================================================================
--- trunk/modules/API/Proxy.php	2008-01-14 02:57:02 UTC (rev 158)
+++ trunk/modules/API/Proxy.php	2008-01-14 03:00:40 UTC (rev 159)
@@ -212,7 +212,7 @@
 	 *
 	 * @return string
 	 */
-	public function getAllInterfaceString( $outputExampleUrls = true )
+	public function getAllInterfaceString( $outputExampleUrls = true, $prefixUrls = '' )
 	{
 		$str = '';
 		foreach($this->api as $class => $info)
@@ -231,7 +231,8 @@
 				
 				if($outputExampleUrls)
 				{
-					$exampleUrl = $this->getExampleUrl($class, $methodName);
+					$exampleUrl = $prefixUrls;
+					$exampleUrl .= $this->getExampleUrl($class, $methodName);
 					if($exampleUrl !== false)
 					{
 						$str .= " [ Example in  

Modified: trunk/modules/API/Request.php
===================================================================
--- trunk/modules/API/Request.php	2008-01-14 02:57:02 UTC (rev 158)
+++ trunk/modules/API/Request.php	2008-01-14 03:00:40 UTC (rev 159)
@@ -17,12 +17,14 @@
  *	');
  *	$result = $request->process();
  *  echo $result;
- * 
+ * 
+ * @see http://dev.piwik.org/trac/wiki/API for a complete documentation
  * @package Piwik_API
  */
 class Piwik_API_Request
 {
-	/**
+	/**
+	 * 
 	 * @param string GET request that defines the API call (must at least contain a "method" parameter) 
 	 *  Example: method=UserSettings.getWideScreen&idSite=1&date=yesterday&period=week&format=xml
 	 * 	If a request is not provided, then we use the $_REQUEST superglobal and fetch

Modified: trunk/plugins/API/Controller.php
===================================================================
--- trunk/plugins/API/Controller.php	2008-01-14 02:57:02 UTC (rev 158)
+++ trunk/plugins/API/Controller.php	2008-01-14 03:00:40 UTC (rev 159)
@@ -33,7 +33,7 @@
 	function listAllMethods()
 	{
 		$this->init();
-		echo Piwik_API_Proxy::getInstance()->getAllInterfaceString( $outputExampleUrls = true );
+		echo Piwik_API_Proxy::getInstance()->getAllInterfaceString( $outputExampleUrls = true, $prefixUrls = Piwik_Common::getRequestVar('prefixUrl', '') );
 	}
 	
 	

Modified: trunk/plugins/UsersManager/templates/UsersManager.tpl
===================================================================
--- trunk/plugins/UsersManager/templates/UsersManager.tpl	2008-01-14 02:57:02 UTC (rev 158)
+++ trunk/plugins/UsersManager/templates/UsersManager.tpl	2008-01-14 03:00:40 UTC (rev 159)
@@ -60,6 +60,7 @@
             <th>Password</th>
             <th>Email</th>
             <th>Alias</th>
+            <th>token_auth</th>
             <th>Edit</th>
             <th>Delete</th>
         </tr>
@@ -72,6 +73,7 @@
             <td id="password" class="editable">-</td>
             <td id="email" class="editable">{$user.email}</td>
             <td id="alias" class="editable">{$user.alias}</td>
+            <td id="alias">{$user.token_auth}</td>
             <td><img src='plugins/UsersManager/images/edit.png' class="edituser" id="row{$i}" href='#'></td>
             <td><img src='plugins/UsersManager/images/remove.png' class="deleteuser" id="row{$i}" value="Delete"></td>
         </tr>