aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeshan Wanigasooriya <heshanmw@gmail.com>2011-01-08 05:53:04 +0000
committerHeshan Wanigasooriya <heshanmw@gmail.com>2011-01-08 05:53:04 +0000
commitd1ef125d9d6b772922411187baaaf3402316c431 (patch)
treeb6b3d379d305d7c67019151b5e847c97c463ba18
parent42bb65a75da1adb88f07d01677e2b80ee6b59039 (diff)
downloadvideo-d1ef125d9d6b772922411187baaaf3402316c431.tar.gz
video-d1ef125d9d6b772922411187baaaf3402316c431.tar.bz2
D7 ready : updating the admin interface for D7
-rw-r--r--includes/filesystem.inc6
-rw-r--r--includes/metadata.inc6
-rw-r--r--includes/preset.inc4
-rw-r--r--includes/transcoder.inc6
4 files changed, 11 insertions, 11 deletions
diff --git a/includes/filesystem.inc b/includes/filesystem.inc
index d7c71f9..26a0060 100644
--- a/includes/filesystem.inc
+++ b/includes/filesystem.inc
@@ -20,7 +20,7 @@ class video_filesystem {
foreach ($modules as $module) {
$mobule_files = array();
$module_path = drupal_get_path('module', $module) . '/filesystem';
- $mobule_files = file_scan_directory($module_path, '^.*\.inc$');
+ $mobule_files = file_scan_directory($module_path, '/.*\.inc/');
if (is_array($mobule_files)) {
foreach ($mobule_files as $file) {
if ($file->name == $filesystem)
@@ -70,13 +70,13 @@ class video_filesystem {
// We do this by scanning our transcoders folder
$form = array('radios' => array(), 'help' => array(), 'admin_settings' => array());
$path = drupal_get_path('module', 'video') . '/filesystem';
- $files = file_scan_directory($path, '^.*\.inc$');
+ $files = file_scan_directory($path, '/.*\.inc/');
// check inside sub modules
$modules = module_list();
foreach ($modules as $module) {
$mobule_files = array();
$module_path = drupal_get_path('module', $module) . '/filesystem';
- $mobule_files = file_scan_directory($module_path, '^.*\.inc$');
+ $mobule_files = file_scan_directory($module_path, '/.*\.inc/');
$files = array_merge($files, $mobule_files);
}
diff --git a/includes/metadata.inc b/includes/metadata.inc
index c2ad5c3..6dddce6 100644
--- a/includes/metadata.inc
+++ b/includes/metadata.inc
@@ -20,7 +20,7 @@ class video_metadata {
foreach ($modules as $module) {
$mobule_files = array();
$module_path = drupal_get_path('module', $module) . '/metadata';
- $mobule_files = file_scan_directory($module_path, '^.*\.inc$');
+ $mobule_files = file_scan_directory($module_path, '/.*\.inc/');
if (is_array($mobule_files)) {
foreach ($mobule_files as $file) {
if ($file->name == $metadata)
@@ -77,13 +77,13 @@ class video_metadata {
// We do this by scanning our transcoders folder
$form = array('radios' => array(), 'help' => array(), 'admin_settings' => array());
$path = drupal_get_path('module', 'video') . '/metadata';
- $files = file_scan_directory($path, '^.*\.inc$');
+ $files = file_scan_directory($path, '/.*\.inc/');
// check inside sub modules
$modules = module_list();
foreach ($modules as $module) {
$mobule_files = array();
$module_path = drupal_get_path('module', $module) . '/metadata';
- $mobule_files = file_scan_directory($module_path, '^.*\.inc$');
+ $mobule_files = file_scan_directory($module_path, '/.*\.inc/');
$files = array_merge($files, $mobule_files);
}
diff --git a/includes/preset.inc b/includes/preset.inc
index aca0b26..1b0f6c4 100644
--- a/includes/preset.inc
+++ b/includes/preset.inc
@@ -64,13 +64,13 @@ class video_preset {
// We do this by scanning our transcoders folder
$form = array('radios' => array(), 'help' => array(), 'properties' => array());
$path = drupal_get_path('module', 'video') . '/video_preset';
- $files = file_scan_directory($path, '^.*\.inc$');
+ $files = file_scan_directory($path, '/.*\.inc/');
// check inside sub modules
$modules = module_list();
foreach ($modules as $module) {
$mobule_files = array();
$module_path = drupal_get_path('module', $module) . '/video_preset';
- $mobule_files = file_scan_directory($module_path, '^.*\.inc$');
+ $mobule_files = file_scan_directory($module_path, '/.*\.inc/');
$files = array_merge($files, $mobule_files);
}
diff --git a/includes/transcoder.inc b/includes/transcoder.inc
index 8d604a5..7de2ee5 100644
--- a/includes/transcoder.inc
+++ b/includes/transcoder.inc
@@ -35,7 +35,7 @@ class video_transcoder {
$files = array();
foreach ($modules as $module) {
$module_path = drupal_get_path('module', $module) . '/transcoders';
- $inc_files = file_scan_directory($module_path, '^.*\.inc$');
+ $inc_files = file_scan_directory($module_path, '/.*\.inc/');
if (!empty($inc_files))
$files[$module] = $inc_files;
}
@@ -109,13 +109,13 @@ class video_transcoder {
// We do this by scanning our transcoders folder
$form = array('radios' => array(), 'help' => array(), 'admin_settings' => array());
$path = drupal_get_path('module', 'video') . '/transcoders';
- $files = file_scan_directory($path, '^.*\.inc$');
+ $files = file_scan_directory($path, '/.*\.inc/');
// check inside sub modules
$modules = module_list();
foreach ($modules as $module) {
$mobule_files = array();
$module_path = drupal_get_path('module', $module) . '/transcoders';
- $mobule_files = file_scan_directory($module_path, '^.*\.inc$');
+ $mobule_files = file_scan_directory($module_path, '/.*\.inc/');
$files = array_merge($files, $mobule_files);
}