November 2016 - Wine-commits

Jeremy Newman : dracionian rules for coding standards aren't needed here
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 317b055108618d1532ef75aa9f41d08bb58514e5 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=317b055108618d1532ef75aa… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 18 13:24:13 2016 -0600 dracionian rules for coding standards aren't needed here just look at the code, and keep with what you see --- CODING_STANDARD | 115 -------------------------------------------------------- 1 file changed, 115 deletions(-) diff --git a/CODING_STANDARD b/CODING_STANDARD deleted file mode 100644 index 463140e..0000000 --- a/CODING_STANDARD +++ /dev/null @@ -1,115 +0,0 @@ -WineHQ Application Database Coding Practice - -/** - * HTML - */ -- Respect html coding standards. The current doctype is HTML 4.01 transitional (http://www.w3.org/TR/REC-html40/) -Try to make your content validate nicely (http://validator.w3.org/) - -Avoid using implicitly closed elements eg. <br/> in HTML 4.01 transitional, as it can lead to validation errors. -http://www.w3.org/TR/html401/struct/text.html#edef-BR - -/** - * Variables naming - */ -variables that don't come from outside your script (i.e. that aren't fetched from superglobals) should be named this way -(a.k.a hungarian notation): -prefix + var_name - -Where prefix is one of: -Scalar types: -i for integers -f for floats -s for strings -sh for html strings -b for booleans -Compound types: -a for arrays -o for objects -Special type: -h for handles - -the rest of the variable's name is using camel style -examples: -$aUsers -$iTopicId -$hRecordSet -$sQuery -$hResult - - -/** - * Functions naming - */ -1)functions name should be declarative and be prefixed with the name of the module (=file) where it is stored (for example image_show_thumbnail()) -2)methods (functions inside a class) are named like this: setMyName() (i.e. words separated with an upper case character) -3)normal functions (outside a class) are named like this: query_appdb() (i.e. words separated with an underscore) - - -/** - * general coding guidelines - */ -1) functions, loops and if's are written this way (look at the way {}'s are lined up): -<?php -function do_foo($sVar) -{ - if(isset($sVar)) - { - echo "bar"; - } else - { - echo "foo"; - } -} -?> - -2) indentation is made of 4 spaces (no tabs please) - -3) line length should be no more than 130 characters, preferably < 80 - -4) use long php tags (<?php ?>) instead of short ones (<? ?>) as : - a) it could be removed from future versions of php - b) if conflicts with tags like <?xml version=1.0 ?> that are used in xhtml - -5) do not use vars that require register_globals to be on as: - a) it is off by default in php 4.1+ - b) it is more secure - c) it makes it easier to understand where your vars are coming from (forms, session, etc.) - - -/** - * comments - */ -1) function, method, header and multiline comments: -/** - * This functions does nothing interesing. - * More comments to come here... - */ -function bar() -{ - foo(); -} - -2) one-line comments -// This is a one line comment - -3) always put a single space after the comment mark - -4) never use # for commenting as it will become obsolete in the future - -/** - * string quotes - */ -There are two different ways to quote strings in PHP - single quotes or double quotes. -The difference is that the parser does variable interpolation in double-quoted strings, but not in single quoted strings. -Because of this, always use single quotes unless the string contains a variable that needs to be parsed. - -Also if the string contains a variable put it inside double quotes instead of using 'bla' . $var . 'bla'; -To increase readability of the code. -Wrong: -$str = "This is a long string without any variables"; -$str = 'This string contains a variable ' . $var . ' enough said.'; - -Right: -$str = 'This is a long string without any variables'; -$str = "This string contains a variable $var enough said";

1 0

Jeremy Newman : remove some unused images
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: b42d8672e320ba5ef3707fb066a1c3f264b53e16 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b42d8672e320ba5ef3707fb0… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 18 13:30:15 2016 -0600 remove some unused images --- images/back.gif | Bin 128 -> 0 bytes images/bk.gif | Bin 109 -> 0 bytes images/blank.gif | Bin 61 -> 0 bytes images/compare.gif | Bin 146 -> 0 bytes images/grey_pixel.gif | Bin 43 -> 0 bytes images/list.gif | Bin 114 -> 0 bytes images/next.gif | Bin 126 -> 0 bytes images/remove.gif | Bin 144 -> 0 bytes images/s0.gif | Bin 59 -> 0 bytes images/s1.gif | Bin 117 -> 0 bytes images/s2.gif | Bin 117 -> 0 bytes images/tree.gif | Bin 116 -> 0 bytes images/w0.gif | Bin 65 -> 0 bytes images/w1.gif | Bin 297 -> 0 bytes 14 files changed, 0 insertions(+), 0 deletions(-) diff --git a/images/back.gif b/images/back.gif deleted file mode 100644 index abb3072..0000000 Binary files a/images/back.gif and /dev/null differ diff --git a/images/bk.gif b/images/bk.gif deleted file mode 100644 index 743ac5f..0000000 Binary files a/images/bk.gif and /dev/null differ diff --git a/images/blank.gif b/images/blank.gif deleted file mode 100644 index c080147..0000000 Binary files a/images/blank.gif and /dev/null differ diff --git a/images/compare.gif b/images/compare.gif deleted file mode 100644 index b2d6268..0000000 Binary files a/images/compare.gif and /dev/null differ diff --git a/images/grey_pixel.gif b/images/grey_pixel.gif deleted file mode 100644 index bf677fd..0000000 Binary files a/images/grey_pixel.gif and /dev/null differ diff --git a/images/list.gif b/images/list.gif deleted file mode 100644 index 54b1256..0000000 Binary files a/images/list.gif and /dev/null differ diff --git a/images/next.gif b/images/next.gif deleted file mode 100644 index bbe694e..0000000 Binary files a/images/next.gif and /dev/null differ diff --git a/images/remove.gif b/images/remove.gif deleted file mode 100644 index 13a3066..0000000 Binary files a/images/remove.gif and /dev/null differ diff --git a/images/s0.gif b/images/s0.gif deleted file mode 100644 index 21b6be5..0000000 Binary files a/images/s0.gif and /dev/null differ diff --git a/images/s1.gif b/images/s1.gif deleted file mode 100644 index 0bf6bfb..0000000 Binary files a/images/s1.gif and /dev/null differ diff --git a/images/s2.gif b/images/s2.gif deleted file mode 100644 index 1205878..0000000 Binary files a/images/s2.gif and /dev/null differ diff --git a/images/tree.gif b/images/tree.gif deleted file mode 100644 index e4e818c..0000000 Binary files a/images/tree.gif and /dev/null differ diff --git a/images/w0.gif b/images/w0.gif deleted file mode 100644 index ab10835..0000000 Binary files a/images/w0.gif and /dev/null differ diff --git a/images/w1.gif b/images/w1.gif deleted file mode 100644 index 70ea8f2..0000000 Binary files a/images/w1.gif and /dev/null differ

1 0

Jeremy Newman : comments disabled when no maintainers
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 4cb6ec56406dfca98556f4f559ed3bf9eed51c6e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=4cb6ec56406dfca98556f4f5… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 18 13:44:33 2016 -0600 comments disabled when no maintainers We are no longer going to allow comments when the application does not have maintainers. Based on a patch from: "Andre Hentschel" <nerv(a)dawncrow.de> --- include/version.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/include/version.php b/include/version.php index 1ee7a26..60b14df 100644 --- a/include/version.php +++ b/include/version.php @@ -1165,8 +1165,17 @@ EOT; // Comments Section echo "<h2 id=\"viewComments\" class=\"whq-app-title\">Comments</h2>\n"; - if($this->iVersionId) - Comment::view_app_comments($this->iVersionId); + if(sizeof($aMaintainers)>0) + { + if($this->iVersionId) + Comment::view_app_comments($this->iVersionId); + } + else + { + echo html_note('<i class="fa fa-exclamation-circle"></i> <b>Comments Disabled</b><br><br> '. + 'Comments for this application have be disabled becuase there are no maintainers.', + "","","warning"); + } } public static function lookup_name($versionId)

1 0

Andre Hentschel : Get rid of some old dead code
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 5bf8291b879f33a88029a8fc48491dcf401d6b83 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=5bf8291b879f33a88029a8fc… Author: Andre Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 18 13:51:24 2016 -0600 Get rid of some old dead code --- include/appdb.php | 9 --------- include/html.php | 15 --------------- include/tableve.php | 27 --------------------------- 3 files changed, 51 deletions(-) diff --git a/include/appdb.php b/include/appdb.php index c24d94c..4a92df6 100644 --- a/include/appdb.php +++ b/include/appdb.php @@ -6,7 +6,6 @@ /* * TODO: * + replace all apidb_ calls with appdb_ - * + apidb_url and apidb_fullurl should be merged * + addmsg should be removed, and calls replaced with session->addmsg */ @@ -213,14 +212,6 @@ function appdb_clear_buffer() } /** - * return url with docroot prepended - */ -function apidb_url($path) -{ - return BASE.$path; -} - -/** * return FULL url with docroot prepended */ function apidb_fullurl($path = "") diff --git a/include/html.php b/include/html.php index cc3b309..20b359c 100644 --- a/include/html.php +++ b/include/html.php @@ -84,21 +84,6 @@ function html_ahref($label, $url, $extra = "") } } -function html_imagebutton($text, $url, $extra = "") -{ - static $i = 1; - - $i++; - $img1 = apidb_url("util/button.php?text=".urlencode($text)."&pressed=0"); - $img2 = apidb_url("util/button.php?text=".urlencode($text)."&pressed=1"); - - $java = "onMouseDown = 'document.img$i.src = \"$img2\"; return true;' "; - $java .= "onMouseUp = 'document.img$i.src = \"$img1\"; return true;' "; - - return "\n<a href=\"$url\" $extra $java>\n <img src=\"$img1\" name=\"img$i\" alt=\"$text\"> </a>\n"; -} - - function html_frame_start($title = "", $width = "", $extra = "", $innerPad = 0) { $style = ""; diff --git a/include/tableve.php b/include/tableve.php index 9a4e11a..73a1c38 100644 --- a/include/tableve.php +++ b/include/tableve.php @@ -268,8 +268,6 @@ class TableVE { echo "$value  \n"; break; } - - $this->entry_add_extra($field, $value); } function view_entry_output_field($field, $value, $len) @@ -319,33 +317,8 @@ class TableVE { echo "$value  \n"; break; } - - $this->entry_add_extra($field, $value); } - - /* - * add extra stuff to certain fields - */ - function entry_add_extra($field, $value) - { - /* - * add extra stuff to certain fields - */ - - if($field->name == "mslink" && $value) - { - echo html_imagebutton("Go!", $value); - } - - if($field->name == "apiname") - { - echo html_imagebutton("Wine LXR", "http://twine.codeweavers.com/lxr/ident?i=$value"); - echo html_imagebutton("Wine API", "http://www.winehq.com/WineAPI/$value.html"); - } - } - - /* * required field for each table. * When editing a query this field needs to be present in the query

1 0

Jeremy Newman : update default bug and main website urls
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 5fd113cf9148109f82df50f900329ba9f63adfb6 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=5fd113cf9148109f82df50f9… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 18 13:53:52 2016 -0600 update default bug and main website urls No, we are not going to drop the http syntax for // Emails also use these vars, and the website is always https now, so use the default of https:// --- include/config.php.sample | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/config.php.sample b/include/config.php.sample index 303f278..53cba20 100644 --- a/include/config.php.sample +++ b/include/config.php.sample @@ -15,10 +15,10 @@ define("APPDB_SCREENSHOT_MAXWIDTH","1024"); // width of the screenshot's thumbna define("APPDB_SCREENSHOT_MAXHEIGHT","768"); // height of the screenshot's thumbnails define("APPDB_ROOT", "http://localhost/appdb/"); // path to AppDB define("APPDB_OWNER","WineHQ"); // with what product/company is this AppDB related ? -define("APPDB_OWNER_URL","http://www.winehq.org/"); // website of this product/company +define("APPDB_OWNER_URL","https://www.winehq.org/"); // website of this product/company define("APPDB_OWNER_EMAIL","appdb(a)winehq.org"); // e-mail of this product/company define("APPDB_SENDER_EMAIL","appdb-noreply(a)winehq.org"); // The e-mail address which appears as the sender in mails sent by the AppDB -define("BUGZILLA_ROOT","http://bugs.winehq.org/"); // path to bugzilla +define("BUGZILLA_ROOT","https://bugs.winehq.org/"); // path to bugzilla // AppDB developers: Use this define to disable email from being sent from the appdb during testing //if(!defined("DISABLE_EMAIL"))

1 0

Jeremy Newman : fail to error page on bad query, use debug log and error handler
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 6c49ce5cce4949a9570c8ee9285df2a03b6fdfd0 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=6c49ce5cce4949a9570c8ee9… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 15 12:17:44 2016 -0600 fail to error page on bad query, use debug log and error handler --- include/query.php | 91 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 47 insertions(+), 44 deletions(-) diff --git a/include/query.php b/include/query.php index 7b02e79..39b9d76 100644 --- a/include/query.php +++ b/include/query.php @@ -1,19 +1,31 @@ <?php +/*************************************************/ +/* Application Database DB Query Functions */ +/*************************************************/ + +// AppDB connection link $hAppdbLink = null; + +// bugs connection link $hBugzillaLink = null; +// set DEADLOCK define("MYSQL_DEADLOCK_ERRNO", 1213); function query_appdb($sQuery, $sComment="") { global $hAppdbLink; + // log query + appdb_debug("query_appdb -> {$sQuery}"); + + // if not connected, connect if(!is_resource($hAppdbLink)) { // The last argument makes sure we are really opening a new connection $hAppdbLink = mysql_connect(APPS_DBHOST, APPS_DBUSER, APPS_DBPASS, true); if(!$hAppdbLink) - die("Database error, please try again soon."); + query_error($sQuery, $sComment, $hAppdbLink); mysql_select_db(APPS_DB, $hAppdbLink); } @@ -45,6 +57,35 @@ function query_appdb($sQuery, $sComment="") return NULL; } +function query_bugzilladb($sQuery, $sComment="") +{ + global $hBugzillaLink; + + // log query + appdb_debug("query_bugzilladb -> {$sQuery}"); + + // if not connected, connect + if(!is_resource($hBugzillaLink)) + { + // The last argument makes sure we are really opening a new connection + $hBugzillaLink = mysql_connect(BUGZILLA_DBHOST, BUGZILLA_DBUSER, BUGZILLA_DBPASS, true); + if(!$hBugzillaLink) + return; + mysql_select_db(BUGZILLA_DB, $hBugzillaLink); + // Tell MySQL to return UTF8-encoded results + $sQueryAskingForUtf8Results = "SET SESSION CHARACTER_SET_RESULTS = 'utf8'"; + if (!mysql_query($sQueryAskingForUtf8Results, $hBugzillaLink)) + { + query_error($sQueryAskingForUtf8Results, "", $hBugzillaLink); + } + } + + $hResult = mysql_query($sQuery, $hBugzillaLink); + if(!$hResult) + query_error($sQuery, $sComment, $hBugzillaLink); + return $hResult; +} + /* * Wildcard Rules * SCALAR (?) => 'original string quoted' @@ -120,51 +161,13 @@ function query_parameters() return query_appdb($sPreparedquery); } -function query_bugzilladb($sQuery,$sComment="") -{ - global $hBugzillaLink; - - if(!is_resource($hBugzillaLink)) - { - // The last argument makes sure we are really opening a new connection - $hBugzillaLink = mysql_connect(BUGZILLA_DBHOST, BUGZILLA_DBUSER, BUGZILLA_DBPASS, true); - if(!$hBugzillaLink) return; - mysql_select_db(BUGZILLA_DB, $hBugzillaLink); - // Tell MySQL to return UTF8-encoded results - $sQueryAskingForUtf8Results = "SET SESSION CHARACTER_SET_RESULTS = 'utf8'"; - if (!mysql_query($sQueryAskingForUtf8Results, $hBugzillaLink)) - { - query_error($sQueryAskingForUtf8Results, "", $hBugzillaLink); - } - } - - $hResult = mysql_query($sQuery, $hBugzillaLink); - if(!$hResult) query_error($sQuery, $sComment, $hBugzillaLink); - return $hResult; -} - - function query_error($sQuery, $sComment, $hLink) { - static $bInQueryError = false; - - // if we are already reporting an error we can't report it again - // as that indicates that error reporting itself produced an error - if($bInQueryError) - return; - - // record that we are inside of this function, we don't want to recurse - $bInQueryError = true; - - error_log::log_error(ERROR_SQL, "Query: '".$sQuery."' ". - "mysql_errno(): '".mysql_errno($hLink)."' ". - "mysql_error(): '".mysql_error($hLink)."' ". - "comment: '".$sComment."'"); - - $sStatusMessage = "<p><b>An internal error has occurred and has been logged and reported to appdb admins</b></p>"; - addmsg($sStatusMessage); - - $bInQueryError = false; // clear variable upon exit + error_log("Query: '".$sQuery."' ". + "mysql_errno(): '".mysql_errno($hLink)."' ". + "mysql_error(): '".mysql_error($hLink)."' ". + "comment: '".$sComment."'"); + trigger_error("Database Error: '".mysql_error($hLink)."' ", E_USER_ERROR); } function query_fetch_row($hResult)

1 0

Jeremy Newman : rewrite javascript handlers for jquery, and merge files, cleanup
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 9c186b30f360ee3e65b697c7d0381f745bcfa609 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9c186b30f360ee3e65b697c7… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 15 12:18:22 2016 -0600 rewrite javascript handlers for jquery, and merge files, cleanup --- scripts.js | 120 -------------------------------------------------- utils.js | 146 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 127 insertions(+), 139 deletions(-) diff --git a/scripts.js b/scripts.js deleted file mode 100644 index 524489d..0000000 --- a/scripts.js +++ /dev/null @@ -1,120 +0,0 @@ -function openWin(fileToOpen,nameOfWindow,width,height) { - myWindow = window.open("",nameOfWindow,"menubar=no,scrollbars=yes,status=no,width="+width+",height="+height); - myWindow.document.open(); - myWindow.document.write('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">'); - myWindow.document.write('<html><head><title>Screenshot Viewer</title>') - myWindow.document.write('<style type="text/css">'); - myWindow.document.write('body { margin: 0; padding: 0; background-color: lightgrey; }'); - myWindow.document.write('img { border: 0; }'); - myWindow.document.write('p { display: inline; }'); - myWindow.document.write('</style></head><body>'); - myWindow.document.write('<a onclick="self.close();" href=""><img src="'+ fileToOpen +'" alt="Screenshot"></a>'); - myWindow.document.write('</body></html>'); - myWindow.document.close(); -} - -function deleteURL(text, url) { - if (confirm(text)) { - self.location = url; - } -} - -function ChangeTr(tableRow, bRowActive, sHighlightColor, sInactiveColor, - sTextDecorationHighlight, sTextDecorationInactive) -{ - if (bRowActive) - { - tableRow.style.backgroundColor = sHighlightColor; - tableRow.style.cursor = "hand"; - tableRow.style.textDecoration = sTextDecorationHighlight; - } - else - { - tableRow.style.backgroundColor = sInactiveColor; - tableRow.style.cursor = "pointer"; - tableRow.style.textDecoration = sTextDecorationInactive; - } -} - -function DoNav(sUrl) -{ - document.location.href = sUrl; -} - -/** - * commentId is the uniquely identifying comment id from the database. - * It is also used as the div id for the comment body. - */ -function showComment(commentid) -{ - elem = $(commentid); - if(elem.visible() && !elem.empty()) - { - elem.hide(); - } - else - { - // Cache the contents of the comment body so we don't need to hit db again. - if(elem.empty()) - { - new Ajax.Updater(commentid, 'comment_body.php', { - method: 'get', - parameters: { - iCommentId: commentid - } - }); - } - elem.show(); - } -} -/* provide a hint to the user about the selected rating */ -var ratingdesc=[ - "", - " Works flawlessly out of the box - no problems ", - " Works flawlessly with DLL overrides, third party software or other settings ", - " Works excellently for normal use;works fine in singleplayer but not multi ", - " Works but has issues for normal use ", - " Does not run or cannot be installed with Wine " - ]; -var ratingstyle =[ - "", - "platinum", - "gold", - "silver", - "bronze", - "garbage" - ]; -function showHint(o){ - if(o) - { - $('hint').innerHTML=ratingdesc[o.selectedIndex]; - $w($('hint').className).map( function(x){ $('hint').removeClassName(x); }) - $('hint').addClassName(ratingstyle[o.selectedIndex]); - } -} -/* too many people still call Wine "WINE" */ -function bind_tolowerWINE() -{ - [ - $('app_editor'), - $('version_editor'), - $('Test1'), - $('Test2'), - $('Test3'), - $('extra_comments')].map( function(x) - { - if(x) - { - x.observe('change', tolowerWINE); - } - }); -} -function tolowerWINE(o) - { - o.element().value = o.element().value.replace(/WINE([^A-Z]+)|(WINE)$/g,"Wine$1"); - } -/* executed when document is ready */ -document.observe("dom:loaded", function() { - showHint($('ratingSelect')); - bind_tolowerWINE(); - }); diff --git a/utils.js b/utils.js index 24d5806..099e61a 100644 --- a/utils.js +++ b/utils.js @@ -1,23 +1,131 @@ /* - Misc JavaScipt for WineHQ -*/ - -// include a file from js scripts dir -function include_dom (script_filename) { - var html_doc = document.getElementsByTagName('head').item(0); - var js = document.createElement('script'); - js.setAttribute('language', 'javascript'); - js.setAttribute('type', 'text/javascript'); - js.setAttribute('src', script_filename); - html_doc.appendChild(js); - return false; -} + * Misc JavaScipt for WineHQ Application Database + */ + +// welcome +console.log('Welcome to the %cWineHQ%c AppDB', + 'color: #490708; font-size: 48pt; font-style: italic; font-weight: bold;', + 'color: #95493A; font-size: 48pt; font-style: italic; font-weight: bold;'); + +// execute on when document ready +$(document).ready(function() +{ + // rating hints + (function() + { + var ratingdesc=[ + "", + " Works flawlessly out of the box - no problems ", + " Works flawlessly with DLL overrides, third party software or other settings ", + " Works excellently for normal use;works fine in singleplayer but not multi ", + " Works but has issues for normal use ", + " Does not run or cannot be installed with Wine " + ]; + var ratingstyle =[ + "", + "platinum", + "gold", + "silver", + "bronze", + "garbage" + ]; + var changeRatingSelect = function() + { + var sel = $("#ratingSelect").prop('selectedIndex'); + $("#hint").attr('class', ''); + $("#hint").html(ratingdesc[sel]); + $("#hint").addClass(ratingstyle[sel]); + }; + $("#ratingSelect").change(function(){changeRatingSelect()}); + changeRatingSelect(); + })(); + + // load nested forum comment + $('.showComment').each(function() + { + $(this).click(function(e) + { + e.preventDefault(); + var id = $(this).data('id'); + $("#comment-"+id).html('<i class="fa fa-spinner fa-spin fa-fw"></a>'); + $.get('comment_body.php', {iCommentId: id}, function(comment) + { + $("#comment-"+id).html(comment); + }); + }); + }); -// load and execute jquery IE6 PNG fix -include_dom("/jquery.pngfix.js"); -jQuery(function($) { - $("img[@src$=png]").pngfix(); /* all img tags with .png extension */ - $("#tabs li").pngfix(); /* top tabs li backgrounds */ + // debug log clicker + $("div#dlogt").toggleClick( + function() + { + $('div#dlogp').slideDown(); + }, + function() + { + $('div#dlogp').slideUp(); + }); }); -// done +/* + * jQuery old style toggle replacement + * this useful object was removed in jquery 1.9 + */ +$.fn.toggleClick = function(){ + var functions = arguments ; + return this.click(function(){ + var iteration = $(this).data('iteration') || 0; + functions[iteration].apply(this, arguments); + iteration = (iteration + 1) % functions.length ; + $(this).data('iteration', iteration); + }); +}; + +// open Window (FIXME: replace with an inline screenshot viewer) +function openWin(fileToOpen,nameOfWindow,width,height) { + myWindow = window.open("",nameOfWindow,"menubar=no,scrollbars=yes,status=no,width="+width+",height="+height); + myWindow.document.open(); + myWindow.document.write('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">'); + myWindow.document.write('<html><head><title>Screenshot Viewer</title>') + myWindow.document.write('<style type="text/css">'); + myWindow.document.write('body { margin: 0; padding: 0; background-color: lightgrey; }'); + myWindow.document.write('img { border: 0; }'); + myWindow.document.write('p { display: inline; }'); + myWindow.document.write('</style></head><body>'); + myWindow.document.write('<a onclick="self.close();" href=""><img src="'+ fileToOpen +'" alt="Screenshot"></a>'); + myWindow.document.write('</body></html>'); + myWindow.document.close(); +} + +// confirmation message (FIXME: replace with jquery utils: dialog) +function deleteURL(text, url) { + if (confirm(text)) { + self.location = url; + } +} + +// row color change +function ChangeTr(tableRow, bRowActive, sHighlightColor, sInactiveColor, + sTextDecorationHighlight, sTextDecorationInactive) +{ + if (bRowActive) + { + tableRow.style.backgroundColor = sHighlightColor; + tableRow.style.cursor = "hand"; + tableRow.style.textDecoration = sTextDecorationHighlight; + } + else + { + tableRow.style.backgroundColor = sInactiveColor; + tableRow.style.cursor = "pointer"; + tableRow.style.textDecoration = sTextDecorationInactive; + } +} + +// doNav +function DoNav(sUrl) +{ + document.location.href = sUrl; +} + +// done \ No newline at end of file

1 0

Jeremy Newman : change over to mysqli db interface as mysql_ is deprecated
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: b851f940b9e3d139fbe19a199283aaaeac4dff91 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b851f940b9e3d139fbe19a19… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 15 14:15:06 2016 -0600 change over to mysqli db interface as mysql_ is deprecated --- include/query.php | 94 ++++++++++++++++++++++++------------------------------- 1 file changed, 41 insertions(+), 53 deletions(-) diff --git a/include/query.php b/include/query.php index 39b9d76..a4b82d8 100644 --- a/include/query.php +++ b/include/query.php @@ -23,10 +23,9 @@ function query_appdb($sQuery, $sComment="") if(!is_resource($hAppdbLink)) { // The last argument makes sure we are really opening a new connection - $hAppdbLink = mysql_connect(APPS_DBHOST, APPS_DBUSER, APPS_DBPASS, true); + $hAppdbLink = new mysqli(APPS_DBHOST, APPS_DBUSER, APPS_DBPASS, APPS_DB); if(!$hAppdbLink) query_error($sQuery, $sComment, $hAppdbLink); - mysql_select_db(APPS_DB, $hAppdbLink); } $iRetries = 2; @@ -35,13 +34,12 @@ function query_appdb($sQuery, $sComment="") /* as a deadlock isn't really a failure */ while($iRetries) { - $hResult = mysql_query($sQuery, $hAppdbLink); + $hResult = $hAppdbLink->query($sQuery); if(!$hResult) { /* if this error isn't a deadlock OR if it is a deadlock and we've */ /* run out of retries, report the error */ - $iErrno = mysql_errno($hAppdbLink); - if(($iErrno != MYSQL_DEADLOCK_ERRNO) || (($iErrno == MYSQL_DEADLOCK_ERRNO) && ($iRetries <= 0))) + if(($hAppdbLink->errno != MYSQL_DEADLOCK_ERRNO) || (($hAppdbLink->errno == MYSQL_DEADLOCK_ERRNO) && ($iRetries <= 0))) { query_error($sQuery, $sComment, $hAppdbLink); return $hResult; @@ -68,19 +66,18 @@ function query_bugzilladb($sQuery, $sComment="") if(!is_resource($hBugzillaLink)) { // The last argument makes sure we are really opening a new connection - $hBugzillaLink = mysql_connect(BUGZILLA_DBHOST, BUGZILLA_DBUSER, BUGZILLA_DBPASS, true); + $hBugzillaLink = new mysqli(BUGZILLA_DBHOST, BUGZILLA_DBUSER, BUGZILLA_DBPASS, BUGZILLA_DB); if(!$hBugzillaLink) return; - mysql_select_db(BUGZILLA_DB, $hBugzillaLink); // Tell MySQL to return UTF8-encoded results $sQueryAskingForUtf8Results = "SET SESSION CHARACTER_SET_RESULTS = 'utf8'"; - if (!mysql_query($sQueryAskingForUtf8Results, $hBugzillaLink)) + if (!$hBugzillaLink->query($sQueryAskingForUtf8Results)) { query_error($sQueryAskingForUtf8Results, "", $hBugzillaLink); } } - $hResult = mysql_query($sQuery, $hBugzillaLink); + $hResult = $hBugzillaLink->query($sQuery); if(!$hResult) query_error($sQuery, $sComment, $hBugzillaLink); return $hResult; @@ -89,7 +86,6 @@ function query_bugzilladb($sQuery, $sComment="") /* * Wildcard Rules * SCALAR (?) => 'original string quoted' - * OPAQUE (&) => 'string from file quoted' * MISC (~) => original string (left 'as-is') * * NOTE: These rules convienently match those for Pear DB @@ -100,9 +96,10 @@ function query_bugzilladb($sQuery, $sComment="") * http://us3.php.net/manual/en/function.mysql-query.php#53400 * * Modified by CMM 20060622 + * Modified by JWN 20161115 * - * Values are mysql_real_escape_string()'d to prevent against injection attacks - * See http://php.net/mysql_real_escape_string for more information about why this is the case + * Values are $hAppdbLink->real_escape_string()'d to prevent against injection attacks + * See http://php.net/$hAppdbLink->real_escape_string for more information about why this is the case * * Usage: * $hResult = query_parameters("Select * from mytable where userid = '?'", @@ -117,16 +114,16 @@ function query_parameters() { global $hAppdbLink; - if(!is_resource($hAppdbLink)) + if(empty($hAppdbLink) or !is_resource($hAppdbLink)) { - // The last argument makes sure we are really opening a new connection - $hAppdbLink = mysql_connect(APPS_DBHOST, APPS_DBUSER, APPS_DBPASS, true) or die('Database error, please try again soon: '.mysql_error()); - mysql_select_db(APPS_DB, $hAppdbLink); + $hAppdbLink = new mysqli(APPS_DBHOST, APPS_DBUSER, APPS_DBPASS, APPS_DB); + if (!$hAppdbLink) + query_error('', 'Database connection failed!', $hAppdbLink); } $aData = func_get_args(); $sQuery = $aData[0]; - $aTokens = preg_split("/[&?~]/", $sQuery); /* NOTE: no need to escape characters inside of [] in regex */ + $aTokens = preg_split("/[?~]/", $sQuery); /* NOTE: no need to escape characters inside of [] in regex */ $sPreparedquery = $aTokens[0]; $iCount = strlen($aTokens[0]); @@ -138,23 +135,8 @@ function query_parameters() { $char = substr($sQuery, $iCount, 1); $iCount += (strlen($aTokens[$i])+1); - if ($char == "&") - { - $fp = @fopen($aData[$i], 'r'); - $pdata = ""; - if ($fp) - { - while (($sBuf = fread($fp, 4096)) != false) - { - $pdata .= $sBuf; - } - fclose($fp); - } - } else - { - $pdata = &$aData[$i]; - } - $sPreparedquery .= ($char != "~" ? mysql_real_escape_string($pdata) : $pdata); + $pdata = &$aData[$i]; + $sPreparedquery .= ($char != "~" ? $hAppdbLink->real_escape_string($pdata) : $pdata); $sPreparedquery .= $aTokens[$i]; } @@ -163,38 +145,35 @@ function query_parameters() function query_error($sQuery, $sComment, $hLink) { - error_log("Query: '".$sQuery."' ". - "mysql_errno(): '".mysql_errno($hLink)."' ". - "mysql_error(): '".mysql_error($hLink)."' ". - "comment: '".$sComment."'"); - trigger_error("Database Error: '".mysql_error($hLink)."' ", E_USER_ERROR); + error_log("Query: '".$sQuery."' $hLink->errno: '".$hLink->errno."' comment: '".$sComment."'"); + trigger_error("Database Error: {$hLink->error} Comment: {$sComment}", E_USER_ERROR); } function query_fetch_row($hResult) { - return mysql_fetch_row($hResult); + return $hResult->fetch_row(); } function query_fetch_object($hResult) { - return mysql_fetch_object($hResult); + return $hResult->fetch_object(); } function query_appdb_insert_id() { global $hAppdbLink; - return mysql_insert_id($hAppdbLink); + return $hAppdbLink->insert_id; } function query_bugzilla_insert_id() { global $hBugzillaLink; - return mysql_insert_id($hBugzillaLink); + return $hAppdbLink->insert_id; } function query_num_rows($hResult) { - return mysql_num_rows($hResult); + return $hResult->num_rows; } function query_escape_string($sString) @@ -204,38 +183,47 @@ function query_escape_string($sString) if(!is_resource($hAppdbLink)) { // The last argument makes sure we are really opening a new connection - $hAppdbLink = mysql_connect(APPS_DBHOST, APPS_DBUSER, APPS_DBPASS, true); + $hAppdbLink = new mysqli(APPS_DBHOST, APPS_DBUSER, APPS_DBPASS, APPS_DB); if(!$hAppdbLink) - die("Database error, please try again soon."); - mysql_select_db(APPS_DB, $hAppdbLink); + query_error('', 'Database connection failed!', $hAppdbLink); } - return mysql_real_escape_string($sString, $hAppdbLink); + return $hAppdbLink->real_escape_string($sString); } function query_field_type($hResult, $iFieldOffset) { - return mysql_field_type($hResult, $iFieldOffset); + $finfo = $hResult->fetch_field_direct($iFieldOffset); + return $finfo->type; } function query_field_name($hResult, $iFieldOffset) { - return mysql_field_name($hResult, $iFieldOffset); + $finfo = $hResult->fetch_field_direct($iFieldOffset); + return $finfo->name; } function query_field_len($hResult, $ifieldOffset) { - return mysql_field_len($hResult, $iFieldOffset); + $finfo = $hResult->fetch_field_direct($iFieldOffset); + return $finfo->max_length; } function query_field_flags($hResult, $iFieldOffset) { - return mysql_field_flags($hResult, $iFieldOffset); + $finfo = $hResult->fetch_field_direct($iFieldOffset); + return $finfo->flags; } function query_fetch_field($hResult, $iFieldOffset) { - return mysql_fetch_field($hResult, $iFieldOffset); + return $hResult->fetch_field_direct($iFieldOffset); +} + +function query_get_server_info() +{ + global $hAppdbLink; + return $hAppdbLink->server_info; } ?>

1 0

Jeremy Newman : change all mysql_ functions over to internal query_ functions
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: fa21b07b91de814b3feb2fc2ba8428dc2420820d URL: http://source.winehq.org/git/appdb.git/?a=commit;h=fa21b07b91de814b3feb2fc2… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 15 14:16:13 2016 -0600 change all mysql_ functions over to internal query_ functions --- admin.php | 26 +++++++++++++------------- admin/editBundle.php | 2 +- cron/cleanup.php | 14 +++++++------- include/application.php | 6 +++--- include/bugs.php | 6 ++++-- include/category.php | 2 +- include/comment.php | 12 ++++++------ include/commonReply.php | 6 +++--- include/db_filter.php | 6 +++--- include/db_filter_ui.php | 2 +- include/distribution.php | 2 +- include/maintainer.php | 10 +++++----- include/maintainerView.php | 6 +++--- include/note.php | 4 ++-- include/objectManager.php | 6 +++--- include/tag.php | 16 ++++++++-------- include/tag_Note.php | 4 ++-- include/testData.php | 6 +++--- include/user.php | 2 +- include/util.php | 2 +- include/version.php | 16 ++++++++-------- include/vote.php | 18 +++++++++--------- unit_test/test_om_objects.php | 4 ++-- 23 files changed, 90 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=fa21b07b91de814b3feb…

1 0

Jeremy Newman : remove old design images, will load directly from main site in new deisgn
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: db6ddc55db28b3ad1385b8ca4647f978c137e1b6 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=db6ddc55db28b3ad1385b8ca… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Nov 16 08:57:27 2016 -0600 remove old design images, will load directly from main site in new deisgn --- images/bg.jpg | Bin 86167 -> 0 bytes images/cw_logo_sm.png | Bin 4383 -> 0 bytes images/side_menu_bg.png | Bin 226 -> 0 bytes images/side_menu_bot.png | Bin 564 -> 0 bytes images/side_menu_top.png | Bin 3287 -> 0 bytes images/tab_h.png | Bin 584 -> 0 bytes images/tab_s.png | Bin 614 -> 0 bytes images/tab_u.png | Bin 616 -> 0 bytes images/winehq_logo_glass_sm.png | Bin 14291 -> 0 bytes images/winehq_logo_text.png | Bin 6870 -> 0 bytes 10 files changed, 0 insertions(+), 0 deletions(-) diff --git a/images/bg.jpg b/images/bg.jpg deleted file mode 100644 index 16bb0b5..0000000 Binary files a/images/bg.jpg and /dev/null differ diff --git a/images/cw_logo_sm.png b/images/cw_logo_sm.png deleted file mode 100644 index 3099535..0000000 Binary files a/images/cw_logo_sm.png and /dev/null differ diff --git a/images/side_menu_bg.png b/images/side_menu_bg.png deleted file mode 100644 index c8cbcc0..0000000 Binary files a/images/side_menu_bg.png and /dev/null differ diff --git a/images/side_menu_bot.png b/images/side_menu_bot.png deleted file mode 100644 index 8bc9b5d..0000000 Binary files a/images/side_menu_bot.png and /dev/null differ diff --git a/images/side_menu_top.png b/images/side_menu_top.png deleted file mode 100644 index 047c4c0..0000000 Binary files a/images/side_menu_top.png and /dev/null differ diff --git a/images/tab_h.png b/images/tab_h.png deleted file mode 100644 index 59620cd..0000000 Binary files a/images/tab_h.png and /dev/null differ diff --git a/images/tab_s.png b/images/tab_s.png deleted file mode 100644 index 54d367b..0000000 Binary files a/images/tab_s.png and /dev/null differ diff --git a/images/tab_u.png b/images/tab_u.png deleted file mode 100644 index ff84b7a..0000000 Binary files a/images/tab_u.png and /dev/null differ diff --git a/images/winehq_logo_glass_sm.png b/images/winehq_logo_glass_sm.png deleted file mode 100644 index 949334b..0000000 Binary files a/images/winehq_logo_glass_sm.png and /dev/null differ diff --git a/images/winehq_logo_text.png b/images/winehq_logo_text.png deleted file mode 100644 index 29b6ecb..0000000 Binary files a/images/winehq_logo_text.png and /dev/null differ

1 0