[Phpgroupware-cvs] CVS: sitemgr/inc class.module.inc.php,1.2,1.3 class.module_appdir.inc.php,1.3,1.4class.module_calendar.inc.php,1.2,1.3 class.module_forum.inc.php,1.3,1.4class.module_galerie.inc.php,1.1,1.2 class.module_hello.inc.php,1.1,1.2class.module_redirect.inc.php,1.1,1.2 class.module_sitetree.inc.php,1.1,1.2class.module_xml.inc.php,1.1,1.2

[Michael Totschnig <address@hidden>]

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

Modified Files:
        class.module.inc.php class.module_appdir.inc.php 
        class.module_calendar.inc.php class.module_forum.inc.php 
        class.module_galerie.inc.php class.module_hello.inc.php 
        class.module_redirect.inc.php class.module_sitetree.inc.php 
        class.module_xml.inc.php 
Log Message:
$this->name is not really needed for a module since it can retrieve its name 
from the block


Index: class.module.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.module.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.module.inc.php        19 Jan 2003 01:10:02 -0000      1.2
--- class.module.inc.php        19 Jan 2003 03:18:28 -0000      1.3
***************
*** 52,56 ****
                        if ($this->session)
                        {
!                               $sessionarguments = 
$GLOBALS['phpgw']->session->appsession($this->name,'sitemgr-site');
                                while (list(,$argument) = @each($this->session))
                                {
--- 52,56 ----
                        if ($this->session)
                        {
!                               $sessionarguments = 
$GLOBALS['phpgw']->session->appsession($block->module_name,'sitemgr-site');
                                while (list(,$argument) = @each($this->session))
                                {
***************
*** 63,69 ****
                        while (list(,$argument) = @each($this->get))
                        {
!                               if (isset($_GET[$this->name][$argument]))
                                {
!                                       $block->arguments[$argument] = 
$_GET[$this->name][$argument];
                                }
                        }
--- 63,69 ----
                        while (list(,$argument) = @each($this->get))
                        {
!                               if 
(isset($_GET[$block->module_name][$argument]))
                                {
!                                       $block->arguments[$argument] = 
$_GET[$block->module_name][$argument];
                                }
                        }
***************
*** 72,85 ****
                        while (list($argument,) = @each($this->post))
                        {
!                               if (isset($_POST[$this->name][$argument]))
                                {
!                                       $block->arguments[$argument] = 
$_POST[$this->name][$argument];
                                }
                        }
                        while (list(,$argument) = @each($this->cookie))
                        {
!                               if (isset($_COOKIE[$this->name][$argument]))
                                {
!                                       $block->arguments[$argument] = 
$_COOKIE[$this->name][$argument];
                                }
                        }
--- 72,85 ----
                        while (list($argument,) = @each($this->post))
                        {
!                               if 
(isset($_POST[$block->module_name][$argument]))
                                {
!                                       $block->arguments[$argument] = 
$_POST[$block->module_name][$argument];
                                }
                        }
                        while (list(,$argument) = @each($this->cookie))
                        {
!                               if 
(isset($_COOKIE[$block->module_name][$argument]))
                                {
!                                       $block->arguments[$argument] = 
$_COOKIE[$block->module_name][$argument];
                                }
                        }
***************
*** 92,96 ****
                while (list($key,$value) = @each($modulevars))
                {
!                       $extravars[$this->name.'['.$key.']'] = $value;
                }
                $extravars['page_id'] = $this->block->page_id;
--- 92,96 ----
                while (list($key,$value) = @each($modulevars))
                {
!                       $extravars[$this->block->module_name.'['.$key.']'] = 
$value;
                }
                $extravars['page_id'] = $this->block->page_id;
***************
*** 205,209 ****
        function get_admin_interface()
        {
-               //we set the blockarguments to the properties so that the 
build_input_element function can retrieve the right defaults
                $properties = $this->get_properties(False);
                $elementname = 'element[' .$key . ']';
--- 205,208 ----
***************
*** 223,227 ****
                        $this->post[$key],
                        ($default !== False) ? $default : 
$this->block->arguments[$key],
!                       ($this->name . '[' . $key . ']')
                );
        }
--- 222,226 ----
                        $this->post[$key],
                        ($default !== False) ? $default : 
$this->block->arguments[$key],
!                       ($this->block->module_name . '[' . $key . ']')
                );
        }
***************
*** 310,314 ****
                                        }
                                }
!                               
$GLOBALS['phpgw']->session->appsession($this->name,'sitemgr-site',$sessionarguments);
                        }
                        return $content;
--- 309,313 ----
                                        }
                                }
!                               
$GLOBALS['phpgw']->session->appsession($this->block->module_name,'sitemgr-site',$sessionarguments);
                        }
                        return $content;

Index: class.module_appdir.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.module_appdir.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.module_appdir.inc.php 19 Jan 2003 01:10:02 -0000      1.3
--- class.module_appdir.inc.php 19 Jan 2003 03:18:28 -0000      1.4
***************
*** 9,13 ****
        function module_appdir()
        {
-               $this->name = 'appdir';
                $this->arguments = array();
                $this->title = "An application directory";
--- 9,12 ----

Index: class.module_calendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.module_calendar.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.module_calendar.inc.php       19 Jan 2003 01:10:02 -0000      1.2
--- class.module_calendar.inc.php       19 Jan 2003 03:18:28 -0000      1.3
***************
*** 5,9 ****
      function module_calendar()  
      {
-               $this->name = 'calendar';
          $this->arguments = array();
                $this->session = array('timestamp');
--- 5,8 ----

Index: class.module_forum.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.module_forum.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.module_forum.inc.php  19 Jan 2003 01:10:02 -0000      1.3
--- class.module_forum.inc.php  19 Jan 2003 03:18:28 -0000      1.4
***************
*** 8,12 ****
        function module_forum()
        {
-               $this->name = "forum";
                $this->arguments = array(
                        'startlevel' => array(
--- 8,11 ----

Index: class.module_galerie.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.module_galerie.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.module_galerie.inc.php        17 Jan 2003 03:37:52 -0000      1.1
--- class.module_galerie.inc.php        19 Jan 2003 03:18:28 -0000      1.2
***************
*** 5,9 ****
        function module_galerie()
        {
-               $this->name = 'galerie';
                $this->arguments = array(
                        'imagedirurl' => array(
--- 5,8 ----
***************
*** 117,121 ****
                                '';
                        require_once(PHPGW_INCLUDE_ROOT . SEP . 'sitemgr' . SEP 
. 'inc' . SEP . 'class.browser_transform.inc.php');
!                       $this->add_transformer(new 
browser_transform($prevlink,$nextlink,$this->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,$this->block->app_name));
                }
        }

Index: class.module_hello.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.module_hello.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.module_hello.inc.php  17 Jan 2003 03:37:52 -0000      1.1
--- class.module_hello.inc.php  19 Jan 2003 03:18:28 -0000      1.2
***************
*** 5,9 ****
        function module_hello()
        {
-               $this->name = "hello";
                $this->arguments = array(
                        'name' => array(
--- 5,8 ----

Index: class.module_redirect.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.module_redirect.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.module_redirect.inc.php       18 Jan 2003 04:30:34 -0000      1.1
--- class.module_redirect.inc.php       19 Jan 2003 03:18:28 -0000      1.2
***************
*** 5,9 ****
        function module_redirect()
        {
-               $this->name = "redirect";
                $this->arguments = array(
                        'URL' => array(
--- 5,8 ----

Index: class.module_sitetree.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.module_sitetree.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.module_sitetree.inc.php       17 Jan 2003 03:37:52 -0000      1.1
--- class.module_sitetree.inc.php       19 Jan 2003 03:18:28 -0000      1.2
***************
*** 5,9 ****
        function module_sitetree()
        {
-               $this->name = "sitetree";
                $this->arguments = array();
                $this->properties = array();
--- 5,8 ----
***************
*** 86,90 ****
  function add(catid)
  {
!       document.cookie = '".$this->name."[menutree][' + catid + ']=';
  }
  
--- 85,89 ----
  function add(catid)
  {
!       document.cookie = '".$this->block->app_name."[menutree][' + catid + 
']=';
  }
  
***************
*** 92,96 ****
  {
        var now = new Date();
!       document.cookie = '".$this->name."[menutree][' + catid + ']=; expires=' 
+ now.toGMTString();
  }
  
--- 91,95 ----
  {
        var now = new Date();
!       document.cookie = '".$this->block->app_name."[menutree][' + catid + 
']=; expires=' + now.toGMTString();
  }
  

Index: class.module_xml.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.module_xml.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.module_xml.inc.php    17 Jan 2003 03:37:52 -0000      1.1
--- class.module_xml.inc.php    19 Jan 2003 03:18:28 -0000      1.2
***************
*** 8,12 ****
        function module_xml()
        {
-               $this->name = 'xml';
                $this->arguments = array(
                        'dirpath' => array('type' => 'textfield', 'label' => 
'Filesystem path of the directory where XML files are stored'),
--- 8,11 ----
***************
*** 71,75 ****
                                '';
                        require_once(PHPGW_INCLUDE_ROOT . SEP . 'sitemgr' . SEP 
. 'inc' . SEP . 'class.browser_transform.inc.php');
!                       $this->add_transformer(new 
browser_transform($prevlink,$nextlink,$this->name));
                }
        }
--- 70,74 ----
                                '';
                        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->module_name));
                }
        }