You can subscribe to this list here.
2007 |
Jan
|
Feb
|
Mar
|
Apr
(14) |
May
(67) |
Jun
(32) |
Jul
(8) |
Aug
(7) |
Sep
(32) |
Oct
(7) |
Nov
(37) |
Dec
(34) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2008 |
Jan
(278) |
Feb
(487) |
Mar
(194) |
Apr
(54) |
May
(34) |
Jun
(10) |
Jul
(15) |
Aug
(29) |
Sep
(48) |
Oct
(13) |
Nov
(12) |
Dec
(104) |
2009 |
Jan
(218) |
Feb
(155) |
Mar
(107) |
Apr
(37) |
May
|
Jun
(4) |
Jul
(5) |
Aug
(12) |
Sep
(23) |
Oct
(8) |
Nov
(2) |
Dec
(5) |
2010 |
Jan
(65) |
Feb
(21) |
Mar
(30) |
Apr
(8) |
May
(4) |
Jun
(5) |
Jul
|
Aug
(37) |
Sep
(18) |
Oct
(7) |
Nov
(1) |
Dec
(5) |
2011 |
Jan
(17) |
Feb
(1) |
Mar
(3) |
Apr
(2) |
May
|
Jun
|
Jul
(55) |
Aug
(73) |
Sep
(34) |
Oct
(21) |
Nov
(8) |
Dec
(4) |
2012 |
Jan
(1) |
Feb
(4) |
Mar
(6) |
Apr
(5) |
May
(3) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
2013 |
Jan
(13) |
Feb
|
Mar
(1) |
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
(1) |
2014 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
2015 |
Jan
(9) |
Feb
(13) |
Mar
(5) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(3) |
Oct
|
Nov
(1) |
Dec
|
2016 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
(1) |
Oct
(25) |
Nov
(16) |
Dec
(2) |
2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
2019 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2020 |
Jan
|
Feb
(4) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(1) |
2022 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
(3) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
|
2023 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(3) |
Nov
|
Dec
|
2024 |
Jan
|
Feb
|
Mar
(3) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <lu...@us...> - 2007-09-29 08:40:09
|
Revision: 7354 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7354&view=rev Author: luke-jr Date: 2007-09-29 01:40:12 -0700 (Sat, 29 Sep 2007) Log Message: ----------- looks like all we can do is accept userpriv as a feature breaker Modified Paths: -------------- armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass Modified: armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass =================================================================== --- armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass 2007-09-29 08:26:52 UTC (rev 7353) +++ armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass 2007-09-29 08:40:12 UTC (rev 7354) @@ -28,7 +28,7 @@ if has ManualSCM ${FEATURES}; then LIVE_UPDATES=manual elif [ "${SUBVERSION_REVBUMP}" = 'no' ]; then - LIVE_UPDATES=manual + LIVE_UPDATES=never else LIVE_UPDATES=revision fi @@ -36,6 +36,14 @@ [ "${LIVE_UPDATES}" = 'never' ] && return 1 # always false + + # Disable caching to get LIVE_UPDATES changes effective + addwrite "${BASH_SOURCE[0]}" + if ! touch "${BASH_SOURCE[0]}"; then + __live_why=-userpriv + return 0 # always true, because userpriv prevents conditionals + fi + [ "${LIVE_UPDATES}" = 'manual' ] && return 1 # always false @@ -96,10 +104,6 @@ live_want_update && IUSE="$IUSE z~Live${__live_why}" # 'z~' to make sure it's listed last :) - - # Disable caching to get LIVE_UPDATES changes effective - addwrite "${BASH_SOURCE[0]}" - touch "${BASH_SOURCE[0]}" fi true This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-29 08:26:48
|
Revision: 7353 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7353&view=rev Author: luke-jr Date: 2007-09-29 01:26:52 -0700 (Sat, 29 Sep 2007) Log Message: ----------- actually, that didnt help :/ Modified Paths: -------------- armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass Modified: armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass =================================================================== --- armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass 2007-09-29 08:22:46 UTC (rev 7352) +++ armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass 2007-09-29 08:26:52 UTC (rev 7353) @@ -1,7 +1,5 @@ EXPORT_FUNCTIONS pkg_postinst -RESTRICT="${RESTRICT} userpriv" - live_svn_currentrev() { # NOTE: we use $(which sed) to pass QA checks LC_ALL=C svn info "${1}" | @@ -94,7 +92,7 @@ live() { # Activate Live if appropriate -[ "$EBUILD_PHASE" == 'depend' ] && + if [ "$EBUILD_PHASE" == 'depend' ]; then live_want_update && IUSE="$IUSE z~Live${__live_why}" # 'z~' to make sure it's listed last :) @@ -102,6 +100,7 @@ # Disable caching to get LIVE_UPDATES changes effective addwrite "${BASH_SOURCE[0]}" touch "${BASH_SOURCE[0]}" + fi true } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-29 08:22:46
|
Revision: 7352 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7352&view=rev Author: luke-jr Date: 2007-09-29 01:22:46 -0700 (Sat, 29 Sep 2007) Log Message: ----------- userpriv breaks the cache disabling stuff Modified Paths: -------------- armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass Modified: armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass =================================================================== --- armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass 2007-09-29 06:52:34 UTC (rev 7351) +++ armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass 2007-09-29 08:22:46 UTC (rev 7352) @@ -1,5 +1,7 @@ EXPORT_FUNCTIONS pkg_postinst +RESTRICT="${RESTRICT} userpriv" + live_svn_currentrev() { # NOTE: we use $(which sed) to pass QA checks LC_ALL=C svn info "${1}" | This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-29 06:52:33
|
Revision: 7351 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7351&view=rev Author: luke-jr Date: 2007-09-28 23:52:34 -0700 (Fri, 28 Sep 2007) Log Message: ----------- s/true/false ... if no existing install Modified Paths: -------------- armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass Modified: armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass =================================================================== --- armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass 2007-09-29 06:48:22 UTC (rev 7350) +++ armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass 2007-09-29 06:52:34 UTC (rev 7351) @@ -38,13 +38,15 @@ return 1 # always false [ "${LIVE_UPDATES}" = 'manual' ] && return 1 # always false + + local ENVFILE="${ROOT}/var/db/pkg/${CATEGORY}/${P}/environment.bz2" + [ -r "${ENVFILE}" ] || return 1 # false if no existing install + [ "${LIVE_UPDATES}" = 'always' ] && __live_why='-Always' && return 0 # always true # Then/Now logic - local ENVFILE="${ROOT}/var/db/pkg/${CATEGORY}/${P}/environment.bz2" - [ -r "${ENVFILE}" ] || return 0 # true if no earlier install local Then Now case "${LIVE_UPDATES}" in This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-29 06:48:18
|
Revision: 7350 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7350&view=rev Author: luke-jr Date: 2007-09-28 23:48:22 -0700 (Fri, 28 Sep 2007) Log Message: ----------- digests for changes Modified Paths: -------------- armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad-live/Manifest Added Paths: ----------- armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad-live/files/digest-armagetronad-live-0.2.8_alpha7348 armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad-live/files/digest-armagetronad-live-0.3_alpha7348 Modified: armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad-live/Manifest =================================================================== --- armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad-live/Manifest 2007-09-29 06:47:50 UTC (rev 7349) +++ armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad-live/Manifest 2007-09-29 06:48:22 UTC (rev 7350) @@ -9,6 +9,10 @@ MD5 e56c9c34d3c06c2d28b797e97034703b armagetronad-live-0.2.8_alpha7326.ebuild 6470 RMD160 cd7f3f1cb87602072a6a32168b06d3149009ef28 armagetronad-live-0.2.8_alpha7326.ebuild 6470 SHA256 7d20a703bd08ad1393776f5ef1dacafc42bcedafd8f4f8a525756fd2e733193a armagetronad-live-0.2.8_alpha7326.ebuild 6470 +EBUILD armagetronad-live-0.2.8_alpha7348.ebuild 5861 RMD160 ffef6144faba15a5d89ca9ad8a47abfbff0593ac SHA1 10a9fa4fa73707faa86483f2f2b9222f89109b17 SHA256 8c721bdc0be03cc68fe3cb047828c17c9c846778e9a17e3737df5c5b88736c20 +MD5 5b65aaaa296ea2e758f55b44a82f083f armagetronad-live-0.2.8_alpha7348.ebuild 5861 +RMD160 ffef6144faba15a5d89ca9ad8a47abfbff0593ac armagetronad-live-0.2.8_alpha7348.ebuild 5861 +SHA256 8c721bdc0be03cc68fe3cb047828c17c9c846778e9a17e3737df5c5b88736c20 armagetronad-live-0.2.8_alpha7348.ebuild 5861 EBUILD armagetronad-live-0.3_alpha6693.ebuild 7844 RMD160 794dd9cab96269b5e5c62f22d962e1e5be67c78d SHA1 090f24717ec8a17917ea873a2016845d7a03e434 SHA256 a79988eb0efaa456e5d06e04a64decc341d44c6fcb4bd67520799382fe9ccb11 MD5 a4853f876787562fc66e6c2bdd3e76a1 armagetronad-live-0.3_alpha6693.ebuild 7844 RMD160 794dd9cab96269b5e5c62f22d962e1e5be67c78d armagetronad-live-0.3_alpha6693.ebuild 7844 @@ -17,6 +21,10 @@ MD5 aab69ee2efb1664f9eb9d6d7de3e77fd armagetronad-live-0.3_alpha7326.ebuild 7208 RMD160 c91137a22b90ed9081dd497b1e314e7cdaf70b9f armagetronad-live-0.3_alpha7326.ebuild 7208 SHA256 712c126ddd4a647fe912cffbe09c207adaaeff77a8dc637f44c62a3fab9e4097 armagetronad-live-0.3_alpha7326.ebuild 7208 +EBUILD armagetronad-live-0.3_alpha7348.ebuild 6599 RMD160 f6f98ea321f188b32e10990329de7f8b975f2782 SHA1 65e0fa3c9f6555eac362d3e3d039a9afe916f3a4 SHA256 049295654c52a5e464850571d0a7b59f8d09004dfb209dbd0b452b6a31c644b5 +MD5 5d3be60647c766a70df508ca398ae22b armagetronad-live-0.3_alpha7348.ebuild 6599 +RMD160 f6f98ea321f188b32e10990329de7f8b975f2782 armagetronad-live-0.3_alpha7348.ebuild 6599 +SHA256 049295654c52a5e464850571d0a7b59f8d09004dfb209dbd0b452b6a31c644b5 armagetronad-live-0.3_alpha7348.ebuild 6599 MISC ChangeLog 133 RMD160 99f736c47fd4d22c98995e50c943ecb7adce7eda SHA1 256954961b882b13e0c28d86466f856da8e144ca SHA256 23b53e7c596ca0e27fb503226a25724940c5e94336e43859a2185449ced7c730 MD5 d9ac85e3bd2c4a2487c37eb7a15117bb ChangeLog 133 RMD160 99f736c47fd4d22c98995e50c943ecb7adce7eda ChangeLog 133 @@ -31,9 +39,15 @@ MD5 78fb2de6a9611eb1fb2aa970cba6dba9 files/digest-armagetronad-live-0.2.8_alpha7326 690 RMD160 423a57a87eeb8949492d27fb555a25d4c38d005b files/digest-armagetronad-live-0.2.8_alpha7326 690 SHA256 419fd728d425d7267047c72b08903f7828f4f55411f76620ddde7ec56e38c931 files/digest-armagetronad-live-0.2.8_alpha7326 690 +MD5 78fb2de6a9611eb1fb2aa970cba6dba9 files/digest-armagetronad-live-0.2.8_alpha7348 690 +RMD160 423a57a87eeb8949492d27fb555a25d4c38d005b files/digest-armagetronad-live-0.2.8_alpha7348 690 +SHA256 419fd728d425d7267047c72b08903f7828f4f55411f76620ddde7ec56e38c931 files/digest-armagetronad-live-0.2.8_alpha7348 690 MD5 78fb2de6a9611eb1fb2aa970cba6dba9 files/digest-armagetronad-live-0.3_alpha6693 690 RMD160 423a57a87eeb8949492d27fb555a25d4c38d005b files/digest-armagetronad-live-0.3_alpha6693 690 SHA256 419fd728d425d7267047c72b08903f7828f4f55411f76620ddde7ec56e38c931 files/digest-armagetronad-live-0.3_alpha6693 690 MD5 78fb2de6a9611eb1fb2aa970cba6dba9 files/digest-armagetronad-live-0.3_alpha7326 690 RMD160 423a57a87eeb8949492d27fb555a25d4c38d005b files/digest-armagetronad-live-0.3_alpha7326 690 SHA256 419fd728d425d7267047c72b08903f7828f4f55411f76620ddde7ec56e38c931 files/digest-armagetronad-live-0.3_alpha7326 690 +MD5 78fb2de6a9611eb1fb2aa970cba6dba9 files/digest-armagetronad-live-0.3_alpha7348 690 +RMD160 423a57a87eeb8949492d27fb555a25d4c38d005b files/digest-armagetronad-live-0.3_alpha7348 690 +SHA256 419fd728d425d7267047c72b08903f7828f4f55411f76620ddde7ec56e38c931 files/digest-armagetronad-live-0.3_alpha7348 690 Added: armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad-live/files/digest-armagetronad-live-0.2.8_alpha7348 =================================================================== --- armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad-live/files/digest-armagetronad-live-0.2.8_alpha7348 (rev 0) +++ armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad-live/files/digest-armagetronad-live-0.2.8_alpha7348 2007-09-29 06:48:22 UTC (rev 7350) @@ -0,0 +1,9 @@ +MD5 e2d40309dde7e1339ca6aff7599cdfa3 moviepack.zip 352253 +RMD160 07c8b2aa48ad84092869c90e32d32a96d367afd5 moviepack.zip 352253 +SHA256 3de835e1e8af71f1dcbf5ac8405dfa87973eac50d206c12338278fc601cf9d78 moviepack.zip 352253 +MD5 3c5d04af52eb296cdeb2fba5ecbd8899 moviesounds_fq.zip 2182021 +RMD160 9fe95f3cc31bfdf9149bf850d5ae46ca5253a09a moviesounds_fq.zip 2182021 +SHA256 9f8061eb0fef416885424bdba9f899fc5b4d9a021f46eef4eb821a7f1e08c1ba moviesounds_fq.zip 2182021 +MD5 1ca4f4a4f11c728315250973b8d69ce6 spanishvoices.zip 349593 +RMD160 13a7b307e1da341fe37e164e36db7778960edaee spanishvoices.zip 349593 +SHA256 fff02f9f002927929dc7ed102d4b01875c20a6e42188fe0a3b2d8b9cfdbad1a4 spanishvoices.zip 349593 Added: armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad-live/files/digest-armagetronad-live-0.3_alpha7348 =================================================================== --- armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad-live/files/digest-armagetronad-live-0.3_alpha7348 (rev 0) +++ armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad-live/files/digest-armagetronad-live-0.3_alpha7348 2007-09-29 06:48:22 UTC (rev 7350) @@ -0,0 +1,9 @@ +MD5 e2d40309dde7e1339ca6aff7599cdfa3 moviepack.zip 352253 +RMD160 07c8b2aa48ad84092869c90e32d32a96d367afd5 moviepack.zip 352253 +SHA256 3de835e1e8af71f1dcbf5ac8405dfa87973eac50d206c12338278fc601cf9d78 moviepack.zip 352253 +MD5 3c5d04af52eb296cdeb2fba5ecbd8899 moviesounds_fq.zip 2182021 +RMD160 9fe95f3cc31bfdf9149bf850d5ae46ca5253a09a moviesounds_fq.zip 2182021 +SHA256 9f8061eb0fef416885424bdba9f899fc5b4d9a021f46eef4eb821a7f1e08c1ba moviesounds_fq.zip 2182021 +MD5 1ca4f4a4f11c728315250973b8d69ce6 spanishvoices.zip 349593 +RMD160 13a7b307e1da341fe37e164e36db7778960edaee spanishvoices.zip 349593 +SHA256 fff02f9f002927929dc7ed102d4b01875c20a6e42188fe0a3b2d8b9cfdbad1a4 spanishvoices.zip 349593 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-29 06:47:49
|
Revision: 7349 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7349&view=rev Author: luke-jr Date: 2007-09-28 23:47:50 -0700 (Fri, 28 Sep 2007) Log Message: ----------- live.eclass -- please test Added Paths: ----------- armagetronad/trunk/build/gentoo/overlay/eclass/ armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.2.8_alpha7348.ebuild armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha7348.ebuild Copied: armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass (from rev 7348, armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha7326.ebuild) =================================================================== --- armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass (rev 0) +++ armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass 2007-09-29 06:47:50 UTC (rev 7349) @@ -0,0 +1,129 @@ +EXPORT_FUNCTIONS pkg_postinst + +live_svn_currentrev() { + # NOTE: we use $(which sed) to pass QA checks + LC_ALL=C svn info "${1}" | + "$(which sed)" ' + s,^Last Changed Rev: \([0-9]\+\)$,\1, + t + d + ' +} + +live_svn_currentrevlist() { + local rl= repo_uri repo thisrev + for repo in "${ESVN_REPO_URI[@]}"; do + repo_uri="$(subversion__get_repository_uri "${repo}")" + thisrev="$(live_svn_currentrev "${repo_uri}")" + [ -z "$thisrev" ] && return + rl="$rl:$thisrev" + done + echo "${rl:1}" +} + +live_want_update() { + __live_why= + if [ -z "${LIVE_UPDATES}" ]; then + local LIVE_UPDATES + if has ManualSCM ${FEATURES}; then + LIVE_UPDATES=manual + elif [ "${SUBVERSION_REVBUMP}" = 'no' ]; then + LIVE_UPDATES=manual + else + LIVE_UPDATES=revision + fi + fi + + [ "${LIVE_UPDATES}" = 'never' ] && + return 1 # always false + [ "${LIVE_UPDATES}" = 'manual' ] && + return 1 # always false + [ "${LIVE_UPDATES}" = 'always' ] && + __live_why='-Always' && + return 0 # always true + + # Then/Now logic + local ENVFILE="${ROOT}/var/db/pkg/${CATEGORY}/${P}/environment.bz2" + [ -r "${ENVFILE}" ] || return 0 # true if no earlier install + local Then Now + + case "${LIVE_UPDATES}" in + revision) + Then="$(bzgrep -m1 '^__live_revision=' "${ENVFILE}" | cut -d'=' -f'2-')" + Now="$(live_svn_currentrevlist)" + __live_why="-r${Now}" + ;; + date*) + local format='%F' + [ -n "${LIVE_UPDATES:4}" ] && format=+"${LIVE_UPDATES:4}" + Then="$(date -d"$(eval "$(bzgrep -m1 '^__live_date=' "${ENVFILE}")"; echo "${__live_date}")" "+${format}")" + Now="$(date "+${format}")" + __live_why="-date${Now/ /_}" + ;; + esac + + [ -z "${Now}" ] && return 1 # false if we can't figure it out + [ "${Then}" != "${Now}" ] + return $? +} + +live_record_build() { + __live_date="$(TZ=UTC LC_ALL=C date)" + unset __live_revision +} +live_record_repo() { + local repo_uri="$(subversion__get_wc_path "${1}")" + local wc_path="$(subversion__get_wc_path "${repo_uri}")" + local lcr="$(live_svn_currentrev "${wc_path}")" + __live_revision="${__live_revision}${__live_revision+:}${lcr}" +} + +live_src_unpack() { + local repo + live_record_build + for repo in "${ESVN_REPO_URI[@]}"; do + subversion_fetch "${repo}" || die "${ESVN}: unknown problem occurred in subversion_fetch for ${repo}." + live_record_repo "${repo}" + done + subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap." +} + +live() { + # Activate Live if appropriate +[ "$EBUILD_PHASE" == 'depend' ] && + live_want_update && + IUSE="$IUSE z~Live${__live_why}" + # 'z~' to make sure it's listed last :) + + # Disable caching to get LIVE_UPDATES changes effective + addwrite "${BASH_SOURCE[0]}" + touch "${BASH_SOURCE[0]}" + + true +} + +live_pkg_postinst() { + [ "$SUBVERSION_REVBUMP" == "no" ] && return + has ManualSCM ${FEATURES} && return + [ "${LIVE_UPDATES}" = 'never' ] && return + [ "${LIVE_UPDATES}" = 'manual' ] && return + ewarn + ewarn "${CATEGORY}/${P} supports automatic remerging." + ewarn + ewarn 'This feature is UNSUPPORTED by Gentoo, please DO NOT report ANY' + ewarn ' related bugs to them, but rather to us via the forum:' + ewarn ' http://forums.armagetronad.net' + ewarn + ewarn 'To control how often your live packages are updates, set' + ewarn ' the LIVE_UPDATES variable in your make.conf to:' + ewarn ' manual - Disables this feature' + ewarn ' revision - Update when there is a new revision' + ewarn ' date - Update every day' + ewarn ' date%Y%m - Update once a month' + ewarn ' (other variants also possible)' + ewarn ' always - Always treat as an update' + ewarn 'To make your change take effect immediately, you need to run:' + ewarn ' emerge --metadata' + ewarn + ebeep 5 +} Copied: armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.2.8_alpha7348.ebuild (from rev 7348, armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.2.8_alpha7326.ebuild) =================================================================== --- armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.2.8_alpha7348.ebuild (rev 0) +++ armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.2.8_alpha7348.ebuild 2007-09-29 06:47:50 UTC (rev 7349) @@ -0,0 +1,181 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /cvsroot/armagetronad/armagetronad_build/gentoo/client.ebuild,v 1.24 2006/05/05 13:55:13 luke-jr Exp $ + +inherit flag-o-matic eutils games subversion live + +DESCRIPTION="3D light cycles like in the movie TRON" +HOMEPAGE="http://armagetronad.net/" + +MY_PN="armagetronad" +OPT_CLIENTSRC=" + moviesounds? ( + http://beta.armagetronad.net/fetch.php/PreResource/moviesounds_fq.zip + linguas_es? ( !linguas_en? ( + http://beta.armagetronad.net/fetch.php/PreResource/spanishvoices.zip + ) ) + ) + moviepack? ( + http://beta.armagetronad.net/fetch.php/PreResource/moviepack.zip + ) +" +ESVN_REPO_URI="https://${MY_PN}.svn.sourceforge.net/svnroot/${MY_PN}/${MY_PN}/branches/0.2.8/${MY_PN}" +SRC_URI=" + opengl? ( ${OPT_CLIENTSRC} ) + !dedicated? ( ${OPT_CLIENTSRC} ) +" + +LICENSE="GPL-2" +SLOT="live" +KEYWORDS="amd64 ppc sparc x86" +IUSE="debug dedicated linguas_es linguas_en moviepack moviesounds opengl" + +ESVN_PROJECT="${P/_*}" + +GLDEPS=" + || ( + x11-libs/libX11 + virtual/x11 + ) + virtual/glu + virtual/opengl + media-libs/libsdl + media-libs/sdl-image + media-libs/jpeg + media-libs/libpng +" +RDEPEND=" + >=dev-libs/libxml2-2.6.11 + sys-libs/zlib + opengl? ( ${GLDEPS} ) + !dedicated? ( ${GLDEPS} ) +" +OPT_CLIENTDEPS=" + moviepack? ( app-arch/unzip ) + moviesounds? ( app-arch/unzip ) +" +DEPEND="${RDEPEND} + opengl? ( ${OPT_CLIENTDEPS} ) + !dedicated? ( ${OPT_CLIENTDEPS} ) +" + +S="${WORKDIR}/${MY_PN}" + +pkg_setup() { + if use debug; then + ewarn + ewarn 'The "debug" USE flag will enable debugging code. This will cause AI' + ewarn ' players to chat debugging information, debugging lines to be drawn' + ewarn ' on the grid and at wall angles, and probably most relevant to your' + ewarn ' decision to keep the USE flag:' + ewarn ' FULL SCREEN MODE AND SOUND WILL BE DISABLED' + ewarn + ewarn "If you don't like this, add this line to /etc/portage/package.use:" + ewarn ' games-action/armagetronad -debug' + ewarn + ewarn 'If you ignore this warning and complain about any of the above' + ewarn ' effects, the Armagetron Advanced team will either ignore you or' + ewarn ' delete your complaint.' + ewarn + ebeep 5 + fi +} + +src_unpack() { + for f in ${A}; do + unpack "$f" + done + live_src_unpack + rsync -rlpgo "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/}/.svn" "${S}" || ewarn ".svn directory couldn't be copied; your version number will use the current date instead of revision" +} + +aabuild() { + MyBUILDDIR="${WORKDIR}/build-$1" + mkdir -p "${MyBUILDDIR}" || die "error creating build directory($1)" # -p to allow EEXIST scenario + cd "${MyBUILDDIR}" + use debug && DEBUGLEVEL=3 || DEBUGLEVEL=0 + export DEBUGLEVEL CODELEVEL=0 + [ "$SLOT" == "0" ] && myconf="--disable-multiver" || myconf="--enable-multiver=${SLOT}" + [ "$1" == "server" ] && ded='-dedicated' || ded='' + GameDir="${MY_PN}${ded}${GameSLOT}" + ECONF_SOURCE="${S}" \ + egamesconf ${myconf} \ + --disable-binreloc \ + --docdir "/usr/share/doc/${PF}/${DOCDESTTREE}" \ + --disable-master \ + --enable-main \ + --disable-krawall \ + --enable-sysinstall \ + --disable-useradd \ + --enable-etc \ + --disable-restoreold \ + --disable-games \ + --enable-uninstall="emerge --clean =${CATEGORY}/${PF}" \ + "${@:2}" || die "egamesconf($1) failed" + emake armabindir="${GAMES_BINDIR}" || die "emake($1) failed" +} + +src_compile() { + [ "${PN/-live/}" != "${PN}" ] && WANT_AUTOMAKE=1.9 ./bootstrap.sh + + # Assume client if they don't want a server + use opengl || ! use dedicated && build_client=true || build_client=false + use dedicated && build_server=true || build_server=false + + [ "$SLOT" == "0" ] && GameSLOT="" || GameSLOT="-${SLOT}" + filter-flags -fno-exceptions + if ${build_client}; then + einfo "Building game client" + aabuild client --enable-glout --disable-initscripts --enable-desktop + fi + if ${build_server}; then + einfo "Building dedicated server" + aabuild server --disable-glout --enable-initscripts --disable-desktop + fi +} + +src_install() { + if ${build_client} && ${build_server}; then + # Setup symlink so both client and server share their common data + dodir "${GAMES_DATADIR}" + dosym "${MY_PN}${GameSLOT}" "${GAMES_DATADIR}/${MY_PN}-dedicated${GameSLOT}" + dodir "${GAMES_SYSCONFDIR}" + dosym "${MY_PN}${GameSLOT}" "${GAMES_SYSCONFDIR}/${MY_PN}-dedicated${GameSLOT}" + fi + if ${build_client}; then + einfo "Installing game client" + cd "${WORKDIR}/build-client" + make DESTDIR="${D}" armabindir="${GAMES_BINDIR}" install || die "make(client) install failed" + # copy moviepacks/sounds + cd "${WORKDIR}" + insinto "${GAMES_DATADIR}/${MY_PN}${GameSLOT}" + if use moviepack; then + einfo 'Installing moviepack' + doins -r moviepack || die "copying moviepack" + fi + if use moviesounds; then + einfo 'Installing moviesounds' + doins -r moviesounds || die "copying moviesounds" + if use linguas_es && ! use linguas_en; then + einfo 'Installing Spanish moviesounds' + doins -r ArmageTRON/moviesounds || die "copying spanish moviesounds" + fi + fi + cd "${WORKDIR}/build-client" + fi + if ${build_server}; then + einfo "Installing dedicated server" + cd "${WORKDIR}/build-server" + make DESTDIR="${D}" armabindir="${GAMES_BINDIR}" install || die "make(server) install failed" + einfo 'Adjusting dedicated server configuration' + dosed "s,^\(user=\).*$,\1${GAMES_USER_DED},; s,^#\(VARDIR=/.*\)$,\\1," "${GAMES_SYSCONFDIR}/${MY_PN}-dedicated${GameSLOT}/rc.config" || ewarn 'adjustments for rc.config FAILED; the defaults may not be suited for your system!' + fi + # Ok, so we screwed up on doc installation... so for now, the ebuild does this manually + dohtml -r "${D}${GAMES_PREFIX}/share/doc/${GameDir}/html/"* + dodoc "${D}${GAMES_PREFIX}/share/doc/${GameDir}/html/"*.txt + rm -r "${D}${GAMES_PREFIX}/share/doc" + rmdir "${D}${GAMES_PREFIX}/share" || true # Supress potential error + prepgamesdirs +} + +live Copied: armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha7348.ebuild (from rev 7348, armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha7326.ebuild) =================================================================== --- armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha7348.ebuild (rev 0) +++ armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha7348.ebuild 2007-09-29 06:47:50 UTC (rev 7349) @@ -0,0 +1,195 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /cvsroot/armagetronad/armagetronad_build/gentoo/client.ebuild,v 1.24 2006/05/05 13:55:13 luke-jr Exp $ + +inherit flag-o-matic eutils games subversion live + +DESCRIPTION="3D light cycles like in the movie TRON" +HOMEPAGE="http://armagetronad.net/" + +MY_PN="armagetronad" +OPT_CLIENTSRC=" + moviesounds? ( + http://beta.armagetronad.net/fetch.php/PreResource/moviesounds_fq.zip + linguas_es? ( !linguas_en? ( + http://beta.armagetronad.net/fetch.php/PreResource/spanishvoices.zip + ) ) + ) + moviepack? ( + http://beta.armagetronad.net/fetch.php/PreResource/moviepack.zip + ) +" +ESVN_REPO_URI="https://${MY_PN}.svn.sourceforge.net/svnroot/${MY_PN}/${MY_PN}/trunk/${MY_PN}" +SRC_URI=" + opengl? ( ${OPT_CLIENTSRC} ) + !dedicated? ( ${OPT_CLIENTSRC} ) +" + +LICENSE="GPL-2" +SLOT="experimental-live" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="debug dedicated linguas_es linguas_en moviepack moviesounds opengl ruby" + +GLDEPS=" + || ( + x11-libs/libX11 + virtual/x11 + ) + virtual/glu + virtual/opengl + media-libs/libsdl + media-libs/sdl-image + media-libs/sdl-mixer + media-libs/jpeg + media-libs/libpng + media-libs/ftgl +" +RDEPEND=" + >=dev-libs/libxml2-2.6.11 + sys-libs/zlib + opengl? ( ${GLDEPS} ) + !dedicated? ( ${GLDEPS} ) + ruby? ( virtual/ruby >=dev-lang/swig-1.3.29 ) + >=dev-libs/boost-1.33.1 +" +OPT_CLIENTDEPS=" + moviepack? ( app-arch/unzip ) + moviesounds? ( app-arch/unzip ) +" +DEPEND="${RDEPEND} + opengl? ( ${OPT_CLIENTDEPS} ) + !dedicated? ( ${OPT_CLIENTDEPS} ) +" + +S="${WORKDIR}/${MY_PN}" + +pkg_setup() { + if use ruby && ! built_with_use dev-lang/swig ruby ; then + eerror "You are trying to compile ${CATEGORY}/${PF} with the \"ruby\" USE flag enabled." + eerror "However, $(best_version dev-lang/swig) was compiled with the ruby flag disabled." + eerror + eerror "You must either disable this use flag, or recompile" + eerror "$(best_version dev-lang/swig) with this ruby use flag enabled." + die 'swig missing ruby' + fi + if use debug; then + ewarn + ewarn 'The "debug" USE flag will enable debugging code. This will cause AI' + ewarn ' players to chat debugging information, debugging lines to be drawn' + ewarn ' on the grid and at wall angles, and probably most relevant to your' + ewarn ' decision to keep the USE flag:' + ewarn ' FULL SCREEN MODE WILL BE DISABLED' + ewarn + ewarn "If you don't like this, add this line to /etc/portage/package.use:" + ewarn ' games-action/armagetronad -debug' + ewarn + ewarn 'If you ignore this warning and complain about any of the above' + ewarn ' effects, the Armagetron Advanced team will either ignore you or' + ewarn ' delete your complaint.' + ewarn + ebeep 5 + fi + ewarn 'Please note that this is an EXPERIMENTAL RELEASE of Armagetron Advanced.' + ewarn 'It has known bugs, and is not meant to be well-tested or stable.' + ewarn ' PLAY AT YOUR OWN RISK' +} + +src_unpack() { + for f in ${A}; do + unpack "$f" + done + live_src_unpack + rsync -rlpgo "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/}/.svn" "${S}" || ewarn ".svn directory couldn't be copied; your version number will use the current date instead of revision" +} + +aabuild() { + MyBUILDDIR="${WORKDIR}/build-$1" + mkdir -p "${MyBUILDDIR}" || die "error creating build directory($1)" # -p to allow EEXIST scenario + cd "${MyBUILDDIR}" + use debug && DEBUGLEVEL=3 || DEBUGLEVEL=0 + export DEBUGLEVEL CODELEVEL=0 + [ "$SLOT" == "0" ] && myconf="--disable-multiver" || myconf="--enable-multiver=${SLOT}" + [ "$1" == "server" ] && ded='-dedicated' || ded='' + GameDir="${MY_PN}${ded}${GameSLOT}" + ECONF_SOURCE="${S}" \ + egamesconf ${myconf} \ + --disable-binreloc \ + --docdir "/usr/share/doc/${PF}/${DOCDESTTREE}" \ + --disable-master \ + --enable-main \ + --disable-krawall \ + --enable-sysinstall \ + --disable-useradd \ + --enable-etc \ + --disable-restoreold \ + --disable-games \ + --enable-uninstall="emerge --clean =${CATEGORY}/${PF}" \ + $(use_enable ruby) \ + "${@:2}" || die "egamesconf($1) failed" + emake armabindir="${GAMES_BINDIR}" || die "emake($1) failed" +} + +src_compile() { + [ "${PN/-live/}" != "${PN}" ] && WANT_AUTOMAKE=1.9 ./bootstrap.sh + + # Assume client if they don't want a server + use opengl || ! use dedicated && build_client=true || build_client=false + use dedicated && build_server=true || build_server=false + + [ "$SLOT" == "0" ] && GameSLOT="" || GameSLOT="-${SLOT}" + filter-flags -fno-exceptions + if ${build_client}; then + einfo "Building game client" + aabuild client --enable-glout --disable-initscripts --enable-desktop + fi + if ${build_server}; then + einfo "Building dedicated server" + aabuild server --disable-glout --enable-initscripts --disable-desktop + fi +} + +src_install() { + if ${build_client} && ${build_server}; then + # Setup symlink so both client and server share their common data + dodir "${GAMES_DATADIR}" + dosym "${MY_PN}${GameSLOT}" "${GAMES_DATADIR}/${MY_PN}-dedicated${GameSLOT}" + dodir "${GAMES_SYSCONFDIR}" + dosym "${MY_PN}${GameSLOT}" "${GAMES_SYSCONFDIR}/${MY_PN}-dedicated${GameSLOT}" + fi + if ${build_client}; then + einfo "Installing game client" + cd "${WORKDIR}/build-client" + make DESTDIR="${D}" armabindir="${GAMES_BINDIR}" install || die "make(client) install failed" + # copy moviepacks/sounds + cd "${WORKDIR}" + insinto "${GAMES_DATADIR}/${MY_PN}${GameSLOT}" + if use moviepack; then + einfo 'Installing moviepack' + doins -r moviepack || die "copying moviepack" + fi + if use moviesounds; then + einfo 'Installing moviesounds' + doins -r moviesounds || die "copying moviesounds" + if use linguas_es && ! use linguas_en; then + einfo 'Installing Spanish moviesounds' + doins -r ArmageTRON/moviesounds || die "copying spanish moviesounds" + fi + fi + cd "${WORKDIR}/build-client" + fi + if ${build_server}; then + einfo "Installing dedicated server" + cd "${WORKDIR}/build-server" + make DESTDIR="${D}" armabindir="${GAMES_BINDIR}" install || die "make(server) install failed" + einfo 'Adjusting dedicated server configuration' + dosed "s,^\(user=\).*$,\1${GAMES_USER_DED},; s,^#\(VARDIR=/.*\)$,\\1," "${GAMES_SYSCONFDIR}/${MY_PN}-dedicated${GameSLOT}/rc.config" || ewarn 'adjustments for rc.config FAILED; the defaults may not be suited for your system!' + fi + # Ok, so we screwed up on doc installation... so for now, the ebuild does this manually + dohtml -r "${D}${GAMES_PREFIX}/share/doc/${GameDir}/html/"* + dodoc "${D}${GAMES_PREFIX}/share/doc/${GameDir}/html/"*.txt + rm -r "${D}${GAMES_PREFIX}/share/doc" + rmdir "${D}${GAMES_PREFIX}/share" || true # Supress potential error + prepgamesdirs +} + +live This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lac...@us...> - 2007-09-28 12:50:24
|
Revision: 7348 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7348&view=rev Author: lackadaisical Date: 2007-09-28 05:50:25 -0700 (Fri, 28 Sep 2007) Log Message: ----------- thumbs. Added Paths: ----------- www/mainsite/screenshots/thumbnails/ss_ctf_1.thumb.png www/mainsite/screenshots/thumbnails/ss_ctf_2.thumb.png www/mainsite/screenshots/thumbnails/ss_ctf_3.thumb.png www/mainsite/screenshots/thumbnails/ss_ctf_4.thumb.png www/mainsite/screenshots/thumbnails/ss_ctf_5.thumb.png www/mainsite/screenshots/thumbnails/ss_fort_1.thumb.png www/mainsite/screenshots/thumbnails/ss_fort_2.thumb.png www/mainsite/screenshots/thumbnails/ss_fort_3.thumb.png www/mainsite/screenshots/thumbnails/ss_fort_4.thumb.png www/mainsite/screenshots/thumbnails/ss_fort_5.thumb.png www/mainsite/screenshots/thumbnails/ss_fort_6.thumb.png www/mainsite/screenshots/thumbnails/ss_fort_7.thumb.png www/mainsite/screenshots/thumbnails/ss_fort_8.thumb.png www/mainsite/screenshots/thumbnails/ss_sumo_1.thumb.png www/mainsite/screenshots/thumbnails/ss_sumo_2.thumb.png www/mainsite/screenshots/thumbnails/ss_sumo_3.thumb.png Added: www/mainsite/screenshots/thumbnails/ss_ctf_1.thumb.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/thumbnails/ss_ctf_1.thumb.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/thumbnails/ss_ctf_2.thumb.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/thumbnails/ss_ctf_2.thumb.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/thumbnails/ss_ctf_3.thumb.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/thumbnails/ss_ctf_3.thumb.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/thumbnails/ss_ctf_4.thumb.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/thumbnails/ss_ctf_4.thumb.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/thumbnails/ss_ctf_5.thumb.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/thumbnails/ss_ctf_5.thumb.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/thumbnails/ss_fort_1.thumb.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/thumbnails/ss_fort_1.thumb.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/thumbnails/ss_fort_2.thumb.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/thumbnails/ss_fort_2.thumb.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/thumbnails/ss_fort_3.thumb.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/thumbnails/ss_fort_3.thumb.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/thumbnails/ss_fort_4.thumb.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/thumbnails/ss_fort_4.thumb.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/thumbnails/ss_fort_5.thumb.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/thumbnails/ss_fort_5.thumb.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/thumbnails/ss_fort_6.thumb.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/thumbnails/ss_fort_6.thumb.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/thumbnails/ss_fort_7.thumb.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/thumbnails/ss_fort_7.thumb.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/thumbnails/ss_fort_8.thumb.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/thumbnails/ss_fort_8.thumb.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/thumbnails/ss_sumo_1.thumb.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/thumbnails/ss_sumo_1.thumb.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/thumbnails/ss_sumo_2.thumb.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/thumbnails/ss_sumo_2.thumb.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/thumbnails/ss_sumo_3.thumb.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/thumbnails/ss_sumo_3.thumb.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lac...@us...> - 2007-09-28 12:46:17
|
Revision: 7347 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7347&view=rev Author: lackadaisical Date: 2007-09-28 05:46:20 -0700 (Fri, 28 Sep 2007) Log Message: ----------- screenshots. can i do this? lack Added Paths: ----------- www/mainsite/screenshots/ss_ctf_1.png www/mainsite/screenshots/ss_ctf_2.png www/mainsite/screenshots/ss_ctf_3.png www/mainsite/screenshots/ss_ctf_4.png www/mainsite/screenshots/ss_ctf_5.png www/mainsite/screenshots/ss_fort_1.png www/mainsite/screenshots/ss_fort_2.png www/mainsite/screenshots/ss_fort_3.png www/mainsite/screenshots/ss_fort_4.png www/mainsite/screenshots/ss_fort_5.png www/mainsite/screenshots/ss_fort_6.png www/mainsite/screenshots/ss_fort_7.png www/mainsite/screenshots/ss_fort_8.png www/mainsite/screenshots/ss_sumo_1.png www/mainsite/screenshots/ss_sumo_2.png www/mainsite/screenshots/ss_sumo_3.png Added: www/mainsite/screenshots/ss_ctf_1.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/ss_ctf_1.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/ss_ctf_2.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/ss_ctf_2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/ss_ctf_3.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/ss_ctf_3.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/ss_ctf_4.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/ss_ctf_4.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/ss_ctf_5.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/ss_ctf_5.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/ss_fort_1.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/ss_fort_1.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/ss_fort_2.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/ss_fort_2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/ss_fort_3.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/ss_fort_3.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/ss_fort_4.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/ss_fort_4.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/ss_fort_5.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/ss_fort_5.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/ss_fort_6.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/ss_fort_6.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/ss_fort_7.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/ss_fort_7.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/ss_fort_8.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/ss_fort_8.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/ss_sumo_1.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/ss_sumo_1.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/ss_sumo_2.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/ss_sumo_2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: www/mainsite/screenshots/ss_sumo_3.png =================================================================== (Binary files differ) Property changes on: www/mainsite/screenshots/ss_sumo_3.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 11:16:45
|
Revision: 7346 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7346&view=rev Author: luke-jr Date: 2007-09-12 04:14:11 -0700 (Wed, 12 Sep 2007) Log Message: ----------- override Tanks code style Modified Paths: -------------- www/beta/trunk/www-aabeta/serverlist-aan.php Modified: www/beta/trunk/www-aabeta/serverlist-aan.php =================================================================== --- www/beta/trunk/www-aabeta/serverlist-aan.php 2007-09-12 11:07:52 UTC (rev 7345) +++ www/beta/trunk/www-aabeta/serverlist-aan.php 2007-09-12 11:14:11 UTC (rev 7346) @@ -34,6 +34,15 @@ table.serverlist th { border: inherit; /* Tank's CSS has a general th thing? :/ */ } + .serverlist_bg>code { + /* Tank's CSS has a general code thing :/ */ + display: inline; + background-color: transparent; + color: inherit; + border: 0; + margin: 0; + padding: 0; + } font.brighttext { /* what does this apply to??? --ljr */ background-color: #0b170b; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 11:07:55
|
Revision: 7345 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7345&view=rev Author: luke-jr Date: 2007-09-12 04:07:52 -0700 (Wed, 12 Sep 2007) Log Message: ----------- wrap _gpl in _main Modified Paths: -------------- www/beta/trunk/www-aabeta/serverlist-aan.php www/beta/trunk/www-aabeta/serverlist-common.php www/beta/trunk/www-aabeta/serverlist.php Modified: www/beta/trunk/www-aabeta/serverlist-aan.php =================================================================== --- www/beta/trunk/www-aabeta/serverlist-aan.php 2007-09-12 10:46:24 UTC (rev 7344) +++ www/beta/trunk/www-aabeta/serverlist-aan.php 2007-09-12 11:07:52 UTC (rev 7345) @@ -85,7 +85,6 @@ </ul> <div id="content"> <? serverlist_betanotice(); ?> - <? serverlist_gpl(); ?> <? serverlist_main('serverlist_bg'); ?> </div> <span id="copyrightnotice"> Modified: www/beta/trunk/www-aabeta/serverlist-common.php =================================================================== --- www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:46:24 UTC (rev 7344) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 11:07:52 UTC (rev 7345) @@ -81,7 +81,7 @@ <? } -function serverlist_gpl() { +function serverlist_gpl($extraClasses = false) { if ($_GET['source'] != '') { ini_set('highlight.bg', '#0b170b'); ini_set('highlight.comment', '#FF8000'); @@ -104,7 +104,10 @@ default: die('I don\'t show that source!'); } - echo '<div class="src">'; + echo '<div class="src'; + if ($extraClasses) + echo " $extraClasses"; + echo '">'; highlight_file($srcreq); echo '</div>'; exit; @@ -174,6 +177,8 @@ } function serverlist_main($extraClasses = false) { + serverlist_gpl($extraClasses); + $master = new aap_master(); $servers = $master->getlist(); unset($master); Modified: www/beta/trunk/www-aabeta/serverlist.php =================================================================== --- www/beta/trunk/www-aabeta/serverlist.php 2007-09-12 10:46:24 UTC (rev 7344) +++ www/beta/trunk/www-aabeta/serverlist.php 2007-09-12 11:07:52 UTC (rev 7345) @@ -32,7 +32,6 @@ </head> <body class="serverlist_bg"> <? serverlist_betanotice(); ?> - <? serverlist_gpl(); ?> <? serverlist_main(); ?> </body> </html> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 10:46:21
|
Revision: 7344 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7344&view=rev Author: luke-jr Date: 2007-09-12 03:46:24 -0700 (Wed, 12 Sep 2007) Log Message: ----------- pull outside rcsid from global Modified Paths: -------------- www/beta/trunk/www-aabeta/serverlist-common.php Modified: www/beta/trunk/www-aabeta/serverlist-common.php =================================================================== --- www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:41:36 UTC (rev 7343) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:46:24 UTC (rev 7344) @@ -300,7 +300,7 @@ <br /> <table class="rcsid"> <?php -global $top_rcsid, $aap_master_rcsid, $aap_serverinfo_rcsid; +global $top_rcsid, $aap_master_rcsid, $aap_serverinfo_rcsid, $player_name_links_rcsid; $serverlist_common_rcsid = '$Id$'; $rcsexpr = '%^\$'.'I'.'d: [^ ]+ ([0-9]+) ([0-9/-]+) ([0-9:]+)Z ([^ ]+) \$$%'; foreach (array( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 10:41:35
|
Revision: 7343 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7343&view=rev Author: luke-jr Date: 2007-09-12 03:41:36 -0700 (Wed, 12 Sep 2007) Log Message: ----------- portable syntax color changing? Modified Paths: -------------- www/beta/trunk/www-aabeta/serverlist-common.php Modified: www/beta/trunk/www-aabeta/serverlist-common.php =================================================================== --- www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:30:52 UTC (rev 7342) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:41:36 UTC (rev 7343) @@ -58,11 +58,6 @@ color: #f3a9a9; } - .src font[color="#000000"] { color: #d0d0d0 !important; } - .src font[color="#0000BB"] { color: #00d0d0 !important; } - .src font[color="#007700"] { color: #00d000 !important; } - .src font[color="#DD0000"] { color: #ff5050 !important; } - table.rcsid { border: 0; margin-top: 1em; @@ -88,6 +83,13 @@ function serverlist_gpl() { if ($_GET['source'] != '') { + ini_set('highlight.bg', '#0b170b'); + ini_set('highlight.comment', '#FF8000'); + ini_set('highlight.default', '#00d0d0'); + ini_set('highlight.html', '#d0d0d0'); + ini_set('highlight.keyword', '#00d000'); + ini_set('highlight.string', '#ff5050'); + $srcreq = $_GET['source']; switch ($srcreq) { case '_top': This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 10:30:51
|
Revision: 7342 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7342&view=rev Author: luke-jr Date: 2007-09-12 03:30:52 -0700 (Wed, 12 Sep 2007) Log Message: ----------- PHPs || sucks Modified Paths: -------------- www/beta/trunk/www-aabeta/serverlist-common.php Modified: www/beta/trunk/www-aabeta/serverlist-common.php =================================================================== --- www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:29:51 UTC (rev 7341) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:30:52 UTC (rev 7342) @@ -338,7 +338,7 @@ <td class="src"> <? if ($data['action'] == 'modified') { - echo '<a href="?source='.($data['Spage'] || $data['page']).'">(View Source)</a>'; + echo '<a href="?source='.($data['Spage']?$data['Spage']:$data['page']).'">(View Source)</a>'; } ?> </td> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 10:29:51
|
Revision: 7341 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7341&view=rev Author: luke-jr Date: 2007-09-12 03:29:51 -0700 (Wed, 12 Sep 2007) Log Message: ----------- pull outside rcsid from global Modified Paths: -------------- www/beta/trunk/www-aabeta/serverlist-common.php Modified: www/beta/trunk/www-aabeta/serverlist-common.php =================================================================== --- www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:26:40 UTC (rev 7340) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:29:51 UTC (rev 7341) @@ -298,6 +298,7 @@ <br /> <table class="rcsid"> <?php +global $top_rcsid, $aap_master_rcsid, $aap_serverinfo_rcsid; $serverlist_common_rcsid = '$Id$'; $rcsexpr = '%^\$'.'I'.'d: [^ ]+ ([0-9]+) ([0-9/-]+) ([0-9:]+)Z ([^ ]+) \$$%'; foreach (array( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 10:26:36
|
Revision: 7340 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7340&view=rev Author: luke-jr Date: 2007-09-12 03:26:40 -0700 (Wed, 12 Sep 2007) Log Message: ----------- debug info Modified Paths: -------------- www/beta/trunk/www-aabeta/serverlist-common.php Modified: www/beta/trunk/www-aabeta/serverlist-common.php =================================================================== --- www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:23:00 UTC (rev 7339) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:26:40 UTC (rev 7340) @@ -329,7 +329,7 @@ 'action' => 'updated', ), ) as $data) { - echo '<!-- rcsid: ' . $data['rcsid'] . ' -->'; + echo '<!-- ' . $data['page'] . ' rcsid: ' . $data['rcsid'] . ' -->'; if (!preg_match($rcsexpr, $data['rcsid'], $matches)) continue; ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 10:22:58
|
Revision: 7339 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7339&view=rev Author: luke-jr Date: 2007-09-12 03:23:00 -0700 (Wed, 12 Sep 2007) Log Message: ----------- preg for rcsid Modified Paths: -------------- www/beta/trunk/www-aabeta/serverlist-common.php Modified: www/beta/trunk/www-aabeta/serverlist-common.php =================================================================== --- www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:21:13 UTC (rev 7338) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:23:00 UTC (rev 7339) @@ -329,6 +329,7 @@ 'action' => 'updated', ), ) as $data) { + echo '<!-- rcsid: ' . $data['rcsid'] . ' -->'; if (!preg_match($rcsexpr, $data['rcsid'], $matches)) continue; ?> @@ -336,7 +337,7 @@ <td class="src"> <? if ($data['action'] == 'modified') { - $outs .= '<a href="?source='.($data['Spage'] || $data['page']).'">(View Source)</a>'; + echo '<a href="?source='.($data['Spage'] || $data['page']).'">(View Source)</a>'; } ?> </td> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 10:21:21
|
Revision: 7338 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7338&view=rev Author: luke-jr Date: 2007-09-12 03:21:13 -0700 (Wed, 12 Sep 2007) Log Message: ----------- preg for rcsid Modified Paths: -------------- www/beta/trunk/www-aabeta/serverlist-common.php Modified: www/beta/trunk/www-aabeta/serverlist-common.php =================================================================== --- www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:19:19 UTC (rev 7337) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:21:13 UTC (rev 7338) @@ -329,7 +329,7 @@ 'action' => 'updated', ), ) as $data) { - if (!preg_match($rcsexpr, $data['rcsid'])) + if (!preg_match($rcsexpr, $data['rcsid'], $matches)) continue; ?> <tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 10:19:22
|
Revision: 7337 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7337&view=rev Author: luke-jr Date: 2007-09-12 03:19:19 -0700 (Wed, 12 Sep 2007) Log Message: ----------- preg for rcsid Modified Paths: -------------- www/beta/trunk/www-aabeta/serverlist-common.php Modified: www/beta/trunk/www-aabeta/serverlist-common.php =================================================================== --- www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:03:21 UTC (rev 7336) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:19:19 UTC (rev 7337) @@ -92,15 +92,20 @@ switch ($srcreq) { case '_top': $srcreq = $_SERVER['SCRIPT_FILENAME']; + break; + case '_self': + $srcreq = __FILE__; + break; case 'aap_master.php': case 'aap_serverinfo.php': + break; + default: + die('I don\'t show that source!'); + } echo '<div class="src">'; - highlight_file($srcreq); + highlight_file($srcreq); echo '</div>'; exit; - default: - die('I don\'t show that source!'); - } } } @@ -294,16 +299,18 @@ <table class="rcsid"> <?php $serverlist_common_rcsid = '$Id$'; -$rcsexpr = '^\$'.'I'.'d: [^ ]+ ([0-9]+) ([0-9/-]+) ([0-9:]+)Z ([^ ]+) \$$'; +$rcsexpr = '%^\$'.'I'.'d: [^ ]+ ([0-9]+) ([0-9/-]+) ([0-9:]+)Z ([^ ]+) \$$%'; foreach (array( array( 'rcsid' => $top_rcsid, 'page' => preg_replace(',^.*/,', '', $_SERVER['PHP_SELF']), + 'Spage' => '_top', 'action' => 'modified', ), array( 'rcsid' => $serverlist_common_rcsid, 'page' => preg_replace(',^.*/,', '', __FILE__), + 'Spage' => '_self', 'action' => 'modified', ), array( @@ -322,24 +329,28 @@ 'action' => 'updated', ), ) as $data) { - $outs = '<tr> - <td class="src">'; + if (!preg_match($rcsexpr, $data['rcsid'])) + continue; + ?> + <tr> + <td class="src"> + <? if ($data['action'] == 'modified') { - $outs .= '<a href="?source='.$data['page'].'">(View Source)</a>'; + $outs .= '<a href="?source='.($data['Spage'] || $data['page']).'">(View Source)</a>'; } - $outs .= ' + ?> </td> - <td class="page">' . $data['page'] . '</td> - <td class="lastmodstr">last ' . $data['action'] . '</td> - <td class="date">\2</td> + <td class="page"><?=$data['page']?></td> + <td class="lastmodstr">last <?=$data['action']?></td> + <td class="date"><?=$matches[2]?></td> <td>at</td> - <td class="time">\3</td> + <td class="time"><?=$matches[3]?></td> <td>by</td> - <td class="who">\4</td> + <td class="who"><?=$matches[4]?></td> <td>(revision:</td> - <td class="version">\1)</td> -</tr>'; - echo ereg_replace($rcsexpr, $outs, $data['rcsid']); + <td class="version"><?=$matches[1]?>)</td> +</tr> + <? } ?> </table> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 10:03:28
|
Revision: 7336 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7336&view=rev Author: luke-jr Date: 2007-09-12 03:03:21 -0700 (Wed, 12 Sep 2007) Log Message: ----------- debug info Modified Paths: -------------- www/beta/trunk/www-aabeta/serverlist-common.php Modified: www/beta/trunk/www-aabeta/serverlist-common.php =================================================================== --- www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:02:32 UTC (rev 7335) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:03:21 UTC (rev 7336) @@ -245,6 +245,8 @@ echo '<tr> <td class="name">'; + if ($si->url) + echo '<!-- lit uri: ' . htmlspecialchars($si->url) . ' -->'; $uri = safelink($si->url); if ($uri) echo '<a target="_new" href="'.htmlspecialchars($uri).'">'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 10:02:32
|
Revision: 7335 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7335&view=rev Author: luke-jr Date: 2007-09-12 03:02:32 -0700 (Wed, 12 Sep 2007) Log Message: ----------- find substring URIs Modified Paths: -------------- www/beta/trunk/www-aabeta/serverlist-common.php Modified: www/beta/trunk/www-aabeta/serverlist-common.php =================================================================== --- www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 09:58:55 UTC (rev 7334) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:02:32 UTC (rev 7335) @@ -144,21 +144,22 @@ function safelink($s) { $s = trim(preg_replace('/0x.{6}/i', '', $s)); - if (!preg_match(',^([a-z0-9-]+):,i', $s, $matches)) + if (!preg_match(',(([a-z0-9-]+):[^ ]*),i', $s, $matches)) { // Give it a chance as HTTP - if (preg_match(',(?:[a-z0-9.-]+)\.(?:com|org|net|info|biz|name|[a-z]{2})(?:/.*)?$,i', $s)) - return 'http://' . $s; + if (preg_match(',((?:[a-z0-9.-]+)\.(?:com|org|net|info|biz|name|[a-z]{2})(?:/[^ ]*)?)(?: .*)?$,i', $s, $matches)) + return 'http://' . $matches[1]; return false; } - $scheme = $matches[1]; + $uri = $matches[1]; + $scheme = $matches[2]; switch($scheme) { case 'http': case 'mailto': case 'xmpp': case 'tel': case 'pots': - return $s; + return $uri; break; default: } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 09:58:53
|
Revision: 7334 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7334&view=rev Author: luke-jr Date: 2007-09-12 02:58:55 -0700 (Wed, 12 Sep 2007) Log Message: ----------- if no path, we need EOL Modified Paths: -------------- www/beta/trunk/www-aabeta/serverlist-common.php Modified: www/beta/trunk/www-aabeta/serverlist-common.php =================================================================== --- www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 09:56:42 UTC (rev 7333) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 09:58:55 UTC (rev 7334) @@ -147,7 +147,7 @@ if (!preg_match(',^([a-z0-9-]+):,i', $s, $matches)) { // Give it a chance as HTTP - if (preg_match(',(?:[a-z0-9.-]+)\.(?:com|org|net|info|biz|name|[a-z]{2})(?:/.*)?,i', $s)) + if (preg_match(',(?:[a-z0-9.-]+)\.(?:com|org|net|info|biz|name|[a-z]{2})(?:/.*)?$,i', $s)) return 'http://' . $s; return false; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 09:56:40
|
Revision: 7333 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7333&view=rev Author: luke-jr Date: 2007-09-12 02:56:42 -0700 (Wed, 12 Sep 2007) Log Message: ----------- dont link to nullstring Modified Paths: -------------- www/beta/trunk/www-aabeta/serverlist-common.php Modified: www/beta/trunk/www-aabeta/serverlist-common.php =================================================================== --- www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 09:55:04 UTC (rev 7332) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 09:56:42 UTC (rev 7333) @@ -149,7 +149,7 @@ // Give it a chance as HTTP if (preg_match(',(?:[a-z0-9.-]+)\.(?:com|org|net|info|biz|name|[a-z]{2})(?:/.*)?,i', $s)) return 'http://' . $s; - return ''; + return false; } $scheme = $matches[1]; switch($scheme) { @@ -162,7 +162,7 @@ break; default: } - return ''; + return false; } function serverlist_main($extraClasses = false) { @@ -244,7 +244,9 @@ echo '<tr> <td class="name">'; - if ($si->url) echo '<a target="_new" href="'.htmlspecialchars(safelink($si->url)).'">'; + $uri = safelink($si->url); + if ($uri) + echo '<a target="_new" href="'.htmlspecialchars($uri).'">'; echo convert_string($si->name); if ($si->url) echo '</a>'; echo '</td> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 09:55:03
|
Revision: 7332 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7332&view=rev Author: luke-jr Date: 2007-09-12 02:55:04 -0700 (Wed, 12 Sep 2007) Log Message: ----------- refactor serverlist code Modified Paths: -------------- www/beta/trunk/www-aabeta/serverlist-common.php Modified: www/beta/trunk/www-aabeta/serverlist-common.php =================================================================== --- www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 09:54:34 UTC (rev 7331) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 09:55:04 UTC (rev 7332) @@ -80,7 +80,7 @@ font.darktext { background-color: white; } <? } -function serverlist_beta() { +function serverlist_betanotice() { ?> Reminder: This is still <strong>beta</strong> and has issues on occasion. Mainly because it is slow and polls all the servers every time the page is loaded...<br /><br /> <? This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 09:54:33
|
Revision: 7331 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7331&view=rev Author: luke-jr Date: 2007-09-12 02:54:34 -0700 (Wed, 12 Sep 2007) Log Message: ----------- refactor serverlist code Modified Paths: -------------- www/beta/trunk/www-aabeta/serverlist-common.php Modified: www/beta/trunk/www-aabeta/serverlist-common.php =================================================================== --- www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 09:53:16 UTC (rev 7330) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 09:54:34 UTC (rev 7331) @@ -86,7 +86,7 @@ <? } -serverlist_gpl() { +function serverlist_gpl() { if ($_GET['source'] != '') { $srcreq = $_GET['source']; switch ($srcreq) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 09:53:20
|
Revision: 7330 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7330&view=rev Author: luke-jr Date: 2007-09-12 02:53:16 -0700 (Wed, 12 Sep 2007) Log Message: ----------- refactor serverlist code Modified Paths: -------------- www/beta/trunk/www-aabeta/serverlist-aan.php www/beta/trunk/www-aabeta/serverlist.php Added Paths: ----------- www/beta/trunk/www-aabeta/serverlist-common.php Modified: www/beta/trunk/www-aabeta/serverlist-aan.php =================================================================== --- www/beta/trunk/www-aabeta/serverlist-aan.php 2007-09-12 09:01:45 UTC (rev 7329) +++ www/beta/trunk/www-aabeta/serverlist-aan.php 2007-09-12 09:53:16 UTC (rev 7330) @@ -20,6 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ***********************************************************************--> +<? $top_rcsid = '$Id$'; ?> +<? require('serverlist-common.php'); ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> @@ -28,55 +30,12 @@ </title> <link rel="stylesheet" href="http://armagetronad.net/armagetronad.css" type="text/css"> <style type="text/css"> - table.serverlist { - width: 100%; - background-color: #0b170b; - color: white; - background: url(background-aamenu.png); - background-attachment: fixed; - } - a { color: inherit; } - table.serverlist,table.serverlist td,table.serverlist tr { - border-collapse: collapse; - border: 1px solid #183118 /*#254c25*/; - } - table.serverlist td { - padding: 0 0.5ex; - } - table.serverlist td.numplayers { text-align: right; } - table.serverlist td.players { border-color: #79ff79; border-left: 0; } + <? serverlist_css(); ?> table.serverlist th { - color: #a44646; - font-weight: bold; - text-align: left; border: inherit; /* Tank's CSS has a general th thing? :/ */ } -<?php -$sortkey = $_GET['sort']; -$sortflip = $_GET['sortflip']; -if ($sortkey) - echo ' table.serverlist th.'.$sortkey.' { - color: #f3a9a9; - } -'; -?> - - table.rcsid { - border: 0; - margin-top: 1em; - border-collapse: collapse; - } - table.rcsid tr td { padding-right: 0.35em } - table.rcsid tr td.page { text-align: right } - table.rcsid tr td.lastmodstr, - table.rcsid tr td.date, - table.rcsid tr td.time, - table.rcsid tr td.who, - table.rcsid tr td.version { text-align: left } - table.rcsid tr td form { margin: 0 } - - font.darktext { background-color: white; } font.brighttext { + /* what does this apply to??? --ljr */ background-color: #0b170b; padding-left: 1ex; padding-right: 1ex; @@ -125,214 +84,9 @@ </li> </ul> <div id="content"> -Reminder: This is still <strong>beta</strong> and has issues on occasion. Mainly because it is slow and polls all the servers every time the page is loaded...<br /><br /> -<?php -if ($_GET['source'] != '') { - if (!in_array($_GET['source'], array('serverlist-aan.php', 'aap_master.php', 'aap_serverinfo.php'))) - die('I don\'t show that source!'); - echo '<div class="src">'; - highlight_file($_GET['source']); - echo '</div>'; - exit; -} - -require_once('aap_master.php'); -require_once('aap_serverinfo.php'); -if (!@include('player_name_links.php')) { - function link_name($s) { - return false; - } -} - -function convert_colours($s, $terminate = true) { - if ($terminate) - $s .= '0xRESETT'; - $r = ''; - $fc = 0; - while (($i = strpos($s, '0x')) !== false) { - $r .= substr($s, 0, $i); - if (!strcasecmp(substr($s, $i + 2, 6), 'RESETT')) { - for (; $fc > 0; --$fc) - $r .= '</font>'; - } else { - $Cr = hexdec(substr($s, $i + 2, 2)); - $Cg = hexdec(substr($s, $i + 4, 2)); - $Cb = hexdec(substr($s, $i + 6, 2)); - $r .= '<font color="#' . substr('0'.dechex($Cr), -2) . substr('0'.dechex($Cg), -2) . substr('0'.dechex($Cb), -2) . '"'; - if (max($Cr, $Cg, $Cb) < 0x7f || ($Cr + $Cg + $Cb) < 0xff) - $r .= ' class="darktext"'; - $r .= '>'; - } - $s = substr($s, $i + 8); - ++$fc; - } - $r .= $s; - return $r; -} - -function convert_string($s) { - return convert_colours(htmlspecialchars($s)); -} - -$master = new aap_master(); -$servers = $master->getlist(); -unset($master); - -if ($sortkey) { - $serverinfo = array(); - foreach ($servers as $i) { - $si = new aap_serverinfo(); - if ($si->load($i)) - $serverinfo[] = $si; - } - - function cmp_numplayers($a, $b) { - global $serverinfo; - return $serverinfo[$b]->numplayers - $serverinfo[$a]->numplayers; - } - function cmp_version($a, $b) { - global $serverinfo; - return strnatcasecmp($serverinfo[$b]->version, $serverinfo[$a]->version); - } - function cmp_name($a, $b) { - global $serverinfo; - return strnatcasecmp($serverinfo[$b]->name, $serverinfo[$a]->name); - } - function cmp_address($a, $b) { - global $serverinfo; - if ($hc = strnatcasecmp($serverinfo[$a]->ip, $serverinfo[$b]->ip)) - return $hc; - return $serverinfo[$a]->port - $serverinfo[$b]->port; - } - - uksort($serverinfo, 'cmp_'.$sortkey); - if ($sortflip) - $serverinfo = array_reverse($serverinfo); -} else - $serverinfo = $servers; - - echo '<table class="serverlist">'; - echo '<tr>'; - foreach (array( - array('id'=>'name', 'label'=>'Server Name', 'sortable'=>true, ), - array('id'=>'version', 'label'=>'Version', 'sortable'=>true, ), - array('id'=>'address', 'label'=>'Address', 'sortable'=>true, ), - array('id'=>'numplayers', 'label'=>'Players', 'sortable'=>true, - 'extra'=>' colspan="2"' ), - ) as $headinfo) { - echo '<th class="'.$headinfo['id'].'"'.$headinfo['extra'].'>'; - if ($headinfo['sortable']) { - echo '<a href="?sort='.$headinfo['id']; - if ($sortkey == $headinfo['id'] && !$sortflip) - echo '&sortflip=1'; - echo '">'; - } - echo $headinfo['label']; - if ($headinfo['sortable']) - echo '</a>'; - echo '</th>'."\n"; - } - echo '</tr>'; - foreach ($serverinfo as $i) { - if ($sortkey) - $si = $i; - else { - $si = new aap_serverinfo(); - if (!$si->load($i)) - continue; - } - - echo '<tr> - <td class="name">'; - if ($si->url) echo '<a target="_new" href="'.trim(htmlspecialchars($si->url)).'">'; - echo convert_string($si->name); - if ($si->url) echo '</a>'; - echo '</td> - <td class="version">'; - echo $si->version; - echo '</td> - <td class="address">'; - echo '<a href="armagetronad://'.htmlspecialchars(trim($si->ip).':'.trim($si->port)).'">'; - echo $si->ip.':'.$si->port; - echo '</a>'; - echo '</td> - <td class="numplayers">'; - echo $si->numplayers; - echo '</td>'; - if ($si->numplayers) { - echo ' - <td class="players">'; - for ($d = 0; $d < $si->numplayers; $d++) - { - if ($d != 0) { - echo ', '; - if ($d == $si->numplayers - 1) - echo 'and '; - } - $pn = $si->players[$d]; - if ($pl = link_name($pn)) - echo '<a target="_new" href="'.$pl.'">'; - echo convert_string($pn); - if ($pl) - echo '</a>'; - } - echo '</td>'; - } - echo ' -</tr>'; - if (!$sortkey) - flush(); - } - echo '</table>'; -?> -<br /> - <table class="rcsid"> -<?php -$serverlist_aan_rcsid = '$Id$'; -$rcsexpr = '^\$'.'I'.'d: [^,]*,v ([^ ]*) ([0-9/-]*) ([0-9:]*) ([^ ]*) Exp \$$'; -foreach (array( - array( - 'rcsid' => $serverlist_aan_rcsid, - 'page' => 'serverlist-aan.php', - 'action' => 'modified', - ), - array( - 'rcsid' => $aap_master_rcsid, - 'page' => 'aap_master.php', - 'action' => 'modified', - ), - array( - 'rcsid' => $aap_serverinfo_rcsid, - 'page' => 'aap_serverinfo.php', - 'action' => 'modified', - ), - array( - 'rcsid' => $player_name_links_rcsid, - 'page' => 'Player name link list', - 'action' => 'updated', - ), -) as $data) { - $outs = '<tr> - <td class="src">'; - if ($data['action'] == 'modified') { - $outs .= '<a href="?source='.$data['page'].'">(View Source)</a>'; - } - $outs .= ' - </td> - <td class="page">' . $data['page'] . '</td> - <td class="lastmodstr">last ' . $data['action'] . '</td> - <td class="date">\2</td> - <td>at</td> - <td class="time">\3</td> - <td>by</td> - <td class="who">\4</td> - <td>(version:</td> - <td class="version">\1)</td> -</tr>'; - echo ereg_replace($rcsexpr, $outs, $data['rcsid']); -} -?> -</table> + <? serverlist_betanotice(); ?> + <? serverlist_gpl(); ?> + <? serverlist_main('serverlist_bg'); ?> </div> <span id="copyrightnotice"> ©2005 Armagetron Advanced Team. Design by Lackadaisical.<br/> Copied: www/beta/trunk/www-aabeta/serverlist-common.php (from rev 7327, www/beta/trunk/www-aabeta/serverlist.php) =================================================================== --- www/beta/trunk/www-aabeta/serverlist-common.php (rev 0) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 09:53:16 UTC (rev 7330) @@ -0,0 +1,344 @@ +<?php +/************************************************************************* + +ASAASB - A Simple Armagetron Advanced Server Browser +Copyright (C) 2005 Guru3 +Copyright (C) 2007 Luke-Jr + +************************************************************************** + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +*************************************************************************/ +function serverlist_css() { + ?> + table.serverlist { + width: 100%; + } + .serverlist_bg { + background-color: #0b170b; + color: white; + background: url(background-aamenu.png); + background-attachment: fixed; + /* font-weight: bold; + font-family: fixed; */ + } + a { color: inherit; } + table.serverlist,table.serverlist td,table.serverlist tr { + border-collapse: collapse; + border: 1px solid #183118 /*#254c25*/; + } + table.serverlist td { + padding: 0 0.5ex; + } + table.serverlist td.numplayers { text-align: right; } + table.serverlist td.players { border-color: #79ff79; border-left: 0; } + /*td.numplayers { + border-right-color: #3c823c; + } + td.numplayers:last-child { border-color: inherit; } */ + table.serverlist th { + color: #a44646; + font-weight: bold; + text-align: left; + } + table.serverlist th.sortkey { + color: #f3a9a9; + } + + .src font[color="#000000"] { color: #d0d0d0 !important; } + .src font[color="#0000BB"] { color: #00d0d0 !important; } + .src font[color="#007700"] { color: #00d000 !important; } + .src font[color="#DD0000"] { color: #ff5050 !important; } + + table.rcsid { + border: 0; + margin-top: 1em; + border-collapse: collapse; + } + table.rcsid tr td { padding-right: 0.35em } + table.rcsid tr td.page { text-align: right } + table.rcsid tr td.lastmodstr, + table.rcsid tr td.date, + table.rcsid tr td.time, + table.rcsid tr td.who, + table.rcsid tr td.version { text-align: left } + table.rcsid tr td form { margin: 0 } + + font.darktext { background-color: white; } + <? +} +function serverlist_beta() { + ?> +Reminder: This is still <strong>beta</strong> and has issues on occasion. Mainly because it is slow and polls all the servers every time the page is loaded...<br /><br /> + <? +} + +serverlist_gpl() { + if ($_GET['source'] != '') { + $srcreq = $_GET['source']; + switch ($srcreq) { + case '_top': + $srcreq = $_SERVER['SCRIPT_FILENAME']; + case 'aap_master.php': + case 'aap_serverinfo.php': + echo '<div class="src">'; + highlight_file($srcreq); + echo '</div>'; + exit; + default: + die('I don\'t show that source!'); + } + } +} + +require_once('aap_master.php'); +require_once('aap_serverinfo.php'); +if (!@include('player_name_links.php')) { + function link_name($s) { + return false; + } +} + +function convert_colours($s, $terminate = true) { + if ($terminate) + $s .= '0xRESETT'; + $r = ''; + $fc = 0; + while (($i = strpos($s, '0x')) !== false) { + $r .= substr($s, 0, $i); + if (!strcasecmp(substr($s, $i + 2, 6), 'RESETT')) { + for (; $fc > 0; --$fc) + $r .= '</font>'; + } else { + $Cr = hexdec(substr($s, $i + 2, 2)); + $Cg = hexdec(substr($s, $i + 4, 2)); + $Cb = hexdec(substr($s, $i + 6, 2)); + $r .= '<font color="#' . substr('0'.dechex($Cr), -2) . substr('0'.dechex($Cg), -2) . substr('0'.dechex($Cb), -2) . '"'; + if (max($Cr, $Cg, $Cb) < 0x7f || ($Cr + $Cg + $Cb) < 0xff) + $r .= ' class="darktext"'; + $r .= '>'; + } + $s = substr($s, $i + 8); + ++$fc; + } + $r .= $s; + return $r; +} + +function convert_string($s) { + return convert_colours(htmlspecialchars($s)); +} + +function safelink($s) { + $s = trim(preg_replace('/0x.{6}/i', '', $s)); + if (!preg_match(',^([a-z0-9-]+):,i', $s, $matches)) + { + // Give it a chance as HTTP + if (preg_match(',(?:[a-z0-9.-]+)\.(?:com|org|net|info|biz|name|[a-z]{2})(?:/.*)?,i', $s)) + return 'http://' . $s; + return ''; + } + $scheme = $matches[1]; + switch($scheme) { + case 'http': + case 'mailto': + case 'xmpp': + case 'tel': + case 'pots': + return $s; + break; + default: + } + return ''; +} + +function serverlist_main($extraClasses = false) { +$master = new aap_master(); +$servers = $master->getlist(); +unset($master); + +$sortkey = $_GET['sort']; +$sortflip = $_GET['sortflip']; +if ($sortkey) { + $serverinfo = array(); + foreach ($servers as $i) { + $si = new aap_serverinfo(); + if ($si->load($i)) + $serverinfo[] = $si; + } + + function cmp_numplayers($a, $b) { + global $serverinfo; + return $serverinfo[$b]->numplayers - $serverinfo[$a]->numplayers; + } + function cmp_version($a, $b) { + global $serverinfo; + return strnatcasecmp($serverinfo[$b]->version, $serverinfo[$a]->version); + } + function cmp_name($a, $b) { + global $serverinfo; + return strnatcasecmp($serverinfo[$b]->name, $serverinfo[$a]->name); + } + function cmp_address($a, $b) { + global $serverinfo; + if ($hc = strnatcasecmp($serverinfo[$a]->ip, $serverinfo[$b]->ip)) + return $hc; + return $serverinfo[$a]->port - $serverinfo[$b]->port; + } + + uksort($serverinfo, 'cmp_'.$sortkey); + if ($sortflip) + $serverinfo = array_reverse($serverinfo); +} else + $serverinfo = $servers; + + echo '<table class="serverlist'; + if ($extraClasses) + echo " $extraClasses"; + echo '">'; + echo '<tr>'; + foreach (array( + array('id'=>'name', 'label'=>'Server Name', 'sortable'=>true, ), + array('id'=>'version', 'label'=>'Version', 'sortable'=>true, ), + array('id'=>'address', 'label'=>'Address', 'sortable'=>true, ), + array('id'=>'numplayers', 'label'=>'Players', 'sortable'=>true, + 'extra'=>' colspan="2"' ), + ) as $headinfo) { + $CSSclass = $headinfo['id']; + if ($headinfo['id'] == $sortkey) + $CSSclass .= ' sortkey'; + echo '<th class="'.$CSSclass.'"'.$headinfo['extra'].'>'; + if ($headinfo['sortable']) { + echo '<a href="?sort='.$headinfo['id']; + if ($sortkey == $headinfo['id'] && !$sortflip) + echo '&sortflip=1'; + echo '">'; + } + echo $headinfo['label']; + if ($headinfo['sortable']) + echo '</a>'; + echo '</th>'."\n"; + } + echo '</tr>'; + foreach ($serverinfo as $i) { + if ($sortkey) + $si = $i; + else { + $si = new aap_serverinfo(); + if (!$si->load($i)) + continue; + } + + echo '<tr> + <td class="name">'; + if ($si->url) echo '<a target="_new" href="'.htmlspecialchars(safelink($si->url)).'">'; + echo convert_string($si->name); + if ($si->url) echo '</a>'; + echo '</td> + <td class="version">'; + echo $si->version; + echo '</td> + <td class="address">'; + echo '<a href="armagetronad://'.htmlspecialchars(trim($si->ip).':'.trim($si->port)).'">'; + echo $si->ip.':'.$si->port; + echo '</a>'; + echo '</td> + <td class="numplayers">'; + echo $si->numplayers; + echo '</td>'; + if ($si->numplayers) { + echo ' + <td class="players">'; + for ($d = 0; $d < $si->numplayers; $d++) + { + if ($d != 0) { + echo ', '; + if ($d == $si->numplayers - 1) + echo 'and '; + } + $pn = $si->players[$d]; + if ($pl = link_name($pn)) + echo '<a target="_new" href="'.$pl.'">'; + echo convert_string($pn); + if ($pl) + echo '</a>'; + } + echo '</td>'; + } + echo ' +</tr>'; + if (!$sortkey) + flush(); + } + echo '</table>'; +?> +<br /> + <table class="rcsid"> +<?php +$serverlist_common_rcsid = '$Id$'; +$rcsexpr = '^\$'.'I'.'d: [^ ]+ ([0-9]+) ([0-9/-]+) ([0-9:]+)Z ([^ ]+) \$$'; +foreach (array( + array( + 'rcsid' => $top_rcsid, + 'page' => preg_replace(',^.*/,', '', $_SERVER['PHP_SELF']), + 'action' => 'modified', + ), + array( + 'rcsid' => $serverlist_common_rcsid, + 'page' => preg_replace(',^.*/,', '', __FILE__), + 'action' => 'modified', + ), + array( + 'rcsid' => $aap_master_rcsid, + 'page' => 'aap_master.php', + 'action' => 'modified', + ), + array( + 'rcsid' => $aap_serverinfo_rcsid, + 'page' => 'aap_serverinfo.php', + 'action' => 'modified', + ), + array( + 'rcsid' => $player_name_links_rcsid, + 'page' => 'Player name link list', + 'action' => 'updated', + ), +) as $data) { + $outs = '<tr> + <td class="src">'; + if ($data['action'] == 'modified') { + $outs .= '<a href="?source='.$data['page'].'">(View Source)</a>'; + } + $outs .= ' + </td> + <td class="page">' . $data['page'] . '</td> + <td class="lastmodstr">last ' . $data['action'] . '</td> + <td class="date">\2</td> + <td>at</td> + <td class="time">\3</td> + <td>by</td> + <td class="who">\4</td> + <td>(revision:</td> + <td class="version">\1)</td> +</tr>'; + echo ereg_replace($rcsexpr, $outs, $data['rcsid']); +} +?> +</table> + <? +} + +// NOTE: Intentionally leaving off closing php so we don't get extra whitespace Modified: www/beta/trunk/www-aabeta/serverlist.php =================================================================== --- www/beta/trunk/www-aabeta/serverlist.php 2007-09-12 09:01:45 UTC (rev 7329) +++ www/beta/trunk/www-aabeta/serverlist.php 2007-09-12 09:53:16 UTC (rev 7330) @@ -20,281 +20,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ***********************************************************************--> +<? $top_rcsid = '$Id$'; ?> +<? require('serverlist-common.php'); ?> <html> <head> <title> Armagetron Advanced Servers </title> <link rel="shortcut icon" href="/favicon.ico"> <style type="text/css"> - table.serverlist { - width: 100%; - } - body { - background-color: #0b170b; - color: white; - background: url(background-aamenu.png); - background-attachment: fixed; - /* font-weight: bold; - font-family: fixed; */ - } - a { color: inherit; } - table.serverlist,table.serverlist td,table.serverlist tr { - border-collapse: collapse; - border: 1px solid #183118 /*#254c25*/; - } - table.serverlist td { - padding: 0 0.5ex; - } - table.serverlist td.numplayers { text-align: right; } - table.serverlist td.players { border-color: #79ff79; border-left: 0; } - /*td.numplayers { - border-right-color: #3c823c; - } - td.numplayers:last-child { border-color: inherit; } */ - table.serverlist th { - color: #a44646; - font-weight: bold; - text-align: left; - } -<?php -$sortkey = $_GET['sort']; -$sortflip = $_GET['sortflip']; -if ($sortkey) - echo ' table.serverlist th.'.$sortkey.' { - color: #f3a9a9; - } -'; -?> - .src font[color="#000000"] { color: #d0d0d0 !important; } - .src font[color="#0000BB"] { color: #00d0d0 !important; } - .src font[color="#007700"] { color: #00d000 !important; } - .src font[color="#DD0000"] { color: #ff5050 !important; } - - table.rcsid { - border: 0; - margin-top: 1em; - border-collapse: collapse; - } - table.rcsid tr td { padding-right: 0.35em } - table.rcsid tr td.page { text-align: right } - table.rcsid tr td.lastmodstr, - table.rcsid tr td.date, - table.rcsid tr td.time, - table.rcsid tr td.who, - table.rcsid tr td.version { text-align: left } - table.rcsid tr td form { margin: 0 } - - font.darktext { background-color: white; } + <? serverlist_css(); ?> </style> </head> - <body> -Reminder: This is still <strong>beta</strong> and has issues on occasion. Mainly because it is slow and polls all the servers every time the page is loaded...<br /><br /> -<?php -if ($_GET['source'] != '') { - if (!in_array($_GET['source'], array('serverlist.php', 'aap_master.php', 'aap_serverinfo.php'))) - die('I don\'t show that source!'); - echo '<div class="src">'; - highlight_file($_GET['source']); - echo '</div>'; - exit; -} - -require_once('aap_master.php'); -require_once('aap_serverinfo.php'); -if (!@include('player_name_links.php')) { - function link_name($s) { - return false; - } -} - -function convert_colours($s, $terminate = true) { - if ($terminate) - $s .= '0xRESETT'; - $r = ''; - $fc = 0; - while (($i = strpos($s, '0x')) !== false) { - $r .= substr($s, 0, $i); - if (!strcasecmp(substr($s, $i + 2, 6), 'RESETT')) { - for (; $fc > 0; --$fc) - $r .= '</font>'; - } else { - $Cr = hexdec(substr($s, $i + 2, 2)); - $Cg = hexdec(substr($s, $i + 4, 2)); - $Cb = hexdec(substr($s, $i + 6, 2)); - $r .= '<font color="#' . substr('0'.dechex($Cr), -2) . substr('0'.dechex($Cg), -2) . substr('0'.dechex($Cb), -2) . '"'; - if (max($Cr, $Cg, $Cb) < 0x7f || ($Cr + $Cg + $Cb) < 0xff) - $r .= ' class="darktext"'; - $r .= '>'; - } - $s = substr($s, $i + 8); - ++$fc; - } - $r .= $s; - return $r; -} - -function convert_string($s) { - return convert_colours(htmlspecialchars($s)); -} - -$master = new aap_master(); -$servers = $master->getlist(); -unset($master); - -if ($sortkey) { - $serverinfo = array(); - foreach ($servers as $i) { - $si = new aap_serverinfo(); - if ($si->load($i)) - $serverinfo[] = $si; - } - - function cmp_numplayers($a, $b) { - global $serverinfo; - return $serverinfo[$b]->numplayers - $serverinfo[$a]->numplayers; - } - function cmp_version($a, $b) { - global $serverinfo; - return strnatcasecmp($serverinfo[$b]->version, $serverinfo[$a]->version); - } - function cmp_name($a, $b) { - global $serverinfo; - return strnatcasecmp($serverinfo[$b]->name, $serverinfo[$a]->name); - } - function cmp_address($a, $b) { - global $serverinfo; - if ($hc = strnatcasecmp($serverinfo[$a]->ip, $serverinfo[$b]->ip)) - return $hc; - return $serverinfo[$a]->port - $serverinfo[$b]->port; - } - - uksort($serverinfo, 'cmp_'.$sortkey); - if ($sortflip) - $serverinfo = array_reverse($serverinfo); -} else - $serverinfo = $servers; - - echo '<table class="serverlist">'; - echo '<tr>'; - foreach (array( - array('id'=>'name', 'label'=>'Server Name', 'sortable'=>true, ), - array('id'=>'version', 'label'=>'Version', 'sortable'=>true, ), - array('id'=>'address', 'label'=>'Address', 'sortable'=>true, ), - array('id'=>'numplayers', 'label'=>'Players', 'sortable'=>true, - 'extra'=>' colspan="2"' ), - ) as $headinfo) { - echo '<th class="'.$headinfo['id'].'"'.$headinfo['extra'].'>'; - if ($headinfo['sortable']) { - echo '<a href="?sort='.$headinfo['id']; - if ($sortkey == $headinfo['id'] && !$sortflip) - echo '&sortflip=1'; - echo '">'; - } - echo $headinfo['label']; - if ($headinfo['sortable']) - echo '</a>'; - echo '</th>'."\n"; - } - echo '</tr>'; - foreach ($serverinfo as $i) { - if ($sortkey) - $si = $i; - else { - $si = new aap_serverinfo(); - if (!$si->load($i)) - continue; - } - - echo '<tr> - <td class="name">'; - if ($si->url) echo '<a target="_new" href="'.trim(htmlspecialchars($si->url)).'">'; - echo convert_string($si->name); - if ($si->url) echo '</a>'; - echo '</td> - <td class="version">'; - echo $si->version; - echo '</td> - <td class="address">'; - echo '<a href="armagetronad://'.htmlspecialchars(trim($si->ip).':'.trim($si->port)).'">'; - echo $si->ip.':'.$si->port; - echo '</a>'; - echo '</td> - <td class="numplayers">'; - echo $si->numplayers; - echo '</td>'; - if ($si->numplayers) { - echo ' - <td class="players">'; - for ($d = 0; $d < $si->numplayers; $d++) - { - if ($d != 0) { - echo ', '; - if ($d == $si->numplayers - 1) - echo 'and '; - } - $pn = $si->players[$d]; - if ($pl = link_name($pn)) - echo '<a target="_new" href="'.$pl.'">'; - echo convert_string($pn); - if ($pl) - echo '</a>'; - } - echo '</td>'; - } - echo ' -</tr>'; - if (!$sortkey) - flush(); - } - echo '</table>'; -?> -<br /> - <table class="rcsid"> -<?php -$serverlist_rcsid = '$Id$'; -$rcsexpr = '^\$'.'I'.'d: [^ ]+ ([0-9]+) ([0-9/-]+) ([0-9:]+)Z ([^ ]+) \$$'; -foreach (array( - array( - 'rcsid' => $serverlist_rcsid, - 'page' => 'serverlist.php', - 'action' => 'modified', - ), - array( - 'rcsid' => $aap_master_rcsid, - 'page' => 'aap_master.php', - 'action' => 'modified', - ), - array( - 'rcsid' => $aap_serverinfo_rcsid, - 'page' => 'aap_serverinfo.php', - 'action' => 'modified', - ), - array( - 'rcsid' => $player_name_links_rcsid, - 'page' => 'Player name link list', - 'action' => 'updated', - ), -) as $data) { - $outs = '<tr> - <td class="src">'; - if ($data['action'] == 'modified') { - $outs .= '<a href="?source='.$data['page'].'">(View Source)</a>'; - } - $outs .= ' - </td> - <td class="page">' . $data['page'] . '</td> - <td class="lastmodstr">last ' . $data['action'] . '</td> - <td class="date">\2</td> - <td>at</td> - <td class="time">\3</td> - <td>by</td> - <td class="who">\4</td> - <td>(revision:</td> - <td class="version">\1)</td> -</tr>'; - echo ereg_replace($rcsexpr, $outs, $data['rcsid']); -} -?> -</table> -</form> + <body class="serverlist_bg"> + <? serverlist_betanotice(); ?> + <? serverlist_gpl(); ?> + <? serverlist_main(); ?> </body> </html> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |