cvs: docweb /include lib_auth.inc.php /templates/all/www users.tpl.php
[email protected] ("Vincent Gevers")
| Newsgroups | php.doc.web |
|---|---|
| Message-ID | <cvsvincent1122845685@cvsserver> |
vincent Sun Jul 31 17:34:45 2005 EDT
Modified files:
/docweb/include lib_auth.inc.php
/docweb/templates/all/www users.tpl.php
Log:
This seems to make the cookie thing work
http://cvs.php.net/diff.php/docweb/include/lib_auth.inc.php?r1=1.9&r2=1.10&ty=u
Index: docweb/include/lib_auth.inc.php
diff -u docweb/include/lib_auth.inc.php:1.9 docweb/include/lib_auth.inc.php:1.10
--- docweb/include/lib_auth.inc.php:1.9 Sun Jul 31 12:28:25 2005
+++ docweb/include/lib_auth.inc.php Sun Jul 31 17:34:45 2005
@@ -17,7 +17,7 @@
* | Nuno Lopes <[email protected]> |
* +----------------------------------------------------------------------+
*
- * $Id: lib_auth.inc.php,v 1.9 2005/07/31 16:28:25 nlopess Exp $
+ * $Id: lib_auth.inc.php,v 1.10 2005/07/31 21:34:45 vincent Exp $
*/
require_once 'cvs-auth.inc';
@@ -124,9 +124,9 @@
*/
function master_user_name($nick)
{
- $magic_cookie = (empty($_COOKIE['MAGIC_COOKIE']) || !ctype_alnum($_COOKIE['MAGIC_COOKIE'])) ?
- '' : // need a generic key here!!
- $_COOKIE['MAGIC_COOKIE'];
+ $magic_cookie = (!empty($_COOKIE['MAGIC_COOKIE']) || !ctype_alnum($_COOKIE['MAGIC_COOKIE'])) ?
+ $_COOKIE['MAGIC_COOKIE'] :
+ '' ; // need a generic key here!!
if (!$fp = @fsockopen('master.php.net', 80))
return $nick;
http://cvs.php.net/diff.php/docweb/templates/all/www/users.tpl.php?r1=1.5&r2=1.6&ty=u
Index: docweb/templates/all/www/users.tpl.php
diff -u docweb/templates/all/www/users.tpl.php:1.5 docweb/templates/all/www/users.tpl.php:1.6
--- docweb/templates/all/www/users.tpl.php:1.5 Sun Jul 31 16:52:49 2005
+++ docweb/templates/all/www/users.tpl.php Sun Jul 31 17:34:45 2005
@@ -55,8 +55,10 @@
}
} else {
-if (isset($info['country'])) {
+if ($info['country'] != '') {
$cntrycode = $GLOBALS['COUNTRIES'][$info['country']];
+} else {
+$cntrycode = '';
}
echo <<< HTML
<p><strong>&docweb.users.username;</strong>: $info[username]<br />