Provides node methods to services applications. Requires services.module.
'); case 'admin/modules#description': @@ -17,9 +83,11 @@ } } -/*function node_service_perm() { +/** + function node_service_perm() { return array('load raw node data'); -}*/ + } + */ /** * Implementation of hook_service(). @@ -67,7 +135,8 @@ if ($node->nid) { $ret = drupal_execute($node->type .'_node_form', $edit, $edit); } - } else { + } + else { $ret = drupal_execute($edit['type'] .'_node_form', $edit, $edit); } if ($errors = form_get_errors()) { @@ -78,11 +147,11 @@ $nid = substr($ret, strpos($ret, '/')+1); - $flvfile->fid = db_next_id('{files}_fid'); + $flvfile->fid = db_last_insert_id('{files}_fid'); $flvfile->filename = $edit['filename']; - $flvfile->filepath = file_directory_path() . '/' . $edit['filepath']; + $flvfile->filepath = file_directory_path() .'/'. $edit['filepath']; $flvfile->filemime = file_get_mimetype($edit['filename']); - $flvfile->filesize = filesize(file_directory_path() . '/' . $edit['filepath']); + $flvfile->filesize = filesize(file_directory_path() .'/'. $edit['filepath']); $flvfile->list = 0; $flvfile->description = $edit['filename']; @@ -90,12 +159,12 @@ // insert flv file reference $result = db_query("INSERT INTO {files} (fid, nid, filename, filepath, filemime, filesize) VALUES (%d, %d, '%s', '%s', '%s', %d)", $flvfile->fid, $nid, $flvfile->filename, $flvfile->filepath, $flvfile->filemime, $flvfile->filesize); - $result = db_query("INSERT INTO {file_revisions} (fid, vid, list, description) VALUES (%d, %d, %d, '%s')", $flvfile->fid, $nid, $flvfile->list, $flvfile->description); + $result = db_query("INSERT INTO {upload} (fid, vid, list, description) VALUES (%d, %d, %d, '%s')", $flvfile->fid, $nid, $flvfile->list, $flvfile->description); - $jpgfile->fid = db_next_id('{files}_fid'); - $jpgfile->filename = substr($edit['filename'], 0, strpos($edit['filename'], '.flv')) . '.jpg'; - $jpgfile->filepath = file_directory_path() . '/' . substr($edit['filepath'], 0, strpos($edit['filepath'], '.flv')) . '.jpg'; + $jpgfile->fid = db_last_insert_id('{files}_fid'); + $jpgfile->filename = substr($edit['filename'], 0, strpos($edit['filename'], '.flv')) .'.jpg'; + $jpgfile->filepath = file_directory_path() .'/'. substr($edit['filepath'], 0, strpos($edit['filepath'], '.flv')) .'.jpg'; $jpgfile->filemime = file_get_mimetype($jpgfile->filename); $jpgfile->filesize = filesize($jpgfile->filepath); $jpgfile->list = 0; @@ -103,7 +172,7 @@ // insert jpg file reference (video thumbnail) $result = db_query("INSERT INTO {files} (fid, nid, filename, filepath, filemime, filesize) VALUES (%d, %d, '%s', '%s', '%s', %d)", $jpgfile->fid, $nid, $jpgfile->filename, $jpgfile->filepath, $jpgfile->filemime, $jpgfile->filesize); - $result = db_query("INSERT INTO {file_revisions} (fid, vid, list, description) VALUES (%d, %d, %d, '%s')", $jpgfile->fid, $nid, $jpgfile->list, $jpgfile->description); + $result = db_query("INSERT INTO {upload} (fid, vid, list, description) VALUES (%d, %d, %d, '%s')", $jpgfile->fid, $nid, $jpgfile->list, $jpgfile->description); } if (!$result) { @@ -113,14 +182,15 @@ return $ret; } -function flvnode_service_save_access($node) { +function flvnode_service_save_access($op, $node, $account) { if (isset($node['nid'])) { - return node_access('update', $node); + return node_access($op , $node, $account); } - return node_access('create', $node['type']); + return node_access($op, $node['type'], $account); } -/*function node_service_delete_access($nid) { +/* + function node_service_delete_access($nid, $account) { $node = node_load($nid); - return node_access('delete', $node); + return node_access('delete', $node, $account); }*/ Index: videonoderecorder/videonoderecorder.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/red5flashserver/videonoderecorder/videonoderecorder.info,v retrieving revision 1.1.2.1 diff -u -b -r1.1.2.1 videonoderecorder.info --- videonoderecorder/videonoderecorder.info 3 Nov 2008 15:58:59 -0000 1.1.2.1 +++ videonoderecorder/videonoderecorder.info 25 Feb 2009 10:11:34 -0000 @@ -1,5 +1,11 @@ ; $Id: videonoderecorder.info,v 1.1.2.1 2008/11/03 15:58:59 chriscar Exp $ name = Video node recorder description = Module for recording Flash video nodes using a standard webcam and the Red5 Open Source Flash Server. -dependencies = upload services flvnode_service amfphp swftools +dependencies[] = upload +dependencies[] = services +dependencies[] = flvnode_service +dependencies[] = amfphp +dependencies[] = swftools package = Red5 Flash Server + +core = 6.x \ No newline at end of file Index: videonoderecorder/videonoderecorder.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/red5flashserver/videonoderecorder/videonoderecorder.install,v retrieving revision 1.1.2.1 diff -u -b -r1.1.2.1 videonoderecorder.install --- videonoderecorder/videonoderecorder.install 3 Nov 2008 15:58:59 -0000 1.1.2.1 +++ videonoderecorder/videonoderecorder.install 25 Feb 2009 10:11:34 -0000 @@ -2,8 +2,16 @@ // $Id: videonoderecorder.install,v 1.1.2.1 2008/11/03 15:58:59 chriscar Exp $ /** + * @file + * Install file for video node recorder red5 int + */ + +/** * Implementation of hook_uninstall(). */ function videonoderecorder_uninstall() { + // Remove tables. + drupal_uninstall_schema('videonoderecorder'); + db_query("DELETE from {variable} WHERE name LIKE 'videonoderecorder%'"); } Index: videonoderecorder/videonoderecorder.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/red5flashserver/videonoderecorder/videonoderecorder.module,v retrieving revision 1.1.2.1 diff -u -b -r1.1.2.1 videonoderecorder.module --- videonoderecorder/videonoderecorder.module 3 Nov 2008 15:58:59 -0000 1.1.2.1 +++ videonoderecorder/videonoderecorder.module 25 Feb 2009 10:11:34 -0000 @@ -1,12 +1,73 @@ 'image_button', + '#title' => t('My button'), + '#return_value' => 'my_data', + '#src' => 'my/image/path.jpg', +); */ + +/* TODO Node previews and adding form fields to the node form. + There is a subtle but important difference in the way node previews (and other + such operations) are carried out when adding or editing a node. With the new + Forms API, the node form is handled as a multi-step form. When the node form + is previewed, all the form values are submitted, and the form is rebuilt with + those form values put into $form['#node']. Thus, form elements that are added + to the node form will lose any user input unless they set their '#default_value' + elements using this embedded node object. */ + +/* TODO New user_mail_tokens() method may be useful. + user.module now provides a user_mail_tokens() function to return an array + of the tokens available for the email notification messages it sends when + accounts are created, activated, blocked, etc. Contributed modules that + wish to make use of the same tokens for their own needs are encouraged + to use this function. */ + +/* TODO + There is a new hook_watchdog in core. This means that contributed modules + can implement hook_watchdog to log Drupal events to custom destinations. + Two core modules are included, dblog.module (formerly known as watchdog.module), + and syslog.module. Other modules in contrib include an emaillog.module, + included in the logging_alerts module. See syslog or emaillog for an + example on how to implement hook_watchdog. +function example_watchdog($log = array()) { + if ($log['severity'] == WATCHDOG_ALERT) { + mysms_send($log['user']->uid, + $log['type'], + $log['message'], + $log['variables'], + $log['severity'], + $log['referer'], + $log['ip'], + format_date($log['timestamp'])); + } +} */ + + + +/* TODO + An argument for replacements has been added to format_plural(), + escaping and/or theming the values just as done with t().*/ + /** * Implementation of hook_help */ -function videonoderecorder_help($section) { +function videonoderecorder_help($path, $arg) { - switch ($section) { + switch ($path) { case 'admin/settings/webcamvideo': return t('Configure your Red5 Flash Server endpoint as well as the Drupal content type to record webcam videos.'); break; @@ -31,15 +92,15 @@ /** * Implementation of hook_access. */ -function videonoderecorder_access($op, $node) { - global $user; +function videonoderecorder_access($op, $node, $account) { + - if ($op == 'create' && user_access('record webcam video')) { + if ($op == 'create' && user_access('record webcam video', $account)) { return TRUE; } if ($op == 'update' || $op == 'delete') { - if (user_access('edit own webcam video') && ($user->uid == $node->uid)) { + if (user_access('edit own webcam video', $account) && ($account->uid == $node->uid)) { return TRUE; } } @@ -48,35 +109,54 @@ /** * Implementation of hook_menu(). */ -function videonoderecorder_menu($may_cache) { +function videonoderecorder_menu() { $items = array(); // Page initializations - if (!$may_cache) { - - $items[] = array( - 'path' => 'node/add/webcamvideo', - 'title' => t('Webcam Video'), - 'callback' => 'videonoderecorder_recorder', - 'description' => t('Record a Flash video using a standard webcam.'), - 'access' => user_access('record webcam video'), - ); - - $items[] = array( - 'path' => 'admin/settings/webcamvideo', - 'title' => t('Webcam video'), - 'callback' => 'drupal_get_form', - 'callback arguments' => array('videonoderecorder_admin_settings'), - 'access' => user_access('administer webcam video'), +/* TODO + Non menu code that was placed in hook_menu under the '!$may_cache' block + so that it could be run during initialization, should now be moved to hook_init. + Previously we called hook_init twice, once early in the bootstrap process, second + just after the bootstrap has finished. The first instance is now called boot + instead of init. + + In Drupal 6, there are now two hooks that can be used by modules to execute code + at the beginning of a page request. hook_boot() replaces hook_boot() in Drupal 5 + and runs on each page request, even for cached pages. hook_boot() now only runs + for non-cached pages and thus can be used for code that was previously placed in + hook_menu() with $may_cache = FALSE: + + Dynamic menu items under a '!$may_cache' block can often be simplified + to remove references to arg(n) and use of '%