[Phpslash-commit] SF.net SVN: phpslash:[572] trunk/include/class
Brought to you by:
joestewart,
nhruby
Menu
▾
▴
[Phpslash-commit] SF.net SVN: phpslash:[572] trunk/include/class
|
From: <le...@us...> - 2009-01-04 06:59:20
|
Revision: 572
http://phpslash.svn.sourceforge.net/phpslash/?rev=572&view=rev
Author: lems1
Date: 2009-01-04 06:59:14 +0000 (Sun, 04 Jan 2009)
Log Message:
-----------
fixes bugs with skin not being defined
Modified Paths:
--------------
trunk/include/class/WikiEngine.class
trunk/include/class/functions.inc
trunk/include/class/lib.resources.php
trunk/include/class/libtz.inc
trunk/include/class/slashDB.class
trunk/include/class/slashPerm.class
trunk/include/class/slashSess.class
trunk/include/class/slashTemplate.class
trunk/include/class/slash_sql.class
trunk/include/class/tz_functions.inc
Modified: trunk/include/class/WikiEngine.class
===================================================================
--- trunk/include/class/WikiEngine.class 2009-01-04 06:54:17 UTC (rev 571)
+++ trunk/include/class/WikiEngine.class 2009-01-04 06:59:14 UTC (rev 572)
@@ -6,7 +6,7 @@
*
* @author Lars Ackermann - http://www.net-assistant.de/wiki/
* @status Part of PWP Wiki Processor, licensed under GPL.
- * $Id: WikiEngine.class,v 1.1 2003-11-12 21:29:48 joestewart Exp $
+ * $Id: WikiEngine.class,v 1.1 2003/11/12 21:29:48 joestewart Exp $
*/
#require_once( BASE_PATH.'core/Data.inc' );
Modified: trunk/include/class/functions.inc
===================================================================
--- trunk/include/class/functions.inc 2009-01-04 06:54:17 UTC (rev 571)
+++ trunk/include/class/functions.inc 2009-01-04 06:59:14 UTC (rev 572)
@@ -2,7 +2,7 @@
/**
* phpSlash Function Library
*
-* @version $Id: functions.inc,v 1.27 2005-12-24 21:39:08 lems1 Exp $
+* @version $Id: functions.inc,v 1.27 2005/12/24 21:39:08 lems1 Exp $
*
* THE FUNCTIONS HAVE MOVED AROUND!!
* June 2004 - There's been a bit of a rationalisation of this file - you might have notcied!
@@ -236,7 +236,7 @@
if(isset($GLOBALS['ary']['css'])) {
$css = $GLOBALS['ary']['css'];
} else {
- $css = $_PSL['skin'];
+ $css = (array_key_exists('skin',$_PSL)) ? $_PSL['skin'] : $_PSL['defaultskin'];
}
// Are there extra tags/variables to pass to template?
@@ -264,7 +264,7 @@
'SEARCH_ACTION_URL' => $action_url,
// 'NAVBAR' => $navbarcontent, // Could be empty if NavBar is not required
// 'TOPICBAR' => $topicbarcontent, // Could be empty if TopicBar is not required
- 'SKIN' => $_PSL['skin'],
+ 'SKIN' => (array_key_exists('skin',$_PSL)) ? $_PSL['skin'] : $_PSL['defaultskin'],
'CSS' => $css
));
@@ -309,7 +309,7 @@
$templ->set_var(array(
'IMAGEURL' => $_PSL['imageurl'],
- 'SKIN' => $_PSL['skin'],
+ 'SKIN' => (array_key_exists('skin',$_PSL)) ? $_PSL['skin'] : $_PSL['defaultskin'],
'BASEURL' => $_PSL['rooturl'],
// 'NAVBAR' => $navbarcontent
));
@@ -376,7 +376,7 @@
$templ->set_var(array(
'IMAGEDIR' => $_PSL['imageurl'],
- 'SKIN' => $_PSL['skin'],
+ 'SKIN' => (array_key_exists('skin',$_PSL)) ? $_PSL['skin'] : $_PSL['defaultskin'],
'WIDTH' => $width,
'ALIGN' => $align,
'TITLE' => pslgetText($title),
@@ -415,7 +415,7 @@
));
$stempl->set_var(array(
- 'SKIN' => $_PSL['skin'],
+ 'SKIN' => (array_key_exists('skin',$_PSL)) ? $_PSL['skin'] : $_PSL['defaultskin'],
'IMAGEDIR' => $_PSL['imageurl'],
'WIDTH' => $width,
'TITLE' => pslgetText($title)
@@ -822,6 +822,7 @@
} elseif (@is_dir($templatedir . "/" . basename($_PSL['defaultskin']))) {
$new_skin = $_PSL['defaultskin'];
// delete the cookie to reset to default skin
+ // TODO not all servers have www. in front... FIXME
if (!empty($HTTP_COOKIE_VARS['skin'])) {
setcookie("skin","", time()+15552000, "/", ereg_replace("www.", "", $_SERVER['SERVER_NAME']));
}
@@ -1061,11 +1062,11 @@
if ($mode == "1") {
$arg_separator=htmlentities($arg_separator);
}
- # ... e.g. to \xB4&\xB4, replace it lokal with \xB4&\xB4.
+ # ... e.g. to ?&?, replace it lokal with ?&?.
} else {
- # The default in PHP is \xB4&\xB4 so we replace it lokal with \xB4&\xB4
+ # The default in PHP is ?&? so we replace it lokal with ?&?
if ($mode == "1") {
$arg_separator="&";
} else {
@@ -1767,6 +1768,7 @@
* @param destination of message:
* 'now' - output immediately
* 'log' - log in db
+ * 'syslog' - send to system log under NOTICE priority
* 'mail' - mail to whomever
* 'delayed','queue','push' - add output to next debug call
* other - return as string
@@ -1814,6 +1816,10 @@
}
$ans .= debug_iterator($name,$msg,$type,$max_level,$escapeHtmlFlag);
switch($type) {
+ case 'syslog':
+ syslog(LOG_NOTICE,"phpslash: $name -- $msg");
+ $ans = null;
+ break;
case 'log':
logwrite($name,get_r($msg));
$ans = true;
@@ -1834,7 +1840,8 @@
case 'delayed':
case 'queue':
case 'push':
- // don't do anything yet.
+ // don't do anything yet.
+ syslog(LOG_NOTICE,"phpslash: $name -- $msg");
break;
}
return $ans;
Modified: trunk/include/class/lib.resources.php
===================================================================
--- trunk/include/class/lib.resources.php 2009-01-04 06:54:17 UTC (rev 571)
+++ trunk/include/class/lib.resources.php 2009-01-04 06:59:14 UTC (rev 572)
@@ -17,7 +17,7 @@
* @package phpslash
* @subpackage resources
*
- * $Id: lib.resources.php,v 1.2 2003-05-15 18:19:53 joestewart Exp $
+ * $Id: lib.resources.php,v 1.2 2003/05/15 18:19:53 joestewart Exp $
**/
/**
Modified: trunk/include/class/libtz.inc
===================================================================
--- trunk/include/class/libtz.inc 2009-01-04 06:54:17 UTC (rev 571)
+++ trunk/include/class/libtz.inc 2009-01-04 06:59:14 UTC (rev 572)
@@ -2,7 +2,7 @@
/**
* functions for working with the tz classes
*
- * $Id: libtz.inc,v 1.1.1.1 2003-03-12 16:12:50 joestewart Exp $
+ * $Id: libtz.inc,v 1.1.1.1 2003/03/12 16:12:50 joestewart Exp $
*/
/**
Modified: trunk/include/class/slashDB.class
===================================================================
--- trunk/include/class/slashDB.class 2009-01-04 06:54:17 UTC (rev 571)
+++ trunk/include/class/slashDB.class 2009-01-04 06:59:14 UTC (rev 572)
@@ -1,7 +1,7 @@
<?php
/**
* slashDB.class -> Methods for accessing databases
- * @version $Id: slashDB.class,v 1.1.1.1 2003-03-12 16:12:50 joestewart Exp $
+ * @version $Id: slashDB.class,v 1.1.1.1 2003/03/12 16:12:50 joestewart Exp $
*
* Provides database functions of PHPSlash
*
Modified: trunk/include/class/slashPerm.class
===================================================================
--- trunk/include/class/slashPerm.class 2009-01-04 06:54:17 UTC (rev 571)
+++ trunk/include/class/slashPerm.class 2009-01-04 06:59:14 UTC (rev 572)
@@ -1,7 +1,7 @@
<?php
/**
* slashPerm.class -> Primary methods for providing Permissions
- * @version $Id: slashPerm.class,v 1.1.1.1 2003-03-12 16:12:50 joestewart Exp $
+ * @version $Id: slashPerm.class,v 1.1.1.1 2003/03/12 16:12:50 joestewart Exp $
*
* Provides Permission functions of PHPSlash
*
Modified: trunk/include/class/slashSess.class
===================================================================
--- trunk/include/class/slashSess.class 2009-01-04 06:54:17 UTC (rev 571)
+++ trunk/include/class/slashSess.class 2009-01-04 06:59:14 UTC (rev 572)
@@ -1,7 +1,7 @@
<?php
/**
* slashSess.class -> Primary methods for providing Session
- * @version $Id: slashSess.class,v 1.1.1.1 2003-03-12 16:12:50 joestewart Exp $
+ * @version $Id: slashSess.class,v 1.1.1.1 2003/03/12 16:12:50 joestewart Exp $
*
* Provides Session functions of PHPSlash
*
Modified: trunk/include/class/slashTemplate.class
===================================================================
--- trunk/include/class/slashTemplate.class 2009-01-04 06:54:17 UTC (rev 571)
+++ trunk/include/class/slashTemplate.class 2009-01-04 06:59:14 UTC (rev 572)
@@ -15,7 +15,7 @@
* - default skin, default language
*
* @class slashTemplate
-* @version $Id: slashTemplate.class,v 1.10 2004-10-18 17:00:34 krabu Exp $
+* @version $Id: slashTemplate.class,v 1.10 2004/10/18 17:00:34 krabu Exp $
*/
class slashTemplate extends Template {
@@ -95,7 +95,10 @@
// Intitialisation:
// - default to the current skin
if ($skin == "") {
- $skin = $this->psl['skin.current'];
+ if (array_key_exists('skin.current',$this->psl))
+ $skin = $this->psl['skin.current'];
+ else
+ $skin = $this->psl['defaultskin'];
} else {
// belt and braces - make sure noone's messing
$skin = basename($skin);
@@ -103,7 +106,10 @@
// - default to the current language
if ($language == "") {
- $language = $this->psl['language.current'];
+ if (array_key_exists('language.current',$this->psl))
+ $language = $this->psl['language.current'];
+ else
+ $language = $this->psl['language.default'];
} else {
// belt and braces - make sure noone's messing
$language = basename($language);
Modified: trunk/include/class/slash_sql.class
===================================================================
--- trunk/include/class/slash_sql.class 2009-01-04 06:54:17 UTC (rev 571)
+++ trunk/include/class/slash_sql.class 2009-01-04 06:59:14 UTC (rev 572)
@@ -1,7 +1,7 @@
<?php
/**
* slash_sql.class -> Defines session storage method
- * @version $Id: slash_sql.class,v 1.1.1.1 2003-03-12 16:12:50 joestewart Exp $
+ * @version $Id: slash_sql.class,v 1.1.1.1 2003/03/12 16:12:50 joestewart Exp $
*
*/
Modified: trunk/include/class/tz_functions.inc
===================================================================
--- trunk/include/class/tz_functions.inc 2009-01-04 06:54:17 UTC (rev 571)
+++ trunk/include/class/tz_functions.inc 2009-01-04 06:59:14 UTC (rev 572)
@@ -2,7 +2,7 @@
/**
* functions for working with the tz classes
*
- * $Id: tz_functions.inc,v 1.1.1.1 2003-03-12 16:12:50 joestewart Exp $
+ * $Id: tz_functions.inc,v 1.1.1.1 2003/03/12 16:12:50 joestewart Exp $
*/
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
