Permalink
Browse files

Added the streamline module.

Moved bbcode inclusions.

Signed-off-by: Ben Bowtell <kumnaa@gmail.com>
  • Loading branch information...
1 parent 6a740fa commit 4f15713c70f886a4f77e0023f011db6b84c9252f @Kumnaa committed Mar 20, 2011
Showing with 17 additions and 5 deletions.
  1. +9 −2 components/core/_page.php
  2. +5 −3 components/core/_user.php
  3. +1 −0 components/core/component_types.php
  4. +2 −0 components/core/page.php
View
@@ -25,17 +25,17 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-ini_set('display_errors', 1);
-
// for unit testing
if (file_exists('config/_config.php')) {
require('config/_config.php');
require('config/messages.php');
require('config/userlevels.php');
+ require('config/bbcode.php');
} else {
require('config/core/_config.php');
require('config/core/messages.php');
require('config/core/userlevels.php');
+ require('config/core/bbcode.php');
}
// end for unit testing
@@ -193,6 +193,13 @@ public function enable_component($component) {
require('html/core/paging.php');
}
break;
+
+ case component_types::$streamline:
+ if (class_exists('streamline') == false) {
+ require('apis/core/streamline_api.php');
+ require('config/streamline.php');
+ }
+ break;
}
}
@@ -221,9 +221,11 @@ public function logout() {
}
protected function set_cookie($_username, $_security, $_random, $_timeout) {
- setcookie(config::cookie_name() . '[user]', $_username, $_timeout, '/', config::domain());
- setcookie(config::cookie_name() . '[sec]', $_security, $_timeout, '/', config::domain());
- setcookie(config::cookie_name() . '[rndm]', $_random, $_timeout, '/', config::domain());
+ if (apetech::server_name() != 'cgi-script') {
+ setcookie(config::cookie_name() . '[user]', $_username, $_timeout, '/', config::domain());
+ setcookie(config::cookie_name() . '[sec]', $_security, $_timeout, '/', config::domain());
+ setcookie(config::cookie_name() . '[rndm]', $_random, $_timeout, '/', config::domain());
+ }
}
protected function update_session() {
@@ -36,6 +36,7 @@ class component_types {
public static $breadcrumbs = 8;
public static $paging = 9;
public static $recaptcha = 10;
+ public static $streamline = 11;
}
?>
View
@@ -25,6 +25,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+ini_set('display_errors', 1);
+
require('components/core/_page.php');
require('bl/core/forum_bl.php');
require('config/core/bbcode.php');

0 comments on commit 4f15713

Please sign in to comment.