[Openfirst-cvscommit] base/includes settings.php,1.2,1.3

[Jamie <ast...@us...>]

Update of /cvsroot/openfirst/base/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6416/includes

Modified Files:
	settings.php 
Log Message:
Added SiteSettings::del() and UserSettings::del()

Index: settings.php
===================================================================
RCS file: /cvsroot/openfirst/base/includes/settings.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** settings.php	15 Oct 2005 21:51:37 -0000	1.2
--- settings.php	16 Oct 2005 19:35:30 -0000	1.3
***************
*** 51,81 ****
    
    function get($name, $default=null) {
-     $modname = $this->mod;
      global $ogDB;
      $res = $ogDB->select( 'sitesettings', 'ss_value', 
!                           array( 'ss_module'  => $modname, 
!                                  'ss_setting' => $name)
                          );
!     $row = $ogDB->fetchObject($res);
!     
!     if (isset($row->ss_value))
!       return unserialize($row->ss_value);
!     else
        return $default;
    }
    
    function set($name, $value) {
-     $modname = $this->mod;
      global $ogDB;
      $res = $ogDB->replace( 'sitesettings', 
!                             array( 'ss_module'  => $modname, 
                                     'ss_setting' => $name,
!                                    'ss_value'   => serialize($value) )
                           );
    }
    
! /*  function del($name) {
!     #
!   }*/
  }
  
--- 51,91 ----
    
    function get($name, $default=null) {
      global $ogDB;
      $res = $ogDB->select( 'sitesettings', 'ss_value', 
!                           array( 'ss_module'  => $this->mod, 
!                                  'ss_setting' => $name
!                                )
                          );
!     if ($ogDB->numberOfRows($res) >= 1) {
!       $row = $ogDB->fetchObject($res);
!       
!       if (isset($row->ss_value)) {
!         return unserialize($row->ss_value);
!       } else {
!         return $default;
!       }
!     } else {
        return $default;
+     }
    }
    
    function set($name, $value) {
      global $ogDB;
      $res = $ogDB->replace( 'sitesettings', 
!                             array( 'ss_module'  => $this->mod, 
                                     'ss_setting' => $name,
!                                    'ss_value'   => serialize($value)
!                                  )
                           );
    }
    
!   function del($name) {
!     global $ogDB;
!     $ogDB->delete( 'sitesettings', 
!                     array( 'ss_module'  => $this->mod, 
!                            'ss_setting' => $name
!                          )
!                  );
!   }
  }
  
***************
*** 98,104 ****
      
      if ($user == false) {
!       $this->user = $GLOBALS['user']->user;
      } else if (is_object($user)) {
!       $this->user = $user->user;
      } else {
        $this->user = $user;
--- 108,115 ----
      
      if ($user == false) {
!       global $ogUser;
!       $this->user = $ogUser->getuserName();
      } else if (is_object($user)) {
!       $this->user = $user->getuserName();
      } else {
        $this->user = $user;
***************
*** 107,141 ****
    
    function get($name, $default=null) {
-     $modname = $this->mod;
-     $username = $this->user;
      global $ogDB;
      $res = $ogDB->select( 'usersettings', 'us_value', 
!                           array( 'us_user'  => $username, 
!                                  'us_module'  => $modname, 
!                                  'us_setting' => $name)
                          );
!     $row = $ogDB->fetchObject($res);
!     
!     if (isset($row->ss_value))
!       return unserialize($row->ss_value);
!     else
        return $default;
    }
    
    function set($name, $value) {
-     $modname = $this->mod;
-     $username = $this->user;
      global $ogDB;
      $ogDB->replace( 'usersettings', 
!                     array( 'us_user'  => $username, 
!                            'us_module'  => $modname, 
                             'us_setting' => $name,
!                            'us_value'   => serialize($value) )
!                          );
    }
    
! /*  function del($name) {
!     #
!   }*/
  }
  
--- 118,161 ----
    
    function get($name, $default=null) {
      global $ogDB;
      $res = $ogDB->select( 'usersettings', 'us_value', 
!                           array( 'us_user'    => $this->user, 
!                                  'us_module'  => $this->mod, 
!                                  'us_setting' => $name
!                                )
                          );
!     if ($ogDB->numberOfRows($res) >= 1) {
!       $row = $ogDB->fetchObject($res);
!       
!       if (isset($row->us_value)) {
!         return unserialize($row->us_value);
!       } else {
!         return $default;
!       }
!     } else {
        return $default;
+     }
    }
    
    function set($name, $value) {
      global $ogDB;
      $ogDB->replace( 'usersettings', 
!                     array( 'us_user'    => $this->user, 
!                            'us_module'  => $this->mod, 
                             'us_setting' => $name,
!                            'us_value'   => serialize($value)
!                          )
!                   );
    }
    
!   function del($name) {
!     global $ogDB;
!     $ogDB->delete( 'usersettings', 
!                     array( 'us_user'    => $this->user, 
!                            'us_module'  => $this->mod, 
!                            'us_setting' => $name
!                          )
!                  );
!   }
  }