Browse Source

Filename conventions.

pull/258/head
Nigel Banks 12 years ago
parent
commit
e18a7498a6
  1. 0
      includes/authtokens.inc
  2. 0
      includes/object.entity_controller.inc
  3. 0
      includes/tuque.inc
  4. 0
      includes/tuque_wrapper.inc
  5. 12
      islandora.info
  6. 8
      islandora.module
  7. 6
      tests/authtokens.test
  8. 0
      tests/hooks.test
  9. 3
      tests/islandora_test.info
  10. 0
      tests/islandora_test.module
  11. 0
      tests/web_test_case.inc
  12. 0
      theme/theme.inc

0
includes/islandora_authtokens.inc → includes/authtokens.inc

0
includes/islandora_object.entity_controller.inc → includes/object.entity_controller.inc

0
includes/islandora_tuque.inc → includes/tuque.inc

0
includes/islandora_tuque_wrapper.inc → includes/tuque_wrapper.inc

12
islandora.info

@ -8,10 +8,10 @@ stylesheets[all][] = css/islandora.base.css
stylesheets[all][] = css/islandora.theme.css stylesheets[all][] = css/islandora.theme.css
files[] = includes/mime_detect.inc files[] = includes/mime_detect.inc
files[] = includes/dublin_core.inc files[] = includes/dublin_core.inc
files[] = includes/islandora_tuque.inc files[] = includes/tuque.inc
files[] = includes/islandora_tuque_wrapper.inc files[] = includes/tuque_wrapper.inc
files[] = includes/islandora_object.entity_controller.inc files[] = includes/object.entity_controller.inc
files[] = tests/islandora_web_test_case.inc files[] = tests/web_test_case.inc
files[] = tests/islandora_authtokens.test files[] = tests/authtokens.test
files[] = tests/islandora_hooks.test files[] = tests/hooks.test
php = 5.3 php = 5.3

8
islandora.module

@ -227,13 +227,13 @@ function islandora_theme() {
return array( return array(
// default object template // default object template
'islandora_default' => array( 'islandora_default' => array(
'file' => 'theme/islandora.theme.inc', 'file' => 'theme/theme.inc',
'template' => 'theme/islandora-object', 'template' => 'theme/islandora-object',
'variables' => array('islandora_object' => NULL), 'variables' => array('islandora_object' => NULL),
), ),
// default edit page // default edit page
'islandora_default_edit' => array( 'islandora_default_edit' => array(
'file' => 'theme/islandora.theme.inc', 'file' => 'theme/theme.inc',
'template' => 'theme/islandora-object-edit', 'template' => 'theme/islandora-object-edit',
'variables' => array('islandora_object' => NULL), 'variables' => array('islandora_object' => NULL),
), ),
@ -615,7 +615,7 @@ function islandora_tokened_object_load($object_id, $map) {
if (array_key_exists('token', $_GET)) { if (array_key_exists('token', $_GET)) {
$token = filter_input(INPUT_GET, 'token', FILTER_SANITIZE_STRING); $token = filter_input(INPUT_GET, 'token', FILTER_SANITIZE_STRING);
if ($token) { if ($token) {
module_load_include('inc', 'islandora', 'includes/islandora_authtokens'); module_load_include('inc', 'islandora', 'includes/authtokens');
$token_user = islandora_validate_object_token($object_id, $map[4], $token); $token_user = islandora_validate_object_token($object_id, $map[4], $token);
$token_user = $token_user ? user_load($token_user->uid) : NULL; $token_user = $token_user ? user_load($token_user->uid) : NULL;
islandora_get_tuque_connection($token_user); islandora_get_tuque_connection($token_user);
@ -794,7 +794,7 @@ function islandora_delete_datastream(FedoraDatastream &$datastream) {
* Removes expired authentication tokens. * Removes expired authentication tokens.
*/ */
function islandora_cron() { function islandora_cron() {
module_load_include('inc', 'islandora', 'includes/islandora_authtokens'); module_load_include('inc', 'islandora', 'includes/authtokens');
islandora_remove_expired_tokens(); islandora_remove_expired_tokens();
} }

6
tests/islandora_authtokens.test → tests/authtokens.test

@ -29,7 +29,7 @@ class IslandoraAuthtokensTestCase extends IslandoraWebTestCase {
* Test redeeming invalid tokens. * Test redeeming invalid tokens.
*/ */
public function testRedeemInvalidToken() { public function testRedeemInvalidToken() {
module_load_include('inc', 'islandora', 'includes/islandora_authtokens'); module_load_include('inc', 'islandora', 'includes/authtokens');
$token = islandora_get_object_token('test:pid', 'woot', 1); $token = islandora_get_object_token('test:pid', 'woot', 1);
$this->assertTrue($token, 'Token was generated correctly.', 'Unit Tests'); $this->assertTrue($token, 'Token was generated correctly.', 'Unit Tests');
// Redeem a token that doesn't exist with real pid and dsid. // Redeem a token that doesn't exist with real pid and dsid.
@ -41,7 +41,7 @@ class IslandoraAuthtokensTestCase extends IslandoraWebTestCase {
* Test redeeming valid tokens. * Test redeeming valid tokens.
*/ */
public function testRedeemValidToken() { public function testRedeemValidToken() {
module_load_include('inc', 'islandora', 'includes/islandora_authtokens'); module_load_include('inc', 'islandora', 'includes/authtokens');
// Change the current user. // Change the current user.
global $user; global $user;
$user_backup = $user; $user_backup = $user;
@ -82,7 +82,7 @@ class IslandoraAuthtokensTestCase extends IslandoraWebTestCase {
// Do some voodoo to get a token as the user we are connecting as // Do some voodoo to get a token as the user we are connecting as
// to do this we need to change the user we are logged in as. // to do this we need to change the user we are logged in as.
module_load_include('inc', 'islandora', 'includes/islandora_authtokens'); module_load_include('inc', 'islandora', 'includes/authtokens');
global $user; global $user;
$backup = $user; $backup = $user;
$user = $account; $user = $account;

0
tests/islandora_hooks.test → tests/hooks.test

3
tests/islandora_hooks_test.info → tests/islandora_test.info

@ -1,7 +1,6 @@
name = Islandora Hook testing name = Islandora Test Module
description = Tests Hooks. Do not enable. description = Tests Hooks. Do not enable.
core = 7.x core = 7.x
package = Testing package = Testing
hidden = TRUE hidden = TRUE
dependencies[] = islandora dependencies[] = islandora
files[] = islandora_hooks_test.module

0
tests/islandora_hooks_test.module → tests/islandora_test.module

0
tests/islandora_web_test_case.inc → tests/web_test_case.inc

0
theme/islandora.theme.inc → theme/theme.inc

Loading…
Cancel
Save