[Phpgroupware-cvs] admin navbar-create.php, 1.10 class.admin.php, 1.3 acl2_tester.php, 1.3 navbar-sel.php, 1.4 phpinfo.php, 1.7 testbutton.php, 1.6 class.base.php, 1.2 index.php, 1.38

[powerstat]

Update of admin

Modified Files:
     Branch: MAIN
            navbar-create.php lines: +14 -0
            class.admin.php lines: +14 -12
            acl2_tester.php lines: +24 -3
            navbar-sel.php lines: +18 -12
            phpinfo.php lines: +12 -11
            testbutton.php lines: +11 -10
            class.base.php lines: +14 -12
            index.php lines: +15 -14

Log Message:
Added phpdocs

====================================================
Index: admin/navbar-create.php
diff -u admin/navbar-create.php:1.9 admin/navbar-create.php:1.10
--- admin/navbar-create.php:1.9 Thu Dec 30 07:38:14 2004
+++ admin/navbar-create.php     Wed May 11 06:59:37 2005
@@ -1,7 +1,21 @@
 <?php
+       /**
+       * Administration
+       *
+       * @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 admin
+       * @version $Id$
+       */
+
   $phpgw_info = array();
   $phpgw_info["flags"]["currentapp"] = "admin";
   $phpgw_info["server"]["site_title"] = "Create a selected navbar image";
+
+
+  /**
+  * Include phpgroupware header
+  */
   include("../header.inc.php");
 ?>


====================================================
Index: admin/class.admin.php
diff -u admin/class.admin.php:1.2 admin/class.admin.php:1.3
--- admin/class.admin.php:1.2   Mon Apr 18 07:34:47 2005
+++ admin/class.admin.php       Wed May 11 06:59:37 2005
@@ -1,18 +1,20 @@
 <?php
-       
/**************************************************************************\
-       * phpGroupWare                                                          
   *
-       * http://www.phpgroupware.org                                           
   *
-       * This file written by Dan Kuykendall <address@hidden>                 *
-       * Copyright (C) 2003 Dan Kuykendall                                     
   *
-       * 
-------------------------------------------------------------------------*
-  * 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.                                               *
-       
\**************************************************************************/
+       /**
+       * Administration
+       *
+       * @author Dan Kuykendall <address@hidden>
+       * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
+       * @package admin
+       * @version $Id$
+       */

-       /* $Id$ */

+       /**
+       * Administration
+       *
+       * @package admin
+       */
        class admin_admin
        {
                function adduser ()

====================================================
Index: admin/acl2_tester.php
diff -u admin/acl2_tester.php:1.2 admin/acl2_tester.php:1.3
--- admin/acl2_tester.php:1.2   Mon Jan 13 11:29:41 2003
+++ admin/acl2_tester.php       Wed May 11 06:59:37 2005
@@ -1,13 +1,34 @@
 <?php
+       /**
+       * Admin
+       *
+       * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
+       * @package admin
+       * @version $Id$
+       */
+
        $GLOBALS['phpgw_info']['flags']['currentapp'] = 'admin';
+
+       /**
+       * Include phpgroupware header
+       */
        include('../header.inc.php');
+
+       /**
+       * Include API acl2 class
+       */
        include(PHPGW_API_INC . '/class.acl2.inc.php');
+
+
        //$sec = New acl(array('account_id'=>1));
        $sec = New acl2(1,'##DEFAULT##');
-//echo 'phpgw:<pre>'; print_r($GLOBALS['phpgw']); echo '</pre>';
+    //echo 'phpgw:<pre>'; print_r($GLOBALS['phpgw']); echo '</pre>';
        $sec->get_memberships();
-//echo 'memberships_sql: '.$sec->memberships_sql.'<br>';
-//echo 'memberships:<pre>'; print_r($sec->memberships); echo '</pre>';
+    //echo 'memberships_sql: '.$sec->memberships_sql.'<br>';
+    //echo 'memberships:<pre>'; print_r($sec->memberships); echo '</pre>';
+
+
        function ttt($location, $rights)
        {
                GLOBAL $sec;

====================================================
Index: admin/navbar-sel.php
diff -u admin/navbar-sel.php:1.3 admin/navbar-sel.php:1.4
--- admin/navbar-sel.php:1.3    Thu Dec 30 07:38:14 2004
+++ admin/navbar-sel.php        Wed May 11 06:59:37 2005
@@ -1,17 +1,23 @@
 <?php
-//
-// SourceForge Knowledge Base Module v.1.0.0
-//
-// Created by Patrick Walsh (address@hidden) 6/00
-// Copyright (c) ... aw, hell, copy all the code you want
-//
-// $Id$
-
-/*
-       This code was adapted from Rasmus Lerdorf's article on PHPBuilder
-       http://www.phpbuilder.com/columns/rasmus19990124.php3
+       /**
+       * Administration
+       *
+       * SourceForge Knowledge Base Module v.1.0.0
+       * @author Patrick Walsh <address@hidden>
+       * @copyright Copyright (C) xxxx Patrick Walsh
+       * @copyright Copyright (C) 2005 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
+       * @package admin
+       * @version $Id$
+       * @internal This code was adapted from Rasmus Lerdorf's article on 
PHPBuilder http://www.phpbuilder.com/columns/rasmus19990124.php3
+       */
+
+/**
+* Open gif file
+*
+* @param string $filename Filename of gif file
+* @return object Image
 */
-
 function openGif($filename) {

        if (!$filename) { $filename = "navbar.gif"; }

====================================================
Index: admin/phpinfo.php
diff -u admin/phpinfo.php:1.6 admin/phpinfo.php:1.7
--- admin/phpinfo.php:1.6       Thu Dec 30 07:38:14 2004
+++ admin/phpinfo.php   Wed May 11 06:59:37 2005
@@ -1,21 +1,22 @@
 <?php
-       
/**************************************************************************\
-       * phpGroupWare - administration                                         
   *
-       * 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$ */
+       /**
+       * Administration
+       *
+       * @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 admin
+       * @version $Id$
+       */

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

        if ($GLOBALS['phpgw']->acl->check('info_access',1,'admin'))

====================================================
Index: admin/testbutton.php
diff -u admin/testbutton.php:1.5 admin/testbutton.php:1.6
--- admin/testbutton.php:1.5    Thu Dec 30 07:38:14 2004
+++ admin/testbutton.php        Wed May 11 06:59:37 2005
@@ -1,19 +1,20 @@
 <?php
-  /**************************************************************************\
-  * phpGroupWare - administration                                            *
-  * 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$ */
+       /**
+       * Administration
+       *
+       * @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 admin
+       * @version $Id$
+       */

        $phpgw_info["flags"] = array(
                "currentapp" => "admin"
        );

+       /**
+       * Include phpgroupware header
+       */
        include("../header.inc.php");

        $button = CreateObject('phpgwapi.graphics');

====================================================
Index: admin/class.base.php
diff -u admin/class.base.php:1.1 admin/class.base.php:1.2
--- admin/class.base.php:1.1    Thu Oct 23 07:27:18 2003
+++ admin/class.base.php        Wed May 11 06:59:37 2005
@@ -1,18 +1,20 @@
 <?php
-       
/**************************************************************************\
-       * phpGroupWare                                                          
   *
-       * http://www.phpgroupware.org                                           
   *
-       * This file written by Dan Kuykendall <address@hidden>                 *
-       * Copyright (C) 2003 Dan Kuykendall                                     
   *
-       * 
-------------------------------------------------------------------------*
-  * 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.                                               *
-       
\**************************************************************************/
+       /**
+       * Administration
+       *
+       * @author Dan Kuykendall <address@hidden>
+       * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
+       * @package admin
+       * @version $Id$
+       */

-       /* $Id$ */

+       /**
+       * Administration
+       *
+       * @package admin
+       */
        class admin_base
        {
                var $sec;

====================================================
Index: admin/index.php
diff -u admin/index.php:1.37 admin/index.php:1.38
--- admin/index.php:1.37        Thu Dec 30 07:38:14 2004
+++ admin/index.php     Wed May 11 06:59:37 2005
@@ -1,21 +1,22 @@
 <?php
-       
/**************************************************************************\
-       * phpGroupWare - administration                                         
   *
-       * http://www.phpgroupware.org                                           
   *
-       * Written by Joseph Engo <address@hidden>                          *
-       * Modified by Stephen Brown <address@hidden>                        *
-       *  to distribute admin across the application directories               
   *
-       * --------------------------------------------                          
   *
-       *  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$ */
+       /**
+       * Administration
+       *
+       * Distribute administration across the applications
+       * @author Joseph Engo <address@hidden>
+       * @author Stephen Brown <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 admin
+       * @version $Id$
+       */

        $GLOBALS['phpgw_info'] = array();
        $GLOBALS['phpgw_info']['flags']['currentapp'] = 'admin';
+
+       /**
+       * Include phpgroupware header
+       */
        include('../header.inc.php');

        $GLOBALS['admin_tpl'] = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);