Skip to content

Commit

Permalink
Fix S3 addresses to be region-agnostic
Browse files Browse the repository at this point in the history
  • Loading branch information
@drlippman
drlippman committed Jun 11, 2017
1 parent ea7cfb2 commit 005fc83
Show file tree
Hide file tree
Showing 13 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion assessment/displayq2.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ function displayq($qnidx,$qidx,$seed,$doshowans,$showhints,$attemptn,$returnqtxt
$stm->execute(array(':qsetid'=>$qidx));
while ($row = $stm->fetch(PDO::FETCH_NUM)) {
if(isset($GLOBALS['CFG']['GEN']['AWSforcoursefiles']) && $GLOBALS['CFG']['GEN']['AWSforcoursefiles'] == true) {
${$row[0]} = "<img src=\"{$urlmode}s3.amazonaws.com/{$GLOBALS['AWSbucket']}/qimages/{$row[1]}\" alt=\"".htmlentities($row[2],ENT_QUOTES)."\" />";
${$row[0]} = "<img src=\"{$urlmode}{$GLOBALS['AWSbucket']}.s3.amazonaws.com/qimages/{$row[1]}\" alt=\"".htmlentities($row[2],ENT_QUOTES)."\" />";
} else {
${$row[0]} = "<img src=\"$imasroot/assessment/qimages/{$row[1]}\" alt=\"".htmlentities($row[2],ENT_QUOTES)."\" />";
}
Expand Down
4 changes: 2 additions & 2 deletions course/gradebook.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,7 @@ function gbstudisp($stu) {

if ($gbt[1][4][2]==1) {
if(isset($GLOBALS['CFG']['GEN']['AWSforcoursefiles']) && $GLOBALS['CFG']['GEN']['AWSforcoursefiles'] == true) {
echo "<img src=\"{$urlmode}s3.amazonaws.com/{$GLOBALS['AWSbucket']}/cfiles/userimg_sm{$gbt[1][4][0]}.jpg\" onclick=\"togglepic(this)\" class=\"mida\" alt=\"User picture\"/> ";
echo "<img src=\"{$urlmode}{$GLOBALS['AWSbucket']}.s3.amazonaws.com/cfiles/userimg_sm{$gbt[1][4][0]}.jpg\" onclick=\"togglepic(this)\" class=\"mida\" alt=\"User picture\"/> ";
} else {
echo "<img src=\"$imasroot/course/files/userimg_sm{$gbt[1][4][0]}.jpg\" style=\"float: left; padding-right:5px;\" onclick=\"togglepic(this)\" class=\"mida\" alt=\"User picture\"/>";
}
Expand Down Expand Up @@ -1615,7 +1615,7 @@ function gbinstrdisp() {
echo '</tr></thead><tbody>';
//create student rows
if(isset($GLOBALS['CFG']['GEN']['AWSforcoursefiles']) && $GLOBALS['CFG']['GEN']['AWSforcoursefiles'] == true) {
$userimgbase = $urlmode."s3.amazonaws.com/{$GLOBALS['AWSbucket']}/cfiles";
$userimgbase = $urlmode."{$GLOBALS['AWSbucket']}.s3.amazonaws.com/cfiles";
} else {
$userimgbase = "$imasroot/course/files";
}
Expand Down
4 changes: 2 additions & 2 deletions course/listusers.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@
<?php
if ($lineStudent['hasuserimg']==1) {
if(isset($GLOBALS['CFG']['GEN']['AWSforcoursefiles']) && $GLOBALS['CFG']['GEN']['AWSforcoursefiles'] == true) {
echo "<img src=\"{$urlmode}s3.amazonaws.com/{$GLOBALS['AWSbucket']}/cfiles/userimg_{$_GET['uid']}.jpg\" alt=\"User picture\"/> <input type=\"checkbox\" name=\"removepic\" value=\"1\" /> Remove ";
echo "<img src=\"{$urlmode}{$GLOBALS['AWSbucket']}.s3.amazonaws.com/cfiles/userimg_{$_GET['uid']}.jpg\" alt=\"User picture\"/> <input type=\"checkbox\" name=\"removepic\" value=\"1\" /> Remove ";
} else {
$curdir = rtrim(dirname(__FILE__), '/\\');
$galleryPath = "$curdir/course/files/";
Expand Down Expand Up @@ -822,7 +822,7 @@ function picshow(size) {

if ($line['hasuserimg']==1) {
if(isset($GLOBALS['CFG']['GEN']['AWSforcoursefiles']) && $GLOBALS['CFG']['GEN']['AWSforcoursefiles'] == true) {
echo "<img src=\"{$urlmode}s3.amazonaws.com/{$GLOBALS['AWSbucket']}/cfiles/userimg_sm{$line['userid']}.jpg\" style=\"display:none;\" alt=\"User picture\" />";
echo "<img src=\"{$urlmode}{$GLOBALS['AWSbucket']}.s3.amazonaws.com/cfiles/userimg_sm{$line['userid']}.jpg\" style=\"display:none;\" alt=\"User picture\" />";
} else {
echo "<img src=\"$imasroot/course/files/userimg_sm{$line['userid']}.jpg\" style=\"display:none;\" alt=\"User picture\" />";
}
Expand Down
4 changes: 2 additions & 2 deletions course/managestugrps.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,7 @@ function picshow(size) {
echo '<li>';
if ($hasuserimg[$uid]==1) {
if(isset($GLOBALS['CFG']['GEN']['AWSforcoursefiles']) && $GLOBALS['CFG']['GEN']['AWSforcoursefiles'] == true) {
echo "<img src=\"{$urlmode}s3.amazonaws.com/{$GLOBALS['AWSbucket']}/cfiles/userimg_sm{$uid}.jpg\" style=\"display:none;\" alt=\"User picture\" />";
echo "<img src=\"{$urlmode}{$GLOBALS['AWSbucket']}.s3.amazonaws.com/cfiles/userimg_sm{$uid}.jpg\" style=\"display:none;\" alt=\"User picture\" />";
} else {
echo "<img src=\"$imasroot/course/files/userimg_sm{$uid}.jpg\" style=\"display:none;\" alt=\"User picture\"/>";
}
Expand Down Expand Up @@ -779,7 +779,7 @@ function picshow(size) {
echo "<li><input type=\"checkbox\" name=\"stutoadd[]\" value=\"$uid\" id=\"chk$uid\"/><label for=\"chk$uid\">";
if ($hasuserimg[$uid]==1) {
if(isset($GLOBALS['CFG']['GEN']['AWSforcoursefiles']) && $GLOBALS['CFG']['GEN']['AWSforcoursefiles'] == true) {
echo "<img src=\"{$urlmode}s3.amazonaws.com/{$GLOBALS['AWSbucket']}/cfiles/userimg_sm{$uid}.jpg\" style=\"display:none;\" alt=\"User picture\"/>";
echo "<img src=\"{$urlmode}{$GLOBALS['AWSbucket']}.s3.amazonaws.com/cfiles/userimg_sm{$uid}.jpg\" style=\"display:none;\" alt=\"User picture\"/>";
} else {
echo "<img src=\"$imasroot/course/files/userimg_sm{$uid}.jpg\" style=\"display:none;\" alt=\"User picture\"/>";
}
Expand Down
4 changes: 2 additions & 2 deletions course/moddataset.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -820,7 +820,7 @@ function getvideoid($url) {
$qsPacket['id'] = isset($_GET['id']) ? $_GET['id'] : 0;
// Build img base url
if (isset($GLOBALS['CFG']['GEN']['AWSforcoursefiles']) && $GLOBALS['CFG']['GEN']['AWSforcoursefiles'] == true){
$qsPacket['imgUrlBase'] = $urlmode."s3.amazonaws.com/{$GLOBALS['AWSbucket']}/qimages/";
$qsPacket['imgUrlBase'] = $urlmode."{$GLOBALS['AWSbucket']}.s3.amazonaws.com/qimages/";
} else {
$qsPacket['imgUrlBase'] = "$imasroot/assessment/qimages/";
}
Expand Down Expand Up @@ -1233,7 +1233,7 @@ function decboxsize(box) {
if (isset($images['vars']) && count($images['vars'])>0) {
foreach ($images['vars'] as $id=>$var) {
if(isset($GLOBALS['CFG']['GEN']['AWSforcoursefiles']) && $GLOBALS['CFG']['GEN']['AWSforcoursefiles'] == true) {
$urlimg = $urlmode."s3.amazonaws.com/{$GLOBALS['AWSbucket']}/qimages/{$images['files'][$id]}";
$urlimg = $urlmode."{$GLOBALS['AWSbucket']}.s3.amazonaws.com/qimages/{$images['files'][$id]}";
} else {
$urlimg = "$imasroot/assessment/qimages/{$images['files'][$id]}";
}
Expand Down
2 changes: 1 addition & 1 deletion course/printlayoutbare.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ function printq($qn,$qsetid,$seed,$pts,$showpts) {
$stm->execute(array(':qsetid'=>$qsetid));
while ($row = $stm->fetch(PDO::FETCH_NUM)) {
if(isset($GLOBALS['CFG']['GEN']['AWSforcoursefiles']) && $GLOBALS['CFG']['GEN']['AWSforcoursefiles'] == true) {
${$row[0]} = "<img src=\"{$urlmode}s3.amazonaws.com/{$GLOBALS['AWSbucket']}/qimages/{$row[1]}\" alt=\"".htmlentities($row[2],ENT_QUOTES)."\" />";
${$row[0]} = "<img src=\"{$urlmode}{$GLOBALS['AWSbucket']}.s3.amazonaws.com/qimages/{$row[1]}\" alt=\"".htmlentities($row[2],ENT_QUOTES)."\" />";
} else {
${$row[0]} = "<img src=\"$imasroot/assessment/qimages/{$row[1]}\" alt=\"".htmlentities($row[2],ENT_QUOTES)."\" />";
}
Expand Down
2 changes: 1 addition & 1 deletion course/printlayoutword.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ function printq($qn,$qsetid,$seed,$pts,$showpts) {
$stm->execute(array(':qsetid'=>$qsetid));
while ($row = $stm->fetch(PDO::FETCH_NUM)) {
if(isset($GLOBALS['CFG']['GEN']['AWSforcoursefiles']) && $GLOBALS['CFG']['GEN']['AWSforcoursefiles'] == true) {
${$row[0]} = "<img src=\"{$urlmode}s3.amazonaws.com/{$GLOBALS['AWSbucket']}/qimages/{$row[1]}\" alt=\"".htmlentities($row[2],ENT_QUOTES)."\" />";
${$row[0]} = "<img src=\"{$urlmode}{$GLOBALS['AWSbucket']}.s3.amazonaws.com/qimages/{$row[1]}\" alt=\"".htmlentities($row[2],ENT_QUOTES)."\" />";
} else {
${$row[0]} = "<img src=\"$imasroot/assessment/qimages/{$row[1]}\" alt=\"".htmlentities($row[2],ENT_QUOTES)."\" />";
}
Expand Down
2 changes: 1 addition & 1 deletion forms.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
echo "<span class=\"formright\">";
if ($line['hasuserimg']==1) {
if(isset($GLOBALS['CFG']['GEN']['AWSforcoursefiles']) && $GLOBALS['CFG']['GEN']['AWSforcoursefiles'] == true) {
echo "<img src=\"{$urlmode}s3.amazonaws.com/{$GLOBALS['AWSbucket']}/cfiles/userimg_$userid.jpg\" alt=\"User picture\"/> <input type=\"checkbox\" name=\"removepic\" id=removepic value=\"1\" /> <label for=removepic>Remove</label> ";
echo "<img src=\"{$urlmode}{$GLOBALS['AWSbucket']}.s3.amazonaws.com/cfiles/userimg_$userid.jpg\" alt=\"User picture\"/> <input type=\"checkbox\" name=\"removepic\" id=removepic value=\"1\" /> <label for=removepic>Remove</label> ";
} else {
$curdir = rtrim(dirname(__FILE__), '/\\');
$galleryPath = "$curdir/course/files/";
Expand Down
2 changes: 1 addition & 1 deletion forums/posts.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ function printchildren($base,$restricttoowner=false) {
}
if ($hasuserimg[$child]==1) {
if(isset($GLOBALS['CFG']['GEN']['AWSforcoursefiles']) && $GLOBALS['CFG']['GEN']['AWSforcoursefiles'] == true) {
echo "<img src=\"{$urlmode}s3.amazonaws.com/{$GLOBALS['AWSbucket']}/cfiles/userimg_sm{$ownerid[$child]}.jpg\" onclick=\"togglepic(this)\" alt=\"User picture\"/>";
echo "<img src=\"{$urlmode}{$GLOBALS['AWSbucket']}.s3.amazonaws.com/cfiles/userimg_sm{$ownerid[$child]}.jpg\" onclick=\"togglepic(this)\" alt=\"User picture\"/>";
} else {
echo "<img src=\"$imasroot/course/files/userimg_sm{$ownerid[$child]}.jpg\" onclick=\"togglepic(this)\" alt=\"User picture\"/>";
}
Expand Down
2 changes: 1 addition & 1 deletion forums/postsbyname.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ function printuserposts($name, $uid, $content, $postcnt, $replycnt) {
echo $postcnt.($postcnt==1?' post':' posts').', '.$replycnt. ($replycnt==1?' reply':' replies').')';
if ($line['hasuserimg']==1) {
if(isset($GLOBALS['CFG']['GEN']['AWSforcoursefiles']) && $GLOBALS['CFG']['GEN']['AWSforcoursefiles'] == true) {
echo "<img src=\"{$urlmode}s3.amazonaws.com/{$GLOBALS['AWSbucket']}/cfiles/userimg_sm$uid.jpg\" onclick=\"togglepic(this)\" alt=\"Expand\"/>";
echo "<img src=\"{$urlmode}{$GLOBALS['AWSbucket']}.s3.amazonaws.com/cfiles/userimg_sm$uid.jpg\" onclick=\"togglepic(this)\" alt=\"Expand\"/>";
} else {
echo "<img src=\"$imasroot/course/files/userimg_sm$uid.jpg\" onclick=\"togglepic(this)\" alt=\"Expand\"/>";
}
Expand Down
4 changes: 2 additions & 2 deletions msgs/msglist.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ function updateTo(el) {
$curdir = rtrim(dirname(__FILE__), '/\\');
if (isset($_GET['to']) && $row[4]==1) {
if(isset($GLOBALS['CFG']['GEN']['AWSforcoursefiles']) && $GLOBALS['CFG']['GEN']['AWSforcoursefiles'] == true) {
echo " <img style=\"vertical-align: middle;\" src=\"{$urlmode}s3.amazonaws.com/{$GLOBALS['AWSbucket']}/cfiles/userimg_sm$to.jpg\" onclick=\"togglepic(this)\" alt=\"User picture\"/><br/>";
echo " <img style=\"vertical-align: middle;\" src=\"{$urlmode}{$GLOBALS['AWSbucket']}.s3.amazonaws.com/cfiles/userimg_sm$to.jpg\" onclick=\"togglepic(this)\" alt=\"User picture\"/><br/>";
} else {
echo " <img style=\"vertical-align: middle;\" src=\"$imasroot/course/files/userimg_sm$to.jpg\" onclick=\"togglepic(this)\" alt=\"User picture\"/><br/>";
}
Expand Down Expand Up @@ -933,7 +933,7 @@ function chgfilter() {

if ($line['hasuserimg']==1) {
if(isset($GLOBALS['CFG']['GEN']['AWSforcoursefiles']) && $GLOBALS['CFG']['GEN']['AWSforcoursefiles'] == true) {
echo " <img src=\"{$urlmode}s3.amazonaws.com/{$GLOBALS['AWSbucket']}/cfiles/userimg_sm{$line['msgfrom']}.jpg\" style=\"display:none;\" class=\"userpic\" alt=\"User picture\"/>";
echo " <img src=\"{$urlmode}{$GLOBALS['AWSbucket']}.s3.amazonaws.com/cfiles/userimg_sm{$line['msgfrom']}.jpg\" style=\"display:none;\" class=\"userpic\" alt=\"User picture\"/>";
} else {
echo " <img src=\"$imasroot/course/files/userimg_sm{$line['msgfrom']}.jpg\" style=\"display:none;\" class=\"userpic\" alt=\"User picture\"/>";
}
Expand Down
2 changes: 1 addition & 1 deletion msgs/viewmsg.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ function showtrimmed(el) {
$curdir = rtrim(dirname(__FILE__), '/\\');
if ($line['hasuserimg']==1) {
if(isset($GLOBALS['CFG']['GEN']['AWSforcoursefiles']) && $GLOBALS['CFG']['GEN']['AWSforcoursefiles'] == true) {
echo " <img style=\"float:left;\" src=\"{$urlmode}s3.amazonaws.com/{$GLOBALS['AWSbucket']}/cfiles/userimg_sm{$line['msgfrom']}.jpg\" onclick=\"togglepic(this)\" alt=\"User picture\"/><br/>";
echo " <img style=\"float:left;\" src=\"{$urlmode}{$GLOBALS['AWSbucket']}.s3.amazonaws.com/cfiles/userimg_sm{$line['msgfrom']}.jpg\" onclick=\"togglepic(this)\" alt=\"User picture\"/><br/>";
} else {
echo " <img style=\"float:left;\" src=\"$imasroot/course/files/userimg_sm{$line['msgfrom']}.jpg\" onclick=\"togglepic(this)\" alt=\"User picture\"/><br/>";
}
Expand Down
2 changes: 1 addition & 1 deletion util/mbx.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ function mbxproc($qn,$qsetid,$seed) {
$stm->execute(array(':qsetid'=>$qsetid));
while ($row = $stm->fetch(PDO::FETCH_NUM)) {
if(isset($GLOBALS['CFG']['GEN']['AWSforcoursefiles']) && $GLOBALS['CFG']['GEN']['AWSforcoursefiles'] == true) {
${$row[0]} = "<img src=\"https://s3.amazonaws.com/{$GLOBALS['AWSbucket']}/qimages/{$row[1]}\" alt=\"".htmlentities($row[2],ENT_QUOTES)."\" />";
${$row[0]} = "<img src=\"https://{$GLOBALS['AWSbucket']}.s3.amazonaws.com/qimages/{$row[1]}\" alt=\"".htmlentities($row[2],ENT_QUOTES)."\" />";
} else {
${$row[0]} = "<img src=\"$basesiteurl/assessment/qimages/{$row[1]}\" alt=\"".htmlentities($row[2],ENT_QUOTES)."\" />";
}
Expand Down

0 comments on commit 005fc83

Please sign in to comment.