[Phpgroupware-cvs] CVS: wcm/inc class.soelement.inc.php,1.4,1.5 class.sopage.inc.php,1.4,1.5 class.sosite.inc.php,1.3,1.4

[Miles Lott <address@hidden>]

Update of /cvsroot/phpgroupware/wcm/inc
In directory subversions:/tmp/cvs-serv26568

Modified Files:
        class.soelement.inc.php class.sopage.inc.php 
        class.sosite.inc.php 
Log Message:
gettype changes



Index: class.soelement.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.soelement.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.soelement.inc.php     4 Feb 2002 02:08:06 -0000       1.4
--- class.soelement.inc.php     8 Feb 2002 05:45:11 -0000       1.5
***************
*** 26,30 ****
                function list_elements($data='',&$total,$simple=False)
                {
!                       if(gettype($data) == 'array')
                        {
                                if($this->debug) { _debug_array($data); }
--- 26,30 ----
                function list_elements($data='',&$total,$simple=False)
                {
!                       if(is_array($data))
                        {
                                if($this->debug) { _debug_array($data); }
***************
*** 81,85 ****
                                $elementid = $this->elementid;
                        }
!                       if($elementid && gettype($this->element) == 'array')
                        {
                                $sql = "UPDATE $this->table SET "
--- 81,85 ----
                                $elementid = $this->elementid;
                        }
!                       if($elementid && is_array($this->element))
                        {
                                $sql = "UPDATE $this->table SET "
***************
*** 98,102 ****
                function create($element_info='')
                {
!                       if(gettype($element_info) != 'array')
                        {
                                return False;
--- 98,102 ----
                function create($element_info='')
                {
!                       if(!is_array($element_info))
                        {
                                return False;
***************
*** 276,280 ****
                                return False;
                        }
!                       if(gettype($elementdata) == 'integer')
                        {
                                $elementid = $elementdata;
--- 276,280 ----
                                return False;
                        }
!                       if(is_int($elementdata))
                        {
                                $elementid = $elementdata;

Index: class.sopage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.sopage.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.sopage.inc.php        4 Feb 2002 02:32:51 -0000       1.4
--- class.sopage.inc.php        8 Feb 2002 05:45:11 -0000       1.5
***************
*** 78,84 ****
                        {
                                $elements = CreateObject('wcm.soelement');
                                while(list($key,$value) = 
@each($this->page['page_elements']))
                                {
!                                       $new[$key] = 
$elements->read_repository($value);
                                }
                                $this->page['page_elements'] = $new;
--- 78,85 ----
                        {
                                $elements = CreateObject('wcm.soelement');
+                               $new = array();
                                while(list($key,$value) = 
@each($this->page['page_elements']))
                                {
!                                       $new[$key] = 
$elements->read_repository($value,True);
                                }
                                $this->page['page_elements'] = $new;
***************
*** 93,97 ****
                                $pageid = $this->pageid;
                        }
!                       if($pageid && gettype($this->page) == 'array')
                        {
                                $tmp = is_array($this->page['page_elements']) ? 
serialize($this->page['page_elements']) : serialize(array('none'));
--- 94,98 ----
                                $pageid = $this->pageid;
                        }
!                       if($pageid && is_array($this->page))
                        {
                                $tmp = is_array($this->page['page_elements']) ? 
serialize($this->page['page_elements']) : serialize(array('none'));
***************
*** 114,118 ****
                function create($page_info='')
                {
!                       if(gettype($page_info) != 'array')
                        {
                                return False;
--- 115,119 ----
                function create($page_info='')
                {
!                       if(!is_array($page_info))
                        {
                                return False;
***************
*** 284,288 ****
                                return False;
                        }
!                       if(gettype($pagedata) == 'integer')
                        {
                                $pageid = $pagedata;
--- 285,289 ----
                                return False;
                        }
!                       if(is_int($pagedata))
                        {
                                $pageid = $pagedata;

Index: class.sosite.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.sosite.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.sosite.inc.php        4 Feb 2002 01:42:41 -0000       1.3
--- class.sosite.inc.php        8 Feb 2002 05:45:11 -0000       1.4
***************
*** 86,91 ****
--- 86,94 ----
                                $pages = CreateObject('wcm.sopage');
                                @reset($this->site['site_pages']);
+                               //_debug_array($this->site['site_pages']);
+                               $new = array();
                                while(list($key,$value) = 
@each($this->site['site_pages']))
                                {
+                                       echo '<br>reading page: ' . $value;
                                        $new[$key] = 
$pages->read_repository($value,True);
                                }