[dZeeemp-cvs] dzeeemp.sources/core library.Access.extended.php,1.1,1.2 library.Columns.php,1.2,1.3 l
Brought to you by:
lovchy
Update of /cvsroot/dzeeemp/dzeeemp.sources/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21303 Modified Files: library.Access.extended.php library.Columns.php library.Filters.php library.Groups.extended.php library.Templates.php library.Triggers.php the.Thorn.php Log Message: PHP5-compability -- throw is now reserved word and cannot be used as method name Index: library.Templates.php =================================================================== RCS file: /cvsroot/dzeeemp/dzeeemp.sources/core/library.Templates.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** library.Templates.php 14 Jun 2004 12:19:34 -0000 1.4 --- library.Templates.php 11 Aug 2004 13:04:49 -0000 1.5 *************** *** 61,65 **** // {{{ Trigger {TEMPLATES_SELECT} ! $data = $__Triggers->throw(THORN_TG_TEMPLATES_SELECT); if ( $__Triggers->getFlag() == THORN_TRIGGERS_RETURN ) --- 61,65 ---- // {{{ Trigger {TEMPLATES_SELECT} ! $data = $__Triggers->call(THORN_TG_TEMPLATES_SELECT); if ( $__Triggers->getFlag() == THORN_TRIGGERS_RETURN ) Index: the.Thorn.php =================================================================== RCS file: /cvsroot/dzeeemp/dzeeemp.sources/core/the.Thorn.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** the.Thorn.php 13 Jun 2004 00:01:33 -0000 1.8 --- the.Thorn.php 11 Aug 2004 13:04:49 -0000 1.9 *************** *** 259,263 **** // }}} ! $this->Objects['triggers']->throw(THORN_TG_STARTUP); define ('THORN_INSTANCE_EXISTS', true); --- 259,263 ---- // }}} ! $this->Objects['triggers']->call(THORN_TG_STARTUP); define ('THORN_INSTANCE_EXISTS', true); *************** *** 394,398 **** if ( isset($this->Libraries['triggers']) ) { ! $data = $this->Objects['triggers']->throw(THORN_TG_LIBCALL); if ( $this->Objects['triggers']->getFlag() == THORN_TRIGGERS_RETURN ) --- 394,398 ---- if ( isset($this->Libraries['triggers']) ) { ! $data = $this->Objects['triggers']->call(THORN_TG_LIBCALL); if ( $this->Objects['triggers']->getFlag() == THORN_TRIGGERS_RETURN ) Index: library.Triggers.php =================================================================== RCS file: /cvsroot/dzeeemp/dzeeemp.sources/core/library.Triggers.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** library.Triggers.php 13 Jun 2004 00:01:33 -0000 1.4 --- library.Triggers.php 11 Aug 2004 13:04:49 -0000 1.5 *************** *** 123,127 **** * @param trigger $tgId Id of trigger to throw */ ! function throw($tgId = THORN_TG_STARTUP) { // default value --- 123,127 ---- * @param trigger $tgId Id of trigger to throw */ ! function call($tgId = THORN_TG_STARTUP) { // default value Index: library.Access.extended.php =================================================================== RCS file: /cvsroot/dzeeemp/dzeeemp.sources/core/library.Access.extended.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** library.Access.extended.php 11 Apr 2004 13:27:54 -0000 1.1 --- library.Access.extended.php 11 Aug 2004 13:04:49 -0000 1.2 *************** *** 80,84 **** $__Errors->setLast(30); ! $__Triggers->throw(THORN_TG_ACCESS_INSERT, $keyword, $name, $value, $access, $mod); return true; --- 80,84 ---- $__Errors->setLast(30); ! $__Triggers->call(THORN_TG_ACCESS_INSERT, $keyword, $name, $value, $access, $mod); return true; *************** *** 151,155 **** $__Errors->setLast(170); ! $__Triggers->throw(THORN_TG_ACCESS_UPDATE, $id, $keyword, $mod, $value, $access); return true; --- 151,155 ---- $__Errors->setLast(170); ! $__Triggers->call(THORN_TG_ACCESS_UPDATE, $id, $keyword, $mod, $value, $access); return true; *************** *** 183,187 **** $__Errors->setLast(31); ! $__Triggers->throw(THORN_TG_ACCESS_DELETE, $keyword, $mod); return true; --- 183,187 ---- $__Errors->setLast(31); ! $__Triggers->call(THORN_TG_ACCESS_DELETE, $keyword, $mod); return true; Index: library.Columns.php =================================================================== RCS file: /cvsroot/dzeeemp/dzeeemp.sources/core/library.Columns.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** library.Columns.php 12 Apr 2004 03:21:17 -0000 1.2 --- library.Columns.php 11 Aug 2004 13:04:49 -0000 1.3 *************** *** 65,69 **** { $__Triggers = &Thorn::getInstance('triggers'); ! $__Triggers->throw(THORN_TG_COLUMNS_CREATE, $mod); return touch (THORN_COLUMNS_DIR.'/'.$mod.'.php'); --- 65,69 ---- { $__Triggers = &Thorn::getInstance('triggers'); ! $__Triggers->call(THORN_TG_COLUMNS_CREATE, $mod); return touch (THORN_COLUMNS_DIR.'/'.$mod.'.php'); *************** *** 81,85 **** { $__Triggers = &Thorn::getInstance('triggers'); ! $__Triggers->throw(THORN_TG_COLUMNS_DROP, $mod); return unlink (THORN_COLUMNS_DIR.'/'.$mod.'.php'); --- 81,85 ---- { $__Triggers = &Thorn::getInstance('triggers'); ! $__Triggers->call(THORN_TG_COLUMNS_DROP, $mod); return unlink (THORN_COLUMNS_DIR.'/'.$mod.'.php'); *************** *** 110,114 **** $__Triggers = &Thorn::getInstance('triggers'); ! $__Triggers->throw(THORN_TG_COLUMNS_INSERT, $mod, $keyword, $name, $type); if ( !file_exists(THORN_COLUMNS_DIR.'/'.$mod.'.php') ) --- 110,114 ---- $__Triggers = &Thorn::getInstance('triggers'); ! $__Triggers->call(THORN_TG_COLUMNS_INSERT, $mod, $keyword, $name, $type); if ( !file_exists(THORN_COLUMNS_DIR.'/'.$mod.'.php') ) *************** *** 187,191 **** $__Triggers = &Thorn::getInstance('triggers'); ! $__Triggers->throw(THORN_TG_COLUMNS_DELETE, $mod, $keyword); if (! file_exists(THORN_COLUMNS_DIR.'/'.$mod.'.php') ) --- 187,191 ---- $__Triggers = &Thorn::getInstance('triggers'); ! $__Triggers->call(THORN_TG_COLUMNS_DELETE, $mod, $keyword); if (! file_exists(THORN_COLUMNS_DIR.'/'.$mod.'.php') ) Index: library.Filters.php =================================================================== RCS file: /cvsroot/dzeeemp/dzeeemp.sources/core/library.Filters.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** library.Filters.php 11 Apr 2004 13:27:54 -0000 1.1 --- library.Filters.php 11 Aug 2004 13:04:49 -0000 1.2 *************** *** 86,90 **** $__Triggers = &Thorn::getInstance('triggers'); ! $__Triggers->throw(THORN_TG_FILTERS_EXECUTE, $filter, $str); if ( !file_exists($file = THORN_FILTERS_DIR.'/filter.'.$filter.'.php') ) --- 86,90 ---- $__Triggers = &Thorn::getInstance('triggers'); ! $__Triggers->call(THORN_TG_FILTERS_EXECUTE, $filter, $str); if ( !file_exists($file = THORN_FILTERS_DIR.'/filter.'.$filter.'.php') ) *************** *** 141,145 **** $id = $__Database->get_inserted_id(); ! $__Triggers->throw(THORN_TG_FILTERS_LINK, $id, $keyword, $group, $al, $ah, $am, $section); $__Errors->setLast(290); --- 141,145 ---- $id = $__Database->get_inserted_id(); ! $__Triggers->call(THORN_TG_FILTERS_LINK, $id, $keyword, $group, $al, $ah, $am, $section); $__Errors->setLast(290); *************** *** 163,167 **** $__Triggers = &Thorn::getInstance('triggers'); ! $__Triggers->throw(THORN_TG_FILTERS_UNLINK, $id); $__Database->sql = 'DELETE FROM `'.tab.'filters` '. --- 163,167 ---- $__Triggers = &Thorn::getInstance('triggers'); ! $__Triggers->call(THORN_TG_FILTERS_UNLINK, $id); $__Database->sql = 'DELETE FROM `'.tab.'filters` '. Index: library.Groups.extended.php =================================================================== RCS file: /cvsroot/dzeeemp/dzeeemp.sources/core/library.Groups.extended.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** library.Groups.extended.php 11 Apr 2004 13:27:54 -0000 1.1 --- library.Groups.extended.php 11 Aug 2004 13:04:49 -0000 1.2 *************** *** 136,140 **** $__Errors->setLast(84); ! $__Triggers->throw(THORN_TG_GROUPS_INSERT, $keyword, $name, $access); return true; --- 136,140 ---- $__Errors->setLast(84); ! $__Triggers->call(THORN_TG_GROUPS_INSERT, $keyword, $name, $access); return true; *************** *** 186,190 **** $__Errors->setLast(90); ! $__Triggers->throw(THORN_TG_GROUPS_UPDATE, $keyword, $name, $access); return true; --- 186,190 ---- $__Errors->setLast(90); ! $__Triggers->call(THORN_TG_GROUPS_UPDATE, $keyword, $name, $access); return true; *************** *** 298,302 **** $__Errors->setLast(83); ! $__Triggers->throw(THORN_TG_GROUPS_DELETE, $id); return true; --- 298,302 ---- $__Errors->setLast(83); ! $__Triggers->call(THORN_TG_GROUPS_DELETE, $id); return true; *************** *** 391,395 **** $__Errors->setLast(86); ! $__Triggers->throw(THORN_TG_GROUPS_CLEAR, $id); return $CurrentNumber; --- 391,395 ---- $__Errors->setLast(86); ! $__Triggers->call(THORN_TG_GROUPS_CLEAR, $id); return $CurrentNumber; *************** *** 437,441 **** $__Errors->setLast(78); ! $__Triggers->throw(THORN_TG_GROUPS_INCREASE, $id, $keyword, $decrease); return true; --- 437,441 ---- $__Errors->setLast(78); ! $__Triggers->call(THORN_TG_GROUPS_INCREASE, $id, $keyword, $decrease); return true; |