wine-commits January 2016

wine-commits@winehq.org

2 participants
627 discussions

Jeremy Newman : clean up
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: c9f01901cc38d371c6d1fd681034db0208523e38 URL: http://source.winehq.org/git/website.git/?a=commit;h=c9f01901cc38d371c6d1fd… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 12:43:19 2016 -0600 clean up --- templates/en/search.template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/templates/en/search.template b/templates/en/search.template index a142ead..003d434 100644 --- a/templates/en/search.template +++ b/templates/en/search.template @@ -1,7 +1,6 @@  - -<h1 class="title" style="margin-bottom: 10px;">Search Results</h1> +<h1 class="title margin-bottom-md">Search Results</h1> <script> (function() {

1 0

Jeremy Newman : add some info icons
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: 363484eaaf15a625d063df557a6627e22c0db89a URL: http://source.winehq.org/git/website.git/?a=commit;h=363484eaaf15a625d063df… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 12:41:14 2016 -0600 add some info icons --- templates/en/download.template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/en/download.template b/templates/en/download.template index 2ba2acb..6dd5cc2 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -50,6 +50,7 @@ <div class="col-md-1"></div> <div class="col-md-7"> <div class="whq-info-box center"> + <span class="glyphicon glyphicon-info-sign big pull-left text-muted"></span> <b>See the <a href="http://wiki.winehq.org/HowTo">installation and configuration how-to</a> for post-installation instructions.</b> </div> </div> @@ -153,5 +154,6 @@ </p> <div class="whq-info-box"> + <span class="glyphicon glyphicon-info-sign text-muted"></span> <b>Note:</b> See the <a href="http://wiki.winehq.org/Recommended_Packages">recommended packages</a> for help on configuring and building Wine. </div>

1 0

Jeremy Newman : clean up irc page
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: 5a0649317a24823912dc474caf8912548975d099 URL: http://source.winehq.org/git/website.git/?a=commit;h=5a0649317a24823912dc47… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 12:36:19 2016 -0600 clean up irc page --- templates/en/irc.template | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/templates/en/irc.template b/templates/en/irc.template index 1d96c47..401c6ab 100644 --- a/templates/en/irc.template +++ b/templates/en/irc.template @@ -35,7 +35,7 @@ a chat by clicking on:</p> to research your question some before asking about it on the IRC. The <a href="http://wiki.winehq.org/FAQ">Wine FAQ</a>, <a href="//appdb.winehq.org">AppDB</a>, and -<a href="//www.winehq.org/site/download">download page</a> are all good +<a href="//www.winehq.org/download">download page</a> are all good resources to check first.</p> <h2>IRC Rules and Penalties</h2> @@ -54,33 +54,36 @@ want to contest a ban, go to <b>#winehq-social</b> (or the been banned from <b>#winehq-social</b>), and explain why you believe you were banned in the first place and why the ban should be lifted.</p> -<table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> - <tr align="center" bgcolor="black"> - <th><b><font color="white" class="small">Rule</font></b></th> - <th><b><font color="white" class="small">Clarification</font></b></th> - <th><b><font color="white" class="small">Warnings</font></b></th> - <th><b><font color="white" class="small">Kicks</font></b></th> +<table class="table"> +<thead> + <tr class="black inverse small"> + <th>Rule</th> + <th>Clarification</th> + <th>Warnings</th> + <th>Kicks</th> </tr> - <tr bgcolor="#ffffff"> +</thead> +<tbody> + <tr> <td>Do not spam.</td> <td></td> <td>1</td> <td>2</td> </tr> - <tr bgcolor="#ffffff"> + <tr> <td>Use a pastebin for pasting more than 1 or 2 lines.</td> <td><a href="http://winehq.pastebin.com">winehq.pastebin.com</a> and <a href="http://pastebin.ca">pastebin.ca</a> both work well.</td> <td>0</td> <td>5</td> </tr> - <tr bgcolor="#ffffff"> + <tr> <td>Talk in the appropriate channel.</td> <td>If unsure, ask in <b>#winehq</b> which channel to join.</td> <td>2</td> <td>3</td> </tr> - <tr bgcolor="#ffffff"> + <tr> <td>Only Wine and Crossover are supported in their respective channels.</td> <td>Sidenet, WineDoors, Cedega, IEs4Linux, etc. are <b>not</b> @@ -88,7 +91,7 @@ banned in the first place and why the ban should be lifted.</p> <td>2</td> <td>1</td> </tr> - <tr bgcolor="#ffffff"> + <tr> <td>Before asking for help in <b>#winehq</b>, be sure you're running the latest version of Wine.</td> <td>If unsure, run <tt>wine --version</tt> in the command line to @@ -96,16 +99,17 @@ banned in the first place and why the ban should be lifted.</p> <td>3</td> <td>1</td> </tr> - <tr bgcolor="#ffffff"> + <tr> <td>Please wait your turn for help.</td> <td></td> <td>3</td> <td>1</td> </tr> - <tr bgcolor="#ffffff"> + <tr> <td>Do <b>not</b> discuss pirated software.</td> <td></td> <td>1</td> <td>1</td> </tr> +</tbody> </table>

1 0

Jeremy Newman : remove unused banner ad code
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: da36925eebb42af7eb8dbc79e6e609efa1815edf URL: http://source.winehq.org/git/website.git/?a=commit;h=da36925eebb42af7eb8dbc… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 12:31:44 2016 -0600 remove unused banner ad code --- bin/.htaccess | 7 ---- bin/ad | 61 -------------------------------- images/bannerads/WineReleaseParty01.png | Bin 16509 -> 0 bytes images/bannerads/WineReleaseParty02.png | Bin 15764 -> 0 bytes images/bannerads/WineReleaseParty03.png | Bin 15057 -> 0 bytes 5 files changed, 68 deletions(-) diff --git a/bin/.htaccess b/bin/.htaccess deleted file mode 100644 index 48eff56..0000000 --- a/bin/.htaccess +++ /dev/null @@ -1,7 +0,0 @@ -deny from all - -<Files ad> - allow from all - ForceType application/x-httpd-php -</Files> - diff --git a/bin/ad b/bin/ad deleted file mode 100644 index e7c20da..0000000 --- a/bin/ad +++ /dev/null @@ -1,61 +0,0 @@ -<?php - -/* Banner Ad Code */ -/* For WineHQ */ - -// path for banner ad -$bannerads_path = '../images/bannerads/'; - -// max count until we stop displaying ads for user -$max_ads = 10; - -// check cookie for ad counter -$whqac = 0; -if (isset($_COOKIE['whqac'])) - $whqac = $_COOKIE['whqac']; -unset($_COOKIE["whqac"]); -$whqac++; - -// randomly select a banner and display it -if ($whqac >= $max_ads) -{ - // display fixed ad - $whqac = $max_ads; - $img = "../images/blank.gif"; -} -else -{ - // get random ad - $ads = array(); - $d = opendir($bannerads_path); - while($entry = readdir($d)) - { - if(!ereg("(.+)\\.png$", $entry, $arr)) - continue; - array_push($ads, $arr[1]); - } - closedir($d); - sort($ads); - $img = $bannerads_path.$ads[(rand(1,count($ads))-1)]; -} - -// da banner -setcookie("whqac", $whqac, time()+60*60*24*365); -header("Expires: Mon, 1 Jan 2006 05:00:00 GMT"); -header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -?> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> - <title>WineHQ Banner Ad</title> -</head> -<body bgcolor="#E2E2E2" text="#000000" marginwidth="0" marginheight="0" style="margin:0px;"> -<a href="http://www.codeweavers.com/products/support_wine/" target="_top"><img -src="<?=$img?>" width="468" height="60" border="0" alt="Support the Wine Project" -title="Support the Wine Project" /></a> -</body> -</html> diff --git a/images/bannerads/WineReleaseParty01.png b/images/bannerads/WineReleaseParty01.png deleted file mode 100644 index e49eb76..0000000 Binary files a/images/bannerads/WineReleaseParty01.png and /dev/null differ diff --git a/images/bannerads/WineReleaseParty02.png b/images/bannerads/WineReleaseParty02.png deleted file mode 100644 index bec58ce..0000000 Binary files a/images/bannerads/WineReleaseParty02.png and /dev/null differ diff --git a/images/bannerads/WineReleaseParty03.png b/images/bannerads/WineReleaseParty03.png deleted file mode 100644 index 52a7be7..0000000 Binary files a/images/bannerads/WineReleaseParty03.png and /dev/null differ

1 0

Jeremy Newman : add fr and de translations of global strings
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: 1833a7cd04450e82fe0cf7dc1e39d4012d9d634b URL: http://source.winehq.org/git/website.git/?a=commit;h=1833a7cd04450e82fe0cf7… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 11:55:32 2016 -0600 add fr and de translations of global strings --- templates/de/global/xml/trans/global.xml | 15 +++++++++++++++ templates/fr/global/xml/trans/global.xml | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/templates/de/global/xml/trans/global.xml b/templates/de/global/xml/trans/global.xml new file mode 100644 index 0000000..3008dac --- /dev/null +++ b/templates/de/global/xml/trans/global.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" ?> +<trans lang="de" table="global"> + +  + <str name="tab_winehq">WineHQ</str> + <str name="tab_wiki">Wiki</str> + <str name="tab_appdb">AppDB</str> + <str name="tab_bugs">Bugzilla</str> + <str name="tab_forums">Forums</str> + +  + <str name="hosted_by">Hosted By</str> + <str name="hosted_by_alt">CodeWeavers - Führt Windows-Anwendungen und -Spiele unter Linux und Mac aus</str> + +</trans> diff --git a/templates/fr/global/xml/trans/global.xml b/templates/fr/global/xml/trans/global.xml new file mode 100644 index 0000000..e3c51a9 --- /dev/null +++ b/templates/fr/global/xml/trans/global.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" ?> +<trans lang="fr" table="global"> + +  + <str name="tab_winehq">WineHQ</str> + <str name="tab_wiki">Wiki</str> + <str name="tab_appdb">AppDB</str> + <str name="tab_bugs">Bugzilla</str> + <str name="tab_forums">Forums</str> + +  + <str name="hosted_by">Hébergé par</str> + <str name="hosted_by_alt">CodeWeavers - Exécuter des applications et jeux Windows sur Mac et Linux</str> + +</trans>

1 0

Jeremy Newman : remove requirement for base_path config var
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: 1fb8c25327696aa95a66618852768725534205ff URL: http://source.winehq.org/git/website.git/?a=commit;h=1fb8c25327696aa95a6661… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 11:49:42 2016 -0600 remove requirement for base_path config var --- include/utils.php | 4 ++-- include/winehq.conf.sample | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/include/utils.php b/include/utils.php index f9cc2c6..21d5253 100644 --- a/include/utils.php +++ b/include/utils.php @@ -63,7 +63,7 @@ function include_plugin ($__module, $_PLUGIN = array()) $__module = preg_replace('%(^\/|^\\\|^\.|\.\.*)%', '', $__module); // load module if file exists - if ($__module and file_exists("{$GLOBALS['config']->base_path}include/plugins/{$__module}.php")) + if ($__module and file_exists("{$GLOBALS['file_root']}/include/plugins/{$__module}.php")) { debug("plugin", "loading plugin: [{$__module}]"); $out = ""; @@ -74,7 +74,7 @@ function include_plugin ($__module, $_PLUGIN = array()) extract($GLOBALS, EXTR_REFS); // execute the plugin - include("{$config->base_path}include/plugins/{$__module}.php"); + include("{$GLOBALS['file_root']}/include/plugins/{$__module}.php"); $out = ob_get_contents(); } catch (_pluginError $e) diff --git a/include/winehq.conf.sample b/include/winehq.conf.sample index 8967c53..82db033 100644 --- a/include/winehq.conf.sample +++ b/include/winehq.conf.sample @@ -29,14 +29,11 @@ lang: en base_root: base_url: https://www.winehq.org{$base_root}/ -# base path on filesystem to website -base_path: /home/wineowner/opt/www/ - # Path to WWN XML files -news_xml_path: {$base_path}news +news_xml_path: ./news # Path to WWN XML files -wwn_xml_path: {$base_path}wwn +wwn_xml_path: ./wwn # URL for bugs bug_system: http://bugs.winehq.org/show_bug.cgi?id=

1 0

Jeremy Newman : update README for new translation instructions and requirements
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: 095c1f0055ea48b604b16758e6a53991f50aa1b7 URL: http://source.winehq.org/git/website.git/?a=commit;h=095c1f0055ea48b604b167… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 11:40:48 2016 -0600 update README for new translation instructions and requirements --- README | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/README b/README index 6cb89bb..6e8761f 100644 --- a/README +++ b/README @@ -1,12 +1,12 @@ WineHQ (lostwages) Website Template Engine -ver 3.0 +ver 4.0 by Jeremy Newman <jnewman(a)codeweavers.com> ----------------------------------------------------------------------- Installation Requirements: * Apache 2.0 or higher * mod_rewrite enabled in Apache config - * PHP 5.3 or higher + * PHP 5.4 or higher Setting Up: ----------------------------------------------------------------------- @@ -38,6 +38,16 @@ The following varables can be used in templates. You can also add global vars to include/globals.conf and they will be availbe as {$config_[key]} where [key] is the name you defined in globals.conf +Translating: +----------------------------------------------------------------------- +1. Edit include/winehq.conf and add your language code to @languages. +2. Create language subdir in templates. +4. Add your language strings to templates/en/global/xml/trans/lang.xml +5. Copy and edit path templates/en/global/xml/trans/global.xml to your + langs subdir. +6. Copy individual templates/en/*.template to your langs subdir as you + translate them. Only copy the files you plan on translating. +7. News item translations are in news/<lang>. Notes: -----------------------------------------------------------------------

1 0

Jeremy Newman : move translatable strings from global theme into global trans table
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: 415095689f4eee6f309705960b5819e30fb6ffe0 URL: http://source.winehq.org/git/website.git/?a=commit;h=415095689f4eee6f309705… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 11:33:32 2016 -0600 move translatable strings from global theme into global trans table --- include/incl.php | 3 +++ site.php | 3 +-- templates/en/global/layout/content.template | 14 +++++++------- templates/en/global/xml/trans/global.xml | 15 +++++++++++++++ 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/include/incl.php b/include/incl.php index 302d9c1..4a52861 100644 --- a/include/incl.php +++ b/include/incl.php @@ -114,4 +114,7 @@ else unset($lang); } +// load global translation table +$html->load_trans("global"); + ?> diff --git a/site.php b/site.php index 77b2a56..29c5159 100644 --- a/site.php +++ b/site.php @@ -132,13 +132,12 @@ if (defined("PAGE") and PAGE == "home") } // online mode switch -if ($config->offline) +if (!empty($config->offline)) { /* OFFLINE */ $html->_error_mode = 1; - $PAGE_template = "content_nonav"; $PAGE_body = $html->template("local", 'global/website_offline'); } else diff --git a/templates/en/global/layout/content.template b/templates/en/global/layout/content.template index 05677a2..82d4942 100644 --- a/templates/en/global/layout/content.template +++ b/templates/en/global/layout/content.template @@ -38,11 +38,11 @@ <div id="whq-tabs"> <div class="whq-tabs-menu">☰</div> <ul> - <li class="s"><a href="{$base_url}">WineHQ</a></li> - <li><a href="http://wiki.winehq.org/">Wiki</a></li> - <li><a href="//appdb.winehq.org/">AppDB</a></li> - <li><a href="//bugs.winehq.org/">Bugzilla</a></li> - <li><a href="//forums.winehq.org/">Forums</a></li> + <li class="s"><a href="{$base_url}">{trans($tab_winehq)}</a></li> + <li><a href="http://wiki.winehq.org/">{trans($tab_wiki)}</a></li> + <li><a href="//appdb.winehq.org/">{trans($tab_appdb)}</a></li> + <li><a href="//bugs.winehq.org/">{trans($tab_bugs)}</a></li> + <li><a href="//forums.winehq.org/">{trans($tab_forums)}</a></li> </ul> </div> <div class="clear"></div> @@ -70,9 +70,9 @@ <span class="glyphicon glyphicon-globe large"></span> {$langCur} (<a href="{$root}/lang">{$langChange}</a>) </div> <div class="col-xs-6 text-right"> - Hosted By + {trans($hosted_by)} <a href="https://www.codeweavers.com/"><img src="{$root}/images/cw_logo_sm.png" alt="CodeWeavers" - title="CodeWeavers - Run Windows applications and games on Mac and Linux"></a> + title="{trans($hosted_by_alt)}"></a> </div> </div> </div> diff --git a/templates/en/global/xml/trans/global.xml b/templates/en/global/xml/trans/global.xml new file mode 100644 index 0000000..42c0496 --- /dev/null +++ b/templates/en/global/xml/trans/global.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" ?> +<trans lang="en" table="global"> + +  + <str name="tab_winehq">WineHQ</str> + <str name="tab_wiki">Wiki</str> + <str name="tab_appdb">AppDB</str> + <str name="tab_bugs">Bugzilla</str> + <str name="tab_forums">Forums</str> + +  + <str name="hosted_by">Hosted By</str> + <str name="hosted_by_alt">CodeWeavers - Run Windows applications and games on Mac and Linux</str> + +</trans>

1 0

Jeremy Newman : move language strings to translation table
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: 3ba6819debd39bc5668554a7caaad69c39e6162d URL: http://source.winehq.org/git/website.git/?a=commit;h=3ba6819debd39bc5668554… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 11:24:12 2016 -0600 move language strings to translation table --- include/plugins/language.php | 4 ++- include/whq_data.php | 62 ---------------------------------- site.php | 9 ++--- templates/en/global/xml/trans/lang.xml | 38 +++++++++++++++++++++ 4 files changed, 44 insertions(+), 69 deletions(-) diff --git a/include/plugins/language.php b/include/plugins/language.php index 8ea917e..45b2ccc 100644 --- a/include/plugins/language.php +++ b/include/plugins/language.php @@ -12,8 +12,10 @@ switch ($_PLUGIN['cmd']) case "list": foreach ($config->languages as $lang) { + $name = $html->trans_val("lang", "lang", $lang); + $change = $html->trans_val("lang", "change", $lang); echo "<li style=\"background-image: url('{$html->base_url()}/images/lang/{$lang}.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;\">\n". - " <a href=\"{$html->base_url()}/lang/{$lang}\">{$whq_data->languages[$lang]['name']}</a> · {$whq_data->languages[$lang]['change']}\n". + " <a href=\"{$html->base_url()}/lang/{$lang}\">{$name}</a> · {$change}\n". "</li>\n"; } break; diff --git a/include/whq_data.php b/include/whq_data.php deleted file mode 100644 index b580b81..0000000 --- a/include/whq_data.php +++ /dev/null @@ -1,62 +0,0 @@ -<?php - -/* - WineHQ - misc data class - by Jeremy Newman <jnewman(a)codeweavers.com> -*/ - -class whq_data -{ - // defines - public $languages; - - // constuctor - public function __construct () - { - // available languages - $this->languages = array( - 'en' => array( - 'name' => 'English', - 'change' => 'Change Language' - ), - 'de' => array( - 'name' => 'Deutsch', - 'change' => 'Sprache ändern' - ), - 'es' => array( - 'name' => 'Español', - 'change' => 'Cambiar Idioma' - ), - 'fr' => array( - 'name' => 'Français', - 'change' => 'Changez la langue' - ), - 'he' => array( - 'name' => 'עברית', - 'change' => 'החלפת השפה' - ), - 'pl' => array( - 'name' => 'Polski', - 'change' => 'Zmień język' - ), - 'pt' => array( - 'name' => 'Português', - 'change' => 'Mudar a língua' - ), - 'tr' => array( - 'name' => 'Türkçe', - 'change' => 'Lisan Değiştir' - ), - 'uk' => array( - 'name' => 'Українська', - 'change' => 'Змінити мову' - ), - 'zh-cn' => array( - 'name' => '简体中文', - 'change' => '选择语言' - ) - ); - } -} -?> diff --git a/site.php b/site.php index d03f0fc..77b2a56 100644 --- a/site.php +++ b/site.php @@ -9,9 +9,6 @@ $file_root = realpath(dirname(__FILE__)); require("{$file_root}/include/incl.php"); -// init data class -$whq_data = new whq_data(); - // default page body $PAGE_body = ""; @@ -244,11 +241,11 @@ $PAGE_vars = array( 'js_postload' => $html->get_header_links('js_post'), 'rss_link' => &$PAGE_rss, 'page_body' => &$PAGE_body, - 'page_body_class' => &$PAGE_body_class, + 'page_body_class' => $PAGE_body_class, 'copyright_year' => date("Y", time()), 'debug_log' => &$PAGE_debug, - 'langCur' => &$whq_data->languages[$html->lang]['name'], - 'langChange' => &$whq_data->languages[$html->lang]['change'] + 'langCur' => $html->trans_val("lang", "lang", $html->lang), + 'langChange' => $html->trans_val("lang", "change", $html->lang) ); // HTTP status headers diff --git a/templates/en/global/xml/trans/lang.xml b/templates/en/global/xml/trans/lang.xml new file mode 100644 index 0000000..8b22df7 --- /dev/null +++ b/templates/en/global/xml/trans/lang.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" ?> +<trans lang="en" table="lang"> + +  + +  + <str name="lang"> + <str name="en">English</str> + <str name="de">Deutsch</str> + <str name="es">Español</str> + <str name="fr">Français</str> + <str name="he">עברית</str> + <str name="pl">Polski</str> + <str name="pt">Português</str> + <str name="tr">Türkçe</str> + <str name="uk">Українська</str> + <str name="zh-cn">简体中文</str> + </str> + +  + <str name="change"> + <str name="en">Change Language</str> + <str name="de">Sprache ändern</str> + <str name="es">Cambiar Idioma</str> + <str name="fr">Changez la langue</str> + <str name="he">החלפת השפה</str> + <str name="pl">Zmień język</str> + <str name="pt">Mudar a língua</str> + <str name="tr">Lisan Değiştir</str> + <str name="uk">Змінити мову</str> + <str name="zh-cn">选择语言</str> + </str> + +</trans>

1 0

Jeremy Newman : add XML parsing to array class
by Jeremy Newman 19 Jan '16

19 Jan '16

Module: website Branch: master Commit: f5cf99650775aa1a07673050fc9b41599a2bf6fe URL: http://source.winehq.org/git/website.git/?a=commit;h=f5cf99650775aa1a076730… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 19 11:24:00 2016 -0600 add XML parsing to array class --- include/XMLToArray.php | 189 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 189 insertions(+) diff --git a/include/XMLToArray.php b/include/XMLToArray.php new file mode 100644 index 0000000..7996c5e --- /dev/null +++ b/include/XMLToArray.php @@ -0,0 +1,189 @@ +<?php +/* + loads an XML file into an array + Use transverse_array() after parsing to get a nice dump + by Jeremy Newman <jnewman(a)codeweavers.com> +*/ + +class XMLToArray +{ + var $data; + var $filename; + var $traverse_array = array(); + var $error; + + /** PUBLIC + * Constructor: init the object. Define the parsing mode. + */ + public function __construct () + { + return true; + } + + /** PUBLIC + * Parse a text string containing valid XML into a multidimensional array + */ + public function parse () + { + if (!$this->data and isset($this->filename)) + { + if (file_exists($this->filename)) + { + $this->data = join("", @file($this->filename)); + } + else + { + $message = "XML ERROR: {$this->filebname} NOT FOUND!"; + $this->error = $message; + error_log("$message\n"); + return 0; + } + } + + if (!$this->data) + { + $message = "XML ERROR: no data to be parsed!"; + error_log("$message\n"); + $this->error = $message; + return 0; + } + + $this->data = trim($this->data); + $vals = $index = $array = array(); + $parser = xml_parser_create(""); + xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0); + xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 0); + xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, "UTF-8"); + if (!xml_parse_into_struct($parser, $this->data, $vals, $index)) + { + $message = "XML ERROR: ".xml_error_string(xml_get_error_code($parser))." at line ".xml_get_current_line_number($parser); + $this->error = $message; + error_log("$message\n"); + return 0; + } + xml_parser_free($parser); + + $i = 0; + + $tagname = $vals[$i]['tag']; + if (isset($vals[$i]['attributes'])) + { + $array[$tagname]['@'] = $vals[$i]['attributes']; + } + else + { + $array[$tagname]['@'] = array(); + } + + $array[$tagname]["#"] = $this->depth($vals, $i); + + return $array; + } + + /** PRIVATE + * this goes through the tags in the mode 2 parsing. called from parse_mode2 + */ + private function depth ($vals, &$i) + { + $children = array(); + + if (isset($vals[$i]['value'])) + { + array_push($children, $vals[$i]['value']); + } + + while (++$i < count($vals)) + { + switch ($vals[$i]['type']) + { + case 'open': + + if (isset($vals[$i]['tag'])) + { + $tagname = $vals[$i]['tag']; + } + else + { + $tagname = ''; + } + + if (isset($children[$tagname])) + { + $size = sizeof($children[$tagname]); + } + else + { + $size = 0; + } + + if (isset($vals[$i]['attributes'])) + { + $children[$tagname][$size]['@'] = $vals[$i]["attributes"]; + } + + $children[$tagname][$size]['#'] = $this->depth($vals, $i); + + break; + + case 'cdata': + array_push($children, $vals[$i]['value']); + break; + + case 'complete': + $tagname = $vals[$i]['tag']; + + if (isset($children[$tagname])) + { + $size = sizeof($children[$tagname]); + } + else + { + $size = 0; + } + + if (isset($vals[$i]['value'])) + { + $children[$tagname][$size]["#"] = $vals[$i]['value']; + } + else + { + $children[$tagname][$size]["#"] = ''; + } + + if (isset($vals[$i]['attributes'])) + { + $children[$tagname][$size]['@'] = $vals[$i]['attributes']; + } + break; + + case 'close': + return $children; + break; + } + + } + return $children; + } + + /** PUBLIC + * dump an array to the PHP full var path (useful for debugging) + */ + public function traverse ($array, $arrName = "array", $level = 0) + { + foreach ($array as $key => $val) + { + if (is_array($val)) + { + $this->traverse($val, $arrName . "[" . $key . "]", $level + 1); + } + else + { + $this->traverse_array[] = '$' . $arrName . '[' . $key . '] = "' . $val . "\""; + } + } + return 1; + } + +} + +?>

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2016