[Phpgroupware-cvs] CVS: sitemgr/inc class.module_galerie.inc.php,1.2,1.3 class.module_login.inc.php,1.1,1.2class.module_sitetree.inc.php,1.2,1.3

[Michael Totschnig <address@hidden>]

Update of /cvsroot/phpgroupware/sitemgr/inc
In directory subversions:/tmp/cvs-serv11440

Modified Files:
        class.module_galerie.inc.php class.module_login.inc.php 
        class.module_sitetree.inc.php 
Log Message:
galerie: spurious third argument to browser_transform
login: make link to registration conditional on contributor specified argument
sitetree: confused app_name and module_name


Index: class.module_galerie.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.module_galerie.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.module_galerie.inc.php        19 Jan 2003 03:18:28 -0000      1.2
--- class.module_galerie.inc.php        24 Jan 2003 04:58:10 -0000      1.3
***************
*** 116,120 ****
                                '';
                        require_once(PHPGW_INCLUDE_ROOT . SEP . 'sitemgr' . SEP 
. 'inc' . SEP . 'class.browser_transform.inc.php');
!                       $this->add_transformer(new 
browser_transform($prevlink,$nextlink,$this->block->app_name));
                }
        }
--- 116,120 ----
                                '';
                        require_once(PHPGW_INCLUDE_ROOT . SEP . 'sitemgr' . SEP 
. 'inc' . SEP . 'class.browser_transform.inc.php');
!                       $this->add_transformer(new 
browser_transform($prevlink,$nextlink));
                }
        }

Index: class.module_login.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.module_login.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.module_login.inc.php  17 Jan 2003 03:37:52 -0000      1.1
--- class.module_login.inc.php  24 Jan 2003 04:58:10 -0000      1.2
***************
*** 5,12 ****
        function module_login()
        {
!               $this->arguments = array();
                $this->properties = array();
                $this->title = "Login";
!               $this->description = "This block displays a login form";
        }
  
--- 5,17 ----
        function module_login()
        {
!               $this->arguments = array(
!                       'registration' => array(
!                               'type' => 'checkbox',
!                               'label' => 'Display link to autoregistration 
below login form?'
!                       )
!               );
                $this->properties = array();
                $this->title = "Login";
!               $this->description = "This module displays a login form";
        }
  
***************
*** 22,29 ****
                $content .= '<input type="submit" value="' . lang('Login') .'" 
name="submitit">';
                $content .= '</font></center></form>';
!               $content .= '<center><font class="content">' . lang("Don't have 
an account?") .'  ';
!               $content .= '<a 
href="'.phpgw_link('/registration/index.php').'">';
!               $content .= lang('Register for one now.') . 
'</a></font></center>';
! 
                return $content;
        }
--- 27,36 ----
                $content .= '<input type="submit" value="' . lang('Login') .'" 
name="submitit">';
                $content .= '</font></center></form>';
!               if ($arguments['registration'])
!               {
!                       $content .= '<center><font class="content">' . 
lang("Don't have an account?") .'  ';
!                       $content .= '<a 
href="'.phpgw_link('/registration/index.php').'">';
!                       $content .= lang('Register for one now.') . 
'</a></font></center>';
!               }
                return $content;
        }

Index: class.module_sitetree.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.module_sitetree.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.module_sitetree.inc.php       19 Jan 2003 03:18:28 -0000      1.2
--- class.module_sitetree.inc.php       24 Jan 2003 04:58:10 -0000      1.3
***************
*** 69,72 ****
--- 69,73 ----
        function get_content(&$arguments,$properties)
        {
+ print_r($this->block);
                $title = '';
                if ($arguments['menutree'])
***************
*** 85,89 ****
  function add(catid)
  {
!       document.cookie = '".$this->block->app_name."[menutree][' + catid + 
']=';
  }
  
--- 86,90 ----
  function add(catid)
  {
!       document.cookie = '".$this->block->module_name."[menutree][' + catid + 
']=';
  }
  
***************
*** 91,95 ****
  {
        var now = new Date();
!       document.cookie = '".$this->block->app_name."[menutree][' + catid + 
']=; expires=' + now.toGMTString();
  }
  
--- 92,96 ----
  {
        var now = new Date();
!       document.cookie = '".$this->block->module_name."[menutree][' + catid + 
']=; expires=' + now.toGMTString();
  }