diff options
| -rw-r--r-- | README.md | 4 | ||||
| -rwxr-xr-x | boot.php | 2 | ||||
| -rw-r--r-- | include/config.php | 4 | ||||
| -rwxr-xr-x | include/plugin.php | 6 | ||||
| -rw-r--r-- | include/zot.php | 3 | ||||
| -rw-r--r-- | mod/search.php | 1 | ||||
| -rw-r--r-- | version.inc | 2 |
7 files changed, 11 insertions, 11 deletions
@@ -18,9 +18,9 @@ These missing pieces are (in no particular order): -The Red Matrix (sometimes referred to as just "Red") is a collection of web servers and services which provides these missing pieces, but within a decentralised framework. It operates as an independent network within the larger internet where all the nodes or servers (we call them "hubs") are able to fully interact with each other in ways that are simply not possible using other services. Additionally the owners of each network hub have the ability to set their own rules with regard to communications and privacy and data ownership, because each operates with complete independence. +The Red Matrix (sometimes referred to as just "Red") is a collection of web servers and services which provides these missing pieces, but within a decentralised framework. It operates as an independent network within the larger internet where all the nodes or servers (we call them "hubs") are able to fully interact with each other in ways that are simply not possible using other services. Additionally the owners of each network hub have the ability to set their own rules with regard to communications and privacy and data ownership, because each operates with complete independence. These hubs require only slightly more resources than a blog or content management system, and the software is being designed with the ability to natively incorporate both kinds of functionality, as well as cloud storage. -<center></center> + A weakness of existing decentralised network models is the binding of network identity with the physical server where it resides; for example if you are "eric@example.website", your identity is often tied permanently to "example.website". We see this as a problem. Many hubs on the Indie Web are run by enthusiasts with varying skill levels and financial resources - and the technology is changing quite rapidly. Often the cost or workload involved in maintaining these services becomes a burden (or hardware fails) and people or entire social communities are left stranded when their server goes offline. They may have to "start over" building their social circle from scratch when this happens. In some cases communities are unable to recover from this kind of disruption and the entire community dissolves. @@ -1192,7 +1192,7 @@ function check_config(&$a) { */ $r = q("SELECT * FROM `addon` WHERE `installed` = 1"); - if(count($r)) + if($r) $installed = $r; else $installed = array(); diff --git a/include/config.php b/include/config.php index 9b36b1a1e..5db0a3d05 100644 --- a/include/config.php +++ b/include/config.php @@ -17,8 +17,8 @@ function load_config($family) { global $a; - $r = q("SELECT * FROM `config` WHERE `cat` = '%s'", dbesc($family)); - if(count($r)) { + $r = q("SELECT * FROM config WHERE cat = '%s'", dbesc($family)); + if($r) { foreach($r as $rr) { $k = $rr['k']; if ($family === 'config') { diff --git a/include/plugin.php b/include/plugin.php index 3ef97fba9..8406c45e5 100755 --- a/include/plugin.php +++ b/include/plugin.php @@ -169,7 +169,7 @@ function register_hook($hook,$file,$function,$priority=0) { function unregister_hook($hook,$file,$function) { - $r = q("DELETE FROM `hook` WHERE `hook` = '%s' AND `file` = '%s' AND `function` = '%s' LIMIT 1", + $r = q("DELETE FROM hook WHERE hook = '%s' AND `file` = '%s' AND `function` = '%s' LIMIT 1", dbesc($hook), dbesc($file), dbesc($function) @@ -187,8 +187,8 @@ function unregister_hook($hook,$file,$function) { function load_hooks() { $a = get_app(); $a->hooks = array(); - $r = q("SELECT * FROM `hook` WHERE 1 ORDER BY `priority` DESC"); - if(count($r)) { + $r = q("SELECT * FROM hook WHERE true ORDER BY priority DESC"); + if($r) { foreach($r as $rr) { if(! array_key_exists($rr['hook'],$a->hooks)) $a->hooks[$rr['hook']] = array(); diff --git a/include/zot.php b/include/zot.php index d53148952..f36f15dc5 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1218,6 +1218,7 @@ function import_directory_profile($hash,$profile) { import_directory_keywords($hash,$profile['keywords']); foreach($profile['keywords'] as $kw) { $kw = trim(htmlentities($kw,ENT_COMPAT,'UTF-8',false)); + $kw = trim($kw,','); } $clean[] = $kw; } @@ -1312,7 +1313,7 @@ function import_directory_keywords($hash,$keywords) { } foreach($clean as $x) { if(! in_array($x,$existing)) - $r = q("insert int xtag ( xtag_hash, xtag_term) values ( '%s' ,'%s' )", + $r = q("insert into xtag ( xtag_hash, xtag_term) values ( '%s' ,'%s' )", dbesc($hash), dbesc($x) ); diff --git a/mod/search.php b/mod/search.php index fdd79f0a1..453b01c65 100644 --- a/mod/search.php +++ b/mod/search.php @@ -186,7 +186,6 @@ function search_content(&$a) { if(($update) && ($load)) { - $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage'])); if($load) { diff --git a/version.inc b/version.inc index 4dc83065c..efe2b94cc 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-05-07.306 +2013-05-08.307 |