[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] Re: Phpgroupware-cvs Digest, Vol 17, Issue 79
|
From: |
??? |
|
Subject: |
[Phpgroupware-cvs] Re: Phpgroupware-cvs Digest, Vol 17, Issue 79 |
|
Date: |
Fri, 21 May 2004 09:02:51 +0800 |
----- Original Message -----
From: <address@hidden>
To: <address@hidden>
Sent: Friday, May 21, 2004 5:33 AM
Subject: Phpgroupware-cvs Digest, Vol 17, Issue 79
> Send Phpgroupware-cvs mailing list submissions to
> address@hidden
>
> To subscribe or unsubscribe via the World Wide Web, visit
> http://mail.gnu.org/mailman/listinfo/phpgroupware-cvs
> or, via email, send a message with subject or body 'help' to
> address@hidden
>
> You can reach the person managing the list at
> address@hidden
>
> When replying, please edit your Subject line so it is more specific
> than "Re: Contents of Phpgroupware-cvs digest..."
>
>
> Today's Topics:
>
> 1. api/skins/default/about.xsl, 1.1.1.1.2.3
> (address@hidden)
> 2. phpgroupware/notes/skins/index.php, 1.1
> (address@hidden)
> 3. pbwebmaui/inc/hook_admin.inc.php, 1.2
> (address@hidden)
> 4. Removed Files:, Branch: building_part_select.xsl
> (address@hidden)
> 5. pbwebmaui/templates/default/images/btn_delete1a.png, 1.2
> (address@hidden)
> 6. property/skins/default/images/calendar.gif, 1.2
> (address@hidden)
> 7. property/templates/default/tts.xsl, 1.24
> (address@hidden)
> 8. api/skins/default/widgets.xsl, 1.1.1.1.2.18
> (address@hidden)
> 9. api/interface/class.interface_xmlrpc.php, 1.1.2.12
> (address@hidden)
>
>
> ----------------------------------------------------------------------
>
> Message: 1
> Date: Fri, 16 Apr 2004 22:59:49 +0200
> From: address@hidden
> Subject: [Phpgroupware-cvs] api/skins/default/about.xsl, 1.1.1.1.2.3
> To: address@hidden
> Message-ID: <address@hidden>
>
> Update of /api/skins/default
> Modified Files:
> Branch: proposal-branch
> about.xsl
>
> date: 2004/04/16 20:59:49; author: seek3r; state: Exp; lines: +76 -13
>
> Log Message:
> bringing savannah cvs back up to date with what we were doing on our private
> cvs server. We will not be doing dev from this cvs tree
> =====================================================================
> Index: api/skins/default/about.xsl
> diff -u api/skins/default/about.xsl:1.1.1.1.2.2
> api/skins/default/about.xsl:1.1.1.1.2.3
> --- api/skins/default/about.xsl:1.1.1.1.2.2 Mon Oct 27 10:25:01 2003
> +++ api/skins/default/about.xsl Fri Apr 16 20:59:49 2004
> @@ -6,17 +6,80 @@
> <xsl:output indent="yes"/>
>
> <xsl:template match="APP">
> - <table border="0" align="left" cellspacing="4" cellpadding="4">
> - <tr>
> - <td><img src="{$api_image_path}/about_logo.png" /></td>
> - </tr>
> - <tr>
> - <td>This new phpGroupWare framework was brought to you by the outstanding
> and brilliant work of
> - <br />Dan Kuykendall (Seek3r) and Joseph Engo (jengo).
> - <br />Details can be found at <a
> href="http://www.kuykendall.org/phpgroupware";>http://www.kuykendall.org/phpgroupware</a>
> - </td>
> - </tr>
> - </table>
> +
> +<table border="0" width="90%" align="center">
> + <tr>
> + <td>
> + <table border="0" align="left" cellspacing="4" cellpadding="4">
> + <tr>
> + <td width="178" rowspan="2"><img src="{$api_image_path}/about_logo_a.png"
> /></td>
> + <td height="48" valign="top"><img src="{$api_image_path}/about_logo_b.png"
> /></td>
> + </tr>
> + <tr>
> + <td valign="top"><a
> href="http://nextgen.phpgroupware.org/";>phpGroupWare</a> version 1.9.0</td>
> + </tr>
> + <xsl:if test="/PHPGW/APP/name != 'api'">
> + <tr>
> + <td colspan="2">
> + <hr /><b><xsl:value-of select="/PHPGW/APP/title" /> version <xsl:value-of
> select="/PHPGW/APP/version" /></b>
> + <br /><xsl:value-of select="/PHPGW/APP/description" />
> + <br />
> + <br />Authors
> + <ul>
> + <xsl:choose>
> + <xsl:when test="count(/PHPGW/APP/authors/author/author_item) > 1">
> + <xsl:for-each select="/PHPGW/APP/authors/author/author_item">
> + <li><xsl:value-of select="name" />
> + <xsl:if test="email != ''">
> + <<xsl:value-of select="email" />>
> + </xsl:if>
> + </li>
> + </xsl:for-each>
> + </xsl:when>
> + <xsl:otherwise>
> + <xsl:for-each select="/PHPGW/APP/authors/author">
> + <li><xsl:value-of select="name" />
> + <xsl:if test="email != ''">
> + <<xsl:value-of select="email" />>
> + </xsl:if>
> + </li>
> + </xsl:for-each>
> + </xsl:otherwise>
> + </xsl:choose>
> + </ul>
> + Maintainers
> + <ul>
> + <xsl:choose>
> + <xsl:when test="count(/PHPGW/APP/maintainers/maintainer/maintainer_item) >
> 1">
> + <xsl:for-each select="/PHPGW/APP/maintainers/maintainer/maintainer_item">
> + <li><xsl:value-of select="name" />
> + <xsl:if test="email != ''">
> + <<xsl:value-of select="email" />>
> + </xsl:if>
> + </li>
> + </xsl:for-each>
> + </xsl:when>
> + <xsl:otherwise>
> + <xsl:for-each select="/PHPGW/APP/maintainers/maintainer">
> + <li><xsl:value-of select="name" />
> + <xsl:if test="email != ''">
> + <<xsl:value-of select="email" />>
> + </xsl:if>
> + </li>
> + </xsl:for-each>
> + </xsl:otherwise>
> + </xsl:choose>
> + </ul>
> + <xsl:variable name="license_url" select="/PHPGW/APP/license_url" />
> + <br />This application is released under the <a
> href="{$license_url}"><xsl:value-of select="/PHPGW/APP/license" /></a> license
> + </td>
> + </tr>
> + </xsl:if>
> + </table>
> + </td>
> + </tr>
> +</table>
> +
> </xsl:template>
>
> </xsl:stylesheet>
>
>
>
>
> ------------------------------
>
> Message: 2
> Date: Fri, 16 Apr 2004 23:22:00 +0200
> From: address@hidden
> Subject: [Phpgroupware-cvs] phpgroupware/notes/skins/index.php, 1.1
> To: address@hidden
> Message-ID: <address@hidden>
>
> Update of /phpgroupware/notes/skins
> Removed Files:
> Branch:
> index.php
>
> date: 2004/04/16 21:22:00; author: seek3r; state: dead;
>
> Log Message:
> branches: 1.1.2;
> file index.php was initially added on branch proposal-branch.
> =====================================================================
> No syntax errors detected in -
> =====================================================================
>
>
>
>
> ------------------------------
>
> Message: 3
> Date: Mon, 19 Apr 2004 17:36:29 +0200
> From: address@hidden
> Subject: [Phpgroupware-cvs] pbwebmaui/inc/hook_admin.inc.php, 1.2
> To: address@hidden
> Message-ID: <address@hidden>
>
> Update of /pbwebmaui/inc
> Modified Files:
> Branch:
> hook_admin.inc.php
>
> date: 2004/04/19 15:36:29; author: fipsfuchs; state: Exp; lines: +1 -0
>
> Log Message:
> new menu entry to edit mail domain
> =====================================================================
> No syntax errors detected in -
> =====================================================================
> Index: pbwebmaui/inc/hook_admin.inc.php
> diff -u pbwebmaui/inc/hook_admin.inc.php:1.1
> pbwebmaui/inc/hook_admin.inc.php:1.2
> --- pbwebmaui/inc/hook_admin.inc.php:1.1 Wed Mar 31 08:23:44 2004
> +++ pbwebmaui/inc/hook_admin.inc.php Mon Apr 19 15:36:29 2004
> @@ -11,6 +11,7 @@
> $values = array
> (
> 'Site Configuration' =>
> $GLOBALS['phpgw']->link('/index.php','menuaction=pbwebmaui.uipbwebmaui.show_adminSiteConf'),
> + 'Domain Administration' => $GLOBALS['phpgw']->link('/pbwebmaui/index.php'),
> );
>
> display_section($appname,$appname,$values);
>
>
>
>
> ------------------------------
>
> Message: 4
> Date: Thu, 20 May 2004 23:37:09 +0200
> From: address@hidden
> Subject: [Phpgroupware-cvs] Removed Files:, Branch:
> building_part_select.xsl
> To: address@hidden
> Message-ID: <address@hidden>
>
> date: 2004/04/23 12:26:48; author: sigurdne; state: dead; lines: +1 -1
>
> Log Message:
> *** empty log message ***
> =====================================================================
>
>
>
>
> ------------------------------
>
> Message: 5
> Date: Mon, 19 Apr 2004 17:32:07 +0200
> From: address@hidden
> Subject: [Phpgroupware-cvs]
> pbwebmaui/templates/default/images/btn_delete1a.png, 1.2
> To: address@hidden
> Message-ID: <address@hidden>
>
> Update of /pbwebmaui/templates/default/images
> Modified Files:
> Branch:
> btn_delete1a.png
>
> date: 2004/04/19 15:32:07; author: fipsfuchs; state: Exp; lines: +3 -3
>
> Log Message:
> templates completely redesigned
> =====================================================================
> Index: pbwebmaui/templates/default/images/btn_delete1a.png
>
>
>
>
> ------------------------------
>
> Message: 6
> Date: Fri, 23 Apr 2004 14:26:49 +0200
> From: address@hidden
> Subject: [Phpgroupware-cvs]
> property/skins/default/images/calendar.gif, 1.2
> To: address@hidden
> Message-ID: <address@hidden>
>
> Update of /property/skins/default/images
> Removed Files:
> Branch:
> calendar.gif
>
> date: 2004/04/23 12:26:49; author: sigurdne; state: dead; lines: +0 -0
>
> Log Message:
> *** empty log message ***
> =====================================================================
>
>
>
>
> ------------------------------
>
> Message: 7
> Date: Fri, 23 Apr 2004 14:26:51 +0200
> From: address@hidden
> Subject: [Phpgroupware-cvs] property/templates/default/tts.xsl, 1.24
> To: address@hidden
> Message-ID: <address@hidden>
>
> Update of /property/templates/default
> Removed Files:
> Branch:
> tts.xsl
>
> date: 2004/04/23 12:26:51; author: sigurdne; state: dead; lines: +1 -1
>
> Log Message:
> *** empty log message ***
> =====================================================================
>
>
>
>
> ------------------------------
>
> Message: 8
> Date: Sun, 18 Apr 2004 10:05:27 +0200
> From: address@hidden
> Subject: [Phpgroupware-cvs] api/skins/default/widgets.xsl,
> 1.1.1.1.2.18
> To: address@hidden
> Message-ID: <address@hidden>
>
> Update of /api/skins/default
> Modified Files:
> Branch: proposal-branch
> widgets.xsl
>
> date: 2004/04/18 08:05:27; author: jengo; state: Exp; lines: +31 -3
>
> Log Message:
> Added in support for history rollbacks on an item, in order for an app to
> support this there are some strict guidelines
> =====================================================================
> Index: api/skins/default/widgets.xsl
> diff -u api/skins/default/widgets.xsl:1.1.1.1.2.17
> api/skins/default/widgets.xsl:1.1.1.1.2.18
> --- api/skins/default/widgets.xsl:1.1.1.1.2.17 Fri Apr 16 20:59:49 2004
> +++ api/skins/default/widgets.xsl Sun Apr 18 08:05:27 2004
> @@ -483,9 +483,23 @@
> </tr>
> </xsl:template>
>
> +<xsl:template match="APP[action_type='api_history_rollback']">
> + <xsl:if test="count(dialog) > 0">
> + <br />
> + <xsl:call-template name="widget_dialog_yesno">
> + <xsl:with-param name="question" select="dialog/question" />
> + <xsl:with-param name="yes_op" select="dialog/yes_op" />
> + <xsl:with-param name="no_op" select="dialog/no_op" />
> + <xsl:with-param name="inputs"
> select="dialog/current_inputs/current_inputs_item" />
> + </xsl:call-template>
> + <p> </p>
> + </xsl:if>
> +</xsl:template>
> +
> <xsl:template name="record_history">
> <xsl:param name="history_data" />
> <xsl:param name="title" select="'History'" />
> + <xsl:param name="location" select="''" />
>
> <table border="0" width="95%">
> <tr>
> @@ -531,7 +545,21 @@
> <tr class="{$class}">
> <xsl:choose>
> <xsl:when test="position() = 1">
> - <td width="22%"><font color="#000000"><xsl:value-of select="timestamp"
> /></font></td>
> + <td width="22%">
> + <font color="#000000">
> + <!-- FIXME: This doesn't work right now, I need to find a way to get the
> total number of unique nodes -->
> + <xsl:choose>
> + <xsl:when test="count(.|key('key_history_timestamps',timestamp)[1]) > 0">
> + <a
> href="{$baseurl}&op=api.base.history_rollback&location={$location}&history_id={id}">
> + <xsl:value-of select="timestamp" />
> + </a>
> + </xsl:when>
> + <xsl:otherwise>
> + <xsl:value-of select="timestamp" />
> + </xsl:otherwise>
> + </xsl:choose>
> + </font>
> + </td>
> </xsl:when>
> <xsl:otherwise><td width="22%"> </td></xsl:otherwise>
> </xsl:choose>
>
>
>
>
> ------------------------------
>
> Message: 9
> Date: Fri, 16 Apr 2004 22:59:49 +0200
> From: address@hidden
> Subject: [Phpgroupware-cvs] api/interface/class.interface_xmlrpc.php,
> 1.1.2.12
> To: address@hidden
> Message-ID: <address@hidden>
>
> Update of /api/interface
> Modified Files:
> Branch: proposal-branch
> class.interface_xmlrpc.php
>
> date: 2004/04/16 20:59:49; author: seek3r; state: Exp; lines: +37 -36
>
> Log Message:
> bringing savannah cvs back up to date with what we were doing on our private
> cvs server. We will not be doing dev from this cvs tree
> =====================================================================
> No syntax errors detected in -
> =====================================================================
> Index: api/interface/class.interface_xmlrpc.php
> diff -u api/interface/class.interface_xmlrpc.php:1.1.2.11
> api/interface/class.interface_xmlrpc.php:1.1.2.12
> --- api/interface/class.interface_xmlrpc.php:1.1.2.11 Thu Dec 25 02:20:18 2003
> +++ api/interface/class.interface_xmlrpc.php Fri Apr 16 20:59:49 2004
> @@ -31,26 +31,27 @@
> var $inputs;
> var $method_result;
> var $indent = '';
> - var $first_input = True;
> + var $first_input = true;
>
> function api_interface()
> {
> $this->parse();
> $GLOBALS['phpgw_data']['api']['op'] = $this->op;
> - $GLOBALS['phpgw_data']['server']['session_method'] = 'url';
> + $_SESSION['phpgw_data']['server']['session_method'] = 'url';
> }
>
> - function output($result, $debug = False)
> + function output($result, $debug = false)
> {
> + define('PHPGW_FINISHED', true);
> if(!$debug)
> {
> header('Content-type: text/xml');
> header('Content-Length: '.strlen($result));
> - echo $result;
> + return $result;
> }
> else
> {
> - echo htmlentities($result);
> + return htmlentities($result);
> }
> }
>
> @@ -61,7 +62,7 @@
>
> function login()
> {
> - $GLOBALS['phpgw']->finish(False);
> + $GLOBALS['phpgw']->finish(false);
> $this->xmlrpc_fault('1', 'Please login.');
> }
>
> @@ -69,8 +70,7 @@
> {
> $newsid = $GLOBALS['phpgw']->session->sid();
> $result = "<?xml
> version=\"1.0\"?>\n<methodResponse>\n<params>\n<param>\n<value>\n<base64>".base64_encode($newsid)."</base64>\n</value>\n</param>\n</params>\n</methodResponse>";
> - $GLOBALS['phpgw']->session->save_data();
> - $this->output($result);
> + echo $this->output($result);
> exit;
> }
>
> @@ -116,25 +116,29 @@
>
> function sendtoclient()
> {
> - $xml_result = $GLOBALS['phpgw']->base_xml->export_xml();
> - $api_data = xml2var($xml_result);
> -
> + if (defined('MISBEHAVEDAPP'))
> + {
> + $this->xmlrpc_fault(1, 'method returned faulty data. may not be xml-rpc
> compliant.');
> + }
> +
> switch ($this->methodName)
> {
> case 'system.listMethods':
> - $this->system_listMethods();
> - return;
> + return $this->system_listMethods();
> case 'system.methodSignature':
> - $this->system_methodSignature();
> - return;
> + return $this->system_methodSignature();
> case 'system.methodHelp':
> - $this->system_methodHelp();
> - return;
> + return $this->system_methodHelp();
> }
> -
> - if(empty($this->method_result) && isset($api_data['APP']))
> +
> + if(empty($this->method_result))
> {
> - $this->method_result = $api_data['APP'];
> + $xml_result = $GLOBALS['phpgw']->base_xml->export_xml();
> + $api_data = xml2var($xml_result);
> + if(isset($api_data['APP']))
> + {
> + $this->method_result = $api_data['APP'];
> + }
> }
>
> /* Constructing the XML doc */
> @@ -177,7 +181,7 @@
>
> $response_packet .= "</methodResponse>";
>
> - $this->output($response_packet);
> + return $this->output($response_packet);
> }
>
> function parse()
> @@ -194,7 +198,7 @@
> }
> $tmp = explode ("\n", $GLOBALS['HTTP_RAW_POST_DATA']);
> $num = count($tmp);
> - $hit_start = False;
> + $hit_start = false;
> $xmlrpc_input = '';
> for ($i=0; $i < $num; $i++)
> {
> @@ -204,7 +208,7 @@
> }
> elseif(stristr($tmp[$i], '<?xml'))
> {
> - $hit_start = True;
> + $hit_start = true;
> $xmlrpc_input .= $tmp[$i]."\n";
> }
> }
> @@ -219,7 +223,7 @@
> unset($xml_index, $xml_vals);
> if(!isset($this->xml_vals[$this->xml_index['methodName'][0]]['value']))
> {
> - $GLOBALS['phpgw']->finish(False);
> + $GLOBALS['phpgw']->finish(false);
> $this->xmlrpc_fault('1', 'Invalid xmlrpc packet. methodName missing.');
> }
>
> @@ -286,17 +290,17 @@
> {
> if($this->input_num == 1)
> {
> - $GLOBALS['HTTP_GET_VARS']['phpgw_user'] = $value;
> + $_GET['phpgw_user'] = $value;
> }
> elseif($this->input_num == 2)
> {
> - $GLOBALS['HTTP_GET_VARS']['phpgw_pass'] = $value;
> + $_GET['phpgw_pass'] = $value;
> }
> return;
> }
> elseif($this->input_num == 1)
> {
> - $GLOBALS['HTTP_GET_VARS']['sid'] = $value;
> + $_GET['sid'] = $value;
> return;
> }
> else
> @@ -538,8 +542,7 @@
> }
> $result .=
> "</data>\n</array>\n</value>\n</param>\n</params>\n</methodResponse>";
> }
> - $this->output($result);
> - exit;
> + return $this->output($result);
> }
>
> function system_methodSignature()
> @@ -573,8 +576,7 @@
> $result .=
> "</data>\n</array></value>\n</data>\n</array></value>\n</param>\n</params>\n";
> }
> $result .= "</methodResponse>\n";
> - $this->output($result);
> - exit;
> + return $this->output($result);
> }
>
> elseif(isset($GLOBALS['docs'][$app]['classes'][$app.'_'.$class]['functions'][$func])
> && !$GLOBALS['phpgw']->acl->check($methodname, 1))
> {
> @@ -614,8 +616,7 @@
> $result .= "</param>\n</params>\n";
> }
> $result .= "</methodResponse>\n";
> - $this->output($result);
> - exit;
> + return $this->output($result);
> }
>
> elseif(isset($GLOBALS['docs'][$app]['classes'][$app.'_'.$class]['functions'][$func])
> && !$GLOBALS['phpgw']->acl->check($methodname, 1))
> {
> @@ -646,7 +647,7 @@
> $error_result .= " </value>\n";
> $error_result .= " </fault>\n";
> $error_result .= "</methodResponse>\n";
> - $this->output($error_result);
> + echo $this->output($error_result);
> exit;
> }
> }
>
>
>
>
> ------------------------------
>
> _______________________________________________
> Phpgroupware-cvs mailing list
> address@hidden
> http://mail.gnu.org/mailman/listinfo/phpgroupware-cvs
>
>
> End of Phpgroupware-cvs Digest, Vol 17, Issue 79
> ************************************************
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] Re: Phpgroupware-cvs Digest, Vol 17, Issue 79,
??? <=