November 2016 - Wine-commits

Jeremy Newman : cleanup, set method and property visibility, modernize constructor
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 634840878bb26990b0de005bba33b760f3e3c690 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=634840878bb26990b0de005b… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Nov 14 14:49:22 2016 -0600 cleanup, set method and property visibility, modernize constructor --- include/session.php | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/include/session.php b/include/session.php index 31b8761..0a90584 100644 --- a/include/session.php +++ b/include/session.php @@ -9,14 +9,14 @@ class session { // defines - var $_server; - var $_expire; - var $_db; - var $name; - var $msg; - + private $_server; + private $_expire; + private $_db; + private $name; + public $msg; + // create session object - function session ($name, $server = "127.0.0.1", $expire = 30) + public function __construct ($name, $server = "127.0.0.1", $expire = 30) { // set the connection server $this->_server = $server; @@ -31,7 +31,7 @@ class session ini_set('session.name', $this->name); ini_set('session.use_cookies', true); ini_set('session.use_only_cookies', true); - + // setup session object session_set_save_handler( array(&$this, "_open"), @@ -41,16 +41,16 @@ class session array(&$this, "_destroy"), array(&$this, "_gc") ); - + // default lifetime on session cookie session_set_cookie_params( $this->_expire, '/' ); - + // start the loaded session session_start(); - + // make sure we have a valid memcache server connection if (!$this->_db->getVersion()) { @@ -59,26 +59,26 @@ class session } // register variables into session (dynamic load and save of vars) - function register ($var) + public function register ($var) { global $$var; - + // load $var into memory if (isset($_SESSION[$var])) $$var = $_SESSION[$var]; - + // store var into session $_SESSION[$var] =& $$var; } // destroy session - function destroy () + public function destroy () { session_destroy(); } // add alert message to buffer that will be displayed on the Next page view of the same user in html class - function addmsg ($text, $color = "black") + public function addmsg ($text, $color = "black") { if (!isset($_SESSION['_msg'])) $_SESSION['_msg'] = array(); @@ -89,7 +89,7 @@ class session } // add alert message that will be displayed on the current page output in html class - function alert ($text, $color = "black") + public function alert ($text, $color = "black") { $this->msg[] = array( 'msg' => $text, @@ -98,14 +98,14 @@ class session } // clear session messages - function purgemsg () + public function purgemsg () { $this->msg[] = array(); $_SESSION['_msg'][] = array(); } // output msg_buffer and clear it. - function dumpmsgbuffer () + public function dumpmsgbuffer () { if (isset($_SESSION['_msg']) and is_array($_SESSION['_msg'])) { @@ -118,26 +118,26 @@ class session } // connect to session - function _open ($save_path, $session_name) + public function _open ($save_path, $session_name) { $this->_db = new Memcache; return $this->_db->connect($this->_server, "11211"); } // close the session - function _close () + public function _close () { return $this->_db->close(); } // restore a session from memory - function _read ($id) + public function _read ($id) { return $this->_db->get($id); } // write the session - function _write ($id, $data) + public function _write ($id, $data) { if ($this->_db->get($id)) { @@ -151,13 +151,13 @@ class session } // Delete the Session - function _destroy ($id) + public function _destroy ($id) { return $this->_db->delete($id, 0); } // Garbage Collector (Not Needed for MemCache) - function _gc ($maxlifetime) + public function _gc ($maxlifetime) { return true; }

1 0

Jeremy Newman : move menu to htmlmenu so filename matches classname
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 3a51c4a8b93179f0d314e07feff7f5d100912f83 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=3a51c4a8b93179f0d314e07f… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Nov 14 14:52:24 2016 -0600 move menu to htmlmenu so filename matches classname set method propery visibility update constructor cleanup --- include/htmlmenu.php | 47 +++++++++++++++++++++++++++++++++++++++++++++++ include/menu.php | 46 ---------------------------------------------- 2 files changed, 47 insertions(+), 46 deletions(-) diff --git a/include/htmlmenu.php b/include/htmlmenu.php new file mode 100644 index 0000000..3bb9222 --- /dev/null +++ b/include/htmlmenu.php @@ -0,0 +1,47 @@ +<?php +/** + * htmlmenu + * simple menu rendering + */ +class htmlmenu +{ + // constructor + public function __construct($name, $form = null) + { + if (!empty($form)) + echo "<form action=\"$form\" method=\"post\">\n"; + echo '<li class="top"><p>'.$name.'</p></li>'; + } + + // add a table row + public function add($sName, $shUrl = null, $sAlign = "left") + { + $oTableRow = new TableRow(); + + if($shUrl) + { + echo "<li><p><a href=\"{$shUrl}\">{$sName}</a></p></li>\n"; + } + else + { + echo "<li><p>{$sName}</a></li>\n"; + } + } + + // add misc row + public function addmisc($sStuff, $sAlign = "left") + { + echo "<li><p style=\"text-align: $sAlign\">$sStuff</p></li>\n"; + } + + // menu complete + public function done($form = null) + { + echo '<li class="bot"></li>'; + + if (!empty($form)) + echo "</form>\n"; + } +} +// done +?> diff --git a/include/menu.php b/include/menu.php deleted file mode 100644 index dfa6fc2..0000000 --- a/include/menu.php +++ /dev/null @@ -1,46 +0,0 @@ -<?php -class htmlmenu { - - function htmlmenu($name, $form = null) - { - - if ($form) - echo "<form action=\"$form\" method=\"post\">\n"; - - echo ' - <li class="top"><p>'.$name.'</p></li> -'; - - } - - /* add a table row */ - function add($sName, $shUrl = null, $sAlign = "left") - { - $oTableRow = new TableRow(); - - if($shUrl) - { - echo " <li><p><a href=\"{$shUrl}\">{$sName}</a></p></li>\n"; - } - else - { - echo " <li><p>{$sName}</a></li>\n"; - } - } - - function addmisc($sStuff, $sAlign = "left") - { - echo "<li><p style=\"text-align: $sAlign\">$sStuff</p></li>\n"; - } - - function done($form = null) - { - echo ' - <li class="bot"></li> -'; - - if ($form) - echo "</form>\n"; - } -} -?>

1 0

Jeremy Newman : move functions only used here from global
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: a6dfba5ab4eeef5eaaa0050f7d09c398665aba79 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=a6dfba5ab4eeef5eaaa0050f… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Nov 14 14:59:45 2016 -0600 move functions only used here from global --- appimage.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/appimage.php b/appimage.php index 00cc6c4..f4d1b58 100644 --- a/appimage.php +++ b/appimage.php @@ -14,6 +14,18 @@ * - replace iId with iScreenshotId */ +/** + * parse all the date formats required by HTTP 1.1 into PHP time values + */ +function pHttpDate($sDate) { + $iDate = strtotime($sDate); + if ($iDate != -1) return $iDate; + /* the RFC also requires asctime() format... */ + $aTs = strptime($sDate,"%a %b %e %H:%M:%S %Y"); + $iDate = gmmktime($aTs[2],$aTs[1],$aTs[0],$aTs[4],$aTs[3],$aTs[5],0); + return $iDate; +} + // application environment require("path.php"); require(BASE."include/incl.php"); @@ -66,10 +78,11 @@ if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && exit; } -header("Last-Modified: ".fHttpDate($iModTime)); +header("Last-Modified: ".gmdate("D, d M Y H:i:s",$iModTime)." GMT"); if(!$aClean['bThumbnail']) $oScreenshot->output_screenshot(false); else $oScreenshot->output_screenshot(true); + ?>

1 0

Jeremy Newman : add defines for new debug log
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: d161a148e233f1a195d7993e534ae4e309dc0d83 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d161a148e233f1a195d7993e… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 15 12:09:09 2016 -0600 add defines for new debug log --- styles.css | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/styles.css b/styles.css index dc41329..b08d0e8 100644 --- a/styles.css +++ b/styles.css @@ -293,3 +293,62 @@ div.rbox div.content { margin: 0; background-color: #FFFFFF; } .gold { background-color: wheat; } .silver { background-color: silver; } + +/* + ==================================================================================================================== + debug log + ==================================================================================================================== +*/ +#dlog { + position: fixed; + left: 0px; + bottom: 0px; + width: 100%; + z-index: 9999; + margin: 0; + padding: 0; + color: #fff; + border-top: 1px outset rgba(48,48,48,0.8); + background-color: rgba(0,0,0,0.9); +} +#dlogt { + margin: 0; + font-size: x-small; + color: #777; + font-weight: bold; + cursor: pointer; + background-color: rgba(0,0,0,0.4); + border-top: 1px outset rgba(48,48,48,0.8); +} +#dlogp { + display: none; + margin: 0; + padding: 0; + overflow: auto; + height: 500px; +} +#dlogp pre { + font-family: monospace; + white-space: pre-wrap; + margin: 5px 20px 20px 20px; + background: inherit; + border: none; + color: #efefef; +} + +div.appdb_dump { + display: inline-block; + position: relative; + z-index: 999; + min-width: 50px; + max-width: 600px; + max-height: 250px; + padding: 5px; + margin: 4px; + border: 1px dashed #FF0000; + background-color: #000000; + opacity: 0.8; + color: #FFFFFF; + overflow: auto; +} +div.appdb_dump xmp { margin: 0; }

1 0

Jeremy Newman : add microtime_float, remove onlcick from maintainer list
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: f900599f6f97e81b375d54344b0858cddf023e96 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f900599f6f97e81b375d5434… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 15 12:11:14 2016 -0600 add microtime_float, remove onlcick from maintainer list --- include/util.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/include/util.php b/include/util.php index e0ec4a5..3afe390 100644 --- a/include/util.php +++ b/include/util.php @@ -216,7 +216,7 @@ function make_bugzilla_version_list($sVarname, $sSelectedValue = '') // returns a string containing the html for the maintainer rating list function make_maintainer_rating_list($varname, $cvalue) { - $sTxt = "<select id='ratingSelect' onchange='showHint(this)' name='$varname'>\n"; + $sTxt = "<select id='ratingSelect' name='$varname'>\n"; $sTxt .= "<option value=\"\">Choose ...</option>\n"; $aRating = array("Platinum", "Gold", "Silver", "Bronze", "Garbage"); $iMax = count($aRating); @@ -233,6 +233,14 @@ function make_maintainer_rating_list($varname, $cvalue) return $sTxt; } +// Function to calculate script execution time. +function microtime_float () +{ + list ($msec, $sec) = explode(' ', microtime()); + $microtime = (float)$msec + (float)$sec; + return $microtime; +} + /* Get the element with specified key from an array if it is defined */ function getInput($sVar, $aInput) {

1 0

Jeremy Newman : remove onlcick from show comment link, new handler in utils.js
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: dd264836426ded4434bb8969eb49f2765ebad586 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=dd264836426ded4434bb8969… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 15 12:11:54 2016 -0600 remove onlcick from show comment link, new handler in utils.js --- include/comment.php | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/include/comment.php b/include/comment.php index 21c6a14..8334e37 100644 --- a/include/comment.php +++ b/include/comment.php @@ -503,16 +503,10 @@ class Comment { { $sLink = "commentview.php?iAppId={$oRow->appId}&iVersionId=". "{$oRow->versionId}&iThreadId={$oRow->parentId}"; - - $sOnClick = "showComment('{$oRow->commentId}');"; - - /** - * The return false line in the onClick is used to handle javascript - * being disabled so we can fail gracefully to the old style. - */ - return "<li><a href=\"$sLink\" onclick=\"$sOnClick return false;\">$oRow->subject</a>". - ' by '.forum_lookup_user($oRow->userId)." on - {$oRow->time}<div id=\"{$oRow->commentId}\"></div></li>\n"; + return "<li><a href=\"$sLink\" class=\"showComment\" ". + "data-id=\"{$oRow->commentId}\">$oRow->subject</a>". + ' by '.forum_lookup_user($oRow->userId)." on {$oRow->time}". + "<div id=\"comment-{$oRow->commentId}\"></div></li>\n"; } /**

1 0

Jeremy Newman : add some comments to explain what this file is
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: aaca627ffd5ff8aff345d5e6d11bbf4f37a01177 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=aaca627ffd5ff8aff345d5e6… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 15 12:13:17 2016 -0600 add some comments to explain what this file is --- comment_body.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/comment_body.php b/comment_body.php index a4e0cbe..8e2a140 100644 --- a/comment_body.php +++ b/comment_body.php @@ -1,9 +1,13 @@ <?php +/** + * Ajax Loader for Loading an Inline Comment + * ties to handler in utils.js + */ + require("path.php"); require(BASE."include/incl.php"); require_once(BASE."include/comment.php"); - Comment::view_comment_body($aClean['iCommentId']); ?>

1 0

Jeremy Newman : add debug log html to footer
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 502d58934c131344196bcaa7562971c056fa4984 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=502d58934c131344196bcaa7… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 15 12:14:17 2016 -0600 add debug log html to footer --- include/footer.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/footer.php b/include/footer.php index 39a12a9..fa35671 100644 --- a/include/footer.php +++ b/include/footer.php @@ -11,5 +11,16 @@ title="CodeWeavers - Run Windows applications and games on Mac and Linux"></a> </div> +<?php +if($GLOBALS['_APPDB_debug'] and !empty($GLOBALS['_APPDB_debugLog'])) { +?> +<div id="dlog"> + <div id="dlogp"><pre><?php echo htmlspecialchars($GLOBALS['_APPDB_debugLog']); ?></pre></div> + <div id="dlogt"><i class="fa fa-bug"></i> Toggle Debug Console</div> +</div> +<?php +} +?> + </body> </html>

1 0

Jeremy Newman : beginnings of HTML5 code and updating design
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 55907147328d2c6d38e15d3f1e4d0d34dfd90bf0 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=55907147328d2c6d38e15d3f… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 15 12:14:41 2016 -0600 beginnings of HTML5 code and updating design --- include/header.php | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/include/header.php b/include/header.php index 014a8c4..ff01e3b 100644 --- a/include/header.php +++ b/include/header.php @@ -2,28 +2,31 @@ /*********************************/ /* Application Database - Header */ /*********************************/ -?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> +?><!doctype html> +<html lang="en"> <head> <title>WineHQ <?php echo $title; ?></title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <meta HTTP-EQUIV="Expires" CONTENT="Mon, 06 Jan 1990 00:00:01 GMT"> - <meta HTTP-EQUIV="Pragma" CONTENT="no-cache"> + + <meta charset="utf-8"> <meta name="description" content="Open Source Software for running Windows applications on other operating systems."> <meta name="keywords" content="windows, linux, macintosh, solaris, freebsd"> <meta name="robots" content="index, follow"> <meta name="copyright" content="Copyright WineHQ.org All Rights Reserved."> <meta name="language" content="English"> <meta name="revisit-after" content="1"> + + <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous"> + <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.1/css/font-awesome.min.css"> + <link rel="stylesheet" href="https://code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css" type="text/css" media="all"> <link rel="stylesheet" href="<?php echo BASE; ?>styles.css" type="text/css" media="screen"> - <script language="JavaScript" src="<?php echo BASE; ?>jquery.js" type="text/javascript"></script> - <script language="JavaScript" src="<?php echo BASE; ?>utils.js" type="text/javascript"></script> <link rel="stylesheet" href="<?php echo BASE; ?>apidb.css" type="text/css"> <link rel="stylesheet" href="<?php echo BASE; ?>application.css" type="text/css"> - <script type="text/javascript" - src="//ajax.googleapis.com/ajax/libs/prototype/1.6.0.2/prototype.js"></script> - <script src="<?php echo BASE; ?>scripts.js" type="text/javascript"></script> - <link rel="icon" type="image/png" href="<?php echo BASE; ?>images/winehq_logo_16.png"> + + <script src="https://code.jquery.com/jquery-2.2.3.min.js" type="text/javascript"></script> + <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script> + <script src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js" type="text/javascript"></script> + <script src="<?php echo BASE; ?>utils.js"></script> + <link rel="shortcut icon" type="image/png" href="<?php echo BASE; ?>images/winehq_logo_16.png"> <link title="AppDB" type="application/opensearchdescription+xml" rel="search" href="<?php echo BASE; ?>opensearch.xml"> </head>

1 0

Jeremy Newman : move appdb specific functions to appdb.php, cleanup
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 52340938a0d42d199943af22ecdc4b43d7de14e3 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=52340938a0d42d199943af22… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 15 12:15:59 2016 -0600 move appdb specific functions to appdb.php, cleanup * add error handing routines * add debug log * merge some one time used functions --- include/appdb.php | 344 ++++++++++++++++++++++++++++++++++++++++++++++++++---- include/incl.php | 292 +++++---------------------------------------- 2 files changed, 350 insertions(+), 286 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=52340938a0d42d199943…

1 0