November 2016 - Wine-Commits

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

Nov. 21, 2016

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 : fail to error page on bad query, use debug log and error handler
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

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 : html_frame functions should use divs, remove do_indent
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

Module: appdb Branch: master Commit: a463a34a72d011f4fb83ab213089f6a627bceb89 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=a463a34a72d011f4fb83ab21… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Nov 16 10:48:33 2016 -0600 html_frame functions should use divs, remove do_indent using tables for layout is a very very very very old design paradigm it is time to take it out back and send it into the great beyond do_indent is also pointless with modern dom inspectors, making the source pretty is not really needed in this instance --- include/html.php | 136 ++++++++++++------------------------------------------- 1 file changed, 30 insertions(+), 106 deletions(-) diff --git a/include/html.php b/include/html.php index b015f9f..fe46455 100644 --- a/include/html.php +++ b/include/html.php @@ -1,22 +1,8 @@ <?php - -$_indent_level = 0; - -function do_indent($str, $v = 0) -{ - global $_indent_level; - - if($v < 0) - $_indent_level += $v; - - if($_indent_level > 0) - $str = str_repeat(" ", $_indent_level) . $str; - - if($v > 0) - $_indent_level += $v; - - return $str . "\n"; -} +/** + * Basic HTML functions + * FIXME -- get rid of the frame and table functions + */ function do_html_tr($t, $arr, $class, $extra) { @@ -27,7 +13,7 @@ function do_html_tr($t, $arr, $class, $extra) if(strlen($extra)) $extra = " $extra"; - $str = do_indent("<tr$class$extra>", 1); + $str = "<tr$class$extra>"; for($i = 0; $i < sizeof($arr); $i++) { /* If it is not an array, it contains the entire table cell. If it @@ -51,14 +37,14 @@ function do_html_tr($t, $arr, $class, $extra) if(stristr($val, "<$t")) { - $str .= do_indent($val); + $str .= $val; } else { - $str .= do_indent("<$t$class$extra> ".trim($val)." </$t>", 0); + $str .= "<$t$class$extra> ".trim($val)." </$t>"; } } - $str .= do_indent("</tr>", -1); + $str .= "</tr>"; return $str; } @@ -72,50 +58,12 @@ function html_tr($arr, $class = "", $extra = "") // HTML TABLE function html_table_begin($extra = "") { - return do_indent("<table $extra>", 1); + return "<table $extra>"; } function html_table_end() { - return do_indent("</table>", -1); -} - - -// HTML HTML -function html_begin() -{ - return do_indent("<html>", 1); -} - -function html_end() -{ - return do_indent("</html>", -1); -} - - -// HTML HEAD -function html_head($title, $stylesheet = 0) -{ - $str = do_indent("<head>", 1); - $str .= do_indent("<title> $title </title>", 0); - if($stylesheet) - $str .= do_indent("<link rel=\"stylesheet\" ". - "href=\"$stylesheet\" type=\"text/css\">", 0); - $str .= do_indent("</head>", -1); - - return $str; -} - - -// HTML BODY -function html_body_begin() -{ - return do_indent("<body>", 1); -} - -function html_body_end() -{ - return do_indent("</body>", -1); + return "</table>"; } // HTML A HREF @@ -124,15 +72,15 @@ function html_ahref($label, $url, $extra = "") $label = stripslashes($label); if (!$label and $url) { - return do_indent(" <a href=\"$url\" $extra>$url</a> "); + return " <a href=\"$url\" $extra>$url</a> "; } else if (!$label) { - return do_indent("   "); + return "   "; } else { - return do_indent(" <a href=\"$url\" $extra>$label</a> "); + return " <a href=\"$url\" $extra>$label</a> "; } } @@ -153,51 +101,27 @@ function html_imagebutton($text, $url, $extra = "") function html_frame_start($title = "", $width = "", $extra = "", $innerPad = 0) { - - if ($width) { $width = 'width="'.$width.'"'; } - -$str = '<table '.$width.' border="0" class="mainTable" cellpadding="0" cellspacing="0" align="center">'."\n"; - -if ($title) -{ -$str .= ' -<tr><td colspan=3><table width="100%" border=0 cellpadding=0 cellspacing=0> -<tr><td> - <table width="100%" border="0" cellpadding="0" cellspacing="0" class="topMenu"> - <tr> - <td width="100%" rowspan="3" align="center"><span class="menuTitle">'.$title.'</span></td> - </tr> - </table> -</td></tr> -</table></td></tr> -'; -} - -$str .= ' -<tr> -<td><img src="'.BASE.'images/blank.gif" width="5" height="1" alt=""></td> -<td width="100%"><table width="100%" border=0 cellpadding=0 cellspacing=0> - <tr><td class=topMenu> - <table width="100%" border=0 cellpadding="'.$innerPad.'" cellspacing="1" '.$extra.'><tr><td class=white> -'; - + $style = ""; + if ($width or $innerPad) + { + $style .= 'style="'; + if ($width) + $style .= "width:{$width};"; + if ($innerPad) + $style .= "padding:{$innerPad}px;"; + $style .= '"'; + } + $str = "<div class=\"html_frame\" {$style} {$extra}>\n"; + if ($title) + { + $str .= "<div class=\"html_frame_title\">{$title}</div>\n"; + } return $str; } function html_frame_end($text = "") { - -$str = ' - </td></tr></table></td></tr> - </table> -</td> -<td><img src="'.BASE.'images/blank.gif" width="5" height="1" alt=""></td> -</tr> -</table> -<br> -'; - - return $str; + return "</div>\n"; } @@ -226,7 +150,7 @@ function html_back_link($howmany = 1, $url = "") { $url = 'javascript:history.back('.$howmany.');'; } - return '<p>   <a href="'.htmlentities($url).'"><< Back</a></p>'."\n"; + return '<p><a href="'.htmlentities($url).'" class="btn btn-default"><i class="fa fa-arrow-left"></i> Back</a></p>'."\n"; }

1 0

Jeremy Newman : update appdb to the new style winehq layout
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

Module: appdb Branch: master Commit: 164f5bf0b09135c83243f4cb38c0eec7ae4e3899 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=164f5bf0b09135c83243f4cb… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Nov 16 09:47:57 2016 -0600 update appdb to the new style winehq layout * html5, bootstrap, fontawesome * made alert boxes hidable via click, and they float above content * moved sidebar outside of content well, and moved it into header.php --- include/appdb.php | 46 ------- include/footer.php | 8 +- include/header.php | 96 ++++++++++--- styles.css | 395 ++++++++++++++++++++++++++++++----------------------- utils.js | 3 + 5 files changed, 305 insertions(+), 243 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=164f5bf0b09135c83243…

1 0

Jeremy Newman : remove stray div tag
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

Module: appdb Branch: master Commit: 61c69075d60c12e216ac2a13af5a83f3a1a5cebb URL: http://source.winehq.org/git/appdb.git/?a=commit;h=61c69075d60c12e216ac2a13… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Nov 16 09:47:09 2016 -0600 remove stray div tag --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index 0ef4ae1..6fe93e3 100644 --- a/index.php +++ b/index.php @@ -12,10 +12,10 @@ require("path.php"); require(BASE."include/incl.php"); apidb_header("Wine Application Database"); + ?> <img style="float:right;" src="images/appdb_montage.jpg" width=391 height=266 alt="Wine AppDB"> -<div class='default_container'> <h1>Welcome</h1> <p>This is the Wine Application Database (AppDB). Here you can get information on application

1 0

Jeremy Newman : remove old highlight code
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

Module: appdb Branch: master Commit: 374bc7a829829615b6875c668c840cfa4ec37d60 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=374bc7a829829615b6875c66… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 17 10:49:19 2016 -0600 remove old highlight code --- include/testData.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/include/testData.php b/include/testData.php index 2a83066..326de0c 100644 --- a/include/testData.php +++ b/include/testData.php @@ -586,20 +586,12 @@ class testData{ { $sTRClass = $bgcolor; - $oInactiveColor = new color(); - $oInactiveColor->SetColorByName($this->sTestedRating); - - $oHighlightColor = GetHighlightColorFromInactiveColor($oInactiveColor); - - $oTableRowHighlight = new TableRowHighlight($oHighlightColor, $oInactiveColor); - $sUrl = $sLink.$this->iTestingId; if($bShowAll) $sUrl .= '&bShowAll=true'; $oTableRowClick = new TableRowClick($sUrl); - $oTableRowClick->SetHighlight($oTableRowHighlight); // add the table element indicating that the user can show the row by clicking on it $oTableCell = new TableCell("Show");

1 0

Jeremy Newman : change all mysql_ functions over to internal query_ functions
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

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 : change over to mysqli db interface as mysql_ is deprecated
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

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 : move appdb specific functions to appdb.php, cleanup
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

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

Jeremy Newman : add some comments to explain what this file is
by Jeremy Newman Nov. 21, 2016

Nov. 21, 2016

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