[Phpgroupware-cvs] CVS: sitemgr/inc class.Admin_ManageCategories_UI.inc.php,1.1.1.1,1.2 class.Categories_BO.inc.php,1.1.1.1,1.2 class.Categories_SO.inc.php,1.1.1.1,1.2 class.Category_SO.inc.php,1.1.1.1,1.2 class.Page_SO.inc.php,1.1.1.1,1.2 class.Pages_SO.inc.php,1.1.1.1,1.2 class.contributor_ManagePage_UI.inc.php,1.2,1.3

[Patrick Walsh <address@hidden>]

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

Modified Files:
        class.Admin_ManageCategories_UI.inc.php 
        class.Categories_BO.inc.php class.Categories_SO.inc.php 
        class.Category_SO.inc.php class.Page_SO.inc.php 
        class.Pages_SO.inc.php class.contributor_ManagePage_UI.inc.php 
Log Message:
added sort parameter


Index: class.Admin_ManageCategories_UI.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/sitemgr/inc/class.Admin_ManageCategories_UI.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** class.Admin_ManageCategories_UI.inc.php     29 Aug 2002 03:03:17 -0000      
1.1.1.1
--- class.Admin_ManageCategories_UI.inc.php     30 Aug 2002 09:45:25 -0000      
1.2
***************
*** 34,38 ****
                {
                        global 
$btnSaveCategory,$btnAddCategory,$btnEditCategory,$btnDelete,$btnPermission;
!                       global $category_id,$catname,$catdesc,$catid;
                        global $groupaccessread, $groupaccesswrite, 
$individualaccessread, $individualaccesswrite;
  
--- 34,38 ----
                {
                        global 
$btnSaveCategory,$btnAddCategory,$btnEditCategory,$btnDelete,$btnPermission;
!                       global 
$category_id,$catname,$catdesc,$catid,$sort_order;
                        global $groupaccessread, $groupaccesswrite, 
$individualaccessread, $individualaccesswrite;
  
***************
*** 57,61 ****
                                else if($btnSaveCategory && ($catname == '' || 
$catdesc == ''))
                                {
!                                       
$this->_editCategory($catid,True,$catname,$catdesc);
                                }
                                else
--- 57,61 ----
                                else if($btnSaveCategory && ($catname == '' || 
$catdesc == ''))
                                {
!                                       
$this->_editCategory($catid,True,$catname,$catdesc,$sort_order);
                                }
                                else
***************
*** 73,77 ****
                                                $groupaccess = 
array_merge_recursive($groupaccessread, $groupaccesswrite);
                                                $individualaccess = 
array_merge_recursive($individualaccessread, $individualaccesswrite);
!                                               
$this->cat_bo->saveCategoryInfo($catid, $catname, $catdesc);
                                                
$this->cat_bo->saveCategoryPerms($catid, $groupaccess, $individualaccess);
                                        }
--- 73,77 ----
                                                $groupaccess = 
array_merge_recursive($groupaccessread, $groupaccesswrite);
                                                $individualaccess = 
array_merge_recursive($individualaccessread, $individualaccesswrite);
!                                               
$this->cat_bo->saveCategoryInfo($catid, $catname, $catdesc, $sort_order);
                                                
$this->cat_bo->saveCategoryPerms($catid, $groupaccess, $individualaccess);
                                        }
***************
*** 136,140 ****
  
  
!               function 
_editCategory($cat_id,$error=False,$catname='',$catdesc='')
                {
                        $this->t->set_file('EditCategory', 'edit_category.tpl');
--- 136,140 ----
  
  
!               function 
_editCategory($cat_id,$error=False,$catname='',$catdesc='',$sort_order=0)
                {
                        $this->t->set_file('EditCategory', 'edit_category.tpl');
***************
*** 169,172 ****
--- 169,173 ----
                                'catname' => $this->cat->name,
                                'catdesc' => $this->cat->description,
+                               'sort_order' => $this->cat->sort_order,
                                'actionurl' =>
                                
$GLOBALS['phpgw']->link('/index.php','menuaction=sitemgr.Admin_ManageCategories_UI._manageCategories')

Index: class.Categories_BO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Categories_BO.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** class.Categories_BO.inc.php 29 Aug 2002 03:03:17 -0000      1.1.1.1
--- class.Categories_BO.inc.php 30 Aug 2002 09:45:25 -0000      1.2
***************
*** 76,80 ****
                }
  
!               function saveCategoryInfo($cat_id, $cat_name, $cat_description)
                {
                        $cat_info = CreateObject('sitemgr.Category_SO', True);
--- 76,80 ----
                }
  
!               function saveCategoryInfo($cat_id, $cat_name, $cat_description, 
$sort_order=0)
                {
                        $cat_info = CreateObject('sitemgr.Category_SO', True);
***************
*** 82,85 ****
--- 82,86 ----
                        $cat_info->name = $cat_name;
                        $cat_info->description = $cat_description;
+                       $cat_info->sort_order = $sort_order;
  
                        if ($this->acl->can_read_category($cat_id))

Index: class.Categories_SO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Categories_SO.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** class.Categories_SO.inc.php 29 Aug 2002 03:03:17 -0000      1.1.1.1
--- class.Categories_SO.inc.php 30 Aug 2002 09:45:25 -0000      1.2
***************
*** 11,15 ****
                function getFullCategoryIDList()
                {
!                       $sql = 'SELECT cat_id FROM phpgw_sitemgr_categories 
ORDER BY name';
                        $this->db->query($sql, __LINE__, __FILE__);
                        while ($this->db->next_record())
--- 11,15 ----
                function getFullCategoryIDList()
                {
!                       $sql = 'SELECT cat_id FROM phpgw_sitemgr_categories 
ORDER BY sort_order';
                        $this->db->query($sql, __LINE__, __FILE__);
                        while ($this->db->next_record())
***************
*** 40,43 ****
--- 40,44 ----
                        $sql = 'UPDATE phpgw_sitemgr_categories SET name="' .
                                $cat_info->name . '", description="' . 
$cat_info->description .
+                               '", sort_order="'. (int) $cat_info->sort_order .
                                '" WHERE cat_id="' . $cat_info->id . '"';
                        $this->db->query($sql, __LINE__, __FILE__);
***************
*** 53,56 ****
--- 54,58 ----
                                $cat_info->id = $cat_id;
                                $cat_info->name = $this->db->f('name');
+                               $cat_info->sort_order = 
$this->db->f('sort_order');
                                $cat_info->description = 
$this->db->f('description');
                                return $cat_info;

Index: class.Category_SO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Category_SO.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** class.Category_SO.inc.php   29 Aug 2002 03:03:17 -0000      1.1.1.1
--- class.Category_SO.inc.php   30 Aug 2002 09:45:25 -0000      1.2
***************
*** 5,8 ****
--- 5,9 ----
                var $name;
                var $description;
+               var $sort_order;
  
                function Category_SO()

Index: class.Page_SO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Page_SO.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** class.Page_SO.inc.php       29 Aug 2002 03:03:17 -0000      1.1.1.1
--- class.Page_SO.inc.php       30 Aug 2002 09:45:25 -0000      1.2
***************
*** 8,11 ****
--- 8,12 ----
                var $subtitle;
                var $content;
+               var $sort_order;
                
                function Page_SO()

Index: class.Pages_SO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Pages_SO.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** class.Pages_SO.inc.php      29 Aug 2002 03:03:17 -0000      1.1.1.1
--- class.Pages_SO.inc.php      30 Aug 2002 09:45:25 -0000      1.2
***************
*** 11,15 ****
                function getPageIDList($cat_id)
                {
!                       $sql = 'SELECT page_id FROM phpgw_sitemgr_pages WHERE 
cat_id="' . $cat_id . '" ORDER BY page_id DESC';
                        $this->db->query($sql,__LINE__,__FILE__);
                        while ($this->db->next_record())
--- 11,15 ----
                function getPageIDList($cat_id)
                {
!                       $sql = 'SELECT page_id FROM phpgw_sitemgr_pages WHERE 
cat_id="' . $cat_id . '" ORDER BY sort_order';
                        $this->db->query($sql,__LINE__,__FILE__);
                        while ($this->db->next_record())
***************
*** 73,76 ****
--- 73,77 ----
                                $page->title= $this->db->f('title');
                                $page->subtitle = $this->db->f('subtitle');
+                               $page->sort_order = (int) 
$this->db->f('sort_order');
                                $page->content = $this->db->f('content');
                                return $page;
***************
*** 91,94 ****
--- 92,96 ----
                                $page->id = $page_id;
                                $page->cat_id = $this->db->f('cat_id');
+                               $page->sort_order = (int) 
$this->db->f('sort_order');
                                $page->name = $this->db->f('name');
                                $page->title= $this->db->f('title');
***************
*** 108,111 ****
--- 110,114 ----
                                'cat_id="' . $pageInfo->cat_id . '",' .
                                'name="' . $pageInfo->name . '",' .
+                               'sort_order="' . (int) $pageInfo->sort_order . 
'",' .
                                'title="' . $pageInfo->title . '",' .
                                'subtitle="' . $pageInfo->subtitle . '",' .

Index: class.contributor_ManagePage_UI.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/sitemgr/inc/class.contributor_ManagePage_UI.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.contributor_ManagePage_UI.inc.php     30 Aug 2002 08:13:54 -0000      
1.2
--- class.contributor_ManagePage_UI.inc.php     30 Aug 2002 09:45:25 -0000      
1.3
***************
*** 50,53 ****
--- 50,54 ----
                        global $subtitle;
                        global $main;
+                       global $sort_order;
                        global $btnEditPage;
                
***************
*** 80,83 ****
--- 81,85 ----
                                $this->page->content = $main;
                                $this->page->name = $name;
+                               $this->page->sort_order = $sort_order;
                                $this->t->set_var('add_edit','Add Page');
                        }
***************
*** 89,92 ****
--- 91,95 ----
                                'main'=>strtr($this->page->content,$trans),
                                'name'=>$this->page->name,
+                               'sort_order'=>$this->page->sort_order,
                                'pageid'=>$page_id,
                                'category_id' => $category_id
***************
*** 112,115 ****
--- 115,119 ----
                        global $pageid;
                        global $category_id;
+                       global $sort_order;
                        global $title;
                        global $name;
***************
*** 150,153 ****
--- 154,158 ----
                                        $this->page->content = $main;
                                        $this->page->cat_id = $category_id;
+                                       $this->page->sort_order = $sort_order;
                                        $save_msg = 
$this->pagebo->savePageInfo($category_id, $this->page);
                                }