diff options
-rw-r--r-- | Zotlabs/Widget/Conversations.php | 4 | ||||
-rw-r--r-- | Zotlabs/Widget/Tasklist.php | 2 | ||||
-rwxr-xr-x | boot.php | 4 | ||||
-rw-r--r-- | include/channel.php | 72 | ||||
-rw-r--r-- | include/photos.php | 1 | ||||
-rw-r--r-- | view/css/bootstrap-red.css | 1 | ||||
-rw-r--r-- | view/theme/redbasic/css/style.css | 13 | ||||
-rwxr-xr-x | view/tpl/admin_channels.tpl | 6 | ||||
-rwxr-xr-x | view/tpl/photo_albums.tpl | 2 |
9 files changed, 80 insertions, 25 deletions
diff --git a/Zotlabs/Widget/Conversations.php b/Zotlabs/Widget/Conversations.php index c1f1eff16..ee9c6d2b0 100644 --- a/Zotlabs/Widget/Conversations.php +++ b/Zotlabs/Widget/Conversations.php @@ -71,4 +71,6 @@ class Conversations { } return $o; } -}
\ No newline at end of file + +} + diff --git a/Zotlabs/Widget/Tasklist.php b/Zotlabs/Widget/Tasklist.php index 78dc27def..6f7a8aaed 100644 --- a/Zotlabs/Widget/Tasklist.php +++ b/Zotlabs/Widget/Tasklist.php @@ -21,7 +21,7 @@ class Tasklist { </script>'; $o .= '<div class="widget">' . '<h3>' . t('Tasks') . '</h3><div class="tasklist-tasks">'; - $o .= '</div><form id="tasklist-new-form" action="" ><input class="form-control" id="tasklist-new-summary" type="text" name="summary" value="" /></form>'; + $o .= '</div><form id="tasklist-new-form" action="" ><input id="tasklist-new-summary" type="text" name="summary" value="" /></form>'; $o .= '</div>'; return $o; @@ -48,6 +48,7 @@ require_once('include/xchan.php'); require_once('include/hubloc.php'); + define ( 'PLATFORM_NAME', 'red' ); define ( 'STD_VERSION', '5.3' ); @@ -82,7 +83,7 @@ define ( 'DIRECTORY_REALM', 'RED_GLOBAL'); define ( 'DIRECTORY_FALLBACK_MASTER', 'https://gravizot.de'); $DIRECTORY_FALLBACK_SERVERS = array( - 'https://hubzilla.site', + //'https://hubzilla.site', 'https://hubzilla.zottel.net', 'https://my.federated.social', 'https://hubzilla.nl', @@ -2300,6 +2301,7 @@ function cert_bad_email() { ) ] ); + } diff --git a/include/channel.php b/include/channel.php index 465a1524a..b224e3623 100644 --- a/include/channel.php +++ b/include/channel.php @@ -243,20 +243,21 @@ function create_identity($arr) { $expire = 0; $r = channel_store_lowlevel( - [ - channel_account_id => intval($arr['account_id']), - channel_primary => intval($primary), - channel_name => $name, - channel_address => $nick, - channel_guid => $guid, - channel_guid_sig => $sig, - channel_hash => $hash, - channel_prvkey => $key['prvkey'], - channel_pubkey => $key['pubkey'], - channel_pageflags => intval($pageflags), - channel_system => intval($system), - channel_expire_days => intval($expire), - channel_timezone => App::$timezone + [ + 'channel_account_id' => intval($arr['account_id']), + 'channel_primary' => intval($primary), + 'channel_name' => $name, + 'channel_address' => $nick, + 'channel_guid' => $guid, + 'channel_guid_sig' => $sig, + 'channel_hash' => $hash, + 'channel_prvkey' => $key['prvkey'], + 'channel_pubkey' => $key['pubkey'], + 'channel_pageflags' => intval($pageflags), + 'channel_system' => intval($system), + 'channel_expire_days' => intval($expire), + 'channel_timezone' => App::$timezone + ] ); @@ -2007,6 +2008,45 @@ function channel_store_lowlevel($arr) { } +function channel_store_lowlevel($arr) { + + $store = [ + 'channel_account_id' => ((array_key_exists('channel_account_id',$arr)) ? $arr['channel_account_id'] : '0'), + 'channel_primary' => ((array_key_exists('channel_primary',$arr)) ? $arr['channel_primary'] : '0'), + 'channel_name' => ((array_key_exists('channel_name',$arr)) ? $arr['channel_name'] : ''), + 'channel_address' => ((array_key_exists('channel_address',$arr)) ? $arr['channel_address'] : ''), + 'channel_guid' => ((array_key_exists('channel_guid',$arr)) ? $arr['channel_guid'] : ''), + 'channel_guid_sig' => ((array_key_exists('channel_guid_sig',$arr)) ? $arr['channel_guid_sig'] : ''), + 'channel_hash' => ((array_key_exists('channel_hash',$arr)) ? $arr['channel_hash'] : ''), + 'channel_timezone' => ((array_key_exists('channel_timezone',$arr)) ? $arr['channel_timezone'] : 'UTC'), + 'channel_location' => ((array_key_exists('channel_location',$arr)) ? $arr['channel_location'] : ''), + 'channel_theme' => ((array_key_exists('channel_theme',$arr)) ? $arr['channel_theme'] : ''), + 'channel_startpage' => ((array_key_exists('channel_startpage',$arr)) ? $arr['channel_startpage'] : ''), + 'channel_pubkey' => ((array_key_exists('channel_pubkey',$arr)) ? $arr['channel_pubkey'] : ''), + 'channel_prvkey' => ((array_key_exists('channel_prvkey',$arr)) ? $arr['channel_prvkey'] : ''), + 'channel_notifyflags' => ((array_key_exists('channel_notifyflags',$arr)) ? $arr['channel_notifyflags'] : '65535'), + 'channel_pageflags' => ((array_key_exists('channel_pageflags',$arr)) ? $arr['channel_pageflags'] : '0'), + 'channel_dirdate' => ((array_key_exists('channel_dirdate',$arr)) ? $arr['channel_dirdate'] : NULL_DATE), + 'channel_lastpost' => ((array_key_exists('channel_lastpost',$arr)) ? $arr['channel_lastpost'] : NULL_DATE), + 'channel_deleted' => ((array_key_exists('channel_deleted',$arr)) ? $arr['channel_deleted'] : NULL_DATE), + 'channel_max_anon_mail' => ((array_key_exists('channel_max_anon_mail',$arr)) ? $arr['channel_max_anon_mail'] : '10'), + 'channel_max_friend_req' => ((array_key_exists('channel_max_friend_req',$arr)) ? $arr['channel_max_friend_req'] : '10'), + 'channel_expire_days' => ((array_key_exists('channel_expire_days',$arr)) ? $arr['channel_expire_days'] : '0'), + 'channel_passwd_reset' => ((array_key_exists('channel_passwd_reset',$arr)) ? $arr['channel_passwd_reset'] : ''), + 'channel_default_group' => ((array_key_exists('channel_default_group',$arr)) ? $arr['channel_default_group'] : ''), + 'channel_allow_cid' => ((array_key_exists('channel_allow_cid',$arr)) ? $arr['channel_allow_cid'] : ''), + 'channel_allow_gid' => ((array_key_exists('channel_allow_gid',$arr)) ? $arr['channel_allow_gid'] : ''), + 'channel_deny_cid' => ((array_key_exists('channel_deny_cid',$arr)) ? $arr['channel_deny_cid'] : ''), + 'channel_deny_gid' => ((array_key_exists('channel_deny_gid',$arr)) ? $arr['channel_deny_gid'] : ''), + 'channel_removed' => ((array_key_exists('channel_removed',$arr)) ? $arr['channel_removed'] : '0'), + 'channel_system' => ((array_key_exists('channel_system',$arr)) ? $arr['channel_system'] : '0'), + 'channel_moved' => ((array_key_exists('channel_moved',$arr)) ? $arr['channel_moved'] : '') + ]; + + return create_table_from_array('channel',$store); + +} + function profile_store_lowlevel($arr) { @@ -2280,4 +2320,6 @@ function channel_codeallowed($channel_id) { if(($x) && ($x['channel_pageflags'] & PAGE_ALLOWCODE)) return true; return false; -}
\ No newline at end of file + +} + diff --git a/include/photos.php b/include/photos.php index eae9689a9..9b2515658 100644 --- a/include/photos.php +++ b/include/photos.php @@ -582,6 +582,7 @@ function photos_list_photos($channel, $observer, $album = '') { * @return boolean */ + function photos_album_exists($channel_id, $observer_hash, $album) { $sql_extra = permissions_sql($channel_id,$observer_hash); diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 73f71fe7f..0df56f621 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -33,7 +33,6 @@ nav .badge { padding: 0.2rem 0; } - #navbar-collapse-1 i { font-size: 0.9rem; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 156df07ff..601124227 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -878,14 +878,22 @@ margin-right: 50px; list-style-type: none; } -.generic-icons { +.generic-icons, +a .generic-icons { font-size: 1rem; margin-right: 0.5rem; + color: $font_colour; +} + +.generic-icons:hover, +a .generic-icons:hover { + color: $font_colour; } .generic-icons-right { font-size: 1rem; margin-left: 0.5rem; + color: $font_colour; } @@ -901,7 +909,8 @@ margin-right: 50px; .drop-icons, a .drop-icons { - font-size: 1.2em; + font-size: 1rem; + color: $font_colour; text-decoration: none; cursor: pointer; } diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl index 087ce6d3c..452e0eeec 100755 --- a/view/tpl/admin_channels.tpl +++ b/view/tpl/admin_channels.tpl @@ -34,9 +34,9 @@ <td class='channel_address'>{{$c.channel_address}}</td> <td class="checkbox_bulkedit"><input type="checkbox" class="channels_ckbx" id="id_channel_{{$c.channel_id}}" name="channel[]" value="{{$c.channel_id}}"/></td> <td class="tools"> - <a href="{{$baseurl}}/admin/channels/block/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-outline-secondary btn-sm" title='{{if ($c.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='fa fa-ban admin-icons {{if ($c.blocked)}}dim{{/if}}'></i></a> - <a href="{{$baseurl}}/admin/channels/code/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-outline-secondary btn-sm" title='{{if ($c.allowcode)}}{{$uncode}}{{else}}{{$code}}{{/if}}'><i class='fa fa-terminal admin-icons {{if ($c.allowcode)}}dim{{/if}}'></i></a> - <a href="{{$baseurl}}/admin/channels/delete/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-outline-secondary btn-sm" title='{{$delete}}' onclick="return confirm_delete('{{$c.channel_name}}')"><i class='fa fa-trash-o admin-icons'></i></a> + <a href="{{$baseurl}}/admin/channels/block/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($c.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='fa fa-ban admin-icons {{if ($c.blocked)}}dim{{/if}}'></i></a> + <a href="{{$baseurl}}/admin/channels/code/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs{{if ($c.allowcode)}} btn-danger{{/if}}" title='{{if ($c.allowcode)}}{{$uncode}}{{else}}{{$code}}{{/if}}'><i class='fa fa-terminal admin-icons {{if ($c.allowcode)}}dim{{/if}}'></i></a> + <a href="{{$baseurl}}/admin/channels/delete/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$c.channel_name}}')"><i class='fa fa-trash-o admin-icons'></i></a> </td> </tr> {{/foreach}} diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl index aa78c513a..c565ccaf1 100755 --- a/view/tpl/photo_albums.tpl +++ b/view/tpl/photo_albums.tpl @@ -1,7 +1,7 @@ <div id="side-bar-photos-albums" class="widget"> <h3>{{$title}}</h3> <ul class="nav nav-pills flex-column"> - <li class="nav-item"><a class="nav-link"href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$recent_photos}}</a></li> + <li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$recent_photos}}</a></li> {{if $albums}} {{foreach $albums as $al}} {{if $al.shorttext}} |