April 2012 - Wine-Commits - list.winehq.org

Jeremy Newman : google analytics config var
by Jeremy Newman April 12, 2012

April 12, 2012

Module: website Branch: master Commit: 0e415443ce0998d04082ace661e4434a0c106e8e URL: http://source.winehq.org/git/website.git/?a=commit;h=0e415443ce0998d04082ac… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Apr 12 14:47:38 2012 -0500 google analytics config var --- include/winehq.conf.sample | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/winehq.conf.sample b/include/winehq.conf.sample index 7935038..5a247c1 100644 --- a/include/winehq.conf.sample +++ b/include/winehq.conf.sample @@ -42,3 +42,6 @@ git_tree: http://source.winehq.org/git # Path to the root directory of the site base_path: /path/to/root/directory/of/website/ + +# Google Analytics Tracking Code +google_analytics:

1 0

Jeremy Newman : load google analytics if defined in config
by Jeremy Newman April 12, 2012

April 12, 2012

Module: website Branch: master Commit: d8bc1bd004bb4f5bb831f3e6443c1997374e2fd8 URL: http://source.winehq.org/git/website.git/?a=commit;h=d8bc1bd004bb4f5bb831f3… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Apr 12 14:44:24 2012 -0500 load google analytics if defined in config --- include/plugins/google_analytics.php | 19 +++++++++++++++++++ templates/en/global/google_analytics.template | 10 ++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/include/plugins/google_analytics.php b/include/plugins/google_analytics.php new file mode 100644 index 0000000..2850afb --- /dev/null +++ b/include/plugins/google_analytics.php @@ -0,0 +1,19 @@ +<?php + +/* + * WineHQ.org + * by Jeremy Newman <jnewman(a)codeweavers.com> + */ + +/* + Loads Google Analytics Statistics +*/ + +if (!empty($config->google_analytics)) +{ + // display the google analytics code + echo $html->template("local", "global/google_analytics", array('gcode' => $config->google_analytics)); +} + +// done +?> diff --git a/templates/en/global/google_analytics.template b/templates/en/global/google_analytics.template new file mode 100644 index 0000000..bd6624a --- /dev/null +++ b/templates/en/global/google_analytics.template @@ -0,0 +1,10 @@ + <script type="text/javascript"> + var _gaq = _gaq || []; + _gaq.push(['_setAccount', '{$gcode}']); + _gaq.push(['_trackPageview']); + (function(){ + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + </script>

1 0

Jeremy Newman : fix depreciated functions
by Jeremy Newman April 12, 2012

April 12, 2012

Module: website Branch: master Commit: ae633661dd32b7367cebfde9d98880dbf414e685 URL: http://source.winehq.org/git/website.git/?a=commit;h=ae633661dd32b7367cebfd… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Apr 12 14:27:32 2012 -0500 fix depreciated functions --- include/plugins/announce.php | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/plugins/announce.php b/include/plugins/announce.php index 3f0f0fd..6faaae2 100644 --- a/include/plugins/announce.php +++ b/include/plugins/announce.php @@ -22,24 +22,24 @@ if ($arr = file($announce)) { $arr[$c] = $html->urlify($arr[$c]); - if (ereg("^--------------------", $arr[$c])) $in_header = 0; - else if (ereg("^Bugs fixed", $arr[$c])) $in_bugs = 1; - else if (ereg("^Changes since", $arr[$c])) + if (preg_match("/^--------------------/", $arr[$c])) $in_header = 0; + else if (preg_match("/^Bugs fixed/", $arr[$c])) $in_bugs = 1; + else if (preg_match("/^Changes since/", $arr[$c])) { // Link to previous versions in changes $in_bugs = 0; - $arr[$c] = ereg_replace( '[[:digit:].]+(-rc[[:digit:]]+)?', '<a title="Changes since \\0" href="./\\0">\\0</a>', $arr[$c] ); + $arr[$c] = preg_replace( '/[[:digit:].]+(-rc[[:digit:]]+)?/', '<a title="Changes since \\0" href="./\\0">\\0</a>', $arr[$c] ); } if ($in_header) { - $arr[$c] = ereg_replace("AUTHORS", + $arr[$c] = preg_replace("/AUTHORS/", "<a href=\"".$config->git_tree."/wine.git/".$tag.":\\0\">\\0</a>", $arr[$c]); } else if ($in_bugs) { - $arr[$c] = ereg_replace("^( +)([0-9]+)", + $arr[$c] = preg_replace("^/( +)([0-9]+)/", "\\1<a href=\"".$config->bug_system."\\2\">\\2</a>", $arr[$c]); }

1 0

Jeremy Newman : add fatal error template
by Jeremy Newman April 12, 2012

April 12, 2012

Module: website Branch: master Commit: 80d2c79ceb6673e75c024f2b7499b4ce04182554 URL: http://source.winehq.org/git/website.git/?a=commit;h=80d2c79ceb6673e75c024f… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Apr 12 14:27:04 2012 -0500 add fatal error template --- templates/en/global/fatal_error.template | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/templates/en/global/fatal_error.template b/templates/en/global/fatal_error.template new file mode 100644 index 0000000..63603e9 --- /dev/null +++ b/templates/en/global/fatal_error.template @@ -0,0 +1,26 @@ + +<style> +#fatal_error { + width: 400px; margin: 10px 0 0 180px; padding: 100px; + font-family: courier; + background-color: blue; color: white; +} +#fatal_error h1 { margin: 0 100px 1em 100px; font-size: 14px; background-color: white; color: blue; text-align: center; } +#fatal_error pre { font-family: courier; } +</style> + +<div id="fatal_error" class="cornerround dropshadow"> +<h1>Fatal Error</h1> +<p><b>Sorry</b>, there has been an internal error in our system. Your request +could not be processed at this time.</p> +<pre width="72" style="white-space: pre-wrap;"> +<b>Error:</b> {$errstr} +<b>No:</b> {$errno} +<b>Line:</b> {$errline} +<b>File:</b> {$errfile} + +{$debug} +</pre> +<p class="center">Contact the <a href="mailto:web-admin(a)winehq.org">webmaster</a> if this error persists.</p> +</div> +

1 0

Jeremy Newman : use class autoloading, add some error handling functions
by Jeremy Newman April 12, 2012

April 12, 2012

Module: website Branch: master Commit: 5d3f0d0ecdf591b011423b099f4a5627140c3111 URL: http://source.winehq.org/git/website.git/?a=commit;h=5d3f0d0ecdf591b011423b… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Apr 12 14:24:45 2012 -0500 use class autoloading, add some error handling functions --- include/incl.php | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/include/incl.php b/include/incl.php index d6f334e..457b684 100644 --- a/include/incl.php +++ b/include/incl.php @@ -10,23 +10,32 @@ * Main Include Library */ -// load config class -require("{$file_root}/include/config.php"); - -// create config object -$config = new config($file_root."/include/"."winehq.conf", $file_root."/include/"."globals.conf"); +// Require PHP version 5.3 or higher +if (version_compare(phpversion(), '5.3.0') < 0) +{ + trigger_error("PHP 5.3 or Higher Required!", E_USER_ERROR); +} // load global functions lib require_once("{$file_root}/include/utils.php"); +// Set Up the Class AutoLoader +spl_autoload_register("check_and_require"); + +// create config object +$config = new config("{$file_root}/include/winehq.conf", "{$file_root}/include/globals.conf"); + // load data lib -check_and_require("data"); $data = new data(); -// load html lib -check_and_require("html"); - // create html object $html = new html($file_root); +// setup html error handler when not at CLI +if (!defined('STDIN')) +{ + set_error_handler(array(&$html, 'error_handler')); + register_shutdown_function(array(&$html, 'error_shutdown')); +} + ?>

1 0

Jeremy Newman : fix some deprecated functions
by Jeremy Newman April 12, 2012

April 12, 2012

Module: website Branch: master Commit: 0c420b931e776b7552ac9c6d7ccdbede6b400b0b URL: http://source.winehq.org/git/website.git/?a=commit;h=0c420b931e776b7552ac9c… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Apr 12 14:08:47 2012 -0500 fix some deprecated functions --- site | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/site b/site index 5a7bd46..70499c7 100644 --- a/site +++ b/site @@ -18,7 +18,7 @@ if (!preg_match('/\/$/', $_SERVER['PHP_SELF'])) if (isset($_SERVER['PATH_INFO'])) { // set the Current Page - $dirs = split('/', $_SERVER['PATH_INFO']); + $dirs = preg_split('/\//', $_SERVER['PATH_INFO']); array_shift($dirs); if (count($dirs) > 1) { @@ -59,8 +59,8 @@ if (isset($_SERVER['PATH_INFO'])) // cleanup and define page $page = join('/',$good_dirs); - if (ereg('/$', $page)) - $page = ereg_replace('/$', '', $page); + if (preg_match('/\/$/', $page)) + $page = preg_replace('/\/$/', '', $page); unset($c); } else

1 0

Jeremy Newman : class is now autoloaded
by Jeremy Newman April 12, 2012

April 12, 2012

Module: website Branch: master Commit: 771edacc096b4559c27ef74d5a439db913e5a79e URL: http://source.winehq.org/git/website.git/?a=commit;h=771edacc096b4559c27ef7… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Apr 12 14:37:46 2012 -0500 class is now autoloaded --- include/plugins/wwn.php | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/include/plugins/wwn.php b/include/plugins/wwn.php index a37077a..e42afcc 100644 --- a/include/plugins/wwn.php +++ b/include/plugins/wwn.php @@ -7,7 +7,6 @@ */ // load wwn object -check_and_require("wwn"); $wwn = new wwn(); // change display mased on mode

1 0

Jeremy Newman : update object to PHP 5 style, fix depreciated code
by Jeremy Newman April 12, 2012

April 12, 2012

Module: website Branch: master Commit: f7ea018d4de81b50b4fa68e16f3586f6d92b4636 URL: http://source.winehq.org/git/website.git/?a=commit;h=f7ea018d4de81b50b4fa68… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Apr 12 14:37:03 2012 -0500 update object to PHP 5 style, fix depreciated code --- include/wwn.php | 206 +++++++++++++++++++++++++++--------------------------- 1 files changed, 103 insertions(+), 103 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=f7ea018d4de81b50b4…

1 0

Bruno Jesus : ws2_32/tests: Avoid crashing if getservbyname fails.
by Alexandre Julliard April 11, 2012

April 11, 2012

Module: wine Branch: master Commit: 3b2fcdd42600b3893a543ad2232b2d7217bb9f54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b2fcdd42600b3893a543ad22… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Apr 10 23:25:56 2012 -0300 ws2_32/tests: Avoid crashing if getservbyname fails. --- dlls/ws2_32/tests/sock.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9fd6abb..f3b33be 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1600,6 +1600,7 @@ static DWORD WINAPI do_getservbyname( void *param ) for ( j = 0; j < 2; j++ ) { pserv[j] = getservbyname ( serv[j].name, serv[j].proto ); ok ( pserv[j] != NULL, "getservbyname could not retrieve information for %s: %d\n", serv[j].name, WSAGetLastError() ); + if ( !pserv[j] ) continue; ok ( pserv[j]->s_port == htons(serv[j].port), "getservbyname returned the wrong port for %s: %d\n", serv[j].name, ntohs(pserv[j]->s_port) ); ok ( !strcmp ( pserv[j]->s_proto, serv[j].proto ), "getservbyname returned the wrong protocol for %s: %s\n", serv[j].name, pserv[j]->s_proto ); ok ( !strcmp ( pserv[j]->s_name, serv[j].name ), "getservbyname returned the wrong name for %s: %s\n", serv[j].name, pserv[j]->s_name );

1 0

Bruno Jesus : ws2_32/tests: Update hostent struct tests.
by Alexandre Julliard April 11, 2012

April 11, 2012

Module: wine Branch: master Commit: d209697073958137a1ab578718b14677f84bb9ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d209697073958137a1ab57871… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Apr 10 23:13:31 2012 -0300 ws2_32/tests: Update hostent struct tests. --- dlls/ws2_32/tests/sock.c | 39 ++++++++++++++++++++------------------- 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 53cf2c8..9fd6abb 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2730,7 +2730,7 @@ static void test_getsockname(void) static void test_dns(void) { - struct hostent *h, *he, host; + struct hostent *h; union memaddress { char *chr; @@ -2738,20 +2738,13 @@ static void test_dns(void) } addr; char **ptr; int acount; - void *ip_addr, *alias_addr; h = gethostbyname(""); ok(h != NULL, "gethostbyname(\"\") failed with %d\n", h_errno); - if(h) host = *h; - /* Use an address with valid alias names if possible */ - he = gethostbyname("source.winehq.org"); - if(he) - h = he; - else if (h) - h = &host; - else + h = gethostbyname("source.winehq.org"); + if(!h) { skip("Can't test the hostent structure because gethostbyname failed\n"); return; @@ -2762,18 +2755,26 @@ static void test_dns(void) * the struct hostent size. Knowing the amount of aliases we know the exact * location of the first IP returned. Rule valid for >= XP, for older OS's * it's somewhat the opposite. */ - for(ptr = h->h_aliases, acount = 1; *ptr; ptr++) acount++; - addr.mem = h + 1; - alias_addr = addr.mem; + if(h->h_addr_list == addr.mem) /* <= W2K */ + { + skip("Skipping hostent tests since this OS is unsupported\n"); + return; + } + + todo_wine ok(h->h_aliases == addr.mem, + "hostent->h_aliases should be in %p, it is in %p\n", addr.mem, h->h_aliases); + + for(ptr = h->h_aliases, acount = 1; *ptr; ptr++) acount++; + addr.chr += sizeof(*ptr) * acount; + todo_wine ok(h->h_addr_list == addr.mem, + "hostent->h_addr_list should be in %p, it is in %p\n", addr.mem, h->h_addr_list); - todo_wine ok(h->h_aliases == alias_addr || broken(h->h_addr_list == alias_addr /* <= W2K */ ), - "hostent->h_aliases should be in %p, it is in %p\n", alias_addr, h->h_aliases); + for(ptr = h->h_addr_list, acount = 1; *ptr; ptr++) acount++; - addr.chr += sizeof(h->h_aliases) * acount; - ip_addr = addr.mem; - todo_wine ok(h->h_addr_list == ip_addr || broken(h->h_addr_list == alias_addr /* <= W2K */ ), - "hostent->h_addr_list should be in %p, it is in %p\n", ip_addr, h->h_addr_list); + addr.chr += sizeof(*ptr) * acount; + todo_wine ok(h->h_addr_list[0] == addr.mem, + "hostent->h_addr_list[0] should be in %p, it is in %p\n", addr.mem, h->h_addr_list[0]); } /* Our winsock headers don't define gethostname because it conflicts with the

1 0