diff --git a/mozilla/webtools/update/database/mozillaupdate.sql b/mozilla/webtools/update/database/mozillaupdate.sql index ceefabfc470..1b9536caa5c 100644 --- a/mozilla/webtools/update/database/mozillaupdate.sql +++ b/mozilla/webtools/update/database/mozillaupdate.sql @@ -280,18 +280,19 @@ CREATE TABLE `previews` ( CREATE TABLE `reviews` ( `rID` int(11) NOT NULL auto_increment, `ID` int(11) NOT NULL default '0', - `AppID` int(11) NOT NULL default '0', `DateAdded` datetime NOT NULL default '0000-00-00 00:00:00', `AuthorID` int(11) NOT NULL default '0', `Title` varchar(60) NOT NULL default '', `Body` text, + `ExtendedBody` text NOT NULL, `pick` enum('YES','NO') NOT NULL default 'NO', `featured` enum('YES','NO') NOT NULL default 'NO', + `featuredate` varchar(6) NOT NULL default '', PRIMARY KEY (`rID`), - KEY `ID` (`ID`), - KEY `AppID` (`AppID`), + UNIQUE KEY `ID` (`ID`), KEY `AuthorID` (`AuthorID`) ) TYPE=InnoDB PACK_KEYS=0; + -- -------------------------------------------------------- diff --git a/mozilla/webtools/update/developers/inc_sidebar.php b/mozilla/webtools/update/developers/inc_sidebar.php index 0d19b97928e..82204174a65 100755 --- a/mozilla/webtools/update/developers/inc_sidebar.php +++ b/mozilla/webtools/update/developers/inc_sidebar.php @@ -1,10 +1,12 @@
@@ -25,7 +27,8 @@ if ($_SESSION["level"] == "user") {
  • Themes list
  • Extensions list
  • Users Manager
    • -
  • Comments Manager
    • +
  • Comments Manager
    • +
  • Reviews Manager
    • @@ -37,7 +40,8 @@ if ($_SESSION["level"] == "user") {
  • Application Manager
  • Category Manager
  • FAQ Manager
    • -
  • Comments Manager
    • +
  • Comments Manager
    • +
  • Reviews Manager
  • Logout
    • diff --git a/mozilla/webtools/update/developers/reviewsmanager.php b/mozilla/webtools/update/developers/reviewsmanager.php new file mode 100755 index 00000000000..603972b98b9 --- /dev/null +++ b/mozilla/webtools/update/developers/reviewsmanager.php @@ -0,0 +1,213 @@ + + + + +Mozilla Update :: Developer Control Panel :: Reviews Manager + + +"Extensions","T"=>"Themes"); +if (!$_GET["type"]) {$_GET["type"]="E";} +?> + +

    Manage Reviews for :

    +Show: $typename) { +$i++; +echo"$typename"; +if ($i !== $count) {echo" / "; } + +} +unset($i); +?> + + + + + + + + + +\n"; + echo"\n"; + echo"\n"; + echo"\n"; + echo"\n"; + echo"\n"; +} +?> +
    NameReview...Review Posted
    $i.$name$description$dateadded
    + +Adding review for $name, please wait..."; + + if ($_POST["title"] && $_POST["body"] && $_POST["id"] && $_POST["method"]=="add") { + //Everything We *must* have is present... Begin.... + + if (checkFormKey()) { + $sql = "INSERT INTO `reviews` (`ID`,`DateAdded`,`AuthorID`,`Title`,`Body`,`ExtendedBody`,`pick`,`featured`,`featuredate`) VALUES ('".escape_string($_POST[id])."', NOW(NULL), '".escape_string($_SESSION[uid])."','".escape_string($_POST[title])."','".escape_string($_POST[body])."','".escape_string($_POST[extendedbody])."','".escape_string($_POST[pick])."','".escape_string($_POST[featured])."','".escape_string($_POST[featuredate])."');"; + $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE); + if ($sql_result) { + echo"Your review of $name has been submitted successfully...
    \n"; + } + } + } + + } else if ($_POST["submit"]=="Update Review") { + $name = escape_string($_POST["name"]); + echo"

    Updating review for $name, please wait...

    "; + + if ($_POST["title"] && $_POST["body"] && $_POST["rid"] && $_POST["method"]=="edit") { + //Everything We *must* have is present... Begin.... + + if (checkFormKey()) { + $sql = "UPDATE `reviews` SET `Title`= '".escape_string($_POST[title])."', `Body`='".escape_string($_POST[body])."', `ExtendedBody`='".escape_string($_POST[extendedbody])."', `pick`='".escape_string($_POST[pick])."', `featured`='".escape_string($_POST[featured])."', `featuredate`='".escape_string($_POST[featuredate])."' WHERE `rID`='".escape_string($_POST[rid])."' LIMIT 1"; + $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE); + if ($sql_result) { + echo"Your update to the review for $name has been submitted successfully...
    \n"; + } + } + } + + } else if ($_POST["submit"]=="Delete") { + $name = escape_string($_POST["name"]); + $rid = escape_string($_POST["rid"]); + + echo"

    Deleting $name, please wait...

    \n"; + + if (checkFormKey()) { + $sql = "DELETE FROM `reviews` WHERE `rID`='$rid' LIMIT 1"; + $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE); + if ($sql_result) { + echo"The review for $name has been deleted...
    \n"; + echo"«« Back to Main Page...
    \n"; + include"$page_footer"; + echo"\n\n"; + exit; + } + + } + + } + +//Get Parent Item Information +$id = escape_string($_GET["id"]); +if (!$id) {$id = escape_string($_POST["id"]); } + +$sql = "SELECT TM.ID, TM.Type, TM.Name FROM `main` TM WHERE TM.ID = '$id' LIMIT 1"; + $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE); + $row = mysql_fetch_array($sql_result); + $id = $row["ID"]; + $type = $row["Type"]; + $name = $row["Name"]; + +$sql = "SELECT `rID`,TU.UserName as AuthorName, `DateAdded`, `Title`, `Body`, `ExtendedBody`, `pick`, `featured`, `featuredate` FROM `reviews` INNER JOIN `userprofiles` TU ON reviews.AuthorID=TU.UserID WHERE `ID` = '$id' LIMIT 1"; + $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE); + $sql_num = mysql_num_rows($sql_result); + if ($sql_num=="0") { $method="Add"; $action="Add"; } else { $method="Edit"; $action="Update"; } + $row = mysql_fetch_array($sql_result); + $rid = $row["rID"]; + $authorname = $row["AuthorName"]; + $dateadded = date("F d, Y", strtotime($row["DateAdded"])); + $title = $row["Title"]; + $body = $row["Body"]; + $extendedbody = $row["ExtendedBody"]; + $pick = $row["pick"]; + $featured = $row["featured"]; + $featuredate = $row["featuredate"]; + if (!$featuredate) {$featuredate = date("Ym"); } + if (!$authorname) { $authorname = $_SESSION["name"]; } +?> +

    +\n"; ?> + + +"> + +"> +"> +"> + + + + + + + + + + + +
    Title* " SIZE=50 MAXLENGTH=100>
    Body*
    Extended Body
    +\n"; +if ($pick=="YES") { + echo"Yes No"; + } else if ($pick=="NO") { + echo"Yes No"; + } else { + echo"Yes No"; + } +?> +
    +\n"; +if ($featured=="YES") { + echo"Yes No"; + } else if ($featured=="NO") { + echo"Yes No"; + } else { + echo"Yes No"; + } +?> +   Feature Month: "> +
    Review">    ?');">
    +   ">«« Back to Reviews Manager + + + + + +
    + + + + \ No newline at end of file diff --git a/mozilla/webtools/update/extensions/moreinfo.php b/mozilla/webtools/update/extensions/moreinfo.php index 4fc5092948c..d1293d53303 100644 --- a/mozilla/webtools/update/extensions/moreinfo.php +++ b/mozilla/webtools/update/extensions/moreinfo.php @@ -366,13 +366,14 @@ $sql = "SELECT TM.ID, TM.Name, TM.DateAdded, TM.DateUpdated, TM.Homepage, TM.Des "0") { $row = mysql_fetch_array($sql_result); $title = $row["Title"]; $dateadded = $row["DateAdded"]; - $body = $row["Body"]; + $body = nl2br($row["Body"]); + $extendedbody = $row["ExtendedBody"]; $pick = $row["Pick"]; $date = gmdate("F, Y", strtotime("$dateadded")); //Create Customizeable Timestamp ?> @@ -384,7 +385,7 @@ $sql = "SELECT TM.ID, TM.Name, TM.DateAdded, TM.DateUpdated, TM.Homepage, TM.Des } echo"
    \n"; ?> -

    +

    More...";} ?>

    @@ -716,7 +717,7 @@ $sql = "SELECT TM.ID, TM.Name, TM.DateAdded, TM.DateUpdated, TM.Homepage, TM.Des //Staff/Editor Review Tab echo"

    Editor Review

    \n"; - $sql = "SELECT TR.ID, `Title`, TR.DateAdded, `Body`, `Type`, `Pick`, TU.UserName FROM `reviews` TR + $sql = "SELECT TR.ID, `Title`, TR.DateAdded, `Body`, `ExtendedBody`, `Type`, `Pick`, TU.UserID, TU.UserName FROM `reviews` TR INNER JOIN main TM ON TR.ID = TM.ID INNER JOIN userprofiles TU ON TR.AuthorID = TU.UserID WHERE `Type` = 'E' AND TR.ID = '$id' ORDER BY `rID` DESC LIMIT 1"; @@ -726,9 +727,11 @@ $sql = "SELECT TM.ID, TM.Name, TM.DateAdded, TM.DateUpdated, TM.Homepage, TM.Des $id = $row["ID"]; $title = $row["Title"]; $dateadded = $row["DateAdded"]; - $body = $row["Body"]; + $body = nl2br($row["Body"]); + $extendedbody = nl2br($row["ExtendedBody"]); $pick = $row["Pick"]; $username = $row["UserName"]; + $userid = $row["UserID"]; $date = gmdate("F, Y", strtotime("$dateadded")); //Create Customizeable Timestamp $posteddate = date("F j Y, g:i:sa", strtotime("$dateadded")); @@ -737,8 +740,12 @@ $sql = "SELECT TM.ID, TM.Name, TM.DateAdded, TM.DateUpdated, TM.Homepage, TM.Des echo" — $date Editors Pick\n"; } echo"\n"; - echo"Posted on $posteddate by $username
    \n"; + echo"Posted on $posteddate by $username
    \n"; echo"

    $body

    \n"; + if ($extendedbody) { + echo"\n"; + echo"

    $extendedbody

    \n"; + } } $typename = "extension"; diff --git a/mozilla/webtools/update/index.php b/mozilla/webtools/update/index.php index d211c380d94..3fa5f6a278b 100644 --- a/mozilla/webtools/update/index.php +++ b/mozilla/webtools/update/index.php @@ -98,13 +98,38 @@ if ($securitywarning=="true") { unset($uriparams_skip); ?> = '$currentver' AND (`OSName` = '$OS' OR `OSName` = 'ALL') AND `approved` = 'YES' AND TR.featured = 'YES' AND TR.featuredate = '$featuredate' AND TP.preview='YES' LIMIT 1"; + $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE); + while ($row = mysql_fetch_array($sql_result)) { + $id = $row["ID"]; + $type = $row["Type"]; + if ($type=="E") {$typename = "extensions"; } else if ($type=="T") {$typename="themes"; } + $name = $row["Name"]; + $title = $row["Title"]; + $body = nl2br($row["Body"]); + $extendedbody = $row["ExtendedBody"]; + $previewuri = $row["PreviewURI"]; + $attr = getimagesize("$websitepath/$previewuri"); + $attr = $attr[3]; + ?> -

    Currently Featuring...

    - Charamel Theme for Firefox -

    The Charamel Theme for Firefox and Thunderbird has been very popular since it was introduced way back in February. It brings forward the interface of the classic Netscape browser to a modern interpretation.

    -

    Great work on this simple and elegant theme Alex. We give it 3.5 stars out of five.

    +

    Currently Featuring...

    + ">" alt="" class="imgright"> +

    + " style="text-decoration: none">
    + More..."; + } + ?>

    diff --git a/mozilla/webtools/update/themes/moreinfo.php b/mozilla/webtools/update/themes/moreinfo.php index 135a0d1cf7f..41fb0dc1ff6 100644 --- a/mozilla/webtools/update/themes/moreinfo.php +++ b/mozilla/webtools/update/themes/moreinfo.php @@ -366,13 +366,14 @@ $sql = "SELECT TM.ID, TM.Name, TM.DateAdded, TM.DateUpdated, TM.Homepage, TM.Des "0") { $row = mysql_fetch_array($sql_result); $title = $row["Title"]; $dateadded = $row["DateAdded"]; - $body = $row["Body"]; + $body = nl2br($row["Body"]); + $extendedbody = $row["ExtendedBody"]; $pick = $row["Pick"]; $date = gmdate("F, Y", strtotime("$dateadded")); //Create Customizeable Timestamp ?> @@ -384,7 +385,7 @@ $sql = "SELECT TM.ID, TM.Name, TM.DateAdded, TM.DateUpdated, TM.Homepage, TM.Des } echo"
    \n"; ?> -

    +

    More...";} ?>

    @@ -716,7 +717,7 @@ $sql = "SELECT TM.ID, TM.Name, TM.DateAdded, TM.DateUpdated, TM.Homepage, TM.Des //Staff/Editor Review Tab echo"

    Editor Review

    \n"; - $sql = "SELECT TR.ID, `Title`, TR.DateAdded, `Body`, `Type`, `Pick`, TU.UserName FROM `reviews` TR + $sql = "SELECT TR.ID, `Title`, TR.DateAdded, `Body`, `ExtendedBody`, `Type`, `Pick`, TU.UserName FROM `reviews` TR INNER JOIN main TM ON TR.ID = TM.ID INNER JOIN userprofiles TU ON TR.AuthorID = TU.UserID WHERE `Type` = 'T' AND TR.ID = '$id' ORDER BY `rID` DESC LIMIT 1"; @@ -726,7 +727,8 @@ $sql = "SELECT TM.ID, TM.Name, TM.DateAdded, TM.DateUpdated, TM.Homepage, TM.Des $id = $row["ID"]; $title = $row["Title"]; $dateadded = $row["DateAdded"]; - $body = $row["Body"]; + $body = nl2br($row["Body"]); + $extendedbody = nl2br($row["ExtendedBody"]); $pick = $row["Pick"]; $username = $row["UserName"]; $date = gmdate("F, Y", strtotime("$dateadded")); //Create Customizeable Timestamp @@ -739,6 +741,10 @@ $sql = "SELECT TM.ID, TM.Name, TM.DateAdded, TM.DateUpdated, TM.Homepage, TM.Des echo"\n"; echo"Posted on $posteddate by $username
    \n"; echo"

    $body

    \n"; + if ($extendedbody) { + echo"\n"; + echo"

    $extendedbody

    \n"; + } } $typename = "theme";