[Phpgroupware-cvs] api/class.hooks.php, 1.1.1.1.2.3

[nomail]

Update of /api
Modified Files:
        Branch: proposal-branch
          class.hooks.php

date: 2004/04/16 20:59:48;  author: seek3r;  state: Exp;  lines: +24 -24

Log Message:
bringing savannah cvs back up to date with what we were doing on our private 
cvs server. We will not be doing dev from this cvs tree
=====================================================================
No syntax errors detected in -
=====================================================================
Index: api/class.hooks.php
diff -u api/class.hooks.php:1.1.1.1.2.2 api/class.hooks.php:1.1.1.1.2.3
--- api/class.hooks.php:1.1.1.1.2.2     Sat Feb 28 10:30:36 2004
+++ api/class.hooks.php Fri Apr 16 20:59:48 2004
@@ -35,56 +35,56 @@
                function add ()
                {
                        $args = new safe_args();
-                       $args->set('hook', '##REQUIRED##', 'string');
-                       $args = $args->get(func_get_args(),__LINE__,__FILE__);
+                       $args->set('hook', REQUIRED, 'string');
+                       $args = $args->get(func_get_args());
                        
-                       $dbresult = $GLOBALS['phpgw']->db->execute("SELECT * 
FROM phpgw_hooks WHERE hook_name='".$args['hook']."' and 
hook_op='registration'",__LINE__,__FILE__);
+                       $dbresult = $GLOBALS['phpgw']->db->Execute("SELECT * 
FROM phpgw_hooks WHERE hook_name='".$args['hook']."' and 
hook_op='registration'");
                        
                        if($dbresult === false)
                        {                       
                                $sql = "insert into phpgw_hooks (hook_name, 
hook_op)";
                                $sql .= " values ('".$args['hook']."', 
'registration')";
-                               
$GLOBALS['phpgw']->db->execute($sql,__LINE__,__FILE__);
+                               $GLOBALS['phpgw']->db->Execute($sql);
                        }
-                       return True;
+                       return true;
                }
                
                function set ()
                {
                        $args = new safe_args();
-                       $args->set('hook', '##REQUIRED##', 'string');
-                       $args->set('op', '##REQUIRED##', 'string');
-                       $args = $args->get(func_get_args(),__LINE__,__FILE__);
+                       $args->set('hook', REQUIRED, 'string');
+                       $args->set('op', REQUIRED, 'string');
+                       $args = $args->get(func_get_args());
                        
-                       $dbresult = $GLOBALS['phpgw']->db->execute("SELECT * 
FROM phpgw_hooks WHERE hook_name='".$args['hook']."' and 
hook_op='".$args['op']."'",__LINE__,__FILE__);
+                       $dbresult = $GLOBALS['phpgw']->db->Execute("SELECT * 
FROM phpgw_hooks WHERE hook_name='".$args['hook']."' and 
hook_op='".$args['op']."'");
                        
                        if($dbresult === false)
                        {                       
                                $sql = "insert into phpgw_hooks (hook_name, 
hook_op)";
                                $sql .= " values ('".$args['hook']."', 
'".$args['op']."')";
-                               
$GLOBALS['phpgw']->db->execute($sql,__LINE__,__FILE__);
+                               $GLOBALS['phpgw']->db->Execute($sql);
                        }
-                       return True;
+                       return true;
                }
 
                function remove ()
                {
                        $args = new safe_args();
-                       $args->set('hook', '##REQUIRED##', 'string');
-                       $args->set('op', '##REQUIRED##', 'string');
-                       $args = $args->get(func_get_args(),__LINE__,__FILE__);
+                       $args->set('hook', REQUIRED, 'string');
+                       $args->set('op', REQUIRED, 'string');
+                       $args = $args->get(func_get_args());
                        $sql = "delete from phpgw_hooks where 
hook_name='".$args['name']."' and hook_op='".$args['op']."'";
-                       $GLOBALS['phpgw']->db->execute($sql,__LINE__,__FILE__);
-                       return True;
+                       $GLOBALS['phpgw']->db->Execute($sql);
+                       return true;
                }
 
                function execute()
                {
                        $args = new safe_args();
-                       $args->set('hook', '##REQUIRED##', 'string');
-                       $args = $args->get(func_get_args(),__LINE__,__FILE__);
+                       $args->set('hook', REQUIRED, 'string');
+                       $args = $args->get(func_get_args());
                        
-                       $dbresult = $GLOBALS['phpgw']->db->execute("SELECT * 
FROM phpgw_hooks WHERE hook_name='".$args['hook']."' and 
hook_op!='registration'",__LINE__,__FILE__);
+                       $dbresult = $GLOBALS['phpgw']->db->Execute("SELECT * 
FROM phpgw_hooks WHERE hook_name='".$args['hook']."' and 
hook_op!='registration'");
                        $result = array();
                        if($dbresult !== false)
                        {
@@ -111,7 +111,7 @@
                                }
                                if(!is_array($inputs))
                                {
-                                       $inputs = '##NOTSET##';
+                                       $inputs = NOTSET;
                                }
                                /* END - Convert args into input for hook op */
                        
@@ -120,7 +120,7 @@
                                        $op = $dbresult->fields['hook_op'];
                                        if($GLOBALS['phpgw']->acl->check($op,1))
                                        {
-                                               $result = execmethod($op, 
$inputs, True);
+                                               $result = execMethod($op, 
$inputs, true);
                                                $this->data[] = 
array('op'=>$op, 'data'=>$result);
                                        }
                                        /* We could actually just see if they 
have rights to the app, or the app+class. */
@@ -130,7 +130,7 @@
                                        
//if($GLOBALS['phpgw']->acl->check($app.'.'.$class,1))
                                        
if($GLOBALS['phpgw']->acl->check($app,1))
                                        {
-                                               $result[] = 
execmethod($op,$inputs, True);
+                                               $result[] = 
execMethod($op,$inputs, true);
                                        }
                                        */
                                        $dbresult->MoveNext();