kritbit Commit Details

Date:

2015-11-14 16:18:09 (9 years 1 month ago)

Author:

Natalie Adams

Branch:

master

Commit:

55f82dba5425ad695cf27b7810e603931c0d2832

Parents:

6c17c7d25a40758ed2fcfb72d49033c50aaa6b1e

Message:

Adding oauth Upgrade HF to use autoloading

Changes:

File differences

-1
2 2
3 
3
4 4
5 5
6 6
7 7
8 
8
9
10
11
12
9 13
10 14
11 15
+<?php␊
␊
class main extends HF_Controller␊
class main extends base␊
{␊
    public function index()␊
    {␊
␊
        echo $this->loadRender("login.html");␊
        if ($this->isLoggedIn()) {␊
            echo "Hello - " . $this->sessionData->userId;␊
            echo "email = " . $this->user->email;␊
        }␊
        //echo "hello";␊
␊
    }␊
}
 <?php␊
 ␊
-class main extends HF_Controller␊
+class main extends base␊
 {␊
     public function index()␊
     {␊
 ␊
-        echo $this->loadRender("login.html");␊
+        if ($this->isLoggedIn()) {␊
+            echo "Hello - " . $this->sessionData->userId;␊
+            echo "email = " . $this->user->email;␊
+        }␊
+        //echo "hello";␊
 ␊
     }␊
 }

-
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
+<?php␊
␊
echo "Creating session table..." . PHP_EOL;␊
DB::query("CREATE TABLE sessions (␊
          id INTEGER PRIMARY KEY AUTOINCREMENT,␊
          sessionid VARCHAR(255),␊
          ip VARCHAR(255),␊
          userAgent VARCHAR(255),␊
          data TEXT␊
)");␊
␊
echo "Creating users table..." . PHP_EOL;␊
DB::query("CREATE TABLE users (␊
    id INTEGER PRIMARY KEY AUTOINCREMENT,␊
    email VARCHAR(255)␊
)");␊
␊
echo "Adding user " . PHP_EOL;␊
DB::insert("users", ["email" => "adamsna@datanethost.net"]);
+<?php␊
+␊
+echo "Creating session table..." . PHP_EOL;␊
+DB::query("CREATE TABLE sessions (␊
+          id INTEGER PRIMARY KEY AUTOINCREMENT,␊
+          sessionid VARCHAR(255),␊
+          ip VARCHAR(255),␊
+          userAgent VARCHAR(255),␊
+          data TEXT␊
+)");␊
+␊
+echo "Creating users table..." . PHP_EOL;␊
+DB::query("CREATE TABLE users (␊
+    id INTEGER PRIMARY KEY AUTOINCREMENT,␊
+    email VARCHAR(255)␊
+)");␊
+␊
+echo "Adding user " . PHP_EOL;␊
+DB::insert("users", ["email" => "adamsna@datanethost.net"]);

-
2
3
4
5
6
7
8
9
10
11
+<?php␊
␊
namespace application\models;␊
␊
class Sessions extends \system\engine\HF_Model {␊
    public $id;␊
    public $sessionid;␊
    public $ip;␊
    public $userAgent;␊
    public $data;␊
}
+<?php␊
+␊
+namespace application\models;␊
+␊
+class Sessions extends \system\engine\HF_Model {␊
+    public $id;␊
+    public $sessionid;␊
+    public $ip;␊
+    public $userAgent;␊
+    public $data;␊
+}

-
2
3
4
5
6
7
8
9
10
11
+<?php␊
␊
namespace application\models;␊
␊
use system\engine\HF_Model;␊
␊
class Users extends HF_Model␊
{␊
    public $id;␊
    public $email;␊
}
+<?php␊
+␊
+namespace application\models;␊
+␊
+use system\engine\HF_Model;␊
+␊
+class Users extends HF_Model␊
+{␊
+    public $id;␊
+    public $email;␊
+}

-1
2 2
3
4
5
3 6
4 7
5 8
6 9
7 10
8 
9 
10 
11
11 12
+<?php␊
␊
spl_autoload_extensions(".php"); // comma-separated list␊
spl_autoload_register();␊
␊
foreach (glob("system/vendor/*.php") as $filename)␊
{␊
    include $filename;␊
}␊
␊
require('system/engine/core.php');␊
␊
$core = new HF_Core();␊
$core = new \system\engine\HF_Core();␊
$core->run();
 <?php␊
 ␊
+spl_autoload_extensions(".php"); // comma-separated list␊
+spl_autoload_register();␊
+␊
 foreach (glob("system/vendor/*.php") as $filename)␊
 {␊
     include $filename;␊
 }␊
 ␊
-require('system/engine/core.php');␊
-␊
-$core = new HF_Core();␊
+$core = new \system\engine\HF_Core();␊
 $core->run();

-
2
3
4
5
6
7
8
9
10
11
+<?php␊
␊
foreach (glob("system/vendor/*.php") as $filename)␊
{␊
    include $filename;␊
}␊
␊
require('system/engine/HF_Core.php');␊
␊
$core = new HF_Core();␊
$core->runMigrations();
+<?php␊
+␊
+foreach (glob("system/vendor/*.php") as $filename)␊
+{␊
+    include $filename;␊
+}␊
+␊
+require('system/engine/HF_Core.php');␊
+␊
+$core = new HF_Core();␊
+$core->runMigrations();

-
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
+<?php␊
␊
namespace system\engine;␊
␊
class HF_Controller␊
{␊
    protected $config;␊
    protected $tpl;␊
    protected $core;␊
␊
    public function __construct($config, $core, $tpl = null)␊
    {␊
        $this->config = $config;␊
        $this->tpl = $tpl;␊
        $this->core = $core;␊
    }␊
␊
    public function loadRender($template, $parameters=array())␊
    {␊
        $this->tpl->loadTemplate($template);␊
        return $this->tpl->render($parameters);␊
    }␊
␊
}
+<?php␊
+␊
+namespace system\engine;␊
+␊
+class HF_Controller␊
+{␊
+    protected $config;␊
+    protected $tpl;␊
+    protected $core;␊
+␊
+    public function __construct($config, $core, $tpl = null)␊
+    {␊
+        $this->config = $config;␊
+        $this->tpl = $tpl;␊
+        $this->core = $core;␊
+    }␊
+␊
+    public function loadRender($template, $parameters=array())␊
+    {␊
+        $this->tpl->loadTemplate($template);␊
+        return $this->tpl->render($parameters);␊
+    }␊
+␊
+}

-1
2 2
3
4
3 5
4 6
5 7
+<?php␊
␊
namespace system\engine;␊
␊
// Based on tutorial from here: https://portal.cyberhostpro.com/knowledgebase/170/PHP-Mail-Script-with-SMTP-Authentication.html␊
class HF_SMTP␊
{␊
 <?php␊
 ␊
+namespace system\engine;␊
+␊
 // Based on tutorial from here: https://portal.cyberhostpro.com/knowledgebase/170/PHP-Mail-Script-with-SMTP-Authentication.html␊
 class HF_SMTP␊
 {␊

-
2 
3 
4 
5 
6 
7 
8 
9 
10 
11 
12 
13 
14 
15 
16 
17 
18 
19 
20 
21
+<?php␊
class HF_Controller␊
{␊
    protected $config;␊
    protected $tpl;␊
    protected $core;␊
␊
    public function __construct($config, $core, $tpl = null)␊
    {␊
        $this->config = $config;␊
        $this->tpl = $tpl;␊
        $this->core = $core;␊
    }␊
␊
    public function loadRender($template, $parameters=array())␊
    {␊
        $this->tpl->loadTemplate($template);␊
        return $this->tpl->render($parameters);␊
    }␊
␊
}
-<?php␊
-class HF_Controller␊
-{␊
-    protected $config;␊
-    protected $tpl;␊
-    protected $core;␊
-␊
-    public function __construct($config, $core, $tpl = null)␊
-    {␊
-        $this->config = $config;␊
-        $this->tpl = $tpl;␊
-        $this->core = $core;␊
-    }␊
-␊
-    public function loadRender($template, $parameters=array())␊
-    {␊
-        $this->tpl->loadTemplate($template);␊
-        return $this->tpl->render($parameters);␊
-    }␊
-␊
-}

-10
11 11
12 12
13 
13
14 14
15 15
16 16
+␊
    $ret = "<pre style='background: #eee; border: 1px solid #aaa; clear: both; overflow: auto; padding: 10px; text-align: left; margin-bottom: 5px'>";␊
␊
    $ret .- "<b>".htmlspecialchars(trim($code[$backtrace[0]['line']-1]))."</b>\n";␊
    $ret .= "<b>".htmlspecialchars(trim($code[$backtrace[0]['line']-1]))."</b>\n";␊
␊
    $ret .= "\n";␊
␊
 ␊
     $ret = "<pre style='background: #eee; border: 1px solid #aaa; clear: both; overflow: auto; padding: 10px; text-align: left; margin-bottom: 5px'>";␊
 ␊
-    $ret .- "<b>".htmlspecialchars(trim($code[$backtrace[0]['line']-1]))."</b>\n";␊
+    $ret .= "<b>".htmlspecialchars(trim($code[$backtrace[0]['line']-1]))."</b>\n";␊
 ␊
     $ret .= "\n";␊
 ␊

-1
2
2 3
3 4
4 5
+<?php␊
␊
define('H2O_VERSION', '0.3');␊
defined('DS') or define('DS', DIRECTORY_SEPARATOR);␊
defined('H2O_ROOT') or define('H2O_ROOT', dirname(__FILE__) . DS);␊
 <?php␊
+␊
 define('H2O_VERSION', '0.3');␊
 defined('DS') or define('DS', DIRECTORY_SEPARATOR);␊
 defined('H2O_ROOT') or define('H2O_ROOT', dirname(__FILE__) . DS);␊

Download the corresponding diff file

kritbit

File differences

Branches