June 2007 - Wine-commits - list.winehq.org

appdb/include distribution.php
by WineHQ 16 Jun '07

16 Jun '07

ChangeSet ID: 31213 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/16 12:02:25 Modified files: include : distribution.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> distribution: Fix empty submitter notification email. Pass the correct argument to mailSubmitter() Patch: http://cvs.winehq.org/patch.py?id=31213 Old revision New revision Changes Path 1.35 1.36 +2 -2 appdb/include/distribution.php Index: appdb/include/distribution.php diff -u -p appdb/include/distribution.php:1.35 appdb/include/distribution.php:1.36 --- appdb/include/distribution.php:1.35 16 Jun 2007 17: 2:25 -0000 +++ appdb/include/distribution.php 16 Jun 2007 17: 2:25 -0000 @@ -190,7 +190,7 @@ class distribution { { $this->sQueued = 'false'; // we send an e-mail to interested people - $this->mailSubmitter("unQueue"); + $this->mailSubmitter("add"); $this->SendNotificationMail(); return true; } else @@ -258,7 +258,7 @@ class distribution { case "add": { $sSubject = "Submitted Distribution accepted"; - $sMsg = "The Distribution you submitted (".$this->sName.") has been accepted."; + $sMsg = "The Distribution you submitted (".$this->sName.") has been accepted.\n"; } break; case "delete":

1 0

appdb/include objectManager.php
by WineHQ 16 Jun '07

16 Jun '07

ChangeSet ID: 31212 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/16 12:00:58 Modified files: include : objectManager.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Store iPage in handleMultiPageControls(). Fixes the case where an iPage would not be set for page 1, causing iItemsPerPage value to be ignored when returning from data processing Patch: http://cvs.winehq.org/patch.py?id=31212 Old revision New revision Changes Path 1.30 1.31 +1 -0 appdb/include/objectManager.php Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.30 appdb/include/objectManager.php:1.31 --- appdb/include/objectManager.php:1.30 16 Jun 2007 17: 0:58 -0000 +++ appdb/include/objectManager.php 16 Jun 2007 17: 0:58 -0000 @@ -689,6 +689,7 @@ class ObjectManager /* Fill the MultiPage object with the LIMIT related values */ $iLowerLimit = ($iPage - 1) * $iItemsPerPage; $this->oMultiPage->MultiPage(TRUE, $iItemsPerPage, $iLowerLimit); + $this->oMultiPage->iPage = $iPage; } function getQueueString($bQueued, $bRejected)

1 0

appdb/include objectManager.php
by WineHQ 16 Jun '07

16 Jun '07

ChangeSet ID: 31211 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/16 11:58:54 Modified files: include : objectManager.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix a typo in the common response text. Patch: http://cvs.winehq.org/patch.py?id=31211 Old revision New revision Changes Path 1.29 1.30 +1 -1 appdb/include/objectManager.php Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.29 appdb/include/objectManager.php:1.30 --- appdb/include/objectManager.php:1.29 16 Jun 2007 16:58:54 -0000 +++ appdb/include/objectManager.php 16 Jun 2007 16:58:54 -0000 @@ -32,7 +32,7 @@ class ObjectManager " in Wine's Bugzilla at http://bugs.winehq.org and resubmit."; $this->aCommonResponses[] = "We appreciate your submission but it". " needs to be more detailed before it will be most useful to other users of". - " the Application Datbase.". + " the Application Database.". " Please try to improve the entry and resubmit."; $this->aCommonResponses[] = "We appreciate your submission but it". " requires improvement to its grammar and/or spelling".

1 0

appdb/include application.php version.php
by WineHQ 16 Jun '07

16 Jun '07

ChangeSet ID: 31210 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/15 23:55:34 Modified files: include : application.php version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Remove duplicate and unused sDate variables from application and version classes Patch: http://cvs.winehq.org/patch.py?id=31210 Old revision New revision Changes Path 1.115 1.116 +0 -1 appdb/include/application.php 1.131 1.132 +0 -2 appdb/include/version.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.115 appdb/include/application.php:1.116 --- appdb/include/application.php:1.115 16 Jun 2007 4:55:34 -0000 +++ appdb/include/application.php 16 Jun 2007 4:55:34 -0000 @@ -66,7 +66,6 @@ class Application { $this->iCatId = $oRow->catId; $this->iSubmitterId = $oRow->submitterId; $this->sSubmitTime = $oRow->submitTime; - $this->sDate = $oRow->submitTime; $this->sName = $oRow->appName; $this->sKeywords = $oRow->keywords; $this->sDescription = $oRow->description; Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.131 appdb/include/version.php:1.132 --- appdb/include/version.php:1.131 16 Jun 2007 4:55:34 -0000 +++ appdb/include/version.php 16 Jun 2007 4:55:34 -0000 @@ -30,7 +30,6 @@ class Version { var $sTestedRating; var $sSubmitTime; var $iSubmitterId; - var $sDate; var $sQueued; var $sLicense; var $iMaintainerRequest; /* Temporary variable for version submisson. @@ -65,7 +64,6 @@ class Version { $this->iAppId = $oRow->appId; $this->iSubmitterId = $oRow->submitterId; $this->sSubmitTime = $oRow->submitTime; - $this->sDate = $oRow->submitTime; $this->sName = $oRow->versionName; $this->sDescription = $oRow->description; $this->sTestedRelease = $oRow->maintainer_release;

1 0

appdb/ cron/cleanup.php include/error_log.php
by WineHQ 16 Jun '07

16 Jun '07

ChangeSet ID: 31209 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/15 22:35:05 Modified files: cron : cleanup.php include : error_log.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix subject of database error log email sent during cron maintenance Patch: http://cvs.winehq.org/patch.py?id=31209 Old revision New revision Changes Path 1.42 1.43 +2 -1 appdb/cron/cleanup.php 1.3 1.4 +2 -2 appdb/include/error_log.php Index: appdb/cron/cleanup.php diff -u -p appdb/cron/cleanup.php:1.42 appdb/cron/cleanup.php:1.43 --- appdb/cron/cleanup.php:1.42 16 Jun 2007 3:35: 5 -0000 +++ appdb/cron/cleanup.php 16 Jun 2007 3:35: 5 -0000 @@ -251,9 +251,10 @@ function orphanSessionListCheck() $hResult = query_parameters($sQuery, SESSION_DAYS_TO_EXPIRE + 2); } +// report the database error log entries to the mailing list function reportErrorLogEntries() { - error_log::mail_admins_error_log(); + error_log::mail_admins_error_log($sEmailSubject); error_log::flush(); } Index: appdb/include/error_log.php diff -u -p appdb/include/error_log.php:1.3 appdb/include/error_log.php:1.4 --- appdb/include/error_log.php:1.3 16 Jun 2007 3:35: 5 -0000 +++ appdb/include/error_log.php 16 Jun 2007 3:35: 5 -0000 @@ -60,9 +60,9 @@ class error_log else return false; } - function mail_admins_error_log() + function mail_admins_error_log($sSubject = "") { - $sSubject = "Appdb error log\r\n"; + $sSubject .= "Database Error log\r\n"; $sEmail = User::get_notify_email_address_list(null, null); /* get list admins */ $sQuery = "SELECT * from error_log WHERE deleted='0' ORDER BY submitTime";

1 0

appdb/include version_queue.php
by WineHQ 16 Jun '07

16 Jun '07

ChangeSet ID: 31208 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/15 18:54:50 Modified files: include : version_queue.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Hide the maintainer box if the user supermaintains the application Patch: http://cvs.winehq.org/patch.py?id=31208 Old revision New revision Changes Path 1.14 1.15 +2 -1 appdb/include/version_queue.php Index: appdb/include/version_queue.php diff -u -p appdb/include/version_queue.php:1.14 appdb/include/version_queue.php:1.15 --- appdb/include/version_queue.php:1.14 15 Jun 2007 23:54:50 -0000 +++ appdb/include/version_queue.php 15 Jun 2007 23:54:50 -0000 @@ -101,7 +101,8 @@ class version_queue /* Allow the user to apply as maintainer if this is a new version. If it is a new application as well, radio boxes will be displayed by the application class instead. */ - if(!$this->oVersion->iVersionId && $this->oVersion->iAppId) + if(!$this->oVersion->iVersionId && $this->oVersion->iAppId && + !$_SESSION['current']->isSuperMaintainer($this->oVersion->iAppId)) { echo html_frame_start("Become Maintainer", "90%"); echo "<div style='padding:5px;' class='color0'>\n";

1 0

appdb/ ./account.php ./index.php include/form_ ...
by WineHQ 16 Jun '07

16 Jun '07

ChangeSet ID: 31207 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/15 18:40:21 Modified files: . : account.php index.php include : form_login.php sidebar_login.php util.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Preserve current url when logging in. Pass the current url as part of the url to the login form so we can return the user to the starting url after login. Patch: http://cvs.winehq.org/patch.py?id=31207 Old revision New revision Changes Path 1.35 1.36 +4 -1 appdb/account.php 1.48 1.49 +1 -1 appdb/index.php 1.10 1.11 +4 -1 appdb/include/form_login.php 1.28 1.29 +1 -1 appdb/include/sidebar_login.php 1.92 1.93 +16 -0 appdb/include/util.php Index: appdb/account.php diff -u -p appdb/account.php:1.35 appdb/account.php:1.36 --- appdb/account.php:1.35 15 Jun 2007 23:40:21 -0000 +++ appdb/account.php 15 Jun 2007 23:40:21 -0000 @@ -209,8 +209,11 @@ function cmd_do_login() if($iResult == SUCCESS) { + $sReturnUrl = $aClean['sReturnTo']; + if(!$sReturnUrl) + $sReturnUrl = apidb_fullurl("index.php"); addmsg("You are successfully logged in as '$oUser->sRealname'.", "green"); - util_redirect_and_exit(apidb_fullurl("index.php")); + util_redirect_and_exit($sReturnUrl); } else { retry("login","Login failed ".$shNote); Index: appdb/index.php diff -u -p appdb/index.php:1.48 appdb/index.php:1.49 --- appdb/index.php:1.48 15 Jun 2007 23:40:21 -0000 +++ appdb/index.php 15 Jun 2007 23:40:21 -0000 @@ -39,7 +39,7 @@ if(!$_SESSION['current']->isLoggedIn()) $str_benefits - <p>So what are you waiting for, [<a href=\"account.php?sCmd=login\">log in</a>] + <p>So what are you waiting for, [<a href=\"".login_url()."\">log in</a>] or [<a href=\"account.php?sCmd=new\">register</a>] now! Your help in stomping out Wine issues will be greatly appreciated.</p>"; } else Index: appdb/include/form_login.php diff -u -p appdb/include/form_login.php:1.10 appdb/include/form_login.php:1.11 --- appdb/include/form_login.php:1.10 15 Jun 2007 23:40:21 -0000 +++ appdb/include/form_login.php 15 Jun 2007 23:40:21 -0000 @@ -6,7 +6,10 @@ require_once(BASE."include/util.php"); /**************/ echo "<div class='default_container'>\n"; echo '<form method="post" name="sFlogin" action="account.php">',"\n"; -echo html_frame_start("Login to Application DB","400","",0) +echo html_frame_start("Login to Application DB","400","",0); +/* Pass on the URL we should return to after log-in */ +global $aClean; +echo '<input type="hidden" name="sReturnTo" value="'.$aClean['sReturnTo'].'" />'; ?>  Index: appdb/include/sidebar_login.php diff -u -p appdb/include/sidebar_login.php:1.28 appdb/include/sidebar_login.php:1.29 --- appdb/include/sidebar_login.php:1.28 15 Jun 2007 23:40:21 -0000 +++ appdb/include/sidebar_login.php 15 Jun 2007 23:40:21 -0000 @@ -88,7 +88,7 @@ function global_sidebar_login() { } else { - $g->add("Log in", BASE."account.php?sCmd=login"); + $g->add("Log in", login_url()); $g->add("Register", BASE."account.php?sCmd=new"); } Index: appdb/include/util.php diff -u -p appdb/include/util.php:1.92 appdb/include/util.php:1.93 --- appdb/include/util.php:1.92 15 Jun 2007 23:40:21 -0000 +++ appdb/include/util.php 15 Jun 2007 23:40:21 -0000 @@ -903,4 +903,20 @@ function util_trim_description($sDescrip return trim(strip_tags($aDesc[0])); } +/* This allows us to pass on the current URL to the login form so that the user is returned + to the current page once he has logged in */ +function login_url() +{ + $sCurrentUrl = $_SERVER['REQUEST_URI']; + $sLoginUrl = BASE."account.php?sCmd=login"; + + /* If we are on the login page that means the URL already contains an sReturnTo value, + and we don't want two. Besides, there is little point in redirecting to the login page + after login. */ + if(!strpos($sCurrentUrl, "sReturnTo") && !strpos($sCurrentUrl, "account.php")) + $sLoginUrl .= "&sReturnTo=".$sCurrentUrl; + + return $sLoginUrl; +} + ?>

1 0

lostwages/templates/en acknowledgement.template
by Jeremy Newman 15 Jun '07

15 Jun '07

ChangeSet ID: 31206 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/06/15 12:43:47 Modified files: templates/en : acknowledgement.template Log message: Alexander Q. Waite <awaite2(a)uiuc.edu> Flip two links Patch: http://cvs.winehq.org/patch.py?id=31206 Old revision New revision Changes Path 1.9 1.10 +2 -2 lostwages/templates/en/acknowledgement.template Index: lostwages/templates/en/acknowledgement.template diff -u -p lostwages/templates/en/acknowledgement.template:1.9 lostwages/templates/en/acknowledgement.template:1.10 --- lostwages/templates/en/acknowledgement.template:1.9 15 Jun 2007 17:43:47 -0000 +++ lostwages/templates/en/acknowledgement.template 15 Jun 2007 17:43:47 -0000 @@ -208,6 +208,6 @@ found in the source code repository.</p> <hr /> <div class="link-container"> - <p class="left-link">About Wine: <a href="{$root}/site/about">Next</a></p> - <p class="right-link"><a href="{$root}/site/wine_features">Previous</a>: Wine's Features</p> + <p class="left-link"><a href="{$root}/site/wine_features">Previous</a>: Wine's Features</p> + <p class="right-link">About Wine: <a href="{$root}/site/about">Next</a></p> </div> \ No newline at end of file

1 0

lostwages/templates/en git.template
by Jeremy Newman 15 Jun '07

15 Jun '07

ChangeSet ID: 31205 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/06/15 12:39:53 Modified files: templates/en : git.template Log message: Alexander Q. Waite <awaite2(a)uiuc.edu> Use <code> instead of <div>'s and some fixing code so it validates Patch: http://cvs.winehq.org/patch.py?id=31205 Old revision New revision Changes Path 1.4 1.5 +34 -56 lostwages/templates/en/git.template Index: lostwages/templates/en/git.template diff -u -p lostwages/templates/en/git.template:1.4 lostwages/templates/en/git.template:1.5 --- lostwages/templates/en/git.template:1.4 15 Jun 2007 17:39:53 -0000 +++ lostwages/templates/en/git.template 15 Jun 2007 17:39:53 -0000 @@ -7,50 +7,43 @@ Anyone may get the code, post opinions o and contribute patches. You will need to know C and/or perl, and something about <a href="{$root}/site/resources">Unix and Windows</a>.</p> -<p><a href="http://git.or.cz/" target="_blank">Git</a> is a fast directory +<p><a href="http://git.or.cz/">Git</a> is a fast directory content manager, originally written for use with large repositories, -such as the Linux Kernel source. </p> +such as the Linux Kernel source.</p> -<p>You will need Git 1.3.1 or above. </p> +<p>You will need Git 1.3.1 or above.</p> <p>Read the sections below on how to use our Git tree or check the <a href="http://wiki.winehq.org/GitWine">GitWine</a> guide on the Wine Wiki.</p> <ol> - <li><a href="#clone">Getting a local copy of Wine</a> - <li><a href="#uptodate">Staying Up-To-Date</a> - <li><a href="#sourcetree">Source Tree Browsing via the Web</a> - <li><a href="#modules">Other modules available from WineHQ</a> - <li><a href="#docs">Documentation module available from Sourceforge</a> + <li><a href="#clone">Getting a local copy of Wine</a></li> + <li><a href="#uptodate">Staying Up-To-Date</a></li> + <li><a href="#sourcetree">Source Tree Browsing via the Web</a></li> + <li><a href="#modules">Other modules available from WineHQ</a></li> + <li><a href="#docs">Documentation module available from Sourceforge</a></li> </ol> <hr /> -<a name="clone" class="hidden"></a> - -<h1>Getting a local copy of Wine</h1> +<h1 id="clone">Getting a local copy of Wine</h1> <p>To check out the entire Wine source tree, do:</p> -<div class="inverse commandWidth"> - <p>git clone git://source.winehq.org/git/wine.git wine</p> -</div> +<p><code>git clone git://source.winehq.org/git/wine.git wine</code></p> <hr /> -<a name="uptodate" class="hidden"></a> - -<h1>Cleaning up your existing tree</h1> +<h1 id="uptodate">Cleaning up your existing tree</h1> <p>A quick way to clean up your tree after you've been modifying - it and want to remove changes you haven't checked in is this: </p> +it and want to remove changes you haven't checked in is this: </p> -<div class="inverse commandWidth"> - <p>cd wine<br /> - git diff-index -p HEAD > total-<i>x.x.x</i>.diff<br /> - patch -p1 -R < total-<i>x.x.x</i>.diff<br /> - git reset</p> -</div> +<p><code>cd wine +git diff-index -p HEAD > total-<i>x.x.x</i>.diff +patch -p1 -R < total-<i>x.x.x</i>.diff +git reset +</code></p> <p>Using the current x.x.x tags, you can keep a history of changes that were in your Wine tree.</p> @@ -58,9 +51,8 @@ that were in your Wine tree.</p> <p>If you have made commits to the tree, and want to remove them all, you can use the following more dangerous command:</p> -<div class="inverse commandWidth"> - <p>git reset --hard origin</p> -</div> +<p><code>git reset --hard origin</code></p> + <p>This will wipe out any local changes you have made, so use it with caution.</p> @@ -71,35 +63,31 @@ you can use the following more dangerous <p> First, make sure to clean your tree as described above, then run the following commands from the top level wine directory:</p> -<div class="inverse commandWidth"> - <p>git fetch<br /> - git rebase origin</p> -</div> +<p><code>git fetch +git rebase origin +</code></p> <hr /> -<a name="sourcetree" class=hidden></a> - -<h1>Source Tree Browsing via the Web</h1> +<h1 id="sourcetree">Source Tree Browsing via the Web</h1> <p>The source code of the entire Wine tree is (<a href="http://lxr.linux.no/">LXR</a>-based) -cross-referenced and available for browsing, including a search engine. -This cross-references source is based on the snapshot-releases and is made available at: </p> + cross-referenced and available for browsing, including a search engine. + This cross-references source is based on the snapshot-releases and is made available at: </p> <ul> - <li><a href="http://source.winehq.org/">source.winehq.org</a> + <li><a href="http://source.winehq.org/">source.winehq.org</a></li> </ul> <p> Direct access from the web to the complete Git tree is also possible, using <a href="http://www.kernel.org/pub/software/scm/gitweb/">gitweb</a> package:</p> <ul> - <li><a href="http://source.winehq.org/git">source.winehq.org/git</a>, on the primary Git repository + <li><a href="http://source.winehq.org/git">source.winehq.org/git</a>, + on the primary Git repository</li> </ul> <hr /> -<a name="modules" class=hidden></a> - -<h1>Other modules available from WineHQ</h1> +<h1 id="modules">Other modules available from WineHQ</h1> <p>The WineHQ CVS server makes a couple of other things available.</p> @@ -112,36 +100,26 @@ This cross-references source is based on <p>To login to the CVS server, run in a terminal:</p> -<div class="inverse commandWidth"> - <p>CVSROOT=:pserver:cvs(a)cvs.winehq.org:/home/wine cvs login</p> -</div> +<p><code>CVSROOT=:pserver:cvs(a)cvs.winehq.org:/home/wine cvs login</code></p> <p>Use "cvs" as the password (without the quotes).</p> <p>To get a git repository of one of the modules listed above create a new directory and in a terminal run in that directory:</p> -<div class="inverse commandWidth"> - <p>git cvsimport -v -k -d :pserver:cvs(a)cvs.winehq.org:/home/wine MODULE</p> -</div> +<p><code>git cvsimport -v -k -d :pserver:cvs(a)cvs.winehq.org:/home/wine MODULE</code></p> <p>Replace MODULE with one of the module names listed above.<br/> But be aware that this can take quite some time.</p> <hr /> -<a name="docs" class=hidden></a> - -<h1>Documentation module available from Sourceforge</h1> +<h1 id="docs">Documentation module available from Sourceforge</h1> <p>The documentation lives in a separate CVS tree on Sourceforge.<br /> To get a git repository of the documentation create a new directory and in a terminal run in that directory:</p> -<div class="inverse commandWidth"> - <p>git cvsimport -v -k -d :pserver:anonymous(a)wine.cvs.sourceforge.net:/cvsroot/wine docs</p> -</div> - -<p>But be aware that this can take quite some time.</p> +<p><code>git cvsimport -v -k -d :pserver:anonymous(a)wine.cvs.sourceforge.net:/cvsroot/wine docs</code></p> -<p> </p> \ No newline at end of file +<p>But be aware that this can take quite some time.</p> \ No newline at end of file

1 0

lostwages/. winehq_styles.css
by Jeremy Newman 15 Jun '07

15 Jun '07

ChangeSet ID: 31204 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/06/15 12:39:02 Modified files: . : winehq_styles.css Log message: Alexander Q. Waite <awaite2(a)uiuc.edu> Add CSS rules for <code> tag Patch: http://cvs.winehq.org/patch.py?id=31204 Old revision New revision Changes Path 1.18 1.19 +7 -1 lostwages/winehq_styles.css Index: lostwages/winehq_styles.css diff -u -p lostwages/winehq_styles.css:1.18 lostwages/winehq_styles.css:1.19 --- lostwages/winehq_styles.css:1.18 15 Jun 2007 17:39: 2 -0000 +++ lostwages/winehq_styles.css 15 Jun 2007 17:39: 2 -0000 @@ -9,6 +9,12 @@ BODY { img { border: 0; } dt { margin: 10px 0; } +code { border: 1px solid #D1D7DC; + display: block; + margin: 0 1em; + padding: .5em; + white-space: pre; + } /* Link Colors */ A { color: #A50D0D; } @@ -140,4 +146,4 @@ p.indent { padding-left: 1em; /* App Support status */ .gold { background-color: wheat; } -.silver { background-color: silver; } +.silver { background-color: silver; } \ No newline at end of file

1 0