Changeset 1142

Show
Ignore:
Timestamp:
06/12/07 09:51:15 (1 year ago)
Author:
icewing
Message:

Marcus Povey <marcus@dushka.co.uk>
* Cleaned up some bits and pieces.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • devel/mod/file/lib.php

    r1141 r1142  
    152152        if (function_exists('river_save_event')) 
    153153        { 
    154                 //river_register_hook('file', 'file_river_hook'); 
    155  
    156154                listen_for_event('file','publish', 'file_river_hook'); 
    157155                listen_for_event('file','delete', 'file_river_hook'); 
    …… 
    161159function file_river_hook( $object_type, $event, $object) 
    162160{ 
    163         //if ($object_type == "file::file") 
    164         //{ 
    165                 $userid = ($_SESSION['userid'] == "" ? -1 : $_SESSION['userid']); 
    166                 $object_id = $object->ident; 
    167                 $object_owner = $object->owner; 
    168                 $name = $object->originalname; 
    169  
    170                 $username = user_info("username", $userid); 
    171                 if ($username == false) $username = __gettext("Anonymous user"); 
    172                  
    173                 if ($event == "publish") 
    174                         river_save_event($userid, $object_id, $object_owner, $object_type, "$username posted '$name'"); 
    175  
    176                 if ($event == "delete") 
    177                         river_save_event($userid, $object_id, $object_owner, $object_type, "$username deleted '$name'"); 
    178         //} 
     161        $userid = ($_SESSION['userid'] == "" ? -1 : $_SESSION['userid']); 
     162        $object_id = $object->ident; 
     163        $object_owner = $object->owner; 
     164        $name = $object->originalname; 
     165 
     166        $username = user_info("username", $userid); 
     167        if ($username == false) $username = __gettext("Anonymous user"); 
     168         
     169        if ($event == "publish") 
     170                river_save_event($userid, $object_id, $object_owner, $object_type, "$username posted '$name'"); 
     171 
     172        if ($event == "delete") 
     173                river_save_event($userid, $object_id, $object_owner, $object_type, "$username deleted '$name'"); 
    179174 
    180175        return $object;