Thread: [Phpslash-commit] CVS: phpslash-ft/class Group.class,1.5,1.6

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/phpslash/phpslash-ft/class
In directory sc8-pr-cvs1:/tmp/cvs-serv16418/phpslash-ft/class

Modified Files:
	Group.class 
Log Message:
duplicate getName and getId function names

Index: Group.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Group.class,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Group.class	20 Dec 2002 22:17:29 -0000	1.5
--- Group.class	22 Jan 2003 18:48:18 -0000	1.6
***************
*** 43,47 ****
        $this->permission_templ->debug = 0;
        $this->permission_templ->set_file(array(
! 	 'listpermission'  => "permissionList.tpl",
           'newpermission'   => "permissionNew.tpl"
  
--- 43,47 ----
        $this->permission_templ->debug = 0;
        $this->permission_templ->set_file(array(
! 	      'listpermission'  => "permissionList.tpl",
           'newpermission'   => "permissionNew.tpl"
  
***************
*** 159,163 ****
                         group_description  = '$ary[description]'
                   WHERE group_id   = '$ary[group_id]'";
! 	  $this->message = "Group information updated";
        } else {
  
--- 159,163 ----
                         group_description  = '$ary[description]'
                   WHERE group_id   = '$ary[group_id]'";
! 	       $this->message = "Group information updated";
        } else {
  
***************
*** 171,175 ****
                               '$ary[group_name]',
                               '$ary[description]')";
! 	 $this->message = "Group information saved";
        }
        
--- 171,175 ----
                               '$ary[group_name]',
                               '$ary[description]')";
! 	      $this->message = "Group information saved";
        }
        
***************
*** 212,218 ****
        } else {
           // groups of groups need choose no perms.
! 	 // $this->message = "No permission chosen.";
! 	 // $status = false;
! 	 // return $status;
        }
        
--- 212,218 ----
        } else {
           // groups of groups need choose no perms.
! 	      // $this->message = "No permission chosen.";
! 	      // $status = false;
! 	      // return $status;
        }
        
***************
*** 276,280 ****
           $name =  $this->db->Record["author_name"];
           $author_id =  $this->db->Record["author_id"];
!          $this->message = "Sorry, this group is assigned to author ".$name."(".$author_id.")";
        }
  
--- 276,280 ----
           $name =  $this->db->Record["author_name"];
           $author_id =  $this->db->Record["author_id"];
!          $this->message = pslgetText("Sorry, this group is assigned to author ").$name."(".$author_id.")";
        }
  
***************
*** 292,296 ****
           $group_id =  $this->db->Record["group_id"];
           $group_name = $this->db->Record["group_name"];
!          $this->message = "Sorry, this group is assigned to group ".$group_name."(".$group_id.")";
        }
  
--- 292,296 ----
           $group_id =  $this->db->Record["group_id"];
           $group_name = $this->db->Record["group_name"];
!          $this->message = pslgetText("Sorry, this group is assigned to group ").$group_name."(".$group_id.")";
        }
  
***************
*** 593,605 ****
  
     /**
!    * getName -  return name assign to id
     *
!    * when given a group id, getName returns the name
     *
     * @param integer id
     * @access public
!    * return author_name
     */
!    function getName($id) {
        if (!$id) {
           return false;
--- 593,605 ----
  
     /**
!    * getGroupName -  return name assign to id
     *
!    * when given a group id, getGroupName returns the name
     *
     * @param integer id
     * @access public
!    * return group_name
     */
!    function getGroupName($id) {
        if (!$id) {
           return false;
***************
*** 615,621 ****
  
     /**
!    * getId -  return id assign to name
     *
!    * when given a name, getId returns the id
     *
     * @param string name
--- 615,621 ----
  
     /**
!    * getGroupId -  return id assign to name
     *
!    * when given a name, getGroupId returns the id
     *
     * @param string name
***************
*** 623,627 ****
     * return group_id
     */
!    function getId($name) {
        if (!$name) {
           return false;
--- 623,627 ----
     * return group_id
     */
!    function getGroupId($name) {
        if (!$name) {
           return false;
***************
*** 694,702 ****
           $permission_id = $this->db->Record['permission_id'];
           if ($this->perm->have_perm("permissionAdmin")) {
!             $admin  = "<A HREF=\"" . $this->psl['phpself'] . "?submit=editperm" . $this->psl['amp'] . "permission_id=$permission_id\">[Edit]</A>";
!             $admin .= "  <A HREF=\"" . $this->psl['phpself'] . "?submit=deleteperm" . $this->psl['amp'] . "permission_id=$permission_id\">[Delete]</A>";
  
           } else {
!             $admin = "  <A HREF=\"" . $this->psl['phpself'] . "?submit=deleteperm" . $this->psl['amp'] . "permission_id=$permission_id\">[Delete]</A>";
           }
           $this->permission_templ->set_var(array(
--- 694,702 ----
           $permission_id = $this->db->Record['permission_id'];
           if ($this->perm->have_perm("permissionAdmin")) {
!             $admin  = "<A HREF=\"" . $this->psl['phpself'] . "?submit=editperm" . $this->psl['amp'] . "permission_id=$permission_id\">".pslgetText("[Edit]")."</A>";
!             $admin .= "  <A HREF=\"" . $this->psl['phpself'] . "?submit=deleteperm" . $this->psl['amp'] . "permission_id=$permission_id\">".pslgetText("[Delete]")."</A>";
  
           } else {
!             $admin = "  <A HREF=\"" . $this->psl['phpself'] . "?submit=deleteperm" . $this->psl['amp'] . "permission_id=$permission_id\">".pslgetText("[Delete]")."</A>";
           }
           $this->permission_templ->set_var(array(
***************
*** 704,708 ****
             'PERMISSION_ID'       => $permission_id,
             'PERMISSION_DESCRIPTION'     => $this->db->Record['permission_description'],
! 	   'ACTION_URL'     => $this->psl['phpself'],
             'ADMIN'          => $admin
           ));
--- 704,708 ----
             'PERMISSION_ID'       => $permission_id,
             'PERMISSION_DESCRIPTION'     => $this->db->Record['permission_description'],
! 	        'ACTION_URL'     => $this->psl['phpself'],
             'ADMIN'          => $admin
           ));
***************
*** 756,760 ****
                         permission_description  = '$ary[description]'
                   WHERE permission_id   = '$ary[permission_id]'";
! 	 $this->message = "Permission information updated";
        } else {
  
--- 756,760 ----
                         permission_description  = '$ary[description]'
                   WHERE permission_id   = '$ary[permission_id]'";
! 	      $this->message = "Permission information updated";
        } else {
  
***************
*** 768,772 ****
                              '$ary[permission_name]',
                              '$ary[description]')";
! 	 $this->message = "Permission information saved";
        }
  
--- 768,772 ----
                              '$ary[permission_name]',
                              '$ary[description]')";
! 	      $this->message = "Permission information saved";
        }
  
***************
*** 812,816 ****
           $group_id =  $this->db->Record["group_id"];
           $group_name = $this->db->Record["group_name"];
!          $this->message = "Sorry, this permission is assigned to group ".$group_name."(".$group_id.")";
        }
  
--- 812,816 ----
           $group_id =  $this->db->Record["group_id"];
           $group_name = $this->db->Record["group_name"];
!          $this->message = pslgetText("Sorry, this permission is assigned to group ").$group_name."(".$group_id.")";
        }
  
***************
*** 851,863 ****
        } else {
           
! 	 $q = "SELECT permission_id,
                        permission_name,
                        permission_description
! 		FROM psl_permission
                  WHERE permission_id = '$ary[permission_id]'";
           $this->db->query($q);
           $this->db->next_record();
           $this->permission_templ->set_var(array(
! 	    'TITLEBAR' => getTitlebar("100%","Edit Permission"),
              'PERMISSION_ID'       => $this->db->Record["permission_id"],
              'PERMISSION_NAME'     => $this->db->Record["permission_name"],
--- 851,863 ----
        } else {
           
! 	      $q = "SELECT permission_id,
                        permission_name,
                        permission_description
! 		           FROM psl_permission
                  WHERE permission_id = '$ary[permission_id]'";
           $this->db->query($q);
           $this->db->next_record();
           $this->permission_templ->set_var(array(
! 	         'TITLEBAR' => getTitlebar("100%","Edit Permission"),
              'PERMISSION_ID'       => $this->db->Record["permission_id"],
              'PERMISSION_NAME'     => $this->db->Record["permission_name"],
***************
*** 874,886 ****
  
     /**
!    * getName -  return name assign to id
     *
!    * when given a permission id, getName returns the name
     *
     * @param integer id
     * @access public
!    * return author_name
     */
!    function getName($id) {
        if (!$id) {
           return false;
--- 874,886 ----
  
     /**
!    * getPermName -  return name assign to id
     *
!    * when given a permission id, getPermName returns the name
     *
     * @param integer id
     * @access public
!    * return permission_name
     */
!    function getPermName($id) {
        if (!$id) {
           return false;
***************
*** 896,902 ****
  
     /**
!    * getId -  return id assign to name
     *
!    * when given a name, getId returns the id
     *
     * @param string name
--- 896,902 ----
  
     /**
!    * getPermId -  return id assign to name
     *
!    * when given a name, getPermId returns the id
     *
     * @param string name
***************
*** 904,908 ****
     * return permission_id
     */
!    function getId($name) {
        if (!$name) {
           return false;
--- 904,908 ----
     * return permission_id
     */
!    function getPermId($name) {
        if (!$name) {
           return false;

Thread: [Phpslash-commit] CVS: phpslash-ft/class Group.class,1.5,1.6

phpslash-commit