diff --git a/composer.json b/composer.json index e8102b37a..6e60febaa 100644 --- a/composer.json +++ b/composer.json @@ -13,4 +13,3 @@ } ] } - diff --git a/config.ini b/config.ini index 0f13cf746..8911dfcc7 100644 --- a/config.ini +++ b/config.ini @@ -1,3 +1,4 @@ [globals] + DEBUG=3 UI=ui/ diff --git a/lib/api/annotated.html b/lib/api/annotated.html index 0b451aba9..3f8e73f97 100644 --- a/lib/api/annotated.html +++ b/lib/api/annotated.html @@ -19,7 +19,7 @@
$args | Auth | |
$mapper | Auth | |
__construct($storage, array $args=NULL) | Auth | |
_jig($id, $pw, $realm) | Auth | protected |
_ldap($id, $pw) | Auth | protected |
_mongo($id, $pw, $realm) | Auth | protected |
_smtp($id, $pw) | Auth | protected |
_sql($id, $pw, $realm) | Auth | protected |
basic($func=NULL) | Auth | |
E_LDAP (defined in Auth) | Auth | |
E_SMTP (defined in Auth) | Auth | |
login($id, $pw, $realm=NULL) | Auth | |
$storage | Auth | protected |
__construct($storage, array $args=NULL) | Auth | |
_jig($id, $pw, $realm) | Auth | protected |
_ldap($id, $pw) | Auth | protected |
_mongo($id, $pw, $realm) | Auth | protected |
_smtp($id, $pw) | Auth | protected |
_sql($id, $pw, $realm) | Auth | protected |
basic($func=NULL) | Auth | |
E_LDAP (defined in Auth) | Auth | |
E_SMTP (defined in Auth) | Auth | |
login($id, $pw, $realm=NULL) | Auth |
+Protected Attributes | |
+ | $storage |
Auth storage. | |
Authorization/authentication plug-in.
diff --git a/lib/api/classBase-members.html b/lib/api/classBase-members.html index 293e3549c..d1bbc8efd 100644 --- a/lib/api/classBase-members.html +++ b/lib/api/classBase-members.html @@ -19,7 +19,7 @@$key | string |
$src | array |
$src | string|array |
- | $func | +$func, | + +|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+ | + | + | $stack = NULL |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
@@ -1606,6 +1608,7 @@ |
$arg | mixed |
$func | callback |
$stack | array |
Basket::find | ( | - | $key, | +$key = NULL , |
- | $val | +$val = NULL |
||
@@ -353,7 +353,7 @@ |
Return items that match key/value pair
+Return items that match key/value pair; If no key/value pair specified, return all items
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/classBcrypt.html b/lib/api/classBcrypt.html
index 46ac5f9df..c23dd786e 100644
--- a/lib/api/classBcrypt.html
+++ b/lib/api/classBcrypt.html
@@ -19,7 +19,7 @@
|
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/classCache-members.html b/lib/api/classCache-members.html
index 3f4b2f213..a8e0dcdeb 100644
--- a/lib/api/classCache-members.html
+++ b/lib/api/classCache-members.html
@@ -19,7 +19,7 @@
|
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/classCache.html b/lib/api/classCache.html
index 997967fb3..b605084f1 100644
--- a/lib/api/classCache.html
+++ b/lib/api/classCache.html
@@ -19,7 +19,7 @@
|
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
@@ -80,7 +80,7 @@
|
$ref | |
MemCache object. | |
MemCache or Redis object. | |
diff --git a/lib/api/classDB_1_1Cursor-members.html b/lib/api/classDB_1_1Cursor-members.html
index 318f17707..1eeca6f2a 100644
--- a/lib/api/classDB_1_1Cursor-members.html
+++ b/lib/api/classDB_1_1Cursor-members.html
@@ -19,7 +19,7 @@
|
@@ -49,36 +49,43 @@
Fat-Free Framework
- 3.2.1
+ 3.2.2
__isset($key) | Magic | __set($key, $val) | Magic | beforeupdate($func) | DB\Cursor | cast($obj=NULL) | DB\Cursor | clear($key) | Magic | copyfrom($key, $func=NULL) | DB\Cursor | copyto($key) | DB\Cursor | update() | DB\Cursor | |
Public Member Functions | ||||||
dbtype () | ||||||
cast ($obj=NULL) | ||||||
find ($filter=NULL, array $options=NULL, $ttl=0) | ||||||
findone ($filter=NULL, array $options=NULL, $ttl=0) | ||||||
paginate ($pos=0, $size=10, $filter=NULL, array $options=NULL) | ||||||
paginate ($pos=0, $size=10, $filter=NULL, array $options=NULL, $ttl=0) | ||||||
load ($filter=NULL, array $options=NULL, $ttl=0) | ||||||
first () | ||||||
onload ($func) | ||||||
beforeinsert ($func) | ||||||
afterinsert ($func) | ||||||
oninsert ($func) | ||||||
beforeupdate ($func) | ||||||
afterupdate ($func) | ||||||
onupdate ($func) | ||||||
beforeerase ($func) | ||||||
aftererase ($func) | ||||||
onerase ($func) | ||||||
reset () |
DB\Cursor::aftererase | +( | ++ | $func | ) | ++ |
Define aftererase trigger
+$func | callback |
DB\Cursor::afterinsert | +( | ++ | $func | ) | ++ |
Define afterinsert trigger
+$func | callback |
DB\Cursor::afterupdate | +( | ++ | $func | ) | ++ |
Define afterupdate trigger
+$func | callback |
DB\Cursor::beforeerase | +( | ++ | $func | ) | ++ |
Define beforeerase trigger
+$func | callback |
DB\Cursor::beforeinsert | +( | ++ | $func | ) | ++ |
Define beforeinsert trigger
+$func | callback |
DB\Cursor::beforeupdate | +( | ++ | $func | ) | ++ |
Define beforeupdate trigger
+$func | callback |
+
|
+ +abstract | +
Return database type
+Define onerase trigger
-$func | callback |
Define oninsert trigger
-$func | callback |
Define onload trigger
-$func | callback |
Define onupdate trigger
-$func | callback |
array | -$options = NULL |
+ $options = NULL , |
+
+ |
+ | + | + | $ttl = 0 |
@@ -673,6 +886,7 @@ | |||
$size | int | ||
$filter | string|array | ||
$options | array | ||
$ttl | int |
Public Member Functions | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
dbtype () | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
exists ($key) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
set ($key, $val) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
__construct (\DB\Jig $db, $file) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Public Member Functions inherited from DB\Cursor | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
dbtype () | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
cast ($obj=NULL) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
find ($filter=NULL, array $options=NULL, $ttl=0) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
findone ($filter=NULL, array $options=NULL, $ttl=0) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
paginate ($pos=0, $size=10, $filter=NULL, array $options=NULL) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
paginate ($pos=0, $size=10, $filter=NULL, array $options=NULL, $ttl=0) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
load ($filter=NULL, array $options=NULL, $ttl=0) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
first () | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
onload ($func) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
beforeinsert ($func) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
afterinsert ($func) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
oninsert ($func) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
beforeupdate ($func) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
afterupdate ($func) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
onupdate ($func) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
beforeerase ($func) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
aftererase ($func) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
onerase ($func) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
reset () |
DB\Jig\Mapper::dbtype | +( | +) | ++ |
Return database type
++Protected Attributes | |
+ | $sid |
Session ID. | |
Protected Attributes inherited from DB\Jig\Mapper | |
+ | $db |
Flat-file DB wrapper. | |
Protected Attributes inherited from DB\Cursor | |
+ | $query =array() |
Query results. | |
Additional Inherited Members | |
Public Attributes inherited from DB\Jig\Mapper | |
Protected Member Functions inherited from DB\Jig\Mapper | |
factory ($id, $row) | |
Protected Attributes inherited from DB\Jig\Mapper | |
- | $db |
Flat-file DB wrapper. | |
Protected Attributes inherited from DB\Cursor | |
- | $query =array() |
Query results. | |
Jig-managed session handler.
@@ -270,27 +294,20 @@DB\Jig\Session::agent | ( | -- | $id = NULL | ) | +) |
Return HTTP user agent associated with specified session ID
+Return HTTP user agent
$id | string |
DB\Jig\Session::csrf | ( | -- | $id = NULL | ) | +) |
Return anti-CSRF tokan associated with specified session ID
+Return anti-CSRF token
$id | string |
DB\Jig\Session::ip | ( | -- | $id = NULL | ) | +) |
Return IP address associated with specified session ID
+Return IP address
$id | string |
DB\Jig\Session::stamp | ( | -- | $id = NULL | ) | +) |
Return Unix timestamp associated with specified session ID
+Return Unix timestamp
$id | string |
$dsn | DB\Mongo | |
$log | DB\Mongo | |
__construct($dsn, $dbname, array $options=NULL) | DB\Mongo | |
drop() | DB\Mongo | |
dsn() | DB\Mongo | |
E_Profiler (defined in DB\Mongo) | DB\Mongo | |
log() | DB\Mongo | |
uuid() | DB\Mongo | |
$uuid | DB\Mongo | protected |
__construct($dsn, $dbname, array $options=NULL) | DB\Mongo | |
drop() | DB\Mongo | |
dsn() | DB\Mongo | |
E_Profiler (defined in DB\Mongo) | DB\Mongo | |
log() | DB\Mongo | |
uuid() | DB\Mongo |
+Protected Attributes | |
+ | $uuid |
UUID. | |
MongoDB wrapper.
diff --git a/lib/api/classDB_1_1Mongo_1_1Mapper-members.html b/lib/api/classDB_1_1Mongo_1_1Mapper-members.html index d006033b2..3240d802f 100644 --- a/lib/api/classDB_1_1Mongo_1_1Mapper-members.html +++ b/lib/api/classDB_1_1Mongo_1_1Mapper-members.html @@ -19,7 +19,7 @@Public Member Functions | ||||
dbtype () | ||||
exists ($key) | ||||
set ($key, $val) | ||||
__construct (\DB\Mongo $db, $collection) | ||||
Public Member Functions inherited from DB\Cursor | ||||
dbtype () | ||||
cast ($obj=NULL) | ||||
find ($filter=NULL, array $options=NULL, $ttl=0) | ||||
findone ($filter=NULL, array $options=NULL, $ttl=0) | ||||
paginate ($pos=0, $size=10, $filter=NULL, array $options=NULL) | ||||
paginate ($pos=0, $size=10, $filter=NULL, array $options=NULL, $ttl=0) | ||||
load ($filter=NULL, array $options=NULL, $ttl=0) | ||||
first () | ||||
onload ($func) | ||||
beforeinsert ($func) | ||||
afterinsert ($func) | ||||
oninsert ($func) | ||||
beforeupdate ($func) | ||||
afterupdate ($func) | ||||
onupdate ($func) | ||||
beforeerase ($func) | ||||
aftererase ($func) | ||||
onerase ($func) | ||||
reset () |
DB\Mongo\Mapper::dbtype | +( | +) | ++ |
Return database type
++Protected Attributes | |
+ | $sid |
Session ID. | |
Protected Attributes inherited from DB\Mongo\Mapper | |
+ | $db |
MongoDB wrapper. | |
Protected Attributes inherited from DB\Cursor | |
+ | $query =array() |
Query results. | |
Additional Inherited Members | |
Public Attributes inherited from DB\Mongo\Mapper | |
Protected Member Functions inherited from DB\Mongo\Mapper | |
factory ($row) | |
Protected Attributes inherited from DB\Mongo\Mapper | |
- | $db |
MongoDB wrapper. | |
Protected Attributes inherited from DB\Cursor | |
- | $query =array() |
Query results. | |
MongoDB-managed session handler.
@@ -272,27 +296,20 @@DB\Mongo\Session::agent | ( | -- | $id = NULL | ) | +) |
Return HTTP user agent associated with specified session ID
+Return HTTP user agent
$id | string |
DB\Mongo\Session::csrf | ( | -- | $id = NULL | ) | +) |
Return anti-CSRF tokan associated with specified session ID
+Return anti-CSRF token
$id | string |
DB\Mongo\Session::ip | ( | -- | $id = NULL | ) | +) |
Return IP address associated with specified session ID
+Return IP address
$id | string |
DB\Mongo\Session::stamp | ( | -- | $id = NULL | ) | +) |
Return Unix timestamp associated with specified session ID
+Return Unix timestamp
$id | string |
+Protected Attributes | |
+ | $uuid |
UUID. | |
PDO wrapper.
@@ -477,6 +487,41 @@Return UUID
DB\SQL::value | +( | ++ | $type, | +
+ | + | + | $val | +
+ | ) | ++ |
Cast value to PHP type
+$type | string |
$val | scalar |
Public Member Functions | ||||
dbtype () | ||||
exists ($key) | ||||
set ($key, $val) | ||||
type ($pdo) | ||||
value ($type, $val) | ||||
cast ($obj=NULL) | ||||
select ($fields, $filter=NULL, array $options=NULL, $ttl=0) | ||||
__construct (\DB\SQL $db, $table, $fields=NULL, $ttl=60) | ||||
Public Member Functions inherited from DB\Cursor | ||||
dbtype () | ||||
cast ($obj=NULL) | ||||
find ($filter=NULL, array $options=NULL, $ttl=0) | ||||
findone ($filter=NULL, array $options=NULL, $ttl=0) | ||||
paginate ($pos=0, $size=10, $filter=NULL, array $options=NULL) | ||||
paginate ($pos=0, $size=10, $filter=NULL, array $options=NULL, $ttl=0) | ||||
load ($filter=NULL, array $options=NULL, $ttl=0) | ||||
first () | ||||
onload ($func) | ||||
beforeinsert ($func) | ||||
afterinsert ($func) | ||||
oninsert ($func) | ||||
beforeupdate ($func) | ||||
afterupdate ($func) | ||||
onupdate ($func) | ||||
beforeerase ($func) | ||||
aftererase ($func) | ||||
onerase ($func) | ||||
reset () |
DB\SQL\Mapper::dbtype | +( | +) | ++ |
Return database type
+Update current record
DB\SQL\Mapper::value | -( | -- | $type, | -
- | - | - | $val | -
- | ) | -- |
Cast value to PHP type
-$type | string |
$val | scalar |
+Protected Attributes | |
+ | $sid |
Session ID. | |
Protected Attributes inherited from DB\SQL\Mapper | |
+ | $db |
PDO wrapper. | |
Protected Attributes inherited from DB\Cursor | |
+ | $query =array() |
Query results. | |
Additional Inherited Members | |
Public Attributes inherited from DB\SQL\Mapper | |
Protected Member Functions inherited from DB\SQL\Mapper | |
factory ($row) | |
Protected Attributes inherited from DB\SQL\Mapper | |
- | $db |
PDO wrapper. | |
Protected Attributes inherited from DB\Cursor | |
- | $query =array() |
Query results. | |
SQL-managed session handler.
- | $table = 'sessions' |
+ $table = 'sessions' , |
+
+ |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+ | + | + | $force = TRUE |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
@@ -284,6 +312,7 @@ |
$db | object |
$table | string |
$force | bool |
DB\SQL\Session::agent | ( | -- | $id = NULL | ) | +) |
Return HTTP user agent associated with specified session ID
+Return HTTP user agent
$id | string |
DB\SQL\Session::csrf | ( | -- | $id = NULL | ) | +) |
Return anti-CSRF tokan associated with specified session ID
+Return anti-CSRF token
$id | string |
DB\SQL\Session::ip | ( | -- | $id = NULL | ) | +) |
Return IP address associated with specified session ID
+Return IP address
$id | string |
DB\SQL\Session::stamp | ( | -- | $id = NULL | ) | +) |
Return Unix timestamp associated with specified session ID
+Return Unix timestamp
$id | string |
$count | Image | |
$data | Image | |
$flag | Image | |
__construct($file=NULL, $flag=FALSE, $path='') | Image | |
__destruct() | Image | |
blur($selective=FALSE) | Image | |
brightness($level) | Image | |
captcha($font, $size=24, $len=5, $key=NULL, $path='', $fg=0xFFFFFF, $bg=0x000000) | Image | |
contrast($level) | Image | |
crop($x1, $y1, $x2, $y2) | Image | |
dump() | Image | |
E_Color (defined in Image) | Image | |
E_Font (defined in Image) | Image | |
E_Length (defined in Image) | Image | |
emboss() | Image | |
grayscale() | Image | |
height() | Image | |
hflip() | Image | |
identicon($str, $size=64, $blocks=4) | Image | |
invert() | Image | |
load($str) | Image | |
overlay(Image $img, $align=NULL) | Image | |
pixelate($size) | Image | |
POS_Bottom (defined in Image) | Image | |
POS_Center (defined in Image) | Image | |
POS_Left (defined in Image) | Image | |
POS_Middle (defined in Image) | Image | |
POS_Right (defined in Image) | Image | |
POS_Top (defined in Image) | Image | |
render() | Image | |
resize($width, $height, $crop=TRUE, $enlarge=TRUE) | Image | |
restore($state=1) | Image | |
rgb($color) | Image | |
rotate($angle) | Image | |
save() | Image | |
sepia() | Image | |
sketch() | Image | |
smooth($level) | Image | |
undo() | Image | |
vflip() | Image | |
width() | Image | |
$file | Image | protected |
$flag | Image | |
__construct($file=NULL, $flag=FALSE, $path='') | Image | |
__destruct() | Image | |
blur($selective=FALSE) | Image | |
brightness($level) | Image | |
captcha($font, $size=24, $len=5, $key=NULL, $path='', $fg=0xFFFFFF, $bg=0x000000) | Image | |
contrast($level) | Image | |
crop($x1, $y1, $x2, $y2) | Image | |
dump() | Image | |
E_Color (defined in Image) | Image | |
E_Font (defined in Image) | Image | |
E_Length (defined in Image) | Image | |
emboss() | Image | |
grayscale() | Image | |
height() | Image | |
hflip() | Image | |
identicon($str, $size=64, $blocks=4) | Image | |
invert() | Image | |
load($str) | Image | |
overlay(Image $img, $align=NULL) | Image | |
pixelate($size) | Image | |
POS_Bottom (defined in Image) | Image | |
POS_Center (defined in Image) | Image | |
POS_Left (defined in Image) | Image | |
POS_Middle (defined in Image) | Image | |
POS_Right (defined in Image) | Image | |
POS_Top (defined in Image) | Image | |
render() | Image | |
resize($width, $height, $crop=TRUE, $enlarge=TRUE) | Image | |
restore($state=1) | Image | |
rgb($color) | Image | |
rotate($angle) | Image | |
save() | Image | |
sepia() | Image | |
sketch() | Image | |
smooth($level) | Image | |
undo() | Image | |
vflip() | Image | |
width() | Image |
+Protected Attributes | |
+ | $file |
Source filename. | |
Image manipulation tools.
diff --git a/lib/api/classLog-members.html b/lib/api/classLog-members.html index be3142880..e16654bfc 100644 --- a/lib/api/classLog-members.html +++ b/lib/api/classLog-members.html @@ -19,7 +19,7 @@Return class instance
-This is the complete list of members for SMTP, including all inherited members.
$attachments | SMTP | |
$host | SMTP | |
$log | SMTP | |
$port | SMTP | |
$pw | SMTP | |
$scheme | SMTP | |
$socket | SMTP | |
$user | SMTP | |
__construct($host, $port, $scheme, $user, $pw) | SMTP | |
__get($key) | Magic | |
__isset($key) | Magic | |
__set($key, $val) | Magic | |
__unset($key) | Magic | |
attach($file) | SMTP | |
clear($key) | SMTP | |
dialog($cmd=NULL, $log=TRUE) | SMTP | protected |
E_Attach (defined in SMTP) | SMTP | |
E_Blank (defined in SMTP) | SMTP | |
E_Header (defined in SMTP) | SMTP | |
exists($key) | SMTP | |
fixheader($key) | SMTP | protected |
get($key) | SMTP | |
log() | SMTP | |
offsetexists($key) | Magic | |
offsetget($key) | Magic | |
offsetset($key, $val) | Magic | |
offsetunset($key) | Magic | |
send($message, $log=TRUE) | SMTP | |
set($key, $val) | SMTP | |
$headers | SMTP | protected |
$host | SMTP | |
$log | SMTP | |
$port | SMTP | |
$pw | SMTP | |
$scheme | SMTP | |
$socket | SMTP | |
$user | SMTP | |
__construct($host, $port, $scheme, $user, $pw) | SMTP | |
__get($key) | Magic | |
__isset($key) | Magic | |
__set($key, $val) | Magic | |
__unset($key) | Magic | |
attach($file) | SMTP | |
clear($key) | SMTP | |
dialog($cmd=NULL, $log=TRUE) | SMTP | protected |
E_Attach (defined in SMTP) | SMTP | |
E_Blank (defined in SMTP) | SMTP | |
E_Header (defined in SMTP) | SMTP | |
exists($key) | SMTP | |
fixheader($key) | SMTP | protected |
get($key) | SMTP | |
log() | SMTP | |
offsetexists($key) | Magic | |
offsetget($key) | Magic | |
offsetset($key, $val) | Magic | |
offsetunset($key) | Magic | |
send($message, $log=TRUE) | SMTP | |
set($key, $val) | SMTP |
+Protected Attributes | |
+ | $headers |
Message properties. | |
SMTP plug-in.
@@ -290,7 +298,7 @@Send SMTP command and record server response
-$cmd | string | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
@@ -38,15 +38,16 @@
__construct() | Session | |
agent($id=NULL) | Session | |
cleanup($max) | Session | |
close() | Session | |
csrf($id=NULL) | Session | |
destroy($id) | Session | |
ip($id=NULL) | Session | |
open($path, $name) | Session | |
read($id) | Session | |
stamp($id=NULL) | Session | |
write($id, $data) | Session | |
$sid | Session | protected |
__construct() | Session | |
agent() | Session | |
cleanup($max) | Session | |
close() | Session | |
csrf() | Session | |
destroy($id) | Session | |
ip() | Session | |
open($path, $name) | Session | |
read($id) | Session | |
stamp() | Session | |
write($id, $data) | Session |
+Protected Attributes | |
+ | $sid |
Session ID. | |
Cache-based session handler.
@@ -88,27 +96,20 @@Session::agent | ( | -- | $id = NULL | ) | +) |
Return HTTP user agent associated with specified session ID
+Return HTTP user agent
$id | string |
Session::csrf | ( | -- | $id = NULL | ) | +) |
Return anti-CSRF tokan associated with specified session ID
+Return anti-CSRF token
$id | string |
Session::ip | ( | -- | $id = NULL | ) | +) |
Return IP address associated with specified session ID
+Return IP address
$id | string |
Session::stamp | ( | -- | $id = NULL | ) | +) |
Return Unix timestamp associated with specified session ID
+Return Unix timestamp
$id | string |
This is the complete list of members for Test, including all inherited members.
__construct($level=self::FLAG_Both) | Test | |
expect($cond, $text=NULL) | Test | |
FLAG_Both (defined in Test) | Test | |
FLAG_False (defined in Test) | Test | |
FLAG_True (defined in Test) | Test | |
message($text) | Test | |
results() | Test | |
$data | Test | protected |
__construct($level=self::FLAG_Both) | Test | |
expect($cond, $text=NULL) | Test | |
FLAG_Both (defined in Test) | Test | |
FLAG_False (defined in Test) | Test | |
FLAG_True (defined in Test) | Test | |
message($text) | Test | |
results() | Test |
+Protected Attributes | |
+ | $data =array() |
Test results. | |
Unit test kit.
diff --git a/lib/api/classUTF-members.html b/lib/api/classUTF-members.html index 5ec47c0e0..28bcc7331 100644 --- a/lib/api/classUTF-members.html +++ b/lib/api/classUTF-members.html @@ -19,7 +19,7 @@This is the complete list of members for Web, including all inherited members.
_curl($url, $options) | Web | protected |
_socket($url, $options) | Web | protected |
_stream($url, $options) | Web | protected |
acceptable($list=NULL) | Web | |
E_Request (defined in Web) | Web | |
engine($arg='curl') | Web | |
filler($count=1, $max=20, $std=TRUE) | Web | |
instance() | Prefab | static |
mime($file) | Web | |
minify($files, $mime=NULL, $header=TRUE, $path='') | Web | |
progress($id) | Web | |
receive($func=NULL, $overwrite=FALSE, $slug=TRUE) | Web | |
request($url, array $options=NULL) | Web | |
rss($url, $max=10, $tags=NULL) | Web | |
send($file, $mime=NULL, $kbps=0, $force=TRUE) | Web | |
slug($text) | Web | |
subst(array &$old, $new) | Web | |
whois($addr, $server='whois.internic.net') | Web | |
$wrapper | Web | protected |
_curl($url, $options) | Web | protected |
_socket($url, $options) | Web | protected |
_stream($url, $options) | Web | protected |
acceptable($list=NULL) | Web | |
E_Request (defined in Web) | Web | |
engine($arg='curl') | Web | |
filler($count=1, $max=20, $std=TRUE) | Web | |
instance() | Prefab | static |
mime($file) | Web | |
minify($files, $mime=NULL, $header=TRUE, $path='') | Web | |
progress($id) | Web | |
receive($func=NULL, $overwrite=FALSE, $slug=TRUE) | Web | |
request($url, array $options=NULL) | Web | |
rss($url, $max=10, $tags=NULL) | Web | |
send($file, $mime=NULL, $kbps=0, $force=TRUE) | Web | |
slug($text) | Web | |
subst(array &$old, $new) | Web | |
whois($addr, $server='whois.internic.net') | Web |
+Protected Attributes | |
+ | $wrapper |
HTTP request engine. | |
Additional Inherited Members | |||||||||||||||||||||||||||||||||||||||
Static Public Member Functions inherited from Prefab | |||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/classWeb_1_1Geo.html b/lib/api/classWeb_1_1Geo.html
index f3c3fa5c2..5145b52f5 100644
--- a/lib/api/classWeb_1_1Geo.html
+++ b/lib/api/classWeb_1_1Geo.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/classWeb_1_1Google_1_1StaticMap-members.html b/lib/api/classWeb_1_1Google_1_1StaticMap-members.html
index 4bffb198c..f20968a2a 100644
--- a/lib/api/classWeb_1_1Google_1_1StaticMap-members.html
+++ b/lib/api/classWeb_1_1Google_1_1StaticMap-members.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/classWeb_1_1Google_1_1StaticMap.html b/lib/api/classWeb_1_1Google_1_1StaticMap.html
index 9d39d65cb..f76ea686e 100644
--- a/lib/api/classWeb_1_1Google_1_1StaticMap.html
+++ b/lib/api/classWeb_1_1Google_1_1StaticMap.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/classWeb_1_1OpenID-members.html b/lib/api/classWeb_1_1OpenID-members.html
index 762da7b76..9e189aef9 100644
--- a/lib/api/classWeb_1_1OpenID-members.html
+++ b/lib/api/classWeb_1_1OpenID-members.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/classWeb_1_1OpenID.html b/lib/api/classWeb_1_1OpenID.html
index dabaf30b1..406bbb655 100644
--- a/lib/api/classWeb_1_1OpenID.html
+++ b/lib/api/classWeb_1_1OpenID.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/classWeb_1_1Pingback-members.html b/lib/api/classWeb_1_1Pingback-members.html
index fc87ed91a..bc9ccc9ad 100644
--- a/lib/api/classWeb_1_1Pingback-members.html
+++ b/lib/api/classWeb_1_1Pingback-members.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
@@ -42,10 +42,11 @@
__construct() | Web\Pingback | |
enabled($url) | Web\Pingback | protected |
inspect($source) | Web\Pingback | |
instance() | Prefab | static |
listen($func, $path=NULL) | Web\Pingback | |
log() | Web\Pingback | |
$log | Web\Pingback | protected |
__construct() | Web\Pingback | |
enabled($url) | Web\Pingback | protected |
inspect($source) | Web\Pingback | |
instance() | Prefab | static |
listen($func, $path=NULL) | Web\Pingback | |
log() | Web\Pingback |
+Protected Attributes | |
+ | $log |
Transaction history. | |
Additional Inherited Members | |||||||||||||||||||||||||||||||||||||||||||||||||
Static Public Member Functions inherited from Prefab | |||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/dir_3a960e52dd9a2c9686c19ff6ef19d5fb.html b/lib/api/dir_3a960e52dd9a2c9686c19ff6ef19d5fb.html
index cd3aa3b8e..9ee559747 100644
--- a/lib/api/dir_3a960e52dd9a2c9686c19ff6ef19d5fb.html
+++ b/lib/api/dir_3a960e52dd9a2c9686c19ff6ef19d5fb.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/dir_562abdcd8625d4bf7bad2fe6fe01354c.html b/lib/api/dir_562abdcd8625d4bf7bad2fe6fe01354c.html
index 0e1d671bd..523804d34 100644
--- a/lib/api/dir_562abdcd8625d4bf7bad2fe6fe01354c.html
+++ b/lib/api/dir_562abdcd8625d4bf7bad2fe6fe01354c.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/dir_60985a986063d10a97c0bb7f42d76d6f.html b/lib/api/dir_60985a986063d10a97c0bb7f42d76d6f.html
index f6556fe96..ee5b7beac 100644
--- a/lib/api/dir_60985a986063d10a97c0bb7f42d76d6f.html
+++ b/lib/api/dir_60985a986063d10a97c0bb7f42d76d6f.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/dir_826b1e4cd13f4e7f528ca52e638927e5.html b/lib/api/dir_826b1e4cd13f4e7f528ca52e638927e5.html
index 034a69999..7497da129 100644
--- a/lib/api/dir_826b1e4cd13f4e7f528ca52e638927e5.html
+++ b/lib/api/dir_826b1e4cd13f4e7f528ca52e638927e5.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/dir_9d4753e6cb22f68b75f0462ac2496f38.html b/lib/api/dir_9d4753e6cb22f68b75f0462ac2496f38.html
index 3445ce9a2..194aec551 100644
--- a/lib/api/dir_9d4753e6cb22f68b75f0462ac2496f38.html
+++ b/lib/api/dir_9d4753e6cb22f68b75f0462ac2496f38.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/dir_ce5981f09099a3fa6071b9eb8fe67a2c.html b/lib/api/dir_ce5981f09099a3fa6071b9eb8fe67a2c.html
index 0da07b491..4b33a1bc7 100644
--- a/lib/api/dir_ce5981f09099a3fa6071b9eb8fe67a2c.html
+++ b/lib/api/dir_ce5981f09099a3fa6071b9eb8fe67a2c.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/doxygen_8h_source.html b/lib/api/doxygen_8h_source.html
index d9895bdc5..3a25513f2 100644
--- a/lib/api/doxygen_8h_source.html
+++ b/lib/api/doxygen_8h_source.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/functions.html b/lib/api/functions.html
index 7385044eb..d65f1f91f 100644
--- a/lib/api/functions.html
+++ b/lib/api/functions.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
@@ -64,6 +64,7 @@ |||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
@@ -54,7 +54,7 @@ |||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
@@ -37,11 +37,20 @@ |||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
@@ -40,6 +40,15 @@ |||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
@@ -147,10 +147,10 @@ |||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
@@ -34,6 +34,12 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/functions_f.html b/lib/api/functions_f.html
index dc360c71f..113798e78 100644
--- a/lib/api/functions_f.html
+++ b/lib/api/functions_f.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
@@ -48,7 +48,7 @@ |||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
@@ -54,7 +54,7 @@ |||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
@@ -37,11 +37,20 @@ |||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
@@ -40,6 +40,15 @@ |||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
@@ -144,10 +144,10 @@ |||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
@@ -34,6 +34,12 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/functions_func_f.html b/lib/api/functions_func_f.html
index f766c6bff..5ff02eaf1 100644
--- a/lib/api/functions_func_f.html
+++ b/lib/api/functions_func_f.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
@@ -48,7 +48,7 @@ |||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/functions_func_h.html b/lib/api/functions_func_h.html
index 26ea34a7b..7a521fde5 100644
--- a/lib/api/functions_func_h.html
+++ b/lib/api/functions_func_h.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/functions_func_i.html b/lib/api/functions_func_i.html
index f939de6b4..c1b2db929 100644
--- a/lib/api/functions_func_i.html
+++ b/lib/api/functions_func_i.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
@@ -53,10 +53,10 @@ |||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/functions_func_l.html b/lib/api/functions_func_l.html
index f681f6333..1c6b0ddbe 100644
--- a/lib/api/functions_func_l.html
+++ b/lib/api/functions_func_l.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/functions_func_m.html b/lib/api/functions_func_m.html
index 4cf9e0f0d..3c169ca32 100644
--- a/lib/api/functions_func_m.html
+++ b/lib/api/functions_func_m.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/functions_func_n.html b/lib/api/functions_func_n.html
index 1e245d2f1..291eb37d5 100644
--- a/lib/api/functions_func_n.html
+++ b/lib/api/functions_func_n.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/functions_func_o.html b/lib/api/functions_func_o.html
index 474b42eef..baf833890 100644
--- a/lib/api/functions_func_o.html
+++ b/lib/api/functions_func_o.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/functions_func_p.html b/lib/api/functions_func_p.html
index c4b35f186..4f5afc95e 100644
--- a/lib/api/functions_func_p.html
+++ b/lib/api/functions_func_p.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
@@ -35,7 +35,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/functions_func_r.html b/lib/api/functions_func_r.html
index 11339fa19..b31816f38 100644
--- a/lib/api/functions_func_r.html
+++ b/lib/api/functions_func_r.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
@@ -49,7 +49,7 @@ |||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
@@ -112,10 +112,10 @@ |||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/functions_func_u.html b/lib/api/functions_func_u.html
index ac9dbc25b..6b0d49249 100644
--- a/lib/api/functions_func_u.html
+++ b/lib/api/functions_func_u.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/functions_func_v.html b/lib/api/functions_func_v.html
index 48e235452..f259cafc9 100644
--- a/lib/api/functions_func_v.html
+++ b/lib/api/functions_func_v.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
@@ -35,7 +35,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/functions_g.html b/lib/api/functions_g.html
index 4742748d3..8104c4495 100644
--- a/lib/api/functions_g.html
+++ b/lib/api/functions_g.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/functions_h.html b/lib/api/functions_h.html
index 71045ec97..15c3b7929 100644
--- a/lib/api/functions_h.html
+++ b/lib/api/functions_h.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/functions_i.html b/lib/api/functions_i.html
index 4e20e39d7..05ef17b9a 100644
--- a/lib/api/functions_i.html
+++ b/lib/api/functions_i.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
@@ -53,10 +53,10 @@ |||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/functions_l.html b/lib/api/functions_l.html
index ff3712d77..446e26056 100644
--- a/lib/api/functions_l.html
+++ b/lib/api/functions_l.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/functions_m.html b/lib/api/functions_m.html
index e73871fc8..0530b064f 100644
--- a/lib/api/functions_m.html
+++ b/lib/api/functions_m.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/functions_n.html b/lib/api/functions_n.html
index 1e1f44140..01d38e5f8 100644
--- a/lib/api/functions_n.html
+++ b/lib/api/functions_n.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/functions_o.html b/lib/api/functions_o.html
index 4f0cdf5ca..a8447d98e 100644
--- a/lib/api/functions_o.html
+++ b/lib/api/functions_o.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/functions_p.html b/lib/api/functions_p.html
index 0f439e868..ffd6b0300 100644
--- a/lib/api/functions_p.html
+++ b/lib/api/functions_p.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
@@ -35,7 +35,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/functions_r.html b/lib/api/functions_r.html
index d310325bc..721c8994d 100644
--- a/lib/api/functions_r.html
+++ b/lib/api/functions_r.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
@@ -49,7 +49,7 @@ |||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
@@ -112,10 +112,10 @@ |||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/functions_u.html b/lib/api/functions_u.html
index 182b01bbb..a809f5294 100644
--- a/lib/api/functions_u.html
+++ b/lib/api/functions_u.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/functions_v.html b/lib/api/functions_v.html
index a07f222af..759ff423a 100644
--- a/lib/api/functions_v.html
+++ b/lib/api/functions_v.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
@@ -35,7 +35,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
@@ -64,6 +64,7 @@ |||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/hierarchy.html b/lib/api/hierarchy.html
index 7f1c25dea..5f96ee4dd 100644
--- a/lib/api/hierarchy.html
+++ b/lib/api/hierarchy.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/api/index.html b/lib/api/index.html
index acc43baf7..7be8620f8 100644
--- a/lib/api/index.html
+++ b/lib/api/index.html
@@ -19,7 +19,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||
Fat-Free Framework
- 3.2.1
+ 3.2.2
|
diff --git a/lib/auth.php b/lib/auth.php
index e0aa6dc8d..78a068c1d 100644
--- a/lib/auth.php
+++ b/lib/auth.php
@@ -22,7 +22,7 @@ class Auth {
E_SMTP='SMTP connection failure';
//@}
- private
+ protected
//! Auth storage
$storage,
//! Mapper object
@@ -221,8 +221,7 @@ function basic($func=NULL) {
**/
function __construct($storage,array $args=NULL) {
if (is_object($storage) && is_a($storage,'DB\Cursor')) {
- $ref=new ReflectionClass(get_class($storage));
- $this->storage=basename(dirname($ref->getfilename()));
+ $this->storage=$storage->dbtype();
$this->mapper=$storage;
unset($ref);
}
diff --git a/lib/base.php b/lib/base.php
index afd36f68c..c2f8bee86 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -18,7 +18,7 @@ abstract class Prefab {
/**
* Return class instance
- * @return object
+ * @return static
**/
static function instance() {
if (!Registry::exists($class=get_called_class())) {
@@ -38,7 +38,7 @@ class Base extends Prefab {
//@{ Framework details
const
PACKAGE='Fat-Free Framework',
- VERSION='3.2.1-Release';
+ VERSION='3.2.2-Release';
//@}
//@{ HTTP status codes (RFC 2616)
@@ -120,8 +120,6 @@ class Base extends Prefab {
$init,
//! Language lookup sequence
$languages,
- //! Equivalent Locales
- $locales,
//! Default fallback language
$fallback='en',
//! NULL reference
@@ -190,8 +188,12 @@ function($var) use($fw) {
return '$'.preg_replace_callback(
'/\.(\w+)|\[((?:[^\[\]]*|(?R))*)\]/',
function($expr) use($fw) {
- return '['.var_export($expr[1]?:
- $fw->compile($expr[2]),TRUE).']';
+ return '['.var_export(
+ isset($expr[2])?
+ $fw->compile($expr[2]):
+ (ctype_digit($expr[1])?
+ (int)$expr[1]:
+ $expr[1]),TRUE).']';
},
$var[1]
);
@@ -225,25 +227,15 @@ function &ref($key,$add=TRUE) {
$obj=TRUE;
elseif ($obj) {
$obj=FALSE;
- if ($add) {
- if (!is_object($var))
- $var=new stdclass;
- $var=&$var->$part;
- }
- elseif (isset($var->$part))
- $var=$var->$part;
- else
- return $this->null;
+ if (!is_object($var))
+ $var=new stdclass;
+ $var=&$var->$part;
}
- elseif ($add) {
+ else {
if (!is_array($var))
$var=array();
$var=&$var[$part];
}
- elseif (is_array($var) && isset($var[$part]))
- $var=$var[$part];
- else
- return $this->null;
if ($parts[0]=='ALIASES')
$var=$this->build($var);
return $var;
@@ -323,10 +315,6 @@ function set($key,$val,$ttl=0) {
if (preg_match('/^JAR\b/',$key))
call_user_func_array(
'session_set_cookie_params',$this->hive['JAR']);
- elseif (preg_match('/^SESSION\b/',$key)) {
- session_commit();
- session_start();
- }
$cache=Cache::instance();
if ($cache->exists($hash=$this->hash($key).'.var') || $ttl)
// Persist the key-value pair
@@ -505,11 +493,11 @@ function shift($key) {
* Merge array with hive array variable
* @return array
* @param $key string
- * @param $src array
+ * @param $src string|array
**/
function merge($key,$src) {
$ref=&$this->ref($key);
- return array_merge($ref,$src);
+ return array_merge($ref,is_string($src)?$this->hive[$src]:$src);
}
/**
@@ -639,8 +627,8 @@ function base64($data,$mime) {
* @param $str string
**/
function encode($str) {
- return @htmlentities($str,ENT_COMPAT,$this->hive['ENCODING'],FALSE)?:
- $this->scrub($str);
+ return @htmlentities($str,$this->hive['BITMASK'],
+ $this->hive['ENCODING'],FALSE)?:$this->scrub($str);
}
/**
@@ -649,7 +637,8 @@ function encode($str) {
* @param $str string
**/
function decode($str) {
- return html_entity_decode($str,ENT_COMPAT,$this->hive['ENCODING']);
+ return html_entity_decode($str,$this->hive['BITMASK'],
+ $this->hive['ENCODING']);
}
/**
@@ -671,18 +660,28 @@ function dupe($arg) {
* @return mixed
* @param $arg mixed
* @param $func callback
+ * @param $stack array
**/
- function recursive($arg,$func) {
+ function recursive($arg,$func,$stack=NULL) {
+ if ($stack) {
+ foreach ($stack as $node)
+ if ($arg===$node)
+ return $arg;
+ }
+ else
+ $stack=array();
switch (gettype($arg)) {
case 'object':
$arg=$this->dupe($arg);
foreach (get_object_vars($arg) as $key=>$val)
- $arg->$key=$this->recursive($val,$func);
+ $arg->$key=$this->recursive($val,$func,
+ array_merge($stack,array($arg)));
return $arg;
case 'array':
$tmp=array();
foreach ($arg as $key=>$val)
- $tmp[$key]=$this->recursive($val,$func);
+ $tmp[$key]=$this->recursive($val,$func,
+ array_merge($stack,array($arg)));
return $tmp;
}
return $func($arg);
@@ -725,7 +724,6 @@ function scrub(&$var,$tags=NULL) {
function format() {
$args=func_get_args();
$val=array_shift($args);
- setlocale(LC_ALL,str_replace('-','_',$this->locales));
// Get formatting rules
$conv=localeconv();
return preg_replace_callback(
@@ -810,11 +808,15 @@ function($expr) use($args,$conv) {
}
break;
case 'date':
- return strftime(empty($mod) ||
- $mod=='short'?'%x':'%A, %d %B %Y',
- $args[$pos]);
+ if (empty($mod) || $mod=='short')
+ $prop='%x';
+ elseif ($mod=='long')
+ $prop='%A, %d %B %Y';
+ return strftime($prop,$args[$pos]);
case 'time':
- return strftime('%X',$args[$pos]);
+ if (empty($mod) || $mod=='short')
+ $prop='%X';
+ return strftime($prop,$args[$pos]);
default:
return $expr[0];
}
@@ -845,7 +847,7 @@ function language($code) {
}
}
$this->languages=array_unique($this->languages);
- $this->locales=array();
+ $locales=array();
$windows=preg_match('/^win/i',PHP_OS);
foreach ($this->languages as $locale) {
if ($windows) {
@@ -855,9 +857,10 @@ function language($code) {
$country=@constant('ISO::CC_'.strtolower($parts[1])))
$locale.='-'.$country;
}
- $this->locales[]=$locale;
- $this->locales[]=$locale.'.'.ini_get('default_charset');
+ $locales[]=$locale;
+ $locales[]=$locale.'.'.ini_get('default_charset');
}
+ setlocale(LC_ALL,str_replace('-','_',$locales));
return implode(',',$this->languages);
}
@@ -876,7 +879,6 @@ function lexicon($path) {
elseif (is_file($file=$base.'.ini')) {
preg_match_all(
'/(?<=^|\n)(?:'.
- '(?:;[^\n]*)|(?:<\?php.+?\?>?)|'.
'(.+?)\h*=\h*'.
'((?:\\\\\h*\r?\n|.+?)*)'.
')(?=\r?\n|$)/',
@@ -940,7 +942,7 @@ function status($code) {
function expire($secs=0) {
if (PHP_SAPI!='cli') {
header('X-Content-Type-Options: nosniff');
- header('X-Frame-Options: SAMEORIGIN');
+ header('X-Frame-Options: '.$this->hive['XFRAME']);
header('X-Powered-By: '.$this->hive['PACKAGE']);
header('X-XSS-Protection: 1; mode=block');
if ($secs) {
@@ -997,13 +999,12 @@ function($frame) use($debug) {
// Analyze stack trace
foreach ($trace as $frame) {
$line='';
- if ($debug>1) {
- if (isset($frame['class']))
- $line.=$frame['class'].$frame['type'];
- if (isset($frame['function']))
- $line.=$frame['function'].'('.(isset($frame['args'])?
+ if (isset($frame['class']))
+ $line.=$frame['class'].$frame['type'];
+ if (isset($frame['function']))
+ $line.=$frame['function'].'('.
+ ($debug>2 && isset($frame['args'])?
$this->csv($frame['args']):'').')';
- }
$src=$this->fixslashes(str_replace($_SERVER['DOCUMENT_ROOT'].
'/','',$frame['file'])).':'.$frame['line'].' ';
error_log('- '.$src.$line);
@@ -1017,9 +1018,7 @@ function($frame) use($debug) {
'text'=>$text,
'trace'=>$trace
);
- if (!$debug && ob_get_level())
- ob_end_clean();
- $handler=isset($this->hive['ONERROR'])?$this->hive['ONERROR']:NULL;
+ $handler=$this->hive['ONERROR'];
$this->hive['ONERROR']=NULL;
if ((!$handler ||
$this->call($handler,$this,'beforeroute,afterroute')===FALSE) &&
@@ -1148,8 +1147,7 @@ function reroute($url,$permanent=FALSE) {
else
$url=$this->hive['BASE'].$url;
header('Location: '.$url);
- $this->status($permanent?
- 301:($_SERVER['SERVER_PROTOCOL']<'HTTP/1.1'?302:303));
+ $this->status($permanent?301:302);
die;
}
$this->mock('GET '.$url);
@@ -1247,14 +1245,18 @@ function run() {
foreach (array_keys($args) as $key)
if (is_numeric($key) && $key)
unset($args[$key]);
- if (is_string($handler))
+ if (is_string($handler)) {
// Replace route pattern tokens in handler if any
- $handler=preg_replace_callback('/\{?\h*@(\w+\b)\h*\}?/',
+ $handler=preg_replace_callback('/@(\w+\b)/',
function($id) use($args) {
return isset($args[$id[1]])?$args[$id[1]]:$id[0];
},
$handler
);
+ if (preg_match('/(.+)\h*(?:->|::)/',$handler,$match) &&
+ !class_exists($match[1]))
+ $this->error(404);
+ }
// Capture values of route pattern tokens
$this->hive['PARAMS']=$args=array_map('urldecode',$args);
// Save matching route
@@ -1342,7 +1344,7 @@ function call($func,$args=NULL,$hooks='') {
preg_match('/(.+)\h*(->|::)\h*(.+)/s',$func,$parts)) {
// Convert string to executable PHP callback
if (!class_exists($parts[1]))
- $this->error(500,sprintf(self::E_Class,
+ user_error(sprintf(self::E_Class,
is_string($func)?$parts[1]:$this->stringify()));
if ($parts[2]=='->')
$parts[1]=is_subclass_of($parts[1],'Prefab')?
@@ -1350,10 +1352,10 @@ function call($func,$args=NULL,$hooks='') {
new $parts[1]($this);
$func=array($parts[1],$parts[3]);
}
- if (!is_callable($func) && $hooks=='beforeroute,afterroute')
+ if (!is_callable($func))
// No route handler
- $this->error(500,sprintf(self::E_Method,
- is_string($func)?$parts[0]:$this->stringify($func)));
+ user_error(sprintf(self::E_Method,
+ is_string($func)?$func:$this->stringify($func)));
$obj=FALSE;
if (is_array($func)) {
$hooks=$this->split($hooks);
@@ -1411,42 +1413,39 @@ function relay($funcs,$args=NULL) {
function config($file) {
preg_match_all(
'/(?<=^|\n)(?:'.
- '(?:;[^\n]*)|(?:<\?php.+?\?>?)|'.
- '(?:\[(.+?)\])|'.
- '(.+?)\h*=\h*'.
- '((?:\\\\\h*\r?\n|.+?)*)'.
+ '\[(?