diff options
| author | Git <git@what.cd> | 2016-01-06 08:00:29 +0000 |
|---|---|---|
| committer | Git <git@what.cd> | 2016-01-06 08:00:29 +0000 |
| commit | ef4a741d8ba6648c02915510bd6ca6689e23758e (patch) | |
| tree | 22bc97b8eaeac2f2b0305573a0aa01a996a7a966 | |
| parent | 9f072764d32e813a2af62dae89cd3a1bcd258a41 (diff) | |
| download | Gazelle-ef4a741d8ba6648c02915510bd6ca6689e23758e.zip Gazelle-ef4a741d8ba6648c02915510bd6ca6689e23758e.tar.gz Gazelle-ef4a741d8ba6648c02915510bd6ca6689e23758e.tar.bz2 | |
Empty commit
| -rw-r--r-- | docs/CHANGES.txt | 3 | ||||
| -rw-r--r-- | sections/staffpm/common_responses.php | 4 | ||||
| -rw-r--r-- | sections/staffpm/viewconv.php | 3 | ||||
| -rw-r--r-- | sections/tools/development/update_geoip.php | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 6909973..8d7fedf 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -1,5 +1,8 @@ CHANGE LOG +2016-01-05 by newman +Left align staff PM common answer preview. Sort staff PM common responses alphabetically instead of by ID + 2016-01-03 by newman Fix several permissions bugs diff --git a/sections/staffpm/common_responses.php b/sections/staffpm/common_responses.php index 7a849ec..9fcae09 100644 --- a/sections/staffpm/common_responses.php +++ b/sections/staffpm/common_responses.php @@ -61,7 +61,7 @@ View::show_header('Staff PMs', 'staffpm'); $DB->query(" SELECT ID, Message, Name FROM staff_pm_responses - ORDER BY ID DESC"); + ORDER BY Name ASC"); while (list($ID, $Message, $Name) = $DB->next_record()) { ?> @@ -76,7 +76,7 @@ while (list($ID, $Message, $Name) = $DB->next_record()) { <input type="text" name="name" id="response_name_<?=$ID?>" size="87" value="<?=display_str($Name)?>" /> </div> <div class="pad"> - <div class="box pad hidden" id="response_div_<?=$ID?>"> + <div class="box pad hidden" style="text-align: left;" id="response_div_<?=$ID?>"> <?=Text::full_format($Message)?> </div> <textarea rows="10" cols="87" id="response_message_<?=$ID?>" name="message"><?=display_str($Message)?></textarea> diff --git a/sections/staffpm/viewconv.php b/sections/staffpm/viewconv.php index 5bf8017..8ee9bde 100644 --- a/sections/staffpm/viewconv.php +++ b/sections/staffpm/viewconv.php @@ -122,7 +122,8 @@ if ($ConvID = (int)$_GET['id']) { // List common responses $DB->query(" SELECT ID, Name - FROM staff_pm_responses"); + FROM staff_pm_responses + ORDER BY Name ASC"); while (list($ID, $Name) = $DB->next_record()) { ?> <option value="<?=$ID?>"><?=$Name?></option> diff --git a/sections/tools/development/update_geoip.php b/sections/tools/development/update_geoip.php index a4ea363..d28b188 100644 --- a/sections/tools/development/update_geoip.php +++ b/sections/tools/development/update_geoip.php @@ -13,7 +13,7 @@ shell_exec('wget http://geolite.maxmind.com/download/geoip/database/GeoLiteCity_ shell_exec('unzip GeoLiteCity-latest.zip'); shell_exec('rm GeoLiteCity-latest.zip'); -if (($Locations = file("GeoLiteCity_".date('Ym')."07/GeoLiteCity-Location.csv", FILE_IGNORE_NEW_LINES)) === false) { +if (($Locations = file("GeoLiteCity_".date('Ym')."05/GeoLiteCity-Location.csv", FILE_IGNORE_NEW_LINES)) === false) { error('Download or extraction of maxmind database failed'); } array_shift($Locations); |