diff options
| -rwxr-xr-x | include/dba/dba_pdo.php | 14 | ||||
| -rw-r--r-- | install/schema_mysql.sql | 41 | ||||
| -rw-r--r-- | install/schema_postgres.sql | 41 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 2 |
4 files changed, 8 insertions, 90 deletions
diff --git a/include/dba/dba_pdo.php b/include/dba/dba_pdo.php index f76e6cdd7..f119d8926 100755 --- a/include/dba/dba_pdo.php +++ b/include/dba/dba_pdo.php @@ -74,19 +74,19 @@ class dba_pdo extends dba_driver { return $result; } - if($this->debug) { - db_logger('dba_pdo: DEBUG: ' . printable($sql) . ' returned ' . count($result) . ' results.', LOGGER_NORMAL, LOG_INFO); - } - $r = array(); if($result) { foreach($result as $x) { $r[] = $x; } - if($this->debug) { - db_logger('dba_pdo: ' . printable(print_r($r,true)), LOGGER_NORMAL, LOG_INFO); - } } + + if($this->debug) { + db_logger('dba_pdo: DEBUG: ' . printable($sql) . ' returned ' . count($r) . ' results.', LOGGER_NORMAL, LOG_INFO); + db_logger('dba_pdo: ' . printable(print_r($r,true)), LOGGER_NORMAL, LOG_INFO); + } + + return (($this->error) ? false : $r); } diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index be5317722..f3d46fa73 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -18,8 +18,6 @@ CREATE TABLE IF NOT EXISTS `abook` ( `abook_account` int(10) unsigned NOT NULL DEFAULT '0', `abook_channel` int(10) unsigned NOT NULL DEFAULT '0', `abook_xchan` char(255) NOT NULL DEFAULT '', - `abook_my_perms` int(11) NOT NULL DEFAULT '0', - `abook_their_perms` int(11) NOT NULL DEFAULT '0', `abook_closeness` tinyint(3) unsigned NOT NULL DEFAULT '99', `abook_created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00', `abook_updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00', @@ -42,8 +40,6 @@ CREATE TABLE IF NOT EXISTS `abook` ( KEY `abook_account` (`abook_account`), KEY `abook_channel` (`abook_channel`), KEY `abook_xchan` (`abook_xchan`), - KEY `abook_my_perms` (`abook_my_perms`), - KEY `abook_their_perms` (`abook_their_perms`), KEY `abook_closeness` (`abook_closeness`), KEY `abook_created` (`abook_created`), KEY `abook_updated` (`abook_updated`), @@ -266,24 +262,6 @@ CREATE TABLE IF NOT EXISTS `channel` ( `channel_allow_gid` mediumtext NOT NULL, `channel_deny_cid` mediumtext NOT NULL, `channel_deny_gid` mediumtext NOT NULL, - `channel_r_stream` int(10) unsigned NOT NULL DEFAULT '0', - `channel_r_profile` int(10) unsigned NOT NULL DEFAULT '0', - `channel_r_photos` int(10) unsigned NOT NULL DEFAULT '0', - `channel_r_abook` int(10) unsigned NOT NULL DEFAULT '0', - `channel_w_stream` int(10) unsigned NOT NULL DEFAULT '0', - `channel_w_wall` int(10) unsigned NOT NULL DEFAULT '0', - `channel_w_tagwall` int(10) unsigned NOT NULL DEFAULT '0', - `channel_w_comment` int(10) unsigned NOT NULL DEFAULT '0', - `channel_w_mail` int(10) unsigned NOT NULL DEFAULT '0', - `channel_w_photos` int(10) unsigned NOT NULL DEFAULT '0', - `channel_w_chat` int(10) unsigned NOT NULL DEFAULT '0', - `channel_a_delegate` int(10) unsigned NOT NULL DEFAULT '0', - `channel_r_storage` int(10) unsigned NOT NULL DEFAULT '0', - `channel_w_storage` int(10) unsigned NOT NULL DEFAULT '0', - `channel_r_pages` int(10) unsigned NOT NULL DEFAULT '0', - `channel_w_pages` int(10) unsigned NOT NULL DEFAULT '0', - `channel_a_republish` int(10) unsigned NOT NULL DEFAULT '0', - `channel_w_like` int(10) unsigned NOT NULL DEFAULT '0', `channel_removed` tinyint(1) NOT NULL DEFAULT '0', `channel_system` tinyint(1) NOT NULL DEFAULT '0', `channel_moved` char(255) NOT NULL DEFAULT '', @@ -300,29 +278,11 @@ CREATE TABLE IF NOT EXISTS `channel` ( KEY `channel_max_anon_mail` (`channel_max_anon_mail`), KEY `channel_max_friend_req` (`channel_max_friend_req`), KEY `channel_default_gid` (`channel_default_group`), - KEY `channel_r_stream` (`channel_r_stream`), - KEY `channel_r_profile` (`channel_r_profile`), - KEY `channel_r_photos` (`channel_r_photos`), - KEY `channel_r_abook` (`channel_r_abook`), - KEY `channel_w_stream` (`channel_w_stream`), - KEY `channel_w_wall` (`channel_w_wall`), - KEY `channel_w_tagwall` (`channel_w_tagwall`), - KEY `channel_w_comment` (`channel_w_comment`), - KEY `channel_w_mail` (`channel_w_mail`), - KEY `channel_w_photos` (`channel_w_photos`), - KEY `channel_w_chat` (`channel_w_chat`), KEY `channel_guid` (`channel_guid`), KEY `channel_hash` (`channel_hash`), KEY `channel_expire_days` (`channel_expire_days`), - KEY `channel_a_delegate` (`channel_a_delegate`), - KEY `channel_r_storage` (`channel_r_storage`), - KEY `channel_w_storage` (`channel_w_storage`), - KEY `channel_r_pages` (`channel_r_pages`), - KEY `channel_w_pages` (`channel_w_pages`), KEY `channel_deleted` (`channel_deleted`), - KEY `channel_a_republish` (`channel_a_republish`), KEY `channel_dirdate` (`channel_dirdate`), - KEY `channel_w_like` (`channel_w_like`), KEY `channel_removed` (`channel_removed`), KEY `channel_system` (`channel_system`), KEY `channel_lastpost` (`channel_lastpost`), @@ -622,7 +582,6 @@ CREATE TABLE IF NOT EXISTS `item` ( `resource_type` char(16) NOT NULL DEFAULT '', `attach` mediumtext NOT NULL, `sig` text NOT NULL, - `diaspora_meta` mediumtext NOT NULL, `location` char(255) NOT NULL DEFAULT '', `coord` char(255) NOT NULL DEFAULT '', `public_policy` char(255) NOT NULL DEFAULT '', diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql index e78425828..4488d8271 100644 --- a/install/schema_postgres.sql +++ b/install/schema_postgres.sql @@ -16,8 +16,6 @@ CREATE TABLE "abook" ( "abook_account" bigint NOT NULL, "abook_channel" bigint NOT NULL, "abook_xchan" text NOT NULL DEFAULT '', - "abook_my_perms" bigint NOT NULL DEFAULT '0', - "abook_their_perms" bigint NOT NULL DEFAULT '0', "abook_closeness" numeric(3) NOT NULL DEFAULT '99', "abook_created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00', "abook_updated" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00', @@ -41,8 +39,6 @@ CREATE TABLE "abook" ( create index "abook_account" on abook ("abook_account"); create index "abook_channel" on abook ("abook_channel"); create index "abook_xchan" on abook ("abook_xchan"); - create index "abook_my_perms" on abook ("abook_my_perms"); - create index "abook_their_perms" on abook ("abook_their_perms"); create index "abook_closeness" on abook ("abook_closeness"); create index "abook_created" on abook ("abook_created"); create index "abook_updated" on abook ("abook_updated"); @@ -259,24 +255,6 @@ CREATE TABLE "channel" ( "channel_allow_gid" text , "channel_deny_cid" text , "channel_deny_gid" text , - "channel_r_stream" bigint NOT NULL DEFAULT '128', - "channel_r_profile" bigint NOT NULL DEFAULT '128', - "channel_r_photos" bigint NOT NULL DEFAULT '128', - "channel_r_abook" bigint NOT NULL DEFAULT '128', - "channel_w_stream" bigint NOT NULL DEFAULT '128', - "channel_w_wall" bigint NOT NULL DEFAULT '128', - "channel_w_tagwall" bigint NOT NULL DEFAULT '128', - "channel_w_comment" bigint NOT NULL DEFAULT '128', - "channel_w_mail" bigint NOT NULL DEFAULT '128', - "channel_w_photos" bigint NOT NULL DEFAULT '128', - "channel_w_chat" bigint NOT NULL DEFAULT '128', - "channel_a_delegate" bigint NOT NULL DEFAULT '0', - "channel_r_storage" bigint NOT NULL DEFAULT '128', - "channel_w_storage" bigint NOT NULL DEFAULT '128', - "channel_r_pages" bigint NOT NULL DEFAULT '128', - "channel_w_pages" bigint NOT NULL DEFAULT '128', - "channel_a_republish" bigint NOT NULL DEFAULT '128', - "channel_w_like" bigint NOT NULL DEFAULT '128', "channel_removed" smallint NOT NULL DEFAULT '0', "channel_system" smallint NOT NULL DEFAULT '0', "channel_moved" text NOT NULL DEFAULT '', @@ -294,28 +272,10 @@ create index "channel_pageflags" on channel ("channel_pageflags"); create index "channel_max_anon_mail" on channel ("channel_max_anon_mail"); create index "channel_max_friend_req" on channel ("channel_max_friend_req"); create index "channel_default_gid" on channel ("channel_default_group"); -create index "channel_r_stream" on channel ("channel_r_stream"); -create index "channel_r_profile" on channel ("channel_r_profile"); -create index "channel_r_photos" on channel ("channel_r_photos"); -create index "channel_r_abook" on channel ("channel_r_abook"); -create index "channel_w_stream" on channel ("channel_w_stream"); -create index "channel_w_wall" on channel ("channel_w_wall"); -create index "channel_w_tagwall" on channel ("channel_w_tagwall"); -create index "channel_w_comment" on channel ("channel_w_comment"); -create index "channel_w_mail" on channel ("channel_w_mail"); -create index "channel_w_photos" on channel ("channel_w_photos"); -create index "channel_w_chat" on channel ("channel_w_chat"); create index "channel_guid" on channel ("channel_guid"); create index "channel_hash" on channel ("channel_hash"); create index "channel_expire_days" on channel ("channel_expire_days"); -create index "channel_a_delegate" on channel ("channel_a_delegate"); -create index "channel_r_storage" on channel ("channel_r_storage"); -create index "channel_w_storage" on channel ("channel_w_storage"); -create index "channel_r_pages" on channel ("channel_r_pages"); -create index "channel_w_pages" on channel ("channel_w_pages"); create index "channel_deleted" on channel ("channel_deleted"); -create index "channel_a_republish" on channel ("channel_a_republish"); -create index "channel_w_like" on channel ("channel_w_like"); create index "channel_dirdate" on channel ("channel_dirdate"); create index "channel_lastpost" on channel ("channel_lastpost"); create index "channel_removed" on channel ("channel_removed"); @@ -609,7 +569,6 @@ CREATE TABLE "item" ( "resource_type" varchar(16) NOT NULL DEFAULT '', "attach" text NOT NULL, "sig" text NOT NULL DEFAULT '', - "diaspora_meta" text NOT NULL DEFAULT '', "location" text NOT NULL DEFAULT '', "coord" text NOT NULL DEFAULT '', "public_policy" text NOT NULL DEFAULT '', diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 0581989ec..11e107d2a 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -177,7 +177,7 @@ <a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}" onclick="contextualHelp(); return false;"><i class="fa fa-question-circle"></i></a> </li> {{/if}} - <li class=""> + <li class="" id="app-menu"> <a href="#" data-toggle="dropdown"><i class="fa fa-bars"></i></a> <ul class="dropdown-menu"> {{foreach $navapps as $navapp}} |