From 9afce1fe980000d5be639a37c1bfc260c2346025 Mon Sep 17 00:00:00 2001 From: Bong Cosca Date: Fri, 8 Aug 2014 17:21:48 +0800 Subject: [PATCH] 3.3.0-Release --- lib/api/annotated.html | 92 +++--- lib/api/classAudit-members.html | 6 +- lib/api/classAudit.html | 45 ++- lib/api/classAuth-members.html | 6 +- lib/api/classAuth.html | 36 +-- lib/api/classBase-members.html | 95 ++++--- lib/api/classBase.html | 266 +++++++----------- lib/api/classBasket-members.html | 6 +- lib/api/classBasket.html | 63 ++--- lib/api/classBcrypt-members.html | 6 +- lib/api/classBcrypt.html | 17 +- lib/api/classCache-members.html | 6 +- lib/api/classCache.html | 33 +-- lib/api/classDB_1_1Cursor-members.html | 39 +-- lib/api/classDB_1_1Cursor.html | 120 ++++---- lib/api/classDB_1_1Jig-members.html | 6 +- lib/api/classDB_1_1Jig.html | 38 +-- lib/api/classDB_1_1Jig_1_1Mapper-members.html | 41 +-- lib/api/classDB_1_1Jig_1_1Mapper.html | 79 ++---- .../classDB_1_1Jig_1_1Session-members.html | 49 ++-- lib/api/classDB_1_1Jig_1_1Session.html | 57 ++-- lib/api/classDB_1_1Mongo-members.html | 14 +- lib/api/classDB_1_1Mongo.html | 77 +++-- .../classDB_1_1Mongo_1_1Mapper-members.html | 41 +-- lib/api/classDB_1_1Mongo_1_1Mapper.html | 82 +++--- .../classDB_1_1Mongo_1_1Session-members.html | 49 ++-- lib/api/classDB_1_1Mongo_1_1Session.html | 57 ++-- lib/api/classDB_1_1SQL-members.html | 6 +- lib/api/classDB_1_1SQL.html | 68 ++--- lib/api/classDB_1_1SQL_1_1Mapper-members.html | 45 +-- lib/api/classDB_1_1SQL_1_1Mapper.html | 91 +++--- .../classDB_1_1SQL_1_1Session-members.html | 53 ++-- lib/api/classDB_1_1SQL_1_1Session.html | 63 ++--- lib/api/classF3-members.html | 6 +- lib/api/classF3.html | 11 +- lib/api/classISO-members.html | 6 +- lib/api/classISO.html | 15 +- lib/api/classImage-members.html | 8 +- lib/api/classImage.html | 118 ++++---- lib/api/classLog-members.html | 6 +- lib/api/classLog.html | 17 +- lib/api/classMagic-members.html | 6 +- lib/api/classMagic.html | 42 +-- lib/api/classMarkdown-members.html | 6 +- lib/api/classMarkdown.html | 67 ++--- lib/api/classMatrix-members.html | 6 +- lib/api/classMatrix.html | 21 +- lib/api/classPrefab-members.html | 6 +- lib/api/classPrefab.html | 9 +- lib/api/classPreview-members.html | 6 +- lib/api/classPreview.html | 22 +- lib/api/classRegistry-members.html | 6 +- lib/api/classRegistry.html | 18 +- lib/api/classSMTP-members.html | 6 +- lib/api/classSMTP.html | 54 ++-- lib/api/classSession-members.html | 6 +- lib/api/classSession.html | 41 +-- lib/api/classTemplate-members.html | 6 +- lib/api/classTemplate.html | 62 ++-- lib/api/classTest-members.html | 6 +- lib/api/classTest.html | 20 +- lib/api/classUTF-members.html | 6 +- lib/api/classUTF.html | 48 ++-- lib/api/classView-members.html | 6 +- lib/api/classView.html | 20 +- lib/api/classWeb-members.html | 6 +- lib/api/classWeb.html | 56 ++-- lib/api/classWeb_1_1Geo-members.html | 6 +- lib/api/classWeb_1_1Geo.html | 15 +- ...assWeb_1_1Google_1_1StaticMap-members.html | 6 +- lib/api/classWeb_1_1Google_1_1StaticMap.html | 16 +- lib/api/classWeb_1_1OpenID-members.html | 6 +- lib/api/classWeb_1_1OpenID.html | 34 +-- lib/api/classWeb_1_1Pingback-members.html | 6 +- lib/api/classWeb_1_1Pingback.html | 23 +- lib/api/classes.html | 10 +- .../dir_3a960e52dd9a2c9686c19ff6ef19d5fb.html | 6 +- .../dir_562abdcd8625d4bf7bad2fe6fe01354c.html | 6 +- .../dir_60985a986063d10a97c0bb7f42d76d6f.html | 6 +- .../dir_826b1e4cd13f4e7f528ca52e638927e5.html | 6 +- .../dir_9d4753e6cb22f68b75f0462ac2496f38.html | 6 +- .../dir_ce5981f09099a3fa6071b9eb8fe67a2c.html | 6 +- lib/api/doxygen_8h_source.html | 6 +- lib/api/dynsections.js | 54 ++-- lib/api/functions.html | 10 +- lib/api/functions__.html | 9 +- lib/api/functions_a.html | 6 +- lib/api/functions_b.html | 6 +- lib/api/functions_c.html | 6 +- lib/api/functions_d.html | 9 +- lib/api/functions_e.html | 6 +- lib/api/functions_f.html | 6 +- lib/api/functions_func.html | 9 +- lib/api/functions_func_a.html | 6 +- lib/api/functions_func_b.html | 6 +- lib/api/functions_func_c.html | 6 +- lib/api/functions_func_d.html | 9 +- lib/api/functions_func_e.html | 6 +- lib/api/functions_func_f.html | 6 +- lib/api/functions_func_g.html | 6 +- lib/api/functions_func_h.html | 6 +- lib/api/functions_func_i.html | 6 +- lib/api/functions_func_j.html | 6 +- lib/api/functions_func_l.html | 9 +- lib/api/functions_func_m.html | 6 +- lib/api/functions_func_n.html | 6 +- lib/api/functions_func_o.html | 8 +- lib/api/functions_func_p.html | 6 +- lib/api/functions_func_q.html | 6 +- lib/api/functions_func_r.html | 9 +- lib/api/functions_func_s.html | 6 +- lib/api/functions_func_t.html | 6 +- lib/api/functions_func_u.html | 6 +- lib/api/functions_func_v.html | 6 +- lib/api/functions_func_w.html | 6 +- lib/api/functions_g.html | 6 +- lib/api/functions_h.html | 6 +- lib/api/functions_i.html | 6 +- lib/api/functions_j.html | 6 +- lib/api/functions_l.html | 9 +- lib/api/functions_m.html | 6 +- lib/api/functions_n.html | 6 +- lib/api/functions_o.html | 8 +- lib/api/functions_p.html | 6 +- lib/api/functions_q.html | 6 +- lib/api/functions_r.html | 9 +- lib/api/functions_s.html | 6 +- lib/api/functions_t.html | 6 +- lib/api/functions_u.html | 6 +- lib/api/functions_v.html | 6 +- lib/api/functions_vars.html | 10 +- lib/api/functions_w.html | 6 +- lib/api/hierarchy.html | 85 +++--- lib/api/index.html | 6 +- lib/base.php | 119 ++++---- lib/changelog.txt | 31 ++ lib/db/cursor.php | 8 + lib/db/jig/mapper.php | 4 +- lib/db/mongo.php | 18 +- lib/db/mongo/mapper.php | 14 +- lib/db/sql.php | 6 +- lib/db/sql/mapper.php | 6 +- lib/image.php | 22 +- lib/template.php | 14 +- lib/web.php | 6 +- 145 files changed, 1562 insertions(+), 1816 deletions(-) diff --git a/lib/api/annotated.html b/lib/api/annotated.html index 3f8e73f97..9fd19f6ec 100644 --- a/lib/api/annotated.html +++ b/lib/api/annotated.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class List @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@ - +
@@ -37,49 +37,49 @@
Here are the classes, structs, unions and interfaces with brief descriptions:
[detail level 123]
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
oNDB
|oNJig
||oCMapperFlat-file DB mapper
||\CSessionJig-managed session handler
|oNMongo
||oCMapperMongoDB mapper
||\CSessionMongoDB-managed session handler
|oNSQL
||oCMapperSQL data mapper
||\CSessionSQL-managed session handler
|oCCursorSimple cursor implementation
|oCJigFlat-file DB wrapper
|oCMongoMongoDB wrapper
|\CSQLPDO wrapper
oNWeb
|oNGoogle
||\CStaticMapGoogle Static Maps API v2 plug-in
|oCGeoGeo plug-in
|oCOpenIDOpenID consumer
|\CPingbackPingback 1.0 protocol (client and server) implementation
oCAuditData validator
oCAuthAuthorization/authentication plug-in
oCBaseBase structure
oCBasketSession-based pseudo-mapper
oCBcryptLightweight password hashing library
oCCacheCache engine
oCF3Legacy mode enabler
oCImageImage manipulation tools
oCISOISO language/country codes
oCLogCustom logger
oCMagicPHP magic wrapper
oCMarkdownMarkdown-to-HTML converter
oCMatrixGeneric array utilities
oCPrefabFactory class for single-instance objects
oCPreviewLightweight template engine
oCRegistryContainer for singular object instances
oCSessionCache-based session handler
oCSMTPSMTP plug-in
oCTemplateXML-style template engine
oCTestUnit test kit
oCUTFUnicode string manager
oCViewView handler
\CWebWrapper for various HTTP utilities
 ▼NDB
 ▼NJig
 CMapperFlat-file DB mapper
 CSessionJig-managed session handler
 ▼NMongo
 CMapperMongoDB mapper
 CSessionMongoDB-managed session handler
 ▼NSQL
 CMapperSQL data mapper
 CSessionSQL-managed session handler
 CCursorSimple cursor implementation
 CJigFlat-file DB wrapper
 CMongoMongoDB wrapper
 CSQLPDO wrapper
 ▼NWeb
 ▼NGoogle
 CStaticMapGoogle Static Maps API v2 plug-in
 CGeoGeo plug-in
 COpenIDOpenID consumer
 CPingbackPingback 1.0 protocol (client and server) implementation
 CAuditData validator
 CAuthAuthorization/authentication plug-in
 CBaseBase structure
 CBasketSession-based pseudo-mapper
 CBcryptLightweight password hashing library
 CCacheCache engine
 CF3Legacy mode enabler
 CImageImage manipulation tools
 CISOISO language/country codes
 CLogCustom logger
 CMagicPHP magic wrapper
 CMarkdownMarkdown-to-HTML converter
 CMatrixGeneric array utilities
 CPrefabFactory class for single-instance objects
 CPreviewLightweight template engine
 CRegistryContainer for singular object instances
 CSessionCache-based session handler
 CSMTPSMTP plug-in
 CTemplateXML-style template engine
 CTestUnit test kit
 CUTFUnicode string manager
 CViewView handler
 CWebWrapper for various HTTP utilities
diff --git a/lib/api/classAudit-members.html b/lib/api/classAudit-members.html index 2e6813a9f..857993665 100644 --- a/lib/api/classAudit-members.html +++ b/lib/api/classAudit-members.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Member List @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
diff --git a/lib/api/classAudit.html b/lib/api/classAudit.html index f4c147c54..f166d2dff 100644 --- a/lib/api/classAudit.html +++ b/lib/api/classAudit.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Audit Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
@@ -117,8 +117,7 @@
-

Return credit card type if number is valid

-
Returns
string|FALSE
+

Return credit card type if number is valid

Returns
string|FALSE
Parameters
@@ -151,8 +150,7 @@
$idstring
-

Return TRUE if string is a valid e-mail address; Check DNS MX records if specified

-
Returns
bool
+

Return TRUE if string is a valid e-mail address; Check DNS MX records if specified

Returns
bool
Parameters
@@ -176,8 +174,7 @@
$strstring
-

Return entropy estimate of a password (NIST 800-63)

-
Returns
int|float
+

Return entropy estimate of a password (NIST 800-63)

Returns
int|float
Parameters
@@ -200,8 +197,7 @@
$strstring
-

Return TRUE if string is a valid IPV4 address

-
Returns
bool
+

Return TRUE if string is a valid IPV4 address

Returns
bool
Parameters
@@ -224,8 +220,7 @@
$addrstring
-

Return TRUE if string is a valid IPV6 address

-
Returns
bool
+

Return TRUE if string is a valid IPV6 address

Returns
bool
Parameters
@@ -247,8 +242,7 @@
$addrstring
-

Return TRUE if user agent is a Web bot

-
Returns
bool
+

Return TRUE if user agent is a Web bot

Returns
bool
@@ -264,8 +258,7 @@
-

Return TRUE if user agent is a desktop browser

-
Returns
bool
+

Return TRUE if user agent is a desktop browser

Returns
bool
@@ -281,8 +274,7 @@
-

Return TRUE if user agent is a mobile device

-
Returns
bool
+

Return TRUE if user agent is a mobile device

Returns
bool
@@ -299,8 +291,7 @@
-

Return TRUE if IP address is within private range

-
Returns
bool
+

Return TRUE if IP address is within private range

Returns
bool
Parameters
@@ -323,8 +314,7 @@
$addrstring
-

Return TRUE if IP address is neither private nor reserved

-
Returns
bool
+

Return TRUE if IP address is neither private nor reserved

Returns
bool
Parameters
@@ -347,8 +337,7 @@
$addrstring
-

Return TRUE if IP address is within reserved range

-
Returns
bool
+

Return TRUE if IP address is within reserved range

Returns
bool
Parameters
@@ -371,8 +360,7 @@
$addrstring
-

Return TRUE if specified ID has a valid (Luhn) Mod-10 check digit

-
Returns
bool
+

Return TRUE if specified ID has a valid (Luhn) Mod-10 check digit

Returns
bool
Parameters
@@ -395,8 +383,7 @@
$idstring
-

Return TRUE if string is a valid URL

-
Returns
bool
+

Return TRUE if string is a valid URL

Returns
bool
Parameters
diff --git a/lib/api/classAuth-members.html b/lib/api/classAuth-members.html index cd14f209f..9d87f772a 100644 --- a/lib/api/classAuth-members.html +++ b/lib/api/classAuth-members.html @@ -4,7 +4,7 @@ - +Fat-Free Framework: Member List @@ -19,7 +19,7 @@ @@ -28,7 +28,7 @@
$strstring
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
- +
diff --git a/lib/api/classAuth.html b/lib/api/classAuth.html index 43f1d2e92..27fb8d92b 100644 --- a/lib/api/classAuth.html +++ b/lib/api/classAuth.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Auth Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
@@ -58,11 +58,11 @@ Public Attributes  $mapper - Mapper object.
+ Mapper object.
   $args - Storage options.
+ Storage options.
 
@@ -89,7 +89,7 @@ Protected Attributes  $storage - Auth storage.
+ Auth storage.
 

Detailed Description

@@ -118,8 +118,7 @@
-

Instantiate class

-
Returns
object
+

Instantiate class

Returns
object
Parameters
@@ -168,8 +167,7 @@

Member Function Documentation

$storagestring|object
-

Jig storage handler

-
Returns
bool
+

Jig storage handler

Returns
bool
Parameters
@@ -212,8 +210,7 @@

Member Function Documentation

$idstring
-

LDAP storage handler

-
Returns
bool
+

LDAP storage handler

Returns
bool
Parameters
@@ -261,8 +258,7 @@

Member Function Documentation

$idstring
-

MongoDB storage handler

-
Returns
bool
+

MongoDB storage handler

Returns
bool
Parameters
@@ -305,8 +301,7 @@

Member Function Documentation

$idstring
-

SMTP storage handler

-
Returns
bool
+

SMTP storage handler

Returns
bool
Parameters
@@ -354,8 +349,7 @@

Member Function Documentation

$idstring
-

SQL storage handler

-
Returns
bool
+

SQL storage handler

Returns
bool
Parameters
@@ -380,8 +374,7 @@

Member Function Documentation

$idstring
-

HTTP basic auth mechanism

-
Returns
bool
+

HTTP basic auth mechanism

Returns
bool
Parameters
@@ -420,8 +413,7 @@

Member Function Documentation

$funccallback
-

Login auth mechanism

-
Returns
bool
+

Login auth mechanism

Returns
bool
Parameters
diff --git a/lib/api/classBase-members.html b/lib/api/classBase-members.html index d1bbc8efd..3202e49b7 100644 --- a/lib/api/classBase-members.html +++ b/lib/api/classBase-members.html @@ -4,7 +4,7 @@ - +Fat-Free Framework: Member List @@ -19,7 +19,7 @@ @@ -28,7 +28,7 @@
$idstring
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
- +
@@ -41,27 +41,25 @@ $fallbackBase $initBase $languagesBase - $nullBase - __construct()Base - autoload($class)Baseprotected - base64($data, $mime)Base - blacklisted($ip)Base - build($url)Base - call($func, $args=NULL, $hooks='')Base - camelcase($str)Base - chain($funcs, $args=NULL)Base - clean($arg, $tags=NULL)Base - clear($key)Base - compile($str)Base - concat($key, $val)Base - config($file)Base - copy($src, $dst)Base - CSSBase - csv(array $args)Base - decode($str)Base - devoid($key)Base - dump($expr)Base - dupe($arg)Base + __construct()Base + autoload($class)Baseprotected + base64($data, $mime)Base + blacklisted($ip)Base + build($url)Base + call($func, $args=NULL, $hooks='')Base + camelcase($str)Base + chain($funcs, $args=NULL)Base + clean($arg, $tags=NULL)Base + clear($key)Base + compile($str)Base + concat($key, $val)Base + config($file)Base + copy($src, $dst)Base + CSSBase + csv(array $args)Base + decode($str)Base + devoid($key)Base + dump($expr)Base E_Class (defined in Base)Base E_Fatal (defined in Base)Base E_Hive (defined in Base)Base @@ -137,28 +135,29 @@ push($key, $val)Base read($file, $lf=FALSE)Base recursive($arg, $func, $stack=NULL)Base - ref($key, $add=TRUE)Base - rel($url)Base - relay($funcs, $args=NULL)Base - REQ_AJAX (defined in Base)Base - REQ_SYNC (defined in Base)Base - reroute($url, $permanent=FALSE)Base - route($pattern, $handler, $ttl=0, $kbps=0)Base - run()Base - scrub(&$var, $tags=NULL)Base - serialize($arg)Base - set($key, $val, $ttl=0)Base - shift($key)Base - sign($num)Base - snakecase($str)Base - split($str)Base - status($code)Base - stringify($arg, array $stack=NULL)Base - sync($key)Base - unload($cwd)Base - unserialize($arg)Base - unshift($key, $val)Base - VERBSBase - VERSION (defined in Base)Base - write($file, $data, $append=FALSE)Base + redirect($pattern, $url)Base + ref($key, $add=TRUE)Base + rel($url)Base + relay($funcs, $args=NULL)Base + REQ_AJAX (defined in Base)Base + REQ_SYNC (defined in Base)Base + reroute($url, $permanent=FALSE)Base + route($pattern, $handler, $ttl=0, $kbps=0)Base + run()Base + scrub(&$var, $tags=NULL)Base + serialize($arg)Base + set($key, $val, $ttl=0)Base + shift($key)Base + sign($num)Base + snakecase($str)Base + split($str)Base + status($code)Base + stringify($arg, array $stack=NULL)Base + sync($key)Base + unload($cwd)Base + unserialize($arg)Base + unshift($key, $val)Base + VERBSBase + VERSION (defined in Base)Base + write($file, $data, $append=FALSE)Base
diff --git a/lib/api/classBase.html b/lib/api/classBase.html index d12b85c4a..5ac0cde43 100644 --- a/lib/api/classBase.html +++ b/lib/api/classBase.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Base Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
@@ -119,8 +119,6 @@    decode ($str)   - dupe ($arg) -   recursive ($arg, $func, $stack=NULL)    clean ($arg, $tags=NULL) @@ -151,6 +149,8 @@    map ($url, $class, $ttl=0, $kbps=0)   + redirect ($pattern, $url) +   blacklisted ($ip)    run () @@ -179,49 +179,45 @@    __construct () - Bootstrap.
+ Bootstrap.
  - + - + - + - + - + - + - + - - - +const 

Public Attributes

const GLOBALS ='GET|POST|COOKIE|REQUEST|SESSION|FILES|SERVER|ENV'
 Mapped PHP globals.
 Mapped PHP globals.
 
const VERBS ='GET|HEAD|POST|PUT|PATCH|DELETE|CONNECT'
 HTTP verbs.
 HTTP verbs.
 
const MODE =0755
 Default directory permissions.
 Default directory permissions.
 
const CSS ='code.css'
 Syntax highlighting stylesheet.
 Syntax highlighting stylesheet.
 
 $init
 Initial settings.
 Initial settings.
 
 $languages
 Language lookup sequence.
 Language lookup sequence.
 
 $fallback ='en'
 Default fallback language.
 Default fallback language.
 
- $null =NULL
 NULL reference.
 
const PACKAGE ='Fat-Free Framework'
 
-const VERSION ='3.2.2-Release'
VERSION ='3.3.0-Release'
 
@@ -412,8 +408,7 @@
-

Namespace-aware class autoloader

-
Returns
mixed
+

Namespace-aware class autoloader

Returns
mixed
Parameters
@@ -446,8 +441,7 @@
$classstring
-

Return Base64-encoded equivalent

-
Returns
string
+

Return Base64-encoded equivalent

Returns
string
Parameters
@@ -471,8 +465,7 @@
$datastring
-

Return TRUE if IPv4 address exists in DNSBL

-
Returns
bool
+

Return TRUE if IPv4 address exists in DNSBL

Returns
bool
Parameters
@@ -495,8 +488,7 @@
$ipstring
-

Replace tokenized URL with current route's token values

-
Returns
string
+

Replace tokenized URL with current route's token values

Returns
string
Parameters
@@ -535,8 +527,7 @@
$urlarray|string
-

Execute callback/hooks (supports 'class->method' format)

-
Returns
mixed|FALSE
+

Execute callback/hooks (supports 'class->method' format)

Returns
mixed|FALSE
Parameters
@@ -561,8 +552,7 @@
$funccallback
-

Convert snakecase string to camelcase

-
Returns
string
+

Convert snakecase string to camelcase

Returns
string
Parameters
@@ -595,8 +585,7 @@
$strstring
-

Execute specified callbacks in succession; Apply same arguments to all callbacks

-
Returns
array
+

Execute specified callbacks in succession; Apply same arguments to all callbacks

Returns
array
Parameters
@@ -630,8 +619,7 @@
$funcsarray|string
-

Remove HTML tags (except those enumerated) and non-printable characters to mitigate XSS/code injection attacks

-
Returns
mixed
+

Remove HTML tags (except those enumerated) and non-printable characters to mitigate XSS/code injection attacks

Returns
mixed
Parameters
@@ -655,8 +643,7 @@
$argmixed
-

Unset hive key

-
Returns
NULL
+

Unset hive key

Returns
NULL
Parameters
@@ -679,8 +666,7 @@
$keystring
-

Convert JS-style token to PHP expression

-
Returns
string
+

Convert JS-style token to PHP expression

Returns
string
Parameters
@@ -713,8 +699,7 @@
$strstring
-

Concatenate string to hive string variable

-
Returns
string
+

Concatenate string to hive string variable

Returns
string
Parameters
@@ -738,8 +723,7 @@
$keystring
-

Configure framework according to .ini-style file settings

-
Returns
NULL
+

Configure framework according to .ini-style file settings

Returns
NULL
Parameters
@@ -772,8 +756,7 @@
$filestring
-

Copy contents of hive variable to another

-
Returns
mixed
+

Copy contents of hive variable to another

Returns
mixed
Parameters
@@ -797,8 +780,7 @@
$srcstring
-

Flatten array values and return as CSV string

-
Returns
string
+

Flatten array values and return as CSV string

Returns
string
Parameters
@@ -821,8 +803,7 @@
$argsarray
-

Convert HTML entities back to characters

-
Returns
string
+

Convert HTML entities back to characters

Returns
string
Parameters
@@ -845,8 +826,7 @@
$strstring
-

Return TRUE if hive key is empty and not cached

-
Returns
bool
+

Return TRUE if hive key is empty and not cached

Returns
bool
Parameters
@@ -869,8 +849,7 @@
$keystring
-

Dump expression with syntax highlighting

-
Returns
NULL
+

Dump expression with syntax highlighting

Returns
NULL
Parameters
@@ -878,26 +857,6 @@ - - - -
-
-
$exprmixed
- - - - - - - -
Base::dupe ( $arg)
-
-

Attempt to clone object

-
Returns
object
-
-$arg object
-
@@ -913,8 +872,7 @@
-

Convert special characters to HTML entities

-
Returns
string
+

Convert special characters to HTML entities

Returns
string
Parameters
@@ -953,8 +911,7 @@
$strstring
-

Log error; Execute ONERROR handler if defined, else display default error page (HTML for synchronous requests, JSON string for AJAX requests)

-
Returns
NULL
+

Log error; Execute ONERROR handler if defined, else display default error page (HTML for synchronous requests, JSON string for AJAX requests)

Returns
NULL
Parameters
@@ -989,8 +946,7 @@
$codeint
-

Return TRUE if hive key is not set (or return timestamp and TTL if cached)

-
Returns
bool
+

Return TRUE if hive key is set (or return timestamp and TTL if cached)

Returns
bool
Parameters
@@ -1014,8 +970,7 @@
$keystring
-

Send cache metadata to HTTP client

-
Returns
NULL
+

Send cache metadata to HTTP client

Returns
NULL
Parameters
@@ -1038,8 +993,7 @@
$secsint
-

Convert backslashes to slashes

-
Returns
string
+

Convert backslashes to slashes

Returns
string
Parameters
@@ -1062,8 +1016,7 @@
$strstring
-

Swap keys and values of hive array variable

-
Returns
array
+

Swap keys and values of hive array variable

Returns
array
Parameters
@@ -1085,8 +1038,7 @@
$keystring
-

Return locale-aware formatted string

-
Returns
string
+

Return locale-aware formatted string

Returns
string
@@ -1113,8 +1065,7 @@
-

Retrieve contents of hive key

-
Returns
mixed
+

Retrieve contents of hive key

Returns
mixed
Parameters
@@ -1138,8 +1089,7 @@
$keystring
-

Generate 64bit/base36 hash

-
Returns
string
+

Generate 64bit/base36 hash

Returns
string
Parameters
@@ -1162,8 +1112,7 @@
$str
-

Apply syntax highlighting

-
Returns
string
+

Apply syntax highlighting

Returns
string
Parameters
@@ -1185,8 +1134,7 @@
$textstring
-

Publish hive contents

-
Returns
array
+

Publish hive contents

Returns
array
@@ -1203,8 +1151,7 @@
-

Assign/auto-detect language

-
Returns
string
+

Assign/auto-detect language

Returns
string
Parameters
@@ -1227,8 +1174,7 @@
$codestring
-

Transfer lexicon entries to hive

-
Returns
array
+

Transfer lexicon entries to hive

Returns
array
Parameters
@@ -1273,8 +1219,7 @@
$pathstring
-

Provide ReST interface by mapping HTTP verb to class method

-
Returns
NULL
+

Provide ReST interface by mapping HTTP verb to class method

Returns
NULL
Parameters
@@ -1310,8 +1255,7 @@
$urlstring
-

Merge array with hive array variable

-
Returns
array
+

Merge array with hive array variable

Returns
array
Parameters
@@ -1357,8 +1301,7 @@
$keystring
-

Mock HTTP request

-
Returns
NULL
+

Mock HTTP request

Returns
NULL
Parameters
@@ -1400,8 +1343,7 @@
$patternstring
-

Multi-variable assignment using associative array

-
Returns
NULL
+

Multi-variable assignment using associative array

Returns
NULL
Parameters
@@ -1442,8 +1384,7 @@
$varsarray
-

Create mutex, invoke callback then drop ownership when done

-
Returns
mixed
+

Create mutex, invoke callback then drop ownership when done

Returns
mixed
Parameters
@@ -1468,8 +1409,7 @@
$idstring
-

Parse string containing key-value pairs and use as routing tokens

-
Returns
NULL
+

Parse string containing key-value pairs and use as routing tokens

Returns
NULL
Parameters
@@ -1492,8 +1432,7 @@
$strstring
-

Remove last element of hive array variable

-
Returns
mixed
+

Remove last element of hive array variable

Returns
mixed
Parameters
@@ -1526,8 +1465,7 @@
$keystring
-

Add element to the end of hive array variable

-
Returns
mixed
+

Add element to the end of hive array variable

Returns
mixed
Parameters
@@ -1561,8 +1499,7 @@
$keystring
-

Read file (with option to apply Unix LF as standard line ending)

-
Returns
string
+

Read file (with option to apply Unix LF as standard line ending)

Returns
string
Parameters
@@ -1602,8 +1539,7 @@
$filestring
-

Invoke callback recursively for all data types

-
Returns
mixed
+

Invoke callback recursively for all data types

Returns
mixed
Parameters
@@ -1613,6 +1549,40 @@ + + + +
+
+
$argmixed
+ + + + + + + + + + + + + + + + + +
Base::redirect ( $pattern,
 $url 
)
+
+

Redirect a route to another URL

Returns
NULL
+
Parameters
+ + + +
$patternstring|array
$urlstring
+
+
+
@@ -1638,8 +1608,7 @@
-

Get hive key reference/contents; Add non-existent hive keys, array elements, and object properties by default

-
Returns
mixed
+

Get hive key reference/contents; Add non-existent hive keys, array elements, and object properties by default

Returns
mixed
Parameters
@@ -1663,8 +1632,7 @@
$keystring
-

Return path relative to the base directory

-
Returns
string
+

Return path relative to the base directory

Returns
string
Parameters
@@ -1697,8 +1665,7 @@
$urlstring
-

Execute specified callbacks in succession; Relay result of previous callback as argument to the next callback

-
Returns
array
+

Execute specified callbacks in succession; Relay result of previous callback as argument to the next callback

Returns
array
Parameters
@@ -1732,8 +1699,7 @@
$funcsarray|string
-

Reroute to specified URI

-
Returns
NULL
+

Reroute to specified URI

Returns
NULL
Parameters
@@ -1779,8 +1745,7 @@
$urlstring
-

Bind handler to route pattern

-
Returns
NULL
+

Bind handler to route pattern

Returns
NULL
Parameters
@@ -1805,8 +1770,7 @@
$patternstring|array
-

Match routes against incoming URI

-
Returns
NULL
+

Match routes against incoming URI

Returns
NULL
@@ -1833,8 +1797,7 @@
-

Similar to clean(), except that variable is passed by reference

-
Returns
mixed
+

Similar to clean(), except that variable is passed by reference

Returns
mixed
Parameters
@@ -1858,8 +1821,7 @@
$varmixed
-

Return string representation of PHP value

-
Returns
string
+

Return string representation of PHP value

Returns
string
Parameters
@@ -1898,8 +1860,7 @@
$argmixed
-

Bind value to hive key

-
Returns
mixed
+

Bind value to hive key

Returns
mixed
Parameters
@@ -1924,8 +1885,7 @@
$keystring
-

Remove first element of hive array variable

-
Returns
mixed
+

Remove first element of hive array variable

Returns
mixed
Parameters
@@ -1948,8 +1908,7 @@
$keystring
-

Return -1 if specified number is negative, 0 if zero, or 1 if the number is positive

-
Returns
int
+

Return -1 if specified number is negative, 0 if zero, or 1 if the number is positive

Returns
int
Parameters
@@ -1972,8 +1931,7 @@
$nummixed
-

Convert camelcase string to snakecase

-
Returns
string
+

Convert camelcase string to snakecase

Returns
string
Parameters
@@ -1996,8 +1954,7 @@
$strstring
-

Split comma-, semi-colon, or pipe-separated string

-
Returns
array
+

Split comma-, semi-colon, or pipe-separated string

Returns
array
Parameters
@@ -2020,8 +1977,7 @@
$strstring
-

Send HTTP/1.1 status header; Return text equivalent of status code

-
Returns
string
+

Send HTTP/1.1 status header; Return text equivalent of status code

Returns
string
Parameters
@@ -2054,8 +2010,7 @@
$codeint
-

Convert PHP expression/value to compressed exportable string

-
Returns
string
+

Convert PHP expression/value to compressed exportable string

Returns
string
Parameters
@@ -2079,8 +2034,7 @@
$argmixed
-

Sync PHP global with corresponding hive key

-
Returns
array
+

Sync PHP global with corresponding hive key

Returns
array
Parameters
@@ -2103,8 +2057,7 @@
$keystring
-

Execute framework/application shutdown sequence

-
Returns
NULL
+

Execute framework/application shutdown sequence

Returns
NULL
Parameters
@@ -2127,8 +2080,7 @@
$cwdstring
-

Return PHP value derived from string

-
Returns
string
+

Return PHP value derived from string

Returns
string
Parameters
@@ -2161,8 +2113,7 @@
$argmixed
-

Add element to the beginning of hive array variable

-
Returns
mixed
+

Add element to the beginning of hive array variable

Returns
mixed
Parameters
@@ -2202,8 +2153,7 @@
$keystring
-

Exclusive file write

-
Returns
int|FALSE
+

Exclusive file write

Returns
int|FALSE
Parameters
diff --git a/lib/api/classBasket-members.html b/lib/api/classBasket-members.html index c795886ba..ad70f434f 100644 --- a/lib/api/classBasket-members.html +++ b/lib/api/classBasket-members.html @@ -4,7 +4,7 @@ - +Fat-Free Framework: Member List @@ -19,7 +19,7 @@ @@ -28,7 +28,7 @@
$filestring
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
- +
diff --git a/lib/api/classBasket.html b/lib/api/classBasket.html index bb730b24a..02e1e7d3b 100644 --- a/lib/api/classBasket.html +++ b/lib/api/classBasket.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Basket Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
@@ -85,11 +85,11 @@ Public Attributes  $id - Current item identifier.
+ Current item identifier.
   $item =array() - Current item contents.
+ Current item contents.
 
@@ -100,7 +100,7 @@ Protected Attributes  $key - Session key.
+ Session key.
 

Detailed Description

@@ -119,8 +119,7 @@
-

Instantiate class

-
Returns
void
+

Instantiate class

Returns
void
Parameters
@@ -143,8 +142,7 @@

Member Function Documentation

$keystring
-

Check out basket contents

-
Returns
array
+

Check out basket contents

Returns
array
@@ -161,8 +159,7 @@

Member Function Documentation

-

Delete field

-
Returns
NULL
+

Delete field

Returns
NULL
Parameters
@@ -185,8 +182,7 @@

Member Function Documentation

$keystring
-

Hydrate item using hive array variable

-
Returns
NULL
+

Hydrate item using hive array variable

Returns
NULL
Parameters
@@ -209,8 +205,7 @@

Member Function Documentation

$keystring
-

Populate hive array variable with item contents

-
Returns
NULL
+

Populate hive array variable with item contents

Returns
NULL
Parameters
@@ -232,8 +227,7 @@

Member Function Documentation

$keystring
-

Return number of items in basket

-
Returns
int
+

Return number of items in basket

Returns
int
@@ -249,8 +243,7 @@

Member Function Documentation

-

Empty basket

-
Returns
NULL
+

Empty basket

Returns
NULL
@@ -266,8 +259,7 @@

Member Function Documentation

-

Return TRUE if current item is empty/undefined

-
Returns
bool
+

Return TRUE if current item is empty/undefined

Returns
bool
@@ -294,8 +286,7 @@

Member Function Documentation

-

Erase item matching key/value pair

-
Returns
bool
+

Erase item matching key/value pair

Returns
bool
Parameters
@@ -319,8 +310,7 @@

Member Function Documentation

$keystring
-

Return TRUE if field is defined

-
Returns
bool
+

Return TRUE if field is defined

Returns
bool
Parameters
@@ -353,8 +343,7 @@

Member Function Documentation

$keystring
-

Return items that match key/value pair; If no key/value pair specified, return all items

-
Returns
array|FALSE
+

Return items that match key/value pair; If no key/value pair specified, return all items

Returns
array|FALSE
Parameters
@@ -388,8 +377,7 @@

Member Function Documentation

$keystring
-

Return first item that matches key/value pair

-
Returns
object|FALSE
+

Return first item that matches key/value pair

Returns
object|FALSE
Parameters
@@ -413,8 +401,7 @@

Member Function Documentation

$keystring
-

Retrieve value of field

-
Returns
scalar|FALSE
+

Retrieve value of field

Returns
scalar|FALSE
Parameters
@@ -447,8 +434,7 @@

Member Function Documentation

$keystring
-

Map current item to matching key/value pair

-
Returns
array
+

Map current item to matching key/value pair

Returns
array
Parameters
@@ -471,8 +457,7 @@

Member Function Documentation

$keystring
-

Reset cursor

-
Returns
NULL
+

Reset cursor

Returns
NULL
@@ -488,8 +473,7 @@

Member Function Documentation

-

Save current item

-
Returns
array
+

Save current item

Returns
array
@@ -516,8 +500,7 @@

Member Function Documentation

-

Assign value to field

-
Returns
scalar|FALSE
+

Assign value to field

Returns
scalar|FALSE
Parameters
diff --git a/lib/api/classBcrypt-members.html b/lib/api/classBcrypt-members.html index d19472ee7..10d90bfcd 100644 --- a/lib/api/classBcrypt-members.html +++ b/lib/api/classBcrypt-members.html @@ -4,7 +4,7 @@ - +Fat-Free Framework: Member List @@ -19,7 +19,7 @@ @@ -28,7 +28,7 @@
$keystring
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
- +
diff --git a/lib/api/classBcrypt.html b/lib/api/classBcrypt.html index c23dd786e..6a9834a89 100644 --- a/lib/api/classBcrypt.html +++ b/lib/api/classBcrypt.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Bcrypt Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
@@ -67,7 +67,7 @@ Public Attributes const COST =10 - Default cost.
+ Default cost.
 
@@ -115,8 +115,7 @@
-

Generate bcrypt hash of string

-
Returns
string|FALSE
+

Generate bcrypt hash of string

Returns
string|FALSE
Parameters
@@ -151,8 +150,7 @@
$pwstring
-

Check if password is still strong enough

-
Returns
bool
+

Check if password is still strong enough

Returns
bool
Parameters
@@ -186,8 +184,7 @@
$hashstring
-

Verify password against hash using timing attack resistant approach

-
Returns
bool
+

Verify password against hash using timing attack resistant approach

Returns
bool
Parameters
diff --git a/lib/api/classCache-members.html b/lib/api/classCache-members.html index a8e0dcdeb..e9ab92f61 100644 --- a/lib/api/classCache-members.html +++ b/lib/api/classCache-members.html @@ -4,7 +4,7 @@ - +Fat-Free Framework: Member List @@ -19,7 +19,7 @@ @@ -28,7 +28,7 @@
$pwstring
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
- +
diff --git a/lib/api/classCache.html b/lib/api/classCache.html index b605084f1..0cde884c1 100644 --- a/lib/api/classCache.html +++ b/lib/api/classCache.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Cache Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
@@ -76,18 +76,18 @@ Public Attributes  $prefix - Prefix for cache entries.
+ Prefix for cache entries.
   $ref - MemCache or Redis object.
+ MemCache or Redis object.
  - +

Protected Attributes

 $dsn
 Cache DSN.
 Cache DSN.
 

@@ -112,8 +112,7 @@

-

Class constructor

-
Returns
object
+

Class constructor

Returns
object
Parameters
@@ -137,8 +136,7 @@

Member Function Documentation

$dsnbool|string
-

Delete cache entry

-
Returns
bool
+

Delete cache entry

Returns
bool
Parameters
@@ -171,8 +169,7 @@

Member Function Documentation

$keystring
-

Return timestamp and TTL of cache entry or FALSE if not found

-
Returns
array|FALSE
+

Return timestamp and TTL of cache entry or FALSE if not found

Returns
array|FALSE
Parameters
@@ -196,8 +193,7 @@

Member Function Documentation

$keystring
-

Retrieve value of cache entry

-
Returns
mixed|FALSE
+

Retrieve value of cache entry

Returns
mixed|FALSE
Parameters
@@ -220,8 +216,7 @@

Member Function Documentation

$keystring
-

Load/auto-detect cache backend

-
Returns
string
+

Load/auto-detect cache backend

Returns
string
Parameters
@@ -254,8 +249,7 @@

Member Function Documentation

$dsnbool|string
-

Clear contents of cache backend

-
Returns
bool
+

Clear contents of cache backend

Returns
bool
Parameters
@@ -295,8 +289,7 @@

Member Function Documentation

$suffixstring
-

Store value in cache

-
Returns
mixed|FALSE
+

Store value in cache

Returns
mixed|FALSE
Parameters
diff --git a/lib/api/classDB_1_1Cursor-members.html b/lib/api/classDB_1_1Cursor-members.html index 1eeca6f2a..e1bbbdfba 100644 --- a/lib/api/classDB_1_1Cursor-members.html +++ b/lib/api/classDB_1_1Cursor-members.html @@ -4,7 +4,7 @@ - +Fat-Free Framework: Member List @@ -19,7 +19,7 @@ @@ -28,7 +28,7 @@
$keystring
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
- + diff --git a/lib/api/classDB_1_1Cursor.html b/lib/api/classDB_1_1Cursor.html index 3bc6d709f..a53cdf947 100644 --- a/lib/api/classDB_1_1Cursor.html +++ b/lib/api/classDB_1_1Cursor.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: DB\Cursor Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
-

Define aftererase trigger

-
Returns
callback
+

Define aftererase trigger

Returns
callback
Parameters
@@ -215,8 +216,7 @@
$funccallback
-

Define afterinsert trigger

-
Returns
callback
+

Define afterinsert trigger

Returns
callback
Parameters
@@ -239,8 +239,7 @@
$funccallback
-

Define afterupdate trigger

-
Returns
callback
+

Define afterupdate trigger

Returns
callback
Parameters
@@ -263,8 +262,7 @@
$funccallback
-

Define beforeerase trigger

-
Returns
callback
+

Define beforeerase trigger

Returns
callback
Parameters
@@ -287,8 +285,7 @@
$funccallback
-

Define beforeinsert trigger

-
Returns
callback
+

Define beforeinsert trigger

Returns
callback
Parameters
@@ -311,8 +308,7 @@
$funccallback
-

Define beforeupdate trigger

-
Returns
callback
+

Define beforeupdate trigger

Returns
callback
Parameters
@@ -343,8 +339,7 @@
$funccallback
-

Return fields of mapper object as an associative array

-
Returns
array
+

Return fields of mapper object as an associative array

Returns
array
Parameters
@@ -385,8 +380,7 @@
$objobject
-

Hydrate mapper object using hive array variable

-
Returns
NULL
+

Hydrate mapper object using hive array variable

Returns
NULL
Parameters
@@ -418,8 +412,7 @@
$keystring
-

Populate hive array variable with mapper fields

-
Returns
NULL
+

Populate hive array variable with mapper fields

Returns
NULL
Parameters
@@ -460,8 +453,7 @@
$keystring
-

Count records that match criteria

-
Returns
int
+

Count records that match criteria

Returns
int
Parameters
@@ -492,8 +484,7 @@
$filterarray
-

Return database type

-
Returns
string
+

Return database type

Returns
string
@@ -509,8 +500,7 @@
-

Return TRUE if current cursor position is not mapped to any record

-
Returns
bool
+

Return TRUE if current cursor position is not mapped to any record

Returns
bool
@@ -526,8 +516,7 @@
-

Delete current record

-
Returns
int|bool
+

Delete current record

Returns
int|bool
@@ -568,8 +557,7 @@
-

Return records (array of mapper objects) that match criteria

-
Returns
array
+

Return records (array of mapper objects) that match criteria

Returns
array
Parameters
@@ -610,8 +598,7 @@
$filterstring|array
-

Return first record (mapper object) that matches criteria

-
Returns
object|FALSE
+

Return first record (mapper object) that matches criteria

Returns
object|FALSE
Parameters
@@ -635,8 +622,7 @@
$filterstring|array
-

Map to first record in cursor

-
Returns
mixed
+

Map to first record in cursor

Returns
mixed
@@ -660,8 +646,7 @@
-

Insert new record

-
Returns
array
+

Insert new record

Returns
array
@@ -677,8 +662,7 @@
-

Map to last record in cursor

-
Returns
mixed
+

Map to last record in cursor

Returns
mixed
@@ -711,8 +695,7 @@
-

Map to first record that matches criteria

-
Returns
array|FALSE
+

Map to first record that matches criteria

Returns
array|FALSE
Parameters
@@ -722,6 +705,22 @@ + + + +
+
+
$filterstring|array
+ + + + + + +
DB\Cursor::loaded ()
+
+

Return the count of records loaded

Returns
int
+
@@ -736,8 +735,7 @@
-

Map next record

-
Returns
mixed
+

Map next record

Returns
mixed
@@ -754,8 +752,7 @@
-

Define onerase trigger

-
Returns
callback
+

Define onerase trigger

Returns
callback
Parameters
@@ -778,8 +775,7 @@
$funccallback
-

Define oninsert trigger

-
Returns
callback
+

Define oninsert trigger

Returns
callback
Parameters
@@ -802,8 +798,7 @@
$funccallback
-

Define onload trigger

-
Returns
callback
+

Define onload trigger

Returns
callback
Parameters
@@ -826,8 +821,7 @@
$funccallback
-

Define onupdate trigger

-
Returns
callback
+

Define onupdate trigger

Returns
callback
Parameters
@@ -878,8 +872,7 @@
$funccallback
-

Return array containing subset of records matching criteria, total number of records in superset, specified limit, number of subsets available, and actual subset position

-
Returns
array
+

Return array containing subset of records matching criteria, total number of records in superset, specified limit, number of subsets available, and actual subset position

Returns
array
Parameters
@@ -905,8 +898,7 @@
$posint
-

Map previous record

-
Returns
mixed
+

Map previous record

Returns
mixed
@@ -922,8 +914,7 @@
-

Reset cursor

-
Returns
NULL
+

Reset cursor

Returns
NULL
@@ -939,8 +930,7 @@
-

Save mapped record

-
Returns
mixed
+

Save mapped record

Returns
mixed
@@ -957,8 +947,7 @@
-

Map to nth record relative to current cursor position

-
Returns
mixed
+

Map to nth record relative to current cursor position

Returns
mixed
Parameters
@@ -988,8 +977,7 @@
$ofsint
-

Update current record

-
Returns
array
+

Update current record

Returns
array
diff --git a/lib/api/classDB_1_1Jig-members.html b/lib/api/classDB_1_1Jig-members.html index 53e9e59f7..a31de791a 100644 --- a/lib/api/classDB_1_1Jig-members.html +++ b/lib/api/classDB_1_1Jig-members.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Member List @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@ - + - +
-

Instantiate class

-
Parameters
+

Instantiate class

Parameters
@@ -146,8 +145,7 @@

Member Function Documentation

$dirstring
$formatint
-

Return directory

-
Returns
string
+

Return directory

Returns
string
@@ -163,8 +161,7 @@

Member Function Documentation

-

Clean storage

-
Returns
NULL
+

Clean storage

Returns
NULL
@@ -181,8 +178,7 @@

Member Function Documentation

-

Jot down log entry

-
Returns
NULL
+

Jot down log entry

Returns
NULL
Parameters
@@ -204,8 +200,7 @@

Member Function Documentation

$framestring
-

Return SQL profiler results

-
Returns
string
+

Return SQL profiler results

Returns
string
@@ -222,8 +217,7 @@

Member Function Documentation

-

Read data from file

-
Returns
array
+

Read data from file

Returns
array
Parameters
@@ -245,8 +239,7 @@

Member Function Documentation

$filestring
-

Return UUID

-
Returns
string
+

Return UUID

Returns
string
@@ -273,8 +266,7 @@

Member Function Documentation

-

Write data to file

-
Returns
int
+

Write data to file

Returns
int
Parameters
diff --git a/lib/api/classDB_1_1Jig_1_1Mapper-members.html b/lib/api/classDB_1_1Jig_1_1Mapper-members.html index 5648d13a6..fb6820e47 100644 --- a/lib/api/classDB_1_1Jig_1_1Mapper-members.html +++ b/lib/api/classDB_1_1Jig_1_1Mapper-members.html @@ -4,7 +4,7 @@ - +Fat-Free Framework: Member List @@ -19,7 +19,7 @@ @@ -28,7 +28,7 @@
$filestring
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
- + diff --git a/lib/api/classDB_1_1Jig_1_1Mapper.html b/lib/api/classDB_1_1Jig_1_1Mapper.html index a208fbbf1..e497bba4a 100644 --- a/lib/api/classDB_1_1Jig_1_1Mapper.html +++ b/lib/api/classDB_1_1Jig_1_1Mapper.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: DB\Jig\Mapper Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@ - +
-

Instantiate class

-
Returns
void
+

Instantiate class

Returns
void
Parameters
@@ -283,8 +284,7 @@

Member Function Documentation

$dbobject
-

Return fields of mapper object as an associative array

-
Returns
array
+

Return fields of mapper object as an associative array

Returns
array
Parameters
@@ -307,8 +307,7 @@

Member Function Documentation

$objobject
-

Delete field

-
Returns
NULL
+

Delete field

Returns
NULL
Parameters
@@ -341,8 +340,7 @@

Member Function Documentation

$keystring
-

Hydrate mapper object using hive array variable

-
Returns
NULL
+

Hydrate mapper object using hive array variable

Returns
NULL
Parameters
@@ -366,8 +364,7 @@

Member Function Documentation

$keystring
-

Populate hive array variable with mapper fields

-
Returns
NULL
+

Populate hive array variable with mapper fields

Returns
NULL
Parameters
@@ -400,8 +397,7 @@

Member Function Documentation

$keystring
-

Count records that match criteria

-
Returns
int
+

Count records that match criteria

Returns
int
Parameters
@@ -424,8 +420,7 @@

Member Function Documentation

$filterarray
-

Return database type

-
Returns
string
+

Return database type

Returns
string
@@ -442,8 +437,7 @@

Member Function Documentation

-

Delete current record

-
Returns
bool
+

Delete current record

Returns
bool
Parameters
@@ -466,8 +460,7 @@

Member Function Documentation

$filterarray
-

Return TRUE if field is defined

-
Returns
bool
+

Return TRUE if field is defined

Returns
bool
Parameters
@@ -508,8 +501,7 @@

Member Function Documentation

$keystring
-

Convert array to mapper object

-
Returns
object
+

Convert array to mapper object

Returns
object
Parameters
@@ -532,8 +524,7 @@

Member Function Documentation

$idstring
-

Return field names

-
Returns
array
+

Return field names

Returns
array
@@ -572,8 +563,7 @@

Member Function Documentation

-

Return records that match criteria

-
Returns
array|FALSE
+

Return records that match criteria

Returns
array|FALSE
Parameters
@@ -599,8 +589,7 @@

Member Function Documentation

$filterarray
-

Retrieve value of field

-
Returns
scalar|FALSE
+

Retrieve value of field

Returns
scalar|FALSE
Parameters
@@ -622,8 +611,7 @@

Member Function Documentation

$keystring
-

Insert new record

-
Returns
array
+

Insert new record

Returns
array
@@ -639,8 +627,7 @@

Member Function Documentation

-

Reset cursor

-
Returns
NULL
+

Reset cursor

Returns
NULL
@@ -667,8 +654,7 @@

Member Function Documentation

-

Assign value to field

-
Returns
scalar|FALSE
+

Assign value to field

Returns
scalar|FALSE
Parameters
@@ -692,8 +678,7 @@

Member Function Documentation

$keystring
-

Return record at specified offset using criteria of previous load() call and make it active

-
Returns
array
+

Return record at specified offset using criteria of previous load() call and make it active

Returns
array
Parameters
@@ -716,8 +701,7 @@

Member Function Documentation

$ofsint
-

Convert tokens in string expression to variable names

-
Returns
string
+

Convert tokens in string expression to variable names

Returns
string
Parameters
@@ -739,8 +723,7 @@

Member Function Documentation

$strstring
-

Update current record

-
Returns
array
+

Update current record

Returns
array
diff --git a/lib/api/classDB_1_1Jig_1_1Session-members.html b/lib/api/classDB_1_1Jig_1_1Session-members.html index 66c61de4b..6d89d2b74 100644 --- a/lib/api/classDB_1_1Jig_1_1Session-members.html +++ b/lib/api/classDB_1_1Jig_1_1Session-members.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Member List @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@ - + diff --git a/lib/api/classDB_1_1Jig_1_1Session.html b/lib/api/classDB_1_1Jig_1_1Session.html index 0408cdf18..3869ae4f3 100644 --- a/lib/api/classDB_1_1Jig_1_1Session.html +++ b/lib/api/classDB_1_1Jig_1_1Session.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: DB\Jig\Session Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@ - +
-

Instantiate class

-
Parameters
+

Instantiate class

Parameters
@@ -306,8 +307,7 @@

Member Function Documentation

$dbobject
$tablestring
-

Return HTTP user agent

-
Returns
string|FALSE
+

Return HTTP user agent

Returns
string|FALSE
@@ -324,8 +324,7 @@

Member Function Documentation

-

Garbage collector

-
Returns
TRUE
+

Garbage collector

Returns
TRUE
Parameters
@@ -347,8 +346,7 @@

Member Function Documentation

$maxint
-

Close session

-
Returns
TRUE
+

Close session

Returns
TRUE
@@ -364,8 +362,7 @@

Member Function Documentation

-

Return anti-CSRF token

-
Returns
string|FALSE
+

Return anti-CSRF token

Returns
string|FALSE
@@ -382,8 +379,7 @@

Member Function Documentation

-

Destroy session

-
Returns
TRUE
+

Destroy session

Returns
TRUE
Parameters
@@ -405,8 +401,7 @@

Member Function Documentation

$idstring
-

Return IP address

-
Returns
string|FALSE
+

Return IP address

Returns
string|FALSE
@@ -433,8 +428,7 @@

Member Function Documentation

-

Open session

-
Returns
TRUE
+

Open session

Returns
TRUE
Parameters
@@ -458,8 +452,7 @@

Member Function Documentation

$pathstring
-

Return session data in serialized format

-
Returns
string|FALSE
+

Return session data in serialized format

Returns
string|FALSE
Parameters
@@ -481,8 +474,7 @@

Member Function Documentation

$idstring
-

Return Unix timestamp

-
Returns
string|FALSE
+

Return Unix timestamp

Returns
string|FALSE
@@ -509,8 +501,7 @@

Member Function Documentation

-

Write session data

-
Returns
TRUE
+

Write session data

Returns
TRUE
Parameters
diff --git a/lib/api/classDB_1_1Mongo-members.html b/lib/api/classDB_1_1Mongo-members.html index 54814bbb9..e3e907582 100644 --- a/lib/api/classDB_1_1Mongo-members.html +++ b/lib/api/classDB_1_1Mongo-members.html @@ -4,7 +4,7 @@ - +Fat-Free Framework: Member List @@ -19,7 +19,7 @@ @@ -28,7 +28,7 @@
$idstring
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
- + - +
-

Instantiate class

-
Parameters
+

Instantiate class

Parameters
@@ -138,6 +133,40 @@

Member Function Documentation

+ +
+
+
$dsnstring
$dbnamestring
+ + + + + + + + + + + + + + + + + +
DB\Mongo::__call ( $func,
array $args 
)
+
+

Redirect call to MongoDB object

Returns
mixed
+
Parameters
+ + + +
$funcstring
$argsarray
+
+
+ +
+
@@ -150,8 +179,7 @@

Member Function Documentation

-

Intercept native call to re-enable profiler

-
Returns
int
+

Intercept native call to re-enable profiler

Returns
int
@@ -167,8 +195,7 @@

Member Function Documentation

-

Return data source name

-
Returns
string
+

Return data source name

Returns
string
@@ -184,8 +211,7 @@

Member Function Documentation

-

Return MongoDB profiler results

-
Returns
string
+

Return MongoDB profiler results

Returns
string
@@ -201,8 +227,7 @@

Member Function Documentation

-

Return UUID

-
Returns
string
+

Return UUID

Returns
string
diff --git a/lib/api/classDB_1_1Mongo_1_1Mapper-members.html b/lib/api/classDB_1_1Mongo_1_1Mapper-members.html index 3240d802f..4696f6d42 100644 --- a/lib/api/classDB_1_1Mongo_1_1Mapper-members.html +++ b/lib/api/classDB_1_1Mongo_1_1Mapper-members.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Member List @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@ - + diff --git a/lib/api/classDB_1_1Mongo_1_1Mapper.html b/lib/api/classDB_1_1Mongo_1_1Mapper.html index 650ab21a2..bf7e0c921 100644 --- a/lib/api/classDB_1_1Mongo_1_1Mapper.html +++ b/lib/api/classDB_1_1Mongo_1_1Mapper.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: DB\Mongo\Mapper Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@ - +
-

Instantiate class

-
Returns
void
+

Instantiate class

Returns
void
Parameters
@@ -285,8 +286,7 @@

Member Function Documentation

$dbobject
-

Return fields of mapper object as an associative array

-
Returns
array
+

Return fields of mapper object as an associative array

Returns
array
Parameters
@@ -309,8 +309,7 @@

Member Function Documentation

$objobject
-

Delete field

-
Returns
NULL
+

Delete field

Returns
NULL
Parameters
@@ -343,8 +342,7 @@

Member Function Documentation

$keystring
-

Hydrate mapper object using hive array variable

-
Returns
NULL
+

Hydrate mapper object using hive array variable

Returns
NULL
Parameters
@@ -368,8 +366,7 @@

Member Function Documentation

$keystring
-

Populate hive array variable with mapper fields

-
Returns
NULL
+

Populate hive array variable with mapper fields

Returns
NULL
Parameters
@@ -402,8 +399,7 @@

Member Function Documentation

$keystring
-

Count records that match criteria

-
Returns
int
+

Count records that match criteria

Returns
int
Parameters
@@ -426,8 +422,7 @@

Member Function Documentation

$filterarray
-

Return the cursor from last query

-
Returns
object|NULL
+

Return the cursor from last query

Returns
object|NULL
@@ -443,8 +438,7 @@

Member Function Documentation

-

Return database type

-
Returns
string
+

Return database type

Returns
string
@@ -461,8 +455,7 @@

Member Function Documentation

-

Delete current record

-
Returns
bool
+

Delete current record

Returns
bool
Parameters
@@ -485,8 +478,7 @@

Member Function Documentation

$filterarray
-

Return TRUE if field is defined

-
Returns
bool
+

Return TRUE if field is defined

Returns
bool
Parameters
@@ -517,8 +509,7 @@

Member Function Documentation

$keystring
-

Convert array to mapper object

-
Returns
object
+

Convert array to mapper object

Returns
object
Parameters
@@ -540,8 +531,7 @@

Member Function Documentation

$rowarray
-

Return field names

-
Returns
array
+

Return field names

Returns
array
@@ -574,8 +564,7 @@

Member Function Documentation

-

Return records that match criteria

-
Returns
array
+

Return records that match criteria

Returns
array
Parameters
@@ -600,8 +589,7 @@

Member Function Documentation

$filterarray
-

Retrieve value of field

-
Returns
scalar|FALSE
+

Retrieve value of field

Returns
scalar|FALSE
Parameters
@@ -623,8 +611,7 @@

Member Function Documentation

$keystring
-

Insert new record

-
Returns
array
+

Insert new record

Returns
array
@@ -640,8 +627,7 @@

Member Function Documentation

-

Reset cursor

-
Returns
NULL
+

Reset cursor

Returns
NULL
@@ -680,8 +666,7 @@

Member Function Documentation

-

Build query and execute

-
Returns
array
+

Build query and execute

Returns
array
Parameters
@@ -717,8 +702,7 @@

Member Function Documentation

$fieldsstring
-

Assign value to field

-
Returns
scalar|FALSE
+

Assign value to field

Returns
scalar|FALSE
Parameters
@@ -742,8 +726,7 @@

Member Function Documentation

$keystring
-

Return record at specified offset using criteria of previous load() call and make it active

-
Returns
array
+

Return record at specified offset using criteria of previous load() call and make it active

Returns
array
Parameters
@@ -765,8 +748,7 @@

Member Function Documentation

$ofsint
-

Update current record

-
Returns
array
+

Update current record

Returns
array
diff --git a/lib/api/classDB_1_1Mongo_1_1Session-members.html b/lib/api/classDB_1_1Mongo_1_1Session-members.html index e766661dc..bff086076 100644 --- a/lib/api/classDB_1_1Mongo_1_1Session-members.html +++ b/lib/api/classDB_1_1Mongo_1_1Session-members.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Member List @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@ - + diff --git a/lib/api/classDB_1_1Mongo_1_1Session.html b/lib/api/classDB_1_1Mongo_1_1Session.html index 44e799629..2c29e948a 100644 --- a/lib/api/classDB_1_1Mongo_1_1Session.html +++ b/lib/api/classDB_1_1Mongo_1_1Session.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: DB\Mongo\Session Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@ - +
-

Instantiate class

-
Parameters
+

Instantiate class

Parameters
@@ -308,8 +309,7 @@

Member Function Documentation

$dbobject
$tablestring
-

Return HTTP user agent

-
Returns
string|FALSE
+

Return HTTP user agent

Returns
string|FALSE
@@ -326,8 +326,7 @@

Member Function Documentation

-

Garbage collector

-
Returns
TRUE
+

Garbage collector

Returns
TRUE
Parameters
@@ -349,8 +348,7 @@

Member Function Documentation

$maxint
-

Close session

-
Returns
TRUE
+

Close session

Returns
TRUE
@@ -366,8 +364,7 @@

Member Function Documentation

-

Return anti-CSRF token

-
Returns
string|FALSE
+

Return anti-CSRF token

Returns
string|FALSE
@@ -384,8 +381,7 @@

Member Function Documentation

-

Destroy session

-
Returns
TRUE
+

Destroy session

Returns
TRUE
Parameters
@@ -407,8 +403,7 @@

Member Function Documentation

$idstring
-

Return IP address

-
Returns
string|FALSE
+

Return IP address

Returns
string|FALSE
@@ -435,8 +430,7 @@

Member Function Documentation

-

Open session

-
Returns
TRUE
+

Open session

Returns
TRUE
Parameters
@@ -460,8 +454,7 @@

Member Function Documentation

$pathstring
-

Return session data in serialized format

-
Returns
string|FALSE
+

Return session data in serialized format

Returns
string|FALSE
Parameters
@@ -483,8 +476,7 @@

Member Function Documentation

$idstring
-

Return Unix timestamp

-
Returns
string|FALSE
+

Return Unix timestamp

Returns
string|FALSE
@@ -511,8 +503,7 @@

Member Function Documentation

-

Write session data

-
Returns
TRUE
+

Write session data

Returns
TRUE
Parameters
diff --git a/lib/api/classDB_1_1SQL-members.html b/lib/api/classDB_1_1SQL-members.html index f1a6e62fd..987ec7c24 100644 --- a/lib/api/classDB_1_1SQL-members.html +++ b/lib/api/classDB_1_1SQL-members.html @@ -4,7 +4,7 @@ - +Fat-Free Framework: Member List @@ -19,7 +19,7 @@ @@ -28,7 +28,7 @@
$idstring
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
- + - +
-

Instantiate class

-
Parameters
+

Instantiate class

Parameters
@@ -191,8 +190,7 @@

Member Function Documentation

$dsnstring
$userstring
-

Begin SQL transaction

-
Returns
bool
+

Begin SQL transaction

Returns
bool
@@ -208,8 +206,7 @@

Member Function Documentation

-

Commit SQL transaction

-
Returns
bool
+

Commit SQL transaction

Returns
bool
@@ -225,8 +222,7 @@

Member Function Documentation

-

Return number of rows affected by last query

-
Returns
int
+

Return number of rows affected by last query

Returns
int
@@ -242,8 +238,7 @@

Member Function Documentation

-

Return database engine

-
Returns
string
+

Return database engine

Returns
string
@@ -282,8 +277,7 @@

Member Function Documentation

-

Execute SQL statement(s)

-
Returns
array|int|FALSE
+

Execute SQL statement(s)

Returns
array|int|FALSE
Parameters
@@ -308,8 +302,7 @@

Member Function Documentation

$cmdsstring|array
-

Return SQL profiler results

-
Returns
string
+

Return SQL profiler results

Returns
string
@@ -325,8 +318,7 @@

Member Function Documentation

-

Return database name

-
Returns
string
+

Return database name

Returns
string
@@ -353,8 +345,7 @@

Member Function Documentation

-

Quote string

-
Returns
string
+

Quote string

Returns
string
Parameters
@@ -378,8 +369,7 @@

Member Function Documentation

$valmixed
-

Return quoted identifier name

-
Returns
string
+

Return quoted identifier name

Returns
string
Parameters
@@ -401,8 +391,7 @@

Member Function Documentation

$key
-

Rollback SQL transaction

-
Returns
bool
+

Rollback SQL transaction

Returns
bool
@@ -435,8 +424,7 @@

Member Function Documentation

-

Retrieve schema of SQL table

-
Returns
array|FALSE
+

Retrieve schema of SQL table

Returns
array|FALSE
Parameters
@@ -461,8 +449,7 @@

Member Function Documentation

$tablestring
-

Map data type of argument to a PDO constant

-
Returns
int
+

Map data type of argument to a PDO constant

Returns
int
Parameters
@@ -484,8 +471,7 @@

Member Function Documentation

$valscalar
-

Return UUID

-
Returns
string
+

Return UUID

Returns
string
@@ -512,8 +498,7 @@

Member Function Documentation

-

Cast value to PHP type

-
Returns
scalar
+

Cast value to PHP type

Returns
scalar
Parameters
@@ -536,8 +521,7 @@

Member Function Documentation

$typestring
-

Return server version

-
Returns
string
+

Return server version

Returns
string
diff --git a/lib/api/classDB_1_1SQL_1_1Mapper-members.html b/lib/api/classDB_1_1SQL_1_1Mapper-members.html index fc882e3ae..c45bf953c 100644 --- a/lib/api/classDB_1_1SQL_1_1Mapper-members.html +++ b/lib/api/classDB_1_1SQL_1_1Mapper-members.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Member List @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@ - + diff --git a/lib/api/classDB_1_1SQL_1_1Mapper.html b/lib/api/classDB_1_1SQL_1_1Mapper.html index b3f3f0c93..604592f2f 100644 --- a/lib/api/classDB_1_1SQL_1_1Mapper.html +++ b/lib/api/classDB_1_1SQL_1_1Mapper.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: DB\SQL\Mapper Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@ - +
-

Instantiate class

-
Parameters
+

Instantiate class

Parameters
@@ -316,8 +317,7 @@

Member Function Documentation

$dbobject
$tablestring
-

Return fields of mapper object as an associative array

-
Returns
array
+

Return fields of mapper object as an associative array

Returns
array
Parameters
@@ -340,8 +340,7 @@

Member Function Documentation

$objobject
-

Clear value of field

-
Returns
NULL
+

Clear value of field

Returns
NULL
Parameters
@@ -374,8 +373,7 @@

Member Function Documentation

$keystring
-

Hydrate mapper object using hive array variable

-
Returns
NULL
+

Hydrate mapper object using hive array variable

Returns
NULL
Parameters
@@ -399,8 +397,7 @@

Member Function Documentation

$keystring
-

Populate hive array variable with mapper fields

-
Returns
NULL
+

Populate hive array variable with mapper fields

Returns
NULL
Parameters
@@ -433,8 +430,7 @@

Member Function Documentation

$keystring
-

Count records that match criteria

-
Returns
int
+

Count records that match criteria

Returns
int
Parameters
@@ -457,8 +453,7 @@

Member Function Documentation

$filterstring|array
-

Return database type

-
Returns
string
+

Return database type

Returns
string
@@ -475,8 +470,7 @@

Member Function Documentation

-

Delete current record

-
Returns
int
+

Delete current record

Returns
int
Parameters
@@ -499,8 +493,7 @@

Member Function Documentation

$filterstring|array
-

Return TRUE if field is defined

-
Returns
bool
+

Return TRUE if field is defined

Returns
bool
Parameters
@@ -531,8 +524,7 @@

Member Function Documentation

$keystring
-

Convert array to mapper object

-
Returns
object
+

Convert array to mapper object

Returns
object
Parameters
@@ -555,8 +547,7 @@

Member Function Documentation

$rowarray
-

Return field names

-
Returns
array
+

Return field names

Returns
array
Parameters
@@ -595,8 +586,7 @@

Member Function Documentation

$adhocbool
-

Return records that match criteria

-
Returns
array
+

Return records that match criteria

Returns
array
Parameters
@@ -621,8 +611,7 @@

Member Function Documentation

$filterstring|array
-

Retrieve value of field

-
Returns
scalar
+

Retrieve value of field

Returns
scalar
Parameters
@@ -644,8 +633,7 @@

Member Function Documentation

$keystring
-

Insert new record

-
Returns
object
+

Insert new record

Returns
object
@@ -661,8 +649,7 @@

Member Function Documentation

-

Reset cursor

-
Returns
NULL
+

Reset cursor

Returns
NULL
@@ -678,8 +665,7 @@

Member Function Documentation

-

Return schema

-
Returns
array
+

Return schema

Returns
array
@@ -718,8 +704,7 @@

Member Function Documentation

-

Build query string and execute

-
Returns
array
+

Build query string and execute

Returns
array
Parameters
@@ -755,8 +740,7 @@

Member Function Documentation

$fieldsstring
-

Assign value to field

-
Returns
scalar
+

Assign value to field

Returns
scalar
Parameters
@@ -780,8 +764,7 @@

Member Function Documentation

$keystring
-

Return record at specified offset using same criteria as previous load() call and make it active

-
Returns
array
+

Return record at specified offset using same criteria as previous load() call and make it active

Returns
array
Parameters
@@ -804,8 +787,7 @@

Member Function Documentation

$ofsint
-

Get PHP type equivalent of PDO constant

-
Returns
string
+

Get PHP type equivalent of PDO constant

Returns
string
Parameters
@@ -827,8 +809,7 @@

Member Function Documentation

$pdostring
-

Update current record

-
Returns
object
+

Update current record

Returns
object
diff --git a/lib/api/classDB_1_1SQL_1_1Session-members.html b/lib/api/classDB_1_1SQL_1_1Session-members.html index 16568b5d4..588023875 100644 --- a/lib/api/classDB_1_1SQL_1_1Session-members.html +++ b/lib/api/classDB_1_1SQL_1_1Session-members.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Member List @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@ - + diff --git a/lib/api/classDB_1_1SQL_1_1Session.html b/lib/api/classDB_1_1SQL_1_1Session.html index 33f43811c..99dceb49f 100644 --- a/lib/api/classDB_1_1SQL_1_1Session.html +++ b/lib/api/classDB_1_1SQL_1_1Session.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: DB\SQL\Session Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@ - +
-

Instantiate class

-
Parameters
+

Instantiate class

Parameters
@@ -332,8 +333,7 @@

Member Function Documentation

$dbobject
$tablestring
-

Return HTTP user agent

-
Returns
string|FALSE
+

Return HTTP user agent

Returns
string|FALSE
@@ -350,8 +350,7 @@

Member Function Documentation

-

Garbage collector

-
Returns
TRUE
+

Garbage collector

Returns
TRUE
Parameters
@@ -373,8 +372,7 @@

Member Function Documentation

$maxint
-

Close session

-
Returns
TRUE
+

Close session

Returns
TRUE
@@ -390,8 +388,7 @@

Member Function Documentation

-

Return anti-CSRF token

-
Returns
string|FALSE
+

Return anti-CSRF token

Returns
string|FALSE
@@ -408,8 +405,7 @@

Member Function Documentation

-

Destroy session

-
Returns
TRUE
+

Destroy session

Returns
TRUE
Parameters
@@ -431,8 +427,7 @@

Member Function Documentation

$idstring
-

Return IP address

-
Returns
string|FALSE
+

Return IP address

Returns
string|FALSE
@@ -459,8 +454,7 @@

Member Function Documentation

-

Open session

-
Returns
TRUE
+

Open session

Returns
TRUE
Parameters
@@ -484,8 +478,7 @@

Member Function Documentation

$pathstring
-

Return session data in serialized format

-
Returns
string|FALSE
+

Return session data in serialized format

Returns
string|FALSE
Parameters
@@ -507,8 +500,7 @@

Member Function Documentation

$idstring
-

Return Unix timestamp

-
Returns
string|FALSE
+

Return Unix timestamp

Returns
string|FALSE
@@ -535,8 +527,7 @@

Member Function Documentation

-

Write session data

-
Returns
TRUE
+

Write session data

Returns
TRUE
Parameters
diff --git a/lib/api/classF3-members.html b/lib/api/classF3-members.html index 81112442e..988d67c5f 100644 --- a/lib/api/classF3-members.html +++ b/lib/api/classF3-members.html @@ -4,7 +4,7 @@ - +Fat-Free Framework: Member List @@ -19,7 +19,7 @@ @@ -28,7 +28,7 @@
$idstring
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
- +
diff --git a/lib/api/classF3.html b/lib/api/classF3.html index a2cf84c0c..cd5935702 100644 --- a/lib/api/classF3.html +++ b/lib/api/classF3.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: F3 Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
@@ -52,7 +52,7 @@ Static Public Attributes static $fw - Framework instance.
+ Framework instance.
 

Detailed Description

@@ -89,8 +89,7 @@
-

Forward function calls to framework

-
Returns
mixed
+

Forward function calls to framework

Returns
mixed
Parameters
diff --git a/lib/api/classISO-members.html b/lib/api/classISO-members.html index 9396d3ca9..16269e06d 100644 --- a/lib/api/classISO-members.html +++ b/lib/api/classISO-members.html @@ -4,7 +4,7 @@ - +Fat-Free Framework: Member List @@ -19,7 +19,7 @@ @@ -28,7 +28,7 @@
$funccallback
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
- +
diff --git a/lib/api/classISO.html b/lib/api/classISO.html index d747c6f1c..5fb0dbc37 100644 --- a/lib/api/classISO.html +++ b/lib/api/classISO.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: ISO Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
@@ -1097,8 +1097,7 @@
-

Convert class constants to array

-
Returns
array
+

Convert class constants to array

Returns
array
Parameters
@@ -1120,8 +1119,7 @@
$prefixstring
-

Return list of countries indexed by ISO 3166-1 country code

-
Returns
array
+

Return list of countries indexed by ISO 3166-1 country code

Returns
array
@@ -1137,8 +1135,7 @@
-

Return list of languages indexed by ISO 639-1 language code

-
Returns
array
+

Return list of languages indexed by ISO 639-1 language code

Returns
array
diff --git a/lib/api/classImage-members.html b/lib/api/classImage-members.html index a64d81647..186ec0b5e 100644 --- a/lib/api/classImage-members.html +++ b/lib/api/classImage-members.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Member List @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@ - +
@@ -60,7 +60,7 @@ identicon($str, $size=64, $blocks=4)Image invert()Image load($str)Image - overlay(Image $img, $align=NULL)Image + overlay(Image $img, $align=NULL, $alpha=100)Image pixelate($size)Image POS_Bottom (defined in Image)Image POS_Center (defined in Image)Image diff --git a/lib/api/classImage.html b/lib/api/classImage.html index 31f70e90e..0347df704 100644 --- a/lib/api/classImage.html +++ b/lib/api/classImage.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Image Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
@@ -78,8 +78,8 @@    rotate ($angle)   - overlay (Image $img, $align=NULL) -  + overlay (Image $img, $align=NULL, $alpha=100) +   identicon ($str, $size=64, $blocks=4)    captcha ($font, $size=24, $len=5, $key=NULL, $path='', $fg=0xFFFFFF, $bg=0x000000) @@ -109,15 +109,15 @@ Public Attributes  $data - Image resource.
+ Image resource.
   $flag =FALSE - Enable/disable history.
+ Enable/disable history.
   $count =0 - Filter count.
+ Filter count.
 
@@ -153,7 +153,7 @@ Protected Attributes  $file - Source filename.
+ Source filename.
 

Detailed Description

@@ -188,8 +188,7 @@
-

Instantiate image

-
Parameters
+

Instantiate image

Parameters
@@ -212,8 +211,7 @@
$filestring
$flagbool
-

Wrap-up

-
Returns
NULL
+

Wrap-up

Returns
NULL
@@ -231,8 +229,7 @@

Member Function Documentation

-

Blur the image using Gaussian filter

-
Returns
object
+

Blur the image using Gaussian filter

Returns
object
Parameters
@@ -255,8 +252,7 @@

Member Function Documentation

$selectivebool
-

Adjust brightness (range:-255 to 255)

-
Returns
object
+

Adjust brightness (range:-255 to 255)

Returns
object
Parameters
@@ -319,8 +315,7 @@

Member Function Documentation

$levelint
-

Generate CAPTCHA image

-
Returns
object|FALSE
+

Generate CAPTCHA image

Returns
object|FALSE
Parameters
@@ -349,8 +344,7 @@

Member Function Documentation

$fontstring
-

Adjust contrast (range:-100 to 100)

-
Returns
object
+

Adjust contrast (range:-100 to 100)

Returns
object
Parameters
@@ -395,8 +389,7 @@

Member Function Documentation

$levelint
-

Crop the image

-
Returns
object
+

Crop the image

Returns
object
Parameters
@@ -421,8 +414,7 @@

Member Function Documentation

$x1int
-

Return image as a string

-
Returns
string
+

Return image as a string

Returns
string
@@ -438,8 +430,7 @@

Member Function Documentation

-

Emboss the image

-
Returns
object
+

Emboss the image

Returns
object
@@ -455,8 +446,7 @@

Member Function Documentation

-

Convert to grayscale

-
Returns
object
+

Convert to grayscale

Returns
object
@@ -472,8 +462,7 @@

Member Function Documentation

-

Return image height

-
Returns
int
+

Return image height

Returns
int
@@ -489,8 +478,7 @@

Member Function Documentation

-

Flip on horizontal axis

-
Returns
object
+

Flip on horizontal axis

Returns
object
@@ -523,8 +511,7 @@

Member Function Documentation

-

Generate identicon

-
Returns
object
+

Generate identicon

Returns
object
Parameters
@@ -548,8 +535,7 @@

Member Function Documentation

$strstring
-

Invert image

-
Returns
object
+

Invert image

Returns
object
@@ -566,8 +552,7 @@

Member Function Documentation

-

Load string

-
Returns
object
+

Load string

Returns
object
Parameters
@@ -577,7 +562,7 @@

Member Function Documentation

- +
$strstring
@@ -591,7 +576,13 @@

Member Function Documentation

- + + + + + + + @@ -600,12 +591,12 @@

Member Function Documentation

 $align = NULL $align = NULL,
 $alpha = 100 
-

Apply an image overlay

-
Returns
object
+

Apply an image overlay

Returns
object
Parameters
- + +
$imgobject
$alignint
$alignint|array
$alphaint
@@ -625,8 +616,7 @@

Member Function Documentation

-

Pixelate the image

-
Returns
object
+

Pixelate the image

Returns
object
Parameters
@@ -648,8 +638,7 @@

Member Function Documentation

$sizeint
-

Send image to HTTP client

-
Returns
NULL
+

Send image to HTTP client

Returns
NULL
@@ -688,8 +677,7 @@

Member Function Documentation

-

Resize image (Maintain aspect ratio); Crop relative to center if flag is enabled; Enlargement allowed if flag is enabled

-
Returns
object
+

Resize image (Maintain aspect ratio); Crop relative to center if flag is enabled; Enlargement allowed if flag is enabled

Returns
object
Parameters
@@ -715,8 +703,7 @@

Member Function Documentation

$widthint
-

Revert to specified state

-
Returns
object
+

Revert to specified state

Returns
object
Parameters
@@ -739,8 +726,7 @@

Member Function Documentation

$stateint
-

Convert RGB hex triad to array

-
Returns
array|FALSE
+

Convert RGB hex triad to array

Returns
array|FALSE
Parameters
@@ -763,8 +749,7 @@

Member Function Documentation

$colorint
-

Rotate image

-
Returns
object
+

Rotate image

Returns
object
Parameters
@@ -786,8 +771,7 @@

Member Function Documentation

$angleint
-

Save current state

-
Returns
object
+

Save current state

Returns
object
@@ -803,8 +787,7 @@

Member Function Documentation

-

Apply sepia effect

-
Returns
object
+

Apply sepia effect

Returns
object
@@ -820,8 +803,7 @@

Member Function Documentation

-

Apply sketch effect

-
Returns
object
+

Apply sketch effect

Returns
object
@@ -838,8 +820,7 @@

Member Function Documentation

-

Adjust smoothness

-
Returns
object
+

Adjust smoothness

Returns
object
Parameters
@@ -861,8 +842,7 @@

Member Function Documentation

$levelint
-

Undo most recently applied filter

-
Returns
object
+

Undo most recently applied filter

Returns
object
@@ -878,8 +858,7 @@

Member Function Documentation

-

Flip on vertical axis

-
Returns
object
+

Flip on vertical axis

Returns
object
@@ -895,8 +874,7 @@

Member Function Documentation

-

Return image width

-
Returns
int
+

Return image width

Returns
int
diff --git a/lib/api/classLog-members.html b/lib/api/classLog-members.html index e16654bfc..a62fe7479 100644 --- a/lib/api/classLog-members.html +++ b/lib/api/classLog-members.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Member List @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@ - +
diff --git a/lib/api/classLog.html b/lib/api/classLog.html index 0e5a202da..c5ddc1ca9 100644 --- a/lib/api/classLog.html +++ b/lib/api/classLog.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Log Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
@@ -56,7 +56,7 @@ Protected Attributes  $file - File name.
+ File name.
 

Detailed Description

@@ -75,8 +75,7 @@
-

Instantiate class

-
Parameters
+

Instantiate class

Parameters
$filestring
@@ -98,8 +97,7 @@

Member Function Documentation

-

Erase log

-
Returns
NULL
+

Erase log

Returns
NULL
@@ -126,8 +124,7 @@

Member Function Documentation

-

Write specified text to log file

-
Returns
string
+

Write specified text to log file

Returns
string
Parameters
diff --git a/lib/api/classMagic-members.html b/lib/api/classMagic-members.html index e8853eef7..23a1a304d 100644 --- a/lib/api/classMagic-members.html +++ b/lib/api/classMagic-members.html @@ -4,7 +4,7 @@ - +Fat-Free Framework: Member List @@ -19,7 +19,7 @@ @@ -28,7 +28,7 @@
$textstring
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
- +
diff --git a/lib/api/classMagic.html b/lib/api/classMagic.html index 84796cdce..52c0b21fa 100644 --- a/lib/api/classMagic.html +++ b/lib/api/classMagic.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Magic Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
@@ -104,8 +104,7 @@
-

Alias for offsetget()

-
Returns
mixed
+

Alias for offsetget()

Returns
mixed
Parameters
@@ -128,8 +127,7 @@
$keystring
-

Alias for offsetexists()

-
Returns
mixed
+

Alias for offsetexists()

Returns
mixed
Parameters
@@ -162,8 +160,7 @@
$keystring
-

Alias for offsetset()

-
Returns
mixed
+

Alias for offsetset()

Returns
mixed
Parameters
@@ -187,8 +184,7 @@
$keystring
-

Alias for offsetunset()

-
Returns
NULL
+

Alias for offsetunset()

Returns
NULL
Parameters
@@ -219,8 +215,7 @@
$keystring
-

Unset key

-
Returns
NULL
+

Unset key

Returns
NULL
Parameters
@@ -251,8 +246,7 @@
$keystring
-

Return TRUE if key is not empty

-
Returns
bool
+

Return TRUE if key is not empty

Returns
bool
Parameters
@@ -283,8 +277,7 @@
$keystring
-

Retrieve contents of key

-
Returns
mixed
+

Retrieve contents of key

Returns
mixed
Parameters
@@ -307,8 +300,7 @@
$keystring
-

Convenience method for checking property value

-
Returns
mixed
+

Convenience method for checking property value

Returns
mixed
Parameters
@@ -331,8 +323,7 @@
$keystring
-

Convenience method for retrieving property value

-
Returns
mixed
+

Convenience method for retrieving property value

Returns
mixed
Parameters
@@ -365,8 +356,7 @@
$keystring
-

Convenience method for assigning property value

-
Returns
mixed
+

Convenience method for assigning property value

Returns
mixed
Parameters
@@ -390,8 +380,7 @@
$keystring
-

Convenience method for checking property value

-
Returns
NULL
+

Convenience method for checking property value

Returns
NULL
Parameters
@@ -432,8 +421,7 @@
$keystring
-

Bind value to key

-
Returns
mixed
+

Bind value to key

Returns
mixed
Parameters
diff --git a/lib/api/classMarkdown-members.html b/lib/api/classMarkdown-members.html index 0316071ec..20b494821 100644 --- a/lib/api/classMarkdown-members.html +++ b/lib/api/classMarkdown-members.html @@ -4,7 +4,7 @@ - +Fat-Free Framework: Member List @@ -19,7 +19,7 @@ @@ -28,7 +28,7 @@
$keystring
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
- +
diff --git a/lib/api/classMarkdown.html b/lib/api/classMarkdown.html index c1fd9833f..2d9bde49c 100644 --- a/lib/api/classMarkdown.html +++ b/lib/api/classMarkdown.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Markdown Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
@@ -69,7 +69,7 @@ Public Attributes  $special - Special characters.
+ Special characters.
  - +

@@ -111,7 +111,7 @@ Protected Attributes

 $blocks
 Parsing rules.
 Parsing rules.
 

@@ -144,8 +144,7 @@

-

Process anchor span

-
Returns
string
+

Process anchor span

Returns
string
Parameters
@@ -186,8 +185,7 @@
$strstring
-

Process atx-style heading

-
Returns
string
+

Process atx-style heading

Returns
string
Parameters
@@ -219,8 +217,7 @@
$typestring
-

Auto-convert links

-
Returns
string
+

Auto-convert links

Returns
string
Parameters
@@ -251,8 +248,7 @@
$strstring
-

Process blockquote

-
Returns
string
+

Process blockquote

Returns
string
Parameters
@@ -283,8 +279,7 @@
$strstring
-

Process code span

-
Returns
string
+

Process code span

Returns
string
Parameters
@@ -325,8 +320,7 @@
$strstring
-

Process fenced code block

-
Returns
string
+

Process fenced code block

Returns
string
Parameters
@@ -357,8 +351,7 @@
$hintstring
-

Process horizontal rule

-
Returns
string
+

Process horizontal rule

Returns
string
@@ -383,8 +376,7 @@
-

Process image span

-
Returns
string
+

Process image span

Returns
string
Parameters
@@ -415,8 +407,7 @@
$strstring
-

Process ordered/unordered list

-
Returns
string
+

Process ordered/unordered list

Returns
string
Parameters
@@ -447,8 +438,7 @@
$strstring
-

Process paragraph

-
Returns
string
+

Process paragraph

Returns
string
Parameters
@@ -479,8 +469,7 @@
$strstring
-

Process whitespace-prefixed code block

-
Returns
string
+

Process whitespace-prefixed code block

Returns
string
Parameters
@@ -511,8 +500,7 @@
$strstring
-

Ignore raw HTML

-
Returns
string
+

Ignore raw HTML

Returns
string
Parameters
@@ -553,8 +541,7 @@
$strstring
-

Process setext-style heading

-
Returns
string
+

Process setext-style heading

Returns
string
Parameters
@@ -586,8 +573,7 @@
$strstring
-

Process strong/em/strikethrough spans

-
Returns
string
+

Process strong/em/strikethrough spans

Returns
string
Parameters
@@ -618,8 +604,7 @@
$strstring
-

Assemble blocks

-
Returns
string
+

Assemble blocks

Returns
string
Parameters
@@ -642,8 +627,7 @@
$strstring
-

Render HTML equivalent of markdown

-
Returns
string
+

Render HTML equivalent of markdown

Returns
string
Parameters
@@ -666,8 +650,7 @@
$txtstring
-

Convert characters to HTML entities

-
Returns
string
+

Convert characters to HTML entities

Returns
string
Parameters
@@ -690,8 +673,7 @@
$strstring
-

Scan line for convertible spans

-
Returns
string
+

Scan line for convertible spans

Returns
string
Parameters
@@ -722,8 +704,7 @@
$strstring
-

Reduce multiple line feeds

-
Returns
string
+

Reduce multiple line feeds

Returns
string
Parameters
diff --git a/lib/api/classMatrix-members.html b/lib/api/classMatrix-members.html index 672ead29f..6ef1947db 100644 --- a/lib/api/classMatrix-members.html +++ b/lib/api/classMatrix-members.html @@ -4,7 +4,7 @@ - +Fat-Free Framework: Member List @@ -19,7 +19,7 @@ @@ -28,7 +28,7 @@
$strstring
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
- +
diff --git a/lib/api/classMatrix.html b/lib/api/classMatrix.html index 9959d17cc..b0ea52b88 100644 --- a/lib/api/classMatrix.html +++ b/lib/api/classMatrix.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Matrix Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
@@ -98,8 +98,7 @@
-

Return month calendar of specified date, with optional setting for first day of week (0 for Sunday)

-
Returns
array
+

Return month calendar of specified date, with optional setting for first day of week (0 for Sunday)

Returns
array
Parameters
@@ -139,8 +138,7 @@
$datestring
-

Change the key of a two-dimensional array element

-
Returns
NULL
+

Change the key of a two-dimensional array element

Returns
NULL
Parameters
@@ -175,8 +173,7 @@
$vararray
-

Retrieve values from a specified column of a multi-dimensional array variable

-
Returns
array
+

Retrieve values from a specified column of a multi-dimensional array variable

Returns
array
Parameters
@@ -216,8 +213,7 @@
$vararray
-

Sort a multi-dimensional array variable on a specified column

-
Returns
bool
+

Sort a multi-dimensional array variable on a specified column

Returns
bool
Parameters
@@ -242,8 +238,7 @@
$vararray
-

Rotate a two-dimensional array variable

-
Returns
NULL
+

Rotate a two-dimensional array variable

Returns
NULL
Parameters
diff --git a/lib/api/classPrefab-members.html b/lib/api/classPrefab-members.html index c80dd7b39..204c91686 100644 --- a/lib/api/classPrefab-members.html +++ b/lib/api/classPrefab-members.html @@ -4,7 +4,7 @@ - +Fat-Free Framework: Member List @@ -19,7 +19,7 @@ @@ -28,7 +28,7 @@
$vararray
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
- +
diff --git a/lib/api/classPrefab.html b/lib/api/classPrefab.html index bba947ad2..cf4198f1c 100644 --- a/lib/api/classPrefab.html +++ b/lib/api/classPrefab.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Prefab Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
@@ -92,8 +92,7 @@
-

Return class instance

-
Returns
static
+

Return class instance

Returns
static
diff --git a/lib/api/classPreview-members.html b/lib/api/classPreview-members.html index 37319b147..95869ee9f 100644 --- a/lib/api/classPreview-members.html +++ b/lib/api/classPreview-members.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Member List @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@ - +
diff --git a/lib/api/classPreview.html b/lib/api/classPreview.html index 3606e0ca0..b6fbf5ebc 100644 --- a/lib/api/classPreview.html +++ b/lib/api/classPreview.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Preview Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
@@ -85,12 +85,12 @@ Protected Attributes  $mime - MIME type.
+ MIME type.
  - Protected Attributes inherited from View  $view - Template file.
+ Template file.
 

@@ -123,8 +123,7 @@

-

Assemble markup

-
Returns
string
+

Assemble markup

Returns
string
Parameters
@@ -169,8 +168,7 @@
$nodestring
-

Render template

-
Returns
string
+

Render template

Returns
string
Parameters
@@ -206,8 +204,7 @@
$filestring
-

Render template string

-
Returns
string
+

Render template string

Returns
string
Parameters
@@ -231,8 +228,7 @@
$strstring
-

Convert token to variable

-
Returns
string
+

Convert token to variable

Returns
string
Parameters
diff --git a/lib/api/classRegistry-members.html b/lib/api/classRegistry-members.html index 90cbcd70e..65d1caca0 100644 --- a/lib/api/classRegistry-members.html +++ b/lib/api/classRegistry-members.html @@ -4,7 +4,7 @@ - +Fat-Free Framework: Member List @@ -19,7 +19,7 @@ @@ -28,7 +28,7 @@
$strstring
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
- +
diff --git a/lib/api/classRegistry.html b/lib/api/classRegistry.html index 773fd189f..fbb52ef4b 100644 --- a/lib/api/classRegistry.html +++ b/lib/api/classRegistry.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Registry Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
@@ -77,8 +77,7 @@
-

Delete object from catalog

-
Returns
NULL
+

Delete object from catalog

Returns
NULL
Parameters
@@ -109,8 +108,7 @@
$keystring
-

Return TRUE if object exists in catalog

-
Returns
bool
+

Return TRUE if object exists in catalog

Returns
bool
Parameters
@@ -141,8 +139,7 @@
$keystring
-

Retrieve object from catalog

-
Returns
object
+

Retrieve object from catalog

Returns
object
Parameters
@@ -183,8 +180,7 @@
$keystring
-

Add object to catalog

-
Returns
object
+

Add object to catalog

Returns
object
Parameters
diff --git a/lib/api/classSMTP-members.html b/lib/api/classSMTP-members.html index 796167552..20be20e14 100644 --- a/lib/api/classSMTP-members.html +++ b/lib/api/classSMTP-members.html @@ -4,7 +4,7 @@ - +Fat-Free Framework: Member List @@ -19,7 +19,7 @@ @@ -28,7 +28,7 @@
$keystring
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
- +
diff --git a/lib/api/classSMTP.html b/lib/api/classSMTP.html index 3a306483e..5228b1bde 100644 --- a/lib/api/classSMTP.html +++ b/lib/api/classSMTP.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: SMTP Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
@@ -104,35 +104,35 @@ Public Attributes  $attachments - E-mail attachments.
+ E-mail attachments.
   $host - SMTP host.
+ SMTP host.
   $port - SMTP port.
+ SMTP port.
   $scheme - TLS/SSL.
+ TLS/SSL.
   $user - User ID.
+ User ID.
   $pw - Password.
+ Password.
   $socket - TCP/IP socket.
+ TCP/IP socket.
   $log - Server-client conversation.
+ Server-client conversation.
 
@@ -156,7 +156,7 @@ Protected Attributes  $headers - Message properties.
+ Message properties.
 

Detailed Description

@@ -203,8 +203,7 @@
-

Instantiate class

-
Parameters
+

Instantiate class

Parameters
@@ -231,8 +230,7 @@

Member Function Documentation

$hoststring
$portint
-

Add e-mail attachment

-
Returns
NULL
+

Add e-mail attachment

Returns
NULL
Parameters
@@ -255,8 +253,7 @@

Member Function Documentation

$file
-

Remove header

-
Returns
NULL
+

Remove header

Returns
NULL
Parameters
@@ -297,8 +294,7 @@

Member Function Documentation

$keystring
-

Send SMTP command and record server response

-
Returns
string
+

Send SMTP command and record server response

Returns
string
Parameters
@@ -322,8 +318,7 @@

Member Function Documentation

$cmdstring
-

Return TRUE if header exists

-
Returns
bool
+

Return TRUE if header exists

Returns
bool
Parameters
@@ -354,8 +349,7 @@

Member Function Documentation

$key
-

Fix header

-
Returns
string
+

Fix header

Returns
string
Parameters
@@ -378,8 +372,7 @@

Member Function Documentation

$keystring
-

Return value of e-mail header

-
Returns
string|NULL
+

Return value of e-mail header

Returns
string|NULL
Parameters
@@ -401,8 +394,7 @@

Member Function Documentation

$keystring
-

Return client-server conversation history

-
Returns
string
+

Return client-server conversation history

Returns
string
@@ -429,8 +421,7 @@

Member Function Documentation

-

Transmit message

-
Returns
bool
+

Transmit message

Returns
bool
Parameters
@@ -464,8 +455,7 @@

Member Function Documentation

$messagestring
-

Bind value to e-mail header

-
Returns
string
+

Bind value to e-mail header

Returns
string
Parameters
diff --git a/lib/api/classSession-members.html b/lib/api/classSession-members.html index 04e334685..23d99a29c 100644 --- a/lib/api/classSession-members.html +++ b/lib/api/classSession-members.html @@ -4,7 +4,7 @@ - +Fat-Free Framework: Member List @@ -19,7 +19,7 @@ @@ -28,7 +28,7 @@
$keystring
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
- +
diff --git a/lib/api/classSession.html b/lib/api/classSession.html index e45ddd244..39e053f02 100644 --- a/lib/api/classSession.html +++ b/lib/api/classSession.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Session Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
@@ -72,7 +72,7 @@ Protected Attributes  $sid - Session ID.
+ Session ID.
 

Detailed Description

@@ -90,8 +90,7 @@
-

Instantiate class

-
Returns
object
+

Instantiate class

Returns
object
@@ -108,8 +107,7 @@

Member Function Documentation

-

Return HTTP user agent

-
Returns
string|FALSE
+

Return HTTP user agent

Returns
string|FALSE
@@ -126,8 +124,7 @@

Member Function Documentation

-

Garbage collector

-
Returns
TRUE
+

Garbage collector

Returns
TRUE
Parameters
@@ -149,8 +146,7 @@

Member Function Documentation

$maxint
-

Close session

-
Returns
TRUE
+

Close session

Returns
TRUE
@@ -166,8 +162,7 @@

Member Function Documentation

-

Return anti-CSRF token

-
Returns
string|FALSE
+

Return anti-CSRF token

Returns
string|FALSE
@@ -184,8 +179,7 @@

Member Function Documentation

-

Destroy session

-
Returns
TRUE
+

Destroy session

Returns
TRUE
Parameters
@@ -207,8 +201,7 @@

Member Function Documentation

$idstring
-

Return IP address

-
Returns
string|FALSE
+

Return IP address

Returns
string|FALSE
@@ -235,8 +228,7 @@

Member Function Documentation

-

Open session

-
Returns
TRUE
+

Open session

Returns
TRUE
Parameters
@@ -260,8 +252,7 @@

Member Function Documentation

$pathstring
-

Return session data in serialized format

-
Returns
string|FALSE
+

Return session data in serialized format

Returns
string|FALSE
Parameters
@@ -283,8 +274,7 @@

Member Function Documentation

$idstring
-

Return Unix timestamp

-
Returns
string|FALSE
+

Return Unix timestamp

Returns
string|FALSE
@@ -311,8 +301,7 @@

Member Function Documentation

-

Write session data

-
Returns
TRUE
+

Write session data

Returns
TRUE
Parameters
diff --git a/lib/api/classTemplate-members.html b/lib/api/classTemplate-members.html index 28790f583..5ad8a24a7 100644 --- a/lib/api/classTemplate-members.html +++ b/lib/api/classTemplate-members.html @@ -4,7 +4,7 @@ - +Fat-Free Framework: Member List @@ -19,7 +19,7 @@ @@ -28,7 +28,7 @@
$idstring
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
- +
diff --git a/lib/api/classTemplate.html b/lib/api/classTemplate.html index 0a3a2f159..c3d70988d 100644 --- a/lib/api/classTemplate.html +++ b/lib/api/classTemplate.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Template Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
@@ -87,7 +87,7 @@ Public Attributes  $custom =array() - Custom tag handlers.
+ Custom tag handlers.
 
@@ -133,17 +133,17 @@ Protected Attributes  $tags - Template tags.
+ Template tags.
  - Protected Attributes inherited from Preview  $mime - MIME type.
+ MIME type.
  - Protected Attributes inherited from View  $view - Template file.
+ Template file.
 

@@ -195,8 +195,7 @@

Member Function Documentation

-

Call custom tag handler

-
Returns
string|FALSE
+

Call custom tag handler

Returns
string|FALSE
Parameters
@@ -228,8 +227,7 @@

Member Function Documentation

$funccallback
-

Template -case- tag handler

-
Returns
string
+

Template -case- tag handler

Returns
string
Parameters
@@ -260,8 +258,7 @@

Member Function Documentation

$nodearray
-

Template -check- tag handler

-
Returns
string
+

Template -check- tag handler

Returns
string
Parameters
@@ -292,8 +289,7 @@

Member Function Documentation

$nodearray
-

Template -default- tag handler

-
Returns
string
+

Template -default- tag handler

Returns
string
Parameters
@@ -323,8 +319,7 @@

Member Function Documentation

$nodearray
-

Template -exclude- tag handler

-
Returns
string
+

Template -exclude- tag handler

Returns
string
@@ -349,8 +344,7 @@

Member Function Documentation

-

Template -false- tag handler

-
Returns
string
+

Template -false- tag handler

Returns
string
Parameters
@@ -381,8 +375,7 @@

Member Function Documentation

$nodearray
-

Template -ignore- tag handler

-
Returns
string
+

Template -ignore- tag handler

Returns
string
Parameters
@@ -413,8 +406,7 @@

Member Function Documentation

$nodearray
-

Template -include- tag handler

-
Returns
string
+

Template -include- tag handler

Returns
string
Parameters
@@ -445,8 +437,7 @@

Member Function Documentation

$nodearray
-

Template -loop- tag handler

-
Returns
string
+

Template -loop- tag handler

Returns
string
Parameters
@@ -477,8 +468,7 @@

Member Function Documentation

$nodearray
-

Template -repeat- tag handler

-
Returns
string
+

Template -repeat- tag handler

Returns
string
Parameters
@@ -509,8 +499,7 @@

Member Function Documentation

$nodearray
-

Template -set- tag handler

-
Returns
string
+

Template -set- tag handler

Returns
string
Parameters
@@ -541,8 +530,7 @@

Member Function Documentation

$nodearray
-

Template -switch- tag handler

-
Returns
string
+

Template -switch- tag handler

Returns
string
Parameters
@@ -573,8 +561,7 @@

Member Function Documentation

$nodearray
-

Template -true- tag handler

-
Returns
string
+

Template -true- tag handler

Returns
string
Parameters
@@ -605,8 +592,7 @@

Member Function Documentation

$nodearray
-

Assemble markup

-
Returns
string
+

Assemble markup

Returns
string
Parameters
@@ -639,8 +625,7 @@

Member Function Documentation

$nodearray|string
-

Extend template with custom tag

-
Returns
NULL
+

Extend template with custom tag

Returns
NULL
Parameters
@@ -664,8 +649,7 @@

Member Function Documentation

$tagstring
-

Parse string for template directives and tokens

-
Returns
string|array
+

Parse string for template directives and tokens

Returns
string|array
Parameters
diff --git a/lib/api/classTest-members.html b/lib/api/classTest-members.html index be372a1a3..59a9a37b7 100644 --- a/lib/api/classTest-members.html +++ b/lib/api/classTest-members.html @@ -4,7 +4,7 @@ - +Fat-Free Framework: Member List @@ -19,7 +19,7 @@ @@ -28,7 +28,7 @@
$textstring
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
- +
diff --git a/lib/api/classTest.html b/lib/api/classTest.html index e31788164..178814c2b 100644 --- a/lib/api/classTest.html +++ b/lib/api/classTest.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Test Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
@@ -71,7 +71,7 @@ Protected Attributes  $data =array() - Test results.
+ Test results.
 

Detailed Description

@@ -90,8 +90,7 @@
-

Class constructor

-
Returns
NULL
+

Class constructor

Returns
NULL
Parameters
@@ -125,8 +124,7 @@

Member Function Documentation

$levelint
-

Evaluate condition and save test result

-
Returns
object
+

Evaluate condition and save test result

Returns
object
Parameters
@@ -150,8 +148,7 @@

Member Function Documentation

$condbool
-

Append message to test results

-
Returns
NULL
+

Append message to test results

Returns
NULL
Parameters
@@ -173,8 +170,7 @@

Member Function Documentation

$textstring
-

Return test results

-
Returns
array
+

Return test results

Returns
array
diff --git a/lib/api/classUTF-members.html b/lib/api/classUTF-members.html index 28bcc7331..2127878a1 100644 --- a/lib/api/classUTF-members.html +++ b/lib/api/classUTF-members.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Member List @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@ - +
diff --git a/lib/api/classUTF.html b/lib/api/classUTF.html index 111f324e7..4413bc3ef 100644 --- a/lib/api/classUTF.html +++ b/lib/api/classUTF.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: UTF Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
@@ -105,8 +105,7 @@
-

Return UTF-8 byte order mark

-
Returns
string
+

Return UTF-8 byte order mark

Returns
string
@@ -123,8 +122,7 @@
-

Translate emoji tokens to Unicode font-supported symbols

-
Returns
string
+

Translate emoji tokens to Unicode font-supported symbols

Returns
string
Parameters
@@ -147,8 +145,7 @@
$strstring
-

Strip whitespaces from the beginning of a string

-
Returns
string
+

Strip whitespaces from the beginning of a string

Returns
string
Parameters
@@ -171,8 +168,7 @@
$strstring
-

Strip whitespaces from the end of a string

-
Returns
string
+

Strip whitespaces from the end of a string

Returns
string
Parameters
@@ -211,8 +207,7 @@
$strstring
-

Find position of first occurrence of a string (case-insensitive)

-
Returns
int|FALSE
+

Find position of first occurrence of a string (case-insensitive)

Returns
int|FALSE
Parameters
@@ -253,8 +248,7 @@
$stackstring
-

Returns part of haystack string from the first occurrence of needle to the end of haystack (case-insensitive)

-
Returns
string|FALSE
+

Returns part of haystack string from the first occurrence of needle to the end of haystack (case-insensitive)

Returns
string|FALSE
Parameters
@@ -279,8 +273,7 @@
$stackstring
-

Get string length

-
Returns
int
+

Get string length

Returns
int
Parameters
@@ -325,8 +318,7 @@
$strstring
-

Find position of first occurrence of a string

-
Returns
int|FALSE
+

Find position of first occurrence of a string

Returns
int|FALSE
Parameters
@@ -352,8 +344,7 @@
$stackstring
-

Reverse a string

-
Returns
string
+

Reverse a string

Returns
string
Parameters
@@ -398,8 +389,7 @@
$strstring
-

Returns part of haystack string from the first occurrence of needle to the end of haystack

-
Returns
string|FALSE
+

Returns part of haystack string from the first occurrence of needle to the end of haystack

Returns
string|FALSE
Parameters
@@ -441,8 +431,7 @@
$stackstring
-

Return part of a string

-
Returns
string|FALSE
+

Return part of a string

Returns
string|FALSE
Parameters
@@ -477,8 +466,7 @@
$strstring
-

Count the number of substring occurrences

-
Returns
int
+

Count the number of substring occurrences

Returns
int
Parameters
@@ -502,8 +490,7 @@
$stackstring
-

Convert code points to Unicode symbols

-
Returns
string
+

Convert code points to Unicode symbols

Returns
string
Parameters
@@ -526,8 +513,7 @@
$strstring
-

Strip whitespaces from the beginning and end of a string

-
Returns
string
+

Strip whitespaces from the beginning and end of a string

Returns
string
Parameters
diff --git a/lib/api/classView-members.html b/lib/api/classView-members.html index adbdecb39..4a6b4dd49 100644 --- a/lib/api/classView-members.html +++ b/lib/api/classView-members.html @@ -4,7 +4,7 @@ - +Fat-Free Framework: Member List @@ -19,7 +19,7 @@ @@ -28,7 +28,7 @@
$strstring
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
- +
diff --git a/lib/api/classView.html b/lib/api/classView.html index b52f398e3..51a7d1f5d 100644 --- a/lib/api/classView.html +++ b/lib/api/classView.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: View Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
@@ -75,7 +75,7 @@ Protected Attributes  $view - Template file.
+ Template file.
 

@@ -100,8 +100,7 @@

-

Encode characters to equivalent HTML entities

-
Returns
string
+

Encode characters to equivalent HTML entities

Returns
string
Parameters
@@ -124,8 +123,7 @@
$argmixed
-

Decode HTML entities to equivalent characters

-
Returns
string
+

Decode HTML entities to equivalent characters

Returns
string
Parameters
@@ -170,8 +168,7 @@
$argmixed
-

Render template

-
Returns
string
+

Render template

Returns
string
Parameters
@@ -205,8 +202,7 @@
$filestring
-

Create sandbox for template execution

-
Returns
string
+

Create sandbox for template execution

Returns
string
Parameters
diff --git a/lib/api/classWeb-members.html b/lib/api/classWeb-members.html index 2dbcbcce9..3790af44b 100644 --- a/lib/api/classWeb-members.html +++ b/lib/api/classWeb-members.html @@ -4,7 +4,7 @@ - +Fat-Free Framework: Member List @@ -19,7 +19,7 @@ @@ -28,7 +28,7 @@
$hivearray
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
- +
diff --git a/lib/api/classWeb.html b/lib/api/classWeb.html index 77d770236..c2f8ed41f 100644 --- a/lib/api/classWeb.html +++ b/lib/api/classWeb.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Web Class Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
@@ -104,7 +104,7 @@ Protected Attributes  $wrapper - HTTP request engine.
+ HTTP request engine.
 

@@ -147,8 +147,7 @@

-

HTTP request via cURL

-
Returns
array
+

HTTP request via cURL

Returns
array
Parameters
@@ -190,8 +189,7 @@
$urlstring
-

HTTP request via low-level TCP/IP socket

-
Returns
array
+

HTTP request via low-level TCP/IP socket

Returns
array
Parameters
@@ -233,8 +231,7 @@
$urlstring
-

HTTP request via PHP stream wrapper

-
Returns
array
+

HTTP request via PHP stream wrapper

Returns
array
Parameters
@@ -258,8 +255,7 @@
$urlstring
-

Return the MIME types stated in the HTTP Accept header as an array; If a list of MIME types is specified, return the best match; or FALSE if none found

-
Returns
array|string|FALSE
+

Return the MIME types stated in the HTTP Accept header as an array; If a list of MIME types is specified, return the best match; or FALSE if none found

Returns
array|string|FALSE
Parameters
@@ -282,8 +278,7 @@
$liststring|array
-

Specify the HTTP request engine to use; If not available, fall back to an applicable substitute

-
Returns
string
+

Specify the HTTP request engine to use; If not available, fall back to an applicable substitute

Returns
string
Parameters
@@ -322,8 +317,7 @@
$argstring
-

Return chunk of text from standard Lorem Ipsum passage

-
Returns
string
+

Return chunk of text from standard Lorem Ipsum passage

Returns
string
Parameters
@@ -348,8 +342,7 @@
$countint
-

Detect MIME type using file extension

-
Returns
string
+

Detect MIME type using file extension

Returns
string
Parameters
@@ -394,8 +387,7 @@
$filestring
-

Strip Javascript/CSS files of extraneous whitespaces and comments; Return combined output as a minified string

-
Returns
string
+

Strip Javascript/CSS files of extraneous whitespaces and comments; Return combined output as a minified string

Returns
string
Parameters
@@ -421,8 +413,7 @@
$filesstring|array
-

Return upload progress in bytes, FALSE on failure

-
Returns
int|FALSE
+

Return upload progress in bytes, FALSE on failure

Returns
int|FALSE
Parameters
@@ -461,8 +452,7 @@
$idstring
-

Receive file(s) from HTTP client

-
Returns
array|bool
+

Receive file(s) from HTTP client

Returns
array|bool
Parameters
@@ -497,8 +487,7 @@
$funccallback
-

Submit HTTP request; Use HTTP context options (described in http://www.php.net/manual/en/context.http.php) if specified; Cache the page as instructed by remote server

-
Returns
array|FALSE
+

Submit HTTP request; Use HTTP context options (described in http://www.php.net/manual/en/context.http.php) if specified; Cache the page as instructed by remote server

Returns
array|FALSE
Parameters
@@ -538,8 +527,7 @@
$urlstring
-

Retrieve RSS feed and return as an array

-
Returns
array|FALSE
+

Retrieve RSS feed and return as an array

Returns
array|FALSE
Parameters
@@ -586,8 +574,7 @@
$urlstring
-

Transmit file to HTTP client; Return file size if successful, FALSE otherwise

-
Returns
int|FALSE
+

Transmit file to HTTP client; Return file size if successful, FALSE otherwise

Returns
int|FALSE
Parameters
@@ -613,8 +600,7 @@
$filestring
-

Return a URL/filesystem-friendly version of string

-
Returns
string
+

Return a URL/filesystem-friendly version of string

Returns
string
Parameters
@@ -647,8 +633,7 @@
$textstring
-

Replace old headers with new elements

-
Returns
NULL
+

Replace old headers with new elements

Returns
NULL
Parameters
@@ -682,8 +667,7 @@
$oldarray
-

Retrieve information from whois server

-
Returns
string|FALSE
+

Retrieve information from whois server

Returns
string|FALSE
Parameters
diff --git a/lib/api/classWeb_1_1Geo-members.html b/lib/api/classWeb_1_1Geo-members.html index e58ff2b24..491d46915 100644 --- a/lib/api/classWeb_1_1Geo-members.html +++ b/lib/api/classWeb_1_1Geo-members.html @@ -4,7 +4,7 @@ - +Fat-Free Framework: Member List @@ -19,7 +19,7 @@ @@ -28,7 +28,7 @@
$addrstring
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
- + - +
-

Return geolocation data based on specified/auto-detected IP address

-
Returns
array|FALSE
+

Return geolocation data based on specified/auto-detected IP address

Returns
array|FALSE
Parameters
@@ -112,8 +111,7 @@
$ipstring
-

Return information about specified Unix time zone

-
Returns
array
+

Return information about specified Unix time zone

Returns
array
Parameters
@@ -146,8 +144,7 @@
$zonestring
-

Return weather data based on specified latitude/longitude

-
Returns
array|FALSE
+

Return weather data based on specified latitude/longitude

Returns
array|FALSE
Parameters
diff --git a/lib/api/classWeb_1_1Google_1_1StaticMap-members.html b/lib/api/classWeb_1_1Google_1_1StaticMap-members.html index f20968a2a..76e776149 100644 --- a/lib/api/classWeb_1_1Google_1_1StaticMap-members.html +++ b/lib/api/classWeb_1_1Google_1_1StaticMap-members.html @@ -4,7 +4,7 @@ - +Fat-Free Framework: Member List @@ -19,7 +19,7 @@ @@ -28,7 +28,7 @@
$latitudefloat
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
- + - +
-

Specify API key-value pair via magic call

-
Returns
object
+

Specify API key-value pair via magic call

Returns
object
Parameters
@@ -119,8 +118,7 @@
$funcstring
-

Generate map

-
Returns
string
+

Generate map

Returns
string
diff --git a/lib/api/classWeb_1_1OpenID-members.html b/lib/api/classWeb_1_1OpenID-members.html index 9e189aef9..f23ae61ad 100644 --- a/lib/api/classWeb_1_1OpenID-members.html +++ b/lib/api/classWeb_1_1OpenID-members.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Member List @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@ - + - +
-

Initiate OpenID authentication sequence; Return FALSE on failure or redirect to OpenID provider URL

-
Returns
bool
+

Initiate OpenID authentication sequence; Return FALSE on failure or redirect to OpenID provider URL

Returns
bool
Parameters
@@ -179,8 +178,7 @@
$proxystring
-

Remove OpenID request parameter

-
Returns
NULL
+

Remove OpenID request parameter

Returns
NULL
Parameters
@@ -211,8 +209,7 @@
$key
-

Determine OpenID provider

-
Returns
string|FALSE
+

Determine OpenID provider

Returns
string|FALSE
Parameters
@@ -235,8 +232,7 @@
$proxystring
-

Return TRUE if OpenID request parameter exists

-
Returns
bool
+

Return TRUE if OpenID request parameter exists

Returns
bool
Parameters
@@ -259,8 +255,7 @@
$keystring
-

Return value of OpenID request parameter

-
Returns
mixed
+

Return value of OpenID request parameter

Returns
mixed
Parameters
@@ -282,8 +277,7 @@
$keystring
-

Return OpenID response fields

-
Returns
array
+

Return OpenID response fields

Returns
array
@@ -310,8 +304,7 @@
-

Bind value to OpenID request parameter

-
Returns
string
+

Bind value to OpenID request parameter

Returns
string
Parameters
@@ -335,8 +328,7 @@
$keystring
-

Return TRUE if OpenID verification was successful

-
Returns
bool
+

Return TRUE if OpenID verification was successful

Returns
bool
Parameters
diff --git a/lib/api/classWeb_1_1Pingback-members.html b/lib/api/classWeb_1_1Pingback-members.html index bc9ccc9ad..8fb3c96c4 100644 --- a/lib/api/classWeb_1_1Pingback-members.html +++ b/lib/api/classWeb_1_1Pingback-members.html @@ -4,7 +4,7 @@ - +Fat-Free Framework: Member List @@ -19,7 +19,7 @@ @@ -28,7 +28,7 @@
$proxystring
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
- + - +
-

Instantiate class

-
Returns
object
+

Instantiate class

Returns
object
@@ -130,8 +129,7 @@

Member Function Documentation

-

Return TRUE if URL points to a pingback-enabled resource

-
Returns
bool
+

Return TRUE if URL points to a pingback-enabled resource

Returns
bool
Parameters
@@ -154,8 +152,7 @@

Member Function Documentation

$url
-

Load local page contents, parse HTML anchor tags, find permalinks, and send XML-RPC calls to corresponding pingback servers

-
Returns
NULL
+

Load local page contents, parse HTML anchor tags, find permalinks, and send XML-RPC calls to corresponding pingback servers

Returns
NULL
Parameters
@@ -188,8 +185,7 @@

Member Function Documentation

$sourcestring
-

Receive ping, check if local page is pingback-enabled, verify source contents, and return XML-RPC response

-
Returns
string
+

Receive ping, check if local page is pingback-enabled, verify source contents, and return XML-RPC response

Returns
string
Parameters
@@ -212,8 +208,7 @@

Member Function Documentation

$funccallback
-

Return transaction history

-
Returns
string
+

Return transaction history

Returns
string
diff --git a/lib/api/classes.html b/lib/api/classes.html index 687cafd31..845de9b44 100644 --- a/lib/api/classes.html +++ b/lib/api/classes.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Index @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@ - +
@@ -101,10 +101,10 @@
  S  
-Jig\Session (DB)    -SQL\Session (DB)    Session    +SQL\Session (DB)    Mongo\Session (DB)    +Jig\Session (DB)    SMTP    SQL (DB)    StaticMap (Web\Google)    diff --git a/lib/api/dir_3a960e52dd9a2c9686c19ff6ef19d5fb.html b/lib/api/dir_3a960e52dd9a2c9686c19ff6ef19d5fb.html index 9ee559747..c2c931b88 100644 --- a/lib/api/dir_3a960e52dd9a2c9686c19ff6ef19d5fb.html +++ b/lib/api/dir_3a960e52dd9a2c9686c19ff6ef19d5fb.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: web/google Directory Reference @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- + - + - + - + - + - + - +
diff --git a/lib/api/dynsections.js b/lib/api/dynsections.js index ed092c7f6..85e183690 100644 --- a/lib/api/dynsections.js +++ b/lib/api/dynsections.js @@ -24,19 +24,20 @@ function updateStripes() $('table.directory tr'). removeClass('even').filter(':visible:even').addClass('even'); } + function toggleLevel(level) { - $('table.directory tr').each(function(){ + $('table.directory tr').each(function() { var l = this.id.split('_').length-1; var i = $('#img'+this.id.substring(3)); var a = $('#arr'+this.id.substring(3)); if (l - + Fat-Free Framework: Class Members @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
Here is a list of all documented class members with links to the class documentation for each member:
@@ -68,6 +68,7 @@

- $ -

- +
Here is a list of all documented class members with links to the class documentation for each member:

- _ -

- +
Here is a list of all documented class members with links to the class documentation for each member:
diff --git a/lib/api/functions_b.html b/lib/api/functions_b.html index f7b9db5a9..299c4f750 100644 --- a/lib/api/functions_b.html +++ b/lib/api/functions_b.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
Here is a list of all documented class members with links to the class documentation for each member:
diff --git a/lib/api/functions_c.html b/lib/api/functions_c.html index 8254933dc..0a3aee8f9 100644 --- a/lib/api/functions_c.html +++ b/lib/api/functions_c.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
Here is a list of all documented class members with links to the class documentation for each member:
diff --git a/lib/api/functions_d.html b/lib/api/functions_d.html index d4519c6f3..9a2ed3d58 100644 --- a/lib/api/functions_d.html +++ b/lib/api/functions_d.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
Here is a list of all documented class members with links to the class documentation for each member:
@@ -81,8 +81,5 @@

- d -

diff --git a/lib/api/functions_e.html b/lib/api/functions_e.html index 90d8fa48d..90a719c75 100644 --- a/lib/api/functions_e.html +++ b/lib/api/functions_e.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@ - +
Here is a list of all documented class members with links to the class documentation for each member:
diff --git a/lib/api/functions_f.html b/lib/api/functions_f.html index 113798e78..0b505b2f1 100644 --- a/lib/api/functions_f.html +++ b/lib/api/functions_f.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
Here is a list of all documented class members with links to the class documentation for each member:
diff --git a/lib/api/functions_func.html b/lib/api/functions_func.html index f3d621844..43140ded4 100644 --- a/lib/api/functions_func.html +++ b/lib/api/functions_func.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members - Functions @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,14 +28,15 @@
- +
 

- _ -

- +
  diff --git a/lib/api/functions_func_b.html b/lib/api/functions_func_b.html index 0ca4abdfb..84c26cdd5 100644 --- a/lib/api/functions_func_b.html +++ b/lib/api/functions_func_b.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members - Functions @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
  diff --git a/lib/api/functions_func_c.html b/lib/api/functions_func_c.html index 5c9341227..e27a03cc7 100644 --- a/lib/api/functions_func_c.html +++ b/lib/api/functions_func_c.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members - Functions @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
  diff --git a/lib/api/functions_func_d.html b/lib/api/functions_func_d.html index d4ea8ebd1..f4fc64afa 100644 --- a/lib/api/functions_func_d.html +++ b/lib/api/functions_func_d.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members - Functions @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
  @@ -81,8 +81,5 @@

- d -

diff --git a/lib/api/functions_func_e.html b/lib/api/functions_func_e.html index 71f8238ce..8a48e33b6 100644 --- a/lib/api/functions_func_e.html +++ b/lib/api/functions_func_e.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members - Functions @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@ - +
  diff --git a/lib/api/functions_func_f.html b/lib/api/functions_func_f.html index 5ff02eaf1..3914c201b 100644 --- a/lib/api/functions_func_f.html +++ b/lib/api/functions_func_f.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members - Functions @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
  diff --git a/lib/api/functions_func_g.html b/lib/api/functions_func_g.html index 9d39e0929..fbcf5bb12 100644 --- a/lib/api/functions_func_g.html +++ b/lib/api/functions_func_g.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members - Functions @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
  diff --git a/lib/api/functions_func_h.html b/lib/api/functions_func_h.html index 7a521fde5..fa9d4a3d6 100644 --- a/lib/api/functions_func_h.html +++ b/lib/api/functions_func_h.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members - Functions @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
  diff --git a/lib/api/functions_func_i.html b/lib/api/functions_func_i.html index c1b2db929..1969a365f 100644 --- a/lib/api/functions_func_i.html +++ b/lib/api/functions_func_i.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members - Functions @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
  diff --git a/lib/api/functions_func_j.html b/lib/api/functions_func_j.html index 149e77dfe..e4064cbc4 100644 --- a/lib/api/functions_func_j.html +++ b/lib/api/functions_func_j.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members - Functions @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
  diff --git a/lib/api/functions_func_l.html b/lib/api/functions_func_l.html index 1c6b0ddbe..fb382c884 100644 --- a/lib/api/functions_func_l.html +++ b/lib/api/functions_func_l.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members - Functions @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
  @@ -55,6 +55,9 @@

- l -

- +
  diff --git a/lib/api/functions_func_n.html b/lib/api/functions_func_n.html index 291eb37d5..15858da3a 100644 --- a/lib/api/functions_func_n.html +++ b/lib/api/functions_func_n.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members - Functions @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
  diff --git a/lib/api/functions_func_o.html b/lib/api/functions_func_o.html index baf833890..41e9b45b6 100644 --- a/lib/api/functions_func_o.html +++ b/lib/api/functions_func_o.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members - Functions @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
  @@ -65,7 +65,7 @@

- o -

diff --git a/lib/api/functions_func_p.html b/lib/api/functions_func_p.html index 4f5afc95e..4fc2f814f 100644 --- a/lib/api/functions_func_p.html +++ b/lib/api/functions_func_p.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members - Functions @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@ - +
  diff --git a/lib/api/functions_func_q.html b/lib/api/functions_func_q.html index 0e16f6a52..905ff1db8 100644 --- a/lib/api/functions_func_q.html +++ b/lib/api/functions_func_q.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members - Functions @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
  diff --git a/lib/api/functions_func_r.html b/lib/api/functions_func_r.html index b31816f38..55080f359 100644 --- a/lib/api/functions_func_r.html +++ b/lib/api/functions_func_r.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members - Functions @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
  @@ -51,6 +51,9 @@

- r -

- +
  diff --git a/lib/api/functions_func_t.html b/lib/api/functions_func_t.html index c45fcf623..238424542 100644 --- a/lib/api/functions_func_t.html +++ b/lib/api/functions_func_t.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members - Functions @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
  diff --git a/lib/api/functions_func_u.html b/lib/api/functions_func_u.html index 6b0d49249..4cd99c009 100644 --- a/lib/api/functions_func_u.html +++ b/lib/api/functions_func_u.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members - Functions @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
  diff --git a/lib/api/functions_func_v.html b/lib/api/functions_func_v.html index f259cafc9..cb58895ed 100644 --- a/lib/api/functions_func_v.html +++ b/lib/api/functions_func_v.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members - Functions @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
  diff --git a/lib/api/functions_func_w.html b/lib/api/functions_func_w.html index 373f65099..6e5449aa9 100644 --- a/lib/api/functions_func_w.html +++ b/lib/api/functions_func_w.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members - Functions @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
  diff --git a/lib/api/functions_g.html b/lib/api/functions_g.html index 8104c4495..f48991ab4 100644 --- a/lib/api/functions_g.html +++ b/lib/api/functions_g.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
Here is a list of all documented class members with links to the class documentation for each member:
diff --git a/lib/api/functions_h.html b/lib/api/functions_h.html index 15c3b7929..df157fc7d 100644 --- a/lib/api/functions_h.html +++ b/lib/api/functions_h.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
Here is a list of all documented class members with links to the class documentation for each member:
diff --git a/lib/api/functions_i.html b/lib/api/functions_i.html index 05ef17b9a..77db1ca17 100644 --- a/lib/api/functions_i.html +++ b/lib/api/functions_i.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
Here is a list of all documented class members with links to the class documentation for each member:
diff --git a/lib/api/functions_j.html b/lib/api/functions_j.html index 7d2e6ff4a..27d6ddc33 100644 --- a/lib/api/functions_j.html +++ b/lib/api/functions_j.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
Here is a list of all documented class members with links to the class documentation for each member:
diff --git a/lib/api/functions_l.html b/lib/api/functions_l.html index 446e26056..0643d0e7e 100644 --- a/lib/api/functions_l.html +++ b/lib/api/functions_l.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
Here is a list of all documented class members with links to the class documentation for each member:
@@ -55,6 +55,9 @@

- l -

- +
Here is a list of all documented class members with links to the class documentation for each member:
diff --git a/lib/api/functions_n.html b/lib/api/functions_n.html index 01d38e5f8..6d92cf3d2 100644 --- a/lib/api/functions_n.html +++ b/lib/api/functions_n.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
Here is a list of all documented class members with links to the class documentation for each member:
diff --git a/lib/api/functions_o.html b/lib/api/functions_o.html index a8447d98e..fcc30505e 100644 --- a/lib/api/functions_o.html +++ b/lib/api/functions_o.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
Here is a list of all documented class members with links to the class documentation for each member:
@@ -65,7 +65,7 @@

- o -

diff --git a/lib/api/functions_p.html b/lib/api/functions_p.html index ffd6b0300..49ddc9006 100644 --- a/lib/api/functions_p.html +++ b/lib/api/functions_p.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@ - +
Here is a list of all documented class members with links to the class documentation for each member:
diff --git a/lib/api/functions_q.html b/lib/api/functions_q.html index 1addcca71..959ccd15b 100644 --- a/lib/api/functions_q.html +++ b/lib/api/functions_q.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
Here is a list of all documented class members with links to the class documentation for each member:
diff --git a/lib/api/functions_r.html b/lib/api/functions_r.html index 721c8994d..7bb12d333 100644 --- a/lib/api/functions_r.html +++ b/lib/api/functions_r.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
Here is a list of all documented class members with links to the class documentation for each member:
@@ -51,6 +51,9 @@

- r -

- +
Here is a list of all documented class members with links to the class documentation for each member:
diff --git a/lib/api/functions_t.html b/lib/api/functions_t.html index 0712b585e..811088b0e 100644 --- a/lib/api/functions_t.html +++ b/lib/api/functions_t.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
Here is a list of all documented class members with links to the class documentation for each member:
diff --git a/lib/api/functions_u.html b/lib/api/functions_u.html index a809f5294..c3a95c882 100644 --- a/lib/api/functions_u.html +++ b/lib/api/functions_u.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
Here is a list of all documented class members with links to the class documentation for each member:
diff --git a/lib/api/functions_v.html b/lib/api/functions_v.html index 759ff423a..b2e2fc1c3 100644 --- a/lib/api/functions_v.html +++ b/lib/api/functions_v.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
Here is a list of all documented class members with links to the class documentation for each member:
diff --git a/lib/api/functions_vars.html b/lib/api/functions_vars.html index 4846786d5..09750d81e 100644 --- a/lib/api/functions_vars.html +++ b/lib/api/functions_vars.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Members - Variables @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
  @@ -68,6 +68,7 @@

- $ -

- +
Here is a list of all documented class members with links to the class documentation for each member:
diff --git a/lib/api/hierarchy.html b/lib/api/hierarchy.html index 5f96ee4dd..f843efce0 100644 --- a/lib/api/hierarchy.html +++ b/lib/api/hierarchy.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Class Hierarchy @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
@@ -37,46 +37,45 @@
This inheritance list is sorted roughly, but not completely, alphabetically:
[detail level 12345]
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
oCArrayAccess
|\CMagicPHP magic wrapper
| oCDB\CursorSimple cursor implementation
| |oCDB\Jig\MapperFlat-file DB mapper
| ||\CDB\Jig\SessionJig-managed session handler
| |oCDB\Mongo\MapperMongoDB mapper
| ||\CDB\Mongo\SessionMongoDB-managed session handler
| |\CDB\SQL\MapperSQL data mapper
| | \CDB\SQL\SessionSQL-managed session handler
| oCSMTPSMTP plug-in
| \CWeb\OpenIDOpenID consumer
oCAuthAuthorization/authentication plug-in
oCBasketSession-based pseudo-mapper
oCF3Legacy mode enabler
oCImageImage manipulation tools
oCDB\JigFlat-file DB wrapper
oCLogCustom logger
oCMongoDB
|\CDB\MongoMongoDB wrapper
oCPDO
|\CDB\SQLPDO wrapper
oCPrefabFactory class for single-instance objects
|oCAuditData validator
|oCBaseBase structure
|oCBcryptLightweight password hashing library
|oCCacheCache engine
|oCISOISO language/country codes
|oCMarkdownMarkdown-to-HTML converter
|oCMatrixGeneric array utilities
|oCUTFUnicode string manager
|oCViewView handler
||\CPreviewLightweight template engine
|| \CTemplateXML-style template engine
|oCWebWrapper for various HTTP utilities
|oCWeb\GeoGeo plug-in
|\CWeb\PingbackPingback 1.0 protocol (client and server) implementation
oCRegistryContainer for singular object instances
oCSessionCache-based session handler
oCWeb\Google\StaticMapGoogle Static Maps API v2 plug-in
\CTestUnit test kit
 ▼CArrayAccess
 ▼CMagicPHP magic wrapper
 ▼CDB\CursorSimple cursor implementation
 ▼CDB\Jig\MapperFlat-file DB mapper
 CDB\Jig\SessionJig-managed session handler
 ▼CDB\Mongo\MapperMongoDB mapper
 CDB\Mongo\SessionMongoDB-managed session handler
 ▼CDB\SQL\MapperSQL data mapper
 CDB\SQL\SessionSQL-managed session handler
 CSMTPSMTP plug-in
 CWeb\OpenIDOpenID consumer
 CAuthAuthorization/authentication plug-in
 CBasketSession-based pseudo-mapper
 CF3Legacy mode enabler
 CImageImage manipulation tools
 CDB\JigFlat-file DB wrapper
 CLogCustom logger
 CDB\MongoMongoDB wrapper
 ▼CPDO
 CDB\SQLPDO wrapper
 ▼CPrefabFactory class for single-instance objects
 CAuditData validator
 CBaseBase structure
 CBcryptLightweight password hashing library
 CCacheCache engine
 CISOISO language/country codes
 CMarkdownMarkdown-to-HTML converter
 CMatrixGeneric array utilities
 CUTFUnicode string manager
 ▼CViewView handler
 ▼CPreviewLightweight template engine
 CTemplateXML-style template engine
 CWebWrapper for various HTTP utilities
 CWeb\GeoGeo plug-in
 CWeb\PingbackPingback 1.0 protocol (client and server) implementation
 CRegistryContainer for singular object instances
 CSessionCache-based session handler
 CWeb\Google\StaticMapGoogle Static Maps API v2 plug-in
 CTestUnit test kit
diff --git a/lib/api/index.html b/lib/api/index.html index 7be8620f8..63beddd4b 100644 --- a/lib/api/index.html +++ b/lib/api/index.html @@ -4,7 +4,7 @@ - + Fat-Free Framework: Overview @@ -19,7 +19,7 @@
Fat-Free Framework -  3.2.2 +  3.3.0  Overview Class List Hierarchy
@@ -28,7 +28,7 @@
- +
diff --git a/lib/base.php b/lib/base.php index c2f8bee86..231435c37 100644 --- a/lib/base.php +++ b/lib/base.php @@ -38,7 +38,7 @@ class Base extends Prefab { //@{ Framework details const PACKAGE='Fat-Free Framework', - VERSION='3.2.2-Release'; + VERSION='3.3.0-Release'; //@} //@{ HTTP status codes (RFC 2616) @@ -121,9 +121,7 @@ class Base extends Prefab { //! Language lookup sequence $languages, //! Default fallback language - $fallback='en', - //! NULL reference - $null=NULL; + $fallback='en'; /** * Sync PHP global with corresponding hive key @@ -229,12 +227,22 @@ function &ref($key,$add=TRUE) { $obj=FALSE; if (!is_object($var)) $var=new stdclass; - $var=&$var->$part; + if ($add || property_exists($var,$part)) + $var=&$var->$part; + else { + $var=&$this->null; + break; + } } else { if (!is_array($var)) $var=array(); - $var=&$var[$part]; + if ($add || array_key_exists($part,$var)) + $var=&$var[$part]; + else { + $var=&$this->null; + break; + } } if ($parts[0]=='ALIASES') $var=$this->build($var); @@ -242,7 +250,7 @@ function &ref($key,$add=TRUE) { } /** - * Return TRUE if hive key is not set + * Return TRUE if hive key is set * (or return timestamp and TTL if cached) * @return bool * @param $key string @@ -252,8 +260,7 @@ function exists($key,&$val=NULL) { $val=$this->ref($key,FALSE); return isset($val)? TRUE: - (Cache::instance()->exists($this->hash($key).'.var',$val)? - $val:FALSE); + (Cache::instance()->exists($this->hash($key).'.var',$val)?:FALSE); } /** @@ -641,20 +648,6 @@ function decode($str) { $this->hive['ENCODING']); } - /** - * Attempt to clone object - * @return object - * @return $arg object - **/ - function dupe($arg) { - if (method_exists('ReflectionClass','iscloneable')) { - $ref=new ReflectionClass($arg); - if ($ref->iscloneable()) - $arg=clone($arg); - } - return $arg; - } - /** * Invoke callback recursively for all data types * @return mixed @@ -672,10 +665,15 @@ function recursive($arg,$func,$stack=NULL) { $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, - array_merge($stack,array($arg))); + if (method_exists('ReflectionClass','iscloneable')) { + $ref=new ReflectionClass($arg); + if ($ref->iscloneable()) { + $arg=clone($arg); + foreach (get_object_vars($arg) as $key=>$val) + $arg->$key=$this->recursive($val,$func, + array_merge($stack,array($arg))); + } + } return $arg; case 'array': $tmp=array(); @@ -1167,13 +1165,26 @@ function map($url,$class,$ttl=0,$kbps=0) { $this->map($item,$class,$ttl,$kbps); return; } - $fluid=preg_match('/@\w+/',$class); foreach (explode('|',self::VERBS) as $method) - if ($fluid || - method_exists($class,$method) || - method_exists($class,'__call')) - $this->route($method.' '. - $url,$class.'->'.strtolower($method),$ttl,$kbps); + $this->route($method.' '.$url, + $class.'->'.strtolower($method),$ttl,$kbps); + } + + /** + * Redirect a route to another URL + * @return NULL + * @param $pattern string|array + * @param $url string + */ + function redirect($pattern,$url) { + if (is_array($pattern)) { + foreach ($pattern as $item) + $this->redirect($item,$url); + return; + } + $this->route($pattern,function($this) use ($url) { + $this->reroute($url); + }); } /** @@ -1223,7 +1234,7 @@ function run() { $url=str_replace("\x00".'@','@',$url); if (!preg_match('/^'. preg_replace('/@(\w+\b)/','(?P<\1>[^\/\?]+)', - str_replace('\*','(.*)',preg_quote($url,'/'))). + str_replace('\*','([^\?]*)',preg_quote($url,'/'))). '\/?(?:\?.*)?$/'.$case.'um',$req,$args)) continue; $route=NULL; @@ -1286,7 +1297,7 @@ function($id) use($args) { else $this->expire(0); if (!strlen($body)) { - if (!$this->hive['RAW']) + if (!$this->hive['RAW'] && !$this->hive['BODY']) $this->hive['BODY']=file_get_contents('php://input'); ob_start(); // Call route handler @@ -1354,8 +1365,11 @@ function call($func,$args=NULL,$hooks='') { } if (!is_callable($func)) // No route handler - user_error(sprintf(self::E_Method, - is_string($func)?$func:$this->stringify($func))); + if ($hooks=='beforeroute,afterroute') + $this->error(405); + else + user_error(sprintf(self::E_Method, + is_string($func)?$func:$this->stringify($func))); $obj=FALSE; if (is_array($func)) { $hooks=$this->split($hooks); @@ -1423,7 +1437,7 @@ function config($file) { foreach ($matches as $match) { if ($match['section']) $sec=$match['section']; - elseif (in_array($sec,array('routes','maps'))) { + elseif (in_array($sec,array('routes','maps','redirects'))) { call_user_func_array( array($this,rtrim($sec,'s')), array_merge(array($match['lval']), @@ -1484,7 +1498,7 @@ function mutex($id,$func,$args=NULL) { * @param $lf bool **/ function read($file,$lf=FALSE) { - $out=file_get_contents($file); + $out=@file_get_contents($file); return $lf?preg_replace('/\r\n|\r/',"\n",$out):$out; } @@ -1574,7 +1588,7 @@ function unload($cwd) { $error && in_array($error['type'], array(E_ERROR,E_PARSE,E_CORE_ERROR,E_COMPILE_ERROR))) // Fatal error detected - $this->error(sprintf(self::E_Fatal,$error['message'])); + $this->error(500,sprintf(self::E_Fatal,$error['message'])); } //! Prohibit cloning @@ -1639,8 +1653,9 @@ function($code,$text) use($fw) { $_SERVER['DOCUMENT_ROOT']=realpath($_SERVER['DOCUMENT_ROOT']); $base=''; if (PHP_SAPI!='cli') - $base=rtrim($this->fixslashes( - dirname($_SERVER['SCRIPT_NAME'])),'/'); + $base=implode('/',array_map('urlencode', + explode('/',rtrim($this->fixslashes( + dirname($_SERVER['SCRIPT_NAME'])),'/')))); $path=preg_replace('/^'.preg_quote($base,'/').'/','', parse_url($_SERVER['REQUEST_URI'],PHP_URL_PATH)); call_user_func_array('session_set_cookie_params', @@ -1793,14 +1808,14 @@ function exists($key,&$val=NULL) { $raw=xcache_get($ndx); break; case 'folder': - if (is_file($file=$parts[1].$ndx)) - $raw=$fw->read($file); + $raw=$fw->read($parts[1].$ndx); break; } if (!empty($raw)) { list($val,$time,$ttl)=(array)$fw->unserialize($raw); if ($ttl===0 || $time+$ttl>microtime(TRUE)) return array($time,$ttl); + $val=null; $this->clear($key); } return FALSE; @@ -1873,7 +1888,7 @@ function clear($key) { case 'xcache': return xcache_unset($ndx); case 'folder': - return is_file($file=$parts[1].$ndx) && @unlink($file); + return @unlink($parts[1].$ndx); } return FALSE; } @@ -2051,7 +2066,8 @@ protected function sandbox(array $hive=NULL) { $hive=$fw->hive(); if ($fw->get('ESCAPE')) $hive=$this->esc($hive); - $hive['ALIASES']=$fw->build($hive['ALIASES']); + if (isset($hive['ALIASES'])) + $hive['ALIASES']=$fw->build($hive['ALIASES']); extract($hive); unset($fw); unset($hive); @@ -2079,7 +2095,7 @@ function render($file,$mime='text/html',array $hive=NULL,$ttl=0) { if (isset($_COOKIE[session_name()])) @session_start(); $fw->sync('SESSION'); - if (PHP_SAPI!='cli') + if ($mime && PHP_SAPI!='cli') header('Content-Type: '.$mime.'; '. 'charset='.$fw->get('ENCODING')); $data=$this->sandbox($hive); @@ -2117,17 +2133,18 @@ function token($str) { protected function build($node) { $self=$this; return preg_replace_callback( - '/\{\{(.+?)\}\}/s', + '/\{\{(.+?)\}\}(\n)?/s', function($expr) use($self) { $str=trim($self->token($expr[1])); - if (preg_match('/^(.+?)\h*\|(\h*\w+(?:\h*[,;]\h*\w+)*)/', + if (preg_match('/^([^|]+?)\h*\|(\h*\w+(?:\h*[,;]\h*\w+)*)/', $str,$parts)) { $str=$parts[1]; foreach (Base::instance()->split($parts[2]) as $func) $str=(($func=='format')?'\Base::instance()':'$this'). '->'.$func.'('.$str.')'; } - return ''; + return ''. + (isset($expr[2])?"\n\n":''); }, preg_replace_callback( '/\{~(.+?)~\}/s', @@ -2188,7 +2205,7 @@ function render($file,$mime='text/html',array $hive=NULL,$ttl=0) { if (isset($_COOKIE[session_name()])) @session_start(); $fw->sync('SESSION'); - if (PHP_SAPI!='cli') + if ($mime && PHP_SAPI!='cli') header('Content-Type: '.($this->mime=$mime).'; '. 'charset='.$fw->get('ENCODING')); $data=$this->sandbox($hive); diff --git a/lib/changelog.txt b/lib/changelog.txt index 7ae905bb1..b8a07303a 100644 --- a/lib/changelog.txt +++ b/lib/changelog.txt @@ -1,5 +1,36 @@ CHANGELOG +3.3.0 (8 August 2014) +* NEW: Attribute in tag to extend hive +* NEW: Image overlay with transparency and alignment control +* NEW: Allow redirection of specified route patterns to a URL +* Bug fix: Missing AND operator in SQL Server schema query (Issue #576) +* Count Cursor->load() results (Feature request #581) +* Mapper copyfrom() method doesn't allow class/object callbacks (Issue #590) +* Bug fix: exists() creates elements/properties (Issue #591) +* Bug fix: Wildcard in routing pattern consumes entire query string + (Issue #592) +* Tweak Base->map performance (Issue #595) +* Bug fix: Default error handler silently fails for AJAX request with + DEBUG>0 (Issue #599) +* Bug fix: Mocked BODY overwritten (Issue #601) +* Bug fix: Undefined pkey (Issue #607) +* Bug fix: beforeupdate() position (Issue #633) +* Bug fix: exists() return value for cached keys +* Bug fix: Missing error code in UNLOAD handler +* Bug fix: OR operator (||) parsed incorrectly +* Add input name parameter to custom slug function +* Apply URL encoding on BASE to emulate v2 behavior (Issue #123) +* Reduce mapper update() iterations +* Bug fix: Routing treatment of * wildcard character +* SQL Mapper->find: GROUP BY SQL compliant statement +* Work around bug in latest MongoDB driver +* Work around probable race condition and optimize cache access +* View rendering: Optional Content-Type header +* Fix missing newlines after template expansion +* Add form field name to Web->receive() callback arguments +* Quick reference: add RAW variable + 3.2.2 (19 March 2014) * NEW: Locales set automatically (Feature request #522) * NEW: Mapper dbtype() diff --git a/lib/db/cursor.php b/lib/db/cursor.php index 354c68397..a98ea17d7 100644 --- a/lib/db/cursor.php +++ b/lib/db/cursor.php @@ -150,6 +150,14 @@ function load($filter=NULL,array $options=NULL,$ttl=0) { $this->skip(0)?$this->query[$this->ptr=0]:FALSE; } + /** + * Return the count of records loaded + * @return int + **/ + function loaded() { + return count($this->query); + } + /** * Map to first record in cursor * @return mixed diff --git a/lib/db/jig/mapper.php b/lib/db/jig/mapper.php index 3ac3d218e..a8aa151c7 100644 --- a/lib/db/jig/mapper.php +++ b/lib/db/jig/mapper.php @@ -363,6 +363,7 @@ function erase($filter=NULL) { $db=$this->db; $now=microtime(TRUE); $data=$db->read($this->file); + $pkey=array('_id'=>$this->id); if ($filter) { foreach ($this->find($filter,NULL,FALSE) as $mapper) if (!$mapper->erase()) @@ -370,7 +371,6 @@ function erase($filter=NULL) { return TRUE; } elseif (isset($this->id)) { - $pkey=array('_id'=>$this->id); unset($data[$this->id]); parent::erase(); $this->skip(0); @@ -420,7 +420,7 @@ function reset() { function copyfrom($key,$func=NULL) { $var=\Base::instance()->get($key); if ($func) - $var=$func($var); + $var=call_user_func($func,$var); foreach ($var as $key=>$val) $this->document[$key]=$val; } diff --git a/lib/db/mongo.php b/lib/db/mongo.php index 833f16015..2799e96ec 100644 --- a/lib/db/mongo.php +++ b/lib/db/mongo.php @@ -16,7 +16,7 @@ namespace DB; //! MongoDB wrapper -class Mongo extends \MongoDB { +class Mongo { //@{ const @@ -28,6 +28,8 @@ class Mongo extends \MongoDB { $uuid, //! Data source name $dsn, + //! MongoDB object + $db, //! MongoDB log $log; @@ -71,11 +73,21 @@ function log() { * @return int **/ function drop() { - $out=parent::drop(); + $out=$this->db->drop(); $this->setprofilinglevel(2); return $out; } + /** + * Redirect call to MongoDB object + * @return mixed + * @param $func string + * @param $args array + **/ + function __call($func,array $args) { + return call_user_func_array(array($this->db,$func),$args); + } + /** * Instantiate class * @param $dsn string @@ -85,7 +97,7 @@ function drop() { function __construct($dsn,$dbname,array $options=NULL) { $this->uuid=\Base::instance()->hash($this->dsn=$dsn); $class=class_exists('\MongoClient')?'\MongoClient':'\Mongo'; - parent::__construct(new $class($dsn,$options?:array()),$dbname); + $this->db=new \MongoDB(new $class($dsn,$options?:array()),$dbname); $this->setprofilinglevel(2); } diff --git a/lib/db/mongo/mapper.php b/lib/db/mongo/mapper.php index bcb7f6efc..4ce867269 100644 --- a/lib/db/mongo/mapper.php +++ b/lib/db/mongo/mapper.php @@ -230,13 +230,13 @@ function insert() { return $this->update(); if (isset($this->trigger['beforeinsert'])) \Base::instance()->call($this->trigger['beforeinsert'], - array($this,$pkey)); + array($this,array('_id'=>$this->document['_id']))); $this->collection->insert($this->document); $pkey=array('_id'=>$this->document['_id']); if (isset($this->trigger['afterinsert'])) \Base::instance()->call($this->trigger['afterinsert'], array($this,$pkey)); - $this->load(array('_id'=>$this->document['_id'])); + $this->load($pkey); return $this->document; } @@ -245,14 +245,12 @@ function insert() { * @return array **/ function update() { + $pkey=array('_id'=>$this->document['_id']); if (isset($this->trigger['beforeupdate'])) \Base::instance()->call($this->trigger['beforeupdate'], array($this,$pkey)); $this->collection->update( - $pkey=array('_id'=>$this->document['_id']), - $this->document, - array('upsert'=>TRUE) - ); + $pkey,$this->document,array('upsert'=>TRUE)); if (isset($this->trigger['afterupdate'])) \Base::instance()->call($this->trigger['afterupdate'], array($this,$pkey)); @@ -299,7 +297,7 @@ function reset() { function copyfrom($key,$func=NULL) { $var=\Base::instance()->get($key); if ($func) - $var=$func($var); + $var=call_user_func($func,$var); foreach ($var as $key=>$val) $this->document[$key]=$val; } @@ -339,7 +337,7 @@ function cursor() { **/ function __construct(\DB\Mongo $db,$collection) { $this->db=$db; - $this->collection=$db->{$collection}; + $this->collection=$db->selectcollection($collection); $this->reset(); } diff --git a/lib/db/sql.php b/lib/db/sql.php index 88e34dc5a..ea2c13c95 100644 --- a/lib/db/sql.php +++ b/lib/db/sql.php @@ -261,14 +261,14 @@ function schema($table,$fields=NULL,$ttl=0) { 'LEFT OUTER JOIN '. 'information_schema.table_constraints AS t ON '. 'k.table_name=t.table_name AND '. - 'k.constraint_name=t.constraint_name '. + 'k.constraint_name=t.constraint_name AND '. 'k.table_schema=t.table_schema '. ($this->dbname? ('AND k.table_catalog=t.table_catalog '):''). 'WHERE '. - 'c.table_name='.$this->quote($table).' '. + 'c.table_name='.$this->quote($table). ($this->dbname? - ('AND c.table_catalog='. + (' AND c.table_catalog='. $this->quote($this->dbname)):''). ';', 'field','type','defval','nullable','YES','pkey','PRIMARY KEY'), diff --git a/lib/db/sql/mapper.php b/lib/db/sql/mapper.php index 6af467519..52072f198 100644 --- a/lib/db/sql/mapper.php +++ b/lib/db/sql/mapper.php @@ -251,8 +251,8 @@ function find($filter=NULL,array $options=NULL,$ttl=0) { $adhoc=''; foreach ($this->adhoc as $key=>$field) $adhoc.=','.$field['expr'].' AS '.$this->db->quotekey($key); - return $this->select(implode(',', - array_map(array($this->db,'quotekey'),array_keys($this->fields))). + return $this->select(($options['group']?:implode(',', + array_map(array($this->db,'quotekey'),array_keys($this->fields)))). $adhoc,$filter,$options,$ttl); } @@ -491,7 +491,7 @@ function reset() { function copyfrom($key,$func=NULL) { $var=\Base::instance()->get($key); if ($func) - $var=$func($var); + $var=call_user_func($func,$var); foreach ($var as $key=>$val) if (in_array($key,array_keys($this->fields))) { $field=&$this->fields[$key]; diff --git a/lib/image.php b/lib/image.php index c328f83e1..71f07b1a6 100644 --- a/lib/image.php +++ b/lib/image.php @@ -270,11 +270,16 @@ function rotate($angle) { * Apply an image overlay * @return object * @param $img object - * @param $align int + * @param $align int|array + * @param $alpha int **/ - function overlay(Image $img,$align=NULL) { + function overlay(Image $img,$align=NULL,$alpha=100) { if (is_null($align)) $align=self::POS_Right|self::POS_Bottom; + if (is_array($align)) { + list($posx,$posy)=$align; + $align = 0; + } $ovr=imagecreatefromstring($img->dump()); imagesavealpha($ovr,TRUE); $imgw=$this->width(); @@ -297,7 +302,15 @@ function overlay(Image $img,$align=NULL) { $posx=0; if (empty($posy)) $posy=0; - imagecopy($this->data,$ovr,$posx,$posy,0,0,$ovrw,$ovrh); + if ($alpha==100) + imagecopy($this->data,$ovr,$posx,$posy,0,0,$ovrw,$ovrh); + else { + $cut=imagecreatetruecolor($ovrw,$ovrh); + imagecopy($cut,$this->data,0,0,$posx,$posy,$ovrw,$ovrh); + imagecopy($cut,$ovr,0,0,0,0,$ovrw,$ovrh); + imagecopymerge($this->data, + $cut,$posx,$posy,0,0,$ovrw,$ovrh,$alpha); + } return $this->save(); } @@ -400,7 +413,8 @@ function captcha($font,$size=24,$len=5, $tmp[$i]=imagecreatetruecolor( ($w=imagesx($char))/2,($h=imagesy($char))/2); imagefill($tmp[$i],0,0,IMG_COLOR_TRANSPARENT); - imagecopyresampled($tmp[$i],$char,0,0,0,0,$w/2,$h/2,$w,$h); + imagecopyresampled($tmp[$i], + $char,0,0,0,0,$w/2,$h/2,$w,$h); imagedestroy($char); $width+=$i+1<$len?$block/2:$w/2; $height=max($height,$h/2); diff --git a/lib/template.php b/lib/template.php index 59ccb97bd..da3b1c43d 100644 --- a/lib/template.php +++ b/lib/template.php @@ -49,6 +49,18 @@ protected function _set(array $node) { **/ protected function _include(array $node) { $attrib=$node['@attrib']; + $hive=isset($attrib['with']) && + ($attrib['with']=preg_match('/\{\{(.+?)\}\}/', + $attrib['with'])? + $this->token($attrib['with']): + Base::instance()->stringify($attrib['with'])) && + preg_match_all('/(\w+)\h*=\h*(.+?)(?=,|$)/', + $attrib['with'],$pairs,PREG_SET_ORDER)? + 'array('.implode(',', + array_map(function($pair){ + return '\''.$pair[1].'\'=>'.$pair[2]; + },$pairs)).')+get_defined_vars()': + 'get_defined_vars()'; return 'token($attrib['if']).') '):''). @@ -56,7 +68,7 @@ protected function _include(array $node) { (preg_match('/\{\{(.+?)\}\}/',$attrib['href'])? $this->token($attrib['href']): Base::instance()->stringify($attrib['href'])).','. - '$this->mime,get_defined_vars()); ?>'); + '$this->mime,'.$hive.'); ?>'); } /** diff --git a/lib/web.php b/lib/web.php index 6af5a83db..e3fffb105 100644 --- a/lib/web.php +++ b/lib/web.php @@ -197,7 +197,7 @@ function receive($func=NULL,$overwrite=FALSE,$slug=TRUE) { rename($tmp,$file['name']); } $out=array(); - foreach ($_FILES as $item) { + foreach ($_FILES as $name=>$item) { if (is_array($item['name'])) { // Transpose array $tmp=array(); @@ -215,14 +215,14 @@ function receive($func=NULL,$overwrite=FALSE,$slug=TRUE) { $file['name']=$dir. ($slug && preg_match('/(.+?)(\.\w+)?$/',$base,$parts)? (is_callable($slug)? - $slug($base): + $slug($base,$name): ($this->slug($parts[1]). (isset($parts[2])?$parts[2]:''))): $base); $out[$file['name']]=!$file['error'] && is_uploaded_file($file['tmp_name']) && (!file_exists($file['name']) || $overwrite) && - (!$func || $fw->call($func,array($file))!==FALSE) && + (!$func || $fw->call($func,array($file,$name))!==FALSE) && move_uploaded_file($file['tmp_name'],$file['name']); } }