diff --git a/attachment.php b/attachment.php index d000359..d9c83c5 100644 --- a/attachment.php +++ b/attachment.php @@ -97,7 +97,7 @@ else: // Get Last-Modified and calculate an E-Tag to allow revalidation via HEAD. Support for conditionals will come later $mtime=filemtime($conf->jirahome."/data/attachments/$ident/$ident-${key[1]}/thumbs/_thumb_{$id}.png"); $dstring=gmdate('D, d M Y H:i:s T',$mtime); - $etag='"f' . md5("$i-{$ident}-{$key[1]}-{$id}-$mtime").'"'; + $etag='"f' . md5("file-{$ident}-{$key[1]}-{$id}-$mtime").'"'; header("Last-Modified: " .$dstring); header("ETag: $etag"); diff --git a/config.php b/config.php index a053e5f..0a1c9e4 100644 --- a/config.php +++ b/config.php @@ -29,9 +29,7 @@ $conf->customUsernames = true; // Set this to true if you want to honour anythin // Limit requests for a given IP to a specific set of project keys, prefix the IP with a lowercase a $conf->IPProjectRestrictions = array('a46.32.254.153'=> - 'VFJ,MCI,MAILARCHIV,PHPCRED,NLA,GPXIN,VCL,VEHPI,JILS,BTFW,PIDVR,PLGSCH,PHPCBA,URLBRND,VEH,BUGGER,JWL,MGF,BHAYSTACKG,DNSCHAT,MISC,HLS,HLSDVD,PAS,XMLRPCPLG,LOC,ADBLK,FKAMP,VID', -'a192.168.1.70'=> - 'VFJ,MCI,MAILARCHIV,PHPCRED,NLA,GPXIN,VCL,VEHPI,JILS,BTFW,PIDVR,PLGSCH,PHPCBA,URLBRND,VEH,BUGGER,JWL,MGF,BHAYSTACKG,DNSCHAT,MISC,HLS,HLSDVD,PAS,XMLRPCPLG,LOC,ADBLK,FKAMP,VID' + 'VFJ,MCI,MAILARCHIV,PHPCRED,NLA,GPXIN,VCL,VEHPI,JILS,BTFW,PIDVR,PLGSCH,PHPCBA,URLBRND,VEH,BUGGER,JWL,MGF,BHAYSTACKG,DNSCHAT,MISC,HLS,HLSDVD,PAS,XMLRPCPLG,LOC,ADBLK,FKAMP,VID' ); // Example: array('a192.168.1.2'=> 'FOO,BAR,CHAR'); diff --git a/queries/project-index.php b/queries/project-index.php index 85ff84c..242b3a2 100644 --- a/queries/project-index.php +++ b/queries/project-index.php @@ -106,7 +106,7 @@ $db->setQuery($sql); $components = $db->loadResults(); /** TODO: Sort this mess out! */ -$projdesc = "

".htmlspecialchars($project->pkey).": ".htmlentities(htmlspecialchars($project->pname))."


"; +$projdesc = "

".htmlspecialchars($project->pkey).": ".htmlentities(htmlspecialchars(utf8_encode($project->pname)))."


"; $projdesc .= '