phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] phpgroupware soap.php, 1.9 index.php, 1.122 anon_wrap


From: powerstat
Subject: [Phpgroupware-cvs] phpgroupware soap.php, 1.9 index.php, 1.122 anon_wrapper.php, 1.7 set_box.php, 1.6 about.php, 1.26 notify.php, 1.14 login.php, 1.103 logout.php, 1.29 header.inc.php.template, 1.48 version.inc.php, 1.93 help.php, 1.4 home.php, 1.30 xmlrpc.php, 1.14 redirect.php, 1.3 notify_simple.php, 1.5
Date: Fri, 15 Apr 2005 15:19:00 +0200

Update of phpgroupware

Modified Files:
     Branch: MAIN
            soap.php lines: +76 -70
            index.php lines: +22 -15
            anon_wrapper.php lines: +19 -18
            set_box.php lines: +25 -13
            about.php lines: +39 -20
            notify.php lines: +16 -13
            login.php lines: +39 -22
            logout.php lines: +15 -13
            header.inc.php.template lines: +128 -53
            version.inc.php lines: +13 -17
            help.php lines: +23 -14
            home.php lines: +27 -22
            xmlrpc.php lines: +71 -23
            redirect.php lines: +17 -17
            notify_simple.php lines: +15 -12

Log Message:
Converted to phpdoc.
Verified with phpdocumentor and php -l
Also cleaned up some HTML code and unified include_once('header.inc.php')

====================================================
Index: phpgroupware/soap.php
diff -u phpgroupware/soap.php:1.8 phpgroupware/soap.php:1.9
--- phpgroupware/soap.php:1.8   Thu Dec 30 10:46:22 2004
+++ phpgroupware/soap.php       Fri Apr 15 13:19:15 2005
@@ -1,70 +1,76 @@
-<?php
-       
/**************************************************************************\
-       * phpGroupWare - SOAP Server                                            
   *
-       * http://www.phpgroupware.org                                           
   *
-       * Written by Miles Lott <address@hidden>                         *
-       * --------------------------------------------                          
   *
-       *  This program is free software; you can redistribute it and/or modify 
it *
-       *  under the terms of the GNU General Public License as published by 
the   *
-       *  Free Software Foundation; either version 2 of the License, or (at 
your  *
-       *  option) any later version.                                           
   *
-       
\**************************************************************************/
-
-       /* $Id$ */
-
-       $GLOBALS['phpgw_info'] = array();
-       $GLOBALS['phpgw_info']['flags'] = array(
-               'disable_Template_class' => True,
-               'currentapp' => 'login',
-               'noheader'   => True,
-               'disable_Template_class' => True
-       );
-
-       include('./header.inc.php');
-
-       $GLOBALS['server'] = CreateObject('phpgwapi.soap_server');
-       /* _debug_array($GLOBALS['server']);exit; */
-       /* include(PHPGW_API_INC . '/soaplib.soapinterop.php'); */
-
-       $headers = getallheaders();
-
-       if(ereg('Basic',$headers['Authorization']))
-       {
-               $tmp = $headers['Authorization'];
-               $tmp = ereg_replace(' ','',$tmp);
-               $tmp = ereg_replace('Basic','',$tmp);
-               $auth = base64_decode(trim($tmp));
-               list($sessionid,$kp3) = split(':',$auth);
-
-               if($GLOBALS['phpgw']->session->verify($sessionid,$kp3))
-               {
-                       $GLOBALS['server']->authed = True;
-               }
-               
elseif($GLOBALS['phpgw']->session->verify_server($sessionid,$kp3))
-               {
-                       $GLOBALS['server']->authed = True;
-               }
-       }
-
-       $GLOBALS['server']->add_to_map(
-               'system_login',
-               array('soapstruct'),
-               array('soapstruct')
-       );
-       $GLOBALS['server']->add_to_map(
-               'system_logout',
-               array('soapstruct'),
-               array('soapstruct')
-       );
-
-       if(function_exists('system_listapps'))
-       {
-               $GLOBALS['server']->add_to_map(
-                       'system_listApps',
-                       array(),
-                       array('soapstruct')
-               );
-       }
-
-       $GLOBALS['server']->service($HTTP_RAW_POST_DATA);
-?>
+<?php
+       /**
+       * phpGroupWare
+       *
+       * phpgroupware base
+       * @author Miles Lott <address@hidden>
+       * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
+       * @package phpgroupware
+       * @version $Id$
+       */
+
+       $GLOBALS['phpgw_info'] = array();
+
+       $GLOBALS['phpgw_info']['flags'] = array(
+               'disable_Template_class' => True,
+               'currentapp' => 'login',
+               'noheader'   => True,
+               'disable_Template_class' => True
+       );
+
+       /**
+       * Include phpgroupware header
+       */
+       include_once('header.inc.php');
+
+       /**
+       * @global object $GLOBALS['server']
+       */
+       $GLOBALS['server'] = CreateObject('phpgwapi.soap_server');
+
+       /* _debug_array($GLOBALS['server']);exit; */
+       /* include(PHPGW_API_INC . '/soaplib.soapinterop.php'); */
+
+       $headers = getallheaders();
+
+       if(ereg('Basic',$headers['Authorization']))
+       {
+               $tmp = $headers['Authorization'];
+               $tmp = ereg_replace(' ','',$tmp);
+               $tmp = ereg_replace('Basic','',$tmp);
+               $auth = base64_decode(trim($tmp));
+               list($sessionid,$kp3) = split(':',$auth);
+
+               if($GLOBALS['phpgw']->session->verify($sessionid,$kp3))
+               {
+                       $GLOBALS['server']->authed = True;
+               }
+               
elseif($GLOBALS['phpgw']->session->verify_server($sessionid,$kp3))
+               {
+                       $GLOBALS['server']->authed = True;
+               }
+       }
+
+       $GLOBALS['server']->add_to_map(
+               'system_login',
+               array('soapstruct'),
+               array('soapstruct')
+       );
+       $GLOBALS['server']->add_to_map(
+               'system_logout',
+               array('soapstruct'),
+               array('soapstruct')
+       );
+
+       if(function_exists('system_listapps'))
+       {
+               $GLOBALS['server']->add_to_map(
+                       'system_listApps',
+                       array(),
+                       array('soapstruct')
+               );
+       }
+
+       $GLOBALS['server']->service($HTTP_RAW_POST_DATA);
+?>

====================================================
Index: phpgroupware/index.php
diff -u phpgroupware/index.php:1.121 phpgroupware/index.php:1.122
--- phpgroupware/index.php:1.121        Thu Dec 30 10:46:22 2004
+++ phpgroupware/index.php      Fri Apr 15 13:19:15 2005
@@ -1,15 +1,13 @@
 <?php
-       
/**************************************************************************\
-       * phpGroupWare                                                          
   *
-       * http://www.phpgroupware.org                                           
   *
-       * --------------------------------------------                          
   *
-       *  This program is free software; you can redistribute it and/or modify 
it *
-       *  under the terms of the GNU General Public License as published by 
the   *
-       *  Free Software Foundation; either version 2 of the License, or (at 
your  *
-       *  option) any later version.                                           
   *
-       
\**************************************************************************/
-
-       /* $Id$ */
+       /**
+       * phpGroupWare
+       *
+       * phpgroupware base
+       * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
+       * @package phpgroupware
+       * @version $Id$
+       */

        $phpgw_info = array();
        if (!file_exists('header.inc.php'))
@@ -18,6 +16,9 @@
                exit;
        }

+       /**
+       * @global string $GLOBALS['sessionid']
+       */
        $GLOBALS['sessionid'] = isset($_GET['sessionid']) ? $_GET['sessionid'] 
: $_COOKIE['sessionid'];
        if (! $GLOBALS['sessionid'])
        {
@@ -25,9 +26,7 @@
                exit;
        }

-       /*
-               This is the preliminary menuaction driver for the new 
multi-layered design
-       */
+       // This is the preliminary menuaction driver for the new multi-layered 
design
        if (@isset($_GET['menuaction']))
        {
                list($app,$class,$method) = explode('.',$_GET['menuaction']);
@@ -56,7 +55,11 @@
                'nonavbar'   => True,
                'currentapp' => $app
        );
-       include('./header.inc.php');
+
+       /**
+       * Include phpgroupware header
+       */
+       include_once('header.inc.php');

        if ($app == 'home' && ! $api_requested)
        {
@@ -68,7 +71,11 @@
                $app = 'phpgwapi';
        }

+       /**
+       * @global object $GLOBALS['obj']
+       */
        $GLOBALS['obj'] = CreateObject(sprintf('%s.%s',$app,$class));
+
        $GLOBALS[$class] = $GLOBALS['obj'];
        if ((is_array($GLOBALS[$class]->public_functions) && 
$GLOBALS[$class]->public_functions[$method]) && ! $invalid_data)
        {

====================================================
Index: phpgroupware/anon_wrapper.php
diff -u phpgroupware/anon_wrapper.php:1.6 phpgroupware/anon_wrapper.php:1.7
--- phpgroupware/anon_wrapper.php:1.6   Thu Dec 30 10:46:22 2004
+++ phpgroupware/anon_wrapper.php       Fri Apr 15 13:19:15 2005
@@ -1,21 +1,18 @@
 <?php
-       
/**************************************************************************\
-       * phpGroupWare                                                          
   *
-       * http://www.phpgroupware.org                                           
   *
-       * Written by Dan Kuykendall <address@hidden>                      *
-       * --------------------------------------------                          
   *
-       *  This program is free software; you can redistribute it and/or modify 
it *
-       *  under the terms of the GNU General Public License as published by 
the   *
-       *  Free Software Foundation; either version 2 of the License, or (at 
your  *
-       *  option) any later version.                                           
   *
-       
\**************************************************************************/
-
-       /* $Id$ */
-
-       // TODO:
-       // Limit which users can access this program (ACL check)
-       // Global disabler
-       // Detect bad logins and passwords, spit out generic message
+       /**
+       * phpGroupWare
+       *
+       * phpgroupware base
+       * @author Dan Kuykendall <address@hidden>
+       * @author Joseph Engo <address@hidden>
+       * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
+       * @package phpgroupware
+       * @version $Id$
+       * @todo Limit which users can access this program (ACL check)
+       * @todo Global disabler
+       * @todo Detect bad logins and passwords, spit out generic message
+       */

        // If your are going to use multiable accounts, remove the following 
lines
        $login  = 'anonymous';
@@ -27,7 +24,11 @@
                'currentapp' => 'login',
                'noheader'  => True
        );
-       include('./header.inc.php');
+
+       /**
+       * Include phpgroupware header
+       */
+       include_once('./header.inc.php');

        // If your are going to use multiable accounts, remove the following 
lines
        // You must create the useraccount and check its permissions before use

====================================================
Index: phpgroupware/set_box.php
diff -u phpgroupware/set_box.php:1.5 phpgroupware/set_box.php:1.6
--- phpgroupware/set_box.php:1.5        Thu Dec 30 10:46:22 2004
+++ phpgroupware/set_box.php    Fri Apr 15 13:19:15 2005
@@ -1,23 +1,25 @@
 <?php
-  /**************************************************************************\
-  * phpGroupWare                                                             *
-  * http://www.phpgroupware.org                                              *
-  * The file written by Joseph Engo <address@hidden>                 *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-  /* $Id$ */
+       /**
+       * phpGroupWare
+       *
+       * phpgroupware base
+       * @author Joseph Engo <address@hidden>
+       * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
+       * @package phpgroupware
+       * @version $Id$
+       */

        $GLOBALS['phpgw_info']['flags'] = Array(
                'noheader'      => True,
                'nofooter'      => True,
                'currentapp'    => 'home'
        );
-       include('header.inc.php');
+
+       /**
+       * Include phpgroupware header
+       */
+       include_once('header.inc.php');

 //     if(basename($HTTP_REFERER) != 'home.php')
 //     {
@@ -29,6 +31,16 @@
 //     unset($GLOBALS['phpgw_info']['user']['preferences']['portal_order']);
 //     $GLOBALS['phpgw']->preferences->save_repository();

+
+       /**
+       * Move boxes
+       *
+       * @param integer $curr_position
+       * @param integer $new_order
+       * @param integer $offset
+       * @param integer $value_to_check
+       * @param integer $max_num
+       */
        function 
move_boxes($curr_position,$new_order,$offset,$value_to_check,$max_num)
        {
                
if(isset($GLOBALS['phpgw_info']['user']['preferences']['portal_order'][$new_order]))

====================================================
Index: phpgroupware/about.php
diff -u phpgroupware/about.php:1.25 phpgroupware/about.php:1.26
--- phpgroupware/about.php:1.25 Thu Dec 30 10:46:22 2004
+++ phpgroupware/about.php      Fri Apr 15 13:19:15 2005
@@ -1,30 +1,49 @@
 <?php
-       
/**************************************************************************\
-       * phpGroupWare                                                          
   *
-       * http://www.phpgroupware.org                                           
   *
-       * --------------------------------------------                          
   *
-       *  This program is free software; you can redistribute it and/or modify 
it *
-       *  under the terms of the GNU General Public License as published by 
the   *
-       *  Free Software Foundation; either version 2 of the License, or (at 
your  *
-       *  option) any later version.                                           
   *
-       
\**************************************************************************/
-       /* $Id$ */
+       /**
+       * phpGroupWare
+       *
+       * phpgroupware base
+       * @author Dan Kuykendall <address@hidden>
+       * @author Joseph Engo <address@hidden>
+       * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
+       * @package phpgroupware
+       * @version $Id$
+       */

        $GLOBALS['phpgw_info']['flags']['currentapp'] = 'about';
        $GLOBALS['phpgw_info']['flags']['disable_Template_class'] = True;
        $GLOBALS['phpgw_info']['flags']['noheader'] = True;
-       include('header.inc.php');
+
+       /**
+       * Include phpgroupware header
+       */
+       include_once('header.inc.php');

        $app = $_GET['app'];
        if ($app)
        {
                if (!($included = 
$GLOBALS['phpgw']->hooks->single('about',$app)))
                {
+
+
+                       /**
+                       * About this application
+                       *
+                       * This function will create the string to display when 
the about this
+                       * application function will be called.
+                       * @return string Text which describes this application.
+                       */
                        function about_app()
                        {
                                global $app;
                                $icon = 
$GLOBALS['phpgw']->common->image($app,'navbar');
-                               include (PHPGW_INCLUDE_ROOT . 
"/$app/setup/setup.inc.php");
+
+                               /**
+                               * Include applications setup
+                               */
+                               include(PHPGW_INCLUDE_ROOT . 
"/$app/setup/setup.inc.php");
+
                                $info = $setup_info[$app];
                                $info['title'] = 
$GLOBALS['phpgw_info']['apps'][$app]['title'];
                                $other_infos = array(
@@ -35,7 +54,7 @@
                                );

                                $s = "<table width=\"70%\" cellpadding=\"4\">\n"
-                                       . "<tr><td align=\"right\"><img 
src=\"$icon\"></td>"
+                                       . "<tr><td align=\"right\"><img 
src=\"$icon\" alt=\"\" /></td>"
                                        . "<td 
align=\"left\"><b>$info[title]</b></td></tr>";

                                if ($info['description'])
@@ -45,14 +64,14 @@
                                        if ($info['note'])
                                        {
                                                $info['note'] = 
lang($info['note']);
-                                               $s .= "<tr><td colspan='2' 
align='center'><i>$info[note]</i></td></tr>\n";
+                                               $s .= "<tr><td colspan=\"2\" 
align=\"center\"><i>$info[note]</i></td></tr>\n";
                                        }
                                }
                                foreach ($other_infos as $key => $val)
                                {
                                        if (isset($info[$key]))
                                        {
-                                               $s .= "<tr><td width='50%' 
align='right'>$val</td><td>";
+                                               $s .= "<tr><td width=\"50%\" 
align=\"right\">$val</td><td>";
                                                $infos = $info[$key];
                                                for ($n = 0; 
is_array($info[$key][$n]) && ($infos = $info[$key][$n]) || !$n; ++$n)
                                                {
@@ -62,8 +81,8 @@
                                                        }
                                                        if (is_array($infos))
                                                        {
-                                                               $names = 
explode('<br>',$infos['name']);
-                                                               $emails = 
split('@|<br>',$infos['email']);
+                                                               $names = 
explode('<br />',$infos['name']);
+                                                               $emails = 
split('@|<br />',$infos['email']);
                                                                if 
(count($names) < count($emails)/2)
                                                                {
                                                                        $names 
= '';
@@ -71,13 +90,13 @@
                                                                $infos = '';
                                                                while 
(list($user,$domain) = $emails)
                                                                {
-                                                                       if 
($infos) $infos .= '<br>';
+                                                                       if 
($infos) $infos .= '<br />';
                                                                        $name = 
$names ? array_shift($names) : $user;
-                                                                       $infos 
.= "<a href='mailto:$user at $domain' 
onClick=\"document.location='mailto:$user'+'@'+'$domain'; return 
false;\">$name</a>";
+                                                                       $infos 
.= "<a href=\"mailto:$user at $domain\" 
onClick=\"document.location='mailto:$user'+'@'+'$domain'; return 
false;\">$name</a>";
                                                                        
array_shift($emails); array_shift($emails);
                                                                }
                                                        }
-                                                       $s .= ($n ? '<br>' : 
'') . $infos;
+                                                       $s .= ($n ? '<br />' : 
'') . $infos;
                                                }
                                                $s .= "</td></tr>\n";
                                        }

====================================================
Index: phpgroupware/notify.php
diff -u phpgroupware/notify.php:1.13 phpgroupware/notify.php:1.14
--- phpgroupware/notify.php:1.13        Thu Dec 30 10:46:22 2004
+++ phpgroupware/notify.php     Fri Apr 15 13:19:15 2005
@@ -1,28 +1,31 @@
 <?php
-  /**************************************************************************\
-  * phpGroupWare                                                             *
-  * http://www.phpgroupware.org                                              *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-  /* $Id$ */
+       /**
+       * phpGroupWare
+       *
+       * phpgroupware base
+       * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
+       * @package phpgroupware
+       * @version $Id$
+       */

        $phpgw_info = array();
+
        $GLOBALS['phpgw_info']['flags'] = array(
                'noheader' => True,
                'nonavbar' => True,
                'disable_Template_class' => True,
                'currentapp' => 'notifywindow'
        );
-       include('header.inc.php');
+
+       /**
+       * Include phpgroupware header
+       */
+       include_once('header.inc.php');
 ?>
 <html>
 <head>
-       <meta http-equiv="Refresh" content="300">
+       <meta http-equiv="Refresh" content="300" />
        <title>Notify Window</title>
 </head>
 <body bgcolor="<?php echo $GLOBALS['phpgw_info']['theme']['bg_color']; ?>" 
alink="blue" vlink="blue" link="blue">

====================================================
Index: phpgroupware/login.php
diff -u phpgroupware/login.php:1.102 phpgroupware/login.php:1.103
--- phpgroupware/login.php:1.102        Sat Jan 15 09:55:35 2005
+++ phpgroupware/login.php      Fri Apr 15 13:19:15 2005
@@ -1,19 +1,18 @@
 <?php
-       
/**************************************************************************\
-       * phpGroupWare                                                          
   *
-       * http://www.phpgroupware.org                                           
   *
-       * Written by Dan Kuykendall <address@hidden>                      *
-       *            Joseph Engo    <address@hidden>                       *
-       * --------------------------------------------                          
   *
-       *  This program is free software; you can redistribute it and/or modify 
it *
-       *  under the terms of the GNU General Public License as published by 
the   *
-       *  Free Software Foundation; either version 2 of the License, or (at 
your  *
-       *  option) any later version.                                           
   *
-       
\**************************************************************************/
-
-       /* $Id$ */
+       /**
+       * phpGroupWare
+       *
+       * phpgroupware base
+       * @author Dan Kuykendall <address@hidden>
+       * @author Joseph Engo <address@hidden>
+       * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
+       * @package phpgroupware
+       * @version $Id$
+       */

        $phpgw_info = array();
+
        $GLOBALS['phpgw_info']['flags'] = array(
                'disable_template_class' => True,
                'login'                  => True,
@@ -22,7 +21,12 @@
        );
        if(file_exists('./header.inc.php'))
        {
-               include('./header.inc.php');
+
+               /**
+               * Include phpgroupware header
+               */
+               include_once('header.inc.php');
+
                $GLOBALS['phpgw']->sessions = createObject('phpgwapi.sessions');
        }
        else
@@ -70,48 +74,54 @@
        }
 */

+
+       /**
+       * Check logout error code
+       *
+       * @param integer $code Error code
+       * @return string Error message
+       */
        function check_logoutcode($code)
        {
                switch($code)
                {
                        case 1:
                                return lang('You have been successfully logged 
out');
-                               break;
                        case 2:
                                return lang('Sorry, your login has expired');
-                               break;
                        case 5:
                                return lang('Bad login or password');
-                               break;
                        case 99:
                                return lang('Blocked, too many attempts');
-                               break;
                        case 10:
                                
$GLOBALS['phpgw']->sessions->phpgw_setcookie('sessionid');
                                
$GLOBALS['phpgw']->sessions->phpgw_setcookie('kp3');
                                
$GLOBALS['phpgw']->sessions->phpgw_setcookie('domain');

-                               //fix for bug php4 expired sessions bug
+                               // fix for bug php4 expired sessions bug
                                
if($GLOBALS['phpgw_info']['server']['sessions_type'] == 'php4')
                                {
                                        
$GLOBALS['phpgw']->sessions->phpgw_setcookie(PHPGW_PHPSESSID);
                                }

                                return lang('Your session could not be 
verified.');
-                               break;
                        default:
                                return '&nbsp;';
                }
        }

+
+       /**
+       * Check languages
+       */
        function check_langs()
        {
-               //echo "<h1>check_langs()</h1>\n";
+               // echo "<h1>check_langs()</h1>\n";
                if ($GLOBALS['phpgw_info']['server']['lang_ctimes'] && 
!is_array($GLOBALS['phpgw_info']['server']['lang_ctimes']))
                {
                        $GLOBALS['phpgw_info']['server']['lang_ctimes'] = 
unserialize($GLOBALS['phpgw_info']['server']['lang_ctimes']);
                }
-               //_debug_array($GLOBALS['phpgw_info']['server']['lang_ctimes']);
+               // 
_debug_array($GLOBALS['phpgw_info']['server']['lang_ctimes']);

                $lang = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'];
                $apps = $GLOBALS['phpgw_info']['user']['apps'];
@@ -135,6 +145,10 @@
                }
        }

+
+       /**
+       * Update languages
+       */
        function update_langs()
        {
                $GLOBALS['phpgw_setup'] = CreateObject('phpgwapi.setup');
@@ -151,6 +165,9 @@
                $_POST['upgrademethod'] = 'dumpold';
                $included = 'from_login';

+               /**
+               * Include languages setup
+               */
                include(PHPGW_SERVER_ROOT . '/setup/lang.php');
        }


====================================================
Index: phpgroupware/logout.php
diff -u phpgroupware/logout.php:1.28 phpgroupware/logout.php:1.29
--- phpgroupware/logout.php:1.28        Thu Dec 30 10:46:22 2004
+++ phpgroupware/logout.php     Fri Apr 15 13:19:15 2005
@@ -1,18 +1,17 @@
 <?php
-       
/**************************************************************************\
-       * phpGroupWare                                                          
   *
-       * http://www.phpgroupware.org                                           
   *
-       * Written by Joseph Engo <address@hidden>                          *
-       * --------------------------------------------                          
   *
-       *  This program is free software; you can redistribute it and/or modify 
it *
-       *  under the terms of the GNU General Public License as published by 
the   *
-       *  Free Software Foundation; either version 2 of the License, or (at 
your  *
-       *  option) any later version.                                           
   *
-       
\**************************************************************************/
-
-       /* $Id$ */
+       /**
+       * phpGroupWare
+       *
+       * phpgroupware base
+       * @author Joseph Engo <address@hidden>
+       * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
+       * @package phpgroupware
+       * @version $Id$
+       */

        $GLOBALS['phpgw_info']        = array();
+
        $GLOBALS['phpgw_info']['flags'] = array(
                'disable_template_class' => True,
                'currentapp'             => 'logout',
@@ -21,7 +20,10 @@
                'nonavbar'               => True
        );

-       include('./header.inc.php');
+       /**
+       * Include phpgroupware header
+       */
+       include_once('header.inc.php');

        $GLOBALS['sessionid'] = get_var('sessionid',array('GET','COOKIE'));
        $GLOBALS['kp3']       = get_var('kp3',array('GET','COOKIE'));

====================================================
Index: phpgroupware/header.inc.php.template
diff -u phpgroupware/header.inc.php.template:1.47 
phpgroupware/header.inc.php.template:1.48
--- phpgroupware/header.inc.php.template:1.47   Mon Jan  3 22:06:56 2005
+++ phpgroupware/header.inc.php.template        Fri Apr 15 13:19:15 2005
@@ -1,116 +1,191 @@
 <?php
-       
/**************************************************************************\
-       * phpGroupWare                                                          
   *
-       * http://www.phpgroupware.org                                           
   *
-       * This file written by Dan Kuykendall <address@hidden>            *
-       * --------------------------------------------                          
   *
-       *  This program is free software; you can redistribute it and/or modify 
it *
-       *  under the terms of the GNU General Public License as published by 
the   *
-       *  Free Software Foundation; either version 2 of the License, or (at 
your  *
-       *  option) any later version.                                           
   *
-       
\**************************************************************************/
-       /* $Id$ */
-
-       
/**************************************************************************\
-       * !!!!!!! EDIT THESE LINES !!!!!!!!                                     
   *
-       * This setting allows you to easily move the include directory and the  
   *
-       * base of the phpGroupWare install. Simple edit the following 2 lines 
with *
-       * the absolute path to fit your site, and you should be up and running. 
   *
-       
\**************************************************************************/
+       /**
+       * phpGroupWare
+       *
+       * phpgroupware header
+       * @author Dan Kuykendall <address@hidden>
+       * @author Joseph Engo <address@hidden>
+       * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
+       * @package phpgroupware
+       * @version $Id$
+       */
+

+       // 
**************************************************************************
+       // !!!!!!! EDIT THESE LINES !!!!!!!!
+       // This setting allows you to easily move the include directory and the
+       // base of the phpGroupWare install. Simple edit the following 2 lines 
with
+       // the absolute path to fit your site, and you should be up and running.
+       // 
**************************************************************************
+
+       /**
+       * Server root directory
+       */
        define('PHPGW_SERVER_ROOT','{SERVER_ROOT}');
+
+       /**
+       * Include root directory
+       */
        define('PHPGW_INCLUDE_ROOT','{INCLUDE_ROOT}');
+
+       /**
+       * @global string 
$GLOBALS['phpgw_info']['server']['header_admin_password'] Setup administrator 
password
+       */
        $GLOBALS['phpgw_info']['server']['header_admin_password'] = 
'{HEADER_ADMIN_PASSWORD}';

-       /* phpGroupWare domain-specific db settings */{domains}
-       /*
-       ** If you want to have your domains in a select box, change to True
-       ** If not, users will have to login as address@hidden
-       ** Note: This is only for virtual domain support, default domain users 
can login only using
-       ** there loginid.
+       // phpGroupWare domain-specific db settings
+       {domains}
+
+       /**
+       * @global boolean 
$GLOBALS['phpgw_info']['server']['show_domain_selectbox']
+       * If you want to have your domains in a select box, change to True
+       * If not, users will have to login as address@hidden
+       * Note: This is only for virtual domain support, default domain users 
can login only using
+       * there login id.
        */
        $GLOBALS['phpgw_info']['server']['show_domain_selectbox'] = 
{DOMAIN_SELECTBOX};

-       /*
-       ** As an alternative to the domain select box, set this option to True
-       ** to use the domain name from the browser provided hostname 
($_SERVER['HTTP_HOST'])
+       /**
+       * @global $GLOBALS['phpgw_info']['server']['domain_from_host']
+       * As an alternative to the domain select box, set this option to True
+       * to use the domain name from the browser provided hostname 
($_SERVER['HTTP_HOST'])
        */
        $GLOBALS['phpgw_info']['server']['domain_from_host'] = 
{DOMAIN_FROM_HOST};

+       /**
+       * @global boolean $GLOBALS['phpgw_info']['server']['db_persistent']
+       * Use persistent database connection
+       */
        $GLOBALS['phpgw_info']['server']['db_persistent'] = {DB_PERSISTENT};

-       /*
-       ** phpGroupWare can handle session management using the database, but if
-       ** you are using PHP4 you can usually get better performance by having 
phpGroupWare
-       ** use the session support built into PHP4. PHP3 users will have to use 
the database.
-       ** Your choices are 'db' or 'php4'
+       /**
+       * @global string $GLOBALS['phpgw_info']['server']['sessions_type']
+       * phpGroupWare can handle session management using the database, but if
+       * you are using PHP4+ you can usually get better performance by having 
phpGroupWare
+       * use the session support built into PHP4. PHP3 users will have to use 
the database.
+       * Your choices are 'db' or 'php4'
        */
        $GLOBALS['phpgw_info']['server']['sessions_type'] = '{SESSIONS_TYPE}';

-       /* Select which login template set you want, most people will use 
simple */
+       /**
+       * @global string $GLOBALS['phpgw_info']['login_template_set']
+       * Select which login template set you want, most people will use 
'simple'
+       */
        $GLOBALS['phpgw_info']['login_template_set'] = 'simple';

-       /* This is used to control mcrypt's use */
+       /**
+       * @global boolean $GLOBALS['phpgw_info']['server']['mcrypt_enabled']
+       * This is used to control mcrypt's use
+       */
        $GLOBALS['phpgw_info']['server']['mcrypt_enabled'] = {ENABLE_MCRYPT};
-       /* Set this to 'old' for versions < 2.4, otherwise the exact mcrypt 
version you use. */
+
+       /**
+       * @global string $GLOBALS['phpgw_info']['server']['versions']['mcrypt']
+       * Set this to 'old' for versions < 2.4, otherwise the exact mcrypt 
version you use.
+       */
        $GLOBALS['phpgw_info']['server']['versions']['mcrypt'] = 
'{MCRYPT_VERSION}';

-       /*
-       ** This is a random string used as the initialization vector for mcrypt
-       ** feel free to change it when setting up phpgroupware on a clean 
database,
-       ** but you must not change it after that point!
-       ** It should be around 30 bytes in length.
+       /**
+       * @global string $GLOBALS['phpgw_info']['server']['mcrypt_iv']
+       * This is a random string used as the initialization vector for mcrypt
+       * feel free to change it when setting up phpgroupware on a clean 
database,
+       * but you must not change it after that point!
+       * It should be around 30 bytes in length.
        */
        $GLOBALS['phpgw_info']['server']['mcrypt_iv'] = '{MCRYPT_IV}';

-       /* If you want phpGroupWare to be cached by proxy servers, uncomment 
the following */
-       /* This is NOT recommended, but phpGroupWare should still work fine. */
+       // If you want phpGroupWare to be cached by proxy servers, uncomment 
the following
+       // This is NOT recommended, but phpGroupWare should still work fine.
        if(!isset($GLOBALS['phpgw_info']['flags']['nocachecontrol']) || 
!$GLOBALS['phpgw_info']['flags']['nocachecontrol'] == True)
        {
                header('Cache-Control: no-cache, must-revalidate');  // HTTP/1.1
                header('Pragma: no-cache');                          // HTTP/1.0
        }

-       /* debugging settings */
+       // debugging settings
        define('DEBUG_APP',  False);
        define('DEBUG_API',  False);
        define('DEBUG_DATATYPES',  True);
        define('DEBUG_LEVEL',  3);
-       define('DEBUG_OUTPUT', 2); /* 1 = screen,  2 = DB (not supported with 
PHP3). For both use 3. */
+       define('DEBUG_OUTPUT', 2); // 1 = screen,  2 = DB (not supported with 
PHP3). For both use 3.
        define('DEBUG_TIMER', False);

+
+       /**
+       * Perf get microtime
+       *
+       * @return float Microseconds
+       */
        function perfgetmicrotime()
        {
                list($usec, $sec) = explode(' ',microtime());
                return ((float)$usec + (float)$sec);
        }

+
        if (DEBUG_TIMER)
        {
                $GLOBALS['debug_timer_start'] = perfgetmicrotime();
        }

-       
/**************************************************************************\
-       * Do not edit these lines                                               
   *
-       
\**************************************************************************/
+       // 
**************************************************************************
+       // Do not edit these lines
+       // 
**************************************************************************
+
+       /**
+       * phpgroupware API include root
+       */
        define('PHPGW_API_INC',PHPGW_INCLUDE_ROOT.'/phpgwapi/inc');
-       include(PHPGW_SERVER_ROOT.'/phpgwapi/setup/setup.inc.php');
+
+       /**
+       * Include API setup
+       */
+       include(PHPGW_SERVER_ROOT . '/phpgwapi/setup/setup.inc.php');
+
+       /**
+       * @global string 
$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']
+       * Installed API version
+       */
        $GLOBALS['phpgw_info']['server']['versions']['phpgwapi'] = 
$setup_info['phpgwapi']['version'];
+
+       /**
+       * @global string 
$GLOBALS['phpgw_info']['server']['versions']['current_header']
+       * Installed header version
+       */
        $GLOBALS['phpgw_info']['server']['versions']['current_header'] = 
$setup_info['phpgwapi']['versions']['current_header'];
+
        unset($setup_info);
+
+       /**
+       * @global string $GLOBALS['phpgw_info']['server']['versions']['header']
+       * Version of this header file
+       */
        $GLOBALS['phpgw_info']['server']['versions']['header'] = '1.24';
-       /* This is a fix for NT */
+
+
+       // This is a fix for NT
        if(!isset($GLOBALS['phpgw_info']['flags']['noapi']) || 
$GLOBALS['phpgw_info']['flags']['noapi'] != True)
        {
+               /**
+               * Include global general functions
+               */
                include(PHPGW_API_INC . '/functions.inc.php');
+
+               /**
+               * Include global XML functions
+               */
                include(PHPGW_API_INC . '/xml_functions.inc.php');
+
+               /**
+               * Include global SOAP functions
+               */
                include(PHPGW_API_INC . '/soap_functions.inc.php');
        }

-       /*
-         Leave off the final php closing tag, some editors will add
-         a \n or space after which will mess up cookies later on
-       */<!-- BEGIN domain -->
+       // Leave off the final php closing tag, some editors will add
+       // a \n or space after which will mess up cookies later on
+<!-- BEGIN domain -->
        $GLOBALS['phpgw_domain']['{DB_DOMAIN}'] = array (
                'db_host' => '{DB_HOST}',
                'db_name' => '{DB_NAME}',

====================================================
Index: phpgroupware/version.inc.php
diff -u phpgroupware/version.inc.php:1.92 phpgroupware/version.inc.php:1.93
--- phpgroupware/version.inc.php:1.92   Thu Dec 30 10:46:22 2004
+++ phpgroupware/version.inc.php        Fri Apr 15 13:19:15 2005
@@ -1,20 +1,16 @@
 <?php
-       
/**************************************************************************\
-       * phpGroupWare                                                          
   *
-       * http://www.phpgroupware.org                                           
   *
-       * Written by Dan Kuykendall <address@hidden>                      *
-       *            Joseph Engo    <address@hidden>                       *
-       * --------------------------------------------                          
   *
-       *  This program is free software; you can redistribute it and/or modify 
it *
-       *  under the terms of the GNU General Public License as published by 
the   *
-       *  Free Software Foundation; either version 2 of the License, or (at 
your  *
-       *  option) any later version.                                           
   *
-       
\**************************************************************************/
-
-       /* $Id$ */
-
-       /*
-        This is here only to aid in the header.inc.php update from .12 and 
earlier.
-        After this you can delete it.
+       /**
+       * phpGroupWare
+       *
+       * phpgroupware base
+       * @author Dan Kuykendall <address@hidden>
+       * @author Joseph Engo <address@hidden>
+       * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
+       * @package phpgroupware
+       * @version $Id$
        */
+
+       // This is here only to aid in the header.inc.php update from .12 and 
earlier.
+       // After this you can delete it.
 ?>

====================================================
Index: phpgroupware/help.php
diff -u phpgroupware/help.php:1.3 phpgroupware/help.php:1.4
--- phpgroupware/help.php:1.3   Mon Dec 23 00:56:48 2002
+++ phpgroupware/help.php       Fri Apr 15 13:19:15 2005
@@ -1,17 +1,19 @@
 <?php
-       
/**************************************************************************\
-       * phpGroupWare - help                                                   
   *
-       * start file for the phpGroupWare help system                           
   *
-       * http://www.phpgroupware.org                                           
   *
-       * Written by Bettina Gille address@hidden                          *
-       * -----------------------------------------------                       
   *
-       *  This program is free software; you can redistribute it and/or modify 
it *
-       *  under the terms of the GNU General Public License as published by 
the   *
-       *  Free Software Foundation; either version 2 of the License, or (at 
your  *
-       *  option) any later version.                                           
   *
-       
\**************************************************************************/
-       /* $Id$ */
-
+       /**
+       * phpGroupWare - Start file for the phpGroupWare help system
+       *
+       * phpgroupware base
+       * @author Bettina Gille address@hidden
+       * @copyright Copyright (C) 2000-2002,2005 Free Software Foundation, 
Inc. http://www.fsf.org/
+       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
+       * @package phpgroupware
+       * @subpackage help
+       * @version $Id$
+       */
+
+       /**
+       * @global array $GLOBALS['phpgw_info']
+       */
        $GLOBALS['phpgw_info'] = array();

        $app = $HTTP_GET_VARS['app'];
@@ -21,12 +23,19 @@
                $app = 'help';
        }

+       /**
+       * @global array $GLOBALS['phpgw_info']['flags']
+       */
        $GLOBALS['phpgw_info']['flags'] = array
        (
                'headonly'              => True,
                'currentapp'    => $app
        );
-       include('header.inc.php');
+
+       /**
+       * Include phpgroupware header
+       */
+       include_once('header.inc.php');

        $GLOBALS['phpgw']->help = CreateObject('phpgwapi.help_helper');


====================================================
Index: phpgroupware/home.php
diff -u phpgroupware/home.php:1.29 phpgroupware/home.php:1.30
--- phpgroupware/home.php:1.29  Thu Dec 30 10:46:22 2004
+++ phpgroupware/home.php       Fri Apr 15 13:19:15 2005
@@ -1,18 +1,20 @@
 <?php
-       
/**************************************************************************\
-       * phpGroupWare                                                          
   *
-       * http://www.phpgroupware.org                                           
   *
-       * The file written by Joseph Engo <address@hidden>                 *
-       * --------------------------------------------                          
   *
-       *  This program is free software; you can redistribute it and/or modify 
it *
-       *  under the terms of the GNU General Public License as published by 
the   *
-       *  Free Software Foundation; either version 2 of the License, or (at 
your  *
-       *  option) any later version.                                           
   *
-       
\**************************************************************************/
-
-       /* $Id$ */
-
+       /**
+       * phpGroupWare
+       *
+       * phpgroupware base
+       * @author Joseph Engo <address@hidden>
+       * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
+       * @package phpgroupware
+       * @version $Id$
+       */
+
+       /**
+       * @global array $phpgw_info
+       */
        $phpgw_info = array();
+
        if (!is_file('header.inc.php'))
        {
                echo '<p style="{text-align: center; font-weight: bold;}"><a 
href="setup/index.php>"';
@@ -36,7 +38,11 @@
                'enable_contacts_class'   => True,
                'enable_nextmatchs_class' => True
        );
-       include('header.inc.php');
+
+       /**
+       * Include phpgroupware header
+       */
+       include_once('header.inc.php');

        // check if forward parameter is set
        if (@$_GET['phpgw_forward'])
@@ -130,7 +136,7 @@
                {
                        $GLOBALS['phpgw']->network->set_addcrlf(False);
                        $lines = 
$GLOBALS['phpgw']->network->gethttpsocketfile('http://www.phpgroupware.org/currentversion');
-                       for ($i=0; $i<count($lines); $i++)
+                       for ($i=0; $i < count($lines); ++$i)
                        {
                                if (ereg('currentversion',$lines[$i]))
                                {
@@ -160,7 +166,7 @@
                                        
if($GLOBALS['phpgw']->common->cmp_version_long($_db_version,$_file_version))
                                        {
                                                $_found = True;
-                                               $_app_string .= '<br>' . 
$_app_title;
+                                               $_app_string .= '<br />' . 
$_app_title;
                                        }
                                        unset($_file_version);
                                        unset($_app_title);
@@ -170,9 +176,9 @@
                        }
                        if($_found)
                        {
-                               echo '<br>' . lang('The following applications 
require upgrades') . ':' . "\n";
+                               echo '<br />' . lang('The following 
applications require upgrades') . ':' . "\n";
                                echo $_app_string . "\n";
-                               echo '<br>' . lang('Please run setup to become 
current') . '.' . "\n";
+                               echo '<br />' . lang('Please run setup to 
become current') . '.' . "\n";
                                unset($_app_string);
                        }
                }
@@ -181,7 +187,7 @@
                $GLOBALS['phpgw_info']['user']['apps']['notifywindow'])
        {
 ?>
-<SCRIPT LANGUAGE="JavaScript" TYPE="text/javascript">
+<script language="JavaScript" type="text/javascript">
        var NotifyWindow;

        function opennotifywindow()
@@ -200,13 +206,12 @@
                        NotifyWindow.opener = window;
                }
        }
-</SCRIPT>
-
+</script>
 <?php
                echo '<a href="javascript:opennotifywindow()">' . lang('Open 
notify window') . '</a>';
        }

-       /* This initializes the users portal_order preference if it does not 
exist. */
+       // This initializes the users portal_order preference if it does not 
exist.
        
if(!is_array($GLOBALS['phpgw_info']['user']['preferences']['portal_order']) && 
$GLOBALS['phpgw_info']['apps'])
        {
                $GLOBALS['phpgw']->preferences->delete('portal_order');

====================================================
Index: phpgroupware/xmlrpc.php
diff -u phpgroupware/xmlrpc.php:1.13 phpgroupware/xmlrpc.php:1.14
--- phpgroupware/xmlrpc.php:1.13        Thu Dec 30 10:46:22 2004
+++ phpgroupware/xmlrpc.php     Fri Apr 15 13:19:15 2005
@@ -1,17 +1,14 @@
 <?php
-       
/**************************************************************************\
-       * phpGroupWare xmlrpc server                                            
   *
-       * http://www.phpgroupware.org                                           
   *
-       * This file written by Joseph Engo <address@hidden>                *
-       * --------------------------------------------                          
   *
-       *  This program is free software; you can redistribute it and/or modify 
it *
-       *  under the terms of the GNU General Public License as published by 
the   *
-       *  Free Software Foundation; either version 2 of the License, or (at 
your  *
-       *  option) any later version.                                           
   *
-       
\**************************************************************************/
-
-       /* $Id$ */
-       /* $Source$ */
+       /**
+       * phpGroupWare
+       *
+       * phpgroupware base
+       * @author Joseph Engo <address@hidden>
+       * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
+       * @package phpgroupware
+       * @version $Id$
+       */

        // NOTE! This file is still in the experimental stages, use at your own 
risk!
        // The only current documentation for it is the code and the comments
@@ -22,12 +19,17 @@
        // (jengo)

        $GLOBALS['phpgw_info'] = array();
+
        $GLOBALS['phpgw_info']['flags'] = array(
                'currentapp'            => 'login',
                'noheader'              => True,
                'disable_Template_class' => True
        );
-       include('header.inc.php');
+
+       /**
+       * Include phpgroupware header
+       */
+       include_once('header.inc.php');

        // If XML-RPC isn't enabled in PHP, return an XML-RPC response stating 
so
        if (! function_exists('xmlrpc_server_create'))
@@ -116,7 +118,7 @@
                }
                else
                {
-                       // Session is invailed
+                       // Session is invalied
                        xmlrpc_error(1001,'Session expired');
                }
        }
@@ -148,8 +150,18 @@
                }
        }

-       // When PHP returns an error, return that error with a fault instead of
-       // HTML with will make most parsers fall apart
+
+       /**
+       * XMLRPC custom error
+       *
+       * When PHP returns an error, return that error with a fault instead of
+       * HTML with will make most parsers fall apart
+       * @param integer $error_number
+       * @param string $error_string
+       * @param string $filename
+       * @param integer $line
+       * @param array $vars
+       */
        function xmlrpc_custom_error($error_number, $error_string, $filename, 
$line, $vars)
        {
                if (error_reporting() & $error_number)
@@ -160,9 +172,13 @@
                }
        }

-       // This will create an XML-RPC error
-       // FIXME!  This needs to be expanded to handle PHP errors themselfs
-       //         it will make debugging easier
+       /**
+       * Create an XML-RPC error
+       *
+       * @param integer $error_number
+       * @param string $error_string
+       * @todo FIXME! This needs to be expanded to handle PHP errors themselfs 
it will make debugging easier
+       */
        function xmlrpc_error($error_number, $error_string)
        {
                $values = array(
@@ -176,7 +192,12 @@
                exit;
        }

-       // This will dynamicly create the avaiable methods for each class
+       /**
+       * Dynamicly create the avaiable methods for each class
+       *
+       * @param string $method
+       * @return array Method names
+       */
        function xmlrpc_list_methods($method)
        {
                list($app,$class,$func) = explode('.',$method);
@@ -192,6 +213,12 @@
                return $methods;
        }

+       /**
+       * Get XMLRPC methods
+       *
+       * @param string $method
+       * @return array
+       */
        function xmlrpc_describe_methods($method)
        {
                list($app,$class,$func) = explode('.',$method);
@@ -211,6 +238,14 @@
        // and kp3 instead of using HTTP_AUTH features.
        // Would be a nice workaround for librarys that don't support it, as its
        // not in the XML-RPC spec.
+
+       /**
+       * XMLRPC call wrapper
+       *
+       * @param string $method_name
+       * @param array $parameters
+       * @return unknown
+       */
        function xmlrpc_call_wrapper($method_name, $parameters)
        {
                $a = explode('.',$method_name);
@@ -244,6 +279,14 @@
        }

        // The following are common functions used ONLY by XML-RPC
+
+
+       /**
+       * XMLRPC login
+       *
+       * @param string $method_name
+       * @param array $parameters
+       */
        function xmlrpc_login($method_name, $parameters)
        {
                $p = $parameters[0];
@@ -275,6 +318,13 @@
                }
        }

+       /**
+       * XMLRPC logout
+       *
+       * @param string $method
+       * @param array $parameters
+       * @return boolean Always true
+       */
        function xmlrpc_logout($method, $parameters)
        {
                // We have already verified the session upon before this method 
is even created
@@ -284,5 +334,3 @@

                return True;
        }
-
-

====================================================
Index: phpgroupware/redirect.php
diff -u phpgroupware/redirect.php:1.2 phpgroupware/redirect.php:1.3
--- phpgroupware/redirect.php:1.2       Thu Dec 30 10:46:22 2004
+++ phpgroupware/redirect.php   Fri Apr 15 13:19:15 2005
@@ -1,19 +1,16 @@
 <?php
-       
/**************************************************************************\
-       * phpGroupWare - Session safe redirect                                  
   *
-       * http://www.phpgroupware.org                                           
   *
-       * Idea by: Jason Wies <address@hidden>                                  
     *
-       * Poor implementation by: Lars Kneschke <address@hidden>       *
-       * Proper Implementation by: Dave Hall skwashd at phpgroupware.org       
   *
-       * Copyright (c) 2004 Free Software Foundation Inc - http://www.fsf.org/ 
   *
-       * --------------------------------------------                          
   *
-       *  This program is free software; you can redistribute it and/or modify 
it *
-       *  under the terms of the GNU General Public License as published by 
the   *
-       *  Free Software Foundation; either version 2 of the License, or (at 
your  *
-       *  option) any later version.                                           
   *
-       
\**************************************************************************/
-
-       /* $Id$ */
+       /**
+       * phpGroupWare - Session safe redirect
+       *
+       * phpgroupware base
+       * @internal Idea by Jason Wies <address@hidden>
+       * @author Lars Kneschke <address@hidden>
+       * @author Dave Hall <address@hidden>
+       * @copyright Copyright (C) 2004-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
+       * @package phpgroupware
+       * @version $Id$
+       */

        //Get the session variables set for non cookie based sessions
        if (! (@isset($_COOKIES['PHPSESSID']) || @isset($_COOKIES['sessionid']) 
) )
@@ -37,7 +34,10 @@
                                        'nofooter'      => True
                                        );

-       require_once('./header.inc.php');
+       /**
+       * Include phpgroupware header
+       */
+       include_once('header.inc.php');

        if( @isset($_GET['go']) )
        {
@@ -47,7 +47,7 @@
                        <p><?php lang('lang you are about to visit an external 
site'); ?><br />
                        <?php lang('vist:'); ?> <a href="<?php echo 
$_GET['go']; ?>"
                                target="_blank"><?php echo $_GET['go']; 
?></a></p>
-                       <script>window.location='<?php echo$_GET['go']; 
?>';</script>
+                       <script language="JavaScript" 
type="text/javascript">window.location='<?php echo$_GET['go']; ?>';</script>
                <?php
                exit;
        }

====================================================
Index: phpgroupware/notify_simple.php
diff -u phpgroupware/notify_simple.php:1.4 phpgroupware/notify_simple.php:1.5
--- phpgroupware/notify_simple.php:1.4  Thu Dec 30 10:46:22 2004
+++ phpgroupware/notify_simple.php      Fri Apr 15 13:19:15 2005
@@ -1,24 +1,27 @@
 <?php
-  /**************************************************************************\
-  * phpGroupWare                                                             *
-  * http://www.phpgroupware.org                                              *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-  /* $Id$ */
+       /**
+       * phpGroupWare
+       *
+       * phpgroupware base
+       * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
+       * @package phpgroupware
+       * @version $Id$
+       */

        $phpgw_info = array();
+
        $GLOBALS['phpgw_info']['flags'] = array(
                'noheader' => True,
                'nonavbar' => True,
                'disable_Template_class' => True,
                'currentapp' => 'notifywindow'
        );
-       include('./header.inc.php');
+
+       /**
+       * Include phpgroupware header
+       */
+       include_once('header.inc.php');

        echo '<html><body>';
        $GLOBALS['phpgw']->hooks->process('notifywindow_simple',array('email'));






reply via email to

[Prev in Thread] Current Thread [Next in Thread]