character set fix
[cacert-boardvoting.git] / motions.php
index f4ebdac..90899b6 100644 (file)
@@ -85,14 +85,13 @@ BODY;
                                                ?>
                                                </td>
                                                <td>
-                                               <i><a href="motions.php?id=<?php echo $row['tag'].'">'.$row['tag']; ?></a></i><br/>
-                                               <b><?php echo htmlentities($row['title']); ?></b><br/>
+                                               <i><a href="motions.php?motion=<?php echo $row['tag'].'">'.$row['tag']; ?></a></i><br/>
+                                               <b><?php echo htmlspecialchars($row['title']); ?></b><br/>
                                                <pre><?php echo htmlspecialchars($row['content']); ?></pre>
                                                <br/>
                                                <i>Due: <?php echo($row['due']); ?> UTC</i><br/>
                                                <i>Proposed: <?php echo($row['proposer']); ?> (<?php echo($row['proposed']); ?> UTC)</i><br/>
-                                               <i>Required Votes: <?php echo($row['quorum']); ?></i><br/>
-                                               <i>Majority: <?php echo($row['majority']); ?>%</i><br/>
+                                               <i>Vote type: <?php echo(!$row['votetype']?'motion':'veto'); ?></i><br/>
                                                <i>Aye|Naye|Abstain: <?php echo($row['ayes']); ?>|<?php echo($row['nayes']); ?>|<?php echo($row['abstains']); ?></i><br/>
                                        <?php
                                                if ($row['status'] ==0 || $_REQUEST['showvotes']) {