Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Added the streamline module.

Moved bbcode inclusions.

Signed-off-by: Ben Bowtell <kumnaa@gmail.com>
  • Loading branch information...
commit 4f15713c70f886a4f77e0023f011db6b84c9252f 1 parent 6a740fa
Ben Bowtell authored March 20, 2011
11  components/core/_page.php
@@ -25,17 +25,17 @@
25 25
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
26 26
  */
27 27
 
28  
-ini_set('display_errors', 1);
29  
-
30 28
 // for unit testing
31 29
 if (file_exists('config/_config.php')) {
32 30
     require('config/_config.php');
33 31
     require('config/messages.php');
34 32
     require('config/userlevels.php');
  33
+    require('config/bbcode.php');
35 34
 } else {
36 35
     require('config/core/_config.php');
37 36
     require('config/core/messages.php');
38 37
     require('config/core/userlevels.php');
  38
+    require('config/core/bbcode.php');
39 39
 }
40 40
 // end for unit testing
41 41
 
@@ -193,6 +193,13 @@ public function enable_component($component) {
193 193
                     require('html/core/paging.php');
194 194
                 }
195 195
                 break;
  196
+                
  197
+            case component_types::$streamline:
  198
+                if (class_exists('streamline') == false) {
  199
+                    require('apis/core/streamline_api.php');
  200
+                    require('config/streamline.php');
  201
+                }
  202
+                break;
196 203
         }
197 204
     }
198 205
     
8  components/core/_user.php
@@ -221,9 +221,11 @@ public function logout() {
221 221
     }
222 222
 
223 223
     protected function set_cookie($_username, $_security, $_random, $_timeout) {
224  
-        setcookie(config::cookie_name() . '[user]', $_username, $_timeout, '/', config::domain());
225  
-        setcookie(config::cookie_name() . '[sec]', $_security, $_timeout, '/', config::domain());
226  
-        setcookie(config::cookie_name() . '[rndm]', $_random, $_timeout, '/', config::domain());
  224
+        if (apetech::server_name() != 'cgi-script') {
  225
+            setcookie(config::cookie_name() . '[user]', $_username, $_timeout, '/', config::domain());
  226
+            setcookie(config::cookie_name() . '[sec]', $_security, $_timeout, '/', config::domain());
  227
+            setcookie(config::cookie_name() . '[rndm]', $_random, $_timeout, '/', config::domain());
  228
+        }
227 229
     }
228 230
 
229 231
     protected function update_session() {
1  components/core/component_types.php
@@ -36,6 +36,7 @@ class component_types {
36 36
     public static $breadcrumbs = 8;
37 37
     public static $paging = 9;
38 38
     public static $recaptcha = 10;
  39
+    public static $streamline = 11;
39 40
 }
40 41
 
41 42
 ?>
2  components/core/page.php
@@ -25,6 +25,8 @@
25 25
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
26 26
  */
27 27
 
  28
+ini_set('display_errors', 1);
  29
+
28 30
 require('components/core/_page.php');
29 31
 require('bl/core/forum_bl.php');
30 32
 require('config/core/bbcode.php');

0 notes on commit 4f15713

Please sign in to comment.
Something went wrong with that request. Please try again.