From cd57abc0495400c82fa7070a40792af55614ca4d Mon Sep 17 00:00:00 2001
From: Aleksey Lim <me@alsroot.su>
Date: Wed, 13 Jul 2016 15:31:23 +0000
Subject: More fixes related to running in Ubuntu 14.04 environment

---
diff --git a/bin/maintenance.php b/bin/maintenance.php
index 39ae95b..0a4c00d 100755
--- a/bin/maintenance.php
+++ b/bin/maintenance.php
@@ -592,7 +592,7 @@ switch ($action) {
             UPDATE collections
             SET rating=
               IFNULL(
-                CAST(upvotes - downvotes AS SIGNED) * LN(upvotes + downvotes),
+                (CAST(upvotes AS SIGNED) - CAST(downvotes AS SIGNED)) * LN(upvotes + downvotes),
                 0)
         ");
         $affected_rows = mysql_affected_rows();
diff --git a/site/app/views/addons/policy.thtml b/site/app/views/addons/policy.thtml
index e438473..d81d748 100644
--- a/site/app/views/addons/policy.thtml
+++ b/site/app/views/addons/policy.thtml
@@ -66,7 +66,7 @@ else
 
   <?php if (empty($policy)): ?>
     <div id="addon-summary" class="condensed <?=$html->extraClass($addon)?>">
-    <?
+    <?php
       global $browser_apps;
       if (!in_array(APP_ID, $browser_apps)) {
           $buttonMessage = ___('Accept and Download');
diff --git a/site/app/views/admin/tags.thtml b/site/app/views/admin/tags.thtml
index 0553578..9000b6d 100644
--- a/site/app/views/admin/tags.thtml
+++ b/site/app/views/admin/tags.thtml
@@ -41,7 +41,7 @@
     <div id="content-main">
         <h3>Tag Manager</h3>
         <table width="100%">
-        <?
+        <?php
 		$pagination->setPaging($paging); // Initialize the pagination variables
 		$th = array (
             $pagination->sortBy('tag_text','Tag','Tag'),
@@ -73,7 +73,7 @@
            
             }
         }
-        ?></table><?
+        ?></table><?php
                 echo $this->renderElement('pagination');
         
         ?>
diff --git a/site/app/views/editors/review.thtml b/site/app/views/editors/review.thtml
index f3e728e..f6547ee 100644
--- a/site/app/views/editors/review.thtml
+++ b/site/app/views/editors/review.thtml
@@ -219,7 +219,7 @@
             }
             if ($reviewType == 'pending') {
         ?>
-        <?
+        <?php
             }
         ?>
         <div id="finish">
diff --git a/site/app/views/editors/reviews_queue.thtml b/site/app/views/editors/reviews_queue.thtml
index 23873aa..6b5465b 100644
--- a/site/app/views/editors/reviews_queue.thtml
+++ b/site/app/views/editors/reviews_queue.thtml
@@ -106,7 +106,7 @@
             <label for="deny<?=$review['Review']['id']?>"><?=___('Delete review')?></label>
         </div>
     </div>
-<?
+<?php
         }
         echo $html->submit(___('Process Reviews'));
         echo '</form>';
diff --git a/site/app/views/elements/developers/editors_review_history_item.thtml b/site/app/views/elements/developers/editors_review_history_item.thtml
index 3eece81..9866462 100644
--- a/site/app/views/elements/developers/editors_review_history_item.thtml
+++ b/site/app/views/elements/developers/editors_review_history_item.thtml
@@ -54,7 +54,7 @@ else
         }
     ?></td>
     <td><?=$hist['Approval']['created']?></td>
-    <?
+    <?php
         $display_name = trim($hist['User']['firstname'].' '.$hist['User']['lastname']);
         if (empty($display_name)) {
             $display_name = $hist['User']['nickname'];
diff --git a/site/app/views/elements/developers/testresults_group.thtml b/site/app/views/elements/developers/testresults_group.thtml
index 96cc2b8..a0e064b 100644
--- a/site/app/views/elements/developers/testresults_group.thtml
+++ b/site/app/views/elements/developers/testresults_group.thtml
@@ -60,7 +60,7 @@ if ($group['counts'][TEST_WARN] == 0 && $group['counts'][TEST_FAIL] == 0) {
         <?php $resultNum = 0; ?>
         <?php if (!empty($case['results'])) : ?>
             <?php foreach ($case['results'] as $result) : ?>
-                <?
+                <?php
                 $resultNum++;
                 switch ($result['result']) {
                     case TEST_PASS:
diff --git a/site/app/views/files/browse.thtml b/site/app/views/files/browse.thtml
index ea5070f..a375b32 100644
--- a/site/app/views/files/browse.thtml
+++ b/site/app/views/files/browse.thtml
@@ -46,7 +46,7 @@
     <title><?=sprintf(___('%1$s :: File Browser :: %2$s Add-ons'), $addonname, APP_PRETTYNAME)?></title>
 </head>
 <body>
-    <?
+    <?php
 $files['dir'] = 1;
 $files['filename'] = 'extension.xpi';
 ?>
diff --git a/site/app/views/reviews/display.thtml b/site/app/views/reviews/display.thtml
index bf64b95..50c2920 100644
--- a/site/app/views/reviews/display.thtml
+++ b/site/app/views/reviews/display.thtml
@@ -59,7 +59,7 @@ $bare = isset($_GET['bare']) ? ( $_GET['bare'] == 1 ) : FALSE;
 
 <ul>
     <li><?=$html->link(sprintf(___('Back to %1$s...'), $addon['Translation']['name']['string']), '/addon/'.$addon['Addon']['id']); ?></li>
-    <?
+    <?php
     if (empty($isAuthor)) {
         if (!empty($hasreview)) {
             $add_or_edit = ___('Edit your review');
@@ -228,7 +228,7 @@ foreach ($reviews as $review):
 
 <ul>
     <li><?=$html->link(sprintf(___('Back to %1$s...'), $addon['Translation']['name']['string']), '/addon/'.$addon['Addon']['id']); ?></li>
-    <?
+    <?php
     if (empty($isAuthor)) {
         if (!empty($hasreview)) {
             $add_or_edit = ___('Edit your review');
diff --git a/site/app/views/tests/index.thtml b/site/app/views/tests/index.thtml
index b9c6d21..e386d84 100644
--- a/site/app/views/tests/index.thtml
+++ b/site/app/views/tests/index.thtml
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 ?>
-<?
+<?php
 // deactivate locales in URLs for this page
 $html->addLocale = false;
 ?>
--
cgit v0.9.1