aboutsummaryrefslogtreecommitdiff
path: root/mod/file
diff options
context:
space:
mode:
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-30 22:15:36 +0000
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-30 22:15:36 +0000
commit9255088a79a034c3cdf4eb46124504b9dd0c838e (patch)
treea225048f7475ea8ddb4820b539f8482655d9da8e /mod/file
parent323e3ee1dafdf7bdd60607fd960e53957fce770d (diff)
downloadelgg-9255088a79a034c3cdf4eb46124504b9dd0c838e.tar.gz
elgg-9255088a79a034c3cdf4eb46124504b9dd0c838e.tar.bz2
Refs #2598: Converted virtually all uses of $CONFIG->wwwroot to elgg_get_site_url()
git-svn-id: http://code.elgg.org/elgg/trunk@7146 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/file')
-rw-r--r--mod/file/actions/save.php4
-rw-r--r--mod/file/actions/upload.php2
-rw-r--r--mod/file/start.php4
-rw-r--r--mod/file/views/default/file/icon/application/default.php2
-rw-r--r--mod/file/views/default/file/icon/application/excel.php2
-rw-r--r--mod/file/views/default/file/icon/application/msword.php2
-rw-r--r--mod/file/views/default/file/icon/application/pdf.php2
-rw-r--r--mod/file/views/default/file/icon/application/powerpoint.php2
-rw-r--r--mod/file/views/default/file/icon/application/vnd.ms-excel.php2
-rw-r--r--mod/file/views/default/file/icon/application/vnd.ms-powerpoint.php2
-rw-r--r--mod/file/views/default/file/icon/application/vnd.oasis.opendocument.text.php2
-rw-r--r--mod/file/views/default/file/icon/archive.php2
-rw-r--r--mod/file/views/default/file/icon/audio.php2
-rw-r--r--mod/file/views/default/file/icon/default.php2
-rw-r--r--mod/file/views/default/file/icon/document.php2
-rw-r--r--mod/file/views/default/file/icon/text/directory.php2
-rw-r--r--mod/file/views/default/file/icon/video.php2
17 files changed, 19 insertions, 19 deletions
diff --git a/mod/file/actions/save.php b/mod/file/actions/save.php
index 923bc043b..17a9b16fb 100644
--- a/mod/file/actions/save.php
+++ b/mod/file/actions/save.php
@@ -17,7 +17,7 @@
if (!$file = get_entity($guid)) {
register_error(elgg_echo("file:uploadfailed"));
- forward($CONFIG->wwwroot . "pg/file/" . get_loggedin_user()->username);
+ forward(elgg_get_site_url() . "pg/file/" . get_loggedin_user()->username);
exit;
}
@@ -44,5 +44,5 @@
else
register_error(elgg_echo("file:uploadfailed"));
- forward($CONFIG->wwwroot . "pg/file/" . $container->username);
+ forward(elgg_get_site_url() . "pg/file/" . $container->username);
?> \ No newline at end of file
diff --git a/mod/file/actions/upload.php b/mod/file/actions/upload.php
index 367488d7c..82744730c 100644
--- a/mod/file/actions/upload.php
+++ b/mod/file/actions/upload.php
@@ -193,7 +193,7 @@
if (!$ajax) {
$container_user = get_entity($container_guid);
- forward($CONFIG->wwwroot . "pg/file/" . $container_user->username);
+ forward(elgg_get_site_url() . "pg/file/" . $container_user->username);
}
} else {
diff --git a/mod/file/start.php b/mod/file/start.php
index 60e863df5..228e4788b 100644
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -28,7 +28,7 @@
global $CONFIG;
// Set up menu (tools dropdown)
- add_menu(elgg_echo('files'), $CONFIG->wwwroot . "pg/file/");
+ add_menu(elgg_echo('files'), elgg_get_site_url() . "pg/file/");
// Extend CSS
elgg_extend_view('css', 'file/css');
@@ -138,7 +138,7 @@
$descr = $entity->description;
$title = $entity->title;
global $CONFIG;
- $url = $CONFIG->wwwroot . "pg/view/" . $entity->guid;
+ $url = elgg_get_site_url() . "pg/view/" . $entity->guid;
if ($method == 'sms') {
$owner = $entity->getOwnerEntity();
return $owner->name . ' ' . elgg_echo("file:via") . ': ' . $url . ' (' . $title . ')';
diff --git a/mod/file/views/default/file/icon/application/default.php b/mod/file/views/default/file/icon/application/default.php
index eea8cbafe..d9d60901b 100644
--- a/mod/file/views/default/file/icon/application/default.php
+++ b/mod/file/views/default/file/icon/application/default.php
@@ -5,6 +5,6 @@
} else {
$ext = '';
}
- echo "<img src=\"{$CONFIG->wwwroot}mod/file/graphics/icons/application{$ext}.gif\" border=\"0\" />";
+ echo "<img src=\"".elgg_get_site_url()."mod/file/graphics/icons/application{$ext}.gif\" border=\"0\" />";
?> \ No newline at end of file
diff --git a/mod/file/views/default/file/icon/application/excel.php b/mod/file/views/default/file/icon/application/excel.php
index ba2460fec..a4123ea6e 100644
--- a/mod/file/views/default/file/icon/application/excel.php
+++ b/mod/file/views/default/file/icon/application/excel.php
@@ -5,6 +5,6 @@
} else {
$ext = '';
}
- echo "<img src=\"{$CONFIG->wwwroot}mod/file/graphics/icons/excel{$ext}.gif\" border=\"0\" />";
+ echo "<img src=\"".elgg_get_site_url()."mod/file/graphics/icons/excel{$ext}.gif\" border=\"0\" />";
?> \ No newline at end of file
diff --git a/mod/file/views/default/file/icon/application/msword.php b/mod/file/views/default/file/icon/application/msword.php
index 20efb1069..074f7ed91 100644
--- a/mod/file/views/default/file/icon/application/msword.php
+++ b/mod/file/views/default/file/icon/application/msword.php
@@ -5,6 +5,6 @@
} else {
$ext = '';
}
- echo "<img src=\"{$CONFIG->wwwroot}mod/file/graphics/icons/word{$ext}.gif\" border=\"0\" />";
+ echo "<img src=\"".elgg_get_site_url()."mod/file/graphics/icons/word{$ext}.gif\" border=\"0\" />";
?> \ No newline at end of file
diff --git a/mod/file/views/default/file/icon/application/pdf.php b/mod/file/views/default/file/icon/application/pdf.php
index 6a5a7369c..1aeafdb7b 100644
--- a/mod/file/views/default/file/icon/application/pdf.php
+++ b/mod/file/views/default/file/icon/application/pdf.php
@@ -5,6 +5,6 @@
} else {
$ext = '';
}
- echo "<img src=\"{$CONFIG->wwwroot}mod/file/graphics/icons/pdf{$ext}.gif\" border=\"0\" />";
+ echo "<img src=\"".elgg_get_site_url()."mod/file/graphics/icons/pdf{$ext}.gif\" border=\"0\" />";
?> \ No newline at end of file
diff --git a/mod/file/views/default/file/icon/application/powerpoint.php b/mod/file/views/default/file/icon/application/powerpoint.php
index 1857d513f..47a15b639 100644
--- a/mod/file/views/default/file/icon/application/powerpoint.php
+++ b/mod/file/views/default/file/icon/application/powerpoint.php
@@ -5,6 +5,6 @@
} else {
$ext = '';
}
- echo "<img src=\"{$CONFIG->wwwroot}mod/file/graphics/icons/ppt{$ext}.gif\" border=\"0\" />";
+ echo "<img src=\"".elgg_get_site_url()."mod/file/graphics/icons/ppt{$ext}.gif\" border=\"0\" />";
?> \ No newline at end of file
diff --git a/mod/file/views/default/file/icon/application/vnd.ms-excel.php b/mod/file/views/default/file/icon/application/vnd.ms-excel.php
index ba2460fec..a4123ea6e 100644
--- a/mod/file/views/default/file/icon/application/vnd.ms-excel.php
+++ b/mod/file/views/default/file/icon/application/vnd.ms-excel.php
@@ -5,6 +5,6 @@
} else {
$ext = '';
}
- echo "<img src=\"{$CONFIG->wwwroot}mod/file/graphics/icons/excel{$ext}.gif\" border=\"0\" />";
+ echo "<img src=\"".elgg_get_site_url()."mod/file/graphics/icons/excel{$ext}.gif\" border=\"0\" />";
?> \ No newline at end of file
diff --git a/mod/file/views/default/file/icon/application/vnd.ms-powerpoint.php b/mod/file/views/default/file/icon/application/vnd.ms-powerpoint.php
index 1857d513f..47a15b639 100644
--- a/mod/file/views/default/file/icon/application/vnd.ms-powerpoint.php
+++ b/mod/file/views/default/file/icon/application/vnd.ms-powerpoint.php
@@ -5,6 +5,6 @@
} else {
$ext = '';
}
- echo "<img src=\"{$CONFIG->wwwroot}mod/file/graphics/icons/ppt{$ext}.gif\" border=\"0\" />";
+ echo "<img src=\"".elgg_get_site_url()."mod/file/graphics/icons/ppt{$ext}.gif\" border=\"0\" />";
?> \ No newline at end of file
diff --git a/mod/file/views/default/file/icon/application/vnd.oasis.opendocument.text.php b/mod/file/views/default/file/icon/application/vnd.oasis.opendocument.text.php
index d0bde81df..309977160 100644
--- a/mod/file/views/default/file/icon/application/vnd.oasis.opendocument.text.php
+++ b/mod/file/views/default/file/icon/application/vnd.oasis.opendocument.text.php
@@ -5,6 +5,6 @@
} else {
$ext = '';
}
- echo "<img src=\"{$CONFIG->wwwroot}mod/file/graphics/icons/openoffice{$ext}.gif\" border=\"0\" />";
+ echo "<img src=\"".elgg_get_site_url()."mod/file/graphics/icons/openoffice{$ext}.gif\" border=\"0\" />";
?> \ No newline at end of file
diff --git a/mod/file/views/default/file/icon/archive.php b/mod/file/views/default/file/icon/archive.php
index 4fffd9346..694574e8f 100644
--- a/mod/file/views/default/file/icon/archive.php
+++ b/mod/file/views/default/file/icon/archive.php
@@ -5,6 +5,6 @@
} else {
$ext = '';
}
- echo "<img src=\"{$CONFIG->wwwroot}mod/file/graphics/icons/archive{$ext}.gif\" border=\"0\" />";
+ echo "<img src=\"".elgg_get_site_url()."mod/file/graphics/icons/archive{$ext}.gif\" border=\"0\" />";
?> \ No newline at end of file
diff --git a/mod/file/views/default/file/icon/audio.php b/mod/file/views/default/file/icon/audio.php
index 73c55be7b..ce6f6ab4f 100644
--- a/mod/file/views/default/file/icon/audio.php
+++ b/mod/file/views/default/file/icon/audio.php
@@ -5,6 +5,6 @@
} else {
$ext = '';
}
- echo "<img src=\"{$CONFIG->wwwroot}mod/file/graphics/icons/music{$ext}.gif\" border=\"0\" />";
+ echo "<img src=\"".elgg_get_site_url()."mod/file/graphics/icons/music{$ext}.gif\" border=\"0\" />";
?> \ No newline at end of file
diff --git a/mod/file/views/default/file/icon/default.php b/mod/file/views/default/file/icon/default.php
index 844ee312c..ed1b71547 100644
--- a/mod/file/views/default/file/icon/default.php
+++ b/mod/file/views/default/file/icon/default.php
@@ -5,6 +5,6 @@
} else {
$ext = '';
}
- echo "{$CONFIG->wwwroot}mod/file/graphics/icons/general{$ext}.gif";
+ echo elgg_get_site_url()."mod/file/graphics/icons/general{$ext}.gif";
?> \ No newline at end of file
diff --git a/mod/file/views/default/file/icon/document.php b/mod/file/views/default/file/icon/document.php
index 8823514b8..fed4660fb 100644
--- a/mod/file/views/default/file/icon/document.php
+++ b/mod/file/views/default/file/icon/document.php
@@ -5,6 +5,6 @@
} else {
$ext = '';
}
- echo "<img src=\"{$CONFIG->wwwroot}mod/file/graphics/icons/text{$ext}.gif\" border=\"0\" />";
+ echo "<img src=\"".elgg_get_site_url()."mod/file/graphics/icons/text{$ext}.gif\" border=\"0\" />";
?> \ No newline at end of file
diff --git a/mod/file/views/default/file/icon/text/directory.php b/mod/file/views/default/file/icon/text/directory.php
index a08e098c6..863e53d68 100644
--- a/mod/file/views/default/file/icon/text/directory.php
+++ b/mod/file/views/default/file/icon/text/directory.php
@@ -5,6 +5,6 @@
} else {
$ext = '';
}
- echo "<img src=\"{$CONFIG->wwwroot}mod/file/graphics/icons/vcard{$ext}.gif\" border=\"0\" />";
+ echo "<img src=\"".elgg_get_site_url()."mod/file/graphics/icons/vcard{$ext}.gif\" border=\"0\" />";
?> \ No newline at end of file
diff --git a/mod/file/views/default/file/icon/video.php b/mod/file/views/default/file/icon/video.php
index 94617abff..db3f001f7 100644
--- a/mod/file/views/default/file/icon/video.php
+++ b/mod/file/views/default/file/icon/video.php
@@ -5,6 +5,6 @@
} else {
$ext = '';
}
- echo "<img src=\"{$CONFIG->wwwroot}mod/file/graphics/icons/video{$ext}.gif\" border=\"0\" />";
+ echo "<img src=\"".elgg_get_site_url()."mod/file/graphics/icons/video{$ext}.gif\" border=\"0\" />";
?> \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 13:54:29 +0000